webpack 4.1.0 → 4.4.0

package/lib/EvalSourceMapDevToolModuleTemplatePlugin.js

@@ -1,105 +1,105 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const RawSource = require("webpack-sources").RawSource;
-const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
-
-class EvalSourceMapDevToolModuleTemplatePlugin {
-	constructor(compilation, options) {
-		this.compilation = compilation;
-		this.sourceMapComment =
-			options.append || "//# sourceURL=[module]\n//# sourceMappingURL=[url]";
-		this.moduleFilenameTemplate =
-			options.moduleFilenameTemplate ||
-			"webpack://[namespace]/[resource-path]?[hash]";
-		this.namespace = options.namespace || "";
-		this.options = options;
-	}
-
-	apply(moduleTemplate) {
-		const self = this;
-		const options = this.options;
-		const matchModule = ModuleFilenameHelpers.matchObject.bind(
-			ModuleFilenameHelpers,
-			options
-		);
-		moduleTemplate.hooks.module.tap(
-			"EvalSourceMapDevToolModuleTemplatePlugin",
-			(source, module) => {
-				if (source.__EvalSourceMapDevToolData)
-					return source.__EvalSourceMapDevToolData;
-				if (!matchModule(module.resource)) {
-					return source;
-				}
-
-				let sourceMap;
-				let content;
-				if (source.sourceAndMap) {
-					const sourceAndMap = source.sourceAndMap(options);
-					sourceMap = sourceAndMap.map;
-					content = sourceAndMap.source;
-				} else {
-					sourceMap = source.map(options);
-					content = source.source();
-				}
-				if (!sourceMap) {
-					return source;
-				}
-
-				// Clone (flat) the sourcemap to ensure that the mutations below do not persist.
-				sourceMap = Object.keys(sourceMap).reduce((obj, key) => {
-					obj[key] = sourceMap[key];
-					return obj;
-				}, {});
-				const modules = sourceMap.sources.map(source => {
-					const module = self.compilation.findModule(source);
-					return module || source;
-				});
-				let moduleFilenames = modules.map(module => {
-					return ModuleFilenameHelpers.createFilename(
-						module,
-						{
-							moduleFilenameTemplate: self.moduleFilenameTemplate,
-							namespace: self.namespace
-						},
-						moduleTemplate.runtimeTemplate.requestShortener
-					);
-				});
-				moduleFilenames = ModuleFilenameHelpers.replaceDuplicates(
-					moduleFilenames,
-					(filename, i, n) => {
-						for (let j = 0; j < n; j++) filename += "*";
-						return filename;
-					}
-				);
-				sourceMap.sources = moduleFilenames;
-				sourceMap.sourceRoot = options.sourceRoot || "";
-				sourceMap.file = `${module.id}.js`;
-
-				const footer =
-					self.sourceMapComment.replace(
-						/\[url\]/g,
-						`data:application/json;charset=utf-8;base64,${Buffer.from(
-							JSON.stringify(sourceMap),
-							"utf8"
-						).toString("base64")}`
-					) + `\n//# sourceURL=webpack-internal:///${module.id}\n`; // workaround for chrome bug
-				source.__EvalSourceMapDevToolData = new RawSource(
-					`eval(${JSON.stringify(content + footer)});`
-				);
-				return source.__EvalSourceMapDevToolData;
-			}
-		);
-		moduleTemplate.hooks.hash.tap(
-			"EvalSourceMapDevToolModuleTemplatePlugin",
-			hash => {
-				hash.update("eval-source-map");
-				hash.update("2");
-			}
-		);
-	}
-}
-module.exports = EvalSourceMapDevToolModuleTemplatePlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const { RawSource } = require("webpack-sources");
+const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
+
+class EvalSourceMapDevToolModuleTemplatePlugin {
+	constructor(compilation, options) {
+		this.compilation = compilation;
+		this.sourceMapComment =
+			options.append || "//# sourceURL=[module]\n//# sourceMappingURL=[url]";
+		this.moduleFilenameTemplate =
+			options.moduleFilenameTemplate ||
+			"webpack://[namespace]/[resource-path]?[hash]";
+		this.namespace = options.namespace || "";
+		this.options = options;
+	}
+
+	apply(moduleTemplate) {
+		const self = this;
+		const options = this.options;
+		const matchModule = ModuleFilenameHelpers.matchObject.bind(
+			ModuleFilenameHelpers,
+			options
+		);
+		moduleTemplate.hooks.module.tap(
+			"EvalSourceMapDevToolModuleTemplatePlugin",
+			(source, module) => {
+				if (source.__EvalSourceMapDevToolData)
+					return source.__EvalSourceMapDevToolData;
+				if (!matchModule(module.resource)) {
+					return source;
+				}
+
+				let sourceMap;
+				let content;
+				if (source.sourceAndMap) {
+					const sourceAndMap = source.sourceAndMap(options);
+					sourceMap = sourceAndMap.map;
+					content = sourceAndMap.source;
+				} else {
+					sourceMap = source.map(options);
+					content = source.source();
+				}
+				if (!sourceMap) {
+					return source;
+				}
+
+				// Clone (flat) the sourcemap to ensure that the mutations below do not persist.
+				sourceMap = Object.keys(sourceMap).reduce((obj, key) => {
+					obj[key] = sourceMap[key];
+					return obj;
+				}, {});
+				const modules = sourceMap.sources.map(source => {
+					const module = self.compilation.findModule(source);
+					return module || source;
+				});
+				let moduleFilenames = modules.map(module => {
+					return ModuleFilenameHelpers.createFilename(
+						module,
+						{
+							moduleFilenameTemplate: self.moduleFilenameTemplate,
+							namespace: self.namespace
+						},
+						moduleTemplate.runtimeTemplate.requestShortener
+					);
+				});
+				moduleFilenames = ModuleFilenameHelpers.replaceDuplicates(
+					moduleFilenames,
+					(filename, i, n) => {
+						for (let j = 0; j < n; j++) filename += "*";
+						return filename;
+					}
+				);
+				sourceMap.sources = moduleFilenames;
+				sourceMap.sourceRoot = options.sourceRoot || "";
+				sourceMap.file = `${module.id}.js`;
+
+				const footer =
+					self.sourceMapComment.replace(
+						/\[url\]/g,
+						`data:application/json;charset=utf-8;base64,${Buffer.from(
+							JSON.stringify(sourceMap),
+							"utf8"
+						).toString("base64")}`
+					) + `\n//# sourceURL=webpack-internal:///${module.id}\n`; // workaround for chrome bug
+				source.__EvalSourceMapDevToolData = new RawSource(
+					`eval(${JSON.stringify(content + footer)});`
+				);
+				return source.__EvalSourceMapDevToolData;
+			}
+		);
+		moduleTemplate.hooks.hash.tap(
+			"EvalSourceMapDevToolModuleTemplatePlugin",
+			hash => {
+				hash.update("eval-source-map");
+				hash.update("2");
+			}
+		);
+	}
+}
+module.exports = EvalSourceMapDevToolModuleTemplatePlugin;

package/lib/ExportPropertyMainTemplatePlugin.js

@@ -1,40 +1,40 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const ConcatSource = require("webpack-sources").ConcatSource;
-
-const accessorToObjectAccess = accessor => {
-	return accessor.map(a => `[${JSON.stringify(a)}]`).join("");
-};
-
-class ExportPropertyMainTemplatePlugin {
-	constructor(property) {
-		this.property = property;
-	}
-
-	apply(compilation) {
-		const { mainTemplate, chunkTemplate } = compilation;
-
-		const onRenderWithEntry = (source, chunk, hash) => {
-			const postfix = `${accessorToObjectAccess([].concat(this.property))}`;
-			return new ConcatSource(source, postfix);
-		};
-
-		for (const template of [mainTemplate, chunkTemplate]) {
-			template.hooks.renderWithEntry.tap(
-				"ExportPropertyMainTemplatePlugin",
-				onRenderWithEntry
-			);
-		}
-
-		mainTemplate.hooks.hash.tap("ExportPropertyMainTemplatePlugin", hash => {
-			hash.update("export property");
-			hash.update(`${this.property}`);
-		});
-	}
-}
-
-module.exports = ExportPropertyMainTemplatePlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const { ConcatSource } = require("webpack-sources");
+
+const accessorToObjectAccess = accessor => {
+	return accessor.map(a => `[${JSON.stringify(a)}]`).join("");
+};
+
+class ExportPropertyMainTemplatePlugin {
+	constructor(property) {
+		this.property = property;
+	}
+
+	apply(compilation) {
+		const { mainTemplate, chunkTemplate } = compilation;
+
+		const onRenderWithEntry = (source, chunk, hash) => {
+			const postfix = `${accessorToObjectAccess([].concat(this.property))}`;
+			return new ConcatSource(source, postfix);
+		};
+
+		for (const template of [mainTemplate, chunkTemplate]) {
+			template.hooks.renderWithEntry.tap(
+				"ExportPropertyMainTemplatePlugin",
+				onRenderWithEntry
+			);
+		}
+
+		mainTemplate.hooks.hash.tap("ExportPropertyMainTemplatePlugin", hash => {
+			hash.update("export property");
+			hash.update(`${this.property}`);
+		});
+	}
+}
+
+module.exports = ExportPropertyMainTemplatePlugin;

package/lib/ExternalModule.js

@@ -1,159 +1,159 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const Module = require("./Module");
-const OriginalSource = require("webpack-sources").OriginalSource;
-const RawSource = require("webpack-sources").RawSource;
-const WebpackMissingModule = require("./dependencies/WebpackMissingModule");
-const Template = require("./Template");
-
-class ExternalModule extends Module {
-	constructor(request, type, userRequest) {
-		super("javascript/dynamic", null);
-
-		// Info from Factory
-		this.request = request;
-		this.externalType = type;
-		this.userRequest = userRequest;
-		this.external = true;
-	}
-
-	libIdent() {
-		return this.userRequest;
-	}
-
-	chunkCondition(chunk) {
-		return chunk.hasEntryModule();
-	}
-
-	identifier() {
-		return "external " + JSON.stringify(this.request);
-	}
-
-	readableIdentifier() {
-		return "external " + JSON.stringify(this.request);
-	}
-
-	needRebuild() {
-		return false;
-	}
-
-	build(options, compilation, resolver, fs, callback) {
-		this.built = true;
-		this.buildMeta = {};
-		this.buildInfo = {};
-		callback();
-	}
-
-	getSourceForGlobalVariableExternal(variableName, type) {
-		if (!Array.isArray(variableName)) {
-			// make it an array as the look up works the same basically
-			variableName = [variableName];
-		}
-
-		// needed for e.g. window["some"]["thing"]
-		const objectLookup = variableName
-			.map(r => `[${JSON.stringify(r)}]`)
-			.join("");
-		return `(function() { module.exports = ${type}${objectLookup}; }());`;
-	}
-
-	getSourceForCommonJsExternal(moduleAndSpecifiers) {
-		if (!Array.isArray(moduleAndSpecifiers)) {
-			return `module.exports = require(${JSON.stringify(
-				moduleAndSpecifiers
-			)});`;
-		}
-
-		const moduleName = moduleAndSpecifiers[0];
-		const objectLookup = moduleAndSpecifiers
-			.slice(1)
-			.map(r => `[${JSON.stringify(r)}]`)
-			.join("");
-		return `module.exports = require(${moduleName})${objectLookup};`;
-	}
-
-	checkExternalVariable(variableToCheck, request) {
-		return `if(typeof ${
-			variableToCheck
-		} === 'undefined') {${WebpackMissingModule.moduleCode(request)}}\n`;
-	}
-
-	getSourceForAmdOrUmdExternal(id, optional, request) {
-		const externalVariable = `__WEBPACK_EXTERNAL_MODULE_${Template.toIdentifier(
-			`${id}`
-		)}__`;
-		const missingModuleError = optional
-			? this.checkExternalVariable(externalVariable, request)
-			: "";
-		return `${missingModuleError}module.exports = ${externalVariable};`;
-	}
-
-	getSourceForDefaultCase(optional, request) {
-		const missingModuleError = optional
-			? this.checkExternalVariable(request, request)
-			: "";
-		return `${missingModuleError}module.exports = ${request};`;
-	}
-
-	getSourceString(runtime) {
-		const request =
-			typeof this.request === "object"
-				? this.request[this.externalType]
-				: this.request;
-		switch (this.externalType) {
-			case "this":
-			case "window":
-			case "self":
-				return this.getSourceForGlobalVariableExternal(
-					request,
-					this.externalType
-				);
-			case "global":
-				return this.getSourceForGlobalVariableExternal(
-					runtime.outputOptions.globalObject,
-					this.externalType
-				);
-			case "commonjs":
-			case "commonjs2":
-				return this.getSourceForCommonJsExternal(request);
-			case "amd":
-			case "umd":
-			case "umd2":
-				return this.getSourceForAmdOrUmdExternal(
-					this.id,
-					this.optional,
-					request
-				);
-			default:
-				return this.getSourceForDefaultCase(this.optional, request);
-		}
-	}
-
-	getSource(sourceString) {
-		if (this.useSourceMap) {
-			return new OriginalSource(sourceString, this.identifier());
-		}
-
-		return new RawSource(sourceString);
-	}
-
-	source(dependencyTemplates, runtime) {
-		return this.getSource(this.getSourceString(runtime));
-	}
-
-	size() {
-		return 42;
-	}
-
-	updateHash(hash) {
-		hash.update(this.externalType);
-		hash.update(JSON.stringify(this.request));
-		hash.update(JSON.stringify(Boolean(this.optional)));
-		super.updateHash(hash);
-	}
-}
-
-module.exports = ExternalModule;
+/*
+	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 Template = require("./Template");
+
+class ExternalModule extends Module {
+	constructor(request, type, userRequest) {
+		super("javascript/dynamic", null);
+
+		// Info from Factory
+		this.request = request;
+		this.externalType = type;
+		this.userRequest = userRequest;
+		this.external = true;
+	}
+
+	libIdent() {
+		return this.userRequest;
+	}
+
+	chunkCondition(chunk) {
+		return chunk.hasEntryModule();
+	}
+
+	identifier() {
+		return "external " + JSON.stringify(this.request);
+	}
+
+	readableIdentifier() {
+		return "external " + JSON.stringify(this.request);
+	}
+
+	needRebuild() {
+		return false;
+	}
+
+	build(options, compilation, resolver, fs, callback) {
+		this.built = true;
+		this.buildMeta = {};
+		this.buildInfo = {};
+		callback();
+	}
+
+	getSourceForGlobalVariableExternal(variableName, type) {
+		if (!Array.isArray(variableName)) {
+			// make it an array as the look up works the same basically
+			variableName = [variableName];
+		}
+
+		// needed for e.g. window["some"]["thing"]
+		const objectLookup = variableName
+			.map(r => `[${JSON.stringify(r)}]`)
+			.join("");
+		return `(function() { module.exports = ${type}${objectLookup}; }());`;
+	}
+
+	getSourceForCommonJsExternal(moduleAndSpecifiers) {
+		if (!Array.isArray(moduleAndSpecifiers)) {
+			return `module.exports = require(${JSON.stringify(
+				moduleAndSpecifiers
+			)});`;
+		}
+
+		const moduleName = moduleAndSpecifiers[0];
+		const objectLookup = moduleAndSpecifiers
+			.slice(1)
+			.map(r => `[${JSON.stringify(r)}]`)
+			.join("");
+		return `module.exports = require(${moduleName})${objectLookup};`;
+	}
+
+	checkExternalVariable(variableToCheck, request) {
+		return `if(typeof ${variableToCheck} === 'undefined') {${WebpackMissingModule.moduleCode(
+			request
+		)}}\n`;
+	}
+
+	getSourceForAmdOrUmdExternal(id, optional, request) {
+		const externalVariable = `__WEBPACK_EXTERNAL_MODULE_${Template.toIdentifier(
+			`${id}`
+		)}__`;
+		const missingModuleError = optional
+			? this.checkExternalVariable(externalVariable, request)
+			: "";
+		return `${missingModuleError}module.exports = ${externalVariable};`;
+	}
+
+	getSourceForDefaultCase(optional, request) {
+		const missingModuleError = optional
+			? this.checkExternalVariable(request, request)
+			: "";
+		return `${missingModuleError}module.exports = ${request};`;
+	}
+
+	getSourceString(runtime) {
+		const request =
+			typeof this.request === "object"
+				? this.request[this.externalType]
+				: this.request;
+		switch (this.externalType) {
+			case "this":
+			case "window":
+			case "self":
+				return this.getSourceForGlobalVariableExternal(
+					request,
+					this.externalType
+				);
+			case "global":
+				return this.getSourceForGlobalVariableExternal(
+					runtime.outputOptions.globalObject,
+					this.externalType
+				);
+			case "commonjs":
+			case "commonjs2":
+				return this.getSourceForCommonJsExternal(request);
+			case "amd":
+			case "umd":
+			case "umd2":
+				return this.getSourceForAmdOrUmdExternal(
+					this.id,
+					this.optional,
+					request
+				);
+			default:
+				return this.getSourceForDefaultCase(this.optional, request);
+		}
+	}
+
+	getSource(sourceString) {
+		if (this.useSourceMap) {
+			return new OriginalSource(sourceString, this.identifier());
+		}
+
+		return new RawSource(sourceString);
+	}
+
+	source(dependencyTemplates, runtime) {
+		return this.getSource(this.getSourceString(runtime));
+	}
+
+	size() {
+		return 42;
+	}
+
+	updateHash(hash) {
+		hash.update(this.externalType);
+		hash.update(JSON.stringify(this.request));
+		hash.update(JSON.stringify(Boolean(this.optional)));
+		super.updateHash(hash);
+	}
+}
+
+module.exports = ExternalModule;