socket 0.14.100 → 0.14.102

package/dist/module-sync/cli.js

@@ -900,7 +900,7 @@ function emitBanner(name) {
   logger.logger.error(getAsciiHeader(name))
 }
 function getAsciiHeader(command) {
-  const cliVersion = '0.14.100:7c35eec:135794c2:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
+  const cliVersion = '0.14.102:51e000d:e352a2ef:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
   const nodeVersion = process$1.version
   const apiToken = shadowNpmInject.getDefaultToken()
   const shownToken = apiToken ? getLastFiveOfApiToken(apiToken) : 'no'
@@ -3724,6 +3724,9 @@ async function branchExists(branch, cwd = process.cwd()) {
 }
 async function checkoutBaseBranchIfAvailable(baseBranch, cwd = process.cwd()) {
   try {
+    await spawn.spawn('git', ['fetch', '--depth=1', 'origin', baseBranch], {
+      cwd
+    })
     await spawn.spawn('git', ['checkout', baseBranch], {
       cwd
     })
@@ -3731,10 +3734,11 @@ async function checkoutBaseBranchIfAvailable(baseBranch, cwd = process.cwd()) {
       cwd
     })
     logger.logger.info(`Checked out and reset to ${baseBranch}`)
-  } catch {
+  } catch (e) {
     logger.logger.warn(
       `Could not switch to ${baseBranch}. Proceeding with HEAD.`
     )
+    debug.debugLog(e)
   }
 }
 async function createAndPushBranchIfNeeded(
@@ -3965,6 +3969,8 @@ async function npmFix(
   const editablePkgJson = await packages.readPackageJson(cwd, {
     editable: true
   })
+  // Lazily access constants.ENV[CI].
+  const isCi = constants.ENV[CI$1]
   await arb.buildIdealTree()
   for (const { 0: name, 1: infos } of infoByPkg) {
     const hasUpgrade = !!registry.getManifestData(NPM$f, name)
@@ -4010,8 +4016,8 @@ async function npmFix(
         if (
           !shadowNpmInject.updateNode(node, packument, vulnerableVersionRange)
         ) {
-          spinner?.failAndStop(`Could not patch ${fromSpec}`)
-          return
+          spinner?.fail(`Could not patch ${fromSpec}`)
+          continue
         }
         const toVersion = node.package.version
         const toVersionRange = shadowNpmInject.applyRange(
@@ -4020,21 +4026,17 @@ async function npmFix(
           rangeStyle
         )
         const toSpec = `${name}@${toVersionRange}`
-        let branch
-        let owner
-        let repo
-        let shouldOpenPr = false
-        // Lazily access constants.ENV[CI].
-        if (constants.ENV[CI$1]) {
-          ;({ owner, repo } = getGitHubEnvRepoInfo())
-          branch = getSocketBranchName(fromPurl, toVersion)
-          // eslint-disable-next-line no-await-in-loop
-          shouldOpenPr = !(await doesPullRequestExistForBranch(
-            owner,
-            repo,
-            branch
-          ))
-        }
+        const branch = isCi ? getSocketBranchName(fromPurl, toVersion) : ''
+        const { owner, repo } = isCi
+          ? getGitHubEnvRepoInfo()
+          : {
+              owner: '',
+              repo: ''
+            }
+        const shouldOpenPr = isCi
+          ? // eslint-disable-next-line no-await-in-loop
+            !(await doesPullRequestExistForBranch(owner, repo, branch))
+          : false
         const revertData = {
           ...(editablePkgJson.content.dependencies
             ? {
@@ -4058,6 +4060,8 @@ async function npmFix(
 
         // eslint-disable-next-line no-await-in-loop
         await checkoutBaseBranchIfAvailable(baseBranch, cwd)
+        let error
+        let errored = false
         let installed = false
         let saved = false
         try {
@@ -4087,23 +4091,11 @@ async function npmFix(
           }
           spinner?.successAndStop(`Fixed ${name}`)
           spinner?.start()
-        } catch {
-          spinner?.error(`Reverting ${toSpec}`)
-          if (saved) {
-            editablePkgJson.update(revertData)
-            // eslint-disable-next-line no-await-in-loop
-            await editablePkgJson.save()
-          }
-          if (installed) {
-            // eslint-disable-next-line no-await-in-loop
-            await install$1(revertTree, {
-              cwd
-            })
-          }
-          spinner?.failAndStop(`Failed to fix ${fromSpec}`)
-          return
+        } catch (e) {
+          error = e
+          errored = true
         }
-        if (shouldOpenPr) {
+        if (!errored && shouldOpenPr) {
           // eslint-disable-next-line no-await-in-loop
           await createAndPushBranchIfNeeded(
             branch,
@@ -4125,6 +4117,25 @@ async function npmFix(
             await enableAutoMerge(prResponse.data)
           }
         }
+        if (errored || isCi) {
+          if (errored) {
+            spinner?.error(`Reverting ${toSpec}`, error)
+          }
+          if (saved) {
+            editablePkgJson.update(revertData)
+            // eslint-disable-next-line no-await-in-loop
+            await editablePkgJson.save()
+          }
+          if (installed) {
+            // eslint-disable-next-line no-await-in-loop
+            await install$1(revertTree, {
+              cwd
+            })
+          }
+          if (errored) {
+            spinner?.failAndStop(`Failed to fix ${fromSpec}`)
+          }
+        }
       }
     }
   }
@@ -4375,6 +4386,8 @@ async function pnpmFix(
   const editablePkgJson = await packages.readPackageJson(cwd, {
     editable: true
   })
+  // Lazily access constants.ENV[CI].
+  const isCi = constants.ENV[CI]
   let actualTree = await getActualTree(cwd)
   for (const { 0: name, 1: infos } of infoByPkg) {
     if (registry.getManifestData(NPM$c, name)) {
@@ -4422,8 +4435,8 @@ async function pnpmFix(
           ? packument.versions[toVersion]
           : undefined
         if (!(toVersion && targetPackument)) {
-          spinner?.failAndStop(`Could not patch ${fromSpec}`)
-          return
+          spinner?.fail(`Could not patch ${fromSpec}`)
+          continue
         }
         const oldPnpm = editablePkgJson.content[PNPM$9]
         const oldPnpmKeyCount = oldPnpm ? Object.keys(oldPnpm).length : 0
@@ -4438,21 +4451,17 @@ async function pnpmFix(
           rangeStyle
         )
         const toSpec = `${name}@${toVersionRange}`
-        let branch
-        let owner
-        let repo
-        let shouldOpenPr = false
-        // Lazily access constants.ENV[CI].
-        if (constants.ENV[CI]) {
-          ;({ owner, repo } = getGitHubEnvRepoInfo())
-          branch = getSocketBranchName(fromPurl, toVersion)
-          // eslint-disable-next-line no-await-in-loop
-          shouldOpenPr = !(await doesPullRequestExistForBranch(
-            owner,
-            repo,
-            branch
-          ))
-        }
+        const branch = isCi ? getSocketBranchName(fromPurl, toVersion) : ''
+        const { owner, repo } = isCi
+          ? getGitHubEnvRepoInfo()
+          : {
+              owner: '',
+              repo: ''
+            }
+        const shouldOpenPr = isCi
+          ? // eslint-disable-next-line no-await-in-loop
+            !(await doesPullRequestExistForBranch(owner, repo, branch))
+          : false
         const updateData = {
           [PNPM$9]: {
             ...oldPnpm,
@@ -4497,6 +4506,8 @@ async function pnpmFix(
 
         // eslint-disable-next-line no-await-in-loop
         await checkoutBaseBranchIfAvailable(baseBranch, cwd)
+        let error
+        let errored = false
         let installed = false
         let saved = false
         try {
@@ -4528,22 +4539,10 @@ async function pnpmFix(
           spinner?.successAndStop(`Fixed ${name}`)
           spinner?.start()
         } catch (e) {
-          spinner?.error(`Reverting ${toSpec}`, e)
-          if (saved) {
-            editablePkgJson.update(revertData)
-            // eslint-disable-next-line no-await-in-loop
-            await editablePkgJson.save()
-          }
-          if (installed) {
-            // eslint-disable-next-line no-await-in-loop
-            actualTree = await install(pkgEnvDetails, {
-              spinner
-            })
-          }
-          spinner?.failAndStop(`Failed to fix ${fromSpec}`)
-          return
+          error = e
+          errored = true
         }
-        if (shouldOpenPr) {
+        if (!errored && shouldOpenPr) {
           // eslint-disable-next-line no-await-in-loop
           await createAndPushBranchIfNeeded(
             branch,
@@ -4565,6 +4564,25 @@ async function pnpmFix(
             await enableAutoMerge(prResponse.data)
           }
         }
+        if (errored || isCi) {
+          if (errored) {
+            spinner?.error(`Reverting ${toSpec}`, error)
+          }
+          if (saved) {
+            editablePkgJson.update(revertData)
+            // eslint-disable-next-line no-await-in-loop
+            await editablePkgJson.save()
+          }
+          if (installed) {
+            // eslint-disable-next-line no-await-in-loop
+            actualTree = await install(pkgEnvDetails, {
+              spinner
+            })
+          }
+          if (errored) {
+            spinner?.failAndStop(`Failed to fix ${fromSpec}`)
+          }
+        }
       }
     }
   }
@@ -11484,7 +11502,7 @@ void (async () => {
   await vendor.updater({
     name: SOCKET_CLI_BIN_NAME,
     // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION']".
-    version: '0.14.100',
+    version: '0.14.102',
     ttl: 86_400_000 /* 24 hours in milliseconds */
   })
   try {
@@ -11552,5 +11570,5 @@ void (async () => {
     await shadowNpmInject.captureException(e)
   }
 })()
-//# debugId=3dc0bb50-dadf-4426-8d9c-aec587ba7726
+//# debugId=53c889d4-b512-4df3-9241-7d2b2c18c461
 //# sourceMappingURL=cli.js.map