TypeScript
fix(cli): t3 up's pairing hint keeps --base-dir (#29684)
Alex Southwelldf2dfde0ee8f
diff --git a/apps/server/src/cli/up.test.ts b/apps/server/src/cli/up.test.tsindex aa32442f451..10fb3b421d2 100644--- a/apps/server/src/cli/up.test.ts+++ b/apps/server/src/cli/up.test.ts@@ -182,6 +182,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer, NetService.layer))},{label: "the local network opens",+ prints: "Run `t3 pair --base-dir <baseDir>`.",installed: true,env: "T3CODE_LAN=false\n",args: ["--lan"],@@ -337,7 +338,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer, NetService.layer))),);if (input.prints !== undefined) {- expect(lines.join("\n")).toContain(input.prints);+ expect(lines.join("\n")).toContain(input.prints.replace("<baseDir>", baseDir));}expect(exit._tag).toBe(input.restartFails === true ? "Failure" : "Success");expect({ installs, restarts }).toEqual({diff --git a/apps/server/src/cli/up.ts b/apps/server/src/cli/up.tsindex b04b6fea7d3..5a0e820958c 100644--- a/apps/server/src/cli/up.ts+++ b/apps/server/src/cli/up.ts@@ -171,12 +171,12 @@ const formatSetup = (setup: Setup) => {].join("\n");};-const formatNextSteps = (routes: Routes, serviceInstalled: boolean) =>+const formatNextSteps = (routes: Routes, serviceInstalled: boolean, pairCommand: string) =>[...(routes.connect? ["On your other device, sign in to T3 Connect with the same account."]: []),- ...(routes.lan ? ["Run `t3 pair`. Use the code on your other device."] : []),+ ...(routes.lan ? [`Run \`${pairCommand}\`. Use the code on your other device.`] : []),...(routes.connect || routes.lan? []: [@@ -197,6 +197,11 @@ const setUp = Effect.fn("cli.up")(function* (flags: {}) {const { baseDir } = yield* ServerConfig.ServerConfig;const service = yield* BootService.BootService;+ const baseDirArgs = Option.match(flags.baseDir, {+ onNone: () => [],+ onSome: (dir) => ["--base-dir", dir],+ });+ const { command: pairCommand } = yield* resolveHostCliCommand("pair", baseDirArgs);const before = yield* readSetup();if (before.connect === null && Option.getOrElse(flags.connect, () => false)) {return yield* new CliError.UserError({@@ -252,7 +257,7 @@ const setUp = Effect.fn("cli.up")(function* (flags: {yield* disconnectCloud({ clearAuthorization: false });}if (current.lan) yield* CliService.writeServiceEnv(baseDir, { T3CODE_LAN: "false" });- return yield* Console.log(formatNextSteps(routes, false));+ return yield* Console.log(formatNextSteps(routes, false, pairCommand));}const { installedVersion } = before.service;const newer =@@ -327,7 +332,7 @@ const setUp = Effect.fn("cli.up")(function* (flags: {const printServeCommand = Effect.fn(function* (reason: string) {const { command } = yield* resolveHostCliCommand("serve", [- ...Option.match(flags.baseDir, { onNone: () => [], onSome: (dir) => ["--base-dir", dir] }),+ ...baseDirArgs,// Explicit either way, so a T3CODE_LAN in the shell cannot override the choice.routes.lan ? "--lan" : "--no-lan",]);@@ -408,6 +413,7 @@ const setUp = Effect.fn("cli.up")(function* (flags: {`\nThis machine\n${formatSetup(after)}\n\n${formatNextSteps({ connect: after.connect === true, lan: after.lan },after.service.installed,+ pairCommand,)}`,);});