Skip to content

Commit

Permalink
remove ordering in ModuleConcatenationPlugin
Browse files Browse the repository at this point in the history
  • Loading branch information
sokra committed Aug 7, 2017
1 parent 9f5bffa commit 6607cfa
Showing 1 changed file with 2 additions and 14 deletions.
16 changes: 2 additions & 14 deletions lib/optimize/ModuleConcatenationPlugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,7 @@ class ModuleConcatenationPlugin {
for(const concatConfiguration of concatConfigurations) {
if(usedModules.has(concatConfiguration.rootModule))
continue;
const orderedModules = new Set();
this.addInOrder(concatConfiguration.rootModule, concatConfiguration.modules, orderedModules);
const newModule = new ConcatenatedModule(concatConfiguration.rootModule, Array.from(orderedModules));
const newModule = new ConcatenatedModule(concatConfiguration.rootModule, Array.from(concatConfiguration.modules));
concatConfiguration.sortWarnings();
for(const warning of concatConfiguration.warnings) {
newModule.optimizationBailout.push((requestShortener) => {
Expand All @@ -151,7 +149,7 @@ class ModuleConcatenationPlugin {
});
}
const chunks = concatConfiguration.rootModule.getChunks();
for(const m of orderedModules) {
for(const m of concatConfiguration.modules) {
usedModules.add(m);
chunks.forEach(chunk => chunk.removeModule(m));
}
Expand Down Expand Up @@ -247,16 +245,6 @@ class ModuleConcatenationPlugin {
config.set(testConfig);
return null;
}

addInOrder(module, unorderedSet, orderedSet) {
if(orderedSet.has(module)) return;
if(!unorderedSet.has(module)) return;
orderedSet.add(module);
for(const imp of this.getImports(module))
this.addInOrder(imp, unorderedSet, orderedSet);
orderedSet.delete(module);
orderedSet.add(module);
}
}

class ConcatConfiguration {
Expand Down

0 comments on commit 6607cfa

Please sign in to comment.