webpack 5.44.0 → 5.45.0

package/schemas/WebpackOptions.json

@@ -3585,6 +3585,13 @@
       "type": "object",
       "additionalProperties": false,
       "properties": {
+        "assert": {
+          "description": "Match on import assertions of the dependency.",
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/RuleSetConditionOrConditions"
+          }
+        },
         "compiler": {
           "description": "Match the child compiler name.",
           "oneOf": [

package/types.d.ts

@@ -80,7 +80,8 @@ import {
 	WithStatement,
 	YieldExpression
 } from "estree";
-import { ValidationError, validate as validateFunction } from "schema-utils";
+import { validate as validateFunction } from "schema-utils";
+import { default as ValidationError } from "schema-utils/declarations/ValidationError";
 import { ValidationErrorConfiguration } from "schema-utils/declarations/validate";
 import {
 	AsArray,
@@ -1865,10 +1866,10 @@ declare class Compiler {
 	records: object;
 	managedPaths: Set<string>;
 	immutablePaths: Set<string>;
-	modifiedFiles: Set<string>;
-	removedFiles: Set<string>;
-	fileTimestamps: Map<string, null | FileSystemInfoEntry | "ignore">;
-	contextTimestamps: Map<string, null | FileSystemInfoEntry | "ignore">;
+	modifiedFiles: ReadonlySet<string>;
+	removedFiles: ReadonlySet<string>;
+	fileTimestamps: ReadonlyMap<string, null | FileSystemInfoEntry | "ignore">;
+	contextTimestamps: ReadonlyMap<string, null | FileSystemInfoEntry | "ignore">;
 	fsStartTime: number;
 	resolverFactory: ResolverFactory;
 	infrastructureLogger: any;
@@ -3966,10 +3967,12 @@ declare abstract class FileSystemInfo {
 	logStatistics(): void;
 	clear(): void;
 	addFileTimestamps(
-		map: Map<string, null | FileSystemInfoEntry | "ignore">
+		map: ReadonlyMap<string, null | FileSystemInfoEntry | "ignore">,
+		immutable?: boolean
 	): void;
 	addContextTimestamps(
-		map: Map<string, null | FileSystemInfoEntry | "ignore">
+		map: ReadonlyMap<string, null | FileSystemInfoEntry | "ignore">,
+		immutable?: boolean
 	): void;
 	getFileTimestamp(
 		path: string,
@@ -4732,21 +4735,44 @@ declare class JavascriptParser extends Parser {
 			boolean | void
 		>;
 		label: HookMap<SyncBailHook<[LabeledStatement], boolean | void>>;
-		import: SyncBailHook<[Statement, ImportSource], boolean | void>;
+		import: SyncBailHook<[ImportDeclaration, ImportSource], boolean | void>;
 		importSpecifier: SyncBailHook<
-			[Statement, ImportSource, string, string],
+			[ImportDeclaration, ImportSource, string, string],
+			boolean | void
+		>;
+		export: SyncBailHook<
+			[ExportNamedDeclaration | ExportAllDeclaration],
+			boolean | void
+		>;
+		exportImport: SyncBailHook<
+			[ExportNamedDeclaration | ExportAllDeclaration, ImportSource],
+			boolean | void
+		>;
+		exportDeclaration: SyncBailHook<
+			[ExportNamedDeclaration | ExportAllDeclaration, Declaration],
+			boolean | void
+		>;
+		exportExpression: SyncBailHook<
+			[ExportDefaultDeclaration, Declaration],
 			boolean | void
 		>;
-		export: SyncBailHook<[Statement], boolean | void>;
-		exportImport: SyncBailHook<[Statement, ImportSource], boolean | void>;
-		exportDeclaration: SyncBailHook<[Statement, Declaration], boolean | void>;
-		exportExpression: SyncBailHook<[Statement, Declaration], boolean | void>;
 		exportSpecifier: SyncBailHook<
-			[Statement, string, string, undefined | number],
+			[
+				ExportNamedDeclaration | ExportAllDeclaration,
+				string,
+				string,
+				undefined | number
+			],
 			boolean | void
 		>;
 		exportImportSpecifier: SyncBailHook<
-			[Statement, ImportSource, string, string, undefined | number],
+			[
+				ExportNamedDeclaration | ExportAllDeclaration,
+				ImportSource,
+				string,
+				string,
+				undefined | number
+			],
 			boolean | void
 		>;
 		preDeclarator: SyncBailHook<
@@ -6371,6 +6397,7 @@ declare class ModuleDependency extends Dependency {
 	request: string;
 	userRequest: string;
 	range: any;
+	assertions?: Record<string, any>;
 	static Template: typeof DependencyTemplate;
 	static NO_EXPORTS_REFERENCED: string[][];
 	static EXPORTS_OBJECT_REFERENCED: string[][];
@@ -8927,6 +8954,7 @@ declare interface ResolveData {
 	resolveOptions?: ResolveOptionsWebpackOptions;
 	context: string;
 	request: string;
+	assertions?: Record<string, any>;
 	dependencies: ModuleDependency[];
 	createData: Object;
 	fileDependencies: LazySet<string>;
@@ -9338,6 +9366,11 @@ declare interface RuleSetLogicalConditionsAbsolute {
  * A rule description with conditions and effects for modules.
  */
 declare interface RuleSetRule {
+	/**
+	 * Match on import assertions of the dependency.
+	 */
+	assert?: { [index: string]: RuleSetConditionOrConditions };
+
 	/**
 	 * Match the child compiler name.
 	 */

package/lib/util/StackedSetMap.js

@@ -1,166 +0,0 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-
-"use strict";
-
-const TOMBSTONE = Symbol("tombstone");
-const UNDEFINED_MARKER = Symbol("undefined");
-
-/**
- * @template T
- * @typedef {T | undefined} Cell<T>
- */
-
-/**
- * @template T
- * @typedef {T | typeof TOMBSTONE | typeof UNDEFINED_MARKER} InternalCell<T>
- */
-
-/**
- * @template K
- * @template V
- * @param {[K, InternalCell<V>]} pair the internal cell
- * @returns {[K, Cell<V>]} its “safe” representation
- */
-const extractPair = pair => {
-	const key = pair[0];
-	const val = pair[1];
-	if (val === UNDEFINED_MARKER || val === TOMBSTONE) {
-		return [key, undefined];
-	} else {
-		return /** @type {[K, Cell<V>]} */ (pair);
-	}
-};
-
-/**
- * @template K
- * @template V
- */
-class StackedMap {
-	/**
-	 * @param {Map<K, InternalCell<V>>[]=} parentStack an optional parent
-	 */
-	constructor(parentStack) {
-		/** @type {Map<K, InternalCell<V>>} */
-		this.map = new Map();
-		/** @type {Map<K, InternalCell<V>>[]} */
-		this.stack = parentStack === undefined ? [] : parentStack.slice();
-		this.stack.push(this.map);
-	}
-
-	/**
-	 * @param {K} item the key of the element to add
-	 * @param {V} value the value of the element to add
-	 * @returns {void}
-	 */
-	set(item, value) {
-		this.map.set(item, value === undefined ? UNDEFINED_MARKER : value);
-	}
-
-	/**
-	 * @param {K} item the item to delete
-	 * @returns {void}
-	 */
-	delete(item) {
-		if (this.stack.length > 1) {
-			this.map.set(item, TOMBSTONE);
-		} else {
-			this.map.delete(item);
-		}
-	}
-
-	/**
-	 * @param {K} item the item to test
-	 * @returns {boolean} true if the item exists in this set
-	 */
-	has(item) {
-		const topValue = this.map.get(item);
-		if (topValue !== undefined) {
-			return topValue !== TOMBSTONE;
-		}
-		if (this.stack.length > 1) {
-			for (let i = this.stack.length - 2; i >= 0; i--) {
-				const value = this.stack[i].get(item);
-				if (value !== undefined) {
-					this.map.set(item, value);
-					return value !== TOMBSTONE;
-				}
-			}
-			this.map.set(item, TOMBSTONE);
-		}
-		return false;
-	}
-
-	/**
-	 * @param {K} item the key of the element to return
-	 * @returns {Cell<V>} the value of the element
-	 */
-	get(item) {
-		const topValue = this.map.get(item);
-		if (topValue !== undefined) {
-			return topValue === TOMBSTONE || topValue === UNDEFINED_MARKER
-				? undefined
-				: topValue;
-		}
-		if (this.stack.length > 1) {
-			for (let i = this.stack.length - 2; i >= 0; i--) {
-				const value = this.stack[i].get(item);
-				if (value !== undefined) {
-					this.map.set(item, value);
-					return value === TOMBSTONE || value === UNDEFINED_MARKER
-						? undefined
-						: value;
-				}
-			}
-			this.map.set(item, TOMBSTONE);
-		}
-		return undefined;
-	}
-
-	_compress() {
-		if (this.stack.length === 1) return;
-		this.map = new Map();
-		for (const data of this.stack) {
-			for (const pair of data) {
-				if (pair[1] === TOMBSTONE) {
-					this.map.delete(pair[0]);
-				} else {
-					this.map.set(pair[0], pair[1]);
-				}
-			}
-		}
-		this.stack = [this.map];
-	}
-
-	asArray() {
-		this._compress();
-		return Array.from(this.map.keys());
-	}
-
-	asSet() {
-		this._compress();
-		return new Set(this.map.keys());
-	}
-
-	asPairArray() {
-		this._compress();
-		return Array.from(this.map.entries(), extractPair);
-	}
-
-	asMap() {
-		return new Map(this.asPairArray());
-	}
-
-	get size() {
-		this._compress();
-		return this.map.size;
-	}
-
-	createChild() {
-		return new StackedMap(this.stack);
-	}
-}
-
-module.exports = StackedMap;