@uniformdev/next-app-router 20.50.0 → 20.50.1-alpha.16

package/dist/index.esm.js

@@ -2749,6 +2749,13 @@ var createTestComponentProps = ({
   test
 }) => {
   var _a;
+  if (pageState.isPrefetch) {
+    return {
+      ...common,
+      index: void 0,
+      test
+    };
+  }
   const component = resolveComponentFromPageState({
     pageState,
     componentId
@@ -2787,6 +2794,7 @@ var applyEditableParameters = ({
 };
 
 // src/components/Test.tsx
+import { ClientTest } from "@uniformdev/next-app-router-client";
 import { createElement, Fragment } from "react";
 
 // src/components/ContextTestTransfer.tsx
@@ -2799,7 +2807,14 @@ var ContextTestTransfer = ({ event }) => {
 // src/components/Test.tsx
 var Test = ({ index, slots, test, component, context: compositionContext }) => {
   var _a, _b, _c, _d, _e, _f;
-  const indexToShow = typeof index === "number" ? (_b = (_a = slots == null ? void 0 : slots[CANVAS_TEST_SLOT]) == null ? void 0 : _a.items[index]) != null ? _b : null : null;
+  if (typeof index !== "number") {
+    return createElement(ClientTest, {
+      slots,
+      test,
+      context: compositionContext
+    });
+  }
+  const indexToShow = (_b = (_a = slots == null ? void 0 : slots[CANVAS_TEST_SLOT]) == null ? void 0 : _a.items[index]) != null ? _b : null;
   const event = {
     name: test.name,
     control: (_d = (_c = test.variations[index]) == null ? void 0 : _c.control) != null ? _d : false,
@@ -3580,7 +3595,8 @@ var generatePossiblePageStates = ({
     defaultConsent: void 0,
     previewMode: void 0,
     rules: void 0,
-    locale
+    locale,
+    isPrefetch: void 0
   };
   const allStates = generateStatesRecursively(dependencyMap, void 0, initialState);
   return allStates.map((payload) => serializeEvaluationResult({ payload }));

package/dist/index.js

@@ -2678,7 +2678,7 @@ var getRouteClient = (options) => {
 
 // src/components/UniformComposition.tsx
 var import_core = require("@uniformdev/canvas-react/core");
-var import_next_app_router_client4 = require("@uniformdev/next-app-router-client");
+var import_next_app_router_client5 = require("@uniformdev/next-app-router-client");
 var import_next_app_router_shared4 = require("@uniformdev/next-app-router-shared");
 var import_navigation = require("next/navigation");
 var import_react6 = __toESM(require("react"));
@@ -2772,6 +2772,13 @@ var createTestComponentProps = ({
   test
 }) => {
   var _a;
+  if (pageState.isPrefetch) {
+    return {
+      ...common,
+      index: void 0,
+      test
+    };
+  }
   const component = (0, import_next_app_router_shared2.resolveComponentFromPageState)({
     pageState,
     componentId
@@ -2810,6 +2817,7 @@ var applyEditableParameters = ({
 };
 
 // src/components/Test.tsx
+var import_next_app_router_client2 = require("@uniformdev/next-app-router-client");
 var import_react2 = require("react");
 
 // src/components/ContextTestTransfer.tsx
@@ -2822,7 +2830,14 @@ var ContextTestTransfer = ({ event }) => {
 // src/components/Test.tsx
 var Test = ({ index, slots, test, component, context: compositionContext }) => {
   var _a, _b, _c, _d, _e, _f;
-  const indexToShow = typeof index === "number" ? (_b = (_a = slots == null ? void 0 : slots[CANVAS_TEST_SLOT]) == null ? void 0 : _a.items[index]) != null ? _b : null : null;
+  if (typeof index !== "number") {
+    return (0, import_react2.createElement)(import_next_app_router_client2.ClientTest, {
+      slots,
+      test,
+      context: compositionContext
+    });
+  }
+  const indexToShow = (_b = (_a = slots == null ? void 0 : slots[CANVAS_TEST_SLOT]) == null ? void 0 : _a.items[index]) != null ? _b : null;
   const event = {
     name: test.name,
     control: (_d = (_c = test.variations[index]) == null ? void 0 : _c.control) != null ? _d : false,
@@ -2854,7 +2869,7 @@ var UniformCompositionWrapper = ({
 };
 
 // src/components/UniformContext.tsx
-var import_next_app_router_client2 = require("@uniformdev/next-app-router-client");
+var import_next_app_router_client3 = require("@uniformdev/next-app-router-client");
 var import_react4 = __toESM(require("react"));
 
 // src/config/helpers.ts
@@ -2907,7 +2922,7 @@ var UniformContext = async ({ clientContextComponent, result }) => {
     dynamicInputs: route.dynamicInputs,
     matchedRoute: route.matchedRoute
   } : void 0;
-  const ContextComponent = clientContextComponent || import_next_app_router_client2.DefaultUniformClientContext;
+  const ContextComponent = clientContextComponent || import_next_app_router_client3.DefaultUniformClientContext;
   const disableDevTools = getDisabledDevTools();
   const defaultConsent = (_a = result == null ? void 0 : result.pageState.defaultConsent) != null ? _a : getDefaultConsent();
   const experimentalQuirkSerialization = getQuirkSerialization();
@@ -2924,14 +2939,14 @@ var UniformContext = async ({ clientContextComponent, result }) => {
 };
 
 // src/components/VisibilityRulesWrapper.tsx
-var import_next_app_router_client3 = require("@uniformdev/next-app-router-client");
+var import_next_app_router_client4 = require("@uniformdev/next-app-router-client");
 var import_react5 = __toESM(require("react"));
 var VisibilityRulesWrapper = ({
   parameter,
   initialIsVisible,
   children
 }) => {
-  return /* @__PURE__ */ import_react5.default.createElement(import_next_app_router_client3.VisibilityRulesWrapperClient, { parameter, initialIsVisible }, children);
+  return /* @__PURE__ */ import_react5.default.createElement(import_next_app_router_client4.VisibilityRulesWrapperClient, { parameter, initialIsVisible }, children);
 };
 
 // src/components/UniformComposition.tsx
@@ -2994,7 +3009,7 @@ async function UniformCompositionInner({
         route
       }
     }
-  )), (pageState.compositionState === CANVAS_EDITOR_STATE || pageState.compositionState === CANVAS_DRAFT_STATE) && /* @__PURE__ */ import_react6.default.createElement(import_next_app_router_client4.UniformScript, null));
+  )), (pageState.compositionState === CANVAS_EDITOR_STATE || pageState.compositionState === CANVAS_DRAFT_STATE) && /* @__PURE__ */ import_react6.default.createElement(import_next_app_router_client5.UniformScript, null));
 }
 var resolveComponents = ({
   target,
@@ -3090,7 +3105,7 @@ var resolveComponents = ({
     }
     let tagElement = null;
     if (enrichmentTags == null ? void 0 : enrichmentTags.length) {
-      tagElement = (0, import_react6.createElement)(import_next_app_router_client4.ContextUpdateTransfer, {
+      tagElement = (0, import_react6.createElement)(import_next_app_router_client5.ContextUpdateTransfer, {
         key: `${slotName}-${componentIndex}-tags`,
         update: {
           enrichments: enrichmentTags
@@ -3165,7 +3180,7 @@ var createResolvedComponent = ({
       componentId: component._id,
       pageState
     });
-    return (0, import_react6.createElement)(import_next_app_router_client4.Personalize, { ...personalizeProps, key });
+    return (0, import_react6.createElement)(import_next_app_router_client5.Personalize, { ...personalizeProps, key });
   }
   if (component.type === CANVAS_TEST_TYPE) {
     const extractedTest = extractTest({
@@ -3601,7 +3616,8 @@ var generatePossiblePageStates = ({
     defaultConsent: void 0,
     previewMode: void 0,
     rules: void 0,
-    locale
+    locale,
+    isPrefetch: void 0
   };
   const allStates = generateStatesRecursively(dependencyMap, void 0, initialState);
   return allStates.map((payload) => (0, import_next_app_router_shared8.serializeEvaluationResult)({ payload }));

package/dist/index.mjs

@@ -2749,6 +2749,13 @@ var createTestComponentProps = ({
   test
 }) => {
   var _a;
+  if (pageState.isPrefetch) {
+    return {
+      ...common,
+      index: void 0,
+      test
+    };
+  }
   const component = resolveComponentFromPageState({
     pageState,
     componentId
@@ -2787,6 +2794,7 @@ var applyEditableParameters = ({
 };
 
 // src/components/Test.tsx
+import { ClientTest } from "@uniformdev/next-app-router-client";
 import { createElement, Fragment } from "react";
 
 // src/components/ContextTestTransfer.tsx
@@ -2799,7 +2807,14 @@ var ContextTestTransfer = ({ event }) => {
 // src/components/Test.tsx
 var Test = ({ index, slots, test, component, context: compositionContext }) => {
   var _a, _b, _c, _d, _e, _f;
-  const indexToShow = typeof index === "number" ? (_b = (_a = slots == null ? void 0 : slots[CANVAS_TEST_SLOT]) == null ? void 0 : _a.items[index]) != null ? _b : null : null;
+  if (typeof index !== "number") {
+    return createElement(ClientTest, {
+      slots,
+      test,
+      context: compositionContext
+    });
+  }
+  const indexToShow = (_b = (_a = slots == null ? void 0 : slots[CANVAS_TEST_SLOT]) == null ? void 0 : _a.items[index]) != null ? _b : null;
   const event = {
     name: test.name,
     control: (_d = (_c = test.variations[index]) == null ? void 0 : _c.control) != null ? _d : false,
@@ -3580,7 +3595,8 @@ var generatePossiblePageStates = ({
     defaultConsent: void 0,
     previewMode: void 0,
     rules: void 0,
-    locale
+    locale,
+    isPrefetch: void 0
   };
   const allStates = generateStatesRecursively(dependencyMap, void 0, initialState);
   return allStates.map((payload) => serializeEvaluationResult({ payload }));

package/dist/middleware.js

@@ -3047,7 +3047,8 @@ var import_next_app_router_shared4 = require("@uniformdev/next-app-router-shared
 var evaluateRunnables = async ({
   runnables,
   context,
-  compositionContext
+  compositionContext,
+  isPrefetch
 }) => {
   var _a;
   const result = {
@@ -3057,6 +3058,9 @@ var evaluateRunnables = async ({
   const runnablesToProcess = runnables.filter((item2) => item2.variantId === void 0);
   let item;
   while (item = runnablesToProcess.shift()) {
+    if (item.type === "test" && isPrefetch) {
+      continue;
+    }
     if (item.type === "test") {
       const testResult = (0, import_next_app_router_shared4.evaluateTest)({
         context,
@@ -5562,7 +5566,8 @@ var handlePlaygroundRequest = async ({
       searchParams: request.nextUrl.searchParams,
       isDraftModeEnabled: true
       // this is checked above
-    })
+    }),
+    isPrefetch: false
   });
   const pageState = {
     routePath: id,
@@ -5580,7 +5585,8 @@ var handlePlaygroundRequest = async ({
       // this is checked above
     }),
     rules,
-    locale: options.locale
+    locale: options.locale,
+    isPrefetch: void 0
   };
   const code = (0, import_next_app_router_shared5.serializeEvaluationResult)({
     payload: pageState
@@ -5629,7 +5635,7 @@ var handleRouteRequest = async ({
     })
   ]);
   if (!(routeResult == null ? void 0 : routeResult.route) || ((_d = routeResult == null ? void 0 : routeResult.route) == null ? void 0 : _d.type) === "notFound") {
-    return import_server.NextResponse.next();
+    return import_server.NextResponse.rewrite(new URL("/404", request.url));
   }
   if (((_e = routeResult == null ? void 0 : routeResult.route) == null ? void 0 : _e.type) === "redirect") {
     return handleRedirect({ request, route: routeResult.route });
@@ -5664,6 +5670,7 @@ var handleRouteRequest = async ({
     searchParams: request.nextUrl.searchParams,
     isDraftModeEnabled: draftModeEnabled
   });
+  const isPrefetch = isPrefetchRequest(request);
   const { components, rules } = await extractAndEvaluateRunnables({
     composition: route.compositionApiResponse.composition,
     routePath,
@@ -5681,7 +5688,8 @@ var handleRouteRequest = async ({
       searchParams: request.nextUrl.searchParams,
       isDraftModeEnabled: true
       // this is checked above
-    })
+    }),
+    isPrefetch
   });
   const pageState = {
     routePath,
@@ -5695,7 +5703,8 @@ var handleRouteRequest = async ({
     }),
     previewMode,
     rules,
-    locale: options.locale
+    locale: options.locale,
+    isPrefetch: isPrefetch || void 0
   };
   const code = (0, import_next_app_router_shared5.serializeEvaluationResult)({
     payload: pageState
@@ -5715,6 +5724,9 @@ var handleRouteRequest = async ({
     headers
   });
 };
+var isPrefetchRequest = (request) => {
+  return request.headers.has("next-url");
+};
 var extractAndEvaluateRunnables = async ({
   composition,
   routePath,
@@ -5725,12 +5737,14 @@ var extractAndEvaluateRunnables = async ({
   releaseId,
   defaultConsent,
   keys,
-  previewMode
+  previewMode,
+  isPrefetch
 }) => {
   const extracted = extractRunnables(composition);
   const result = await evaluateRunnables({
     runnables: extracted,
     context,
+    isPrefetch,
     compositionContext: {
       _id: composition._id,
       type: composition.type,
@@ -5748,7 +5762,8 @@ var extractAndEvaluateRunnables = async ({
         defaultConsent,
         previewMode,
         rules: void 0,
-        locale: void 0
+        locale: void 0,
+        isPrefetch: isPrefetch || void 0
       }
     }
   });

package/dist/middleware.mjs

@@ -3039,7 +3039,8 @@ import {
 var evaluateRunnables = async ({
   runnables,
   context,
-  compositionContext
+  compositionContext,
+  isPrefetch
 }) => {
   var _a;
   const result = {
@@ -3049,6 +3050,9 @@ var evaluateRunnables = async ({
   const runnablesToProcess = runnables.filter((item2) => item2.variantId === void 0);
   let item;
   while (item = runnablesToProcess.shift()) {
+    if (item.type === "test" && isPrefetch) {
+      continue;
+    }
     if (item.type === "test") {
       const testResult = evaluateTest({
         context,
@@ -5554,7 +5558,8 @@ var handlePlaygroundRequest = async ({
       searchParams: request.nextUrl.searchParams,
       isDraftModeEnabled: true
       // this is checked above
-    })
+    }),
+    isPrefetch: false
   });
   const pageState = {
     routePath: id,
@@ -5572,7 +5577,8 @@ var handlePlaygroundRequest = async ({
       // this is checked above
     }),
     rules,
-    locale: options.locale
+    locale: options.locale,
+    isPrefetch: void 0
   };
   const code = serializeEvaluationResult({
     payload: pageState
@@ -5621,7 +5627,7 @@ var handleRouteRequest = async ({
     })
   ]);
   if (!(routeResult == null ? void 0 : routeResult.route) || ((_d = routeResult == null ? void 0 : routeResult.route) == null ? void 0 : _d.type) === "notFound") {
-    return NextResponse.next();
+    return NextResponse.rewrite(new URL("/404", request.url));
   }
   if (((_e = routeResult == null ? void 0 : routeResult.route) == null ? void 0 : _e.type) === "redirect") {
     return handleRedirect({ request, route: routeResult.route });
@@ -5656,6 +5662,7 @@ var handleRouteRequest = async ({
     searchParams: request.nextUrl.searchParams,
     isDraftModeEnabled: draftModeEnabled
   });
+  const isPrefetch = isPrefetchRequest(request);
   const { components, rules } = await extractAndEvaluateRunnables({
     composition: route.compositionApiResponse.composition,
     routePath,
@@ -5673,7 +5680,8 @@ var handleRouteRequest = async ({
       searchParams: request.nextUrl.searchParams,
       isDraftModeEnabled: true
       // this is checked above
-    })
+    }),
+    isPrefetch
   });
   const pageState = {
     routePath,
@@ -5687,7 +5695,8 @@ var handleRouteRequest = async ({
     }),
     previewMode,
     rules,
-    locale: options.locale
+    locale: options.locale,
+    isPrefetch: isPrefetch || void 0
   };
   const code = serializeEvaluationResult({
     payload: pageState
@@ -5707,6 +5716,9 @@ var handleRouteRequest = async ({
     headers
   });
 };
+var isPrefetchRequest = (request) => {
+  return request.headers.has("next-url");
+};
 var extractAndEvaluateRunnables = async ({
   composition,
   routePath,
@@ -5717,12 +5729,14 @@ var extractAndEvaluateRunnables = async ({
   releaseId,
   defaultConsent,
   keys,
-  previewMode
+  previewMode,
+  isPrefetch
 }) => {
   const extracted = extractRunnables(composition);
   const result = await evaluateRunnables({
     runnables: extracted,
     context,
+    isPrefetch,
     compositionContext: {
       _id: composition._id,
       type: composition.type,
@@ -5740,7 +5754,8 @@ var extractAndEvaluateRunnables = async ({
         defaultConsent,
         previewMode,
         rules: void 0,
-        locale: void 0
+        locale: void 0,
+        isPrefetch: isPrefetch || void 0
       }
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/next-app-router",
-  "version": "20.50.0",
+  "version": "20.50.1-alpha.16+940a311ed2",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "build": "tsup",
@@ -99,12 +99,12 @@
     "vitest": "3.2.4"
   },
   "dependencies": {
-    "@uniformdev/canvas-react": "20.50.0",
-    "@uniformdev/next-app-router-client": "20.50.0",
-    "@uniformdev/next-app-router-shared": "20.50.0",
-    "@uniformdev/redirect": "20.50.0",
-    "@uniformdev/richtext": "20.50.0",
-    "@uniformdev/webhooks": "20.50.0",
+    "@uniformdev/canvas-react": "20.50.1-alpha.16+940a311ed2",
+    "@uniformdev/next-app-router-client": "20.50.1-alpha.16+940a311ed2",
+    "@uniformdev/next-app-router-shared": "20.50.1-alpha.16+940a311ed2",
+    "@uniformdev/redirect": "20.50.1-alpha.16+940a311ed2",
+    "@uniformdev/richtext": "20.50.1-alpha.16+940a311ed2",
+    "@uniformdev/webhooks": "20.50.1-alpha.16+940a311ed2",
     "@vercel/functions": "^2.2.2",
     "encoding": "^0.1.13",
     "server-only": "^0.0.1",
@@ -121,5 +121,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "58f9d804c4f3e01abea765fa69202b540427e999"
+  "gitHead": "940a311ed2ab119a1d58fc652a91e1818fe746e8"
 }