webpack 4.15.0 → 4.16.2

package/lib/dependencies/SystemPlugin.js

@@ -1,125 +1,125 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const ParserHelpers = require("../ParserHelpers");
-const WebpackError = require("../WebpackError");
-
-class SystemPlugin {
-	constructor(options) {
-		this.options = options;
-	}
-
-	apply(compiler) {
-		compiler.hooks.compilation.tap(
-			"SystemPlugin",
-			(compilation, { normalModuleFactory }) => {
-				const handler = (parser, parserOptions) => {
-					if (
-						typeof parserOptions.system !== "undefined" &&
-						!parserOptions.system
-					)
-						return;
-
-					const shouldWarn = typeof parserOptions.system === "undefined";
-
-					const setNotSupported = name => {
-						parser.hooks.evaluateTypeof
-							.for(name)
-							.tap("SystemPlugin", ParserHelpers.evaluateToString("undefined"));
-						parser.hooks.expression
-							.for(name)
-							.tap(
-								"SystemPlugin",
-								ParserHelpers.expressionIsUnsupported(
-									parser,
-									name + " is not supported by webpack."
-								)
-							);
-					};
-
-					parser.hooks.typeof
-						.for("System.import")
-						.tap(
-							"SystemPlugin",
-							ParserHelpers.toConstantDependency(
-								parser,
-								JSON.stringify("function")
-							)
-						);
-					parser.hooks.evaluateTypeof
-						.for("System.import")
-						.tap("SystemPlugin", ParserHelpers.evaluateToString("function"));
-					parser.hooks.typeof
-						.for("System")
-						.tap(
-							"SystemPlugin",
-							ParserHelpers.toConstantDependency(
-								parser,
-								JSON.stringify("object")
-							)
-						);
-					parser.hooks.evaluateTypeof
-						.for("System")
-						.tap("SystemPlugin", ParserHelpers.evaluateToString("object"));
-
-					setNotSupported("System.set");
-					setNotSupported("System.get");
-					setNotSupported("System.register");
-
-					parser.hooks.expression.for("System").tap("SystemPlugin", () => {
-						const systemPolyfillRequire = ParserHelpers.requireFileAsExpression(
-							parser.state.module.context,
-							require.resolve("../../buildin/system.js")
-						);
-						return ParserHelpers.addParsedVariableToModule(
-							parser,
-							"System",
-							systemPolyfillRequire
-						);
-					});
-
-					parser.hooks.call.for("System.import").tap("SystemPlugin", expr => {
-						if (shouldWarn) {
-							parser.state.module.warnings.push(
-								new SystemImportDeprecationWarning(
-									parser.state.module,
-									expr.loc
-								)
-							);
-						}
-
-						return parser.hooks.importCall.call(expr);
-					});
-				};
-
-				normalModuleFactory.hooks.parser
-					.for("javascript/auto")
-					.tap("SystemPlugin", handler);
-				normalModuleFactory.hooks.parser
-					.for("javascript/dynamic")
-					.tap("SystemPlugin", handler);
-			}
-		);
-	}
-}
-
-class SystemImportDeprecationWarning extends WebpackError {
-	constructor(module, loc) {
-		super(
-			"System.import() is deprecated and will be removed soon. Use import() instead.\n" +
-				"For more info visit https://webpack.js.org/guides/code-splitting/"
-		);
-
-		this.name = "SystemImportDeprecationWarning";
-
-		this.module = module;
-		this.loc = loc;
-
-		Error.captureStackTrace(this, this.constructor);
-	}
-}
-
-module.exports = SystemPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const ParserHelpers = require("../ParserHelpers");
+const WebpackError = require("../WebpackError");
+
+class SystemPlugin {
+	constructor(options) {
+		this.options = options;
+	}
+
+	apply(compiler) {
+		compiler.hooks.compilation.tap(
+			"SystemPlugin",
+			(compilation, { normalModuleFactory }) => {
+				const handler = (parser, parserOptions) => {
+					if (
+						typeof parserOptions.system !== "undefined" &&
+						!parserOptions.system
+					)
+						return;
+
+					const shouldWarn = typeof parserOptions.system === "undefined";
+
+					const setNotSupported = name => {
+						parser.hooks.evaluateTypeof
+							.for(name)
+							.tap("SystemPlugin", ParserHelpers.evaluateToString("undefined"));
+						parser.hooks.expression
+							.for(name)
+							.tap(
+								"SystemPlugin",
+								ParserHelpers.expressionIsUnsupported(
+									parser,
+									name + " is not supported by webpack."
+								)
+							);
+					};
+
+					parser.hooks.typeof
+						.for("System.import")
+						.tap(
+							"SystemPlugin",
+							ParserHelpers.toConstantDependency(
+								parser,
+								JSON.stringify("function")
+							)
+						);
+					parser.hooks.evaluateTypeof
+						.for("System.import")
+						.tap("SystemPlugin", ParserHelpers.evaluateToString("function"));
+					parser.hooks.typeof
+						.for("System")
+						.tap(
+							"SystemPlugin",
+							ParserHelpers.toConstantDependency(
+								parser,
+								JSON.stringify("object")
+							)
+						);
+					parser.hooks.evaluateTypeof
+						.for("System")
+						.tap("SystemPlugin", ParserHelpers.evaluateToString("object"));
+
+					setNotSupported("System.set");
+					setNotSupported("System.get");
+					setNotSupported("System.register");
+
+					parser.hooks.expression.for("System").tap("SystemPlugin", () => {
+						const systemPolyfillRequire = ParserHelpers.requireFileAsExpression(
+							parser.state.module.context,
+							require.resolve("../../buildin/system")
+						);
+						return ParserHelpers.addParsedVariableToModule(
+							parser,
+							"System",
+							systemPolyfillRequire
+						);
+					});
+
+					parser.hooks.call.for("System.import").tap("SystemPlugin", expr => {
+						if (shouldWarn) {
+							parser.state.module.warnings.push(
+								new SystemImportDeprecationWarning(
+									parser.state.module,
+									expr.loc
+								)
+							);
+						}
+
+						return parser.hooks.importCall.call(expr);
+					});
+				};
+
+				normalModuleFactory.hooks.parser
+					.for("javascript/auto")
+					.tap("SystemPlugin", handler);
+				normalModuleFactory.hooks.parser
+					.for("javascript/dynamic")
+					.tap("SystemPlugin", handler);
+			}
+		);
+	}
+}
+
+class SystemImportDeprecationWarning extends WebpackError {
+	constructor(module, loc) {
+		super(
+			"System.import() is deprecated and will be removed soon. Use import() instead.\n" +
+				"For more info visit https://webpack.js.org/guides/code-splitting/"
+		);
+
+		this.name = "SystemImportDeprecationWarning";
+
+		this.module = module;
+		this.loc = loc;
+
+		Error.captureStackTrace(this, this.constructor);
+	}
+}
+
+module.exports = SystemPlugin;

package/lib/dependencies/UnsupportedDependency.js

@@ -1,27 +1,27 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const NullDependency = require("./NullDependency");
-const webpackMissingModule = require("./WebpackMissingModule").module;
-
-class UnsupportedDependency extends NullDependency {
-	constructor(request, range) {
-		super();
-		this.request = request;
-		this.range = range;
-	}
-}
-
-UnsupportedDependency.Template = class UnsupportedDependencyTemplate {
-	apply(dep, source, runtime) {
-		source.replace(
-			dep.range[0],
-			dep.range[1],
-			webpackMissingModule(dep.request)
-		);
-	}
-};
-
-module.exports = UnsupportedDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const NullDependency = require("./NullDependency");
+const webpackMissingModule = require("./WebpackMissingModule").module;
+
+class UnsupportedDependency extends NullDependency {
+	constructor(request, range) {
+		super();
+		this.request = request;
+		this.range = range;
+	}
+}
+
+UnsupportedDependency.Template = class UnsupportedDependencyTemplate {
+	apply(dep, source, runtime) {
+		source.replace(
+			dep.range[0],
+			dep.range[1],
+			webpackMissingModule(dep.request)
+		);
+	}
+};
+
+module.exports = UnsupportedDependency;

package/lib/dependencies/WebAssemblyExportImportedDependency.js

@@ -1,29 +1,29 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const DependencyReference = require("./DependencyReference");
-const ModuleDependency = require("./ModuleDependency");
-
-class WebAssemblyExportImportedDependency extends ModuleDependency {
-	constructor(exportName, request, name) {
-		super(request);
-		/** @type {string} */
-		this.exportName = exportName;
-		/** @type {string} */
-		this.name = name;
-	}
-
-	getReference() {
-		if (!this.module) return null;
-		return new DependencyReference(this.module, [this.name], false);
-	}
-
-	get type() {
-		return "wasm export import";
-	}
-}
-
-module.exports = WebAssemblyExportImportedDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const DependencyReference = require("./DependencyReference");
+const ModuleDependency = require("./ModuleDependency");
+
+class WebAssemblyExportImportedDependency extends ModuleDependency {
+	constructor(exportName, request, name) {
+		super(request);
+		/** @type {string} */
+		this.exportName = exportName;
+		/** @type {string} */
+		this.name = name;
+	}
+
+	getReference() {
+		if (!this.module) return null;
+		return new DependencyReference(this.module, [this.name], false);
+	}
+
+	get type() {
+		return "wasm export import";
+	}
+}
+
+module.exports = WebAssemblyExportImportedDependency;

package/lib/dependencies/WebAssemblyImportDependency.js

@@ -1,48 +1,48 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const DependencyReference = require("./DependencyReference");
-const ModuleDependency = require("./ModuleDependency");
-const UnsupportedWebAssemblyFeatureError = require("../wasm/UnsupportedWebAssemblyFeatureError");
-
-class WebAssemblyImportDependency extends ModuleDependency {
-	constructor(request, name, description, onlyDirectImport) {
-		super(request);
-		/** @type {string} */
-		this.name = name;
-		/** @type {TODO} */
-		this.description = description;
-		/** @type {false | string} */
-		this.onlyDirectImport = onlyDirectImport;
-	}
-
-	getReference() {
-		if (!this.module) return null;
-		return new DependencyReference(this.module, [this.name], false);
-	}
-
-	getErrors() {
-		if (
-			this.onlyDirectImport &&
-			this.module &&
-			!this.module.type.startsWith("webassembly")
-		) {
-			return [
-				new UnsupportedWebAssemblyFeatureError(
-					`Import "${this.name}" from "${this.request}" with ${
-						this.onlyDirectImport
-					} can only be used for direct wasm to wasm dependencies`
-				)
-			];
-		}
-	}
-
-	get type() {
-		return "wasm import";
-	}
-}
-
-module.exports = WebAssemblyImportDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const DependencyReference = require("./DependencyReference");
+const ModuleDependency = require("./ModuleDependency");
+const UnsupportedWebAssemblyFeatureError = require("../wasm/UnsupportedWebAssemblyFeatureError");
+
+class WebAssemblyImportDependency extends ModuleDependency {
+	constructor(request, name, description, onlyDirectImport) {
+		super(request);
+		/** @type {string} */
+		this.name = name;
+		/** @type {TODO} */
+		this.description = description;
+		/** @type {false | string} */
+		this.onlyDirectImport = onlyDirectImport;
+	}
+
+	getReference() {
+		if (!this.module) return null;
+		return new DependencyReference(this.module, [this.name], false);
+	}
+
+	getErrors() {
+		if (
+			this.onlyDirectImport &&
+			this.module &&
+			!this.module.type.startsWith("webassembly")
+		) {
+			return [
+				new UnsupportedWebAssemblyFeatureError(
+					`Import "${this.name}" from "${this.request}" with ${
+						this.onlyDirectImport
+					} can only be used for direct wasm to wasm dependencies`
+				)
+			];
+		}
+	}
+
+	get type() {
+		return "wasm import";
+	}
+}
+
+module.exports = WebAssemblyImportDependency;

package/lib/dependencies/WebpackMissingModule.js

@@ -1,20 +1,20 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const toErrorCode = err =>
-	`var e = new Error(${JSON.stringify(err)}); e.code = 'MODULE_NOT_FOUND';`;
-
-exports.module = request =>
-	`!(function webpackMissingModule() { ${exports.moduleCode(request)} }())`;
-
-exports.promise = request => {
-	const errorCode = toErrorCode(`Cannot find module '${request}'`);
-	return `Promise.reject(function webpackMissingModule() { ${errorCode} return e; }())`;
-};
-
-exports.moduleCode = request => {
-	const errorCode = toErrorCode(`Cannot find module '${request}'`);
-	return `${errorCode} throw e;`;
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const toErrorCode = err =>
+	`var e = new Error(${JSON.stringify(err)}); e.code = 'MODULE_NOT_FOUND';`;
+
+exports.module = request =>
+	`!(function webpackMissingModule() { ${exports.moduleCode(request)} }())`;
+
+exports.promise = request => {
+	const errorCode = toErrorCode(`Cannot find module '${request}'`);
+	return `Promise.reject(function webpackMissingModule() { ${errorCode} return e; }())`;
+};
+
+exports.moduleCode = request => {
+	const errorCode = toErrorCode(`Cannot find module '${request}'`);
+	return `${errorCode} throw e;`;
+};

package/lib/formatLocation.js

@@ -1,61 +1,75 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-
-"use strict";
-
-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:
-			return "";
-	}
-};
-
-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);
-			}
-			return formatPosition(loc);
-		default:
-			return "";
-	}
-};
-
-module.exports = formatLocation;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"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 "";
+	// 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 "";
+	// 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)}`;
+			}
+		}
+		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;