socket 0.14.125 → 0.14.126

package/dist/module-sync/cli.js

@@ -917,7 +917,7 @@ function emitBanner(name) {
   logger.logger.error(getAsciiHeader(name))
 }
 function getAsciiHeader(command) {
-  const cliVersion = '0.14.125:11530dd:821f8925:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
+  const cliVersion = '0.14.126:cbde084:6c7196a9:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
   const nodeVersion = process$1.version
   const apiToken = shadowNpmInject.getDefaultToken()
   const defaultOrg = shadowNpmInject.getConfigValue('defaultOrg')
@@ -4683,28 +4683,32 @@ async function pnpmFix(
             error = e
             errored = true
           }
-          if (errored || isCi) {
+          if (errored) {
             editablePkgJson.update(revertData)
-
             // eslint-disable-next-line no-await-in-loop
             await Promise.all([
               shadowNpmInject.removeNodeModules(cwd),
-              ...(isCi
-                ? [gitCheckoutBaseBranchIfAvailable(baseBranch, cwd)]
-                : []),
-              ...(isCi ? [] : [editablePkgJson.save()])
+              editablePkgJson.save()
+            ])
+            // eslint-disable-next-line no-await-in-loop
+            actualTree = await install(pkgEnvDetails, {
+              spinner
+            })
+            spinner?.failAndStop(
+              `Update failed for ${oldSpec} in ${workspaceName}`,
+              error
+            )
+          } else if (isCi) {
+            // eslint-disable-next-line no-await-in-loop
+            await Promise.all([
+              shadowNpmInject.removeNodeModules(cwd),
+              // Reset to base branch to isolate next PR
+              gitCheckoutBaseBranchIfAvailable(baseBranch, cwd)
             ])
-
             // eslint-disable-next-line no-await-in-loop
             actualTree = await install(pkgEnvDetails, {
               spinner
             })
-            if (errored) {
-              spinner?.failAndStop(
-                `Update failed for ${oldSpec} in ${workspaceName}`,
-                error
-              )
-            }
           }
         }
       }
@@ -12278,7 +12282,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.125',
+    version: '0.14.126',
     ttl: 86_400_000 /* 24 hours in milliseconds */
   })
   try {
@@ -12346,5 +12350,5 @@ void (async () => {
     await shadowNpmInject.captureException(e)
   }
 })()
-//# debugId=8c8790a2-a162-431b-99ab-b980237160d8
+//# debugId=aa5acd0c-77d1-4ae1-8a7f-0c5b01e272c0
 //# sourceMappingURL=cli.js.map