@uniformdev/next-app-router 20.56.1-alpha.5 → 20.56.2-alpha.5

package/dist/cache.js

@@ -1412,8 +1412,15 @@ var isIncontextEditingEnabled = ({
 var isDevelopmentEnvironment = () => {
   return process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test";
 };
+var shouldIgnoreRedirects = ({ state }) => {
+  const isNotPublished = state !== CANVAS_PUBLISHED_STATE;
+  return isNotPublished ? true : void 0;
+};
 
 // src/clients/cache.ts
+var isSpecificCacheMode = (options) => {
+  return "cache" in options;
+};
 var isStateCacheMode = (options) => {
   return "state" in options;
 };
@@ -1435,7 +1442,9 @@ var resolveCache = ({
 }) => {
   let cache = void 0;
   if (options) {
-    if (isStateCacheMode(options)) {
+    if (isSpecificCacheMode(options)) {
+      cache = options.cache;
+    } else if (isStateCacheMode(options)) {
       if (options.state === CANVAS_DRAFT_STATE || options.state === CANVAS_EDITOR_STATE) {
         cache = {
           type: "no-cache",
@@ -1755,7 +1764,10 @@ var DefaultDataClient = class {
       }
     }
     const manifest = await getManifest({
-      cache: {
+      cache: isDevelopmentEnvironment() ? {
+        type: "no-cache",
+        bypassCache: true
+      } : {
         type: "force-cache"
       }
     });
@@ -1858,12 +1870,13 @@ var DefaultDataClient = class {
     };
   }
   async getRoutePageState(options) {
+    const shouldBypassCache = options.pageState.compositionState !== CANVAS_PUBLISHED_STATE || isDevelopmentEnvironment();
     const routeClient = getRouteClient({
-      cache: options.pageState.compositionState === CANVAS_PUBLISHED_STATE ? {
-        type: "force-cache"
-      } : {
+      cache: shouldBypassCache ? {
         type: "no-cache",
         bypassCache: true
+      } : {
+        type: "force-cache"
       }
     });
     const originalRoute = {
@@ -1871,7 +1884,8 @@ var DefaultDataClient = class {
       state: options.pageState.compositionState,
       withComponentIDs: true,
       releaseId: options.pageState.releaseId,
-      locale: options.pageState.locale
+      locale: options.pageState.locale,
+      ignoreRedirects: shouldIgnoreRedirects({ state: options.pageState.compositionState })
     };
     const resolvedRoute = await this.getRouteFromApi({
       source: "pageState",

package/dist/cache.mjs

@@ -1399,8 +1399,15 @@ var isIncontextEditingEnabled = ({
 var isDevelopmentEnvironment = () => {
   return process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test";
 };
+var shouldIgnoreRedirects = ({ state }) => {
+  const isNotPublished = state !== CANVAS_PUBLISHED_STATE;
+  return isNotPublished ? true : void 0;
+};
 
 // src/clients/cache.ts
+var isSpecificCacheMode = (options) => {
+  return "cache" in options;
+};
 var isStateCacheMode = (options) => {
   return "state" in options;
 };
@@ -1422,7 +1429,9 @@ var resolveCache = ({
 }) => {
   let cache = void 0;
   if (options) {
-    if (isStateCacheMode(options)) {
+    if (isSpecificCacheMode(options)) {
+      cache = options.cache;
+    } else if (isStateCacheMode(options)) {
       if (options.state === CANVAS_DRAFT_STATE || options.state === CANVAS_EDITOR_STATE) {
         cache = {
           type: "no-cache",
@@ -1742,7 +1751,10 @@ var DefaultDataClient = class {
       }
     }
     const manifest = await getManifest({
-      cache: {
+      cache: isDevelopmentEnvironment() ? {
+        type: "no-cache",
+        bypassCache: true
+      } : {
         type: "force-cache"
       }
     });
@@ -1845,12 +1857,13 @@ var DefaultDataClient = class {
     };
   }
   async getRoutePageState(options) {
+    const shouldBypassCache = options.pageState.compositionState !== CANVAS_PUBLISHED_STATE || isDevelopmentEnvironment();
     const routeClient = getRouteClient({
-      cache: options.pageState.compositionState === CANVAS_PUBLISHED_STATE ? {
-        type: "force-cache"
-      } : {
+      cache: shouldBypassCache ? {
         type: "no-cache",
         bypassCache: true
+      } : {
+        type: "force-cache"
       }
     });
     const originalRoute = {
@@ -1858,7 +1871,8 @@ var DefaultDataClient = class {
       state: options.pageState.compositionState,
       withComponentIDs: true,
       releaseId: options.pageState.releaseId,
-      locale: options.pageState.locale
+      locale: options.pageState.locale,
+      ignoreRedirects: shouldIgnoreRedirects({ state: options.pageState.compositionState })
     };
     const resolvedRoute = await this.getRouteFromApi({
       source: "pageState",

package/dist/handler.js

@@ -1786,6 +1786,9 @@ var isDevelopmentEnvironment = () => {
 };
 
 // src/clients/cache.ts
+var isSpecificCacheMode = (options) => {
+  return "cache" in options;
+};
 var isStateCacheMode = (options) => {
   return "state" in options;
 };
@@ -1807,7 +1810,9 @@ var resolveCache = ({
 }) => {
   let cache = void 0;
   if (options) {
-    if (isStateCacheMode(options)) {
+    if (isSpecificCacheMode(options)) {
+      cache = options.cache;
+    } else if (isStateCacheMode(options)) {
       if (options.state === CANVAS_DRAFT_STATE || options.state === CANVAS_EDITOR_STATE) {
         cache = {
           type: "no-cache",

package/dist/handler.mjs

@@ -1771,6 +1771,9 @@ var isDevelopmentEnvironment = () => {
 };
 
 // src/clients/cache.ts
+var isSpecificCacheMode = (options) => {
+  return "cache" in options;
+};
 var isStateCacheMode = (options) => {
   return "state" in options;
 };
@@ -1792,7 +1795,9 @@ var resolveCache = ({
 }) => {
   let cache = void 0;
   if (options) {
-    if (isStateCacheMode(options)) {
+    if (isSpecificCacheMode(options)) {
+      cache = options.cache;
+    } else if (isStateCacheMode(options)) {
       if (options.state === CANVAS_DRAFT_STATE || options.state === CANVAS_EDITOR_STATE) {
         cache = {
           type: "no-cache",

package/dist/index.esm.js

@@ -1991,8 +1991,15 @@ var isIncontextEditingEnabled = ({
 var isDevelopmentEnvironment = () => {
   return process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test";
 };
+var shouldIgnoreRedirects = ({ state }) => {
+  const isNotPublished = state !== CANVAS_PUBLISHED_STATE;
+  return isNotPublished ? true : void 0;
+};
 
 // src/clients/cache.ts
+var isSpecificCacheMode = (options) => {
+  return "cache" in options;
+};
 var isStateCacheMode = (options) => {
   return "state" in options;
 };
@@ -2019,7 +2026,9 @@ var resolveCache = ({
 }) => {
   let cache2 = void 0;
   if (options) {
-    if (isStateCacheMode(options)) {
+    if (isSpecificCacheMode(options)) {
+      cache2 = options.cache;
+    } else if (isStateCacheMode(options)) {
       if (options.state === CANVAS_DRAFT_STATE || options.state === CANVAS_EDITOR_STATE) {
         cache2 = {
           type: "no-cache",
@@ -2775,7 +2784,7 @@ var createTestComponentProps = ({
   const [testIndex] = (_a = component == null ? void 0 : component.indexes) != null ? _a : [];
   return {
     ...common,
-    index: testIndex != null ? testIndex : 0,
+    index: testIndex,
     test
   };
 };
@@ -3610,8 +3619,9 @@ var generatePossiblePageStates = ({
     locale,
     isPrefetch: void 0
   };
+  const allComponentIds = runnables.filter((r) => r.type === "test" || r.type === "personalization").map((r) => r._id);
   const allStates = generateStatesRecursively(dependencyMap, void 0, initialState);
-  return allStates.map((payload) => serializeEvaluationResult({ payload }));
+  return allStates.map((payload) => serializeEvaluationResult({ payload, allComponentIds }));
 };
 function permutationsWithoutRepetition(options, k) {
   if (k === 0) return [[]];
@@ -3660,7 +3670,10 @@ var DefaultDataClient = class {
       }
     }
     const manifest = await getManifest({
-      cache: {
+      cache: isDevelopmentEnvironment() ? {
+        type: "no-cache",
+        bypassCache: true
+      } : {
         type: "force-cache"
       }
     });
@@ -3763,12 +3776,13 @@ var DefaultDataClient = class {
     };
   }
   async getRoutePageState(options) {
+    const shouldBypassCache = options.pageState.compositionState !== CANVAS_PUBLISHED_STATE || isDevelopmentEnvironment();
     const routeClient = getRouteClient({
-      cache: options.pageState.compositionState === CANVAS_PUBLISHED_STATE ? {
-        type: "force-cache"
-      } : {
+      cache: shouldBypassCache ? {
         type: "no-cache",
         bypassCache: true
+      } : {
+        type: "force-cache"
       }
     });
     const originalRoute = {
@@ -3776,7 +3790,8 @@ var DefaultDataClient = class {
       state: options.pageState.compositionState,
       withComponentIDs: true,
       releaseId: options.pageState.releaseId,
-      locale: options.pageState.locale
+      locale: options.pageState.locale,
+      ignoreRedirects: shouldIgnoreRedirects({ state: options.pageState.compositionState })
     };
     const resolvedRoute = await this.getRouteFromApi({
       source: "pageState",

package/dist/index.js

@@ -2018,8 +2018,15 @@ var isIncontextEditingEnabled = ({
 var isDevelopmentEnvironment = () => {
   return process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test";
 };
+var shouldIgnoreRedirects = ({ state }) => {
+  const isNotPublished = state !== CANVAS_PUBLISHED_STATE;
+  return isNotPublished ? true : void 0;
+};
 
 // src/clients/cache.ts
+var isSpecificCacheMode = (options) => {
+  return "cache" in options;
+};
 var isStateCacheMode = (options) => {
   return "state" in options;
 };
@@ -2046,7 +2053,9 @@ var resolveCache = ({
 }) => {
   let cache2 = void 0;
   if (options) {
-    if (isStateCacheMode(options)) {
+    if (isSpecificCacheMode(options)) {
+      cache2 = options.cache;
+    } else if (isStateCacheMode(options)) {
       if (options.state === CANVAS_DRAFT_STATE || options.state === CANVAS_EDITOR_STATE) {
         cache2 = {
           type: "no-cache",
@@ -2798,7 +2807,7 @@ var createTestComponentProps = ({
   const [testIndex] = (_a = component == null ? void 0 : component.indexes) != null ? _a : [];
   return {
     ...common,
-    index: testIndex != null ? testIndex : 0,
+    index: testIndex,
     test
   };
 };
@@ -3631,8 +3640,9 @@ var generatePossiblePageStates = ({
     locale,
     isPrefetch: void 0
   };
+  const allComponentIds = runnables.filter((r) => r.type === "test" || r.type === "personalization").map((r) => r._id);
   const allStates = generateStatesRecursively(dependencyMap, void 0, initialState);
-  return allStates.map((payload) => (0, import_next_app_router_shared8.serializeEvaluationResult)({ payload }));
+  return allStates.map((payload) => (0, import_next_app_router_shared8.serializeEvaluationResult)({ payload, allComponentIds }));
 };
 function permutationsWithoutRepetition(options, k) {
   if (k === 0) return [[]];
@@ -3681,7 +3691,10 @@ var DefaultDataClient = class {
       }
     }
     const manifest = await getManifest({
-      cache: {
+      cache: isDevelopmentEnvironment() ? {
+        type: "no-cache",
+        bypassCache: true
+      } : {
         type: "force-cache"
       }
     });
@@ -3784,12 +3797,13 @@ var DefaultDataClient = class {
     };
   }
   async getRoutePageState(options) {
+    const shouldBypassCache = options.pageState.compositionState !== CANVAS_PUBLISHED_STATE || isDevelopmentEnvironment();
     const routeClient = getRouteClient({
-      cache: options.pageState.compositionState === CANVAS_PUBLISHED_STATE ? {
-        type: "force-cache"
-      } : {
+      cache: shouldBypassCache ? {
         type: "no-cache",
         bypassCache: true
+      } : {
+        type: "force-cache"
       }
     });
     const originalRoute = {
@@ -3797,7 +3811,8 @@ var DefaultDataClient = class {
       state: options.pageState.compositionState,
       withComponentIDs: true,
       releaseId: options.pageState.releaseId,
-      locale: options.pageState.locale
+      locale: options.pageState.locale,
+      ignoreRedirects: shouldIgnoreRedirects({ state: options.pageState.compositionState })
     };
     const resolvedRoute = await this.getRouteFromApi({
       source: "pageState",

package/dist/index.mjs

@@ -1991,8 +1991,15 @@ var isIncontextEditingEnabled = ({
 var isDevelopmentEnvironment = () => {
   return process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test";
 };
+var shouldIgnoreRedirects = ({ state }) => {
+  const isNotPublished = state !== CANVAS_PUBLISHED_STATE;
+  return isNotPublished ? true : void 0;
+};
 
 // src/clients/cache.ts
+var isSpecificCacheMode = (options) => {
+  return "cache" in options;
+};
 var isStateCacheMode = (options) => {
   return "state" in options;
 };
@@ -2019,7 +2026,9 @@ var resolveCache = ({
 }) => {
   let cache2 = void 0;
   if (options) {
-    if (isStateCacheMode(options)) {
+    if (isSpecificCacheMode(options)) {
+      cache2 = options.cache;
+    } else if (isStateCacheMode(options)) {
       if (options.state === CANVAS_DRAFT_STATE || options.state === CANVAS_EDITOR_STATE) {
         cache2 = {
           type: "no-cache",
@@ -2775,7 +2784,7 @@ var createTestComponentProps = ({
   const [testIndex] = (_a = component == null ? void 0 : component.indexes) != null ? _a : [];
   return {
     ...common,
-    index: testIndex != null ? testIndex : 0,
+    index: testIndex,
     test
   };
 };
@@ -3610,8 +3619,9 @@ var generatePossiblePageStates = ({
     locale,
     isPrefetch: void 0
   };
+  const allComponentIds = runnables.filter((r) => r.type === "test" || r.type === "personalization").map((r) => r._id);
   const allStates = generateStatesRecursively(dependencyMap, void 0, initialState);
-  return allStates.map((payload) => serializeEvaluationResult({ payload }));
+  return allStates.map((payload) => serializeEvaluationResult({ payload, allComponentIds }));
 };
 function permutationsWithoutRepetition(options, k) {
   if (k === 0) return [[]];
@@ -3660,7 +3670,10 @@ var DefaultDataClient = class {
       }
     }
     const manifest = await getManifest({
-      cache: {
+      cache: isDevelopmentEnvironment() ? {
+        type: "no-cache",
+        bypassCache: true
+      } : {
         type: "force-cache"
       }
     });
@@ -3763,12 +3776,13 @@ var DefaultDataClient = class {
     };
   }
   async getRoutePageState(options) {
+    const shouldBypassCache = options.pageState.compositionState !== CANVAS_PUBLISHED_STATE || isDevelopmentEnvironment();
     const routeClient = getRouteClient({
-      cache: options.pageState.compositionState === CANVAS_PUBLISHED_STATE ? {
-        type: "force-cache"
-      } : {
+      cache: shouldBypassCache ? {
         type: "no-cache",
         bypassCache: true
+      } : {
+        type: "force-cache"
       }
     });
     const originalRoute = {
@@ -3776,7 +3790,8 @@ var DefaultDataClient = class {
       state: options.pageState.compositionState,
       withComponentIDs: true,
       releaseId: options.pageState.releaseId,
-      locale: options.pageState.locale
+      locale: options.pageState.locale,
+      ignoreRedirects: shouldIgnoreRedirects({ state: options.pageState.compositionState })
     };
     const resolvedRoute = await this.getRouteFromApi({
       source: "pageState",

package/dist/middleware.js

@@ -2351,8 +2351,15 @@ var isIncontextEditingEnabled = ({
 var isDevelopmentEnvironment = () => {
   return process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test";
 };
+var shouldIgnoreRedirects = ({ state }) => {
+  const isNotPublished = state !== CANVAS_PUBLISHED_STATE;
+  return isNotPublished ? true : void 0;
+};
 
 // src/clients/cache.ts
+var isSpecificCacheMode = (options) => {
+  return "cache" in options;
+};
 var isStateCacheMode = (options) => {
   return "state" in options;
 };
@@ -2374,7 +2381,9 @@ var resolveCache = ({
 }) => {
   let cache = void 0;
   if (options) {
-    if (isStateCacheMode(options)) {
+    if (isSpecificCacheMode(options)) {
+      cache = options.cache;
+    } else if (isStateCacheMode(options)) {
       if (options.state === CANVAS_DRAFT_STATE || options.state === CANVAS_EDITOR_STATE) {
         cache = {
           type: "no-cache",
@@ -2769,7 +2778,10 @@ var DefaultDataClient = class {
       }
     }
     const manifest = await getManifest({
-      cache: {
+      cache: isDevelopmentEnvironment() ? {
+        type: "no-cache",
+        bypassCache: true
+      } : {
         type: "force-cache"
       }
     });
@@ -2872,12 +2884,13 @@ var DefaultDataClient = class {
     };
   }
   async getRoutePageState(options) {
+    const shouldBypassCache = options.pageState.compositionState !== CANVAS_PUBLISHED_STATE || isDevelopmentEnvironment();
     const routeClient = getRouteClient({
-      cache: options.pageState.compositionState === CANVAS_PUBLISHED_STATE ? {
-        type: "force-cache"
-      } : {
+      cache: shouldBypassCache ? {
         type: "no-cache",
         bypassCache: true
+      } : {
+        type: "force-cache"
       }
     });
     const originalRoute = {
@@ -2885,7 +2898,8 @@ var DefaultDataClient = class {
       state: options.pageState.compositionState,
       withComponentIDs: true,
       releaseId: options.pageState.releaseId,
-      locale: options.pageState.locale
+      locale: options.pageState.locale,
+      ignoreRedirects: shouldIgnoreRedirects({ state: options.pageState.compositionState })
     };
     const resolvedRoute = await this.getRouteFromApi({
       source: "pageState",
@@ -5434,7 +5448,8 @@ var retrieveRouteByPath = async ({
       withComponentIDs: true,
       withContentSourceMap: (_a = getServerConfig().experimental) == null ? void 0 : _a.vercelVisualEditing,
       releaseId,
-      locale
+      locale,
+      ignoreRedirects: shouldIgnoreRedirects({ state })
     }
   });
 };
@@ -5561,7 +5576,7 @@ var handlePlaygroundRequest = async ({
     })
   });
   const context = await onDemandContext.getContext();
-  const { components, rules } = await extractAndEvaluateRunnables({
+  const { components, rules, allComponentIds } = await extractAndEvaluateRunnables({
     composition: composition.composition,
     routePath: id,
     state: composition.state,
@@ -5601,7 +5616,8 @@ var handlePlaygroundRequest = async ({
     isPrefetch: void 0
   };
   const code = (0, import_next_app_router_shared5.serializeEvaluationResult)({
-    payload: pageState
+    payload: pageState,
+    allComponentIds
   });
   let pathToRewriteTo = await (options.rewriteDestinationPath ? options.rewriteDestinationPath({ code, pageState, source: "playground" }) : void 0);
   if (!pathToRewriteTo) {
@@ -5615,16 +5631,15 @@ var handleRouteRequest = async ({
   dataClient,
   options
 }) => {
-  var _a, _b, _c, _d, _e, _f, _g;
-  const releaseId = (_b = (_a = options.release) == null ? void 0 : _a.id) != null ? _b : draftModeEnabled ? request.nextUrl.searchParams.get("releaseId") || void 0 : void 0;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   const states = await determineState({
     searchParams: request.nextUrl.searchParams,
     draftModeEnabled
   });
-  const requestPath = (_d = await ((_c = options.rewriteRequestPath) == null ? void 0 : _c.call(options, {
+  const requestPath = (_b = await ((_a = options.rewriteRequestPath) == null ? void 0 : _a.call(options, {
     request,
     url: new URL(request.url)
-  }))) != null ? _d : {
+  }))) != null ? _b : {
     path: `${request.nextUrl.pathname}${request.nextUrl.search}`
   };
   const serverConfig = getServerConfig();
@@ -5635,7 +5650,7 @@ var handleRouteRequest = async ({
       searchParams: request.nextUrl.searchParams,
       draftModeEnabled,
       dataClient,
-      releaseId,
+      releaseId: (_c = options.release) == null ? void 0 : _c.id,
       locale: options.locale
     }),
     createOnDemandContext({
@@ -5647,10 +5662,10 @@ var handleRouteRequest = async ({
       })
     })
   ]);
-  if (!(routeResult == null ? void 0 : routeResult.route) || ((_e = routeResult == null ? void 0 : routeResult.route) == null ? void 0 : _e.type) === "notFound") {
+  if (!(routeResult == null ? void 0 : routeResult.route) || ((_d = routeResult == null ? void 0 : routeResult.route) == null ? void 0 : _d.type) === "notFound") {
     return import_server.NextResponse.rewrite(new URL("/404", request.url));
   }
-  if (((_f = routeResult == null ? void 0 : routeResult.route) == null ? void 0 : _f.type) === "redirect") {
+  if (((_e = routeResult == null ? void 0 : routeResult.route) == null ? void 0 : _e.type) === "redirect") {
     return handleRedirect({ request, route: routeResult.route });
   }
   const { route } = routeResult;
@@ -5684,14 +5699,14 @@ var handleRouteRequest = async ({
     isDraftModeEnabled: draftModeEnabled
   });
   const isPrefetch = isPrefetchRequest(request);
-  const { components, rules } = await extractAndEvaluateRunnables({
+  const { components, rules, allComponentIds } = await extractAndEvaluateRunnables({
     composition: route.compositionApiResponse.composition,
     routePath,
     state,
     context,
     matchedRoute: route.matchedRoute,
-    dynamicInputs: (_g = route.dynamicInputs) != null ? _g : {},
-    releaseId,
+    dynamicInputs: (_f = route.dynamicInputs) != null ? _f : {},
+    releaseId: (_g = options.release) == null ? void 0 : _g.id,
     defaultConsent: determineDefaultConsent({
       serverConfig,
       defaultConsent: options.defaultConsent
@@ -5709,7 +5724,7 @@ var handleRouteRequest = async ({
     compositionState: state,
     components,
     keys: requestPath.keys,
-    releaseId,
+    releaseId: (_h = options.release) == null ? void 0 : _h.id,
     defaultConsent: determineDefaultConsent({
       serverConfig,
       defaultConsent: options.defaultConsent
@@ -5720,7 +5735,8 @@ var handleRouteRequest = async ({
     isPrefetch: isPrefetch || void 0
   };
   const code = (0, import_next_app_router_shared5.serializeEvaluationResult)({
-    payload: pageState
+    payload: pageState,
+    allComponentIds
   });
   let pathToRewriteTo = await (options.rewriteDestinationPath ? options.rewriteDestinationPath({ code, pageState, source: "route" }) : void 0);
   if (!pathToRewriteTo) {
@@ -5780,7 +5796,8 @@ var extractAndEvaluateRunnables = async ({
       }
     }
   });
-  return result;
+  const allComponentIds = extracted.filter((r) => r.type === "test" || r.type === "personalization").map((r) => r._id);
+  return { ...result, allComponentIds };
 };
 var handleRedirect = ({ request, route }) => {
   const href = resolveRedirectHref({

package/dist/middleware.mjs

@@ -2338,8 +2338,15 @@ var isIncontextEditingEnabled = ({
 var isDevelopmentEnvironment = () => {
   return process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test";
 };
+var shouldIgnoreRedirects = ({ state }) => {
+  const isNotPublished = state !== CANVAS_PUBLISHED_STATE;
+  return isNotPublished ? true : void 0;
+};
 
 // src/clients/cache.ts
+var isSpecificCacheMode = (options) => {
+  return "cache" in options;
+};
 var isStateCacheMode = (options) => {
   return "state" in options;
 };
@@ -2361,7 +2368,9 @@ var resolveCache = ({
 }) => {
   let cache = void 0;
   if (options) {
-    if (isStateCacheMode(options)) {
+    if (isSpecificCacheMode(options)) {
+      cache = options.cache;
+    } else if (isStateCacheMode(options)) {
       if (options.state === CANVAS_DRAFT_STATE || options.state === CANVAS_EDITOR_STATE) {
         cache = {
           type: "no-cache",
@@ -2756,7 +2765,10 @@ var DefaultDataClient = class {
       }
     }
     const manifest = await getManifest({
-      cache: {
+      cache: isDevelopmentEnvironment() ? {
+        type: "no-cache",
+        bypassCache: true
+      } : {
         type: "force-cache"
       }
     });
@@ -2859,12 +2871,13 @@ var DefaultDataClient = class {
     };
   }
   async getRoutePageState(options) {
+    const shouldBypassCache = options.pageState.compositionState !== CANVAS_PUBLISHED_STATE || isDevelopmentEnvironment();
     const routeClient = getRouteClient({
-      cache: options.pageState.compositionState === CANVAS_PUBLISHED_STATE ? {
-        type: "force-cache"
-      } : {
+      cache: shouldBypassCache ? {
         type: "no-cache",
         bypassCache: true
+      } : {
+        type: "force-cache"
       }
     });
     const originalRoute = {
@@ -2872,7 +2885,8 @@ var DefaultDataClient = class {
       state: options.pageState.compositionState,
       withComponentIDs: true,
       releaseId: options.pageState.releaseId,
-      locale: options.pageState.locale
+      locale: options.pageState.locale,
+      ignoreRedirects: shouldIgnoreRedirects({ state: options.pageState.compositionState })
     };
     const resolvedRoute = await this.getRouteFromApi({
       source: "pageState",
@@ -5426,7 +5440,8 @@ var retrieveRouteByPath = async ({
       withComponentIDs: true,
       withContentSourceMap: (_a = getServerConfig().experimental) == null ? void 0 : _a.vercelVisualEditing,
       releaseId,
-      locale
+      locale,
+      ignoreRedirects: shouldIgnoreRedirects({ state })
     }
   });
 };
@@ -5553,7 +5568,7 @@ var handlePlaygroundRequest = async ({
     })
   });
   const context = await onDemandContext.getContext();
-  const { components, rules } = await extractAndEvaluateRunnables({
+  const { components, rules, allComponentIds } = await extractAndEvaluateRunnables({
     composition: composition.composition,
     routePath: id,
     state: composition.state,
@@ -5593,7 +5608,8 @@ var handlePlaygroundRequest = async ({
     isPrefetch: void 0
   };
   const code = serializeEvaluationResult({
-    payload: pageState
+    payload: pageState,
+    allComponentIds
   });
   let pathToRewriteTo = await (options.rewriteDestinationPath ? options.rewriteDestinationPath({ code, pageState, source: "playground" }) : void 0);
   if (!pathToRewriteTo) {
@@ -5607,16 +5623,15 @@ var handleRouteRequest = async ({
   dataClient,
   options
 }) => {
-  var _a, _b, _c, _d, _e, _f, _g;
-  const releaseId = (_b = (_a = options.release) == null ? void 0 : _a.id) != null ? _b : draftModeEnabled ? request.nextUrl.searchParams.get("releaseId") || void 0 : void 0;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   const states = await determineState({
     searchParams: request.nextUrl.searchParams,
     draftModeEnabled
   });
-  const requestPath = (_d = await ((_c = options.rewriteRequestPath) == null ? void 0 : _c.call(options, {
+  const requestPath = (_b = await ((_a = options.rewriteRequestPath) == null ? void 0 : _a.call(options, {
     request,
     url: new URL(request.url)
-  }))) != null ? _d : {
+  }))) != null ? _b : {
     path: `${request.nextUrl.pathname}${request.nextUrl.search}`
   };
   const serverConfig = getServerConfig();
@@ -5627,7 +5642,7 @@ var handleRouteRequest = async ({
       searchParams: request.nextUrl.searchParams,
       draftModeEnabled,
       dataClient,
-      releaseId,
+      releaseId: (_c = options.release) == null ? void 0 : _c.id,
       locale: options.locale
     }),
     createOnDemandContext({
@@ -5639,10 +5654,10 @@ var handleRouteRequest = async ({
       })
     })
   ]);
-  if (!(routeResult == null ? void 0 : routeResult.route) || ((_e = routeResult == null ? void 0 : routeResult.route) == null ? void 0 : _e.type) === "notFound") {
+  if (!(routeResult == null ? void 0 : routeResult.route) || ((_d = routeResult == null ? void 0 : routeResult.route) == null ? void 0 : _d.type) === "notFound") {
     return NextResponse.rewrite(new URL("/404", request.url));
   }
-  if (((_f = routeResult == null ? void 0 : routeResult.route) == null ? void 0 : _f.type) === "redirect") {
+  if (((_e = routeResult == null ? void 0 : routeResult.route) == null ? void 0 : _e.type) === "redirect") {
     return handleRedirect({ request, route: routeResult.route });
   }
   const { route } = routeResult;
@@ -5676,14 +5691,14 @@ var handleRouteRequest = async ({
     isDraftModeEnabled: draftModeEnabled
   });
   const isPrefetch = isPrefetchRequest(request);
-  const { components, rules } = await extractAndEvaluateRunnables({
+  const { components, rules, allComponentIds } = await extractAndEvaluateRunnables({
     composition: route.compositionApiResponse.composition,
     routePath,
     state,
     context,
     matchedRoute: route.matchedRoute,
-    dynamicInputs: (_g = route.dynamicInputs) != null ? _g : {},
-    releaseId,
+    dynamicInputs: (_f = route.dynamicInputs) != null ? _f : {},
+    releaseId: (_g = options.release) == null ? void 0 : _g.id,
     defaultConsent: determineDefaultConsent({
       serverConfig,
       defaultConsent: options.defaultConsent
@@ -5701,7 +5716,7 @@ var handleRouteRequest = async ({
     compositionState: state,
     components,
     keys: requestPath.keys,
-    releaseId,
+    releaseId: (_h = options.release) == null ? void 0 : _h.id,
     defaultConsent: determineDefaultConsent({
       serverConfig,
       defaultConsent: options.defaultConsent
@@ -5712,7 +5727,8 @@ var handleRouteRequest = async ({
     isPrefetch: isPrefetch || void 0
   };
   const code = serializeEvaluationResult({
-    payload: pageState
+    payload: pageState,
+    allComponentIds
   });
   let pathToRewriteTo = await (options.rewriteDestinationPath ? options.rewriteDestinationPath({ code, pageState, source: "route" }) : void 0);
   if (!pathToRewriteTo) {
@@ -5772,7 +5788,8 @@ var extractAndEvaluateRunnables = async ({
       }
     }
   });
-  return result;
+  const allComponentIds = extracted.filter((r) => r.type === "test" || r.type === "personalization").map((r) => r._id);
+  return { ...result, allComponentIds };
 };
 var handleRedirect = ({ request, route }) => {
   const href = resolveRedirectHref({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/next-app-router",
-  "version": "20.56.1-alpha.5+1bce2eca70",
+  "version": "20.56.2-alpha.5+ae5a0d2550",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "build": "tsup",
@@ -99,12 +99,12 @@
     "vitest": "3.2.4"
   },
   "dependencies": {
-    "@uniformdev/canvas-react": "20.56.1-alpha.5+1bce2eca70",
-    "@uniformdev/next-app-router-client": "20.56.1-alpha.5+1bce2eca70",
-    "@uniformdev/next-app-router-shared": "20.56.1-alpha.5+1bce2eca70",
-    "@uniformdev/redirect": "20.56.1-alpha.5+1bce2eca70",
-    "@uniformdev/richtext": "20.56.1-alpha.5+1bce2eca70",
-    "@uniformdev/webhooks": "20.56.1-alpha.5+1bce2eca70",
+    "@uniformdev/canvas-react": "20.56.2-alpha.5+ae5a0d2550",
+    "@uniformdev/next-app-router-client": "20.56.2-alpha.5+ae5a0d2550",
+    "@uniformdev/next-app-router-shared": "20.56.2-alpha.5+ae5a0d2550",
+    "@uniformdev/redirect": "20.56.2-alpha.5+ae5a0d2550",
+    "@uniformdev/richtext": "20.56.2-alpha.5+ae5a0d2550",
+    "@uniformdev/webhooks": "20.56.2-alpha.5+ae5a0d2550",
     "@vercel/functions": "^2.2.2",
     "encoding": "^0.1.13",
     "server-only": "^0.0.1",
@@ -121,5 +121,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1bce2eca70191de304d93909e5cf08740b01fb5a"
+  "gitHead": "ae5a0d255085f10d36ad4f557d393536033eac7f"
 }