Merge branch 'master' into fix-cache-result-storage

webpack-contrib · Feb 6, 2021 · 1b73671 · 1b73671
2 parents d5f2bd2 + be0391e
commit 1b73671
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/declarations/ESLintError.d.ts b/declarations/ESLintError.d.ts
@@ -1,8 +1,7 @@
-export default class ESLintError {
+export default ESLintError;
+declare class ESLintError extends Error {
   /**
    * @param {string=} messages
    */
   constructor(messages?: string | undefined);
-  name: string;
-  stack: string;
 }
diff --git a/src/index.js b/src/index.js
@@ -72,15 +72,18 @@ class ESLintWebpackPlugin {
     const options = {
       ...this.options,
       exclude: parseFiles(
-        this.options.exclude || 'node_modules',
+        this.options.exclude || [],
         this.getContext(compiler)
       ),
       extensions: arrify(this.options.extensions),
       files: parseFiles(this.options.files || '', this.getContext(compiler)),
     };
 
     const wanted = parseFoldersToGlobs(options.files, options.extensions);
-    const exclude = parseFoldersToGlobs(options.exclude, []);
+    const exclude = parseFoldersToGlobs(
+      this.options.exclude ? options.exclude : '**/node_modules/**',
+      []
+    );
 
     compiler.hooks.thisCompilation.tap(ESLINT_PLUGIN, (compilation) => {
       /** @type {import('./linter').Linter} */