browserslist 4.15.0 → 4.16.3

package/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 4.16.3
+* Fixed `--update-db`.
+
+## 4.16.2
+* Fixed `--update-db` (by @ialarmedalien).
+
+## 4.16.1
+* Fixed Chrome 4 with `mobileToDesktop` (by Aron Woost).
+
+## 4.16
+* Add `browserslist config` query.
+
 ## 4.15
 * Add TypeScript types (by Dmitry Semigradsky).
 

package/README.md

@@ -65,6 +65,7 @@ Browserslist will take queries from tool option,
 ## Table of Contents
 
 * [Tools](#tools)
+  * [Text Editors](#text-editors)
 * [Best Practices](#best-practices)
 * [Browsers Data Updating](#browsers-data-updating)
 * [Queries](#queries)
@@ -88,8 +89,6 @@ Browserslist will take queries from tool option,
 
 * [`browserl.ist`](https://browserl.ist/) is an online tool to check
   what browsers will be selected by some query.
-* [`browserslist-vscode`] adds `.browserslistrc` syntax highlighting
-  to Visual Studio Code.
 * [`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
@@ -110,11 +109,17 @@ Browserslist will take queries from tool option,
 [`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-vscode`]:           https://marketplace.visualstudio.com/items?itemName=webben.browserslist
 [`browserslist-ga`]:               https://github.com/browserslist/browserslist-ga
 [`caniuse-api`]:                   https://github.com/Nyalab/caniuse-api
 
 
+### Text Editors
+
+These extensions will add syntax highlighting for `.browserslistrc` files.
+
+* [VS Code](https://marketplace.visualstudio.com/items?itemName=webben.browserslist)
+* [Vim](https://github.com/browserslist/vim-browserslist)
+
 ## Best Practices
 
 * There is a `defaults` query, which gives a reasonable configuration
@@ -267,6 +272,9 @@ You can specify the browser and Node.js versions by queries (case insensitive):
   `es6-module` here is the `feat` parameter at the URL of the [Can I Use]
   page. A list of all available features can be found at
   [`caniuse-lite/data/features`].
+* `browserslist config`: the browsers defined in Browserslist config. Useful
+  in Differential Serving to modify user’s config like
+  `browserslist config and supports es6-module`.
 * `since 2015` or `last 2 years`: all versions released since year 2015
   (also `since 2015-03` and `since 2015-03-10`).
 * `unreleased versions` or `unreleased Chrome versions`:
@@ -394,8 +402,7 @@ naming or prefixing the module with `@scope/browserslist-config`, such as
 `@scope/browserslist-config` or `@scope/browserslist-config-mycompany`.
 
 If you don’t accept Browserslist queries from users, you can disable the
-validation by using the or `BROWSERSLIST_DANGEROUS_EXTEND` environment variable
-or `dangerousExtend` option.
+validation by using the or `BROWSERSLIST_DANGEROUS_EXTEND` environment variable.
 
 ```sh
 BROWSERSLIST_DANGEROUS_EXTEND=1 npx webpack

package/index.js

@@ -425,6 +425,7 @@ function browserslist (queries, opts) {
     ignoreUnknownVersions: opts.ignoreUnknownVersions,
     dangerousExtend: opts.dangerousExtend,
     mobileToDesktop: opts.mobileToDesktop,
+    path: opts.path,
     env: opts.env
   }
 
@@ -1105,6 +1106,12 @@ var QUERIES = [
       return [data.name + ' ' + version]
     }
   },
+  {
+    regexp: /^browserslist config$/i,
+    select: function (context) {
+      return browserslist(undefined, context)
+    }
+  },
   {
     regexp: /^extends (.+)$/i,
     select: function (context, name) {

package/node.js

@@ -127,7 +127,7 @@ function normalizeStats (data, stats) {
       data[i] &&
       data[i].versions.length === 1
     ) {
-      var normal = Object.keys(data[i].versions)[0]
+      var normal = data[i].versions[0]
       normalized[i] = { }
       normalized[i][normal] = stats[i][versions[0]]
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browserslist",
-  "version": "4.15.0",
+  "version": "4.16.3",
   "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.30001164",
+    "caniuse-lite": "^1.0.30001181",
     "colorette": "^1.2.1",
-    "electron-to-chromium": "^1.3.612",
+    "electron-to-chromium": "^1.3.649",
     "escalade": "^3.1.1",
-    "node-releases": "^1.1.67"
+    "node-releases": "^1.1.70"
   },
   "engines": {
     "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"

package/update-db.js

@@ -19,7 +19,7 @@ function detectLockfile () {
   if (!packageDir) {
     throw new BrowserslistError(
       'Cannot find package.json. ' +
-      'Is it a right project to run npx browserslist --update-db?'
+      'Is this the right directory to run `npx browserslist --update-db` in?'
     )
   }
 
@@ -27,48 +27,27 @@ function detectLockfile () {
   var lockfileYarn = path.join(packageDir, 'yarn.lock')
   var lockfilePnpm = path.join(packageDir, 'pnpm-lock.yaml')
 
-  /* 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 {
-    throw new BrowserslistError(
-      'No lockfile found. Run "npm install", "yarn install" or "pnpm install"'
-    )
-  }
-}
-
-function getCurrentVersion (lock) {
-  var match
-  /* 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
-    }
-  } else if (lock.mode === 'yarn') {
-    match = /caniuse-lite@[^:]+:\r?\n\s+version\s+"([^"]+)"/.exec(lock.content)
-    if (match[1]) return match[1]
   }
-  return null
+  throw new BrowserslistError(
+    'No lockfile found. Run "npm install", "yarn install" or "pnpm install"'
+  )
 }
 
 function getLatestInfo (lock) {
-  if (lock.mode !== 'yarn') {
-    return JSON.parse(
-      childProcess.execSync('npm show caniuse-lite --json').toString()
-    )
-  } else {
+  if (lock.mode === 'yarn') {
     return JSON.parse(
       childProcess.execSync('yarn info caniuse-lite --json').toString()
     ).data
   }
+  return JSON.parse(
+    childProcess.execSync('npm show caniuse-lite --json').toString()
+  )
 }
 
 function getBrowsersList () {
@@ -117,66 +96,106 @@ function diffBrowsersLists (old, current) {
     .join('\n')
 }
 
-function updateLockfile (lock, latest) {
-  if (lock.mode === 'npm') {
-    var fixed = deletePackage(JSON.parse(lock.content))
-    return JSON.stringify(fixed, null, '  ')
-  } else {
-    var lines = lock.content.split('\n')
-    var i
-    /* 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)
-        } else if (lines[i].indexOf('/caniuse-lite') >= 0) {
-          lines[i] = lines[i].replace(/\/[^/:]+:/, '/' + latest.version + ':')
-          for (i = i + 1; i < lines.length; i++) {
-            if (lines[i].indexOf('integrity: ') !== -1) {
-              lines[i] = lines[i].replace(
-                /integrity: .+/, 'integrity: ' + latest.dist.integrity
-              )
-            } else if (lines[i].indexOf(' /') !== -1) {
-              break
-            }
-          }
+function updateNpmLockfile (lock, latest) {
+  var metadata = { latest: latest, versions: [] }
+  var content = deletePackage(JSON.parse(lock.content), metadata)
+  metadata.content = JSON.stringify(content, null, '  ')
+  return metadata
+}
+
+function deletePackage (node, metadata) {
+  if (node.dependencies) {
+    if (node.dependencies['caniuse-lite']) {
+      var version = node.dependencies['caniuse-lite'].version
+      metadata.versions[version] = true
+      delete node.dependencies['caniuse-lite']
+    }
+    for (var i in node.dependencies) {
+      node.dependencies[i] = deletePackage(node.dependencies[i], metadata)
+    }
+  }
+  return node
+}
+
+var yarnVersionRe = new RegExp('version "(.*?)"')
+
+function updateYarnLockfile (lock, latest) {
+  var blocks = lock.content.split(/(\n{2,})/).map(function (block) {
+    return block.split('\n')
+  })
+  var versions = {}
+  blocks.forEach(function (lines) {
+    if (lines[0].indexOf('caniuse-lite@') !== -1) {
+      var match = yarnVersionRe.exec(lines[1])
+      versions[match[1]] = true
+      if (match[1] !== latest.version) {
+        lines[1] = lines[1].replace(
+          /version "[^"]+"/, 'version "' + latest.version + '"'
+        )
+        lines[2] = lines[2].replace(
+          /resolved "[^"]+"/, 'resolved "' + latest.dist.tarball + '"'
+        )
+        lines[3] = lines[3].replace(
+          /integrity .+/, 'integrity ' + latest.dist.integrity
+        )
+      }
+    }
+  })
+  var content = blocks.map(function (lines) {
+    return lines.join('\n')
+  }).join('')
+  return { content: content, versions: versions }
+}
+
+function updatePnpmLockfile (lock, latest) {
+  var versions = {}
+  var lines = lock.content.split('\n')
+  var i
+  var j
+  var lineParts
+
+  for (i = 0; i < lines.length; i++) {
+    if (lines[i].indexOf('caniuse-lite:') >= 0) {
+      lineParts = lines[i].split(/:\s?/, 2)
+      versions[lineParts[1]] = true
+      lines[i] = lineParts[0] + ': ' + latest.version
+    } else if (lines[i].indexOf('/caniuse-lite') >= 0) {
+      lineParts = lines[i].split(/([/:])/)
+      for (j = 0; j < lineParts.length; j++) {
+        if (lineParts[j].indexOf('caniuse-lite') >= 0) {
+          versions[lineParts[j + 2]] = true
+          lineParts[j + 2] = latest.version
+          break
         }
       }
-    } 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] = lineParts.join('')
+      for (i = i + 1; i < lines.length; i++) {
+        if (lines[i].indexOf('integrity: ') !== -1) {
+          lines[i] = lines[i].replace(
+            /integrity: .+/, 'integrity: ' + latest.dist.integrity
           )
-          lines[i + 3] = lines[i + 3].replace(
-            /integrity .+/, 'integrity ' + latest.dist.integrity
-          )
-          i += 4
+        } else if (lines[i].indexOf(' /') !== -1) {
+          break
         }
       }
     }
-    return lines.join('\n')
   }
+  return { content: lines.join('\n'), versions: versions }
 }
 
-function deletePackage (node) {
-  if (node.dependencies) {
-    delete node.dependencies['caniuse-lite']
-    for (var i in node.dependencies) {
-      node.dependencies[i] = deletePackage(node.dependencies[i])
-    }
+function updateLockfile (lock, latest) {
+  lock.content = fs.readFileSync(lock.file).toString()
+
+  if (lock.mode === 'npm') {
+    return updateNpmLockfile(lock, latest)
+  } else if (lock.mode === 'yarn') {
+    return updateYarnLockfile(lock, latest)
   }
-  return node
+  return updatePnpmLockfile(lock, latest)
 }
 
 module.exports = function updateDB (print) {
   var lock = detectLockfile()
-  lock.content = fs.readFileSync(lock.file).toString()
-
-  var current = getCurrentVersion(lock)
   var latest = getLatestInfo(lock)
   var browsersListRetrievalError
   var oldBrowsersList
@@ -186,15 +205,32 @@ module.exports = function updateDB (print) {
     browsersListRetrievalError = e
   }
 
-  if (typeof current === 'string') {
-    print('Current version: ' + bold(red(current)) + '\n')
+  print(
+    'Latest version:     ' + bold(green(latest.version)) + '\n'
+  )
+
+  var lockfileData = updateLockfile(lock, latest)
+  var caniuseVersions = Object.keys(lockfileData.versions).sort()
+  if (caniuseVersions.length === 1 &&
+    caniuseVersions[0] === latest.version) {
+    print(
+      'Installed version:  ' + bold(green(latest.version)) + '\n' +
+      bold(green('caniuse-lite is up to date')) + '\n'
+    )
+    return
+  }
+
+  if (caniuseVersions.length === 0) {
+    caniuseVersions[0] = 'none'
   }
   print(
-    'New version:     ' + bold(green(latest.version)) + '\n' +
+    'Installed version' +
+    (caniuseVersions.length === 1 ? ':  ' : 's: ') +
+    bold(red(caniuseVersions.join(', '))) +
+    '\n' +
     'Removing old caniuse-lite from lock file\n'
   )
-
-  fs.writeFileSync(lock.file, updateLockfile(lock, latest))
+  fs.writeFileSync(lock.file, lockfileData.content)
 
   var install = lock.mode === 'yarn' ? 'yarn add -W' : lock.mode + ' install'
   print(
@@ -208,7 +244,7 @@ module.exports = function updateDB (print) {
       red(
         '\n' +
         e.stack + '\n\n' +
-        'Problem with `' + install + '  caniuse-lite` call. ' +
+        'Problem with `' + install + ' caniuse-lite` call. ' +
         'Run it manually.\n'
       )
     )
@@ -238,7 +274,7 @@ module.exports = function updateDB (print) {
       red(
         '\n' +
         browsersListRetrievalError.stack + '\n\n' +
-        'Problem with browsers list retrieval.\n' +
+        'Problem with browser list retrieval.\n' +
         'Target browser changes won’t be shown.\n'
       )
     )