webpack 4.34.0 → 4.35.3

package/declarations/WebpackOptions.d.ts

@@ -558,6 +558,10 @@ export interface RuleSetRule {
 	 * Shortcut for use.query
 	 */
 	query?: RuleSetQuery;
+	/**
+	 * Match rules with custom resource name
+	 */
+	realResource?: RuleSetConditionOrConditionsAbsolute;
 	/**
 	 * Options for the resolver
 	 */
@@ -870,6 +874,10 @@ export interface OptimizationSplitChunksOptions {
 	 * Sets the name delimiter for created chunks
 	 */
 	automaticNameDelimiter?: string;
+	/**
+	 * Sets the max length for the name of a created chunk
+	 */
+	automaticNameMaxLength?: number;
 	/**
 	 * Assign modules to a cache group (modules from different cache groups are tried to keep in separate chunks)
 	 */
@@ -887,6 +895,10 @@ export interface OptimizationSplitChunksOptions {
 					 * Sets the name delimiter for created chunks
 					 */
 					automaticNameDelimiter?: string;
+					/**
+					 * Sets the max length for the name of a created chunk
+					 */
+					automaticNameMaxLength?: number;
 					/**
 					 * Sets the name prefix for created chunks
 					 */

package/lib/JsonGenerator.js

@@ -28,6 +28,7 @@ class JsonGenerator {
 				})
 			);
 		}
+		let finalJson;
 		if (
 			Array.isArray(module.buildMeta.providedExports) &&
 			!module.isUsed("default")
@@ -41,12 +42,14 @@ class JsonGenerator {
 					reducedJson[used] = data[exportName];
 				}
 			}
-			source.add(
-				`${module.moduleArgument}.exports = ${stringifySafe(reducedJson)};`
-			);
+			finalJson = reducedJson;
 		} else {
-			source.add(`${module.moduleArgument}.exports = ${stringifySafe(data)};`);
+			finalJson = data;
 		}
+		// Use JSON because JSON.parse() is much faster than JavaScript evaluation
+		const jsonSource = JSON.stringify(stringifySafe(finalJson));
+		const jsonExpr = `JSON.parse(${jsonSource})`;
+		source.add(`${module.moduleArgument}.exports = ${jsonExpr};`);
 		return source;
 	}
 }

package/lib/MultiWatching.js

@@ -18,6 +18,18 @@ class MultiWatching {
 		}
 	}
 
+	suspend() {
+		for (const watching of this.watchings) {
+			watching.suspend();
+		}
+	}
+
+	resume() {
+		for (const watching of this.watchings) {
+			watching.resume();
+		}
+	}
+
 	close(callback) {
 		asyncLib.forEach(
 			this.watchings,

package/lib/NormalModuleFactory.js

@@ -335,7 +335,11 @@ class NormalModuleFactory extends Tapable {
 						],
 						(err, results) => {
 							if (err) return callback(err);
-							loaders = results[0].concat(loaders, results[1], results[2]);
+							if (matchResource === undefined) {
+								loaders = results[0].concat(loaders, results[1], results[2]);
+							} else {
+								loaders = results[0].concat(results[1], loaders, results[2]);
+							}
 							process.nextTick(() => {
 								const type = settings.type;
 								const resolveOptions = settings.resolve;

package/lib/OptionsDefaulter.js

@@ -4,8 +4,14 @@
 */
 "use strict";
 
-const getProperty = (obj, name) => {
-	name = name.split(".");
+/**
+ * Gets the value at path of object
+ * @param {object} obj - object to query
+ * @param {string} path - query path
+ * @returns {any} - if {@param path} requests element from array, then `undefined` will be returned
+ */
+const getProperty = (obj, path) => {
+	let name = path.split(".");
 	for (let i = 0; i < name.length - 1; i++) {
 		obj = obj[name[i]];
 		if (typeof obj !== "object" || !obj || Array.isArray(obj)) return;
@@ -13,8 +19,15 @@ const getProperty = (obj, name) => {
 	return obj[name.pop()];
 };
 
-const setProperty = (obj, name, value) => {
-	name = name.split(".");
+/**
+ * Sets the value at path of object. Stops execution, if {@param path} requests element from array to be set
+ * @param {object} obj - object to query
+ * @param {string} path - query path
+ * @param {any} value - value to be set
+ * @returns {void}
+ */
+const setProperty = (obj, path, value) => {
+	let name = path.split(".");
 	for (let i = 0; i < name.length - 1; i++) {
 		if (typeof obj[name[i]] !== "object" && obj[name[i]] !== undefined) return;
 		if (Array.isArray(obj[name[i]])) return;
@@ -24,21 +37,53 @@ const setProperty = (obj, name, value) => {
 	obj[name.pop()] = value;
 };
 
+/**
+ * @typedef {'call' | 'make' | 'append'} ConfigType
+ */
+/**
+ * @typedef {(options: object) => any} MakeConfigHandler
+ */
+/**
+ * @typedef {(value: any, options: object) => any} CallConfigHandler
+ */
+/**
+ * @typedef {any[]} AppendConfigValues
+ */
+
 class OptionsDefaulter {
 	constructor() {
+		/**
+		 * Stores default options settings or functions for computing them
+		 */
 		this.defaults = {};
+		/**
+		 * Stores configuration for options
+		 * @type {{[key: string]: ConfigType}}
+		 */
 		this.config = {};
 	}
 
+	/**
+	 * Enhancing {@param options} with default values
+	 * @param {object} options - provided options
+	 * @returns {object} - enhanced options
+	 * @throws {Error} - will throw error, if configuration value is other then `undefined` or {@link ConfigType}
+	 */
 	process(options) {
 		options = Object.assign({}, options);
 		for (let name in this.defaults) {
 			switch (this.config[name]) {
+				/**
+				 * If {@link ConfigType} doesn't specified and current value is `undefined`, then default value will be assigned
+				 */
 				case undefined:
 					if (getProperty(options, name) === undefined) {
 						setProperty(options, name, this.defaults[name]);
 					}
 					break;
+				/**
+				 * Assign result of {@link CallConfigHandler}
+				 */
 				case "call":
 					setProperty(
 						options,
@@ -46,11 +91,17 @@ class OptionsDefaulter {
 						this.defaults[name].call(this, getProperty(options, name), options)
 					);
 					break;
+				/**
+				 * Assign result of {@link MakeConfigHandler}, if current value is `undefined`
+				 */
 				case "make":
 					if (getProperty(options, name) === undefined) {
 						setProperty(options, name, this.defaults[name].call(this, options));
 					}
 					break;
+				/**
+				 * Adding {@link AppendConfigValues} at the end of the current array
+				 */
 				case "append": {
 					let oldValue = getProperty(options, name);
 					if (!Array.isArray(oldValue)) {
@@ -69,6 +120,13 @@ class OptionsDefaulter {
 		return options;
 	}
 
+	/**
+	 * Builds up default values
+	 * @param {string} name - option path
+	 * @param {ConfigType | any} config - if {@param def} is provided, then only {@link ConfigType} is allowed
+	 * @param {MakeConfigHandler | CallConfigHandler | AppendConfigValues} [def] - defaults
+	 * @returns {void}
+	 */
 	set(name, config, def) {
 		if (def !== undefined) {
 			this.defaults[name] = def;

package/lib/Parser.js

@@ -7,14 +7,13 @@
 // Syntax: https://developer.mozilla.org/en/SpiderMonkey/Parser_API
 
 const acorn = require("acorn");
-const acornDynamicImport = require("acorn-dynamic-import").default;
 const { Tapable, SyncBailHook, HookMap } = require("tapable");
 const util = require("util");
 const vm = require("vm");
 const BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
 const StackedSetMap = require("./util/StackedSetMap");
 
-const acornParser = acorn.Parser.extend(acornDynamicImport);
+const acornParser = acorn.Parser;
 
 const joinRanges = (startRange, endRange) => {
 	if (!endRange) return startRange;
@@ -25,7 +24,7 @@ const joinRanges = (startRange, endRange) => {
 const defaultParserOptions = {
 	ranges: true,
 	locations: true,
-	ecmaVersion: 2019,
+	ecmaVersion: 11,
 	sourceType: "module",
 	onComment: null
 };

package/lib/ProgressPlugin.js

@@ -18,7 +18,8 @@ const createDefaultHandler = profile => {
 
 	const defaultHandler = (percentage, msg, ...args) => {
 		let state = msg;
-		const details = args;
+		const details = args.filter(v => v.length);
+		const maxLineLength = process.stderr.columns || Infinity;
 		if (percentage < 1) {
 			percentage = Math.floor(percentage * 100);
 			msg = `${percentage}% ${msg}`;
@@ -28,12 +29,28 @@ const createDefaultHandler = profile => {
 			if (percentage < 10) {
 				msg = ` ${msg}`;
 			}
-			for (let detail of details) {
-				if (!detail) continue;
-				if (detail.length > 40) {
-					detail = `...${detail.substr(detail.length - 39)}`;
+
+			if (details.length) {
+				const maxTotalDetailsLength = maxLineLength - msg.length;
+				const totalDetailsLength = details.reduce(
+					(a, b) => a + b.length,
+					details.length // account for added space before each detail text
+				);
+				const maxDetailLength =
+					totalDetailsLength < maxTotalDetailsLength
+						? Infinity
+						: Math.floor(maxTotalDetailsLength / details.length);
+
+				for (let detail of details) {
+					if (!detail) continue;
+					if (detail.length + 1 > maxDetailLength) {
+						const truncatePrefix = "...";
+						detail = `${truncatePrefix}${detail.substr(
+							-(maxDetailLength - truncatePrefix.length - 1)
+						)}`;
+					}
+					msg += ` ${detail}`;
 				}
-				msg += ` ${detail}`;
 			}
 		}
 		if (profile) {
@@ -55,6 +72,7 @@ const createDefaultHandler = profile => {
 		}
 		if (lastMessage !== msg) {
 			goToLineStart(msg);
+			msg = msg.substring(0, maxLineLength);
 			process.stderr.write(msg);
 			lastMessage = msg;
 		}

package/lib/Watching.js

@@ -13,6 +13,7 @@ class Watching {
 		this.handler = handler;
 		this.callbacks = [];
 		this.closed = false;
+		this.suspended = false;
 		if (typeof watchOptions === "number") {
 			this.watchOptions = {
 				aggregateTimeout: watchOptions
@@ -133,7 +134,9 @@ class Watching {
 				this.compiler.fileTimestamps = fileTimestamps;
 				this.compiler.contextTimestamps = contextTimestamps;
 				this.compiler.removedFiles = removedFiles;
-				this._invalidate();
+				if (!this.suspended) {
+					this._invalidate();
+				}
 			},
 			(fileName, changeTime) => {
 				this.compiler.hooks.invalid.call(fileName, changeTime);
@@ -158,6 +161,7 @@ class Watching {
 			this.watcher.pause();
 			this.watcher = null;
 		}
+
 		if (this.running) {
 			this.invalid = true;
 			return false;
@@ -166,6 +170,18 @@ class Watching {
 		}
 	}
 
+	suspend() {
+		this.suspended = true;
+		this.invalid = false;
+	}
+
+	resume() {
+		if (this.suspended) {
+			this.suspended = false;
+			this._invalidate();
+		}
+	}
+
 	close(callback) {
 		const finalCallback = () => {
 			this.compiler.hooks.watchClose.call();

package/lib/WebpackOptionsDefaulter.js

@@ -231,6 +231,7 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 			return isProductionLikeMode(options) ? 5 : Infinity;
 		});
 		this.set("optimization.splitChunks.automaticNameDelimiter", "~");
+		this.set("optimization.splitChunks.automaticNameMaxLength", 109);
 		this.set("optimization.splitChunks.maxInitialRequests", "make", options => {
 			return isProductionLikeMode(options) ? 3 : Infinity;
 		});

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/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.34.0",
+  "version": "4.35.3",
   "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",
@@ -9,8 +9,7 @@
     "@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",
+    "acorn": "^6.2.0",
     "ajv": "^6.1.0",
     "ajv-keywords": "^3.1.0",
     "chrome-trace-event": "^1.0.0",
@@ -72,6 +71,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",