webpack 4.29.2 → 4.29.6

package/lib/APIPlugin.js

@@ -58,12 +58,12 @@ class APIPlugin {
 											REPLACEMENTS[key]
 									  )
 							);
-						parser.hooks.evaluateTypeof
-							.for(key)
-							.tap(
-								"APIPlugin",
-								ParserHelpers.evaluateToString(REPLACEMENT_TYPES[key])
-							);
+						const type = REPLACEMENT_TYPES[key];
+						if (type) {
+							parser.hooks.evaluateTypeof
+								.for(key)
+								.tap("APIPlugin", ParserHelpers.evaluateToString(type));
+						}
 					});
 				};
 

package/lib/ContextModule.js

@@ -380,13 +380,12 @@ function webpackContext(req) {
 	${returnModuleObject}
 }
 function webpackContextResolve(req) {
-	var id = map[req];
-	if(!(id + 1)) { // check for number or string
+	if(!__webpack_require__.o(map, req)) {
 		var e = new Error("Cannot find module '" + req + "'");
 		e.code = 'MODULE_NOT_FOUND';
 		throw e;
 	}
-	return id;
+	return map[req];
 }
 webpackContext.keys = function webpackContextKeys() {
 	return Object.keys(map);
@@ -414,13 +413,12 @@ function webpackContext(req) {
 	${returnModuleObject}
 }
 function webpackContextResolve(req) {
-	var id = map[req];
-	if(!(id + 1)) { // check for number or string
+	if(!__webpack_require__.o(map, req)) {
 		var e = new Error("Cannot find module '" + req + "'");
 		e.code = 'MODULE_NOT_FOUND';
 		throw e;
 	}
-	return id;
+	return map[req];
 }
 webpackContext.keys = function webpackContextKeys() {
 	return Object.keys(map);
@@ -452,13 +450,12 @@ function webpackAsyncContextResolve(req) {
 	// Here Promise.resolve().then() is used instead of new Promise() to prevent
 	// uncaught exception popping up in devtools
 	return Promise.resolve().then(function() {
-		var id = map[req];
-		if(!(id + 1)) { // check for number or string
+		if(!__webpack_require__.o(map, req)) {
 			var e = new Error("Cannot find module '" + req + "'");
 			e.code = 'MODULE_NOT_FOUND';
 			throw e;
 		}
-		return id;
+		return map[req];
 	});
 }
 webpackAsyncContext.keys = function webpackAsyncContextKeys() {
@@ -488,13 +485,12 @@ function webpackAsyncContextResolve(req) {
 	// Here Promise.resolve().then() is used instead of new Promise() to prevent
 	// uncaught exception popping up in devtools
 	return Promise.resolve().then(function() {
-		var id = map[req];
-		if(!(id + 1)) { // check for number or string
+		if(!__webpack_require__.o(map, req)) {
 			var e = new Error("Cannot find module '" + req + "'");
 			e.code = 'MODULE_NOT_FOUND';
 			throw e;
 		}
-		return id;
+		return map[req];
 	});
 }
 webpackAsyncContext.keys = function webpackAsyncContextKeys() {
@@ -527,13 +523,12 @@ function webpackAsyncContext(req) {
 }
 function webpackAsyncContextResolve(req) {
 	return ${promise}.then(function() {
-		var id = map[req];
-		if(!(id + 1)) { // check for number or string
+		if(!__webpack_require__.o(map, req)) {
 			var e = new Error("Cannot find module '" + req + "'");
 			e.code = 'MODULE_NOT_FOUND';
 			throw e;
 		}
-		return id;
+		return map[req];
 	});
 }
 webpackAsyncContext.keys = function webpackAsyncContextKeys() {
@@ -546,59 +541,92 @@ module.exports = webpackAsyncContext;`;
 
 	getLazySource(blocks, id) {
 		let hasMultipleOrNoChunks = false;
+		let hasNoChunk = true;
 		const fakeMap = this.getFakeMap(blocks.map(b => b.dependencies[0]));
+		const hasFakeMap = typeof fakeMap === "object";
 		const map = blocks
 			.filter(block => block.dependencies[0].module)
-			.map(block => ({
-				dependency: block.dependencies[0],
-				block: block,
-				userRequest: block.dependencies[0].userRequest
-			}))
+			.map(block => {
+				const chunks = block.chunkGroup ? block.chunkGroup.chunks : [];
+				if (chunks.length > 0) {
+					hasNoChunk = false;
+				}
+				if (chunks.length !== 1) {
+					hasMultipleOrNoChunks = true;
+				}
+				return {
+					dependency: block.dependencies[0],
+					block: block,
+					userRequest: block.dependencies[0].userRequest,
+					chunks
+				};
+			})
 			.sort((a, b) => {
 				if (a.userRequest === b.userRequest) return 0;
 				return a.userRequest < b.userRequest ? -1 : 1;
 			})
 			.reduce((map, item) => {
-				const chunks =
-					(item.block.chunkGroup && item.block.chunkGroup.chunks) || [];
-				if (chunks.length !== 1) {
-					hasMultipleOrNoChunks = true;
-				}
-				const arrayStart = [item.dependency.module.id];
-				if (typeof fakeMap === "object") {
-					arrayStart.push(fakeMap[item.dependency.module.id]);
+				const chunks = item.chunks;
+
+				if (hasNoChunk && !hasFakeMap) {
+					map[item.userRequest] = item.dependency.module.id;
+				} else {
+					const arrayStart = [item.dependency.module.id];
+					if (typeof fakeMap === "object") {
+						arrayStart.push(fakeMap[item.dependency.module.id]);
+					}
+					map[item.userRequest] = arrayStart.concat(
+						chunks.map(chunk => chunk.id)
+					);
 				}
-				map[item.userRequest] = arrayStart.concat(
-					chunks.map(chunk => chunk.id)
-				);
 
 				return map;
 			}, Object.create(null));
 
-		const chunksStartPosition = typeof fakeMap === "object" ? 2 : 1;
-		const requestPrefix = hasMultipleOrNoChunks
+		const shortMode = hasNoChunk && !hasFakeMap;
+		const chunksStartPosition = hasFakeMap ? 2 : 1;
+		const requestPrefix = hasNoChunk
+			? "Promise.resolve()"
+			: hasMultipleOrNoChunks
 			? `Promise.all(ids.slice(${chunksStartPosition}).map(__webpack_require__.e))`
 			: `__webpack_require__.e(ids[${chunksStartPosition}])`;
 		const returnModuleObject = this.getReturnModuleObjectSource(
 			fakeMap,
-			"ids[1]"
+			shortMode ? "invalid" : "ids[1]"
 		);
 
-		return `var map = ${JSON.stringify(map, null, "\t")};
+		const webpackAsyncContext =
+			requestPrefix === "Promise.resolve()"
+				? `${shortMode ? "" : ""}
 function webpackAsyncContext(req) {
-	var ids = map[req];
-	if(!ids) {
+	return Promise.resolve().then(function() {
+		if(!__webpack_require__.o(map, req)) {
+			var e = new Error("Cannot find module '" + req + "'");
+			e.code = 'MODULE_NOT_FOUND';
+			throw e;
+		}
+
+		${shortMode ? "var id = map[req];" : "var ids = map[req], id = ids[0];"}
+		${returnModuleObject}
+	});
+}`
+				: `function webpackAsyncContext(req) {
+	if(!__webpack_require__.o(map, req)) {
 		return Promise.resolve().then(function() {
 			var e = new Error("Cannot find module '" + req + "'");
 			e.code = 'MODULE_NOT_FOUND';
 			throw e;
 		});
 	}
+
+	var ids = map[req], id = ids[0];
 	return ${requestPrefix}.then(function() {
-		var id = ids[0];
 		${returnModuleObject}
 	});
-}
+}`;
+
+		return `var map = ${JSON.stringify(map, null, "\t")};
+${webpackAsyncContext}
 webpackAsyncContext.keys = function webpackAsyncContextKeys() {
 	return Object.keys(map);
 };

package/lib/WebpackError.js

@@ -4,6 +4,8 @@
 */
 "use strict";
 
+const inspect = require("util").inspect.custom;
+
 class WebpackError extends Error {
 	/**
 	 * Creates an instance of WebpackError.
@@ -21,7 +23,7 @@ class WebpackError extends Error {
 		Error.captureStackTrace(this, this.constructor);
 	}
 
-	inspect() {
+	[inspect]() {
 		return this.stack + (this.details ? `\n${this.details}` : "");
 	}
 }

package/lib/dependencies/HarmonyAcceptDependency.js

@@ -34,7 +34,10 @@ HarmonyAcceptDependency.Template = class HarmonyAcceptDependencyTemplate {
 				dep.range[0],
 				`function(__WEBPACK_OUTDATED_DEPENDENCIES__) { ${content}(`
 			);
-			source.insert(dep.range[1], ")(__WEBPACK_OUTDATED_DEPENDENCIES__); }");
+			source.insert(
+				dep.range[1],
+				")(__WEBPACK_OUTDATED_DEPENDENCIES__); }.bind(this)"
+			);
 			return;
 		}
 

package/lib/wasm/WebAssemblyGenerator.js

@@ -177,9 +177,12 @@ const rewriteImportedGlobals = state => bin => {
 
 				globalType.mutability = "var";
 
-				const init = createDefaultInitForGlobal(globalType);
+				const init = [
+					createDefaultInitForGlobal(globalType),
+					t.instruction("end")
+				];
 
-				newGlobals.push(t.global(globalType, [init]));
+				newGlobals.push(t.global(globalType, init));
 
 				path.remove();
 			}
@@ -196,7 +199,10 @@ const rewriteImportedGlobals = state => bin => {
 
 				const initialGlobalidx = init.args[0];
 
-				node.init = [createDefaultInitForGlobal(node.globalType)];
+				node.init = [
+					createDefaultInitForGlobal(node.globalType),
+					t.instruction("end")
+				];
 
 				additionalInitCode.push(
 					/**
@@ -316,6 +322,8 @@ const addInitFunction = ({
 		funcBody.push(instr);
 	}
 
+	funcBody.push(t.instruction("end"));
+
 	const funcResults = [];
 
 	// Code section

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "webpack",
-  "version": "4.29.2",
+  "version": "4.29.6",
   "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.7.11",
-    "@webassemblyjs/helper-module-context": "1.7.11",
-    "@webassemblyjs/wasm-edit": "1.7.11",
-    "@webassemblyjs/wasm-parser": "1.7.11",
+    "@webassemblyjs/ast": "1.8.5",
+    "@webassemblyjs/helper-module-context": "1.8.5",
+    "@webassemblyjs/wasm-edit": "1.8.5",
+    "@webassemblyjs/wasm-parser": "1.8.5",
     "acorn": "^6.0.5",
     "acorn-dynamic-import": "^4.0.0",
     "ajv": "^6.1.0",
@@ -34,6 +34,7 @@
     "@types/node": "^10.12.21",
     "@types/tapable": "^1.0.1",
     "@types/webpack-sources": "^0.1.4",
+    "@yarnpkg/lockfile": "^1.1.0",
     "benchmark": "^2.1.1",
     "bundle-loader": "~0.5.0",
     "coffee-loader": "^0.9.0",
@@ -119,14 +120,14 @@
     "build:examples": "cd examples && node buildAll.js",
     "pretest": "yarn lint",
     "prelint": "yarn setup",
-    "lint": "yarn code-lint && yarn schema-lint && yarn type-lint && yarn special-lint",
+    "lint": "yarn code-lint && yarn jest-lint && yarn type-lint && yarn special-lint",
     "code-lint": "eslint --cache \"{setup,lib,bin,hot,buildin,benchmark,tooling,schemas}/**/*.js\" \"test/*.js\" \"test/{configCases,watchCases,statsCases,hotCases}/**/webpack.config.js\" \"examples/**/webpack.config.js\"",
     "type-lint": "tsc --pretty",
     "special-lint": "node tooling/inherit-types && node tooling/format-schemas && node tooling/compile-to-definitions",
     "special-lint-fix": "node tooling/inherit-types --write --override && node tooling/format-schemas --write && node tooling/compile-to-definitions --write",
     "fix": "yarn code-lint --fix && yarn special-lint-fix",
     "pretty": "prettier --loglevel warn --write \"*.{ts,js,json,yml,yaml}\" \"{setup,lib,bin,hot,buildin,benchmark,tooling,schemas}/**/*.{js,json}\" \"test/*.js\" \"test/{configCases,watchCases,statsCases,hotCases}/**/webpack.config.js\" \"examples/**/webpack.config.js\"",
-    "schema-lint": "node --max-old-space-size=4096 node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.lint.js\" --no-verbose",
+    "jest-lint": "node --max-old-space-size=4096 node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.lint.js\" --no-verbose",
     "benchmark": "node --max-old-space-size=4096 --trace-deprecation node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.benchmark.js\" --runInBand",
     "cover": "yarn cover:init && yarn cover:all && yarn cover:report",
     "cover:init": "rimraf coverage",