stim 1.20.2 → 1.22.0

package/dist/{server-expo-DsguMGUF.mjs → server-expo-CrjB29pq.mjs}

@@ -1,13 +1,14 @@
-import { t as getExecutor } from "./exec-DqKo9GKJ.mjs";
-import { K as resolveProjectSettings } from "./settings-B717odTD.mjs";
+import { t as getExecutor } from "./exec-DEoAhcze.mjs";
 import { n as stripAnsi, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { S as resolvePackageJson } from "./project-_phNIJfs.mjs";
-import { t as cancellableSleep } from "./cancellation-C_22VQTH.mjs";
-import { r as createNdjsonWriter } from "./ndjson-GOnbyvso.mjs";
-import { a as expoMetroStoreEnv, c as registerMetroStore, f as resolveMetroSharedCache, i as expoMetroConfigPath, n as supervisorError, o as metroStoreConfirmedRoot, s as metroStoreRoot } from "./errors-DzkMYh8Q.mjs";
+import { u as cancellableSleep } from "./operation-exec-BW0em61G.mjs";
+import { q as resolveProjectSettings } from "./settings-C7O8A6ZI.mjs";
+import { C as resolvePackageJson } from "./project-wM_XFTvE.mjs";
+import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
+import { a as expoMetroStoreEnv, c as registerMetroStore, f as resolveMetroSharedCache, i as expoMetroConfigPath, n as supervisorError, o as metroStoreConfirmedRoot, s as metroStoreRoot } from "./errors-ccaPc4ox.mjs";
 import { accessSync, constants, existsSync, readFileSync } from "node:fs";
-import { dirname, join } from "node:path";
+import { delimiter, dirname, join } from "node:path";
 import { LOG_ROTATE_BYTES } from "@stim-cli/core";
+import { projectNodeBin, satisfiesNodePin } from "@stim-cli/core/toolchain";
 //#region src/supervisor/child-server.ts
 function superviseChildServer({ mode, child, log, toRecord, signal, alive = null, killTimeoutMs, onRecord = null }) {
 	let lastMsg = null;
@@ -74,15 +75,50 @@ function superviseChildServer({ mode, child, log, toRecord, signal, alive = null
 				while (running() && Date.now() < deadline) await cancellableSleep(25, { ref: false });
 				return !running();
 			};
-			if (!running() || !signal("SIGTERM")) return;
+			if (!running()) return;
+			signal("SIGTERM");
 			if (!await gone()) {
 				signal("SIGKILL");
-				await gone();
+				if (!await gone()) throw new Error(`Could not confirm shutdown of dev-server pid ${child.pid ?? "unknown"}.`);
 			}
 		}
 	};
 }
 //#endregion
+//#region src/supervisor/project-node.ts
+function pathNodeVersion(env) {
+	const childEnv = {};
+	for (const [key, value] of Object.entries(env)) if (value !== void 0) childEnv[key] = value;
+	return getExecutor().runFileQuiet("node", ["-p", "process.versions.node"], {
+		timeoutMs: 5e3,
+		env: childEnv
+	});
+}
+/**
+* `env` with the Node that `root` pins (`.nvmrc`, `.node-version`, `.tool-versions` or Volta) first on `PATH`,
+* for the dev server Stim starts through its `#!/usr/bin/env node` script. It changes nothing when the project pins
+* no Node, when no installed Node satisfies the pin, or when the `node` already on `PATH` satisfies it.
+*/
+function withProjectNode(root, env, { nodeVersion = pathNodeVersion } = {}) {
+	const pinned = projectNodeBin(root, env);
+	if (!pinned) return {
+		env,
+		pinned: null
+	};
+	const current = nodeVersion(env);
+	if (current && satisfiesNodePin(current, pinned.spec)) return {
+		env,
+		pinned: null
+	};
+	return {
+		env: {
+			...env,
+			PATH: [pinned.bin, ...(env.PATH ?? "").split(delimiter).filter(Boolean)].join(delimiter)
+		},
+		pinned
+	};
+}
+//#endregion
 //#region src/supervisor/server-expo.ts
 function resolveExpoBin(root) {
 	const fromPackage = expoBinFromPackage(resolvePackageJson(root, "expo"));
@@ -294,6 +330,13 @@ async function startExpoServer({ root, port, logsDir, writer = null, spawnFn = n
 		settings: settings ?? resolveProjectSettings(root).settings
 	});
 	const [command, commandArgs] = platform === "win32" && resolved.source === "package" ? [process.execPath, [bin, ...args]] : [bin, args];
+	const node = withProjectNode(root, process.env);
+	if (node.pinned) log.write({
+		src: "metro",
+		level: "info",
+		event: "project_node",
+		msg: `Metro runs on Node ${node.pinned.version} from ${node.pinned.bin}, which ${node.pinned.pin} pins`
+	});
 	const child = spawn(command, commandArgs, {
 		cwd: root,
 		stdio: [
@@ -303,7 +346,7 @@ async function startExpoServer({ root, port, logsDir, writer = null, spawnFn = n
 		],
 		detached: false,
 		env: {
-			...process.env,
+			...node.env,
 			FORCE_COLOR: "0",
 			...expoProxyEnv(process.env),
 			...storeEnv,
@@ -329,4 +372,4 @@ async function startExpoServer({ root, port, logsDir, writer = null, spawnFn = n
 	});
 }
 //#endregion
-export { expoProxyEnv as a, inferLevel as c, parseExpoWaitingOnUrl as d, recordFromLine as f, expoBinRefusal as i, isBundleMarker as l, superviseChildServer as m, expoBinFromPackage as n, expoSdkMajor as o, startExpoServer as p, expoBinPath as r, findBinUpward as s, cleanLine as t, isDevClientNavigationNotice as u };
+export { expoProxyEnv as a, inferLevel as c, parseExpoWaitingOnUrl as d, recordFromLine as f, superviseChildServer as h, expoBinRefusal as i, isBundleMarker as l, withProjectNode as m, expoBinFromPackage as n, expoSdkMajor as o, startExpoServer as p, expoBinPath as r, findBinUpward as s, cleanLine as t, isDevClientNavigationNotice as u };

package/dist/server-expo-D58c9L0M.mjs

@@ -0,0 +1,2 @@
+import { p as startExpoServer } from "./server-expo-CrjB29pq.mjs";
+export { startExpoServer };