Upgrade to PostCSS v8

dimitrinicolas · dimitrinicolas · commit 34dcbc25ff39 · 2021-01-02T17:47:11.000+01:00
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,34 +1,15 @@
 module.exports = {
   env: {
-    browser: true
+    es6: true,
+    node: true,
   },
-  extends: 'airbnb',
-  parser: 'babel-eslint',
-  rules : {
-    'max-len': ['error', {
-      'code': 150
-    }],
-    'comma-dangle': 0,
-    'no-plusplus': 0,
-    'arrow-parens': ['error', 'as-needed'],
-    'no-multi-assign': 0,
-    'strict': 0,
-    'no-console': 0,
-    'prefer-destructuring': 0,
-    'function-paren-newline': 0,
-    'global-require': 0,
-    'prefer-spread': 0,
-    'prefer-rest-params': 0,
-    'prefer-arrow-callback': 0,
-    'arrow-body-style': 0,
-    'no-restricted-globals': 0,
-    'no-restricted-syntax': 0,
-    'consistent-return': 0,
-    'no-param-reassign': 0,
-    'no-underscore-dangle': 0,
-    'import/no-unresolved': 0,
-    'import/no-dynamic-require': 0,
-    'import/no-extraneous-dependencies': 0,
-    'import/extensions': ['warn', 'ignorePackages']
-  }
+  globals: {
+    Atomics: 'readonly',
+    SharedArrayBuffer: 'readonly',
+  },
+  parserOptions: {
+    ecmaVersion: 2018,
+    sourceType: 'module',
+  },
+  rules: {},
 };
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,5 @@ logs
 
 .nyc_output
 coverage
+
+.vscode
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,61 @@
+{
+  "printWidth": 80,
+  "singleQuote": true,
+  "useTabs": false,
+  "overrides": [
+    {
+      "files": "*.css",
+      "options": {
+        "parser": "scss",
+        "singleQuote": false
+      }
+    },
+    {
+      "files": ["*.json", ".prettierrc", ".eslintrc"],
+      "options": {
+        "parser": "json"
+      }
+    }
+  ],
+  "eslintConfig": {
+    "env": {
+      "browser": true
+    },
+    "extends": "airbnb",
+    "parser": "babel-eslint",
+    "rules": {
+      "max-len": [
+        "error",
+        {
+          "code": 150
+        }
+      ],
+      "comma-dangle": 0,
+      "no-plusplus": 0,
+      "arrow-parens": ["error", "as-needed"],
+      "no-multi-assign": 0,
+      "strict": 0,
+      "no-console": 0,
+      "prefer-destructuring": 0,
+      "function-paren-newline": 0,
+      "global-require": 0,
+      "prefer-spread": 0,
+      "prefer-rest-params": 0,
+      "prefer-arrow-callback": 0,
+      "arrow-body-style": 0,
+      "no-restricted-globals": 0,
+      "no-restricted-syntax": 0,
+      "no-unused-expressions": 0,
+      "consistent-return": 0,
+      "no-param-reassign": 0,
+      "no-underscore-dangle": 0,
+      "import/no-unresolved": 0,
+      "import/no-dynamic-require": 0,
+      "import/no-extraneous-dependencies": 0,
+      "import/extensions": ["warn", "ignorePackages"],
+      "react/prefer-stateless-function": 0,
+      "react/jsx-one-expression-per-line": 0,
+      "implicit-arrow-linebreak": 0
+    }
+  }
+}
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: node_js
 
 node_js:
   - stable
-  - "8"
+  - '14'
 
 install:
   - npm install
@@ -11,7 +11,3 @@ install:
 after_success:
   - npm run coverage
   - codecov
-
-# Telegram bot
-notifications:
-  webhooks: https://fathomless-fjord-24024.herokuapp.com/notify
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@
 This project adheres to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2.0.0 - 2021-01-02
+### Breaking
+- Upgrade to PostCSS v8.
+
 ## 1.1.0 - 2018-08-15
 ### Added
 - Source for new nodes to generate an accurate source map.
diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
 # postcss-import-ext-glob [![Build Status][travis badge]][travis link] [![Coverage Status][coveralls badge]][coveralls link]
 
-A [PostCSS][postcss] plugin to extend [postcss-import][postcss-import] path 
+A [PostCSS][postcss] v8 plugin to extend [postcss-import][postcss-import] path
 resolver to allow [glob][glob ref] usage as a path.
 
-You must use this plugin along with [postcss-import][postcss-import], place 
+You must use this plugin along with [postcss-import][postcss-import], place
 this plugin **before** `postcss-import`.
 
 ```pcss
@@ -13,7 +13,7 @@ this plugin **before** `postcss-import`.
 ## Installation
 
 ```console
-$ npm install postcss-import-ext-glob
+$ npm install --save-dev postcss postcss-import postcss-import-ext-glob
 ```
 
 ## Usage
@@ -26,7 +26,7 @@ postcss([
 ]);
 ```
 
-Check out [PostCSS](https://github.com/postcss/postcss) docs for the complete 
+Check out [PostCSS](https://github.com/postcss/postcss) docs for the complete
 installation.
 
 ### Example
@@ -71,7 +71,7 @@ The sort order is by default ascending.
 
 ## Related
 
-- [postcss-import][postcss-import] - PostCSS plugin to inline @import rules 
+- [postcss-import][postcss-import] - PostCSS plugin to inline @import rules
 content
 - [fast-glob][fast-glob] - Module used for getting glob entries
 - [fast-sort][fast-sort] - Module used for sorting glob entries
diff --git a/index.js b/index.js
@@ -1,4 +1,3 @@
-const postcss = require('postcss');
 const valueParser = require('postcss-value-parser');
 
 const path = require('path');
@@ -8,60 +7,71 @@ const sort = require('fast-sort');
 const SORTERS = ['asc', 'desc'];
 const DEFAULT_SORTER = 'asc';
 
-module.exports = postcss.plugin('postcss-import-ext-glob', (opts = {}) => {
-  const sorter = SORTERS.indexOf(opts.sort) > -1
-    ? opts.sort
-    : DEFAULT_SORTER;
+module.exports = (opts = {}) => {
+  const sorter = SORTERS.indexOf(opts.sort) !== -1 ? opts.sort : DEFAULT_SORTER;
 
-  return (root, result) => {
-    const promisesList = [];
+  return {
+    postcssPlugin: 'postcss-import-ext-glob',
+    Once(root, { AtRule, result }) {
+      const promisesList = [];
 
-    root.walkAtRules('import-glob', rule => {
-      promisesList.push(new Promise(resolve => {
-        const globList = [];
-        const params = valueParser(rule.params).nodes;
+      root.walkAtRules('import-glob', (rule) => {
+        promisesList.push(
+          new Promise((resolve) => {
+            const globList = [];
 
-        const dirname = typeof rule.source.input.file === 'string'
-          ? path.dirname(rule.source.input.file)
-          : __dirname;
+            const params = valueParser(rule.params).nodes;
 
-        for (const param of params) {
-          if (param.type === 'string') {
-            globList.push(path.join(dirname, param.value));
-          }
-        }
+            const dirName =
+              typeof rule.source.input.file === 'string'
+                ? path.dirname(rule.source.input.file)
+                : __dirname;
 
-        if (globList.length) {
-          fg(globList)
-            .then(entries => {
-              if (!entries.length) {
-                result.warn(
-                  `No file found for @import-glob ${rule.params}`,
-                  { node: rule }
-                );
+            for (const param of params) {
+              if (param.type === 'string') {
+                globList.push(path.join(dirName, param.value));
               }
+            }
 
-              const sortedEntries = sort(entries)[sorter]();
+            if (globList.length) {
+              fg(globList).then((entries) => {
+                if (!entries.length) {
+                  result.warn(`No file found for @import-glob ${rule.params}`, {
+                    node: rule,
+                  });
+                }
 
-              for (const entry of sortedEntries) {
-                root.insertBefore(rule, {
-                  name: 'import',
-                  params: `"${entry}"`,
-                  source: rule.source
+                const sortedEntries = sort(entries)[sorter]();
+
+                sortedEntries.forEach((entry) => {
+                  rule.before(
+                    new AtRule({
+                      name: 'import',
+                      params: `"${entry}"`,
+                      source: rule.source,
+                    })
+                  );
                 });
-              }
-              rule.remove();
-              resolve();
-            });
-        } else {
-          throw rule.error(
-            `No string found with rule @import-glob ${rule.params}`,
-            { plugin: 'postcss-import-ext-glob' }
-          );
-        }
-      }));
-    });
 
-    return Promise.all(promisesList);
+                rule.remove();
+
+                resolve();
+              });
+            } else {
+              throw rule.error(
+                `No string found with rule @import-glob ${rule.params}`,
+                {
+                  word: rule.params,
+                }
+              );
+            }
+          })
+        );
+      });
+
+      return Promise.all(promisesList);
+    },
   };
-});
+};
+
+module.exports.postcss = true;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/test.js b/test.js
