Skip to content

Commit

Permalink
Merge pull request #38 from mpreziuso/bugfix/webpack-5-support
Browse files Browse the repository at this point in the history
fix: replace dep.module with ModuleGraph API
  • Loading branch information
fqborges authored Oct 7, 2020
2 parents ca1f3b6 + c96fd6a commit 33168dd
Showing 1 changed file with 12 additions and 7 deletions.
19 changes: 12 additions & 7 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class WebpackFixStyleOnlyEntriesPlugin {
if (!file.endsWith(".js") && !file.endsWith(".mjs")) return;
if (!chunk.hasEntryModule()) return;

const rawResources = collectEntryResources(chunk.entryModule);
const rawResources = collectEntryResources(compilation, chunk.entryModule);
const resources = this.options.ignore
? rawResources.filter(r => !r.match(this.options.ignore))
: rawResources;
Expand All @@ -61,7 +61,7 @@ class WebpackFixStyleOnlyEntriesPlugin {
}
}

function collectEntryResources(module, level = 0) {
function collectEntryResources(compilation, module, level = 0) {
// module.index is unique per compilation
// module.id can be null, not used here
if (_entryResourcesCache[module.index] !== undefined) {
Expand All @@ -76,12 +76,17 @@ function collectEntryResources(module, level = 0) {

const resources = [];
if (module.dependencies) {
const hasModuleGraphSupport = compilation.hasOwnProperty('moduleGraph');
module.dependencies.forEach(dep => {
if (dep && (dep.module || dep.originModule)) {
const nextModule = dep.module || dep.originModule;
const depResources = collectEntryResources(nextModule, level + 1);
for (let index = 0, length = depResources.length; index !== length; index++) {
resources.push(depResources[index]);
if(dep) {
const module = hasModuleGraphSupport ? compilation.moduleGraph.getModule(dep) : dep.module;
const originModule = hasModuleGraphSupport ? compilation.moduleGraph.getParentModule(dep) : dep.originModule;
const nextModule = module || originModule;
if (nextModule) {
const depResources = collectEntryResources(compilation, nextModule, level + 1);
for (let index = 0, length = depResources.length; index !== length; index++) {
resources.push(depResources[index]);
}
}
}
});
Expand Down

0 comments on commit 33168dd

Please sign in to comment.