autoprefixer 10.4.13 → 10.4.15

package/lib/hacks/grid-rows-columns.js

@@ -1,31 +1,14 @@
 let Declaration = require('../declaration')
 let {
-  prefixTrackProp,
-  prefixTrackValue,
   autoplaceGridItems,
   getGridGap,
-  inheritGridGap
+  inheritGridGap,
+  prefixTrackProp,
+  prefixTrackValue
 } = require('./grid-utils')
 let Processor = require('../processor')
 
 class GridRowsColumns extends Declaration {
-  /**
-   * Change property name for IE
-   */
-  prefixed(prop, prefix) {
-    if (prefix === '-ms-') {
-      return prefixTrackProp({ prop, prefix })
-    }
-    return super.prefixed(prop, prefix)
-  }
-
-  /**
-   * Change IE property back
-   */
-  normalize(prop) {
-    return prop.replace(/^grid-(rows|columns)/, 'grid-template-$1')
-  }
-
   insert(decl, prefix, prefixes, result) {
     if (prefix !== '-ms-') return super.insert(decl, prefix, prefixes)
 
@@ -56,15 +39,15 @@ class GridRowsColumns extends Declaration {
     }
 
     let prefixValue = prefixTrackValue({
-      value,
-      gap: gapValue
+      gap: gapValue,
+      value
     })
 
     /**
      * Insert prefixes
      */
     decl.cloneBefore({
-      prop: prefixTrackProp({ prop, prefix }),
+      prop: prefixTrackProp({ prefix, prop }),
       value: prefixValue
     })
 
@@ -113,6 +96,23 @@ class GridRowsColumns extends Declaration {
 
     return undefined
   }
+
+  /**
+   * Change IE property back
+   */
+  normalize(prop) {
+    return prop.replace(/^grid-(rows|columns)/, 'grid-template-$1')
+  }
+
+  /**
+   * Change property name for IE
+   */
+  prefixed(prop, prefix) {
+    if (prefix === '-ms-') {
+      return prefixTrackProp({ prefix, prop })
+    }
+    return super.prefixed(prop, prefix)
+  }
 }
 
 GridRowsColumns.names = [

package/lib/hacks/grid-template-areas.js

@@ -1,12 +1,12 @@
 let Declaration = require('../declaration')
 let {
+  getGridGap,
+  inheritGridGap,
   parseGridAreas,
-  warnMissedAreas,
   prefixTrackProp,
   prefixTrackValue,
-  getGridGap,
   warnGridGap,
-  inheritGridGap
+  warnMissedAreas
 } = require('./grid-utils')
 
 function getGridRows(tpl) {
@@ -39,8 +39,8 @@ class GridTemplateAreas extends Declaration {
         hasRows = true
         let { prop, value } = trackDecl
         trackDecl.cloneBefore({
-          prop: prefixTrackProp({ prop, prefix }),
-          value: prefixTrackValue({ value, gap: gap.row })
+          prop: prefixTrackProp({ prefix, prop }),
+          value: prefixTrackValue({ gap: gap.row, value })
         })
       } else {
         hasColumns = true
@@ -52,25 +52,25 @@ class GridTemplateAreas extends Declaration {
     if (hasColumns && !hasRows && gap.row && gridRows.length > 1) {
       decl.cloneBefore({
         prop: '-ms-grid-rows',
+        raws: {},
         value: prefixTrackValue({
-          value: `repeat(${gridRows.length}, auto)`,
-          gap: gap.row
-        }),
-        raws: {}
+          gap: gap.row,
+          value: `repeat(${gridRows.length}, auto)`
+        })
       })
     }
 
     // warnings
     warnGridGap({
+      decl,
       gap,
       hasColumns,
-      decl,
       result
     })
 
     let areas = parseGridAreas({
-      rows: gridRows,
-      gap
+      gap,
+      rows: gridRows
     })
 
     warnMissedAreas(areas, decl, result)

package/lib/hacks/grid-template.js

@@ -1,10 +1,10 @@
 let Declaration = require('../declaration')
 let {
-  parseTemplate,
-  warnMissedAreas,
   getGridGap,
+  inheritGridGap,
+  parseTemplate,
   warnGridGap,
-  inheritGridGap
+  warnMissedAreas
 } = require('./grid-utils')
 
 class GridTemplate extends Declaration {
@@ -26,7 +26,7 @@ class GridTemplate extends Declaration {
      */
     let inheritedGap = inheritGridGap(decl, gap)
 
-    let { rows, columns, areas } = parseTemplate({
+    let { areas, columns, rows } = parseTemplate({
       decl,
       gap: inheritedGap || gap
     })
@@ -36,9 +36,9 @@ class GridTemplate extends Declaration {
     let hasColumns = Boolean(columns)
 
     warnGridGap({
+      decl,
       gap,
       hasColumns,
-      decl,
       result
     })
 
@@ -47,16 +47,16 @@ class GridTemplate extends Declaration {
     if ((hasRows && hasColumns) || hasAreas) {
       decl.cloneBefore({
         prop: '-ms-grid-rows',
-        value: rows,
-        raws: {}
+        raws: {},
+        value: rows
       })
     }
 
     if (hasColumns) {
       decl.cloneBefore({
         prop: '-ms-grid-columns',
-        value: columns,
-        raws: {}
+        raws: {},
+        value: columns
       })
     }
 

package/lib/hacks/grid-utils.js

@@ -90,7 +90,7 @@ function insertDecl(decl, prop, value) {
 
 exports.prefixTrackProp = prefixTrackProp
 
-function prefixTrackProp({ prop, prefix }) {
+function prefixTrackProp({ prefix, prop }) {
   return prefix + prop.replace('template-', '')
 }
 
@@ -105,9 +105,9 @@ function transformRepeat({ nodes }, { gap }) {
       return result
     },
     {
+      count: [],
       key: 'count',
-      size: [],
-      count: []
+      size: []
     }
   )
 
@@ -132,7 +132,7 @@ function transformRepeat({ nodes }, { gap }) {
 
 exports.prefixTrackValue = prefixTrackValue
 
-function prefixTrackValue({ value, gap }) {
+function prefixTrackValue({ gap, value }) {
   let result = parser(value).nodes.reduce((nodes, node) => {
     if (node.type === 'function' && node.value === 'repeat') {
       return nodes.concat({
@@ -164,7 +164,7 @@ function prefixTrackValue({ value, gap }) {
 let DOTS = /^\.+$/
 
 function track(start, end) {
-  return { start, end, span: end - start }
+  return { end, span: end - start, start }
 }
 
 function getColumns(line) {
@@ -173,7 +173,7 @@ function getColumns(line) {
 
 exports.parseGridAreas = parseGridAreas
 
-function parseGridAreas({ rows, gap }) {
+function parseGridAreas({ gap, rows }) {
   return rows.reduce((areas, line, rowIndex) => {
     if (gap.row) rowIndex *= 2
 
@@ -248,25 +248,25 @@ function parseTemplate({ decl, gap }) {
       return result
     },
     {
-      key: 'rows',
+      areas: [],
       columns: [],
-      rows: [],
-      areas: []
+      key: 'rows',
+      rows: []
     }
   )
 
   return {
     areas: parseGridAreas({
-      rows: gridTemplate.areas,
-      gap
+      gap,
+      rows: gridTemplate.areas
     }),
     columns: prefixTrackValue({
-      value: gridTemplate.columns.join(' '),
-      gap: gap.column
+      gap: gap.column,
+      value: gridTemplate.columns.join(' ')
     }),
     rows: prefixTrackValue({
-      value: gridTemplate.rows.join(' '),
-      gap: gap.row
+      gap: gap.row,
+      value: gridTemplate.rows.join(' ')
     })
   }
 }
@@ -429,12 +429,12 @@ function parseGridTemplatesData(css) {
 
       parsed[index].allAreas = uniq([...allAreas, ...areaNames])
       parsed[index].rules.push({
+        areas,
+        duplicateAreaNames,
         hasDuplicates: !hasNoDuplicates,
-        params: media.params,
-        selectors: rule.selectors,
         node: rule,
-        duplicateAreaNames,
-        areas
+        params: media.params,
+        selectors: rule.selectors
       })
     } else {
       // index is NOT found, push the new item to the parsed array
@@ -443,13 +443,13 @@ function parseGridTemplatesData(css) {
         areasCount: 0,
         rules: [
           {
-            hasDuplicates: false,
+            areas,
+            duplicateAreaNames: [],
             duplicateRules: [],
-            params: media.params,
-            selectors: rule.selectors,
+            hasDuplicates: false,
             node: rule,
-            duplicateAreaNames: [],
-            areas
+            params: media.params,
+            selectors: rule.selectors
           }
         ]
       })
@@ -993,7 +993,7 @@ function inheritGridGap(decl, gap) {
 
 exports.warnGridGap = warnGridGap
 
-function warnGridGap({ gap, hasColumns, decl, result }) {
+function warnGridGap({ decl, gap, hasColumns, result }) {
   let hasBothGaps = gap.row && gap.column
   if (!hasColumns && (hasBothGaps || (gap.column && !gap.row))) {
     delete gap.column
@@ -1079,7 +1079,7 @@ function autoplaceGridItems(decl, result, gap, autoflowValue = 'row') {
     ).join(' ')
   })
 
-  let areas = parseGridAreas({ rows: filledRows, gap })
+  let areas = parseGridAreas({ gap, rows: filledRows })
   let keys = Object.keys(areas)
   let items = keys.map(i => areas[i])
 

package/lib/hacks/image-rendering.js

@@ -8,6 +8,13 @@ class ImageRendering extends Declaration {
     return decl.value === 'pixelated'
   }
 
+  /**
+   * Return property name by spec
+   */
+  normalize() {
+    return 'image-rendering'
+  }
+
   /**
    * Change property name for IE
    */
@@ -18,6 +25,13 @@ class ImageRendering extends Declaration {
     return super.prefixed(prop, prefix)
   }
 
+  /**
+   * Warn on old value
+   */
+  process(node, result) {
+    return super.process(node, result)
+  }
+
   /**
    * Change property and value for IE
    */
@@ -27,20 +41,6 @@ class ImageRendering extends Declaration {
     decl.value = 'nearest-neighbor'
     return decl
   }
-
-  /**
-   * Return property name by spec
-   */
-  normalize() {
-    return 'image-rendering'
-  }
-
-  /**
-   * Warn on old value
-   */
-  process(node, result) {
-    return super.process(node, result)
-  }
 }
 
 ImageRendering.names = ['image-rendering', 'interpolation-mode']

package/lib/hacks/inline-logical.js

@@ -2,17 +2,17 @@ let Declaration = require('../declaration')
 
 class InlineLogical extends Declaration {
   /**
-   * Use old syntax for -moz- and -webkit-
+   * Return property name by spec
    */
-  prefixed(prop, prefix) {
-    return prefix + prop.replace('-inline', '')
+  normalize(prop) {
+    return prop.replace(/(margin|padding|border)-(start|end)/, '$1-inline-$2')
   }
 
   /**
-   * Return property name by spec
+   * Use old syntax for -moz- and -webkit-
    */
-  normalize(prop) {
-    return prop.replace(/(margin|padding|border)-(start|end)/, '$1-inline-$2')
+  prefixed(prop, prefix) {
+    return prefix + prop.replace('-inline', '')
   }
 }
 

package/lib/hacks/intrinsic.js

@@ -6,9 +6,11 @@ function regexp(name) {
 }
 
 class Intrinsic extends Value {
-  regexp() {
-    if (!this.regexpCache) this.regexpCache = regexp(this.name)
-    return this.regexpCache
+  add(decl, prefix) {
+    if (decl.prop.includes('grid') && prefix !== '-webkit-') {
+      return undefined
+    }
+    return super.add(decl, prefix)
   }
 
   isStretch() {
@@ -19,16 +21,6 @@ class Intrinsic extends Value {
     )
   }
 
-  replace(string, prefix) {
-    if (prefix === '-moz-' && this.isStretch()) {
-      return string.replace(this.regexp(), '$1-moz-available$3')
-    }
-    if (prefix === '-webkit-' && this.isStretch()) {
-      return string.replace(this.regexp(), '$1-webkit-fill-available$3')
-    }
-    return super.replace(string, prefix)
-  }
-
   old(prefix) {
     let prefixed = prefix + this.name
     if (this.isStretch()) {
@@ -41,11 +33,19 @@ class Intrinsic extends Value {
     return new OldValue(this.name, prefixed, prefixed, regexp(prefixed))
   }
 
-  add(decl, prefix) {
-    if (decl.prop.includes('grid') && prefix !== '-webkit-') {
-      return undefined
+  regexp() {
+    if (!this.regexpCache) this.regexpCache = regexp(this.name)
+    return this.regexpCache
+  }
+
+  replace(string, prefix) {
+    if (prefix === '-moz-' && this.isStretch()) {
+      return string.replace(this.regexp(), '$1-moz-available$3')
     }
-    return super.add(decl, prefix)
+    if (prefix === '-webkit-' && this.isStretch()) {
+      return string.replace(this.regexp(), '$1-webkit-fill-available$3')
+    }
+    return super.replace(string, prefix)
   }
 }
 

package/lib/hacks/justify-content.js

@@ -2,6 +2,13 @@ let flexSpec = require('./flex-spec')
 let Declaration = require('../declaration')
 
 class JustifyContent extends Declaration {
+  /**
+   * Return property name by final spec
+   */
+  normalize() {
+    return 'justify-content'
+  }
+
   /**
    * Change property name for 2009 and 2012 specs
    */
@@ -17,13 +24,6 @@ class JustifyContent extends Declaration {
     return super.prefixed(prop, prefix)
   }
 
-  /**
-   * Return property name by final spec
-   */
-  normalize() {
-    return 'justify-content'
-  }
-
   /**
    * Change value for 2009 and 2012 specs
    */
@@ -47,8 +47,8 @@ JustifyContent.names = ['justify-content', 'flex-pack', 'box-pack']
 JustifyContent.oldValues = {
   'flex-end': 'end',
   'flex-start': 'start',
-  'space-between': 'justify',
-  'space-around': 'distribute'
+  'space-around': 'distribute',
+  'space-between': 'justify'
 }
 
 module.exports = JustifyContent

package/lib/hacks/mask-composite.js

@@ -73,9 +73,9 @@ MaskComposite.names = ['mask', 'mask-composite']
 
 MaskComposite.oldValues = {
   add: 'source-over',
-  subtract: 'source-out',
+  exclude: 'xor',
   intersect: 'source-in',
-  exclude: 'xor'
+  subtract: 'source-out'
 }
 
 MaskComposite.regexp = new RegExp(

package/lib/hacks/order.js

@@ -2,6 +2,13 @@ let flexSpec = require('./flex-spec')
 let Declaration = require('../declaration')
 
 class Order extends Declaration {
+  /**
+   * Return property name by final spec
+   */
+  normalize() {
+    return 'order'
+  }
+
   /**
    * Change property name for 2009 and 2012 specs
    */
@@ -17,13 +24,6 @@ class Order extends Declaration {
     return super.prefixed(prop, prefix)
   }
 
-  /**
-   * Return property name by final spec
-   */
-  normalize() {
-    return 'order'
-  }
-
   /**
    * Fix value for 2009 spec
    */

package/lib/hacks/overscroll-behavior.js

@@ -2,17 +2,17 @@ let Declaration = require('../declaration')
 
 class OverscrollBehavior extends Declaration {
   /**
-   * Change property name for IE
+   * Return property name by spec
    */
-  prefixed(prop, prefix) {
-    return prefix + 'scroll-chaining'
+  normalize() {
+    return 'overscroll-behavior'
   }
 
   /**
-   * Return property name by spec
+   * Change property name for IE
    */
-  normalize() {
-    return 'overscroll-behavior'
+  prefixed(prop, prefix) {
+    return prefix + 'scroll-chaining'
   }
 
   /**

package/lib/hacks/pixelated.js

@@ -3,29 +3,29 @@ let Value = require('../value')
 
 class Pixelated extends Value {
   /**
-   * Use non-standard name for WebKit and Firefox
+   * Different name for WebKit and Firefox
    */
-  replace(string, prefix) {
+  old(prefix) {
     if (prefix === '-webkit-') {
-      return string.replace(this.regexp(), '$1-webkit-optimize-contrast')
+      return new OldValue(this.name, '-webkit-optimize-contrast')
     }
     if (prefix === '-moz-') {
-      return string.replace(this.regexp(), '$1-moz-crisp-edges')
+      return new OldValue(this.name, '-moz-crisp-edges')
     }
-    return super.replace(string, prefix)
+    return super.old(prefix)
   }
 
   /**
-   * Different name for WebKit and Firefox
+   * Use non-standard name for WebKit and Firefox
    */
-  old(prefix) {
+  replace(string, prefix) {
     if (prefix === '-webkit-') {
-      return new OldValue(this.name, '-webkit-optimize-contrast')
+      return string.replace(this.regexp(), '$1-webkit-optimize-contrast')
     }
     if (prefix === '-moz-') {
-      return new OldValue(this.name, '-moz-crisp-edges')
+      return string.replace(this.regexp(), '$1-moz-crisp-edges')
     }
-    return super.old(prefix)
+    return super.replace(string, prefix)
   }
 }
 

package/lib/hacks/print-color-adjust.js

@@ -1,6 +1,13 @@
 let Declaration = require('../declaration')
 
 class PrintColorAdjust extends Declaration {
+  /**
+   * Return property name by spec
+   */
+  normalize() {
+    return 'print-color-adjust'
+  }
+
   /**
    * Change property name for WebKit-based browsers
    */
@@ -11,13 +18,6 @@ class PrintColorAdjust extends Declaration {
       return prefix + 'print-color-adjust'
     }
   }
-
-  /**
-   * Return property name by spec
-   */
-  normalize() {
-    return 'print-color-adjust'
-  }
 }
 
 PrintColorAdjust.names = ['print-color-adjust', 'color-adjust']