update-browserslist-db 1.2.3 → 1.3.2

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright 2022 Andrey Sitnik <andrey@sitnik.ru> and other contributors
+Copyright 2022 Andrey Sitnik <andrey@sitnik.es> and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

package/README.md

@@ -12,19 +12,30 @@ from `caniuse-lite`.
 ```sh
 npx update-browserslist-db@latest
 ```
+
 Or if using `pnpm`:
+
+```sh
+pnpm dlx update-browserslist-db latest
+```
+
+Or if using `bun`:
+
 ```sh
-pnpm exec update-browserslist-db latest
+bunx update-browserslist-db@latest
 ```
-Or if using `yarn`:
+
+Or if using `yarn` 2+:
+
 ```sh
 yarn dlx update-browserslist-db@latest
 ```
 
-<a href="https://evilmartians.com/?utm_source=update-browserslist-db">
-  <img src="https://evilmartians.com/badges/sponsored-by-evil-martians.svg"
-       alt="Sponsored by Evil Martians" width="236" height="54">
-</a>
+---
+
+<img src="https://cdn.evilmartians.com/badges/logo-no-label.svg" alt="" width="22" height="16" />  Update Browserslist DB is built by <b><a href="https://evilmartians.com/">Evil Martians</a></b>, an American design and engineering consultancy for <b>developer tools, AI, and cybersecurity startups</b>.
+
+---
 
 ## Docs
 Read full docs **[here](https://github.com/browserslist/update-db#readme)**.

package/check-npm-version.js

@@ -1,17 +1,20 @@
 let { execSync } = require('child_process')
+let { existsSync } = require('fs')
 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'
+if (!existsSync('deno.lock')) {
+  try {
+    let output = execSync('npm -v').toString().trim()
+    let version = parseInt(output.replace(/^[^\d]*/, ''))
+    if (version <= 6) {
+      process.stderr.write(
+        pico.red(
+          'Update npm or call ' +
+            pico.yellow('npx browserslist@latest --update-db') +
+            '\n'
+        )
       )
-    )
-    process.exit(1)
-  }
-  // eslint-disable-next-line no-unused-vars
-} catch (e) {}
+      process.exit(1)
+    }
+  } catch {}
+}

package/cli.js

@@ -14,7 +14,7 @@ function getPackage() {
 
 let args = process.argv.slice(2)
 
-let USAGE = 'Usage:\n  npx update-browserslist-db\n'
+const USAGE = 'Usage:\n  npx update-browserslist-db\n'
 
 function isArg(arg) {
   return args.some(i => i === arg)
@@ -28,7 +28,7 @@ function error(msg) {
 if (isArg('--help') || isArg('-h')) {
   process.stdout.write(getPackage().description + '.\n\n' + USAGE + '\n')
 } else if (isArg('--version') || isArg('-v')) {
-  process.stdout.write('browserslist-lint ' + getPackage().version + '\n')
+  process.stdout.write(getPackage().name + ' ' + getPackage().version + '\n')
 } else {
   try {
     updateDb()

package/index.js

@@ -1,10 +1,10 @@
 let { execSync } = require('child_process')
 let escalade = require('escalade/sync')
 let { existsSync, readFileSync, writeFileSync } = require('fs')
-let { join } = require('path')
+let { dirname, join } = require('path')
 let pico = require('picocolors')
 
-const { detectEOL, detectIndent } = require('./utils')
+let { detectEOL, detectIndent } = require('./utils')
 
 function BrowserslistUpdateError(message) {
   this.name = 'BrowserslistUpdateError'
@@ -18,8 +18,7 @@ function BrowserslistUpdateError(message) {
 BrowserslistUpdateError.prototype = Error.prototype
 
 // Check if HADOOP_HOME is set to determine if this is running in a Hadoop environment
-const IsHadoopExists = !!process.env.HADOOP_HOME
-const yarnCommand = IsHadoopExists ? 'yarnpkg' : 'yarn'
+const YARN_CMD = process.env.HADOOP_HOME ? 'yarnpkg' : 'yarn'
 
 /* c8 ignore next 3 */
 function defaultPrint(str) {
@@ -44,6 +43,7 @@ function detectLockfile() {
   let lockfilePnpm = join(packageDir, 'pnpm-lock.yaml')
   let lockfileBun = join(packageDir, 'bun.lock')
   let lockfileBunBinary = join(packageDir, 'bun.lockb')
+  let lockfileDeno = join(packageDir, 'deno.lock')
 
   if (existsSync(lockfilePnpm)) {
     return { file: lockfilePnpm, mode: 'pnpm' }
@@ -58,32 +58,55 @@ function detectLockfile() {
     return lock
   } else if (existsSync(lockfileShrinkwrap)) {
     return { file: lockfileShrinkwrap, mode: 'npm' }
+  } else if (existsSync(lockfileDeno)) {
+    return { file: lockfileDeno, mode: 'deno' }
   }
   throw new BrowserslistUpdateError(
-    'No lockfile found. Run "npm install", "yarn install" or "pnpm install"'
+    'No lockfile found. Run "npm install", "yarn install", "pnpm install", "bun install" or "deno install"'
   )
 }
 
 function getLatestInfo(lock) {
-  if (lock.mode === 'yarn') {
-    if (lock.version === 1) {
-      return JSON.parse(
-        execSync(yarnCommand + ' info caniuse-lite --json').toString()
-      ).data
-    } else {
-      return JSON.parse(
-        execSync(yarnCommand + ' npm info caniuse-lite --json').toString()
+  try {
+    if (lock.mode === 'yarn') {
+      if (lock.version === 1) {
+        return JSON.parse(
+          execSync(YARN_CMD + ' info caniuse-lite --json').toString()
+        ).data
+      } else {
+        return JSON.parse(
+          execSync(YARN_CMD + ' npm info caniuse-lite --json').toString()
+        )
+      }
+    }
+    if (lock.mode === 'pnpm') {
+      return JSON.parse(execSync('pnpm info caniuse-lite --json').toString())
+    }
+    if (lock.mode === 'bun') {
+      return JSON.parse(execSync('bun info caniuse-lite --json').toString())
+    }
+    if (lock.mode === 'deno') {
+      let result = JSON.parse(
+        execSync(
+          'deno run -A npm:npm show caniuse-lite version --json'
+        ).toString()
       )
+      return { version: Array.isArray(result) ? result[0] : result }
     }
-  }
-  if (lock.mode === 'pnpm') {
-    return JSON.parse(execSync('pnpm info caniuse-lite --json').toString())
-  }
-  if (lock.mode === 'bun') {
-    return JSON.parse(execSync(' bun info caniuse-lite --json').toString())
-  }
 
-  return JSON.parse(execSync('npm show caniuse-lite --json').toString())
+    return JSON.parse(execSync('npm show caniuse-lite --json').toString())
+  } catch (e) {
+    if (e.code === 'ENOENT' || e.status === 127) {
+      throw new BrowserslistUpdateError(
+        'Cannot find ' +
+          lock.mode +
+          ' binary in PATH. Please install ' +
+          lock.mode +
+          ' or run updates manually.'
+      )
+    }
+    throw e
+  }
 }
 
 function getBrowsers() {
@@ -223,7 +246,7 @@ function updatePackageManually(print, lock, latest) {
   writeFileSync(lock.file, lockfileData.content)
 
   let install =
-    lock.mode === 'yarn' ? yarnCommand + ' add -W' : lock.mode + ' install'
+    lock.mode === 'yarn' ? YARN_CMD + ' add -W' : lock.mode + ' install'
   print(
     'Installing new caniuse-lite version\n' +
       pico.yellow('$ ' + install + ' caniuse-lite baseline-browser-mapping') +
@@ -247,7 +270,7 @@ function updatePackageManually(print, lock, latest) {
   } /* c8 ignore end */
 
   let del =
-    lock.mode === 'yarn' ? yarnCommand + ' remove -W' : lock.mode + ' uninstall'
+    lock.mode === 'yarn' ? YARN_CMD + ' remove -W' : lock.mode + ' uninstall'
   print(
     'Cleaning package.json dependencies from caniuse-lite\n' +
       pico.yellow('$ ' + del + ' caniuse-lite baseline-browser-mapping') +
@@ -256,8 +279,57 @@ function updatePackageManually(print, lock, latest) {
   execSync(del + ' caniuse-lite baseline-browser-mapping')
 }
 
-function updateWith(print, cmd) {
-  print('Updating caniuse-lite version\n' + pico.yellow('$ ' + cmd) + '\n')
+/**
+ * Bun cannot update a transitive dependency by name: `bun update caniuse-lite`
+ * adds caniuse-lite to package.json as a new direct dependency at the latest
+ * version and leaves every nested copy - the ones that actually get resolved at
+ * runtime - on the old version. A temporary `overrides` entry reaches those,
+ * and the resolutions survive once it is taken back out.
+ */
+function updateBun(print, lock, latest) {
+  let pkgFile = join(dirname(lock.file), 'package.json')
+  let original = readFileSync(pkgFile)
+  let pkg = JSON.parse(original.toString())
+  let withOverride = {
+    ...pkg,
+    overrides: {
+      ...pkg.overrides,
+      'baseline-browser-mapping': 'latest',
+      'caniuse-lite': latest.version
+    }
+  }
+
+  // The file is restored byte for byte below, so its formatting does not matter.
+  writeFileSync(pkgFile, JSON.stringify(withOverride, null, 2) + '\n')
+
+  print(
+    'Updating caniuse-lite version\n' +
+      pico.yellow('$ bun install') +
+      ' (with a temporary caniuse-lite override)\n'
+  )
+  try {
+    execSync('bun install')
+  } catch (e) /* c8 ignore start */ {
+    writeFileSync(pkgFile, original)
+    print(pico.red(e.stdout.toString()))
+    print(
+      pico.red(
+        '\n' +
+          e.stack +
+          '\n\n' +
+          'Problem with `bun install` call. ' +
+          'Run it manually.\n'
+      )
+    )
+    process.exit(1)
+  } /* c8 ignore end */
+
+  writeFileSync(pkgFile, original)
+  updateWith(print, 'bun install', 'Removing the temporary override')
+}
+
+function updateWith(print, cmd, message = 'Updating caniuse-lite version') {
+  print(message + '\n' + pico.yellow('$ ' + cmd) + '\n')
   try {
     execSync(cmd)
   } catch (e) /* c8 ignore start */ {
@@ -292,18 +364,22 @@ 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,
-      yarnCommand + ' up -R caniuse-lite baseline-browser-mapping'
-    )
+    updateWith(print, YARN_CMD + ' up -R caniuse-lite baseline-browser-mapping')
   } else if (lock.mode === 'pnpm') {
     let lockContent = readFileSync(lock.file).toString()
     let packages = lockContent.includes('baseline-browser-mapping')
       ? 'caniuse-lite baseline-browser-mapping'
       : 'caniuse-lite'
-    updateWith(print, 'pnpm up --depth=Infinity --no-save ' + packages)
+    updateWith(print, 'pnpm up --depth=9999 --no-save ' + packages)
   } else if (lock.mode === 'bun') {
-    updateWith(print, 'bun update caniuse-lite baseline-browser-mapping')
+    updateBun(print, lock, latest)
+  } else if (lock.mode === 'deno') {
+    updateWith(print, 'deno add npm:caniuse-lite npm:baseline-browser-mapping')
+    updateWith(
+      print,
+      'deno remove caniuse-lite baseline-browser-mapping',
+      'Cleaning package.json dependencies from caniuse-lite'
+    )
   } else {
     updatePackageManually(print, lock, latest)
   }

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "update-browserslist-db",
-  "version": "1.2.3",
+  "version": "1.3.2",
   "description": "CLI tool to update caniuse-lite to refresh target browsers from Browserslist config",
   "keywords": [
-    "caniuse",
     "browsers",
+    "caniuse",
     "target"
   ],
+  "license": "MIT",
+  "author": "Andrey Sitnik <andrey@sitnik.es>",
+  "repository": "browserslist/update-db",
   "funding": [
     {
       "type": "opencollective",
@@ -21,9 +24,7 @@
       "url": "https://github.com/sponsors/ai"
     }
   ],
-  "author": "Andrey Sitnik <andrey@sitnik.ru>",
-  "license": "MIT",
-  "repository": "browserslist/update-db",
+  "bin": "cli.js",
   "types": "./index.d.ts",
   "exports": {
     ".": "./index.js",
@@ -35,6 +36,5 @@
   },
   "peerDependencies": {
     "browserslist": ">= 4.21.0"
-  },
-  "bin": "cli.js"
+  }
 }

package/utils.js

@@ -1,6 +1,6 @@
 const { EOL } = require('os')
 
-const getFirstRegexpMatchOrDefault = (text, regexp, defaultValue) => {
+function getFirstRegexpMatchOrDefault(text, regexp, defaultValue) {
   regexp.lastIndex = 0 // https://stackoverflow.com/a/11477448/4536543
   let match = regexp.exec(text)
   if (match !== null) {