webpack 4.17.3 → 4.19.1

package/README.md

@@ -221,7 +221,7 @@ or are automatically applied via regex from your webpack configuration.
 |<a href="https://github.com/webpack/style-loader">`<style>`</a>|![style-npm]|![style-size]|Add exports of a module as style to DOM|
 |<a href="https://github.com/webpack/css-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/css-3.svg"></a>|![css-npm]|![css-size]|Loads CSS file with resolved imports and returns CSS code|
 |<a href="https://github.com/webpack/less-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/less-63.svg"></a>|![less-npm]|![less-size]|Loads and compiles a LESS file|
-|<a href="https://github.com/jtangelder/sass-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/sass-1.svg"></a>|![sass-npm]|![sass-size]|Loads and compiles a SASS/SCSS file|
+|<a href="https://github.com/jtangelder/sass-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/sass-1.svg"></a>|![sass-npm]|![sass-size]|Loads and compiles a Sass/SCSS file|
 |<a href="https://github.com/shama/stylus-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/stylus.svg"></a>|![stylus-npm]|![stylus-size]|Loads and compiles a Stylus file|
 |<a href="https://github.com/postcss/postcss-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/postcss.svg"></a>|![postcss-npm]|![postcss-size]|Loads and transforms a CSS/SSS file using [PostCSS](http://postcss.org)|
 

package/lib/ChunkTemplate.js

@@ -9,6 +9,7 @@ const { Tapable, SyncWaterfallHook, SyncHook } = require("tapable");
 /** @typedef {import("./ModuleTemplate")} ModuleTemplate */
 /** @typedef {import("./Chunk")} Chunk */
 /** @typedef {import("./Module")} Module} */
+/** @typedef {import("./Dependency").DependencyTemplate} DependencyTemplate} */
 /** @typedef {import("./util/createHash").Hash} Hash} */
 
 /**
@@ -71,12 +72,15 @@ module.exports = class ChunkTemplate extends Tapable {
 	}
 
 	/**
+	 * TODO webpack 5: remove moduleTemplate and dependencyTemplates
 	 * Updates hash with chunk-specific information from this template
 	 * @param {Hash} hash the hash to update
 	 * @param {Chunk} chunk the chunk
+	 * @param {ModuleTemplate} moduleTemplate ModuleTemplate instance for render
+	 * @param {Map<Function, DependencyTemplate>} dependencyTemplates dependency templates
 	 * @returns {void}
 	 */
-	updateHashForChunk(hash, chunk) {
+	updateHashForChunk(hash, chunk, moduleTemplate, dependencyTemplates) {
 		this.updateHash(hash);
 		this.hooks.hashForChunk.call(hash, chunk);
 	}

package/lib/Compilation.js

@@ -455,9 +455,10 @@ class Compilation extends Tapable {
 		this.children = [];
 		/** @type {Map<DepConstructor, ModuleFactory>} */
 		this.dependencyFactories = new Map();
-		/** @type {Map<DepConstructor|string, DependencyTemplate|string>} */
+		/** @type {Map<DepConstructor, DependencyTemplate>} */
 		this.dependencyTemplates = new Map();
 		// TODO refactor this in webpack 5 to a custom DependencyTemplates class with a hash property
+		// @ts-ignore
 		this.dependencyTemplates.set("hash", "");
 		this.childrenCounters = {};
 		/** @type {Set<number|string>} */
@@ -2259,7 +2260,12 @@ class Compilation extends Tapable {
 			const template = chunk.hasRuntime()
 				? this.mainTemplate
 				: this.chunkTemplate;
-			template.updateHashForChunk(chunkHash, chunk);
+			template.updateHashForChunk(
+				chunkHash,
+				chunk,
+				this.moduleTemplates.javascript,
+				this.dependencyTemplates
+			);
 			this.hooks.chunkHash.call(chunk, chunkHash);
 			chunk.hash = chunkHash.digest(hashDigest);
 			hash.update(chunk.hash);

package/lib/ExternalModule.js

@@ -74,7 +74,9 @@ class ExternalModule extends Module {
 			.slice(1)
 			.map(r => `[${JSON.stringify(r)}]`)
 			.join("");
-		return `module.exports = require(${moduleName})${objectLookup};`;
+		return `module.exports = require(${JSON.stringify(
+			moduleName
+		)})${objectLookup};`;
 	}
 
 	checkExternalVariable(variableToCheck, request) {
@@ -94,15 +96,25 @@ class ExternalModule extends Module {
 	}
 
 	getSourceForDefaultCase(optional, request) {
+		if (!Array.isArray(request)) {
+			// make it an array as the look up works the same basically
+			request = [request];
+		}
+
+		const variableName = request[0];
 		const missingModuleError = optional
-			? this.checkExternalVariable(request, request)
+			? this.checkExternalVariable(variableName, request.join("."))
 			: "";
-		return `${missingModuleError}module.exports = ${request};`;
+		const objectLookup = request
+			.slice(1)
+			.map(r => `[${JSON.stringify(r)}]`)
+			.join("");
+		return `${missingModuleError}module.exports = ${variableName}${objectLookup};`;
 	}
 
 	getSourceString(runtime) {
 		const request =
-			typeof this.request === "object"
+			typeof this.request === "object" && !Array.isArray(this.request)
 				? this.request[this.externalType]
 				: this.request;
 		switch (this.externalType) {

package/lib/JavascriptModulesPlugin.js

@@ -137,7 +137,12 @@ class JavascriptModulesPlugin {
 						: compilation.chunkTemplate;
 					hash.update(`${chunk.id} `);
 					hash.update(chunk.ids ? chunk.ids.join(",") : "");
-					template.updateHashForChunk(hash, chunk);
+					template.updateHashForChunk(
+						hash,
+						chunk,
+						compilation.moduleTemplates.javascript,
+						compilation.dependencyTemplates
+					);
 					for (const m of chunk.modulesIterable) {
 						if (typeof m.source === "function") {
 							hash.update(m.hash);

package/lib/MainTemplate.js

@@ -361,14 +361,14 @@ module.exports = class MainTemplate extends Tapable {
 	}
 
 	/**
-	 *
+	 * TODO webpack 5: remove moduleTemplate and dependencyTemplates
 	 * @param {string} hash hash to be used for render call
 	 * @param {Chunk} chunk Chunk instance
 	 * @param {ModuleTemplate} moduleTemplate ModuleTemplate instance for render
 	 * @param {Map<Function, DependencyTemplate>} dependencyTemplates dependency templates
-	 * @returns {ConcatSource} the newly generated source from rendering
+	 * @returns {string[]} the generated source of the bootstrap code
 	 */
-	render(hash, chunk, moduleTemplate, dependencyTemplates) {
+	renderBootstrap(hash, chunk, moduleTemplate, dependencyTemplates) {
 		const buf = [];
 		buf.push(
 			this.hooks.bootstrap.call(
@@ -392,6 +392,23 @@ module.exports = class MainTemplate extends Tapable {
 		buf.push("");
 		buf.push(Template.asString(this.hooks.beforeStartup.call("", chunk, hash)));
 		buf.push(Template.asString(this.hooks.startup.call("", chunk, hash)));
+		return buf;
+	}
+
+	/**
+	 * @param {string} hash hash to be used for render call
+	 * @param {Chunk} chunk Chunk instance
+	 * @param {ModuleTemplate} moduleTemplate ModuleTemplate instance for render
+	 * @param {Map<Function, DependencyTemplate>} dependencyTemplates dependency templates
+	 * @returns {ConcatSource} the newly generated source from rendering
+	 */
+	render(hash, chunk, moduleTemplate, dependencyTemplates) {
+		const buf = this.renderBootstrap(
+			hash,
+			chunk,
+			moduleTemplate,
+			dependencyTemplates
+		);
 		let source = this.hooks.render.call(
 			new OriginalSource(
 				Template.prefix(buf, " \t") + "\n",
@@ -486,19 +503,29 @@ module.exports = class MainTemplate extends Tapable {
 	updateHash(hash) {
 		hash.update("maintemplate");
 		hash.update("3");
-		hash.update(this.outputOptions.publicPath + "");
 		this.hooks.hash.call(hash);
 	}
 
 	/**
+	 * TODO webpack 5: remove moduleTemplate and dependencyTemplates
 	 * Updates hash with chunk-specific information from this template
 	 * @param {Hash} hash the hash to update
 	 * @param {Chunk} chunk the chunk
+	 * @param {ModuleTemplate} moduleTemplate ModuleTemplate instance for render
+	 * @param {Map<Function, DependencyTemplate>} dependencyTemplates dependency templates
 	 * @returns {void}
 	 */
-	updateHashForChunk(hash, chunk) {
+	updateHashForChunk(hash, chunk, moduleTemplate, dependencyTemplates) {
 		this.updateHash(hash);
 		this.hooks.hashForChunk.call(hash, chunk);
+		for (const line of this.renderBootstrap(
+			"0000",
+			chunk,
+			moduleTemplate,
+			dependencyTemplates
+		)) {
+			hash.update(line);
+		}
 	}
 
 	useChunkHash(chunk) {

package/lib/SourceMapDevToolPlugin.js

@@ -84,7 +84,7 @@ class SourceMapDevToolPlugin {
 		const fallbackModuleFilenameTemplate = this.fallbackModuleFilenameTemplate;
 		const requestShortener = compiler.requestShortener;
 		const options = this.options;
-		options.test = options.test || /\.(js|css)($|\?)/i;
+		options.test = options.test || /\.(m?js|css)($|\?)/i;
 
 		const matchObject = ModuleFilenameHelpers.matchObject.bind(
 			undefined,

package/lib/WebpackOptionsDefaulter.js

@@ -327,7 +327,11 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 		this.set("resolve.extensions", [".wasm", ".mjs", ".js", ".json"]);
 		this.set("resolve.mainFiles", ["index"]);
 		this.set("resolve.aliasFields", "make", options => {
-			if (options.target === "web" || options.target === "webworker") {
+			if (
+				options.target === "web" ||
+				options.target === "webworker" ||
+				options.target === "electron-renderer"
+			) {
 				return ["browser"];
 			} else {
 				return [];

package/lib/dependencies/HarmonyExportDependencyParserPlugin.js

@@ -54,10 +54,25 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 		parser.hooks.exportExpression.tap(
 			"HarmonyExportDependencyParserPlugin",
 			(statement, expr) => {
+				const comments = parser.getComments([
+					statement.range[0],
+					expr.range[0]
+				]);
 				const dep = new HarmonyExportExpressionDependency(
 					parser.state.module,
 					expr.range,
-					statement.range
+					statement.range,
+					comments
+						.map(c => {
+							switch (c.type) {
+								case "Block":
+									return `/*${c.value}*/`;
+								case "Line":
+									return `//${c.value}\n`;
+							}
+							return "";
+						})
+						.join("")
 				);
 				dep.loc = Object.create(statement.loc);
 				dep.loc.index = -1;

package/lib/dependencies/HarmonyExportExpressionDependency.js

@@ -6,11 +6,12 @@
 const NullDependency = require("./NullDependency");
 
 class HarmonyExportExpressionDependency extends NullDependency {
-	constructor(originModule, range, rangeStatement) {
+	constructor(originModule, range, rangeStatement, prefix) {
 		super();
 		this.originModule = originModule;
 		this.range = range;
 		this.rangeStatement = rangeStatement;
+		this.prefix = prefix;
 	}
 
 	get type() {
@@ -31,7 +32,11 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 		const content = this.getContent(dep.originModule, used);
 
 		if (dep.range) {
-			source.replace(dep.rangeStatement[0], dep.range[0] - 1, content + "(");
+			source.replace(
+				dep.rangeStatement[0],
+				dep.range[0] - 1,
+				content + "(" + dep.prefix
+			);
 			source.replace(dep.range[1], dep.rangeStatement[1] - 1, ");");
 			return;
 		}

package/lib/node/NodeMainTemplatePlugin.js

@@ -96,7 +96,7 @@ module.exports = class NodeMainTemplatePlugin {
 								"var promise = new Promise(function(resolve, reject) {",
 								Template.indent([
 									"installedChunkData = installedChunks[chunkId] = [resolve, reject];",
-									"var filename = __dirname + " +
+									"var filename = require('path').join(__dirname, " +
 										mainTemplate.getAssetPath(
 											JSON.stringify(`/${chunkFilename}`),
 											{
@@ -155,7 +155,7 @@ module.exports = class NodeMainTemplatePlugin {
 												contentHashType: "javascript"
 											}
 										) +
-										";",
+										");",
 									"require('fs').readFile(filename, 'utf-8',  function(err, content) {",
 									Template.indent(
 										[
@@ -315,9 +315,7 @@ module.exports = class NodeMainTemplatePlugin {
 		);
 		mainTemplate.hooks.hash.tap("NodeMainTemplatePlugin", hash => {
 			hash.update("node");
-			hash.update("3");
-			hash.update(mainTemplate.outputOptions.filename + "");
-			hash.update(mainTemplate.outputOptions.chunkFilename + "");
+			hash.update("4");
 		});
 	}
 };

package/lib/wasm/WasmMainTemplatePlugin.js

@@ -335,23 +335,8 @@ class WasmMainTemplatePlugin {
 		);
 		mainTemplate.hooks.hash.tap("WasmMainTemplatePlugin", hash => {
 			hash.update("WasmMainTemplatePlugin");
-			hash.update("1");
-			hash.update(`${mainTemplate.outputOptions.webassemblyModuleFilename}`);
-			hash.update(`${this.mangleImports}`);
+			hash.update("2");
 		});
-		mainTemplate.hooks.hashForChunk.tap(
-			"WasmMainTemplatePlugin",
-			(hash, chunk) => {
-				const chunkModuleMaps = chunk.getChunkModuleMaps(m =>
-					m.type.startsWith("webassembly")
-				);
-				hash.update(JSON.stringify(chunkModuleMaps.id));
-				const wasmModules = getAllWasmModules(chunk);
-				for (const module of wasmModules) {
-					hash.update(module.hash);
-				}
-			}
-		);
 	}
 }
 

package/lib/wasm/WebAssemblyGenerator.js

@@ -9,7 +9,6 @@ const Template = require("../Template");
 const WebAssemblyUtils = require("./WebAssemblyUtils");
 const { RawSource } = require("webpack-sources");
 
-const { shrinkPaddedLEB128 } = require("@webassemblyjs/wasm-opt");
 const { editWithAST, addWithAST } = require("@webassemblyjs/wasm-edit");
 const { decode } = require("@webassemblyjs/wasm-parser");
 const t = require("@webassemblyjs/ast");
@@ -30,17 +29,6 @@ const WebAssemblyExportImportedDependency = require("../dependencies/WebAssembly
  * @typedef {(ArrayBuffer) => ArrayBuffer} ArrayBufferTransform
  */
 
-/**
- * Run some preprocessing on the binary before wasm-edit
- *
- * @param {ArrayBuffer} ab - original binary
- * @returns {ArrayBufferTransform} transform
- */
-const preprocess = ab => {
-	const optBin = shrinkPaddedLEB128(new Uint8Array(ab));
-	return optBin.buffer;
-};
-
 /**
  * @template T
  * @param {Function[]} fns transforms
@@ -382,7 +370,6 @@ class WebAssemblyGenerator extends Generator {
 	 */
 	generate(module, dependencyTemplates, runtimeTemplate, type) {
 		let bin = module.originalSource().source();
-		bin = preprocess(bin);
 
 		const initFuncId = t.identifier(
 			Array.isArray(module.usedExports)

package/lib/web/JsonpMainTemplatePlugin.js

@@ -581,11 +581,7 @@ ${globalObject}[${JSON.stringify(hotUpdateFunction)}] = ${runtimeSource}`;
 		);
 		mainTemplate.hooks.hash.tap("JsonpMainTemplatePlugin", hash => {
 			hash.update("jsonp");
-			hash.update("5");
-			hash.update(`${mainTemplate.outputOptions.globalObject}`);
-			hash.update(`${mainTemplate.outputOptions.chunkFilename}`);
-			hash.update(`${mainTemplate.outputOptions.jsonpFunction}`);
-			hash.update(`${mainTemplate.outputOptions.hotUpdateFunction}`);
+			hash.update("6");
 		});
 	}
 }

package/lib/webworker/WebWorkerMainTemplatePlugin.js

@@ -184,12 +184,7 @@ class WebWorkerMainTemplatePlugin {
 		);
 		mainTemplate.hooks.hash.tap("WebWorkerMainTemplatePlugin", hash => {
 			hash.update("webworker");
-			hash.update("3");
-			hash.update(`${mainTemplate.outputOptions.publicPath}`);
-			hash.update(`${mainTemplate.outputOptions.filename}`);
-			hash.update(`${mainTemplate.outputOptions.chunkFilename}`);
-			hash.update(`${mainTemplate.outputOptions.chunkCallbackName}`);
-			hash.update(`${mainTemplate.outputOptions.globalObject}`);
+			hash.update("4");
 		});
 	}
 }

package/package.json

@@ -1,15 +1,14 @@
 {
   "name": "webpack",
-  "version": "4.17.3",
+  "version": "4.19.1",
   "author": "Tobias Koppers @sokra",
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",
   "dependencies": {
-    "@webassemblyjs/ast": "1.5.13",
-    "@webassemblyjs/helper-module-context": "1.5.13",
-    "@webassemblyjs/wasm-edit": "1.5.13",
-    "@webassemblyjs/wasm-opt": "1.5.13",
-    "@webassemblyjs/wasm-parser": "1.5.13",
+    "@webassemblyjs/ast": "1.7.6",
+    "@webassemblyjs/helper-module-context": "1.7.6",
+    "@webassemblyjs/wasm-edit": "1.7.6",
+    "@webassemblyjs/wasm-parser": "1.7.6",
     "acorn": "^5.6.2",
     "acorn-dynamic-import": "^3.0.0",
     "ajv": "^6.1.0",
@@ -26,7 +25,7 @@
     "neo-async": "^2.5.0",
     "node-libs-browser": "^2.0.0",
     "schema-utils": "^0.4.4",
-    "tapable": "^1.0.0",
+    "tapable": "^1.1.0",
     "uglifyjs-webpack-plugin": "^1.2.4",
     "watchpack": "^1.5.0",
     "webpack-sources": "^1.2.0"

package/schemas/WebpackOptions.json

@@ -123,6 +123,9 @@
               {
                 "type": "object"
               },
+              {
+                "$ref": "#/definitions/common.arrayOfStringValues"
+              },
               {
                 "type": "boolean"
               }