Skip to content

Commit 303bd64

Browse files
committed
#28116: RequireJS resolver sometimes fails to detect blocked resources
1 parent 6b6f428 commit 303bd64

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

lib/web/mage/requirejs/resolver.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,16 @@ define([
3737
return registry[module.id] && (registry[module.id].inited || registry[module.id].error);
3838
}
3939

40+
/**
41+
* Checks if provided module had path fallback triggered.
42+
*
43+
* @param {Object} module - Module to be checked.
44+
* @return {Boolean}
45+
*/
46+
function isPathFallback(module) {
47+
return registry[module.id] && registry[module.id].events.error;
48+
}
49+
4050
/**
4151
* Checks if provided module has unresolved dependencies.
4252
*
@@ -48,7 +58,8 @@ define([
4858
return false;
4959
}
5060

51-
return module.depCount > _.filter(module.depMaps, isRejected).length;
61+
return module.depCount >
62+
(_.filter(module.depMaps, isRejected).length + _.filter(module.depMaps, isPathFallback).length);
5263
}
5364

5465
/**

0 commit comments

Comments
 (0)