Do not stop processing on error

ooflorent · ooflorent · commit 25ec7e41021d · 2018-05-29T13:17:36.000+02:00
diff --git a/lib/Parser.js b/lib/Parser.js
@@ -43,6 +43,11 @@ const webpackImportCommentOptions = [
 
 const webpackCommentRegExp = new RegExp(webpackImportCommentOptions.join("|"));
 
+const EMPTY_COMMENT_OPTIONS = {
+	options: null,
+	errors: null
+};
+
 class Parser extends Tapable {
 	constructor(options, sourceType = "auto") {
 		super();
@@ -1996,23 +2001,25 @@ class Parser extends Tapable {
 
 	parseCommentOptions(range) {
 		const comments = this.getComments(range);
-		if (comments.length === 0) return null;
-		const options = comments.map(comment => {
+		if (comments.length === 0) {
+			return EMPTY_COMMENT_OPTIONS;
+		}
+		let options = {};
+		let errors = [];
+		for (const comment of comments) {
 			const { value } = comment;
 			if (value && webpackCommentRegExp.test(value)) {
 				// try compile only if webpack options comment is present
 				try {
 					const val = vm.runInNewContext(`(function(){return {${value}};})()`);
-					return val;
+					Object.assign(options, val);
 				} catch (e) {
-					throw Error(
-						`compilation error while processing: /*${value}*/: ${e.message}`
-					);
+					e.comment = comment;
+					errors.push(e);
 				}
 			}
-			return {};
-		});
-		return options.reduce((o, i) => Object.assign(o, i), {});
+		}
+		return { options, errors };
 	}
 
 	getNameForExpression(expression) {
@@ -2100,11 +2107,7 @@ class Parser extends Tapable {
 Object.defineProperty(Parser.prototype, "getCommentOptions", {
 	configurable: false,
 	value: util.deprecate(function(range) {
-		try {
-			return this.parseCommentOptions(range);
-		} catch (e) {
-			return {};
-		}
+		return this.parseCommentOptions(range).options;
 	}, "Parser.getCommentOptions: Use Parser.parseCommentOptions(range) instead")
 });
 
diff --git a/lib/dependencies/ImportParserPlugin.js b/lib/dependencies/ImportParserPlugin.js
@@ -30,19 +30,26 @@ class ImportParserPlugin {
 			let mode = "lazy";
 			let include = null;
 			let exclude = null;
-			let importOptions = null;
 			const groupOptions = {};
 
-			try {
-				importOptions = parser.parseCommentOptions(expr.range);
-			} catch (e) {
-				parser.state.module.warnings.push(
-					new ImportOptionsCompileWarning(
-						e.message,
-						parser.state.module,
-						expr.loc
-					)
-				);
+			const {
+				options: importOptions,
+				errors: commentErrors
+			} = parser.parseCommentOptions(expr.range);
+
+			if (commentErrors) {
+				for (const e of commentErrors) {
+					const { comment } = e;
+					parser.state.module.warnings.push(
+						new ImportOptionsCompileWarning(
+							`compilation error while processing: /*${comment.value}*/: ${
+								e.message
+							}`,
+							parser.state.module,
+							comment.loc
+						)
+					);
+				}
 			}
 
 			if (importOptions) {
diff --git a/test/__snapshots__/StatsTestCases.test.js.snap b/test/__snapshots__/StatsTestCases.test.js.snap
@@ -1026,11 +1026,11 @@ Entrypoint main = main.js
 
 WARNING in ./chunk.js
 compilation error while processing: /* webpack Prefetch: 0, webpackChunkName: \\"notGoingToCompile-c\\" */: Unexpected identifier
- @ ./index.js 4:4-90 1:0-49
+ @ ./index.js 4:11-77 1:0-49
 
 WARNING in ./chunk.js
 compilation error while processing: /* webpackPrefetch: true, webpackChunkName: notGoingToCompileChunkName */: notGoingToCompileChunkName is not defined
- @ ./index.js 2:4-97 1:0-49"
+ @ ./index.js 2:11-84 1:0-49"
 `;
 
 exports[`StatsTestCases should print correct stats for limit-chunk-count-plugin 1`] = `
