Add icss-utils

Author: TrySound

package.json

@@ -56,7 +56,7 @@
     "strip-indent": "^2.0.0"
   },
   "dependencies": {
-    "icss-replace-symbols": "^1.1.0",
+    "icss-utils": "^2.0.0",
     "postcss": "^6.0.1"
   }
 }

src/icss.js

@@ -1,6 +1,10 @@
-const postcss = require('postcss')
-const { default: replaceSymbols, replaceAll } = require('icss-replace-symbols')
-const { extractICSS, createICSSRules } = require('./icss.js')
+import postcss from 'postcss'
+import {
+  replaceSymbols,
+  replaceValueSymbols,
+  extractICSS,
+  createICSSRules
+} from 'icss-utils'
 
 const matchImports = /^(.+?|\([\s\S]+?\))\s+from\s+("[^"]*"|'[^']*'|[\w-]+)$/
 const matchValueDefinition = /(?:\s+|^)([\w-]+):?\s+(.+?)\s*$/g
@@ -14,11 +18,11 @@ module.exports = postcss.plugin('postcss-modules-values', () => (
   css,
   result
 ) => {
-  const { imports, exports } = extractICSS(css)
+  const { icssImports, icssExports } = extractICSS(css)
   let importIndex = 0
   const createImportedName = (path, name) => {
     const importedName = getAliasName(name, importIndex)
-    if (imports[path] && imports[path][importedName]) {
+    if (icssImports[path] && icssImports[path][importedName]) {
       importIndex += 1
       return createImportedName(path, name)
     }
@@ -31,7 +35,7 @@ module.exports = postcss.plugin('postcss-modules-values', () => (
     while ((matches = matchValueDefinition.exec(atRule.params))) {
       let [, key, value] = matches
       // Add to the definitions, knowing that values can refer to each other
-      exports[key] = replaceAll(exports, value)
+      icssExports[key] = replaceValueSymbols(value, icssExports)
       atRule.remove()
     }
   }
@@ -41,7 +45,7 @@ module.exports = postcss.plugin('postcss-modules-values', () => (
     if (matches) {
       let [, aliasesString, path] = matches
       // We can use constants for path names
-      if (exports[path]) path = exports[path]
+      if (icssExports[path]) path = icssExports[path]
       let aliases = aliasesString
         .replace(/^\(\s*([\s\S]+)\s*\)$/, '$1')
         .split(/\s*,\s*/)
@@ -50,7 +54,7 @@ module.exports = postcss.plugin('postcss-modules-values', () => (
           if (tokens) {
             let [, theirName, myName = theirName] = tokens
             let importedName = createImportedName(path, myName)
-            exports[myName] = importedName
+            icssExports[myName] = importedName
             return { theirName, importedName }
           } else {
             throw new Error(`@import statement "${alias}" is invalid!`)
@@ -60,7 +64,7 @@ module.exports = postcss.plugin('postcss-modules-values', () => (
           acc[importedName] = theirName
           return acc
         }, {})
-      imports[path] = Object.assign({}, imports[path], aliases)
+      icssImports[path] = Object.assign({}, icssImports[path], aliases)
       atRule.remove()
     }
   }
@@ -79,10 +83,10 @@ module.exports = postcss.plugin('postcss-modules-values', () => (
   })
 
   /* If we have no definitions, don't continue */
-  if (Object.keys(exports).length === 0) return
+  if (Object.keys(icssExports).length === 0) return
 
   /* Perform replacements */
-  replaceSymbols(css, exports)
+  replaceSymbols(css, icssExports)
 
-  css.prepend(createICSSRules(imports, exports))
+  css.prepend(createICSSRules(icssImports, icssExports))
 })

src/index.js

@@ -1370,9 +1370,11 @@ iconv-lite@0.4.13:
   version "0.4.13"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
 
-icss-replace-symbols@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
+icss-utils@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.0.0.tgz#9eb8432af871adc003e4ac7a574d24169398317d"
+  dependencies:
+    postcss "^6.0.1"
 
 indent-string@^2.1.0:
   version "2.1.0"