CLI runs on Node 20+: npx storebound (bunx keeps working)
- cli/lib/rt.ts: the runtime layer on node: modules (spawn / spawnSync with Bun's defaults, exit codes and "Executable not found", which with PATHEXT, sleep, serve, Glob, hasher, gunzip, stdin, SQLite, packageRoot, config imports with a type-stripping fallback for Node 20); every Bun.* use in cli/ goes through it - tools/gen-embedded.ts -> cli/lib/embedded.ts: templates/, cli/shots/*.html and Play's Data safety form embedded (replaces Bun text imports; the bundle and the compiled sidecar carry them), checked fresh by bun run ci - package.json: bin dist/storebound.mjs (Node ESM bundle, tools/build-node.ts, prepack), engines node >=20 - bun run ci: node bundle + node smoke (real node: --version, help, check same as Bun, scan, release plan --help, init, MCP handshake + tool call); Forgejo CI sets up Node 20; tests/node-compat.test.ts guards cli/ - install writes npx MCP commands when run with Node; bin/storebound falls back to Node - docs: npx storebound init (Node 20+) or bunx storebound init
This commit is contained in:
parent
614c32bcba
commit
36a8bf9625
73 changed files with 1195 additions and 251 deletions
|
|
@ -6,6 +6,7 @@
|
|||
// Nothing is installed system-wide. Sources and licenses: docs/desktop.md.
|
||||
import { existsSync, readFileSync } from 'node:fs';
|
||||
import { delimiter, join } from 'node:path';
|
||||
import * as rt from './rt';
|
||||
|
||||
export type ToolId = 'ffmpeg' | 'ffprobe' | 'chrome' | 'xcode' | 'simctl' | 'adb' | 'git';
|
||||
|
||||
|
|
@ -47,7 +48,7 @@ export function toolPath(env: Record<string, string | undefined> = process.env,
|
|||
/** First line of `<cmd> <args>` (version banners), or null. */
|
||||
function firstLine(cmd: string[], env: Record<string, string>): string | null {
|
||||
try {
|
||||
const r = Bun.spawnSync(cmd, { stdout: 'pipe', stderr: 'pipe', env, timeout: 5_000 });
|
||||
const r = rt.spawnSync(cmd, { stdout: 'pipe', stderr: 'pipe', env, timeout: 5_000 });
|
||||
if (r.exitCode !== 0) return null;
|
||||
return (r.stdout.toString() || r.stderr.toString()).trim().split('\n')[0]?.trim() || null;
|
||||
} catch { return null; }
|
||||
|
|
@ -72,7 +73,7 @@ export function detectTools(env: Record<string, string | undefined> = process.en
|
|||
const PATH = toolPath(env);
|
||||
const spawnEnv: Record<string, string> = { ...Object.fromEntries(Object.entries(env).filter((e): e is [string, string] => e[1] !== undefined)), PATH };
|
||||
const appDirs = (env.STOREBOUND_TOOL_PATH ?? '').split(delimiter).filter(Boolean);
|
||||
const which = (n: string): string | null => Bun.which(n, { PATH });
|
||||
const which = (n: string): string | null => rt.which(n, { PATH });
|
||||
const src = (p: string | null): ToolStatus['source'] => (!p ? null : appDirs.some(d => p.startsWith(d)) ? 'app' : 'system');
|
||||
const bin = (id: ToolId, name: string, usedFor: string, install: ToolStatus['install'], versionArgs: string[]): ToolStatus => {
|
||||
const path = which(id);
|
||||
|
|
@ -206,7 +207,7 @@ export function androidSdkMissing(l: AndroidSdkLookup): string {
|
|||
/** Where playwright resolves from (the project, then the storebound folder), or null. */
|
||||
export function findPlaywright(bases: string[]): string | null {
|
||||
for (const base of bases) {
|
||||
try { return Bun.resolveSync('playwright', base); } catch { /* next */ }
|
||||
try { return rt.resolveFrom('playwright', base); } catch { /* next */ }
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue