fix: compiler hooks

webpack-contrib · Sep 30, 2019 · aca2c1d · aca2c1d
1 parent 9dc0a9c
commit aca2c1d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/src/LintDirtyModulesPlugin.js b/src/LintDirtyModulesPlugin.js
@@ -3,30 +3,31 @@ import { isMatch } from 'micromatch';
 import linter from './linter';
 
 export default class LintDirtyModulesPlugin {
-  constructor(options) {
+  constructor(compiler, options) {
+    this.compiler = compiler;
     this.options = options;
     this.startTime = Date.now();
     this.prevTimestamps = {};
     this.isFirstRun = true;
   }
 
-  apply(compiler, callback) {
+  apply(compilation, callback) {
     if (this.isFirstRun) {
       this.isFirstRun = false;
-      this.prevTimestamps = compiler.fileTimestamps;
+      this.prevTimestamps = compilation.fileTimestamps;
       callback();
       return;
     }
 
     const dirtyOptions = { ...this.options };
     const glob = dirtyOptions.files.join('|');
-    const changedFiles = this.getChangedFiles(compiler.fileTimestamps, glob);
+    const changedFiles = this.getChangedFiles(compilation.fileTimestamps, glob);
 
-    this.prevTimestamps = compiler.fileTimestamps;
+    this.prevTimestamps = compilation.fileTimestamps;
 
     if (changedFiles.length) {
       dirtyOptions.files = changedFiles;
-      linter(dirtyOptions, compiler, callback);
+      linter(dirtyOptions, this.compiler, callback);
     } else {
       callback();
     }

diff --git a/src/index.js b/src/index.js
@@ -22,9 +22,9 @@ class StylelintWebpackPlugin {
     const plugin = { name: this.constructor.name };
 
     if (options.lintDirtyModulesOnly) {
-      const lintDirtyModulesPlugin = new LintDirtyModulesPlugin(options);
+      const lintDirty = new LintDirtyModulesPlugin(compiler, options);
       compiler.hooks.emit.tapAsync(plugin, (compilation, callback) => {
-        lintDirtyModulesPlugin.apply(compilation, callback);
+        lintDirty.apply(compilation, callback);
       });
     } else {
       compiler.hooks.run.tapAsync(plugin, (compilation, callback) => {

diff --git a/src/linter.js b/src/linter.js
@@ -21,7 +21,7 @@ export default function linter(options, compiler, callback) {
     })
     .catch(callback);
 
-  compiler.hooks.afterCompile.tapAsync(
+  compiler.hooks.afterEmit.tapAsync(
     'StylelintWebpackPlugin',
     (compilation, next) => {
       if (warnings.length) {

diff --git a/test/lint-dirty-modules-only.test.js b/test/lint-dirty-modules-only.test.js
@@ -12,7 +12,7 @@ describe('lint dirty modules only', () => {
   beforeAll(() => {
     callback = jest.fn();
 
-    plugin = new LintDirtyModulesPlugin({ files: ['**/*.s?(c|a)ss'] });
+    plugin = new LintDirtyModulesPlugin(null, { files: ['**/*.s?(c|a)ss'] });
     plugin.isFirstRun = false;
   });