@parcel/transformer-postcss 2.0.0-beta.3.1 → 2.0.0-nightly.1002

package/lib/PostCSSTransformer.js

@@ -5,30 +5,30 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-function _utils() {
-  const data = require("@parcel/utils");
+function _hash() {
+  const data = require("@parcel/hash");
 
-  _utils = function () {
+  _hash = function () {
     return data;
   };
 
   return data;
 }
 
-function _plugin() {
-  const data = require("@parcel/plugin");
+function _utils() {
+  const data = require("@parcel/utils");
 
-  _plugin = function () {
+  _utils = function () {
     return data;
   };
 
   return data;
 }
 
-function _fileSystemLoader() {
-  const data = _interopRequireDefault(require("css-modules-loader-core/lib/file-system-loader"));
+function _plugin() {
+  const data = require("@parcel/plugin");
 
-  _fileSystemLoader = function () {
+  _plugin = function () {
     return data;
   };
 
@@ -75,30 +75,16 @@ function _postcssValueParser() {
   return data;
 }
 
-function _postcssModules() {
-  const data = _interopRequireDefault(require("postcss-modules"));
+var _loadConfig = require("./loadConfig");
 
-  _postcssModules = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _loadConfig() {
-  const data = require("./loadConfig");
-
-  _loadConfig = function () {
-    return data;
-  };
-
-  return data;
-}
+var _constants = require("./constants");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 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({
@@ -106,7 +92,7 @@ var _default = new (_plugin().Transformer)({
     options,
     logger
   }) {
-    return (0, _loadConfig().load)({
+    return (0, _loadConfig.load)({
       config,
       options,
       logger
@@ -116,7 +102,7 @@ var _default = new (_plugin().Transformer)({
   canReuseAST({
     ast
   }) {
-    return ast.type === 'postcss' && _semver().default.satisfies(ast.version, '^8.2.1');
+    return ast.type === 'postcss' && _semver().default.satisfies(ast.version, _constants.POSTCSS_RANGE);
   },
 
   async parse({
@@ -124,7 +110,9 @@ var _default = new (_plugin().Transformer)({
     config,
     options
   }) {
-    if (!config) {
+    let isLegacy = await isLegacyCssModule(asset);
+
+    if (!config && !isLegacy) {
       return;
     }
 
@@ -145,51 +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, _utils().md5FromString)(_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({
-                moduleSpecifier: importPath,
-                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
 
 
@@ -205,7 +212,22 @@ var _default = new (_plugin().Transformer)({
 
     for (let msg of messages) {
       if (msg.type === 'dependency') {
-        asset.addIncludedFile(msg.file);
+        asset.invalidateOnFileChange(msg.file);
+      } else if (msg.type === 'dir-dependency') {
+        var _msg$glob;
+
+        let pattern = `${msg.dir}/${(_msg$glob = msg.glob) !== null && _msg$glob !== void 0 ? _msg$glob : '**/*'}`;
+        let files = await (0, _utils().glob)(pattern, asset.fs, {
+          onlyFiles: true
+        });
+
+        for (let file of files) {
+          asset.invalidateOnFileChange(_path().default.normalize(file));
+        }
+
+        asset.invalidateOnFileCreate({
+          glob: pattern
+        });
       }
     }
 
@@ -214,12 +236,12 @@ var _default = new (_plugin().Transformer)({
     if (cssModules) {
       // $FlowFixMe
       let cssModulesList = Object.entries(cssModules);
-      let deps = asset.getDependencies().filter(dep => !dep.isURL);
+      let deps = asset.getDependencies().filter(dep => dep.priority === 'sync');
       let code;
 
       if (deps.length > 0) {
         code = `
-          module.exports = Object.assign({}, ${deps.map(dep => `require(${JSON.stringify(dep.moduleSpecifier)})`).join(', ')}, ${JSON.stringify(cssModules, null, 2)});
+          module.exports = Object.assign({}, ${deps.map(dep => `require(${JSON.stringify(dep.specifier)})`).join(', ')}, ${JSON.stringify(cssModules, null, 2)});
         `;
       } else {
         code = cssModulesList.map( // This syntax enables shaking the invidual statements, so that unused classes don't even exist in JS.
@@ -235,7 +257,6 @@ var _default = new (_plugin().Transformer)({
       asset.symbols.set('default', 'default');
       assets.push({
         type: 'js',
-        filePath: asset.filePath + '.js',
         content: code
       });
     }
@@ -262,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);
@@ -281,7 +305,8 @@ function createLoader(asset, resolve) {
       let source = await asset.fs.readFile(resolved, 'utf-8');
       let {
         exportTokens
-      } = await this.core.load(source, rootRelativePath, undefined, this.fetch.bind(this));
+      } = await this.core.load(source, rootRelativePath, undefined, // $FlowFixMe[method-unbinding]
+      this.fetch.bind(this));
       return exportTokens;
     }
 
@@ -294,8 +319,17 @@ function createLoader(asset, resolve) {
 
 function loadPostcss(options, from) {
   return options.packageManager.require('postcss', from, {
-    range: '^8.2.1',
+    range: _constants.POSTCSS_RANGE,
     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/constants.js

@@ -0,0 +1,8 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.POSTCSS_RANGE = void 0;
+const POSTCSS_RANGE = '^8.2.1';
+exports.POSTCSS_RANGE = POSTCSS_RANGE;

package/lib/loadConfig.js

@@ -45,32 +45,13 @@ function _clone() {
   return data;
 }
 
-function _loadPlugins() {
-  const data = _interopRequireDefault(require("./loadPlugins"));
+var _constants = require("./constants");
 
-  _loadPlugins = function () {
-    return data;
-  };
-
-  return data;
-}
+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...
@@ -88,7 +69,7 @@ async function configHydrator(configFile, config, resolveFrom, options) {
     modulesConfig = {};
   }
 
-  let plugins = await (0, _loadPlugins().default)(configFilePlugins, (0, _nullthrows().default)(resolveFrom), options); // contents is either:
+  let plugins = await (0, _loadPlugins.default)(configFilePlugins, (0, _nullthrows().default)(resolveFrom), options); // contents is either:
   // from JSON:    { plugins: { 'postcss-foo': { ...opts } } }
   // from JS (v8): { plugins: [ { postcssPlugin: 'postcss-foo', ...visitor callback functions } ]
   // from JS (v7): { plugins: [ [Function: ...] ]
@@ -98,13 +79,13 @@ async function configHydrator(configFile, config, resolveFrom, options) {
   for (let p of pluginArray) {
     if (typeof p === 'string') {
       config.addDevDependency({
-        moduleSpecifier: p,
+        specifier: p,
         resolveFrom: (0, _nullthrows().default)(resolveFrom)
       });
     }
   }
 
-  config.setResult({
+  return {
     raw: configFile,
     hydrated: {
       plugins,
@@ -112,7 +93,7 @@ async function configHydrator(configFile, config, resolveFrom, options) {
       to: config.searchPath,
       modules: modulesConfig
     }
-  });
+  };
 }
 
 async function load({
@@ -120,6 +101,10 @@ async function load({
   options,
   logger
 }) {
+  if (!config.isSource) {
+    return;
+  }
+
   let configFile = await config.getConfig(['.postcssrc', '.postcssrc.json', '.postcssrc.js', 'postcss.config.js'], {
     packageKey: 'postcss'
   });
@@ -127,8 +112,9 @@ async function load({
 
   if (configFile) {
     config.addDevDependency({
-      moduleSpecifier: 'postcss',
-      resolveFrom: config.searchPath
+      specifier: 'postcss',
+      resolveFrom: config.searchPath,
+      range: _constants.POSTCSS_RANGE
     });
     contents = configFile.contents;
     let isDynamic = configFile && _path().default.extname(configFile.filePath) === '.js';
@@ -139,10 +125,10 @@ async function load({
       logger.warn({
         message: 'WARNING: Using a JavaScript PostCSS config file means losing out on caching features of Parcel. Use a .postcssrc(.json) file whenever possible.'
       });
-      config.shouldInvalidateOnStartup(); // Also add the config as a dev dependency so we attempt to reload in watch mode.
+      config.invalidateOnStartup(); // Also add the config as a dev dependency so we attempt to reload in watch mode.
 
       config.addDevDependency({
-        moduleSpecifier: (0, _utils().relativePath)(_path().default.dirname(config.searchPath), configFile.filePath),
+        specifier: (0, _utils().relativePath)(_path().default.dirname(config.searchPath), configFile.filePath),
         resolveFrom: config.searchPath
       });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/transformer-postcss",
-  "version": "2.0.0-beta.3.1",
+  "version": "2.0.0-nightly.1002+5530a6ef",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,20 +17,19 @@
   "source": "src/PostCSSTransformer.js",
   "engines": {
     "node": ">= 12.0.0",
-    "parcel": "^2.0.0-beta.1"
+    "parcel": "2.0.0-nightly.1000+5530a6ef"
   },
   "dependencies": {
-    "@parcel/plugin": "2.0.0-beta.3.1",
-    "@parcel/utils": "2.0.0-beta.3.1",
+    "@parcel/hash": "2.3.2-nightly.2625+5530a6ef",
+    "@parcel/plugin": "2.0.0-nightly.1002+5530a6ef",
+    "@parcel/utils": "2.0.0-nightly.1002+5530a6ef",
     "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",
-    "semver": "^5.4.1"
+    "postcss-value-parser": "^4.2.0",
+    "semver": "^5.7.1"
   },
   "devDependencies": {
-    "postcss": "^8.2.1"
+    "postcss": "^8.4.5"
   },
-  "gitHead": "daece49d003ba804bbdaa3a7ed3d6aaf446f166d"
+  "gitHead": "5530a6eff8b619873353baeb0457ae4ec591e9fa"
 }

package/src/PostCSSTransformer.js

@@ -1,21 +1,23 @@
 // @flow
 
-import type {FilePath, MutableAsset, PluginOptions} from '@parcel/types';
+import type {FilePath, Asset, MutableAsset, PluginOptions} from '@parcel/types';
 
-import {md5FromString} from '@parcel/utils';
+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';
+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}) {
@@ -23,11 +25,14 @@ export default (new Transformer({
   },
 
   canReuseAST({ast}) {
-    return ast.type === 'postcss' && semver.satisfies(ast.version, '^8.2.1');
+    return (
+      ast.type === 'postcss' && semver.satisfies(ast.version, POSTCSS_RANGE)
+    );
   },
 
   async parse({asset, config, options}) {
-    if (!config) {
+    let isLegacy = await isLegacyCssModule(asset);
+    if (!config && !isLegacy) {
       return;
     }
 
@@ -46,54 +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}_${md5FromString(
+            `${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({
-                moduleSpecifier: importPath,
-                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
@@ -108,7 +141,14 @@ export default (new Transformer({
     });
     for (let msg of messages) {
       if (msg.type === 'dependency') {
-        asset.addIncludedFile(msg.file);
+        asset.invalidateOnFileChange(msg.file);
+      } else if (msg.type === 'dir-dependency') {
+        let pattern = `${msg.dir}/${msg.glob ?? '**/*'}`;
+        let files = await glob(pattern, asset.fs, {onlyFiles: true});
+        for (let file of files) {
+          asset.invalidateOnFileChange(path.normalize(file));
+        }
+        asset.invalidateOnFileCreate({glob: pattern});
       }
     }
 
@@ -118,12 +158,12 @@ export default (new Transformer({
       let cssModulesList = (Object.entries(cssModules): Array<
         [string, string],
       >);
-      let deps = asset.getDependencies().filter(dep => !dep.isURL);
+      let deps = asset.getDependencies().filter(dep => dep.priority === 'sync');
       let code: string;
       if (deps.length > 0) {
         code = `
           module.exports = Object.assign({}, ${deps
-            .map(dep => `require(${JSON.stringify(dep.moduleSpecifier)})`)
+            .map(dep => `require(${JSON.stringify(dep.specifier)})`)
             .join(', ')}, ${JSON.stringify(cssModules, null, 2)});
         `;
       } else {
@@ -146,7 +186,6 @@ export default (new Transformer({
 
       assets.push({
         type: 'js',
-        filePath: asset.filePath + '.js',
         content: code,
       });
     }
@@ -167,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, '');
@@ -188,6 +232,7 @@ function createLoader(
         source,
         rootRelativePath,
         undefined,
+        // $FlowFixMe[method-unbinding]
         this.fetch.bind(this),
       );
       return exportTokens;
@@ -201,8 +246,17 @@ function createLoader(
 
 function loadPostcss(options: PluginOptions, from: FilePath): Promise<Postcss> {
   return options.packageManager.require('postcss', from, {
-    range: '^8.2.1',
+    range: POSTCSS_RANGE,
     saveDev: true,
     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/constants.js

@@ -0,0 +1,3 @@
+// @flow
+
+export const POSTCSS_RANGE = '^8.2.1';

package/src/loadConfig.js

@@ -1,32 +1,34 @@
 // @flow
-import type {Config, FilePath, PluginOptions} from '@parcel/types';
-import type {PluginLogger} from '@parcel/logger';
+import type {
+  Config,
+  FilePath,
+  PluginOptions,
+  PluginLogger,
+} from '@parcel/types';
 import path from 'path';
 import {relativePath} from '@parcel/utils';
 import nullthrows from 'nullthrows';
 import clone from 'clone';
+import {POSTCSS_RANGE} from './constants';
 
 import loadExternalPlugins from './loadPlugins';
 
-const MODULE_BY_NAME_RE = /\.module\./;
+type ConfigResult = {|
+  raw: any,
+  hydrated: {|
+    plugins: Array<any>,
+    from: FilePath,
+    to: FilePath,
+    modules: any,
+  |},
+|};
 
 async function configHydrator(
   configFile: any,
   config: Config,
   resolveFrom: ?FilePath,
   options: PluginOptions,
-) {
-  // 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;
-  }
-
+): Promise<?ConfigResult> {
   if (configFile == null) {
     return;
   }
@@ -63,13 +65,13 @@ async function configHydrator(
   for (let p of pluginArray) {
     if (typeof p === 'string') {
       config.addDevDependency({
-        moduleSpecifier: p,
+        specifier: p,
         resolveFrom: nullthrows(resolveFrom),
       });
     }
   }
 
-  config.setResult({
+  return {
     raw: configFile,
     hydrated: {
       plugins,
@@ -77,7 +79,7 @@ async function configHydrator(
       to: config.searchPath,
       modules: modulesConfig,
     },
-  });
+  };
 }
 
 export async function load({
@@ -88,7 +90,11 @@ export async function load({
   config: Config,
   options: PluginOptions,
   logger: PluginLogger,
-|}): Promise<void> {
+|}): Promise<?ConfigResult> {
+  if (!config.isSource) {
+    return;
+  }
+
   let configFile: any = await config.getConfig(
     ['.postcssrc', '.postcssrc.json', '.postcssrc.js', 'postcss.config.js'],
     {packageKey: 'postcss'},
@@ -97,8 +103,9 @@ export async function load({
   let contents = null;
   if (configFile) {
     config.addDevDependency({
-      moduleSpecifier: 'postcss',
+      specifier: 'postcss',
       resolveFrom: config.searchPath,
+      range: POSTCSS_RANGE,
     });
 
     contents = configFile.contents;
@@ -111,11 +118,11 @@ export async function load({
           'WARNING: Using a JavaScript PostCSS config file means losing out on caching features of Parcel. Use a .postcssrc(.json) file whenever possible.',
       });
 
-      config.shouldInvalidateOnStartup();
+      config.invalidateOnStartup();
 
       // Also add the config as a dev dependency so we attempt to reload in watch mode.
       config.addDevDependency({
-        moduleSpecifier: relativePath(
+        specifier: relativePath(
           path.dirname(config.searchPath),
           configFile.filePath,
         ),