socket 0.14.118 → 0.14.120

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.118:fb39c6f:81d22cc7:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
+  const cliVersion = '0.14.120:d9e8965:5c231098: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
   })
@@ -4103,6 +4105,10 @@ async function npmFix(
             oldVersion
           )
           if (!node) {
+            debug.debugLog(
+              `Skipping ${oldSpec}, no node found in arborist.idealTree`,
+              pkgJsonPath
+            )
             continue
           }
           if (
@@ -4216,13 +4222,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,
@@ -4503,13 +4512,18 @@ async function pnpmFix(
           firstPatchedVersionIdentifier,
           vulnerableVersionRange
         } of infos) {
+          // eslint-disable-next-line no-await-in-loop
+          actualTree = await getActualTree()
           const node = shadowNpmInject.findPackageNode(
             actualTree,
             name,
             oldVersion
           )
           if (!node) {
-            debug.debugLog('skipping no node', pkgJsonPath)
+            debug.debugLog(
+              `Skipping ${oldSpec}, no node found in arborist.actualTree`,
+              pkgJsonPath
+            )
             continue
           }
           const availableVersions = Object.keys(packument.versions)
@@ -4627,7 +4641,7 @@ async function pnpmFix(
             newVersion,
             rangeStyle
           )
-          debug.debugLog('updatePackageJsonFromNode', modded)
+          debug.debugLog(`Updated package.json from node: ${modded}`)
           let error
           let errored = false
           let installed = false
@@ -4669,13 +4683,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,
@@ -12296,7 +12313,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.118',
+    version: '0.14.120',
     ttl: 86_400_000 /* 24 hours in milliseconds */
   })
   try {
@@ -12364,5 +12381,5 @@ void (async () => {
     await shadowNpmInject.captureException(e)
   }
 })()
-//# debugId=1911c4b4-75fd-408e-81ff-9c4463baa635
+//# debugId=776d94c4-537e-4ae8-824d-a4a612fa5e0f
 //# sourceMappingURL=cli.js.map