update-browserslist-db 1.0.1 → 1.0.4

package/index.js

@@ -28,7 +28,7 @@ function detectLockfile() {
   if (!packageDir) {
     throw new BrowserslistUpdateError(
       'Cannot find package.json. ' +
-        'Is this the right directory to run `npx browserslist --update-db` in?'
+        'Is this the right directory to run `npx update-browserslist-db` in?'
     )
   }
 
@@ -71,56 +71,33 @@ function getLatestInfo(lock) {
   )
 }
 
-function getBrowsersList() {
-  return childProcess
-    .execSync('npx browserslist')
-    .toString()
-    .trim()
-    .split('\n')
-    .map(line => {
-      return line.trim().split(' ')
-    })
-    .reduce((result, entry) => {
-      if (!result[entry[0]]) {
-        result[entry[0]] = []
-      }
-      result[entry[0]].push(entry[1])
-      return result
-    }, {})
+function getBrowsers() {
+  let browserslist = require('browserslist')
+  return browserslist().reduce((result, entry) => {
+    if (!result[entry[0]]) {
+      result[entry[0]] = []
+    }
+    result[entry[0]].push(entry[1])
+    return result
+  }, {})
 }
 
-function diffBrowsersLists(old, current) {
+function diffBrowsers(old, current) {
   let browsers = Object.keys(old).concat(
-    Object.keys(current).filter(browser => {
-      return old[browser] === undefined
-    })
+    Object.keys(current).filter(browser => old[browser] === undefined)
   )
   return browsers
     .map(browser => {
       let oldVersions = old[browser] || []
       let currentVersions = current[browser] || []
-      let intersection = oldVersions.filter(version => {
-        return currentVersions.indexOf(version) !== -1
-      })
-      let addedVersions = currentVersions.filter(version => {
-        return intersection.indexOf(version) === -1
-      })
-      let removedVersions = oldVersions.filter(version => {
-        return intersection.indexOf(version) === -1
-      })
-      return removedVersions
-        .map(version => {
-          return pico.red('- ' + browser + ' ' + version)
-        })
-        .concat(
-          addedVersions.map(version => {
-            return pico.green('+ ' + browser + ' ' + version)
-          })
-        )
+      let common = oldVersions.filter(v => currentVersions.includes(v))
+      let added = currentVersions.filter(v => !common.includes(v))
+      let removed = oldVersions.filter(v => !common.includes(v))
+      return removed
+        .map(v => pico.red('- ' + browser + ' ' + v))
+        .concat(added.map(v => pico.green('+ ' + browser + ' ' + v)))
     })
-    .reduce((result, array) => {
-      return result.concat(array)
-    }, [])
+    .reduce((result, array) => result.concat(array), [])
     .join('\n')
 }
 
@@ -176,11 +153,7 @@ function updateYarnLockfile(lock, latest) {
       }
     }
   })
-  let content = blocks
-    .map(lines => {
-      return lines.join('\n')
-    })
-    .join('')
+  let content = blocks.map(lines => lines.join('\n')).join('')
   return { content, versions }
 }
 
@@ -277,12 +250,12 @@ module.exports = function updateDB(print = defaultPrint) {
   let lock = detectLockfile()
   let latest = getLatestInfo(lock)
 
-  let browsersListRetrievalError
-  let oldBrowsersList
+  let listError
+  let oldList
   try {
-    oldBrowsersList = getBrowsersList()
+    oldList = getBrowsers()
   } catch (e) {
-    browsersListRetrievalError = e
+    listError = e
   }
 
   print('Latest version:     ' + pico.bold(pico.green(latest.version)) + '\n')
@@ -297,33 +270,30 @@ module.exports = function updateDB(print = defaultPrint) {
 
   print('caniuse-lite has been successfully updated\n')
 
-  let currentBrowsersList
-  if (!browsersListRetrievalError) {
+  let newList
+  if (!listError) {
     try {
-      currentBrowsersList = getBrowsersList()
+      newList = getBrowsers()
     } catch (e) /* c8 ignore start */ {
-      browsersListRetrievalError = e
+      listError = e
     } /* c8 ignore end */
   }
 
-  if (browsersListRetrievalError) {
+  if (listError) {
     print(
       pico.red(
         '\n' +
-          browsersListRetrievalError.stack +
+          listError.stack +
           '\n\n' +
           'Problem with browser list retrieval.\n' +
           'Target browser changes won’t be shown.\n'
       )
     )
   } else {
-    let targetBrowserChanges = diffBrowsersLists(
-      oldBrowsersList,
-      currentBrowsersList
-    )
-    if (targetBrowserChanges) {
+    let changes = diffBrowsers(oldList, newList)
+    if (changes) {
       print('\nTarget browser changes:\n')
-      print(targetBrowserChanges + '\n')
+      print(changes + '\n')
     } else {
       print('\n' + pico.green('No target browser changes') + '\n')
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "update-browserslist-db",
-  "version": "1.0.1",
+  "version": "1.0.4",
   "description": "CLI tool to update caniuse-lite to refresh target browsers from Browserslist config",
   "keywords": [
     "caniuse",
@@ -29,6 +29,9 @@
     "escalade": "^3.1.1",
     "picocolors": "^1.0.0"
   },
+  "peerDependencies": {
+    "browserslist": ">= 4.21.0"
+  },
   "bin": {
     "browserslist-lint": "cli.js"
   }