chore(release): 4.0.0-rc.4 (#14)

css-modules · Oct 8, 2020 · fdc802f · fdc802f
1 parent 44d4e85
commit fdc802f
Show file tree

Hide file tree

Showing 4 changed files with 198 additions and 159 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.0.0-rc.4](https://github.com/postcss-modules-local-by-default/compare/v4.0.0-rc.3...v4.0.0-rc.4) - 2020-10-08
+
+### Fixes
+
+- perf
+- compatibility with empty custom properties
+- works with `options.createImportedName`
+
 ## [4.0.0-rc.3](https://github.com/postcss-modules-local-by-default/compare/v4.0.0-rc.2...v4.0.0-rc.3) - 2020-10-08
 
 ### BREAKING CHANGE

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-modules-values",
-  "version": "4.0.0-rc.3",
+  "version": "4.0.0-rc.4",
   "description": "PostCSS plugin for CSS Modules to pass arbitrary values between your module files",
   "main": "src/index.js",
   "files": [

diff --git a/src/index.js b/src/index.js
@@ -3,83 +3,89 @@
 const ICSSUtils = require("icss-utils");
 
 const matchImports = /^(.+?|\([\s\S]+?\))\s+from\s+("[^"]*"|'[^']*'|[\w-]+)$/;
-const matchValueDefinition = /(?:\s+|^)([\w-]+):?\s+(.+?)\s*$/g;
+const matchValueDefinition = /(?:\s+|^)([\w-]+):?(.*?)$/;
 const matchImport = /^([\w-]+)(?:\s+as\s+([\w-]+))?/;
 
-let options = {};
-let importIndex = 0;
-let createImportedName =
-  (options && options.createImportedName) ||
-  ((importName /*, path*/) =>
-    `i__const_${importName.replace(/\W/g, "_")}_${importIndex++}`);
+module.exports = (options) => {
+  let importIndex = 0;
+  let createImportedName =
+    (options && options.createImportedName) ||
+    ((importName /*, path*/) =>
+      `i__const_${importName.replace(/\W/g, "_")}_${importIndex++}`);
 
-module.exports = () => {
   return {
     postcssPlugin: "postcss-modules-values",
     prepare(result) {
       const importAliases = [];
       const definitions = {};
 
       return {
-        /* Look at all the @value statements and treat them as locals or as imports */
         AtRule: {
           value(atRule) {
-            if (matchImports.exec(atRule.params)) {
-              const matches = matchImports.exec(atRule.params);
-
-              if (matches) {
-                let [, /*match*/ aliases, path] = matches;
-
-                // We can use constants for path names
-                if (definitions[path]) {
-                  path = definitions[path];
-                }
-
-                const imports = aliases
-                  .replace(/^\(\s*([\s\S]+)\s*\)$/, "$1")
-                  .split(/\s*,\s*/)
-                  .map((alias) => {
-                    const tokens = matchImport.exec(alias);
-
-                    if (tokens) {
-                      const [
-                        ,
-                        /*match*/ theirName,
-                        myName = theirName,
-                      ] = tokens;
-                      const importedName = createImportedName(myName);
-                      definitions[myName] = importedName;
-                      return { theirName, importedName };
-                    } else {
-                      throw new Error(
-                        `@import statement "${alias}" is invalid!`
-                      );
-                    }
-                  });
-
-                importAliases.push({ path, imports });
-
-                atRule.remove();
-              }
-            } else {
-              if (atRule.params.indexOf("@value") !== -1) {
-                result.warn("Invalid value definition: " + atRule.params);
+            const matches = atRule.params.match(matchImports);
+
+            if (matches) {
+              let [, /*match*/ aliases, path] = matches;
+
+              // We can use constants for path names
+              if (definitions[path]) {
+                path = definitions[path];
               }
 
-              let matches;
+              const imports = aliases
+                .replace(/^\(\s*([\s\S]+)\s*\)$/, "$1")
+                .split(/\s*,\s*/)
+                .map((alias) => {
+                  const tokens = matchImport.exec(alias);
 
-              while ((matches = matchValueDefinition.exec(atRule.params))) {
-                let [, /*match*/ key, value] = matches;
+                  if (tokens) {
+                    const [, /*match*/ theirName, myName = theirName] = tokens;
+                    const importedName = createImportedName(myName);
+                    definitions[myName] = importedName;
+                    return { theirName, importedName };
+                  } else {
+                    throw new Error(`@import statement "${alias}" is invalid!`);
+                  }
+                });
 
-                // Add to the definitions, knowing that values can refer to each other
-                definitions[key] = ICSSUtils.replaceValueSymbols(
-                  value,
-                  definitions
-                );
+              importAliases.push({ path, imports });
 
-                atRule.remove();
-              }
+              atRule.remove();
+
+              return;
+            }
+
+            if (atRule.params.indexOf("@value") !== -1) {
+              result.warn("Invalid value definition: " + atRule.params);
+            }
+
+            let [, key, value] = `${atRule.params}${atRule.raws.between}`.match(
+              matchValueDefinition
+            );
+
+            const normalizedValue = value.replace(/\/\*((?!\*\/).*?)\*\//g, "");
+
+            if (normalizedValue.length === 0) {
+              result.warn("Invalid value definition: " + atRule.params);
+
+              atRule.remove();
+
+              return;
             }
+
+            let isOnlySpace = /^\s+$/.test(normalizedValue);
+
+            if (!isOnlySpace) {
+              value = value.trim();
+            }
+
+            // Add to the definitions, knowing that values can refer to each other
+            definitions[key] = ICSSUtils.replaceValueSymbols(
+              value,
+              definitions
+            );
+
+            atRule.remove();
           },
         },
         OnceExit(root, postcss) {