socket 0.14.114 → 0.14.115

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.114:6709538:c3c69119:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
+  const cliVersion = '0.14.115:b2d12c7:12ad560f: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')
@@ -3831,11 +3831,6 @@ async function gitCreateAndPushBranchIfNeeded(
       basename === 'pnpm-lock.yaml'
     )
   })
-  debug.debugLog('branch', branch)
-  debug.debugLog(
-    'gitCreateAndPushBranchIfNeeded > moddedFilepaths',
-    moddedFilepaths
-  )
   if (moddedFilepaths.length) {
     await spawn.spawn('git', ['add', ...moddedFilepaths], {
       cwd
@@ -4030,9 +4025,10 @@ async function npmFix(
   pkgEnvDetails,
   { autoMerge, cwd, purls, rangeStyle, spinner, test, testScript }
 ) {
+  const { pkgPath: rootPath } = pkgEnvDetails
   spinner?.start()
   const arb = new shadowNpmInject.SafeArborist({
-    path: pkgEnvDetails.pkgPath,
+    path: rootPath,
     ...shadowNpmInject.SAFE_ARBORIST_REIFY_OPTIONS_OVERRIDES
   })
   // Calling arb.reify() creates the arb.diff object and nulls-out arb.idealTree.
@@ -4057,14 +4053,14 @@ async function npmFix(
 
   // Lazily access constants.ENV[CI].
   const isCi = constants.ENV[CI$1]
-  const { pkgPath: rootPath } = pkgEnvDetails
   const { 0: isRepo, 1: workspacePkgJsonPaths } = await Promise.all([
     isInGitRepo(cwd),
-    shadowNpmPaths.globWorkspace(pkgEnvDetails)
+    shadowNpmInject.globWorkspace(pkgEnvDetails.agent, rootPath)
   ])
   const pkgJsonPaths = [
-    pkgEnvDetails.editablePkgJson.filename,
-    ...workspacePkgJsonPaths
+    ...workspacePkgJsonPaths,
+    // 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) {
@@ -4253,6 +4249,8 @@ async function npmFix(
                 spinner?.error(`Reverting ${newSpec}${workspaceDetails}`, error)
               }
             }
+            // eslint-disable-next-line no-await-in-loop
+            await shadowNpmInject.removeNodeModules(cwd)
             if (isRepo) {
               // eslint-disable-next-line no-await-in-loop
               await gitHardReset(cwd)
@@ -4435,12 +4433,10 @@ async function pnpmFix(
   pkgEnvDetails,
   { autoMerge, cwd, purls, rangeStyle, spinner, test, testScript }
 ) {
-  const lockfile = await vendor.libExports$3.readWantedLockfile(
-    pkgEnvDetails.pkgPath,
-    {
-      ignoreIncompatible: false
-    }
-  )
+  const { pkgPath: rootPath } = pkgEnvDetails
+  const lockfile = await vendor.libExports$3.readWantedLockfile(rootPath, {
+    ignoreIncompatible: false
+  })
   if (!lockfile) {
     return
   }
@@ -4467,21 +4463,20 @@ async function pnpmFix(
 
   // Lazily access constants.ENV[CI].
   const isCi = constants.ENV[CI]
-  const { pkgPath: rootPath } = pkgEnvDetails
   const {
     0: isRepo,
     1: workspacePkgJsonPaths,
     2: initialTree
   } = await Promise.all([
     isInGitRepo(cwd),
-    shadowNpmPaths.globWorkspace(pkgEnvDetails),
+    shadowNpmInject.globWorkspace(pkgEnvDetails.agent, rootPath),
     getActualTree(cwd)
   ])
   const pkgJsonPaths = [
-    pkgEnvDetails.editablePkgJson.filename,
-    ...workspacePkgJsonPaths
+    ...workspacePkgJsonPaths,
+    // Process the workspace root last since it will add an override to package.json.
+    pkgEnvDetails.editablePkgJson.filename
   ]
-  debug.debugLog('workspacePkgJsonPaths', workspacePkgJsonPaths)
   let actualTree = initialTree
   for (const { 0: name, 1: infos } of infoByPkg) {
     if (registry.getManifestData(NPM$c, name)) {
@@ -4513,9 +4508,6 @@ async function pnpmFix(
           firstPatchedVersionIdentifier,
           vulnerableVersionRange
         } of infos) {
-          debug.debugLog('name', name)
-          debug.debugLog('oldVersion', oldVersion)
-          debug.debugLog('pkgJsonPath', pkgJsonPath)
           const node = shadowNpmInject.findPackageNode(
             actualTree,
             name,
@@ -4641,7 +4633,6 @@ async function pnpmFix(
             rangeStyle
           )
           debug.debugLog('updatePackageJsonFromNode', modded)
-          debug.debugLog(branch, editablePkgJson.filename)
           let error
           let errored = false
           let installed = false
@@ -4683,17 +4674,13 @@ async function pnpmFix(
             error = e
             errored = true
           }
-          debug.debugLog('check "shouldOpenPr":', shouldOpenPr)
-          debug.debugLog('check "errored":', errored)
           if (!errored && shouldOpenPr) {
-            debug.debugLog('1: gitCreateAndPushBranchIfNeeded')
             // eslint-disable-next-line no-await-in-loop
             await gitCreateAndPushBranchIfNeeded(
               branch,
               getSocketCommitMessage(oldPurl, newVersion, workspaceName),
               cwd
             )
-            debug.debugLog('2: openGitHubPullRequest')
             // eslint-disable-next-line no-await-in-loop
             const prResponse = await openGitHubPullRequest(
               owner,
@@ -4720,6 +4707,8 @@ async function pnpmFix(
               }
             }
             editablePkgJson.update(revertData)
+            // eslint-disable-next-line no-await-in-loop
+            await shadowNpmInject.removeNodeModules(cwd)
             if (isRepo) {
               // eslint-disable-next-line no-await-in-loop
               await gitHardReset(cwd)
@@ -7518,7 +7507,10 @@ async function addOverrides(pkgEnvDetails, pkgPath, options) {
       updated: new Set(),
       updatedInWorkspaces: new Set(),
       warnedPnpmWorkspaceRequiresNpm: false,
-      workspacePkgJsonPaths: await shadowNpmPaths.globWorkspace(pkgEnvDetails)
+      workspacePkgJsonPaths: await shadowNpmInject.globWorkspace(
+        agent,
+        rootPath
+      )
     }
   } = {
     __proto__: null,
@@ -12311,7 +12303,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.114',
+    version: '0.14.115',
     ttl: 86_400_000 /* 24 hours in milliseconds */
   })
   try {
@@ -12379,5 +12371,5 @@ void (async () => {
     await shadowNpmInject.captureException(e)
   }
 })()
-//# debugId=c9a1b3d7-691f-4424-8e65-e9bc8d0adfc7
+//# debugId=69630122-326f-45e7-bdba-67ec950698be
 //# sourceMappingURL=cli.js.map