browserslist 4.14.6 → 4.14.7

package/CHANGELOG.md

@@ -1,8 +1,14 @@
 # Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 4.14.7
+* Fixed Yarn Workspaces support to `--update-db` (by Fausto Núñez Alberro).
+* Added browser changes to `--update-db` (by @AleksandrSl).
+* Added color output to `--update-db`.
+* Updated `package.funding` to have link to our Open Collective.
+
 ## 4.14.6
-* Fixed Yarn support n `--update-db` (by Ivan Storck).
+* Fixed Yarn support in `--update-db` (by Ivan Storck).
 * Fixed npm 7 support in `--update-db`.
 
 ## 4.14.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browserslist",
-  "version": "4.14.6",
+  "version": "4.14.7",
   "description": "Share target browsers between different front-end tools, like Autoprefixer, Stylelint and babel-env-preset",
   "keywords": [
     "caniuse",
@@ -8,17 +8,18 @@
     "target"
   ],
   "funding": {
-    "type": "tidelift",
-    "url": "https://tidelift.com/funding/github/npm/browserslist"
+    "type": "opencollective",
+    "url": "https://opencollective.com/browserslist"
   },
   "author": "Andrey Sitnik <andrey@sitnik.ru>",
   "license": "MIT",
   "repository": "browserslist/browserslist",
   "dependencies": {
-    "caniuse-lite": "^1.0.30001154",
-    "electron-to-chromium": "^1.3.585",
+    "caniuse-lite": "^1.0.30001157",
+    "colorette": "^1.2.1",
+    "electron-to-chromium": "^1.3.591",
     "escalade": "^3.1.1",
-    "node-releases": "^1.1.65"
+    "node-releases": "^1.1.66"
   },
   "engines": {
     "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"

package/update-db.js

@@ -1,10 +1,16 @@
 var childProcess = require('child_process')
+var colorette = require('colorette')
 var escalade = require('escalade/sync')
 var path = require('path')
 var fs = require('fs')
 
 var BrowserslistError = require('./error')
 
+var red = colorette.red
+var bold = colorette.bold
+var green = colorette.green
+var yellow = colorette.yellow
+
 function detectLockfile () {
   var packageDir = escalade('.', function (dir, names) {
     return names.indexOf('package.json') !== -1 ? dir : ''
@@ -65,6 +71,52 @@ function getLatestInfo (lock) {
   }
 }
 
+function getBrowsersList () {
+  return childProcess.execSync('npx browserslist').toString()
+    .trim()
+    .split('\n')
+    .map(function (line) {
+      return line.trim().split(' ')
+    })
+    .reduce(function (result, entry) {
+      if (!result[entry[0]]) {
+        result[entry[0]] = []
+      }
+      result[entry[0]].push(entry[1])
+      return result
+    }, {})
+}
+
+function diffBrowsersLists (old, current) {
+  var browsers = Object.keys(old).concat(
+    Object.keys(current).filter(function (browser) {
+      return old[browser] === undefined
+    })
+  )
+  return browsers.map(function (browser) {
+    var oldVersions = old[browser] || []
+    var currentVersions = current[browser] || []
+    var intersection = oldVersions.filter(function (version) {
+      return currentVersions.indexOf(version) !== -1
+    })
+    var addedVersions = currentVersions.filter(function (version) {
+      return intersection.indexOf(version) === -1
+    })
+    var removedVersions = oldVersions.filter(function (version) {
+      return intersection.indexOf(version) === -1
+    })
+    return removedVersions.map(function (version) {
+      return red('- ' + browser + ' ' + version)
+    }).concat(addedVersions.map(function (version) {
+      return green('+ ' + browser + ' ' + version)
+    }))
+  })
+    .reduce(function (result, array) {
+      return result.concat(array)
+    }, [])
+    .join('\n')
+}
+
 function updateLockfile (lock, latest) {
   if (lock.mode === 'npm') {
     var fixed = deletePackage(JSON.parse(lock.content))
@@ -126,36 +178,80 @@ module.exports = function updateDB (print) {
 
   var current = getCurrentVersion(lock)
   var latest = getLatestInfo(lock)
+  var browsersListRetrievalError
+  var oldBrowsersList
+  try {
+    oldBrowsersList = getBrowsersList()
+  } catch (e) {
+    browsersListRetrievalError = e
+  }
 
   if (typeof current === 'string') {
-    print('Current version: ' + current + '\n')
+    print('Current version: ' + bold(red(current)) + '\n')
   }
   print(
-    'New version: ' + latest.version + '\n' +
+    'New version:     ' + bold(green(latest.version)) + '\n' +
     'Removing old caniuse-lite from lock file\n'
   )
 
   fs.writeFileSync(lock.file, updateLockfile(lock, latest))
 
-  var install = lock.mode === 'yarn' ? 'yarn add' : lock.mode + ' install'
+  var install = lock.mode === 'yarn' ? 'yarn add -W' : lock.mode + ' install'
   print(
     'Installing new caniuse-lite version\n' +
-    '$ ' + install + ' caniuse-lite\n'
+    yellow('$ ' + install + ' caniuse-lite') + '\n'
   )
   try {
     childProcess.execSync(install + ' caniuse-lite')
   } catch (e) /* istanbul ignore next */ {
-    print(e.stack)
-    print('\nProblem with `' + lock.mode + ' install` call. Run it manually.\n')
+    print(
+      red(
+        '\n' +
+        e.stack + '\n\n' +
+        'Problem with `' + install + '  caniuse-lite` call. ' +
+        'Run it manually.\n'
+      )
+    )
     process.exit(1)
   }
 
-  var del = lock.mode === 'yarn' ? 'yarn remove' : lock.mode + ' uninstall'
+  var del = lock.mode === 'yarn' ? 'yarn remove -W' : lock.mode + ' uninstall'
   print(
     'Cleaning package.json dependencies from caniuse-lite\n' +
-    '$ ' + del + ' caniuse-lite\n'
+    yellow('$ ' + del + ' caniuse-lite') + '\n'
   )
   childProcess.execSync(del + ' caniuse-lite')
 
   print('caniuse-lite has been successfully updated\n')
+
+  var currentBrowsersList
+  if (!browsersListRetrievalError) {
+    try {
+      currentBrowsersList = getBrowsersList()
+    } catch (e) /* istanbul ignore next */ {
+      browsersListRetrievalError = e
+    }
+  }
+
+  if (browsersListRetrievalError) {
+    print(
+      red(
+        '\n' +
+        browsersListRetrievalError.stack + '\n\n' +
+        'Problem with browsers list retrieval.\n' +
+        'Target browser changes won’t be shown.\n'
+      )
+    )
+  } else {
+    var targetBrowserChanges = diffBrowsersLists(
+      oldBrowsersList,
+      currentBrowsersList
+    )
+    if (targetBrowserChanges) {
+      print('\nTarget browser changes:\n')
+      print(targetBrowserChanges + '\n')
+    } else {
+      print('\n' + green('No target browser changes') + '\n')
+    }
+  }
 }