update-browserslist-db 1.0.10 → 1.0.12

package/README.md

@@ -18,6 +18,5 @@ npx update-browserslist-db@latest
        alt="Sponsored by Evil Martians" width="236" height="54">
 </a>
 
-
 ## Docs
-Read **[full docs](https://github.com/browserslist/update-db#readme)** on GitHub.
+Read full docs **[here](https://github.com/browserslist/update-db#readme)**.

package/index.js

@@ -1,10 +1,10 @@
-let childProcess = require('child_process')
+let { existsSync, readFileSync, writeFileSync } = require('fs')
+let { execSync } = require('child_process')
+let { join } = require('path')
 let escalade = require('escalade/sync')
 let pico = require('picocolors')
-let path = require('path')
-let fs = require('fs')
 
-const { detectIndent, detectEOL } = require('./utils')
+const { detectEOL, detectIndent } = require('./utils')
 
 function BrowserslistUpdateError(message) {
   this.name = 'BrowserslistUpdateError'
@@ -34,22 +34,22 @@ function detectLockfile() {
     )
   }
 
-  let lockfileNpm = path.join(packageDir, 'package-lock.json')
-  let lockfileShrinkwrap = path.join(packageDir, 'npm-shrinkwrap.json')
-  let lockfileYarn = path.join(packageDir, 'yarn.lock')
-  let lockfilePnpm = path.join(packageDir, 'pnpm-lock.yaml')
+  let lockfileNpm = join(packageDir, 'package-lock.json')
+  let lockfileShrinkwrap = join(packageDir, 'npm-shrinkwrap.json')
+  let lockfileYarn = join(packageDir, 'yarn.lock')
+  let lockfilePnpm = join(packageDir, 'pnpm-lock.yaml')
 
-  if (fs.existsSync(lockfilePnpm)) {
-    return { mode: 'pnpm', file: lockfilePnpm }
-  } else if (fs.existsSync(lockfileNpm)) {
-    return { mode: 'npm', file: lockfileNpm }
-  } else if (fs.existsSync(lockfileYarn)) {
-    let lock = { mode: 'yarn', file: lockfileYarn }
-    lock.content = fs.readFileSync(lock.file).toString()
+  if (existsSync(lockfilePnpm)) {
+    return { file: lockfilePnpm, mode: 'pnpm' }
+  } else if (existsSync(lockfileNpm)) {
+    return { file: lockfileNpm, mode: 'npm' }
+  } else if (existsSync(lockfileYarn)) {
+    let lock = { file: lockfileYarn, mode: 'yarn' }
+    lock.content = 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 }
+  } else if (existsSync(lockfileShrinkwrap)) {
+    return { file: lockfileShrinkwrap, mode: 'npm' }
   }
   throw new BrowserslistUpdateError(
     'No lockfile found. Run "npm install", "yarn install" or "pnpm install"'
@@ -59,23 +59,18 @@ function detectLockfile() {
 function getLatestInfo(lock) {
   if (lock.mode === 'yarn') {
     if (lock.version === 1) {
-      return JSON.parse(
-        childProcess.execSync('yarn info caniuse-lite --json').toString()
-      ).data
+      return JSON.parse(execSync('yarnpkg info caniuse-lite --json').toString())
+        .data
     } else {
       return JSON.parse(
-        childProcess.execSync('yarn npm info caniuse-lite --json').toString()
+        execSync('yarnpkg npm info caniuse-lite --json').toString()
       )
     }
   }
   if (lock.mode === 'pnpm') {
-    return JSON.parse(
-      childProcess.execSync('pnpm info caniuse-lite --json').toString()
-    )
+    return JSON.parse(execSync('pnpm info caniuse-lite --json').toString())
   }
-  return JSON.parse(
-    childProcess.execSync('npm show caniuse-lite --json').toString()
-  )
+  return JSON.parse(execSync('npm show caniuse-lite --json').toString())
 }
 
 function getBrowsers() {
@@ -126,6 +121,14 @@ function deletePackage(node, metadata) {
       node.dependencies[i] = deletePackage(node.dependencies[i], metadata)
     }
   }
+  if (node.packages) {
+    for (let path in node.packages) {
+      if (path.endsWith('/caniuse-lite')) {
+        metadata.versions[node.packages[path].version] = true
+        delete node.packages[path]
+      }
+    }
+  }
   return node
 }
 
@@ -165,7 +168,7 @@ function updateYarnLockfile(lock, latest) {
 }
 
 function updateLockfile(lock, latest) {
-  if (!lock.content) lock.content = fs.readFileSync(lock.file).toString()
+  if (!lock.content) lock.content = readFileSync(lock.file).toString()
 
   let updatedLockFile
   if (lock.mode === 'yarn') {
@@ -186,7 +189,7 @@ function updatePackageManually(print, lock, latest) {
   if (caniuseVersions.length === 1 && caniuseVersions[0] === latest.version) {
     print(
       'Installed version:  ' +
-        pico.bold(pico.green(latest.version)) +
+        pico.bold(pico.green(caniuseVersions[0])) +
         '\n' +
         pico.bold(pico.green('caniuse-lite is up to date')) +
         '\n'
@@ -204,16 +207,16 @@ function updatePackageManually(print, lock, latest) {
       '\n' +
       'Removing old caniuse-lite from lock file\n'
   )
-  fs.writeFileSync(lock.file, lockfileData.content)
+  writeFileSync(lock.file, lockfileData.content)
 
-  let install = lock.mode === 'yarn' ? 'yarn add -W' : lock.mode + ' install'
+  let install = lock.mode === 'yarn' ? 'yarnpkg add -W' : lock.mode + ' install'
   print(
     'Installing new caniuse-lite version\n' +
-      pico.yellow('$ ' + install + ' caniuse-lite') +
+      pico.yellow('$ ' + install.replace('yarnpkg', 'yarn') + ' caniuse-lite') +
       '\n'
   )
   try {
-    childProcess.execSync(install + ' caniuse-lite')
+    execSync(install + ' caniuse-lite')
   } catch (e) /* c8 ignore start */ {
     print(
       pico.red(
@@ -229,19 +232,24 @@ function updatePackageManually(print, lock, latest) {
     process.exit(1)
   } /* c8 ignore end */
 
-  let del = lock.mode === 'yarn' ? 'yarn remove -W' : lock.mode + ' uninstall'
+  let del =
+    lock.mode === 'yarn' ? 'yarnpkg remove -W' : lock.mode + ' uninstall'
   print(
     'Cleaning package.json dependencies from caniuse-lite\n' +
-      pico.yellow('$ ' + del + ' caniuse-lite') +
+      pico.yellow('$ ' + del.replace('yarnpkg', 'yarn') + ' caniuse-lite') +
       '\n'
   )
-  childProcess.execSync(del + ' caniuse-lite')
+  execSync(del + ' caniuse-lite')
 }
 
 function updateWith(print, cmd) {
-  print('Updating caniuse-lite version\n' + pico.yellow('$ ' + cmd) + '\n')
+  print(
+    'Updating caniuse-lite version\n' +
+      pico.yellow('$ ' + cmd.replace('yarnpkg', 'yarn')) +
+      '\n'
+  )
   try {
-    childProcess.execSync(cmd)
+    execSync(cmd)
   } catch (e) /* c8 ignore start */ {
     print(pico.red(e.stdout.toString()))
     print(
@@ -274,7 +282,7 @@ module.exports = function updateDB(print = defaultPrint) {
   print('Latest version:     ' + pico.bold(pico.green(latest.version)) + '\n')
 
   if (lock.mode === 'yarn' && lock.version !== 1) {
-    updateWith(print, 'yarn up -R caniuse-lite')
+    updateWith(print, 'yarnpkg up -R caniuse-lite')
   } else if (lock.mode === 'pnpm') {
     updateWith(print, 'pnpm up caniuse-lite')
   } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "update-browserslist-db",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "CLI tool to update caniuse-lite to refresh target browsers from Browserslist config",
   "keywords": [
     "caniuse",
@@ -15,6 +15,10 @@
     {
       "type": "tidelift",
       "url": "https://tidelift.com/funding/github/npm/browserslist"
+    },
+    {
+      "type": "github",
+      "url": "https://github.com/sponsors/ai"
     }
   ],
   "author": "Andrey Sitnik <andrey@sitnik.ru>",
@@ -32,7 +36,5 @@
   "peerDependencies": {
     "browserslist": ">= 4.21.0"
   },
-  "bin": {
-    "browserslist-lint": "cli.js"
-  }
+  "bin": "cli.js"
 }