socket 1.0.70 → 1.0.71

package/dist/cli.js

@@ -3994,12 +3994,12 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
             }
             continue infosLoop;
           }
+          spinner?.start();
           if (!hasAnnouncedWorkspace) {
             hasAnnouncedWorkspace = true;
             workspaceLogCallCount = logger.logger.logCallCount;
           }
           const newId = `${name}@${utils.applyRange(refRange, newVersion, rangeStyle)}`;
-          spinner?.start();
           spinner?.info(`Installing ${newId} in ${workspace}.`);
           let error;
           let errored = false;
@@ -4449,9 +4449,7 @@ async function pnpmFix(pkgEnvDetails, fixConfig) {
   } = fixConfig;
   spinner?.start();
   let actualTree;
-  let {
-    lockSrc
-  } = pkgEnvDetails;
+  let lockSrc = pkgEnvDetails.lockSrc;
   let lockfile = utils.parsePnpmLockfile(lockSrc);
   // Update pnpm-lock.yaml if its version is older than what the installed pnpm
   // produces.
@@ -4461,10 +4459,9 @@ async function pnpmFix(pkgEnvDetails, fixConfig) {
       cwd,
       spinner
     });
-    const maybeLockSrc = maybeActualTree ? await utils.readLockfile(pkgEnvDetails.lockPath) : null;
-    if (maybeActualTree && maybeLockSrc) {
+    lockSrc = maybeActualTree ? await utils.readLockfile(pkgEnvDetails.lockPath) : null;
+    if (lockSrc && maybeActualTree) {
       actualTree = maybeActualTree;
-      lockSrc = maybeLockSrc;
       lockfile = utils.parsePnpmLockfile(lockSrc);
     } else {
       lockfile = null;
@@ -4498,7 +4495,7 @@ async function pnpmFix(pkgEnvDetails, fixConfig) {
   }
   let revertData;
   let revertOverrides;
-  let revertOverridesSrc;
+  let revertOverridesSrc = '';
   return await agentFix(pkgEnvDetails, actualTree, alertsMap, install, {
     async beforeInstall(editablePkgJson, packument, oldVersion, newVersion, vulnerableVersionRange, options) {
       const isWorkspaceRoot = editablePkgJson.filename === pkgEnvDetails.editablePkgJson.filename;
@@ -4508,6 +4505,7 @@ async function pnpmFix(pkgEnvDetails, fixConfig) {
       } = getOverridesDataPnpm(pkgEnvDetails, editablePkgJson.content);
       const oldPnpmSection = editablePkgJson.content[PNPM$6];
       const overrideKey = `${packument.name}@${vulnerableVersionRange}`;
+      lockSrc = await utils.readLockfile(pkgEnvDetails.lockPath);
       revertOverrides = undefined;
       revertOverridesSrc = utils.extractOverridesFromPnpmLockSrc(lockSrc);
       if (isWorkspaceRoot) {
@@ -4560,8 +4558,9 @@ async function pnpmFix(pkgEnvDetails, fixConfig) {
       await editablePkgJson.save({
         ignoreWhitespace: true
       });
+      lockSrc = await utils.readLockfile(pkgEnvDetails.lockPath);
       const updatedOverridesContent = utils.extractOverridesFromPnpmLockSrc(lockSrc);
-      if (updatedOverridesContent && revertOverridesSrc) {
+      if (updatedOverridesContent) {
         lockSrc = lockSrc.replace(updatedOverridesContent, revertOverridesSrc);
         await fs$1.promises.writeFile(pkgEnvDetails.lockPath, lockSrc, 'utf8');
       }
@@ -14595,5 +14594,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=c419b9c7-a1f4-4307-8197-19068fed4cd4
+//# debugId=6e0fd7c6-a2c8-49d0-90ec-61ff85e89df9
 //# sourceMappingURL=cli.js.map