chore(release): 4.1.0 (#61)

Author: evilebottnawi

.travis.yml

@@ -1,4 +1,36 @@
+sudo: false
+
+git:
+  depth: 10
+
+branches:
+  only:
+    - master
+    - next
+
 language: node_js
-node_js:
-  - "6"
-  - "node"
+
+cache:
+  yarn: true
+  directories:
+    - node_modules
+
+matrix:
+  include:
+    - node_js: "11"
+      env: JOB_PART=pretest
+    - node_js: "6"
+      env: JOB_PART=test
+    - node_js: "8"
+      env: JOB_PART=test
+    - node_js: "10"
+      env: JOB_PART=test
+    - node_js: "11"
+      env: JOB_PART=test
+
+before_script:
+  - node --version
+  - yarn --version
+
+script:
+  - yarn $JOB_PART

README.md

@@ -1,6 +1,6 @@
 [![Build Status](https://travis-ci.org/css-modules/icss-utils.svg)](https://travis-ci.org/css-modules/icss-utils)
 
-# ICSS Utils 
+# ICSS Utils
 
 ## replaceSymbols
 
@@ -10,9 +10,10 @@ This is broken into its own module in case the behaviour needs to be replicated
 (i.e. [CSS Modules Values](https://github.com/css-modules/postcss-modules-values))
 
 ```js
-import { replaceSymbols, replaceValueSymbols } from "icss-utils"
-replaceSymbols(css, replacements)
-replaceValueSymbols(string, replacements)
+import { replaceSymbols, replaceValueSymbols } from "icss-utils";
+
+replaceSymbols(css, replacements);
+replaceValueSymbols(string, replacements);
 ```
 
 Where:
@@ -30,8 +31,8 @@ A symbol is a string of alphanumeric, `-` or `_` characters. A replacement can b
 Extracts and remove (if removeRules is equal true) from PostCSS tree `:import` and `:export` statements.
 
 ```js
-import postcss from 'postcss';
-import { extractICSS } from 'icss-utils'
+import postcss from "postcss";
+import { extractICSS } from "icss-utils";
 
 const css = postcss.parse(`
   :import(colors) {
@@ -40,9 +41,9 @@ const css = postcss.parse(`
   :export {
     c: d;
   }
-`)
+`);
 
-extractICSS(css)
+extractICSS(css);
 /*
   {
     icssImports: {
@@ -62,18 +63,22 @@ extractICSS(css)
 Converts icss imports and exports definitions to postcss ast
 
 ```js
-createICSSRules({
-  colors: {
-    a: 'b'
+createICSSRules(
+  {
+    colors: {
+      a: "b"
+    }
+  },
+  {
+    c: "d"
   }
-}, {
-  c: 'd'
-})
+);
 ```
 
 ## License
 
 ISC
 
 ---
-Glen Maddern and Bogdan Chadkin, 2015.
+
+Glen Maddern, Bogdan Chadkin and Evilebottnawi 2015-present.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "icss-utils",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "ICSS utils for postcss ast",
   "main": "lib/index.js",
   "engines": {
@@ -10,39 +10,48 @@
     "lib"
   ],
   "scripts": {
+    "lint": "eslint . --ignore-path .gitignore",
     "build": "babel --out-dir lib src",
-    "test": "jest --coverage",
-    "precommit": "lint-staged",
+    "pretest": "npm run lint",
+    "test": "npm run test:only",
+    "test:only": "jest",
     "prepublish": "yarn test && yarn run build"
   },
-  "lint-staged": {
-    "*.js": [
-      "prettier --write",
-      "eslint",
-      "git add"
+  "babel": {
+    "presets": [
+      [
+        "@babel/preset-env",
+        {
+          "targets": {
+            "node": 6
+          }
+        }
+      ]
     ]
   },
   "eslintConfig": {
+    "parser": "babel-eslint",
     "parserOptions": {
       "sourceType": "module"
     },
     "env": {
-      "es6": true
+      "es6": true,
+      "jest": true
     },
     "extends": "eslint:recommended"
   },
-  "babel": {
-    "presets": [
-      [
-        "env",
-        {
-          "targets": {
-            "node": 6
-          }
-        }
-      ]
+  "lint-staged": {
+    "*.js": [
+      "prettier --write",
+      "eslint",
+      "git add"
     ]
   },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/css-modules/icss-utils.git"
@@ -60,16 +69,18 @@
   },
   "homepage": "https://github.com/css-modules/icss-utils#readme",
   "dependencies": {
-    "postcss": "^7.0.5"
+    "postcss": "^7.0.14"
   },
   "devDependencies": {
-    "babel-cli": "^6.24.1",
-    "babel-jest": "^20.0.3",
-    "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"
+    "@babel/cli": "^7.1.0",
+    "@babel/core": "^7.1.0",
+    "@babel/preset-env": "^7.1.0",
+    "babel-eslint": "^10.0.1",
+    "babel-jest": "^24.1.0",
+    "eslint": "^5.14.1",
+    "husky": "^1.3.1",
+    "jest": "^24.1.0",
+    "lint-staged": "^8.1.4",
+    "prettier": "^1.16.4"
   }
 }

src/createICSSRules.js

@@ -10,12 +10,19 @@ const createImports = imports => {
         raws: { before: "\n  " }
       })
     );
-    return postcss
-      .rule({
-        selector: `:import('${path}')`,
-        raws: { after: "\n" }
-      })
-      .append(declarations);
+
+    const hasDeclarations = declarations.length > 0;
+
+    const rule = postcss.rule({
+      selector: `:import('${path}')`,
+      raws: { after: hasDeclarations ? "\n" : "" }
+    });
+
+    if (hasDeclarations) {
+      rule.append(declarations);
+    }
+
+    return rule;
   });
 };
 
@@ -27,15 +34,18 @@ const createExports = exports => {
       raws: { before: "\n  " }
     })
   );
+
   if (declarations.length === 0) {
     return [];
   }
+
   const rule = postcss
     .rule({
       selector: `:export`,
       raws: { after: "\n" }
     })
     .append(declarations);
+
   return [rule];
 };
 

src/extractICSS.js

@@ -2,40 +2,49 @@ const importPattern = /^:import\(("[^"]*"|'[^']*'|[^"']+)\)$/;
 
 const getDeclsObject = rule => {
   const object = {};
+
   rule.walkDecls(decl => {
     const before = decl.raws.before ? decl.raws.before.trim() : "";
+
     object[before + decl.prop] = decl.value;
   });
+
   return object;
 };
 
 const extractICSS = (css, removeRules = true) => {
   const icssImports = {};
   const icssExports = {};
+
   css.each(node => {
     if (node.type === "rule") {
       if (node.selector.slice(0, 7) === ":import") {
         const matches = importPattern.exec(node.selector);
+
         if (matches) {
           const path = matches[1].replace(/'|"/g, "");
-          const aliases = Object.assign(
+
+          icssImports[path] = Object.assign(
             icssImports[path] || {},
             getDeclsObject(node)
           );
-          icssImports[path] = aliases;
+
           if (removeRules) {
             node.remove();
           }
         }
       }
+
       if (node.selector === ":export") {
         Object.assign(icssExports, getDeclsObject(node));
+
         if (removeRules) {
           node.remove();
         }
       }
     }
   });
+
   return { icssImports, icssExports };
 };
 

src/replaceSymbols.js

@@ -6,7 +6,10 @@ const replaceSymbols = (css, replacements) => {
       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") {
+    } else if (
+      node.type === "atrule" &&
+      ["media", "supports"].includes(node.name.toLowerCase())
+    ) {
       node.params = replaceValueSymbols(node.params, replacements);
     }
   });

src/replaceValueSymbols.js

@@ -2,16 +2,20 @@ const matchValueName = /[$]?[\w-]+/g;
 
 const replaceValueSymbols = (value, replacements) => {
   let matches;
+
   while ((matches = matchValueName.exec(value))) {
     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;
     }
   }
+
   return value;
 };
 

test/createICSSRules.test.js

@@ -1,11 +1,24 @@
-/* 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 empty :import statement", () => {
+  expect(
+    run(
+      {
+        "path/file": {}
+      },
+      {}
+    )
+  ).toEqual(":import('path/file') {}");
+});
+
 test("create :import statement", () => {
   expect(
     run(

test/extractICSS.test.js

@@ -1,4 +1,3 @@
-/* eslint-env jest */
 import postcss from "postcss";
 import { extractICSS } from "../src";