webpack 5.99.3 → 5.99.5

package/lib/javascript/JavascriptParser.js

@@ -2197,24 +2197,34 @@ class JavascriptParser extends Parser {
 	walkIfStatement(statement) {
 		const result = this.hooks.statementIf.call(statement);
 		if (result === undefined) {
-			this.inExecutedPath(false, () => {
-				this.walkExpression(statement.test);
-				this.walkNestedStatement(statement.consequent);
-			});
+			this.walkExpression(statement.test);
+			this.walkNestedStatement(statement.consequent);
 
-			this.inExecutedPath(true, () => {
-				if (statement.alternate) {
-					this.walkNestedStatement(statement.alternate);
-				}
-			});
+			const consequentTerminated = this.scope.terminated;
+			this.scope.terminated = undefined;
+
+			if (statement.alternate) {
+				this.walkNestedStatement(statement.alternate);
+			}
+
+			const alternateTerminated = this.scope.terminated;
+
+			this.scope.terminated =
+				consequentTerminated && alternateTerminated
+					? this.scope.terminated
+					: undefined;
 		} else {
-			this.inExecutedPath(true, () => {
-				if (result) {
-					this.walkNestedStatement(statement.consequent);
-				} else if (statement.alternate) {
-					this.walkNestedStatement(statement.alternate);
-				}
-			});
+			const oldState = this.scope.inExecutedPath;
+
+			this.scope.inExecutedPath = true;
+
+			if (result) {
+				this.walkNestedStatement(statement.consequent);
+			} else if (statement.alternate) {
+				this.walkNestedStatement(statement.alternate);
+			}
+
+			this.scope.inExecutedPath = oldState;
 		}
 	}
 
@@ -2234,7 +2244,9 @@ class JavascriptParser extends Parser {
 			const result = hook.call(statement);
 			if (result === true) return;
 		}
-		this.walkNestedStatement(statement.body);
+		this.inBlockScope(() => {
+			this.walkNestedStatement(statement.body);
+		});
 	}
 
 	/**
@@ -2248,8 +2260,10 @@ class JavascriptParser extends Parser {
 	 * @param {WithStatement} statement with statement
 	 */
 	walkWithStatement(statement) {
-		this.walkExpression(statement.object);
-		this.walkNestedStatement(statement.body);
+		this.inBlockScope(() => {
+			this.walkExpression(statement.object);
+			this.walkNestedStatement(statement.body);
+		});
 	}
 
 	/**
@@ -2345,8 +2359,10 @@ class JavascriptParser extends Parser {
 	 * @param {WhileStatement} statement while statement
 	 */
 	walkWhileStatement(statement) {
-		this.walkExpression(statement.test);
-		this.walkNestedStatement(statement.body);
+		this.inBlockScope(() => {
+			this.walkExpression(statement.test);
+			this.walkNestedStatement(statement.body);
+		});
 	}
 
 	/**
@@ -2360,8 +2376,10 @@ class JavascriptParser extends Parser {
 	 * @param {DoWhileStatement} statement do while statement
 	 */
 	walkDoWhileStatement(statement) {
-		this.walkNestedStatement(statement.body);
-		this.walkExpression(statement.test);
+		this.inBlockScope(() => {
+			this.walkNestedStatement(statement.body);
+			this.walkExpression(statement.test);
+		});
 	}
 
 	/**
@@ -3479,21 +3497,16 @@ class JavascriptParser extends Parser {
 	walkConditionalExpression(expression) {
 		const result = this.hooks.expressionConditionalOperator.call(expression);
 		if (result === undefined) {
-			this.inExecutedPath(false, () => {
-				this.walkExpression(expression.test);
-				this.walkExpression(expression.consequent);
-				if (expression.alternate) {
-					this.walkExpression(expression.alternate);
-				}
-			});
-		} else {
-			this.inExecutedPath(true, () => {
-				if (result) {
-					this.walkExpression(expression.consequent);
-				} else if (expression.alternate) {
-					this.walkExpression(expression.alternate);
-				}
-			});
+			this.walkExpression(expression.test);
+			this.walkExpression(expression.consequent);
+
+			if (expression.alternate) {
+				this.walkExpression(expression.alternate);
+			}
+		} else if (result) {
+			this.walkExpression(expression.consequent);
+		} else if (expression.alternate) {
+			this.walkExpression(expression.alternate);
 		}
 	}
 
@@ -4077,23 +4090,6 @@ class JavascriptParser extends Parser {
 		this.scope = oldScope;
 	}
 
-	/**
-	 * @param {boolean} state executed state
-	 * @param {() => void} fn inner function
-	 */
-	inExecutedPath(state, fn) {
-		const oldState = this.scope.inExecutedPath;
-		const oldTerminated = this.scope.terminated;
-		this.scope.inExecutedPath = state;
-
-		fn();
-
-		if (!state) {
-			this.scope.terminated = oldTerminated;
-		}
-		this.scope.inExecutedPath = oldState;
-	}
-
 	/**
 	 * @param {boolean} hasThis true, when this is defined
 	 * @param {Identifier[]} params scope params

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.99.3",
+  "version": "5.99.5",
   "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

@@ -7043,7 +7043,6 @@ declare class JavascriptParser extends Parser {
 		)[],
 		fn: () => void
 	): void;
-	inExecutedPath(state: boolean, fn: () => void): void;
 	inClassScope(hasThis: boolean, params: Identifier[], fn: () => void): void;
 	inFunctionScope(
 		hasThis: boolean,