diff --git a/tests/unit/build-environment-bundle.test.ts b/tests/unit/build-environment-bundle.test.ts index 2229565..848b957 100644 --- a/tests/unit/build-environment-bundle.test.ts +++ b/tests/unit/build-environment-bundle.test.ts @@ -1,5 +1,5 @@ import { spawnSync } from "node:child_process"; -import { mkdtemp, readdir, readFile, rm } from "node:fs/promises"; +import { mkdtemp, readFile, rm } from "node:fs/promises"; import { tmpdir } from "node:os"; import path from "node:path"; @@ -67,16 +67,31 @@ describe("build variables in the bundle (13-06)", () => { const second = await build({ ...DECLARED, VITE_BUILD_ID: "build-probe-2" }); expect(second.run.status).toBe(0); - // The shared application chunk, which Vite names after one of its modules: - // `design-system-*` upstream. This product's route chunk split - // (vite.config.ts) leaves `render-boot-failure-*` as that chunk here. - const designSystem = async (outDir: string) => - (await readdir(path.join(outDir, "assets"))).filter((name) => - name.startsWith("render-boot-failure-"), - ); - const firstChunks = await designSystem(first.outDir); + // The design system, found by what it holds rather than by name: this + // product's route chunk split (vite.config.ts) names chunks after route + // modules, and upstream's `design-system-*` does not exist here. + // (The previous check looked at `render-boot-failure-*`, which holds the + // build id on purpose and can never keep its name.) + const designSystem = ({ contents }: Awaited>) => + contents + .filter(({ file, text }) => + file.endsWith(".js") && text.includes("ui-button--pending"), + ) + .map(({ file }) => path.basename(file)); + const firstChunks = designSystem(first); expect(firstChunks).toHaveLength(1); - expect(await designSystem(second.outDir)).toEqual(firstChunks); + expect(designSystem(second)).toEqual(firstChunks); + + // Template 1103/15-06. react-dom sat in the boot-failure chunk with the + // build id, so every release renamed it and returning visitors downloaded + // it again. Its own chunk keeps the name while only the build id changes. + const reactDom = ({ contents }: Awaited>) => + contents + .filter(({ file, text }) => file.endsWith(".js") && text.includes("__reactContainer$")) + .map(({ file }) => path.basename(file)); + expect(reactDom(first)).toHaveLength(1); + expect(reactDom(first)[0]).not.toMatch(/render-boot-failure/u); + expect(reactDom(second)).toEqual(reactDom(first)); }, 120_000); it("refuses a VITE_* variable the build does not declare", async () => { diff --git a/vite.config.ts b/vite.config.ts index 84be581..ef99e85 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -65,6 +65,10 @@ const techLogRouteChunks = Object.freeze({ "/public/pages/public-not-found-page.tsx": "route-not-found", } as const); +// pnpm lays packages out as node_modules/.pnpm/@/node_modules/. +const REACT_DOM_MODULE = + /[\\/]node_modules[\\/](?:\.pnpm[\\/][^\\/]+[\\/]node_modules[\\/])?(?:react-dom|scheduler)[\\/]/; + function routeChunkName(moduleId: string): string | undefined { const normalized = moduleId.replaceAll("\\", "/"); const featurePath = "/src/features/tech-log/presentation"; @@ -139,10 +143,19 @@ export default defineConfig(({ mode }) => { // 09-03. The entry now imports the app dynamically, so Vite's preload // helper would land in the entry chunk and every lazy chunk would // import the entry, whose hash changes with each build id. + // + // Template 1103/15-06 (af6d0a9f). react-dom and scheduler shared the + // boot-failure chunk with the build id (getBuildConfig), so a release + // that only changed the build id renamed that 190 KB chunk and + // returning visitors downloaded it again. In a chunk of their own they + // keep their name; only boot, the entry and the small boot-failure + // screen, which hold or import the build id, are renamed. manualChunks: (id: string) => id.includes("vite/preload-helper") ? "preload-helper" - : routeChunkName(id), + : REACT_DOM_MODULE.test(id) + ? "react-dom" + : routeChunkName(id), }, }, },