update-browserslist-db 1.0.3 → 1.0.6

package/README.md

@@ -1,7 +1,7 @@
 # Update Browserslist DB
 
-<img width="120" height="120" alt="Browserslist logo by Anton Lovchikov"
-     src="https://browserslist.github.io/browserslist/logo.svg" align="right">
+<img width="120" height="120" alt="Browserslist logo by Anton Popov"
+     src="https://browsersl.ist/logo.svg" align="right">
 
 CLI tool to update `caniuse-lite` with browsers DB
 from [Browserslist](https://github.com/browserslist/browserslist/) config.

package/check-npm-version.js

@@ -0,0 +1,16 @@
+let { execSync } = require('child_process')
+let pico = require('picocolors')
+
+try {
+  let version = parseInt(execSync('npm -v'))
+  if (version <= 6) {
+    process.stderr.write(
+      pico.red(
+        'Update npm or call ' +
+          pico.yellow('npx browserslist@latest --update-db') +
+          '\n'
+      )
+    )
+    process.exit(1)
+  }
+} catch (e) {}

package/cli.js

@@ -3,6 +3,7 @@
 let { readFileSync } = require('fs')
 let { join } = require('path')
 
+require('./check-npm-version')
 let updateDb = require('./')
 
 const ROOT = __dirname

package/index.js

@@ -4,6 +4,18 @@ let pico = require('picocolors')
 let path = require('path')
 let fs = require('fs')
 
+const DEFAULT_INDENT = '  '
+const INDENT_REGEXP = /^(\s*)[^\s]/m
+
+function detectIndent(text) {
+  try {
+    return INDENT_REGEXP.exec(text)[1] || DEFAULT_INDENT
+  } catch (e) {
+    /* c8 ignore next 2 */
+    return DEFAULT_INDENT
+  }
+}
+
 function BrowserslistUpdateError(message) {
   this.name = 'BrowserslistUpdateError'
   this.message = message
@@ -71,64 +83,40 @@ function getLatestInfo(lock) {
   )
 }
 
-function getBrowsersList() {
-  let spawn = childProcess.spawnSync('npx', ['browserslist'])
-  if (spawn.status !== 0) throw new Error(spawn.stderr.toString())
-  return spawn.stdout
-    .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')
 }
 
 function updateNpmLockfile(lock, latest) {
   let metadata = { latest, versions: [] }
   let content = deletePackage(JSON.parse(lock.content), metadata)
-  metadata.content = JSON.stringify(content, null, '  ')
+  metadata.content = JSON.stringify(content, null, detectIndent(lock.content))
   return metadata
 }
 
@@ -177,11 +165,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 }
 }
 
@@ -278,12 +262,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')
@@ -298,33 +282,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.message +
+          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.3",
+  "version": "1.0.6",
   "description": "CLI tool to update caniuse-lite to refresh target browsers from Browserslist config",
   "keywords": [
     "caniuse",