Clean up code

zhouyu9527 · Jul 4, 2022 · 5cb07ca · 5cb07ca
1 parent f24981b
commit 5cb07ca
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 26 deletions.
diff --git a/test/update-db/index.test.js b/test/update-db/index.test.js
@@ -251,6 +251,7 @@ if (!NODE_8 && !NODE_10) {
 
 if (!NODE_8 && !NODE_10 && isInstalled('pnpm')) {
   let versions = ['1.0.30001000', '1.0.1234', '1.0.3000', '1.0.30001035']
+
   test('updates caniuse-lite for pnpm', async () => {
     let dir = await chdir('update-pnpm', 'package.json', 'pnpm-lock.yaml')
     checkRunUpdateContents(versions.sort().join(', '), 'pnpm')

diff --git a/update-db.js b/update-db.js
@@ -224,12 +224,13 @@ function updatePnpmLockfile(lock, latest) {
 function updateLockfile(lock, latest) {
   if (!lock.content) lock.content = fs.readFileSync(lock.file).toString()
 
-  if (lock.mode === 'npm') {
-    return updateNpmLockfile(lock, latest)
-  } else if (lock.mode === 'yarn') {
+  if (lock.mode === 'yarn') {
     return updateYarnLockfile(lock, latest)
+  } else if (lock.mode === 'pnpm') {
+    return updatePnpmLockfile(lock, latest)
+  } else {
+    return updateNpmLockfile(lock, latest)
   }
-  return updatePnpmLockfile(lock, latest)
 }
 
 function updatePackageManually(print, lock, latest) {
@@ -290,6 +291,27 @@ function updatePackageManually(print, lock, latest) {
   childProcess.execSync(del + ' caniuse-lite')
 }
 
+function updateWith(print, cmd) {
+  print('Updating caniuse-lite version\n' + pico.yellow('$ ' + cmd) + '\n')
+  try {
+    childProcess.execSync(cmd)
+  } catch (e) /* c8 ignore start */ {
+    print(pico.red(e.stdout.toString()))
+    print(
+      pico.red(
+        '\n' +
+          e.stack +
+          '\n\n' +
+          'Problem with `' +
+          cmd +
+          '` call. ' +
+          'Run it manually.\n'
+      )
+    )
+    process.exit(1)
+  } /* c8 ignore end */
+}
+
 module.exports = function updateDB(print) {
   var lock = detectLockfile()
   var latest = getLatestInfo(lock)
@@ -305,28 +327,7 @@ module.exports = function updateDB(print) {
   print('Latest version:     ' + pico.bold(pico.green(latest.version)) + '\n')
 
   if (lock.mode === 'yarn' && lock.version !== 1) {
-    var update = 'yarn up -R'
-    print(
-      'Updating caniuse-lite version\n' +
-        pico.yellow('$ ' + update + ' caniuse-lite') +
-        '\n'
-    )
-    try {
-      childProcess.execSync(update + ' caniuse-lite')
-    } catch (e) /* c8 ignore start */ {
-      print(
-        pico.red(
-          '\n' +
-            e.stack +
-            '\n\n' +
-            'Problem with `' +
-            update +
-            ' caniuse-lite` call. ' +
-            'Run it manually.\n'
-        )
-      )
-      process.exit(1)
-    } /* c8 ignore end */
+    updateWith(print, 'yarn up -R caniuse-lite')
   } else {
     updatePackageManually(print, lock, latest)
   }