webpack 5.33.0 → 5.35.0

package/lib/optimize/LimitChunkCountPlugin.js

@@ -5,16 +5,23 @@
 
 "use strict";
 
-const { validate } = require("schema-utils");
-const schema = require("../../schemas/plugins/optimize/LimitChunkCountPlugin.json");
 const { STAGE_ADVANCED } = require("../OptimizationStages");
 const LazyBucketSortedSet = require("../util/LazyBucketSortedSet");
 const { compareChunks } = require("../util/comparators");
+const createSchemaValidation = require("../util/create-schema-validation");
 
+/** @typedef {import("../../declarations/plugins/optimize/LimitChunkCountPlugin").LimitChunkCountPluginOptions} LimitChunkCountPluginOptions */
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compiler")} Compiler */
 
-/** @typedef {import("../../declarations/plugins/optimize/LimitChunkCountPlugin").LimitChunkCountPluginOptions} LimitChunkCountPluginOptions */
+const validate = createSchemaValidation(
+	require("../../schemas/plugins/optimize/LimitChunkCountPlugin.check.js"),
+	() => require("../../schemas/plugins/optimize/LimitChunkCountPlugin.json"),
+	{
+		name: "Limit Chunk Count Plugin",
+		baseDataPath: "options"
+	}
+);
 
 /**
  * @typedef {Object} ChunkCombination
@@ -43,10 +50,7 @@ class LimitChunkCountPlugin {
 	 * @param {LimitChunkCountPluginOptions=} options options object
 	 */
 	constructor(options) {
-		validate(schema, options, {
-			name: "Limit Chunk Count Plugin",
-			baseDataPath: "options"
-		});
+		validate(options);
 		this.options = options;
 	}
 
@@ -175,7 +179,8 @@ class LimitChunkCountPlugin {
 						}
 
 						// merge the chunks
-						if (a.integrate(b, "limit")) {
+						if (chunkGraph.canChunksBeIntegrated(a, b)) {
+							chunkGraph.integrateChunks(a, b);
 							compilation.chunks.delete(b);
 
 							// flag chunk a as modified as further optimization are possible for all children here
@@ -204,7 +209,8 @@ class LimitChunkCountPlugin {
 										continue;
 									}
 									// Update size
-									const newIntegratedSize = a.integratedSize(
+									const newIntegratedSize = chunkGraph.getIntegratedChunksSize(
+										a,
 										combination.b,
 										options
 									);
@@ -222,10 +228,12 @@ class LimitChunkCountPlugin {
 										continue;
 									}
 									// Update size
-									const newIntegratedSize = combination.a.integratedSize(
+									const newIntegratedSize = chunkGraph.getIntegratedChunksSize(
+										combination.a,
 										a,
 										options
 									);
+
 									const finishUpdate = combinations.startUpdate(combination);
 									combination.b = a;
 									combination.integratedSize = newIntegratedSize;

package/lib/optimize/MinChunkSizePlugin.js

@@ -5,24 +5,28 @@
 
 "use strict";
 
-const { validate } = require("schema-utils");
-const schema = require("../../schemas/plugins/optimize/MinChunkSizePlugin.json");
 const { STAGE_ADVANCED } = require("../OptimizationStages");
+const createSchemaValidation = require("../util/create-schema-validation");
 
+/** @typedef {import("../../declarations/plugins/optimize/MinChunkSizePlugin").MinChunkSizePluginOptions} MinChunkSizePluginOptions */
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compiler")} Compiler */
 
-/** @typedef {import("../../declarations/plugins/optimize/MinChunkSizePlugin").MinChunkSizePluginOptions} MinChunkSizePluginOptions */
+const validate = createSchemaValidation(
+	require("../../schemas/plugins/optimize/MinChunkSizePlugin.check.js"),
+	() => require("../../schemas/plugins/optimize/MinChunkSizePlugin.json"),
+	{
+		name: "Min Chunk Size Plugin",
+		baseDataPath: "options"
+	}
+);
 
 class MinChunkSizePlugin {
 	/**
 	 * @param {MinChunkSizePluginOptions} options options object
 	 */
 	constructor(options) {
-		validate(schema, options, {
-			name: "Min Chunk Size Plugin",
-			baseDataPath: "options"
-		});
+		validate(options);
 		this.options = options;
 	}
 

package/lib/runtime/StartupChunkDependenciesPlugin.js

@@ -32,7 +32,9 @@ class StartupChunkDependenciesPlugin {
 				const isEnabledForChunk = chunk => {
 					const options = chunk.getEntryOptions();
 					const chunkLoading =
-						(options && options.chunkLoading) || globalChunkLoading;
+						options && options.chunkLoading !== undefined
+							? options.chunkLoading
+							: globalChunkLoading;
 					return chunkLoading === this.chunkLoading;
 				};
 				compilation.hooks.additionalTreeRuntimeRequirements.tap(

package/lib/serialization/BinaryMiddleware.js

@@ -123,6 +123,12 @@ class BinaryMiddleware extends SerializerMiddleware {
 		return this._serialize(data, context);
 	}
 
+	_serializeLazy(fn, context) {
+		return SerializerMiddleware.serializeLazy(fn, data =>
+			this._serialize(data, context)
+		);
+	}
+
 	/**
 	 * @param {DeserializedType} data data
 	 * @param {Object} context context object
@@ -135,7 +141,7 @@ class BinaryMiddleware extends SerializerMiddleware {
 		let leftOverBuffer = null;
 		let currentPosition = 0;
 		/** @type {BufferSerializableType[]} */
-		const buffers = [];
+		let buffers = [];
 		let buffersTotalLength = 0;
 		const allocate = bytesNeeded => {
 			if (currentBuffer !== null) {
@@ -146,8 +152,11 @@ class BinaryMiddleware extends SerializerMiddleware {
 				currentBuffer = leftOverBuffer;
 				leftOverBuffer = null;
 			} else {
-				currentBuffer = Buffer.allocUnsafeSlow(
-					Math.max(bytesNeeded, buffersTotalLength, 16384)
+				currentBuffer = Buffer.allocUnsafe(
+					Math.max(
+						bytesNeeded,
+						Math.min(Math.max(buffersTotalLength, 1024), 16384)
+					)
 				);
 			}
 		};
@@ -201,10 +210,7 @@ class BinaryMiddleware extends SerializerMiddleware {
 								SerializerMiddleware.setLazySerializedValue(thing, data);
 								serializedData = data;
 							} else {
-								serializedData = SerializerMiddleware.serializeLazy(
-									thing,
-									data => this._serialize(data, context)
-								);
+								serializedData = this._serializeLazy(thing, context);
 							}
 						}
 						if (typeof serializedData === "function") {
@@ -471,7 +477,13 @@ class BinaryMiddleware extends SerializerMiddleware {
 		};
 		serializeData(data);
 		flush();
-		return buffers;
+
+		// avoid leaking memory
+		currentBuffer = null;
+		leftOverBuffer = null;
+		const _buffers = buffers;
+		buffers = undefined;
+		return _buffers;
 	}
 
 	/**
@@ -483,6 +495,21 @@ class BinaryMiddleware extends SerializerMiddleware {
 		return this._deserialize(data, context);
 	}
 
+	_createLazyDeserialized(content, context) {
+		return SerializerMiddleware.createLazy(
+			memoize(() => this._deserialize(content, context)),
+			this,
+			undefined,
+			content
+		);
+	}
+
+	_deserializeLazy(fn, context) {
+		return SerializerMiddleware.deserializeLazy(fn, data =>
+			this._deserialize(data, context)
+		);
+	}
+
 	/**
 	 * @param {SerializedType} data data
 	 * @param {Object} context context object
@@ -494,6 +521,8 @@ class BinaryMiddleware extends SerializerMiddleware {
 		let currentIsBuffer = Buffer.isBuffer(currentBuffer);
 		let currentPosition = 0;
 
+		const retainedBuffer = context.retainedBuffer || (x => x);
+
 		const checkOverflow = () => {
 			if (currentPosition >= currentBuffer.length) {
 				currentPosition = 0;
@@ -607,23 +636,16 @@ class BinaryMiddleware extends SerializerMiddleware {
 								do {
 									const buf = readUpTo(l);
 									l -= buf.length;
-									content.push(buf);
+									content.push(retainedBuffer(buf));
 								} while (l > 0);
 							}
 						}
-						result.push(
-							SerializerMiddleware.createLazy(
-								memoize(() => this._deserialize(content, context)),
-								this,
-								undefined,
-								content
-							)
-						);
+						result.push(this._createLazyDeserialized(content, context));
 					};
 				case BUFFER_HEADER:
 					return () => {
 						const len = readU32();
-						result.push(read(len));
+						result.push(retainedBuffer(read(len)));
 					};
 				case TRUE_HEADER:
 					return () => result.push(true);
@@ -849,14 +871,10 @@ class BinaryMiddleware extends SerializerMiddleware {
 		});
 
 		/** @type {DeserializedType} */
-		const result = [];
+		let result = [];
 		while (currentBuffer !== null) {
 			if (typeof currentBuffer === "function") {
-				result.push(
-					SerializerMiddleware.deserializeLazy(currentBuffer, data =>
-						this._deserialize(data, context)
-					)
-				);
+				result.push(this._deserializeLazy(currentBuffer, context));
 				currentDataItem++;
 				currentBuffer =
 					currentDataItem < data.length ? data[currentDataItem] : null;
@@ -866,7 +884,11 @@ class BinaryMiddleware extends SerializerMiddleware {
 				dispatchTable[header]();
 			}
 		}
-		return result;
+
+		// avoid leaking memory in context
+		let _result = result;
+		result = undefined;
+		return _result;
 	}
 }
 

package/lib/sharing/ConsumeSharedPlugin.js

@@ -5,13 +5,12 @@
 
 "use strict";
 
-const { validate } = require("schema-utils");
-const schema = require("../../schemas/plugins/sharing/ConsumeSharedPlugin.json");
 const ModuleNotFoundError = require("../ModuleNotFoundError");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const WebpackError = require("../WebpackError");
 const { parseOptions } = require("../container/options");
 const LazySet = require("../util/LazySet");
+const createSchemaValidation = require("../util/create-schema-validation");
 const { parseRange } = require("../util/semver");
 const ConsumeSharedFallbackDependency = require("./ConsumeSharedFallbackDependency");
 const ConsumeSharedModule = require("./ConsumeSharedModule");
@@ -30,6 +29,15 @@ const {
 /** @typedef {import("../ResolverFactory").ResolveOptionsWithDependencyType} ResolveOptionsWithDependencyType */
 /** @typedef {import("./ConsumeSharedModule").ConsumeOptions} ConsumeOptions */
 
+const validate = createSchemaValidation(
+	require("../../schemas/plugins/sharing/ConsumeSharedPlugin.check.js"),
+	() => require("../../schemas/plugins/sharing/ConsumeSharedPlugin.json"),
+	{
+		name: "Consume Shared Plugin",
+		baseDataPath: "options"
+	}
+);
+
 /** @type {ResolveOptionsWithDependencyType} */
 const RESOLVE_OPTIONS = { dependencyType: "esm" };
 const PLUGIN_NAME = "ConsumeSharedPlugin";
@@ -40,7 +48,7 @@ class ConsumeSharedPlugin {
 	 */
 	constructor(options) {
 		if (typeof options !== "string") {
-			validate(schema, options, { name: "Consumes Shared Plugin" });
+			validate(options);
 		}
 
 		/** @type {[string, ConsumeOptions][]} */

package/lib/sharing/ProvideSharedPlugin.js

@@ -5,10 +5,9 @@
 
 "use strict";
 
-const { validate } = require("schema-utils");
-const schema = require("../../schemas/plugins/sharing/ProvideSharedPlugin.json");
 const WebpackError = require("../WebpackError");
 const { parseOptions } = require("../container/options");
+const createSchemaValidation = require("../util/create-schema-validation");
 const ProvideForSharedDependency = require("./ProvideForSharedDependency");
 const ProvideSharedDependency = require("./ProvideSharedDependency");
 const ProvideSharedModuleFactory = require("./ProvideSharedModuleFactory");
@@ -17,6 +16,15 @@ const ProvideSharedModuleFactory = require("./ProvideSharedModuleFactory");
 /** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../Compiler")} Compiler */
 
+const validate = createSchemaValidation(
+	require("../../schemas/plugins/sharing/ProvideSharedPlugin.check.js"),
+	() => require("../../schemas/plugins/sharing/ProvideSharedPlugin.json"),
+	{
+		name: "Provide Shared Plugin",
+		baseDataPath: "options"
+	}
+);
+
 /**
  * @typedef {Object} ProvideOptions
  * @property {string} shareKey
@@ -32,7 +40,7 @@ class ProvideSharedPlugin {
 	 * @param {ProvideSharedPluginOptions} options options
 	 */
 	constructor(options) {
-		validate(schema, options, { name: "Provide Shared Plugin" });
+		validate(options);
 
 		/** @type {[string, ProvideOptions][]} */
 		this._provides = parseOptions(

package/lib/util/comparators.js

@@ -34,9 +34,7 @@ const createCachedParameterizedComparator = fn => {
 		 * @param {T} b second item
 		 * @returns {-1|0|1} compare result
 		 */
-		const result = (a, b) => {
-			return fn(arg, a, b);
-		};
+		const result = fn.bind(null, arg);
 		map.set(arg, result);
 		return result;
 	};

package/lib/util/create-schema-validation.js

@@ -0,0 +1,21 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+const memoize = require("./memoize");
+
+const getValidate = memoize(() => require("schema-utils").validate);
+
+const createSchemaValidation = (check = v => false, getSchema, options) => {
+	getSchema = memoize(getSchema);
+	return value => {
+		if (!check(value)) {
+			getValidate()(getSchema(), value, options);
+		}
+	};
+};
+
+module.exports = createSchemaValidation;

package/lib/util/registerExternalSerializer.js

@@ -9,7 +9,7 @@ const { register } = require("./serialization");
 
 const Position = /** @type {TODO} */ (require("acorn")).Position;
 const SourceLocation = require("acorn").SourceLocation;
-const { ValidationError } = require("schema-utils");
+const ValidationError = require("schema-utils/dist/ValidationError").default;
 const {
 	CachedSource,
 	ConcatSource,

package/lib/web/FetchCompileAsyncWasmPlugin.js

@@ -24,7 +24,9 @@ class FetchCompileAsyncWasmPlugin {
 				const isEnabledForChunk = chunk => {
 					const options = chunk.getEntryOptions();
 					const wasmLoading =
-						(options && options.wasmLoading) || globalWasmLoading;
+						options && options.wasmLoading !== undefined
+							? options.wasmLoading
+							: globalWasmLoading;
 					return wasmLoading === "fetch";
 				};
 				const generateLoadBinaryCode = path =>

package/lib/web/FetchCompileWasmPlugin.js

@@ -30,7 +30,9 @@ class FetchCompileWasmPlugin {
 				const isEnabledForChunk = chunk => {
 					const options = chunk.getEntryOptions();
 					const wasmLoading =
-						(options && options.wasmLoading) || globalWasmLoading;
+						options && options.wasmLoading !== undefined
+							? options.wasmLoading
+							: globalWasmLoading;
 					return wasmLoading === "fetch";
 				};
 				const generateLoadBinaryCode = path =>

package/lib/web/JsonpChunkLoadingPlugin.js

@@ -24,7 +24,9 @@ class JsonpChunkLoadingPlugin {
 				const isEnabledForChunk = chunk => {
 					const options = chunk.getEntryOptions();
 					const chunkLoading =
-						(options && options.chunkLoading) || globalChunkLoading;
+						options && options.chunkLoading !== undefined
+							? options.chunkLoading
+							: globalChunkLoading;
 					return chunkLoading === "jsonp";
 				};
 				const onceForChunkSet = new WeakSet();

package/lib/webpack.js

@@ -6,6 +6,7 @@
 "use strict";
 
 const util = require("util");
+const webpackOptionsSchemaCheck = require("../schemas/WebpackOptions.check.js");
 const webpackOptionsSchema = require("../schemas/WebpackOptions.json");
 const Compiler = require("./Compiler");
 const MultiCompiler = require("./MultiCompiler");
@@ -16,7 +17,7 @@ const {
 } = require("./config/defaults");
 const { getNormalizedWebpackOptions } = require("./config/normalization");
 const NodeEnvironmentPlugin = require("./node/NodeEnvironmentPlugin");
-const validateSchema = require("./validateSchema");
+const memoize = require("./util/memoize");
 
 /** @typedef {import("../declarations/WebpackOptions").WebpackOptions} WebpackOptions */
 /** @typedef {import("./Compiler").WatchOptions} WatchOptions */
@@ -24,6 +25,8 @@ const validateSchema = require("./validateSchema");
 /** @typedef {import("./MultiStats")} MultiStats */
 /** @typedef {import("./Stats")} Stats */
 
+const getValidateSchema = memoize(() => require("./validateSchema"));
+
 /**
  * @template T
  * @callback Callback
@@ -102,7 +105,9 @@ const webpack = /** @type {WebpackFunctionSingle & WebpackFunctionMulti} */ (
 	 */
 	(options, callback) => {
 		const create = () => {
-			validateSchema(webpackOptionsSchema, options);
+			if (!webpackOptionsSchemaCheck(options)) {
+				getValidateSchema()(webpackOptionsSchema, options);
+			}
 			/** @type {MultiCompiler|Compiler} */
 			let compiler;
 			let watch = false;

package/lib/webworker/ImportScriptsChunkLoadingPlugin.js

@@ -29,7 +29,9 @@ class ImportScriptsChunkLoadingPlugin {
 				const isEnabledForChunk = chunk => {
 					const options = chunk.getEntryOptions();
 					const chunkLoading =
-						(options && options.chunkLoading) || globalChunkLoading;
+						options && options.chunkLoading !== undefined
+							? options.chunkLoading
+							: globalChunkLoading;
 					return chunkLoading === "import-scripts";
 				};
 				const onceForChunkSet = new WeakSet();

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "webpack",
-  "version": "5.33.0",
+  "version": "5.35.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.46",
+    "@types/estree": "^0.0.47",
     "@webassemblyjs/ast": "1.11.0",
     "@webassemblyjs/wasm-edit": "1.11.0",
     "@webassemblyjs/wasm-parser": "1.11.0",
     "acorn": "^8.0.4",
     "browserslist": "^4.14.5",
     "chrome-trace-event": "^1.0.2",
-    "enhanced-resolve": "^5.7.0",
+    "enhanced-resolve": "^5.8.0",
     "es-module-lexer": "^0.4.0",
     "eslint-scope": "^5.1.1",
     "events": "^3.2.0",
@@ -92,7 +92,7 @@
     "style-loader": "^2.0.0",
     "terser": "^5.5.0",
     "toml": "^3.0.0",
-    "tooling": "webpack/tooling#v1.15.0",
+    "tooling": "webpack/tooling#v1.17.0",
     "ts-loader": "^8.0.2",
     "typescript": "^4.2.0-beta",
     "url-loader": "^4.1.0",
@@ -151,8 +151,8 @@
     "type-lint": "tsc",
     "typings-lint": "tsc -p tsconfig.test.json",
     "spellcheck": "cspell \"{.github,benchmark,bin,examples,hot,lib,schemas,setup,tooling}/**/*.{md,yml,yaml,js,json}\" \"*.md\"",
-    "special-lint": "node node_modules/tooling/lockfile-lint && node node_modules/tooling/schemas-lint && node node_modules/tooling/inherit-types && node node_modules/tooling/format-schemas && node tooling/generate-runtime-code.js && node node_modules/tooling/format-file-header && node node_modules/tooling/compile-to-definitions && node node_modules/tooling/generate-types --no-template-literals",
-    "special-lint-fix": "node node_modules/tooling/inherit-types --write && node node_modules/tooling/format-schemas --write && node tooling/generate-runtime-code.js --write && node node_modules/tooling/format-file-header --write && node node_modules/tooling/compile-to-definitions --write && node node_modules/tooling/generate-types --no-template-literals --write",
+    "special-lint": "node node_modules/tooling/lockfile-lint && node node_modules/tooling/schemas-lint && node node_modules/tooling/inherit-types && node node_modules/tooling/format-schemas && node tooling/generate-runtime-code.js && node node_modules/tooling/format-file-header && node node_modules/tooling/compile-to-definitions && node node_modules/tooling/precompile-schemas && node node_modules/tooling/generate-types --no-template-literals",
+    "special-lint-fix": "node node_modules/tooling/inherit-types --write && node node_modules/tooling/format-schemas --write && node tooling/generate-runtime-code.js --write && node node_modules/tooling/format-file-header --write && node node_modules/tooling/compile-to-definitions --write && node node_modules/tooling/precompile-schemas --write && node node_modules/tooling/generate-types --no-template-literals --write",
     "fix": "yarn code-lint --fix && yarn special-lint-fix && yarn pretty-lint-fix",
     "prepare": "husky install",
     "pretty-lint-base": "prettier \"*.{ts,json,yml,yaml,md}\" \"{setup,lib,bin,hot,benchmark,tooling,schemas}/**/*.json\" \"examples/*.md\"",

package/schemas/WebpackOptions.check.d.ts

@@ -0,0 +1,7 @@
+/*
+ * This file was automatically generated.
+ * DO NOT MODIFY BY HAND.
+ * Run `yarn special-lint-fix` to update
+ */
+declare const check: (options: import("../declarations/WebpackOptions").WebpackOptions) => boolean;
+export = check;