root
/
webpack
mirror of https://github.com/webpack/webpack.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fixed #179 typo in OccurenceOrderPlugin

This commit is contained in:
Tobias Koppers 2014-02-25 08:51:40 +01:00
parent ee30c84672
commit 48aad3eeee
4 changed files with 86 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/WebpackOptionsApply.js
View File

@ -200,9 +200,9 @@ WebpackOptionsApply.prototype.process = function(options, compiler) {
compiler.apply(new RecordIdsPlugin()); compiler.apply(new RecordIdsPlugin());
if(options.optimize && options.optimize.occurenceOrder) { if(options.optimize && options.optimize.occurenceOrder) {
compiler.apply(new MovedToPluginWarningPlugin("optimize.occurenceOrder", "optimize.OccurenceOrderPlugin")); compiler.apply(new MovedToPluginWarningPlugin("optimize.occurenceOrder", "optimize.OccurrenceOrderPlugin"));
var OccurenceOrderPlugin = require("./optimize/OccurenceOrderPlugin"); var OccurrenceOrderPlugin = require("./optimize/OccurrenceOrderPlugin");
compiler.apply(new OccurenceOrderPlugin(options.optimize.occurenceOrderPreferEntry)); compiler.apply(new OccurrenceOrderPlugin(options.optimize.occurenceOrderPreferEntry));
} }
if(options.optimize && options.optimize.minChunkSize) { if(options.optimize && options.optimize.minChunkSize) {

78
lib/optimize/OccurenceOrderPlugin.js
View File

@ -2,80 +2,4 @@
MIT License http://www.opensource.org/licenses/mit-license.php MIT License http://www.opensource.org/licenses/mit-license.php
Author Tobias Koppers @sokra Author Tobias Koppers @sokra
*/ */
function OccurenceOrderPlugin(preferEntry) { module.exports = require("./OccurrenceOrderPlugin");
this.preferEntry = preferEntry;
}
module.exports = OccurenceOrderPlugin;
OccurenceOrderPlugin.prototype.apply = function(compiler) {
var preferEntry = this.preferEntry;
compiler.plugin("compilation", function(compilation) {
compilation.plugin("optimize-module-order", function(modules) {
function entryChunks(m) {
return m.chunks.filter(function(c) {
return c.initial;
}).length;
}
function occursInEntry(m) {
return m.reasons.map(function(r) {
if(!r.module) return 0;
return entryChunks(r.module);
}).reduce(function(a, b) { return a+b; }, 0) + entryChunks(m);
}
function occurs(m) {
return m.reasons.map(function(r) {
if(!r.module) return 0;
return r.module.chunks.length;
}).reduce(function(a, b) { return a+b; }, 0) + m.chunks.length;
}
modules.sort(function(a, b) {
if(preferEntry) {
var aEntryOccurs = occursInEntry(a);
var bEntryOccurs = occursInEntry(b);
if(aEntryOccurs > bEntryOccurs) return -1;
if(aEntryOccurs < bEntryOccurs) return 1;
}
var aOccurs = occurs(a);
var bOccurs = occurs(b);
if(aOccurs > bOccurs) return -1;
if(aOccurs < bOccurs) return 1;
if(a.identifier() > b.identifier()) return 1;
if(a.identifier() < b.identifier()) return -1;
return 0;
});
});
compilation.plugin("optimize-chunk-order", function(chunks) {
function occursInEntry(c) {
return c.parents.filter(function(p) {
return p.initial;
}).length + (c.entry ? 1 : 0);
}
function occurs(c) {
return c.blocks.length + (c.entry ? 1 : 0);
}
chunks.forEach(function(c) {
c.modules.sort(function(a, b) {
if(a.identifier() > b.identifier()) return 1;
if(a.identifier() < b.identifier()) return -1;
return 0;
});
});
chunks.sort(function(a, b) {
var aEntryOccurs = occursInEntry(a);
var bEntryOccurs = occursInEntry(b);
if(aEntryOccurs > bEntryOccurs) return -1;
if(aEntryOccurs < bEntryOccurs) return 1;
var aOccurs = occurs(a);
var bOccurs = occurs(b);
if(aOccurs > bOccurs) return -1;
if(aOccurs < bOccurs) return 1;
if(a.modules.length > b.modules.length) return -1;
if(a.modules.length < b.modules.length) return 1;
for(var i = 0; i < a.modules.length; i++) {
if(a.modules[i].identifier() > b.modules[i].identifier()) return -1;
if(a.modules[i].identifier() < b.modules[i].identifier()) return 1;
}
return 0;
});
});
});
};

81
lib/optimize/OccurrenceOrderPlugin.js Normal file
View File

@ -0,0 +1,81 @@
/*
MIT License http://www.opensource.org/licenses/mit-license.php
Author Tobias Koppers @sokra
*/
function OccurrenceOrderPlugin(preferEntry) {
this.preferEntry = preferEntry;
}
module.exports = OccurrenceOrderPlugin;
OccurrenceOrderPlugin.prototype.apply = function(compiler) {
var preferEntry = this.preferEntry;
compiler.plugin("compilation", function(compilation) {
compilation.plugin("optimize-module-order", function(modules) {
function entryChunks(m) {
return m.chunks.filter(function(c) {
return c.initial;
}).length;
}
function occursInEntry(m) {
return m.reasons.map(function(r) {
if(!r.module) return 0;
return entryChunks(r.module);
}).reduce(function(a, b) { return a+b; }, 0) + entryChunks(m);
}
function occurs(m) {
return m.reasons.map(function(r) {
if(!r.module) return 0;
return r.module.chunks.length;
}).reduce(function(a, b) { return a+b; }, 0) + m.chunks.length;
}
modules.sort(function(a, b) {
if(preferEntry) {
var aEntryOccurs = occursInEntry(a);
var bEntryOccurs = occursInEntry(b);
if(aEntryOccurs > bEntryOccurs) return -1;
if(aEntryOccurs < bEntryOccurs) return 1;
}
var aOccurs = occurs(a);
var bOccurs = occurs(b);
if(aOccurs > bOccurs) return -1;
if(aOccurs < bOccurs) return 1;
if(a.identifier() > b.identifier()) return 1;
if(a.identifier() < b.identifier()) return -1;
return 0;
});
});
compilation.plugin("optimize-chunk-order", function(chunks) {
function occursInEntry(c) {
return c.parents.filter(function(p) {
return p.initial;
}).length + (c.entry ? 1 : 0);
}
function occurs(c) {
return c.blocks.length + (c.entry ? 1 : 0);
}
chunks.forEach(function(c) {
c.modules.sort(function(a, b) {
if(a.identifier() > b.identifier()) return 1;
if(a.identifier() < b.identifier()) return -1;
return 0;
});
});
chunks.sort(function(a, b) {
var aEntryOccurs = occursInEntry(a);
var bEntryOccurs = occursInEntry(b);
if(aEntryOccurs > bEntryOccurs) return -1;
if(aEntryOccurs < bEntryOccurs) return 1;
var aOccurs = occurs(a);
var bOccurs = occurs(b);
if(aOccurs > bOccurs) return -1;
if(aOccurs < bOccurs) return 1;
if(a.modules.length > b.modules.length) return -1;
if(a.modules.length < b.modules.length) return 1;
for(var i = 0; i < a.modules.length; i++) {
if(a.modules[i].identifier() > b.modules[i].identifier()) return -1;
if(a.modules[i].identifier() < b.modules[i].identifier()) return 1;
}
return 0;
});
});
});
};

1
lib/webpack.js
View File

@ -60,6 +60,7 @@ exportPlugins(exports.optimize = {}, "./optimize", [
"LimitChunkCountPlugin", "LimitChunkCountPlugin",
"MinChunkSizePlugin", "MinChunkSizePlugin",
"OccurenceOrderPlugin", "OccurenceOrderPlugin",
"OccurrenceOrderPlugin",
"UglifyJsPlugin" "UglifyJsPlugin"
]); ]);
exportPlugins(exports.dependencies = {}, "./dependencies", [ exportPlugins(exports.dependencies = {}, "./dependencies", [