cdk-nextjs 0.7.6 → 0.7.7

package/lib/runtime/lambda.mjs

@@ -38647,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) {
@@ -38794,7 +38804,7 @@ var NextjsRuntime = class {
         const search = toSearch(invocationQuery);
         req.url = search ? `${pathname}?${search}` : pathname;
         req.headers = toIncomingHttpHeaders(result.requestHeaders);
-        await handler2(req, asServerResponse(res), {
+        const options = {
           waitUntil,
           requestMeta: {
             // The resolved query, stated rather than left to be re-derived.
@@ -38869,7 +38879,9 @@ var NextjsRuntime = class {
             // mocked `req`/`res`).
             revalidate: (config) => this.revalidate(config, request)
           }
-        });
+        };
+        const render = () => handler2(req, asServerResponse(res), options);
+        await (result.entrypoint.type === "app-page" ? catchUpTags(render) : render());
         if (!res.writableEnded && result.entrypoint.type !== "page-api") {
           res.end();
         }
@@ -39156,7 +39168,8 @@ var NextjsRuntime = class {
     if (target.kind === "entrypoint") {
       const handler2 = await this.entrypoints.load(target.entrypoint);
       req.url = requestedUrl ?? req.url;
-      await handler2(req, asServerResponse(res), { waitUntil });
+      const render = () => handler2(req, asServerResponse(res), { waitUntil });
+      await (target.entrypoint.type === "app-page" ? catchUpTags(render) : render());
       if (!res.writableEnded) {
         res.end();
       }

package/lib/runtime/server.mjs

@@ -38647,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) {
@@ -38794,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.
@@ -38869,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();
         }
@@ -39156,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/package.json

@@ -84,7 +84,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.7.6",
+  "version": "0.7.7",
   "jest": {
     "coverageProvider": "v8",
     "testPathIgnorePatterns": [