browserslist 4.7.2 → 4.8.2

package/CHANGELOG.md

@@ -1,9 +1,24 @@
 # Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 4.8.2
+* Fix `Cannot convert undefined or null to object` (by Antoine Clausse).
+* Fix `mobileToDesktop` in `defaults` (by Huáng Jùnliàng).
+
+## 4.8.1
+* Fix Chrome and `mobileToDesktop` (by Huáng Jùnliàng).
+
+## 4.8
+* Add `> 5% in browserslist-config-my stats` query (by Andrew Leedham).
+* Improve docs (by Danny van Kooten).
+
+## 4.7.3
+* Add funding link for `npm fund`.
+
 ## 4.7.2
 * Add cache for query parsing.
 * Improve config caching (by Kārlis Gaņģis).
+* Update Firefox ESR.
 
 ## 4.7.1
 * Improve caching.

package/README.md

@@ -19,10 +19,10 @@ when you add the following to `package.json`:
 
 ```js
   "browserslist": [
-    "last 1 version",
-    "> 1%",
+    "defaults",
+    "not IE 11",
+    "not IE_Mob 11",
     "maintained node versions",
-    "not dead"
   ]
 ```
 
@@ -31,15 +31,15 @@ Or in `.browserslistrc` config:
 ```yaml
 # Browsers that we support
 
-last 1 version
-> 1%
+defaults
+not IE 11
+not IE_Mob 11
 maintained node versions
-not dead
 ```
 
 Developers set versions list in queries like `last 2 version`
 to be free from updating versions manually.
-Browserslist will use [Can I Use] data for this queries.
+Browserslist will use [`caniuse-lite`] with [Can I Use] data for this queries.
 
 Browserslist will take queries from tool option,
 `browserslist` config, `.browserslistrc` config,
@@ -60,6 +60,7 @@ Browserslist will take queries from tool option,
 [Browserslist Example]:                      https://github.com/browserslist/browserslist-example
 [postcss-preset-env]:                        https://github.com/jonathantneal/postcss-preset-env
 [postcss-normalize]:                         https://github.com/jonathantneal/postcss-normalize
+[`caniuse-lite`]:                            https://github.com/ben-eb/caniuse-lite
 [Autoprefixer]:                              https://github.com/postcss/autoprefixer
 [Can I Use]:                                 https://caniuse.com/
 [Babel]:                                     https://github.com/babel/babel/tree/master/packages/babel-preset-env
@@ -104,10 +105,6 @@ Browserslist will take queries from tool option,
 
 ## Best Practices
 
-* Select browsers directly (`last 2 Chrome versions`) only if you are making
-  a web app for a kiosk with one browser. There are a lot of browsers
-  on the market. If you are making general web app you should respect
-  browsers diversity.
 * There is a `defaults` query, which gives a reasonable configuration
   for most users:
 
@@ -118,12 +115,16 @@ Browserslist will take queries from tool option,
   ```
 
 * If you want to change the default set of browsers we recommend to combine
-  `last 1 version`, `not dead` with `> 0.2%` (or `> 1% in US`,
-  `> 1% in my stats`). `last n versions` adds too many dead browsers
-  and does not add popular old versions. Choosing a percentage above `0.2%`
-  will in the long run make popular browsers even more popular. We might run
-  into a monopoly and stagnation situation, as we had with Internet Explorer 6.
-  Please use this setting with caution.
+  `last 2 versions`, `not dead` with a usage number like `> 0.2%`. This is
+  because `last n versions` on its own does not add popular old versions while
+  only using a percentage above `0.2%` will in the long run make popular
+  browsers even more popular. We might run into a monopoly and stagnation
+  situation, as we had with Internet Explorer 6. Please use this setting
+  with caution.
+* Select browsers directly (`last 2 Chrome versions`) only if you are making
+  a web app for a kiosk with one browser. There are a lot of browsers
+  on the market. If you are making general web app you should respect
+  browsers diversity.
 * 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
@@ -173,12 +174,16 @@ in your terminal._
 
 You can specify the browser and Node.js versions by queries (case insensitive):
 
+* `defaults`: Browserslist’s default browsers
+  (`> 0.5%, last 2 versions, Firefox ESR, not dead`).
 * `> 5%`: browsers versions selected by global usage statistics.
   `>=`, `<` and `<=` work too.
 * `> 5% in US`: uses USA usage statistics. It accepts [two-letter country code].
 * `> 5% in alt-AS`: uses Asia region usage statistics. List of all region codes
   can be found at [`caniuse-lite/data/regions`].
 * `> 5% in my stats`: uses [custom usage data].
+* `> 5% in browserslist-config-mycompany stats`: uses [custom usage data]
+  from `browserslist-config-mycompany/browserslist-stats.json`.
 * `cover 99.5%`: most popular browsers that provide coverage.
 * `cover 99.5% in US`: same as above, with [two-letter country code].
 * `cover 99.5% in my stats`: uses [custom usage data].
@@ -207,8 +212,6 @@ You can specify the browser and Node.js versions by queries (case insensitive):
   `Samsung 4` and `OperaMobile 12.1`.
 * `last 2 versions`: the last 2 versions for *each* browser.
 * `last 2 Chrome versions`: the last 2 versions of Chrome browser.
-* `defaults`: Browserslist’s default browsers
-  (`> 0.5%, last 2 versions, Firefox ESR, not dead`).
 * `not ie <= 8`: exclude browsers selected by previous queries.
 
 You can add `not ` to any query.
@@ -357,6 +360,10 @@ module.exports = [
 ]
 ```
 
+You can also include a `browserslist-stats.json` file as part of your shareable
+config at the root and query it using `> 5% in browserslist-config-mycompany stats`.
+It uses the same format as `extends` and the `dangerousExtend` property as above.
+
 
 ## Configuring for Different Environments
 

package/index.js

@@ -7,8 +7,8 @@ var e2c = require('electron-to-chromium/versions')
 var BrowserslistError = require('./error')
 var env = require('./node') // Will load browser.js in webpack
 
-var FLOAT_RANGE = /^\d+(\.\d+)?(-\d+(\.\d+)?)*$/
 var YEAR = 365.259641 * 24 * 60 * 60 * 1000
+var ANDROID_EVERGREEN_FIRST = 37
 
 var QUERY_OR = 1
 var QUERY_AND = 2
@@ -138,9 +138,9 @@ function compare (a, b) {
 
 function compareSemver (a, b) {
   return (
-    compare(a[0], b[0]) ||
-    compare(a[1], b[1]) ||
-    compare(a[2], b[2])
+    compare(parseInt(a[0]), parseInt(b[0])) ||
+    compare(parseInt(a[1] || '0'), parseInt(b[1] || '0')) ||
+    compare(parseInt(a[2] || '0'), parseInt(b[2] || '0'))
   )
 }
 
@@ -154,16 +154,8 @@ function resolveVersion (data, version) {
   }
 }
 
-function normalizeVersion (data, version, context) {
+function normalizeVersion (data, version) {
   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) {
@@ -173,10 +165,10 @@ function normalizeVersion (data, version, context) {
   }
 }
 
-function filterByYear (since) {
+function filterByYear (since, context) {
   since = since / 1000
   return Object.keys(agents).reduce(function (selected, name) {
-    var data = byName(name)
+    var data = byName(name, context)
     if (!data) return selected
     var versions = Object.keys(data.releaseDate).filter(function (v) {
       return data.releaseDate[v] >= since
@@ -185,14 +177,47 @@ function filterByYear (since) {
   }, [])
 }
 
-function byName (name) {
+function cloneData (data) {
+  return {
+    name: data.name,
+    versions: data.versions,
+    released: data.released,
+    releaseDate: data.releaseDate
+  }
+}
+
+function byName (name, context) {
   name = name.toLowerCase()
   name = browserslist.aliases[name] || name
+  if (context.mobileToDesktop && browserslist.desktopNames[name]) {
+    var desktop = browserslist.data[browserslist.desktopNames[name]]
+    if (name === 'android') {
+      return normalizeAndroidData(cloneData(browserslist.data[name]), desktop)
+    } else {
+      var cloned = cloneData(desktop)
+      cloned.name = name
+      return cloned
+    }
+  }
   return browserslist.data[name]
 }
 
-function checkName (name) {
-  var data = byName(name)
+function normalizeAndroidVersions (androidVersions, chromeVersions) {
+  var firstEvergreen = ANDROID_EVERGREEN_FIRST
+  var last = chromeVersions[chromeVersions.length - 1]
+  return androidVersions
+    .filter(function (version) { return /^(?:[2-4]\.|[34]$)/.test(version) })
+    .concat(chromeVersions.slice(firstEvergreen - last - 1))
+}
+
+function normalizeAndroidData (android, chrome) {
+  android.released = normalizeAndroidVersions(android.released, chrome.released)
+  android.versions = normalizeAndroidVersions(android.versions, chrome.versions)
+  return android
+}
+
+function checkName (name, context) {
+  var data = byName(name, context)
   if (!data) throw new BrowserslistError('Unknown browser ' + name)
   return data
 }
@@ -204,11 +229,11 @@ function unknownQuery (query) {
   )
 }
 
-function filterAndroid (list, versions) {
+function filterAndroid (list, versions, context) {
+  if (context.mobileToDesktop) return list
   var released = browserslist.data.android.released
-  var firstEvergreen = 37
   var last = released[released.length - 1]
-  var diff = last - firstEvergreen - versions // First Android Evergreen
+  var diff = last - ANDROID_EVERGREEN_FIRST - versions
   if (diff > 0) {
     return list.slice(-1)
   } else {
@@ -252,7 +277,7 @@ function resolve (queries, context) {
         var array = type.select.apply(browserslist, args).map(function (j) {
           var parts = j.split(' ')
           if (parts[1] === '0') {
-            return parts[0] + ' ' + byName(parts[0]).versions[0]
+            return parts[0] + ' ' + byName(parts[0], context).versions[0]
           } else {
             return j
           }
@@ -359,11 +384,12 @@ function browserslist (queries, opts) {
     name1 = name1.split(' ')
     name2 = name2.split(' ')
     if (name1[0] === name2[0]) {
-      if (FLOAT_RANGE.test(name1[1]) && FLOAT_RANGE.test(name2[1])) {
-        return parseFloat(name2[1]) - parseFloat(name1[1])
-      } else {
-        return compare(name2[1], name1[1])
-      }
+      // assumptions on caniuse data
+      // 1) version ranges never overlaps
+      // 2) if version is not a range, it never contains `-`
+      var version1 = name1[1].split('-')[0]
+      var version2 = name2[1].split('-')[0]
+      return compareSemver(version2.split('.'), version1.split('.'))
     } else {
       return compare(name1[0], name2[0])
     }
@@ -383,8 +409,8 @@ function parse (queries) {
 }
 
 function doMatch (string, qs) {
-  var or = /^(?:,\s*|\s+OR\s+)(.*)/i
-  var and = /^\s+AND\s+(.*)/i
+  var or = /^(?:,\s*|\s+or\s+)(.*)/i
+  var and = /^\s+and\s+(.*)/i
 
   return find(string, function (parsed, n, max) {
     if (and.test(parsed)) {
@@ -455,7 +481,8 @@ browserslist.desktopNames = {
   and_chr: 'chrome',
   and_ff: 'firefox',
   ie_mob: 'ie',
-  op_mob: 'opera'
+  op_mob: 'opera',
+  android: 'chrome' // has extra processing logic
 }
 
 // Aliases to work with joined versions like `ios_saf 7.0-7.1`
@@ -530,11 +557,13 @@ var QUERIES = [
     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)
+        var data = byName(name, context)
         if (!data) return selected
         var list = getMajorVersions(data.released, versions)
         list = list.map(nameMapper(data.name))
-        if (data.name === 'android') list = filterAndroid(list, versions)
+        if (data.name === 'android') {
+          list = filterAndroid(list, versions, context)
+        }
         return selected.concat(list)
       }, [])
     }
@@ -543,11 +572,13 @@ var QUERIES = [
     regexp: /^last\s+(\d+)\s+versions?$/i,
     select: function (context, versions) {
       return Object.keys(agents).reduce(function (selected, name) {
-        var data = byName(name)
+        var data = byName(name, context)
         if (!data) return selected
         var list = data.released.slice(-versions)
         list = list.map(nameMapper(data.name))
-        if (data.name === 'android') list = filterAndroid(list, versions)
+        if (data.name === 'android') {
+          list = filterAndroid(list, versions, context)
+        }
         return selected.concat(list)
       }, [])
     }
@@ -564,10 +595,12 @@ var QUERIES = [
   {
     regexp: /^last\s+(\d+)\s+(\w+)\s+major\s+versions?$/i,
     select: function (context, versions, name) {
-      var data = checkName(name)
+      var data = checkName(name, context)
       var validVersions = getMajorVersions(data.released, versions)
       var list = validVersions.map(nameMapper(data.name))
-      if (data.name === 'android') list = filterAndroid(list, versions)
+      if (data.name === 'android') {
+        list = filterAndroid(list, versions, context)
+      }
       return list
     }
   },
@@ -582,17 +615,19 @@ var QUERIES = [
   {
     regexp: /^last\s+(\d+)\s+(\w+)\s+versions?$/i,
     select: function (context, versions, name) {
-      var data = checkName(name)
+      var data = checkName(name, context)
       var list = data.released.slice(-versions).map(nameMapper(data.name))
-      if (data.name === 'android') list = filterAndroid(list, versions)
+      if (data.name === 'android') {
+        list = filterAndroid(list, versions, context)
+      }
       return list
     }
   },
   {
     regexp: /^unreleased\s+versions$/i,
-    select: function () {
+    select: function (context) {
       return Object.keys(agents).reduce(function (selected, name) {
-        var data = byName(name)
+        var data = byName(name, context)
         if (!data) return selected
         var list = data.versions.filter(function (v) {
           return data.released.indexOf(v) === -1
@@ -611,7 +646,7 @@ var QUERIES = [
   {
     regexp: /^unreleased\s+(\w+)\s+versions?$/i,
     select: function (context, name) {
-      var data = checkName(name)
+      var data = checkName(name, context)
       return data.versions.filter(function (v) {
         return data.released.indexOf(v) === -1
       }).map(nameMapper(data.name))
@@ -620,7 +655,7 @@ var QUERIES = [
   {
     regexp: /^last\s+(\d*.?\d+)\s+years?$/i,
     select: function (context, years) {
-      return filterByYear(Date.now() - YEAR * years)
+      return filterByYear(Date.now() - YEAR * years, context)
     }
   },
   {
@@ -629,7 +664,7 @@ var QUERIES = [
       year = parseInt(year)
       month = parseInt(month || '01') - 1
       date = parseInt(date || '01')
-      return filterByYear(Date.UTC(year, month, date, 0, 0, 0))
+      return filterByYear(Date.UTC(year, month, date, 0, 0, 0), context)
     }
   },
   {
@@ -685,6 +720,41 @@ var QUERIES = [
       }, [])
     }
   },
+  {
+    regexp: /^(>=?|<=?)\s*(\d*\.?\d+)%\s+in\s+(\S+)\s+stats$/,
+    select: function (context, sign, popularity, name) {
+      popularity = parseFloat(popularity)
+      var stats = env.loadStat(context, name, browserslist.data)
+      if (stats) {
+        context.customUsage = { }
+        for (var browser in stats) {
+          fillUsage(context.customUsage, browser, stats[browser])
+        }
+      }
+      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) {
+            result.push(version)
+          }
+        } else if (sign === '<') {
+          if (usage[version] < popularity) {
+            result.push(version)
+          }
+        } else if (sign === '<=') {
+          if (usage[version] <= popularity) {
+            result.push(version)
+          }
+        } else if (usage[version] >= popularity) {
+          result.push(version)
+        }
+        return result
+      }, [])
+    }
+  },
   {
     regexp: /^(>=?|<=?)\s*(\d*\.?\d+)%\s+in\s+((alt-)?\w\w)$/,
     select: function (context, sign, popularity, place) {
@@ -781,9 +851,9 @@ 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, context) || from)
-      to = parseFloat(normalizeVersion(data, to, context) || to)
+      var data = checkName(name, context)
+      from = parseFloat(normalizeVersion(data, from) || from)
+      to = parseFloat(normalizeVersion(data, to) || to)
       function filter (v) {
         var parsed = parseFloat(v)
         return parsed >= from && parsed <= to
@@ -820,7 +890,7 @@ var QUERIES = [
   {
     regexp: /^(\w+)\s*(>=?|<=?)\s*([\d.]+)$/,
     select: function (context, name, sign, version) {
-      var data = checkName(name)
+      var data = checkName(name, context)
       var alias = browserslist.versionAliases[data.name][version]
       if (alias) {
         version = alias
@@ -912,8 +982,8 @@ var QUERIES = [
     regexp: /^(\w+)\s+(tp|[\d.]+)$/i,
     select: function (context, name, version) {
       if (/^tp$/i.test(version)) version = 'TP'
-      var data = checkName(name)
-      var alias = normalizeVersion(data, version, context)
+      var data = checkName(name, context)
+      var alias = normalizeVersion(data, version)
       if (alias) {
         version = alias
       } else {
@@ -922,7 +992,7 @@ var QUERIES = [
         } else {
           alias = version.replace(/\.0$/, '')
         }
-        alias = normalizeVersion(data, alias, context)
+        alias = normalizeVersion(data, alias)
         if (alias) {
           version = alias
         } else if (context.ignoreUnknownVersions) {
@@ -943,8 +1013,8 @@ var QUERIES = [
   },
   {
     regexp: /^defaults$/i,
-    select: function () {
-      return browserslist(browserslist.defaults)
+    select: function (context) {
+      return resolve(browserslist.defaults, context)
     }
   },
   {
@@ -962,7 +1032,7 @@ var QUERIES = [
   {
     regexp: /^(\w+)$/i,
     select: function (context, name) {
-      if (byName(name)) {
+      if (byName(name, context)) {
         throw new BrowserslistError(
           'Specify versions in Browserslist query for browser ' + name)
       } else {

package/node.js

@@ -4,7 +4,7 @@ var fs = require('fs')
 
 var BrowserslistError = require('./error')
 
-var IS_SECTION = /^\s*\[(.+)\]\s*$/
+var IS_SECTION = /^\s*\[(.+)]\s*$/
 var CONFIG_PATTERN = /^browserslist-config-/
 var SCOPED_CONFIG__PATTERN = /@[^/]+\/browserslist-config(-|$|\/)/
 var TIME_TO_UPDATE_CANIUSE = 6 * 30 * 24 * 60 * 60 * 1000
@@ -111,6 +111,32 @@ function latestReleaseTime (agents) {
   return latest * 1000
 }
 
+function normalizeStats (data, stats) {
+  if (stats && 'dataByBrowser' in stats) {
+    stats = stats.dataByBrowser
+  }
+
+  if (typeof stats !== 'object') return undefined
+
+  var normalized = { }
+  for (var i in stats) {
+    var versions = Object.keys(stats[i])
+    if (
+      versions.length === 1 &&
+      data[i] &&
+      data[i].versions.length === 1
+    ) {
+      var normal = Object.keys(data[i].versions)[0]
+      normalized[i] = { }
+      normalized[i][normal] = stats[i][versions[0]]
+    } else {
+      normalized[i] = stats[i]
+    }
+  }
+
+  return normalized
+}
+
 module.exports = {
   loadQueries: function loadQueries (context, name) {
     if (!context.dangerousExtend) checkExtend(name)
@@ -124,6 +150,18 @@ module.exports = {
     return queries
   },
 
+  loadStat: function loadStat (context, name, data) {
+    if (!context.dangerousExtend) checkExtend(name)
+    // eslint-disable-next-line security/detect-non-literal-require
+    var stats = require(
+      require.resolve(
+        path.join(name, 'browserslist-stats.json'),
+        { paths: ['.'] }
+      )
+    )
+    return normalizeStats(data, stats)
+  },
+
   getStat: function getStat (opts, data) {
     var stats
     if (opts.stats) {
@@ -136,7 +174,6 @@ module.exports = {
         return isFile(file) ? file : undefined
       })
     }
-
     if (typeof stats === 'string') {
       try {
         stats = JSON.parse(fs.readFileSync(stats))
@@ -144,26 +181,7 @@ module.exports = {
         throw new BrowserslistError('Can\'t read ' + stats)
       }
     }
-
-    if (stats && 'dataByBrowser' in stats) {
-      stats = stats.dataByBrowser
-    }
-
-    if (typeof stats !== 'object') return undefined
-
-    var normalized = { }
-    for (var i in stats) {
-      var versions = Object.keys(stats[i])
-      if (versions.length === 1 && data[i] && data[i].versions.length === 1) {
-        var normal = Object.keys(data[i].versions)[0]
-        normalized[i] = { }
-        normalized[i][normal] = stats[i][versions[0]]
-      } else {
-        normalized[i] = stats[i]
-      }
-    }
-
-    return normalized
+    return normalizeStats(data, stats)
   },
 
   loadConfig: function loadConfig (opts) {

package/package.json

@@ -1,19 +1,23 @@
 {
   "name": "browserslist",
-  "version": "4.7.2",
+  "version": "4.8.2",
   "description": "Share target browsers between different front-end tools, like Autoprefixer, Stylelint and babel-env-preset",
   "keywords": [
     "caniuse",
     "browsers",
     "target"
   ],
+  "funding": {
+    "type": "tidelift",
+    "url": "https://tidelift.com/funding/github/npm/browserslist"
+  },
   "author": "Andrey Sitnik <andrey@sitnik.ru>",
   "license": "MIT",
   "repository": "browserslist/browserslist",
   "dependencies": {
-    "caniuse-lite": "^1.0.30001004",
-    "electron-to-chromium": "^1.3.295",
-    "node-releases": "^1.1.38"
+    "caniuse-lite": "^1.0.30001015",
+    "electron-to-chromium": "^1.3.322",
+    "node-releases": "^1.1.42"
   },
   "bin": "./cli.js",
   "browser": {
@@ -25,6 +29,6 @@
   ],
   "sharec": {
     "config": "@logux/sharec-config",
-    "version": "0.5.4"
+    "version": "0.5.6"
   }
 }