socket 0.14.120 → 0.14.122

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.120:d9e8965:5c231098:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
+  const cliVersion = '0.14.122:30c1354:72c12a48: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')
@@ -4063,15 +4063,20 @@ async function npmFix(
     // Process the workspace root last since it will add an override to package.json.
     pkgEnvDetails.editablePkgJson.filename
   ]
-  await arb.buildIdealTree()
   for (const { 0: name, 1: infos } of infoByPkg) {
     const hasUpgrade = !!registry.getManifestData(NPM$f, name)
     if (hasUpgrade) {
       spinner?.info(`Skipping ${name}. Socket Optimize package exists.`)
       continue
     }
+    arb.idealTree = null
+    // eslint-disable-next-line no-await-in-loop
+    await arb.buildIdealTree()
     const oldVersions = arrays.arrayUnique(
-      shadowNpmInject.findPackageNodes(arb.idealTree, name).map(n => n.version)
+      shadowNpmInject
+        .findPackageNodes(arb.idealTree, name)
+        .map(n => n.version)
+        .filter(Boolean)
     )
     const packument =
       oldVersions.length && infos.length
@@ -4245,9 +4250,13 @@ async function npmFix(
                 workspaceName
               }
             )
-            if (prResponse && autoMerge) {
-              // eslint-disable-next-line no-await-in-loop
-              await enableAutoMerge(prResponse.data)
+            if (prResponse) {
+              const { data } = prResponse
+              spinner?.info(`PR #${data.number} opened.`)
+              if (autoMerge) {
+                // eslint-disable-next-line no-await-in-loop
+                await enableAutoMerge(data)
+              }
             }
           }
           if (errored || isCi) {
@@ -4467,29 +4476,30 @@ async function pnpmFix(
 
   // Lazily access constants.ENV[CI].
   const isCi = constants.ENV[CI]
-  const {
-    0: isRepo,
-    1: workspacePkgJsonPaths,
-    2: initialTree
-  } = await Promise.all([
+  const { 0: isRepo, 1: workspacePkgJsonPaths } = await Promise.all([
     isInGitRepo(cwd),
-    shadowNpmInject.globWorkspace(pkgEnvDetails.agent, rootPath),
-    getActualTree(cwd)
+    shadowNpmInject.globWorkspace(pkgEnvDetails.agent, rootPath)
   ])
   const pkgJsonPaths = [
     ...workspacePkgJsonPaths,
     // Process the workspace root last since it will add an override to package.json.
     pkgEnvDetails.editablePkgJson.filename
   ]
-  let actualTree = initialTree
+  let actualTree
   for (const { 0: name, 1: infos } of infoByPkg) {
     if (registry.getManifestData(NPM$c, name)) {
       spinner?.info(`Skipping ${name}. Socket Optimize package exists.`)
       continue
     }
+    // eslint-disable-next-line no-await-in-loop
+    actualTree = await getActualTree(cwd)
     const oldVersions = arrays.arrayUnique(
-      shadowNpmInject.findPackageNodes(actualTree, name).map(n => n.version)
+      shadowNpmInject
+        .findPackageNodes(actualTree, name)
+        .map(n => n.version)
+        .filter(Boolean)
     )
+    debug.debugLog(name, 'oldVersions', oldVersions)
     const packument =
       oldVersions.length && infos.length
         ? // eslint-disable-next-line no-await-in-loop
@@ -4706,9 +4716,13 @@ async function pnpmFix(
                 workspaceName
               }
             )
-            if (prResponse && autoMerge) {
-              // eslint-disable-next-line no-await-in-loop
-              await enableAutoMerge(prResponse.data)
+            if (prResponse) {
+              const { data } = prResponse
+              spinner?.info(`PR #${data.number} opened.`)
+              if (autoMerge) {
+                // eslint-disable-next-line no-await-in-loop
+                await enableAutoMerge(data)
+              }
             }
           }
           if (errored || isCi) {
@@ -12313,7 +12327,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.120',
+    version: '0.14.122',
     ttl: 86_400_000 /* 24 hours in milliseconds */
   })
   try {
@@ -12381,5 +12395,5 @@ void (async () => {
     await shadowNpmInject.captureException(e)
   }
 })()
-//# debugId=776d94c4-537e-4ae8-824d-a4a612fa5e0f
+//# debugId=e703dfb8-7322-4ac4-9e54-b02c664bb4a2
 //# sourceMappingURL=cli.js.map