webpack 5.99.0 → 5.99.2

package/lib/javascript/JavascriptParser.js

@@ -1952,10 +1952,19 @@ class JavascriptParser extends Parser {
 	 * @param {(Statement | ModuleDeclaration)[]} statements statements
 	 */
 	walkStatements(statements) {
+		let onlyFunctionDeclaration = false;
+
 		for (let index = 0, len = statements.length; index < len; index++) {
 			const statement = statements[index];
+
+			if (onlyFunctionDeclaration && statement.type !== "FunctionDeclaration")
+				continue;
+
 			this.walkStatement(statement);
-			if (this.scope.terminated) break;
+
+			if (this.scope.terminated) {
+				onlyFunctionDeclaration = true;
+			}
 		}
 	}
 
@@ -2302,13 +2311,24 @@ class JavascriptParser extends Parser {
 			this.walkStatement(statement.block);
 			this.scope.inTry = false;
 		}
-		if (this.scope.terminated === "throw") {
-			this.scope.terminated = undefined;
-		} else if (this.scope.terminated === "return") {
-			return;
-		}
+
+		const tryTerminated = this.scope.terminated;
+		this.scope.terminated = undefined;
+
 		if (statement.handler) this.walkCatchClause(statement.handler);
+
+		const handlerTerminated = this.scope.terminated;
+		this.scope.terminated = undefined;
+
 		if (statement.finalizer) this.walkStatement(statement.finalizer);
+
+		if (
+			!this.scope.terminated &&
+			tryTerminated &&
+			(statement.handler ? handlerTerminated : true)
+		) {
+			this.scope.terminated = tryTerminated;
+		}
 	}
 
 	/**
@@ -3001,7 +3021,7 @@ class JavascriptParser extends Parser {
 			this.blockPreWalkStatement(catchClause.body);
 			this.prevStatement = prev;
 			this.walkStatement(catchClause.body);
-		});
+		}, true);
 	}
 
 	/**

package/package.json

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