webpack 4.14.0 → 4.16.1

package/lib/dependencies/CommonJsRequireDependency.js

@@ -1,22 +1,22 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const ModuleDependency = require("./ModuleDependency");
-const ModuleDependencyTemplateAsId = require("./ModuleDependencyTemplateAsId");
-
-class CommonJsRequireDependency extends ModuleDependency {
-	constructor(request, range) {
-		super(request);
-		this.range = range;
-	}
-
-	get type() {
-		return "cjs require";
-	}
-}
-
-CommonJsRequireDependency.Template = ModuleDependencyTemplateAsId;
-
-module.exports = CommonJsRequireDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const ModuleDependency = require("./ModuleDependency");
+const ModuleDependencyTemplateAsId = require("./ModuleDependencyTemplateAsId");
+
+class CommonJsRequireDependency extends ModuleDependency {
+	constructor(request, range) {
+		super(request);
+		this.range = range;
+	}
+
+	get type() {
+		return "cjs require";
+	}
+}
+
+CommonJsRequireDependency.Template = ModuleDependencyTemplateAsId;
+
+module.exports = CommonJsRequireDependency;

package/lib/dependencies/CriticalDependencyWarning.js

@@ -1,20 +1,20 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const WebpackError = require("../WebpackError");
-
-class CriticalDependencyWarning extends WebpackError {
-	constructor(message) {
-		super();
-
-		this.name = "CriticalDependencyWarning";
-		this.message = "Critical dependency: " + message;
-
-		Error.captureStackTrace(this, this.constructor);
-	}
-}
-
-module.exports = CriticalDependencyWarning;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const WebpackError = require("../WebpackError");
+
+class CriticalDependencyWarning extends WebpackError {
+	constructor(message) {
+		super();
+
+		this.name = "CriticalDependencyWarning";
+		this.message = "Critical dependency: " + message;
+
+		Error.captureStackTrace(this, this.constructor);
+	}
+}
+
+module.exports = CriticalDependencyWarning;

package/lib/dependencies/DelegatedSourceDependency.js

@@ -1,18 +1,18 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const ModuleDependency = require("./ModuleDependency");
-
-class DelegatedSourceDependency extends ModuleDependency {
-	constructor(request) {
-		super(request);
-	}
-
-	get type() {
-		return "delegated source";
-	}
-}
-
-module.exports = DelegatedSourceDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const ModuleDependency = require("./ModuleDependency");
+
+class DelegatedSourceDependency extends ModuleDependency {
+	constructor(request) {
+		super(request);
+	}
+
+	get type() {
+		return "delegated source";
+	}
+}
+
+module.exports = DelegatedSourceDependency;

package/lib/dependencies/DllEntryDependency.js

@@ -1,20 +1,20 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const Dependency = require("../Dependency");
-
-class DllEntryDependency extends Dependency {
-	constructor(dependencies, name) {
-		super();
-		this.dependencies = dependencies;
-		this.name = name;
-	}
-
-	get type() {
-		return "dll entry";
-	}
-}
-
-module.exports = DllEntryDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const Dependency = require("../Dependency");
+
+class DllEntryDependency extends Dependency {
+	constructor(dependencies, name) {
+		super();
+		this.dependencies = dependencies;
+		this.name = name;
+	}
+
+	get type() {
+		return "dll entry";
+	}
+}
+
+module.exports = DllEntryDependency;

package/lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -244,7 +244,8 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 				return new DependencyReference(
 					mode.module,
 					Array.from(mode.map.values()),
-					false
+					false,
+					this.sourceOrder
 				);
 
 			case "dynamic-reexport":

package/lib/dependencies/LoaderDependency.js

@@ -6,6 +6,9 @@
 const ModuleDependency = require("./ModuleDependency");
 
 class LoaderDependency extends ModuleDependency {
+	/**
+	 * @param {string} request request string
+	 */
 	constructor(request) {
 		super(request);
 	}

package/lib/dependencies/LoaderPlugin.js

@@ -5,6 +5,17 @@
 "use strict";
 
 const LoaderDependency = require("./LoaderDependency");
+const NormalModule = require("../NormalModule");
+
+/** @typedef {import("../Module")} Module */
+
+/**
+ * @callback LoadModuleCallback
+ * @param {Error=} err error object
+ * @param {string=} source source code
+ * @param {object=} map source map
+ * @param {Module=} module loaded module if successful
+ */
 
 class LoaderPlugin {
 	apply(compiler) {
@@ -22,9 +33,16 @@ class LoaderPlugin {
 			compilation.hooks.normalModuleLoader.tap(
 				"LoaderPlugin",
 				(loaderContext, module) => {
+					/**
+					 * @param {string} request the request string to load the module from
+					 * @param {LoadModuleCallback} callback callback returning the loaded module or error
+					 * @returns {void}
+					 */
 					loaderContext.loadModule = (request, callback) => {
 						const dep = new LoaderDependency(request);
-						dep.loc = request;
+						dep.loc = {
+							name: request
+						};
 						const factory = compilation.dependencyFactories.get(
 							dep.constructor
 						);
@@ -57,7 +75,8 @@ class LoaderPlugin {
 									if (!dep.module) {
 										return callback(new Error("Cannot load the module"));
 									}
-									if (dep.module.error) {
+									// TODO consider removing this in webpack 5
+									if (dep.module instanceof NormalModule && dep.module.error) {
 										return callback(dep.module.error);
 									}
 									if (!dep.module._source) {

package/lib/dependencies/LocalModule.js

@@ -1,23 +1,23 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-class LocalModule {
-	constructor(module, name, idx) {
-		this.module = module;
-		this.name = name;
-		this.idx = idx;
-		this.used = false;
-	}
-
-	flagUsed() {
-		this.used = true;
-	}
-
-	variableName() {
-		return "__WEBPACK_LOCAL_MODULE_" + this.idx + "__";
-	}
-}
-module.exports = LocalModule;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+class LocalModule {
+	constructor(module, name, idx) {
+		this.module = module;
+		this.name = name;
+		this.idx = idx;
+		this.used = false;
+	}
+
+	flagUsed() {
+		this.used = true;
+	}
+
+	variableName() {
+		return "__WEBPACK_LOCAL_MODULE_" + this.idx + "__";
+	}
+}
+module.exports = LocalModule;

package/lib/dependencies/ModuleDependency.js

@@ -6,6 +6,9 @@
 const Dependency = require("../Dependency");
 
 class ModuleDependency extends Dependency {
+	/**
+	 * @param {string} request request path which needs resolving
+	 */
 	constructor(request) {
 		super();
 		this.request = request;

package/lib/dependencies/ModuleHotAcceptDependency.js

@@ -1,23 +1,23 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const ModuleDependency = require("./ModuleDependency");
-const ModuleDependencyTemplateAsId = require("./ModuleDependencyTemplateAsId");
-
-class ModuleHotAcceptDependency extends ModuleDependency {
-	constructor(request, range) {
-		super(request);
-		this.range = range;
-		this.weak = true;
-	}
-
-	get type() {
-		return "module.hot.accept";
-	}
-}
-
-ModuleHotAcceptDependency.Template = ModuleDependencyTemplateAsId;
-
-module.exports = ModuleHotAcceptDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const ModuleDependency = require("./ModuleDependency");
+const ModuleDependencyTemplateAsId = require("./ModuleDependencyTemplateAsId");
+
+class ModuleHotAcceptDependency extends ModuleDependency {
+	constructor(request, range) {
+		super(request);
+		this.range = range;
+		this.weak = true;
+	}
+
+	get type() {
+		return "module.hot.accept";
+	}
+}
+
+ModuleHotAcceptDependency.Template = ModuleDependencyTemplateAsId;
+
+module.exports = ModuleHotAcceptDependency;

package/lib/dependencies/ModuleHotDeclineDependency.js

@@ -1,23 +1,23 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const ModuleDependency = require("./ModuleDependency");
-const ModuleDependencyTemplateAsId = require("./ModuleDependencyTemplateAsId");
-
-class ModuleHotDeclineDependency extends ModuleDependency {
-	constructor(request, range) {
-		super(request);
-		this.range = range;
-		this.weak = true;
-	}
-
-	get type() {
-		return "module.hot.decline";
-	}
-}
-
-ModuleHotDeclineDependency.Template = ModuleDependencyTemplateAsId;
-
-module.exports = ModuleHotDeclineDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const ModuleDependency = require("./ModuleDependency");
+const ModuleDependencyTemplateAsId = require("./ModuleDependencyTemplateAsId");
+
+class ModuleHotDeclineDependency extends ModuleDependency {
+	constructor(request, range) {
+		super(request);
+		this.range = range;
+		this.weak = true;
+	}
+
+	get type() {
+		return "module.hot.decline";
+	}
+}
+
+ModuleHotDeclineDependency.Template = ModuleDependencyTemplateAsId;
+
+module.exports = ModuleHotDeclineDependency;

package/lib/dependencies/MultiEntryDependency.js

@@ -3,9 +3,14 @@
 	Author Tobias Koppers @sokra
 */
 "use strict";
+/** @typedef {import("./SingleEntryDependency")} SingleEntryDependency */
 const Dependency = require("../Dependency");
 
 class MultiEntryDependency extends Dependency {
+	/**
+	 * @param {SingleEntryDependency[]} dependencies an array of SingleEntryDependencies
+	 * @param {string} name entry name
+	 */
 	constructor(dependencies, name) {
 		super();
 		this.dependencies = dependencies;

package/lib/dependencies/PrefetchDependency.js

@@ -1,18 +1,18 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const ModuleDependency = require("./ModuleDependency");
-
-class PrefetchDependency extends ModuleDependency {
-	constructor(request) {
-		super(request);
-	}
-
-	get type() {
-		return "prefetch";
-	}
-}
-
-module.exports = PrefetchDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const ModuleDependency = require("./ModuleDependency");
+
+class PrefetchDependency extends ModuleDependency {
+	constructor(request) {
+		super(request);
+	}
+
+	get type() {
+		return "prefetch";
+	}
+}
+
+module.exports = PrefetchDependency;

package/lib/dependencies/RequireEnsureItemDependency.js

@@ -1,21 +1,21 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const ModuleDependency = require("./ModuleDependency");
-const NullDependency = require("./NullDependency");
-
-class RequireEnsureItemDependency extends ModuleDependency {
-	constructor(request) {
-		super(request);
-	}
-
-	get type() {
-		return "require.ensure item";
-	}
-}
-
-RequireEnsureItemDependency.Template = NullDependency.Template;
-
-module.exports = RequireEnsureItemDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const ModuleDependency = require("./ModuleDependency");
+const NullDependency = require("./NullDependency");
+
+class RequireEnsureItemDependency extends ModuleDependency {
+	constructor(request) {
+		super(request);
+	}
+
+	get type() {
+		return "require.ensure item";
+	}
+}
+
+RequireEnsureItemDependency.Template = NullDependency.Template;
+
+module.exports = RequireEnsureItemDependency;

package/lib/dependencies/RequireResolveDependency.js

@@ -1,22 +1,22 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const ModuleDependency = require("./ModuleDependency");
-const ModuleDependencyAsId = require("./ModuleDependencyTemplateAsId");
-
-class RequireResolveDependency extends ModuleDependency {
-	constructor(request, range) {
-		super(request);
-		this.range = range;
-	}
-
-	get type() {
-		return "require.resolve";
-	}
-}
-
-RequireResolveDependency.Template = ModuleDependencyAsId;
-
-module.exports = RequireResolveDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const ModuleDependency = require("./ModuleDependency");
+const ModuleDependencyAsId = require("./ModuleDependencyTemplateAsId");
+
+class RequireResolveDependency extends ModuleDependency {
+	constructor(request, range) {
+		super(request);
+		this.range = range;
+	}
+
+	get type() {
+		return "require.resolve";
+	}
+}
+
+RequireResolveDependency.Template = ModuleDependencyAsId;
+
+module.exports = RequireResolveDependency;

package/lib/dependencies/SingleEntryDependency.js

@@ -6,6 +6,9 @@
 const ModuleDependency = require("./ModuleDependency");
 
 class SingleEntryDependency extends ModuleDependency {
+	/**
+	 * @param {string} request request path for entry
+	 */
 	constructor(request) {
 		super(request);
 	}

package/lib/dependencies/SystemPlugin.js

@@ -72,7 +72,7 @@ class SystemPlugin {
 					parser.hooks.expression.for("System").tap("SystemPlugin", () => {
 						const systemPolyfillRequire = ParserHelpers.requireFileAsExpression(
 							parser.state.module.context,
-							require.resolve("../../buildin/system.js")
+							require.resolve("../../buildin/system")
 						);
 						return ParserHelpers.addParsedVariableToModule(
 							parser,

package/lib/formatLocation.js

@@ -5,57 +5,71 @@
 
 "use strict";
 
+/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
+/** @typedef {import("./Dependency").SourcePosition} SourcePosition */
+
+// TODO webpack 5: pos must be SourcePosition
+/**
+ * @param {SourcePosition|DependencyLocation|string} pos position
+ * @returns {string} formatted position
+ */
 const formatPosition = pos => {
 	if (pos === null) return "";
-	const typeOfPos = typeof pos;
-	switch (typeOfPos) {
-		case "string":
-			return pos;
-		case "number":
-			return `${pos}`;
-		case "object":
-			if (typeof pos.line === "number" && typeof pos.column === "number") {
-				return `${pos.line}:${pos.column}`;
-			} else if (typeof pos.line === "number") {
-				return `${pos.line}:?`;
-			} else if (typeof pos.index === "number") {
-				return `+${pos.index}`;
-			} else {
-				return "";
-			}
-		default:
+	// TODO webpack 5: Simplify this
+	if (typeof pos === "string") return pos;
+	if (typeof pos === "number") return `${pos}`;
+	if (typeof pos === "object") {
+		if ("line" in pos && "column" in pos) {
+			return `${pos.line}:${pos.column}`;
+		} else if ("line" in pos) {
+			return `${pos.line}:?`;
+		} else if ("index" in pos) {
+			// TODO webpack 5 remove this case
+			return `+${pos.index}`;
+		} else {
 			return "";
+		}
 	}
+	return "";
 };
 
+// TODO webpack 5: loc must be DependencyLocation
+/**
+ * @param {DependencyLocation|SourcePosition|string} loc location
+ * @returns {string} formatted location
+ */
 const formatLocation = loc => {
 	if (loc === null) return "";
-	const typeOfLoc = typeof loc;
-	switch (typeOfLoc) {
-		case "string":
-			return loc;
-		case "number":
-			return `${loc}`;
-		case "object":
-			if (loc.start && loc.end) {
-				if (
-					typeof loc.start.line === "number" &&
-					typeof loc.end.line === "number" &&
-					typeof loc.end.column === "number" &&
-					loc.start.line === loc.end.line
-				) {
-					return `${formatPosition(loc.start)}-${loc.end.column}`;
-				} else {
-					return `${formatPosition(loc.start)}-${formatPosition(loc.end)}`;
-				}
-			}
-			if (loc.start) {
-				return formatPosition(loc.start);
+	// TODO webpack 5: Simplify this
+	if (typeof loc === "string") return loc;
+	if (typeof loc === "number") return `${loc}`;
+	if (typeof loc === "object") {
+		if ("start" in loc && loc.start && "end" in loc && loc.end) {
+			if (
+				typeof loc.start === "object" &&
+				typeof loc.start.line === "number" &&
+				typeof loc.end === "object" &&
+				typeof loc.end.line === "number" &&
+				typeof loc.end.column === "number" &&
+				loc.start.line === loc.end.line
+			) {
+				return `${formatPosition(loc.start)}-${loc.end.column}`;
+			} else {
+				return `${formatPosition(loc.start)}-${formatPosition(loc.end)}`;
 			}
-			return formatPosition(loc);
-		default:
-			return "";
+		}
+		if ("start" in loc && loc.start) {
+			return formatPosition(loc.start);
+		}
+		if ("name" in loc && "index" in loc) {
+			return `${loc.name}[${loc.index}]`;
+		}
+		if ("name" in loc) {
+			return loc.name;
+		}
+		return formatPosition(loc);
 	}
+	return "";
 };
 
 module.exports = formatLocation;