webpack 4.15.0 → 4.16.2

package/lib/RequestShortener.js

@@ -1,83 +1,83 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const path = require("path");
-const NORMALIZE_SLASH_DIRECTION_REGEXP = /\\/g;
-const PATH_CHARS_REGEXP = /[-[\]{}()*+?.,\\^$|#\s]/g;
-const SEPARATOR_REGEXP = /[/\\]$/;
-const FRONT_OR_BACK_BANG_REGEXP = /^!|!$/g;
-const INDEX_JS_REGEXP = /\/index.js(!|\?|\(query\))/g;
-const MATCH_RESOURCE_REGEXP = /!=!/;
-
-const normalizeBackSlashDirection = request => {
-	return request.replace(NORMALIZE_SLASH_DIRECTION_REGEXP, "/");
-};
-
-const createRegExpForPath = path => {
-	const regexpTypePartial = path.replace(PATH_CHARS_REGEXP, "\\$&");
-	return new RegExp(`(^|!)${regexpTypePartial}`, "g");
-};
-
-class RequestShortener {
-	constructor(directory) {
-		directory = normalizeBackSlashDirection(directory);
-		if (SEPARATOR_REGEXP.test(directory)) {
-			directory = directory.substr(0, directory.length - 1);
-		}
-
-		if (directory) {
-			this.currentDirectoryRegExp = createRegExpForPath(directory);
-		}
-
-		const dirname = path.dirname(directory);
-		const endsWithSeparator = SEPARATOR_REGEXP.test(dirname);
-		const parentDirectory = endsWithSeparator
-			? dirname.substr(0, dirname.length - 1)
-			: dirname;
-		if (parentDirectory && parentDirectory !== directory) {
-			this.parentDirectoryRegExp = createRegExpForPath(parentDirectory);
-		}
-
-		if (__dirname.length >= 2) {
-			const buildins = normalizeBackSlashDirection(path.join(__dirname, ".."));
-			const buildinsAsModule =
-				this.currentDirectoryRegExp &&
-				this.currentDirectoryRegExp.test(buildins);
-			this.buildinsAsModule = buildinsAsModule;
-			this.buildinsRegExp = createRegExpForPath(buildins);
-		}
-
-		this.cache = new Map();
-	}
-
-	shorten(request) {
-		if (!request) return request;
-		const cacheEntry = this.cache.get(request);
-		if (cacheEntry !== undefined) {
-			return cacheEntry;
-		}
-		let result = normalizeBackSlashDirection(request);
-		if (this.buildinsAsModule && this.buildinsRegExp) {
-			result = result.replace(this.buildinsRegExp, "!(webpack)");
-		}
-		if (this.currentDirectoryRegExp) {
-			result = result.replace(this.currentDirectoryRegExp, "!.");
-		}
-		if (this.parentDirectoryRegExp) {
-			result = result.replace(this.parentDirectoryRegExp, "!..");
-		}
-		if (!this.buildinsAsModule && this.buildinsRegExp) {
-			result = result.replace(this.buildinsRegExp, "!(webpack)");
-		}
-		result = result.replace(INDEX_JS_REGEXP, "$1");
-		result = result.replace(FRONT_OR_BACK_BANG_REGEXP, "");
-		result = result.replace(MATCH_RESOURCE_REGEXP, " = ");
-		this.cache.set(request, result);
-		return result;
-	}
-}
-
-module.exports = RequestShortener;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const path = require("path");
+const NORMALIZE_SLASH_DIRECTION_REGEXP = /\\/g;
+const PATH_CHARS_REGEXP = /[-[\]{}()*+?.,\\^$|#\s]/g;
+const SEPARATOR_REGEXP = /[/\\]$/;
+const FRONT_OR_BACK_BANG_REGEXP = /^!|!$/g;
+const INDEX_JS_REGEXP = /\/index.js(!|\?|\(query\))/g;
+const MATCH_RESOURCE_REGEXP = /!=!/;
+
+const normalizeBackSlashDirection = request => {
+	return request.replace(NORMALIZE_SLASH_DIRECTION_REGEXP, "/");
+};
+
+const createRegExpForPath = path => {
+	const regexpTypePartial = path.replace(PATH_CHARS_REGEXP, "\\$&");
+	return new RegExp(`(^|!)${regexpTypePartial}`, "g");
+};
+
+class RequestShortener {
+	constructor(directory) {
+		directory = normalizeBackSlashDirection(directory);
+		if (SEPARATOR_REGEXP.test(directory)) {
+			directory = directory.substr(0, directory.length - 1);
+		}
+
+		if (directory) {
+			this.currentDirectoryRegExp = createRegExpForPath(directory);
+		}
+
+		const dirname = path.dirname(directory);
+		const endsWithSeparator = SEPARATOR_REGEXP.test(dirname);
+		const parentDirectory = endsWithSeparator
+			? dirname.substr(0, dirname.length - 1)
+			: dirname;
+		if (parentDirectory && parentDirectory !== directory) {
+			this.parentDirectoryRegExp = createRegExpForPath(parentDirectory);
+		}
+
+		if (__dirname.length >= 2) {
+			const buildins = normalizeBackSlashDirection(path.join(__dirname, ".."));
+			const buildinsAsModule =
+				this.currentDirectoryRegExp &&
+				this.currentDirectoryRegExp.test(buildins);
+			this.buildinsAsModule = buildinsAsModule;
+			this.buildinsRegExp = createRegExpForPath(buildins);
+		}
+
+		this.cache = new Map();
+	}
+
+	shorten(request) {
+		if (!request) return request;
+		const cacheEntry = this.cache.get(request);
+		if (cacheEntry !== undefined) {
+			return cacheEntry;
+		}
+		let result = normalizeBackSlashDirection(request);
+		if (this.buildinsAsModule && this.buildinsRegExp) {
+			result = result.replace(this.buildinsRegExp, "!(webpack)");
+		}
+		if (this.currentDirectoryRegExp) {
+			result = result.replace(this.currentDirectoryRegExp, "!.");
+		}
+		if (this.parentDirectoryRegExp) {
+			result = result.replace(this.parentDirectoryRegExp, "!..");
+		}
+		if (!this.buildinsAsModule && this.buildinsRegExp) {
+			result = result.replace(this.buildinsRegExp, "!(webpack)");
+		}
+		result = result.replace(INDEX_JS_REGEXP, "$1");
+		result = result.replace(FRONT_OR_BACK_BANG_REGEXP, "");
+		result = result.replace(MATCH_RESOURCE_REGEXP, " = ");
+		this.cache.set(request, result);
+		return result;
+	}
+}
+
+module.exports = RequestShortener;

package/lib/RequireJsStuffPlugin.js

@@ -1,69 +1,69 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const ParserHelpers = require("./ParserHelpers");
-const ConstDependency = require("./dependencies/ConstDependency");
-const NullFactory = require("./NullFactory");
-
-module.exports = class RequireJsStuffPlugin {
-	apply(compiler) {
-		compiler.hooks.compilation.tap(
-			"RequireJsStuffPlugin",
-			(compilation, { normalModuleFactory }) => {
-				compilation.dependencyFactories.set(ConstDependency, new NullFactory());
-				compilation.dependencyTemplates.set(
-					ConstDependency,
-					new ConstDependency.Template()
-				);
-				const handler = (parser, parserOptions) => {
-					if (
-						typeof parserOptions.requireJs !== "undefined" &&
-						!parserOptions.requireJs
-					)
-						return;
-
-					parser.hooks.call
-						.for("require.config")
-						.tap(
-							"RequireJsStuffPlugin",
-							ParserHelpers.toConstantDependency(parser, "undefined")
-						);
-					parser.hooks.call
-						.for("requirejs.config")
-						.tap(
-							"RequireJsStuffPlugin",
-							ParserHelpers.toConstantDependency(parser, "undefined")
-						);
-
-					parser.hooks.expression
-						.for("require.version")
-						.tap(
-							"RequireJsStuffPlugin",
-							ParserHelpers.toConstantDependency(
-								parser,
-								JSON.stringify("0.0.0")
-							)
-						);
-					parser.hooks.expression
-						.for("requirejs.onError")
-						.tap(
-							"RequireJsStuffPlugin",
-							ParserHelpers.toConstantDependencyWithWebpackRequire(
-								parser,
-								"__webpack_require__.oe"
-							)
-						);
-				};
-				normalModuleFactory.hooks.parser
-					.for("javascript/auto")
-					.tap("RequireJsStuffPlugin", handler);
-				normalModuleFactory.hooks.parser
-					.for("javascript/dynamic")
-					.tap("RequireJsStuffPlugin", handler);
-			}
-		);
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const ParserHelpers = require("./ParserHelpers");
+const ConstDependency = require("./dependencies/ConstDependency");
+const NullFactory = require("./NullFactory");
+
+module.exports = class RequireJsStuffPlugin {
+	apply(compiler) {
+		compiler.hooks.compilation.tap(
+			"RequireJsStuffPlugin",
+			(compilation, { normalModuleFactory }) => {
+				compilation.dependencyFactories.set(ConstDependency, new NullFactory());
+				compilation.dependencyTemplates.set(
+					ConstDependency,
+					new ConstDependency.Template()
+				);
+				const handler = (parser, parserOptions) => {
+					if (
+						typeof parserOptions.requireJs !== "undefined" &&
+						!parserOptions.requireJs
+					)
+						return;
+
+					parser.hooks.call
+						.for("require.config")
+						.tap(
+							"RequireJsStuffPlugin",
+							ParserHelpers.toConstantDependency(parser, "undefined")
+						);
+					parser.hooks.call
+						.for("requirejs.config")
+						.tap(
+							"RequireJsStuffPlugin",
+							ParserHelpers.toConstantDependency(parser, "undefined")
+						);
+
+					parser.hooks.expression
+						.for("require.version")
+						.tap(
+							"RequireJsStuffPlugin",
+							ParserHelpers.toConstantDependency(
+								parser,
+								JSON.stringify("0.0.0")
+							)
+						);
+					parser.hooks.expression
+						.for("requirejs.onError")
+						.tap(
+							"RequireJsStuffPlugin",
+							ParserHelpers.toConstantDependencyWithWebpackRequire(
+								parser,
+								"__webpack_require__.oe"
+							)
+						);
+				};
+				normalModuleFactory.hooks.parser
+					.for("javascript/auto")
+					.tap("RequireJsStuffPlugin", handler);
+				normalModuleFactory.hooks.parser
+					.for("javascript/dynamic")
+					.tap("RequireJsStuffPlugin", handler);
+			}
+		);
+	}
+};

package/lib/ResolverFactory.js

@@ -1,64 +1,64 @@
-/*
- MIT License http://www.opensource.org/licenses/mit-license.php
- Author Tobias Koppers @sokra
- */
-"use strict";
-
-const { Tapable, HookMap, SyncHook, SyncWaterfallHook } = require("tapable");
-const Factory = require("enhanced-resolve").ResolverFactory;
-
-module.exports = class ResolverFactory extends Tapable {
-	constructor() {
-		super();
-		this.hooks = {
-			resolveOptions: new HookMap(
-				() => new SyncWaterfallHook(["resolveOptions"])
-			),
-			resolver: new HookMap(() => new SyncHook(["resolver", "resolveOptions"]))
-		};
-		this._pluginCompat.tap("ResolverFactory", options => {
-			let match;
-			match = /^resolve-options (.+)$/.exec(options.name);
-			if (match) {
-				this.hooks.resolveOptions.tap(
-					match[1],
-					options.fn.name || "unnamed compat plugin",
-					options.fn
-				);
-				return true;
-			}
-			match = /^resolver (.+)$/.exec(options.name);
-			if (match) {
-				this.hooks.resolver.tap(
-					match[1],
-					options.fn.name || "unnamed compat plugin",
-					options.fn
-				);
-				return true;
-			}
-		});
-		this.cache1 = new WeakMap();
-		this.cache2 = new Map();
-	}
-
-	get(type, resolveOptions) {
-		const cachedResolver = this.cache1.get(resolveOptions);
-		if (cachedResolver) return cachedResolver();
-		const ident = `${type}|${JSON.stringify(resolveOptions)}`;
-		const resolver = this.cache2.get(ident);
-		if (resolver) return resolver;
-		const newResolver = this._create(type, resolveOptions);
-		this.cache2.set(ident, newResolver);
-		return newResolver;
-	}
-
-	_create(type, resolveOptions) {
-		resolveOptions = this.hooks.resolveOptions.for(type).call(resolveOptions);
-		const resolver = Factory.createResolver(resolveOptions);
-		if (!resolver) {
-			throw new Error("No resolver created");
-		}
-		this.hooks.resolver.for(type).call(resolver, resolveOptions);
-		return resolver;
-	}
-};
+/*
+ MIT License http://www.opensource.org/licenses/mit-license.php
+ Author Tobias Koppers @sokra
+ */
+"use strict";
+
+const { Tapable, HookMap, SyncHook, SyncWaterfallHook } = require("tapable");
+const Factory = require("enhanced-resolve").ResolverFactory;
+
+module.exports = class ResolverFactory extends Tapable {
+	constructor() {
+		super();
+		this.hooks = {
+			resolveOptions: new HookMap(
+				() => new SyncWaterfallHook(["resolveOptions"])
+			),
+			resolver: new HookMap(() => new SyncHook(["resolver", "resolveOptions"]))
+		};
+		this._pluginCompat.tap("ResolverFactory", options => {
+			let match;
+			match = /^resolve-options (.+)$/.exec(options.name);
+			if (match) {
+				this.hooks.resolveOptions.tap(
+					match[1],
+					options.fn.name || "unnamed compat plugin",
+					options.fn
+				);
+				return true;
+			}
+			match = /^resolver (.+)$/.exec(options.name);
+			if (match) {
+				this.hooks.resolver.tap(
+					match[1],
+					options.fn.name || "unnamed compat plugin",
+					options.fn
+				);
+				return true;
+			}
+		});
+		this.cache1 = new WeakMap();
+		this.cache2 = new Map();
+	}
+
+	get(type, resolveOptions) {
+		const cachedResolver = this.cache1.get(resolveOptions);
+		if (cachedResolver) return cachedResolver();
+		const ident = `${type}|${JSON.stringify(resolveOptions)}`;
+		const resolver = this.cache2.get(ident);
+		if (resolver) return resolver;
+		const newResolver = this._create(type, resolveOptions);
+		this.cache2.set(ident, newResolver);
+		return newResolver;
+	}
+
+	_create(type, resolveOptions) {
+		resolveOptions = this.hooks.resolveOptions.for(type).call(resolveOptions);
+		const resolver = Factory.createResolver(resolveOptions);
+		if (!resolver) {
+			throw new Error("No resolver created");
+		}
+		this.hooks.resolver.for(type).call(resolver, resolveOptions);
+		return resolver;
+	}
+};

package/lib/RuntimeTemplate.js

@@ -6,6 +6,8 @@
 
 const Template = require("./Template");
 
+/** @typedef {import("./Module")} Module */
+
 module.exports = class RuntimeTemplate {
 	constructor(outputOptions, requestShortener) {
 		this.outputOptions = outputOptions || {};
@@ -188,6 +190,16 @@ module.exports = class RuntimeTemplate {
 		return `${promise || "Promise.resolve()"}.then(${getModuleFunction})`;
 	}
 
+	/**
+	 *
+	 * @param {Object} options options object
+	 * @param {boolean=} options.update whether a new variable should be created or the existing one updated
+	 * @param {Module} options.module the module
+	 * @param {string} options.request the request that should be printed as comment
+	 * @param {string} options.importVar name of the import variable
+	 * @param {Module} options.originModule module in which the statement is emitted
+	 * @returns {string} the import statement
+	 */
 	importStatement({ update, module, request, importVar, originModule }) {
 		if (!module) {
 			return this.missingModuleStatement({

package/lib/SetVarMainTemplatePlugin.js

@@ -1,69 +1,69 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const { ConcatSource } = require("webpack-sources");
-
-/** @typedef {import("./Compilation")} Compilation */
-
-class SetVarMainTemplatePlugin {
-	/**
-	 * @param {string} varExpression the accessor where the library is exported
-	 * @param {boolean} copyObject specify copying the exports
-	 */
-	constructor(varExpression, copyObject) {
-		/** @type {string} */
-		this.varExpression = varExpression;
-		/** @type {boolean} */
-		this.copyObject = copyObject;
-	}
-
-	/**
-	 * @param {Compilation} compilation the compilation instance
-	 * @returns {void}
-	 */
-	apply(compilation) {
-		const { mainTemplate, chunkTemplate } = compilation;
-
-		const onRenderWithEntry = (source, chunk, hash) => {
-			const varExpression = mainTemplate.getAssetPath(this.varExpression, {
-				hash,
-				chunk
-			});
-			if (this.copyObject) {
-				return new ConcatSource(
-					`(function(e, a) { for(var i in a) e[i] = a[i]; }(${varExpression}, `,
-					source,
-					"))"
-				);
-			} else {
-				const prefix = `${varExpression} =\n`;
-				return new ConcatSource(prefix, source);
-			}
-		};
-
-		for (const template of [mainTemplate, chunkTemplate]) {
-			template.hooks.renderWithEntry.tap(
-				"SetVarMainTemplatePlugin",
-				onRenderWithEntry
-			);
-		}
-
-		mainTemplate.hooks.globalHashPaths.tap(
-			"SetVarMainTemplatePlugin",
-			paths => {
-				if (this.varExpression) paths.push(this.varExpression);
-				return paths;
-			}
-		);
-		mainTemplate.hooks.hash.tap("SetVarMainTemplatePlugin", hash => {
-			hash.update("set var");
-			hash.update(`${this.varExpression}`);
-			hash.update(`${this.copyObject}`);
-		});
-	}
-}
-
-module.exports = SetVarMainTemplatePlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const { ConcatSource } = require("webpack-sources");
+
+/** @typedef {import("./Compilation")} Compilation */
+
+class SetVarMainTemplatePlugin {
+	/**
+	 * @param {string} varExpression the accessor where the library is exported
+	 * @param {boolean} copyObject specify copying the exports
+	 */
+	constructor(varExpression, copyObject) {
+		/** @type {string} */
+		this.varExpression = varExpression;
+		/** @type {boolean} */
+		this.copyObject = copyObject;
+	}
+
+	/**
+	 * @param {Compilation} compilation the compilation instance
+	 * @returns {void}
+	 */
+	apply(compilation) {
+		const { mainTemplate, chunkTemplate } = compilation;
+
+		const onRenderWithEntry = (source, chunk, hash) => {
+			const varExpression = mainTemplate.getAssetPath(this.varExpression, {
+				hash,
+				chunk
+			});
+			if (this.copyObject) {
+				return new ConcatSource(
+					`(function(e, a) { for(var i in a) e[i] = a[i]; }(${varExpression}, `,
+					source,
+					"))"
+				);
+			} else {
+				const prefix = `${varExpression} =\n`;
+				return new ConcatSource(prefix, source);
+			}
+		};
+
+		for (const template of [mainTemplate, chunkTemplate]) {
+			template.hooks.renderWithEntry.tap(
+				"SetVarMainTemplatePlugin",
+				onRenderWithEntry
+			);
+		}
+
+		mainTemplate.hooks.globalHashPaths.tap(
+			"SetVarMainTemplatePlugin",
+			paths => {
+				if (this.varExpression) paths.push(this.varExpression);
+				return paths;
+			}
+		);
+		mainTemplate.hooks.hash.tap("SetVarMainTemplatePlugin", hash => {
+			hash.update("set var");
+			hash.update(`${this.varExpression}`);
+			hash.update(`${this.copyObject}`);
+		});
+	}
+}
+
+module.exports = SetVarMainTemplatePlugin;

package/lib/SingleEntryPlugin.js

@@ -48,9 +48,14 @@ class SingleEntryPlugin {
 		);
 	}
 
+	/**
+	 * @param {string} entry entry request
+	 * @param {string} name entry name
+	 * @returns {SingleEntryDependency} the dependency
+	 */
 	static createDependency(entry, name) {
 		const dep = new SingleEntryDependency(entry);
-		dep.loc = name;
+		dep.loc = { name };
 		return dep;
 	}
 }

package/lib/SizeFormatHelpers.js

@@ -1,24 +1,24 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Sean Larkin @thelarkinn
-*/
-"use strict";
-
-const SizeFormatHelpers = exports;
-
-SizeFormatHelpers.formatSize = size => {
-	if (typeof size !== "number" || Number.isNaN(size) === true) {
-		return "unknown size";
-	}
-
-	if (size <= 0) {
-		return "0 bytes";
-	}
-
-	const abbreviations = ["bytes", "KiB", "MiB", "GiB"];
-	const index = Math.floor(Math.log(size) / Math.log(1024));
-
-	return `${+(size / Math.pow(1024, index)).toPrecision(3)} ${
-		abbreviations[index]
-	}`;
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Sean Larkin @thelarkinn
+*/
+"use strict";
+
+const SizeFormatHelpers = exports;
+
+SizeFormatHelpers.formatSize = size => {
+	if (typeof size !== "number" || Number.isNaN(size) === true) {
+		return "unknown size";
+	}
+
+	if (size <= 0) {
+		return "0 bytes";
+	}
+
+	const abbreviations = ["bytes", "KiB", "MiB", "GiB"];
+	const index = Math.floor(Math.log(size) / Math.log(1024));
+
+	return `${+(size / Math.pow(1024, index)).toPrecision(3)} ${
+		abbreviations[index]
+	}`;
+};