socket 0.14.117 → 0.14.119

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.117:3a58b03:992e8879:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
+  const cliVersion = '0.14.119:4f7b6a8:5ff737f3: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')
@@ -3817,12 +3817,9 @@ async function gitCreateAndPushBranchIfNeeded(
   cwd = process.cwd()
 ) {
   if (await gitBranchExists(branch, cwd)) {
-    logger.logger.warn(`Branch "${branch}" already exists. Skipping creation.`)
-    return false
+    logger.logger.warn(`Branch "${branch}" already exists, skipping creation.`)
+    return true
   }
-  await spawn.spawn('git', ['checkout', '-b', branch], {
-    cwd
-  })
   const moddedFilepaths = (await gitUnstagedModifiedFiles(cwd)).filter(p => {
     const basename = path$1.basename(p)
     return (
@@ -3831,11 +3828,16 @@ async function gitCreateAndPushBranchIfNeeded(
       basename === 'pnpm-lock.yaml'
     )
   })
-  if (moddedFilepaths.length) {
-    await spawn.spawn('git', ['add', ...moddedFilepaths], {
-      cwd
-    })
+  if (!moddedFilepaths.length) {
+    logger.logger.warn('Nothing to commit, skipping push.')
+    return false
   }
+  await spawn.spawn('git', ['checkout', '-b', branch], {
+    cwd
+  })
+  await spawn.spawn('git', ['add', ...moddedFilepaths], {
+    cwd
+  })
   await spawn.spawn('git', ['commit', '-m', commitMsg], {
     cwd
   })
@@ -4216,13 +4218,16 @@ async function npmFix(
             error = e
             errored = true
           }
-          if (!errored && shouldOpenPr) {
+          if (
+            !errored &&
+            shouldOpenPr &&
             // eslint-disable-next-line no-await-in-loop
-            await gitCreateAndPushBranchIfNeeded(
+            (await gitCreateAndPushBranchIfNeeded(
               branch,
               getSocketCommitMessage(oldPurl, newVersion, workspaceName),
               cwd
-            )
+            ))
+          ) {
             // eslint-disable-next-line no-await-in-loop
             const prResponse = await openGitHubPullRequest(
               owner,
@@ -4248,19 +4253,15 @@ async function npmFix(
                 spinner?.error(`Reverting ${newSpec}${workspaceDetails}`, error)
               }
             }
-            // eslint-disable-next-line no-await-in-loop
-            await shadowNpmInject.removeNodeModules(cwd)
-            if (isRepo) {
-              // eslint-disable-next-line no-await-in-loop
-              await gitHardReset(cwd)
-            }
             if (saved) {
               editablePkgJson.update(revertData)
-              if (!isRepo) {
-                // eslint-disable-next-line no-await-in-loop
-                await editablePkgJson.save()
-              }
             }
+            // eslint-disable-next-line no-await-in-loop
+            await Promise.all([
+              shadowNpmInject.removeNodeModules(cwd),
+              ...(isRepo ? [gitHardReset(cwd)] : []),
+              ...(saved && !isRepo ? [editablePkgJson.save()] : [])
+            ])
             if (!isRepo && installed) {
               // eslint-disable-next-line no-await-in-loop
               await install$1(revertTree, {
@@ -4673,13 +4674,16 @@ async function pnpmFix(
             error = e
             errored = true
           }
-          if (!errored && shouldOpenPr) {
+          if (
+            !errored &&
+            shouldOpenPr &&
             // eslint-disable-next-line no-await-in-loop
-            await gitCreateAndPushBranchIfNeeded(
+            (await gitCreateAndPushBranchIfNeeded(
               branch,
               getSocketCommitMessage(oldPurl, newVersion, workspaceName),
               cwd
-            )
+            ))
+          ) {
             // eslint-disable-next-line no-await-in-loop
             const prResponse = await openGitHubPullRequest(
               owner,
@@ -4707,20 +4711,18 @@ async function pnpmFix(
             }
             editablePkgJson.update(revertData)
             // eslint-disable-next-line no-await-in-loop
-            await shadowNpmInject.removeNodeModules(cwd)
-            if (isRepo) {
-              // eslint-disable-next-line no-await-in-loop
-              await gitHardReset(cwd)
-              // eslint-disable-next-line no-await-in-loop
-              actualTree = await getActualTree(cwd)
-            } else if (installed) {
-              // eslint-disable-next-line no-await-in-loop
-              await editablePkgJson.save()
-              // eslint-disable-next-line no-await-in-loop
-              actualTree = await install(pkgEnvDetails, {
-                spinner
-              })
-            }
+            await Promise.all([
+              shadowNpmInject.removeNodeModules(cwd),
+              ...(isRepo
+                ? [gitHardReset(cwd)]
+                : installed
+                  ? [editablePkgJson.save()]
+                  : [])
+            ])
+            // eslint-disable-next-line no-await-in-loop
+            actualTree = await install(pkgEnvDetails, {
+              spinner
+            })
             if (errored) {
               if (!failedSpecs.has(newSpecKey)) {
                 failedSpecs.add(newSpecKey)
@@ -12302,7 +12304,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.117',
+    version: '0.14.119',
     ttl: 86_400_000 /* 24 hours in milliseconds */
   })
   try {
@@ -12370,5 +12372,5 @@ void (async () => {
     await shadowNpmInject.captureException(e)
   }
 })()
-//# debugId=6435fd3c-af36-45dd-abe9-42d54adb2b3f
+//# debugId=617452d4-7fe3-48d9-912c-adf3352d17b3
 //# sourceMappingURL=cli.js.map