webpack 4.1.0 → 4.4.0

package/lib/JavascriptModulesPlugin.js

@@ -1,158 +1,184 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const Parser = require("./Parser");
-const Template = require("./Template");
-const ConcatSource = require("webpack-sources").ConcatSource;
-const JavascriptGenerator = require("./JavascriptGenerator");
-
-class JavascriptModulesPlugin {
-	apply(compiler) {
-		compiler.hooks.compilation.tap(
-			"JavascriptModulesPlugin",
-			(compilation, { normalModuleFactory }) => {
-				normalModuleFactory.hooks.createParser
-					.for("javascript/auto")
-					.tap("JavascriptModulesPlugin", options => {
-						return new Parser(options, "auto");
-					});
-				normalModuleFactory.hooks.createParser
-					.for("javascript/dynamic")
-					.tap("JavascriptModulesPlugin", options => {
-						return new Parser(options, "script");
-					});
-				normalModuleFactory.hooks.createParser
-					.for("javascript/esm")
-					.tap("JavascriptModulesPlugin", options => {
-						return new Parser(options, "module");
-					});
-				normalModuleFactory.hooks.createGenerator
-					.for("javascript/auto")
-					.tap("JavascriptModulesPlugin", options => {
-						return new JavascriptGenerator(options);
-					});
-				normalModuleFactory.hooks.createGenerator
-					.for("javascript/dynamic")
-					.tap("JavascriptModulesPlugin", options => {
-						return new JavascriptGenerator(options);
-					});
-				normalModuleFactory.hooks.createGenerator
-					.for("javascript/esm")
-					.tap("JavascriptModulesPlugin", options => {
-						return new JavascriptGenerator(options);
-					});
-				compilation.mainTemplate.hooks.renderManifest.tap(
-					"JavascriptModulesPlugin",
-					(result, options) => {
-						const chunk = options.chunk;
-						const hash = options.hash;
-						const fullHash = options.fullHash;
-						const outputOptions = options.outputOptions;
-						const moduleTemplates = options.moduleTemplates;
-						const dependencyTemplates = options.dependencyTemplates;
-
-						let filenameTemplate;
-						if (chunk.filenameTemplate)
-							filenameTemplate = chunk.filenameTemplate;
-						else filenameTemplate = outputOptions.filename;
-
-						const useChunkHash = compilation.mainTemplate.useChunkHash(chunk);
-
-						result.push({
-							render: () =>
-								compilation.mainTemplate.render(
-									hash,
-									chunk,
-									moduleTemplates.javascript,
-									dependencyTemplates
-								),
-							filenameTemplate,
-							pathOptions: {
-								noChunkHash: !useChunkHash,
-								chunk
-							},
-							identifier: `chunk${chunk.id}`,
-							hash: useChunkHash ? chunk.hash : fullHash
-						});
-						return result;
-					}
-				);
-				compilation.mainTemplate.hooks.modules.tap(
-					"JavascriptModulesPlugin",
-					(source, chunk, hash, moduleTemplate, dependencyTemplates) => {
-						return Template.renderChunkModules(
-							chunk,
-							m => typeof m.source === "function",
-							moduleTemplate,
-							dependencyTemplates,
-							"/******/ "
-						);
-					}
-				);
-				compilation.chunkTemplate.hooks.renderManifest.tap(
-					"JavascriptModulesPlugin",
-					(result, options) => {
-						const chunk = options.chunk;
-						const outputOptions = options.outputOptions;
-						const moduleTemplates = options.moduleTemplates;
-						const dependencyTemplates = options.dependencyTemplates;
-
-						let filenameTemplate;
-						if (chunk.filenameTemplate)
-							filenameTemplate = chunk.filenameTemplate;
-						else filenameTemplate = outputOptions.chunkFilename;
-
-						result.push({
-							render: () =>
-								this.renderJavascript(
-									compilation.chunkTemplate,
-									chunk,
-									moduleTemplates.javascript,
-									dependencyTemplates
-								),
-							filenameTemplate,
-							pathOptions: {
-								chunk
-							},
-							identifier: `chunk${chunk.id}`,
-							hash: chunk.hash
-						});
-
-						return result;
-					}
-				);
-			}
-		);
-	}
-
-	renderJavascript(chunkTemplate, chunk, moduleTemplate, dependencyTemplates) {
-		const moduleSources = Template.renderChunkModules(
-			chunk,
-			m => typeof m.source === "function",
-			moduleTemplate,
-			dependencyTemplates
-		);
-		const core = chunkTemplate.hooks.modules.call(
-			moduleSources,
-			chunk,
-			moduleTemplate,
-			dependencyTemplates
-		);
-		let source = chunkTemplate.hooks.render.call(
-			core,
-			chunk,
-			moduleTemplate,
-			dependencyTemplates
-		);
-		if (chunk.hasEntryModule()) {
-			source = chunkTemplate.hooks.renderWithEntry.call(source, chunk);
-		}
-		chunk.rendered = true;
-		return new ConcatSource(source, ";");
-	}
-}
-
-module.exports = JavascriptModulesPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const Parser = require("./Parser");
+const Template = require("./Template");
+const { ConcatSource } = require("webpack-sources");
+const JavascriptGenerator = require("./JavascriptGenerator");
+const createHash = require("./util/createHash");
+
+class JavascriptModulesPlugin {
+	apply(compiler) {
+		compiler.hooks.compilation.tap(
+			"JavascriptModulesPlugin",
+			(compilation, { normalModuleFactory }) => {
+				normalModuleFactory.hooks.createParser
+					.for("javascript/auto")
+					.tap("JavascriptModulesPlugin", options => {
+						return new Parser(options, "auto");
+					});
+				normalModuleFactory.hooks.createParser
+					.for("javascript/dynamic")
+					.tap("JavascriptModulesPlugin", options => {
+						return new Parser(options, "script");
+					});
+				normalModuleFactory.hooks.createParser
+					.for("javascript/esm")
+					.tap("JavascriptModulesPlugin", options => {
+						return new Parser(options, "module");
+					});
+				normalModuleFactory.hooks.createGenerator
+					.for("javascript/auto")
+					.tap("JavascriptModulesPlugin", () => {
+						return new JavascriptGenerator();
+					});
+				normalModuleFactory.hooks.createGenerator
+					.for("javascript/dynamic")
+					.tap("JavascriptModulesPlugin", () => {
+						return new JavascriptGenerator();
+					});
+				normalModuleFactory.hooks.createGenerator
+					.for("javascript/esm")
+					.tap("JavascriptModulesPlugin", () => {
+						return new JavascriptGenerator();
+					});
+				compilation.mainTemplate.hooks.renderManifest.tap(
+					"JavascriptModulesPlugin",
+					(result, options) => {
+						const chunk = options.chunk;
+						const hash = options.hash;
+						const fullHash = options.fullHash;
+						const outputOptions = options.outputOptions;
+						const moduleTemplates = options.moduleTemplates;
+						const dependencyTemplates = options.dependencyTemplates;
+
+						let filenameTemplate;
+						if (chunk.filenameTemplate)
+							filenameTemplate = chunk.filenameTemplate;
+						else filenameTemplate = outputOptions.filename;
+
+						const useChunkHash = compilation.mainTemplate.useChunkHash(chunk);
+
+						result.push({
+							render: () =>
+								compilation.mainTemplate.render(
+									hash,
+									chunk,
+									moduleTemplates.javascript,
+									dependencyTemplates
+								),
+							filenameTemplate,
+							pathOptions: {
+								noChunkHash: !useChunkHash,
+								contentHashType: "javascript",
+								chunk
+							},
+							identifier: `chunk${chunk.id}`,
+							hash: useChunkHash ? chunk.hash : fullHash
+						});
+						return result;
+					}
+				);
+				compilation.mainTemplate.hooks.modules.tap(
+					"JavascriptModulesPlugin",
+					(source, chunk, hash, moduleTemplate, dependencyTemplates) => {
+						return Template.renderChunkModules(
+							chunk,
+							m => typeof m.source === "function",
+							moduleTemplate,
+							dependencyTemplates,
+							"/******/ "
+						);
+					}
+				);
+				compilation.chunkTemplate.hooks.renderManifest.tap(
+					"JavascriptModulesPlugin",
+					(result, options) => {
+						const chunk = options.chunk;
+						const outputOptions = options.outputOptions;
+						const moduleTemplates = options.moduleTemplates;
+						const dependencyTemplates = options.dependencyTemplates;
+
+						let filenameTemplate;
+						if (chunk.filenameTemplate)
+							filenameTemplate = chunk.filenameTemplate;
+						else filenameTemplate = outputOptions.chunkFilename;
+
+						result.push({
+							render: () =>
+								this.renderJavascript(
+									compilation.chunkTemplate,
+									chunk,
+									moduleTemplates.javascript,
+									dependencyTemplates
+								),
+							filenameTemplate,
+							pathOptions: {
+								chunk,
+								contentHashType: "javascript"
+							},
+							identifier: `chunk${chunk.id}`,
+							hash: chunk.hash
+						});
+
+						return result;
+					}
+				);
+				compilation.hooks.contentHash.tap("JavascriptModulesPlugin", chunk => {
+					const outputOptions = compilation.outputOptions;
+					const {
+						hashSalt,
+						hashDigest,
+						hashDigestLength,
+						hashFunction
+					} = outputOptions;
+					const hash = createHash(hashFunction);
+					if (hashSalt) hash.update(hashSalt);
+					const template = chunk.hasRuntime()
+						? compilation.mainTemplate
+						: compilation.chunkTemplate;
+					template.updateHashForChunk(hash, chunk);
+					for (const m of chunk.modulesIterable) {
+						if (typeof m.source === "function") {
+							hash.update(m.hash);
+						}
+					}
+					chunk.contentHash.javascript = hash
+						.digest(hashDigest)
+						.substr(0, hashDigestLength);
+				});
+			}
+		);
+	}
+
+	renderJavascript(chunkTemplate, chunk, moduleTemplate, dependencyTemplates) {
+		const moduleSources = Template.renderChunkModules(
+			chunk,
+			m => typeof m.source === "function",
+			moduleTemplate,
+			dependencyTemplates
+		);
+		const core = chunkTemplate.hooks.modules.call(
+			moduleSources,
+			chunk,
+			moduleTemplate,
+			dependencyTemplates
+		);
+		let source = chunkTemplate.hooks.render.call(
+			core,
+			chunk,
+			moduleTemplate,
+			dependencyTemplates
+		);
+		if (chunk.hasEntryModule()) {
+			source = chunkTemplate.hooks.renderWithEntry.call(source, chunk);
+		}
+		chunk.rendered = true;
+		return new ConcatSource(source, ";");
+	}
+}
+
+module.exports = JavascriptModulesPlugin;

package/lib/JsonGenerator.js

@@ -1,42 +1,42 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const ConcatSource = require("webpack-sources").ConcatSource;
-
-const stringifySafe = data =>
-	JSON.stringify(data).replace(
-		/\u2028|\u2029/g,
-		str => (str === "\u2029" ? "\\u2029" : "\\u2028")
-	); // invalid in JavaScript but valid JSON
-
-class JsonGenerator {
-	generate(module, dependencyTemplates, runtimeTemplate) {
-		const source = new ConcatSource();
-		const data = module.buildInfo.jsonData;
-		if (
-			Array.isArray(module.buildMeta.providedExports) &&
-			!module.isUsed("default")
-		) {
-			// Only some exports are used: We can optimize here, by only generating a part of the JSON
-			const reducedJson = {};
-			for (const exportName of module.buildMeta.providedExports) {
-				if (exportName === "default") continue;
-				const used = module.isUsed(exportName);
-				if (used) {
-					reducedJson[used] = data[exportName];
-				}
-			}
-			source.add(
-				`${module.moduleArgument}.exports = ${stringifySafe(reducedJson)};`
-			);
-		} else {
-			source.add(`${module.moduleArgument}.exports = ${stringifySafe(data)};`);
-		}
-		return source;
-	}
-}
-
-module.exports = JsonGenerator;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const { ConcatSource } = require("webpack-sources");
+
+const stringifySafe = data =>
+	JSON.stringify(data).replace(
+		/\u2028|\u2029/g,
+		str => (str === "\u2029" ? "\\u2029" : "\\u2028")
+	); // invalid in JavaScript but valid JSON
+
+class JsonGenerator {
+	generate(module, dependencyTemplates, runtimeTemplate) {
+		const source = new ConcatSource();
+		const data = module.buildInfo.jsonData;
+		if (
+			Array.isArray(module.buildMeta.providedExports) &&
+			!module.isUsed("default")
+		) {
+			// Only some exports are used: We can optimize here, by only generating a part of the JSON
+			const reducedJson = {};
+			for (const exportName of module.buildMeta.providedExports) {
+				if (exportName === "default") continue;
+				const used = module.isUsed(exportName);
+				if (used) {
+					reducedJson[used] = data[exportName];
+				}
+			}
+			source.add(
+				`${module.moduleArgument}.exports = ${stringifySafe(reducedJson)};`
+			);
+		} else {
+			source.add(`${module.moduleArgument}.exports = ${stringifySafe(data)};`);
+		}
+		return source;
+	}
+}
+
+module.exports = JsonGenerator;