fix: hooks and callback error

webpack-contrib · Dec 20, 2019 · 3e7c36e · 3e7c36e
1 parent b7f3679
commit 3e7c36e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/src/linter.js b/src/linter.js
@@ -34,7 +34,7 @@ export default function linter(options, compiler, callback) {
 
     let { errors, warnings } = parseResults(options, results);
 
-    compiler.hooks.afterCompile.tapAsync(
+    compiler.hooks.afterEmit.tapAsync(
       'ESLintWebpackPlugin',
       (compilation, next) => {
         if (warnings.length > 0) {
@@ -85,7 +85,15 @@ export default function linter(options, compiler, callback) {
       callback();
     }
   } catch (e) {
-    callback(e);
+    compiler.hooks.afterEmit.tapAsync(
+      'ESLintWebpackPlugin',
+      (compilation, next) => {
+        compilation.errors.push(new ESLintError(e.message));
+        next();
+      }
+    );
+
+    callback();
   }
 }
 

diff --git a/test/empty.test.js b/test/empty.test.js
@@ -9,11 +9,16 @@ describe('empty', () => {
     const compiler = webpack({
       context: join(__dirname, 'fixtures', 'empty'),
       mode: 'development',
+      entry: '../index',
       plugins: [new ESLintPlugin()],
     });
 
-    compiler.run((err) => {
-      expect(err.message).toMatch(/No files matching/i);
+    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(/No files matching/i);
       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, '.badeslintrc');
     const compiler = pack('error', { configFile });
 
-    compiler.run((err) => {
-      expect(err.message).toMatch(
+    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(
         /ESLint configuration in --config is invalid/i
       );
       done();