Skip to content

RequireJS resolver sometimes fails to detect blocked resources #28117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
magento-engcom-team merged 5 commits into from
Sep 21, 2020
Merged

RequireJS resolver sometimes fails to detect blocked resources #28117

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
303bd64
magento/magento2#28116: RequireJS resolver sometimes fails to detect …
ishakhsuvarov May 5, 2020
bfdde51
Merge branch '2.4-develop' into requirejs-resolver-error-handling
slavvka May 19, 2020
c1f132b
Merge branch '2.4-develop' into requirejs-resolver-error-handling
VladimirZaets Jun 3, 2020
8602bef
Merge branch '2.4-develop' into requirejs-resolver-error-handling
engcom-Kilo Jul 20, 2020
375b129
magento/magento2#28117 RequireJS resolver sometimes fails to detect b…
ihor-sviziev Jul 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion lib/web/mage/requirejs/resolver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand All @@ -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);
}

/**
Expand Down