browserslist 4.6.3 → 4.7.0

package/CHANGELOG.md

@@ -1,6 +1,20 @@
 # Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 4.7
+* Add PhantomJS queries.
+* Improve docs (by Dorian Koehring).
+
+## 4.6.6
+* Remove Safari from `dead` query.
+
+## 4.6.5
+* Add Samsung 4 browser to `dead` query.
+* Remove dirty fix for `android all` error.
+
+## 4.6.4
+* Add Firefox 68 to `Firefox ESR` query.
+
 ## 4.6.3
 * Dirty fix for `android all` error.
 

package/README.md

@@ -14,7 +14,6 @@ front-end tools. It is used in:
 * [postcss-normalize]
 * [obsolete-webpack-plugin]
 
-[Browserslist Example] shows how every tool uses Browserslist.
 All tools will find target browsers automatically,
 when you add the following to `package.json`:
 
@@ -46,7 +45,7 @@ Browserslist will take queries from tool option,
 `browserslist` config, `.browserslistrc` config,
 `browserslist` section in `package.json` or environment variables.
 
-You can test Browserslist queries in [online demo].
+[Browserslist Example] shows how every tool uses Browserslist.
 
 [cult-img]: https://cultofmartians.com/assets/badges/badge.svg
 [cult]: https://cultofmartians.com/done.html
@@ -62,15 +61,27 @@ You can test Browserslist queries in [online demo].
 [postcss-preset-env]:                        https://github.com/jonathantneal/postcss-preset-env
 [postcss-normalize]:                         https://github.com/jonathantneal/postcss-normalize
 [Autoprefixer]:                              https://github.com/postcss/autoprefixer
-[online demo]:                               https://browserl.ist/
 [Can I Use]:                                 https://caniuse.com/
 [Babel]:                                     https://github.com/babel/babel/tree/master/packages/babel-preset-env
 [obsolete-webpack-plugin]:                   https://github.com/ElemeFE/obsolete-webpack-plugin
 
+## Table of Contents
+
+1. [Tools](#tools)
+2. [Best Practices](#best-practices)
+3. [Queries](#queries)
+4. [Config File](#config-file)
+5. [Shareable Configs](#shareable-configs)
+6. [Configuring for Different Environments](#configuring-for-different-environments)
+7. [Custom Usage Data](#custom-usage-data)
+8. [JS API](#js-api)
+9. [Environment Variables](#environment-variables)
+10. [Cache](#cache)
+
 ## Tools
 
-* [`browserslist-ga`] downloads your website browsers statistics
-  to use it in `> 0.5% in my stats` query.
+* [`browserslist-ga`] and [`browserslist-ga-export`] download your website
+  browsers statistics to use it in `> 0.5% in my stats` query.
 * [`browserslist-useragent-regexp`] compiles Browserslist query to a RegExp
   to test browser useragent.
 * [`browserslist-useragent-ruby`] is a Ruby library to checks browser
@@ -82,12 +93,13 @@ You can test Browserslist queries in [online demo].
   target browsers. This CLI tool is built-in and available in any project
   with Autoprefixer.
 
+[`browserslist-useragent-regexp`]: https://github.com/browserslist/browserslist-useragent-regexp
 [`browserslist-useragent-ruby`]:   https://github.com/browserslist/browserslist-useragent-ruby
+[`browserslist-browserstack`]:     https://github.com/xeroxinteractive/browserslist-browserstack
+[`browserslist-ga-export`]:        https://github.com/browserslist/browserslist-ga-export
 [`browserslist-useragent`]:        https://github.com/pastelsky/browserslist-useragent
-[`browserslist-useragent-regexp`]: https://github.com/browserslist/browserslist-useragent-regexp
 [`browserslist-ga`]:               https://github.com/browserslist/browserslist-ga
 [`caniuse-api`]:                   https://github.com/Nyalab/caniuse-api
-[`browserslist-browserstack`]:     https://github.com/xeroxinteractive/browserslist-browserstack
 
 
 ## Best Practices
@@ -121,7 +133,7 @@ You can test Browserslist queries in [online demo].
 ## Queries
 
 Browserslist will use browsers and Node.js versions query
-from one of this sources:
+from one of these sources:
 
 1. `browserslist` key in `package.json` file in current or parent directories.
    **We recommend this way.**
@@ -144,14 +156,14 @@ intersection of the previous query: `last 1 version and > 1%`.
 There is 3 different ways to combine queries as depicted below. First you start
 with a single query and then we combine the queries to get our final list.
 
-Obviously you can *not* start with a `not` combiner, since the is no left-hand
+Obviously you can *not* start with a `not` combiner, since there is no left-hand
 side query to combine it with.
 
 | Query combiner type | Illustration | Example |
 | ------------------- | :----------: | ------- |
-|`or`/ `,` combiner <br> (union) | ![Union of queries](img/union.svg)  | `'> .5% or last 2 versions'` <br> `'> .5%, last 2 versions'` |
-| `and` combiner <br> (intersection) | ![intersection of queries](img/intersection.svg) | `'> .5% and last 2 versions'` |
-| `not` combiner <br> (relative complement) | ![Relative complement of queries](img/complement.svg) | `'> .5% and not last 2 versions'` <br> `'> .5% or not last 2 versions'` <br> `'> .5%, not last 2 versions'` |
+|`or`/`,` combiner <br> (union) | ![Union of queries](img/union.svg)  | `> .5% or last 2 versions` <br> `> .5%, last 2 versions` |
+| `and` combiner <br> (intersection) | ![intersection of queries](img/intersection.svg) | `> .5% and last 2 versions` |
+| `not` combiner <br> (relative complement) | ![Relative complement of queries](img/complement.svg) | `> .5% and not last 2 versions` <br> `> .5% or not last 2 versions` <br> `> .5%, not last 2 versions` |
 
 _A quick way to test your query is to do `npx browserslist '> 0.5%, not IE 11'`
 in your terminal._
@@ -182,16 +194,17 @@ You can specify the browser and Node.js versions by queries (case insensitive):
   `>=`, `<` and `<=` work too. It also works with Node.js.
 * `iOS 7`: the iOS browser version 7 directly.
 * `Firefox ESR`: the latest [Firefox ESR] version.
+* `PhantomJS 2.1` and `PhantomJS 1.9`: selects Safari versions similar
+  to PhantomJS runtime.
 * `unreleased versions` or `unreleased Chrome versions`:
   alpha and beta versions.
 * `last 2 major versions` or `last 2 iOS major versions`:
   all minor/patch releases of last 2 major versions.
 * `since 2015` or `last 2 years`: all versions released since year 2015
   (also `since 2015-03` and `since 2015-03-10`).
-* `dead`: browsers from `last 2 version` query, but with less than 0.5%
-  in global usage statistics and without official support or updates
-  for 24 months. Right now it is `IE 10`, `IE_Mob 10`, `BlackBerry 10`,
-  `BlackBerry 7`, and `OperaMobile 12.1`.
+* `dead`: browsers without official support or updates for 24 months.
+  Right now it is `IE 10`, `IE_Mob 10`, `BlackBerry 10`, `BlackBerry 7`,
+  `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
@@ -258,7 +271,9 @@ Names are case insensitive:
 * `kaios` for KaiOS Browser.
 
 
-## `package.json`
+## Config File
+
+### `package.json`
 
 If you want to reduce config files in project root, you can specify
 browsers in `package.json` with `browserslist` key:
@@ -278,9 +293,9 @@ browsers in `package.json` with `browserslist` key:
 ```
 
 
-## Config File
+### `.browserslistrc`
 
-Browserslist config should be named `.browserslistrc` or `browserslist`
+Separated Browserslist config should be named `.browserslistrc`
 and have browsers queries split by a new line. Comments starts with `#` symbol:
 
 ```yaml
@@ -343,46 +358,7 @@ module.exports = [
 ```
 
 
-## Environment Variables
-
-If some tool use Browserslist inside, you can change browsers settings
-by [environment variables]:
-
-* `BROWSERSLIST` with browsers queries.
-
-   ```sh
-  BROWSERSLIST="> 5%" gulp css
-   ```
-
-* `BROWSERSLIST_CONFIG` with path to config file.
-
-   ```sh
-  BROWSERSLIST_CONFIG=./config/browserslist gulp css
-   ```
-
-* `BROWSERSLIST_ENV` with environments string.
-
-   ```sh
-  BROWSERSLIST_ENV="development" gulp css
-   ```
-
-* `BROWSERSLIST_STATS` with path to the custom usage data
-  for `> 1% in my stats` query.
-
-   ```sh
-  BROWSERSLIST_STATS=./config/usage_data.json gulp css
-   ```
-
-* `BROWSERSLIST_DISABLE_CACHE` if you want to disable config reading cache.
-
-   ```sh
-  BROWSERSLIST_DISABLE_CACHE=1 gulp css
-   ```
-
-[environment variables]: https://en.wikipedia.org/wiki/Environment_variable
-
-
-## Environments
+## Configuring for Different Environments
 
 You can also specify different browser queries for various environments.
 Browserslist will choose query according to `BROWSERSLIST_ENV` or `NODE_ENV`
@@ -433,8 +409,10 @@ If you have a website, you can query against the usage statistics of your site.
 npx browserslist-ga
 ```
 
-Of course, you can generate usage statistics file by any other method.
-File format should be like:
+Or you can use [`browserslist-ga-export`] to convert Google Analytics data without giving a password for Google account.
+
+You can generate usage statistics file by any other method. File format should
+be like:
 
 ```js
 {
@@ -450,12 +428,13 @@ File format should be like:
 }
 ```
 
-Note that you can query against your custom usage data
-while also querying against global or regional data.
-For example, the query `> 1% in my stats, > 5% in US, 10%` is permitted.
+Note that you can query against your custom usage data while also querying
+against global or regional data. For example, the query
+`> 1% in my stats, > 5% in US, 10%` is permitted.
 
-[`browserslist-ga`]: https://github.com/browserslist/browserslist-ga
-[Can I Use]:         https://caniuse.com/
+[`browserslist-ga-export`]: https://github.com/browserslist/browserslist-ga-export
+[`browserslist-ga`]:        https://github.com/browserslist/browserslist-ga
+[Can I Use]:                https://caniuse.com/
 
 
 ## JS API
@@ -502,9 +481,6 @@ For non-JS environment and debug purpose you can use CLI tool:
 browserslist "> 1%, IE 10"
 ```
 
-
-## Coverage
-
 You can get total users coverage for selected browsers by JS API:
 
 ```js
@@ -550,6 +526,45 @@ These browsers account for 83.1% of all users in custom statistics
 ```
 
 
+## Environment Variables
+
+If some tool use Browserslist inside, you can change browsers settings
+by [environment variables]:
+
+* `BROWSERSLIST` with browsers queries.
+
+   ```sh
+  BROWSERSLIST="> 5%" gulp css
+   ```
+
+* `BROWSERSLIST_CONFIG` with path to config file.
+
+   ```sh
+  BROWSERSLIST_CONFIG=./config/browserslist gulp css
+   ```
+
+* `BROWSERSLIST_ENV` with environments string.
+
+   ```sh
+  BROWSERSLIST_ENV="development" gulp css
+   ```
+
+* `BROWSERSLIST_STATS` with path to the custom usage data
+  for `> 1% in my stats` query.
+
+   ```sh
+  BROWSERSLIST_STATS=./config/usage_data.json gulp css
+   ```
+
+* `BROWSERSLIST_DISABLE_CACHE` if you want to disable config reading cache.
+
+   ```sh
+  BROWSERSLIST_DISABLE_CACHE=1 gulp css
+   ```
+
+[environment variables]: https://en.wikipedia.org/wiki/Environment_variable
+
+
 ## Cache
 
 Browserslist caches the configuration it reads from `package.json` and

package/index.js

@@ -10,10 +10,7 @@ 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
 
-// Enum values MUST be powers of 2, so combination are safe
-/** @constant {number} */
 var QUERY_OR = 1
-/** @constant {number} */
 var QUERY_AND = 2
 
 function isVersionsMatch (versionA, versionB) {
@@ -265,14 +262,10 @@ function resolve (queries, context) {
           case QUERY_AND:
             if (isExclude) {
               return result.filter(function (j) {
-                // remove result items that are in array
-                // (the relative complement of array in result)
                 return array.indexOf(j) === -1
               })
             } else {
               return result.filter(function (j) {
-                // remove result items not in array
-                // (intersect of result and array)
                 return array.indexOf(j) !== -1
               })
             }
@@ -287,7 +280,6 @@ function resolve (queries, context) {
                 return !filter[j]
               })
             }
-            // union of result and array
             return result.concat(array)
         }
       }
@@ -375,35 +367,14 @@ function browserslist (queries, opts) {
   return uniq(result)
 }
 
-/**
- * @typedef {object} BrowserslistQuery
- * @property {number} type A type constant like QUERY_OR @see QUERY_OR.
- * @property {string} queryString A query like "not ie < 11".
- */
-
-/**
- * Parse a browserslist string query
- * @param {string} queries One or more queries as a string
- * @returns {BrowserslistQuery[]} An array of BrowserslistQuery
- */
 function parse (queries) {
   var qs = []
-
   do {
     queries = doMatch(queries, qs)
   } while (queries)
-
   return qs
 }
 
-/**
- * Find query matches in a string. This function is meant to be called
- * repeatedly with the returned query string until there is no more matches.
- * @param {string} string A string with one or more queries.
- * @param {BrowserslistQuery[]} qs Out parameter,
- * will be filled with `BrowserslistQuery`.
- * @returns {string} The rest of the query string minus the matched part.
- */
 function doMatch (string, qs) {
   var or = /^(?:,\s*|\s+OR\s+)(.*)/i
   var and = /^\s+AND\s+(.*)/i
@@ -857,7 +828,7 @@ var QUERIES = [
   {
     regexp: /^(firefox|ff|fx)\s+esr$/i,
     select: function () {
-      return ['firefox 60']
+      return ['firefox 68', 'firefox 60']
     }
   },
   {
@@ -918,6 +889,18 @@ var QUERIES = [
       return resolve(queries, context)
     }
   },
+  {
+    regexp: /^phantomjs\s+1.9$/i,
+    select: function () {
+      return ['safari 5']
+    }
+  },
+  {
+    regexp: /^phantomjs\s+2.1$/i,
+    select: function () {
+      return ['safari 6']
+    }
+  },
   {
     regexp: /^(\w+)\s+(tp|[\d.]+)$/i,
     select: function (context, name, version) {
@@ -957,19 +940,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) {
-      var dead = ['ie <= 10', 'ie_mob <= 10', 'bb <= 10', 'op_mob <= 12.1']
+      var dead = [
+        'ie <= 10', 'ie_mob <= 10',
+        'bb <= 10',
+        'op_mob <= 12.1',
+        'samsung 4'
+      ]
       return resolve(dead, context)
     }
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browserslist",
-  "version": "4.6.3",
+  "version": "4.7.0",
   "description": "Share target browsers between different front-end tools, like Autoprefixer, Stylelint and babel-env-preset",
   "keywords": [
     "caniuse",
@@ -11,13 +11,19 @@
   "license": "MIT",
   "repository": "browserslist/browserslist",
   "dependencies": {
-    "caniuse-lite": "^1.0.30000975",
-    "electron-to-chromium": "^1.3.164",
-    "node-releases": "^1.1.23"
+    "caniuse-lite": "^1.0.30000989",
+    "electron-to-chromium": "^1.3.247",
+    "node-releases": "^1.1.29"
   },
   "bin": "./cli.js",
   "browser": {
     "./node.js": "./browser.js",
     "path": false
+  },
+  "eslintIgnore": [
+    "test/fixtures"
+  ],
+  "sharec": {
+    "version": "0.4.2"
   }
 }