webpack 4.9.1 → 4.10.2

package/lib/LibManifestPlugin.js

@@ -1,86 +1,86 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const path = require("path");
-const asyncLib = require("neo-async");
-const SingleEntryDependency = require("./dependencies/SingleEntryDependency");
-
-class LibManifestPlugin {
-	constructor(options) {
-		this.options = options;
-	}
-
-	apply(compiler) {
-		compiler.hooks.emit.tapAsync(
-			"LibManifestPlugin",
-			(compilation, callback) => {
-				asyncLib.forEach(
-					compilation.chunks,
-					(chunk, callback) => {
-						if (!chunk.isOnlyInitial()) {
-							callback();
-							return;
-						}
-						const targetPath = compilation.getPath(this.options.path, {
-							hash: compilation.hash,
-							chunk
-						});
-						const name =
-							this.options.name &&
-							compilation.getPath(this.options.name, {
-								hash: compilation.hash,
-								chunk
-							});
-						const manifest = {
-							name,
-							type: this.options.type,
-							content: Array.from(chunk.modulesIterable, module => {
-								if (
-									this.options.entryOnly &&
-									!module.reasons.some(
-										r => r.dependency instanceof SingleEntryDependency
-									)
-								) {
-									return;
-								}
-								if (module.libIdent) {
-									const ident = module.libIdent({
-										context: this.options.context || compiler.options.context
-									});
-									if (ident) {
-										return {
-											ident,
-											data: {
-												id: module.id,
-												buildMeta: module.buildMeta
-											}
-										};
-									}
-								}
-							})
-								.filter(Boolean)
-								.reduce((obj, item) => {
-									obj[item.ident] = item.data;
-									return obj;
-								}, Object.create(null))
-						};
-						const content = Buffer.from(JSON.stringify(manifest), "utf8");
-						compiler.outputFileSystem.mkdirp(path.dirname(targetPath), err => {
-							if (err) return callback(err);
-							compiler.outputFileSystem.writeFile(
-								targetPath,
-								content,
-								callback
-							);
-						});
-					},
-					callback
-				);
-			}
-		);
-	}
-}
-module.exports = LibManifestPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const path = require("path");
+const asyncLib = require("neo-async");
+const SingleEntryDependency = require("./dependencies/SingleEntryDependency");
+
+class LibManifestPlugin {
+	constructor(options) {
+		this.options = options;
+	}
+
+	apply(compiler) {
+		compiler.hooks.emit.tapAsync(
+			"LibManifestPlugin",
+			(compilation, callback) => {
+				asyncLib.forEach(
+					compilation.chunks,
+					(chunk, callback) => {
+						if (!chunk.isOnlyInitial()) {
+							callback();
+							return;
+						}
+						const targetPath = compilation.getPath(this.options.path, {
+							hash: compilation.hash,
+							chunk
+						});
+						const name =
+							this.options.name &&
+							compilation.getPath(this.options.name, {
+								hash: compilation.hash,
+								chunk
+							});
+						const manifest = {
+							name,
+							type: this.options.type,
+							content: Array.from(chunk.modulesIterable, module => {
+								if (
+									this.options.entryOnly &&
+									!module.reasons.some(
+										r => r.dependency instanceof SingleEntryDependency
+									)
+								) {
+									return;
+								}
+								if (module.libIdent) {
+									const ident = module.libIdent({
+										context: this.options.context || compiler.options.context
+									});
+									if (ident) {
+										return {
+											ident,
+											data: {
+												id: module.id,
+												buildMeta: module.buildMeta
+											}
+										};
+									}
+								}
+							})
+								.filter(Boolean)
+								.reduce((obj, item) => {
+									obj[item.ident] = item.data;
+									return obj;
+								}, Object.create(null))
+						};
+						const content = Buffer.from(JSON.stringify(manifest), "utf8");
+						compiler.outputFileSystem.mkdirp(path.dirname(targetPath), err => {
+							if (err) return callback(err);
+							compiler.outputFileSystem.writeFile(
+								targetPath,
+								content,
+								callback
+							);
+						});
+					},
+					callback
+				);
+			}
+		);
+	}
+}
+module.exports = LibManifestPlugin;

package/lib/LibraryTemplatePlugin.js

@@ -1,119 +1,153 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const SetVarMainTemplatePlugin = require("./SetVarMainTemplatePlugin");
-
-const accessorToObjectAccess = accessor => {
-	return accessor
-		.map(a => {
-			return `[${JSON.stringify(a)}]`;
-		})
-		.join("");
-};
-
-const accessorAccess = (base, accessor, joinWith) => {
-	accessor = [].concat(accessor);
-	return accessor
-		.map((a, idx) => {
-			a = base
-				? base + accessorToObjectAccess(accessor.slice(0, idx + 1))
-				: accessor[0] + accessorToObjectAccess(accessor.slice(1, idx + 1));
-			if (idx === accessor.length - 1) return a;
-			if (idx === 0 && typeof base === "undefined")
-				return `${a} = typeof ${a} === "object" ? ${a} : {}`;
-			return `${a} = ${a} || {}`;
-		})
-		.join(joinWith || "; ");
-};
-
-class LibraryTemplatePlugin {
-	constructor(name, target, umdNamedDefine, auxiliaryComment, exportProperty) {
-		this.name = name;
-		this.target = target;
-		this.umdNamedDefine = umdNamedDefine;
-		this.auxiliaryComment = auxiliaryComment;
-		this.exportProperty = exportProperty;
-	}
-
-	apply(compiler) {
-		compiler.hooks.thisCompilation.tap("LibraryTemplatePlugin", compilation => {
-			if (this.exportProperty) {
-				var ExportPropertyMainTemplatePlugin = require("./ExportPropertyMainTemplatePlugin");
-				new ExportPropertyMainTemplatePlugin(this.exportProperty).apply(
-					compilation
-				);
-			}
-			switch (this.target) {
-				case "var":
-					new SetVarMainTemplatePlugin(
-						`var ${accessorAccess(false, this.name)}`
-					).apply(compilation);
-					break;
-				case "assign":
-					new SetVarMainTemplatePlugin(
-						accessorAccess(undefined, this.name)
-					).apply(compilation);
-					break;
-				case "this":
-				case "self":
-				case "window":
-					if (this.name)
-						new SetVarMainTemplatePlugin(
-							accessorAccess(this.target, this.name)
-						).apply(compilation);
-					else
-						new SetVarMainTemplatePlugin(this.target, true).apply(compilation);
-					break;
-				case "global":
-					if (this.name)
-						new SetVarMainTemplatePlugin(
-							accessorAccess(
-								compilation.runtimeTemplate.outputOptions.globalObject,
-								this.name
-							)
-						).apply(compilation);
-					else
-						new SetVarMainTemplatePlugin(
-							compilation.runtimeTemplate.outputOptions.globalObject,
-							true
-						).apply(compilation);
-					break;
-				case "commonjs":
-					if (this.name)
-						new SetVarMainTemplatePlugin(
-							accessorAccess("exports", this.name)
-						).apply(compilation);
-					else new SetVarMainTemplatePlugin("exports", true).apply(compilation);
-					break;
-				case "commonjs2":
-				case "commonjs-module":
-					new SetVarMainTemplatePlugin("module.exports").apply(compilation);
-					break;
-				case "amd":
-					var AmdMainTemplatePlugin = require("./AmdMainTemplatePlugin");
-					new AmdMainTemplatePlugin(this.name).apply(compilation);
-					break;
-				case "umd":
-				case "umd2":
-					var UmdMainTemplatePlugin = require("./UmdMainTemplatePlugin");
-					new UmdMainTemplatePlugin(this.name, {
-						optionalAmdExternalAsGlobal: this.target === "umd2",
-						namedDefine: this.umdNamedDefine,
-						auxiliaryComment: this.auxiliaryComment
-					}).apply(compilation);
-					break;
-				case "jsonp":
-					var JsonpExportMainTemplatePlugin = require("./web/JsonpExportMainTemplatePlugin");
-					new JsonpExportMainTemplatePlugin(this.name).apply(compilation);
-					break;
-				default:
-					throw new Error(`${this.target} is not a valid Library target`);
-			}
-		});
-	}
-}
-
-module.exports = LibraryTemplatePlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const SetVarMainTemplatePlugin = require("./SetVarMainTemplatePlugin");
+
+/** @typedef {import("./Compiler")} Compiler */
+
+/**
+ * @param {string[]} accessor the accessor to convert to path
+ * @returns {string} the path
+ */
+const accessorToObjectAccess = accessor => {
+	return accessor.map(a => `[${JSON.stringify(a)}]`).join("");
+};
+
+/**
+ * @param {string=} base the path prefix
+ * @param {string|string[]} accessor the accessor
+ * @param {string=} joinWith the element separator
+ * @returns {string} the path
+ */
+const accessorAccess = (base, accessor, joinWith = "; ") => {
+	const accessors = Array.isArray(accessor) ? accessor : [accessor];
+	return accessors
+		.map((_, idx) => {
+			const a = base
+				? base + accessorToObjectAccess(accessors.slice(0, idx + 1))
+				: accessors[0] + accessorToObjectAccess(accessors.slice(1, idx + 1));
+			if (idx === accessors.length - 1) return a;
+			if (idx === 0 && typeof base === "undefined") {
+				return `${a} = typeof ${a} === "object" ? ${a} : {}`;
+			}
+			return `${a} = ${a} || {}`;
+		})
+		.join(joinWith);
+};
+
+class LibraryTemplatePlugin {
+	/**
+	 * @param {string} name name of library
+	 * @param {string} target type of library
+	 * @param {boolean} umdNamedDefine setting this to true will name the UMD module
+	 * @param {string|TODO} auxiliaryComment comment in the UMD wrapper
+	 * @param {string|string[]} exportProperty which export should be exposed as library
+	 */
+	constructor(name, target, umdNamedDefine, auxiliaryComment, exportProperty) {
+		this.name = name;
+		this.target = target;
+		this.umdNamedDefine = umdNamedDefine;
+		this.auxiliaryComment = auxiliaryComment;
+		this.exportProperty = exportProperty;
+	}
+
+	/**
+	 * @param {Compiler} compiler the compiler instance
+	 * @returns {void}
+	 */
+	apply(compiler) {
+		compiler.hooks.thisCompilation.tap("LibraryTemplatePlugin", compilation => {
+			if (this.exportProperty) {
+				const ExportPropertyMainTemplatePlugin = require("./ExportPropertyMainTemplatePlugin");
+				new ExportPropertyMainTemplatePlugin(this.exportProperty).apply(
+					compilation
+				);
+			}
+			switch (this.target) {
+				case "var":
+					new SetVarMainTemplatePlugin(
+						`var ${accessorAccess(undefined, this.name)}`,
+						false
+					).apply(compilation);
+					break;
+				case "assign":
+					new SetVarMainTemplatePlugin(
+						accessorAccess(undefined, this.name),
+						false
+					).apply(compilation);
+					break;
+				case "this":
+				case "self":
+				case "window":
+					if (this.name) {
+						new SetVarMainTemplatePlugin(
+							accessorAccess(this.target, this.name),
+							false
+						).apply(compilation);
+					} else {
+						new SetVarMainTemplatePlugin(this.target, true).apply(compilation);
+					}
+					break;
+				case "global":
+					if (this.name) {
+						new SetVarMainTemplatePlugin(
+							accessorAccess(
+								compilation.runtimeTemplate.outputOptions.globalObject,
+								this.name
+							),
+							false
+						).apply(compilation);
+					} else {
+						new SetVarMainTemplatePlugin(
+							compilation.runtimeTemplate.outputOptions.globalObject,
+							true
+						).apply(compilation);
+					}
+					break;
+				case "commonjs":
+					if (this.name) {
+						new SetVarMainTemplatePlugin(
+							accessorAccess("exports", this.name),
+							false
+						).apply(compilation);
+					} else {
+						new SetVarMainTemplatePlugin("exports", true).apply(compilation);
+					}
+					break;
+				case "commonjs2":
+				case "commonjs-module":
+					new SetVarMainTemplatePlugin("module.exports", false).apply(
+						compilation
+					);
+					break;
+				case "amd": {
+					const AmdMainTemplatePlugin = require("./AmdMainTemplatePlugin");
+					new AmdMainTemplatePlugin(this.name).apply(compilation);
+					break;
+				}
+				case "umd":
+				case "umd2": {
+					const UmdMainTemplatePlugin = require("./UmdMainTemplatePlugin");
+					new UmdMainTemplatePlugin(this.name, {
+						optionalAmdExternalAsGlobal: this.target === "umd2",
+						namedDefine: this.umdNamedDefine,
+						auxiliaryComment: this.auxiliaryComment
+					}).apply(compilation);
+					break;
+				}
+				case "jsonp": {
+					const JsonpExportMainTemplatePlugin = require("./web/JsonpExportMainTemplatePlugin");
+					new JsonpExportMainTemplatePlugin(this.name).apply(compilation);
+					break;
+				}
+				default:
+					throw new Error(`${this.target} is not a valid Library target`);
+			}
+		});
+	}
+}
+
+module.exports = LibraryTemplatePlugin;

package/lib/LoaderOptionsPlugin.js

@@ -1,52 +1,53 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
-
-const validateOptions = require("schema-utils");
-const schema = require("../schemas/plugins/LoaderOptionsPlugin.json");
-
-class LoaderOptionsPlugin {
-	constructor(options) {
-		validateOptions(schema, options || {}, "Loader Options Plugin");
-
-		if (typeof options !== "object") options = {};
-		if (!options.test)
-			options.test = {
-				test: () => true
-			};
-		this.options = options;
-	}
-
-	apply(compiler) {
-		const options = this.options;
-		compiler.hooks.compilation.tap("LoaderOptionsPlugin", compilation => {
-			compilation.hooks.normalModuleLoader.tap(
-				"LoaderOptionsPlugin",
-				(context, module) => {
-					const resource = module.resource;
-					if (!resource) return;
-					const i = resource.indexOf("?");
-					if (
-						ModuleFilenameHelpers.matchObject(
-							options,
-							i < 0 ? resource : resource.substr(0, i)
-						)
-					) {
-						for (const key of Object.keys(options)) {
-							if (key === "include" || key === "exclude" || key === "test") {
-								continue;
-							}
-							context[key] = options[key];
-						}
-					}
-				}
-			);
-		});
-	}
-}
-
-module.exports = LoaderOptionsPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
+
+const validateOptions = require("schema-utils");
+const schema = require("../schemas/plugins/LoaderOptionsPlugin.json");
+
+class LoaderOptionsPlugin {
+	constructor(options) {
+		validateOptions(schema, options || {}, "Loader Options Plugin");
+
+		if (typeof options !== "object") options = {};
+		if (!options.test) {
+			options.test = {
+				test: () => true
+			};
+		}
+		this.options = options;
+	}
+
+	apply(compiler) {
+		const options = this.options;
+		compiler.hooks.compilation.tap("LoaderOptionsPlugin", compilation => {
+			compilation.hooks.normalModuleLoader.tap(
+				"LoaderOptionsPlugin",
+				(context, module) => {
+					const resource = module.resource;
+					if (!resource) return;
+					const i = resource.indexOf("?");
+					if (
+						ModuleFilenameHelpers.matchObject(
+							options,
+							i < 0 ? resource : resource.substr(0, i)
+						)
+					) {
+						for (const key of Object.keys(options)) {
+							if (key === "include" || key === "exclude" || key === "test") {
+								continue;
+							}
+							context[key] = options[key];
+						}
+					}
+				}
+			);
+		});
+	}
+}
+
+module.exports = LoaderOptionsPlugin;

package/lib/LoaderTargetPlugin.js

@@ -1,24 +1,24 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-class LoaderTargetPlugin {
-	constructor(target) {
-		this.target = target;
-	}
-
-	apply(compiler) {
-		compiler.hooks.compilation.tap("LoaderTargetPlugin", compilation => {
-			compilation.hooks.normalModuleLoader.tap(
-				"LoaderTargetPlugin",
-				loaderContext => {
-					loaderContext.target = this.target;
-				}
-			);
-		});
-	}
-}
-
-module.exports = LoaderTargetPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+class LoaderTargetPlugin {
+	constructor(target) {
+		this.target = target;
+	}
+
+	apply(compiler) {
+		compiler.hooks.compilation.tap("LoaderTargetPlugin", compilation => {
+			compilation.hooks.normalModuleLoader.tap(
+				"LoaderTargetPlugin",
+				loaderContext => {
+					loaderContext.target = this.target;
+				}
+			);
+		});
+	}
+}
+
+module.exports = LoaderTargetPlugin;