autoprefixer 10.5.0 → 10.5.1

package/README.md

@@ -51,6 +51,3 @@ Twitter account for news and releases: [@autoprefixer].
 [cult-img]: https://cultofmartians.com/assets/badges/badge.svg
 [PostCSS]: https://github.com/postcss/postcss
 [cult]: https://cultofmartians.com/tasks/autoprefixer-grid.html
-
-## Docs
-Read full docs **[here](https://github.com/postcss/autoprefixer#readme)**.

package/lib/hacks/grid-utils.js

@@ -358,6 +358,30 @@ function selectorsEqual(ruleA, ruleB) {
   })
 }
 
+function selectorStartsWith(base, selector) {
+  if (!selector.startsWith(base)) {
+    return false
+  }
+
+  let next = selector[base.length]
+  return !next || /[\s.#[:>+~]/.test(next)
+}
+
+function selectorMayOverlap(previous, current) {
+  let base = previous.replace(/\s*\*\s*/g, ' ').replace(/\s+/g, ' ').trim()
+  let selector = current.replace(/\s+/g, ' ').trim()
+
+  return !base || selectorStartsWith(base, selector)
+}
+
+function selectorsMayOverlap(previous, current) {
+  return previous.some(previousSelector => {
+    return current.some(currentSelector => {
+      return selectorMayOverlap(previousSelector, currentSelector)
+    })
+  })
+}
+
 /**
  * Parse data from all grid-template(-areas) declarations
  * @param  {Root} css css root
@@ -483,6 +507,7 @@ function insertAreas(css, isDisabled) {
 
   // we need to store the rules that we will insert later
   let rulesToInsert = {}
+  let previousGridAreas = []
 
   css.walkDecls('grid-area', gridArea => {
     let gridAreaRule = gridArea.parent
@@ -515,6 +540,20 @@ function insertAreas(css, isDisabled) {
       return false
     }
 
+    function shouldResetSpan(rule, area, dimension) {
+      return previousGridAreas.some(previous => {
+        if (previous.data !== data) {
+          return false
+        }
+        if (!selectorsMayOverlap(previous.selectors, gridAreaRule.selectors)) {
+          return false
+        }
+
+        let previousArea = rule.areas[previous.value]
+        return previousArea && previousArea[dimension].span > area[dimension].span
+      })
+    }
+
     // create the empty object with the key as the last area name
     // e.g if we have templates with "a b c" values, "c" will be the last area
     if (!rulesToInsert[lastArea]) {
@@ -553,8 +592,10 @@ function insertAreas(css, isDisabled) {
 
       if ((!rule.hasDuplicates || !hasDuplicateName) && !rule.params) {
         // grid-template has no duplicates and not inside media rule
+        let addRowSpan = shouldResetSpan(rule, area, 'row')
+        let addColumnSpan = shouldResetSpan(rule, area, 'column')
 
-        getMSDecls(area, false, false)
+        getMSDecls(area, addRowSpan, addColumnSpan)
           .reverse()
           .forEach(i =>
             gridAreaRule.prepend(
@@ -572,8 +613,11 @@ function insertAreas(css, isDisabled) {
         // grid-template has duplicates and not inside media rule
         let cloned = gridAreaRule.clone()
         cloned.removeAll()
+        let addRowSpan = area.row.updateSpan || shouldResetSpan(rule, area, 'row')
+        let addColumnSpan =
+          area.column.updateSpan || shouldResetSpan(rule, area, 'column')
 
-        getMSDecls(area, area.row.updateSpan, area.column.updateSpan)
+        getMSDecls(area, addRowSpan, addColumnSpan)
           .reverse()
           .forEach(i =>
             cloned.prepend(
@@ -604,7 +648,11 @@ function insertAreas(css, isDisabled) {
         // grid-template has duplicates and not inside media rule
         // and the selector is complex
         gridAreaRule.walkDecls(/-ms-grid-(row|column)/, d => d.remove())
-        getMSDecls(area, area.row.updateSpan, area.column.updateSpan)
+        let addRowSpan = area.row.updateSpan || shouldResetSpan(rule, area, 'row')
+        let addColumnSpan =
+          area.column.updateSpan || shouldResetSpan(rule, area, 'column')
+
+        getMSDecls(area, addRowSpan, addColumnSpan)
           .reverse()
           .forEach(i =>
             gridAreaRule.prepend(
@@ -622,8 +670,11 @@ function insertAreas(css, isDisabled) {
         // rules and merge them easily
         let cloned = gridAreaRule.clone()
         cloned.removeAll()
+        let addRowSpan = area.row.updateSpan || shouldResetSpan(rule, area, 'row')
+        let addColumnSpan =
+          area.column.updateSpan || shouldResetSpan(rule, area, 'column')
 
-        getMSDecls(area, area.row.updateSpan, area.column.updateSpan)
+        getMSDecls(area, addRowSpan, addColumnSpan)
           .reverse()
           .forEach(i =>
             cloned.prepend(
@@ -661,6 +712,12 @@ function insertAreas(css, isDisabled) {
       }
     }
 
+    previousGridAreas.push({
+      data,
+      selectors: gridAreaRule.selectors,
+      value
+    })
+
     return undefined
   })
 

package/lib/supports.js

@@ -211,7 +211,8 @@ class Supports {
     let browsers = new Browsers(
       this.all.browsers.data,
       filtered,
-      this.all.options
+      this.all.options,
+      this.all.browsers.browserslistOpts
     )
     this.prefixerCache = new this.Prefixes(
       this.all.data,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autoprefixer",
-  "version": "10.5.0",
+  "version": "10.5.1",
   "description": "Parse CSS and add vendor prefixes to CSS rules using values from the Can I Use website",
   "keywords": [
     "autoprefixer",
@@ -33,8 +33,8 @@
   "main": "lib/autoprefixer.js",
   "types": "lib/autoprefixer.d.ts",
   "dependencies": {
-    "browserslist": "^4.28.2",
-    "caniuse-lite": "^1.0.30001787",
+    "browserslist": "^4.28.4",
+    "caniuse-lite": "^1.0.30001799",
     "fraction.js": "^5.3.4",
     "picocolors": "^1.1.1",
     "postcss-value-parser": "^4.2.0"