webpack 4.15.0 → 4.16.2

package/lib/ChunkGroup.js

@@ -11,7 +11,6 @@ const compareLocations = require("./compareLocations");
 /** @typedef {import("./Module")} Module */
 /** @typedef {import("./ModuleReason")} ModuleReason */
 
-/** @typedef {{id: number}} HasId */
 /** @typedef {{module: Module, loc: TODO, request: string}} OriginRecord */
 /** @typedef {string|{name: string}} ChunkGroupOptions */
 
@@ -26,8 +25,8 @@ const getArray = set => Array.from(set);
 
 /**
  * A convenience method used to sort chunks based on their id's
- * @param {HasId} a first sorting comparator
- * @param {HasId} b second sorting comparator
+ * @param {ChunkGroup} a first sorting comparator
+ * @param {ChunkGroup} b second sorting comparator
  * @returns {1|0|-1} a sorting index to determine order
  */
 const sortById = (a, b) => {
@@ -63,6 +62,7 @@ class ChunkGroup {
 		/** @type {number} */
 		this.groupDebugId = debugId++;
 		this.options = options;
+		/** @type {SortableSet<ChunkGroup>} */
 		this._children = new SortableSet(undefined, sortById);
 		this._parents = new SortableSet(undefined, sortById);
 		this._blocks = new SortableSet();
@@ -442,7 +442,7 @@ class ChunkGroup {
 			list.sort((a, b) => {
 				const cmp = b.order - a.order;
 				if (cmp !== 0) return cmp;
-				// TOOD webpack 5 remove this check of compareTo
+				// TODO webpack 5 remove this check of compareTo
 				if (a.group.compareTo) {
 					return a.group.compareTo(b.group);
 				}

package/lib/ChunkRenderError.js

@@ -1,32 +1,32 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const WebpackError = require("./WebpackError");
-
-/** @typedef {import("./Chunk")} Chunk */
-
-class ChunkRenderError extends WebpackError {
-	/**
-	 * Create a new ChunkRenderError
-	 * @param {Chunk} chunk A chunk
-	 * @param {string} file Related file
-	 * @param {Error} error Original error
-	 */
-	constructor(chunk, file, error) {
-		super();
-
-		this.name = "ChunkRenderError";
-		this.error = error;
-		this.message = error.message;
-		this.details = error.stack;
-		this.file = file;
-		this.chunk = chunk;
-
-		Error.captureStackTrace(this, this.constructor);
-	}
-}
-
-module.exports = ChunkRenderError;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const WebpackError = require("./WebpackError");
+
+/** @typedef {import("./Chunk")} Chunk */
+
+class ChunkRenderError extends WebpackError {
+	/**
+	 * Create a new ChunkRenderError
+	 * @param {Chunk} chunk A chunk
+	 * @param {string} file Related file
+	 * @param {Error} error Original error
+	 */
+	constructor(chunk, file, error) {
+		super();
+
+		this.name = "ChunkRenderError";
+		this.error = error;
+		this.message = error.message;
+		this.details = error.stack;
+		this.file = file;
+		this.chunk = chunk;
+
+		Error.captureStackTrace(this, this.constructor);
+	}
+}
+
+module.exports = ChunkRenderError;

package/lib/CommentCompilationWarning.js

@@ -6,9 +6,9 @@
 
 const WebpackError = require("./WebpackError");
 
-/** @typedef {import("./Module.js")} Module */
+/** @typedef {import("./Module")} Module */
 
-/** @typedef {import("./Dependency.js").DependencyLocation} DependencyLocation */
+/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
 
 class CommentCompilationWarning extends WebpackError {
 	/**

package/lib/CompatibilityPlugin.js

@@ -1,70 +1,70 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const ConstDependency = require("./dependencies/ConstDependency");
-
-const NullFactory = require("./NullFactory");
-
-/** @typedef {import("./Compiler.js")} Compiler */
-
-class CompatibilityPlugin {
-	/**
-	 * Apply the plugin
-	 * @param {Compiler} compiler Webpack Compiler
-	 * @returns {void}
-	 */
-	apply(compiler) {
-		compiler.hooks.compilation.tap(
-			"CompatibilityPlugin",
-			(compilation, { normalModuleFactory }) => {
-				compilation.dependencyFactories.set(ConstDependency, new NullFactory());
-				compilation.dependencyTemplates.set(
-					ConstDependency,
-					new ConstDependency.Template()
-				);
-
-				normalModuleFactory.hooks.parser
-					.for("javascript/auto")
-					.tap("CompatibilityPlugin", (parser, parserOptions) => {
-						if (
-							typeof parserOptions.browserify !== "undefined" &&
-							!parserOptions.browserify
-						)
-							return;
-
-						parser.hooks.call
-							.for("require")
-							.tap("CompatibilityPlugin", expr => {
-								// support for browserify style require delegator: "require(o, !0)"
-								if (expr.arguments.length !== 2) return;
-								const second = parser.evaluateExpression(expr.arguments[1]);
-								if (!second.isBoolean()) return;
-								if (second.asBool() !== true) return;
-								const dep = new ConstDependency("require", expr.callee.range);
-								dep.loc = expr.loc;
-								if (parser.state.current.dependencies.length > 1) {
-									const last =
-										parser.state.current.dependencies[
-											parser.state.current.dependencies.length - 1
-										];
-									if (
-										last.critical &&
-										last.options &&
-										last.options.request === "." &&
-										last.userRequest === "." &&
-										last.options.recursive
-									)
-										parser.state.current.dependencies.pop();
-								}
-								parser.state.current.addDependency(dep);
-								return true;
-							});
-					});
-			}
-		);
-	}
-}
-module.exports = CompatibilityPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const ConstDependency = require("./dependencies/ConstDependency");
+
+const NullFactory = require("./NullFactory");
+
+/** @typedef {import("./Compiler")} Compiler */
+
+class CompatibilityPlugin {
+	/**
+	 * Apply the plugin
+	 * @param {Compiler} compiler Webpack Compiler
+	 * @returns {void}
+	 */
+	apply(compiler) {
+		compiler.hooks.compilation.tap(
+			"CompatibilityPlugin",
+			(compilation, { normalModuleFactory }) => {
+				compilation.dependencyFactories.set(ConstDependency, new NullFactory());
+				compilation.dependencyTemplates.set(
+					ConstDependency,
+					new ConstDependency.Template()
+				);
+
+				normalModuleFactory.hooks.parser
+					.for("javascript/auto")
+					.tap("CompatibilityPlugin", (parser, parserOptions) => {
+						if (
+							typeof parserOptions.browserify !== "undefined" &&
+							!parserOptions.browserify
+						)
+							return;
+
+						parser.hooks.call
+							.for("require")
+							.tap("CompatibilityPlugin", expr => {
+								// support for browserify style require delegator: "require(o, !0)"
+								if (expr.arguments.length !== 2) return;
+								const second = parser.evaluateExpression(expr.arguments[1]);
+								if (!second.isBoolean()) return;
+								if (second.asBool() !== true) return;
+								const dep = new ConstDependency("require", expr.callee.range);
+								dep.loc = expr.loc;
+								if (parser.state.current.dependencies.length > 1) {
+									const last =
+										parser.state.current.dependencies[
+											parser.state.current.dependencies.length - 1
+										];
+									if (
+										last.critical &&
+										last.options &&
+										last.options.request === "." &&
+										last.userRequest === "." &&
+										last.options.recursive
+									)
+										parser.state.current.dependencies.pop();
+								}
+								parser.state.current.addDependency(dep);
+								return true;
+							});
+					});
+			}
+		);
+	}
+}
+module.exports = CompatibilityPlugin;

package/lib/Compilation.js

@@ -26,7 +26,6 @@ const ChunkTemplate = require("./ChunkTemplate");
 const HotUpdateChunkTemplate = require("./HotUpdateChunkTemplate");
 const ModuleTemplate = require("./ModuleTemplate");
 const RuntimeTemplate = require("./RuntimeTemplate");
-const Dependency = require("./Dependency");
 const ChunkRenderError = require("./ChunkRenderError");
 const AsyncDependencyToInitialChunkError = require("./AsyncDependencyToInitialChunkError");
 const Stats = require("./Stats");
@@ -36,6 +35,7 @@ const Queue = require("./util/Queue");
 const SortableSet = require("./util/SortableSet");
 const GraphHelpers = require("./GraphHelpers");
 const ModuleDependency = require("./dependencies/ModuleDependency");
+const compareLocations = require("./compareLocations");
 
 /** @typedef {import("./Module")} Module */
 /** @typedef {import("./Compiler")} Compiler */
@@ -642,7 +642,7 @@ class Compilation extends Tapable {
 					war.dependencies = dependencies;
 					this.warnings.push(war);
 				}
-				module.dependencies.sort(Dependency.compare);
+				module.dependencies.sort((a, b) => compareLocations(a.loc, b.loc));
 				if (error) {
 					this.hooks.failedModule.call(module, error);
 					return callback(error);
@@ -888,6 +888,7 @@ class Compilation extends Tapable {
 				// leaking the Compilation object.
 
 				if (err) {
+					// eslint-disable-next-line no-self-assign
 					err.stack = err.stack;
 					return callback(err);
 				}
@@ -1292,6 +1293,9 @@ class Compilation extends Tapable {
 	 * @returns {void}
 	 */
 	sortModules(modules) {
+		// TODO webpack 5: this should only be enabled when `moduleIds: "natural"`
+		// TODO move it into a plugin (NaturalModuleIdsPlugin) and use this in WebpackOptionsApply
+		// TODO remove this method
 		modules.sort(byIndexOrIdentifier);
 	}
 
@@ -1453,7 +1457,7 @@ class Compilation extends Tapable {
 	 * @returns {DependencyReference} a reference for the dependency
 	 */
 	getDependencyReference(module, dependency) {
-		// TODO remove dep.getReference existance check in webpack 5
+		// TODO remove dep.getReference existence check in webpack 5
 		if (typeof dependency.getReference !== "function") return null;
 		const ref = dependency.getReference();
 		if (!ref) return null;
@@ -2113,7 +2117,7 @@ class Compilation extends Tapable {
 
 		/**
 		 * Used to sort errors and warnings in compilation. this.warnings, and
-		 * this.errors contribute to the compilation hash and therefore shoudl be
+		 * this.errors contribute to the compilation hash and therefore should be
 		 * updated whenever other references (having a chunk id) are sorted. This preserves the hash
 		 * integrity
 		 *
@@ -2438,21 +2442,48 @@ class Compilation extends Tapable {
 }
 
 // TODO remove in webpack 5
-Compilation.prototype.applyPlugins = util.deprecate(function(name, ...args) {
-	this.hooks[
-		name.replace(/[- ]([a-z])/g, match => match[1].toUpperCase())
-	].call(...args);
-}, "Compilation.applyPlugins is deprecated. Use new API on `.hooks` instead");
+Compilation.prototype.applyPlugins = util.deprecate(
+	/**
+	 * @deprecated
+	 * @param {string} name Name
+	 * @param {any[]} args Other arguments
+	 * @returns {void}
+	 * @this {Compilation}
+	 */
+	function(name, ...args) {
+		this.hooks[
+			name.replace(/[- ]([a-z])/g, match => match[1].toUpperCase())
+		].call(...args);
+	},
+	"Compilation.applyPlugins is deprecated. Use new API on `.hooks` instead"
+);
 
 // TODO remove in webpack 5
 Object.defineProperty(Compilation.prototype, "moduleTemplate", {
 	configurable: false,
-	get: util.deprecate(function() {
-		return this.moduleTemplates.javascript;
-	}, "Compilation.moduleTemplate: Use Compilation.moduleTemplates.javascript instead"),
-	set: util.deprecate(function(value) {
-		this.moduleTemplates.javascript = value;
-	}, "Compilation.moduleTemplate: Use Compilation.moduleTemplates.javascript instead.")
+	get: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {Compilation}
+		 * @returns {TODO} module template
+		 */
+		function() {
+			return this.moduleTemplates.javascript;
+		},
+		"Compilation.moduleTemplate: Use Compilation.moduleTemplates.javascript instead"
+	),
+	set: util.deprecate(
+		/**
+		 * @deprecated
+		 * @param {ModuleTemplate} value Template value
+		 * @this {Compilation}
+		 * @returns {void}
+		 */
+		function(value) {
+			this.moduleTemplates.javascript = value;
+		},
+		"Compilation.moduleTemplate: Use Compilation.moduleTemplates.javascript instead."
+	)
 });
 
 module.exports = Compilation;

package/lib/ConcurrentCompilationError.js

@@ -1,19 +1,19 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Maksim Nazarjev @acupofspirt
-*/
-"use strict";
-
-const WebpackError = require("./WebpackError");
-
-module.exports = class ConcurrentCompilationError extends WebpackError {
-	constructor() {
-		super();
-
-		this.name = "ConcurrentCompilationError";
-		this.message =
-			"You ran Webpack twice. Each instance only supports a single concurrent compilation at a time.";
-
-		Error.captureStackTrace(this, this.constructor);
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Maksim Nazarjev @acupofspirt
+*/
+"use strict";
+
+const WebpackError = require("./WebpackError");
+
+module.exports = class ConcurrentCompilationError extends WebpackError {
+	constructor() {
+		super();
+
+		this.name = "ConcurrentCompilationError";
+		this.message =
+			"You ran Webpack twice. Each instance only supports a single concurrent compilation at a time.";
+
+		Error.captureStackTrace(this, this.constructor);
+	}
+};