fix: use hook afterEmit and emit error on catch

webpack-contrib · Dec 1, 2019 · 17f7421 · 17f7421
1 parent e16d03c
commit 17f7421
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 21 deletions.
diff --git a/src/linter.js b/src/linter.js
@@ -11,6 +11,23 @@ export default function linter(options, compiler, callback) {
     .then(({ results }) => {
       ({ errors, warnings } = parseResults(options, results));
 
+      compiler.hooks.afterEmit.tapAsync(
+        'StylelintWebpackPlugin',
+        (compilation, next) => {
+          if (warnings.length) {
+            compilation.warnings.push(StylelintError.format(options, warnings));
+            warnings = [];
+          }
+
+          if (errors.length) {
+            compilation.errors.push(StylelintError.format(options, errors));
+            errors = [];
+          }
+
+          next();
+        }
+      );
+
       if (options.failOnError && errors.length) {
         callback(StylelintError.format(options, errors));
       } else if (options.failOnWarning && warnings.length) {
@@ -19,24 +36,17 @@ export default function linter(options, compiler, callback) {
         callback();
       }
     })
-    .catch(callback);
-
-  compiler.hooks.afterCompile.tapAsync(
-    'StylelintWebpackPlugin',
-    (compilation, next) => {
-      if (warnings.length) {
-        compilation.warnings.push(StylelintError.format(options, warnings));
-        warnings = [];
-      }
-
-      if (errors.length) {
-        compilation.errors.push(StylelintError.format(options, errors));
-        errors = [];
-      }
+    .catch((e) => {
+      compiler.hooks.afterEmit.tapAsync(
+        'StylelintWebpackPlugin',
+        (compilation, next) => {
+          compilation.errors.push(new StylelintError(e.message));
+          next();
+        }
+      );
 
-      next();
-    }
-  );
+      callback();
+    });
 }
 
 function parseResults(options, results) {

diff --git a/test/empty.test.js b/test/empty.test.js
@@ -16,8 +16,12 @@ describe('empty', () => {
       plugins: [new StylelintPlugin()],
     });
 
-    compiler.run((err) => {
-      expect(err.message).toContain('No files matching the pattern');
+    compiler.run((err, stats) => {
+      const { errors } = stats.compilation;
+      expect(stats.hasWarnings()).toBe(false);
+      expect(stats.hasErrors()).toBe(true);
+      expect(errors).toHaveLength(1);
+      expect(errors[0].message).toContain('No files matching the pattern');
       done();
     });
   });

diff --git a/test/fail-on-config.test.js b/test/fail-on-config.test.js
@@ -7,8 +7,12 @@ describe('fail on config', () => {
     const configFile = join(__dirname, '.badstylelintrc');
     const compiler = pack('error', { configFile });
 
-    compiler.run((err) => {
-      expect(err.message).toMatch(/duplicated mapping key|Failed to parse/);
+    compiler.run((err, stats) => {
+      const { errors } = stats.compilation;
+      expect(stats.hasWarnings()).toBe(false);
+      expect(stats.hasErrors()).toBe(true);
+      expect(errors).toHaveLength(1);
+      expect(errors[0].message).toMatch(/Map keys must be unique/);
       done();
     });
   });

diff --git a/test/fixtures/empty/index.js b/test/fixtures/empty/index.js