@uniformdev/canvas-next-rsc 20.7.1-alpha.12 → 20.7.1-alpha.120

package/LICENSE.txt

@@ -1,2 +1,2 @@
-© 2024 Uniform Systems, Inc. All Rights Reserved.
+© 2025 Uniform Systems, Inc. All Rights Reserved.
 See details of Uniform Systems, Inc. Master Subscription Agreement here: https://uniform.dev/eula

package/dist/config.d.mts

@@ -1,6 +1,13 @@
 import { NextConfig } from 'next';
 export { UniformServerConfig } from '@uniformdev/canvas-next-rsc-shared';
 
+/**
+ * Wraps the Next.js config to set up the Uniform server config alias.
+ * This enables the `uniform.server.config` import to resolve to the project's config file.
+ *
+ * @param nextConfig - The Next.js configuration object
+ * @returns The modified Next.js configuration with Uniform config alias set up
+ */
 declare const withUniformConfig: (nextConfig: NextConfig) => NextConfig;
 
 export { withUniformConfig };

package/dist/config.d.ts

@@ -1,6 +1,13 @@
 import { NextConfig } from 'next';
 export { UniformServerConfig } from '@uniformdev/canvas-next-rsc-shared';
 
+/**
+ * Wraps the Next.js config to set up the Uniform server config alias.
+ * This enables the `uniform.server.config` import to resolve to the project's config file.
+ *
+ * @param nextConfig - The Next.js configuration object
+ * @returns The modified Next.js configuration with Uniform config alias set up
+ */
 declare const withUniformConfig: (nextConfig: NextConfig) => NextConfig;
 
 export { withUniformConfig };

package/dist/config.js

@@ -47,34 +47,28 @@ var getConfigPath = () => {
   };
 };
 var withUniformConfig = (nextConfig) => {
-  var _a, _b, _c;
-  const { fileName: uniformConfigFileName } = getConfigPath() || {};
-  const turboResolveAliases = {
-    ...((_b = (_a = nextConfig.experimental) == null ? void 0 : _a.turbo) == null ? void 0 : _b.resolveAlias) || {}
+  var _a;
+  const { fileName: uniformConfigFileName, filePath: uniformConfigFilePath } = getConfigPath() || {};
+  const turbopackResolveAlias = {
+    ...(_a = nextConfig.turbopack) == null ? void 0 : _a.resolveAlias
   };
   if (uniformConfigFileName) {
-    console.log("(Turbo) Using Uniform config from", uniformConfigFileName);
-    turboResolveAliases["uniform.server.config"] = `./${uniformConfigFileName}`;
+    console.log("(Turbopack) Using Uniform config from", uniformConfigFileName);
+    turbopackResolveAlias["uniform.server.config"] = `./${uniformConfigFileName}`;
   }
   return {
     ...nextConfig,
-    experimental: {
-      ...nextConfig.experimental || {},
-      turbo: {
-        ...((_c = nextConfig.experimental) == null ? void 0 : _c.turbo) || {},
-        resolveAlias: turboResolveAliases
-      }
+    turbopack: {
+      ...nextConfig.turbopack,
+      resolveAlias: turbopackResolveAlias
     },
     webpack: (config, context) => {
       if (nextConfig.webpack) {
         nextConfig.webpack(config, context);
       }
-      if (context.isServer) {
-        const { filePath: uniformConfigPath } = getConfigPath() || {};
-        if (uniformConfigPath) {
-          console.log("Using Uniform config from", uniformConfigPath);
-          config.resolve.alias["uniform.server.config"] = (0, import_path.resolve)(config.context, uniformConfigPath);
-        }
+      if (context.isServer && uniformConfigFilePath) {
+        console.log("(Webpack) Using Uniform config from", uniformConfigFilePath);
+        config.resolve.alias["uniform.server.config"] = (0, import_path.resolve)(config.context, uniformConfigFilePath);
       }
       return config;
     }

package/dist/config.mjs

@@ -23,34 +23,28 @@ var getConfigPath = () => {
   };
 };
 var withUniformConfig = (nextConfig) => {
-  var _a, _b, _c;
-  const { fileName: uniformConfigFileName } = getConfigPath() || {};
-  const turboResolveAliases = {
-    ...((_b = (_a = nextConfig.experimental) == null ? void 0 : _a.turbo) == null ? void 0 : _b.resolveAlias) || {}
+  var _a;
+  const { fileName: uniformConfigFileName, filePath: uniformConfigFilePath } = getConfigPath() || {};
+  const turbopackResolveAlias = {
+    ...(_a = nextConfig.turbopack) == null ? void 0 : _a.resolveAlias
   };
   if (uniformConfigFileName) {
-    console.log("(Turbo) Using Uniform config from", uniformConfigFileName);
-    turboResolveAliases["uniform.server.config"] = `./${uniformConfigFileName}`;
+    console.log("(Turbopack) Using Uniform config from", uniformConfigFileName);
+    turbopackResolveAlias["uniform.server.config"] = `./${uniformConfigFileName}`;
   }
   return {
     ...nextConfig,
-    experimental: {
-      ...nextConfig.experimental || {},
-      turbo: {
-        ...((_c = nextConfig.experimental) == null ? void 0 : _c.turbo) || {},
-        resolveAlias: turboResolveAliases
-      }
+    turbopack: {
+      ...nextConfig.turbopack,
+      resolveAlias: turbopackResolveAlias
     },
     webpack: (config, context) => {
       if (nextConfig.webpack) {
         nextConfig.webpack(config, context);
       }
-      if (context.isServer) {
-        const { filePath: uniformConfigPath } = getConfigPath() || {};
-        if (uniformConfigPath) {
-          console.log("Using Uniform config from", uniformConfigPath);
-          config.resolve.alias["uniform.server.config"] = resolve(config.context, uniformConfigPath);
-        }
+      if (context.isServer && uniformConfigFilePath) {
+        console.log("(Webpack) Using Uniform config from", uniformConfigFilePath);
+        config.resolve.alias["uniform.server.config"] = resolve(config.context, uniformConfigFilePath);
       }
       return config;
     }

package/dist/handler.js

@@ -204,9 +204,18 @@ var env = {
 };
 
 // src/utils/tag.ts
+var encodePathForTag = (path) => {
+  return path.split("/").map((segment) => {
+    if (/[^\x00-\x7F]/.test(segment)) {
+      return encodeURIComponent(segment);
+    }
+    return segment;
+  }).join("/");
+};
 var buildPathTag = (path) => {
   const actualPath = path.startsWith("/") ? path : `/${path}`;
-  return `path:${actualPath}`.toLowerCase();
+  const encodedPath = encodePathForTag(actualPath);
+  return `path:${encodedPath}`.toLowerCase();
 };
 var buildCompositionTag = (compositionId) => {
   return `composition:${compositionId}`.toLowerCase();

package/dist/handler.mjs

@@ -171,9 +171,18 @@ var env = {
 };
 
 // src/utils/tag.ts
+var encodePathForTag = (path) => {
+  return path.split("/").map((segment) => {
+    if (/[^\x00-\x7F]/.test(segment)) {
+      return encodeURIComponent(segment);
+    }
+    return segment;
+  }).join("/");
+};
 var buildPathTag = (path) => {
   const actualPath = path.startsWith("/") ? path : `/${path}`;
-  return `path:${actualPath}`.toLowerCase();
+  const encodedPath = encodePathForTag(actualPath);
+  return `path:${encodedPath}`.toLowerCase();
 };
 var buildCompositionTag = (compositionId) => {
   return `composition:${compositionId}`.toLowerCase();

package/dist/index.d.mts

@@ -37,7 +37,7 @@ declare const getManifest: (options: Pick<CompositionContext, "searchParams">) =
                         clauses: ({
                             type: "G";
                             op?: "&" | "|";
-                            clauses: (any | ({
+                            clauses: (/*elided*/ any | ({
                                 type: "CK";
                                 cookieName: string;
                                 match: {

package/dist/index.d.ts

@@ -37,7 +37,7 @@ declare const getManifest: (options: Pick<CompositionContext, "searchParams">) =
                         clauses: ({
                             type: "G";
                             op?: "&" | "|";
-                            clauses: (any | ({
+                            clauses: (/*elided*/ any | ({
                                 type: "CK";
                                 cookieName: string;
                                 match: {

package/dist/index.esm.js

@@ -24,13 +24,12 @@ var isDraftModeEnabled = async ({
     draftModeEnabled = (await draftMode()).isEnabled;
   } catch (e) {
   }
-  return draftModeEnabled || isIncontextEditingEnabled({ searchParams });
+  return draftModeEnabled;
 };
 var isIncontextEditingEnabled = ({
   searchParams
 }) => {
-  const containsKey = typeof (searchParams == null ? void 0 : searchParams[IN_CONTEXT_EDITOR_QUERY_STRING_PARAM]) !== "undefined";
-  return containsKey;
+  return (searchParams == null ? void 0 : searchParams[IN_CONTEXT_EDITOR_QUERY_STRING_PARAM]) === "true";
 };
 var determinePreviewMode = ({
   searchParams
@@ -67,9 +66,6 @@ var shouldCacheBeDisabled = async (options) => {
   if (await isDraftModeEnabled(options)) {
     return { disabled: true, reason: "DRAFT" };
   }
-  if (isIncontextEditingEnabled(options)) {
-    return { disabled: true, reason: "INCONTEXT" };
-  }
   if (isDevelopmentEnvironment()) {
     return { disabled: true, reason: "DEV" };
   }
@@ -154,9 +150,18 @@ var env = {
 };
 
 // src/utils/tag.ts
+var encodePathForTag = (path) => {
+  return path.split("/").map((segment) => {
+    if (/[^\x00-\x7F]/.test(segment)) {
+      return encodeURIComponent(segment);
+    }
+    return segment;
+  }).join("/");
+};
 var buildPathTag = (path) => {
   const actualPath = path.startsWith("/") ? path : `/${path}`;
-  return `path:${actualPath}`.toLowerCase();
+  const encodedPath = encodePathForTag(actualPath);
+  return `path:${encodedPath}`.toLowerCase();
 };
 var buildCompositionTag = (compositionId) => {
   return `composition:${compositionId}`.toLowerCase();
@@ -529,10 +534,17 @@ var retrieveRoute = async ({ params, searchParams: providedSearchParams, skipPre
   let result;
   for (let i = 0; i < states.length; i++) {
     const state = states[i];
-    const releaseId = determineReleaseId({
+    const releaseIdFromSearchParams = await determineReleaseId({
       searchParams,
       state
     });
+    const releaseIdFromFetchOptions = fetchOptions == null ? void 0 : fetchOptions.releaseId;
+    if (releaseIdFromSearchParams && releaseIdFromFetchOptions && releaseIdFromSearchParams !== releaseIdFromFetchOptions) {
+      console.warn(
+        "retrieveRoute: releaseId provided in both searchParams and fetchOptions, using fetchOptions"
+      );
+    }
+    const releaseId = releaseIdFromFetchOptions != null ? releaseIdFromFetchOptions : releaseIdFromSearchParams;
     try {
       result = await retrieveRouteByPath({
         path: value,
@@ -597,23 +609,16 @@ var determineState = async ({ searchParams }) => {
     searchParams
   });
   const previewEnvironment = isOnVercelPreviewEnvironment();
-  const isDevelopment = isDevelopmentEnvironment();
   const isCanvasEditing = isIncontextEditingEnabled({
     searchParams
   });
-  let states;
-  if (isCanvasEditing) {
-    states = [CANVAS_EDITOR_STATE, CANVAS_DRAFT_STATE];
-  } else {
-    states = isDraftMode || previewEnvironment || isDevelopment ? [CANVAS_DRAFT_STATE] : [CANVAS_PUBLISHED_STATE];
-  }
-  return states;
+  return isDraftMode || previewEnvironment ? (isCanvasEditing ? [CANVAS_EDITOR_STATE] : []).concat([CANVAS_DRAFT_STATE]) : [CANVAS_PUBLISHED_STATE];
 };
-var determineReleaseId = ({
+var determineReleaseId = async ({
   searchParams,
   state
 }) => {
-  const draftMode2 = isDraftModeEnabled({
+  const draftMode2 = await isDraftModeEnabled({
     searchParams
   });
   if (!draftMode2 || state === CANVAS_PUBLISHED_STATE) {
@@ -631,19 +636,17 @@ var ContextUpdateTrigger = ({ path }) => {
 
 // src/components/PersonalizeClientWrapper.tsx
 import { PersonalizeClient } from "@uniformdev/canvas-next-rsc-client";
-import { runPersonalization } from "@uniformdev/canvas-next-rsc-shared";
 import React3 from "react";
-var PersonalizeClientWrapper = (props) => {
-  const { indexes } = runPersonalization({
-    ...props,
-    contextInstance: void 0
-  });
-  return /* @__PURE__ */ React3.createElement(PersonalizeClient, { ...props, indexes });
+var PersonalizeClientWrapper = ({
+  contextInstance,
+  ...props
+}) => {
+  return /* @__PURE__ */ React3.createElement(PersonalizeClient, { ...props, indexes: [] });
 };
 
 // src/components/PersonalizeServer.ts
 import { CANVAS_PERSONALIZE_SLOT } from "@uniformdev/canvas";
-import { runPersonalization as runPersonalization2 } from "@uniformdev/canvas-next-rsc-shared";
+import { runPersonalization } from "@uniformdev/canvas-next-rsc-shared";
 import { unstable_noStore as noStore } from "next/cache";
 import { createElement, Fragment } from "react";
 
@@ -660,7 +663,7 @@ var PersonalizeServer = (props) => {
   if ((_a = getServerConfig().ppr) == null ? void 0 : _a.personalizationSuspense) {
     noStore();
   }
-  const { indexes, event } = runPersonalization2(props);
+  const { indexes, event } = runPersonalization(props);
   const slot = (_b = props.slots) == null ? void 0 : _b[CANVAS_PERSONALIZE_SLOT];
   const components = indexes.map((index) => {
     const component = slot.items[index];
@@ -675,20 +678,14 @@ var PersonalizeServer = (props) => {
 
 // src/components/PersonalizeServerHybrid.tsx
 import { PersonalizeClient as PersonalizeClient2 } from "@uniformdev/canvas-next-rsc-client";
-import { runPersonalization as runPersonalization3 } from "@uniformdev/canvas-next-rsc-shared";
+import { runPersonalization as runPersonalization2 } from "@uniformdev/canvas-next-rsc-shared";
 import React5 from "react";
-var PersonalizeServerHybrid = (props) => {
-  const { indexes } = runPersonalization3(props);
-  return /* @__PURE__ */ React5.createElement(
-    PersonalizeClient2,
-    {
-      component: props.component,
-      count: props.count,
-      slots: props.slots,
-      trackingEventName: props.trackingEventName,
-      indexes
-    }
-  );
+var PersonalizeServerHybrid = ({
+  contextInstance,
+  ...props
+}) => {
+  const { indexes } = runPersonalization2({ ...props, contextInstance });
+  return /* @__PURE__ */ React5.createElement(PersonalizeClient2, { ...props, indexes });
 };
 
 // src/components/TestServer.ts
@@ -751,6 +748,7 @@ var UniformComposition = async ({
   route,
   ...props
 }) => {
+  var _a;
   let searchParams;
   let serverContext = void 0;
   if (props.mode === "static") {
@@ -775,10 +773,10 @@ var UniformComposition = async ({
   const state = route.compositionApiResponse.state;
   if (state === CANVAS_DRAFT_STATE2 || state === CANVAS_EDITOR_STATE2) {
     walkNodeTree(route.compositionApiResponse.composition, (node) => {
-      var _a, _b;
+      var _a2, _b;
       if (node.type === "component" && node.node.parameters) {
         const contextualEditing = node.node.parameters[CANVAS_CONTEXTUAL_EDITING_PARAM];
-        const editableFields = (_b = (_a = contextualEditing == null ? void 0 : contextualEditing.value) == null ? void 0 : _a.editableParameters) != null ? _b : [];
+        const editableFields = (_b = (_a2 = contextualEditing == null ? void 0 : contextualEditing.value) == null ? void 0 : _a2.editableParameters) != null ? _b : [];
         Object.keys(node.node.parameters).forEach((key) => {
           const parameter = node.node.parameters[key];
           if (parameter.type === "text") {
@@ -795,7 +793,8 @@ var UniformComposition = async ({
     composition: route.compositionApiResponse.composition,
     matchedRoute: route.matchedRoute,
     searchParams,
-    dynamicInputs: route.dynamicInputs,
+    // provide default non-undefined values to avoid serialization issues
+    dynamicInputs: (_a = route.dynamicInputs) != null ? _a : {},
     type: "composition",
     isContextualEditing: isIncontextEditingEnabled({ searchParams }),
     isDraftMode: await isDraftModeEnabled({ searchParams }),
@@ -827,6 +826,11 @@ var UniformComposition = async ({
           },
           {}
         ),
+        compositionMetadata: {
+          compositionId: route.compositionApiResponse.composition._id,
+          matchedRoute: route.matchedRoute,
+          dynamicInputs: route.dynamicInputs
+        },
         quirks: {
           "vc-country": headersValue.get("x-vercel-ip-country") || missingQuirkValue,
           "vc-region": headersValue.get("x-vercel-ip-country-region") || missingQuirkValue,
@@ -1146,7 +1150,8 @@ import { notFound as notFound2 } from "next/navigation";
 import React10 from "react";
 var UniformPlayground = async ({ searchParams, ...rest }) => {
   const awaitedSearchParams = await searchParams;
-  if (!isDraftModeEnabled({ searchParams: awaitedSearchParams })) {
+  const isDraftMode = await isDraftModeEnabled({ searchParams: awaitedSearchParams });
+  if (!isDraftMode) {
     return /* @__PURE__ */ React10.createElement("div", null, /* @__PURE__ */ React10.createElement("h1", null, "Playground is only available in draft mode"));
   }
   const id = awaitedSearchParams["id"];

package/dist/index.js

@@ -77,13 +77,12 @@ var isDraftModeEnabled = async ({
     draftModeEnabled = (await (0, import_headers.draftMode)()).isEnabled;
   } catch (e) {
   }
-  return draftModeEnabled || isIncontextEditingEnabled({ searchParams });
+  return draftModeEnabled;
 };
 var isIncontextEditingEnabled = ({
   searchParams
 }) => {
-  const containsKey = typeof (searchParams == null ? void 0 : searchParams[import_canvas.IN_CONTEXT_EDITOR_QUERY_STRING_PARAM]) !== "undefined";
-  return containsKey;
+  return (searchParams == null ? void 0 : searchParams[import_canvas.IN_CONTEXT_EDITOR_QUERY_STRING_PARAM]) === "true";
 };
 var determinePreviewMode = ({
   searchParams
@@ -120,9 +119,6 @@ var shouldCacheBeDisabled = async (options) => {
   if (await isDraftModeEnabled(options)) {
     return { disabled: true, reason: "DRAFT" };
   }
-  if (isIncontextEditingEnabled(options)) {
-    return { disabled: true, reason: "INCONTEXT" };
-  }
   if (isDevelopmentEnvironment()) {
     return { disabled: true, reason: "DEV" };
   }
@@ -207,9 +203,18 @@ var env = {
 };
 
 // src/utils/tag.ts
+var encodePathForTag = (path) => {
+  return path.split("/").map((segment) => {
+    if (/[^\x00-\x7F]/.test(segment)) {
+      return encodeURIComponent(segment);
+    }
+    return segment;
+  }).join("/");
+};
 var buildPathTag = (path) => {
   const actualPath = path.startsWith("/") ? path : `/${path}`;
-  return `path:${actualPath}`.toLowerCase();
+  const encodedPath = encodePathForTag(actualPath);
+  return `path:${encodedPath}`.toLowerCase();
 };
 var buildCompositionTag = (compositionId) => {
   return `composition:${compositionId}`.toLowerCase();
@@ -457,7 +462,7 @@ async function generateStaticParams() {
 // src/components/UniformComposition.ts
 var import_canvas8 = require("@uniformdev/canvas");
 var import_canvas_next_rsc_client8 = require("@uniformdev/canvas-next-rsc-client");
-var import_canvas_next_rsc_shared7 = require("@uniformdev/canvas-next-rsc-shared");
+var import_canvas_next_rsc_shared6 = require("@uniformdev/canvas-next-rsc-shared");
 var import_core = require("@uniformdev/canvas-react/core");
 var import_headers3 = require("next/headers");
 var import_navigation = require("next/navigation");
@@ -557,10 +562,17 @@ var retrieveRoute = async ({ params, searchParams: providedSearchParams, skipPre
   let result;
   for (let i = 0; i < states.length; i++) {
     const state = states[i];
-    const releaseId = determineReleaseId({
+    const releaseIdFromSearchParams = await determineReleaseId({
       searchParams,
       state
     });
+    const releaseIdFromFetchOptions = fetchOptions == null ? void 0 : fetchOptions.releaseId;
+    if (releaseIdFromSearchParams && releaseIdFromFetchOptions && releaseIdFromSearchParams !== releaseIdFromFetchOptions) {
+      console.warn(
+        "retrieveRoute: releaseId provided in both searchParams and fetchOptions, using fetchOptions"
+      );
+    }
+    const releaseId = releaseIdFromFetchOptions != null ? releaseIdFromFetchOptions : releaseIdFromSearchParams;
     try {
       result = await retrieveRouteByPath({
         path: value,
@@ -625,23 +637,16 @@ var determineState = async ({ searchParams }) => {
     searchParams
   });
   const previewEnvironment = isOnVercelPreviewEnvironment();
-  const isDevelopment = isDevelopmentEnvironment();
   const isCanvasEditing = isIncontextEditingEnabled({
     searchParams
   });
-  let states;
-  if (isCanvasEditing) {
-    states = [import_canvas4.CANVAS_EDITOR_STATE, import_canvas4.CANVAS_DRAFT_STATE];
-  } else {
-    states = isDraftMode || previewEnvironment || isDevelopment ? [import_canvas4.CANVAS_DRAFT_STATE] : [import_canvas4.CANVAS_PUBLISHED_STATE];
-  }
-  return states;
+  return isDraftMode || previewEnvironment ? (isCanvasEditing ? [import_canvas4.CANVAS_EDITOR_STATE] : []).concat([import_canvas4.CANVAS_DRAFT_STATE]) : [import_canvas4.CANVAS_PUBLISHED_STATE];
 };
-var determineReleaseId = ({
+var determineReleaseId = async ({
   searchParams,
   state
 }) => {
-  const draftMode2 = isDraftModeEnabled({
+  const draftMode2 = await isDraftModeEnabled({
     searchParams
   });
   if (!draftMode2 || state === import_canvas4.CANVAS_PUBLISHED_STATE) {
@@ -659,19 +664,17 @@ var ContextUpdateTrigger = ({ path }) => {
 
 // src/components/PersonalizeClientWrapper.tsx
 var import_canvas_next_rsc_client3 = require("@uniformdev/canvas-next-rsc-client");
-var import_canvas_next_rsc_shared3 = require("@uniformdev/canvas-next-rsc-shared");
 var import_react3 = __toESM(require("react"));
-var PersonalizeClientWrapper = (props) => {
-  const { indexes } = (0, import_canvas_next_rsc_shared3.runPersonalization)({
-    ...props,
-    contextInstance: void 0
-  });
-  return /* @__PURE__ */ import_react3.default.createElement(import_canvas_next_rsc_client3.PersonalizeClient, { ...props, indexes });
+var PersonalizeClientWrapper = ({
+  contextInstance,
+  ...props
+}) => {
+  return /* @__PURE__ */ import_react3.default.createElement(import_canvas_next_rsc_client3.PersonalizeClient, { ...props, indexes: [] });
 };
 
 // src/components/PersonalizeServer.ts
 var import_canvas5 = require("@uniformdev/canvas");
-var import_canvas_next_rsc_shared4 = require("@uniformdev/canvas-next-rsc-shared");
+var import_canvas_next_rsc_shared3 = require("@uniformdev/canvas-next-rsc-shared");
 var import_cache = require("next/cache");
 var import_react5 = require("react");
 
@@ -688,7 +691,7 @@ var PersonalizeServer = (props) => {
   if ((_a = getServerConfig().ppr) == null ? void 0 : _a.personalizationSuspense) {
     (0, import_cache.unstable_noStore)();
   }
-  const { indexes, event } = (0, import_canvas_next_rsc_shared4.runPersonalization)(props);
+  const { indexes, event } = (0, import_canvas_next_rsc_shared3.runPersonalization)(props);
   const slot = (_b = props.slots) == null ? void 0 : _b[import_canvas5.CANVAS_PERSONALIZE_SLOT];
   const components = indexes.map((index) => {
     const component = slot.items[index];
@@ -703,25 +706,19 @@ var PersonalizeServer = (props) => {
 
 // src/components/PersonalizeServerHybrid.tsx
 var import_canvas_next_rsc_client5 = require("@uniformdev/canvas-next-rsc-client");
-var import_canvas_next_rsc_shared5 = require("@uniformdev/canvas-next-rsc-shared");
+var import_canvas_next_rsc_shared4 = require("@uniformdev/canvas-next-rsc-shared");
 var import_react6 = __toESM(require("react"));
-var PersonalizeServerHybrid = (props) => {
-  const { indexes } = (0, import_canvas_next_rsc_shared5.runPersonalization)(props);
-  return /* @__PURE__ */ import_react6.default.createElement(
-    import_canvas_next_rsc_client5.PersonalizeClient,
-    {
-      component: props.component,
-      count: props.count,
-      slots: props.slots,
-      trackingEventName: props.trackingEventName,
-      indexes
-    }
-  );
+var PersonalizeServerHybrid = ({
+  contextInstance,
+  ...props
+}) => {
+  const { indexes } = (0, import_canvas_next_rsc_shared4.runPersonalization)({ ...props, contextInstance });
+  return /* @__PURE__ */ import_react6.default.createElement(import_canvas_next_rsc_client5.PersonalizeClient, { ...props, indexes });
 };
 
 // src/components/TestServer.ts
 var import_canvas6 = require("@uniformdev/canvas");
-var import_canvas_next_rsc_shared6 = require("@uniformdev/canvas-next-rsc-shared");
+var import_canvas_next_rsc_shared5 = require("@uniformdev/canvas-next-rsc-shared");
 var import_cache2 = require("next/cache");
 var import_react8 = require("react");
 
@@ -738,7 +735,7 @@ var TestServer = async (props) => {
   if ((_a = getServerConfig().ppr) == null ? void 0 : _a.testSuspense) {
     (0, import_cache2.unstable_noStore)();
   }
-  const { index, event } = (0, import_canvas_next_rsc_shared6.runTest)(props);
+  const { index, event } = (0, import_canvas_next_rsc_shared5.runTest)(props);
   if (index === null || event === null) {
     return null;
   }
@@ -774,6 +771,7 @@ var UniformComposition = async ({
   route,
   ...props
 }) => {
+  var _a;
   let searchParams;
   let serverContext = void 0;
   if (props.mode === "static") {
@@ -785,7 +783,7 @@ var UniformComposition = async ({
     });
   }
   const awaitedParams = await props.params;
-  const { value: path } = (0, import_canvas_next_rsc_shared7.resolvePath)({
+  const { value: path } = (0, import_canvas_next_rsc_shared6.resolvePath)({
     params: awaitedParams
   });
   if (!route || route.type === "notFound") {
@@ -798,10 +796,10 @@ var UniformComposition = async ({
   const state = route.compositionApiResponse.state;
   if (state === import_canvas8.CANVAS_DRAFT_STATE || state === import_canvas8.CANVAS_EDITOR_STATE) {
     (0, import_canvas8.walkNodeTree)(route.compositionApiResponse.composition, (node) => {
-      var _a, _b;
+      var _a2, _b;
       if (node.type === "component" && node.node.parameters) {
         const contextualEditing = node.node.parameters[import_canvas8.CANVAS_CONTEXTUAL_EDITING_PARAM];
-        const editableFields = (_b = (_a = contextualEditing == null ? void 0 : contextualEditing.value) == null ? void 0 : _a.editableParameters) != null ? _b : [];
+        const editableFields = (_b = (_a2 = contextualEditing == null ? void 0 : contextualEditing.value) == null ? void 0 : _a2.editableParameters) != null ? _b : [];
         Object.keys(node.node.parameters).forEach((key) => {
           const parameter = node.node.parameters[key];
           if (parameter.type === "text") {
@@ -818,7 +816,8 @@ var UniformComposition = async ({
     composition: route.compositionApiResponse.composition,
     matchedRoute: route.matchedRoute,
     searchParams,
-    dynamicInputs: route.dynamicInputs,
+    // provide default non-undefined values to avoid serialization issues
+    dynamicInputs: (_a = route.dynamicInputs) != null ? _a : {},
     type: "composition",
     isContextualEditing: isIncontextEditingEnabled({ searchParams }),
     isDraftMode: await isDraftModeEnabled({ searchParams }),
@@ -850,6 +849,11 @@ var UniformComposition = async ({
           },
           {}
         ),
+        compositionMetadata: {
+          compositionId: route.compositionApiResponse.composition._id,
+          matchedRoute: route.matchedRoute,
+          dynamicInputs: route.dynamicInputs
+        },
         quirks: {
           "vc-country": headersValue.get("x-vercel-ip-country") || missingQuirkValue,
           "vc-region": headersValue.get("x-vercel-ip-country-region") || missingQuirkValue,
@@ -1166,7 +1170,8 @@ var import_navigation2 = require("next/navigation");
 var import_react13 = __toESM(require("react"));
 var UniformPlayground = async ({ searchParams, ...rest }) => {
   const awaitedSearchParams = await searchParams;
-  if (!isDraftModeEnabled({ searchParams: awaitedSearchParams })) {
+  const isDraftMode = await isDraftModeEnabled({ searchParams: awaitedSearchParams });
+  if (!isDraftMode) {
     return /* @__PURE__ */ import_react13.default.createElement("div", null, /* @__PURE__ */ import_react13.default.createElement("h1", null, "Playground is only available in draft mode"));
   }
   const id = awaitedSearchParams["id"];

package/dist/index.mjs

@@ -24,13 +24,12 @@ var isDraftModeEnabled = async ({
     draftModeEnabled = (await draftMode()).isEnabled;
   } catch (e) {
   }
-  return draftModeEnabled || isIncontextEditingEnabled({ searchParams });
+  return draftModeEnabled;
 };
 var isIncontextEditingEnabled = ({
   searchParams
 }) => {
-  const containsKey = typeof (searchParams == null ? void 0 : searchParams[IN_CONTEXT_EDITOR_QUERY_STRING_PARAM]) !== "undefined";
-  return containsKey;
+  return (searchParams == null ? void 0 : searchParams[IN_CONTEXT_EDITOR_QUERY_STRING_PARAM]) === "true";
 };
 var determinePreviewMode = ({
   searchParams
@@ -67,9 +66,6 @@ var shouldCacheBeDisabled = async (options) => {
   if (await isDraftModeEnabled(options)) {
     return { disabled: true, reason: "DRAFT" };
   }
-  if (isIncontextEditingEnabled(options)) {
-    return { disabled: true, reason: "INCONTEXT" };
-  }
   if (isDevelopmentEnvironment()) {
     return { disabled: true, reason: "DEV" };
   }
@@ -154,9 +150,18 @@ var env = {
 };
 
 // src/utils/tag.ts
+var encodePathForTag = (path) => {
+  return path.split("/").map((segment) => {
+    if (/[^\x00-\x7F]/.test(segment)) {
+      return encodeURIComponent(segment);
+    }
+    return segment;
+  }).join("/");
+};
 var buildPathTag = (path) => {
   const actualPath = path.startsWith("/") ? path : `/${path}`;
-  return `path:${actualPath}`.toLowerCase();
+  const encodedPath = encodePathForTag(actualPath);
+  return `path:${encodedPath}`.toLowerCase();
 };
 var buildCompositionTag = (compositionId) => {
   return `composition:${compositionId}`.toLowerCase();
@@ -529,10 +534,17 @@ var retrieveRoute = async ({ params, searchParams: providedSearchParams, skipPre
   let result;
   for (let i = 0; i < states.length; i++) {
     const state = states[i];
-    const releaseId = determineReleaseId({
+    const releaseIdFromSearchParams = await determineReleaseId({
       searchParams,
       state
     });
+    const releaseIdFromFetchOptions = fetchOptions == null ? void 0 : fetchOptions.releaseId;
+    if (releaseIdFromSearchParams && releaseIdFromFetchOptions && releaseIdFromSearchParams !== releaseIdFromFetchOptions) {
+      console.warn(
+        "retrieveRoute: releaseId provided in both searchParams and fetchOptions, using fetchOptions"
+      );
+    }
+    const releaseId = releaseIdFromFetchOptions != null ? releaseIdFromFetchOptions : releaseIdFromSearchParams;
     try {
       result = await retrieveRouteByPath({
         path: value,
@@ -597,23 +609,16 @@ var determineState = async ({ searchParams }) => {
     searchParams
   });
   const previewEnvironment = isOnVercelPreviewEnvironment();
-  const isDevelopment = isDevelopmentEnvironment();
   const isCanvasEditing = isIncontextEditingEnabled({
     searchParams
   });
-  let states;
-  if (isCanvasEditing) {
-    states = [CANVAS_EDITOR_STATE, CANVAS_DRAFT_STATE];
-  } else {
-    states = isDraftMode || previewEnvironment || isDevelopment ? [CANVAS_DRAFT_STATE] : [CANVAS_PUBLISHED_STATE];
-  }
-  return states;
+  return isDraftMode || previewEnvironment ? (isCanvasEditing ? [CANVAS_EDITOR_STATE] : []).concat([CANVAS_DRAFT_STATE]) : [CANVAS_PUBLISHED_STATE];
 };
-var determineReleaseId = ({
+var determineReleaseId = async ({
   searchParams,
   state
 }) => {
-  const draftMode2 = isDraftModeEnabled({
+  const draftMode2 = await isDraftModeEnabled({
     searchParams
   });
   if (!draftMode2 || state === CANVAS_PUBLISHED_STATE) {
@@ -631,19 +636,17 @@ var ContextUpdateTrigger = ({ path }) => {
 
 // src/components/PersonalizeClientWrapper.tsx
 import { PersonalizeClient } from "@uniformdev/canvas-next-rsc-client";
-import { runPersonalization } from "@uniformdev/canvas-next-rsc-shared";
 import React3 from "react";
-var PersonalizeClientWrapper = (props) => {
-  const { indexes } = runPersonalization({
-    ...props,
-    contextInstance: void 0
-  });
-  return /* @__PURE__ */ React3.createElement(PersonalizeClient, { ...props, indexes });
+var PersonalizeClientWrapper = ({
+  contextInstance,
+  ...props
+}) => {
+  return /* @__PURE__ */ React3.createElement(PersonalizeClient, { ...props, indexes: [] });
 };
 
 // src/components/PersonalizeServer.ts
 import { CANVAS_PERSONALIZE_SLOT } from "@uniformdev/canvas";
-import { runPersonalization as runPersonalization2 } from "@uniformdev/canvas-next-rsc-shared";
+import { runPersonalization } from "@uniformdev/canvas-next-rsc-shared";
 import { unstable_noStore as noStore } from "next/cache";
 import { createElement, Fragment } from "react";
 
@@ -660,7 +663,7 @@ var PersonalizeServer = (props) => {
   if ((_a = getServerConfig().ppr) == null ? void 0 : _a.personalizationSuspense) {
     noStore();
   }
-  const { indexes, event } = runPersonalization2(props);
+  const { indexes, event } = runPersonalization(props);
   const slot = (_b = props.slots) == null ? void 0 : _b[CANVAS_PERSONALIZE_SLOT];
   const components = indexes.map((index) => {
     const component = slot.items[index];
@@ -675,20 +678,14 @@ var PersonalizeServer = (props) => {
 
 // src/components/PersonalizeServerHybrid.tsx
 import { PersonalizeClient as PersonalizeClient2 } from "@uniformdev/canvas-next-rsc-client";
-import { runPersonalization as runPersonalization3 } from "@uniformdev/canvas-next-rsc-shared";
+import { runPersonalization as runPersonalization2 } from "@uniformdev/canvas-next-rsc-shared";
 import React5 from "react";
-var PersonalizeServerHybrid = (props) => {
-  const { indexes } = runPersonalization3(props);
-  return /* @__PURE__ */ React5.createElement(
-    PersonalizeClient2,
-    {
-      component: props.component,
-      count: props.count,
-      slots: props.slots,
-      trackingEventName: props.trackingEventName,
-      indexes
-    }
-  );
+var PersonalizeServerHybrid = ({
+  contextInstance,
+  ...props
+}) => {
+  const { indexes } = runPersonalization2({ ...props, contextInstance });
+  return /* @__PURE__ */ React5.createElement(PersonalizeClient2, { ...props, indexes });
 };
 
 // src/components/TestServer.ts
@@ -751,6 +748,7 @@ var UniformComposition = async ({
   route,
   ...props
 }) => {
+  var _a;
   let searchParams;
   let serverContext = void 0;
   if (props.mode === "static") {
@@ -775,10 +773,10 @@ var UniformComposition = async ({
   const state = route.compositionApiResponse.state;
   if (state === CANVAS_DRAFT_STATE2 || state === CANVAS_EDITOR_STATE2) {
     walkNodeTree(route.compositionApiResponse.composition, (node) => {
-      var _a, _b;
+      var _a2, _b;
       if (node.type === "component" && node.node.parameters) {
         const contextualEditing = node.node.parameters[CANVAS_CONTEXTUAL_EDITING_PARAM];
-        const editableFields = (_b = (_a = contextualEditing == null ? void 0 : contextualEditing.value) == null ? void 0 : _a.editableParameters) != null ? _b : [];
+        const editableFields = (_b = (_a2 = contextualEditing == null ? void 0 : contextualEditing.value) == null ? void 0 : _a2.editableParameters) != null ? _b : [];
         Object.keys(node.node.parameters).forEach((key) => {
           const parameter = node.node.parameters[key];
           if (parameter.type === "text") {
@@ -795,7 +793,8 @@ var UniformComposition = async ({
     composition: route.compositionApiResponse.composition,
     matchedRoute: route.matchedRoute,
     searchParams,
-    dynamicInputs: route.dynamicInputs,
+    // provide default non-undefined values to avoid serialization issues
+    dynamicInputs: (_a = route.dynamicInputs) != null ? _a : {},
     type: "composition",
     isContextualEditing: isIncontextEditingEnabled({ searchParams }),
     isDraftMode: await isDraftModeEnabled({ searchParams }),
@@ -827,6 +826,11 @@ var UniformComposition = async ({
           },
           {}
         ),
+        compositionMetadata: {
+          compositionId: route.compositionApiResponse.composition._id,
+          matchedRoute: route.matchedRoute,
+          dynamicInputs: route.dynamicInputs
+        },
         quirks: {
           "vc-country": headersValue.get("x-vercel-ip-country") || missingQuirkValue,
           "vc-region": headersValue.get("x-vercel-ip-country-region") || missingQuirkValue,
@@ -1146,7 +1150,8 @@ import { notFound as notFound2 } from "next/navigation";
 import React10 from "react";
 var UniformPlayground = async ({ searchParams, ...rest }) => {
   const awaitedSearchParams = await searchParams;
-  if (!isDraftModeEnabled({ searchParams: awaitedSearchParams })) {
+  const isDraftMode = await isDraftModeEnabled({ searchParams: awaitedSearchParams });
+  if (!isDraftMode) {
     return /* @__PURE__ */ React10.createElement("div", null, /* @__PURE__ */ React10.createElement("h1", null, "Playground is only available in draft mode"));
   }
   const id = awaitedSearchParams["id"];

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@uniformdev/canvas-next-rsc",
-  "version": "20.7.1-alpha.12+75bdbe8f17",
+  "version": "20.7.1-alpha.120+5160373551",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "build": "tsup",
     "dev": "tsup --watch",
     "lint": "eslint \"src/**/*.{ts,tsx}\" --fix",
-    "test": "jest --maxWorkers=1 --passWithNoTests"
+    "test": "jest --maxWorkers=1 --passWithNoTests",
+    "document": "api-extractor run --local"
   },
   "sideEffects": false,
   "main": "dist/index.js",
@@ -18,9 +19,9 @@
       "import": "./dist/index.esm.js"
     },
     "./handler": {
+      "types": "./dist/handler.d.ts",
       "require": "./dist/handler.js",
-      "import": "./dist/handler.mjs",
-      "types": "./dist/handler.d.ts"
+      "import": "./dist/handler.mjs"
     },
     "./config": {
       "types": "./dist/config.d.ts",
@@ -53,23 +54,22 @@
     "/dist"
   ],
   "devDependencies": {
-    "@types/node": "22.7.8",
-    "@types/react": "18.3.11",
-    "eslint": "9.9.0",
-    "next": "15.1.0",
+    "@types/node": "24.3.1",
+    "@types/react": "18.3.24",
+    "next": "15.2.5",
     "react": "18.3.1",
     "react-dom": "18.3.1"
   },
   "dependencies": {
-    "@uniformdev/canvas": "20.7.1-alpha.12+75bdbe8f17",
-    "@uniformdev/canvas-next-rsc-client": "^20.7.1-alpha.12+75bdbe8f17",
-    "@uniformdev/canvas-next-rsc-shared": "^20.7.1-alpha.12+75bdbe8f17",
-    "@uniformdev/canvas-react": "20.7.1-alpha.12+75bdbe8f17",
-    "@uniformdev/context": "20.7.1-alpha.12+75bdbe8f17",
-    "@uniformdev/project-map": "20.7.1-alpha.12+75bdbe8f17",
-    "@uniformdev/redirect": "20.7.1-alpha.12+75bdbe8f17",
-    "@uniformdev/richtext": "20.7.1-alpha.12+75bdbe8f17",
-    "@uniformdev/webhooks": "20.7.1-alpha.12+75bdbe8f17",
+    "@uniformdev/canvas": "20.7.1-alpha.120+5160373551",
+    "@uniformdev/canvas-next-rsc-client": "^20.7.1-alpha.120+5160373551",
+    "@uniformdev/canvas-next-rsc-shared": "^20.7.1-alpha.120+5160373551",
+    "@uniformdev/canvas-react": "20.7.1-alpha.120+5160373551",
+    "@uniformdev/context": "20.7.1-alpha.120+5160373551",
+    "@uniformdev/project-map": "20.7.1-alpha.120+5160373551",
+    "@uniformdev/redirect": "20.7.1-alpha.120+5160373551",
+    "@uniformdev/richtext": "20.7.1-alpha.120+5160373551",
+    "@uniformdev/webhooks": "20.7.1-alpha.120+5160373551",
     "@vercel/edge-config": "^0.4.0",
     "encoding": "^0.1.13",
     "server-only": "^0.0.1",
@@ -79,12 +79,12 @@
     "node": "^18.18.0 || ^19.8.0 || >= 20.0.0"
   },
   "peerDependencies": {
-    "next": ">=15.1.0",
+    "next": ">=15.2.3",
     "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0",
     "react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "75bdbe8f179a18d65e3460f795a657c69349a7dc"
+  "gitHead": "5160373551e91f6ef481c9f3687cad238e379591"
 }