webpack 4.1.0 → 4.4.0

package/lib/ModuleBuildError.js

@@ -1,42 +1,42 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const WebpackError = require("./WebpackError");
-const cutOffLoaderExecution = require("./ErrorHelpers").cutOffLoaderExecution;
-
-class ModuleBuildError extends WebpackError {
-	constructor(module, err) {
-		super();
-
-		this.name = "ModuleBuildError";
-		this.message = "Module build failed: ";
-		if (err !== null && typeof err === "object") {
-			if (typeof err.stack === "string" && err.stack) {
-				var stack = cutOffLoaderExecution(err.stack);
-				if (!err.hideStack) {
-					this.message += stack;
-				} else {
-					this.details = stack;
-					if (typeof err.message === "string" && err.message) {
-						this.message += err.message;
-					} else {
-						this.message += err;
-					}
-				}
-			} else if (typeof err.message === "string" && err.message) {
-				this.message += err.message;
-			} else {
-				this.message += err;
-			}
-		}
-		this.module = module;
-		this.error = err;
-
-		Error.captureStackTrace(this, this.constructor);
-	}
-}
-
-module.exports = ModuleBuildError;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const WebpackError = require("./WebpackError");
+const { cutOffLoaderExecution } = require("./ErrorHelpers");
+
+class ModuleBuildError extends WebpackError {
+	constructor(module, err) {
+		super();
+
+		this.name = "ModuleBuildError";
+		this.message = "Module build failed: ";
+		if (err !== null && typeof err === "object") {
+			if (typeof err.stack === "string" && err.stack) {
+				var stack = cutOffLoaderExecution(err.stack);
+				if (!err.hideStack) {
+					this.message += stack;
+				} else {
+					this.details = stack;
+					if (typeof err.message === "string" && err.message) {
+						this.message += err.message;
+					} else {
+						this.message += err;
+					}
+				}
+			} else if (typeof err.message === "string" && err.message) {
+				this.message += err.message;
+			} else {
+				this.message += err;
+			}
+		}
+		this.module = module;
+		this.error = err;
+
+		Error.captureStackTrace(this, this.constructor);
+	}
+}
+
+module.exports = ModuleBuildError;

package/lib/ModuleError.js

@@ -1,28 +1,28 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const WebpackError = require("./WebpackError");
-const cleanUp = require("./ErrorHelpers").cleanUp;
-
-class ModuleError extends WebpackError {
-	constructor(module, err) {
-		super();
-
-		this.name = "ModuleError";
-		this.module = module;
-		this.message =
-			err && typeof err === "object" && err.message ? err.message : err;
-		this.error = err;
-		this.details =
-			err && typeof err === "object" && err.stack
-				? cleanUp(err.stack, this.message)
-				: undefined;
-
-		Error.captureStackTrace(this, this.constructor);
-	}
-}
-
-module.exports = ModuleError;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const WebpackError = require("./WebpackError");
+const { cleanUp } = require("./ErrorHelpers");
+
+class ModuleError extends WebpackError {
+	constructor(module, err) {
+		super();
+
+		this.name = "ModuleError";
+		this.module = module;
+		this.message =
+			err && typeof err === "object" && err.message ? err.message : err;
+		this.error = err;
+		this.details =
+			err && typeof err === "object" && err.stack
+				? cleanUp(err.stack, this.message)
+				: undefined;
+
+		Error.captureStackTrace(this, this.constructor);
+	}
+}
+
+module.exports = ModuleError;

package/lib/ModuleFilenameHelpers.js

@@ -1,166 +1,166 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const createHash = require("./util/createHash");
-
-const ModuleFilenameHelpers = exports;
-
-ModuleFilenameHelpers.ALL_LOADERS_RESOURCE = "[all-loaders][resource]";
-ModuleFilenameHelpers.REGEXP_ALL_LOADERS_RESOURCE = /\[all-?loaders\]\[resource\]/gi;
-ModuleFilenameHelpers.LOADERS_RESOURCE = "[loaders][resource]";
-ModuleFilenameHelpers.REGEXP_LOADERS_RESOURCE = /\[loaders\]\[resource\]/gi;
-ModuleFilenameHelpers.RESOURCE = "[resource]";
-ModuleFilenameHelpers.REGEXP_RESOURCE = /\[resource\]/gi;
-ModuleFilenameHelpers.ABSOLUTE_RESOURCE_PATH = "[absolute-resource-path]";
-ModuleFilenameHelpers.REGEXP_ABSOLUTE_RESOURCE_PATH = /\[abs(olute)?-?resource-?path\]/gi;
-ModuleFilenameHelpers.RESOURCE_PATH = "[resource-path]";
-ModuleFilenameHelpers.REGEXP_RESOURCE_PATH = /\[resource-?path\]/gi;
-ModuleFilenameHelpers.ALL_LOADERS = "[all-loaders]";
-ModuleFilenameHelpers.REGEXP_ALL_LOADERS = /\[all-?loaders\]/gi;
-ModuleFilenameHelpers.LOADERS = "[loaders]";
-ModuleFilenameHelpers.REGEXP_LOADERS = /\[loaders\]/gi;
-ModuleFilenameHelpers.QUERY = "[query]";
-ModuleFilenameHelpers.REGEXP_QUERY = /\[query\]/gi;
-ModuleFilenameHelpers.ID = "[id]";
-ModuleFilenameHelpers.REGEXP_ID = /\[id\]/gi;
-ModuleFilenameHelpers.HASH = "[hash]";
-ModuleFilenameHelpers.REGEXP_HASH = /\[hash\]/gi;
-ModuleFilenameHelpers.NAMESPACE = "[namespace]";
-ModuleFilenameHelpers.REGEXP_NAMESPACE = /\[namespace\]/gi;
-
-const getAfter = (str, token) => {
-	const idx = str.indexOf(token);
-	return idx < 0 ? "" : str.substr(idx);
-};
-
-const getBefore = (str, token) => {
-	const idx = str.lastIndexOf(token);
-	return idx < 0 ? "" : str.substr(0, idx);
-};
-
-const getHash = str => {
-	const hash = createHash("md4");
-	hash.update(str);
-	return hash.digest("hex").substr(0, 4);
-};
-
-const asRegExp = test => {
-	if (typeof test === "string")
-		test = new RegExp("^" + test.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"));
-	return test;
-};
-
-ModuleFilenameHelpers.createFilename = (module, options, requestShortener) => {
-	const opts = Object.assign(
-		{
-			namespace: "",
-			moduleFilenameTemplate: ""
-		},
-		typeof options === "object"
-			? options
-			: {
-					moduleFilenameTemplate: options
-				}
-	);
-
-	let absoluteResourcePath;
-	let hash;
-	let identifier;
-	let moduleId;
-	let shortIdentifier;
-	if (module === undefined) module = "";
-	if (typeof module === "string") {
-		shortIdentifier = requestShortener.shorten(module);
-		identifier = shortIdentifier;
-		moduleId = "";
-		absoluteResourcePath = module.split("!").pop();
-		hash = getHash(identifier);
-	} else {
-		shortIdentifier = module.readableIdentifier(requestShortener);
-		identifier = requestShortener.shorten(module.identifier());
-		moduleId = module.id;
-		absoluteResourcePath = module
-			.identifier()
-			.split("!")
-			.pop();
-		hash = getHash(identifier);
-	}
-	const resource = shortIdentifier.split("!").pop();
-	const loaders = getBefore(shortIdentifier, "!");
-	const allLoaders = getBefore(identifier, "!");
-	const query = getAfter(resource, "?");
-	const resourcePath = resource.substr(0, resource.length - query.length);
-	if (typeof opts.moduleFilenameTemplate === "function") {
-		return opts.moduleFilenameTemplate({
-			identifier: identifier,
-			shortIdentifier: shortIdentifier,
-			resource: resource,
-			resourcePath: resourcePath,
-			absoluteResourcePath: absoluteResourcePath,
-			allLoaders: allLoaders,
-			query: query,
-			moduleId: moduleId,
-			hash: hash,
-			namespace: opts.namespace
-		});
-	}
-	return opts.moduleFilenameTemplate
-		.replace(ModuleFilenameHelpers.REGEXP_ALL_LOADERS_RESOURCE, identifier)
-		.replace(ModuleFilenameHelpers.REGEXP_LOADERS_RESOURCE, shortIdentifier)
-		.replace(ModuleFilenameHelpers.REGEXP_RESOURCE, resource)
-		.replace(ModuleFilenameHelpers.REGEXP_RESOURCE_PATH, resourcePath)
-		.replace(
-			ModuleFilenameHelpers.REGEXP_ABSOLUTE_RESOURCE_PATH,
-			absoluteResourcePath
-		)
-		.replace(ModuleFilenameHelpers.REGEXP_ALL_LOADERS, allLoaders)
-		.replace(ModuleFilenameHelpers.REGEXP_LOADERS, loaders)
-		.replace(ModuleFilenameHelpers.REGEXP_QUERY, query)
-		.replace(ModuleFilenameHelpers.REGEXP_ID, moduleId)
-		.replace(ModuleFilenameHelpers.REGEXP_HASH, hash)
-		.replace(ModuleFilenameHelpers.REGEXP_NAMESPACE, opts.namespace);
-};
-
-ModuleFilenameHelpers.replaceDuplicates = (array, fn, comparator) => {
-	const countMap = Object.create(null);
-	const posMap = Object.create(null);
-	array.forEach((item, idx) => {
-		countMap[item] = countMap[item] || [];
-		countMap[item].push(idx);
-		posMap[item] = 0;
-	});
-	if (comparator) {
-		Object.keys(countMap).forEach(item => {
-			countMap[item].sort(comparator);
-		});
-	}
-	return array.map((item, i) => {
-		if (countMap[item].length > 1) {
-			if (comparator && countMap[item][0] === i) return item;
-			return fn(item, i, posMap[item]++);
-		} else return item;
-	});
-};
-
-ModuleFilenameHelpers.matchPart = (str, test) => {
-	if (!test) return true;
-	test = asRegExp(test);
-	if (Array.isArray(test)) {
-		return test.map(asRegExp).some(regExp => regExp.test(str));
-	} else {
-		return test.test(str);
-	}
-};
-
-ModuleFilenameHelpers.matchObject = (obj, str) => {
-	if (obj.test)
-		if (!ModuleFilenameHelpers.matchPart(str, obj.test)) return false;
-	if (obj.include)
-		if (!ModuleFilenameHelpers.matchPart(str, obj.include)) return false;
-	if (obj.exclude)
-		if (ModuleFilenameHelpers.matchPart(str, obj.exclude)) return false;
-	return true;
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const createHash = require("./util/createHash");
+
+const ModuleFilenameHelpers = exports;
+
+ModuleFilenameHelpers.ALL_LOADERS_RESOURCE = "[all-loaders][resource]";
+ModuleFilenameHelpers.REGEXP_ALL_LOADERS_RESOURCE = /\[all-?loaders\]\[resource\]/gi;
+ModuleFilenameHelpers.LOADERS_RESOURCE = "[loaders][resource]";
+ModuleFilenameHelpers.REGEXP_LOADERS_RESOURCE = /\[loaders\]\[resource\]/gi;
+ModuleFilenameHelpers.RESOURCE = "[resource]";
+ModuleFilenameHelpers.REGEXP_RESOURCE = /\[resource\]/gi;
+ModuleFilenameHelpers.ABSOLUTE_RESOURCE_PATH = "[absolute-resource-path]";
+ModuleFilenameHelpers.REGEXP_ABSOLUTE_RESOURCE_PATH = /\[abs(olute)?-?resource-?path\]/gi;
+ModuleFilenameHelpers.RESOURCE_PATH = "[resource-path]";
+ModuleFilenameHelpers.REGEXP_RESOURCE_PATH = /\[resource-?path\]/gi;
+ModuleFilenameHelpers.ALL_LOADERS = "[all-loaders]";
+ModuleFilenameHelpers.REGEXP_ALL_LOADERS = /\[all-?loaders\]/gi;
+ModuleFilenameHelpers.LOADERS = "[loaders]";
+ModuleFilenameHelpers.REGEXP_LOADERS = /\[loaders\]/gi;
+ModuleFilenameHelpers.QUERY = "[query]";
+ModuleFilenameHelpers.REGEXP_QUERY = /\[query\]/gi;
+ModuleFilenameHelpers.ID = "[id]";
+ModuleFilenameHelpers.REGEXP_ID = /\[id\]/gi;
+ModuleFilenameHelpers.HASH = "[hash]";
+ModuleFilenameHelpers.REGEXP_HASH = /\[hash\]/gi;
+ModuleFilenameHelpers.NAMESPACE = "[namespace]";
+ModuleFilenameHelpers.REGEXP_NAMESPACE = /\[namespace\]/gi;
+
+const getAfter = (str, token) => {
+	const idx = str.indexOf(token);
+	return idx < 0 ? "" : str.substr(idx);
+};
+
+const getBefore = (str, token) => {
+	const idx = str.lastIndexOf(token);
+	return idx < 0 ? "" : str.substr(0, idx);
+};
+
+const getHash = str => {
+	const hash = createHash("md4");
+	hash.update(str);
+	return hash.digest("hex").substr(0, 4);
+};
+
+const asRegExp = test => {
+	if (typeof test === "string")
+		test = new RegExp("^" + test.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"));
+	return test;
+};
+
+ModuleFilenameHelpers.createFilename = (module, options, requestShortener) => {
+	const opts = Object.assign(
+		{
+			namespace: "",
+			moduleFilenameTemplate: ""
+		},
+		typeof options === "object"
+			? options
+			: {
+					moduleFilenameTemplate: options
+			  }
+	);
+
+	let absoluteResourcePath;
+	let hash;
+	let identifier;
+	let moduleId;
+	let shortIdentifier;
+	if (module === undefined) module = "";
+	if (typeof module === "string") {
+		shortIdentifier = requestShortener.shorten(module);
+		identifier = shortIdentifier;
+		moduleId = "";
+		absoluteResourcePath = module.split("!").pop();
+		hash = getHash(identifier);
+	} else {
+		shortIdentifier = module.readableIdentifier(requestShortener);
+		identifier = requestShortener.shorten(module.identifier());
+		moduleId = module.id;
+		absoluteResourcePath = module
+			.identifier()
+			.split("!")
+			.pop();
+		hash = getHash(identifier);
+	}
+	const resource = shortIdentifier.split("!").pop();
+	const loaders = getBefore(shortIdentifier, "!");
+	const allLoaders = getBefore(identifier, "!");
+	const query = getAfter(resource, "?");
+	const resourcePath = resource.substr(0, resource.length - query.length);
+	if (typeof opts.moduleFilenameTemplate === "function") {
+		return opts.moduleFilenameTemplate({
+			identifier: identifier,
+			shortIdentifier: shortIdentifier,
+			resource: resource,
+			resourcePath: resourcePath,
+			absoluteResourcePath: absoluteResourcePath,
+			allLoaders: allLoaders,
+			query: query,
+			moduleId: moduleId,
+			hash: hash,
+			namespace: opts.namespace
+		});
+	}
+	return opts.moduleFilenameTemplate
+		.replace(ModuleFilenameHelpers.REGEXP_ALL_LOADERS_RESOURCE, identifier)
+		.replace(ModuleFilenameHelpers.REGEXP_LOADERS_RESOURCE, shortIdentifier)
+		.replace(ModuleFilenameHelpers.REGEXP_RESOURCE, resource)
+		.replace(ModuleFilenameHelpers.REGEXP_RESOURCE_PATH, resourcePath)
+		.replace(
+			ModuleFilenameHelpers.REGEXP_ABSOLUTE_RESOURCE_PATH,
+			absoluteResourcePath
+		)
+		.replace(ModuleFilenameHelpers.REGEXP_ALL_LOADERS, allLoaders)
+		.replace(ModuleFilenameHelpers.REGEXP_LOADERS, loaders)
+		.replace(ModuleFilenameHelpers.REGEXP_QUERY, query)
+		.replace(ModuleFilenameHelpers.REGEXP_ID, moduleId)
+		.replace(ModuleFilenameHelpers.REGEXP_HASH, hash)
+		.replace(ModuleFilenameHelpers.REGEXP_NAMESPACE, opts.namespace);
+};
+
+ModuleFilenameHelpers.replaceDuplicates = (array, fn, comparator) => {
+	const countMap = Object.create(null);
+	const posMap = Object.create(null);
+	array.forEach((item, idx) => {
+		countMap[item] = countMap[item] || [];
+		countMap[item].push(idx);
+		posMap[item] = 0;
+	});
+	if (comparator) {
+		Object.keys(countMap).forEach(item => {
+			countMap[item].sort(comparator);
+		});
+	}
+	return array.map((item, i) => {
+		if (countMap[item].length > 1) {
+			if (comparator && countMap[item][0] === i) return item;
+			return fn(item, i, posMap[item]++);
+		} else return item;
+	});
+};
+
+ModuleFilenameHelpers.matchPart = (str, test) => {
+	if (!test) return true;
+	test = asRegExp(test);
+	if (Array.isArray(test)) {
+		return test.map(asRegExp).some(regExp => regExp.test(str));
+	} else {
+		return test.test(str);
+	}
+};
+
+ModuleFilenameHelpers.matchObject = (obj, str) => {
+	if (obj.test)
+		if (!ModuleFilenameHelpers.matchPart(str, obj.test)) return false;
+	if (obj.include)
+		if (!ModuleFilenameHelpers.matchPart(str, obj.include)) return false;
+	if (obj.exclude)
+		if (ModuleFilenameHelpers.matchPart(str, obj.exclude)) return false;
+	return true;
+};

package/lib/ModuleTemplate.js

@@ -1,79 +1,77 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const Tapable = require("tapable").Tapable;
-const SyncWaterfallHook = require("tapable").SyncWaterfallHook;
-const SyncHook = require("tapable").SyncHook;
-
-module.exports = class ModuleTemplate extends Tapable {
-	constructor(runtimeTemplate) {
-		super();
-		this.runtimeTemplate = runtimeTemplate;
-		this.hooks = {
-			content: new SyncWaterfallHook([
-				"source",
-				"module",
-				"options",
-				"dependencyTemplates"
-			]),
-			module: new SyncWaterfallHook([
-				"source",
-				"module",
-				"options",
-				"dependencyTemplates"
-			]),
-			render: new SyncWaterfallHook([
-				"source",
-				"module",
-				"options",
-				"dependencyTemplates"
-			]),
-			package: new SyncWaterfallHook([
-				"source",
-				"module",
-				"options",
-				"dependencyTemplates"
-			]),
-			hash: new SyncHook(["hash"])
-		};
-	}
-
-	render(module, dependencyTemplates, options) {
-		const moduleSource = module.source(
-			dependencyTemplates,
-			this.runtimeTemplate
-		);
-		const moduleSourcePostContent = this.hooks.content.call(
-			moduleSource,
-			module,
-			options,
-			dependencyTemplates
-		);
-		const moduleSourcePostModule = this.hooks.module.call(
-			moduleSourcePostContent,
-			module,
-			options,
-			dependencyTemplates
-		);
-		const moduleSourcePostRender = this.hooks.render.call(
-			moduleSourcePostModule,
-			module,
-			options,
-			dependencyTemplates
-		);
-		return this.hooks.package.call(
-			moduleSourcePostRender,
-			module,
-			options,
-			dependencyTemplates
-		);
-	}
-
-	updateHash(hash) {
-		hash.update("1");
-		this.hooks.hash.call(hash);
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const { Tapable, SyncWaterfallHook, SyncHook } = require("tapable");
+
+module.exports = class ModuleTemplate extends Tapable {
+	constructor(runtimeTemplate) {
+		super();
+		this.runtimeTemplate = runtimeTemplate;
+		this.hooks = {
+			content: new SyncWaterfallHook([
+				"source",
+				"module",
+				"options",
+				"dependencyTemplates"
+			]),
+			module: new SyncWaterfallHook([
+				"source",
+				"module",
+				"options",
+				"dependencyTemplates"
+			]),
+			render: new SyncWaterfallHook([
+				"source",
+				"module",
+				"options",
+				"dependencyTemplates"
+			]),
+			package: new SyncWaterfallHook([
+				"source",
+				"module",
+				"options",
+				"dependencyTemplates"
+			]),
+			hash: new SyncHook(["hash"])
+		};
+	}
+
+	render(module, dependencyTemplates, options) {
+		const moduleSource = module.source(
+			dependencyTemplates,
+			this.runtimeTemplate
+		);
+		const moduleSourcePostContent = this.hooks.content.call(
+			moduleSource,
+			module,
+			options,
+			dependencyTemplates
+		);
+		const moduleSourcePostModule = this.hooks.module.call(
+			moduleSourcePostContent,
+			module,
+			options,
+			dependencyTemplates
+		);
+		const moduleSourcePostRender = this.hooks.render.call(
+			moduleSourcePostModule,
+			module,
+			options,
+			dependencyTemplates
+		);
+		return this.hooks.package.call(
+			moduleSourcePostRender,
+			module,
+			options,
+			dependencyTemplates
+		);
+	}
+
+	updateHash(hash) {
+		hash.update("1");
+		this.hooks.hash.call(hash);
+	}
+};