Skip to content

Commit 9bf385a

Browse files
MarcoDotIOclaude
andcommitted
fix(scripts): dev runner expands ~ in --home-dir and T3CODE_HOME
`vp run dev --home-dir=~/t3-dev` (shells leave `~` after `=` alone) or a `T3CODE_HOME=~/t3-dev` line in `.env` made the dev runner resolve the home against the current directory, so dev state landed in a literal `./~/t3-dev` folder inside the checkout. The server already expands `~` for T3CODE_HOME; the dev runner now does the same before resolving. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 210b2e7 commit 9bf385a

2 files changed

Lines changed: 33 additions & 0 deletions

File tree

‎scripts/dev-runner.test.ts‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,32 @@ it.layer(NodeServices.layer)("dev-runner", (it) => {
412412
}),
413413
);
414414

415+
it.effect("expands a home-relative T3 home the way the server does", () =>
416+
Effect.gen(function* () {
417+
const path = yield* Path.Path;
418+
const homeFor = (t3Home: string) =>
419+
createDevRunnerEnv({
420+
mode: "dev",
421+
baseEnv: {},
422+
serverOffset: 0,
423+
webOffset: 0,
424+
t3Home,
425+
browser: undefined,
426+
autoBootstrapProjectFromCwd: undefined,
427+
logWebSocketEvents: undefined,
428+
host: undefined,
429+
port: undefined,
430+
devUrl: undefined,
431+
}).pipe(
432+
Effect.provideService(HostProcess.HomeDirectory, "/home/dev"),
433+
Effect.map((env) => env.T3CODE_HOME),
434+
);
435+
436+
assert.equal(yield* homeFor("~/t3-dev"), path.join("/home/dev", "t3-dev"));
437+
assert.equal(yield* homeFor("~"), "/home/dev");
438+
}),
439+
);
440+
415441
it.effect("rejects a specific non-loopback --host for browser dev modes", () => {
416442
const spawnerLayer = Layer.succeed(
417443
ChildProcessSpawner.ChildProcessSpawner,

‎scripts/dev-runner.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,13 @@ const resolveBaseDir = Effect.fn("dev-runner.resolveBaseDir")(function* (
272272
const path = yield* Path.Path;
273273
const configured = baseDir?.trim();
274274

275+
// Expand `~` as the server does for T3CODE_HOME; shells leave `--home-dir=~/x` and `.env` values alone.
276+
if (configured === "~") {
277+
return yield* HostProcess.HomeDirectory;
278+
}
279+
if (configured?.startsWith("~/") || configured?.startsWith("~\\")) {
280+
return path.join(yield* HostProcess.HomeDirectory, configured.slice(2));
281+
}
275282
if (configured) {
276283
return path.resolve(configured);
277284
}

0 commit comments

Comments
 (0)