socket 0.14.126 → 0.14.128

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.126:cbde084:6c7196a9:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
+  const cliVersion = '0.14.128:ec33790:9f97cc47: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')
@@ -3811,6 +3811,11 @@ async function gitCheckoutBaseBranchIfAvailable(
     debug.debugLog(e)
   }
 }
+async function gitCleanFdx(cwd = process.cwd()) {
+  await spawn.spawn('git', ['clean', '-fdx'], {
+    cwd
+  })
+}
 async function gitCreateAndPushBranchIfNeeded(
   branch,
   commitMsg,
@@ -3846,8 +3851,8 @@ async function gitCreateAndPushBranchIfNeeded(
   })
   return true
 }
-async function gitHardReset(cwd = process.cwd()) {
-  await spawn.spawn('git', ['reset', '--hard'], {
+async function gitHardReset(branch = 'HEAD', cwd = process.cwd()) {
+  await spawn.spawn('git', ['reset', '--hard', branch], {
     cwd
   })
 }
@@ -4480,37 +4485,23 @@ async function pnpmFix(
     // Process the workspace root last since it will add an override to package.json.
     pkgEnvDetails.editablePkgJson.filename
   ]
-  let actualTree = await getActualTree(cwd)
   for (const { 0: name, 1: infos } of infoByPkg) {
+    debug.debugLog(`Processing vulnerable package: ${name}`)
     if (registry.getManifestData(NPM$c, name)) {
       spinner?.info(`Skipping ${name}. Socket Optimize package exists.`)
       continue
     }
-    const oldVersions = arrays.arrayUnique(
-      shadowNpmInject
-        .findPackageNodes(actualTree, name)
-        .map(n => n.target?.version ?? n.version)
-        .filter(Boolean)
-    )
-    const packument =
-      oldVersions.length && infos.length
-        ? // eslint-disable-next-line no-await-in-loop
-          await packages.fetchPackagePackument(name)
-        : null
-    if (!packument) {
-      continue
-    }
     const fixedSpecs = new Set()
     for (const pkgJsonPath of pkgJsonPaths) {
-      // Re-read actualTree to avoid lockfile state issues
+      debug.debugLog(`Checking workspace: ${pkgJsonPath}`)
+
       // eslint-disable-next-line no-await-in-loop
-      actualTree = await getActualTree(cwd)
-      const pkgPath = path$1.dirname(pkgJsonPath)
+      let actualTree = await getActualTree(cwd)
       const isWorkspaceRoot =
         pkgJsonPath === pkgEnvDetails.editablePkgJson.filename
       const workspaceName = isWorkspaceRoot
         ? 'root'
-        : path$1.relative(rootPath, pkgPath)
+        : path$1.relative(rootPath, path$1.dirname(pkgJsonPath))
       const editablePkgJson = isWorkspaceRoot
         ? pkgEnvDetails.editablePkgJson
         : // eslint-disable-next-line no-await-in-loop
@@ -4521,6 +4512,20 @@ async function pnpmFix(
       // Get current overrides for revert logic
       const oldPnpmSection = editablePkgJson.content[PNPM$8]
       const oldOverrides = oldPnpmSection?.[OVERRIDES$2]
+      const oldVersions = arrays.arrayUnique(
+        shadowNpmInject
+          .findPackageNodes(actualTree, name)
+          .map(n => n.target?.version ?? n.version)
+          .filter(Boolean)
+      )
+      const packument =
+        oldVersions.length && infos.length
+          ? // eslint-disable-next-line no-await-in-loop
+            await packages.fetchPackagePackument(name)
+          : null
+      if (!packument) {
+        continue
+      }
       for (const oldVersion of oldVersions) {
         const oldSpec = `${name}@${oldVersion}`
         const oldPurl = `pkg:npm/${oldSpec}`
@@ -4700,11 +4705,9 @@ async function pnpmFix(
             )
           } 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)
-            ])
+            await gitHardReset(baseBranch, cwd)
+            // eslint-disable-next-line no-await-in-loop
+            await gitCleanFdx(cwd)
             // eslint-disable-next-line no-await-in-loop
             actualTree = await install(pkgEnvDetails, {
               spinner
@@ -12282,7 +12285,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.126',
+    version: '0.14.128',
     ttl: 86_400_000 /* 24 hours in milliseconds */
   })
   try {
@@ -12350,5 +12353,5 @@ void (async () => {
     await shadowNpmInject.captureException(e)
   }
 })()
-//# debugId=aa5acd0c-77d1-4ae1-8a7f-0c5b01e272c0
+//# debugId=f1c6fcaa-6659-4ef8-b1e9-947a9992b085
 //# sourceMappingURL=cli.js.map