cdk-nextjs 0.7.5 → 0.7.7

package/lib/runtime/server.mjs

@@ -35889,9 +35889,9 @@ var require_dist_cjs16 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@next+routing@16.3.6/node_modules/@next/routing/dist/index.js
+// node_modules/.pnpm/@next+routing@16.3.8/node_modules/@next/routing/dist/index.js
 var require_dist = __commonJS({
-  "node_modules/.pnpm/@next+routing@16.3.6/node_modules/@next/routing/dist/index.js"(exports, module) {
+  "node_modules/.pnpm/@next+routing@16.3.8/node_modules/@next/routing/dist/index.js"(exports, module) {
     (() => {
       "use strict";
       var e5 = {};
@@ -38359,7 +38359,7 @@ async function loadImageCache({ deploymentRoot, manifest, importModule }, loaded
     });
   }
   return {
-    responses: new modules.responseCache.default(false),
+    responses: newImageResponseCache(modules.responseCache.default),
     images: new next.optimizer.ImageOptimizerCache({
       distDir,
       nextConfig,
@@ -38367,6 +38367,17 @@ async function loadImageCache({ deploymentRoot, manifest, importModule }, loaded
     })
   };
 }
+function newImageResponseCache(ResponseCache) {
+  const Legacy = ResponseCache;
+  try {
+    return new Legacy(false);
+  } catch (err) {
+    if (!String(err?.message).includes("requires a source route")) {
+      throw err;
+    }
+    return new ResponseCache({ minimalMode: false, route: "image" });
+  }
+}
 function cacheHandlerUrl(distDir, cacheHandler) {
   const path = cacheHandler.startsWith("file://") ? fileURLToPath(cacheHandler) : cacheHandler;
   return pathToFileURL(
@@ -38636,6 +38647,16 @@ function httpDate(value) {
   return date2 && !Number.isNaN(date2.getTime()) ? date2 : void 0;
 }
 
+// src/runtime/tag-manifest.ts
+var TAG_MANIFEST_SYMBOL = /* @__PURE__ */ Symbol.for(
+  "cdk-nextjs.use-cache.tag-manifest"
+);
+async function catchUpTags(render) {
+  const global = globalThis;
+  const manifest = global[TAG_MANIFEST_SYMBOL];
+  return manifest ? manifest.catchUp(render) : render();
+}
+
 // src/runtime/core.ts
 var NextjsRuntime = class {
   constructor(options) {
@@ -38783,7 +38804,7 @@ var NextjsRuntime = class {
         const search = toSearch(invocationQuery);
         req.url = search ? `${pathname}?${search}` : pathname;
         req.headers = toIncomingHttpHeaders(result.requestHeaders);
-        await handler(req, asServerResponse(res), {
+        const options = {
           waitUntil,
           requestMeta: {
             // The resolved query, stated rather than left to be re-derived.
@@ -38858,7 +38879,9 @@ var NextjsRuntime = class {
             // mocked `req`/`res`).
             revalidate: (config) => this.revalidate(config, request)
           }
-        });
+        };
+        const render = () => handler(req, asServerResponse(res), options);
+        await (result.entrypoint.type === "app-page" ? catchUpTags(render) : render());
         if (!res.writableEnded && result.entrypoint.type !== "page-api") {
           res.end();
         }
@@ -39145,7 +39168,8 @@ var NextjsRuntime = class {
     if (target.kind === "entrypoint") {
       const handler = await this.entrypoints.load(target.entrypoint);
       req.url = requestedUrl ?? req.url;
-      await handler(req, asServerResponse(res), { waitUntil });
+      const render = () => handler(req, asServerResponse(res), { waitUntil });
+      await (target.entrypoint.type === "app-page" ? catchUpTags(render) : render());
       if (!res.writableEnded) {
         res.end();
       }

package/lib/runtime/tag-manifest.d.ts

@@ -0,0 +1,15 @@
+/**
+ * The key the process's tag manifest (`TrackedTagMarkers`, from the adapter's
+ * `sharedTagManifest`) is kept under on `globalThis`, since the runtime and the
+ * cache handlers are separate bundles.
+ */
+export declare const TAG_MANIFEST_SYMBOL: unique symbol;
+/**
+ * Render a page, after waiting for the revalidation log query if the instance
+ * has fallen behind on it (sat idle, or thawed): here, before Next.js starts
+ * rendering, rather than inside the first `'use cache'` lookup, where the wait
+ * cuts a staged render's static stage short. Just `render` until a cache
+ * handler first creates the manifest, and then there is nothing to catch up
+ * on. Rejects only as `render` does.
+ */
+export declare function catchUpTags<T>(render: () => Promise<T>): Promise<T>;

package/lib/runtime/tag-manifest.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TAG_MANIFEST_SYMBOL = void 0;
+exports.catchUpTags = catchUpTags;
+/**
+ * The key the process's tag manifest (`TrackedTagMarkers`, from the adapter's
+ * `sharedTagManifest`) is kept under on `globalThis`, since the runtime and the
+ * cache handlers are separate bundles.
+ */
+exports.TAG_MANIFEST_SYMBOL = Symbol.for("cdk-nextjs.use-cache.tag-manifest");
+/**
+ * Render a page, after waiting for the revalidation log query if the instance
+ * has fallen behind on it (sat idle, or thawed): here, before Next.js starts
+ * rendering, rather than inside the first `'use cache'` lookup, where the wait
+ * cuts a staged render's static stage short. Just `render` until a cache
+ * handler first creates the manifest, and then there is nothing to catch up
+ * on. Rejects only as `render` does.
+ */
+async function catchUpTags(render) {
+    const global = globalThis;
+    const manifest = global[exports.TAG_MANIFEST_SYMBOL];
+    return manifest ? manifest.catchUp(render) : render();
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFnLW1hbmlmZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3J1bnRpbWUvdGFnLW1hbmlmZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQW1CQSxrQ0FNQztBQXZCRDs7OztHQUlHO0FBQ1UsUUFBQSxtQkFBbUIsR0FBRyxNQUFNLENBQUMsR0FBRyxDQUMzQyxtQ0FBbUMsQ0FDcEMsQ0FBQztBQUVGOzs7Ozs7O0dBT0c7QUFDSSxLQUFLLFVBQVUsV0FBVyxDQUFJLE1BQXdCO0lBQzNELE1BQU0sTUFBTSxHQUFHLFVBRWQsQ0FBQztJQUNGLE1BQU0sUUFBUSxHQUFHLE1BQU0sQ0FBQywyQkFBbUIsQ0FBQyxDQUFDO0lBQzdDLE9BQU8sUUFBUSxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQztBQUN4RCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHR5cGUgeyBUcmFja2VkVGFnTWFya2VycyB9IGZyb20gXCIuLi9hZGFwdGVyL2F3cy1jYWNoZS1zdG9yZVwiO1xuXG4vKipcbiAqIFRoZSBrZXkgdGhlIHByb2Nlc3MncyB0YWcgbWFuaWZlc3QgKGBUcmFja2VkVGFnTWFya2Vyc2AsIGZyb20gdGhlIGFkYXB0ZXInc1xuICogYHNoYXJlZFRhZ01hbmlmZXN0YCkgaXMga2VwdCB1bmRlciBvbiBgZ2xvYmFsVGhpc2AsIHNpbmNlIHRoZSBydW50aW1lIGFuZCB0aGVcbiAqIGNhY2hlIGhhbmRsZXJzIGFyZSBzZXBhcmF0ZSBidW5kbGVzLlxuICovXG5leHBvcnQgY29uc3QgVEFHX01BTklGRVNUX1NZTUJPTCA9IFN5bWJvbC5mb3IoXG4gIFwiY2RrLW5leHRqcy51c2UtY2FjaGUudGFnLW1hbmlmZXN0XCIsXG4pO1xuXG4vKipcbiAqIFJlbmRlciBhIHBhZ2UsIGFmdGVyIHdhaXRpbmcgZm9yIHRoZSByZXZhbGlkYXRpb24gbG9nIHF1ZXJ5IGlmIHRoZSBpbnN0YW5jZVxuICogaGFzIGZhbGxlbiBiZWhpbmQgb24gaXQgKHNhdCBpZGxlLCBvciB0aGF3ZWQpOiBoZXJlLCBiZWZvcmUgTmV4dC5qcyBzdGFydHNcbiAqIHJlbmRlcmluZywgcmF0aGVyIHRoYW4gaW5zaWRlIHRoZSBmaXJzdCBgJ3VzZSBjYWNoZSdgIGxvb2t1cCwgd2hlcmUgdGhlIHdhaXRcbiAqIGN1dHMgYSBzdGFnZWQgcmVuZGVyJ3Mgc3RhdGljIHN0YWdlIHNob3J0LiBKdXN0IGByZW5kZXJgIHVudGlsIGEgY2FjaGVcbiAqIGhhbmRsZXIgZmlyc3QgY3JlYXRlcyB0aGUgbWFuaWZlc3QsIGFuZCB0aGVuIHRoZXJlIGlzIG5vdGhpbmcgdG8gY2F0Y2ggdXBcbiAqIG9uLiBSZWplY3RzIG9ubHkgYXMgYHJlbmRlcmAgZG9lcy5cbiAqL1xuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIGNhdGNoVXBUYWdzPFQ+KHJlbmRlcjogKCkgPT4gUHJvbWlzZTxUPik6IFByb21pc2U8VD4ge1xuICBjb25zdCBnbG9iYWwgPSBnbG9iYWxUaGlzIGFzIHtcbiAgICBbVEFHX01BTklGRVNUX1NZTUJPTF0/OiBQaWNrPFRyYWNrZWRUYWdNYXJrZXJzLCBcImNhdGNoVXBcIj47XG4gIH07XG4gIGNvbnN0IG1hbmlmZXN0ID0gZ2xvYmFsW1RBR19NQU5JRkVTVF9TWU1CT0xdO1xuICByZXR1cm4gbWFuaWZlc3QgPyBtYW5pZmVzdC5jYXRjaFVwKHJlbmRlcikgOiByZW5kZXIoKTtcbn1cbiJdfQ==

package/lib/runtime/tag-manifest.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/runtime/tag-manifest.test.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tag_manifest_1 = require("./tag-manifest");
+const global = globalThis;
+afterEach(() => {
+    delete global[tag_manifest_1.TAG_MANIFEST_SYMBOL];
+});
+describe("catchUpTags", () => {
+    it("just renders before a cache handler creates the manifest", async () => {
+        await expect((0, tag_manifest_1.catchUpTags)(async () => "page")).resolves.toBe("page");
+    });
+    it("renders through the manifest the cache handlers share", async () => {
+        const manifest = {
+            catchUp: jest.fn(async (render) => render()),
+        };
+        global[tag_manifest_1.TAG_MANIFEST_SYMBOL] = manifest;
+        await expect((0, tag_manifest_1.catchUpTags)(async () => "page")).resolves.toBe("page");
+        expect(manifest.catchUp).toHaveBeenCalledTimes(1);
+    });
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFnLW1hbmlmZXN0LnRlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcnVudGltZS90YWctbWFuaWZlc3QudGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLGlEQUFrRTtBQUVsRSxNQUFNLE1BQU0sR0FBRyxVQUFpRCxDQUFDO0FBRWpFLFNBQVMsQ0FBQyxHQUFHLEVBQUU7SUFDYixPQUFPLE1BQU0sQ0FBQyxrQ0FBbUIsQ0FBQyxDQUFDO0FBQ3JDLENBQUMsQ0FBQyxDQUFDO0FBRUgsUUFBUSxDQUFDLGFBQWEsRUFBRSxHQUFHLEVBQUU7SUFDM0IsRUFBRSxDQUFDLDBEQUEwRCxFQUFFLEtBQUssSUFBSSxFQUFFO1FBQ3hFLE1BQU0sTUFBTSxDQUFDLElBQUEsMEJBQVcsRUFBQyxLQUFLLElBQUksRUFBRSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUN0RSxDQUFDLENBQUMsQ0FBQztJQUVILEVBQUUsQ0FBQyx1REFBdUQsRUFBRSxLQUFLLElBQUksRUFBRTtRQUNyRSxNQUFNLFFBQVEsR0FBRztZQUNmLE9BQU8sRUFBRSxJQUFJLENBQUMsRUFBRSxDQUFDLEtBQUssRUFBRSxNQUE2QixFQUFFLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQztTQUNwRSxDQUFDO1FBQ0YsTUFBTSxDQUFDLGtDQUFtQixDQUFDLEdBQUcsUUFBUSxDQUFDO1FBQ3ZDLE1BQU0sTUFBTSxDQUFDLElBQUEsMEJBQVcsRUFBQyxLQUFLLElBQUksRUFBRSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUNwRSxNQUFNLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLHFCQUFxQixDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3BELENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBjYXRjaFVwVGFncywgVEFHX01BTklGRVNUX1NZTUJPTCB9IGZyb20gXCIuL3RhZy1tYW5pZmVzdFwiO1xuXG5jb25zdCBnbG9iYWwgPSBnbG9iYWxUaGlzIGFzIHsgW1RBR19NQU5JRkVTVF9TWU1CT0xdPzogdW5rbm93biB9O1xuXG5hZnRlckVhY2goKCkgPT4ge1xuICBkZWxldGUgZ2xvYmFsW1RBR19NQU5JRkVTVF9TWU1CT0xdO1xufSk7XG5cbmRlc2NyaWJlKFwiY2F0Y2hVcFRhZ3NcIiwgKCkgPT4ge1xuICBpdChcImp1c3QgcmVuZGVycyBiZWZvcmUgYSBjYWNoZSBoYW5kbGVyIGNyZWF0ZXMgdGhlIG1hbmlmZXN0XCIsIGFzeW5jICgpID0+IHtcbiAgICBhd2FpdCBleHBlY3QoY2F0Y2hVcFRhZ3MoYXN5bmMgKCkgPT4gXCJwYWdlXCIpKS5yZXNvbHZlcy50b0JlKFwicGFnZVwiKTtcbiAgfSk7XG5cbiAgaXQoXCJyZW5kZXJzIHRocm91Z2ggdGhlIG1hbmlmZXN0IHRoZSBjYWNoZSBoYW5kbGVycyBzaGFyZVwiLCBhc3luYyAoKSA9PiB7XG4gICAgY29uc3QgbWFuaWZlc3QgPSB7XG4gICAgICBjYXRjaFVwOiBqZXN0LmZuKGFzeW5jIChyZW5kZXI6ICgpID0+IFByb21pc2U8c3RyaW5nPikgPT4gcmVuZGVyKCkpLFxuICAgIH07XG4gICAgZ2xvYmFsW1RBR19NQU5JRkVTVF9TWU1CT0xdID0gbWFuaWZlc3Q7XG4gICAgYXdhaXQgZXhwZWN0KGNhdGNoVXBUYWdzKGFzeW5jICgpID0+IFwicGFnZVwiKSkucmVzb2x2ZXMudG9CZShcInBhZ2VcIik7XG4gICAgZXhwZWN0KG1hbmlmZXN0LmNhdGNoVXApLnRvSGF2ZUJlZW5DYWxsZWRUaW1lcygxKTtcbiAgfSk7XG59KTtcbiJdfQ==

package/lib/utils/deployment-build-id.d.ts

@@ -0,0 +1,11 @@
+/**
+ * The build ID cdk-nextjs stores a deployment under. Pure, so the adapter can
+ * check it at build time against the same format the constructs deploy with.
+ */
+/** {@link NextjsBuild.buildId}: Next.js's build ID, suffixed with the app's `deploymentId`. */
+export declare function deploymentBuildId(manifest: {
+    readonly buildId: string;
+    readonly config: {
+        readonly deploymentId: string;
+    };
+}): string;

package/lib/utils/deployment-build-id.js

@@ -0,0 +1,15 @@
+"use strict";
+/**
+ * The build ID cdk-nextjs stores a deployment under. Pure, so the adapter can
+ * check it at build time against the same format the constructs deploy with.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deploymentBuildId = deploymentBuildId;
+/** {@link NextjsBuild.buildId}: Next.js's build ID, suffixed with the app's `deploymentId`. */
+function deploymentBuildId(manifest) {
+    const { deploymentId } = manifest.config;
+    return deploymentId
+        ? `${manifest.buildId}-${deploymentId}`
+        : manifest.buildId;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95bWVudC1idWlsZC1pZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9kZXBsb3ltZW50LWJ1aWxkLWlkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O0dBR0c7O0FBR0gsOENBUUM7QUFURCwrRkFBK0Y7QUFDL0YsU0FBZ0IsaUJBQWlCLENBQUMsUUFHakM7SUFDQyxNQUFNLEVBQUUsWUFBWSxFQUFFLEdBQUcsUUFBUSxDQUFDLE1BQU0sQ0FBQztJQUN6QyxPQUFPLFlBQVk7UUFDakIsQ0FBQyxDQUFDLEdBQUcsUUFBUSxDQUFDLE9BQU8sSUFBSSxZQUFZLEVBQUU7UUFDdkMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUM7QUFDdkIsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogVGhlIGJ1aWxkIElEIGNkay1uZXh0anMgc3RvcmVzIGEgZGVwbG95bWVudCB1bmRlci4gUHVyZSwgc28gdGhlIGFkYXB0ZXIgY2FuXG4gKiBjaGVjayBpdCBhdCBidWlsZCB0aW1lIGFnYWluc3QgdGhlIHNhbWUgZm9ybWF0IHRoZSBjb25zdHJ1Y3RzIGRlcGxveSB3aXRoLlxuICovXG5cbi8qKiB7QGxpbmsgTmV4dGpzQnVpbGQuYnVpbGRJZH06IE5leHQuanMncyBidWlsZCBJRCwgc3VmZml4ZWQgd2l0aCB0aGUgYXBwJ3MgYGRlcGxveW1lbnRJZGAuICovXG5leHBvcnQgZnVuY3Rpb24gZGVwbG95bWVudEJ1aWxkSWQobWFuaWZlc3Q6IHtcbiAgcmVhZG9ubHkgYnVpbGRJZDogc3RyaW5nO1xuICByZWFkb25seSBjb25maWc6IHsgcmVhZG9ubHkgZGVwbG95bWVudElkOiBzdHJpbmcgfTtcbn0pOiBzdHJpbmcge1xuICBjb25zdCB7IGRlcGxveW1lbnRJZCB9ID0gbWFuaWZlc3QuY29uZmlnO1xuICByZXR1cm4gZGVwbG95bWVudElkXG4gICAgPyBgJHttYW5pZmVzdC5idWlsZElkfS0ke2RlcGxveW1lbnRJZH1gXG4gICAgOiBtYW5pZmVzdC5idWlsZElkO1xufVxuIl19

package/package.json

@@ -21,7 +21,7 @@
     "@aws-sdk/client-ssm": "^3.1141.0",
     "@aws-sdk/lib-storage": "^3.1141.0",
     "@mrgrain/jsii-struct-builder": "^0.7.64",
-    "@next/routing": "16.3.6",
+    "@next/routing": "16.3.8",
     "@smithy/signature-v4": "^2.3.0",
     "@types/aws-lambda": "^8.10.163",
     "@types/debug": "^4.1.13",
@@ -51,7 +51,7 @@
     "jsii-pacmak": "^1.140.0",
     "jsii-rosetta": "~5.9.67",
     "mime-types": "^2.1.35",
-    "next": "^16.3.6",
+    "next": "^16.3.8",
     "prettier": "^3.9.9",
     "projen": "^0.101.6",
     "ts-jest": "^29.4.14",
@@ -84,7 +84,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.7.5",
+  "version": "0.7.7",
   "jest": {
     "coverageProvider": "v8",
     "testPathIgnorePatterns": [

package/scripts/e2e-harness/README.md

@@ -449,7 +449,7 @@ cdk-nextjs rejects any build output whose runtime is not `nodejs`
 
 That is a product limitation and a deliberate one: the edge runtime is deprecated
 in Next.js, and cdk-nextjs supports Next.js 16's Node-runtime `proxy.ts` instead.
-931 of next.js's 1134 e2e files are edge-free, so it barely constrains widening
+933 of next.js's 1136 e2e files are edge-free, so it barely constrains widening
 the list - and `scripts/e2e-harness/screen.mjs` applies this screen and the three
 below for you, recording the funnel in the manifest's `screening` block: