webpack 4.9.1 → 4.10.2

package/lib/DefinePlugin.js

@@ -1,197 +1,206 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const ConstDependency = require("./dependencies/ConstDependency");
-const BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
-const ParserHelpers = require("./ParserHelpers");
-const NullFactory = require("./NullFactory");
-
-const stringifyObj = obj => {
-	return (
-		"Object({" +
-		Object.keys(obj)
-			.map(key => {
-				const code = obj[key];
-				return JSON.stringify(key) + ":" + toCode(code);
-			})
-			.join(",") +
-		"})"
-	);
-};
-
-const toCode = code => {
-	if (code === null) return "null";
-	else if (code === undefined) return "undefined";
-	else if (code instanceof RegExp && code.toString) return code.toString();
-	else if (typeof code === "function" && code.toString)
-		return "(" + code.toString() + ")";
-	else if (typeof code === "object") return stringifyObj(code);
-	else return code + "";
-};
-
-class DefinePlugin {
-	constructor(definitions) {
-		this.definitions = definitions;
-	}
-
-	apply(compiler) {
-		const definitions = this.definitions;
-		compiler.hooks.compilation.tap(
-			"DefinePlugin",
-			(compilation, { normalModuleFactory }) => {
-				compilation.dependencyFactories.set(ConstDependency, new NullFactory());
-				compilation.dependencyTemplates.set(
-					ConstDependency,
-					new ConstDependency.Template()
-				);
-
-				const handler = parser => {
-					const walkDefinitions = (definitions, prefix) => {
-						Object.keys(definitions).forEach(key => {
-							const code = definitions[key];
-							if (
-								code &&
-								typeof code === "object" &&
-								!(code instanceof RegExp)
-							) {
-								walkDefinitions(code, prefix + key + ".");
-								applyObjectDefine(prefix + key, code);
-								return;
-							}
-							applyDefineKey(prefix, key);
-							applyDefine(prefix + key, code);
-						});
-					};
-
-					const applyDefineKey = (prefix, key) => {
-						const splittedKey = key.split(".");
-						splittedKey.slice(1).forEach((_, i) => {
-							const fullKey = prefix + splittedKey.slice(0, i + 1).join(".");
-							parser.hooks.canRename
-								.for(fullKey)
-								.tap("DefinePlugin", ParserHelpers.approve);
-						});
-					};
-
-					const applyDefine = (key, code) => {
-						const isTypeof = /^typeof\s+/.test(key);
-						if (isTypeof) key = key.replace(/^typeof\s+/, "");
-						let recurse = false;
-						let recurseTypeof = false;
-						code = toCode(code);
-						if (!isTypeof) {
-							parser.hooks.canRename
-								.for(key)
-								.tap("DefinePlugin", ParserHelpers.approve);
-							parser.hooks.evaluateIdentifier
-								.for(key)
-								.tap("DefinePlugin", expr => {
-									/**
-									 * this is needed in case there is a recursion in the DefinePlugin
-									 * to prevent an endless recursion
-									 * e.g.: new DefinePlugin({
-									 * "a": "b",
-									 * "b": "a"
-									 * });
-									 */
-									if (recurse) return;
-									recurse = true;
-									const res = parser.evaluate(code);
-									recurse = false;
-									res.setRange(expr.range);
-									return res;
-								});
-							parser.hooks.expression
-								.for(key)
-								.tap(
-									"DefinePlugin",
-									/__webpack_require__/.test(code)
-										? ParserHelpers.toConstantDependencyWithWebpackRequire(
-												parser,
-												code
-										  )
-										: ParserHelpers.toConstantDependency(parser, code)
-								);
-						}
-						const typeofCode = isTypeof ? code : "typeof (" + code + ")";
-						parser.hooks.evaluateTypeof.for(key).tap("DefinePlugin", expr => {
-							/**
-							 * this is needed in case there is a recursion in the DefinePlugin
-							 * to prevent an endless recursion
-							 * e.g.: new DefinePlugin({
-							 * "typeof a": "typeof b",
-							 * "typeof b": "typeof a"
-							 * });
-							 */
-							if (recurseTypeof) return;
-							recurseTypeof = true;
-							const res = parser.evaluate(typeofCode);
-							recurseTypeof = false;
-							res.setRange(expr.range);
-							return res;
-						});
-						parser.hooks.typeof.for(key).tap("DefinePlugin", expr => {
-							const res = parser.evaluate(typeofCode);
-							if (!res.isString()) return;
-							return ParserHelpers.toConstantDependency(
-								parser,
-								JSON.stringify(res.string)
-							).bind(parser)(expr);
-						});
-					};
-
-					const applyObjectDefine = (key, obj) => {
-						const code = stringifyObj(obj);
-						parser.hooks.canRename
-							.for(key)
-							.tap("DefinePlugin", ParserHelpers.approve);
-						parser.hooks.evaluateIdentifier
-							.for(key)
-							.tap("DefinePlugin", expr =>
-								new BasicEvaluatedExpression().setTruthy().setRange(expr.range)
-							);
-						parser.hooks.evaluateTypeof
-							.for(key)
-							.tap("DefinePlugin", ParserHelpers.evaluateToString("object"));
-						parser.hooks.expression
-							.for(key)
-							.tap(
-								"DefinePlugin",
-								/__webpack_require__/.test(code)
-									? ParserHelpers.toConstantDependencyWithWebpackRequire(
-											parser,
-											code
-									  )
-									: ParserHelpers.toConstantDependency(parser, code)
-							);
-						parser.hooks.typeof
-							.for(key)
-							.tap(
-								"DefinePlugin",
-								ParserHelpers.toConstantDependency(
-									parser,
-									JSON.stringify("object")
-								)
-							);
-					};
-
-					walkDefinitions(definitions, "");
-				};
-
-				normalModuleFactory.hooks.parser
-					.for("javascript/auto")
-					.tap("DefinePlugin", handler);
-				normalModuleFactory.hooks.parser
-					.for("javascript/dynamic")
-					.tap("DefinePlugin", handler);
-				normalModuleFactory.hooks.parser
-					.for("javascript/esm")
-					.tap("DefinePlugin", handler);
-			}
-		);
-	}
-}
-module.exports = DefinePlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const ConstDependency = require("./dependencies/ConstDependency");
+const BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
+const ParserHelpers = require("./ParserHelpers");
+const NullFactory = require("./NullFactory");
+
+const stringifyObj = obj => {
+	return (
+		"Object({" +
+		Object.keys(obj)
+			.map(key => {
+				const code = obj[key];
+				return JSON.stringify(key) + ":" + toCode(code);
+			})
+			.join(",") +
+		"})"
+	);
+};
+
+const toCode = code => {
+	if (code === null) {
+		return "null";
+	}
+	if (code === undefined) {
+		return "undefined";
+	}
+	if (code instanceof RegExp && code.toString) {
+		return code.toString();
+	}
+	if (typeof code === "function" && code.toString) {
+		return "(" + code.toString() + ")";
+	}
+	if (typeof code === "object") {
+		return stringifyObj(code);
+	}
+	return code + "";
+};
+
+class DefinePlugin {
+	constructor(definitions) {
+		this.definitions = definitions;
+	}
+
+	apply(compiler) {
+		const definitions = this.definitions;
+		compiler.hooks.compilation.tap(
+			"DefinePlugin",
+			(compilation, { normalModuleFactory }) => {
+				compilation.dependencyFactories.set(ConstDependency, new NullFactory());
+				compilation.dependencyTemplates.set(
+					ConstDependency,
+					new ConstDependency.Template()
+				);
+
+				const handler = parser => {
+					const walkDefinitions = (definitions, prefix) => {
+						Object.keys(definitions).forEach(key => {
+							const code = definitions[key];
+							if (
+								code &&
+								typeof code === "object" &&
+								!(code instanceof RegExp)
+							) {
+								walkDefinitions(code, prefix + key + ".");
+								applyObjectDefine(prefix + key, code);
+								return;
+							}
+							applyDefineKey(prefix, key);
+							applyDefine(prefix + key, code);
+						});
+					};
+
+					const applyDefineKey = (prefix, key) => {
+						const splittedKey = key.split(".");
+						splittedKey.slice(1).forEach((_, i) => {
+							const fullKey = prefix + splittedKey.slice(0, i + 1).join(".");
+							parser.hooks.canRename
+								.for(fullKey)
+								.tap("DefinePlugin", ParserHelpers.approve);
+						});
+					};
+
+					const applyDefine = (key, code) => {
+						const isTypeof = /^typeof\s+/.test(key);
+						if (isTypeof) key = key.replace(/^typeof\s+/, "");
+						let recurse = false;
+						let recurseTypeof = false;
+						code = toCode(code);
+						if (!isTypeof) {
+							parser.hooks.canRename
+								.for(key)
+								.tap("DefinePlugin", ParserHelpers.approve);
+							parser.hooks.evaluateIdentifier
+								.for(key)
+								.tap("DefinePlugin", expr => {
+									/**
+									 * this is needed in case there is a recursion in the DefinePlugin
+									 * to prevent an endless recursion
+									 * e.g.: new DefinePlugin({
+									 * "a": "b",
+									 * "b": "a"
+									 * });
+									 */
+									if (recurse) return;
+									recurse = true;
+									const res = parser.evaluate(code);
+									recurse = false;
+									res.setRange(expr.range);
+									return res;
+								});
+							parser.hooks.expression
+								.for(key)
+								.tap(
+									"DefinePlugin",
+									/__webpack_require__/.test(code)
+										? ParserHelpers.toConstantDependencyWithWebpackRequire(
+												parser,
+												code
+										  )
+										: ParserHelpers.toConstantDependency(parser, code)
+								);
+						}
+						const typeofCode = isTypeof ? code : "typeof (" + code + ")";
+						parser.hooks.evaluateTypeof.for(key).tap("DefinePlugin", expr => {
+							/**
+							 * this is needed in case there is a recursion in the DefinePlugin
+							 * to prevent an endless recursion
+							 * e.g.: new DefinePlugin({
+							 * "typeof a": "typeof b",
+							 * "typeof b": "typeof a"
+							 * });
+							 */
+							if (recurseTypeof) return;
+							recurseTypeof = true;
+							const res = parser.evaluate(typeofCode);
+							recurseTypeof = false;
+							res.setRange(expr.range);
+							return res;
+						});
+						parser.hooks.typeof.for(key).tap("DefinePlugin", expr => {
+							const res = parser.evaluate(typeofCode);
+							if (!res.isString()) return;
+							return ParserHelpers.toConstantDependency(
+								parser,
+								JSON.stringify(res.string)
+							).bind(parser)(expr);
+						});
+					};
+
+					const applyObjectDefine = (key, obj) => {
+						const code = stringifyObj(obj);
+						parser.hooks.canRename
+							.for(key)
+							.tap("DefinePlugin", ParserHelpers.approve);
+						parser.hooks.evaluateIdentifier
+							.for(key)
+							.tap("DefinePlugin", expr =>
+								new BasicEvaluatedExpression().setTruthy().setRange(expr.range)
+							);
+						parser.hooks.evaluateTypeof
+							.for(key)
+							.tap("DefinePlugin", ParserHelpers.evaluateToString("object"));
+						parser.hooks.expression
+							.for(key)
+							.tap(
+								"DefinePlugin",
+								/__webpack_require__/.test(code)
+									? ParserHelpers.toConstantDependencyWithWebpackRequire(
+											parser,
+											code
+									  )
+									: ParserHelpers.toConstantDependency(parser, code)
+							);
+						parser.hooks.typeof
+							.for(key)
+							.tap(
+								"DefinePlugin",
+								ParserHelpers.toConstantDependency(
+									parser,
+									JSON.stringify("object")
+								)
+							);
+					};
+
+					walkDefinitions(definitions, "");
+				};
+
+				normalModuleFactory.hooks.parser
+					.for("javascript/auto")
+					.tap("DefinePlugin", handler);
+				normalModuleFactory.hooks.parser
+					.for("javascript/dynamic")
+					.tap("DefinePlugin", handler);
+				normalModuleFactory.hooks.parser
+					.for("javascript/esm")
+					.tap("DefinePlugin", handler);
+			}
+		);
+	}
+}
+module.exports = DefinePlugin;

package/lib/DelegatedModule.js

@@ -1,101 +1,101 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const { OriginalSource, RawSource } = require("webpack-sources");
-
-const Module = require("./Module");
-const WebpackMissingModule = require("./dependencies/WebpackMissingModule");
-const DelegatedSourceDependency = require("./dependencies/DelegatedSourceDependency");
-const DelegatedExportsDependency = require("./dependencies/DelegatedExportsDependency");
-
-class DelegatedModule extends Module {
-	constructor(sourceRequest, data, type, userRequest, originalRequest) {
-		super("javascript/dynamic", null);
-
-		// Info from Factory
-		this.sourceRequest = sourceRequest;
-		this.request = data.id;
-		this.type = type;
-		this.userRequest = userRequest;
-		this.originalRequest = originalRequest;
-		this.delegateData = data;
-	}
-
-	libIdent(options) {
-		return typeof this.originalRequest === "string"
-			? this.originalRequest
-			: this.originalRequest.libIdent(options);
-	}
-
-	identifier() {
-		return `delegated ${JSON.stringify(this.request)} from ${
-			this.sourceRequest
-		}`;
-	}
-
-	readableIdentifier() {
-		return `delegated ${this.userRequest} from ${this.sourceRequest}`;
-	}
-
-	needRebuild() {
-		return false;
-	}
-
-	build(options, compilation, resolver, fs, callback) {
-		this.built = true;
-		this.buildMeta = Object.assign({}, this.delegateData.buildMeta);
-		this.buildInfo = {};
-		this.addDependency(new DelegatedSourceDependency(this.sourceRequest));
-		this.addDependency(
-			new DelegatedExportsDependency(this, this.delegateData.exports || true)
-		);
-		callback();
-	}
-
-	source(depTemplates, runtime) {
-		const dep = this.dependencies[0];
-		const sourceModule = dep.module;
-		let str;
-
-		if (!sourceModule) {
-			str = WebpackMissingModule.moduleCode(this.sourceRequest);
-		} else {
-			str = `module.exports = (${runtime.moduleExports({
-				module: sourceModule,
-				request: dep.request
-			})})`;
-
-			switch (this.type) {
-				case "require":
-					str += `(${JSON.stringify(this.request)})`;
-					break;
-				case "object":
-					str += `[${JSON.stringify(this.request)}]`;
-					break;
-			}
-
-			str += ";";
-		}
-
-		if (this.useSourceMap) {
-			return new OriginalSource(str, this.identifier());
-		} else {
-			return new RawSource(str);
-		}
-	}
-
-	size() {
-		return 42;
-	}
-
-	updateHash(hash) {
-		hash.update(this.type);
-		hash.update(JSON.stringify(this.request));
-		super.updateHash(hash);
-	}
-}
-
-module.exports = DelegatedModule;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const { OriginalSource, RawSource } = require("webpack-sources");
+
+const Module = require("./Module");
+const WebpackMissingModule = require("./dependencies/WebpackMissingModule");
+const DelegatedSourceDependency = require("./dependencies/DelegatedSourceDependency");
+const DelegatedExportsDependency = require("./dependencies/DelegatedExportsDependency");
+
+class DelegatedModule extends Module {
+	constructor(sourceRequest, data, type, userRequest, originalRequest) {
+		super("javascript/dynamic", null);
+
+		// Info from Factory
+		this.sourceRequest = sourceRequest;
+		this.request = data.id;
+		this.type = type;
+		this.userRequest = userRequest;
+		this.originalRequest = originalRequest;
+		this.delegateData = data;
+	}
+
+	libIdent(options) {
+		return typeof this.originalRequest === "string"
+			? this.originalRequest
+			: this.originalRequest.libIdent(options);
+	}
+
+	identifier() {
+		return `delegated ${JSON.stringify(this.request)} from ${
+			this.sourceRequest
+		}`;
+	}
+
+	readableIdentifier() {
+		return `delegated ${this.userRequest} from ${this.sourceRequest}`;
+	}
+
+	needRebuild() {
+		return false;
+	}
+
+	build(options, compilation, resolver, fs, callback) {
+		this.built = true;
+		this.buildMeta = Object.assign({}, this.delegateData.buildMeta);
+		this.buildInfo = {};
+		this.addDependency(new DelegatedSourceDependency(this.sourceRequest));
+		this.addDependency(
+			new DelegatedExportsDependency(this, this.delegateData.exports || true)
+		);
+		callback();
+	}
+
+	source(depTemplates, runtime) {
+		const dep = this.dependencies[0];
+		const sourceModule = dep.module;
+		let str;
+
+		if (!sourceModule) {
+			str = WebpackMissingModule.moduleCode(this.sourceRequest);
+		} else {
+			str = `module.exports = (${runtime.moduleExports({
+				module: sourceModule,
+				request: dep.request
+			})})`;
+
+			switch (this.type) {
+				case "require":
+					str += `(${JSON.stringify(this.request)})`;
+					break;
+				case "object":
+					str += `[${JSON.stringify(this.request)}]`;
+					break;
+			}
+
+			str += ";";
+		}
+
+		if (this.useSourceMap) {
+			return new OriginalSource(str, this.identifier());
+		} else {
+			return new RawSource(str);
+		}
+	}
+
+	size() {
+		return 42;
+	}
+
+	updateHash(hash) {
+		hash.update(this.type);
+		hash.update(JSON.stringify(this.request));
+		super.updateHash(hash);
+	}
+}
+
+module.exports = DelegatedModule;