cdk-nextjs 0.7.7 → 0.7.8

package/lib/runtime/lambda.mjs

@@ -25058,7 +25058,7 @@ var require_dist_cjs11 = __commonJS({
     var { setCredentialFeature: setCredentialFeature2 } = (init_client3(), __toCommonJS(client_exports2));
     var { CredentialsProviderError: CredentialsProviderError2, parseKnownFiles: parseKnownFiles2, getProfileName: getProfileName2 } = (init_config2(), __toCommonJS(config_exports));
     var { HttpRequest: HttpRequest2 } = (init_protocols(), __toCommonJS(protocols_exports));
-    var { createHash: createHash6, createPrivateKey, createPublicKey, sign: sign3 } = __require("node:crypto");
+    var { createHash: createHash7, createPrivateKey, createPublicKey, sign: sign3 } = __require("node:crypto");
     var { promises } = __require("node:fs");
     var { homedir: homedir2 } = __require("node:os");
     var { dirname: dirname3, join: join12 } = __require("node:path");
@@ -25227,7 +25227,7 @@ var require_dist_cjs11 = __commonJS({
       getTokenFilePath() {
         const directory = process.env.AWS_LOGIN_CACHE_DIRECTORY ?? join12(homedir2(), ".aws", "login", "cache");
         const loginSessionBytes = Buffer.from(this.loginSession, "utf8");
-        const loginSessionSha256 = createHash6("sha256").update(loginSessionBytes).digest("hex");
+        const loginSessionSha256 = createHash7("sha256").update(loginSessionBytes).digest("hex");
         return join12(directory, `${loginSessionSha256}.json`);
       }
       derToRawSignature(derSignature) {
@@ -35889,9 +35889,9 @@ var require_dist_cjs16 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@next+routing@16.3.8/node_modules/@next/routing/dist/index.js
+// node_modules/.pnpm/@next+routing@16.4.0/node_modules/@next/routing/dist/index.js
 var require_dist = __commonJS({
-  "node_modules/.pnpm/@next+routing@16.3.8/node_modules/@next/routing/dist/index.js"(exports, module) {
+  "node_modules/.pnpm/@next+routing@16.4.0/node_modules/@next/routing/dist/index.js"(exports, module) {
     (() => {
       "use strict";
       var e5 = {};
@@ -36012,22 +36012,37 @@ var require_dist = __commonJS({
         return true;
       }
       function replaceDestination(e6, t8, n4) {
-        let a5 = e6;
+        const a5 = Object.keys(n4);
         if (t8) {
           for (let e7 = 1; e7 < t8.length; e7++) {
-            const n5 = t8[e7] ?? "";
-            a5 = a5.replace(new RegExp(`\\$${e7}`, "g"), n5);
+            a5.push(String(e7));
           }
           if (t8.groups) {
-            for (const [e7, n5] of Object.entries(t8.groups)) {
-              a5 = a5.replace(new RegExp(`\\$${e7}`, "g"), n5 ?? "");
-            }
+            a5.push(...Object.keys(t8.groups));
           }
         }
-        for (const [e7, t9] of Object.entries(n4)) {
-          a5 = a5.replace(new RegExp(`\\$${e7}`, "g"), t9);
+        if (a5.length === 0) {
+          return e6;
         }
-        return a5;
+        const s2 = a5.sort(((e7, t9) => t9.length - e7.length)).map(((e7) => {
+          const t9 = e7.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+          return /^\d+$/.test(e7) ? `${t9}(?!\\d)` : t9;
+        })).join("|");
+        return e6.replace(new RegExp(`\\$(${s2})`, "g"), ((e7, a6) => {
+          if (t8) {
+            const e8 = Number(a6);
+            if (Number.isInteger(e8) && e8 > 0 && e8 < t8.length && String(e8) === a6) {
+              return t8[e8] ?? "";
+            }
+            if (t8.groups && Object.hasOwn(t8.groups, a6)) {
+              return t8.groups[a6] ?? "";
+            }
+          }
+          if (Object.hasOwn(n4, a6)) {
+            return n4[a6];
+          }
+          return e7;
+        }));
       }
       function isExternalDestination(e6) {
         return e6.startsWith("http://") || e6.startsWith("https://");
@@ -38023,6 +38038,7 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 
 // src/runtime/image-utils.ts
 var import_client_s32 = __toESM(require_dist_cjs16());
+import { createHash as createHash6 } from "node:crypto";
 async function fetchFromS3(s32, bucket, url, location, maximumBody) {
   const { urlBasePath, keyPrefix } = location;
   const path = withoutAssetPrefix(url.split(/[?#]/, 1)[0], location);
@@ -38070,6 +38086,12 @@ var ImageTooLargeError = class extends Error {
     this.name = "ImageTooLargeError";
   }
 };
+function extractEtag(etag, imageBuffer) {
+  if (etag) {
+    return Buffer.from(etag).toString("base64url");
+  }
+  return createHash6("sha256").update(imageBuffer).digest("base64url");
+}
 function resolveErrorResponse(error2, ImageError) {
   if (error2 instanceof ImageError) {
     return { statusCode: error2.statusCode, message: error2.message };
@@ -38241,6 +38263,9 @@ var RuntimeImageOptimizer = class {
           waitUntil
         }
       );
+      if (entry && "error" in entry) {
+        throw entry.error;
+      }
       const value = entry?.value;
       if (value?.kind !== IMAGE_KIND) {
         throw new Error("The image cache returned no image entry");
@@ -38296,7 +38321,8 @@ var RuntimeImageOptimizer = class {
           buffer: result.buffer,
           contentType: result.contentType,
           cacheControl: null,
-          etag: result.etag
+          // Encoded as for a route's response: `fetchInternalImage` does too.
+          etag: extractEtag(result.etag, result.buffer)
         };
       } catch (error2) {
         const missing = error2 instanceof Error && error2.name === "NoSuchKey";
@@ -38326,7 +38352,7 @@ var RuntimeImageOptimizer = class {
       buffer: response.body,
       contentType: firstValue(response.headers["content-type"]) ?? null,
       cacheControl: firstValue(response.headers["cache-control"]) ?? null,
-      etag: optimizer.extractEtag(
+      etag: extractEtag(
         firstValue(response.headers.etag) ?? null,
         response.body
       )
@@ -38648,6 +38674,14 @@ function httpDate(value) {
 }
 
 // src/runtime/tag-manifest.ts
+import { AsyncLocalStorage } from "node:async_hooks";
+var OUTSIDE_REQUEST_SYMBOL = /* @__PURE__ */ Symbol.for(
+  "cdk-nextjs.outside-request-context"
+);
+function captureOutsideRequest() {
+  const global = globalThis;
+  global[OUTSIDE_REQUEST_SYMBOL] ??= AsyncLocalStorage.snapshot();
+}
 var TAG_MANIFEST_SYMBOL = /* @__PURE__ */ Symbol.for(
   "cdk-nextjs.use-cache.tag-manifest"
 );
@@ -38658,6 +38692,7 @@ async function catchUpTags(render) {
 }
 
 // src/runtime/core.ts
+captureOutsideRequest();
 var NextjsRuntime = class {
   constructor(options) {
     this.options = options;

package/lib/runtime/server.mjs

@@ -25058,7 +25058,7 @@ var require_dist_cjs11 = __commonJS({
     var { setCredentialFeature: setCredentialFeature2 } = (init_client3(), __toCommonJS(client_exports2));
     var { CredentialsProviderError: CredentialsProviderError2, parseKnownFiles: parseKnownFiles2, getProfileName: getProfileName2 } = (init_config2(), __toCommonJS(config_exports));
     var { HttpRequest: HttpRequest2 } = (init_protocols(), __toCommonJS(protocols_exports));
-    var { createHash: createHash6, createPrivateKey, createPublicKey, sign: sign3 } = __require("node:crypto");
+    var { createHash: createHash7, createPrivateKey, createPublicKey, sign: sign3 } = __require("node:crypto");
     var { promises } = __require("node:fs");
     var { homedir: homedir2 } = __require("node:os");
     var { dirname: dirname3, join: join12 } = __require("node:path");
@@ -25227,7 +25227,7 @@ var require_dist_cjs11 = __commonJS({
       getTokenFilePath() {
         const directory = process.env.AWS_LOGIN_CACHE_DIRECTORY ?? join12(homedir2(), ".aws", "login", "cache");
         const loginSessionBytes = Buffer.from(this.loginSession, "utf8");
-        const loginSessionSha256 = createHash6("sha256").update(loginSessionBytes).digest("hex");
+        const loginSessionSha256 = createHash7("sha256").update(loginSessionBytes).digest("hex");
         return join12(directory, `${loginSessionSha256}.json`);
       }
       derToRawSignature(derSignature) {
@@ -35889,9 +35889,9 @@ var require_dist_cjs16 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@next+routing@16.3.8/node_modules/@next/routing/dist/index.js
+// node_modules/.pnpm/@next+routing@16.4.0/node_modules/@next/routing/dist/index.js
 var require_dist = __commonJS({
-  "node_modules/.pnpm/@next+routing@16.3.8/node_modules/@next/routing/dist/index.js"(exports, module) {
+  "node_modules/.pnpm/@next+routing@16.4.0/node_modules/@next/routing/dist/index.js"(exports, module) {
     (() => {
       "use strict";
       var e5 = {};
@@ -36012,22 +36012,37 @@ var require_dist = __commonJS({
         return true;
       }
       function replaceDestination(e6, t8, n4) {
-        let a5 = e6;
+        const a5 = Object.keys(n4);
         if (t8) {
           for (let e7 = 1; e7 < t8.length; e7++) {
-            const n5 = t8[e7] ?? "";
-            a5 = a5.replace(new RegExp(`\\$${e7}`, "g"), n5);
+            a5.push(String(e7));
           }
           if (t8.groups) {
-            for (const [e7, n5] of Object.entries(t8.groups)) {
-              a5 = a5.replace(new RegExp(`\\$${e7}`, "g"), n5 ?? "");
-            }
+            a5.push(...Object.keys(t8.groups));
           }
         }
-        for (const [e7, t9] of Object.entries(n4)) {
-          a5 = a5.replace(new RegExp(`\\$${e7}`, "g"), t9);
+        if (a5.length === 0) {
+          return e6;
         }
-        return a5;
+        const s2 = a5.sort(((e7, t9) => t9.length - e7.length)).map(((e7) => {
+          const t9 = e7.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+          return /^\d+$/.test(e7) ? `${t9}(?!\\d)` : t9;
+        })).join("|");
+        return e6.replace(new RegExp(`\\$(${s2})`, "g"), ((e7, a6) => {
+          if (t8) {
+            const e8 = Number(a6);
+            if (Number.isInteger(e8) && e8 > 0 && e8 < t8.length && String(e8) === a6) {
+              return t8[e8] ?? "";
+            }
+            if (t8.groups && Object.hasOwn(t8.groups, a6)) {
+              return t8.groups[a6] ?? "";
+            }
+          }
+          if (Object.hasOwn(n4, a6)) {
+            return n4[a6];
+          }
+          return e7;
+        }));
       }
       function isExternalDestination(e6) {
         return e6.startsWith("http://") || e6.startsWith("https://");
@@ -38023,6 +38038,7 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 
 // src/runtime/image-utils.ts
 var import_client_s32 = __toESM(require_dist_cjs16());
+import { createHash as createHash6 } from "node:crypto";
 async function fetchFromS3(s32, bucket, url, location, maximumBody) {
   const { urlBasePath, keyPrefix } = location;
   const path = withoutAssetPrefix(url.split(/[?#]/, 1)[0], location);
@@ -38070,6 +38086,12 @@ var ImageTooLargeError = class extends Error {
     this.name = "ImageTooLargeError";
   }
 };
+function extractEtag(etag, imageBuffer) {
+  if (etag) {
+    return Buffer.from(etag).toString("base64url");
+  }
+  return createHash6("sha256").update(imageBuffer).digest("base64url");
+}
 function resolveErrorResponse(error2, ImageError) {
   if (error2 instanceof ImageError) {
     return { statusCode: error2.statusCode, message: error2.message };
@@ -38241,6 +38263,9 @@ var RuntimeImageOptimizer = class {
           waitUntil
         }
       );
+      if (entry && "error" in entry) {
+        throw entry.error;
+      }
       const value = entry?.value;
       if (value?.kind !== IMAGE_KIND) {
         throw new Error("The image cache returned no image entry");
@@ -38296,7 +38321,8 @@ var RuntimeImageOptimizer = class {
           buffer: result.buffer,
           contentType: result.contentType,
           cacheControl: null,
-          etag: result.etag
+          // Encoded as for a route's response: `fetchInternalImage` does too.
+          etag: extractEtag(result.etag, result.buffer)
         };
       } catch (error2) {
         const missing = error2 instanceof Error && error2.name === "NoSuchKey";
@@ -38326,7 +38352,7 @@ var RuntimeImageOptimizer = class {
       buffer: response.body,
       contentType: firstValue(response.headers["content-type"]) ?? null,
       cacheControl: firstValue(response.headers["cache-control"]) ?? null,
-      etag: optimizer.extractEtag(
+      etag: extractEtag(
         firstValue(response.headers.etag) ?? null,
         response.body
       )
@@ -38648,6 +38674,14 @@ function httpDate(value) {
 }
 
 // src/runtime/tag-manifest.ts
+import { AsyncLocalStorage } from "node:async_hooks";
+var OUTSIDE_REQUEST_SYMBOL = /* @__PURE__ */ Symbol.for(
+  "cdk-nextjs.outside-request-context"
+);
+function captureOutsideRequest() {
+  const global = globalThis;
+  global[OUTSIDE_REQUEST_SYMBOL] ??= AsyncLocalStorage.snapshot();
+}
 var TAG_MANIFEST_SYMBOL = /* @__PURE__ */ Symbol.for(
   "cdk-nextjs.use-cache.tag-manifest"
 );
@@ -38658,6 +38692,7 @@ async function catchUpTags(render) {
 }
 
 // src/runtime/core.ts
+captureOutsideRequest();
 var NextjsRuntime = class {
   constructor(options) {
     this.options = options;

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

@@ -1,3 +1,28 @@
+/**
+ * The key {@link outsideRequest}'s context is kept under on `globalThis`, for
+ * the same reason as {@link TAG_MANIFEST_SYMBOL}.
+ */
+export declare const OUTSIDE_REQUEST_SYMBOL: unique symbol;
+/**
+ * Capture the context the runtime's module loads in, outside any request.
+ * Called once, at load; a later call keeps the first capture.
+ */
+export declare function captureOutsideRequest(): void;
+/**
+ * Run `fn` in the context {@link captureOutsideRequest} captured, where Next.js's
+ * request stores are unset: or in the current one, if nothing was captured
+ * (outside the runtime, as in unit tests).
+ *
+ * Next.js 16.4 patches `Date.now()`, `new Date()`, `Math.random()` and
+ * `crypto`'s random functions to end a staged render's static stage when one is
+ * called during it (`node-environment-extensions/io-utils`), judged by its
+ * request store. Cache handler work called from inside the render - the tag
+ * refresh's clock reads, the AWS SDK's request signing and invocation ids - is
+ * not the render's, but it runs in the render's context, so it counted: a
+ * draft mode page's static stage ended empty, and the client cached nothing
+ * from it.
+ */
+export declare function outsideRequest<T>(fn: () => T): T;
 /**
  * The key the process's tag manifest (`TrackedTagMarkers`, from the adapter's
  * `sharedTagManifest`) is kept under on `globalThis`, since the runtime and the

package/lib/runtime/tag-manifest.js

@@ -1,7 +1,42 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TAG_MANIFEST_SYMBOL = void 0;
+exports.TAG_MANIFEST_SYMBOL = exports.OUTSIDE_REQUEST_SYMBOL = void 0;
+exports.captureOutsideRequest = captureOutsideRequest;
+exports.outsideRequest = outsideRequest;
 exports.catchUpTags = catchUpTags;
+const node_async_hooks_1 = require("node:async_hooks");
+/**
+ * The key {@link outsideRequest}'s context is kept under on `globalThis`, for
+ * the same reason as {@link TAG_MANIFEST_SYMBOL}.
+ */
+exports.OUTSIDE_REQUEST_SYMBOL = Symbol.for("cdk-nextjs.outside-request-context");
+/**
+ * Capture the context the runtime's module loads in, outside any request.
+ * Called once, at load; a later call keeps the first capture.
+ */
+function captureOutsideRequest() {
+    const global = globalThis;
+    global[exports.OUTSIDE_REQUEST_SYMBOL] ??= node_async_hooks_1.AsyncLocalStorage.snapshot();
+}
+/**
+ * Run `fn` in the context {@link captureOutsideRequest} captured, where Next.js's
+ * request stores are unset: or in the current one, if nothing was captured
+ * (outside the runtime, as in unit tests).
+ *
+ * Next.js 16.4 patches `Date.now()`, `new Date()`, `Math.random()` and
+ * `crypto`'s random functions to end a staged render's static stage when one is
+ * called during it (`node-environment-extensions/io-utils`), judged by its
+ * request store. Cache handler work called from inside the render - the tag
+ * refresh's clock reads, the AWS SDK's request signing and invocation ids - is
+ * not the render's, but it runs in the render's context, so it counted: a
+ * draft mode page's static stage ended empty, and the client cached nothing
+ * from it.
+ */
+function outsideRequest(fn) {
+    const global = globalThis;
+    const run = global[exports.OUTSIDE_REQUEST_SYMBOL];
+    return run ? run(fn) : fn();
+}
 /**
  * The key the process's tag manifest (`TrackedTagMarkers`, from the adapter's
  * `sharedTagManifest`) is kept under on `globalThis`, since the runtime and the
@@ -21,4 +56,4 @@ async function catchUpTags(render) {
     const manifest = global[exports.TAG_MANIFEST_SYMBOL];
     return manifest ? manifest.catchUp(render) : render();
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFnLW1hbmlmZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3J1bnRpbWUvdGFnLW1hbmlmZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQW1CQSxrQ0FNQztBQXZCRDs7OztHQUlHO0FBQ1UsUUFBQSxtQkFBbUIsR0FBRyxNQUFNLENBQUMsR0FBRyxDQUMzQyxtQ0FBbUMsQ0FDcEMsQ0FBQztBQUVGOzs7Ozs7O0dBT0c7QUFDSSxLQUFLLFVBQVUsV0FBVyxDQUFJLE1BQXdCO0lBQzNELE1BQU0sTUFBTSxHQUFHLFVBRWQsQ0FBQztJQUNGLE1BQU0sUUFBUSxHQUFHLE1BQU0sQ0FBQywyQkFBbUIsQ0FBQyxDQUFDO0lBQzdDLE9BQU8sUUFBUSxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQztBQUN4RCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHR5cGUgeyBUcmFja2VkVGFnTWFya2VycyB9IGZyb20gXCIuLi9hZGFwdGVyL2F3cy1jYWNoZS1zdG9yZVwiO1xuXG4vKipcbiAqIFRoZSBrZXkgdGhlIHByb2Nlc3MncyB0YWcgbWFuaWZlc3QgKGBUcmFja2VkVGFnTWFya2Vyc2AsIGZyb20gdGhlIGFkYXB0ZXInc1xuICogYHNoYXJlZFRhZ01hbmlmZXN0YCkgaXMga2VwdCB1bmRlciBvbiBgZ2xvYmFsVGhpc2AsIHNpbmNlIHRoZSBydW50aW1lIGFuZCB0aGVcbiAqIGNhY2hlIGhhbmRsZXJzIGFyZSBzZXBhcmF0ZSBidW5kbGVzLlxuICovXG5leHBvcnQgY29uc3QgVEFHX01BTklGRVNUX1NZTUJPTCA9IFN5bWJvbC5mb3IoXG4gIFwiY2RrLW5leHRqcy51c2UtY2FjaGUudGFnLW1hbmlmZXN0XCIsXG4pO1xuXG4vKipcbiAqIFJlbmRlciBhIHBhZ2UsIGFmdGVyIHdhaXRpbmcgZm9yIHRoZSByZXZhbGlkYXRpb24gbG9nIHF1ZXJ5IGlmIHRoZSBpbnN0YW5jZVxuICogaGFzIGZhbGxlbiBiZWhpbmQgb24gaXQgKHNhdCBpZGxlLCBvciB0aGF3ZWQpOiBoZXJlLCBiZWZvcmUgTmV4dC5qcyBzdGFydHNcbiAqIHJlbmRlcmluZywgcmF0aGVyIHRoYW4gaW5zaWRlIHRoZSBmaXJzdCBgJ3VzZSBjYWNoZSdgIGxvb2t1cCwgd2hlcmUgdGhlIHdhaXRcbiAqIGN1dHMgYSBzdGFnZWQgcmVuZGVyJ3Mgc3RhdGljIHN0YWdlIHNob3J0LiBKdXN0IGByZW5kZXJgIHVudGlsIGEgY2FjaGVcbiAqIGhhbmRsZXIgZmlyc3QgY3JlYXRlcyB0aGUgbWFuaWZlc3QsIGFuZCB0aGVuIHRoZXJlIGlzIG5vdGhpbmcgdG8gY2F0Y2ggdXBcbiAqIG9uLiBSZWplY3RzIG9ubHkgYXMgYHJlbmRlcmAgZG9lcy5cbiAqL1xuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIGNhdGNoVXBUYWdzPFQ+KHJlbmRlcjogKCkgPT4gUHJvbWlzZTxUPik6IFByb21pc2U8VD4ge1xuICBjb25zdCBnbG9iYWwgPSBnbG9iYWxUaGlzIGFzIHtcbiAgICBbVEFHX01BTklGRVNUX1NZTUJPTF0/OiBQaWNrPFRyYWNrZWRUYWdNYXJrZXJzLCBcImNhdGNoVXBcIj47XG4gIH07XG4gIGNvbnN0IG1hbmlmZXN0ID0gZ2xvYmFsW1RBR19NQU5JRkVTVF9TWU1CT0xdO1xuICByZXR1cm4gbWFuaWZlc3QgPyBtYW5pZmVzdC5jYXRjaFVwKHJlbmRlcikgOiByZW5kZXIoKTtcbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFnLW1hbmlmZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3J1bnRpbWUvdGFnLW1hbmlmZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQWlCQSxzREFHQztBQWdCRCx3Q0FJQztBQW1CRCxrQ0FNQztBQWpFRCx1REFBcUQ7QUFHckQ7OztHQUdHO0FBQ1UsUUFBQSxzQkFBc0IsR0FBRyxNQUFNLENBQUMsR0FBRyxDQUM5QyxvQ0FBb0MsQ0FDckMsQ0FBQztBQUlGOzs7R0FHRztBQUNILFNBQWdCLHFCQUFxQjtJQUNuQyxNQUFNLE1BQU0sR0FBRyxVQUEwRCxDQUFDO0lBQzFFLE1BQU0sQ0FBQyw4QkFBc0IsQ0FBQyxLQUFLLG9DQUFpQixDQUFDLFFBQVEsRUFBRSxDQUFDO0FBQ2xFLENBQUM7QUFFRDs7Ozs7Ozs7Ozs7OztHQWFHO0FBQ0gsU0FBZ0IsY0FBYyxDQUFJLEVBQVc7SUFDM0MsTUFBTSxNQUFNLEdBQUcsVUFBMEQsQ0FBQztJQUMxRSxNQUFNLEdBQUcsR0FBRyxNQUFNLENBQUMsOEJBQXNCLENBQUMsQ0FBQztJQUMzQyxPQUFPLEdBQUcsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQztBQUM5QixDQUFDO0FBRUQ7Ozs7R0FJRztBQUNVLFFBQUEsbUJBQW1CLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FDM0MsbUNBQW1DLENBQ3BDLENBQUM7QUFFRjs7Ozs7OztHQU9HO0FBQ0ksS0FBSyxVQUFVLFdBQVcsQ0FBSSxNQUF3QjtJQUMzRCxNQUFNLE1BQU0sR0FBRyxVQUVkLENBQUM7SUFDRixNQUFNLFFBQVEsR0FBRyxNQUFNLENBQUMsMkJBQW1CLENBQUMsQ0FBQztJQUM3QyxPQUFPLFFBQVEsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUM7QUFDeEQsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEFzeW5jTG9jYWxTdG9yYWdlIH0gZnJvbSBcIm5vZGU6YXN5bmNfaG9va3NcIjtcbmltcG9ydCB0eXBlIHsgVHJhY2tlZFRhZ01hcmtlcnMgfSBmcm9tIFwiLi4vYWRhcHRlci9hd3MtY2FjaGUtc3RvcmVcIjtcblxuLyoqXG4gKiBUaGUga2V5IHtAbGluayBvdXRzaWRlUmVxdWVzdH0ncyBjb250ZXh0IGlzIGtlcHQgdW5kZXIgb24gYGdsb2JhbFRoaXNgLCBmb3JcbiAqIHRoZSBzYW1lIHJlYXNvbiBhcyB7QGxpbmsgVEFHX01BTklGRVNUX1NZTUJPTH0uXG4gKi9cbmV4cG9ydCBjb25zdCBPVVRTSURFX1JFUVVFU1RfU1lNQk9MID0gU3ltYm9sLmZvcihcbiAgXCJjZGstbmV4dGpzLm91dHNpZGUtcmVxdWVzdC1jb250ZXh0XCIsXG4pO1xuXG50eXBlIENvbnRleHRSdW5uZXIgPSA8VD4oZm46ICgpID0+IFQpID0+IFQ7XG5cbi8qKlxuICogQ2FwdHVyZSB0aGUgY29udGV4dCB0aGUgcnVudGltZSdzIG1vZHVsZSBsb2FkcyBpbiwgb3V0c2lkZSBhbnkgcmVxdWVzdC5cbiAqIENhbGxlZCBvbmNlLCBhdCBsb2FkOyBhIGxhdGVyIGNhbGwga2VlcHMgdGhlIGZpcnN0IGNhcHR1cmUuXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBjYXB0dXJlT3V0c2lkZVJlcXVlc3QoKTogdm9pZCB7XG4gIGNvbnN0IGdsb2JhbCA9IGdsb2JhbFRoaXMgYXMgeyBbT1VUU0lERV9SRVFVRVNUX1NZTUJPTF0/OiBDb250ZXh0UnVubmVyIH07XG4gIGdsb2JhbFtPVVRTSURFX1JFUVVFU1RfU1lNQk9MXSA/Pz0gQXN5bmNMb2NhbFN0b3JhZ2Uuc25hcHNob3QoKTtcbn1cblxuLyoqXG4gKiBSdW4gYGZuYCBpbiB0aGUgY29udGV4dCB7QGxpbmsgY2FwdHVyZU91dHNpZGVSZXF1ZXN0fSBjYXB0dXJlZCwgd2hlcmUgTmV4dC5qcydzXG4gKiByZXF1ZXN0IHN0b3JlcyBhcmUgdW5zZXQ6IG9yIGluIHRoZSBjdXJyZW50IG9uZSwgaWYgbm90aGluZyB3YXMgY2FwdHVyZWRcbiAqIChvdXRzaWRlIHRoZSBydW50aW1lLCBhcyBpbiB1bml0IHRlc3RzKS5cbiAqXG4gKiBOZXh0LmpzIDE2LjQgcGF0Y2hlcyBgRGF0ZS5ub3coKWAsIGBuZXcgRGF0ZSgpYCwgYE1hdGgucmFuZG9tKClgIGFuZFxuICogYGNyeXB0b2AncyByYW5kb20gZnVuY3Rpb25zIHRvIGVuZCBhIHN0YWdlZCByZW5kZXIncyBzdGF0aWMgc3RhZ2Ugd2hlbiBvbmUgaXNcbiAqIGNhbGxlZCBkdXJpbmcgaXQgKGBub2RlLWVudmlyb25tZW50LWV4dGVuc2lvbnMvaW8tdXRpbHNgKSwganVkZ2VkIGJ5IGl0c1xuICogcmVxdWVzdCBzdG9yZS4gQ2FjaGUgaGFuZGxlciB3b3JrIGNhbGxlZCBmcm9tIGluc2lkZSB0aGUgcmVuZGVyIC0gdGhlIHRhZ1xuICogcmVmcmVzaCdzIGNsb2NrIHJlYWRzLCB0aGUgQVdTIFNESydzIHJlcXVlc3Qgc2lnbmluZyBhbmQgaW52b2NhdGlvbiBpZHMgLSBpc1xuICogbm90IHRoZSByZW5kZXIncywgYnV0IGl0IHJ1bnMgaW4gdGhlIHJlbmRlcidzIGNvbnRleHQsIHNvIGl0IGNvdW50ZWQ6IGFcbiAqIGRyYWZ0IG1vZGUgcGFnZSdzIHN0YXRpYyBzdGFnZSBlbmRlZCBlbXB0eSwgYW5kIHRoZSBjbGllbnQgY2FjaGVkIG5vdGhpbmdcbiAqIGZyb20gaXQuXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBvdXRzaWRlUmVxdWVzdDxUPihmbjogKCkgPT4gVCk6IFQge1xuICBjb25zdCBnbG9iYWwgPSBnbG9iYWxUaGlzIGFzIHsgW09VVFNJREVfUkVRVUVTVF9TWU1CT0xdPzogQ29udGV4dFJ1bm5lciB9O1xuICBjb25zdCBydW4gPSBnbG9iYWxbT1VUU0lERV9SRVFVRVNUX1NZTUJPTF07XG4gIHJldHVybiBydW4gPyBydW4oZm4pIDogZm4oKTtcbn1cblxuLyoqXG4gKiBUaGUga2V5IHRoZSBwcm9jZXNzJ3MgdGFnIG1hbmlmZXN0IChgVHJhY2tlZFRhZ01hcmtlcnNgLCBmcm9tIHRoZSBhZGFwdGVyJ3NcbiAqIGBzaGFyZWRUYWdNYW5pZmVzdGApIGlzIGtlcHQgdW5kZXIgb24gYGdsb2JhbFRoaXNgLCBzaW5jZSB0aGUgcnVudGltZSBhbmQgdGhlXG4gKiBjYWNoZSBoYW5kbGVycyBhcmUgc2VwYXJhdGUgYnVuZGxlcy5cbiAqL1xuZXhwb3J0IGNvbnN0IFRBR19NQU5JRkVTVF9TWU1CT0wgPSBTeW1ib2wuZm9yKFxuICBcImNkay1uZXh0anMudXNlLWNhY2hlLnRhZy1tYW5pZmVzdFwiLFxuKTtcblxuLyoqXG4gKiBSZW5kZXIgYSBwYWdlLCBhZnRlciB3YWl0aW5nIGZvciB0aGUgcmV2YWxpZGF0aW9uIGxvZyBxdWVyeSBpZiB0aGUgaW5zdGFuY2VcbiAqIGhhcyBmYWxsZW4gYmVoaW5kIG9uIGl0IChzYXQgaWRsZSwgb3IgdGhhd2VkKTogaGVyZSwgYmVmb3JlIE5leHQuanMgc3RhcnRzXG4gKiByZW5kZXJpbmcsIHJhdGhlciB0aGFuIGluc2lkZSB0aGUgZmlyc3QgYCd1c2UgY2FjaGUnYCBsb29rdXAsIHdoZXJlIHRoZSB3YWl0XG4gKiBjdXRzIGEgc3RhZ2VkIHJlbmRlcidzIHN0YXRpYyBzdGFnZSBzaG9ydC4gSnVzdCBgcmVuZGVyYCB1bnRpbCBhIGNhY2hlXG4gKiBoYW5kbGVyIGZpcnN0IGNyZWF0ZXMgdGhlIG1hbmlmZXN0LCBhbmQgdGhlbiB0aGVyZSBpcyBub3RoaW5nIHRvIGNhdGNoIHVwXG4gKiBvbi4gUmVqZWN0cyBvbmx5IGFzIGByZW5kZXJgIGRvZXMuXG4gKi9cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBjYXRjaFVwVGFnczxUPihyZW5kZXI6ICgpID0+IFByb21pc2U8VD4pOiBQcm9taXNlPFQ+IHtcbiAgY29uc3QgZ2xvYmFsID0gZ2xvYmFsVGhpcyBhcyB7XG4gICAgW1RBR19NQU5JRkVTVF9TWU1CT0xdPzogUGljazxUcmFja2VkVGFnTWFya2VycywgXCJjYXRjaFVwXCI+O1xuICB9O1xuICBjb25zdCBtYW5pZmVzdCA9IGdsb2JhbFtUQUdfTUFOSUZFU1RfU1lNQk9MXTtcbiAgcmV0dXJuIG1hbmlmZXN0ID8gbWFuaWZlc3QuY2F0Y2hVcChyZW5kZXIpIDogcmVuZGVyKCk7XG59XG4iXX0=

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

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const node_async_hooks_1 = require("node:async_hooks");
 const tag_manifest_1 = require("./tag-manifest");
 const global = globalThis;
 afterEach(() => {
     delete global[tag_manifest_1.TAG_MANIFEST_SYMBOL];
+    delete global[tag_manifest_1.OUTSIDE_REQUEST_SYMBOL];
 });
 describe("catchUpTags", () => {
     it("just renders before a cache handler creates the manifest", async () => {
@@ -18,4 +20,28 @@ describe("catchUpTags", () => {
         expect(manifest.catchUp).toHaveBeenCalledTimes(1);
     });
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFnLW1hbmlmZXN0LnRlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcnVudGltZS90YWctbWFuaWZlc3QudGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLGlEQUFrRTtBQUVsRSxNQUFNLE1BQU0sR0FBRyxVQUFpRCxDQUFDO0FBRWpFLFNBQVMsQ0FBQyxHQUFHLEVBQUU7SUFDYixPQUFPLE1BQU0sQ0FBQyxrQ0FBbUIsQ0FBQyxDQUFDO0FBQ3JDLENBQUMsQ0FBQyxDQUFDO0FBRUgsUUFBUSxDQUFDLGFBQWEsRUFBRSxHQUFHLEVBQUU7SUFDM0IsRUFBRSxDQUFDLDBEQUEwRCxFQUFFLEtBQUssSUFBSSxFQUFFO1FBQ3hFLE1BQU0sTUFBTSxDQUFDLElBQUEsMEJBQVcsRUFBQyxLQUFLLElBQUksRUFBRSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUN0RSxDQUFDLENBQUMsQ0FBQztJQUVILEVBQUUsQ0FBQyx1REFBdUQsRUFBRSxLQUFLLElBQUksRUFBRTtRQUNyRSxNQUFNLFFBQVEsR0FBRztZQUNmLE9BQU8sRUFBRSxJQUFJLENBQUMsRUFBRSxDQUFDLEtBQUssRUFBRSxNQUE2QixFQUFFLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQztTQUNwRSxDQUFDO1FBQ0YsTUFBTSxDQUFDLGtDQUFtQixDQUFDLEdBQUcsUUFBUSxDQUFDO1FBQ3ZDLE1BQU0sTUFBTSxDQUFDLElBQUEsMEJBQVcsRUFBQyxLQUFLLElBQUksRUFBRSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUNwRSxNQUFNLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLHFCQUFxQixDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3BELENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBjYXRjaFVwVGFncywgVEFHX01BTklGRVNUX1NZTUJPTCB9IGZyb20gXCIuL3RhZy1tYW5pZmVzdFwiO1xuXG5jb25zdCBnbG9iYWwgPSBnbG9iYWxUaGlzIGFzIHsgW1RBR19NQU5JRkVTVF9TWU1CT0xdPzogdW5rbm93biB9O1xuXG5hZnRlckVhY2goKCkgPT4ge1xuICBkZWxldGUgZ2xvYmFsW1RBR19NQU5JRkVTVF9TWU1CT0xdO1xufSk7XG5cbmRlc2NyaWJlKFwiY2F0Y2hVcFRhZ3NcIiwgKCkgPT4ge1xuICBpdChcImp1c3QgcmVuZGVycyBiZWZvcmUgYSBjYWNoZSBoYW5kbGVyIGNyZWF0ZXMgdGhlIG1hbmlmZXN0XCIsIGFzeW5jICgpID0+IHtcbiAgICBhd2FpdCBleHBlY3QoY2F0Y2hVcFRhZ3MoYXN5bmMgKCkgPT4gXCJwYWdlXCIpKS5yZXNvbHZlcy50b0JlKFwicGFnZVwiKTtcbiAgfSk7XG5cbiAgaXQoXCJyZW5kZXJzIHRocm91Z2ggdGhlIG1hbmlmZXN0IHRoZSBjYWNoZSBoYW5kbGVycyBzaGFyZVwiLCBhc3luYyAoKSA9PiB7XG4gICAgY29uc3QgbWFuaWZlc3QgPSB7XG4gICAgICBjYXRjaFVwOiBqZXN0LmZuKGFzeW5jIChyZW5kZXI6ICgpID0+IFByb21pc2U8c3RyaW5nPikgPT4gcmVuZGVyKCkpLFxuICAgIH07XG4gICAgZ2xvYmFsW1RBR19NQU5JRkVTVF9TWU1CT0xdID0gbWFuaWZlc3Q7XG4gICAgYXdhaXQgZXhwZWN0KGNhdGNoVXBUYWdzKGFzeW5jICgpID0+IFwicGFnZVwiKSkucmVzb2x2ZXMudG9CZShcInBhZ2VcIik7XG4gICAgZXhwZWN0KG1hbmlmZXN0LmNhdGNoVXApLnRvSGF2ZUJlZW5DYWxsZWRUaW1lcygxKTtcbiAgfSk7XG59KTtcbiJdfQ==
+describe("outsideRequest", () => {
+    // Stands in for Next.js's request store.
+    const request = new node_async_hooks_1.AsyncLocalStorage();
+    it("runs in the context captured at load, where no request store is set", async () => {
+        (0, tag_manifest_1.captureOutsideRequest)();
+        await request.run("page render", async () => {
+            expect((0, tag_manifest_1.outsideRequest)(() => request.getStore())).toBeUndefined();
+            // Awaited work it starts stays outside too.
+            await expect((0, tag_manifest_1.outsideRequest)(async () => {
+                await Promise.resolve();
+                return request.getStore();
+            })).resolves.toBeUndefined();
+            expect(request.getStore()).toBe("page render");
+        });
+    });
+    it("keeps the first capture", () => {
+        (0, tag_manifest_1.captureOutsideRequest)();
+        request.run("page render", () => (0, tag_manifest_1.captureOutsideRequest)());
+        request.run("another render", () => expect((0, tag_manifest_1.outsideRequest)(() => request.getStore())).toBeUndefined());
+    });
+    it("runs in the current context when nothing was captured", () => {
+        request.run("page render", () => expect((0, tag_manifest_1.outsideRequest)(() => request.getStore())).toBe("page render"));
+    });
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFnLW1hbmlmZXN0LnRlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcnVudGltZS90YWctbWFuaWZlc3QudGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHVEQUFxRDtBQUNyRCxpREFNd0I7QUFFeEIsTUFBTSxNQUFNLEdBQUcsVUFHZCxDQUFDO0FBRUYsU0FBUyxDQUFDLEdBQUcsRUFBRTtJQUNiLE9BQU8sTUFBTSxDQUFDLGtDQUFtQixDQUFDLENBQUM7SUFDbkMsT0FBTyxNQUFNLENBQUMscUNBQXNCLENBQUMsQ0FBQztBQUN4QyxDQUFDLENBQUMsQ0FBQztBQUVILFFBQVEsQ0FBQyxhQUFhLEVBQUUsR0FBRyxFQUFFO0lBQzNCLEVBQUUsQ0FBQywwREFBMEQsRUFBRSxLQUFLLElBQUksRUFBRTtRQUN4RSxNQUFNLE1BQU0sQ0FBQyxJQUFBLDBCQUFXLEVBQUMsS0FBSyxJQUFJLEVBQUUsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDdEUsQ0FBQyxDQUFDLENBQUM7SUFFSCxFQUFFLENBQUMsdURBQXVELEVBQUUsS0FBSyxJQUFJLEVBQUU7UUFDckUsTUFBTSxRQUFRLEdBQUc7WUFDZixPQUFPLEVBQUUsSUFBSSxDQUFDLEVBQUUsQ0FBQyxLQUFLLEVBQUUsTUFBNkIsRUFBRSxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUM7U0FDcEUsQ0FBQztRQUNGLE1BQU0sQ0FBQyxrQ0FBbUIsQ0FBQyxHQUFHLFFBQVEsQ0FBQztRQUN2QyxNQUFNLE1BQU0sQ0FBQyxJQUFBLDBCQUFXLEVBQUMsS0FBSyxJQUFJLEVBQUUsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDcEUsTUFBTSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNwRCxDQUFDLENBQUMsQ0FBQztBQUNMLENBQUMsQ0FBQyxDQUFDO0FBRUgsUUFBUSxDQUFDLGdCQUFnQixFQUFFLEdBQUcsRUFBRTtJQUM5Qix5Q0FBeUM7SUFDekMsTUFBTSxPQUFPLEdBQUcsSUFBSSxvQ0FBaUIsRUFBVSxDQUFDO0lBRWhELEVBQUUsQ0FBQyxxRUFBcUUsRUFBRSxLQUFLLElBQUksRUFBRTtRQUNuRixJQUFBLG9DQUFxQixHQUFFLENBQUM7UUFDeEIsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLGFBQWEsRUFBRSxLQUFLLElBQUksRUFBRTtZQUMxQyxNQUFNLENBQUMsSUFBQSw2QkFBYyxFQUFDLEdBQUcsRUFBRSxDQUFDLE9BQU8sQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDLENBQUMsYUFBYSxFQUFFLENBQUM7WUFDakUsNENBQTRDO1lBQzVDLE1BQU0sTUFBTSxDQUNWLElBQUEsNkJBQWMsRUFBQyxLQUFLLElBQUksRUFBRTtnQkFDeEIsTUFBTSxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUM7Z0JBQ3hCLE9BQU8sT0FBTyxDQUFDLFFBQVEsRUFBRSxDQUFDO1lBQzVCLENBQUMsQ0FBQyxDQUNILENBQUMsUUFBUSxDQUFDLGFBQWEsRUFBRSxDQUFDO1lBQzNCLE1BQU0sQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDakQsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDLENBQUMsQ0FBQztJQUVILEVBQUUsQ0FBQyx5QkFBeUIsRUFBRSxHQUFHLEVBQUU7UUFDakMsSUFBQSxvQ0FBcUIsR0FBRSxDQUFDO1FBQ3hCLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxFQUFFLEdBQUcsRUFBRSxDQUFDLElBQUEsb0NBQXFCLEdBQUUsQ0FBQyxDQUFDO1FBQzFELE9BQU8sQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLEVBQUUsR0FBRyxFQUFFLENBQ2pDLE1BQU0sQ0FBQyxJQUFBLDZCQUFjLEVBQUMsR0FBRyxFQUFFLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUMsQ0FBQyxhQUFhLEVBQUUsQ0FDakUsQ0FBQztJQUNKLENBQUMsQ0FBQyxDQUFDO0lBRUgsRUFBRSxDQUFDLHVEQUF1RCxFQUFFLEdBQUcsRUFBRTtRQUMvRCxPQUFPLENBQUMsR0FBRyxDQUFDLGFBQWEsRUFBRSxHQUFHLEVBQUUsQ0FDOUIsTUFBTSxDQUFDLElBQUEsNkJBQWMsRUFBQyxHQUFHLEVBQUUsQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FDckUsQ0FBQztJQUNKLENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBc3luY0xvY2FsU3RvcmFnZSB9IGZyb20gXCJub2RlOmFzeW5jX2hvb2tzXCI7XG5pbXBvcnQge1xuICBjYXB0dXJlT3V0c2lkZVJlcXVlc3QsXG4gIGNhdGNoVXBUYWdzLFxuICBPVVRTSURFX1JFUVVFU1RfU1lNQk9MLFxuICBvdXRzaWRlUmVxdWVzdCxcbiAgVEFHX01BTklGRVNUX1NZTUJPTCxcbn0gZnJvbSBcIi4vdGFnLW1hbmlmZXN0XCI7XG5cbmNvbnN0IGdsb2JhbCA9IGdsb2JhbFRoaXMgYXMge1xuICBbVEFHX01BTklGRVNUX1NZTUJPTF0/OiB1bmtub3duO1xuICBbT1VUU0lERV9SRVFVRVNUX1NZTUJPTF0/OiB1bmtub3duO1xufTtcblxuYWZ0ZXJFYWNoKCgpID0+IHtcbiAgZGVsZXRlIGdsb2JhbFtUQUdfTUFOSUZFU1RfU1lNQk9MXTtcbiAgZGVsZXRlIGdsb2JhbFtPVVRTSURFX1JFUVVFU1RfU1lNQk9MXTtcbn0pO1xuXG5kZXNjcmliZShcImNhdGNoVXBUYWdzXCIsICgpID0+IHtcbiAgaXQoXCJqdXN0IHJlbmRlcnMgYmVmb3JlIGEgY2FjaGUgaGFuZGxlciBjcmVhdGVzIHRoZSBtYW5pZmVzdFwiLCBhc3luYyAoKSA9PiB7XG4gICAgYXdhaXQgZXhwZWN0KGNhdGNoVXBUYWdzKGFzeW5jICgpID0+IFwicGFnZVwiKSkucmVzb2x2ZXMudG9CZShcInBhZ2VcIik7XG4gIH0pO1xuXG4gIGl0KFwicmVuZGVycyB0aHJvdWdoIHRoZSBtYW5pZmVzdCB0aGUgY2FjaGUgaGFuZGxlcnMgc2hhcmVcIiwgYXN5bmMgKCkgPT4ge1xuICAgIGNvbnN0IG1hbmlmZXN0ID0ge1xuICAgICAgY2F0Y2hVcDogamVzdC5mbihhc3luYyAocmVuZGVyOiAoKSA9PiBQcm9taXNlPHN0cmluZz4pID0+IHJlbmRlcigpKSxcbiAgICB9O1xuICAgIGdsb2JhbFtUQUdfTUFOSUZFU1RfU1lNQk9MXSA9IG1hbmlmZXN0O1xuICAgIGF3YWl0IGV4cGVjdChjYXRjaFVwVGFncyhhc3luYyAoKSA9PiBcInBhZ2VcIikpLnJlc29sdmVzLnRvQmUoXCJwYWdlXCIpO1xuICAgIGV4cGVjdChtYW5pZmVzdC5jYXRjaFVwKS50b0hhdmVCZWVuQ2FsbGVkVGltZXMoMSk7XG4gIH0pO1xufSk7XG5cbmRlc2NyaWJlKFwib3V0c2lkZVJlcXVlc3RcIiwgKCkgPT4ge1xuICAvLyBTdGFuZHMgaW4gZm9yIE5leHQuanMncyByZXF1ZXN0IHN0b3JlLlxuICBjb25zdCByZXF1ZXN0ID0gbmV3IEFzeW5jTG9jYWxTdG9yYWdlPHN0cmluZz4oKTtcblxuICBpdChcInJ1bnMgaW4gdGhlIGNvbnRleHQgY2FwdHVyZWQgYXQgbG9hZCwgd2hlcmUgbm8gcmVxdWVzdCBzdG9yZSBpcyBzZXRcIiwgYXN5bmMgKCkgPT4ge1xuICAgIGNhcHR1cmVPdXRzaWRlUmVxdWVzdCgpO1xuICAgIGF3YWl0IHJlcXVlc3QucnVuKFwicGFnZSByZW5kZXJcIiwgYXN5bmMgKCkgPT4ge1xuICAgICAgZXhwZWN0KG91dHNpZGVSZXF1ZXN0KCgpID0+IHJlcXVlc3QuZ2V0U3RvcmUoKSkpLnRvQmVVbmRlZmluZWQoKTtcbiAgICAgIC8vIEF3YWl0ZWQgd29yayBpdCBzdGFydHMgc3RheXMgb3V0c2lkZSB0b28uXG4gICAgICBhd2FpdCBleHBlY3QoXG4gICAgICAgIG91dHNpZGVSZXF1ZXN0KGFzeW5jICgpID0+IHtcbiAgICAgICAgICBhd2FpdCBQcm9taXNlLnJlc29sdmUoKTtcbiAgICAgICAgICByZXR1cm4gcmVxdWVzdC5nZXRTdG9yZSgpO1xuICAgICAgICB9KSxcbiAgICAgICkucmVzb2x2ZXMudG9CZVVuZGVmaW5lZCgpO1xuICAgICAgZXhwZWN0KHJlcXVlc3QuZ2V0U3RvcmUoKSkudG9CZShcInBhZ2UgcmVuZGVyXCIpO1xuICAgIH0pO1xuICB9KTtcblxuICBpdChcImtlZXBzIHRoZSBmaXJzdCBjYXB0dXJlXCIsICgpID0+IHtcbiAgICBjYXB0dXJlT3V0c2lkZVJlcXVlc3QoKTtcbiAgICByZXF1ZXN0LnJ1bihcInBhZ2UgcmVuZGVyXCIsICgpID0+IGNhcHR1cmVPdXRzaWRlUmVxdWVzdCgpKTtcbiAgICByZXF1ZXN0LnJ1bihcImFub3RoZXIgcmVuZGVyXCIsICgpID0+XG4gICAgICBleHBlY3Qob3V0c2lkZVJlcXVlc3QoKCkgPT4gcmVxdWVzdC5nZXRTdG9yZSgpKSkudG9CZVVuZGVmaW5lZCgpLFxuICAgICk7XG4gIH0pO1xuXG4gIGl0KFwicnVucyBpbiB0aGUgY3VycmVudCBjb250ZXh0IHdoZW4gbm90aGluZyB3YXMgY2FwdHVyZWRcIiwgKCkgPT4ge1xuICAgIHJlcXVlc3QucnVuKFwicGFnZSByZW5kZXJcIiwgKCkgPT5cbiAgICAgIGV4cGVjdChvdXRzaWRlUmVxdWVzdCgoKSA9PiByZXF1ZXN0LmdldFN0b3JlKCkpKS50b0JlKFwicGFnZSByZW5kZXJcIiksXG4gICAgKTtcbiAgfSk7XG59KTtcbiJdfQ==

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.8",
+    "@next/routing": "16.4.0",
     "@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.8",
+    "next": "^16.4.0",
     "prettier": "^3.9.9",
     "projen": "^0.101.6",
     "ts-jest": "^29.4.14",
@@ -84,7 +84,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.7.7",
+  "version": "0.7.8",
   "jest": {
     "coverageProvider": "v8",
     "testPathIgnorePatterns": [

package/scripts/e2e-deploy.sh

@@ -74,8 +74,13 @@ PM="$(node -e 'const f=require("path").join(process.argv[1],"package.json");let
 case "$PM" in
   pnpm)
     if command -v corepack >/dev/null 2>&1; then PM_CMD=(corepack pnpm); else PM_CMD=(pnpm); fi
-    # Without it pnpm walks up out of /tmp looking for a workspace root.
-    INSTALL_ARGS=(--ignore-workspace --prefer-offline)
+    INSTALL_ARGS=(--prefer-offline)
+    # Without it pnpm walks up out of /tmp looking for a workspace root. But a
+    # fixture with its own pnpm-workspace.yaml is that root, and the flag would
+    # also drop the file's settings: test/e2e/app-dir/turbopack-reports approves
+    # its native addon's node-gyp build there (`allowBuilds`), and with the flag
+    # pnpm skips the build, so `next build` can't load the binary.
+    [ -f "$APP_DIR/pnpm-workspace.yaml" ] || INSTALL_ARGS+=(--ignore-workspace)
     ;;
   *)
     PM_CMD=("$PM")