magic comment regexp match update and statsCase test updated

keblodev · keblodev · commit a228daec58ee · 2018-05-30T13:18:43.000+08:00
plus minor renamings and snapshot update
diff --git a/lib/Parser.js b/lib/Parser.js
@@ -31,17 +31,8 @@ const defaultParserOptions = {
 	}
 };
 
-const webpackImportCommentOptions = [
-	"webpackIgnore",
-	"webpackChunkName",
-	"webpackMode",
-	"webpackPrefetch",
-	"webpackPreload",
-	"webpackInclude",
-	"webpackExclude"
-];
-
-const webpackCommentRegExp = new RegExp(webpackImportCommentOptions.join("|"));
+// regexp to match at lease one "magic comment"
+const webpackCommentRegExp = new RegExp(/(^|\W)webpack[A-Z]{1,}[A-Za-z]{1,}:/);
 
 const EMPTY_COMMENT_OPTIONS = {
 	options: null,
diff --git a/lib/dependencies/ImportParserPlugin.js b/lib/dependencies/ImportParserPlugin.js
@@ -41,10 +41,10 @@ class ImportParserPlugin {
 				for (const e of commentErrors) {
 					const { comment } = e;
 					parser.state.module.warnings.push(
-						new ImportOptionsCompileWarning(
-							`compilation error while processing: /*${comment.value}*/: ${
-								e.message
-							}`,
+						new CommentCompilationWarning(
+							`Compilation error while processing magic comment(-s): /*${
+								comment.value
+							}*/: ${e.message}`,
 							parser.state.module,
 							comment.loc
 						)
@@ -250,11 +250,11 @@ class ImportParserPlugin {
 	}
 }
 
-class ImportOptionsCompileWarning extends WebpackError {
+class CommentCompilationWarning extends WebpackError {
 	constructor(message, module, loc) {
 		super();
 
-		this.name = "ImportOptionsCompileWarning";
+		this.name = "CommentCompilationWarning";
 		this.message = message;
 
 		this.origin = this.module = module;
diff --git a/test/__snapshots__/StatsTestCases.test.js.snap b/test/__snapshots__/StatsTestCases.test.js.snap
@@ -1008,29 +1008,16 @@ Entrypoint entry = entry.js
 `;
 
 exports[`StatsTestCases should print correct stats for import-with-invalid-options-comments 1`] = `
-"Hash: 3933c30f2b0ad856b9f3
-Time: Xms
-Built at: Thu Jan 01 1970 00:00:00 GMT
-                       Asset       Size  Chunks             Chunk Names
-                    chunk.js   1.16 KiB       0  [emitted]  chunk
-                     main.js   7.85 KiB       1  [emitted]  main
-                        2.js  154 bytes       2  [emitted]  
-goingToCompileChunkName-b.js  163 bytes       3  [emitted]  goingToCompileChunkName-b
-                        4.js  157 bytes       4  [emitted]  
-Entrypoint main = main.js
-[0] ./chunk-a.js 27 bytes {2} [built]
-[1] ./chunk-b.js 27 bytes {3} [built]
-[2] ./chunk-c.js 27 bytes {4} [built]
-[3] ./chunk.js 318 bytes {0} [built] [2 warnings]
-[4] ./index.js 50 bytes {1} [built]
+"   6 modules
+
+WARNING in ./chunk.js
+Compilation error while processing magic comment(-s): /* webpack Prefetch: 0, webpackChunkName: \\"notGoingToCompile-c\\" */: Unexpected identifier
 
 WARNING in ./chunk.js
-compilation error while processing: /* webpack Prefetch: 0, webpackChunkName: \\"notGoingToCompile-c\\" */: Unexpected identifier
- @ ./index.js 4:11-77 1:0-49
+Compilation error while processing magic comment(-s): /* webpackPrefetch: nope */: nope is not defined
 
 WARNING in ./chunk.js
-compilation error while processing: /* webpackPrefetch: true, webpackChunkName: notGoingToCompileChunkName */: notGoingToCompileChunkName is not defined
- @ ./index.js 2:11-84 1:0-49"
+Compilation error while processing magic comment(-s): /* webpackPrefetch: true, webpackChunkName: notGoingToCompileChunkName */: notGoingToCompileChunkName is not defined"
 `;
 
 exports[`StatsTestCases should print correct stats for limit-chunk-count-plugin 1`] = `
diff --git a/test/statsCases/import-with-invalid-options-comments/chunk-d.js b/test/statsCases/import-with-invalid-options-comments/chunk-d.js
@@ -0,0 +1 @@
+module.exports = "chunk-d";
diff --git a/test/statsCases/import-with-invalid-options-comments/chunk.js b/test/statsCases/import-with-invalid-options-comments/chunk.js
@@ -2,4 +2,5 @@ export default function() {
     import(/* webpackPrefetch: true, webpackChunkName: notGoingToCompileChunkName */ "./chunk-a");
     import(/* webpackPrefetch: 0, webpackChunkName: "goingToCompileChunkName-b" */ "./chunk-b");
     import(/* webpack Prefetch: 0, webpackChunkName: "notGoingToCompile-c" */ "./chunk-c");
+    import(/* webpackPrefetch: nope */ /* webpackChunkName: "yep" */ "./chunk-d");
 }
diff --git a/test/statsCases/import-with-invalid-options-comments/webpack.config.js b/test/statsCases/import-with-invalid-options-comments/webpack.config.js
@@ -4,5 +4,5 @@ module.exports = {
 	output: {
 		chunkFilename: "[name].js"
 	},
-	performance: false
+	stats: "minimal"
 };

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,5 @@ export default function() {`
`2`	`2`	`import(/* webpackPrefetch: true, webpackChunkName: notGoingToCompileChunkName */ "./chunk-a");`
`3`	`3`	`import(/* webpackPrefetch: 0, webpackChunkName: "goingToCompileChunkName-b" */ "./chunk-b");`
`4`	`4`	`import(/* webpack Prefetch: 0, webpackChunkName: "notGoingToCompile-c" */ "./chunk-c");`
	`5`	`+ import(/* webpackPrefetch: nope / / webpackChunkName: "yep" */ "./chunk-d");`
`5`	`6`	`}`