ENGCOM-7914: RequireJS resolver sometimes fails to detect blocked res…

…ources #28117
magento · Sep 21, 2020 · d7f3e8c · d7f3e8c
2 parents 3553b8a + a5d138b
commit d7f3e8c
Showing 1 changed file with 12 additions and 1 deletion.
diff --git 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;
     }
 
     /**