webpack 5.97.0 → 5.97.1

package/lib/DefinePlugin.js

@@ -14,7 +14,7 @@ const RuntimeGlobals = require("./RuntimeGlobals");
 const WebpackError = require("./WebpackError");
 const ConstDependency = require("./dependencies/ConstDependency");
 const BasicEvaluatedExpression = require("./javascript/BasicEvaluatedExpression");
-
+const { VariableInfo } = require("./javascript/JavascriptParser");
 const {
 	evaluateToString,
 	toConstantDependency
@@ -455,10 +455,16 @@ class DefinePlugin {
 					 */
 					const applyDefineKey = (prefix, key) => {
 						const splittedKey = key.split(".");
+						const firstKey = splittedKey[0];
 						for (const [i, _] of splittedKey.slice(1).entries()) {
 							const fullKey = prefix + splittedKey.slice(0, i + 1).join(".");
 							parser.hooks.canRename.for(fullKey).tap(PLUGIN_NAME, () => {
 								addValueDependency(key);
+								if (
+									parser.scope.definitions.get(firstKey) instanceof VariableInfo
+								) {
+									return false;
+								}
 								return true;
 							});
 						}

package/lib/hmr/HotModuleReplacementRuntimeModule.js

@@ -21,7 +21,6 @@ class HotModuleReplacementRuntimeModule extends RuntimeModule {
 		return Template.getFunctionContent(
 			require("./HotModuleReplacement.runtime.js")
 		)
-			.replace(/\$getFullHash\$/g, RuntimeGlobals.getFullHash)
 			.replace(
 				/\$interceptModuleExecution\$/g,
 				RuntimeGlobals.interceptModuleExecution

package/lib/javascript/JavascriptParser.js

@@ -5004,3 +5004,4 @@ module.exports.ALLOWED_MEMBER_TYPES_EXPRESSION =
 module.exports.ALLOWED_MEMBER_TYPES_CALL_EXPRESSION =
 	ALLOWED_MEMBER_TYPES_CALL_EXPRESSION;
 module.exports.getImportAttributes = getImportAttributes;
+module.exports.VariableInfo = VariableInfo;

package/lib/util/Queue.js

@@ -8,25 +8,24 @@
 /**
  * @template T
  */
-class Node {
+class Queue {
 	/**
-	 * @param {T} value the value
+	 * @param {Iterable<T>=} items The initial elements.
 	 */
-	constructor(value) {
-		this.value = value;
-		/** @type {Node<T> | undefined} */
-		this.next = undefined;
+	constructor(items) {
+		/**
+		 * @private
+		 * @type {Set<T>}
+		 */
+		this._set = new Set(items);
 	}
-}
 
-/**
- * @template T
- */
-class Queue {
-	constructor() {
-		this._head = undefined;
-		this._tail = undefined;
-		this._size = 0;
+	/**
+	 * Returns the number of elements in this queue.
+	 * @returns {number} The number of elements in this queue.
+	 */
+	get length() {
+		return this._set.size;
 	}
 
 	/**
@@ -35,18 +34,7 @@ class Queue {
 	 * @returns {void}
 	 */
 	enqueue(item) {
-		const node = new Node(item);
-
-		if (this._head) {
-			/** @type {Node<T>} */
-			(this._tail).next = node;
-			this._tail = node;
-		} else {
-			this._head = node;
-			this._tail = node;
-		}
-
-		this._size++;
+		this._set.add(item);
 	}
 
 	/**
@@ -54,31 +42,10 @@ class Queue {
 	 * @returns {T | undefined} The head of the queue of `undefined` if this queue is empty.
 	 */
 	dequeue() {
-		const current = this._head;
-		if (!current) {
-			return;
-		}
-
-		this._head = this._head.next;
-		this._size--;
-		return current.value;
-	}
-
-	/**
-	 * Returns the number of elements in this queue.
-	 * @returns {number} The number of elements in this queue.
-	 */
-	get length() {
-		return this._size;
-	}
-
-	*[Symbol.iterator]() {
-		let current = this._head;
-
-		while (current) {
-			yield current.value;
-			current = current.next;
-		}
+		const result = this._set[Symbol.iterator]().next();
+		if (result.done) return;
+		this._set.delete(result.value);
+		return result.value;
 	}
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.97.0",
+  "version": "5.97.1",
   "author": "Tobias Koppers @sokra",
   "description": "Packs ECMAScript/CommonJs/AMD modules for the browser. Allows you to split your codebase into multiple bundles, which can be loaded on demand. Supports loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",

package/types.d.ts

@@ -4546,7 +4546,7 @@ declare interface ExportSpec {
 	 */
 	hidden?: boolean;
 }
-type ExportedVariableInfo = string | ScopeInfo | VariableInfo;
+type ExportedVariableInfo = string | VariableInfo | ScopeInfo;
 declare abstract class ExportsInfo {
 	get ownedExports(): Iterable<ExportInfo>;
 	get orderedOwnedExports(): Iterable<ExportInfo>;
@@ -6810,7 +6810,7 @@ declare class JavascriptParser extends Parser {
 			| undefined
 			| ((
 					arg0: string,
-					arg1: string | ScopeInfo | VariableInfo,
+					arg1: string | VariableInfo | ScopeInfo,
 					arg2: () => string[]
 			  ) => any),
 		defined: undefined | ((arg0: string) => any),
@@ -7143,6 +7143,7 @@ declare class JavascriptParser extends Parser {
 			| ExportAllDeclarationJavascriptParser
 			| ImportExpressionJavascriptParser
 	) => undefined | ImportAttributes;
+	static VariableInfo: typeof VariableInfo;
 }
 
 /**
@@ -13918,7 +13919,7 @@ declare interface RuntimeValueOptions {
  * to create the range of the _parent node_.
  */
 declare interface ScopeInfo {
-	definitions: StackedMap<string, ScopeInfo | VariableInfo>;
+	definitions: StackedMap<string, VariableInfo | ScopeInfo>;
 	topLevelScope: boolean | "arrow";
 	inShorthand: string | boolean;
 	inTaggedTemplateTag: boolean;
@@ -15249,7 +15250,12 @@ type UsageStateType = 0 | 1 | 2 | 3 | 4;
 type UsedName = string | false | string[];
 type Value = string | number | boolean | RegExp;
 type ValueCacheVersion = string | Set<string>;
-declare abstract class VariableInfo {
+declare class VariableInfo {
+	constructor(
+		declaredScope: ScopeInfo,
+		freeName?: string | true,
+		tagInfo?: TagInfo
+	);
 	declaredScope: ScopeInfo;
 	freeName?: string | true;
 	tagInfo?: TagInfo;