@parcel/transformer-postcss 2.1.1 → 2.3.1

package/lib/PostCSSTransformer.js

@@ -35,16 +35,6 @@ function _plugin() {
   return data;
 }
 
-function _fileSystemLoader() {
-  const data = _interopRequireDefault(require("css-modules-loader-core/lib/file-system-loader"));
-
-  _fileSystemLoader = function () {
-    return data;
-  };
-
-  return data;
-}
-
 function _nullthrows() {
   const data = _interopRequireDefault(require("nullthrows"));
 
@@ -85,16 +75,6 @@ function _postcssValueParser() {
   return data;
 }
 
-function _postcssModules() {
-  const data = _interopRequireDefault(require("postcss-modules"));
-
-  _postcssModules = function () {
-    return data;
-  };
-
-  return data;
-}
-
 var _loadConfig = require("./loadConfig");
 
 var _constants = require("./constants");
@@ -103,6 +83,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 const COMPOSES_RE = /composes:.+from\s*("|').*("|')\s*;?/;
 const FROM_IMPORT_RE = /.+from\s*(?:"|')(.*)(?:"|')\s*;?/;
+const LEGACY_MODULE_RE = /@value|(:global|:local)(?!\s*\()/i;
+const MODULE_BY_NAME_RE = /\.module\./;
 
 var _default = new (_plugin().Transformer)({
   loadConfig({
@@ -128,7 +110,9 @@ var _default = new (_plugin().Transformer)({
     config,
     options
   }) {
-    if (!config) {
+    let isLegacy = await isLegacyCssModule(asset);
+
+    if (!config && !isLegacy) {
       return;
     }
 
@@ -149,52 +133,70 @@ var _default = new (_plugin().Transformer)({
     resolve
   }) {
     asset.type = 'css';
+    let isLegacy = await isLegacyCssModule(asset);
+
+    if (isLegacy && !config) {
+      config = {
+        hydrated: {
+          plugins: [],
+          from: asset.filePath,
+          to: asset.filePath,
+          modules: {}
+        }
+      }; // TODO: warning?
+    }
 
     if (!config) {
       return [asset];
     }
 
     const postcss = await loadPostcss(options, asset.filePath);
+    let ast = (0, _nullthrows().default)(await asset.getAST());
+    let program = postcss.fromJSON(ast.program);
     let plugins = [...config.hydrated.plugins];
     let cssModules = null;
 
     if (config.hydrated.modules) {
-      plugins.push((0, _postcssModules().default)({
+      asset.meta.cssModulesCompiled = true; // TODO: should this be resolved from the project root?
+
+      let postcssModules = await options.packageManager.require('postcss-modules', asset.filePath, {
+        range: '^4.3.0',
+        saveDev: true,
+        shouldAutoInstall: options.shouldAutoInstall
+      });
+      plugins.push(postcssModules({
         getJSON: (filename, json) => cssModules = json,
-        Loader: createLoader(asset, resolve),
-        generateScopedName: (name, filename) => `_${name}_${(0, _hash().hashString)(_path().default.relative(options.projectRoot, filename)).substr(0, 6)}`,
+        Loader: await createLoader(asset, resolve, options),
+        generateScopedName: (name, filename) => `${name}_${(0, _hash().hashString)(_path().default.relative(options.projectRoot, filename)).substr(0, 6)}`,
         ...config.hydrated.modules
       }));
-    }
-
-    let ast = (0, _nullthrows().default)(await asset.getAST());
-    let program = postcss.fromJSON(ast.program);
-    let code = asset.isASTDirty() ? null : await asset.getCode();
-
-    if (code == null || COMPOSES_RE.test(code)) {
-      program.walkDecls(decl => {
-        let [, importPath] = FROM_IMPORT_RE.exec(decl.value) || [];
-
-        if (decl.prop === 'composes' && importPath != null) {
-          let parsed = (0, _postcssValueParser().default)(decl.value);
-          parsed.walk(node => {
-            if (node.type === 'string') {
-              asset.addDependency({
-                specifier: importPath,
-                specifierType: 'url',
-                loc: {
-                  filePath: asset.filePath,
-                  start: decl.source.start,
-                  end: {
-                    line: decl.source.start.line,
-                    column: decl.source.start.column + importPath.length
+      let code = asset.isASTDirty() ? null : await asset.getCode();
+
+      if (code == null || COMPOSES_RE.test(code)) {
+        program.walkDecls(decl => {
+          let [, importPath] = FROM_IMPORT_RE.exec(decl.value) || [];
+
+          if (decl.prop === 'composes' && importPath != null) {
+            let parsed = (0, _postcssValueParser().default)(decl.value);
+            parsed.walk(node => {
+              if (node.type === 'string') {
+                asset.addDependency({
+                  specifier: importPath,
+                  specifierType: 'url',
+                  loc: {
+                    filePath: asset.filePath,
+                    start: decl.source.start,
+                    end: {
+                      line: decl.source.start.line,
+                      column: decl.source.start.column + importPath.length
+                    }
                   }
-                }
-              });
-            }
-          });
-        }
-      });
+                });
+              }
+            });
+          }
+        });
+      }
     } // $FlowFixMe Added in Flow 0.121.0 upgrade in #4381
 
 
@@ -281,8 +283,11 @@ var _default = new (_plugin().Transformer)({
 
 exports.default = _default;
 
-function createLoader(asset, resolve) {
-  return class extends _fileSystemLoader().default {
+async function createLoader(asset, resolve, options) {
+  let {
+    default: FileSystemLoader
+  } = await options.packageManager.require('postcss-modules/build/css-loader-core/loader', asset.filePath);
+  return class extends FileSystemLoader {
     async fetch(composesPath, relativeTo) {
       let importPath = composesPath.replace(/^["']|["']$/g, '');
       let resolved = await resolve(relativeTo, importPath);
@@ -318,4 +323,13 @@ function loadPostcss(options, from) {
     saveDev: true,
     shouldAutoInstall: options.shouldAutoInstall
   });
+}
+
+async function isLegacyCssModule(asset) {
+  if (!MODULE_BY_NAME_RE.test(asset.filePath)) {
+    return false;
+  }
+
+  let code = await asset.getCode();
+  return LEGACY_MODULE_RE.test(code);
 }

package/lib/loadConfig.js

@@ -51,20 +51,7 @@ var _loadPlugins = _interopRequireDefault(require("./loadPlugins"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const MODULE_BY_NAME_RE = /\.module\./;
-
 async function configHydrator(configFile, config, resolveFrom, options) {
-  // Use a basic, modules-only PostCSS config if the file opts in by a name
-  // like foo.module.css
-  if (configFile == null && config.searchPath.match(MODULE_BY_NAME_RE)) {
-    configFile = {
-      plugins: {
-        'postcss-modules': {}
-      }
-    };
-    resolveFrom = __filename;
-  }
-
   if (configFile == null) {
     return;
   } // Load the custom config...

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/transformer-postcss",
-  "version": "2.1.1",
+  "version": "2.3.1",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,21 +17,19 @@
   "source": "src/PostCSSTransformer.js",
   "engines": {
     "node": ">= 12.0.0",
-    "parcel": "^2.1.1"
+    "parcel": "^2.3.1"
   },
   "dependencies": {
-    "@parcel/hash": "^2.1.1",
-    "@parcel/plugin": "^2.1.1",
-    "@parcel/utils": "^2.1.1",
+    "@parcel/hash": "2.3.1",
+    "@parcel/plugin": "2.3.1",
+    "@parcel/utils": "2.3.1",
     "clone": "^2.1.1",
-    "css-modules-loader-core": "^1.1.0",
     "nullthrows": "^1.1.1",
-    "postcss-modules": "^3.2.2",
-    "postcss-value-parser": "^4.1.0",
+    "postcss-value-parser": "^4.2.0",
     "semver": "^5.7.1"
   },
   "devDependencies": {
-    "postcss": "^8.3.0"
+    "postcss": "^8.4.5"
   },
-  "gitHead": "f53ffe772a8259d94ca2937d02fde149454112f3"
+  "gitHead": "699f0b24c38eabcdad0960c62c03bd2f2902b19e"
 }

package/src/PostCSSTransformer.js

@@ -1,16 +1,14 @@
 // @flow
 
-import type {FilePath, MutableAsset, PluginOptions} from '@parcel/types';
+import type {FilePath, Asset, MutableAsset, PluginOptions} from '@parcel/types';
 
 import {hashString} from '@parcel/hash';
 import {glob} from '@parcel/utils';
 import {Transformer} from '@parcel/plugin';
-import FileSystemLoader from 'css-modules-loader-core/lib/file-system-loader';
 import nullthrows from 'nullthrows';
 import path from 'path';
 import semver from 'semver';
 import valueParser from 'postcss-value-parser';
-import postcssModules from 'postcss-modules';
 import typeof * as Postcss from 'postcss';
 
 import {load} from './loadConfig';
@@ -18,6 +16,8 @@ import {POSTCSS_RANGE} from './constants';
 
 const COMPOSES_RE = /composes:.+from\s*("|').*("|')\s*;?/;
 const FROM_IMPORT_RE = /.+from\s*(?:"|')(.*)(?:"|')\s*;?/;
+const LEGACY_MODULE_RE = /@value|(:global|:local)(?!\s*\()/i;
+const MODULE_BY_NAME_RE = /\.module\./;
 
 export default (new Transformer({
   loadConfig({config, options, logger}) {
@@ -31,7 +31,8 @@ export default (new Transformer({
   },
 
   async parse({asset, config, options}) {
-    if (!config) {
+    let isLegacy = await isLegacyCssModule(asset);
+    if (!config && !isLegacy) {
       return;
     }
 
@@ -50,55 +51,82 @@ export default (new Transformer({
 
   async transform({asset, config, options, resolve}) {
     asset.type = 'css';
+    let isLegacy = await isLegacyCssModule(asset);
+    if (isLegacy && !config) {
+      config = {
+        hydrated: {
+          plugins: [],
+          from: asset.filePath,
+          to: asset.filePath,
+          modules: {},
+        },
+      };
+
+      // TODO: warning?
+    }
+
     if (!config) {
       return [asset];
     }
 
     const postcss: Postcss = await loadPostcss(options, asset.filePath);
+    let ast = nullthrows(await asset.getAST());
+    let program = postcss.fromJSON(ast.program);
 
     let plugins = [...config.hydrated.plugins];
     let cssModules: ?{|[string]: string|} = null;
     if (config.hydrated.modules) {
+      asset.meta.cssModulesCompiled = true;
+
+      // TODO: should this be resolved from the project root?
+      let postcssModules = await options.packageManager.require(
+        'postcss-modules',
+        asset.filePath,
+        {
+          range: '^4.3.0',
+          saveDev: true,
+          shouldAutoInstall: options.shouldAutoInstall,
+        },
+      );
+
       plugins.push(
         postcssModules({
           getJSON: (filename, json) => (cssModules = json),
-          Loader: createLoader(asset, resolve),
+          Loader: await createLoader(asset, resolve, options),
           generateScopedName: (name, filename) =>
-            `_${name}_${hashString(
+            `${name}_${hashString(
               path.relative(options.projectRoot, filename),
             ).substr(0, 6)}`,
           ...config.hydrated.modules,
         }),
       );
-    }
 
-    let ast = nullthrows(await asset.getAST());
-    let program = postcss.fromJSON(ast.program);
-    let code = asset.isASTDirty() ? null : await asset.getCode();
-    if (code == null || COMPOSES_RE.test(code)) {
-      program.walkDecls(decl => {
-        let [, importPath] = FROM_IMPORT_RE.exec(decl.value) || [];
-        if (decl.prop === 'composes' && importPath != null) {
-          let parsed = valueParser(decl.value);
-
-          parsed.walk(node => {
-            if (node.type === 'string') {
-              asset.addDependency({
-                specifier: importPath,
-                specifierType: 'url',
-                loc: {
-                  filePath: asset.filePath,
-                  start: decl.source.start,
-                  end: {
-                    line: decl.source.start.line,
-                    column: decl.source.start.column + importPath.length,
+      let code = asset.isASTDirty() ? null : await asset.getCode();
+      if (code == null || COMPOSES_RE.test(code)) {
+        program.walkDecls(decl => {
+          let [, importPath] = FROM_IMPORT_RE.exec(decl.value) || [];
+          if (decl.prop === 'composes' && importPath != null) {
+            let parsed = valueParser(decl.value);
+
+            parsed.walk(node => {
+              if (node.type === 'string') {
+                asset.addDependency({
+                  specifier: importPath,
+                  specifierType: 'url',
+                  loc: {
+                    filePath: asset.filePath,
+                    start: decl.source.start,
+                    end: {
+                      line: decl.source.start.line,
+                      column: decl.source.start.column + importPath.length,
+                    },
                   },
-                },
-              });
-            }
-          });
-        }
-      });
+                });
+              }
+            });
+          }
+        });
+      }
     }
 
     // $FlowFixMe Added in Flow 0.121.0 upgrade in #4381
@@ -178,10 +206,15 @@ export default (new Transformer({
   },
 }): Transformer);
 
-function createLoader(
+async function createLoader(
   asset: MutableAsset,
   resolve: (from: FilePath, to: string) => Promise<FilePath>,
+  options: PluginOptions,
 ) {
+  let {default: FileSystemLoader} = await options.packageManager.require(
+    'postcss-modules/build/css-loader-core/loader',
+    asset.filePath,
+  );
   return class ParcelFileSystemLoader extends FileSystemLoader {
     async fetch(composesPath, relativeTo) {
       let importPath = composesPath.replace(/^["']|["']$/g, '');
@@ -218,3 +251,12 @@ function loadPostcss(options: PluginOptions, from: FilePath): Promise<Postcss> {
     shouldAutoInstall: options.shouldAutoInstall,
   });
 }
+
+async function isLegacyCssModule(asset: Asset | MutableAsset) {
+  if (!MODULE_BY_NAME_RE.test(asset.filePath)) {
+    return false;
+  }
+
+  let code = await asset.getCode();
+  return LEGACY_MODULE_RE.test(code);
+}

package/src/loadConfig.js

@@ -13,8 +13,6 @@ import {POSTCSS_RANGE} from './constants';
 
 import loadExternalPlugins from './loadPlugins';
 
-const MODULE_BY_NAME_RE = /\.module\./;
-
 type ConfigResult = {|
   raw: any,
   hydrated: {|
@@ -31,17 +29,6 @@ async function configHydrator(
   resolveFrom: ?FilePath,
   options: PluginOptions,
 ): Promise<?ConfigResult> {
-  // Use a basic, modules-only PostCSS config if the file opts in by a name
-  // like foo.module.css
-  if (configFile == null && config.searchPath.match(MODULE_BY_NAME_RE)) {
-    configFile = {
-      plugins: {
-        'postcss-modules': {},
-      },
-    };
-    resolveFrom = __filename;
-  }
-
   if (configFile == null) {
     return;
   }