Update to PostCSS@6 (#2561)

* Update to PostCSS@6

* Fix PostCSS@6 closing-brace test (#2689)

* Account for PostCSS@6's support for at-apply

* Remove only

* Fix postcssPlugin tests (#2690)

* Fix defaultSeverity.test.js test

* Fix ignoreDisables test

* Check ownSemiColon

* Fixed: remove hacks related to custom property set.

lib/__tests__/defaultSeverity.test.js

@@ -9,7 +9,7 @@ it("`defaultSeverity` option set to warning", () => {
       "block-no-empty": true,
     },
   }
-  return postcssPlugin.process("a {}", config).then(result => {
+  return postcssPlugin.process("a {}", {}, config).then(result => {
     const warnings = result.warnings()
     expect(warnings.length).toBe(1)
     expect(warnings[0].text.indexOf("block-no-empty")).not.toBe(-1)

lib/__tests__/ignoreDisables.test.js

@@ -20,7 +20,7 @@ describe("ignoreDisables with postcssPlugins", () => {
   let result
 
   beforeEach(() => {
-    return postcssPlugin.process(css, {
+    return postcssPlugin.process(css, {}, {
       config,
       ignoreDisables: true,
     }).then(data => result = data)

lib/__tests__/postcssPlugin.test.js

@@ -16,15 +16,15 @@ it("`configFile` option with absolute path", () => {
   const config = {
     configFile: path.join(__dirname, "fixtures/config-block-no-empty.json"),
   }
-  return postcssPlugin.process("a {}", config).then(postcssResult => {
+  return postcssPlugin.process("a {}", {}, config).then(postcssResult => {
     const warnings = postcssResult.warnings()
     expect(warnings.length).toBe(1)
     expect(warnings[0].text.indexOf("block-no-empty")).not.toBe(-1)
   })
 })
 
 it("`configFile` with bad path", () => {
-  return postcssPlugin.process("a {}", { configFile: "./herby.json" }).then(() => {
+  return postcssPlugin.process("a {}", {}, { configFile: "./herby.json" }).then(() => {
     throw new Error("should not have succeeded")
   }).catch(err => {
     expect(err.code).toBe("ENOENT")
@@ -35,7 +35,7 @@ it("`configFile` option without rules", () => {
   const config = {
     configFile: path.join(__dirname, "fixtures/config-without-rules.json"),
   }
-  return postcssPlugin.process("a {}", config).then(() => {
+  return postcssPlugin.process("a {}", {}, config).then(() => {
     throw new Error("should not have succeeded")
   }).catch(err => {
     expect(err).toEqual(configurationError("No rules found within configuration. Have you provided a \"rules\" property?"))
@@ -47,7 +47,7 @@ it("`configFile` option with undefined rule", () => {
     configFile: path.join(__dirname, "fixtures/config-with-undefined-rule.json"),
   }
   const ruleName = "unknown-rule"
-  return postcssPlugin.process("a {}", config).then(() => {
+  return postcssPlugin.process("a {}", {}, config).then(() => {
     throw new Error("should not have succeeded")
   }).catch(err => {
     expect(err).toEqual(configurationError(`Undefined rule ${ruleName}`))
@@ -62,7 +62,7 @@ it("`ignoreFiles` options is not empty and file ignored", () => {
     ignoreFiles: "**/foo.css",
     from: "foo.css",
   }
-  return postcssPlugin.process("a {}", config).then(postcssResult => {
+  return postcssPlugin.process("a {}", {}, config).then(postcssResult => {
     expect(postcssResult.stylelint.ignored).toBeTruthy()
   })
 })
@@ -75,7 +75,7 @@ it("`ignoreFiles` options is not empty and file not ignored", () => {
     ignoreFiles: "**/bar.css",
     from: "foo.css",
   }
-  return postcssPlugin.process("a {}", config).then(postcssResult => {
+  return postcssPlugin.process("a {}", {}, config).then(postcssResult => {
     expect(postcssResult.stylelint.ignored).toBeFalsy()
   })
 })

lib/rules/block-closing-brace-newline-after/__tests__/index.js

@@ -42,6 +42,9 @@ testRule(rule, {
   }, {
     code: ":root {\n --x { color: pink; };\n --y { color: red; };\n }",
     description: "Allow a trailing semicolon after the closing brace of a block",
+  }, {
+    code: ":root {\n --x { color: pink; } ;\n --y { color: red; };\n }",
+    description: "Allow a spaced trailing semicolon after the closing brace of an at-apply block",
   }, {
     code: ".foo {\n --my-theme: { color: red; };\n --toolbar-theme: { color: green; };\n }",
     description: "Make sure trailing semicolon works well for blocks outside :root",
@@ -83,10 +86,10 @@ testRule(rule, {
     line: 1,
     column: 6,
   }, {
-    code: ":root {\n --x { color: pink; } ;\n --y { color: red; };\n }",
+    code: ":root {\n --x { color: pink; } ; \n --y { color: red; };\n }",
     message: messages.expectedAfter(),
     line: 2,
-    column: 22,
+    column: 24,
   }, {
     code: ":root {\n --x { color: pink; }; \n --y { color: red; };\n }",
     message: messages.expectedAfter(),

lib/rules/no-extra-semicolons/index.js

@@ -1,6 +1,5 @@
 "use strict"
 
-const hasEmptyBlock = require("../../utils/hasEmptyBlock")
 const isCustomPropertySet = require("../../utils/isCustomPropertySet")
 const report = require("../../utils/report")
 const ruleMessages = require("../../utils/ruleMessages")
@@ -59,11 +58,6 @@ const rule = function (actual) {
       if (rawBeforeNode && rawBeforeNode.trim().length !== 0) {
         let allowedSemi = 0
 
-        // Forbid semicolon before first custom properties sets
-        if (isCustomPropertySet(node) && node.parent.index(node) > 0) {
-          allowedSemi = 1
-        }
-
         const next = node.next()
 
         // Ignore semicolon before comment if next node is custom properties sets or comment
@@ -93,18 +87,28 @@ const rule = function (actual) {
       const rawAfterNode = node.raws.after
 
       if (rawAfterNode && rawAfterNode.trim().length !== 0) {
+        styleSearch({ source: rawAfterNode, target: ";" }, (match) => {
+          const index = getOffsetByNode(node) + node.toString().length - 1 - rawAfterNode.length + match.startIndex
+
+          complain(index)
+        })
+      }
+
+      const rawOwnSemicolon = node.raws.ownSemicolon
+
+      if (rawOwnSemicolon) {
         let allowedSemi = 0
 
-        if (!hasEmptyBlock(node) && isCustomPropertySet(node.nodes[node.nodes.length - 1])) {
+        if (isCustomPropertySet(node)) {
           allowedSemi = 1
         }
 
-        styleSearch({ source: rawAfterNode, target: ";" }, (match, count) => {
+        styleSearch({ source: rawOwnSemicolon, target: ";" }, (match, count) => {
           if (count === allowedSemi) {
             return
           }
 
-          const index = getOffsetByNode(node) + node.toString().length - 1 - rawAfterNode.length + match.startIndex
+          const index = getOffsetByNode(node) + node.toString().length - rawOwnSemicolon.length + match.startIndex
           complain(index)
         })
       }

package.json

@@ -36,7 +36,7 @@
     "node": ">=4.2.1"
   },
   "dependencies": {
-    "autoprefixer": "^6.0.0",
+    "autoprefixer": "^7.0.0",
     "balanced-match": "^0.4.0",
     "chalk": "^1.1.1",
     "cosmiconfig": "^2.1.1",
@@ -57,19 +57,19 @@
     "micromatch": "^2.3.11",
     "normalize-selector": "^0.2.0",
     "pify": "^2.3.0",
-    "postcss": "^5.0.20",
+    "postcss": "^6.0.4",
     "postcss-less": "^0.14.0",
     "postcss-media-query-parser": "^0.2.0",
-    "postcss-reporter": "^3.0.0",
+    "postcss-reporter": "^4.0.0",
     "postcss-resolve-nested-selector": "^0.1.1",
-    "postcss-scss": "^0.4.0",
+    "postcss-scss": "^1.0.0",
     "postcss-selector-parser": "^2.1.1",
     "postcss-value-parser": "^3.1.1",
     "resolve-from": "^3.0.0",
     "specificity": "^0.3.0",
     "string-width": "^2.0.0",
     "style-search": "^0.1.0",
-    "sugarss": "^0.2.0",
+    "sugarss": "^1.0.0",
     "svg-tags": "^1.0.0",
     "table": "^4.0.1"
   },
@@ -88,8 +88,8 @@
     "jest": "^20.0.1",
     "npm-run-all": "^4.0.0",
     "npmpub": "^3.0.1",
-    "postcss-import": "^9.0.0",
-    "postcss-safe-parser": "^2.0.0",
+    "postcss-import": "^10.0.0",
+    "postcss-safe-parser": "^3.0.0",
     "remark-cli": "^3.0.0",
     "remark-preset-lint-consistent": "^2.0.0",
     "remark-preset-lint-recommended": "^2.0.0",