browserslist 4.16.5 → 4.17.0

package/README.md

@@ -98,6 +98,8 @@ Browserslist will take queries from tool option,
 * [`browserslist-browserstack`] runs BrowserStack tests for all browsers
   in Browserslist config.
 * [`browserslist-adobe-analytics`] use Adobe Analytics data to target browsers.
+* [`browserslist-new-relic`] generate a custom usage data file for Browserslist
+  from your New Relic Browser data.
 * [`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
@@ -110,6 +112,7 @@ Browserslist will take queries from tool option,
 [`browserslist-ga-export`]:        https://github.com/browserslist/browserslist-ga-export
 [`browserslist-useragent`]:        https://github.com/pastelsky/browserslist-useragent
 [`browserslist-ga`]:               https://github.com/browserslist/browserslist-ga
+[`browserslist-new-relic`]:        https://github.com/syntactic-salt/browserslist-new-relic
 [`caniuse-api`]:                   https://github.com/Nyalab/caniuse-api
 
 
@@ -213,7 +216,7 @@ intersection of all the previous queries:
 `last 1 version or chrome > 75 and > 1%` will select
 (`browser last version` or `Chrome since 76`) and `more than 1% marketshare`.
 
-There is 3 different ways to combine queries as depicted below. First you start
+There are 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
@@ -235,7 +238,8 @@ 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.
+* By usage statistics:
+  * `> 5%`: browsers versions selected by global usage statistics.
   `>=`, `<` and `<=` work too.
   * `> 5% in US`: uses USA usage statistics.
     It accepts [two-letter country code].
@@ -247,19 +251,22 @@ You can specify the browser and Node.js versions by queries (case insensitive):
   * `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].
-* `dead`: browsers without official support or updates for 24 months.
-  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 versions:
+  * `last 2 versions`: the last 2 versions for *each* browser.
   * `last 2 Chrome versions`: the last 2 versions of Chrome browser.
   * `last 2 major versions` or `last 2 iOS major versions`:
     all minor/patch releases of last 2 major versions.
-* `node 10` and `node 10.4`: selects latest Node.js `10.x.x`
+* `dead`: browsers without official support or updates for 24 months.
+  Right now it is `IE 10`, `IE_Mob 11`, `BlackBerry 10`, `BlackBerry 7`,
+  `Samsung 4` and `OperaMobile 12.1`.
+* Node.js versions:
+  * `node 10` and `node 10.4`: selects latest Node.js `10.x.x`
   or `10.4.x` release.
   * `current node`: Node.js version used by Browserslist right now.
   * `maintained node versions`: all Node.js versions, which are [still maintained]
     by Node.js Foundation.
-* `iOS 7`: the iOS browser version 7 directly.
+* Browsers versions:
+  * `iOS 7`: the iOS browser version 7 directly.
   * `Firefox > 20`: versions of Firefox newer than 20.
     `>=`, `<` and `<=` work too. It also works with Node.js.
   * `ie 6-8`: selects an inclusive range of versions.

package/index.js

@@ -1039,7 +1039,7 @@ var QUERIES = [
   {
     regexp: /^(firefox|ff|fx)\s+esr$/i,
     select: function () {
-      return ['firefox 78']
+      return ['firefox 78', 'firefox 91']
     }
   },
   {

package/node.js

@@ -113,6 +113,9 @@ function latestReleaseTime (agents) {
 }
 
 function normalizeStats (data, stats) {
+  if (!data) {
+    data = {}
+  }
   if (stats && 'dataByBrowser' in stats) {
     stats = stats.dataByBrowser
   }
@@ -372,9 +375,8 @@ module.exports = {
     if (latest !== 0 && latest < halfYearAgo) {
       console.warn(
         'Browserslist: caniuse-lite is outdated. Please run:\n' +
-        'npx browserslist@latest --update-db\n' +
-        '\n' +
-        'Why you should do it regularly:\n' +
+        '  npx browserslist@latest --update-db\n' +
+        '  Why you should do it regularly: ' +
         'https://github.com/browserslist/browserslist#browsers-data-updating'
       )
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browserslist",
-  "version": "4.16.5",
+  "version": "4.17.0",
   "description": "Share target browsers between different front-end tools, like Autoprefixer, Stylelint and babel-env-preset",
   "keywords": [
     "caniuse",
@@ -15,11 +15,11 @@
   "license": "MIT",
   "repository": "browserslist/browserslist",
   "dependencies": {
-    "caniuse-lite": "^1.0.30001214",
-    "colorette": "^1.2.2",
-    "electron-to-chromium": "^1.3.719",
+    "caniuse-lite": "^1.0.30001254",
+    "colorette": "^1.3.0",
+    "electron-to-chromium": "^1.3.830",
     "escalade": "^3.1.1",
-    "node-releases": "^1.1.71"
+    "node-releases": "^1.1.75"
   },
   "engines": {
     "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"

package/update-db.js

@@ -24,6 +24,7 @@ function detectLockfile () {
   }
 
   var lockfileNpm = path.join(packageDir, 'package-lock.json')
+  var lockfileShrinkwrap = path.join(packageDir, 'npm-shrinkwrap.json')
   var lockfileYarn = path.join(packageDir, 'yarn.lock')
   var lockfilePnpm = path.join(packageDir, 'pnpm-lock.yaml')
 
@@ -32,7 +33,12 @@ function detectLockfile () {
   } else if (fs.existsSync(lockfileNpm)) {
     return { mode: 'npm', file: lockfileNpm }
   } else if (fs.existsSync(lockfileYarn)) {
-    return { mode: 'yarn', file: lockfileYarn }
+    var lock = { mode: 'yarn', file: lockfileYarn }
+    lock.content = fs.readFileSync(lock.file).toString()
+    lock.version = /# yarn lockfile v1/.test(lock.content) ? 1 : 2
+    return lock
+  } else if (fs.existsSync(lockfileShrinkwrap)) {
+    return { mode: 'npm', file: lockfileShrinkwrap }
   }
   throw new BrowserslistError(
     'No lockfile found. Run "npm install", "yarn install" or "pnpm install"'
@@ -41,9 +47,15 @@ function detectLockfile () {
 
 function getLatestInfo (lock) {
   if (lock.mode === 'yarn') {
-    return JSON.parse(
-      childProcess.execSync('yarn info caniuse-lite --json').toString()
-    ).data
+    if (lock.version === 1) {
+      return JSON.parse(
+        childProcess.execSync('yarn info caniuse-lite --json').toString()
+      ).data
+    } else {
+      return JSON.parse(
+        childProcess.execSync('yarn npm info caniuse-lite --json').toString()
+      )
+    }
   }
   return JSON.parse(
     childProcess.execSync('npm show caniuse-lite --json').toString()
@@ -184,7 +196,7 @@ function updatePnpmLockfile (lock, latest) {
 }
 
 function updateLockfile (lock, latest) {
-  lock.content = fs.readFileSync(lock.file).toString()
+  if (!lock.content) lock.content = fs.readFileSync(lock.file).toString()
 
   if (lock.mode === 'npm') {
     return updateNpmLockfile(lock, latest)
@@ -194,21 +206,7 @@ function updateLockfile (lock, latest) {
   return updatePnpmLockfile(lock, latest)
 }
 
-module.exports = function updateDB (print) {
-  var lock = detectLockfile()
-  var latest = getLatestInfo(lock)
-  var browsersListRetrievalError
-  var oldBrowsersList
-  try {
-    oldBrowsersList = getBrowsersList()
-  } catch (e) {
-    browsersListRetrievalError = e
-  }
-
-  print(
-    'Latest version:     ' + bold(green(latest.version)) + '\n'
-  )
-
+function updatePackageManually (print, lock, latest) {
   var lockfileData = updateLockfile(lock, latest)
   var caniuseVersions = Object.keys(lockfileData.versions).sort()
   if (caniuseVersions.length === 1 &&
@@ -257,6 +255,46 @@ module.exports = function updateDB (print) {
     yellow('$ ' + del + ' caniuse-lite') + '\n'
   )
   childProcess.execSync(del + ' caniuse-lite')
+}
+
+module.exports = function updateDB (print) {
+  var lock = detectLockfile()
+  var latest = getLatestInfo(lock)
+
+  var browsersListRetrievalError
+  var oldBrowsersList
+  try {
+    oldBrowsersList = getBrowsersList()
+  } catch (e) {
+    browsersListRetrievalError = e
+  }
+
+  print(
+    'Latest version:     ' + bold(green(latest.version)) + '\n'
+  )
+
+  if (lock.mode === 'yarn' && lock.version !== 1) {
+    var update = 'yarn up -R'
+    print(
+      'Updating caniuse-lite version\n' +
+      yellow('$ ' + update + ' caniuse-lite') + '\n'
+    )
+    try {
+      childProcess.execSync(update + ' caniuse-lite')
+    } catch (e) /* istanbul ignore next */ {
+      print(
+        red(
+          '\n' +
+          e.stack + '\n\n' +
+          'Problem with `' + update + ' caniuse-lite` call. ' +
+          'Run it manually.\n'
+        )
+      )
+      process.exit(1)
+    }
+  } else {
+    updatePackageManually(print, lock, latest)
+  }
 
   print('caniuse-lite has been successfully updated\n')