fix(pages): resolve staged entries when activated

Author: james-elicx

packages/vinext/src/index.ts

@@ -19,7 +19,11 @@ import {
   invalidateRouteCache,
   matchRoute,
 } from "./routing/pages-router.js";
-import { generateServerEntry as _generateServerEntry } from "./entries/pages-server-entry.js";
+import {
+  generatePagesRequestEntry as _generatePagesRequestEntry,
+  generatePagesResponseEntry as _generatePagesResponseEntry,
+  generateServerEntry as _generateServerEntry,
+} from "./entries/pages-server-entry.js";
 import { generateClientEntry as _generateClientEntry } from "./entries/pages-client-entry.js";
 import {
   appRouteGraph,
@@ -50,7 +54,9 @@ import { createDirectRunner } from "./server/dev-module-runner.js";
 import { generateRscEntry } from "./entries/app-rsc-entry.js";
 import { generateSsrEntry } from "./entries/app-ssr-entry.js";
 import {
+  VIRTUAL_CDN_CACHE_ADAPTER,
   VIRTUAL_CACHE_ADAPTERS,
+  generateCdnCacheAdapterModule,
   generateCacheAdaptersModule,
   hasVerbatimResponseVary,
   VINEXT_CACHE_CONFIG_PLUGIN_PROPERTY,
@@ -1093,6 +1099,10 @@ const VIRTUAL_WORKER_ENTRY = "virtual:vinext-worker-entry";
 const RESOLVED_WORKER_ENTRY = VIRTUAL_PREFIX + VIRTUAL_WORKER_ENTRY;
 const VIRTUAL_SERVER_ENTRY = "virtual:vinext-server-entry";
 const RESOLVED_SERVER_ENTRY = VIRTUAL_PREFIX + VIRTUAL_SERVER_ENTRY;
+const VIRTUAL_PAGES_REQUEST_ENTRY = "virtual:vinext-pages-request-entry";
+const RESOLVED_PAGES_REQUEST_ENTRY = VIRTUAL_PREFIX + VIRTUAL_PAGES_REQUEST_ENTRY;
+const VIRTUAL_PAGES_RESPONSE_ENTRY = "virtual:vinext-pages-response-entry";
+const RESOLVED_PAGES_RESPONSE_ENTRY = VIRTUAL_PREFIX + VIRTUAL_PAGES_RESPONSE_ENTRY;
 const VIRTUAL_CLIENT_ENTRY = "virtual:vinext-client-entry";
 const RESOLVED_CLIENT_ENTRY = VIRTUAL_PREFIX + VIRTUAL_CLIENT_ENTRY;
 const VIRTUAL_PAGES_CLIENT_ASSETS = "virtual:vinext-pages-client-assets";
@@ -1113,6 +1123,8 @@ const VIRTUAL_ROOT_PARAMS = "virtual:vinext-root-params";
 const RESOLVED_ROOT_PARAMS = VIRTUAL_PREFIX + VIRTUAL_ROOT_PARAMS;
 /** Virtual module that registers config-driven cache adapters (see VinextOptions.cache). */
 const RESOLVED_CACHE_ADAPTERS = VIRTUAL_PREFIX + VIRTUAL_CACHE_ADAPTERS;
+/** CDN-only registrar kept out of the data-cache response graph. */
+const RESOLVED_CDN_CACHE_ADAPTER = VIRTUAL_PREFIX + VIRTUAL_CDN_CACHE_ADAPTER;
 /** Virtual module that registers the config-driven image optimizer (see VinextOptions.images). */
 const RESOLVED_IMAGE_ADAPTERS = VIRTUAL_PREFIX + VIRTUAL_IMAGE_ADAPTERS;
 /** Virtual module for composed instrumentation-client bootstrap. */
@@ -1601,6 +1613,33 @@ export default function vinext(options: VinextOptions = {}): PluginOption[] {
     );
   }
 
+  async function generatePagesRequestEntry(configuredPublicDir: string | false): Promise<string> {
+    const publicFiles =
+      isServeCommand && devPublicFileRoutes
+        ? [...devPublicFileRoutes].sort()
+        : scanPublicFileRoutes(root, configuredPublicDir === "" ? false : configuredPublicDir);
+    return _generatePagesRequestEntry(
+      pagesDir,
+      nextConfig,
+      fileMatcher,
+      middlewarePath,
+      instrumentationPath,
+      publicFiles,
+      prerenderSecret,
+    );
+  }
+
+  function generatePagesResponseEntry(): Promise<string> {
+    return _generatePagesResponseEntry(
+      pagesDir,
+      nextConfig,
+      fileMatcher,
+      middlewarePath,
+      instrumentationPath,
+      prerenderSecret,
+    );
+  }
+
   /**
    * Generate the virtual client hydration entry module.
    * This is the entry point for `vite build` (client bundle).
@@ -3962,10 +4001,18 @@ export default function vinext(options: VinextOptions = {}): PluginOption[] {
 
           // Pages Router virtual modules
           if (cleanId === VIRTUAL_SERVER_ENTRY) return RESOLVED_SERVER_ENTRY;
+          if (cleanId === VIRTUAL_PAGES_REQUEST_ENTRY) return RESOLVED_PAGES_REQUEST_ENTRY;
+          if (cleanId === VIRTUAL_PAGES_RESPONSE_ENTRY) return RESOLVED_PAGES_RESPONSE_ENTRY;
           if (cleanId === VIRTUAL_CLIENT_ENTRY) return RESOLVED_CLIENT_ENTRY;
           if (cleanId.endsWith("/" + VIRTUAL_SERVER_ENTRY)) {
             return RESOLVED_SERVER_ENTRY;
           }
+          if (cleanId.endsWith("/" + VIRTUAL_PAGES_REQUEST_ENTRY)) {
+            return RESOLVED_PAGES_REQUEST_ENTRY;
+          }
+          if (cleanId.endsWith("/" + VIRTUAL_PAGES_RESPONSE_ENTRY)) {
+            return RESOLVED_PAGES_RESPONSE_ENTRY;
+          }
           if (cleanId.endsWith("/" + VIRTUAL_CLIENT_ENTRY)) {
             return RESOLVED_CLIENT_ENTRY;
           }
@@ -3992,6 +4039,12 @@ export default function vinext(options: VinextOptions = {}): PluginOption[] {
           ) {
             return RESOLVED_CACHE_ADAPTERS;
           }
+          if (
+            cleanId === VIRTUAL_CDN_CACHE_ADAPTER ||
+            cleanId.endsWith("/" + VIRTUAL_CDN_CACHE_ADAPTER)
+          ) {
+            return RESOLVED_CDN_CACHE_ADAPTER;
+          }
           if (
             cleanId === VIRTUAL_IMAGE_ADAPTERS ||
             cleanId.endsWith("/" + VIRTUAL_IMAGE_ADAPTERS)
@@ -4049,6 +4102,16 @@ export default function vinext(options: VinextOptions = {}): PluginOption[] {
               this.environment.config.publicDir === "" ? false : this.environment.config.publicDir,
             );
           }
+          if (id === RESOLVED_PAGES_REQUEST_ENTRY) {
+            recordServerEntryLoad(this.environment?.name, id);
+            return await generatePagesRequestEntry(
+              this.environment.config.publicDir === "" ? false : this.environment.config.publicDir,
+            );
+          }
+          if (id === RESOLVED_PAGES_RESPONSE_ENTRY) {
+            recordServerEntryLoad(this.environment?.name, id);
+            return await generatePagesResponseEntry();
+          }
           if (id === RESOLVED_CLIENT_ENTRY) {
             return await generateClientEntry();
           }
@@ -4180,6 +4243,9 @@ export default function vinext(options: VinextOptions = {}): PluginOption[] {
           if (id === RESOLVED_CACHE_ADAPTERS) {
             return generateCacheAdaptersModule(options.cache);
           }
+          if (id === RESOLVED_CDN_CACHE_ADAPTER) {
+            return generateCdnCacheAdapterModule(options.cache);
+          }
           if (id === RESOLVED_IMAGE_ADAPTERS) {
             return generateImageAdaptersModule(options.images);
           }

tests/after-deploy.test.ts

@@ -13,7 +13,7 @@
 import { describe, expect, it } from "vite-plus/test";
 import fs from "node:fs";
 import path from "node:path";
-import { readPagesRouterEntrySource } from "./worker-entry-source.js";
+import { readPagesResponseStageEntrySource } from "./worker-entry-source.js";
 
 type ExecutionContextLike = {
   waitUntil(promise: Promise<unknown>): void;
@@ -141,19 +141,20 @@ describe("after() in deploy mode — Pages Router worker entry", () => {
   it("forwards ctx to handleApiRoute so api routes can call after()", () => {
     // Regression for #1365: handleApiRoute previously ignored ctx, leaving
     // after() inside Pages Router api routes without a way to call
-    // ctx.waitUntil(). The generated worker entry must thread ctx through.
-    //
-    // After #1336 item 3 the dispatch URL is `apiLookupUrl` (the locale-
-    // stripped form of `resolvedUrl`), but `ctx` is still threaded through.
-    const content = readPagesRouterEntrySource();
-    expect(content).toContain(
-      'handleApiRoute(req, apiUrl, ctx, new URL(req.url).origin, "worker")',
+    // ctx.waitUntil(). Rendering now lives in the response stage, which must
+    // preserve that context in the cacheability wrapper it passes to the
+    // generated Pages entry.
+    const content = readPagesResponseStageEntrySource();
+    expect(content).toMatch(
+      /pagesEntry\.handleApiRoute\(\s*request,\s*props\.apiUrl,\s*cacheabilityContext,\s*new URL\(request\.url\)\.origin,/,
     );
   });
 
   it("forwards ctx and staged middleware headers to renderPage so page renders can call after() and apply CSP nonces", () => {
-    const content = readPagesRouterEntrySource();
-    expect(content).toContain("renderPage(req, resolvedUrl, null, ctx, stagedHeaders, options)");
+    const content = readPagesResponseStageEntrySource();
+    expect(content).toMatch(
+      /pagesEntry\.renderPage\(\s*request,\s*props\.resolvedUrl,\s*null,\s*cacheabilityContext,\s*renderHeaders,\s*props\.renderOptions/,
+    );
   });
 });
 

tests/worker-entry-source.ts

@@ -9,21 +9,6 @@ export function readAppRouterEntrySource(): string {
   );
 }
 
-export function readAppRequestStageEntrySource(): string {
-  const sourceUrl = new URL(
-    "../packages/vinext/src/server/app-request-stage-independent-entry.ts",
-    import.meta.url,
-  );
-  if (fs.existsSync(sourceUrl)) return fs.readFileSync(sourceUrl, "utf-8");
-  return fs.readFileSync(
-    new URL(
-      "../packages/vinext/src/server/app-request-stage-independent-entry.js",
-      import.meta.url,
-    ),
-    "utf-8",
-  );
-}
-
 export function readPagesRouterEntrySource(): string {
   return readPagesRequestStageEntrySource();
 }
@@ -37,7 +22,7 @@ export function readPagesSingleEntrySource(): string {
   );
 }
 
-export function readPagesRequestStageEntrySource(): string {
+function readPagesRequestStageEntrySource(): string {
   const sourceUrl = new URL(
     "../packages/vinext/src/server/pages-request-stage-entry.ts",
     import.meta.url,