mirror of
https://github.com/cloudflare/vinext.git
synced 2026-09-14 19:04:59 +08:00
930e03c449
* fix(app-router): prerender cacheComponents root-param fallback shells PR 1 of 4: core model + build integration. Model: app-ppr-fallback-shell, pregenerated-concrete-paths, prerender-manifest Build: prerender/run-prerender fallback shell artifact generation Tests: createAppPprFallbackShells, pregenerated-concrete-paths core * feat(ppr): add fallback shell payload identity * feat(ppr): safely serve fallback shell cache entries * refactor(ppr): extract fallback shell render pipeline and dedupe getViteMajorVersion * fix(ppr): restore safe-serving CI checks The safe-serving branch failed CI because a client-side server-only guard rejected valid 'use server' action modules, a fallback-shell dependency cast no longer matched its helper type, apps/web lost the Cloudflare cache adapter source path during typecheck, and Knip could not resolve the documented Cloudflare cache adapter subpaths. The server-only guard now reads the directive prologue and skips top-level 'use server' modules, fallback-shell regeneration passes an explicit typed dependency object, apps/web gets the workspace Cloudflare cache path, the Cloudflare package exports explicit adapter subpaths, Knip uses a relative source import in the dispatch unit test, and the readiness test awaits the actual cache-ready promise. * fix(ppr): guard fallback shell reads for queries * fix(ppr): normalize pregenerated concrete paths * fix(ppr): address review comments on fallback shell serving and react runtime check * fix(ci): restore knip ignores for unlisted binaries and prune dependencies * fix(ppr): restrict bracket check in fallback detection to legacy manifests * fix(ppr): prefer stable ESM react-dom/static.edge before CJS fallback The loadStaticPrerender dev-mode path hard-codes react-dom's internal CJS file layout (cjs/react-dom-server.edge.development.js). A React upgrade could silently break fallback-shell rendering in dev without affecting production because the function never tried the stable ESM entry in development. Change the order so that react-dom/static.edge is attempted first in all environments. Only fall back to the CJS path when the ESM entry does not export prerender() and we are in a development runtime. This lets future React dev builds that expose prerender() from the ESM entry work automatically, and it surfaces the CJS-path failure only when the stable path is genuinely unavailable. Also handle the CJS default-export interop shape that Node.js ESM produces when dynamically importing a CommonJS module. * refactor(ppr): address four review cleanup items 1. Remove redundant double-normalization in seed-cache.ts addPregeneratedConcretePath already normalizes internally, so the call-site normalizePregeneratedPathname() was redundant. Dropping it gives a single source of truth for pathname normalization. 2. Lazily construct FallbackShellRenderDeps in tryServePprFallbackShell Extract the large FallbackShellRenderDeps object into a top-level buildFallbackShellRenderDeps helper. The closure in the probe loop now just delegates, so the heavy object is only created when a STALE entry actually triggers regeneration, not on every HIT probe. 3. Add dev-only warning for legacy bracket heuristic When isFallbackShellArtifactPath falls back to the bracket substring scan (route.fallback === undefined), emit a console.warn in dev so developers know a legacy manifest is being used and concrete URLs with literal brackets may be misclassified. 4. Update pregenerated-concrete-paths.test.ts to colon notation The production manifest writer uses colon notation (/:slug) for the route field, but the test fixtures used bracket notation (/[slug]). Update the fixtures so the test format matches production, exercising the real key format that the safe-serving guard depends on. * test(ppr): compact fallback shell dispatch fixtures * refactor(ppr): name fallback shell render phases * refactor(app-router): deduplicate PPR fallback shell and app page cache render paths * fix(ppr): avoid serving incomplete fallback shells * chore: drop redundant cloudflare cache aliases * fix(ppr): track fallback navigation hooks * test(ppr): render navigation hook probes * test(ppr): type navigation hook probes * refactor(ppr): remove unused shell regeneration path * refactor(ppr): remove unused shell result type * fix(ppr): safely gate fallback shell prerendering * fix(ppr): keep fallback shell gate internal * fix(ppr): mark generated dynamic fallback shells * test(ppr): align fallback fixture and search params --------- Co-authored-by: James <james@eli.cx>
131 lines
4.5 KiB
TypeScript
131 lines
4.5 KiB
TypeScript
import { describe, it, expect, afterEach } from "vite-plus/test";
|
|
import {
|
|
clearPregeneratedConcretePaths,
|
|
addPregeneratedConcretePath,
|
|
getRenderedConcreteUrlPathsForRoute,
|
|
initPregeneratedPathsFromGlobals,
|
|
normalizePregeneratedPathname,
|
|
} from "../packages/vinext/src/server/pregenerated-concrete-paths.js";
|
|
import { isFallbackShellArtifactPath } from "../packages/vinext/src/server/prerender-manifest.js";
|
|
|
|
describe("pregenerated concrete paths", () => {
|
|
afterEach(() => {
|
|
clearPregeneratedConcretePaths();
|
|
});
|
|
|
|
it("returns undefined for an unknown route pattern", () => {
|
|
expect(getRenderedConcreteUrlPathsForRoute("/en/blog/:slug")).toBeUndefined();
|
|
});
|
|
|
|
it("stores and retrieves pathnames for a route pattern", () => {
|
|
addPregeneratedConcretePath("/:locale/blog/:slug", "/en/blog/hello");
|
|
addPregeneratedConcretePath("/:locale/blog/:slug", "/fr/blog/bonjour");
|
|
|
|
const paths = getRenderedConcreteUrlPathsForRoute("/:locale/blog/:slug");
|
|
expect(paths).toBeDefined();
|
|
expect([...paths!]).toEqual(["/en/blog/hello", "/fr/blog/bonjour"]);
|
|
});
|
|
|
|
it("supports independent route patterns", () => {
|
|
addPregeneratedConcretePath("/:locale/blog/:slug", "/en/blog/hello");
|
|
addPregeneratedConcretePath("/products/:id", "/products/42");
|
|
|
|
expect([...getRenderedConcreteUrlPathsForRoute("/:locale/blog/:slug")!]).toEqual([
|
|
"/en/blog/hello",
|
|
]);
|
|
expect([...getRenderedConcreteUrlPathsForRoute("/products/:id")!]).toEqual(["/products/42"]);
|
|
});
|
|
|
|
it("returns an empty state after clear", () => {
|
|
addPregeneratedConcretePath("/en/blog/:slug", "/en/blog/persistent");
|
|
expect(getRenderedConcreteUrlPathsForRoute("/en/blog/:slug")).toBeDefined();
|
|
|
|
clearPregeneratedConcretePaths();
|
|
|
|
expect(getRenderedConcreteUrlPathsForRoute("/en/blog/:slug")).toBeUndefined();
|
|
});
|
|
|
|
it("clears stale paths from a previous build on re-population (issue 3)", () => {
|
|
// Build A
|
|
addPregeneratedConcretePath("/en/blog/:slug", "/en/blog/old");
|
|
addPregeneratedConcretePath("/en/blog/:slug", "/en/blog/also-old");
|
|
expect(getRenderedConcreteUrlPathsForRoute("/en/blog/:slug")!.size).toBe(2);
|
|
|
|
// Build B — clear and re-seed without the old paths
|
|
clearPregeneratedConcretePaths();
|
|
addPregeneratedConcretePath("/en/blog/:slug", "/en/blog/new");
|
|
|
|
const paths = getRenderedConcreteUrlPathsForRoute("/en/blog/:slug")!;
|
|
expect(paths.has("/en/blog/old")).toBe(false);
|
|
expect(paths.has("/en/blog/also-old")).toBe(false);
|
|
expect(paths.has("/en/blog/new")).toBe(true);
|
|
expect(paths.size).toBe(1);
|
|
});
|
|
|
|
it("normalizes percent-encoded pathnames", () => {
|
|
expect(normalizePregeneratedPathname("/en/blog/hello%20world")).toBe("/en/blog/hello world");
|
|
});
|
|
|
|
it("normalizes pathnames when adding concrete paths", () => {
|
|
addPregeneratedConcretePath("/:locale/blog/:slug", "/en/blog/hello%20world");
|
|
|
|
expect([...getRenderedConcreteUrlPathsForRoute("/:locale/blog/:slug")!]).toEqual([
|
|
"/en/blog/hello world",
|
|
]);
|
|
});
|
|
|
|
it("initializes from the Worker global concrete-path table", () => {
|
|
globalThis.__VINEXT_PREGENERATED_CONCRETE_PATHS = [
|
|
["/:locale/blog/:slug", ["/en/blog/hello%20world"]],
|
|
];
|
|
initPregeneratedPathsFromGlobals();
|
|
delete globalThis.__VINEXT_PREGENERATED_CONCRETE_PATHS;
|
|
|
|
expect([...getRenderedConcreteUrlPathsForRoute("/:locale/blog/:slug")!]).toEqual([
|
|
"/en/blog/hello world",
|
|
]);
|
|
});
|
|
|
|
describe("isFallbackShellArtifactPath", () => {
|
|
it("identifies fallback shells when fallback === true", () => {
|
|
expect(
|
|
isFallbackShellArtifactPath("/en/blog/[slug]", {
|
|
route: "/en/blog/:slug",
|
|
fallback: true,
|
|
status: "rendered",
|
|
router: "app",
|
|
}),
|
|
).toBe(true);
|
|
});
|
|
|
|
it("identifies concrete paths even with brackets when fallback === false", () => {
|
|
expect(
|
|
isFallbackShellArtifactPath("/en/blog/[draft]-post", {
|
|
route: "/en/blog/:slug",
|
|
fallback: false,
|
|
status: "rendered",
|
|
router: "app",
|
|
}),
|
|
).toBe(false);
|
|
});
|
|
|
|
it("falls back to bracket checks when fallback is undefined (legacy manifests)", () => {
|
|
expect(
|
|
isFallbackShellArtifactPath("/en/blog/[slug]", {
|
|
route: "/en/blog/:slug",
|
|
status: "rendered",
|
|
router: "app",
|
|
}),
|
|
).toBe(true);
|
|
|
|
expect(
|
|
isFallbackShellArtifactPath("/en/blog/hello", {
|
|
route: "/en/blog/:slug",
|
|
status: "rendered",
|
|
router: "app",
|
|
}),
|
|
).toBe(false);
|
|
});
|
|
});
|
|
});
|