autoprefixer 10.4.13 → 10.4.15

package/lib/autoprefixer.js

@@ -1,5 +1,5 @@
 let browserslist = require('browserslist')
-let { agents } = require('caniuse-lite')
+let { agents } = require('caniuse-lite/dist/unpacker/agents')
 let pico = require('picocolors')
 
 let Browsers = require('./browsers')
@@ -96,9 +96,9 @@ function plugin(...reqs) {
   }
 
   let brwlstOpts = {
+    env: options.env,
     ignoreUnknownVersions: options.ignoreUnknownVersions,
-    stats: options.stats,
-    env: options.env
+    stats: options.stats
   }
 
   function loadPrefixes(opts) {
@@ -114,12 +114,21 @@ function plugin(...reqs) {
   }
 
   return {
-    postcssPlugin: 'autoprefixer',
+    browsers: reqs,
+
+    info(opts) {
+      opts = opts || {}
+      opts.from = opts.from || process.cwd()
+      return getInfo(loadPrefixes(opts))
+    },
 
+    options,
+
+    postcssPlugin: 'autoprefixer',
     prepare(result) {
       let prefixes = loadPrefixes({
-        from: result.opts.from,
-        env: options.env
+        env: options.env,
+        from: result.opts.from
       })
 
       return {
@@ -133,16 +142,7 @@ function plugin(...reqs) {
           }
         }
       }
-    },
-
-    info(opts) {
-      opts = opts || {}
-      opts.from = opts.from || process.cwd()
-      return getInfo(loadPrefixes(opts))
-    },
-
-    options,
-    browsers: reqs
+    }
   }
 }
 

package/lib/browsers.js

@@ -1,9 +1,16 @@
 let browserslist = require('browserslist')
-let agents = require('caniuse-lite').agents
+let { agents } = require('caniuse-lite/dist/unpacker/agents')
 
 let utils = require('./utils')
 
 class Browsers {
+  constructor(data, requirements, options, browserslistOpts) {
+    this.data = data
+    this.options = options || {}
+    this.browserslistOpts = browserslistOpts || {}
+    this.selected = this.parse(requirements)
+  }
+
   /**
    * Return all prefixes for default browser data
    */
@@ -35,11 +42,11 @@ class Browsers {
     return this.prefixesRegexp.test(value)
   }
 
-  constructor(data, requirements, options, browserslistOpts) {
-    this.data = data
-    this.options = options || {}
-    this.browserslistOpts = browserslistOpts || {}
-    this.selected = this.parse(requirements)
+  /**
+   * Is browser is selected by requirements
+   */
+  isSelected(browser) {
+    return this.selected.includes(browser)
   }
 
   /**
@@ -67,13 +74,6 @@ class Browsers {
     }
     return `-${prefix}-`
   }
-
-  /**
-   * Is browser is selected by requirements
-   */
-  isSelected(browser) {
-    return this.selected.includes(browser)
-  }
 }
 
 module.exports = Browsers

package/lib/declaration.js

@@ -4,58 +4,70 @@ let utils = require('./utils')
 
 class Declaration extends Prefixer {
   /**
-   * Always true, because we already get prefixer by property name
+   * Clone and add prefixes for declaration
    */
-  check(/* decl */) {
-    return true
+  add(decl, prefix, prefixes, result) {
+    let prefixed = this.prefixed(decl.prop, prefix)
+    if (
+      this.isAlready(decl, prefixed) ||
+      this.otherPrefixes(decl.value, prefix)
+    ) {
+      return undefined
+    }
+    return this.insert(decl, prefix, prefixes, result)
   }
 
   /**
-   * Return prefixed version of property
+   * Calculate indentation to create visual cascade
    */
-  prefixed(prop, prefix) {
-    return prefix + prop
+  calcBefore(prefixes, decl, prefix = '') {
+    let max = this.maxPrefixed(prefixes, decl)
+    let diff = max - utils.removeNote(prefix).length
+
+    let before = decl.raw('before')
+    if (diff > 0) {
+      before += Array(diff).fill(' ').join('')
+    }
+
+    return before
   }
 
   /**
-   * Return unprefixed version of property
+   * Always true, because we already get prefixer by property name
    */
-  normalize(prop) {
-    return prop
+  check(/* decl */) {
+    return true
   }
 
   /**
-   * Check `value`, that it contain other prefixes, rather than `prefix`
+   * Clone and insert new declaration
    */
-  otherPrefixes(value, prefix) {
-    for (let other of Browsers.prefixes()) {
-      if (other === prefix) {
-        continue
-      }
-      if (value.includes(other)) {
-        return value.replace(/var\([^)]+\)/, '').includes(other)
-      }
+  insert(decl, prefix, prefixes) {
+    let cloned = this.set(this.clone(decl), prefix)
+    if (!cloned) return undefined
+
+    let already = decl.parent.some(
+      i => i.prop === cloned.prop && i.value === cloned.value
+    )
+    if (already) {
+      return undefined
     }
-    return false
-  }
 
-  /**
-   * Set prefix to declaration
-   */
-  set(decl, prefix) {
-    decl.prop = this.prefixed(decl.prop, prefix)
-    return decl
+    if (this.needCascade(decl)) {
+      cloned.raws.before = this.calcBefore(prefixes, decl, prefix)
+    }
+    return decl.parent.insertBefore(decl, cloned)
   }
 
   /**
-   * Should we use visual cascade for prefixes
+   * Did this declaration has this prefix above
    */
-  needCascade(decl) {
-    if (!decl._autoprefixerCascade) {
-      decl._autoprefixerCascade =
-        this.all.options.cascade !== false && decl.raw('before').includes('\n')
+  isAlready(decl, prefixed) {
+    let already = this.all.group(decl).up(i => i.prop === prefixed)
+    if (!already) {
+      already = this.all.group(decl).down(i => i.prop === prefixed)
     }
-    return decl._autoprefixerCascade
+    return already
   }
 
   /**
@@ -79,82 +91,50 @@ class Declaration extends Prefixer {
   }
 
   /**
-   * Calculate indentation to create visual cascade
+   * Should we use visual cascade for prefixes
    */
-  calcBefore(prefixes, decl, prefix = '') {
-    let max = this.maxPrefixed(prefixes, decl)
-    let diff = max - utils.removeNote(prefix).length
-
-    let before = decl.raw('before')
-    if (diff > 0) {
-      before += Array(diff).fill(' ').join('')
+  needCascade(decl) {
+    if (!decl._autoprefixerCascade) {
+      decl._autoprefixerCascade =
+        this.all.options.cascade !== false && decl.raw('before').includes('\n')
     }
-
-    return before
+    return decl._autoprefixerCascade
   }
 
   /**
-   * Remove visual cascade
+   * Return unprefixed version of property
    */
-  restoreBefore(decl) {
-    let lines = decl.raw('before').split('\n')
-    let min = lines[lines.length - 1]
-
-    this.all.group(decl).up(prefixed => {
-      let array = prefixed.raw('before').split('\n')
-      let last = array[array.length - 1]
-      if (last.length < min.length) {
-        min = last
-      }
-    })
-
-    lines[lines.length - 1] = min
-    decl.raws.before = lines.join('\n')
+  normalize(prop) {
+    return prop
   }
 
   /**
-   * Clone and insert new declaration
+   * Return list of prefixed properties to clean old prefixes
    */
-  insert(decl, prefix, prefixes) {
-    let cloned = this.set(this.clone(decl), prefix)
-    if (!cloned) return undefined
-
-    let already = decl.parent.some(
-      i => i.prop === cloned.prop && i.value === cloned.value
-    )
-    if (already) {
-      return undefined
-    }
-
-    if (this.needCascade(decl)) {
-      cloned.raws.before = this.calcBefore(prefixes, decl, prefix)
-    }
-    return decl.parent.insertBefore(decl, cloned)
+  old(prop, prefix) {
+    return [this.prefixed(prop, prefix)]
   }
 
   /**
-   * Did this declaration has this prefix above
+   * Check `value`, that it contain other prefixes, rather than `prefix`
    */
-  isAlready(decl, prefixed) {
-    let already = this.all.group(decl).up(i => i.prop === prefixed)
-    if (!already) {
-      already = this.all.group(decl).down(i => i.prop === prefixed)
+  otherPrefixes(value, prefix) {
+    for (let other of Browsers.prefixes()) {
+      if (other === prefix) {
+        continue
+      }
+      if (value.includes(other)) {
+        return value.replace(/var\([^)]+\)/, '').includes(other)
+      }
     }
-    return already
+    return false
   }
 
   /**
-   * Clone and add prefixes for declaration
+   * Return prefixed version of property
    */
-  add(decl, prefix, prefixes, result) {
-    let prefixed = this.prefixed(decl.prop, prefix)
-    if (
-      this.isAlready(decl, prefixed) ||
-      this.otherPrefixes(decl.value, prefix)
-    ) {
-      return undefined
-    }
-    return this.insert(decl, prefix, prefixes, result)
+  prefixed(prop, prefix) {
+    return prefix + prop
   }
 
   /**
@@ -177,10 +157,30 @@ class Declaration extends Prefixer {
   }
 
   /**
-   * Return list of prefixed properties to clean old prefixes
+   * Remove visual cascade
    */
-  old(prop, prefix) {
-    return [this.prefixed(prop, prefix)]
+  restoreBefore(decl) {
+    let lines = decl.raw('before').split('\n')
+    let min = lines[lines.length - 1]
+
+    this.all.group(decl).up(prefixed => {
+      let array = prefixed.raw('before').split('\n')
+      let last = array[array.length - 1]
+      if (last.length < min.length) {
+        min = last
+      }
+    })
+
+    lines[lines.length - 1] = min
+    decl.raws.before = lines.join('\n')
+  }
+
+  /**
+   * Set prefix to declaration
+   */
+  set(decl, prefix) {
+    decl.prop = this.prefixed(decl.prop, prefix)
+    return decl
   }
 }
 

package/lib/hacks/align-content.js

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

package/lib/hacks/align-items.js

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

package/lib/hacks/align-self.js

@@ -11,6 +11,13 @@ class AlignSelf extends Declaration {
     )
   }
 
+  /**
+   * Return property name by final spec
+   */
+  normalize() {
+    return 'align-self'
+  }
+
   /**
    * Change property name for 2012 specs
    */
@@ -23,13 +30,6 @@ class AlignSelf extends Declaration {
     return super.prefixed(prop, prefix)
   }
 
-  /**
-   * Return property name by final spec
-   */
-  normalize() {
-    return 'align-self'
-  }
-
   /**
    * Change value for 2012 spec and ignore prefix for 2009
    */

package/lib/hacks/block-logical.js

@@ -1,16 +1,6 @@
 let Declaration = require('../declaration')
 
 class BlockLogical extends Declaration {
-  /**
-   * Use old syntax for -moz- and -webkit-
-   */
-  prefixed(prop, prefix) {
-    if (prop.includes('-start')) {
-      return prefix + prop.replace('-block-start', '-before')
-    }
-    return prefix + prop.replace('-block-end', '-after')
-  }
-
   /**
    * Return property name by spec
    */
@@ -20,6 +10,16 @@ class BlockLogical extends Declaration {
     }
     return prop.replace('-after', '-block-end')
   }
+
+  /**
+   * Use old syntax for -moz- and -webkit-
+   */
+  prefixed(prop, prefix) {
+    if (prop.includes('-start')) {
+      return prefix + prop.replace('-block-start', '-before')
+    }
+    return prefix + prop.replace('-block-end', '-after')
+  }
 }
 
 BlockLogical.names = [

package/lib/hacks/border-radius.js

@@ -1,6 +1,13 @@
 let Declaration = require('../declaration')
 
 class BorderRadius extends Declaration {
+  /**
+   * Return unprefixed version of property
+   */
+  normalize(prop) {
+    return BorderRadius.toNormal[prop] || prop
+  }
+
   /**
    * Change syntax, when add Mozilla prefix
    */
@@ -10,13 +17,6 @@ class BorderRadius extends Declaration {
     }
     return super.prefixed(prop, prefix)
   }
-
-  /**
-   * Return unprefixed version of property
-   */
-  normalize(prop) {
-    return BorderRadius.toNormal[prop] || prop
-  }
 }
 
 BorderRadius.names = ['border-radius']

package/lib/hacks/break-props.js

@@ -2,10 +2,16 @@ let Declaration = require('../declaration')
 
 class BreakProps extends Declaration {
   /**
-   * Change name for -webkit- and -moz- prefix
+   * Don’t prefix some values
    */
-  prefixed(prop, prefix) {
-    return `${prefix}column-${prop}`
+  insert(decl, prefix, prefixes) {
+    if (decl.prop !== 'break-inside') {
+      return super.insert(decl, prefix, prefixes)
+    }
+    if (/region/i.test(decl.value) || /page/i.test(decl.value)) {
+      return undefined
+    }
+    return super.insert(decl, prefix, prefixes)
   }
 
   /**
@@ -21,6 +27,13 @@ class BreakProps extends Declaration {
     return 'break-after'
   }
 
+  /**
+   * Change name for -webkit- and -moz- prefix
+   */
+  prefixed(prop, prefix) {
+    return `${prefix}column-${prop}`
+  }
+
   /**
    * Change prefixed value for avoid-column and avoid-page
    */
@@ -33,19 +46,6 @@ class BreakProps extends Declaration {
     }
     return super.set(decl, prefix)
   }
-
-  /**
-   * Don’t prefix some values
-   */
-  insert(decl, prefix, prefixes) {
-    if (decl.prop !== 'break-inside') {
-      return super.insert(decl, prefix, prefixes)
-    }
-    if (/region/i.test(decl.value) || /page/i.test(decl.value)) {
-      return undefined
-    }
-    return super.insert(decl, prefix, prefixes)
-  }
 }
 
 BreakProps.names = [

package/lib/hacks/display-flex.js

@@ -17,6 +17,15 @@ class DisplayFlex extends Value {
     return decl.prop === 'display' && decl.value === this.name
   }
 
+  /**
+   * Change value for old specs
+   */
+  old(prefix) {
+    let prefixed = this.prefixed(prefix)
+    if (!prefixed) return undefined
+    return new OldValue(this.name, prefixed)
+  }
+
   /**
    * Return value by spec
    */
@@ -49,15 +58,6 @@ class DisplayFlex extends Value {
   replace(string, prefix) {
     return this.prefixed(prefix)
   }
-
-  /**
-   * Change value for old specs
-   */
-  old(prefix) {
-    let prefixed = this.prefixed(prefix)
-    if (!prefixed) return undefined
-    return new OldValue(this.name, prefixed)
-  }
 }
 
 DisplayFlex.names = ['display-flex', 'inline-flex']

package/lib/hacks/flex-direction.js

@@ -2,13 +2,6 @@ let flexSpec = require('./flex-spec')
 let Declaration = require('../declaration')
 
 class FlexDirection extends Declaration {
-  /**
-   * Return property name by final spec
-   */
-  normalize() {
-    return 'flex-direction'
-  }
-
   /**
    * Use two properties for 2009 spec
    */
@@ -53,6 +46,13 @@ class FlexDirection extends Declaration {
     return decl.parent.insertBefore(decl, cloned)
   }
 
+  /**
+   * Return property name by final spec
+   */
+  normalize() {
+    return 'flex-direction'
+  }
+
   /**
    * Clean two properties for 2009 spec
    */

package/lib/hacks/flex.js

@@ -4,6 +4,13 @@ let flexSpec = require('./flex-spec')
 let Declaration = require('../declaration')
 
 class Flex extends Declaration {
+  /**
+   * Return property name by final spec
+   */
+  normalize() {
+    return 'flex'
+  }
+
   /**
    * Change property name for 2009 spec
    */
@@ -16,13 +23,6 @@ class Flex extends Declaration {
     return super.prefixed(prop, prefix)
   }
 
-  /**
-   * Return property name by final spec
-   */
-  normalize() {
-    return 'flex'
-  }
-
   /**
    * Spec 2009 supports only first argument
    * Spec 2012 disallows unitless basis