chore: revert breaking change

webpack · Nov 22, 2022 · c922ee1 · c922ee1
1 parent e7e2aec
commit c922ee1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/lib/dependencies/CommonJsImportsParserPlugin.js b/lib/dependencies/CommonJsImportsParserPlugin.js
@@ -236,7 +236,8 @@ class CommonJsImportsParserPlugin {
 					parser.parseCommentOptions(expr.range);
 
 				if (commentErrors) {
-					for (const { cause: e, comment } of commentErrors) {
+					for (const e of commentErrors) {
+						const { comment } = e;
 						parser.state.module.addWarning(
 							new CommentCompilationWarning(
 								`Compilation error while processing magic comment(-s): /*${comment.value}*/: ${e.message}`,

diff --git a/lib/dependencies/ImportParserPlugin.js b/lib/dependencies/ImportParserPlugin.js
@@ -55,7 +55,8 @@ class ImportParserPlugin {
 				parser.parseCommentOptions(expr.range);
 
 			if (commentErrors) {
-				for (const { cause: e, comment } of commentErrors) {
+				for (const e of commentErrors) {
+					const { comment } = e;
 					parser.state.module.addWarning(
 						new CommentCompilationWarning(
 							`Compilation error while processing magic comment(-s): /*${comment.value}*/: ${e.message}`,

diff --git a/lib/dependencies/WorkerPlugin.js b/lib/dependencies/WorkerPlugin.js
@@ -203,7 +203,8 @@ class WorkerPlugin {
 							parser.parseCommentOptions(expr.range);
 
 						if (commentErrors) {
-							for (const { cause: e, comment } of commentErrors) {
+							for (const e of commentErrors) {
+								const { comment } = e;
 								parser.state.module.addWarning(
 									new CommentCompilationWarning(
 										`Compilation error while processing magic comment(-s): /*${comment.value}*/: ${e.message}`,

diff --git a/lib/javascript/JavascriptParser.js b/lib/javascript/JavascriptParser.js
@@ -3635,6 +3635,7 @@ class JavascriptParser extends Parser {
 			return EMPTY_COMMENT_OPTIONS;
 		}
 		let options = {};
+		/** @type {unknown[]} */
 		let errors = [];
 		for (const comment of comments) {
 			const { value } = comment;
@@ -3651,7 +3652,10 @@ class JavascriptParser extends Parser {
 						options[key] = val;
 					}
 				} catch (e) {
-					errors.push({ comment, cause: e });
+					const newErr = new Error(String(e.message));
+					newErr.stack = String(e.stack);
+					newErr.comment = comment;
+					errors.push(newErr);
 				}
 			}
 		}

diff --git a/types.d.ts b/types.d.ts
@@ -5476,9 +5476,7 @@ declare class JavascriptParser extends Parser {
 	evaluatedVariable(tagInfo?: any): VariableInfo;
 	parseCommentOptions(
 		range?: any
-	):
-		| { options: null; errors: null }
-		| { options: object; errors: { comment: any; cause: unknown }[] };
+	): { options: null; errors: null } | { options: object; errors: unknown[] };
 	extractMemberExpressionChain(expression: MemberExpression): {
 		members: string[];
 		object: