socket 1.0.58 → 1.0.60

package/bin/cli.js

@@ -12,8 +12,6 @@ const { spawn } = require(
   path.join(rootPath, 'external/@socketsecurity/registry/lib/spawn.js'),
 )
 
-const { NODE_COMPILE_CACHE } = constants
-
 process.exitCode = 1
 
 spawn(
@@ -39,7 +37,8 @@ spawn(
   {
     env: {
       ...process.env,
-      ...(NODE_COMPILE_CACHE ? { NODE_COMPILE_CACHE } : undefined),
+      // Lazily access constants.processEnv.
+      ...constants.processEnv,
     },
     stdio: 'inherit',
   },

package/dist/cli.js

@@ -3716,6 +3716,7 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
   };
   const handleInstallFail = () => {
     cleanupInfoEntriesLoop();
+    spinner?.stop();
     return {
       ok: false,
       message: 'Install failed',
@@ -4119,6 +4120,9 @@ async function install$1(pkgEnvDetails, options) {
   const args = ['--ignore-scripts', '--no-audit', '--no-fund', '--no-progress', '--no-save', '--silent', ...(extraArgs ?? [])];
   const quotedCmd = `\`${pkgEnvDetails.agent} install ${args.join(' ')}\``;
   debug.debugFn('stdio', `spawn: ${quotedCmd}`);
+  const isSpinning = spinner?.isSpinning;
+  spinner?.stop();
+  let errored = false;
   try {
     await utils.runAgentInstall(pkgEnvDetails, {
       args,
@@ -4130,17 +4134,23 @@ async function install$1(pkgEnvDetails, options) {
     debug.debugDir('inspect', {
       error: e
     });
-    return null;
+    errored = true;
   }
-  try {
-    return await getActualTree(cwd);
-  } catch (e) {
-    debug.debugFn('error', 'caught: Arborist error');
-    debug.debugDir('inspect', {
-      error: e
-    });
+  let actualTree = null;
+  if (!errored) {
+    try {
+      actualTree = await getActualTree(cwd);
+    } catch (e) {
+      debug.debugFn('error', 'caught: Arborist error');
+      debug.debugDir('inspect', {
+        error: e
+      });
+    }
   }
-  return null;
+  if (isSpinning) {
+    spinner.start();
+  }
+  return actualTree;
 }
 async function npmFix(pkgEnvDetails, fixConfig) {
   const {
@@ -4262,6 +4272,9 @@ async function install(pkgEnvDetails, options) {
   '--config.confirmModulesPurge=false', ...(extraArgs ?? [])];
   const quotedCmd = `\`${pkgEnvDetails.agent} install ${args.join(' ')}\``;
   debug.debugFn('stdio', `spawn: ${quotedCmd}`);
+  const isSpinning = spinner?.isSpinning;
+  spinner?.stop();
+  let errored = false;
   try {
     await utils.runAgentInstall(pkgEnvDetails, {
       args,
@@ -4273,17 +4286,23 @@ async function install(pkgEnvDetails, options) {
     debug.debugDir('inspect', {
       error: e
     });
-    return null;
+    errored = true;
   }
-  try {
-    return await getActualTree(cwd);
-  } catch (e) {
-    debug.debugFn('error', 'caught: Arborist error');
-    debug.debugDir('inspect', {
-      error: e
-    });
+  let actualTree = null;
+  if (!errored) {
+    try {
+      actualTree = await getActualTree(cwd);
+    } catch (e) {
+      debug.debugFn('error', 'caught: Arborist error');
+      debug.debugDir('inspect', {
+        error: e
+      });
+    }
   }
-  return null;
+  if (isSpinning) {
+    spinner.start();
+  }
+  return actualTree;
 }
 async function pnpmFix(pkgEnvDetails, fixConfig) {
   const {
@@ -7520,7 +7539,7 @@ async function updateLockfile(pkgEnvDetails, options) {
     __proto__: null,
     ...options
   };
-  const isSpinning = !!spinner?.['isSpinning'];
+  const isSpinning = !!spinner?.isSpinning;
   if (!isSpinning) {
     spinner?.start();
   }
@@ -7581,6 +7600,7 @@ async function applyOptimization(pkgEnvDetails, {
       spinner
     });
     if (!result.ok) {
+      spinner.stop();
       return result;
     }
   }
@@ -7659,11 +7679,12 @@ async function handleOptimize({
     agentVersion
   } = pkgEnvDetails;
   if (agent === VLT) {
-    return {
+    await outputOptimizeResult({
       ok: false,
       message: 'Unsupported',
       cause: utils.cmdPrefixMessage(CMD_NAME, `${agent} v${agentVersion} does not support overrides. Soon, though ⚡`)
-    };
+    }, outputKind);
+    return;
   }
   logger.logger.info(`Optimizing packages for ${agent} v${agentVersion}.\n`);
   await outputOptimizeResult(await applyOptimization(pkgEnvDetails, {
@@ -14191,5 +14212,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=1ea5a8dd-5995-4b46-91ba-648181473483
+//# debugId=3e924cea-502a-45fa-add8-c7154304d157
 //# sourceMappingURL=cli.js.map