browserslist 4.6.1 → 4.6.2

package/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 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).
 

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:
@@ -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`.
 
@@ -469,16 +466,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.overrideBrowserslist, {
-        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
 }
 ```
 
@@ -567,7 +564,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

@@ -207,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.
@@ -537,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)
       }, [])
     }
   },
@@ -555,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) {
@@ -572,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
     }
   },
   {
@@ -591,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
     }
   },
   {
@@ -600,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)
       }, [])
     }
   },
@@ -644,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) {
@@ -669,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) {
@@ -700,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) {
@@ -734,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$/)) {
@@ -756,23 +763,19 @@ 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
     }
   },
@@ -787,10 +790,8 @@ var QUERIES = [
       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
@@ -805,12 +806,10 @@ var QUERIES = [
       var data = checkName(name)
       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))
     }
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browserslist",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "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.30000971",
-    "electron-to-chromium": "^1.3.137",
-    "node-releases": "^1.1.21"
+    "caniuse-lite": "^1.0.30000974",
+    "electron-to-chromium": "^1.3.150",
+    "node-releases": "^1.1.23"
   },
   "bin": "./cli.js",
   "browser": {