socket 0.14.121 → 0.14.123

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.121:002547b:753db578:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
+  const cliVersion = '0.14.123:ac83b62:9fc01fd8: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
@@ -4471,28 +4476,35 @@ 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
+    await Promise.all([
+      shadowNpmInject.removeNodeModules(cwd),
+      ...(isRepo ? [gitHardReset(cwd)] : [])
+    ])
+    // eslint-disable-next-line no-await-in-loop
+    actualTree = await install(pkgEnvDetails, {
+      spinner
+    })
     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 =
@@ -4518,7 +4530,14 @@ async function pnpmFix(
           vulnerableVersionRange
         } of infos) {
           // eslint-disable-next-line no-await-in-loop
-          actualTree = await getActualTree()
+          await Promise.all([
+            shadowNpmInject.removeNodeModules(cwd),
+            ...(isRepo ? [gitHardReset(cwd)] : [])
+          ])
+          // eslint-disable-next-line no-await-in-loop
+          actualTree = await install(pkgEnvDetails, {
+            spinner
+          })
           const node = shadowNpmInject.findPackageNode(
             actualTree,
             name,
@@ -12322,7 +12341,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.121',
+    version: '0.14.123',
     ttl: 86_400_000 /* 24 hours in milliseconds */
   })
   try {
@@ -12390,5 +12409,5 @@ void (async () => {
     await shadowNpmInject.captureException(e)
   }
 })()
-//# debugId=a9198775-d997-4ba2-a631-647708910271
+//# debugId=5bad9b77-6e22-4b32-a047-7f16520f50a3
 //# sourceMappingURL=cli.js.map