stylelint-webpack-plugin 2.2.0 → 2.2.1

package/README.md

@@ -64,7 +64,7 @@ A string indicating the root of your files.
 ### `exclude`
 
 - Type: `String|Array[String]`
-- Default: `'node_modules'`
+- Default: `['node_modules', compiler.options.output.path]`
 
 Specify the files and/or directories to exclude. Must be relative to `options.context`.
 

package/declarations/index.d.ts

@@ -33,12 +33,12 @@ declare class StylelintWebpackPlugin {
    */
   getContext(compiler: Compiler): string;
   /**
-   * @param {string[]} glob
    * @param {Compiler} compiler
-   * @param {Module} module
+   * @param {string[]} wanted
+   * @param {string[]} exclude
    * @returns {string[]}
    */
-  getFiles(glob: string[], compiler: Compiler, module: Module): string[];
+  getFiles(compiler: Compiler, wanted: string[], exclude: string[]): string[];
   /**
    * @param {Map<string, null | FileSystemInfoEntry | "ignore">} fileTimestamps
    * @returns {string[]}

package/declarations/utils.d.ts

@@ -1,9 +1,12 @@
 /**
- * @param {string|string[]} files
+ * @param {string|(string|undefined)[]} files
  * @param {string} context
  * @returns {string[]}
  */
-export function parseFiles(files: string | string[], context: string): string[];
+export function parseFiles(
+  files: string | (string | undefined)[],
+  context: string
+): string[];
 /**
  * @param {string|string[]} patterns
  * @param {string|string[]} extensions

package/dist/index.js

@@ -9,7 +9,7 @@ var _path = require("path");
 
 var _arrify = _interopRequireDefault(require("arrify"));
 
-var _fastGlob = _interopRequireDefault(require("fast-glob"));
+var _globby = _interopRequireDefault(require("globby"));
 
 var _micromatch = require("micromatch");
 
@@ -89,12 +89,12 @@ class StylelintWebpackPlugin {
 
     const context = this.getContext(compiler);
     const options = { ...this.options,
-      exclude: (0, _utils.parseFiles)(this.options.exclude || [], context),
+      exclude: (0, _utils.parseFiles)(this.options.exclude || ['**/node_modules/**', compiler.options.output.path], context),
       extensions: (0, _arrify.default)(this.options.extensions),
       files: (0, _utils.parseFiles)(this.options.files || '', context)
     };
     const wanted = (0, _utils.parseFoldersToGlobs)(options.files, options.extensions);
-    const exclude = (0, _utils.parseFoldersToGlobs)(this.options.exclude ? options.exclude : '**/node_modules/**', []);
+    const exclude = (0, _utils.parseFoldersToGlobs)(options.exclude);
     compiler.hooks.thisCompilation.tap(this.key, compilation => {
       /** @type {import('./linter').Linter} */
       let lint;
@@ -115,29 +115,15 @@ class StylelintWebpackPlugin {
         compilation.errors.push(e);
         return;
       }
-      /** @type {string[]} */
 
+      compilation.hooks.finishModules.tap(this.key, () => {
+        const files = this.getFiles(compiler, wanted, exclude);
 
-      const files = []; // Add the file to be linted
-
-      compilation.hooks.succeedModule.tap(this.key, module => {
-        const filteredFiles = this.getFiles(wanted, compiler, module).filter(file => !files.includes(file) && (0, _micromatch.isMatch)(file, wanted, {
-          dot: true
-        }) && !(0, _micromatch.isMatch)(file, exclude, {
-          dot: true
-        }));
-
-        for (const file of filteredFiles) {
-          files.push(file);
-
-          if (threads > 1) {
+        if (threads > 1) {
+          for (const file of files) {
             lint((0, _utils.parseFiles)(file, context));
           }
-        }
-      }); // Lint all files added
-
-      compilation.hooks.finishModules.tap(this.key, () => {
-        if (files.length > 0 && threads <= 1) {
+        } else if (files.length > 0) {
           lint((0, _utils.parseFiles)(files, context));
         }
       }); // await and interpret results
@@ -192,59 +178,38 @@ class StylelintWebpackPlugin {
     return this.options.context;
   }
   /**
-   * @param {string[]} glob
    * @param {Compiler} compiler
-   * @param {Module} module
+   * @param {string[]} wanted
+   * @param {string[]} exclude
    * @returns {string[]}
    */
   // eslint-disable-next-line no-unused-vars
 
 
-  getFiles(glob, compiler, module) {
-    // TODO: how to get module dependencies on css files?
-    // maybe implemented on next major version v3
-    // Temporaly lint all css files on start webpack
-    // on watch lint only modified files
-    // on webpack 5 not safe to use `module.buildInfo.snapshot`
-    // on webpack `module.buildInfo.fileDependencies` not working correclty
-    // webpack 5
-
-    /*
-    if (
-      module.buildInfo &&
-      module.buildInfo.snapshot &&
-      module.buildInfo.snapshot.fileTimestamps
-    ) {
-      files = this.getChangedFiles(module.buildInfo.snapshot.fileTimestamps);
-    }
-     // webpack 4
-    else if (module.buildInfo && module.buildInfo.fileDependencies) {
-      files = Array.from(module.buildInfo.fileDependencies);
-       if (compiler.fileTimestamps && compiler.fileTimestamps.size > 0) {
-        const fileDependencies = new Map();
-         for (const [filename, timestamp] of compiler.fileTimestamps.entries()) {
-          if (files.includes(filename)) {
-            fileDependencies.set(filename, timestamp);
-          }
-        }
-         files = this.getChangedFiles(fileDependencies);
-      }
-    }
-    */
+  getFiles(compiler, wanted, exclude) {
     // webpack 5
     if (compiler.modifiedFiles) {
-      return Array.from(compiler.modifiedFiles);
+      return Array.from(compiler.modifiedFiles).filter(file => (0, _micromatch.isMatch)(file, wanted, {
+        dot: true
+      }) && !(0, _micromatch.isMatch)(file, exclude, {
+        dot: true
+      }));
     } // webpack 4
 
     /* istanbul ignore next */
 
 
     if (compiler.fileTimestamps && compiler.fileTimestamps.size > 0) {
-      return this.getChangedFiles(compiler.fileTimestamps);
+      return this.getChangedFiles(compiler.fileTimestamps).filter(file => (0, _micromatch.isMatch)(file, wanted, {
+        dot: true
+      }) && !(0, _micromatch.isMatch)(file, exclude, {
+        dot: true
+      }));
     }
 
-    return _fastGlob.default.sync(glob, {
-      dot: true
+    return _globby.default.sync(wanted, {
+      dot: true,
+      ignore: exclude
     });
   }
   /**

package/dist/utils.js

@@ -21,12 +21,14 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // @ts-ignore
 
 /**
- * @param {string|string[]} files
+ * @param {string|(string|undefined)[]} files
  * @param {string} context
  * @returns {string[]}
  */
 function parseFiles(files, context) {
-  return (0, _arrify.default)(files).map((
+  return (0, _arrify.default)(files).filter((
+  /** @type {string} */
+  file) => typeof file === 'string').map((
   /** @type {string} */
   file) => (0, _normalizePath.default)((0, _path.resolve)(context, file)));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stylelint-webpack-plugin",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "A Stylelint plugin for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/stylelint-webpack-plugin",
@@ -48,8 +48,8 @@
   "dependencies": {
     "@types/stylelint": "^13.13.0",
     "arrify": "^2.0.1",
-    "fast-glob": "^3.2.5",
     "jest-worker": "^27.0.2",
+    "globby": "^11.0.4",
     "micromatch": "^4.0.4",
     "normalize-path": "^3.0.0",
     "schema-utils": "^3.0.0"