Use PostCSS 8

.gitignore

@@ -1,4 +1,4 @@
-coverage/
 node_modules/
-npm-debug.log
 yarn-error.log
+
+coverage/

.npmignore

@@ -1,9 +1,5 @@
-.editorconfig
-
-node_modules/
-npm-debug.log
+yarn-error.log
 yarn.lock
 
-coverage/
 *.test.js
-.travis.yml
+coverage/

.travis.yml

@@ -4,7 +4,3 @@ node_js:
   - node
   - "12"
   - "10"
-  - "8"
-  - "6"
-install:
- - yarn install --ignore-engines

README.md

@@ -2,7 +2,7 @@
 
 <img align="right" width="135" height="95"
      title="Philosopher’s stone, logo of PostCSS"
-     src="http://postcss.github.io/postcss/logo-leftp.svg">
+     src="https://postcss.org/logo-leftp.svg">
 
 [PostCSS] plugin to unwrap nested rules like how Sass does it.
 
@@ -72,7 +72,8 @@ Alternatives:
 * [`postcss-nested-props`] for nested properties like `font-size`.
 
 <a href="https://evilmartians.com/?utm_source=postcss-nested">
-<img src="https://evilmartians.com/badges/sponsored-by-evil-martians.svg" alt="Sponsored by Evil Martians" width="236" height="54">
+  <img src="https://evilmartians.com/badges/sponsored-by-evil-martians.svg"
+       alt="Sponsored by Evil Martians" width="236" height="54">
 </a>
 
 [`postcss-current-selector`]: https://github.com/komlev/postcss-current-selector
@@ -82,13 +83,29 @@ Alternatives:
 [CSSWG draft]:              https://drafts.csswg.org/css-nesting-1/
 [PostCSS]:                  https://github.com/postcss/postcss
 
+
 ## Usage
 
-```js
-postcss([ require('postcss-nested') ])
+**Step 1:** Check you project for existed PostCSS config: `postcss.config.js`
+in the project root, `"postcss"` section in `package.json`
+or `postcss` in bundle config.
+
+If you do not use PostCSS, add it according to [official docs]
+and set this plugin in settings.
+
+**Step 2:** Add the plugin to plugins list:
+
+```diff
+module.exports = {
+  plugins: [
++   require('postcss-nested'),
+    require('autoprefixer')
+  ]
+}
 ```
 
-See [PostCSS] docs for examples for your environment.
+[official docs]: https://github.com/postcss/postcss#usage
+
 
 ## Options
 
@@ -120,6 +137,7 @@ a {
 }
 ```
 
+
 ### `unwrap`
 
 By default, plugin will unwrap only `@font-face`, `@keyframes` and `@document`
@@ -146,6 +164,7 @@ a {
 }
 ```
 
+
 ### `preserveEmpty`
 
 By default, plugin will strip out any empty selector generated by intermediate

index.d.ts

@@ -1,29 +1,29 @@
 // Original definitions (@types/postcss-nested) by Maxim Vorontsov <https://github.com/VorontsovMaxim>
 
-import { Plugin } from 'postcss';
+import { PluginCreator } from 'postcss';
 
 declare namespace nested {
-    interface Options {
-        /**
-         * By default, plugin will bubble only @media and @supports at-rules.
-         * You can add your custom at-rules to this list by this option.
-         */
-        bubble?: string[];
+  interface Options {
+    /**
+     * By default, plugin will bubble only @media and @supports at-rules.
+     * You can add your custom at-rules to this list by this option.
+     */
+    bubble?: string[];
 
-        /**
-         * By default, plugin will unwrap only @font-face, @keyframes and @document at-rules.
-         * You can add your custom at-rules to this list by this option.
-         */
-        unwrap?: string[];
+    /**
+     * By default, plugin will unwrap only @font-face, @keyframes and @document at-rules.
+     * You can add your custom at-rules to this list by this option.
+     */
+    unwrap?: string[];
 
-        /**
-         * By default, plugin will strip out any empty selector generated by intermediate nesting
-         * levels. You can set this option to true to preserve them.
-         */
-        preserveEmpty?: boolean;
-    }
+    /**
+     * By default, plugin will strip out any empty selector generated by intermediate nesting
+     * levels. You can set this option to true to preserve them.
+     */
+    preserveEmpty?: boolean;
+  }
 
-    type Nested = Plugin<Options>;
+  type Nested = PluginCreator<Options>;
 }
 
 declare const nested: nested.Nested;

index.js

@@ -1,15 +1,14 @@
-var postcss = require('postcss')
-var parser = require('postcss-selector-parser')
+let parser = require('postcss-selector-parser')
 
 function parse (str, rule) {
-  var nodes
-  var saver = parser(function (parsed) {
+  let nodes
+  let saver = parser(parsed => {
     nodes = parsed
   })
   try {
     saver.processSync(str)
   } catch (e) {
-    if (str.indexOf(':') !== -1) {
+    if (str.includes(':')) {
       throw rule ? rule.error('Missed semicolon') : e
     } else {
       throw rule ? rule.error(e.message) : e
@@ -19,10 +18,10 @@ function parse (str, rule) {
 }
 
 function replace (nodes, parent) {
-  var replaced = false
-  nodes.each(function (i) {
+  let replaced = false
+  nodes.each(i => {
     if (i.type === 'nesting') {
-      var clonedParent = parent.clone()
+      let clonedParent = parent.clone()
       if (i.value !== '&') {
         i.replaceWith(parse(i.value.replace('&', clonedParent.toString())))
       } else {
@@ -39,13 +38,13 @@ function replace (nodes, parent) {
 }
 
 function selectors (parent, child) {
-  var result = []
-  parent.selectors.forEach(function (i) {
-    var parentNode = parse(i, parent)
+  let result = []
+  parent.selectors.forEach(i => {
+    let parentNode = parse(i, parent)
 
-    child.selectors.forEach(function (j) {
-      var node = parse(j, child)
-      var replaced = replace(node, parentNode)
+    child.selectors.forEach(j => {
+      let node = parse(j, child)
+      let replaced = replace(node, parentNode)
       if (!replaced) {
         node.prepend(parser.combinator({ value: ' ' }))
         node.prepend(parentNode.clone())
@@ -66,8 +65,8 @@ function pickComment (comment, after) {
 }
 
 function atruleChilds (rule, atrule, bubbling) {
-  var children = []
-  atrule.each(function (child) {
+  let children = []
+  atrule.each(child => {
     if (child.type === 'comment') {
       children.push(child)
     } else if (child.type === 'decl') {
@@ -80,39 +79,39 @@ function atruleChilds (rule, atrule, bubbling) {
   })
   if (bubbling) {
     if (children.length) {
-      var clone = rule.clone({ nodes: [] })
-      for (var i = 0; i < children.length; i++) {
-        clone.append(children[i])
+      let clone = rule.clone({ nodes: [] })
+      for (let child of children) {
+        clone.append(child)
       }
       atrule.prepend(clone)
     }
   }
 }
 
-function pickDeclarations (selector, declarations, after) {
-  var parent = postcss.rule({
-    selector: selector,
+function pickDeclarations (selector, declarations, after, Rule) {
+  let parent = new Rule({
+    selector,
     nodes: []
   })
 
-  for (var i = 0; i < declarations.length; i++) {
-    parent.append(declarations[i])
+  for (let declaration of declarations) {
+    parent.append(declaration)
   }
 
   after.after(parent)
   return parent
 }
 
-function processRule (rule, bubble, unwrap, preserveEmpty) {
-  var unwrapped = false
-  var after = rule
-  var copyDeclarations = false
-  var declarations = []
+function processRule (rule, bubble, unwrap, preserveEmpty, Rule) {
+  let unwrapped = false
+  let after = rule
+  let copyDeclarations = false
+  let declarations = []
 
-  rule.each(function (child) {
+  rule.each(child => {
     if (child.type === 'rule') {
       if (declarations.length) {
-        after = pickDeclarations(rule.selector, declarations, after)
+        after = pickDeclarations(rule.selector, declarations, after, Rule)
         declarations = []
       }
 
@@ -126,20 +125,17 @@ function processRule (rule, bubble, unwrap, preserveEmpty) {
       copyDeclarations = false
 
       if (declarations.length) {
-        after = pickDeclarations(rule.selector, declarations, after)
+        after = pickDeclarations(rule.selector, declarations, after, Rule)
         declarations = []
       }
 
       if (child.name === 'at-root') {
         unwrapped = true
         atruleChilds(rule, child, false)
 
-        var nodes = child.nodes
+        let nodes = child.nodes
         if (child.params) {
-          nodes = postcss.rule({
-            selector: child.params,
-            nodes: nodes
-          })
+          nodes = new Rule({ selector: child.params, nodes })
         }
 
         after.after(nodes)
@@ -164,7 +160,7 @@ function processRule (rule, bubble, unwrap, preserveEmpty) {
   })
 
   if (declarations.length) {
-    after = pickDeclarations(rule.selector, declarations, after)
+    after = pickDeclarations(rule.selector, declarations, after, Rule)
   }
 
   if (unwrapped && preserveEmpty !== true) {
@@ -174,34 +170,38 @@ function processRule (rule, bubble, unwrap, preserveEmpty) {
 }
 
 function atruleNames (defaults, custom) {
-  var list = { }
-  var i, name
-  for (i = 0; i < defaults.length; i++) {
-    list[defaults[i]] = true
+  let list = {}
+  for (let i of defaults) {
+    list[i] = true
   }
   if (custom) {
-    for (i = 0; i < custom.length; i++) {
-      name = custom[i].replace(/^@/, '')
+    for (let i of custom) {
+      let name = i.replace(/^@/, '')
       list[name] = true
     }
   }
   return list
 }
 
-module.exports = postcss.plugin('postcss-nested', function (opts) {
-  if (!opts) opts = { }
-  var bubble = atruleNames(['media', 'supports'], opts.bubble)
-  var unwrap = atruleNames(['document', 'font-face', 'keyframes'], opts.unwrap)
-  var preserveEmpty = opts ? opts.preserveEmpty : false
-
-  var process = function (node) {
-    node.each(function (child) {
-      if (child.type === 'rule') {
-        processRule(child, bubble, unwrap, preserveEmpty)
-      } else if (child.type === 'atrule') {
-        process(child)
+module.exports = (opts = {}) => {
+  let bubble = atruleNames(['media', 'supports'], opts.bubble)
+  let unwrap = atruleNames(['document', 'font-face', 'keyframes'], opts.unwrap)
+  let preserveEmpty = opts.preserveEmpty
+
+  return {
+    postcssPlugin: 'postcss-nested',
+    Root (root, { Rule }) {
+      let process = function (node) {
+        node.each(child => {
+          if (child.type === 'rule') {
+            processRule(child, bubble, unwrap, preserveEmpty, Rule)
+          } else if (child.type === 'atrule') {
+            process(child)
+          }
+        })
       }
-    })
+      process(root)
+    }
   }
-  return process
-})
+}
+module.exports.postcss = true