@uniformdev/next-app-router 20.70.0 → 20.70.1-alpha.6

package/dist/cache.js

@@ -176,12 +176,12 @@ var ApiClientError = class _ApiClientError extends Error {
       `${errorMessage}
  ${statusCode}${statusText ? " " + statusText : ""} (${fetchMethod} ${fetchUri}${requestId ? ` Request ID: ${requestId}` : ""})`
     );
-    this.errorMessage = errorMessage;
-    this.fetchMethod = fetchMethod;
-    this.fetchUri = fetchUri;
-    this.statusCode = statusCode;
-    this.statusText = statusText;
-    this.requestId = requestId;
+    __publicField(this, "errorMessage", errorMessage);
+    __publicField(this, "fetchMethod", fetchMethod);
+    __publicField(this, "fetchUri", fetchUri);
+    __publicField(this, "statusCode", statusCode);
+    __publicField(this, "statusText", statusText);
+    __publicField(this, "requestId", requestId);
     Object.setPrototypeOf(this, _ApiClientError.prototype);
   }
 };

package/dist/cache.mjs

@@ -163,12 +163,12 @@ var ApiClientError = class _ApiClientError extends Error {
       `${errorMessage}
  ${statusCode}${statusText ? " " + statusText : ""} (${fetchMethod} ${fetchUri}${requestId ? ` Request ID: ${requestId}` : ""})`
     );
-    this.errorMessage = errorMessage;
-    this.fetchMethod = fetchMethod;
-    this.fetchUri = fetchUri;
-    this.statusCode = statusCode;
-    this.statusText = statusText;
-    this.requestId = requestId;
+    __publicField(this, "errorMessage", errorMessage);
+    __publicField(this, "fetchMethod", fetchMethod);
+    __publicField(this, "fetchUri", fetchUri);
+    __publicField(this, "statusCode", statusCode);
+    __publicField(this, "statusText", statusText);
+    __publicField(this, "requestId", requestId);
     Object.setPrototypeOf(this, _ApiClientError.prototype);
   }
 };

package/dist/component.js

@@ -231,12 +231,12 @@ var ApiClientError = class _ApiClientError extends Error {
       `${errorMessage}
  ${statusCode}${statusText ? " " + statusText : ""} (${fetchMethod} ${fetchUri}${requestId ? ` Request ID: ${requestId}` : ""})`
     );
-    this.errorMessage = errorMessage;
-    this.fetchMethod = fetchMethod;
-    this.fetchUri = fetchUri;
-    this.statusCode = statusCode;
-    this.statusText = statusText;
-    this.requestId = requestId;
+    __publicField(this, "errorMessage", errorMessage);
+    __publicField(this, "fetchMethod", fetchMethod);
+    __publicField(this, "fetchUri", fetchUri);
+    __publicField(this, "statusCode", statusCode);
+    __publicField(this, "statusText", statusText);
+    __publicField(this, "requestId", requestId);
     Object.setPrototypeOf(this, _ApiClientError.prototype);
   }
 };

package/dist/component.mjs

@@ -216,12 +216,12 @@ var ApiClientError = class _ApiClientError extends Error {
       `${errorMessage}
  ${statusCode}${statusText ? " " + statusText : ""} (${fetchMethod} ${fetchUri}${requestId ? ` Request ID: ${requestId}` : ""})`
     );
-    this.errorMessage = errorMessage;
-    this.fetchMethod = fetchMethod;
-    this.fetchUri = fetchUri;
-    this.statusCode = statusCode;
-    this.statusText = statusText;
-    this.requestId = requestId;
+    __publicField(this, "errorMessage", errorMessage);
+    __publicField(this, "fetchMethod", fetchMethod);
+    __publicField(this, "fetchUri", fetchUri);
+    __publicField(this, "statusCode", statusCode);
+    __publicField(this, "statusText", statusText);
+    __publicField(this, "requestId", requestId);
     Object.setPrototypeOf(this, _ApiClientError.prototype);
   }
 };

package/dist/handler.js

@@ -175,12 +175,12 @@ var ApiClientError = class _ApiClientError extends Error {
       `${errorMessage}
  ${statusCode}${statusText ? " " + statusText : ""} (${fetchMethod} ${fetchUri}${requestId ? ` Request ID: ${requestId}` : ""})`
     );
-    this.errorMessage = errorMessage;
-    this.fetchMethod = fetchMethod;
-    this.fetchUri = fetchUri;
-    this.statusCode = statusCode;
-    this.statusText = statusText;
-    this.requestId = requestId;
+    __publicField(this, "errorMessage", errorMessage);
+    __publicField(this, "fetchMethod", fetchMethod);
+    __publicField(this, "fetchUri", fetchUri);
+    __publicField(this, "statusCode", statusCode);
+    __publicField(this, "statusText", statusText);
+    __publicField(this, "requestId", requestId);
     Object.setPrototypeOf(this, _ApiClientError.prototype);
   }
 };

package/dist/handler.mjs

@@ -160,12 +160,12 @@ var ApiClientError = class _ApiClientError extends Error {
       `${errorMessage}
  ${statusCode}${statusText ? " " + statusText : ""} (${fetchMethod} ${fetchUri}${requestId ? ` Request ID: ${requestId}` : ""})`
     );
-    this.errorMessage = errorMessage;
-    this.fetchMethod = fetchMethod;
-    this.fetchUri = fetchUri;
-    this.statusCode = statusCode;
-    this.statusText = statusText;
-    this.requestId = requestId;
+    __publicField(this, "errorMessage", errorMessage);
+    __publicField(this, "fetchMethod", fetchMethod);
+    __publicField(this, "fetchUri", fetchUri);
+    __publicField(this, "statusCode", statusCode);
+    __publicField(this, "statusText", statusText);
+    __publicField(this, "requestId", requestId);
     Object.setPrototypeOf(this, _ApiClientError.prototype);
   }
 };

package/dist/index.esm.js

@@ -166,12 +166,12 @@ var ApiClientError = class _ApiClientError extends Error {
       `${errorMessage}
  ${statusCode}${statusText ? " " + statusText : ""} (${fetchMethod} ${fetchUri}${requestId ? ` Request ID: ${requestId}` : ""})`
     );
-    this.errorMessage = errorMessage;
-    this.fetchMethod = fetchMethod;
-    this.fetchUri = fetchUri;
-    this.statusCode = statusCode;
-    this.statusText = statusText;
-    this.requestId = requestId;
+    __publicField(this, "errorMessage", errorMessage);
+    __publicField(this, "fetchMethod", fetchMethod);
+    __publicField(this, "fetchUri", fetchUri);
+    __publicField(this, "statusCode", statusCode);
+    __publicField(this, "statusText", statusText);
+    __publicField(this, "requestId", requestId);
     Object.setPrototypeOf(this, _ApiClientError.prototype);
   }
 };
@@ -1194,15 +1194,15 @@ var CanvasClient = class extends ApiClient {
   /** Updates or creates a Canvas component definition */
   async updateComposition(body, options) {
     const fetchUri = this.createUrl(CANVAS_URL);
-    const headers = {};
+    const headers2 = {};
     if (options == null ? void 0 : options.ifUnmodifiedSince) {
-      headers["x-if-unmodified-since"] = options.ifUnmodifiedSince;
+      headers2["x-if-unmodified-since"] = options.ifUnmodifiedSince;
     }
     const { response } = await this.apiClientWithResponse(fetchUri, {
       method: "PUT",
       body: JSON.stringify({ ...body, projectId: this.options.projectId }),
       expectNoContent: true,
-      headers
+      headers: headers2
     });
     return { modified: response.headers.get("x-modified-at") };
   }
@@ -1294,15 +1294,15 @@ var _ContentClient = class _ContentClient2 extends ApiClient {
   }
   async upsertEntry(body, options) {
     const fetchUri = this.createUrl(__privateGet2(_ContentClient2, _entriesUrl));
-    const headers = {};
+    const headers2 = {};
     if (options == null ? void 0 : options.ifUnmodifiedSince) {
-      headers["x-if-unmodified-since"] = options.ifUnmodifiedSince;
+      headers2["x-if-unmodified-since"] = options.ifUnmodifiedSince;
     }
     const { response } = await this.apiClientWithResponse(fetchUri, {
       method: "PUT",
       body: JSON.stringify({ ...body, projectId: this.options.projectId }),
       expectNoContent: true,
-      headers
+      headers: headers2
     });
     return { modified: response.headers.get("x-modified-at") };
   }
@@ -2679,8 +2679,13 @@ import { ContextUpdateTransfer, Personalize, UniformScript } from "@uniformdev/n
 import {
   resolveRuleFromPageState
 } from "@uniformdev/next-app-router-shared";
+import { headers } from "next/headers";
 import { notFound } from "next/navigation";
-import React5, { createElement as createElement2, Fragment as Fragment3, Suspense as Suspense2 } from "react";
+import React5, { createElement as createElement2, Fragment as Fragment3, Suspense } from "react";
+
+// src/config/routeCode.ts
+var UNIFORM_DRAFT_SEGMENT = "__uniform_draft";
+var UNIFORM_DRAFT_CODE_HEADER = "x-uniform-code";
 
 // src/data/extract/extractTest.ts
 import { extractTestName } from "@uniformdev/next-app-router-shared";
@@ -2858,15 +2863,9 @@ var Test = ({ index, slots, test, component, context: compositionContext }) => {
 };
 
 // src/components/UniformCompositionWrapper.tsx
-import { deserializeEvaluationResult } from "@uniformdev/next-app-router-shared";
-import React2, { Fragment as Fragment2, Suspense } from "react";
-var UniformCompositionWrapper = ({
-  code,
-  children
-}) => {
-  const data = deserializeEvaluationResult({ input: code });
-  const WrapperComponent = data.compositionState === CANVAS_EDITOR_STATE || data.compositionState === CANVAS_DRAFT_STATE ? Suspense : Fragment2;
-  return /* @__PURE__ */ React2.createElement(WrapperComponent, null, children);
+import React2, { Fragment as Fragment2 } from "react";
+var UniformCompositionWrapper = ({ children }) => {
+  return /* @__PURE__ */ React2.createElement(Fragment2, null, children);
 };
 
 // src/components/UniformContext.tsx
@@ -2964,8 +2963,16 @@ async function UniformCompositionInner({
   dataClient
 }) {
   var _a, _b;
+  let effectiveCode = code;
+  if (code === UNIFORM_DRAFT_SEGMENT) {
+    const draftCode = (await headers()).get(UNIFORM_DRAFT_CODE_HEADER);
+    if (!draftCode) {
+      notFound();
+    }
+    effectiveCode = draftCode;
+  }
   const result = await resolveRoute({
-    code,
+    code: effectiveCode,
     dataClient
   });
   if (!(result == null ? void 0 : result.route) || ((_a = result == null ? void 0 : result.route) == null ? void 0 : _a.type) !== "composition") {
@@ -3000,12 +3007,12 @@ async function UniformCompositionInner({
     composition,
     compositionContext
   });
-  return /* @__PURE__ */ React5.createElement(React5.Fragment, null, resolved, /* @__PURE__ */ React5.createElement(Suspense2, null, /* @__PURE__ */ React5.createElement(
+  return /* @__PURE__ */ React5.createElement(React5.Fragment, null, resolved, /* @__PURE__ */ React5.createElement(Suspense, null, /* @__PURE__ */ React5.createElement(
     UniformContext,
     {
       clientContextComponent,
       result: {
-        code,
+        code: effectiveCode,
         pageState,
         route
       }
@@ -3088,7 +3095,7 @@ var resolveComponents = ({
     let element = null;
     if (wrapInSuspense) {
       element = createElement2(
-        Suspense2,
+        Suspense,
         {
           key,
           fallback: typeof wrapInSuspense === "boolean" || typeof (wrapInSuspense == null ? void 0 : wrapInSuspense.fallback) === "undefined" ? void 0 : createElement2(wrapInSuspense.fallback)
@@ -3263,9 +3270,9 @@ import { draftMode } from "next/headers";
 import React6 from "react";
 
 // src/data/resolvePlaygroundRoute.ts
-import { deserializeEvaluationResult as deserializeEvaluationResult2 } from "@uniformdev/next-app-router-shared";
+import { deserializeEvaluationResult } from "@uniformdev/next-app-router-shared";
 var resolvePlaygroundRoute = async ({ code }) => {
-  const pageState = deserializeEvaluationResult2({ input: code });
+  const pageState = deserializeEvaluationResult({ input: code });
   const canvasClient = getCanvasClient({
     cache: {
       type: "no-cache"
@@ -3899,12 +3906,12 @@ var precomputeComposition = ({
 };
 
 // src/data/resolveRouteFromCode.ts
-import { deserializeEvaluationResult as deserializeEvaluationResult3 } from "@uniformdev/next-app-router-shared";
+import { deserializeEvaluationResult as deserializeEvaluationResult2 } from "@uniformdev/next-app-router-shared";
 var resolveRouteFromCode = async ({
   code,
   dataClient: providedDataClient
 }) => {
-  const pageState = deserializeEvaluationResult3({ input: code });
+  const pageState = deserializeEvaluationResult2({ input: code });
   const dataClient = providedDataClient != null ? providedDataClient : new DefaultDataClient();
   const { route } = await dataClient.getRoute({
     source: "pageState",

package/dist/index.js

@@ -149,8 +149,8 @@ var require_p_limit = __commonJS({
 });
 
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   DefaultDataClient: () => DefaultDataClient,
   UniformComposition: () => UniformComposition,
   UniformPlayground: () => UniformPlayground,
@@ -169,7 +169,7 @@ __export(src_exports, {
   resolveRouteFromCode: () => resolveRouteFromCode,
   serverContext: () => serverContext
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 var import_server_only5 = require("server-only");
 
 // src/clients/canvas.ts
@@ -193,12 +193,12 @@ var ApiClientError = class _ApiClientError extends Error {
       `${errorMessage}
  ${statusCode}${statusText ? " " + statusText : ""} (${fetchMethod} ${fetchUri}${requestId ? ` Request ID: ${requestId}` : ""})`
     );
-    this.errorMessage = errorMessage;
-    this.fetchMethod = fetchMethod;
-    this.fetchUri = fetchUri;
-    this.statusCode = statusCode;
-    this.statusText = statusText;
-    this.requestId = requestId;
+    __publicField(this, "errorMessage", errorMessage);
+    __publicField(this, "fetchMethod", fetchMethod);
+    __publicField(this, "fetchUri", fetchUri);
+    __publicField(this, "statusCode", statusCode);
+    __publicField(this, "statusText", statusText);
+    __publicField(this, "requestId", requestId);
     Object.setPrototypeOf(this, _ApiClientError.prototype);
   }
 };
@@ -1221,15 +1221,15 @@ var CanvasClient = class extends ApiClient {
   /** Updates or creates a Canvas component definition */
   async updateComposition(body, options) {
     const fetchUri = this.createUrl(CANVAS_URL);
-    const headers = {};
+    const headers2 = {};
     if (options == null ? void 0 : options.ifUnmodifiedSince) {
-      headers["x-if-unmodified-since"] = options.ifUnmodifiedSince;
+      headers2["x-if-unmodified-since"] = options.ifUnmodifiedSince;
     }
     const { response } = await this.apiClientWithResponse(fetchUri, {
       method: "PUT",
       body: JSON.stringify({ ...body, projectId: this.options.projectId }),
       expectNoContent: true,
-      headers
+      headers: headers2
     });
     return { modified: response.headers.get("x-modified-at") };
   }
@@ -1321,15 +1321,15 @@ var _ContentClient = class _ContentClient2 extends ApiClient {
   }
   async upsertEntry(body, options) {
     const fetchUri = this.createUrl(__privateGet2(_ContentClient2, _entriesUrl));
-    const headers = {};
+    const headers2 = {};
     if (options == null ? void 0 : options.ifUnmodifiedSince) {
-      headers["x-if-unmodified-since"] = options.ifUnmodifiedSince;
+      headers2["x-if-unmodified-since"] = options.ifUnmodifiedSince;
     }
     const { response } = await this.apiClientWithResponse(fetchUri, {
       method: "PUT",
       body: JSON.stringify({ ...body, projectId: this.options.projectId }),
       expectNoContent: true,
-      headers
+      headers: headers2
     });
     return { modified: response.headers.get("x-modified-at") };
   }
@@ -2703,10 +2703,15 @@ var getRouteClient = (options) => {
 // src/components/UniformComposition.tsx
 var import_core = require("@uniformdev/canvas-react/core");
 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_next_app_router_shared3 = require("@uniformdev/next-app-router-shared");
+var import_headers = require("next/headers");
 var import_navigation = require("next/navigation");
 var import_react6 = __toESM(require("react"));
 
+// src/config/routeCode.ts
+var UNIFORM_DRAFT_SEGMENT = "__uniform_draft";
+var UNIFORM_DRAFT_CODE_HEADER = "x-uniform-code";
+
 // src/data/extract/extractTest.ts
 var import_next_app_router_shared = require("@uniformdev/next-app-router-shared");
 var extractTest = ({ component }) => {
@@ -2881,15 +2886,9 @@ var Test = ({ index, slots, test, component, context: compositionContext }) => {
 };
 
 // src/components/UniformCompositionWrapper.tsx
-var import_next_app_router_shared3 = require("@uniformdev/next-app-router-shared");
 var import_react3 = __toESM(require("react"));
-var UniformCompositionWrapper = ({
-  code,
-  children
-}) => {
-  const data = (0, import_next_app_router_shared3.deserializeEvaluationResult)({ input: code });
-  const WrapperComponent = data.compositionState === CANVAS_EDITOR_STATE || data.compositionState === CANVAS_DRAFT_STATE ? import_react3.Suspense : import_react3.Fragment;
-  return /* @__PURE__ */ import_react3.default.createElement(WrapperComponent, null, children);
+var UniformCompositionWrapper = ({ children }) => {
+  return /* @__PURE__ */ import_react3.default.createElement(import_react3.Fragment, null, children);
 };
 
 // src/components/UniformContext.tsx
@@ -2987,8 +2986,16 @@ async function UniformCompositionInner({
   dataClient
 }) {
   var _a, _b;
+  let effectiveCode = code;
+  if (code === UNIFORM_DRAFT_SEGMENT) {
+    const draftCode = (await (0, import_headers.headers)()).get(UNIFORM_DRAFT_CODE_HEADER);
+    if (!draftCode) {
+      (0, import_navigation.notFound)();
+    }
+    effectiveCode = draftCode;
+  }
   const result = await resolveRoute({
-    code,
+    code: effectiveCode,
     dataClient
   });
   if (!(result == null ? void 0 : result.route) || ((_a = result == null ? void 0 : result.route) == null ? void 0 : _a.type) !== "composition") {
@@ -3028,7 +3035,7 @@ async function UniformCompositionInner({
     {
       clientContextComponent,
       result: {
-        code,
+        code: effectiveCode,
         pageState,
         route
       }
@@ -3167,7 +3174,7 @@ var resolveComponents = ({
       childNode = elements;
     }
     if (visibilityRules) {
-      const isVisible = (0, import_next_app_router_shared4.resolveRuleFromPageState)({
+      const isVisible = (0, import_next_app_router_shared3.resolveRuleFromPageState)({
         pageState,
         rule: visibilityRules
       });
@@ -3282,13 +3289,13 @@ var resolveSlots = ({
 };
 
 // src/components/UniformPlayground.tsx
-var import_headers = require("next/headers");
+var import_headers2 = require("next/headers");
 var import_react7 = __toESM(require("react"));
 
 // src/data/resolvePlaygroundRoute.ts
-var import_next_app_router_shared5 = require("@uniformdev/next-app-router-shared");
+var import_next_app_router_shared4 = require("@uniformdev/next-app-router-shared");
 var resolvePlaygroundRoute = async ({ code }) => {
-  const pageState = (0, import_next_app_router_shared5.deserializeEvaluationResult)({ input: code });
+  const pageState = (0, import_next_app_router_shared4.deserializeEvaluationResult)({ input: code });
   const canvasClient = getCanvasClient({
     cache: {
       type: "no-cache"
@@ -3327,7 +3334,7 @@ var resolvePlaygroundRoute = async ({ code }) => {
 
 // src/components/UniformPlayground.tsx
 var UniformPlayground = async ({ resolveRoute, ...rest }) => {
-  const isDraftMode = (await (0, import_headers.draftMode)()).isEnabled;
+  const isDraftMode = (await (0, import_headers2.draftMode)()).isEnabled;
   if (!isDraftMode) {
     return /* @__PURE__ */ import_react7.default.createElement("div", null, /* @__PURE__ */ import_react7.default.createElement("h1", null, "Playground is only available in draft mode"));
   }
@@ -3335,18 +3342,18 @@ var UniformPlayground = async ({ resolveRoute, ...rest }) => {
 };
 
 // src/components/generateStaticParams.ts
-var import_next_app_router_shared8 = require("@uniformdev/next-app-router-shared");
+var import_next_app_router_shared7 = require("@uniformdev/next-app-router-shared");
 
 // src/data/extract/extractRunnables.ts
-var import_next_app_router_shared7 = require("@uniformdev/next-app-router-shared");
+var import_next_app_router_shared6 = require("@uniformdev/next-app-router-shared");
 
 // src/data/extract/extractPersonalization.ts
-var import_next_app_router_shared6 = require("@uniformdev/next-app-router-shared");
+var import_next_app_router_shared5 = require("@uniformdev/next-app-router-shared");
 var extractPersonalization = ({
   component
 }) => {
   var _a, _b, _c;
-  const trackingEventName = (0, import_next_app_router_shared6.extractPersonalizationName)({ component });
+  const trackingEventName = (0, import_next_app_router_shared5.extractPersonalizationName)({ component });
   const countParameter = (_a = component.parameters) == null ? void 0 : _a.count;
   const algorithmParameter = (_b = component.parameters) == null ? void 0 : _b.algorithm;
   const count = countParameter == null ? void 0 : countParameter.value;
@@ -3418,7 +3425,7 @@ var extractRunnables = (composition) => {
       if (visibilityRules) {
         runnable.push({
           type: "visibility",
-          _id: (0, import_next_app_router_shared7.getRuleId)(visibilityRules),
+          _id: (0, import_next_app_router_shared6.getRuleId)(visibilityRules),
           variantId: findAncestorVariant(node.ancestorsAndSelf),
           rules: visibilityRules
         });
@@ -3645,7 +3652,7 @@ var generatePossiblePageStates = ({
   };
   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, allComponentIds }));
+  return allStates.map((payload) => (0, import_next_app_router_shared7.serializeEvaluationResult)({ payload, allComponentIds }));
 };
 function permutationsWithoutRepetition(options, k) {
   if (k === 0) return [[]];
@@ -3848,16 +3855,16 @@ var expireMiddlewareCacheTag = async (tag) => {
 };
 
 // src/data/precomputeComposition.ts
-var import_next_app_router_shared9 = require("@uniformdev/next-app-router-shared");
+var import_next_app_router_shared8 = require("@uniformdev/next-app-router-shared");
 var shouldEvaluateTest = (test, evaluateTests) => {
   return typeof evaluateTests === "function" ? evaluateTests({
-    name: (0, import_next_app_router_shared9.extractTestName)({ component: test }),
+    name: (0, import_next_app_router_shared8.extractTestName)({ component: test }),
     component: test
   }) : evaluateTests;
 };
 var shouldEvaluatePersonalization = (personalization, evaluatePersonalizations) => {
   const result = typeof evaluatePersonalizations === "function" ? evaluatePersonalizations({
-    name: (0, import_next_app_router_shared9.extractPersonalizationName)({ component: personalization }),
+    name: (0, import_next_app_router_shared8.extractPersonalizationName)({ component: personalization }),
     component: personalization
   }) : evaluatePersonalizations;
   return result;
@@ -3875,7 +3882,7 @@ var precomputeComposition = ({
     var _a, _b;
     if (node.type === "component") {
       const component = node.node;
-      const pageStateComponent = (0, import_next_app_router_shared9.resolveComponentFromPageState)({
+      const pageStateComponent = (0, import_next_app_router_shared8.resolveComponentFromPageState)({
         pageState,
         componentId: component._id
       });
@@ -3916,12 +3923,12 @@ var precomputeComposition = ({
 };
 
 // src/data/resolveRouteFromCode.ts
-var import_next_app_router_shared10 = require("@uniformdev/next-app-router-shared");
+var import_next_app_router_shared9 = require("@uniformdev/next-app-router-shared");
 var resolveRouteFromCode = async ({
   code,
   dataClient: providedDataClient
 }) => {
-  const pageState = (0, import_next_app_router_shared10.deserializeEvaluationResult)({ input: code });
+  const pageState = (0, import_next_app_router_shared9.deserializeEvaluationResult)({ input: code });
   const dataClient = providedDataClient != null ? providedDataClient : new DefaultDataClient();
   const { route } = await dataClient.getRoute({
     source: "pageState",

package/dist/index.mjs

@@ -166,12 +166,12 @@ var ApiClientError = class _ApiClientError extends Error {
       `${errorMessage}
  ${statusCode}${statusText ? " " + statusText : ""} (${fetchMethod} ${fetchUri}${requestId ? ` Request ID: ${requestId}` : ""})`
     );
-    this.errorMessage = errorMessage;
-    this.fetchMethod = fetchMethod;
-    this.fetchUri = fetchUri;
-    this.statusCode = statusCode;
-    this.statusText = statusText;
-    this.requestId = requestId;
+    __publicField(this, "errorMessage", errorMessage);
+    __publicField(this, "fetchMethod", fetchMethod);
+    __publicField(this, "fetchUri", fetchUri);
+    __publicField(this, "statusCode", statusCode);
+    __publicField(this, "statusText", statusText);
+    __publicField(this, "requestId", requestId);
     Object.setPrototypeOf(this, _ApiClientError.prototype);
   }
 };
@@ -1194,15 +1194,15 @@ var CanvasClient = class extends ApiClient {
   /** Updates or creates a Canvas component definition */
   async updateComposition(body, options) {
     const fetchUri = this.createUrl(CANVAS_URL);
-    const headers = {};
+    const headers2 = {};
     if (options == null ? void 0 : options.ifUnmodifiedSince) {
-      headers["x-if-unmodified-since"] = options.ifUnmodifiedSince;
+      headers2["x-if-unmodified-since"] = options.ifUnmodifiedSince;
     }
     const { response } = await this.apiClientWithResponse(fetchUri, {
       method: "PUT",
       body: JSON.stringify({ ...body, projectId: this.options.projectId }),
       expectNoContent: true,
-      headers
+      headers: headers2
     });
     return { modified: response.headers.get("x-modified-at") };
   }
@@ -1294,15 +1294,15 @@ var _ContentClient = class _ContentClient2 extends ApiClient {
   }
   async upsertEntry(body, options) {
     const fetchUri = this.createUrl(__privateGet2(_ContentClient2, _entriesUrl));
-    const headers = {};
+    const headers2 = {};
     if (options == null ? void 0 : options.ifUnmodifiedSince) {
-      headers["x-if-unmodified-since"] = options.ifUnmodifiedSince;
+      headers2["x-if-unmodified-since"] = options.ifUnmodifiedSince;
     }
     const { response } = await this.apiClientWithResponse(fetchUri, {
       method: "PUT",
       body: JSON.stringify({ ...body, projectId: this.options.projectId }),
       expectNoContent: true,
-      headers
+      headers: headers2
     });
     return { modified: response.headers.get("x-modified-at") };
   }
@@ -2679,8 +2679,13 @@ import { ContextUpdateTransfer, Personalize, UniformScript } from "@uniformdev/n
 import {
   resolveRuleFromPageState
 } from "@uniformdev/next-app-router-shared";
+import { headers } from "next/headers";
 import { notFound } from "next/navigation";
-import React5, { createElement as createElement2, Fragment as Fragment3, Suspense as Suspense2 } from "react";
+import React5, { createElement as createElement2, Fragment as Fragment3, Suspense } from "react";
+
+// src/config/routeCode.ts
+var UNIFORM_DRAFT_SEGMENT = "__uniform_draft";
+var UNIFORM_DRAFT_CODE_HEADER = "x-uniform-code";
 
 // src/data/extract/extractTest.ts
 import { extractTestName } from "@uniformdev/next-app-router-shared";
@@ -2858,15 +2863,9 @@ var Test = ({ index, slots, test, component, context: compositionContext }) => {
 };
 
 // src/components/UniformCompositionWrapper.tsx
-import { deserializeEvaluationResult } from "@uniformdev/next-app-router-shared";
-import React2, { Fragment as Fragment2, Suspense } from "react";
-var UniformCompositionWrapper = ({
-  code,
-  children
-}) => {
-  const data = deserializeEvaluationResult({ input: code });
-  const WrapperComponent = data.compositionState === CANVAS_EDITOR_STATE || data.compositionState === CANVAS_DRAFT_STATE ? Suspense : Fragment2;
-  return /* @__PURE__ */ React2.createElement(WrapperComponent, null, children);
+import React2, { Fragment as Fragment2 } from "react";
+var UniformCompositionWrapper = ({ children }) => {
+  return /* @__PURE__ */ React2.createElement(Fragment2, null, children);
 };
 
 // src/components/UniformContext.tsx
@@ -2964,8 +2963,16 @@ async function UniformCompositionInner({
   dataClient
 }) {
   var _a, _b;
+  let effectiveCode = code;
+  if (code === UNIFORM_DRAFT_SEGMENT) {
+    const draftCode = (await headers()).get(UNIFORM_DRAFT_CODE_HEADER);
+    if (!draftCode) {
+      notFound();
+    }
+    effectiveCode = draftCode;
+  }
   const result = await resolveRoute({
-    code,
+    code: effectiveCode,
     dataClient
   });
   if (!(result == null ? void 0 : result.route) || ((_a = result == null ? void 0 : result.route) == null ? void 0 : _a.type) !== "composition") {
@@ -3000,12 +3007,12 @@ async function UniformCompositionInner({
     composition,
     compositionContext
   });
-  return /* @__PURE__ */ React5.createElement(React5.Fragment, null, resolved, /* @__PURE__ */ React5.createElement(Suspense2, null, /* @__PURE__ */ React5.createElement(
+  return /* @__PURE__ */ React5.createElement(React5.Fragment, null, resolved, /* @__PURE__ */ React5.createElement(Suspense, null, /* @__PURE__ */ React5.createElement(
     UniformContext,
     {
       clientContextComponent,
       result: {
-        code,
+        code: effectiveCode,
         pageState,
         route
       }
@@ -3088,7 +3095,7 @@ var resolveComponents = ({
     let element = null;
     if (wrapInSuspense) {
       element = createElement2(
-        Suspense2,
+        Suspense,
         {
           key,
           fallback: typeof wrapInSuspense === "boolean" || typeof (wrapInSuspense == null ? void 0 : wrapInSuspense.fallback) === "undefined" ? void 0 : createElement2(wrapInSuspense.fallback)
@@ -3263,9 +3270,9 @@ import { draftMode } from "next/headers";
 import React6 from "react";
 
 // src/data/resolvePlaygroundRoute.ts
-import { deserializeEvaluationResult as deserializeEvaluationResult2 } from "@uniformdev/next-app-router-shared";
+import { deserializeEvaluationResult } from "@uniformdev/next-app-router-shared";
 var resolvePlaygroundRoute = async ({ code }) => {
-  const pageState = deserializeEvaluationResult2({ input: code });
+  const pageState = deserializeEvaluationResult({ input: code });
   const canvasClient = getCanvasClient({
     cache: {
       type: "no-cache"
@@ -3899,12 +3906,12 @@ var precomputeComposition = ({
 };
 
 // src/data/resolveRouteFromCode.ts
-import { deserializeEvaluationResult as deserializeEvaluationResult3 } from "@uniformdev/next-app-router-shared";
+import { deserializeEvaluationResult as deserializeEvaluationResult2 } from "@uniformdev/next-app-router-shared";
 var resolveRouteFromCode = async ({
   code,
   dataClient: providedDataClient
 }) => {
-  const pageState = deserializeEvaluationResult3({ input: code });
+  const pageState = deserializeEvaluationResult2({ input: code });
   const dataClient = providedDataClient != null ? providedDataClient : new DefaultDataClient();
   const { route } = await dataClient.getRoute({
     source: "pageState",

package/dist/middleware.js

@@ -371,12 +371,12 @@ var ApiClientError = class _ApiClientError extends Error {
       `${errorMessage}
  ${statusCode}${statusText ? " " + statusText : ""} (${fetchMethod} ${fetchUri}${requestId ? ` Request ID: ${requestId}` : ""})`
     );
-    this.errorMessage = errorMessage;
-    this.fetchMethod = fetchMethod;
-    this.fetchUri = fetchUri;
-    this.statusCode = statusCode;
-    this.statusText = statusText;
-    this.requestId = requestId;
+    __publicField(this, "errorMessage", errorMessage);
+    __publicField(this, "fetchMethod", fetchMethod);
+    __publicField(this, "fetchUri", fetchUri);
+    __publicField(this, "statusCode", statusCode);
+    __publicField(this, "statusText", statusText);
+    __publicField(this, "requestId", requestId);
     Object.setPrototypeOf(this, _ApiClientError.prototype);
   }
 };
@@ -2655,6 +2655,10 @@ var getDisableSwrMiddlewareCache = () => {
   return false;
 };
 
+// src/config/routeCode.ts
+var UNIFORM_DRAFT_SEGMENT = "__uniform_draft";
+var UNIFORM_DRAFT_CODE_HEADER = "x-uniform-code";
+
 // src/data/client.ts
 var import_functions = require("@vercel/functions");
 
@@ -3163,7 +3167,7 @@ function dequal(foo, bar) {
   return foo !== foo && bar !== bar;
 }
 
-// ../../node_modules/.pnpm/js-cookie@3.0.7/node_modules/js-cookie/dist/js.cookie.mjs
+// ../../node_modules/.pnpm/js-cookie@3.0.8/node_modules/js-cookie/dist/js.cookie.mjs
 function assign(target) {
   for (var i = 1; i < arguments.length; i++) {
     var source = arguments[i];
@@ -3229,7 +3233,7 @@ function init(converter, defaultAttributes) {
         if (name === found) {
           break;
         }
-      } catch (e) {
+      } catch (_e) {
       }
     }
     return name ? jar[name] : jar;
@@ -4574,7 +4578,7 @@ var _LocalStorage_instances;
 var key_fn;
 var LocalStorage = class {
   constructor(partitionKey) {
-    this.partitionKey = partitionKey;
+    __publicField2(this, "partitionKey", partitionKey);
     __privateAdd4(this, _LocalStorage_instances);
     __publicField2(this, "inMemoryFallback", {});
     __publicField2(this, "hasLocalStorageObject", typeof document !== "undefined" && typeof localStorage !== "undefined");
@@ -5743,8 +5747,14 @@ var handleRouteRequest = async ({
     allComponentIds
   });
   let pathToRewriteTo = await (options.rewriteDestinationPath ? options.rewriteDestinationPath({ code, pageState, source: "route" }) : void 0);
+  let usedDraftStableSegment = false;
   if (!pathToRewriteTo) {
-    pathToRewriteTo = `/uniform/${code}`;
+    if (draftModeEnabled) {
+      pathToRewriteTo = `/uniform/${UNIFORM_DRAFT_SEGMENT}`;
+      usedDraftStableSegment = true;
+    } else {
+      pathToRewriteTo = `/uniform/${code}`;
+    }
   }
   const headers = new Headers();
   if (serializedQuirkCookie) {
@@ -5753,8 +5763,14 @@ var handleRouteRequest = async ({
       `${import_next_app_router_shared6.UNIFORM_MIDDLEWARE_QUIRK_COOKIE_NAME}=${serializedQuirkCookie}; Path=/; SameSite=Lax; Max-Age=10`
     );
   }
+  let requestHeaders;
+  if (usedDraftStableSegment) {
+    requestHeaders = new Headers(request.headers);
+    requestHeaders.set(UNIFORM_DRAFT_CODE_HEADER, code);
+  }
   return import_server.NextResponse.rewrite(new URL(pathToRewriteTo, request.nextUrl.origin), {
-    headers
+    headers,
+    ...requestHeaders ? { request: { headers: requestHeaders } } : {}
   });
 };
 var isPrefetchRequest = (request) => {
@@ -5900,5 +5916,5 @@ var determinePreviewMode = ({
 /*! Bundled license information:
 
 js-cookie/dist/js.cookie.mjs:
-  (*! js-cookie v3.0.7 | MIT *)
+  (*! js-cookie v3.0.8 | MIT *)
 */

package/dist/middleware.mjs

@@ -356,12 +356,12 @@ var ApiClientError = class _ApiClientError extends Error {
       `${errorMessage}
  ${statusCode}${statusText ? " " + statusText : ""} (${fetchMethod} ${fetchUri}${requestId ? ` Request ID: ${requestId}` : ""})`
     );
-    this.errorMessage = errorMessage;
-    this.fetchMethod = fetchMethod;
-    this.fetchUri = fetchUri;
-    this.statusCode = statusCode;
-    this.statusText = statusText;
-    this.requestId = requestId;
+    __publicField(this, "errorMessage", errorMessage);
+    __publicField(this, "fetchMethod", fetchMethod);
+    __publicField(this, "fetchUri", fetchUri);
+    __publicField(this, "statusCode", statusCode);
+    __publicField(this, "statusText", statusText);
+    __publicField(this, "requestId", requestId);
     Object.setPrototypeOf(this, _ApiClientError.prototype);
   }
 };
@@ -2642,6 +2642,10 @@ var getDisableSwrMiddlewareCache = () => {
   return false;
 };
 
+// src/config/routeCode.ts
+var UNIFORM_DRAFT_SEGMENT = "__uniform_draft";
+var UNIFORM_DRAFT_CODE_HEADER = "x-uniform-code";
+
 // src/data/client.ts
 import { getCache, waitUntil } from "@vercel/functions";
 
@@ -3155,7 +3159,7 @@ function dequal(foo, bar) {
   return foo !== foo && bar !== bar;
 }
 
-// ../../node_modules/.pnpm/js-cookie@3.0.7/node_modules/js-cookie/dist/js.cookie.mjs
+// ../../node_modules/.pnpm/js-cookie@3.0.8/node_modules/js-cookie/dist/js.cookie.mjs
 function assign(target) {
   for (var i = 1; i < arguments.length; i++) {
     var source = arguments[i];
@@ -3221,7 +3225,7 @@ function init(converter, defaultAttributes) {
         if (name === found) {
           break;
         }
-      } catch (e) {
+      } catch (_e) {
       }
     }
     return name ? jar[name] : jar;
@@ -4566,7 +4570,7 @@ var _LocalStorage_instances;
 var key_fn;
 var LocalStorage = class {
   constructor(partitionKey) {
-    this.partitionKey = partitionKey;
+    __publicField2(this, "partitionKey", partitionKey);
     __privateAdd4(this, _LocalStorage_instances);
     __publicField2(this, "inMemoryFallback", {});
     __publicField2(this, "hasLocalStorageObject", typeof document !== "undefined" && typeof localStorage !== "undefined");
@@ -5735,8 +5739,14 @@ var handleRouteRequest = async ({
     allComponentIds
   });
   let pathToRewriteTo = await (options.rewriteDestinationPath ? options.rewriteDestinationPath({ code, pageState, source: "route" }) : void 0);
+  let usedDraftStableSegment = false;
   if (!pathToRewriteTo) {
-    pathToRewriteTo = `/uniform/${code}`;
+    if (draftModeEnabled) {
+      pathToRewriteTo = `/uniform/${UNIFORM_DRAFT_SEGMENT}`;
+      usedDraftStableSegment = true;
+    } else {
+      pathToRewriteTo = `/uniform/${code}`;
+    }
   }
   const headers = new Headers();
   if (serializedQuirkCookie) {
@@ -5745,8 +5755,14 @@ var handleRouteRequest = async ({
       `${UNIFORM_MIDDLEWARE_QUIRK_COOKIE_NAME}=${serializedQuirkCookie}; Path=/; SameSite=Lax; Max-Age=10`
     );
   }
+  let requestHeaders;
+  if (usedDraftStableSegment) {
+    requestHeaders = new Headers(request.headers);
+    requestHeaders.set(UNIFORM_DRAFT_CODE_HEADER, code);
+  }
   return NextResponse.rewrite(new URL(pathToRewriteTo, request.nextUrl.origin), {
-    headers
+    headers,
+    ...requestHeaders ? { request: { headers: requestHeaders } } : {}
   });
 };
 var isPrefetchRequest = (request) => {
@@ -5891,5 +5907,5 @@ export {
 /*! Bundled license information:
 
 js-cookie/dist/js.cookie.mjs:
-  (*! js-cookie v3.0.7 | MIT *)
+  (*! js-cookie v3.0.8 | MIT *)
 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/next-app-router",
-  "version": "20.70.0",
+  "version": "20.70.1-alpha.6+9aeb4f32ae",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "build": "tsup",
@@ -87,27 +87,27 @@
     "/dist"
   ],
   "devDependencies": {
-    "@types/node": "20.19.25",
-    "@types/react": "19.0.8",
-    "@types/react-dom": "19.0.3",
-    "next": "16.2.3",
-    "react": "19.2.0",
-    "react-dom": "19.2.0",
-    "typescript": "5.9.2",
-    "vite-tsconfig-paths": "^5.1.4",
-    "vitest": "3.2.4"
+    "@types/node": "26.0.0",
+    "@types/react": "19.2.17",
+    "@types/react-dom": "19.2.3",
+    "next": "16.2.9",
+    "react": "19.2.1",
+    "react-dom": "19.2.1",
+    "typescript": "6.0.3",
+    "vite-tsconfig-paths": "^6.1.1",
+    "vitest": "4.1.9"
   },
   "dependencies": {
-    "@uniformdev/canvas-react": "20.70.0",
-    "@uniformdev/next-app-router-client": "20.70.0",
-    "@uniformdev/next-app-router-shared": "20.70.0",
-    "@uniformdev/redirect": "20.70.0",
-    "@uniformdev/richtext": "20.70.0",
-    "@uniformdev/webhooks": "20.70.0",
-    "@vercel/functions": "^2.2.2",
+    "@uniformdev/canvas-react": "20.70.1-alpha.6+9aeb4f32ae",
+    "@uniformdev/next-app-router-client": "20.70.1-alpha.6+9aeb4f32ae",
+    "@uniformdev/next-app-router-shared": "20.70.1-alpha.6+9aeb4f32ae",
+    "@uniformdev/redirect": "20.70.1-alpha.6+9aeb4f32ae",
+    "@uniformdev/richtext": "20.70.1-alpha.6+9aeb4f32ae",
+    "@uniformdev/webhooks": "20.70.1-alpha.6+9aeb4f32ae",
+    "@vercel/functions": "^3.7.2",
     "encoding": "^0.1.13",
     "server-only": "^0.0.1",
-    "svix": "^1.5.0"
+    "svix": "^1.96.0"
   },
   "engines": {
     "node": ">=20.9.0"
@@ -120,5 +120,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3f8f572b37fc7ea5d2f37b1425451973556f3392"
+  "gitHead": "9aeb4f32aeef86de9ce119eeb1516f5f8c6b6063"
 }