webpack 4.33.0 → 4.35.2

package/lib/dependencies/ImportParserPlugin.js

@@ -43,9 +43,7 @@ class ImportParserPlugin {
 					const { comment } = e;
 					parser.state.module.warnings.push(
 						new CommentCompilationWarning(
-							`Compilation error while processing magic comment(-s): /*${
-								comment.value
-							}*/: ${e.message}`,
+							`Compilation error while processing magic comment(-s): /*${comment.value}*/: ${e.message}`,
 							parser.state.module,
 							comment.loc
 						)
@@ -59,9 +57,7 @@ class ImportParserPlugin {
 						parser.state.module.warnings.push(
 							new UnsupportedFeatureWarning(
 								parser.state.module,
-								`\`webpackIgnore\` expected a boolean, but received: ${
-									importOptions.webpackIgnore
-								}.`,
+								`\`webpackIgnore\` expected a boolean, but received: ${importOptions.webpackIgnore}.`,
 								expr.loc
 							)
 						);
@@ -77,9 +73,7 @@ class ImportParserPlugin {
 						parser.state.module.warnings.push(
 							new UnsupportedFeatureWarning(
 								parser.state.module,
-								`\`webpackChunkName\` expected a string, but received: ${
-									importOptions.webpackChunkName
-								}.`,
+								`\`webpackChunkName\` expected a string, but received: ${importOptions.webpackChunkName}.`,
 								expr.loc
 							)
 						);
@@ -92,9 +86,7 @@ class ImportParserPlugin {
 						parser.state.module.warnings.push(
 							new UnsupportedFeatureWarning(
 								parser.state.module,
-								`\`webpackMode\` expected a string, but received: ${
-									importOptions.webpackMode
-								}.`,
+								`\`webpackMode\` expected a string, but received: ${importOptions.webpackMode}.`,
 								expr.loc
 							)
 						);
@@ -111,9 +103,7 @@ class ImportParserPlugin {
 						parser.state.module.warnings.push(
 							new UnsupportedFeatureWarning(
 								parser.state.module,
-								`\`webpackPrefetch\` expected true or a number, but received: ${
-									importOptions.webpackPrefetch
-								}.`,
+								`\`webpackPrefetch\` expected true or a number, but received: ${importOptions.webpackPrefetch}.`,
 								expr.loc
 							)
 						);
@@ -128,9 +118,7 @@ class ImportParserPlugin {
 						parser.state.module.warnings.push(
 							new UnsupportedFeatureWarning(
 								parser.state.module,
-								`\`webpackPreload\` expected true or a number, but received: ${
-									importOptions.webpackPreload
-								}.`,
+								`\`webpackPreload\` expected true or a number, but received: ${importOptions.webpackPreload}.`,
 								expr.loc
 							)
 						);
@@ -144,9 +132,7 @@ class ImportParserPlugin {
 						parser.state.module.warnings.push(
 							new UnsupportedFeatureWarning(
 								parser.state.module,
-								`\`webpackInclude\` expected a regular expression, but received: ${
-									importOptions.webpackInclude
-								}.`,
+								`\`webpackInclude\` expected a regular expression, but received: ${importOptions.webpackInclude}.`,
 								expr.loc
 							)
 						);
@@ -162,9 +148,7 @@ class ImportParserPlugin {
 						parser.state.module.warnings.push(
 							new UnsupportedFeatureWarning(
 								parser.state.module,
-								`\`webpackExclude\` expected a regular expression, but received: ${
-									importOptions.webpackExclude
-								}.`,
+								`\`webpackExclude\` expected a regular expression, but received: ${importOptions.webpackExclude}.`,
 								expr.loc
 							)
 						);

package/lib/dependencies/LoaderPlugin.js

@@ -49,9 +49,7 @@ class LoaderPlugin {
 						if (factory === undefined) {
 							return callback(
 								new Error(
-									`No module factory available for dependency type: ${
-										dep.constructor.name
-									}`
+									`No module factory available for dependency type: ${dep.constructor.name}`
 								)
 							);
 						}

package/lib/dependencies/WebAssemblyImportDependency.js

@@ -40,9 +40,7 @@ class WebAssemblyImportDependency extends ModuleDependency {
 		) {
 			return [
 				new UnsupportedWebAssemblyFeatureError(
-					`Import "${this.name}" from "${this.request}" with ${
-						this.onlyDirectImport
-					} can only be used for direct wasm to wasm dependencies`
+					`Import "${this.name}" from "${this.request}" with ${this.onlyDirectImport} can only be used for direct wasm to wasm dependencies`
 				)
 			];
 		}

package/lib/optimize/ChunkModuleIdRangePlugin.js

@@ -26,9 +26,7 @@ class ChunkModuleIdRangePlugin {
 				);
 				if (!chunk) {
 					throw new Error(
-						`ChunkModuleIdRangePlugin: Chunk with name '${
-							options.name
-						}"' was not found`
+						`ChunkModuleIdRangePlugin: Chunk with name '${options.name}"' was not found`
 					);
 				}
 

package/lib/optimize/ConcatenatedModule.js

@@ -1136,23 +1136,17 @@ class ConcatenatedModule extends Module {
 					if (info.interopNamespaceObjectUsed) {
 						if (info.module.buildMeta.exportsType === "named") {
 							result.add(
-								`var ${
-									info.interopNamespaceObjectName
-								} = /*#__PURE__*/__webpack_require__.t(${info.name}, 2);\n`
+								`var ${info.interopNamespaceObjectName} = /*#__PURE__*/__webpack_require__.t(${info.name}, 2);\n`
 							);
 						} else if (!info.module.buildMeta.exportsType) {
 							result.add(
-								`var ${
-									info.interopNamespaceObjectName
-								} = /*#__PURE__*/__webpack_require__.t(${info.name});\n`
+								`var ${info.interopNamespaceObjectName} = /*#__PURE__*/__webpack_require__.t(${info.name});\n`
 							);
 						}
 					}
 					if (info.interopDefaultAccessUsed) {
 						result.add(
-							`var ${
-								info.interopDefaultAccessName
-							} = /*#__PURE__*/__webpack_require__.n(${info.name});\n`
+							`var ${info.interopDefaultAccessName} = /*#__PURE__*/__webpack_require__.n(${info.name});\n`
 						);
 					}
 					break;
@@ -1266,9 +1260,7 @@ class HarmonyImportSpecifierDependencyConcatenatedTemplate {
 			}_ns${strictFlag}__[${JSON.stringify(dep._id)}]`;
 		} else {
 			const exportData = Buffer.from(dep._id, "utf-8").toString("hex");
-			content = `__WEBPACK_MODULE_REFERENCE__${
-				info.index
-			}_${exportData}${callFlag}${strictFlag}__`;
+			content = `__WEBPACK_MODULE_REFERENCE__${info.index}_${exportData}${callFlag}${strictFlag}__`;
 		}
 		if (dep.shorthand) {
 			content = dep.name + ": " + content;
@@ -1464,14 +1456,10 @@ class HarmonyExportImportedSpecifierDependencyConcatenatedTemplate {
 						? "_strict"
 						: "";
 					if (def.id === true) {
-						finalName = `__WEBPACK_MODULE_REFERENCE__${
-							info.index
-						}_ns${strictFlag}__`;
+						finalName = `__WEBPACK_MODULE_REFERENCE__${info.index}_ns${strictFlag}__`;
 					} else {
 						const exportData = Buffer.from(def.id, "utf-8").toString("hex");
-						finalName = `__WEBPACK_MODULE_REFERENCE__${
-							info.index
-						}_${exportData}${strictFlag}__`;
+						finalName = `__WEBPACK_MODULE_REFERENCE__${info.index}_${exportData}${strictFlag}__`;
 					}
 					const exportsName = this.rootModule.exportsArgument;
 					const content =

package/lib/optimize/SplitChunksPlugin.js

@@ -123,9 +123,11 @@ module.exports = class SplitChunksPlugin {
 			getCacheGroups: SplitChunksPlugin.normalizeCacheGroups({
 				cacheGroups: options.cacheGroups,
 				name: options.name,
-				automaticNameDelimiter: options.automaticNameDelimiter
+				automaticNameDelimiter: options.automaticNameDelimiter,
+				automaticNameMaxLength: options.automaticNameMaxLength
 			}),
 			automaticNameDelimiter: options.automaticNameDelimiter,
+			automaticNameMaxLength: options.automaticNameMaxLength || 109,
 			fallbackCacheGroup: SplitChunksPlugin.normalizeFallbackCacheGroup(
 				options.fallbackCacheGroup || {},
 				options
@@ -133,7 +135,12 @@ module.exports = class SplitChunksPlugin {
 		};
 	}
 
-	static normalizeName({ name, automaticNameDelimiter, automaticNamePrefix }) {
+	static normalizeName({
+		name,
+		automaticNameDelimiter,
+		automaticNamePrefix,
+		automaticNameMaxLength
+	}) {
 		if (name === true) {
 			/** @type {WeakMap<Chunk[], Record<string, string>>} */
 			const cache = new WeakMap();
@@ -160,11 +167,17 @@ module.exports = class SplitChunksPlugin {
 				// Filenames and paths can't be too long otherwise an
 				// ENAMETOOLONG error is raised. If the generated name if too
 				// long, it is truncated and a hash is appended. The limit has
-				// been set to 100 to prevent `[name].[chunkhash].[ext]` from
+				// been set to 109 to prevent `[name].[chunkhash].[ext]` from
 				// generating a 256+ character string.
-				if (name.length > 100) {
+				if (name.length > automaticNameMaxLength) {
+					const hashedFilename = hashFilename(name);
+					const sliceLength =
+						automaticNameMaxLength -
+						(automaticNameDelimiter.length + hashedFilename.length);
 					name =
-						name.slice(0, 100) + automaticNameDelimiter + hashFilename(name);
+						name.slice(0, sliceLength) +
+						automaticNameDelimiter +
+						hashFilename(name);
 				}
 				cacheEntry[cacheGroup] = name;
 				return name;
@@ -213,7 +226,12 @@ module.exports = class SplitChunksPlugin {
 		};
 	}
 
-	static normalizeCacheGroups({ cacheGroups, name, automaticNameDelimiter }) {
+	static normalizeCacheGroups({
+		cacheGroups,
+		name,
+		automaticNameDelimiter,
+		automaticNameMaxLength
+	}) {
 		if (typeof cacheGroups === "function") {
 			// TODO webpack 5 remove this
 			if (cacheGroups.length !== 1) {
@@ -259,7 +277,9 @@ module.exports = class SplitChunksPlugin {
 										typeof option.automaticNameDelimiter === "string"
 											? option.automaticNameDelimiter
 											: automaticNameDelimiter,
-									automaticNamePrefix: option.automaticNamePrefix
+									automaticNamePrefix: option.automaticNamePrefix,
+									automaticNameMaxLength:
+										option.automaticNameMaxLength || automaticNameMaxLength
 								}) || (() => {}),
 							chunksFilter: SplitChunksPlugin.normalizeChunksFilter(
 								option.chunks

package/lib/wasm/WasmFinalizeExportsPlugin.js

@@ -46,9 +46,7 @@ class WasmFinalizeExportsPlugin {
 												// 4. error
 												/** @type {any} */
 												const error = new UnsupportedWebAssemblyFeatureError(
-													`Export "${name}" with ${
-														jsIncompatibleExports[name]
-													} can only be used for direct wasm to wasm dependencies`
+													`Export "${name}" with ${jsIncompatibleExports[name]} can only be used for direct wasm to wasm dependencies`
 												);
 												error.module = module;
 												error.origin = reason.module;

package/lib/wasm/WasmMainTemplatePlugin.js

@@ -307,9 +307,7 @@ class WasmMainTemplatePlugin {
 							"}",
 							"promises.push(installedWasmModules[wasmModuleId] = promise.then(function(res) {",
 							Template.indent([
-								`return ${
-									mainTemplate.requireFn
-								}.w[wasmModuleId] = (res.instance || res).exports;`
+								`return ${mainTemplate.requireFn}.w[wasmModuleId] = (res.instance || res).exports;`
 							]),
 							"}));"
 						]),

package/lib/web/JsonpMainTemplatePlugin.js

@@ -188,6 +188,7 @@ class JsonpMainTemplatePlugin {
 								"var errorType = event && (event.type === 'load' ? 'missing' : event.type);",
 								"var realSrc = event && event.target && event.target.src;",
 								"error.message = 'Loading chunk ' + chunkId + ' failed.\\n(' + errorType + ': ' + realSrc + ')';",
+								"error.name = 'ChunkLoadError';",
 								"error.type = errorType;",
 								"error.request = realSrc;",
 								"chunk[1](error);"
@@ -340,9 +341,7 @@ class JsonpMainTemplatePlugin {
 					source,
 					"",
 					"// on error function for async loading",
-					`${
-						mainTemplate.requireFn
-					}.oe = function(err) { console.error(err); throw err; };`
+					`${mainTemplate.requireFn}.oe = function(err) { console.error(err); throw err; };`
 				]);
 			}
 		);

package/lib/webpack.js

@@ -32,7 +32,9 @@ const webpack = (options, callback) => {
 	}
 	let compiler;
 	if (Array.isArray(options)) {
-		compiler = new MultiCompiler(options.map(options => webpack(options)));
+		compiler = new MultiCompiler(
+			Array.from(options).map(options => webpack(options))
+		);
 	} else if (typeof options === "object") {
 		options = new WebpackOptionsDefaulter().process(options);
 

package/lib/webworker/WebWorkerMainTemplatePlugin.js

@@ -45,6 +45,7 @@ class WebWorkerMainTemplatePlugin {
 						"if(!installedChunks[chunkId]) {",
 						Template.indent([
 							"importScripts(" +
+								"__webpack_require__.p + " +
 								mainTemplate.getAssetPath(JSON.stringify(chunkFilename), {
 									hash: `" + ${mainTemplate.renderCurrentHashCode(hash)} + "`,
 									hashWithLength: length =>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "4.33.0",
+  "version": "4.35.2",
   "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",
@@ -72,6 +72,7 @@
     "rimraf": "^2.6.2",
     "script-loader": "~0.7.0",
     "simple-git": "^1.65.0",
+    "strip-ansi": "^5.2.0",
     "style-loader": "^0.23.1",
     "typescript": "^3.0.0-rc",
     "url-loader": "^1.1.2",

package/schemas/WebpackOptions.json

@@ -553,6 +553,11 @@
           "type": "string",
           "minLength": 1
         },
+        "automaticNameMaxLength": {
+          "description": "Sets the max length for the name of a created chunk",
+          "type": "number",
+          "minimum": 1
+        },
         "cacheGroups": {
           "description": "Assign modules to a cache group (modules from different cache groups are tried to keep in separate chunks)",
           "type": "object",
@@ -582,6 +587,11 @@
                     "type": "string",
                     "minLength": 1
                   },
+                  "automaticNameMaxLength": {
+                    "description": "Sets the max length for the name of a created chunk",
+                    "type": "number",
+                    "minimum": 1
+                  },
                   "automaticNamePrefix": {
                     "description": "Sets the name prefix for created chunks",
                     "type": "string"
@@ -1511,6 +1521,14 @@
             }
           ]
         },
+        "realResource": {
+          "description": "Match rules with custom resource name",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/RuleSetConditionOrConditionsAbsolute"
+            }
+          ]
+        },
         "resolve": {
           "description": "Options for the resolver",
           "type": "object",