browserslist 4.11.0 → 4.12.2

package/CHANGELOG.md

@@ -1,6 +1,20 @@
 # Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 4.12.2
+* Update Firefox ESR.
+
+## 4.12.1
+* Update `package.json` scanning tool for `--update-db` (by Luke Edwards).
+* Improve docs (by Mukundan Senthil).
+
+## 4.12
+* Add environments to shared configs (by Yevgeny Petukhov).
+* Fix docs (by Dmitry Statsenko and Thomas Pozzo di Borgo).
+
+## 4.11.1
+* FIx Node.js 6 support.
+
 ## 4.11
 * Add `npx browserslist --mobile-to-desktop` (by James Ross).
 

package/README.md

@@ -17,12 +17,12 @@ front-end tools. It is used in:
 All tools will find target browsers automatically,
 when you add the following to `package.json`:
 
-```js
+```json
   "browserslist": [
     "defaults",
     "not IE 11",
     "not IE_Mob 11",
-    "maintained node versions",
+    "maintained node versions"
   ]
 ```
 
@@ -68,16 +68,24 @@ Browserslist will take queries from tool option,
 
 ## 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](#tools)
+* [Best Practices](#best-practices)
+* [Queries](#queries)
+  * [Query Composition](#query-composition)
+  * [Full List](#full-list)
+  * [Debug](#debug)
+  * [Browsers](#browsers)
+* [Config File](#config-file)
+  * [`package.json`](#packagejson)
+  * [`.browserslistrc`](#browserslistrc)
+* [Shareable Configs](#shareable-configs)
+* [Configuring for Different Environments](#configuring-for-different-environments)
+* [Custom Usage Data](#custom-usage-data)
+* [JS API](#js-api)
+* [Environment Variables](#environment-variables)
+* [Cache](#cache)
+* [Security Contact](#security-contact)
+* [For Enterprise](#for-enterprise)
 
 ## Tools
 
@@ -162,13 +170,16 @@ 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 there is no left-hand
-side query to combine it with.
+side query to combine it with. The left-hand is always resolved as `and`
+combiner even if `or` is used (this is an API implementation specificity).
+
+`and` combiner has precedence over `or` combiner.
 
 | 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` |
+| `not` combiner <br> (relative complement) | ![Relative complement of queries](img/complement.svg) | All those three are equivalent to the first one <br> `> .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._
@@ -212,7 +223,7 @@ You can specify the browser and Node.js versions by queries (case insensitive):
 * `since 2015` or `last 2 years`: all versions released since year 2015
   (also `since 2015-03` and `since 2015-03-10`).
 * `dead`: browsers without official support or updates for 24 months.
-  Right now it is `IE 10`, `IE_Mob 10`, `BlackBerry 10`, `BlackBerry 7`,
+  Right now it is `IE 10`, `IE_Mob 11`, `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.
@@ -303,7 +314,8 @@ browsers in `package.json` with `browserslist` key:
 ### `.browserslistrc`
 
 Separated Browserslist config should be named `.browserslistrc`
-and have browsers queries split by a new line. Comments starts with `#` symbol:
+and have browsers queries split by a new line.
+Each line is combined with the `or` combiner. Comments starts with `#` symbol:
 
 ```yaml
 # Browsers that we support
@@ -365,8 +377,25 @@ 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.
+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.
+
+You can export configs for different environments and select environment
+by `BROWSERSLIST_ENV` or `env` option in your tool:
+
+```js
+module.exports = {
+  development: [
+    'last 1 version'
+  ],
+  production: [
+    'last 1 version',
+    '> 1%',
+    'ie 10'
+  ]
+}
+```
 
 
 ## Configuring for Different Environments
@@ -598,3 +627,14 @@ To report a security vulnerability, please use the [Tidelift security contact].
 Tidelift will coordinate the fix and disclosure.
 
 [Tidelift security contact]: https://tidelift.com/security
+
+
+## For Enterprise
+
+Available as part of the Tidelift Subscription.
+
+The maintainers of `browserslist` and thousands of other packages are working
+with Tidelift to deliver commercial support and maintenance for the open source
+dependencies you use to build your applications. Save time, reduce risk,
+and improve code health, while paying the maintainers of the exact dependencies
+you use. [Learn more.](https://tidelift.com/subscription/pkg/npm-browserslist?utm_source=npm-browserslist&utm_medium=referral&utm_campaign=enterprise&utm_term=repo)

package/index.js

@@ -424,7 +424,8 @@ function browserslist (queries, opts) {
   var context = {
     ignoreUnknownVersions: opts.ignoreUnknownVersions,
     dangerousExtend: opts.dangerousExtend,
-    mobileToDesktop: opts.mobileToDesktop
+    mobileToDesktop: opts.mobileToDesktop,
+    env: opts.env
   }
 
   env.oldDataWarning(browserslist.data)
@@ -645,7 +646,7 @@ var QUERIES = [
   {
     regexp: /^last\s+(\d+)\s+electron\s+major\s+versions?$/i,
     select: function (context, versions) {
-      var validVersions = getMajorVersions(Object.keys(e2c).reverse(), versions)
+      var validVersions = getMajorVersions(Object.keys(e2c), versions)
       return validVersions.map(function (i) {
         return 'chrome ' + e2c[i]
       })
@@ -989,7 +990,7 @@ var QUERIES = [
   {
     regexp: /^(firefox|ff|fx)\s+esr$/i,
     select: function () {
-      return ['firefox 68']
+      return ['firefox 68', 'firefox 78']
     }
   },
   {

package/node.js

@@ -156,12 +156,18 @@ module.exports = {
     if (!context.dangerousExtend) checkExtend(name)
     // eslint-disable-next-line security/detect-non-literal-require
     var queries = require(require.resolve(name, { paths: ['.'] }))
-    if (!Array.isArray(queries)) {
-      throw new BrowserslistError(
-        '`' + name + '` config exports not an array of queries'
-      )
+    if (queries) {
+      if (Array.isArray(queries)) {
+        return queries
+      } else if (typeof queries === 'object') {
+        if (!queries.defaults) queries.defaults = []
+        return pickEnv(queries, context, name)
+      }
     }
-    return queries
+    throw new BrowserslistError(
+      '`' + name + '` config exports not an array of queries' +
+      ' or an object of envs'
+    )
   },
 
   loadStat: function loadStat (context, name, data) {
@@ -342,10 +348,9 @@ module.exports = {
     var halfYearAgo = Date.now() - TIME_TO_UPDATE_CANIUSE
 
     if (latest !== 0 && latest < halfYearAgo) {
-      var command = 'npx browserslist --update-db'
       console.warn(
-        'Browserslist: caniuse-lite is outdated. ' +
-        'Please run the following command: `' + command + '`'
+        'Browserslist: caniuse-lite is outdated. Please run:\n' +
+        'npx browserslist@latest --update-db'
       )
     }
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browserslist",
-  "version": "4.11.0",
+  "version": "4.12.2",
   "description": "Share target browsers between different front-end tools, like Autoprefixer, Stylelint and babel-env-preset",
   "keywords": [
     "caniuse",
@@ -15,17 +15,17 @@
   "license": "MIT",
   "repository": "browserslist/browserslist",
   "dependencies": {
-    "caniuse-lite": "^1.0.30001035",
-    "electron-to-chromium": "^1.3.380",
-    "node-releases": "^1.1.52",
-    "pkg-up": "^3.1.0"
+    "caniuse-lite": "^1.0.30001088",
+    "electron-to-chromium": "^1.3.483",
+    "escalade": "^3.0.1",
+    "node-releases": "^1.1.58"
+  },
+  "engines": {
+    "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
   },
   "bin": "./cli.js",
   "browser": {
     "./node.js": "./browser.js",
     "path": false
-  },
-  "eslintIgnore": [
-    "test/fixtures"
-  ]
+  }
 }

package/update-db.js

@@ -1,30 +1,33 @@
 var childProcess = require('child_process')
-var pkgUp = require('pkg-up')
+var escalade = require('escalade/sync')
 var path = require('path')
 var fs = require('fs')
 
 var BrowserslistError = require('./error')
 
 function detectLockfile () {
-  var packagePath = pkgUp.sync()
-  if (!packagePath) {
+  var packageDir = escalade('.', function (dir, names) {
+    return names.indexOf('package.json') !== -1 ? dir : ''
+  })
+
+  if (!packageDir) {
     throw new BrowserslistError(
       'Cannot find package.json. ' +
       'Is it a right project to run npx browserslist --update-db?'
     )
   }
 
-  var rootDir = path.dirname(packagePath)
-  var lockfileNpm = path.join(rootDir, 'package-lock.json')
-  var lockfileYarn = path.join(rootDir, 'yarn.lock')
-  var lockfilePnpm = path.join(rootDir, 'pnpm-lock.yaml')
+  var lockfileNpm = path.join(packageDir, 'package-lock.json')
+  var lockfileYarn = path.join(packageDir, 'yarn.lock')
+  var lockfilePnpm = path.join(packageDir, 'pnpm-lock.yaml')
 
-  if (fs.existsSync(lockfileNpm)) {
+  /* istanbul ignore next */
+  if (fs.existsSync(lockfilePnpm)) {
+    return { mode: 'pnpm', file: lockfilePnpm }
+  } else if (fs.existsSync(lockfileNpm)) {
     return { mode: 'npm', file: lockfileNpm }
   } else if (fs.existsSync(lockfileYarn)) {
     return { mode: 'yarn', file: lockfileYarn }
-  } else if (fs.existsSync(lockfilePnpm)) {
-    return { mode: 'pnpm', file: lockfilePnpm }
   } else {
     throw new BrowserslistError(
       'No lockfile found. Run "npm install", "yarn install" or "pnpm install"'
@@ -34,7 +37,11 @@ function detectLockfile () {
 
 function getCurrentVersion (lock) {
   var match
-  if (lock.mode === 'npm') {
+  /* istanbul ignore if */
+  if (lock.mode === 'pnpm') {
+    match = /\/caniuse-lite\/([^:]+):/.exec(lock.content)
+    if (match[1]) return match[1]
+  } else if (lock.mode === 'npm') {
     var dependencies = JSON.parse(lock.content).dependencies
     if (dependencies && dependencies['caniuse-lite']) {
       return dependencies['caniuse-lite'].version
@@ -42,9 +49,6 @@ function getCurrentVersion (lock) {
   } else if (lock.mode === 'yarn') {
     match = /caniuse-lite@[^:]+:\n\s+version\s+"([^"]+)"/.exec(lock.content)
     if (match[1]) return match[1]
-  } else if (lock.mode === 'pnpm') {
-    match = /\/caniuse-lite\/([^:]+):/.exec(lock.content)
-    if (match[1]) return match[1]
   }
   return null
 }
@@ -62,22 +66,8 @@ function updateLockfile (lock, latest) {
   } else {
     var lines = lock.content.split('\n')
     var i
-    if (lock.mode === 'yarn') {
-      for (i = 0; i < lines.length; i++) {
-        if (lines[i].indexOf('caniuse-lite@') !== -1) {
-          lines[i + 1] = lines[i + 1].replace(
-            /version "[^"]+"/, 'version "' + latest.version + '"'
-          )
-          lines[i + 2] = lines[i + 2].replace(
-            /resolved "[^"]+"/, 'resolved "' + latest.dist.tarball + '"'
-          )
-          lines[i + 3] = lines[i + 3].replace(
-            /integrity .+/, 'integrity ' + latest.dist.integrity
-          )
-          i += 4
-        }
-      }
-    } else if (lock.mode === 'pnpm') {
+    /* istanbul ignore if */
+    if (lock.mode === 'pnpm') {
       for (i = 0; i < lines.length; i++) {
         if (lines[i].indexOf('caniuse-lite:') >= 0) {
           lines[i] = lines[i].replace(/: .*$/, ': ' + latest.version)
@@ -94,6 +84,21 @@ function updateLockfile (lock, latest) {
           }
         }
       }
+    } else if (lock.mode === 'yarn') {
+      for (i = 0; i < lines.length; i++) {
+        if (lines[i].indexOf('caniuse-lite@') !== -1) {
+          lines[i + 1] = lines[i + 1].replace(
+            /version "[^"]+"/, 'version "' + latest.version + '"'
+          )
+          lines[i + 2] = lines[i + 2].replace(
+            /resolved "[^"]+"/, 'resolved "' + latest.dist.tarball + '"'
+          )
+          lines[i + 3] = lines[i + 3].replace(
+            /integrity .+/, 'integrity ' + latest.dist.integrity
+          )
+          i += 4
+        }
+      }
     }
     return lines.join('\n')
   }