postcss 8.4.6 → 8.4.9

package/lib/node.d.ts

@@ -3,7 +3,7 @@ import Comment, { CommentProps } from './comment.js'
 import { Stringifier, Syntax } from './postcss.js'
 import AtRule, { AtRuleProps } from './at-rule.js'
 import Rule, { RuleProps } from './rule.js'
-import { WarningOptions } from './warning.js'
+import Warning, { WarningOptions } from './warning.js'
 import CssSyntaxError from './css-syntax-error.js'
 import Result from './result.js'
 import Input from './input.js'
@@ -241,7 +241,7 @@ export default abstract class Node {
    *
    * @return Created warning object.
    */
-  warn(result: Result, text: string, opts?: WarningOptions): void
+  warn(result: Result, text: string, opts?: WarningOptions): Warning
 
   /**
    * Removes the node from its parent and cleans the parent properties

package/lib/parser.js

@@ -7,6 +7,19 @@ let AtRule = require('./at-rule')
 let Root = require('./root')
 let Rule = require('./rule')
 
+const SAFE_COMMENT_NEIGHBOR = {
+  empty: true,
+  space: true
+}
+
+function findLastWithPosition(tokens) {
+  for (let i = tokens.length - 1; i >= 0; i--) {
+    let token = tokens[i]
+    let pos = token[3] || token[2]
+    if (pos) return pos
+  }
+}
+
 class Parser {
   constructor(input) {
     this.input = input
@@ -172,7 +185,10 @@ class Parser {
       this.semicolon = true
       tokens.pop()
     }
-    node.source.end = this.getPosition(last[3] || last[2])
+
+    node.source.end = this.getPosition(
+      last[3] || last[2] || findLastWithPosition(tokens)
+    )
 
     while (tokens[0][0] !== 'word') {
       if (tokens.length === 1) this.unknownWord(tokens)
@@ -418,10 +434,14 @@ class Parser {
       if (type === 'space' && i === length - 1 && !customProperty) {
         clean = false
       } else if (type === 'comment') {
-        prev = tokens[i - 1]
-        next = tokens[i + 1]
-        if (prev && next && prev[0] !== 'space' && next[0] !== 'space') {
-          value += token[1]
+        prev = tokens[i - 1] ? tokens[i - 1][0] : 'empty'
+        next = tokens[i + 1] ? tokens[i + 1][0] : 'empty'
+        if (!SAFE_COMMENT_NEIGHBOR[prev] && !SAFE_COMMENT_NEIGHBOR[next]) {
+          if (value.slice(-1) === ',') {
+            clean = false
+          } else {
+            value += token[1]
+          }
         } else {
           clean = false
         }

package/lib/processor.js

@@ -7,7 +7,7 @@ let Root = require('./root')
 
 class Processor {
   constructor(plugins = []) {
-    this.version = '8.4.6'
+    this.version = '8.4.9'
     this.plugins = this.normalize(plugins)
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss",
-  "version": "8.4.6",
+  "version": "8.4.9",
   "description": "Tool for transforming styles with JS plugins",
   "engines": {
     "node": "^10 || ^12 || >=14"
@@ -53,10 +53,16 @@
     "manipulation",
     "transpiler"
   ],
-  "funding": {
-    "type": "opencollective",
-    "url": "https://opencollective.com/postcss/"
-  },
+  "funding": [
+    {
+      "type": "opencollective",
+      "url": "https://opencollective.com/postcss/"
+    },
+    {
+      "type": "tidelift",
+      "url": "https://tidelift.com/funding/github/npm/postcss"
+    }
+  ],
   "author": "Andrey Sitnik <andrey@sitnik.ru>",
   "license": "MIT",
   "homepage": "https://postcss.org/",
@@ -65,7 +71,7 @@
     "url": "https://github.com/postcss/postcss/issues"
   },
   "dependencies": {
-    "nanoid": "^3.2.0",
+    "nanoid": "^3.3.1",
     "picocolors": "^1.0.0",
     "source-map-js": "^1.0.2"
   },