webpack 5.90.3 → 5.92.0

package/lib/NormalModuleFactory.js

@@ -56,7 +56,7 @@ const {
 /** @typedef {Partial<NormalModuleCreateData & {settings: ModuleSettings}>} CreateData */
 
 /**
- * @typedef {Object} ResolveData
+ * @typedef {object} ResolveData
  * @property {ModuleFactoryCreateData["contextInfo"]} contextInfo
  * @property {ModuleFactoryCreateData["resolveOptions"]} resolveOptions
  * @property {string} context
@@ -72,7 +72,7 @@ const {
  */
 
 /**
- * @typedef {Object} ResourceData
+ * @typedef {object} ResourceData
  * @property {string} resource
  * @property {string=} path
  * @property {string=} query
@@ -83,7 +83,7 @@ const {
 /** @typedef {ResourceData & { data: Record<string, any> }} ResourceDataWithData */
 
 /**
- * @typedef {Object} ParsedLoaderRequest
+ * @typedef {object} ParsedLoaderRequest
  * @property {string} loader loader
  * @property {string|undefined} options options
  */
@@ -227,7 +227,16 @@ const ruleSetCompiler = new RuleSetCompiler([
 	new BasicMatcherRulePlugin("issuer"),
 	new BasicMatcherRulePlugin("compiler"),
 	new BasicMatcherRulePlugin("issuerLayer"),
-	new ObjectMatcherRulePlugin("assert", "assertions"),
+	new ObjectMatcherRulePlugin(
+		"assert",
+		"assertions",
+		value => value && /** @type {any} */ (value)._isLegacyAssert !== undefined
+	),
+	new ObjectMatcherRulePlugin(
+		"with",
+		"assertions",
+		value => value && !(/** @type {any} */ (value)._isLegacyAssert)
+	),
 	new ObjectMatcherRulePlugin("descriptionData"),
 	new BasicEffectRulePlugin("type"),
 	new BasicEffectRulePlugin("sideEffects"),
@@ -240,12 +249,12 @@ const ruleSetCompiler = new RuleSetCompiler([
 
 class NormalModuleFactory extends ModuleFactory {
 	/**
-	 * @param {Object} param params
+	 * @param {object} param params
 	 * @param {string=} param.context context
 	 * @param {InputFileSystem} param.fs file system
 	 * @param {ResolverFactory} param.resolverFactory resolverFactory
 	 * @param {ModuleOptions} param.options options
-	 * @param {Object=} param.associatedObjectForCache an object to which the cache will be attached
+	 * @param {object=} param.associatedObjectForCache an object to which the cache will be attached
 	 * @param {boolean=} param.layers enable layers
 	 */
 	constructor({
@@ -268,7 +277,7 @@ class NormalModuleFactory extends ModuleFactory {
 			resolveInScheme: new HookMap(
 				() => new AsyncSeriesBailHook(["resourceData", "resolveData"])
 			),
-			/** @type {AsyncSeriesBailHook<[ResolveData], Module>} */
+			/** @type {AsyncSeriesBailHook<[ResolveData], Module | undefined>} */
 			factorize: new AsyncSeriesBailHook(["resolveData"]),
 			/** @type {AsyncSeriesBailHook<[ResolveData], false | void>} */
 			beforeResolve: new AsyncSeriesBailHook(["resolveData"]),
@@ -308,9 +317,9 @@ class NormalModuleFactory extends ModuleFactory {
 		this.fs = fs;
 		this._globalParserOptions = options.parser;
 		this._globalGeneratorOptions = options.generator;
-		/** @type {Map<string, WeakMap<Object, Parser>>} */
+		/** @type {Map<string, WeakMap<object, Parser>>} */
 		this.parserCache = new Map();
-		/** @type {Map<string, WeakMap<Object, Generator>>} */
+		/** @type {Map<string, WeakMap<object, Generator>>} */
 		this.generatorCache = new Map();
 		/** @type {Set<Module>} */
 		this._restoredUnsafeCacheEntries = new Set();

package/lib/NormalModuleReplacementPlugin.js

@@ -8,6 +8,8 @@
 const { join, dirname } = require("./util/fs");
 
 /** @typedef {import("./Compiler")} Compiler */
+/** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
+
 /** @typedef {function(import("./NormalModuleFactory").ResolveData): void} ModuleReplacer */
 
 class NormalModuleReplacementPlugin {
@@ -49,7 +51,9 @@ class NormalModuleReplacementPlugin {
 						if (typeof newResource === "function") {
 							newResource(result);
 						} else {
-							const fs = compiler.inputFileSystem;
+							const fs =
+								/** @type {InputFileSystem} */
+								(compiler.inputFileSystem);
 							if (
 								newResource.startsWith("/") ||
 								(newResource.length > 1 && newResource[1] === ":")

package/lib/Parser.js

@@ -11,7 +11,7 @@
 /** @typedef {Record<string, any>} PreparsedAst */
 
 /**
- * @typedef {Object} ParserStateBase
+ * @typedef {object} ParserStateBase
  * @property {string | Buffer} source
  * @property {NormalModule} current
  * @property {NormalModule} module

package/lib/PlatformPlugin.js

@@ -0,0 +1,39 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Authors Ivan Kopeykin @vankop
+*/
+
+"use strict";
+
+/** @typedef {import("./Compiler")} Compiler */
+/** @typedef {import("./config/target").PlatformTargetProperties} PlatformTargetProperties */
+
+/**
+ * Should be used only for "target === false" or
+ * when you want to overwrite platform target properties
+ */
+class PlatformPlugin {
+	/**
+	 * @param {Partial<PlatformTargetProperties>} platform target properties
+	 */
+	constructor(platform) {
+		/** @type {Partial<PlatformTargetProperties>} */
+		this.platform = platform;
+	}
+
+	/**
+	 * Apply the plugin
+	 * @param {Compiler} compiler the compiler instance
+	 * @returns {void}
+	 */
+	apply(compiler) {
+		compiler.hooks.environment.tap("PlatformPlugin", () => {
+			compiler.platform = {
+				...compiler.platform,
+				...this.platform
+			};
+		});
+	}
+}
+
+module.exports = PlatformPlugin;

package/lib/ProgressPlugin.js

@@ -21,7 +21,7 @@ const { contextify } = require("./util/identifier");
 /** @typedef {import("./logging/Logger").Logger} Logger */
 
 /**
- * @typedef {Object} CountsData
+ * @typedef {object} CountsData
  * @property {number} modulesCount modules count
  * @property {number} dependenciesCount dependencies count
  */

package/lib/ProvidePlugin.js

@@ -59,7 +59,9 @@ class ProvidePlugin {
 				 */
 				const handler = (parser, parserOptions) => {
 					Object.keys(definitions).forEach(name => {
-						const request = [].concat(definitions[name]);
+						const request =
+							/** @type {string[]} */
+							([]).concat(definitions[name]);
 						const splittedName = name.split(".");
 						if (splittedName.length > 0) {
 							splittedName.slice(1).forEach((_, i) => {

package/lib/RawModule.js

@@ -19,6 +19,7 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {import("./Module").CodeGenerationContext} CodeGenerationContext */
 /** @typedef {import("./Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("./Module").NeedBuildContext} NeedBuildContext */
+/** @typedef {import("./Module").ReadOnlyRuntimeRequirements} ReadOnlyRuntimeRequirements */
 /** @typedef {import("./Module").SourceTypes} SourceTypes */
 /** @typedef {import("./RequestShortener")} RequestShortener */
 /** @typedef {import("./ResolverFactory").ResolverWithOptions} ResolverWithOptions */
@@ -36,7 +37,7 @@ class RawModule extends Module {
 	 * @param {string} source source code
 	 * @param {string} identifier unique identifier
 	 * @param {string=} readableIdentifier readable identifier
-	 * @param {ReadonlySet<string>=} runtimeRequirements runtime requirements needed for the source code
+	 * @param {ReadOnlyRuntimeRequirements=} runtimeRequirements runtime requirements needed for the source code
 	 */
 	constructor(source, identifier, readableIdentifier, runtimeRequirements) {
 		super(JAVASCRIPT_MODULE_TYPE_DYNAMIC, null);

package/lib/RecordIdsPlugin.js

@@ -13,28 +13,28 @@ const identifierUtils = require("./util/identifier");
 /** @typedef {import("./Module")} Module */
 
 /**
- * @typedef {Object} RecordsChunks
+ * @typedef {object} RecordsChunks
  * @property {Record<string, number>=} byName
  * @property {Record<string, number>=} bySource
  * @property {number[]=} usedIds
  */
 
 /**
- * @typedef {Object} RecordsModules
+ * @typedef {object} RecordsModules
  * @property {Record<string, number>=} byIdentifier
  * @property {Record<string, number>=} bySource
  * @property {number[]=} usedIds
  */
 
 /**
- * @typedef {Object} Records
+ * @typedef {object} Records
  * @property {RecordsChunks=} chunks
  * @property {RecordsModules=} modules
  */
 
 class RecordIdsPlugin {
 	/**
-	 * @param {Object} options Options object
+	 * @param {object} options Options object
 	 * @param {boolean=} options.portableIds true, when ids need to be portable
 	 */
 	constructor(options) {

package/lib/ResolverFactory.js

@@ -22,7 +22,7 @@ const {
 
 /** @typedef {WebpackResolveOptions & {dependencyType?: string, resolveToContext?: boolean }} ResolveOptionsWithDependencyType */
 /**
- * @typedef {Object} WithOptions
+ * @typedef {object} WithOptions
  * @property {function(Partial<ResolveOptionsWithDependencyType>): ResolverWithOptions} withOptions create a resolver with additional/different options
  */
 
@@ -61,13 +61,15 @@ const convertToResolveOptions = resolveOptionsWithDepType => {
 		);
 
 	return removeOperations(
-		resolveByProperty(options, "byDependency", dependencyType)
+		resolveByProperty(options, "byDependency", dependencyType),
+		// Keep the `unsafeCache` because it can be a `Proxy`
+		["unsafeCache"]
 	);
 };
 
 /**
- * @typedef {Object} ResolverCache
- * @property {WeakMap<Object, ResolverWithOptions>} direct
+ * @typedef {object} ResolverCache
+ * @property {WeakMap<object, ResolverWithOptions>} direct
  * @property {Map<string, ResolverWithOptions>} stringified
  */
 

package/lib/RuntimeModule.js

@@ -47,7 +47,7 @@ class RuntimeModule extends Module {
 		this.chunkGraph = undefined;
 		this.fullHash = false;
 		this.dependentHash = false;
-		/** @type {string | undefined} */
+		/** @type {string | undefined | null} */
 		this._cachedGeneratedCode = undefined;
 	}
 
@@ -113,9 +113,9 @@ class RuntimeModule extends Module {
 			if (this.fullHash || this.dependentHash) {
 				// Do not use getGeneratedCode here, because i. e. compilation hash might be not
 				// ready at this point. We will cache it later instead.
-				hash.update(this.generate());
+				hash.update(/** @type {string} */ (this.generate()));
 			} else {
-				hash.update(this.getGeneratedCode());
+				hash.update(/** @type {string} */ (this.getGeneratedCode()));
 			}
 		} catch (err) {
 			hash.update(/** @type {Error} */ (err).message);
@@ -179,7 +179,7 @@ class RuntimeModule extends Module {
 	 */
 	getGeneratedCode() {
 		if (this._cachedGeneratedCode) {
-			return /** @type {string | null} */ (this._cachedGeneratedCode);
+			return this._cachedGeneratedCode;
 		}
 		return (this._cachedGeneratedCode = this.generate());
 	}

package/lib/RuntimePlugin.js

@@ -60,6 +60,7 @@ const GLOBALS_ON_REQUIRE = [
 	RuntimeGlobals.publicPath,
 	RuntimeGlobals.baseURI,
 	RuntimeGlobals.relativeUrl,
+	// TODO webpack 6 - rename to nonce, because we use it for CSS too
 	RuntimeGlobals.scriptNonce,
 	RuntimeGlobals.uncaughtErrorHandler,
 	RuntimeGlobals.asyncModule,