mirror of
https://github.com/cloudflare/vinext.git
synced 2026-09-14 19:04:59 +08:00
Nathan Nguyen
bdbd1f833d
* fix(app-router): preserve source identity for intercepted renders Intercepted App Router renders used the visible target pathname as the payload route identity. That let a modal navigation such as /feed to /photos/42 replace the retained source tree with target-scoped route and page ids, so refreshes, server actions, chained modals, and history traversal could lose source page state. The violated invariant is that an intercepted render has separate display and matched-route identities. This commits a fenced render identity helper, keeps source route and page ids stable for retained source-route payloads, leaves the target pathname in interception proof, and includes source context in RSC cache variants. Regression coverage asserts source payload keys, cache variants, modal refresh/action/history flows, and source client/search state preservation. * fix(app-router): normalize intercepted rsc cache source * fix(app-router): harden intercepted cache regeneration * refactor(app-router): share intercepted path normalization * fixup! fix(app-router): preserve source identity for intercepted renders fixup! fix(app-router): preserve source identity for intercepted renders
77 lines
2.9 KiB
TypeScript
77 lines
2.9 KiB
TypeScript
import { describe, expect, it } from "vite-plus/test";
|
|
import { createAppPageRenderIdentity } from "../packages/vinext/src/server/app-page-render-identity.js";
|
|
|
|
describe("createAppPageRenderIdentity", () => {
|
|
it("uses the display pathname as the route identity for direct renders", () => {
|
|
const identity = createAppPageRenderIdentity({ displayPathname: "/photos/42" });
|
|
|
|
expect(identity).toEqual({
|
|
displayPathname: "/photos/42",
|
|
interception: null,
|
|
interceptionContext: null,
|
|
matchedRoutePathname: "/photos/42",
|
|
pageId: "page:/photos/42",
|
|
routeId: "route:/photos/42",
|
|
targetMatchedPathname: "/photos/42",
|
|
});
|
|
});
|
|
|
|
it("uses the source route as the route identity for intercepted source renders", () => {
|
|
const identity = createAppPageRenderIdentity({
|
|
displayPathname: "/photos/42",
|
|
interceptionContext: "/feed",
|
|
interceptSourceMatchedUrl: "/feed",
|
|
interceptSlotId: "slot:modal:/feed",
|
|
});
|
|
|
|
expect(identity.routeId).toBe("route:/feed");
|
|
expect(identity.pageId).toBe("page:/feed");
|
|
expect(identity.matchedRoutePathname).toBe("/feed");
|
|
expect(identity.targetMatchedPathname).toBe("/photos/42");
|
|
expect(identity.interception).toEqual({
|
|
sourceMatchedUrl: "/feed",
|
|
sourceRouteId: "route:/feed",
|
|
slotId: "slot:modal:/feed",
|
|
targetMatchedUrl: "/photos/42",
|
|
targetRouteId: "route:/photos/42",
|
|
});
|
|
});
|
|
|
|
it("normalizes encoded source and target pathnames before encoding route IDs", () => {
|
|
const identity = createAppPageRenderIdentity({
|
|
displayPathname: "/photos/caf%C3%A9",
|
|
interceptionContext: "/caf%C3%A9",
|
|
interceptSourceMatchedUrl: "/caf%C3%A9",
|
|
interceptSlotId: "slot:modal:/café",
|
|
});
|
|
|
|
expect(identity.routeId).toBe("route:/café");
|
|
expect(identity.pageId).toBe("page:/café");
|
|
expect(identity.matchedRoutePathname).toBe("/café");
|
|
expect(identity.targetMatchedPathname).toBe("/photos/café");
|
|
expect(identity.interception?.sourceMatchedUrl).toBe("/café");
|
|
expect(identity.interception?.targetMatchedUrl).toBe("/photos/café");
|
|
});
|
|
|
|
it("ignores invalid source proof and falls back to direct target identity", () => {
|
|
const identity = createAppPageRenderIdentity({
|
|
displayPathname: "/photos/42",
|
|
interceptionContext: "/feed?tab=popular",
|
|
interceptSourceMatchedUrl: "/feed?tab=popular",
|
|
interceptSlotId: "slot:modal:/feed",
|
|
});
|
|
|
|
expect(identity.interception).toBeNull();
|
|
expect(identity.routeId).toBe("route:/photos/42");
|
|
expect(identity.pageId).toBe("page:/photos/42");
|
|
expect(identity.matchedRoutePathname).toBe("/photos/42");
|
|
expect(identity.interceptionContext).toBe("/feed?tab=popular");
|
|
});
|
|
|
|
it("rejects relative display pathnames", () => {
|
|
expect(() => createAppPageRenderIdentity({ displayPathname: "photos/42" })).toThrow(
|
|
"[vinext] App Router render pathname must be absolute: photos/42",
|
|
);
|
|
});
|
|
});
|