stylelint-webpack-plugin 3.1.1 → 3.2.0

package/LICENSE

@@ -1,20 +1,20 @@
-Copyright JS Foundation and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright JS Foundation and other contributors
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -21,16 +21,40 @@ This plugin uses [`stylelint`](https://stylelint.io/) that helps you avoid error
 
 To begin, you'll need to install `stylelint-webpack-plugin`:
 
-```bash
+```console
 npm install stylelint-webpack-plugin --save-dev
 ```
 
+or
+
+```console
+yarn add -D install stylelint-webpack-plugin
+```
+
+or
+
+```console
+pnpm add -D stylelint-webpack-plugin
+```
+
 **Note**: You also need to install `stylelint >= 13` from npm, if you haven't already:
 
-```bash
+```console
 npm install stylelint --save-dev
 ```
 
+or
+
+```console
+yarn add -D stylelint
+```
+
+or
+
+```console
+pnpm add -D stylelint
+```
+
 **Note**: If you are using Stylelint 13 rather than 14+, you might also need to install `@types/stylelint` as a dev dependency if getting stylelint related type errors.
 
 Then add the plugin to your webpack config. For example:
@@ -51,7 +75,12 @@ See [stylelint's options](https://stylelint.io/user-guide/usage/node-api#options
 
 ### `configFile`
 
-- Type: `String`
+- Type:
+
+```ts
+type context = string;
+```
+
 - Default: `undefined`
 
 Specify the config file location to be used by `stylelint`.
@@ -60,63 +89,110 @@ Specify the config file location to be used by `stylelint`.
 
 ### `context`
 
-- Type: `String`
+- Type:
+
+```ts
+type context = string;
+```
+
 - Default: `compiler.context`
 
 A string indicating the root of your files.
 
 ### `exclude`
 
-- Type: `String|Array[String]`
+- Type:
+
+```ts
+type exclude = string | Array<string>;
+```
+
 - Default: `['node_modules', compiler.options.output.path]`
 
 Specify the files and/or directories to exclude. Must be relative to `options.context`.
 
 ### `extensions`
 
-- Type: `String|Array[String]`
+- Type:
+
+```ts
+type extensions = string | Array<string>;
+```
+
 - Default: `['css', 'scss', 'sass']`
 
 Specify extensions that should be checked.
 
 ### `files`
 
-- Type: `String|Array[String]`
+- Type:
+
+```ts
+type files = string | Array<string>;
+```
+
 - Default: `null`
 
-Specify directories, files, or globs. Must be relative to `options.context`. Directories are traveresed recursively looking for files matching `options.extensions`. File and glob patterns ignore `options.extensions`.
+Specify directories, files, or globs. Must be relative to `options.context`. Directories are traversed recursively looking for files matching `options.extensions`. File and glob patterns ignore `options.extensions`.
 
 ### `fix`
 
-- Type: `Boolean`
+- Type:
+
+```ts
+type fix = boolean;
+```
+
 - Default: `false`
 
 If `true`, `stylelint` will fix as many errors as possible. The fixes are made to the actual source files. All unfixed errors will be reported. See [Autofixing errors](https://stylelint.io/user-guide/usage/options#fix) docs.
 
 ### `formatter`
 
-- Type: `String|Function`
+- Type:
+
+```ts
+type formatter = string | (
+  results: Array<import('stylelint').LintResult>
+) => string
+```
+
 - Default: `'string'`
 
 Specify the formatter that you would like to use to format your results. See [formatter option](https://stylelint.io/user-guide/usage/options#formatter).
 
 ### `lintDirtyModulesOnly`
 
-- Type: `Boolean`
+- Type:
+
+```ts
+type lintDirtyModulesOnly = boolean;
+```
+
 - Default: `false`
 
 Lint only changed files, skip lint on start.
 
 ### `stylelintPath`
 
-- Type: `String`
+- Type:
+
+```ts
+type stylelintPath = string;
+```
+
 - Default: `stylelint`
 
 Path to `stylelint` instance that will be used for linting.
 
 ### `threads`
 
-- Type: `Boolean | Number`
+- Type:
+
+```ts
+type threads = boolean | number;
+```
+
 - Default: `false`
 
 Set to true for an auto-selected pool size based on number of cpus. Set to a number greater than 1 to set an explicit pool size. Set to false, 1, or less to disable and only run in main process.
@@ -128,42 +204,82 @@ You can still force this behavior by using `emitError` **or** `emitWarning` opti
 
 #### `emitError`
 
-- Type: `Boolean`
+- Type:
+
+```ts
+type emitError = boolean;
+```
+
 - Default: `true`
 
 The errors found will always be emitted, to disable set to `false`.
 
 #### `emitWarning`
 
-- Type: `Boolean`
+- Type:
+
+```ts
+type emitWarning = boolean;
+```
+
 - Default: `true`
 
 The warnings found will always be emitted, to disable set to `false`.
 
 #### `failOnError`
 
-- Type: `Boolean`
+- Type:
+
+```ts
+type failOnError = boolean;
+```
+
 - Default: `true`
 
 Will cause the module build to fail if there are any errors, to disable set to `false`.
 
 #### `failOnWarning`
 
-- Type: `Boolean`
+- Type:
+
+```ts
+type failOnWarning = boolean;
+```
+
 - Default: `false`
 
 Will cause the module build to fail if there are any warnings, if set to `true`.
 
 #### `quiet`
 
-- Type: `Boolean`
+- Type:
+
+```ts
+type quiet = boolean;
+```
+
 - Default: `false`
 
 Will process and report errors only and ignore warnings, if set to `true`.
 
 #### `outputReport`
 
-- Type: `Boolean|Object`
+- Type:
+
+```ts
+type outputReport =
+  | boolean
+  | {
+      filePath?: string | undefined;
+      formatter?:
+        | (
+            | string
+            | ((results: Array<import('stylelint').LintResult>) => string)
+          )
+        | undefined;
+    };
+```
+
 - Default: `false`
 
 Write the output of the errors to a file, for example a `json` file for use for reporting.

package/dist/StylelintError.js

@@ -1,10 +1,5 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
 class StylelintError extends Error {
   /**
    * @param {string=} messages
@@ -17,5 +12,4 @@ class StylelintError extends Error {
 
 }
 
-var _default = StylelintError;
-exports.default = _default;
+module.exports = StylelintError;

package/dist/getStylelint.js

@@ -1,23 +1,29 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = getStylelint;
+const {
+  cpus
+} = require('os');
 
-var _os = require("os");
+const {
+  Worker: JestWorker
+} = require('jest-worker'); // @ts-ignore
 
-var _jestWorker = require("jest-worker");
 
-var _worker = require("./worker");
+const {
+  setup,
+  lintFiles
+} = require('./worker');
 
-var _utils = require("./utils");
+const {
+  jsonStringifyReplacerSortKeys
+} = require('./utils');
 
-var _options = require("./options");
+const {
+  getStylelintOptions
+} = require('./options');
+/** @type {{[key: string]: any}} */
 
-// @ts-ignore
 
-/** @type {{[key: string]: any}} */
 const cache = {};
 /** @typedef {import('stylelint')} Stylelint */
 
@@ -29,7 +35,7 @@ const cache = {};
 
 /** @typedef {(files: string|string[]) => Promise<LintResult[]>} LintTask */
 
-/** @typedef {{stylelint: Stylelint, lintFiles: LintTask, cleanup: AsyncTask, threads: number, }} Linter */
+/** @typedef {{api: import('stylelint').InternalApi, stylelint: Stylelint, lintFiles: LintTask, cleanup: AsyncTask, threads: number, }} Linter */
 
 /** @typedef {import('jest-worker').Worker & {lintFiles: LintTask}} Worker */
 
@@ -39,10 +45,12 @@ const cache = {};
  */
 
 function loadStylelint(options) {
-  const stylelint = (0, _worker.setup)(options, (0, _options.getStylelintOptions)(options));
+  const stylelintOptions = getStylelintOptions(options);
+  const stylelint = setup(options, stylelintOptions);
   return {
     stylelint,
-    lintFiles: _worker.lintFiles,
+    api: stylelint.createLinter(stylelintOptions),
+    lintFiles,
     cleanup: async () => {},
     threads: 1
   };
@@ -63,12 +71,12 @@ function loadStylelintThreaded(key, poolSize, options) {
   const workerOptions = {
     enableWorkerThreads: true,
     numWorkers: poolSize,
-    setupArgs: [options, (0, _options.getStylelintOptions)(options)]
+    setupArgs: [options, getStylelintOptions(options)]
   };
   const local = loadStylelint(options);
   let worker =
   /** @type {Worker?} */
-  new _jestWorker.Worker(source, workerOptions);
+  new JestWorker(source, workerOptions);
   /** @type {Linter} */
 
   const context = { ...local,
@@ -102,7 +110,7 @@ function getStylelint(key, {
   threads,
   ...options
 }) {
-  const max = typeof threads !== 'number' ? threads ? (0, _os.cpus)().length - 1 : 1 : threads;
+  const max = typeof threads !== 'number' ? threads ? cpus().length - 1 : 1 : threads;
   const cacheKey = getCacheKey(key, {
     threads,
     ...options
@@ -125,5 +133,7 @@ function getCacheKey(key, options) {
   return JSON.stringify({
     key,
     options
-  }, _utils.jsonStringifyReplacerSortKeys);
-}
+  }, jsonStringifyReplacerSortKeys);
+}
+
+module.exports = getStylelint;

package/dist/index.js

@@ -1,26 +1,27 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
+const {
+  isAbsolute,
+  join
+} = require('path');
 
-var _path = require("path");
+const globby = require('globby');
 
-var _globby = _interopRequireDefault(require("globby"));
+const {
+  isMatch
+} = require('micromatch');
 
-var _micromatch = require("micromatch");
+const {
+  getOptions
+} = require('./options');
 
-var _options = require("./options");
-
-var _linter = _interopRequireDefault(require("./linter"));
-
-var _utils = require("./utils");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-// @ts-ignore
+const linter = require('./linter');
 
+const {
+  arrify,
+  parseFiles,
+  parseFoldersToGlobs
+} = require('./utils');
 /** @typedef {import('webpack').Compiler} Compiler */
 
 /** @typedef {import('webpack').Module} Module */
@@ -28,6 +29,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /** @typedef {import('./options').Options} Options */
 
 /** @typedef {Partial<{timestamp:number} | number>} FileSystemInfoEntry */
+
+
 const STYLELINT_PLUGIN = 'StylelintWebpackPlugin';
 let counter = 0;
 
@@ -37,7 +40,7 @@ class StylelintWebpackPlugin {
    */
   constructor(options = {}) {
     this.key = STYLELINT_PLUGIN;
-    this.options = (0, _options.getOptions)(options);
+    this.options = getOptions(options);
     this.run = this.run.bind(this);
     this.startTime = Date.now();
     this.prevTimestamps = new Map();
@@ -87,15 +90,18 @@ class StylelintWebpackPlugin {
     const context = this.getContext(compiler);
     const excludeDefault = ['**/node_modules/**', String(compiler.options.output.path)];
     const options = { ...this.options,
-      exclude: (0, _utils.parseFiles)(this.options.exclude || excludeDefault, context),
-      extensions: (0, _utils.arrify)(this.options.extensions),
-      files: (0, _utils.parseFiles)(this.options.files || '', context)
+      exclude: parseFiles(this.options.exclude || excludeDefault, context),
+      extensions: arrify(this.options.extensions),
+      files: parseFiles(this.options.files || '', context)
     };
-    const wanted = (0, _utils.parseFoldersToGlobs)(options.files, options.extensions);
-    const exclude = (0, _utils.parseFoldersToGlobs)(options.exclude);
+    const wanted = parseFoldersToGlobs(options.files, options.extensions);
+    const exclude = parseFoldersToGlobs(options.exclude);
     compiler.hooks.thisCompilation.tap(this.key, compilation => {
       /** @type {import('./linter').Linter} */
       let lint;
+      /** @type {import('stylelint').InternalApi} */
+
+      let api;
       /** @type {import('./linter').Reporter} */
 
       let report;
@@ -106,30 +112,39 @@ class StylelintWebpackPlugin {
       try {
         ({
           lint,
+          api,
           report,
           threads
-        } = (0, _linter.default)(this.key, options, compilation));
+        } = linter(this.key, options, compilation));
       } catch (e) {
         compilation.errors.push(e);
         return;
       }
 
-      compilation.hooks.finishModules.tap(this.key, () => {
-        const files = compiler.modifiedFiles ? Array.from(compiler.modifiedFiles).filter(file => (0, _micromatch.isMatch)(file, wanted, {
+      compilation.hooks.finishModules.tapPromise(this.key, async () => {
+        /** @type {string[]} */
+        // @ts-ignore
+        const files = (await Promise.all((compiler.modifiedFiles ? Array.from(compiler.modifiedFiles).filter(file => isMatch(file, wanted, {
           dot: true
-        }) && !(0, _micromatch.isMatch)(file, exclude, {
+        }) && !isMatch(file, exclude, {
           dot: true
-        })) : _globby.default.sync(wanted, {
+        })) : globby.sync(wanted, {
           dot: true,
           ignore: exclude
-        });
+        })).map(async file => {
+          try {
+            return (await api.isPathIgnored(file)) ? false : file;
+          } catch (e) {
+            return file;
+          }
+        }))).filter(file => file !== false);
 
         if (threads > 1) {
           for (const file of files) {
-            lint((0, _utils.parseFiles)(file, context));
+            lint(parseFiles(file, context));
           }
         } else if (files.length > 0) {
-          lint((0, _utils.parseFiles)(files, context));
+          lint(parseFiles(files, context));
         }
       }); // await and interpret results
 
@@ -176,8 +191,8 @@ class StylelintWebpackPlugin {
       return String(compiler.options.context);
     }
 
-    if (!(0, _path.isAbsolute)(this.options.context)) {
-      return (0, _path.join)(String(compiler.options.context), this.options.context);
+    if (!isAbsolute(this.options.context)) {
+      return join(String(compiler.options.context), this.options.context);
     }
 
     return this.options.context;
@@ -185,5 +200,4 @@ class StylelintWebpackPlugin {
 
 }
 
-var _default = StylelintWebpackPlugin;
-exports.default = _default;
+module.exports = StylelintWebpackPlugin;

package/dist/linter.js

@@ -1,24 +1,24 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = linter;
+const {
+  dirname,
+  isAbsolute,
+  join
+} = require('path');
 
-var _path = require("path");
+const StylelintError = require('./StylelintError');
 
-var _StylelintError = _interopRequireDefault(require("./StylelintError"));
-
-var _getStylelint = _interopRequireDefault(require("./getStylelint"));
-
-var _utils = require("./utils");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const getStylelint = require('./getStylelint');
 
+const {
+  arrify
+} = require('./utils');
 /** @typedef {import('stylelint')} Stylelint */
 
 /** @typedef {import('stylelint').LintResult} LintResult */
 
+/** @typedef {import('stylelint').InternalApi} InternalApi */
+
 /** @typedef {import('webpack').Compiler} Compiler */
 
 /** @typedef {import('webpack').Compilation} Compilation */
@@ -40,17 +40,22 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /** @typedef {{[files: string]: LintResult}} LintResultMap */
 
 /** @type {WeakMap<Compiler, LintResultMap>} */
+
+
 const resultStorage = new WeakMap();
 /**
  * @param {string|undefined} key
  * @param {Options} options
  * @param {Compilation} compilation
- * @returns {{lint: Linter, report: Reporter, threads: number}}
+ * @returns {{api: InternalApi, lint: Linter, report: Reporter, threads: number}}
  */
 
 function linter(key, options, compilation) {
   /** @type {Stylelint} */
   let stylelint;
+  /** @type {InternalApi} */
+
+  let api;
   /** @type {(files: string|string[]) => Promise<LintResult[]>} */
 
   let lintFiles;
@@ -68,16 +73,18 @@ function linter(key, options, compilation) {
   try {
     ({
       stylelint,
+      api,
       lintFiles,
       cleanup,
       threads
-    } = (0, _getStylelint.default)(key, options));
+    } = getStylelint(key, options));
   } catch (e) {
-    throw new _StylelintError.default(e.message);
+    throw new StylelintError(e.message);
   }
 
   return {
     lint,
+    api,
     report,
     threads
   };
@@ -86,7 +93,7 @@ function linter(key, options, compilation) {
    */
 
   function lint(files) {
-    for (const file of (0, _utils.arrify)(files)) {
+    for (const file of arrify(files)) {
       delete crossRunResultStorage[file];
     }
 
@@ -147,7 +154,7 @@ function linter(key, options, compilation) {
         } = compiler.outputFileSystem; // ensure directory exists
         // @ts-ignore - the types for `outputFileSystem` are missing the 3 arg overload
 
-        mkdir((0, _path.dirname)(name), {
+        mkdir(dirname(name), {
           recursive: true
         }, err => {
           /* istanbul ignore if */
@@ -167,8 +174,8 @@ function linter(key, options, compilation) {
         filePath
       } = outputReport;
 
-      if (!(0, _path.isAbsolute)(filePath)) {
-        filePath = (0, _path.join)(compiler.outputPath, filePath);
+      if (!isAbsolute(filePath)) {
+        filePath = join(compiler.outputPath, filePath);
       }
 
       await save(filePath, content);
@@ -187,11 +194,11 @@ function formatResults(formatter, results) {
   let warnings;
 
   if (results.warnings.length > 0) {
-    warnings = new _StylelintError.default(formatter(results.warnings));
+    warnings = new StylelintError(formatter(results.warnings));
   }
 
   if (results.errors.length > 0) {
-    errors = new _StylelintError.default(formatter(results.errors));
+    errors = new StylelintError(formatter(results.errors));
   }
 
   return {
@@ -295,4 +302,6 @@ function getResultStorage({
   }
 
   return storage;
-}
+}
+
+module.exports = linter;

package/dist/options.js

@@ -1,19 +1,10 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getOptions = getOptions;
-exports.getStylelintOptions = getStylelintOptions;
-
-var _schemaUtils = require("schema-utils");
-
-var _options = _interopRequireDefault(require("./options.json"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-// @ts-ignore
+const {
+  validate
+} = require('schema-utils');
 
+const schema = require('./options.json');
 /** @typedef {import("stylelint")} stylelint */
 
 /** @typedef {import("stylelint").LinterOptions} StylelintOptions */
@@ -50,6 +41,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @param {Options} pluginOptions
  * @returns {Partial<PluginOptions>}
  */
+
+
 function getOptions(pluginOptions) {
   const options = {
     extensions: ['css', 'scss', 'sass'],
@@ -63,7 +56,7 @@ function getOptions(pluginOptions) {
     } : {})
   }; // @ts-ignore
 
-  (0, _schemaUtils.validate)(_options.default, options, {
+  validate(schema, options, {
     name: 'Stylelint Webpack Plugin',
     baseDataPath: 'options'
   });
@@ -83,7 +76,7 @@ function getStylelintOptions(pluginOptions) {
     files,
     formatter,
     ...stylelintOnlyOptions
-  } = _options.default.properties; // No need to guard the for-in because schema.properties has hardcoded keys.
+  } = schema.properties; // No need to guard the for-in because schema.properties has hardcoded keys.
   // eslint-disable-next-line guard-for-in
 
   for (const option in stylelintOnlyOptions) {
@@ -92,4 +85,9 @@ function getStylelintOptions(pluginOptions) {
   }
 
   return stylelintOptions;
-}
+}
+
+module.exports = {
+  getOptions,
+  getStylelintOptions
+};

package/dist/utils.js

@@ -1,23 +1,14 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.arrify = arrify;
-exports.jsonStringifyReplacerSortKeys = void 0;
-exports.parseFiles = parseFiles;
-exports.parseFoldersToGlobs = parseFoldersToGlobs;
+const {
+  resolve
+} = require('path');
 
-var _path = require("path");
-
-var _fs = require("fs");
-
-var _normalizePath = _interopRequireDefault(require("normalize-path"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-// @ts-ignore
+const {
+  statSync
+} = require('fs');
 
+const normalizePath = require('normalize-path');
 /**
  * @template T
  * @param {T} value
@@ -35,6 +26,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  */
 
 /* istanbul ignore next */
+
+
 function arrify(value) {
   // eslint-disable-next-line no-undefined
   if (value === null || value === undefined) {
@@ -71,7 +64,7 @@ function arrify(value) {
 function parseFiles(files, context) {
   return arrify(files).map((
   /** @type {string} */
-  file) => (0, _normalizePath.default)((0, _path.resolve)(context, file)));
+  file) => normalizePath(resolve(context, file)));
 }
 /**
  * @param {string|string[]} patterns
@@ -91,7 +84,7 @@ function parseFoldersToGlobs(patterns, extensions = []) {
   pattern) => {
     try {
       // The patterns are absolute because they are prepended with the context.
-      const stats = (0, _fs.statSync)(pattern);
+      const stats = statSync(pattern);
       /* istanbul ignore else */
 
       if (stats.isDirectory()) {
@@ -124,4 +117,9 @@ const jsonStringifyReplacerSortKeys = (_, value) => {
   return value instanceof Object && !(value instanceof Array) ? Object.keys(value).sort().reduce(insert, {}) : value;
 };
 
-exports.jsonStringifyReplacerSortKeys = jsonStringifyReplacerSortKeys;
+module.exports = {
+  arrify,
+  parseFiles,
+  parseFoldersToGlobs,
+  jsonStringifyReplacerSortKeys
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stylelint-webpack-plugin",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "description": "A Stylelint plugin for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/stylelint-webpack-plugin",
@@ -11,16 +11,16 @@
     "type": "opencollective",
     "url": "https://opencollective.com/webpack"
   },
-  "main": "dist/cjs.js",
-  "types": "declarations/index.d.ts",
+  "main": "dist/index.js",
+  "types": "types/index.d.ts",
   "engines": {
     "node": ">= 12.13.0"
   },
   "scripts": {
     "start": "npm run build -- -w",
-    "clean": "del-cli dist declarations",
+    "clean": "del-cli dist types",
     "prebuild": "npm run clean",
-    "build:types": "tsc --declaration --emitDeclarationOnly --outDir declarations && prettier \"declarations/**/*.ts\" --write",
+    "build:types": "tsc --declaration --emitDeclarationOnly --outDir types && prettier \"types/**/*.ts\" --write",
     "build:code": "cross-env NODE_ENV=production babel src -d dist --copy-files",
     "build": "npm-run-all -p \"build:**\"",
     "commitlint": "commitlint --from=master",
@@ -39,51 +39,51 @@
   },
   "files": [
     "dist",
-    "declarations"
+    "types"
   ],
   "peerDependencies": {
     "stylelint": "^13.0.0 || ^14.0.0",
     "webpack": "^5.0.0"
   },
   "dependencies": {
-    "jest-worker": "^27.3.1",
-    "globby": "^11.0.4",
+    "jest-worker": "^27.5.1",
+    "globby": "^11.1.0",
     "micromatch": "^4.0.4",
     "normalize-path": "^3.0.0",
     "schema-utils": "^4.0.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.16.0",
-    "@babel/core": "^7.16.0",
-    "@babel/preset-env": "^7.16.4",
-    "@commitlint/cli": "^15.0.0",
-    "@commitlint/config-conventional": "^15.0.0",
+    "@babel/cli": "^7.17.6",
+    "@babel/core": "^7.17.7",
+    "@babel/preset-env": "^7.16.11",
+    "@commitlint/cli": "^16.2.3",
+    "@commitlint/config-conventional": "^16.2.1",
     "@types/fs-extra": "^9.0.13",
     "@types/micromatch": "^4.0.2",
     "@types/normalize-path": "^3.0.0",
     "@types/webpack": "^5.28.0",
     "@webpack-contrib/eslint-config-webpack": "^3.0.0",
     "babel-eslint": "^10.1.0",
-    "babel-jest": "^27.3.1",
+    "babel-jest": "^27.5.1",
     "chokidar": "^3.5.2",
     "cross-env": "^7.0.3",
     "del": "^6.0.0",
     "del-cli": "^4.0.1",
-    "eslint": "^8.3.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.25.3",
+    "eslint": "^8.11.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-import": "^2.25.4",
     "file-loader": "^6.2.0",
-    "fs-extra": "^10.0.0",
+    "fs-extra": "^10.0.1",
     "husky": "^7.0.4",
-    "jest": "^27.3.1",
-    "lint-staged": "^12.1.2",
+    "jest": "^27.5.1",
+    "lint-staged": "^12.3.6",
     "npm-run-all": "^4.1.5",
-    "postcss-scss": "^4.0.2",
-    "prettier": "^2.4.1",
+    "postcss-scss": "^4.0.3",
+    "prettier": "^2.6.0",
     "standard-version": "^9.3.2",
-    "stylelint": "^14.1.0",
-    "typescript": "^4.5.2",
-    "webpack": "^5.64.3"
+    "stylelint": "^14.6.0",
+    "typescript": "^4.6.2",
+    "webpack": "^5.70.0"
   },
   "keywords": [
     "stylelint",

package/types/StylelintError.d.ts

@@ -0,0 +1,8 @@
+export = StylelintError;
+declare class StylelintError extends Error {
+  /**
+   * @param {string=} messages
+   */
+  constructor(messages?: string | undefined);
+  stack: string;
+}

package/{declarations → types}/getStylelint.d.ts

@@ -1,14 +1,34 @@
 /// <reference types="stylelint" />
+export = getStylelint;
 /**
  * @param {string|undefined} key
  * @param {Options} options
  * @returns {Linter}
  */
-export default function getStylelint(
+declare function getStylelint(
   key: string | undefined,
   { threads, ...options }: Options
 ): Linter;
-export type Stylelint = import('postcss').PluginCreator<
+declare namespace getStylelint {
+  export {
+    Stylelint,
+    LintResult,
+    Options,
+    AsyncTask,
+    LintTask,
+    Linter,
+    Worker,
+  };
+}
+type Options = import('./options').Options;
+type Linter = {
+  api: import('stylelint').InternalApi;
+  stylelint: Stylelint;
+  lintFiles: LintTask;
+  cleanup: AsyncTask;
+  threads: number;
+};
+type Stylelint = import('postcss').PluginCreator<
   import('stylelint').PostcssPluginOptions
 > & {
   lint: (
@@ -30,6 +50,15 @@ export type Stylelint = import('postcss').PluginCreator<
   createLinter: (
     options: import('stylelint').LinterOptions
   ) => import('stylelint').InternalApi;
+  resolveConfig: (
+    filePath: string,
+    options?:
+      | Pick<
+          import('stylelint').LinterOptions,
+          'cwd' | 'config' | 'configFile' | 'configBasedir'
+        >
+      | undefined
+  ) => Promise<import('stylelint').Config | undefined>;
   utils: {
     report: (problem: import('stylelint').Problem) => void;
     ruleMessages: <
@@ -54,16 +83,9 @@ export type Stylelint = import('postcss').PluginCreator<
     ) => void;
   };
 };
-export type LintResult = import('stylelint').LintResult;
-export type Options = import('./options').Options;
-export type AsyncTask = () => Promise<void>;
-export type LintTask = (files: string | string[]) => Promise<LintResult[]>;
-export type Linter = {
-  stylelint: Stylelint;
-  lintFiles: LintTask;
-  cleanup: AsyncTask;
-  threads: number;
-};
-export type Worker = import('jest-worker').Worker & {
+type LintResult = import('stylelint').LintResult;
+type AsyncTask = () => Promise<void>;
+type LintTask = (files: string | string[]) => Promise<LintResult[]>;
+type Worker = import('jest-worker').Worker & {
   lintFiles: LintTask;
 };

package/{declarations → types}/index.d.ts

@@ -1,13 +1,4 @@
-export default StylelintWebpackPlugin;
-export type Compiler = import('webpack').Compiler;
-export type Module = import('webpack').Module;
-export type Options = import('./options').Options;
-export type FileSystemInfoEntry = Partial<
-  | {
-      timestamp: number;
-    }
-  | number
->;
+export = StylelintWebpackPlugin;
 declare class StylelintWebpackPlugin {
   /**
    * @param {Options} options
@@ -33,3 +24,15 @@ declare class StylelintWebpackPlugin {
    */
   getContext(compiler: Compiler): string;
 }
+declare namespace StylelintWebpackPlugin {
+  export { Compiler, Module, Options, FileSystemInfoEntry };
+}
+type Compiler = import('webpack').Compiler;
+type Options = import('./options').Options;
+type Module = import('webpack').Module;
+type FileSystemInfoEntry = Partial<
+  | {
+      timestamp: number;
+    }
+  | number
+>;

package/{declarations → types}/linter.d.ts

@@ -1,20 +1,44 @@
 /// <reference types="stylelint" />
+export = linter;
 /**
  * @param {string|undefined} key
  * @param {Options} options
  * @param {Compilation} compilation
- * @returns {{lint: Linter, report: Reporter, threads: number}}
+ * @returns {{api: InternalApi, lint: Linter, report: Reporter, threads: number}}
  */
-export default function linter(
+declare function linter(
   key: string | undefined,
   options: Options,
   compilation: Compilation
 ): {
+  api: InternalApi;
   lint: Linter;
   report: Reporter;
   threads: number;
 };
-export type Stylelint = import('postcss').PluginCreator<
+declare namespace linter {
+  export {
+    Stylelint,
+    LintResult,
+    InternalApi,
+    Compiler,
+    Compilation,
+    Options,
+    FormatterType,
+    FormatterFunction,
+    GenerateReport,
+    Report,
+    Reporter,
+    Linter,
+    LintResultMap,
+  };
+}
+type Options = import('./options').Options;
+type Compilation = import('webpack').Compilation;
+type InternalApi = import('stylelint').InternalApi;
+type Linter = (files: string | string[]) => void;
+type Reporter = () => Promise<Report>;
+type Stylelint = import('postcss').PluginCreator<
   import('stylelint').PostcssPluginOptions
 > & {
   lint: (
@@ -36,6 +60,15 @@ export type Stylelint = import('postcss').PluginCreator<
   createLinter: (
     options: import('stylelint').LinterOptions
   ) => import('stylelint').InternalApi;
+  resolveConfig: (
+    filePath: string,
+    options?:
+      | Pick<
+          import('stylelint').LinterOptions,
+          'cwd' | 'config' | 'configFile' | 'configBasedir'
+        >
+      | undefined
+  ) => Promise<import('stylelint').Config | undefined>;
   utils: {
     report: (problem: import('stylelint').Problem) => void;
     ruleMessages: <
@@ -60,21 +93,17 @@ export type Stylelint = import('postcss').PluginCreator<
     ) => void;
   };
 };
-export type LintResult = import('stylelint').LintResult;
-export type Compiler = import('webpack').Compiler;
-export type Compilation = import('webpack').Compilation;
-export type Options = import('./options').Options;
-export type FormatterType = import('./options').FormatterType;
-export type FormatterFunction = (results: LintResult[]) => string;
-export type GenerateReport = (compilation: Compilation) => Promise<void>;
-export type Report = {
+type LintResult = import('stylelint').LintResult;
+type Compiler = import('webpack').Compiler;
+type FormatterType = import('./options').FormatterType;
+type FormatterFunction = (results: LintResult[]) => string;
+type GenerateReport = (compilation: Compilation) => Promise<void>;
+type Report = {
   errors?: StylelintError;
   warnings?: StylelintError;
   generateReportAsset?: GenerateReport;
 };
-export type Reporter = () => Promise<Report>;
-export type Linter = (files: string | string[]) => void;
-export type LintResultMap = {
+type LintResultMap = {
   [files: string]: import('stylelint').LintResult;
 };
-import StylelintError from './StylelintError';
+import StylelintError = require('./StylelintError');

package/{declarations → types}/options.d.ts

@@ -1,42 +1,4 @@
 /// <reference types="stylelint" />
-/** @typedef {import("stylelint")} stylelint */
-/** @typedef {import("stylelint").LinterOptions} StylelintOptions */
-/** @typedef {import("stylelint").FormatterType} FormatterType */
-/**
- * @typedef {Object} OutputReport
- * @property {string=} filePath
- * @property {FormatterType=} formatter
- */
-/**
- * @typedef {Object} PluginOptions
- * @property {string} context
- * @property {boolean} emitError
- * @property {boolean} emitWarning
- * @property {string|string[]=} exclude
- * @property {string|string[]} extensions
- * @property {boolean} failOnError
- * @property {boolean} failOnWarning
- * @property {string|string[]} files
- * @property {FormatterType} formatter
- * @property {boolean} lintDirtyModulesOnly
- * @property {boolean} quiet
- * @property {string} stylelintPath
- * @property {OutputReport} outputReport
- * @property {number|boolean=} threads
- */
-/** @typedef {Partial<PluginOptions & StylelintOptions>} Options */
-/**
- * @param {Options} pluginOptions
- * @returns {Partial<PluginOptions>}
- */
-export function getOptions(pluginOptions: Options): Partial<PluginOptions>;
-/**
- * @param {Options} pluginOptions
- * @returns {Partial<StylelintOptions>}
- */
-export function getStylelintOptions(
-  pluginOptions: Options
-): Partial<StylelintOptions>;
 export type stylelint = import('postcss').PluginCreator<
   import('stylelint').PostcssPluginOptions
 > & {
@@ -59,6 +21,15 @@ export type stylelint = import('postcss').PluginCreator<
   createLinter: (
     options: import('stylelint').LinterOptions
   ) => import('stylelint').InternalApi;
+  resolveConfig: (
+    filePath: string,
+    options?:
+      | Pick<
+          import('stylelint').LinterOptions,
+          'cwd' | 'config' | 'configFile' | 'configBasedir'
+        >
+      | undefined
+  ) => Promise<import('stylelint').Config | undefined>;
   utils: {
     report: (problem: import('stylelint').Problem) => void;
     ruleMessages: <
@@ -106,3 +77,41 @@ export type PluginOptions = {
   threads?: (number | boolean) | undefined;
 };
 export type Options = Partial<PluginOptions & StylelintOptions>;
+/** @typedef {import("stylelint")} stylelint */
+/** @typedef {import("stylelint").LinterOptions} StylelintOptions */
+/** @typedef {import("stylelint").FormatterType} FormatterType */
+/**
+ * @typedef {Object} OutputReport
+ * @property {string=} filePath
+ * @property {FormatterType=} formatter
+ */
+/**
+ * @typedef {Object} PluginOptions
+ * @property {string} context
+ * @property {boolean} emitError
+ * @property {boolean} emitWarning
+ * @property {string|string[]=} exclude
+ * @property {string|string[]} extensions
+ * @property {boolean} failOnError
+ * @property {boolean} failOnWarning
+ * @property {string|string[]} files
+ * @property {FormatterType} formatter
+ * @property {boolean} lintDirtyModulesOnly
+ * @property {boolean} quiet
+ * @property {string} stylelintPath
+ * @property {OutputReport} outputReport
+ * @property {number|boolean=} threads
+ */
+/** @typedef {Partial<PluginOptions & StylelintOptions>} Options */
+/**
+ * @param {Options} pluginOptions
+ * @returns {Partial<PluginOptions>}
+ */
+export function getOptions(pluginOptions: Options): Partial<PluginOptions>;
+/**
+ * @param {Options} pluginOptions
+ * @returns {Partial<StylelintOptions>}
+ */
+export function getStylelintOptions(
+  pluginOptions: Options
+): Partial<StylelintOptions>;

package/{declarations → types}/utils.d.ts

@@ -39,4 +39,9 @@ export function parseFoldersToGlobs(
   patterns: string | string[],
   extensions?: string | string[]
 ): string[];
+/**
+ *
+ * @param {string} _ key, but unused
+ * @param {any} value
+ */
 export function jsonStringifyReplacerSortKeys(_: string, value: any): any;

package/{declarations → types}/worker.d.ts

@@ -21,6 +21,15 @@ export type Stylelint = import('postcss').PluginCreator<
   createLinter: (
     options: import('stylelint').LinterOptions
   ) => import('stylelint').InternalApi;
+  resolveConfig: (
+    filePath: string,
+    options?:
+      | Pick<
+          import('stylelint').LinterOptions,
+          'cwd' | 'config' | 'configFile' | 'configBasedir'
+        >
+      | undefined
+  ) => Promise<import('stylelint').Config | undefined>;
   utils: {
     report: (problem: import('stylelint').Problem) => void;
     ruleMessages: <

package/declarations/StylelintError.d.ts

@@ -1,2 +0,0 @@
-export default StylelintError;
-declare class StylelintError extends Error {}

package/declarations/cjs.d.ts

@@ -1,3 +0,0 @@
-declare const _exports: typeof plugin.default;
-export = _exports;
-import plugin = require('./index');

package/dist/cjs.js

@@ -1,5 +0,0 @@
-"use strict";
-
-const plugin = require('./index');
-
-module.exports = plugin.default;