@wix/evalforge-evaluator 0.195.0 → 0.196.0

package/build/index.mjs

@@ -7402,7 +7402,6 @@ import { createHash } from "crypto";
 import path from "path";
 import { spawn, execFileSync } from "child_process";
 var INSTALL_TIMEOUT_MS = 1e5;
-var PNPM_BOOTSTRAP_TIMEOUT_MS = 6e4;
 var HEARTBEAT_INTERVAL_MS = 5e3;
 function reportRegistry(workDir, onProgress) {
   try {
@@ -7491,80 +7490,36 @@ function cloneDirectory(src, dest) {
     cpSync(src, dest, { recursive: true });
   }
 }
-async function runCommand(exec, cmd, args, workDir, onProgress, label, timeoutMs) {
-  onProgress(`[diag] ${label} starting: ${cmd} ${args.join(" ")}`);
+async function runInstall(exec, pm, workDir, onProgress) {
+  reportRegistry(workDir, onProgress);
+  onProgress(`[diag] npm install starting: ${pm.cmd} ${pm.args.join(" ")}`);
   const startedAt = Date.now();
   const heartbeat = setInterval(() => {
     onProgress(
-      `[diag] ${label} still running: ${Math.round(
+      `[diag] npm install still running: ${Math.round(
         (Date.now() - startedAt) / 1e3
       )}s elapsed`
     );
   }, HEARTBEAT_INTERVAL_MS);
   try {
-    await exec(cmd, args, {
+    await exec(pm.cmd, pm.args, {
       cwd: workDir,
-      timeoutMs,
+      timeoutMs: INSTALL_TIMEOUT_MS,
       env: { ...process.env, NODE_ENV: "development" }
     });
-    onProgress(`[diag] ${label} finished in ${Date.now() - startedAt}ms`);
+    onProgress(`[diag] npm install finished in ${Date.now() - startedAt}ms`);
+    reportNodeModules(workDir, onProgress);
     return true;
   } catch (err) {
     onProgress(
-      `[diag] ${label} FAILED after ${Date.now() - startedAt}ms: ${err instanceof Error ? err.message : String(err)}`
+      `[diag] npm install FAILED after ${Date.now() - startedAt}ms: ${err instanceof Error ? err.message : String(err)}`
     );
+    reportNodeModules(workDir, onProgress);
     return false;
   } finally {
     clearInterval(heartbeat);
   }
 }
-var PNPM_INSTALL_ARGS = [
-  "install",
-  "--shamefully-hoist",
-  "--ignore-scripts",
-  "--network-concurrency=8"
-];
-async function runInstall(exec, pm, workDir, onProgress) {
-  reportRegistry(workDir, onProgress);
-  const pnpmReady = await runCommand(
-    exec,
-    "npm",
-    ["install", "-g", "pnpm"],
-    workDir,
-    onProgress,
-    "pnpm bootstrap",
-    PNPM_BOOTSTRAP_TIMEOUT_MS
-  );
-  if (pnpmReady) {
-    const pnpmOk = await runCommand(
-      exec,
-      "pnpm",
-      PNPM_INSTALL_ARGS,
-      workDir,
-      onProgress,
-      "pnpm install",
-      INSTALL_TIMEOUT_MS
-    );
-    if (pnpmOk) {
-      reportNodeModules(workDir, onProgress);
-      return true;
-    }
-    onProgress("[diag] pnpm install failed \u2014 falling back to npm");
-  } else {
-    onProgress("[diag] pnpm bootstrap failed \u2014 falling back to npm");
-  }
-  const ok = await runCommand(
-    exec,
-    pm.cmd,
-    pm.args,
-    workDir,
-    onProgress,
-    "npm install",
-    INSTALL_TIMEOUT_MS
-  );
-  reportNodeModules(workDir, onProgress);
-  return ok;
-}
 async function installWithCache(workDir, exec, cacheBase, pm, onProgress) {
   const sourceContent = readFileSync(
     path.join(workDir, pm.cacheSourceFile),