browserslist 4.5.4 → 4.6.1

package/CHANGELOG.md

@@ -1,6 +1,19 @@
 # Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 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.
+
+## 4.5.5
+* Fix CLI help (by Marcel Gerber).
+* Add KaiOS browser to docs.
+
 ## 4.5.4
 * Update docs (by Andrew Leedham and Dan Onoshko).
 

package/README.md

@@ -73,13 +73,12 @@ You can test Browserslist queries in [online demo].
 
 * [`browserslist-ga`] downloads your website browsers statistics
   to use it in `> 0.5% in my stats` query.
-* [`browserslist-useragent`] checks browser by user agent string
-  to match Browserslist target browsers query.
-* [`browserslist-useragent-ruby`] is a Ruby library to checks browser
-  by user agent string to match Browserslist.
 * [`browserslist-useragent-regexp`] compiles Browserslist query to a RegExp
   to test browser useragent.
-* [`browserslist-browserstack`] runs BrowserStack tests for all browsers in Browserslist config.
+* [`browserslist-useragent-ruby`] is a Ruby library to checks browser
+  by user agent string to match Browserslist.
+* [`browserslist-browserstack`] runs BrowserStack tests for all browsers
+  in Browserslist config.
 * [`caniuse-api`] returns browsers which support some specific feature.
 * Run `npx browserslist` in your project directory to see project’s
   target browsers. This CLI tool is built-in and available in any project
@@ -93,6 +92,34 @@ You can test Browserslist queries in [online demo].
 [`browserslist-browserstack`]:     https://github.com/xeroxinteractive/browserslist-browserstack
 
 
+## 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:
+
+  ```json
+    "browserslist": [
+      "defaults"
+    ]
+  ```
+
+* 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.
+* 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.
+
+
 ## Queries
 
 Browserslist will use browsers and Node.js versions query
@@ -133,25 +160,6 @@ _A quick way to test your query is to do `npx browserslist '> 0.5%, not IE 11'`
 in your terminal._
 
 
-### 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.
-* 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.
-* 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.
-
-
 ### Full List
 
 You can specify the browser and Node.js versions by queries (case insensitive):
@@ -261,6 +269,7 @@ Names are case insensitive:
 * `Safari` for desktop Safari.
 * `Samsung` for Samsung Internet.
 * `UCAndroid` or `and_uc` for UC Browser for Android.
+* `kaios` for KaiOS Browser.
 
 
 ## `package.json`
@@ -464,7 +473,7 @@ var browserslist = require('browserslist');
 
 // Your CSS/JS build tool code
 var process = function (source, opts) {
-    var browsers = browserslist(opts.browsers, {
+    var browsers = browserslist(opts.overrideBrowserslist, {
         stats: opts.stats,
         path:  opts.file,
         env:   opts.env
@@ -490,6 +499,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:
 

package/cli.js

@@ -13,7 +13,7 @@ var USAGE = 'Usage:\n' +
             '  ' + pkg.name + ' --config="path/to/browserlist/file"\n' +
             '  ' + pkg.name + ' --coverage "QUERIES"\n' +
             '  ' + pkg.name + ' --coverage=US "QUERIES"\n' +
-            '  ' + pkg.name + ' --coverage=US,RU,world "QUERIES"\n' +
+            '  ' + pkg.name + ' --coverage=US,RU,global "QUERIES"\n' +
             '  ' + pkg.name + ' --env="environment name defined in config"\n' +
             '  ' + pkg.name + ' --stats="path/to/browserlist/stats/file"'
 

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 {
@@ -274,6 +302,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 +333,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 +459,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 = { }
 
@@ -738,10 +779,12 @@ var QUERIES = [
   {
     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')
       }
 
@@ -760,8 +803,8 @@ 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)
@@ -774,15 +817,16 @@ var QUERIES = [
   {
     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]
         })
     }
   },
   {
-    regexp: /^node\s*(>=?|<=?)\s*([\d.]+)$/,
+    regexp: /^node\s*(>=?|<=?)\s*([\d.]+)$/i,
     select: function (context, sign, version) {
       var nodeVersions = jsReleases.filter(function (i) {
         return i.name === 'nodejs'
@@ -826,7 +870,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 +924,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 +933,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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browserslist",
-  "version": "4.5.4",
+  "version": "4.6.1",
   "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.30000955",
-    "electron-to-chromium": "^1.3.122",
-    "node-releases": "^1.1.13"
+    "caniuse-lite": "^1.0.30000971",
+    "electron-to-chromium": "^1.3.137",
+    "node-releases": "^1.1.21"
   },
   "bin": "./cli.js",
   "browser": {