postcss-nested 2.1.2 → 3.0.0

package/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 3.0
+* Add `@font-face` to bubbling at-rules (by Valeriy Komlev).
+* Add special logic for `@font-face` bubbling (by Phanindra Pydisetty).
+* Use PostCSS selector parser 3.0.
+
 ## 2.1.2
 * Fix replacing multiple `&`.
 

package/README.md

@@ -74,7 +74,7 @@ See [PostCSS] docs for examples for your environment.
 
 ### `bubble`
 
-By default, plugin will unwrap only `@media`, `@supports` and `@document`
+By default, plugin will unwrap only `@media`, `@supports`, `@font-face` and `@document
 at-rules. You can add your custom at-rules to this list by `bubble` option:
 
 ```js

package/index.js

@@ -1,14 +1,23 @@
 var postcss = require('postcss');
 var parser = require('postcss-selector-parser');
 
+function parse(str) {
+    var nodes;
+    var saver = parser(function (parsed) {
+        nodes = parsed;
+    });
+    saver.processSync(str);
+    return nodes.at(0);
+}
+
 function replace(nodes, parent) {
     var replaced = false;
-    nodes.forEach(function (i) {
+    nodes.each(function (i) {
         if (i.type === 'nesting') {
             i.replaceWith(parent.clone());
             replaced = true;
         } else if (i.nodes) {
-            if (replace(i.nodes, parent)) {
+            if (replace(i, parent)) {
                 replaced = true;
             }
         }
@@ -19,11 +28,11 @@ function replace(nodes, parent) {
 function selectors(parent, child) {
     var result = [];
     parent.selectors.forEach(function (i) {
-        var parentNode = parser().process(i).res.first;
+        var parentNode = parse(i);
 
         child.selectors.forEach(function (j) {
-            var node = parser().process(j).res.first;
-            var replaced = replace(node.nodes, parentNode);
+            var node = parse(j);
+            var replaced = replace(node, parentNode);
             if (!replaced) {
                 node.prepend(parser.combinator({ value: ' ' }));
                 node.prepend(parentNode.clone());
@@ -56,6 +65,8 @@ function atruleChilds(rule, atrule) {
             atruleChilds(rule, child);
         }
     });
+    if ( atrule.name === 'font-face' ) return;
+
     if ( children.length ) {
         var clone = rule.clone({ nodes: [] });
         for ( var i = 0; i < children.length; i++ ) {
@@ -92,7 +103,7 @@ function processRule(rule, bubble, preserveEmpty) {
 }
 
 module.exports = postcss.plugin('postcss-nested', function (opts) {
-    var bubble = ['media', 'supports', 'document'];
+    var bubble = ['media', 'supports', 'document', 'font-face'];
     if ( opts && opts.bubble ) {
         bubble = bubble.concat(opts.bubble.map(function (i) {
             return i.replace(/^@/, '');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-nested",
-  "version": "2.1.2",
+  "version": "3.0.0",
   "description": "PostCSS plugin to unwrap nested rules like how Sass does it.",
   "keywords": [
     "postcss",
@@ -13,13 +13,14 @@
   "license": "MIT",
   "repository": "postcss/postcss-nested",
   "dependencies": {
-    "postcss": "^6.0.9",
-    "postcss-selector-parser": "^2.2.3"
+    "postcss": "^6.0.14",
+    "postcss-selector-parser": "^3.1.1"
   },
   "devDependencies": {
-    "eslint": "^4.4.1",
+    "eslint": "^4.13.0",
+    "eslint-ci": "^0.1.1",
     "eslint-config-postcss": "^2.0.2",
-    "jest": "^20.0.4"
+    "jest": "^21.2.1"
   },
   "jest": {
     "coverageThreshold": {
@@ -29,7 +30,7 @@
     }
   },
   "scripts": {
-    "test": "jest --coverage && eslint *.js"
+    "test": "jest --coverage && eslint-ci *.js"
   },
   "eslintConfig": {
     "extends": "eslint-config-postcss/es5",