@uniformdev/next-app-router 20.81.1-alpha.12.sha-5d72d595dc → 20.81.1-alpha.15.sha-2b5fd446ca

package/dist/{createCachedManifestProvider-DUuhXeA4.d.ts → createCachedManifestProvider-DrlaCKdm.d.ts}

@@ -1,7 +1,7 @@
 import { ManifestV2 } from '@uniformdev/context';
 import { TransformEdgeStreamOptions } from '@uniformdev/context-edge';
 import { NextRequest, NextFetchEvent } from 'next/server';
-import { f as ManifestProvider, E as EdgeRouteFilter, d as EdgeRouteStore, g as ManifestProviderOptions, e as EdgeRouteStoreCache, M as ManifestCache } from './models-D8YUMc4L.js';
+import { f as ManifestProvider, E as EdgeRouteFilter, d as EdgeRouteStore, g as ManifestProviderOptions, e as EdgeRouteStoreCache, M as ManifestCache } from './models-DKZtopoy.js';
 import { HandleOptions } from './middleware.js';
 
 /**
@@ -42,11 +42,19 @@ type UniformEdgeMiddlewareOptions = HandleOptions & {
     /**
      * Records what the transform learns about each processed page, such as `vercelEdgeRouteStore`
      * from `@uniformdev/next-app-router/vercel` or one made with `createEdgeRouteStore`. Filters
-     * read the record, and processed pages get per-visitor ETags when the origin sends an ETag.
+     * read the record, and processed pages get per-visitor ETags unless `etags` is `false`.
      *
      * @defaultValue nothing is recorded, and responses get no ETag
      */
     store?: EdgeRouteStore;
+    /**
+     * Gives processed pages per-visitor ETags, from the page placements the `store` records. `false`
+     * sends every processed page in full with `private, no-store`, never hashes the page, and records
+     * only whether each page has placements.
+     *
+     * @defaultValue `true`
+     */
+    etags?: boolean;
 };
 /**
  * Returns middleware that rewrites each request to its Uniform code like `uniformMiddleware`, and
@@ -63,17 +71,20 @@ declare const uniformEdgeMiddleware: (options: UniformEdgeMiddlewareOptions) =>
  * Handles one request the way {@link uniformEdgeMiddleware} does. The transformed response is
  * personalized, so it is marked `private, no-store`.
  *
- * When the origin answers 200 with an ETag and the `store` recorded the page's placements for that
- * ETag, the variants are chosen before the headers are sent. The response then
- * gets an ETag built from the origin's ETag and those choices, and `private, no-cache`. A request
- * whose `If-None-Match` matches it gets a `304`. A response that assigns a test or rolls a
- * personalization control group carries the visitor state and an ETag that never matches, so the
- * visitor's next request is answered in full.
+ * When `etags` is on, the origin answers 200 and the `store` recorded the page's placements for
+ * its current version, the variants are chosen before the headers are sent. The version is the
+ * origin's ETag or, without one, a hash of the untransformed page that the last full response
+ * recorded. A page that changed without a new origin ETag is detected when a full response hashes
+ * differently, and until then a matching request is answered `304`. The response gets an ETag
+ * built from the version and the choices, and `private, no-cache`. A request whose
+ * `If-None-Match` matches it gets a `304`. A response that changes the visitor's stored data, such
+ * as a score from a signal or a test assignment, carries the visitor state and an ETag that never
+ * matches, so the visitor's next request is answered in full.
  *
  * `waitUntil` is handed to the manifest provider, the filter and the store for background work, and
  * defaults to letting the promise run unobserved.
  */
-declare const handleUniformEdgeRoute: ({ request, manifest, onError, filter, store, waitUntil, ...options }: UniformEdgeMiddlewareOptions & {
+declare const handleUniformEdgeRoute: ({ request, manifest, onError, filter, store, etags, waitUntil, ...options }: UniformEdgeMiddlewareOptions & {
     request: NextRequest;
     waitUntil?: ManifestProviderOptions["waitUntil"];
 }) => Promise<Response>;
@@ -110,9 +121,10 @@ type CreateEdgeRouteStoreOptions = {
  * Creates an edge route store for `uniformEdgeMiddleware`. Records live in memory for `maxAge`,
  * then in the platform's shared `cache`, tagged with the page's `path:` tag.
  *
- * A page's record keeps whether it has placements and, when the origin sends an ETag, the
- * placements visitors reached on that page version. Placements in variants no visitor was shown
- * yet are added as visitors reach them, and a new origin ETag replaces them.
+ * A page's record keeps whether it has placements and, when the middleware sends ETags, the
+ * placements visitors reached on the page's version: its origin ETag or a hash of its content.
+ * Placements in variants no visitor was shown yet are added as visitors reach them, and a new
+ * version replaces them.
  *
  * Publishing a pattern or entry does not expire the pages that use it. Until the record expires,
  * a page that gained a placement that way is skipped by `learnedEdgeRouteFilter`.

package/dist/{createCachedManifestProvider-Bpv56Ou-.d.mts → createCachedManifestProvider-VL1HGJ-J.d.mts}

@@ -1,7 +1,7 @@
 import { ManifestV2 } from '@uniformdev/context';
 import { TransformEdgeStreamOptions } from '@uniformdev/context-edge';
 import { NextRequest, NextFetchEvent } from 'next/server';
-import { f as ManifestProvider, E as EdgeRouteFilter, d as EdgeRouteStore, g as ManifestProviderOptions, e as EdgeRouteStoreCache, M as ManifestCache } from './models-D8YUMc4L.mjs';
+import { f as ManifestProvider, E as EdgeRouteFilter, d as EdgeRouteStore, g as ManifestProviderOptions, e as EdgeRouteStoreCache, M as ManifestCache } from './models-DKZtopoy.mjs';
 import { HandleOptions } from './middleware.mjs';
 
 /**
@@ -42,11 +42,19 @@ type UniformEdgeMiddlewareOptions = HandleOptions & {
     /**
      * Records what the transform learns about each processed page, such as `vercelEdgeRouteStore`
      * from `@uniformdev/next-app-router/vercel` or one made with `createEdgeRouteStore`. Filters
-     * read the record, and processed pages get per-visitor ETags when the origin sends an ETag.
+     * read the record, and processed pages get per-visitor ETags unless `etags` is `false`.
      *
      * @defaultValue nothing is recorded, and responses get no ETag
      */
     store?: EdgeRouteStore;
+    /**
+     * Gives processed pages per-visitor ETags, from the page placements the `store` records. `false`
+     * sends every processed page in full with `private, no-store`, never hashes the page, and records
+     * only whether each page has placements.
+     *
+     * @defaultValue `true`
+     */
+    etags?: boolean;
 };
 /**
  * Returns middleware that rewrites each request to its Uniform code like `uniformMiddleware`, and
@@ -63,17 +71,20 @@ declare const uniformEdgeMiddleware: (options: UniformEdgeMiddlewareOptions) =>
  * Handles one request the way {@link uniformEdgeMiddleware} does. The transformed response is
  * personalized, so it is marked `private, no-store`.
  *
- * When the origin answers 200 with an ETag and the `store` recorded the page's placements for that
- * ETag, the variants are chosen before the headers are sent. The response then
- * gets an ETag built from the origin's ETag and those choices, and `private, no-cache`. A request
- * whose `If-None-Match` matches it gets a `304`. A response that assigns a test or rolls a
- * personalization control group carries the visitor state and an ETag that never matches, so the
- * visitor's next request is answered in full.
+ * When `etags` is on, the origin answers 200 and the `store` recorded the page's placements for
+ * its current version, the variants are chosen before the headers are sent. The version is the
+ * origin's ETag or, without one, a hash of the untransformed page that the last full response
+ * recorded. A page that changed without a new origin ETag is detected when a full response hashes
+ * differently, and until then a matching request is answered `304`. The response gets an ETag
+ * built from the version and the choices, and `private, no-cache`. A request whose
+ * `If-None-Match` matches it gets a `304`. A response that changes the visitor's stored data, such
+ * as a score from a signal or a test assignment, carries the visitor state and an ETag that never
+ * matches, so the visitor's next request is answered in full.
  *
  * `waitUntil` is handed to the manifest provider, the filter and the store for background work, and
  * defaults to letting the promise run unobserved.
  */
-declare const handleUniformEdgeRoute: ({ request, manifest, onError, filter, store, waitUntil, ...options }: UniformEdgeMiddlewareOptions & {
+declare const handleUniformEdgeRoute: ({ request, manifest, onError, filter, store, etags, waitUntil, ...options }: UniformEdgeMiddlewareOptions & {
     request: NextRequest;
     waitUntil?: ManifestProviderOptions["waitUntil"];
 }) => Promise<Response>;
@@ -110,9 +121,10 @@ type CreateEdgeRouteStoreOptions = {
  * Creates an edge route store for `uniformEdgeMiddleware`. Records live in memory for `maxAge`,
  * then in the platform's shared `cache`, tagged with the page's `path:` tag.
  *
- * A page's record keeps whether it has placements and, when the origin sends an ETag, the
- * placements visitors reached on that page version. Placements in variants no visitor was shown
- * yet are added as visitors reach them, and a new origin ETag replaces them.
+ * A page's record keeps whether it has placements and, when the middleware sends ETags, the
+ * placements visitors reached on the page's version: its origin ETag or a hash of its content.
+ * Placements in variants no visitor was shown yet are added as visitors reach them, and a new
+ * version replaces them.
  *
  * Publishing a pattern or entry does not expire the pages that use it. Until the record expires,
  * a page that gained a placement that way is skipped by `learnedEdgeRouteFilter`.

package/dist/edge.d.mts

@@ -1,6 +1,6 @@
-export { C as CreateCachedManifestProviderOptions, a as CreateEdgeRouteStoreOptions, U as UNIFORM_EDGE_ORIGIN_HEADER, b as UniformEdgeMiddlewareOptions, c as createCachedManifestProvider, d as createEdgeRouteStore, h as handleUniformEdgeRoute, u as uniformEdgeMiddleware } from './createCachedManifestProvider-Bpv56Ou-.mjs';
-import { E as EdgeRouteFilter } from './models-D8YUMc4L.mjs';
-export { a as EdgeRouteFilterOptions, b as EdgeRoutePage, c as EdgeRouteRecord, d as EdgeRouteStore, e as EdgeRouteStoreCache, M as ManifestCache, f as ManifestProvider, g as ManifestProviderOptions, R as RecordedPersonalizationOptions, h as RecordedPlacement, i as RecordedTestOptions } from './models-D8YUMc4L.mjs';
+export { C as CreateCachedManifestProviderOptions, a as CreateEdgeRouteStoreOptions, U as UNIFORM_EDGE_ORIGIN_HEADER, b as UniformEdgeMiddlewareOptions, c as createCachedManifestProvider, d as createEdgeRouteStore, h as handleUniformEdgeRoute, u as uniformEdgeMiddleware } from './createCachedManifestProvider-VL1HGJ-J.mjs';
+import { E as EdgeRouteFilter } from './models-DKZtopoy.mjs';
+export { a as EdgeRouteFilterOptions, b as EdgeRoutePage, c as EdgeRouteRecord, d as EdgeRouteStore, e as EdgeRouteStoreCache, M as ManifestCache, f as ManifestProvider, g as ManifestProviderOptions, R as RecordedPersonalizationOptions, h as RecordedPlacement, i as RecordedTestOptions } from './models-DKZtopoy.mjs';
 import '@uniformdev/context';
 import '@uniformdev/context-edge';
 import 'next/server';

package/dist/edge.d.ts

@@ -1,6 +1,6 @@
-export { C as CreateCachedManifestProviderOptions, a as CreateEdgeRouteStoreOptions, U as UNIFORM_EDGE_ORIGIN_HEADER, b as UniformEdgeMiddlewareOptions, c as createCachedManifestProvider, d as createEdgeRouteStore, h as handleUniformEdgeRoute, u as uniformEdgeMiddleware } from './createCachedManifestProvider-DUuhXeA4.js';
-import { E as EdgeRouteFilter } from './models-D8YUMc4L.js';
-export { a as EdgeRouteFilterOptions, b as EdgeRoutePage, c as EdgeRouteRecord, d as EdgeRouteStore, e as EdgeRouteStoreCache, M as ManifestCache, f as ManifestProvider, g as ManifestProviderOptions, R as RecordedPersonalizationOptions, h as RecordedPlacement, i as RecordedTestOptions } from './models-D8YUMc4L.js';
+export { C as CreateCachedManifestProviderOptions, a as CreateEdgeRouteStoreOptions, U as UNIFORM_EDGE_ORIGIN_HEADER, b as UniformEdgeMiddlewareOptions, c as createCachedManifestProvider, d as createEdgeRouteStore, h as handleUniformEdgeRoute, u as uniformEdgeMiddleware } from './createCachedManifestProvider-DrlaCKdm.js';
+import { E as EdgeRouteFilter } from './models-DKZtopoy.js';
+export { a as EdgeRouteFilterOptions, b as EdgeRoutePage, c as EdgeRouteRecord, d as EdgeRouteStore, e as EdgeRouteStoreCache, M as ManifestCache, f as ManifestProvider, g as ManifestProviderOptions, R as RecordedPersonalizationOptions, h as RecordedPlacement, i as RecordedTestOptions } from './models-DKZtopoy.js';
 import '@uniformdev/context';
 import '@uniformdev/context-edge';
 import 'next/server';

package/dist/edge.js

@@ -700,15 +700,37 @@ var buildPlacementTree = (events) => {
   return roots;
 };
 
+// src/edge/createContentHasher.ts
+var createContentHasher = () => {
+  let h1 = 3735928559;
+  let h2 = 1103547991;
+  return {
+    update: (chunk) => {
+      for (let index = 0; index < chunk.length; index++) {
+        const byte = chunk[index];
+        h1 = Math.imul(h1 ^ byte, 2654435761);
+        h2 = Math.imul(h2 ^ byte, 1597334677);
+      }
+    },
+    digest: () => {
+      let a = Math.imul(h1 ^ h1 >>> 16, 2246822507);
+      a ^= Math.imul(h2 ^ h2 >>> 13, 3266489909);
+      let b = Math.imul(h2 ^ h2 >>> 16, 2246822507);
+      b ^= Math.imul(a ^ a >>> 13, 3266489909);
+      return `${(b >>> 0).toString(16).padStart(8, "0")}${(a >>> 0).toString(16).padStart(8, "0")}`;
+    }
+  };
+};
+
 // src/edge/createEdgeEtag.ts
 var createEdgeEtag = async ({
-  originEtag,
+  version,
   chosen,
   oneShot
 }) => {
   const digest = await crypto.subtle.digest(
     "SHA-1",
-    new TextEncoder().encode(`${originEtag}
+    new TextEncoder().encode(`${version}
 ${JSON.stringify(chosen)}`)
   );
   const hash = btoa(String.fromCharCode(...new Uint8Array(digest))).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
@@ -716,19 +738,23 @@ ${JSON.stringify(chosen)}`)
 };
 
 // src/edge/hasNewVisitorState.ts
+var import_dequal = require("dequal");
 var hasNewVisitorState = (context) => {
-  var _a, _b;
-  const { tests, personalizeVariants } = context.getServerToClientTransitionState();
-  if (tests && Object.keys(tests).length > 0) {
-    return true;
-  }
-  const initial = (_b = (_a = context.storage.options.transitionStore) == null ? void 0 : _a.initialData) == null ? void 0 : _b.personalizeVariants;
-  return Object.entries(personalizeVariants != null ? personalizeVariants : {}).some(
-    ([name, variants]) => variants.some((variant) => {
-      var _a2;
-      return !((_a2 = initial == null ? void 0 : initial[name]) == null ? void 0 : _a2.some((known) => known.index === variant.index));
-    })
-  );
+  var _a;
+  const before = normalize((_a = context.storage.options.transitionStore) == null ? void 0 : _a.initialData);
+  const after = normalize(context.storage.data);
+  return !(0, import_dequal.dequal)(before, after);
+};
+var normalize = (data) => {
+  var _a, _b, _c, _d, _e, _f;
+  return {
+    tests: (_a = data == null ? void 0 : data.tests) != null ? _a : {},
+    scores: (_b = data == null ? void 0 : data.scores) != null ? _b : {},
+    sessionScores: (_c = data == null ? void 0 : data.sessionScores) != null ? _c : {},
+    goals: (_d = data == null ? void 0 : data.goals) != null ? _d : {},
+    controlGroup: (_e = data == null ? void 0 : data.controlGroup) != null ? _e : false,
+    personalizeVariants: (_f = data == null ? void 0 : data.personalizeVariants) != null ? _f : {}
+  };
 };
 
 // src/edge/matchesIfNoneMatch.ts
@@ -785,6 +811,7 @@ var choose = (context, placement) => {
 
 // src/edge/uniformEdgeMiddleware.ts
 var UNIFORM_EDGE_ORIGIN_HEADER = "x-uniform-edge-origin";
+var CONTENT_VERSION_PREFIX = "content:";
 var uniformEdgeMiddleware = (options) => {
   return async (request, event) => {
     return handleUniformEdgeRoute({
@@ -800,10 +827,11 @@ var handleUniformEdgeRoute = async ({
   onError,
   filter,
   store,
+  etags = true,
   waitUntil = ignorePromise,
   ...options
 }) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   if (request.headers.has(UNIFORM_EDGE_ORIGIN_HEADER)) {
     return import_server2.NextResponse.next();
   }
@@ -853,18 +881,20 @@ var handleUniformEdgeRoute = async ({
   headers.delete("content-encoding");
   headers.delete("etag");
   headers.delete("last-modified");
-  const originEtag = originResponse.status === 200 ? originResponse.headers.get("etag") : null;
-  const chosen = originEtag && ((_b = record == null ? void 0 : record.page) == null ? void 0 : _b.etag) === originEtag ? replayRecordedPage(context, record.page) : void 0;
+  const isOk = originResponse.status === 200;
+  const originEtag = etags && isOk ? originResponse.headers.get("etag") : null;
+  const version = originEtag != null ? originEtag : etags && isOk ? (_b = record == null ? void 0 : record.page) == null ? void 0 : _b.etag : void 0;
+  const chosen = version && ((_c = record == null ? void 0 : record.page) == null ? void 0 : _c.etag) === version ? replayRecordedPage(context, record.page) : void 0;
   let includeTransitionState = true;
-  if (originEtag && chosen) {
+  if (version && chosen) {
     const newState = hasNewVisitorState(context);
-    const etag = await createEdgeEtag({ originEtag, chosen, oneShot: newState });
+    const etag = await createEdgeEtag({ version, chosen, oneShot: newState });
     headers.set("etag", etag);
     headers.set("cache-control", "private, no-cache");
     if (!newState) {
       includeTransitionState = false;
       if (matchesIfNoneMatch(request.headers.get("if-none-match"), etag)) {
-        (_c = originResponse.body) == null ? void 0 : _c.cancel().catch(() => {
+        (_d = originResponse.body) == null ? void 0 : _d.cancel().catch(() => {
         });
         const notModifiedHeaders = new Headers(result.headers);
         notModifiedHeaders.set("etag", etag);
@@ -875,14 +905,25 @@ var handleUniformEdgeRoute = async ({
   } else {
     headers.set("cache-control", "private, no-store");
   }
-  const onComplete = store && originResponse.status === 200 ? (placements) => store.observe({
-    pageState: result.pageState,
-    hasPlacements: placements.some((placement) => !placement.parent),
-    ...originEtag ? { page: { etag: originEtag, placements: buildPlacementTree(placements) } } : {},
-    waitUntil
-  }) : void 0;
+  const hasher = etags && store && isOk && !originEtag ? createContentHasher() : void 0;
+  const onComplete = store && isOk ? (placements) => {
+    const pageVersion = originEtag != null ? originEtag : hasher ? `${CONTENT_VERSION_PREFIX}${hasher.digest()}` : void 0;
+    store.observe({
+      pageState: result.pageState,
+      hasPlacements: placements.some((placement) => !placement.parent),
+      ...pageVersion ? { page: { etag: pageVersion, placements: buildPlacementTree(placements) } } : {},
+      waitUntil
+    });
+  } : void 0;
   return new Response(
-    transformBody({ body: originResponse.body, context, onError, onComplete, includeTransitionState }),
+    transformBody({
+      body: originResponse.body,
+      context,
+      onError,
+      onComplete,
+      onChunk: hasher == null ? void 0 : hasher.update,
+      includeTransitionState
+    }),
     {
       status: originResponse.status,
       statusText: originResponse.statusText,
@@ -926,6 +967,7 @@ var transformBody = ({
   context,
   onError,
   onComplete,
+  onChunk,
   includeTransitionState
 }) => {
   if (!body) {
@@ -950,6 +992,9 @@ var transformBody = ({
         await writer.ready.catch(() => {
         });
         const { done, value } = await reader.read();
+        if (value) {
+          onChunk == null ? void 0 : onChunk(value);
+        }
         return { done, value };
       }
     },

package/dist/edge.mjs

@@ -668,15 +668,37 @@ var buildPlacementTree = (events) => {
   return roots;
 };
 
+// src/edge/createContentHasher.ts
+var createContentHasher = () => {
+  let h1 = 3735928559;
+  let h2 = 1103547991;
+  return {
+    update: (chunk) => {
+      for (let index = 0; index < chunk.length; index++) {
+        const byte = chunk[index];
+        h1 = Math.imul(h1 ^ byte, 2654435761);
+        h2 = Math.imul(h2 ^ byte, 1597334677);
+      }
+    },
+    digest: () => {
+      let a = Math.imul(h1 ^ h1 >>> 16, 2246822507);
+      a ^= Math.imul(h2 ^ h2 >>> 13, 3266489909);
+      let b = Math.imul(h2 ^ h2 >>> 16, 2246822507);
+      b ^= Math.imul(a ^ a >>> 13, 3266489909);
+      return `${(b >>> 0).toString(16).padStart(8, "0")}${(a >>> 0).toString(16).padStart(8, "0")}`;
+    }
+  };
+};
+
 // src/edge/createEdgeEtag.ts
 var createEdgeEtag = async ({
-  originEtag,
+  version,
   chosen,
   oneShot
 }) => {
   const digest = await crypto.subtle.digest(
     "SHA-1",
-    new TextEncoder().encode(`${originEtag}
+    new TextEncoder().encode(`${version}
 ${JSON.stringify(chosen)}`)
   );
   const hash = btoa(String.fromCharCode(...new Uint8Array(digest))).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
@@ -684,19 +706,23 @@ ${JSON.stringify(chosen)}`)
 };
 
 // src/edge/hasNewVisitorState.ts
+import { dequal } from "dequal";
 var hasNewVisitorState = (context) => {
-  var _a, _b;
-  const { tests, personalizeVariants } = context.getServerToClientTransitionState();
-  if (tests && Object.keys(tests).length > 0) {
-    return true;
-  }
-  const initial = (_b = (_a = context.storage.options.transitionStore) == null ? void 0 : _a.initialData) == null ? void 0 : _b.personalizeVariants;
-  return Object.entries(personalizeVariants != null ? personalizeVariants : {}).some(
-    ([name, variants]) => variants.some((variant) => {
-      var _a2;
-      return !((_a2 = initial == null ? void 0 : initial[name]) == null ? void 0 : _a2.some((known) => known.index === variant.index));
-    })
-  );
+  var _a;
+  const before = normalize((_a = context.storage.options.transitionStore) == null ? void 0 : _a.initialData);
+  const after = normalize(context.storage.data);
+  return !dequal(before, after);
+};
+var normalize = (data) => {
+  var _a, _b, _c, _d, _e, _f;
+  return {
+    tests: (_a = data == null ? void 0 : data.tests) != null ? _a : {},
+    scores: (_b = data == null ? void 0 : data.scores) != null ? _b : {},
+    sessionScores: (_c = data == null ? void 0 : data.sessionScores) != null ? _c : {},
+    goals: (_d = data == null ? void 0 : data.goals) != null ? _d : {},
+    controlGroup: (_e = data == null ? void 0 : data.controlGroup) != null ? _e : false,
+    personalizeVariants: (_f = data == null ? void 0 : data.personalizeVariants) != null ? _f : {}
+  };
 };
 
 // src/edge/matchesIfNoneMatch.ts
@@ -753,6 +779,7 @@ var choose = (context, placement) => {
 
 // src/edge/uniformEdgeMiddleware.ts
 var UNIFORM_EDGE_ORIGIN_HEADER = "x-uniform-edge-origin";
+var CONTENT_VERSION_PREFIX = "content:";
 var uniformEdgeMiddleware = (options) => {
   return async (request, event) => {
     return handleUniformEdgeRoute({
@@ -768,10 +795,11 @@ var handleUniformEdgeRoute = async ({
   onError,
   filter,
   store,
+  etags = true,
   waitUntil = ignorePromise,
   ...options
 }) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   if (request.headers.has(UNIFORM_EDGE_ORIGIN_HEADER)) {
     return NextResponse2.next();
   }
@@ -821,18 +849,20 @@ var handleUniformEdgeRoute = async ({
   headers.delete("content-encoding");
   headers.delete("etag");
   headers.delete("last-modified");
-  const originEtag = originResponse.status === 200 ? originResponse.headers.get("etag") : null;
-  const chosen = originEtag && ((_b = record == null ? void 0 : record.page) == null ? void 0 : _b.etag) === originEtag ? replayRecordedPage(context, record.page) : void 0;
+  const isOk = originResponse.status === 200;
+  const originEtag = etags && isOk ? originResponse.headers.get("etag") : null;
+  const version = originEtag != null ? originEtag : etags && isOk ? (_b = record == null ? void 0 : record.page) == null ? void 0 : _b.etag : void 0;
+  const chosen = version && ((_c = record == null ? void 0 : record.page) == null ? void 0 : _c.etag) === version ? replayRecordedPage(context, record.page) : void 0;
   let includeTransitionState = true;
-  if (originEtag && chosen) {
+  if (version && chosen) {
     const newState = hasNewVisitorState(context);
-    const etag = await createEdgeEtag({ originEtag, chosen, oneShot: newState });
+    const etag = await createEdgeEtag({ version, chosen, oneShot: newState });
     headers.set("etag", etag);
     headers.set("cache-control", "private, no-cache");
     if (!newState) {
       includeTransitionState = false;
       if (matchesIfNoneMatch(request.headers.get("if-none-match"), etag)) {
-        (_c = originResponse.body) == null ? void 0 : _c.cancel().catch(() => {
+        (_d = originResponse.body) == null ? void 0 : _d.cancel().catch(() => {
         });
         const notModifiedHeaders = new Headers(result.headers);
         notModifiedHeaders.set("etag", etag);
@@ -843,14 +873,25 @@ var handleUniformEdgeRoute = async ({
   } else {
     headers.set("cache-control", "private, no-store");
   }
-  const onComplete = store && originResponse.status === 200 ? (placements) => store.observe({
-    pageState: result.pageState,
-    hasPlacements: placements.some((placement) => !placement.parent),
-    ...originEtag ? { page: { etag: originEtag, placements: buildPlacementTree(placements) } } : {},
-    waitUntil
-  }) : void 0;
+  const hasher = etags && store && isOk && !originEtag ? createContentHasher() : void 0;
+  const onComplete = store && isOk ? (placements) => {
+    const pageVersion = originEtag != null ? originEtag : hasher ? `${CONTENT_VERSION_PREFIX}${hasher.digest()}` : void 0;
+    store.observe({
+      pageState: result.pageState,
+      hasPlacements: placements.some((placement) => !placement.parent),
+      ...pageVersion ? { page: { etag: pageVersion, placements: buildPlacementTree(placements) } } : {},
+      waitUntil
+    });
+  } : void 0;
   return new Response(
-    transformBody({ body: originResponse.body, context, onError, onComplete, includeTransitionState }),
+    transformBody({
+      body: originResponse.body,
+      context,
+      onError,
+      onComplete,
+      onChunk: hasher == null ? void 0 : hasher.update,
+      includeTransitionState
+    }),
     {
       status: originResponse.status,
       statusText: originResponse.statusText,
@@ -894,6 +935,7 @@ var transformBody = ({
   context,
   onError,
   onComplete,
+  onChunk,
   includeTransitionState
 }) => {
   if (!body) {
@@ -918,6 +960,9 @@ var transformBody = ({
         await writer.ready.catch(() => {
         });
         const { done, value } = await reader.read();
+        if (value) {
+          onChunk == null ? void 0 : onChunk(value);
+        }
         return { done, value };
       }
     },

package/dist/index.d.mts

@@ -8,7 +8,7 @@ import { ClientContextComponent } from '@uniformdev/next-app-router-client';
 import React from 'react';
 import { a as ResolvedRouteResult, b as ResolvedComposition, R as ResolvedCompositionResult } from './composition-CGU7iH-k.mjs';
 export { c as ResolvedNotFound, d as ResolvedRedirect } from './composition-CGU7iH-k.mjs';
-import { E as EdgeRouteFilter } from './models-D8YUMc4L.mjs';
+import { E as EdgeRouteFilter } from './models-DKZtopoy.mjs';
 import { b as ResolveRouteFromCodeOptions } from './resolveRouteFromPath-_rauUskz.mjs';
 export { P as PageStateSource, R as ResolveCompositionByIdOptions, a as ResolveCompositionBySlugOptions, c as ResolveRouteFromPathOptions, d as ResolveRouteFunction, r as resolveCompositionById, e as resolveCompositionBySlug, f as resolveRouteFromCode, g as resolveRouteFromPath } from './resolveRouteFromPath-_rauUskz.mjs';
 import '@uniformdev/context';
@@ -300,8 +300,9 @@ type ResolveRedirectHrefOptions = {
 };
 /**
  * Builds the URL a redirect route sends the visitor to. Path variables in the target, such as
- * `/new/:id`, are filled from `routePath`. Targets on the same domain come back as relative paths;
- * absolute targets on another domain come back unchanged.
+ * `/new/:id`, and a trailing splat, written `*` or `:splat`, are filled from `routePath`. Targets
+ * on the same domain come back as relative paths; absolute targets on another domain come back
+ * unchanged.
  */
 declare const resolveRedirectHref: ({ route, routePath }: ResolveRedirectHrefOptions) => string;
 

package/dist/index.d.ts

@@ -8,7 +8,7 @@ import { ClientContextComponent } from '@uniformdev/next-app-router-client';
 import React from 'react';
 import { a as ResolvedRouteResult, b as ResolvedComposition, R as ResolvedCompositionResult } from './composition-CGU7iH-k.js';
 export { c as ResolvedNotFound, d as ResolvedRedirect } from './composition-CGU7iH-k.js';
-import { E as EdgeRouteFilter } from './models-D8YUMc4L.js';
+import { E as EdgeRouteFilter } from './models-DKZtopoy.js';
 import { b as ResolveRouteFromCodeOptions } from './resolveRouteFromPath-CnfnaxY2.js';
 export { P as PageStateSource, R as ResolveCompositionByIdOptions, a as ResolveCompositionBySlugOptions, c as ResolveRouteFromPathOptions, d as ResolveRouteFunction, r as resolveCompositionById, e as resolveCompositionBySlug, f as resolveRouteFromCode, g as resolveRouteFromPath } from './resolveRouteFromPath-CnfnaxY2.js';
 import '@uniformdev/context';
@@ -300,8 +300,9 @@ type ResolveRedirectHrefOptions = {
 };
 /**
  * Builds the URL a redirect route sends the visitor to. Path variables in the target, such as
- * `/new/:id`, are filled from `routePath`. Targets on the same domain come back as relative paths;
- * absolute targets on another domain come back unchanged.
+ * `/new/:id`, and a trailing splat, written `*` or `:splat`, are filled from `routePath`. Targets
+ * on the same domain come back as relative paths; absolute targets on another domain come back
+ * unchanged.
  */
 declare const resolveRedirectHref: ({ route, routePath }: ResolveRedirectHrefOptions) => string;
 

package/dist/index.esm.js

@@ -3289,8 +3289,7 @@ var REDIRECT_ORIGIN_PLACEHOLDER = "http://uniform.local";
 var resolveRedirectHref = ({ route, routePath }) => {
   const expanded = getTargetVariableExpandedUrl(
     new URL(routePath, REDIRECT_ORIGIN_PLACEHOLDER).toString(),
-    route.redirect,
-    (pathSegment) => pathSegment.startsWith(":")
+    route.redirect
   );
   return expanded.startsWith(REDIRECT_ORIGIN_PLACEHOLDER) ? expanded.slice(REDIRECT_ORIGIN_PLACEHOLDER.length) || "/" : expanded;
 };

package/dist/index.js

@@ -3303,8 +3303,7 @@ var REDIRECT_ORIGIN_PLACEHOLDER = "http://uniform.local";
 var resolveRedirectHref = ({ route, routePath }) => {
   const expanded = (0, import_redirect.getTargetVariableExpandedUrl)(
     new URL(routePath, REDIRECT_ORIGIN_PLACEHOLDER).toString(),
-    route.redirect,
-    (pathSegment) => pathSegment.startsWith(":")
+    route.redirect
   );
   return expanded.startsWith(REDIRECT_ORIGIN_PLACEHOLDER) ? expanded.slice(REDIRECT_ORIGIN_PLACEHOLDER.length) || "/" : expanded;
 };

package/dist/index.mjs

@@ -3289,8 +3289,7 @@ var REDIRECT_ORIGIN_PLACEHOLDER = "http://uniform.local";
 var resolveRedirectHref = ({ route, routePath }) => {
   const expanded = getTargetVariableExpandedUrl(
     new URL(routePath, REDIRECT_ORIGIN_PLACEHOLDER).toString(),
-    route.redirect,
-    (pathSegment) => pathSegment.startsWith(":")
+    route.redirect
   );
   return expanded.startsWith(REDIRECT_ORIGIN_PLACEHOLDER) ? expanded.slice(REDIRECT_ORIGIN_PLACEHOLDER.length) || "/" : expanded;
 };

package/dist/{models-D8YUMc4L.d.mts → models-DKZtopoy.d.mts}

@@ -58,8 +58,9 @@ type EdgeRouteRecord = {
     hasPlacements: boolean;
     page?: EdgeRoutePage;
 };
-/** The placements recorded for one version of a page, identified by the origin's ETag. */
+/** The placements recorded for one version of a page. */
 type EdgeRoutePage = {
+    /** The page version: the origin's ETag, or a hash of the page when the origin sends none. */
     etag: string;
     placements: RecordedPlacement[];
 };

package/dist/{models-D8YUMc4L.d.ts → models-DKZtopoy.d.ts}

@@ -58,8 +58,9 @@ type EdgeRouteRecord = {
     hasPlacements: boolean;
     page?: EdgeRoutePage;
 };
-/** The placements recorded for one version of a page, identified by the origin's ETag. */
+/** The placements recorded for one version of a page. */
 type EdgeRoutePage = {
+    /** The page version: the origin's ETag, or a hash of the page when the origin sends none. */
     etag: string;
     placements: RecordedPlacement[];
 };

package/dist/vercel.d.mts

@@ -1,5 +1,5 @@
-import { a as CreateEdgeRouteStoreOptions, C as CreateCachedManifestProviderOptions, b as UniformEdgeMiddlewareOptions } from './createCachedManifestProvider-Bpv56Ou-.mjs';
-import { d as EdgeRouteStore, f as ManifestProvider, E as EdgeRouteFilter } from './models-D8YUMc4L.mjs';
+import { a as CreateEdgeRouteStoreOptions, C as CreateCachedManifestProviderOptions, b as UniformEdgeMiddlewareOptions } from './createCachedManifestProvider-VL1HGJ-J.mjs';
+import { d as EdgeRouteStore, f as ManifestProvider, E as EdgeRouteFilter } from './models-DKZtopoy.mjs';
 import * as next_server from 'next/server';
 import '@uniformdev/context';
 import '@uniformdev/context-edge';
@@ -53,7 +53,8 @@ type VercelUniformEdgeMiddlewareOptions = Omit<UniformEdgeMiddlewareOptions, 'ma
     filter?: EdgeRouteFilter | false;
     /**
      * Records what the transform learns about each page. `false` records nothing, so the default
-     * filter processes every published page and responses get no ETag.
+     * filter processes every published page and responses get no ETag. To keep the filter and drop
+     * only the ETags, set `etags: false`.
      *
      * @defaultValue `vercelEdgeRouteStore()`
      */

package/dist/vercel.d.ts

@@ -1,5 +1,5 @@
-import { a as CreateEdgeRouteStoreOptions, C as CreateCachedManifestProviderOptions, b as UniformEdgeMiddlewareOptions } from './createCachedManifestProvider-DUuhXeA4.js';
-import { d as EdgeRouteStore, f as ManifestProvider, E as EdgeRouteFilter } from './models-D8YUMc4L.js';
+import { a as CreateEdgeRouteStoreOptions, C as CreateCachedManifestProviderOptions, b as UniformEdgeMiddlewareOptions } from './createCachedManifestProvider-DrlaCKdm.js';
+import { d as EdgeRouteStore, f as ManifestProvider, E as EdgeRouteFilter } from './models-DKZtopoy.js';
 import * as next_server from 'next/server';
 import '@uniformdev/context';
 import '@uniformdev/context-edge';
@@ -53,7 +53,8 @@ type VercelUniformEdgeMiddlewareOptions = Omit<UniformEdgeMiddlewareOptions, 'ma
     filter?: EdgeRouteFilter | false;
     /**
      * Records what the transform learns about each page. `false` records nothing, so the default
-     * filter processes every published page and responses get no ETag.
+     * filter processes every published page and responses get no ETag. To keep the filter and drop
+     * only the ETags, set `etags: false`.
      *
      * @defaultValue `vercelEdgeRouteStore()`
      */

package/dist/vercel.js

@@ -1165,15 +1165,37 @@ var buildPlacementTree = (events) => {
   return roots;
 };
 
+// src/edge/createContentHasher.ts
+var createContentHasher = () => {
+  let h1 = 3735928559;
+  let h2 = 1103547991;
+  return {
+    update: (chunk) => {
+      for (let index = 0; index < chunk.length; index++) {
+        const byte = chunk[index];
+        h1 = Math.imul(h1 ^ byte, 2654435761);
+        h2 = Math.imul(h2 ^ byte, 1597334677);
+      }
+    },
+    digest: () => {
+      let a = Math.imul(h1 ^ h1 >>> 16, 2246822507);
+      a ^= Math.imul(h2 ^ h2 >>> 13, 3266489909);
+      let b = Math.imul(h2 ^ h2 >>> 16, 2246822507);
+      b ^= Math.imul(a ^ a >>> 13, 3266489909);
+      return `${(b >>> 0).toString(16).padStart(8, "0")}${(a >>> 0).toString(16).padStart(8, "0")}`;
+    }
+  };
+};
+
 // src/edge/createEdgeEtag.ts
 var createEdgeEtag = async ({
-  originEtag,
+  version,
   chosen,
   oneShot
 }) => {
   const digest = await crypto.subtle.digest(
     "SHA-1",
-    new TextEncoder().encode(`${originEtag}
+    new TextEncoder().encode(`${version}
 ${JSON.stringify(chosen)}`)
   );
   const hash = btoa(String.fromCharCode(...new Uint8Array(digest))).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
@@ -1181,19 +1203,23 @@ ${JSON.stringify(chosen)}`)
 };
 
 // src/edge/hasNewVisitorState.ts
+var import_dequal = require("dequal");
 var hasNewVisitorState = (context) => {
-  var _a, _b;
-  const { tests, personalizeVariants } = context.getServerToClientTransitionState();
-  if (tests && Object.keys(tests).length > 0) {
-    return true;
-  }
-  const initial = (_b = (_a = context.storage.options.transitionStore) == null ? void 0 : _a.initialData) == null ? void 0 : _b.personalizeVariants;
-  return Object.entries(personalizeVariants != null ? personalizeVariants : {}).some(
-    ([name, variants]) => variants.some((variant) => {
-      var _a2;
-      return !((_a2 = initial == null ? void 0 : initial[name]) == null ? void 0 : _a2.some((known) => known.index === variant.index));
-    })
-  );
+  var _a;
+  const before = normalize((_a = context.storage.options.transitionStore) == null ? void 0 : _a.initialData);
+  const after = normalize(context.storage.data);
+  return !(0, import_dequal.dequal)(before, after);
+};
+var normalize = (data) => {
+  var _a, _b, _c, _d, _e, _f;
+  return {
+    tests: (_a = data == null ? void 0 : data.tests) != null ? _a : {},
+    scores: (_b = data == null ? void 0 : data.scores) != null ? _b : {},
+    sessionScores: (_c = data == null ? void 0 : data.sessionScores) != null ? _c : {},
+    goals: (_d = data == null ? void 0 : data.goals) != null ? _d : {},
+    controlGroup: (_e = data == null ? void 0 : data.controlGroup) != null ? _e : false,
+    personalizeVariants: (_f = data == null ? void 0 : data.personalizeVariants) != null ? _f : {}
+  };
 };
 
 // src/edge/matchesIfNoneMatch.ts
@@ -1250,6 +1276,7 @@ var choose = (context, placement) => {
 
 // src/edge/uniformEdgeMiddleware.ts
 var UNIFORM_EDGE_ORIGIN_HEADER = "x-uniform-edge-origin";
+var CONTENT_VERSION_PREFIX = "content:";
 var uniformEdgeMiddleware = (options) => {
   return async (request, event) => {
     return handleUniformEdgeRoute({
@@ -1265,10 +1292,11 @@ var handleUniformEdgeRoute = async ({
   onError,
   filter,
   store,
+  etags = true,
   waitUntil = ignorePromise,
   ...options
 }) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   if (request.headers.has(UNIFORM_EDGE_ORIGIN_HEADER)) {
     return import_server2.NextResponse.next();
   }
@@ -1318,18 +1346,20 @@ var handleUniformEdgeRoute = async ({
   headers.delete("content-encoding");
   headers.delete("etag");
   headers.delete("last-modified");
-  const originEtag = originResponse.status === 200 ? originResponse.headers.get("etag") : null;
-  const chosen = originEtag && ((_b = record == null ? void 0 : record.page) == null ? void 0 : _b.etag) === originEtag ? replayRecordedPage(context, record.page) : void 0;
+  const isOk = originResponse.status === 200;
+  const originEtag = etags && isOk ? originResponse.headers.get("etag") : null;
+  const version = originEtag != null ? originEtag : etags && isOk ? (_b = record == null ? void 0 : record.page) == null ? void 0 : _b.etag : void 0;
+  const chosen = version && ((_c = record == null ? void 0 : record.page) == null ? void 0 : _c.etag) === version ? replayRecordedPage(context, record.page) : void 0;
   let includeTransitionState = true;
-  if (originEtag && chosen) {
+  if (version && chosen) {
     const newState = hasNewVisitorState(context);
-    const etag = await createEdgeEtag({ originEtag, chosen, oneShot: newState });
+    const etag = await createEdgeEtag({ version, chosen, oneShot: newState });
     headers.set("etag", etag);
     headers.set("cache-control", "private, no-cache");
     if (!newState) {
       includeTransitionState = false;
       if (matchesIfNoneMatch(request.headers.get("if-none-match"), etag)) {
-        (_c = originResponse.body) == null ? void 0 : _c.cancel().catch(() => {
+        (_d = originResponse.body) == null ? void 0 : _d.cancel().catch(() => {
         });
         const notModifiedHeaders = new Headers(result.headers);
         notModifiedHeaders.set("etag", etag);
@@ -1340,14 +1370,25 @@ var handleUniformEdgeRoute = async ({
   } else {
     headers.set("cache-control", "private, no-store");
   }
-  const onComplete = store && originResponse.status === 200 ? (placements) => store.observe({
-    pageState: result.pageState,
-    hasPlacements: placements.some((placement) => !placement.parent),
-    ...originEtag ? { page: { etag: originEtag, placements: buildPlacementTree(placements) } } : {},
-    waitUntil
-  }) : void 0;
+  const hasher = etags && store && isOk && !originEtag ? createContentHasher() : void 0;
+  const onComplete = store && isOk ? (placements) => {
+    const pageVersion = originEtag != null ? originEtag : hasher ? `${CONTENT_VERSION_PREFIX}${hasher.digest()}` : void 0;
+    store.observe({
+      pageState: result.pageState,
+      hasPlacements: placements.some((placement) => !placement.parent),
+      ...pageVersion ? { page: { etag: pageVersion, placements: buildPlacementTree(placements) } } : {},
+      waitUntil
+    });
+  } : void 0;
   return new Response(
-    transformBody({ body: originResponse.body, context, onError, onComplete, includeTransitionState }),
+    transformBody({
+      body: originResponse.body,
+      context,
+      onError,
+      onComplete,
+      onChunk: hasher == null ? void 0 : hasher.update,
+      includeTransitionState
+    }),
     {
       status: originResponse.status,
       statusText: originResponse.statusText,
@@ -1391,6 +1432,7 @@ var transformBody = ({
   context,
   onError,
   onComplete,
+  onChunk,
   includeTransitionState
 }) => {
   if (!body) {
@@ -1415,6 +1457,9 @@ var transformBody = ({
         await writer.ready.catch(() => {
         });
         const { done, value } = await reader.read();
+        if (value) {
+          onChunk == null ? void 0 : onChunk(value);
+        }
         return { done, value };
       }
     },

package/dist/vercel.mjs

@@ -1136,15 +1136,37 @@ var buildPlacementTree = (events) => {
   return roots;
 };
 
+// src/edge/createContentHasher.ts
+var createContentHasher = () => {
+  let h1 = 3735928559;
+  let h2 = 1103547991;
+  return {
+    update: (chunk) => {
+      for (let index = 0; index < chunk.length; index++) {
+        const byte = chunk[index];
+        h1 = Math.imul(h1 ^ byte, 2654435761);
+        h2 = Math.imul(h2 ^ byte, 1597334677);
+      }
+    },
+    digest: () => {
+      let a = Math.imul(h1 ^ h1 >>> 16, 2246822507);
+      a ^= Math.imul(h2 ^ h2 >>> 13, 3266489909);
+      let b = Math.imul(h2 ^ h2 >>> 16, 2246822507);
+      b ^= Math.imul(a ^ a >>> 13, 3266489909);
+      return `${(b >>> 0).toString(16).padStart(8, "0")}${(a >>> 0).toString(16).padStart(8, "0")}`;
+    }
+  };
+};
+
 // src/edge/createEdgeEtag.ts
 var createEdgeEtag = async ({
-  originEtag,
+  version,
   chosen,
   oneShot
 }) => {
   const digest = await crypto.subtle.digest(
     "SHA-1",
-    new TextEncoder().encode(`${originEtag}
+    new TextEncoder().encode(`${version}
 ${JSON.stringify(chosen)}`)
   );
   const hash = btoa(String.fromCharCode(...new Uint8Array(digest))).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
@@ -1152,19 +1174,23 @@ ${JSON.stringify(chosen)}`)
 };
 
 // src/edge/hasNewVisitorState.ts
+import { dequal } from "dequal";
 var hasNewVisitorState = (context) => {
-  var _a, _b;
-  const { tests, personalizeVariants } = context.getServerToClientTransitionState();
-  if (tests && Object.keys(tests).length > 0) {
-    return true;
-  }
-  const initial = (_b = (_a = context.storage.options.transitionStore) == null ? void 0 : _a.initialData) == null ? void 0 : _b.personalizeVariants;
-  return Object.entries(personalizeVariants != null ? personalizeVariants : {}).some(
-    ([name, variants]) => variants.some((variant) => {
-      var _a2;
-      return !((_a2 = initial == null ? void 0 : initial[name]) == null ? void 0 : _a2.some((known) => known.index === variant.index));
-    })
-  );
+  var _a;
+  const before = normalize((_a = context.storage.options.transitionStore) == null ? void 0 : _a.initialData);
+  const after = normalize(context.storage.data);
+  return !dequal(before, after);
+};
+var normalize = (data) => {
+  var _a, _b, _c, _d, _e, _f;
+  return {
+    tests: (_a = data == null ? void 0 : data.tests) != null ? _a : {},
+    scores: (_b = data == null ? void 0 : data.scores) != null ? _b : {},
+    sessionScores: (_c = data == null ? void 0 : data.sessionScores) != null ? _c : {},
+    goals: (_d = data == null ? void 0 : data.goals) != null ? _d : {},
+    controlGroup: (_e = data == null ? void 0 : data.controlGroup) != null ? _e : false,
+    personalizeVariants: (_f = data == null ? void 0 : data.personalizeVariants) != null ? _f : {}
+  };
 };
 
 // src/edge/matchesIfNoneMatch.ts
@@ -1221,6 +1247,7 @@ var choose = (context, placement) => {
 
 // src/edge/uniformEdgeMiddleware.ts
 var UNIFORM_EDGE_ORIGIN_HEADER = "x-uniform-edge-origin";
+var CONTENT_VERSION_PREFIX = "content:";
 var uniformEdgeMiddleware = (options) => {
   return async (request, event) => {
     return handleUniformEdgeRoute({
@@ -1236,10 +1263,11 @@ var handleUniformEdgeRoute = async ({
   onError,
   filter,
   store,
+  etags = true,
   waitUntil = ignorePromise,
   ...options
 }) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   if (request.headers.has(UNIFORM_EDGE_ORIGIN_HEADER)) {
     return NextResponse2.next();
   }
@@ -1289,18 +1317,20 @@ var handleUniformEdgeRoute = async ({
   headers.delete("content-encoding");
   headers.delete("etag");
   headers.delete("last-modified");
-  const originEtag = originResponse.status === 200 ? originResponse.headers.get("etag") : null;
-  const chosen = originEtag && ((_b = record == null ? void 0 : record.page) == null ? void 0 : _b.etag) === originEtag ? replayRecordedPage(context, record.page) : void 0;
+  const isOk = originResponse.status === 200;
+  const originEtag = etags && isOk ? originResponse.headers.get("etag") : null;
+  const version = originEtag != null ? originEtag : etags && isOk ? (_b = record == null ? void 0 : record.page) == null ? void 0 : _b.etag : void 0;
+  const chosen = version && ((_c = record == null ? void 0 : record.page) == null ? void 0 : _c.etag) === version ? replayRecordedPage(context, record.page) : void 0;
   let includeTransitionState = true;
-  if (originEtag && chosen) {
+  if (version && chosen) {
     const newState = hasNewVisitorState(context);
-    const etag = await createEdgeEtag({ originEtag, chosen, oneShot: newState });
+    const etag = await createEdgeEtag({ version, chosen, oneShot: newState });
     headers.set("etag", etag);
     headers.set("cache-control", "private, no-cache");
     if (!newState) {
       includeTransitionState = false;
       if (matchesIfNoneMatch(request.headers.get("if-none-match"), etag)) {
-        (_c = originResponse.body) == null ? void 0 : _c.cancel().catch(() => {
+        (_d = originResponse.body) == null ? void 0 : _d.cancel().catch(() => {
         });
         const notModifiedHeaders = new Headers(result.headers);
         notModifiedHeaders.set("etag", etag);
@@ -1311,14 +1341,25 @@ var handleUniformEdgeRoute = async ({
   } else {
     headers.set("cache-control", "private, no-store");
   }
-  const onComplete = store && originResponse.status === 200 ? (placements) => store.observe({
-    pageState: result.pageState,
-    hasPlacements: placements.some((placement) => !placement.parent),
-    ...originEtag ? { page: { etag: originEtag, placements: buildPlacementTree(placements) } } : {},
-    waitUntil
-  }) : void 0;
+  const hasher = etags && store && isOk && !originEtag ? createContentHasher() : void 0;
+  const onComplete = store && isOk ? (placements) => {
+    const pageVersion = originEtag != null ? originEtag : hasher ? `${CONTENT_VERSION_PREFIX}${hasher.digest()}` : void 0;
+    store.observe({
+      pageState: result.pageState,
+      hasPlacements: placements.some((placement) => !placement.parent),
+      ...pageVersion ? { page: { etag: pageVersion, placements: buildPlacementTree(placements) } } : {},
+      waitUntil
+    });
+  } : void 0;
   return new Response(
-    transformBody({ body: originResponse.body, context, onError, onComplete, includeTransitionState }),
+    transformBody({
+      body: originResponse.body,
+      context,
+      onError,
+      onComplete,
+      onChunk: hasher == null ? void 0 : hasher.update,
+      includeTransitionState
+    }),
     {
       status: originResponse.status,
       statusText: originResponse.statusText,
@@ -1362,6 +1403,7 @@ var transformBody = ({
   context,
   onError,
   onComplete,
+  onChunk,
   includeTransitionState
 }) => {
   if (!body) {
@@ -1386,6 +1428,9 @@ var transformBody = ({
         await writer.ready.catch(() => {
         });
         const { done, value } = await reader.read();
+        if (value) {
+          onChunk == null ? void 0 : onChunk(value);
+        }
         return { done, value };
       }
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/next-app-router",
-  "version": "20.81.1-alpha.12.sha-5d72d595dc",
+  "version": "20.81.1-alpha.15.sha-2b5fd446ca",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "build": "tsup",
@@ -108,7 +108,7 @@
     "@types/node": "26.0.0",
     "@types/react": "19.2.17",
     "@types/react-dom": "19.2.3",
-    "@uniformdev/context-edge": "20.81.1-alpha.12.sha-5d72d595dc",
+    "@uniformdev/context-edge": "20.81.1-alpha.15.sha-2b5fd446ca",
     "@vercel/functions": "^3.7.2",
     "next": "16.3.1",
     "react": "19.2.1",
@@ -118,13 +118,14 @@
     "vitest": "4.1.11"
   },
   "dependencies": {
-    "@uniformdev/canvas-react": "20.81.1-alpha.12.sha-5d72d595dc",
-    "@uniformdev/context": "20.81.1-alpha.12.sha-5d72d595dc",
-    "@uniformdev/next-app-router-client": "20.81.1-alpha.12.sha-5d72d595dc",
-    "@uniformdev/next-app-router-shared": "20.81.1-alpha.12.sha-5d72d595dc",
-    "@uniformdev/redirect": "20.81.1-alpha.12.sha-5d72d595dc",
-    "@uniformdev/richtext": "20.81.1-alpha.12.sha-5d72d595dc",
-    "@uniformdev/webhooks": "20.81.1-alpha.12.sha-5d72d595dc",
+    "@uniformdev/canvas-react": "20.81.1-alpha.15.sha-2b5fd446ca",
+    "@uniformdev/context": "20.81.1-alpha.15.sha-2b5fd446ca",
+    "@uniformdev/next-app-router-client": "20.81.1-alpha.15.sha-2b5fd446ca",
+    "@uniformdev/next-app-router-shared": "20.81.1-alpha.15.sha-2b5fd446ca",
+    "@uniformdev/redirect": "20.81.1-alpha.15.sha-2b5fd446ca",
+    "@uniformdev/richtext": "20.81.1-alpha.15.sha-2b5fd446ca",
+    "@uniformdev/webhooks": "20.81.1-alpha.15.sha-2b5fd446ca",
+    "dequal": "^2.0.3",
     "encoding": "^0.1.13",
     "server-only": "^0.0.1",
     "svix": "^1.96.0"
@@ -150,5 +151,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5d72d595dcfb73d9d0500f2d33170158f8059cce"
+  "gitHead": "2b5fd446caf0ba7503b06dedef66fcdf2d8c8f39"
 }