webpack 4.15.0 → 4.16.2

package/lib/util/identifier.js

@@ -1,103 +1,103 @@
-"use strict";
-const path = require("path");
-
-/**
- * @typedef {Object} MakeRelativePathsCache
- * @property {Map<string, Map<string, string>>=} relativePaths
- */
-
-/**
- *
- * @param {string} maybeAbsolutePath path to check
- * @returns {boolean} returns true if path is "Absolute Path"-like
- */
-const looksLikeAbsolutePath = maybeAbsolutePath => {
-	if (/^\/.*\/$/.test(maybeAbsolutePath)) {
-		// this 'path' is actually a regexp generated by dynamic requires.
-		// Don't treat it as an absolute path.
-		return false;
-	}
-	return /^(?:[a-z]:\\|\/)/i.test(maybeAbsolutePath);
-};
-
-/**
- *
- * @param {string} p path to normalize
- * @returns {string} normalized version of path
- */
-const normalizePathSeparator = p => p.replace(/\\/g, "/");
-
-/**
- *
- * @param {string} context context for relative path
- * @param {string} identifier identifier for path
- * @returns {string} a converted relative path
- */
-const _makePathsRelative = (context, identifier) => {
-	return identifier
-		.split(/([|! ])/)
-		.map(
-			str =>
-				looksLikeAbsolutePath(str)
-					? normalizePathSeparator(path.relative(context, str))
-					: str
-		)
-		.join("");
-};
-
-/**
- *
- * @param {string} context context used to create relative path
- * @param {string} identifier identifier used to create relative path
- * @param {MakeRelativePathsCache=} cache the cache object being set
- * @returns {string} the returned relative path
- */
-exports.makePathsRelative = (context, identifier, cache) => {
-	if (!cache) return _makePathsRelative(context, identifier);
-
-	const relativePaths =
-		cache.relativePaths || (cache.relativePaths = new Map());
-
-	let cachedResult;
-	let contextCache = relativePaths.get(context);
-	if (typeof contextCache === "undefined") {
-		relativePaths.set(context, (contextCache = new Map()));
-	} else {
-		cachedResult = contextCache.get(identifier);
-	}
-
-	if (typeof cachedResult !== "undefined") {
-		return cachedResult;
-	} else {
-		const relativePath = _makePathsRelative(context, identifier);
-		contextCache.set(identifier, relativePath);
-		return relativePath;
-	}
-};
-
-/**
- * @param {string} context absolute context path
- * @param {string} request any request string may containing absolute paths, query string, etc.
- * @returns {string} a new request string avoiding absolute paths when possible
- */
-exports.contextify = (context, request) => {
-	return request
-		.split("!")
-		.map(r => {
-			const splitPath = r.split("?", 2);
-			if (/^[a-zA-Z]:\\/.test(splitPath[0])) {
-				splitPath[0] = path.win32.relative(context, splitPath[0]);
-				if (!/^[a-zA-Z]:\\/.test(splitPath[0])) {
-					splitPath[0] = splitPath[0].replace(/\\/g, "/");
-				}
-			}
-			if (/^\//.test(splitPath[0])) {
-				splitPath[0] = path.posix.relative(context, splitPath[0]);
-			}
-			if (!/^(\.\.\/|\/|[a-zA-Z]:\\)/.test(splitPath[0])) {
-				splitPath[0] = "./" + splitPath[0];
-			}
-			return splitPath.join("?");
-		})
-		.join("!");
-};
+"use strict";
+const path = require("path");
+
+/**
+ * @typedef {Object} MakeRelativePathsCache
+ * @property {Map<string, Map<string, string>>=} relativePaths
+ */
+
+/**
+ *
+ * @param {string} maybeAbsolutePath path to check
+ * @returns {boolean} returns true if path is "Absolute Path"-like
+ */
+const looksLikeAbsolutePath = maybeAbsolutePath => {
+	if (/^\/.*\/$/.test(maybeAbsolutePath)) {
+		// this 'path' is actually a regexp generated by dynamic requires.
+		// Don't treat it as an absolute path.
+		return false;
+	}
+	return /^(?:[a-z]:\\|\/)/i.test(maybeAbsolutePath);
+};
+
+/**
+ *
+ * @param {string} p path to normalize
+ * @returns {string} normalized version of path
+ */
+const normalizePathSeparator = p => p.replace(/\\/g, "/");
+
+/**
+ *
+ * @param {string} context context for relative path
+ * @param {string} identifier identifier for path
+ * @returns {string} a converted relative path
+ */
+const _makePathsRelative = (context, identifier) => {
+	return identifier
+		.split(/([|! ])/)
+		.map(
+			str =>
+				looksLikeAbsolutePath(str)
+					? normalizePathSeparator(path.relative(context, str))
+					: str
+		)
+		.join("");
+};
+
+/**
+ *
+ * @param {string} context context used to create relative path
+ * @param {string} identifier identifier used to create relative path
+ * @param {MakeRelativePathsCache=} cache the cache object being set
+ * @returns {string} the returned relative path
+ */
+exports.makePathsRelative = (context, identifier, cache) => {
+	if (!cache) return _makePathsRelative(context, identifier);
+
+	const relativePaths =
+		cache.relativePaths || (cache.relativePaths = new Map());
+
+	let cachedResult;
+	let contextCache = relativePaths.get(context);
+	if (typeof contextCache === "undefined") {
+		relativePaths.set(context, (contextCache = new Map()));
+	} else {
+		cachedResult = contextCache.get(identifier);
+	}
+
+	if (typeof cachedResult !== "undefined") {
+		return cachedResult;
+	} else {
+		const relativePath = _makePathsRelative(context, identifier);
+		contextCache.set(identifier, relativePath);
+		return relativePath;
+	}
+};
+
+/**
+ * @param {string} context absolute context path
+ * @param {string} request any request string may containing absolute paths, query string, etc.
+ * @returns {string} a new request string avoiding absolute paths when possible
+ */
+exports.contextify = (context, request) => {
+	return request
+		.split("!")
+		.map(r => {
+			const splitPath = r.split("?", 2);
+			if (/^[a-zA-Z]:\\/.test(splitPath[0])) {
+				splitPath[0] = path.win32.relative(context, splitPath[0]);
+				if (!/^[a-zA-Z]:\\/.test(splitPath[0])) {
+					splitPath[0] = splitPath[0].replace(/\\/g, "/");
+				}
+			}
+			if (/^\//.test(splitPath[0])) {
+				splitPath[0] = path.posix.relative(context, splitPath[0]);
+			}
+			if (!/^(\.\.\/|\/|[a-zA-Z]:\\)/.test(splitPath[0])) {
+				splitPath[0] = "./" + splitPath[0];
+			}
+			return splitPath.join("?");
+		})
+		.join("!");
+};

package/lib/util/objectToMap.js

@@ -1,16 +1,16 @@
-/**
- * convert an object into its 2D array equivalent to be turned
- * into an ES6 map
- *
- * @param {object} obj - any object type that works with Object.keys()
- * @returns {Map<TODO, TODO>} an ES6 Map of KV pairs
- */
-module.exports = function objectToMap(obj) {
-	return new Map(
-		Object.keys(obj).map(key => {
-			/** @type {[string, string]} */
-			const pair = [key, obj[key]];
-			return pair;
-		})
-	);
-};
+/**
+ * convert an object into its 2D array equivalent to be turned
+ * into an ES6 map
+ *
+ * @param {object} obj - any object type that works with Object.keys()
+ * @returns {Map<TODO, TODO>} an ES6 Map of KV pairs
+ */
+module.exports = function objectToMap(obj) {
+	return new Map(
+		Object.keys(obj).map(key => {
+			/** @type {[string, string]} */
+			const pair = [key, obj[key]];
+			return pair;
+		})
+	);
+};

package/lib/validateSchema.js

@@ -1,67 +1,67 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Gajus Kuizinas @gajus
-*/
-"use strict";
-
-const Ajv = require("ajv");
-const ajv = new Ajv({
-	errorDataPath: "configuration",
-	allErrors: true,
-	verbose: true
-});
-require("ajv-keywords")(ajv, ["instanceof"]);
-require("../schemas/ajv.absolutePath")(ajv);
-
-const validateSchema = (schema, options) => {
-	if (Array.isArray(options)) {
-		const errors = options.map(options => validateObject(schema, options));
-		errors.forEach((list, idx) => {
-			const applyPrefix = err => {
-				err.dataPath = `[${idx}]${err.dataPath}`;
-				if (err.children) {
-					err.children.forEach(applyPrefix);
-				}
-			};
-			list.forEach(applyPrefix);
-		});
-		return errors.reduce((arr, items) => {
-			return arr.concat(items);
-		}, []);
-	} else {
-		return validateObject(schema, options);
-	}
-};
-
-const validateObject = (schema, options) => {
-	const validate = ajv.compile(schema);
-	const valid = validate(options);
-	return valid ? [] : filterErrors(validate.errors);
-};
-
-const filterErrors = errors => {
-	let newErrors = [];
-	for (const err of errors) {
-		const dataPath = err.dataPath;
-		let children = [];
-		newErrors = newErrors.filter(oldError => {
-			if (oldError.dataPath.includes(dataPath)) {
-				if (oldError.children) {
-					children = children.concat(oldError.children.slice(0));
-				}
-				oldError.children = undefined;
-				children.push(oldError);
-				return false;
-			}
-			return true;
-		});
-		if (children.length) {
-			err.children = children;
-		}
-		newErrors.push(err);
-	}
-
-	return newErrors;
-};
-
-module.exports = validateSchema;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Gajus Kuizinas @gajus
+*/
+"use strict";
+
+const Ajv = require("ajv");
+const ajv = new Ajv({
+	errorDataPath: "configuration",
+	allErrors: true,
+	verbose: true
+});
+require("ajv-keywords")(ajv, ["instanceof"]);
+require("../schemas/ajv.absolutePath")(ajv);
+
+const validateSchema = (schema, options) => {
+	if (Array.isArray(options)) {
+		const errors = options.map(options => validateObject(schema, options));
+		errors.forEach((list, idx) => {
+			const applyPrefix = err => {
+				err.dataPath = `[${idx}]${err.dataPath}`;
+				if (err.children) {
+					err.children.forEach(applyPrefix);
+				}
+			};
+			list.forEach(applyPrefix);
+		});
+		return errors.reduce((arr, items) => {
+			return arr.concat(items);
+		}, []);
+	} else {
+		return validateObject(schema, options);
+	}
+};
+
+const validateObject = (schema, options) => {
+	const validate = ajv.compile(schema);
+	const valid = validate(options);
+	return valid ? [] : filterErrors(validate.errors);
+};
+
+const filterErrors = errors => {
+	let newErrors = [];
+	for (const err of errors) {
+		const dataPath = err.dataPath;
+		let children = [];
+		newErrors = newErrors.filter(oldError => {
+			if (oldError.dataPath.includes(dataPath)) {
+				if (oldError.children) {
+					children = children.concat(oldError.children.slice(0));
+				}
+				oldError.children = undefined;
+				children.push(oldError);
+				return false;
+			}
+			return true;
+		});
+		if (children.length) {
+			err.children = children;
+		}
+		newErrors.push(err);
+	}
+
+	return newErrors;
+};
+
+module.exports = validateSchema;

package/lib/wasm/UnsupportedWebAssemblyFeatureError.js

@@ -1,17 +1,17 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-*/
-"use strict";
-
-const WebpackError = require("../WebpackError");
-
-module.exports = class UnsupportedWebAssemblyFeatureError extends WebpackError {
-	/** @param {string} message Error message */
-	constructor(message) {
-		super(message);
-		this.name = "UnsupportedWebAssemblyFeatureError";
-		this.hideStack = true;
-
-		Error.captureStackTrace(this, this.constructor);
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+*/
+"use strict";
+
+const WebpackError = require("../WebpackError");
+
+module.exports = class UnsupportedWebAssemblyFeatureError extends WebpackError {
+	/** @param {string} message Error message */
+	constructor(message) {
+		super(message);
+		this.name = "UnsupportedWebAssemblyFeatureError";
+		this.hideStack = true;
+
+		Error.captureStackTrace(this, this.constructor);
+	}
+};

package/lib/wasm/WasmFinalizeExportsPlugin.js

@@ -4,7 +4,7 @@
 	*/
 "use strict";
 
-const UnsupportedWebAssemblyFeatureError = require("../wasm/UnsupportedWebAssemblyFeatureError");
+const UnsupportedWebAssemblyFeatureError = require("./UnsupportedWebAssemblyFeatureError");
 
 class WasmFinalizeExportsPlugin {
 	apply(compiler) {

package/lib/wasm/WebAssemblyGenerator.js

@@ -21,6 +21,10 @@ const WebAssemblyExportImportedDependency = require("../dependencies/WebAssembly
 
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("./WebAssemblyUtils").UsedWasmDependency} UsedWasmDependency */
+/** @typedef {import("../NormalModule")} NormalModule */
+/** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
+/** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("../Dependency").DependencyTemplate} DependencyTemplate */
 
 /**
  * @typedef {(ArrayBuffer) => ArrayBuffer} ArrayBufferTransform
@@ -366,7 +370,14 @@ class WebAssemblyGenerator extends Generator {
 		this.options = options;
 	}
 
-	generate(module) {
+	/**
+	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {Map<Function, DependencyTemplate>} dependencyTemplates mapping from dependencies to templates
+	 * @param {RuntimeTemplate} runtimeTemplate the runtime template
+	 * @param {string} type which kind of code should be generated
+	 * @returns {Source} generated code
+	 */
+	generate(module, dependencyTemplates, runtimeTemplate, type) {
 		let bin = module.originalSource().source();
 		bin = preprocess(bin);
 
@@ -398,7 +409,10 @@ class WebAssemblyGenerator extends Generator {
 		const externalExports = new Set(
 			module.dependencies
 				.filter(d => d instanceof WebAssemblyExportImportedDependency)
-				.map(d => d.exportName)
+				.map(d => {
+					const wasmDep = /** @type {WebAssemblyExportImportedDependency} */ (d);
+					return wasmDep.exportName;
+				})
 		);
 
 		/** @type {t.Instruction[]} */