browserslist 4.5.6 → 4.6.3

package/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 4.6.3
+* Dirty fix for `android all` error.
+
+## 4.6.2
+* Fix `last x version` and similar queries for Android (by Tony Ross).
+
+## 4.6.1
+* Fix patch version support for Electron (by Kilian Valkhof).
+
+## 4.6
+* Add `mobileToDesktop` option (by Nicolò Ribaudo).
+
 ## 4.5.6
 * Make `Node > 5` and `node > 5` queries case insensitive.
 

package/README.md

@@ -18,15 +18,13 @@ front-end tools. It is used in:
 All tools will find target browsers automatically,
 when you add the following to `package.json`:
 
-```json
-{
+```js
   "browserslist": [
     "last 1 version",
     "> 1%",
     "maintained node versions",
     "not dead"
   ]
-}
 ```
 
 Or in `.browserslistrc` config:
@@ -117,7 +115,7 @@ You can test Browserslist queries in [online demo].
 * Don’t remove browsers just because you don’t know them. Opera Mini has
   100 million users in Africa and it is more popular in the global market
   than Microsoft Edge. Chinese QQ Browsers has more market share than Firefox
-  and desktop Safari altogether.
+  and desktop Safari combined.
 
 
 ## Queries
@@ -127,11 +125,10 @@ from one of this sources:
 
 1. `browserslist` key in `package.json` file in current or parent directories.
    **We recommend this way.**
-2. Tool options. For example `browsers` option in Autoprefixer.
-3. `BROWSERSLIST` environment variable.
-4. `browserslist` config file in current or parent directories.
-5. `.browserslistrc` config file in current or parent directories.
-6. If the above methods did not produce a valid result
+2. `.browserslistrc` config file in current or parent directories.
+3. `browserslist` config file in current or parent directories.
+4. `BROWSERSLIST` environment variable.
+5. If the above methods did not produce a valid result
    Browserslist will use defaults:
    `> 0.5%, last 2 versions, Firefox ESR, not dead`.
 
@@ -203,6 +200,12 @@ You can specify the browser and Node.js versions by queries (case insensitive):
 
 You can add `not ` to any query.
 
+[`caniuse-lite/data/regions`]: https://github.com/ben-eb/caniuse-lite/tree/master/data/regions
+[two-letter country code]:     https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements
+[custom usage data]:           #custom-usage-data
+[still maintained]:            https://github.com/nodejs/Release
+[Can I Use]:                   https://caniuse.com/
+
 
 ### Debug
 
@@ -228,23 +231,6 @@ samsung 5
 ```
 
 
-### Notes
-
-Browserslist works with separated versions of browsers.
-You should avoid queries like `Firefox > 0`.
-The list of the specified browsers acts as a white list which means other browsers are ignored.
-
-All queries are based on the [Can I Use] support table,
-e.g. `last 3 iOS versions` might select `8.4, 9.2, 9.3` (mixed major and minor),
-whereas `last 3 Chrome versions` might select `50, 49, 48` (major only).
-
-[`caniuse-lite/data/regions`]: https://github.com/ben-eb/caniuse-lite/tree/master/data/regions
-[two-letter country code]:     https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements
-[custom usage data]:           #custom-usage-data
-[still maintained]:            https://github.com/nodejs/Release
-[Can I Use]:                   https://caniuse.com/
-
-
 ### Browsers
 
 Names are case insensitive:
@@ -411,9 +397,12 @@ In `package.json`:
       "> 1%",
       "ie 10"
     ],
-    "development": [
+    "modern": [
       "last 1 chrome version",
       "last 1 firefox version"
+    ],
+    "ssr": [
+      "node 12"
     ]
   }
 ```
@@ -421,13 +410,16 @@ In `package.json`:
 In `.browserslistrc` config:
 
 ```ini
-[production staging]
+[production]
 > 1%
 ie 10
 
-[development]
+[modern]
 last 1 chrome version
 last 1 firefox version
+
+[ssr]
+node 12
 ```
 
 
@@ -469,16 +461,16 @@ For example, the query `> 1% in my stats, > 5% in US, 10%` is permitted.
 ## JS API
 
 ```js
-var browserslist = require('browserslist');
+const browserslist = require('browserslist')
 
 // Your CSS/JS build tool code
-var process = function (source, opts) {
-    var browsers = browserslist(opts.browsers, {
-        stats: opts.stats,
-        path:  opts.file,
-        env:   opts.env
-    });
-    // Your code to add features for selected browsers
+function process (source, opts) {
+  const browsers = browserslist(opts.overrideBrowserslist, {
+    stats: opts.stats,
+    path:  opts.file,
+    env:   opts.env
+  })
+  // Your code to add features for selected browsers
 }
 ```
 
@@ -499,6 +491,10 @@ Options:
   Default is `false.`
 * `dangerousExtend`: Disable security checks for `extend` query.
   Default is `false.`
+* `mobileToDesktop`: Use desktop browsers if Can I Use doesn’t have data
+  about this mobile version. For instance, Browserslist will return
+  `chrome 20` on `and_chr 20` query (Can I Use has only data only about
+  latest versions of mobile browsers). Default is `false`.
 
 For non-JS environment and debug purpose you can use CLI tool:
 
@@ -563,7 +559,7 @@ for the duration of the hosting process.
 To clear these caches, use:
 
 ```js
-browserslist.clearCaches();
+browserslist.clearCaches()
 ```
 
 To disable the caching altogether, set the `BROWSERSLIST_DISABLE_CACHE`

package/index.js

@@ -33,6 +33,17 @@ function normalize (versions) {
   })
 }
 
+function normalizeElectron (version) {
+  var versionToUse = version
+  if (version.split('.').length === 3) {
+    versionToUse = version
+      .split('.')
+      .slice(0, -1)
+      .join('.')
+  }
+  return versionToUse
+}
+
 function nameMapper (name) {
   return function mapName (version) {
     return name + ' ' + version
@@ -136,11 +147,28 @@ function compareSemver (a, b) {
   )
 }
 
-function normalizeVersion (data, version) {
+function resolveVersion (data, version) {
   if (data.versions.indexOf(version) !== -1) {
     return version
   } else if (browserslist.versionAliases[data.name][version]) {
     return browserslist.versionAliases[data.name][version]
+  } else {
+    return false
+  }
+}
+
+function normalizeVersion (data, version, context) {
+  var resolved = resolveVersion(data, version)
+  if (
+    !resolved &&
+    context.mobileToDesktop &&
+    browserslist.desktopNames[data.name]
+  ) {
+    var alias = checkName(browserslist.desktopNames[data.name])
+    resolved = resolveVersion(alias, version)
+  }
+  if (resolved) {
+    return resolved
   } else if (data.versions.length === 1) {
     return data.versions[0]
   } else {
@@ -179,6 +207,18 @@ function unknownQuery (query) {
   )
 }
 
+function filterAndroid (list, versions) {
+  var released = browserslist.data.android.released
+  var firstEvergreen = 37
+  var last = released[released.length - 1]
+  var diff = last - firstEvergreen - versions // First Android Evergreen
+  if (diff > 0) {
+    return list.slice(-1)
+  } else {
+    return list.slice(diff - 1)
+  }
+}
+
 /**
  * Resolves queries into a browser list.
  * @param {string|string[]} queries Queries to combine.
@@ -274,6 +314,9 @@ function resolve (queries, context) {
  *                                                     version in direct query.
  * @param {boolean} [opts.dangerousExtend] Disable security checks
  *                                         for extend query.
+ * @param {boolean} [opts.mobileToDesktop] Alias mobile browsers to the desktop
+ *                                         version when Can I Use doesn't have
+ *                                         data about the specified version.
  * @returns {string[]} Array with browser names in Can I Use.
  *
  * @example
@@ -302,7 +345,8 @@ function browserslist (queries, opts) {
 
   var context = {
     ignoreUnknownVersions: opts.ignoreUnknownVersions,
-    dangerousExtend: opts.dangerousExtend
+    dangerousExtend: opts.dangerousExtend,
+    mobileToDesktop: opts.mobileToDesktop
   }
 
   env.oldDataWarning(browserslist.data)
@@ -427,6 +471,15 @@ browserslist.aliases = {
   qqandroid: 'and_qq'
 }
 
+// Can I Use only provides a few versions for some browsers (e.g. and_chr).
+// Fallback to a similar browser for unknown versions
+browserslist.desktopNames = {
+  and_chr: 'chrome',
+  and_ff: 'firefox',
+  ie_mob: 'ie',
+  op_mob: 'opera'
+}
+
 // Aliases to work with joined versions like `ios_saf 7.0-7.1`
 browserslist.versionAliases = { }
 
@@ -496,15 +549,15 @@ browserslist.coverage = function (browsers, stats) {
 
 var QUERIES = [
   {
-    regexp: /^last\s+(\d+)\s+major versions?$/i,
+    regexp: /^last\s+(\d+)\s+major\s+versions?$/i,
     select: function (context, versions) {
       return Object.keys(agents).reduce(function (selected, name) {
         var data = byName(name)
         if (!data) return selected
-        var array = getMajorVersions(data.released, versions)
-
-        array = array.map(nameMapper(data.name))
-        return selected.concat(array)
+        var list = getMajorVersions(data.released, versions)
+        list = list.map(nameMapper(data.name))
+        if (data.name === 'android') list = filterAndroid(list, versions)
+        return selected.concat(list)
       }, [])
     }
   },
@@ -514,15 +567,15 @@ var QUERIES = [
       return Object.keys(agents).reduce(function (selected, name) {
         var data = byName(name)
         if (!data) return selected
-        var array = data.released.slice(-versions)
-
-        array = array.map(nameMapper(data.name))
-        return selected.concat(array)
+        var list = data.released.slice(-versions)
+        list = list.map(nameMapper(data.name))
+        if (data.name === 'android') list = filterAndroid(list, versions)
+        return selected.concat(list)
       }, [])
     }
   },
   {
-    regexp: /^last\s+(\d+)\s+electron\s+major versions?$/i,
+    regexp: /^last\s+(\d+)\s+electron\s+major\s+versions?$/i,
     select: function (context, versions) {
       var validVersions = getMajorVersions(Object.keys(e2c).reverse(), versions)
       return validVersions.map(function (i) {
@@ -531,11 +584,13 @@ var QUERIES = [
     }
   },
   {
-    regexp: /^last\s+(\d+)\s+(\w+)\s+major versions?$/i,
+    regexp: /^last\s+(\d+)\s+(\w+)\s+major\s+versions?$/i,
     select: function (context, versions, name) {
       var data = checkName(name)
       var validVersions = getMajorVersions(data.released, versions)
-      return validVersions.map(nameMapper(data.name))
+      var list = validVersions.map(nameMapper(data.name))
+      if (data.name === 'android') list = filterAndroid(list, versions)
+      return list
     }
   },
   {
@@ -550,7 +605,9 @@ var QUERIES = [
     regexp: /^last\s+(\d+)\s+(\w+)\s+versions?$/i,
     select: function (context, versions, name) {
       var data = checkName(name)
-      return data.released.slice(-versions).map(nameMapper(data.name))
+      var list = data.released.slice(-versions).map(nameMapper(data.name))
+      if (data.name === 'android') list = filterAndroid(list, versions)
+      return list
     }
   },
   {
@@ -559,12 +616,11 @@ var QUERIES = [
       return Object.keys(agents).reduce(function (selected, name) {
         var data = byName(name)
         if (!data) return selected
-        var array = data.versions.filter(function (v) {
+        var list = data.versions.filter(function (v) {
           return data.released.indexOf(v) === -1
         })
-
-        array = array.map(nameMapper(data.name))
-        return selected.concat(array)
+        list = list.map(nameMapper(data.name))
+        return selected.concat(list)
       }, [])
     }
   },
@@ -603,7 +659,6 @@ var QUERIES = [
     select: function (context, sign, popularity) {
       popularity = parseFloat(popularity)
       var usage = browserslist.usage.global
-
       return Object.keys(usage).reduce(function (result, version) {
         if (sign === '>') {
           if (usage[version] > popularity) {
@@ -628,13 +683,10 @@ var QUERIES = [
     regexp: /^(>=?|<=?)\s*(\d*\.?\d+)%\s+in\s+my\s+stats$/,
     select: function (context, sign, popularity) {
       popularity = parseFloat(popularity)
-
       if (!context.customUsage) {
         throw new BrowserslistError('Custom usage statistics was not provided')
       }
-
       var usage = context.customUsage
-
       return Object.keys(usage).reduce(function (result, version) {
         if (sign === '>') {
           if (usage[version] > popularity) {
@@ -659,16 +711,13 @@ var QUERIES = [
     regexp: /^(>=?|<=?)\s*(\d*\.?\d+)%\s+in\s+((alt-)?\w\w)$/,
     select: function (context, sign, popularity, place) {
       popularity = parseFloat(popularity)
-
       if (place.length === 2) {
         place = place.toUpperCase()
       } else {
         place = place.toLowerCase()
       }
-
       env.loadCountry(browserslist.usage, place)
       var usage = browserslist.usage[place]
-
       return Object.keys(usage).reduce(function (result, version) {
         if (sign === '>') {
           if (usage[version] > popularity) {
@@ -693,7 +742,6 @@ var QUERIES = [
     regexp: /^cover\s+(\d*\.?\d+)%(\s+in\s+(my\s+stats|(alt-)?\w\w))?$/,
     select: function (context, coverage, statMode) {
       coverage = parseFloat(coverage)
-
       var usage = browserslist.usage.global
       if (statMode) {
         if (statMode.match(/^\s+in\s+my\s+stats$/)) {
@@ -715,39 +763,35 @@ var QUERIES = [
           usage = browserslist.usage[place]
         }
       }
-
       var versions = Object.keys(usage).sort(function (a, b) {
         return usage[b] - usage[a]
       })
-
       var coveraged = 0
       var result = []
       var version
       for (var i = 0; i <= versions.length; i++) {
         version = versions[i]
         if (usage[version] === 0) break
-
         coveraged += usage[version]
         result.push(version)
         if (coveraged >= coverage) break
       }
-
       return result
     }
   },
   {
     regexp: /^electron\s+([\d.]+)\s*-\s*([\d.]+)$/i,
     select: function (context, from, to) {
-      if (!e2c[from]) {
+      var fromToUse = normalizeElectron(from)
+      var toToUse = normalizeElectron(to)
+      if (!e2c[fromToUse]) {
         throw new BrowserslistError('Unknown version ' + from + ' of electron')
       }
-      if (!e2c[to]) {
+      if (!e2c[toToUse]) {
         throw new BrowserslistError('Unknown version ' + to + ' of electron')
       }
-
       from = parseFloat(from)
       to = parseFloat(to)
-
       return Object.keys(e2c).filter(function (i) {
         var parsed = parseFloat(i)
         return parsed >= from && parsed <= to
@@ -760,22 +804,21 @@ var QUERIES = [
     regexp: /^(\w+)\s+([\d.]+)\s*-\s*([\d.]+)$/i,
     select: function (context, name, from, to) {
       var data = checkName(name)
-      from = parseFloat(normalizeVersion(data, from) || from)
-      to = parseFloat(normalizeVersion(data, to) || to)
-
+      from = parseFloat(normalizeVersion(data, from, context) || from)
+      to = parseFloat(normalizeVersion(data, to, context) || to)
       function filter (v) {
         var parsed = parseFloat(v)
         return parsed >= from && parsed <= to
       }
-
       return data.released.filter(filter).map(nameMapper(data.name))
     }
   },
   {
     regexp: /^electron\s*(>=?|<=?)\s*([\d.]+)$/i,
     select: function (context, sign, version) {
+      var versionToUse = normalizeElectron(version)
       return Object.keys(e2c)
-        .filter(generateFilter(sign, version))
+        .filter(generateFilter(sign, versionToUse))
         .map(function (i) {
           return 'chrome ' + e2c[i]
         })
@@ -826,7 +869,8 @@ var QUERIES = [
   {
     regexp: /^electron\s+([\d.]+)$/i,
     select: function (context, version) {
-      var chrome = e2c[version]
+      var versionToUse = normalizeElectron(version)
+      var chrome = e2c[versionToUse]
       if (!chrome) {
         throw new BrowserslistError(
           'Unknown version ' + version + ' of electron')
@@ -879,7 +923,7 @@ var QUERIES = [
     select: function (context, name, version) {
       if (/^tp$/i.test(version)) version = 'TP'
       var data = checkName(name)
-      var alias = normalizeVersion(data, version)
+      var alias = normalizeVersion(data, version, context)
       if (alias) {
         version = alias
       } else {
@@ -888,7 +932,7 @@ var QUERIES = [
         } else {
           alias = version.replace(/\.0$/, '')
         }
-        alias = normalizeVersion(data, alias)
+        alias = normalizeVersion(data, alias, context)
         if (alias) {
           version = alias
         } else if (context.ignoreUnknownVersions) {
@@ -913,6 +957,15 @@ var QUERIES = [
       return browserslist(browserslist.defaults)
     }
   },
+  {
+    regexp: /^android all$/i,
+    select: function () {
+      /* istanbul ignore next */
+      console.warn('BrowserslistError: Unknown browser query `android all`')
+      /* istanbul ignore next */
+      return []
+    }
+  },
   {
     regexp: /^dead$/i,
     select: function (context) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browserslist",
-  "version": "4.5.6",
+  "version": "4.6.3",
   "description": "Share target browsers between different front-end tools, like Autoprefixer, Stylelint and babel-env-preset",
   "keywords": [
     "caniuse",
@@ -11,9 +11,9 @@
   "license": "MIT",
   "repository": "browserslist/browserslist",
   "dependencies": {
-    "caniuse-lite": "^1.0.30000963",
-    "electron-to-chromium": "^1.3.127",
-    "node-releases": "^1.1.17"
+    "caniuse-lite": "^1.0.30000975",
+    "electron-to-chromium": "^1.3.164",
+    "node-releases": "^1.1.23"
   },
   "bin": "./cli.js",
   "browser": {