update-browserslist-db 1.0.11 → 1.0.12

package/index.js

@@ -1,10 +1,10 @@
-let { writeFileSync, readFileSync, existsSync } = require('fs')
+let { existsSync, readFileSync, writeFileSync } = require('fs')
 let { execSync } = require('child_process')
 let { join } = require('path')
 let escalade = require('escalade/sync')
 let pico = require('picocolors')
 
-const { detectIndent, detectEOL } = require('./utils')
+const { detectEOL, detectIndent } = require('./utils')
 
 function BrowserslistUpdateError(message) {
   this.name = 'BrowserslistUpdateError'
@@ -40,16 +40,16 @@ function detectLockfile() {
   let lockfilePnpm = join(packageDir, 'pnpm-lock.yaml')
 
   if (existsSync(lockfilePnpm)) {
-    return { mode: 'pnpm', file: lockfilePnpm }
+    return { file: lockfilePnpm, mode: 'pnpm' }
   } else if (existsSync(lockfileNpm)) {
-    return { mode: 'npm', file: lockfileNpm }
+    return { file: lockfileNpm, mode: 'npm' }
   } else if (existsSync(lockfileYarn)) {
-    let lock = { mode: 'yarn', file: 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 (existsSync(lockfileShrinkwrap)) {
-    return { mode: 'npm', file: lockfileShrinkwrap }
+    return { file: lockfileShrinkwrap, mode: 'npm' }
   }
   throw new BrowserslistUpdateError(
     'No lockfile found. Run "npm install", "yarn install" or "pnpm install"'
@@ -59,11 +59,11 @@ function detectLockfile() {
 function getLatestInfo(lock) {
   if (lock.mode === 'yarn') {
     if (lock.version === 1) {
-      return JSON.parse(execSync('yarn info caniuse-lite --json').toString())
+      return JSON.parse(execSync('yarnpkg info caniuse-lite --json').toString())
         .data
     } else {
       return JSON.parse(
-        execSync('yarn npm info caniuse-lite --json').toString()
+        execSync('yarnpkg npm info caniuse-lite --json').toString()
       )
     }
   }
@@ -209,10 +209,10 @@ function updatePackageManually(print, lock, latest) {
   )
   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 {
@@ -232,17 +232,22 @@ 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'
   )
   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 {
     execSync(cmd)
   } catch (e) /* c8 ignore start */ {
@@ -277,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.11",
+  "version": "1.0.12",
   "description": "CLI tool to update caniuse-lite to refresh target browsers from Browserslist config",
   "keywords": [
     "caniuse",