Skip to content

Commit 84c69e9

Browse files
committed
fix(cli): tagged source builds report the release version
1 parent 7195b69 commit 84c69e9

3 files changed

Lines changed: 97 additions & 3 deletions

File tree

‎apps/server/vite.config.ts‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1+
// @effect-diagnostics nodeBuiltinImport:off - Build configuration normalizes manifest paths before an Effect runtime exists.
12
import "vite-plus/test/config";
23
import { defineConfig, mergeConfig } from "vite-plus";
4+
import * as NodePath from "node:path";
5+
import * as NodeURL from "node:url";
36

47
import baseConfig from "../../vite.config.ts";
58
import { loadRepoEnv } from "../../scripts/lib/public-config.ts";
9+
import { resolveTaggedSourceVersion } from "../../scripts/lib/tagged-source-version.ts";
610
import rootPackageJson from "../../package.json" with { type: "json" };
711
import packageJson from "./package.json" with { type: "json" };
812
import { WeightedShardSequencer } from "./src/testUtils/weightedShardSequencer.ts";
@@ -16,9 +20,12 @@ import {
1620
export { shouldBundleCliDependency };
1721

1822
const repoEnv = loadRepoEnv();
19-
const cliBuildChannel = /^[^-+]+-(?:nightly|preview)\./.test(packageJson.version)
20-
? "nightly"
21-
: "latest";
23+
const serverManifestPath = NodeURL.fileURLToPath(new URL("./package.json", import.meta.url));
24+
const buildVersion = resolveTaggedSourceVersion(
25+
NodeURL.fileURLToPath(new URL("../../", import.meta.url)),
26+
packageJson.version,
27+
);
28+
const cliBuildChannel = /^[^-+]+-(?:nightly|preview)\./.test(buildVersion) ? "nightly" : "latest";
2229
// Official release workflows set the telemetry channel; local builds and forks use "dev".
2330
const TELEMETRY_CHANNELS = ["stable", "nightly", "preview", "dev"];
2431
const telemetryChannel = process.env.T3CODE_TELEMETRY_CHANNEL?.trim() || "dev";
@@ -82,6 +89,18 @@ export default mergeConfig(
8289
},
8390
},
8491
pack: {
92+
plugins: [
93+
{
94+
name: "tagged-source-version",
95+
load(id) {
96+
if (NodePath.resolve(id) !== serverManifestPath) return;
97+
return {
98+
code: JSON.stringify({ ...packageJson, version: buildVersion }),
99+
moduleType: "json",
100+
};
101+
},
102+
},
103+
],
85104
// SEA embeds one entry; expose the history worker as a hidden subcommand.
86105
entry: packExecutable ? ["src/bin.ts"] : ["src/bin.ts", "src/claude-history-worker.ts"],
87106
outDir: packExecutable ? "dist-exe" : "dist",
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
// @effect-diagnostics nodeBuiltinImport:off - Exercises build-time Git discovery against temporary repositories.
2+
import * as NodeChildProcess from "node:child_process";
3+
import * as NodeFS from "node:fs";
4+
import * as NodeOS from "node:os";
5+
import * as NodePath from "node:path";
6+
import { expect, it } from "@effect/vitest";
7+
8+
import { resolveTaggedSourceVersion } from "./tagged-source-version.ts";
9+
10+
it("uses the exact stable tag, preserving release overrides and untagged builds", () => {
11+
const root = NodeFS.mkdtempSync(NodePath.join(NodeOS.tmpdir(), "tagged-source-version-"));
12+
const manifest = NodePath.join(root, "apps/server/package.json");
13+
const git = (...args: string[]) =>
14+
NodeChildProcess.execFileSync("git", args, { cwd: root, stdio: "pipe" });
15+
const writeVersion = (version: string) =>
16+
NodeFS.writeFileSync(manifest, JSON.stringify({ name: "t3", version }));
17+
18+
try {
19+
NodeFS.mkdirSync(NodePath.dirname(manifest), { recursive: true });
20+
writeVersion("0.1.5");
21+
git("init");
22+
git("config", "user.name", "Version Test");
23+
git("config", "user.email", "[email protected]");
24+
git("config", "commit.gpgSign", "false");
25+
git("config", "tag.gpgSign", "false");
26+
git("add", ".");
27+
git("commit", "-m", "source");
28+
git("tag", "v0.1.6-nightly.20261031.3977");
29+
git("tag", "-a", "v0.1.6", "-m", "release");
30+
31+
expect(resolveTaggedSourceVersion(root, "0.1.5")).toBe("0.1.6");
32+
expect(JSON.parse(NodeFS.readFileSync(manifest, "utf8")).version).toBe("0.1.5");
33+
34+
writeVersion("0.1.7-preview.1");
35+
expect(resolveTaggedSourceVersion(root, "0.1.7-preview.1")).toBe("0.1.7-preview.1");
36+
37+
writeVersion("0.1.5");
38+
git("commit", "--allow-empty", "-m", "after release");
39+
expect(resolveTaggedSourceVersion(root, "0.1.5")).toBe("0.1.5");
40+
41+
git("tag", "not-a-release");
42+
expect(resolveTaggedSourceVersion(root, "0.1.5")).toBe("0.1.5");
43+
} finally {
44+
NodeFS.rmSync(root, { recursive: true, force: true });
45+
}
46+
});
47+
48+
it("keeps the package version in a source archive without Git metadata", () => {
49+
const root = NodeFS.mkdtempSync(NodePath.join(NodeOS.tmpdir(), "source-archive-version-"));
50+
try {
51+
expect(resolveTaggedSourceVersion(root, "0.1.5")).toBe("0.1.5");
52+
} finally {
53+
NodeFS.rmSync(root, { recursive: true, force: true });
54+
}
55+
});
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// @effect-diagnostics nodeBuiltinImport:off - Build configuration resolves tags before an Effect runtime exists.
2+
import * as NodeChildProcess from "node:child_process";
3+
4+
export function resolveTaggedSourceVersion(repoRoot: string, packageVersion: string): string {
5+
const git = (...args: string[]) =>
6+
NodeChildProcess.execFileSync("git", args, { cwd: repoRoot, encoding: "utf8", stdio: "pipe" });
7+
8+
try {
9+
// Release jobs and local packagers may have already aligned the manifest to an explicit version.
10+
git("diff", "--quiet", "HEAD", "--", "apps/server/package.json");
11+
const tags = git("tag", "--points-at", "HEAD", "--list", "v[0-9]*")
12+
.trim()
13+
.split("\n")
14+
.filter((tag) => /^v\d+\.\d+\.\d+$/.test(tag));
15+
if (tags.length === 1) return tags[0]!.slice(1);
16+
} catch {
17+
// Source archives and builds without Git retain their package version.
18+
}
19+
return packageVersion;
20+
}

0 commit comments

Comments
 (0)