webpack 5.10.0 → 5.11.0

package/lib/validateSchema.js

@@ -69,94 +69,105 @@ const REMOVED = {
 };
 /* cSpell:enable */
 
-const validateSchema = (schema, options) => {
-	validate(schema, options, {
-		name: "Webpack",
-		postFormatter: (formattedError, error) => {
-			const children = error.children;
-			if (
-				children &&
-				children.some(
-					child =>
-						child.keyword === "absolutePath" &&
-						child.dataPath === ".output.filename"
-				)
-			) {
-				return `${formattedError}\nPlease use output.path to specify absolute path and output.filename for the file name.`;
-			}
-
-			if (
-				children &&
-				children.some(
-					child => child.keyword === "pattern" && child.dataPath === ".devtool"
-				)
-			) {
-				return (
-					`${formattedError}\n` +
-					"BREAKING CHANGE since webpack 5: The devtool option is more strict.\n" +
-					"Please strictly follow the order of the keywords in the pattern."
-				);
-			}
-
-			if (error.keyword === "additionalProperties") {
-				const params = /** @type {import("ajv").AdditionalPropertiesParams} */ (error.params);
+/**
+ * @param {Parameters<typeof validate>[0]} schema a json schema
+ * @param {Parameters<typeof validate>[1]} options the options that should be validated
+ * @param {Parameters<typeof validate>[2]=} validationConfiguration configuration for generating errors
+ * @returns {void}
+ */
+const validateSchema = (schema, options, validationConfiguration) => {
+	validate(
+		schema,
+		options,
+		validationConfiguration || {
+			name: "Webpack",
+			postFormatter: (formattedError, error) => {
+				const children = error.children;
 				if (
-					Object.prototype.hasOwnProperty.call(
-						DID_YOU_MEAN,
-						params.additionalProperty
+					children &&
+					children.some(
+						child =>
+							child.keyword === "absolutePath" &&
+							child.dataPath === ".output.filename"
 					)
 				) {
-					return `${formattedError}\nDid you mean ${
-						DID_YOU_MEAN[params.additionalProperty]
-					}?`;
+					return `${formattedError}\nPlease use output.path to specify absolute path and output.filename for the file name.`;
 				}
 
 				if (
-					Object.prototype.hasOwnProperty.call(
-						REMOVED,
-						params.additionalProperty
+					children &&
+					children.some(
+						child =>
+							child.keyword === "pattern" && child.dataPath === ".devtool"
 					)
 				) {
-					return `${formattedError}\n${REMOVED[params.additionalProperty]}?`;
+					return (
+						`${formattedError}\n` +
+						"BREAKING CHANGE since webpack 5: The devtool option is more strict.\n" +
+						"Please strictly follow the order of the keywords in the pattern."
+					);
 				}
 
-				if (!error.dataPath) {
-					if (params.additionalProperty === "debug") {
-						return (
-							`${formattedError}\n` +
-							"The 'debug' property was removed in webpack 2.0.0.\n" +
-							"Loaders should be updated to allow passing this option via loader options in module.rules.\n" +
-							"Until loaders are updated one can use the LoaderOptionsPlugin to switch loaders into debug mode:\n" +
-							"plugins: [\n" +
-							"  new webpack.LoaderOptionsPlugin({\n" +
-							"    debug: true\n" +
-							"  })\n" +
-							"]"
-						);
+				if (error.keyword === "additionalProperties") {
+					const params = /** @type {import("ajv").AdditionalPropertiesParams} */ (error.params);
+					if (
+						Object.prototype.hasOwnProperty.call(
+							DID_YOU_MEAN,
+							params.additionalProperty
+						)
+					) {
+						return `${formattedError}\nDid you mean ${
+							DID_YOU_MEAN[params.additionalProperty]
+						}?`;
 					}
 
-					if (params.additionalProperty) {
-						return (
-							`${formattedError}\n` +
-							"For typos: please correct them.\n" +
-							"For loader options: webpack >= v2.0.0 no longer allows custom properties in configuration.\n" +
-							"  Loaders should be updated to allow passing options via loader options in module.rules.\n" +
-							"  Until loaders are updated one can use the LoaderOptionsPlugin to pass these options to the loader:\n" +
-							"  plugins: [\n" +
-							"    new webpack.LoaderOptionsPlugin({\n" +
-							"      // test: /\\.xxx$/, // may apply this only for some modules\n" +
-							"      options: {\n" +
-							`        ${params.additionalProperty}: …\n` +
-							"      }\n" +
-							"    })\n" +
-							"  ]"
-						);
+					if (
+						Object.prototype.hasOwnProperty.call(
+							REMOVED,
+							params.additionalProperty
+						)
+					) {
+						return `${formattedError}\n${REMOVED[params.additionalProperty]}?`;
+					}
+
+					if (!error.dataPath) {
+						if (params.additionalProperty === "debug") {
+							return (
+								`${formattedError}\n` +
+								"The 'debug' property was removed in webpack 2.0.0.\n" +
+								"Loaders should be updated to allow passing this option via loader options in module.rules.\n" +
+								"Until loaders are updated one can use the LoaderOptionsPlugin to switch loaders into debug mode:\n" +
+								"plugins: [\n" +
+								"  new webpack.LoaderOptionsPlugin({\n" +
+								"    debug: true\n" +
+								"  })\n" +
+								"]"
+							);
+						}
+
+						if (params.additionalProperty) {
+							return (
+								`${formattedError}\n` +
+								"For typos: please correct them.\n" +
+								"For loader options: webpack >= v2.0.0 no longer allows custom properties in configuration.\n" +
+								"  Loaders should be updated to allow passing options via loader options in module.rules.\n" +
+								"  Until loaders are updated one can use the LoaderOptionsPlugin to pass these options to the loader:\n" +
+								"  plugins: [\n" +
+								"    new webpack.LoaderOptionsPlugin({\n" +
+								"      // test: /\\.xxx$/, // may apply this only for some modules\n" +
+								"      options: {\n" +
+								`        ${params.additionalProperty}: …\n` +
+								"      }\n" +
+								"    })\n" +
+								"  ]"
+							);
+						}
 					}
 				}
-			}
 
-			return formattedError;
+				return formattedError;
+			}
 		}
-	});
+	);
 };
 module.exports = validateSchema;

package/lib/wasm-async/AsyncWasmChunkLoadingRuntimeModule.js

@@ -11,7 +11,7 @@ const Template = require("../Template");
 
 class AsyncWasmChunkLoadingRuntimeModule extends RuntimeModule {
 	constructor({ generateLoadBinaryCode, supportsStreaming }) {
-		super("wasm chunk loading", 10);
+		super("wasm chunk loading", RuntimeModule.STAGE_ATTACH);
 		this.generateLoadBinaryCode = generateLoadBinaryCode;
 		this.supportsStreaming = supportsStreaming;
 	}

package/lib/wasm-sync/WasmChunkLoadingRuntimeModule.js

@@ -190,7 +190,7 @@ const generateImportObject = (
 
 class WasmChunkLoadingRuntimeModule extends RuntimeModule {
 	constructor({ generateLoadBinaryCode, supportsStreaming, mangleImports }) {
-		super("wasm chunk loading", 10);
+		super("wasm chunk loading", RuntimeModule.STAGE_ATTACH);
 		this.generateLoadBinaryCode = generateLoadBinaryCode;
 		this.supportsStreaming = supportsStreaming;
 		this.mangleImports = mangleImports;

package/lib/web/JsonpChunkLoadingRuntimeModule.js

@@ -47,7 +47,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 	}
 
 	constructor(runtimeRequirements) {
-		super("jsonp chunk loading", 10);
+		super("jsonp chunk loading", RuntimeModule.STAGE_ATTACH);
 		this._runtimeRequirements = runtimeRequirements;
 	}
 
@@ -376,55 +376,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 			"",
 			withDefer
 				? Template.asString([
-						`var checkDeferredModules = ${runtimeTemplate.basicFunction(
-							"",
-							""
-						)};`,
-						"function checkDeferredModulesImpl() {",
-						Template.indent([
-							"var result;",
-							"for(var i = 0; i < deferredModules.length; i++) {",
-							Template.indent([
-								"var deferredModule = deferredModules[i];",
-								"var fulfilled = true;",
-								"for(var j = 1; j < deferredModule.length; j++) {",
-								Template.indent([
-									"var depId = deferredModule[j];",
-									"if(installedChunks[depId] !== 0) fulfilled = false;"
-								]),
-								"}",
-								"if(fulfilled) {",
-								Template.indent([
-									"deferredModules.splice(i--, 1);",
-									"result = " +
-										"__webpack_require__(" +
-										`${RuntimeGlobals.entryModuleId} = deferredModule[0]);`
-								]),
-								"}"
-							]),
-							"}",
-							"if(deferredModules.length === 0) {",
-							Template.indent([
-								`${RuntimeGlobals.startup}();`,
-								`${RuntimeGlobals.startup} = ${runtimeTemplate.basicFunction(
-									"",
-									""
-								)}`
-							]),
-							"}",
-							"return result;"
-						]),
-						"}",
-						`${RuntimeGlobals.startup} = ${runtimeTemplate.basicFunction("", [
-							"// reset startup function so it can be called again when more startup code is added",
-							`${RuntimeGlobals.startup} = ${runtimeTemplate.basicFunction(
-								"",
-								""
-							)}`,
-							"chunkLoadingGlobal = chunkLoadingGlobal.slice();",
-							"for(var i = 0; i < chunkLoadingGlobal.length; i++) webpackJsonpCallback(chunkLoadingGlobal[i]);",
-							"return (checkDeferredModules = checkDeferredModulesImpl)();"
-						])};`
+						`var checkDeferredModules = ${runtimeTemplate.emptyFunction()};`
 				  ])
 				: "// no deferred startup",
 			"",
@@ -432,7 +384,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 				? Template.asString([
 						"// install a JSONP callback for chunk loading",
 						`var webpackJsonpCallback = ${runtimeTemplate.basicFunction(
-							"data",
+							"parentChunkLoadingFunction, data",
 							[
 								runtimeTemplate.destructureArray(
 									[
@@ -467,7 +419,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 								]),
 								"}",
 								"if(runtime) runtime(__webpack_require__);",
-								"parentChunkLoadingFunction(data);",
+								"if(parentChunkLoadingFunction) parentChunkLoadingFunction(data);",
 								"while(resolves.length) {",
 								Template.indent("resolves.shift()();"),
 								"}",
@@ -485,10 +437,57 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 						)}`,
 						"",
 						`var chunkLoadingGlobal = ${chunkLoadingGlobalExpr} = ${chunkLoadingGlobalExpr} || [];`,
-						"var parentChunkLoadingFunction = chunkLoadingGlobal.push.bind(chunkLoadingGlobal);",
-						"chunkLoadingGlobal.push = webpackJsonpCallback;"
+						"chunkLoadingGlobal.forEach(webpackJsonpCallback.bind(null, 0));",
+						"chunkLoadingGlobal.push = webpackJsonpCallback.bind(null, chunkLoadingGlobal.push.bind(chunkLoadingGlobal));"
+				  ])
+				: "// no jsonp function",
+			"",
+			withDefer
+				? Template.asString([
+						"function checkDeferredModulesImpl() {",
+						Template.indent([
+							"var result;",
+							"for(var i = 0; i < deferredModules.length; i++) {",
+							Template.indent([
+								"var deferredModule = deferredModules[i];",
+								"var fulfilled = true;",
+								"for(var j = 1; j < deferredModule.length; j++) {",
+								Template.indent([
+									"var depId = deferredModule[j];",
+									"if(installedChunks[depId] !== 0) fulfilled = false;"
+								]),
+								"}",
+								"if(fulfilled) {",
+								Template.indent([
+									"deferredModules.splice(i--, 1);",
+									"result = " +
+										"__webpack_require__(" +
+										`${RuntimeGlobals.entryModuleId} = deferredModule[0]);`
+								]),
+								"}"
+							]),
+							"}",
+							"if(deferredModules.length === 0) {",
+							Template.indent([
+								`${RuntimeGlobals.startup}();`,
+								`${
+									RuntimeGlobals.startup
+								} = ${runtimeTemplate.emptyFunction()};`
+							]),
+							"}",
+							"return result;"
+						]),
+						"}",
+						`var startup = ${RuntimeGlobals.startup};`,
+						`${RuntimeGlobals.startup} = ${runtimeTemplate.basicFunction("", [
+							"// reset startup function so it can be called again when more startup code is added",
+							`${
+								RuntimeGlobals.startup
+							} = startup || (${runtimeTemplate.emptyFunction()});`,
+							"return (checkDeferredModules = checkDeferredModulesImpl)();"
+						])};`
 				  ])
-				: "// no jsonp function"
+				: "// no deferred startup"
 		]);
 	}
 }

package/lib/webworker/ImportScriptsChunkLoadingRuntimeModule.js

@@ -14,7 +14,7 @@ const { getUndoPath } = require("../util/identifier");
 
 class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 	constructor(runtimeRequirements) {
-		super("importScripts chunk loading", 10);
+		super("importScripts chunk loading", RuntimeModule.STAGE_ATTACH);
 		this.runtimeRequirements = runtimeRequirements;
 	}
 

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "webpack",
-  "version": "5.10.0",
+  "version": "5.11.0",
   "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": {
     "@types/eslint-scope": "^3.7.0",
     "@types/estree": "^0.0.45",
-    "@webassemblyjs/ast": "1.9.0",
-    "@webassemblyjs/helper-module-context": "1.9.0",
-    "@webassemblyjs/wasm-edit": "1.9.0",
-    "@webassemblyjs/wasm-parser": "1.9.0",
+    "@webassemblyjs/ast": "1.9.1",
+    "@webassemblyjs/helper-module-context": "1.9.1",
+    "@webassemblyjs/wasm-edit": "1.9.1",
+    "@webassemblyjs/wasm-parser": "1.9.1",
     "acorn": "^8.0.4",
     "browserslist": "^4.14.5",
     "chrome-trace-event": "^1.0.2",
@@ -53,7 +53,7 @@
     "es5-ext": "^0.10.53",
     "es6-promise-polyfill": "^1.2.0",
     "eslint": "^7.14.0",
-    "eslint-config-prettier": "^6.11.0",
+    "eslint-config-prettier": "^7.0.0",
     "eslint-plugin-jest": "^24.1.3",
     "eslint-plugin-jsdoc": "^30.7.8",
     "eslint-plugin-node": "^11.0.0",
@@ -69,7 +69,7 @@
     "json-loader": "^0.5.7",
     "json5": "^2.1.3",
     "less": "^3.12.2",
-    "less-loader": "^6.2.0",
+    "less-loader": "^7.1.0",
     "lint-staged": "^10.2.11",
     "loader-utils": "^2.0.0",
     "lodash": "^4.17.19",
@@ -92,7 +92,7 @@
     "style-loader": "^2.0.0",
     "terser": "^5.5.0",
     "toml": "^3.0.0",
-    "tooling": "webpack/tooling#v1.10.0",
+    "tooling": "webpack/tooling#v1.10.2",
     "ts-loader": "^8.0.2",
     "typescript": "^4.2.0-dev.20201130",
     "url-loader": "^4.1.0",