From 303bd64e3c1a7281be08d3b73feb995ef580e61d Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Tue, 5 May 2020 16:30:26 -0500 Subject: [PATCH 1/2] magento/magento2#28116: RequireJS resolver sometimes fails to detect blocked resources --- lib/web/mage/requirejs/resolver.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/web/mage/requirejs/resolver.js b/lib/web/mage/requirejs/resolver.js index 5ba1f1351bcf6..8e1757d30f572 100644 --- a/lib/web/mage/requirejs/resolver.js +++ b/lib/web/mage/requirejs/resolver.js @@ -37,6 +37,16 @@ define([ return registry[module.id] && (registry[module.id].inited || registry[module.id].error); } + /** + * Checks if provided module had path fallback triggered. + * + * @param {Object} module - Module to be checked. + * @return {Boolean} + */ + function isPathFallback(module) { + return registry[module.id] && registry[module.id].events.error; + } + /** * Checks if provided module has unresolved dependencies. * @@ -48,7 +58,8 @@ define([ return false; } - return module.depCount > _.filter(module.depMaps, isRejected).length; + return module.depCount > + (_.filter(module.depMaps, isRejected).length + _.filter(module.depMaps, isPathFallback).length); } /** From 375b129374fb83ba4993c67cb893835da91032ec Mon Sep 17 00:00:00 2001 From: Ihor Sviziev Date: Wed, 29 Jul 2020 09:12:06 +0300 Subject: [PATCH 2/2] magento/magento2#28117 RequireJS resolver sometimes fails to detect blocked resources Fix static tests --- lib/web/mage/requirejs/resolver.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/web/mage/requirejs/resolver.js b/lib/web/mage/requirejs/resolver.js index 8e1757d30f572..9818bc00c1343 100644 --- a/lib/web/mage/requirejs/resolver.js +++ b/lib/web/mage/requirejs/resolver.js @@ -59,7 +59,7 @@ define([ } return module.depCount > - (_.filter(module.depMaps, isRejected).length + _.filter(module.depMaps, isPathFallback).length); + _.filter(module.depMaps, isRejected).length + _.filter(module.depMaps, isPathFallback).length; } /**