icss-utils - npm Package Compare versions

Comparing version 4.0.0 to 4.1.0

lib/createICSSRules.js

@@ -6,7 +6,6 @@ "use strict";
 });
+exports.default = void 0;
 
-var _postcss = require("postcss");
+var _postcss = _interopRequireDefault(require("postcss"));
 
-var _postcss2 = _interopRequireDefault(_postcss);
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -17,11 +16,23 @@
     const aliases = imports[path];
-    const declarations = Object.keys(aliases).map(key => _postcss2.default.decl({
+    const declarations = Object.keys(aliases).map(key => _postcss.default.decl({
       prop: key,
       value: aliases[key],
-      raws: { before: "\n  " }
+      raws: {
+        before: "\n  "
+      }
     }));
-    return _postcss2.default.rule({
+    const hasDeclarations = declarations.length > 0;
+
+    const rule = _postcss.default.rule({
       selector: `:import('${path}')`,
-      raws: { after: "\n" }
-    }).append(declarations);
+      raws: {
+        after: hasDeclarations ? "\n" : ""
+      }
+    });
+
+    if (hasDeclarations) {
+      rule.append(declarations);
+    }
+
+    return rule;
   });
@@ -31,14 +42,21 @@ };
 const createExports = exports => {
-  const declarations = Object.keys(exports).map(key => _postcss2.default.decl({
+  const declarations = Object.keys(exports).map(key => _postcss.default.decl({
     prop: key,
     value: exports[key],
-    raws: { before: "\n  " }
+    raws: {
+      before: "\n  "
+    }
   }));
+
   if (declarations.length === 0) {
     return [];
   }
-  const rule = _postcss2.default.rule({
+
+  const rule = _postcss.default.rule({
     selector: `:export`,
-    raws: { after: "\n" }
+    raws: {
+      after: "\n"
+    }
   }).append(declarations);
+
   return [rule];
@@ -49,2 +67,3 @@ };
 
-exports.default = createICSSRules;
+var _default = createICSSRules;
+exports.default = _default;

lib/extractICSS.js

@@ -6,2 +6,3 @@ "use strict";
 });
+exports.default = void 0;
 const importPattern = /^:import\(("[^"]*"|'[^']*'|[^"']+)\)$/;
@@ -12,3 +13,4 @@
   rule.walkDecls(decl => {
-    object[decl.raws.before.trim() + decl.prop] = decl.value;
+    const before = decl.raws.before ? decl.raws.before.trim() : "";
+    object[before + decl.prop] = decl.value;
   });
@@ -25,6 +27,7 @@ return object;
         const matches = importPattern.exec(node.selector);
+
         if (matches) {
           const path = matches[1].replace(/'|"/g, "");
-          const aliases = Object.assign(icssImports[path] || {}, getDeclsObject(node));
-          icssImports[path] = aliases;
+          icssImports[path] = Object.assign(icssImports[path] || {}, getDeclsObject(node));
+
           if (removeRules) {
@@ -35,4 +38,6 @@ node.remove();
       }
+
       if (node.selector === ":export") {
         Object.assign(icssExports, getDeclsObject(node));
+
         if (removeRules) {
@@ -44,5 +49,9 @@ node.remove();
   });
-  return { icssImports, icssExports };
+  return {
+    icssImports,
+    icssExports
+  };
 };
 
-exports.default = extractICSS;
+var _default = extractICSS;
+exports.default = _default;

lib/index.js

@@ -6,39 +6,35 @@ "use strict";
 });
-
-var _replaceValueSymbols = require("./replaceValueSymbols.js");
-
 Object.defineProperty(exports, "replaceValueSymbols", {
   enumerable: true,
   get: function get() {
-    return _interopRequireDefault(_replaceValueSymbols).default;
+    return _replaceValueSymbols.default;
   }
 });
-
-var _replaceSymbols = require("./replaceSymbols.js");
-
 Object.defineProperty(exports, "replaceSymbols", {
   enumerable: true,
   get: function get() {
-    return _interopRequireDefault(_replaceSymbols).default;
+    return _replaceSymbols.default;
   }
 });
-
-var _extractICSS = require("./extractICSS.js");
-
 Object.defineProperty(exports, "extractICSS", {
   enumerable: true,
   get: function get() {
-    return _interopRequireDefault(_extractICSS).default;
+    return _extractICSS.default;
   }
 });
-
-var _createICSSRules = require("./createICSSRules.js");
-
 Object.defineProperty(exports, "createICSSRules", {
   enumerable: true,
   get: function get() {
-    return _interopRequireDefault(_createICSSRules).default;
+    return _createICSSRules.default;
   }
 });
 
+var _replaceValueSymbols = _interopRequireDefault(require("./replaceValueSymbols.js"));
+
+var _replaceSymbols = _interopRequireDefault(require("./replaceSymbols.js"));
+
+var _extractICSS = _interopRequireDefault(require("./extractICSS.js"));
+
+var _createICSSRules = _interopRequireDefault(require("./createICSSRules.js"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

lib/replaceSymbols.js

@@ -6,7 +6,6 @@ "use strict";
 });
+exports.default = void 0;
 
-var _replaceValueSymbols = require("./replaceValueSymbols.js");
+var _replaceValueSymbols = _interopRequireDefault(require("./replaceValueSymbols.js"));
 
-var _replaceValueSymbols2 = _interopRequireDefault(_replaceValueSymbols);
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -17,7 +16,7 @@
     if (node.type === "decl") {
-      node.value = (0, _replaceValueSymbols2.default)(node.value, replacements);
+      node.value = (0, _replaceValueSymbols.default)(node.value, replacements);
     } else if (node.type === "rule") {
-      node.selector = (0, _replaceValueSymbols2.default)(node.selector, replacements);
-    } else if (node.type === "atrule" && node.name === "media") {
-      node.params = (0, _replaceValueSymbols2.default)(node.params, replacements);
+      node.selector = (0, _replaceValueSymbols.default)(node.selector, replacements);
+    } else if (node.type === "atrule" && ["media", "supports"].includes(node.name.toLowerCase())) {
+      node.params = (0, _replaceValueSymbols.default)(node.params, replacements);
     }
@@ -27,2 +26,3 @@ });
 
-exports.default = replaceSymbols;
+var _default = replaceSymbols;
+exports.default = _default;

lib/replaceValueSymbols.js

@@ -6,2 +6,3 @@ "use strict";
 });
+exports.default = void 0;
 const matchValueName = /[$]?[\w-]+/g;
@@ -11,4 +12,6 @@
   let matches;
+
   while (matches = matchValueName.exec(value)) {
     const replacement = replacements[matches[0]];
+
     if (replacement) {
@@ -19,5 +22,7 @@ value = value.slice(0, matches.index) + replacement + value.slice(matchValueName.lastIndex);
   }
+
   return value;
 };
 
-exports.default = replaceValueSymbols;
+var _default = replaceValueSymbols;
+exports.default = _default;

package.json

 {
   "name": "icss-utils",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "ICSS utils for postcss ast",
@@ -13,15 +13,23 @@ "main": "lib/index.js",
   "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": {
@@ -31,18 +39,19 @@ "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": {
@@ -65,14 +74,16 @@ "type": "git",
   "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"
   }
 }

README.md

 [![Build Status](https://travis-ci.org/css-modules/icss-utils.svg)](https://travis-ci.org/css-modules/icss-utils)
 
-# ICSS Utils 
+# ICSS Utils
 
@@ -13,5 +13,6 @@ ## replaceSymbols
 ```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);
 ```
@@ -34,4 +35,4 @@
 ```js
-import postcss from 'postcss';
-import { extractICSS } from 'icss-utils'
+import postcss from "postcss";
+import { extractICSS } from "icss-utils";
 
@@ -45,5 +46,5 @@ const css = postcss.parse(`
   }
-`)
+`);
 
-extractICSS(css)
+extractICSS(css);
 /*
@@ -68,9 +69,12 @@ {
 ```js
-createICSSRules({
-  colors: {
-    a: 'b'
+createICSSRules(
+  {
+    colors: {
+      a: "b"
+    }
+  },
+  {
+    c: "d"
   }
-}, {
-  c: 'd'
-})
+);
 ```
@@ -83,2 +87,3 @@
 ---
-Glen Maddern and Bogdan Chadkin, 2015.
+
+Glen Maddern, Bogdan Chadkin and Evilebottnawi 2015-present.

New alerts

New author

Supply chain risk

A new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.

Found 1 instance in 1 package

Fixed alerts

New author

Supply chain risk

A new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

9449

increased by8.04%

Lines of code

163

increased by15.6%

Number of lines in readme file

85

increased by6.25%

Worsened metrics

Dev dependency count

10

increased by25%

Dependency changes

• Updatedpostcss@^7.0.14