browserslist 4.6.6 → 4.7.3

package/CHANGELOG.md

@@ -1,6 +1,21 @@
 # Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 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.
+
+## 4.7
+* Add PhantomJS queries.
+* Improve docs (by Dorian Koehring).
+
 ## 4.6.6
 * Remove Safari from `dead` query.
 

package/README.md

@@ -45,7 +45,6 @@ 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
@@ -62,7 +61,6 @@ 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
@@ -73,16 +71,17 @@ You can test Browserslist queries in [online demo].
 2. [Best Practices](#best-practices)
 3. [Queries](#queries)
 4. [Config File](#config-file)
-5. [Configuring for Different Environments](#configuring-for-different-environments)
-6. [Custom Usage Data](#custom-usage-data)
-7. [JS API](#js-api)
-8. [Environment Variables](#environment-variables)
-9. [Cache](#cache)
+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
@@ -94,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
@@ -133,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.**
@@ -194,6 +194,8 @@ 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`:
@@ -407,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
 {
@@ -424,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

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)
         }
       }
@@ -297,6 +289,8 @@ function resolve (queries, context) {
   }, [])
 }
 
+var cache = { }
+
 /**
  * Return array of browsers by selection queries.
  *
@@ -358,7 +352,10 @@ function browserslist (queries, opts) {
     }
   }
 
-  var result = resolve(queries, context).sort(function (name1, name2) {
+  var cacheKey = JSON.stringify([queries, context])
+  if (cache[cacheKey]) return cache[cacheKey]
+
+  var result = uniq(resolve(queries, context)).sort(function (name1, name2) {
     name1 = name1.split(' ')
     name2 = name2.split(' ')
     if (name1[0] === name2[0]) {
@@ -371,39 +368,20 @@ function browserslist (queries, opts) {
       return compare(name1[0], name2[0])
     }
   })
-
-  return uniq(result)
+  if (!process.env.BROWSERSLIST_DISABLE_CACHE) {
+    cache[cacheKey] = result
+  }
+  return 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 +835,7 @@ var QUERIES = [
   {
     regexp: /^(firefox|ff|fx)\s+esr$/i,
     select: function () {
-      return ['firefox 68', 'firefox 60']
+      return ['firefox 68']
     }
   },
   {
@@ -918,6 +896,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) {

package/node.js

@@ -42,7 +42,8 @@ function isFile (file) {
 }
 
 function eachParent (file, callback) {
-  var loc = path.resolve(file)
+  var dir = isFile(file) ? path.dirname(file) : file
+  var loc = path.resolve(dir)
   do {
     var result = callback(loc)
     if (typeof result !== 'undefined') return result
@@ -83,7 +84,8 @@ function parsePackage (file) {
   var config = JSON.parse(fs.readFileSync(file))
   if (config.browserlist && !config.browserslist) {
     throw new BrowserslistError(
-      '`browserlist` key instead of `browserslist` in ' + file)
+      '`browserlist` key instead of `browserslist` in ' + file
+    )
   }
   var list = config.browserslist
   if (Array.isArray(list) || typeof list === 'string') {
@@ -116,7 +118,8 @@ module.exports = {
     var queries = require(require.resolve(name, { paths: ['.'] }))
     if (!Array.isArray(queries)) {
       throw new BrowserslistError(
-        '`' + name + '` config exports not an array of queries')
+        '`' + name + '` config exports not an array of queries'
+      )
     }
     return queries
   },
@@ -214,7 +217,8 @@ module.exports = {
           sections.forEach(function (section) {
             if (result[section]) {
               throw new BrowserslistError(
-                'Duplicate section ' + section + ' in Browserslist config')
+                'Duplicate section ' + section + ' in Browserslist config'
+              )
             }
             result[section] = []
           })
@@ -238,12 +242,14 @@ module.exports = {
   findConfig: function findConfig (from) {
     from = path.resolve(from)
 
-    var cacheKey = isFile(from) ? path.dirname(from) : from
-    if (cacheKey in configCache) {
-      return configCache[cacheKey]
-    }
-
+    var passed = []
     var resolved = eachParent(from, function (dir) {
+      if (dir in configCache) {
+        return configCache[dir]
+      }
+
+      passed.push(dir)
+
       var config = path.join(dir, 'browserslist')
       var pkg = path.join(dir, 'package.json')
       var rc = path.join(dir, '.browserslistrc')
@@ -255,19 +261,23 @@ module.exports = {
         } catch (e) {
           if (e.name === 'BrowserslistError') throw e
           console.warn(
-            '[Browserslist] Could not parse ' + pkg + '. Ignoring it.')
+            '[Browserslist] Could not parse ' + pkg + '. Ignoring it.'
+          )
         }
       }
 
       if (isFile(config) && pkgBrowserslist) {
         throw new BrowserslistError(
-          dir + ' contains both browserslist and package.json with browsers')
+          dir + ' contains both browserslist and package.json with browsers'
+        )
       } else if (isFile(rc) && pkgBrowserslist) {
         throw new BrowserslistError(
-          dir + ' contains both .browserslistrc and package.json with browsers')
+          dir + ' contains both .browserslistrc and package.json with browsers'
+        )
       } else if (isFile(config) && isFile(rc)) {
         throw new BrowserslistError(
-          dir + ' contains both .browserslistrc and browserslist')
+          dir + ' contains both .browserslistrc and browserslist'
+        )
       } else if (isFile(config)) {
         return module.exports.readConfig(config)
       } else if (isFile(rc)) {
@@ -277,7 +287,9 @@ module.exports = {
       }
     })
     if (!process.env.BROWSERSLIST_DISABLE_CACHE) {
-      configCache[cacheKey] = resolved
+      passed.forEach(function (dir) {
+        configCache[dir] = resolved
+      })
     }
     return resolved
   },

package/package.json

@@ -1,23 +1,34 @@
 {
   "name": "browserslist",
-  "version": "4.6.6",
+  "version": "4.7.3",
   "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.30000984",
-    "electron-to-chromium": "^1.3.191",
-    "node-releases": "^1.1.25"
+    "caniuse-lite": "^1.0.30001010",
+    "electron-to-chromium": "^1.3.306",
+    "node-releases": "^1.1.40"
   },
   "bin": "./cli.js",
   "browser": {
     "./node.js": "./browser.js",
     "path": false
+  },
+  "eslintIgnore": [
+    "test/fixtures"
+  ],
+  "sharec": {
+    "config": "@logux/sharec-config",
+    "version": "0.5.6"
   }
 }