fix: set key in apply

webpack-contrib · Jan 22, 2021 · 78307ea · 78307ea
1 parent a6f49ef
commit 78307ea
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 7 deletions.
diff --git a/declarations/getESLint.d.ts b/declarations/getESLint.d.ts
@@ -11,16 +11,25 @@
  */
 export function loadESLint(options: Options): Linter;
 /**
+ * @param {string|undefined} key
  * @param {number} poolSize
  * @param {Options} options
  * @returns {Linter}
  */
-export function loadESLintThreaded(poolSize: number, options: Options): Linter;
+export function loadESLintThreaded(
+  key: string | undefined,
+  poolSize: number,
+  options: Options
+): Linter;
 /**
+ * @param {string|undefined} key
  * @param {Options} options
  * @returns {Linter}
  */
-export default function getESLint({ threads, ...options }: Options): Linter;
+export default function getESLint(
+  key: string | undefined,
+  { threads, ...options }: Options
+): Linter;
 export type ESLint = import('eslint').ESLint;
 export type LintResult = import('eslint').ESLint.LintResult;
 export type Options = import('./options').PluginOptions &

diff --git a/declarations/index.d.ts b/declarations/index.d.ts
@@ -13,6 +13,7 @@ export class ESLintWebpackPlugin {
    * @returns {void}
    */
   apply(compiler: Compiler): void;
+  key: string | undefined;
   /**
    *
    * @param {Compiler} compiler

diff --git a/declarations/linter.d.ts b/declarations/linter.d.ts
@@ -1,9 +1,11 @@
 /**
+ * @param {string|undefined} key
  * @param {Options} options
  * @param {Compilation} compilation
  * @returns {{lint: Linter, report: Reporter}}
  */
 export default function linter(
+  key: string | undefined,
   options: Options,
   compilation: Compilation
 ): {

diff --git a/src/getESLint.js b/src/getESLint.js
@@ -46,7 +46,7 @@ export function loadESLint(options) {
 }
 
 /**
- * @param {string} key
+ * @param {string|undefined} key
  * @param {number} poolSize
  * @param {Options} options
  * @returns {Linter}
@@ -88,7 +88,7 @@ export function loadESLintThreaded(key, poolSize, options) {
 }
 
 /**
- * @param {string} key
+ * @param {string|undefined} key
  * @param {Options} options
  * @returns {Linter}
  */
@@ -110,7 +110,7 @@ export default function getESLint(key, { threads, ...options }) {
 }
 
 /**
- * @param {string} key
+ * @param {string|undefined} key
  * @param {Options} options
  * @returns {string}
  */

diff --git a/src/index.js b/src/index.js
@@ -11,13 +11,13 @@ import { parseFiles, parseFoldersToGlobs } from './utils';
 /** @typedef {import('./options').Options} Options */
 
 const ESLINT_PLUGIN = 'ESLintWebpackPlugin';
+let counter = 0;
 
 export class ESLintWebpackPlugin {
   /**
    * @param {Options} options
    */
   constructor(options = {}) {
-    this.key = Math.random().toString();
     this.options = getOptions(options);
     this.run = this.run.bind(this);
   }
@@ -27,6 +27,12 @@ export class ESLintWebpackPlugin {
    * @returns {void}
    */
   apply(compiler) {
+    // Generate key for each compilation,
+    // this differentiates one from the other when being cached.
+    this.key = compiler.name || `${ESLINT_PLUGIN}_${(counter += 1)}`;
+
+    // If `lintDirtyModulesOnly` is disabled,
+    // execute the linter on the build
     if (!this.options.lintDirtyModulesOnly) {
       compiler.hooks.run.tapPromise(ESLINT_PLUGIN, this.run);
     }

diff --git a/src/linter.js b/src/linter.js
@@ -21,7 +21,7 @@ import getESLint from './getESLint';
 const resultStorage = new WeakMap();
 
 /**
- * @param {string} key
+ * @param {string|undefined} key
  * @param {Options} options
  * @param {Compilation} compilation
  * @returns {{lint: Linter, report: Reporter}}