postcss 8.5.11 → 8.5.13

package/lib/lazy-result.js

@@ -379,7 +379,10 @@ class LazyResult {
     if (str.stringify) str = str.stringify
 
     let rootSource = this.result.root.source
-    if (opts.map === undefined && !(rootSource && rootSource.input && rootSource.input.map)) {
+    if (
+      opts.map === undefined &&
+      !(rootSource && rootSource.input && rootSource.input.map)
+    ) {
       let result = ''
       str(this.result.root, i => {
         result += i

package/lib/postcss.d.ts

@@ -351,6 +351,11 @@ declare namespace postcss {
      * to generate correct source maps.
      */
     to?: string
+
+    /**
+     * Disable source map file protections.
+     */
+    unsafeMap?: boolean
   }
 
   export type Postcss = typeof postcss

package/lib/previous-map.js

@@ -16,6 +16,7 @@ function fromBase64(str) {
 class PreviousMap {
   constructor(css, opts) {
     if (opts.map === false) return
+    if (opts.unsafeMap) this.unsafeMap = true
     this.loadAnnotation(css)
     this.inline = this.startWith(this.annotation, 'data:')
 
@@ -30,7 +31,7 @@ class PreviousMap {
 
   consumer() {
     if (!this.consumerCache) {
-      this.consumerCache = new SourceMapConsumer(this.text)
+      this.consumerCache = new SourceMapConsumer(this.json || this.text)
     }
     return this.consumerCache
   }
@@ -83,7 +84,13 @@ class PreviousMap {
     }
   }
 
-  loadFile(path) {
+  loadFile(path, cssFile, trusted) {
+    /* c8 ignore next 5 */
+    if (!trusted && !this.unsafeMap) {
+      if (!/\.map$/i.test(path)) {
+        return undefined
+      }
+    }
     this.root = dirname(path)
     if (existsSync(path)) {
       this.mapFile = path
@@ -100,7 +107,7 @@ class PreviousMap {
       } else if (typeof prev === 'function') {
         let prevPath = prev(file)
         if (prevPath) {
-          let map = this.loadFile(prevPath)
+          let map = this.loadFile(prevPath, file, true)
           if (!map) {
             throw new Error(
               'Unable to load previous source map: ' + prevPath.toString()
@@ -124,7 +131,16 @@ class PreviousMap {
     } else if (this.annotation) {
       let map = this.annotation
       if (file) map = join(dirname(file), map)
-      return this.loadFile(map)
+      let unknown = this.loadFile(map, file, false)
+      if (unknown) {
+        try {
+          /* c8 ignore next 4 */
+          this.json = JSON.parse(unknown.replace(/^\)]}'[^\n]*\n/, ''))
+        } catch {
+          return undefined
+        }
+      }
+      return unknown
     }
   }
 

package/lib/processor.js

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

package/lib/stringifier.js

@@ -86,21 +86,22 @@ class Stringifier {
 
   block(node, start) {
     let raws = node.raws
-    let between = typeof raws.between !== 'undefined'
-      ? raws.between
-      : this.raw(node, 'between', 'beforeOpen')
+    let between =
+      typeof raws.between !== 'undefined'
+        ? raws.between
+        : this.raw(node, 'between', 'beforeOpen')
     this.builder(escapeHTMLInCSS(start + between) + '{', node, 'start')
 
     let after
     if (node.nodes && node.nodes.length) {
       this.body(node)
-      after = typeof raws.after !== 'undefined'
-        ? raws.after
-        : this.raw(node, 'after')
+      after =
+        typeof raws.after !== 'undefined' ? raws.after : this.raw(node, 'after')
     } else {
-      after = typeof raws.after !== 'undefined'
-        ? raws.after
-        : this.raw(node, 'after', 'emptyBody')
+      after =
+        typeof raws.after !== 'undefined'
+          ? raws.after
+          : this.raw(node, 'after', 'emptyBody')
     }
 
     if (after) this.builder(escapeHTMLInCSS(after))
@@ -130,25 +131,25 @@ class Stringifier {
 
   comment(node) {
     let raws = node.raws
-    let left = typeof raws.left !== 'undefined'
-      ? raws.left
-      : this.raw(node, 'left', 'commentLeft')
-    let right = typeof raws.right !== 'undefined'
-      ? raws.right
-      : this.raw(node, 'right', 'commentRight')
+    let left =
+      typeof raws.left !== 'undefined'
+        ? raws.left
+        : this.raw(node, 'left', 'commentLeft')
+    let right =
+      typeof raws.right !== 'undefined'
+        ? raws.right
+        : this.raw(node, 'right', 'commentRight')
     this.builder(escapeHTMLInCSS('/*' + left + node.text + right + '*/'), node)
   }
 
   decl(node, semicolon) {
     let raws = node.raws
-    let between = typeof raws.between !== 'undefined'
-      ? raws.between
-      : this.raw(node, 'between', 'colon')
+    let between =
+      typeof raws.between !== 'undefined'
+        ? raws.between
+        : this.raw(node, 'between', 'colon')
 
-    let rawVal = raws.value
-    let value = rawVal && rawVal.value === node.value ? rawVal.raw : node.value
-
-    let string = node.prop + between + value
+    let string = node.prop + between + this.rawValue(node, 'value')
 
     if (node.important) {
       string += raws.important || ' !important'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss",
-  "version": "8.5.11",
+  "version": "8.5.13",
   "description": "Tool for transforming styles with JS plugins",
   "keywords": [
     "css",