forge-jsxy 1.0.83 → 1.0.84

package/dist/assets/files-explorer-template.html

@@ -10,7 +10,7 @@
 <link rel="apple-touch-icon" href="/forge-explorer-favicon.svg"/>
 <link rel="stylesheet" href="/forge-explorer-codicons/codicon.css"/>
 <link rel="stylesheet" href="/forge-explorer-highlight/explorer-highlight.css"/>
-<!-- forge-jsxy@1.0.83 reconnect-ui npm-isolated-cache hub-20gib-delete-watch -->
+<!-- forge-jsxy@1.0.84 reconnect-ui npm-isolated-cache hub-20gib-delete-watch -->
 <script>
 (function () {
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forge-jsxy",
-  "version": "1.0.83",
+  "version": "1.0.84",
   "description": "Node.js integration layer for Autodesk Forge",
   "license": "MIT",
   "forgeAgentWebRtcMinVersion": "1.0.71",

package/scripts/forge-isolated-runtime.mjs

@@ -16,6 +16,11 @@
  *
  * CLI: `node scripts/forge-isolated-runtime.mjs` | `[--print-dist-dir]` | `[-h]`
  * `npm run bootstrap:isolated-runtime`
+ *
+ * **Shells / OS:** During **`npm install`**, npm sets **`npm_execpath`** and **`npm_node_execpath`**. We always
+ * spawn **`node npm-cli.js …`** with **`shell: false`** and argv arrays — same behavior from **Windows**
+ * (Git Bash, cmd.exe, PowerShell) and **Unix** (bash, zsh, Terminal.app, etc.): paths with spaces stay intact.
+ * Fallbacks: Windows **`npm.cmd`** next to Node / `where`; Linux/macOS **`npm`** next to Node / **`PATH`**.
  */
 import { spawnSync } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, readdirSync, unlinkSync, writeFileSync } from "node:fs";
@@ -46,10 +51,6 @@ export function resolveInstallWorkingDir() {
   return path.join(os.homedir(), ".local", "share", "cfgmgr");
 }
 
-function npmCmd() {
-  return process.platform === "win32" ? "npm.cmd" : "npm";
-}
-
 function readPackageVersion() {
   const pkgJsonPath = path.join(pkgRoot, "package.json");
   if (!existsSync(pkgJsonPath)) return "0.0.0";
@@ -79,23 +80,94 @@ function npmEnv() {
   };
 }
 
+function stripEnvQuotes(v) {
+  const t = String(v || "").trim();
+  if (t.length >= 2 && ((t.startsWith('"') && t.endsWith('"')) || (t.startsWith("'") && t.endsWith("'")))) {
+    return t.slice(1, -1).trim();
+  }
+  return t;
+}
+
 /**
- * Run npm subcommands with argv-style args.
- * Windows: `shell: true` so `npm.cmd` resolves from PATH like npm's own lifecycle scripts (Git Bash /
- * non-interactive spawn often returns `status: null` without shell when PATH differs).
+ * During `npm install`, npm sets **`npm_execpath`** → **`npm-cli.js`** and **`npm_node_execpath`** → the
+ * node binary that npm uses. Spawning **`node <npm-cli.js> …`** matches npm’s own invocation on **every OS**
+ * (Windows Git Bash / cmd / PowerShell; Linux/macOS bash / zsh / fish — npm normalizes the env).
+ */
+function resolveNpmCliJsFromLifecycleEnv() {
+  const raw = stripEnvQuotes(process.env.npm_execpath || process.env.NPM_CLI_JS || "");
+  if (!raw) return "";
+  const p = path.normalize(raw);
+  if (!existsSync(p)) return "";
+  return /\.m?js$/i.test(p) ? p : "";
+}
+
+function resolveNodeBinaryForNpmCli() {
+  const raw = stripEnvQuotes(
+    process.env.npm_node_execpath || process.env.NPM_NODE_EXECPATH || ""
+  );
+  if (raw) {
+    const p = path.normalize(raw);
+    if (existsSync(p)) return p;
+  }
+  return process.execPath;
+}
+
+/**
+ * Absolute `npm.cmd` for Windows — **never** use `shell: true` with argv here: cmd splits on spaces and
+ * breaks `npm pack C:\\...\\New folder\\...` → `ENOENT ...\\New\\package.json`.
+ * Same-directory-as-node covers stock Node installs; `where` covers nvm-windows / odd layouts.
+ */
+export function resolveNpmExecutableWin32() {
+  const beside = path.join(path.dirname(process.execPath), "npm.cmd");
+  if (existsSync(beside)) return beside;
+  const wh = spawnSync(process.env.ComSpec || "cmd.exe", ["/d", "/s", "/c", "where npm.cmd"], {
+    encoding: "utf8",
+    windowsHide: true,
+    env: npmEnv(),
+    maxBuffer: 1024 * 1024,
+  });
+  if (wh.status === 0) {
+    const line = (wh.stdout || "")
+      .split(/\r?\n/)
+      .map((s) => s.trim())
+      .filter(Boolean)[0];
+    if (line && existsSync(line)) return line;
+  }
+  return beside;
+}
+
+/** Linux/macOS: prefer `npm` next to this `node` (Homebrew, apt, Volta layout); else `PATH`. */
+export function resolveNpmExecutablePosix() {
+  const beside = path.join(path.dirname(process.execPath), "npm");
+  if (existsSync(beside)) return beside;
+  return "npm";
+}
+
+/**
+ * Run npm subcommands with argv-style args (paths with spaces stay single arguments).
+ * Prefer **`node npm-cli.js`** from npm’s lifecycle env — **Windows + Linux + macOS** parity across shells.
  */
 function npmSpawnSync(npmArgv, extraOptions) {
-  const cmd = npmCmd();
   const merged = {
     encoding: "utf8",
     windowsHide: true,
     env: npmEnv(),
     ...extraOptions,
   };
+
+  const npmCli = resolveNpmCliJsFromLifecycleEnv();
+  if (npmCli) {
+    const nodeBin = resolveNodeBinaryForNpmCli();
+    return spawnSync(nodeBin, [npmCli, ...npmArgv], { ...merged, shell: false });
+  }
+
   if (process.platform === "win32") {
-    return spawnSync(cmd, npmArgv, { ...merged, shell: true });
+    const exe = resolveNpmExecutableWin32();
+    return spawnSync(exe, npmArgv, { ...merged, shell: false });
   }
-  return spawnSync(cmd, npmArgv, merged);
+
+  const posixNpm = resolveNpmExecutablePosix();
+  return spawnSync(posixNpm, npmArgv, { ...merged, shell: false });
 }
 
 /** When stderr/stdout are empty but status is null or non-zero — explain spawn/PATH/signal. */
@@ -108,7 +180,7 @@ function formatSpawnFailure(pr, label) {
   if (pr.signal) parts.push(`signal=${pr.signal}`);
   if (pr.error) parts.push(pr.error.message || String(pr.error));
   parts.push(
-    "Windows: prefer cmd.exe or PowerShell for npm install; ensure Node/npm are on PATH; folder paths with spaces sometimes confuse tooling."
+    "npm spawn uses npm_execpath when present (any shell/OS), else npm next to Node — argv-only, no shell; paths with spaces OK. EPERM on Windows: stop processes locking node_modules, retry."
   );
   return parts.join(" — ");
 }