socket 0.14.127 → 0.14.129

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.127:0a19e43:aad274b8:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
+  const cliVersion = '0.14.129:a3be3d1:0a60013f: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
   })
 }
@@ -4497,12 +4502,12 @@ async function pnpmFix(
       const workspaceName = isWorkspaceRoot
         ? 'root'
         : path$1.relative(rootPath, path$1.dirname(pkgJsonPath))
-      const editablePkgJson = isWorkspaceRoot
-        ? pkgEnvDetails.editablePkgJson
-        : // eslint-disable-next-line no-await-in-loop
-          await packages.readPackageJson(pkgJsonPath, {
-            editable: true
-          })
+
+      // Always re-read the editable package.json to avoid stale mutations across iterations
+      // eslint-disable-next-line no-await-in-loop
+      const editablePkgJson = await packages.readPackageJson(pkgJsonPath, {
+        editable: true
+      })
 
       // Get current overrides for revert logic
       const oldPnpmSection = editablePkgJson.content[PNPM$8]
@@ -4685,13 +4690,11 @@ async function pnpmFix(
           }
           if (errored) {
             editablePkgJson.update(revertData)
-
             // eslint-disable-next-line no-await-in-loop
             await Promise.all([
               shadowNpmInject.removeNodeModules(cwd),
               editablePkgJson.save()
             ])
-
             // eslint-disable-next-line no-await-in-loop
             actualTree = await install(pkgEnvDetails, {
               spinner
@@ -4702,11 +4705,9 @@ async function pnpmFix(
             )
           } else if (isCi) {
             // eslint-disable-next-line no-await-in-loop
-            await Promise.all([
-              shadowNpmInject.removeNodeModules(cwd),
-              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
@@ -12284,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.127',
+    version: '0.14.129',
     ttl: 86_400_000 /* 24 hours in milliseconds */
   })
   try {
@@ -12352,5 +12353,5 @@ void (async () => {
     await shadowNpmInject.captureException(e)
   }
 })()
-//# debugId=2a168b95-a192-4aa3-a64c-03c6bd040aea
+//# debugId=b66ba2bc-112f-4b8d-9a20-2281190b67fe
 //# sourceMappingURL=cli.js.map