webpack 2.1.0-beta.24 → 2.1.0-beta.25

package/lib/SourceMapDevToolModuleOptionsPlugin.js

@@ -1,33 +1,33 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-var ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
-
-function SourceMapDevToolModuleOptionsPlugin(options) {
-	this.options = options;
-}
-
-module.exports = SourceMapDevToolModuleOptionsPlugin;
-
-SourceMapDevToolModuleOptionsPlugin.prototype.apply = function(compilation) {
-	var options = this.options;
-	if(options.module !== false) {
-		compilation.plugin("build-module", function(module) {
-			module.useSourceMap = true;
-		});
-	}
-	if(options.lineToLine === true) {
-		compilation.plugin("build-module", function(module) {
-			module.lineToLine = true;
-		});
-	} else if(options.lineToLine) {
-		compilation.plugin("build-module", function(module) {
-			if(!module.resource) return;
-			var resourcePath = module.resource;
-			var idx = resourcePath.indexOf("?");
-			if(idx >= 0) resourcePath = resourcePath.substr(0, idx);
-			module.lineToLine = ModuleFilenameHelpers.matchObject(options.lineToLine, resourcePath);
-		});
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
+
+function SourceMapDevToolModuleOptionsPlugin(options) {
+	this.options = options;
+}
+
+module.exports = SourceMapDevToolModuleOptionsPlugin;
+
+SourceMapDevToolModuleOptionsPlugin.prototype.apply = function(compilation) {
+	var options = this.options;
+	if(options.module !== false) {
+		compilation.plugin("build-module", function(module) {
+			module.useSourceMap = true;
+		});
+	}
+	if(options.lineToLine === true) {
+		compilation.plugin("build-module", function(module) {
+			module.lineToLine = true;
+		});
+	} else if(options.lineToLine) {
+		compilation.plugin("build-module", function(module) {
+			if(!module.resource) return;
+			var resourcePath = module.resource;
+			var idx = resourcePath.indexOf("?");
+			if(idx >= 0) resourcePath = resourcePath.substr(0, idx);
+			module.lineToLine = ModuleFilenameHelpers.matchObject(options.lineToLine, resourcePath);
+		});
+	}
+};

package/lib/WebpackOptionsValidationError.js

@@ -27,6 +27,18 @@ WebpackOptionsValidationError.formatValidationError = function formatValidationE
 			var baseMessage = dataPath + " has an unknown property '" + err.params.additionalProperty + "'. These properties are valid:\n" +
 				getSchemaPartText(err.parentSchema);
 			if(!err.dataPath) {
+				switch(err.params.additionalProperty) {
+					case "debug":
+						return baseMessage + "\n" +
+							"The 'debug' property was removed in webpack 2.\n" +
+							"Loaders should be updated to allow passing this option via loader options in module.rules.\n" +
+							"Until loaders are updated one can use the LoaderOptionsPlugin to switch loaders into debug mode:\n" +
+							"plugins: {\n" +
+							"  new webpack.LoaderOptionsPlugin({\n" +
+							"    debug: true\n" +
+							"  })\n" +
+							"}";
+				}
 				return baseMessage + "\n" +
 					"For typos: please correct them.\n" +
 					"For loader options: webpack 2 no longer allows custom properties in configuration.\n" +
@@ -34,6 +46,7 @@ WebpackOptionsValidationError.formatValidationError = function formatValidationE
 					"  Until loaders are updated one can use the LoaderOptionsPlugin to pass these options to the loader:\n" +
 					"  plugins: {\n" +
 					"    new webpack.LoaderOptionsPlugin({\n" +
+					"      // test: /\\.xxx$/, // may apply this only for some modules\n" +
 					"      options: {\n" +
 					"        " + err.params.additionalProperty + ": ...\n" +
 					"      }\n" +

package/lib/dependencies/ContextDependencyTemplateAsId.js

@@ -1,22 +1,22 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-function ContextDependencyTemplateAsId() {}
-module.exports = ContextDependencyTemplateAsId;
-
-ContextDependencyTemplateAsId.prototype.apply = function(dep, source, outputOptions, requestShortener) {
-	var comment = "";
-	if(outputOptions.pathinfo) comment = "/*! " + requestShortener.shorten(dep.request) + " */ ";
-	if(dep.module && dep.module.dependencies && dep.module.dependencies.length > 0) {
-		if(dep.valueRange) {
-			source.replace(dep.valueRange[1], dep.range[1] - 1, ")");
-			source.replace(dep.range[0], dep.valueRange[0] - 1, "__webpack_require__(" + comment + JSON.stringify(dep.module.id) + ").resolve(" + (typeof dep.prepend === "string" ? JSON.stringify(dep.prepend) : "") + "");
-		} else {
-			source.replace(dep.range[0], dep.range[1] - 1, "__webpack_require__(" + comment + JSON.stringify(dep.module.id) + ").resolve");
-		}
-	} else {
-		var content = require("./WebpackMissingModule").module(dep.request);
-		source.replace(dep.range[0], dep.range[1] - 1, content);
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+function ContextDependencyTemplateAsId() {}
+module.exports = ContextDependencyTemplateAsId;
+
+ContextDependencyTemplateAsId.prototype.apply = function(dep, source, outputOptions, requestShortener) {
+	var comment = "";
+	if(outputOptions.pathinfo) comment = "/*! " + requestShortener.shorten(dep.request) + " */ ";
+	if(dep.module && dep.module.dependencies && dep.module.dependencies.length > 0) {
+		if(dep.valueRange) {
+			source.replace(dep.valueRange[1], dep.range[1] - 1, ")");
+			source.replace(dep.range[0], dep.valueRange[0] - 1, "__webpack_require__(" + comment + JSON.stringify(dep.module.id) + ").resolve(" + (typeof dep.prepend === "string" ? JSON.stringify(dep.prepend) : "") + "");
+		} else {
+			source.replace(dep.range[0], dep.range[1] - 1, "__webpack_require__(" + comment + JSON.stringify(dep.module.id) + ").resolve");
+		}
+	} else {
+		var content = require("./WebpackMissingModule").module(dep.request);
+		source.replace(dep.range[0], dep.range[1] - 1, content);
+	}
+};

package/lib/node/NodeSourcePlugin.js

@@ -1,84 +1,84 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-var AliasPlugin = require("enhanced-resolve/lib/AliasPlugin");
-var ModuleParserHelpers = require("../ModuleParserHelpers");
-var nodeLibsBrowser = require("node-libs-browser");
-
-function NodeSourcePlugin(options) {
-	this.options = options;
-}
-module.exports = NodeSourcePlugin;
-NodeSourcePlugin.prototype.apply = function(compiler) {
-	var options = this.options;
-
-	function getPathToModule(module, type) {
-		if(type === true || (type === undefined && nodeLibsBrowser[module])) {
-			if(!nodeLibsBrowser[module]) throw new Error("No browser version for node.js core module '" + module + "' available");
-			return nodeLibsBrowser[module];
-		} else if(type === "mock") {
-			return require.resolve("node-libs-browser/mock/" + module);
-		} else if(type === "empty") {
-			return require.resolve("node-libs-browser/mock/empty");
-		} else return module;
-	}
-	compiler.plugin("compilation", function(compilation, params) {
-		params.normalModuleFactory.plugin("parser", function(parser, parserOptions) {
-
-			if(parserOptions.node === false)
-				return;
-
-			var localOptions = options;
-			if(parserOptions.node)
-				localOptions = Object.assign({}, localOptions, parserOptions.node);
-
-			if(localOptions.process) {
-				var processType = localOptions.process;
-				parser.plugin("expression process", function() {
-					return ModuleParserHelpers.addParsedVariable(this, "process", "require(" + JSON.stringify(getPathToModule("process", processType)) + ")");
-				});
-			}
-			if(localOptions.global) {
-				parser.plugin("expression global", function() {
-					return ModuleParserHelpers.addParsedVariable(this, "global", "require(" + JSON.stringify(require.resolve("../../buildin/global.js")) + ")");
-				});
-			}
-			if(localOptions.console) {
-				var consoleType = localOptions.console;
-				parser.plugin("expression console", function() {
-					return ModuleParserHelpers.addParsedVariable(this, "console", "require(" + JSON.stringify(getPathToModule("console", consoleType)) + ")");
-				});
-			}
-			var bufferType = localOptions.Buffer;
-			if(bufferType) {
-				parser.plugin("expression Buffer", function() {
-					return ModuleParserHelpers.addParsedVariable(this, "Buffer", "require(" + JSON.stringify(getPathToModule("buffer", bufferType)) + ").Buffer");
-				});
-			}
-			if(localOptions.setImmediate) {
-				var setImmediateType = localOptions.setImmediate;
-				parser.plugin("expression setImmediate", function() {
-					return ModuleParserHelpers.addParsedVariable(this, "setImmediate", "require(" + JSON.stringify(getPathToModule("timers", setImmediateType)) + ").setImmediate");
-				});
-				parser.plugin("expression clearImmediate", function() {
-					return ModuleParserHelpers.addParsedVariable(this, "clearImmediate", "require(" + JSON.stringify(getPathToModule("timers", setImmediateType)) + ").clearImmediate");
-				});
-			}
-		});
-	});
-	compiler.plugin("after-resolvers", function(compiler) {
-		var alias = {};
-		Object.keys(nodeLibsBrowser).forEach(function(lib) {
-			if(options[lib] !== false) {
-				compiler.resolvers.normal.apply(
-					new AliasPlugin("described-resolve", {
-						name: lib,
-						onlyModule: true,
-						alias: getPathToModule(lib, options[lib])
-					}, "resolve")
-				);
-			}
-		});
-	});
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var AliasPlugin = require("enhanced-resolve/lib/AliasPlugin");
+var ModuleParserHelpers = require("../ModuleParserHelpers");
+var nodeLibsBrowser = require("node-libs-browser");
+
+function NodeSourcePlugin(options) {
+	this.options = options;
+}
+module.exports = NodeSourcePlugin;
+NodeSourcePlugin.prototype.apply = function(compiler) {
+	var options = this.options;
+
+	function getPathToModule(module, type) {
+		if(type === true || (type === undefined && nodeLibsBrowser[module])) {
+			if(!nodeLibsBrowser[module]) throw new Error("No browser version for node.js core module '" + module + "' available");
+			return nodeLibsBrowser[module];
+		} else if(type === "mock") {
+			return require.resolve("node-libs-browser/mock/" + module);
+		} else if(type === "empty") {
+			return require.resolve("node-libs-browser/mock/empty");
+		} else return module;
+	}
+	compiler.plugin("compilation", function(compilation, params) {
+		params.normalModuleFactory.plugin("parser", function(parser, parserOptions) {
+
+			if(parserOptions.node === false)
+				return;
+
+			var localOptions = options;
+			if(parserOptions.node)
+				localOptions = Object.assign({}, localOptions, parserOptions.node);
+
+			if(localOptions.process) {
+				var processType = localOptions.process;
+				parser.plugin("expression process", function() {
+					return ModuleParserHelpers.addParsedVariable(this, "process", "require(" + JSON.stringify(getPathToModule("process", processType)) + ")");
+				});
+			}
+			if(localOptions.global) {
+				parser.plugin("expression global", function() {
+					return ModuleParserHelpers.addParsedVariable(this, "global", "require(" + JSON.stringify(require.resolve("../../buildin/global.js")) + ")");
+				});
+			}
+			if(localOptions.console) {
+				var consoleType = localOptions.console;
+				parser.plugin("expression console", function() {
+					return ModuleParserHelpers.addParsedVariable(this, "console", "require(" + JSON.stringify(getPathToModule("console", consoleType)) + ")");
+				});
+			}
+			var bufferType = localOptions.Buffer;
+			if(bufferType) {
+				parser.plugin("expression Buffer", function() {
+					return ModuleParserHelpers.addParsedVariable(this, "Buffer", "require(" + JSON.stringify(getPathToModule("buffer", bufferType)) + ").Buffer");
+				});
+			}
+			if(localOptions.setImmediate) {
+				var setImmediateType = localOptions.setImmediate;
+				parser.plugin("expression setImmediate", function() {
+					return ModuleParserHelpers.addParsedVariable(this, "setImmediate", "require(" + JSON.stringify(getPathToModule("timers", setImmediateType)) + ").setImmediate");
+				});
+				parser.plugin("expression clearImmediate", function() {
+					return ModuleParserHelpers.addParsedVariable(this, "clearImmediate", "require(" + JSON.stringify(getPathToModule("timers", setImmediateType)) + ").clearImmediate");
+				});
+			}
+		});
+	});
+	compiler.plugin("after-resolvers", function(compiler) {
+		var alias = {};
+		Object.keys(nodeLibsBrowser).forEach(function(lib) {
+			if(options[lib] !== false) {
+				compiler.resolvers.normal.apply(
+					new AliasPlugin("described-resolve", {
+						name: lib,
+						onlyModule: true,
+						alias: getPathToModule(lib, options[lib])
+					}, "resolve")
+				);
+			}
+		});
+	});
+};

package/lib/node/NodeWatchFileSystem.js

@@ -1,65 +1,65 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-var Watchpack = require("watchpack");
-
-function NodeWatchFileSystem(inputFileSystem) {
-	this.inputFileSystem = inputFileSystem;
-	this.watcherOptions = {
-		aggregateTimeout: 0
-	};
-	this.watcher = new Watchpack(this.watcherOptions);
-}
-
-module.exports = NodeWatchFileSystem;
-
-NodeWatchFileSystem.prototype.watch = function watch(files, dirs, missing, startTime, options, callback, callbackUndelayed) {
-	if(!Array.isArray(files))
-		throw new Error("Invalid arguments: 'files'");
-	if(!Array.isArray(dirs))
-		throw new Error("Invalid arguments: 'dirs'");
-	if(!Array.isArray(missing))
-		throw new Error("Invalid arguments: 'missing'");
-	if(typeof callback !== "function")
-		throw new Error("Invalid arguments: 'callback'");
-	if(typeof startTime !== "number" && startTime)
-		throw new Error("Invalid arguments: 'startTime'");
-	if(typeof options !== "object")
-		throw new Error("Invalid arguments: 'options'");
-	if(typeof callbackUndelayed !== "function" && callbackUndelayed)
-		throw new Error("Invalid arguments: 'callbackUndelayed'");
-	var oldWatcher = this.watcher;
-	this.watcher = new Watchpack(options);
-
-	if(callbackUndelayed)
-		this.watcher.once("change", callbackUndelayed);
-
-	this.watcher.once("aggregated", function(changes) {
-		if(this.inputFileSystem && this.inputFileSystem.purge) {
-			this.inputFileSystem.purge(changes);
-		}
-		var times = this.watcher.getTimes();
-		callback(null, changes.filter(function(file) {
-			return files.indexOf(file) >= 0;
-		}).sort(), changes.filter(function(file) {
-			return dirs.indexOf(file) >= 0;
-		}).sort(), changes.filter(function(file) {
-			return missing.indexOf(file) >= 0;
-		}).sort(), times, times);
-	}.bind(this));
-
-	this.watcher.watch(files.concat(missing), dirs, startTime);
-
-	if(oldWatcher) {
-		oldWatcher.close();
-	}
-	return {
-		close: function() {
-			this.watcher.close();
-		}.bind(this),
-		pause: function() {
-			this.watcher.pause();
-		}.bind(this)
-	};
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var Watchpack = require("watchpack");
+
+function NodeWatchFileSystem(inputFileSystem) {
+	this.inputFileSystem = inputFileSystem;
+	this.watcherOptions = {
+		aggregateTimeout: 0
+	};
+	this.watcher = new Watchpack(this.watcherOptions);
+}
+
+module.exports = NodeWatchFileSystem;
+
+NodeWatchFileSystem.prototype.watch = function watch(files, dirs, missing, startTime, options, callback, callbackUndelayed) {
+	if(!Array.isArray(files))
+		throw new Error("Invalid arguments: 'files'");
+	if(!Array.isArray(dirs))
+		throw new Error("Invalid arguments: 'dirs'");
+	if(!Array.isArray(missing))
+		throw new Error("Invalid arguments: 'missing'");
+	if(typeof callback !== "function")
+		throw new Error("Invalid arguments: 'callback'");
+	if(typeof startTime !== "number" && startTime)
+		throw new Error("Invalid arguments: 'startTime'");
+	if(typeof options !== "object")
+		throw new Error("Invalid arguments: 'options'");
+	if(typeof callbackUndelayed !== "function" && callbackUndelayed)
+		throw new Error("Invalid arguments: 'callbackUndelayed'");
+	var oldWatcher = this.watcher;
+	this.watcher = new Watchpack(options);
+
+	if(callbackUndelayed)
+		this.watcher.once("change", callbackUndelayed);
+
+	this.watcher.once("aggregated", function(changes) {
+		if(this.inputFileSystem && this.inputFileSystem.purge) {
+			this.inputFileSystem.purge(changes);
+		}
+		var times = this.watcher.getTimes();
+		callback(null, changes.filter(function(file) {
+			return files.indexOf(file) >= 0;
+		}).sort(), changes.filter(function(file) {
+			return dirs.indexOf(file) >= 0;
+		}).sort(), changes.filter(function(file) {
+			return missing.indexOf(file) >= 0;
+		}).sort(), times, times);
+	}.bind(this));
+
+	this.watcher.watch(files.concat(missing), dirs, startTime);
+
+	if(oldWatcher) {
+		oldWatcher.close();
+	}
+	return {
+		close: function() {
+			this.watcher.close();
+		}.bind(this),
+		pause: function() {
+			this.watcher.pause();
+		}.bind(this)
+	};
+};

package/lib/optimize/OccurrenceOrderPlugin.js

@@ -1,96 +1,96 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-function OccurrenceOrderPlugin(preferEntry) {
-	if(preferEntry !== undefined && typeof preferEntry !== "boolean") {
-		throw new Error("Argument should be a boolean.\nFor more info on this plugin, see https://webpack.github.io/docs/list-of-plugins.html");
-	}
-	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.map(function(c) {
-					var sum = (c.isInitial() ? 1 : 0) + (c.entryModule === m ? 1 : 0);
-					return sum;
-				}).reduce(function(a, b) {
-					return a + b;
-				}, 0);
-			}
-
-			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 + m.chunks.filter(function(c) {
-					c.entryModule === m;
-				}).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.isInitial();
-				}).length;
-			}
-
-			function occurs(c) {
-				return c.blocks.length;
-			}
-			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;
-			});
-		});
-	});
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+function OccurrenceOrderPlugin(preferEntry) {
+	if(preferEntry !== undefined && typeof preferEntry !== "boolean") {
+		throw new Error("Argument should be a boolean.\nFor more info on this plugin, see https://webpack.github.io/docs/list-of-plugins.html");
+	}
+	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.map(function(c) {
+					var sum = (c.isInitial() ? 1 : 0) + (c.entryModule === m ? 1 : 0);
+					return sum;
+				}).reduce(function(a, b) {
+					return a + b;
+				}, 0);
+			}
+
+			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 + m.chunks.filter(function(c) {
+					c.entryModule === m;
+				}).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.isInitial();
+				}).length;
+			}
+
+			function occurs(c) {
+				return c.blocks.length;
+			}
+			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;
+			});
+		});
+	});
+};