.travis.yml

@@ -1,5 +1,4 @@
 language: node_js
 node_js:
-  - "4"
   - "6"
   - "node"

LICENSE.md

@@ -0,0 +1,6 @@
+ISC License (ISC)
+Copyright 2018 Glen Maddern
+
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

package.json

@@ -1,8 +1,11 @@
 {
   "name": "icss-utils",
-  "version": "2.1.0",
+  "version": "4.0.0",
   "description": "ICSS utils for postcss ast",
   "main": "lib/index.js",
+  "engines": {
+    "node": ">= 6"
+  },
   "files": [
     "lib"
   ],
@@ -14,16 +17,18 @@
   },
   "lint-staged": {
     "*.js": [
-      "eslint",
       "prettier --write",
+      "eslint",
       "git add"
     ]
   },
   "eslintConfig": {
     "parserOptions": {
-      "ecmaVersion": 6,
       "sourceType": "module"
     },
+    "env": {
+      "es6": true
+    },
     "extends": "eslint:recommended"
   },
   "babel": {
@@ -32,7 +37,7 @@
         "env",
         {
           "targets": {
-            "node": 4
+            "node": 6
           }
         }
       ]
@@ -55,16 +60,16 @@
   },
   "homepage": "https://github.com/css-modules/icss-utils#readme",
   "dependencies": {
-    "postcss": "^6.0.1"
+    "postcss": "^7.0.5"
   },
   "devDependencies": {
     "babel-cli": "^6.24.1",
     "babel-jest": "^20.0.3",
-    "babel-preset-env": "^1.5.1",
-    "eslint": "^3.19.0",
-    "husky": "^0.13.3",
-    "jest": "^20.0.3",
-    "lint-staged": "^3.4.2",
-    "prettier": "^1.3.1"
+    "babel-preset-env": "^1.5.2",
+    "eslint": "^4.0.0",
+    "husky": "^0.13.4",
+    "jest": "^20.0.4",
+    "lint-staged": "^3.6.1",
+    "prettier": "^1.4.4"
   }
 }

src/createICSSRules.js

@@ -1,47 +1,47 @@
-import postcss from 'postcss'
+import postcss from "postcss";
 
 const createImports = imports => {
   return Object.keys(imports).map(path => {
-    const aliases = imports[path]
+    const aliases = imports[path];
     const declarations = Object.keys(aliases).map(key =>
       postcss.decl({
         prop: key,
         value: aliases[key],
-        raws: { before: '\n  ' }
+        raws: { before: "\n  " }
       })
-    )
+    );
     return postcss
       .rule({
-        selector: `:import(${path})`,
-        raws: { after: '\n' }
+        selector: `:import('${path}')`,
+        raws: { after: "\n" }
       })
-      .append(declarations)
-  })
-}
+      .append(declarations);
+  });
+};
 
 const createExports = exports => {
   const declarations = Object.keys(exports).map(key =>
     postcss.decl({
       prop: key,
       value: exports[key],
-      raws: { before: '\n  ' }
+      raws: { before: "\n  " }
     })
-  )
+  );
   if (declarations.length === 0) {
-    return []
+    return [];
   }
   const rule = postcss
     .rule({
       selector: `:export`,
-      raws: { after: '\n' }
+      raws: { after: "\n" }
     })
-    .append(declarations)
-  return [rule]
-}
+    .append(declarations);
+  return [rule];
+};
 
 const createICSSRules = (imports, exports) => [
   ...createImports(imports),
   ...createExports(exports)
-]
+];
 
-export default createICSSRules
+export default createICSSRules;

src/extractICSS.js

@@ -1,4 +1,4 @@
-const importPattern = /^:import\(("[^"]*"|'[^']*'|[\w-\.]+)\)$/;
+const importPattern = /^:import\(("[^"]*"|'[^']*'|[^"']+)\)$/;
 
 const getDeclsObject = rule => {
   const object = {};
@@ -16,7 +16,7 @@ const extractICSS = (css, removeRules = true) => {
       if (node.selector.slice(0, 7) === ":import") {
         const matches = importPattern.exec(node.selector);
         if (matches) {
-          const path = matches[1];
+          const path = matches[1].replace(/'|"/g, "");
           const aliases = Object.assign(
             icssImports[path] || {},
             getDeclsObject(node)

src/index.js

@@ -1,4 +1,4 @@
-export { default as replaceValueSymbols } from './replaceValueSymbols.js'
-export { default as replaceSymbols } from './replaceSymbols.js'
-export { default as extractICSS } from './extractICSS.js'
-export { default as createICSSRules } from './createICSSRules.js'
+export { default as replaceValueSymbols } from "./replaceValueSymbols.js";
+export { default as replaceSymbols } from "./replaceSymbols.js";
+export { default as extractICSS } from "./extractICSS.js";
+export { default as createICSSRules } from "./createICSSRules.js";

src/replaceSymbols.js

@@ -1,13 +1,15 @@
-import replaceValueSymbols from './replaceValueSymbols.js'
+import replaceValueSymbols from "./replaceValueSymbols.js";
 
 const replaceSymbols = (css, replacements) => {
-  css.walkDecls(
-    decl => (decl.value = replaceValueSymbols(decl.value, replacements))
-  )
-  css.walkAtRules(
-    'media',
-    atRule => (atRule.params = replaceValueSymbols(atRule.params, replacements))
-  )
-}
+  css.walk(node => {
+    if (node.type === "decl") {
+      node.value = replaceValueSymbols(node.value, replacements);
+    } else if (node.type === "rule") {
+      node.selector = replaceValueSymbols(node.selector, replacements);
+    } else if (node.type === "atrule" && node.name === "media") {
+      node.params = replaceValueSymbols(node.params, replacements);
+    }
+  });
+};
 
-export default replaceSymbols
+export default replaceSymbols;

src/replaceValueSymbols.js

@@ -1,18 +1,18 @@
-const matchValueName = /[$#]?[\w-\.]+/g
+const matchValueName = /[$]?[\w-]+/g;
 
 const replaceValueSymbols = (value, replacements) => {
-  let matches
+  let matches;
   while ((matches = matchValueName.exec(value))) {
-    const replacement = replacements[matches[0]]
+    const replacement = replacements[matches[0]];
     if (replacement) {
       value =
         value.slice(0, matches.index) +
         replacement +
-        value.slice(matchValueName.lastIndex)
-      matchValueName.lastIndex -= matches[0].length - replacement.length
+        value.slice(matchValueName.lastIndex);
+      matchValueName.lastIndex -= matches[0].length - replacement.length;
     }
   }
-  return value
-}
+  return value;
+};
 
-export default replaceValueSymbols
+export default replaceValueSymbols;

test/createICSSRules.test.js

@@ -1,52 +1,47 @@
-import postcss from 'postcss'
-import { createICSSRules } from '../src'
+/* eslint-env jest */
+import postcss from "postcss";
+import { createICSSRules } from "../src";
 
 const run = (imports, exports) => {
-  return postcss.root().append(createICSSRules(imports, exports)).toString()
-}
+  return postcss.root().append(createICSSRules(imports, exports)).toString();
+};
 
-test('create :import statement', () => {
+test("create :import statement", () => {
   expect(
     run(
       {
-        colors: {
-          a: 'b',
-          c: 'd'
-        },
-        '"path/file"': {
-          e: 'f'
+        "path/file": {
+          e: "f"
         }
       },
       {}
     )
-  ).toEqual(
-    ':import(colors) {\n  a: b;\n  c: d\n}\n:import("path/file") {\n  e: f\n}'
-  )
-})
+  ).toEqual(":import('path/file') {\n  e: f\n}");
+});
 
-test('create :export statement', () => {
+test("create :export statement", () => {
   expect(
     run(
       {},
       {
-        a: 'b',
-        c: 'd'
+        a: "b",
+        c: "d"
       }
     )
-  ).toEqual(':export {\n  a: b;\n  c: d\n}')
-})
+  ).toEqual(":export {\n  a: b;\n  c: d\n}");
+});
 
-test('create :import and :export', () => {
+test("create :import and :export", () => {
   expect(
     run(
       {
         colors: {
-          a: 'b'
+          a: "b"
         }
       },
       {
-        c: 'd'
+        c: "d"
       }
     )
-  ).toEqual(':import(colors) {\n  a: b\n}\n:export {\n  c: d\n}')
-})
+  ).toEqual(":import('colors') {\n  a: b\n}\n:export {\n  c: d\n}");
+});

test/extractICSS.test.js

@@ -21,7 +21,7 @@ test("extract :import statements with identifier", () => {
 test("extract :import statements with single quoted path", () => {
   expect(runExtract(`:import('./colors.css') {}`)).toEqual({
     icssImports: {
-      "'./colors.css'": {}
+      "./colors.css": {}
     },
     icssExports: {}
   });
@@ -30,18 +30,18 @@ test("extract :import statements with single quoted path", () => {
 test("extract :import statements with double quoted path", () => {
   expect(runExtract(':import("./colors.css") {}')).toEqual({
     icssImports: {
-      '"./colors.css"': {}
+      "./colors.css": {}
     },
     icssExports: {}
   });
 });
 
-test("extract :import with values", () => {
+test("not extract :import with values", () => {
   expect(
-    runExtract(":import(colors) { i__blue: blue; i__red: red; }")
+    runExtract(":import(./colors.css) { i__blue: blue; i__red: red; }")
   ).toEqual({
     icssImports: {
-      colors: {
+      "./colors.css": {
         i__blue: "blue",
         i__red: "red"
       }
@@ -51,7 +51,7 @@ test("extract :import with values", () => {
 });
 
 test("not extract invalid :import", () => {
-  expect(runExtract(":import(./color.css) {}")).toEqual({
+  expect(runExtract(":import(\\'./colors.css) {}")).toEqual({
     icssImports: {},
     icssExports: {}
   });