@uniformdev/canvas-next-rsc 19.199.0 → 19.199.1-alpha.10

package/dist/index.mjs

@@ -419,6 +419,7 @@ async function generateStaticParams() {
 
 // src/components/UniformComposition.ts
 import {
+  CANVAS_CONTEXTUAL_EDITING_PARAM,
   CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE2,
   CANVAS_EDITOR_STATE as CANVAS_EDITOR_STATE2,
   CANVAS_ENRICHMENT_TAG_PARAM,
@@ -441,7 +442,10 @@ import { createElement as createElement3, Fragment as Fragment3, Suspense } from
 import {
   createUniformContext
 } from "@uniformdev/canvas-next-rsc-shared";
-import { UNIFORM_DEFAULT_COOKIE_NAME } from "@uniformdev/context";
+import {
+  UNIFORM_DEFAULT_COOKIE_NAME,
+  UNIFORM_DEFAULT_QUIRK_COOKIE_NAME
+} from "@uniformdev/context";
 import { cookies } from "next/headers";
 var createServerUniformContext = async (options) => {
   const manifest = await getManifest(options);
@@ -452,10 +456,13 @@ var createServerUniformContext = async (options) => {
   return context;
 };
 var createServerUniformContextFromManifest = async (options) => {
-  var _a;
+  var _a, _b, _c;
+  const quirksEnabled = (_a = getServerConfig().experimental) == null ? void 0 : _a.quirkSerialization;
   const context = createUniformContext({
     ...options || {},
-    serverCookieValue: (_a = cookies().get(UNIFORM_DEFAULT_COOKIE_NAME)) == null ? void 0 : _a.value
+    serverCookieValue: (_b = cookies().get(UNIFORM_DEFAULT_COOKIE_NAME)) == null ? void 0 : _b.value,
+    experimental_quirksEnabled: quirksEnabled,
+    quirkCookieValue: quirksEnabled ? (_c = cookies().get(UNIFORM_DEFAULT_QUIRK_COOKIE_NAME)) == null ? void 0 : _c.value : void 0
   });
   return context;
 };
@@ -533,12 +540,17 @@ var retrieveRoute = async ({ params, searchParams, skipPrefetch }, fetchOptions)
   let result;
   for (let i = 0; i < states.length; i++) {
     const state = states[i];
+    const releaseId = determineReleaseId({
+      searchParams,
+      state
+    });
     try {
       result = await retrieveRouteByPath({
         path: value,
         state,
         searchParams,
-        fetchOptions
+        fetchOptions,
+        releaseId
       });
     } catch (e) {
       console.warn(`Failed to retrieve route by path: ${value} with state ${state}`, e);
@@ -555,7 +567,8 @@ var retrieveRouteByPath = async ({
   path,
   state,
   searchParams,
-  fetchOptions
+  fetchOptions,
+  releaseId
 }) => {
   var _a;
   const client = getDefaultRouteClient({
@@ -580,7 +593,8 @@ var retrieveRouteByPath = async ({
     state,
     dataSourceVariant: getDataSourceVariantFromRouteGetParams(fetchOptions != null ? fetchOptions : {}, state),
     withComponentIDs: true,
-    withContentSourceMap: isOnVercelPreviewEnvironment() && ((_a = getServerConfig().experimental) == null ? void 0 : _a.vercelVisualEditing)
+    withContentSourceMap: isOnVercelPreviewEnvironment() && ((_a = getServerConfig().experimental) == null ? void 0 : _a.vercelVisualEditing),
+    releaseId
   });
 };
 var resolveRedirectHref = (resolveResult, path) => {
@@ -604,6 +618,16 @@ var determineState = ({ searchParams }) => {
   }
   return states;
 };
+var determineReleaseId = ({
+  searchParams,
+  state
+}) => {
+  const draftMode2 = isDraftModeEnabled({ searchParams });
+  if (!draftMode2 || state === CANVAS_PUBLISHED_STATE) {
+    return void 0;
+  }
+  return searchParams == null ? void 0 : searchParams.releaseId;
+};
 
 // src/components/ContextUpdateTrigger.tsx
 import { ClientContextUpdate } from "@uniformdev/canvas-next-rsc-client";
@@ -656,6 +680,24 @@ var PersonalizeServer = (props) => {
   return createElement(Fragment, void 0, [...components, eventElement]);
 };
 
+// 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 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
+    }
+  );
+};
+
 // src/components/TestServer.ts
 import { CANVAS_TEST_SLOT } from "@uniformdev/canvas";
 import {
@@ -666,27 +708,22 @@ import { createElement as createElement2, Fragment as Fragment2 } from "react";
 
 // src/components/ContextTestTransfer.tsx
 import { ClientContextTestTransfer } from "@uniformdev/canvas-next-rsc-client";
-import React5 from "react";
+import React6 from "react";
 var ContextTestTransfer = ({ event }) => {
-  return /* @__PURE__ */ React5.createElement(ClientContextTestTransfer, { ts: (/* @__PURE__ */ new Date()).valueOf(), event });
+  return /* @__PURE__ */ React6.createElement(ClientContextTestTransfer, { ts: (/* @__PURE__ */ new Date()).valueOf(), event });
 };
 
 // src/components/TestServer.ts
 var TestServer = async (props) => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d;
   if ((_a = getServerConfig().ppr) == null ? void 0 : _a.testSuspense) {
     noStore2();
   }
-  const { contextInstance, test } = props;
-  const isTestDefined = Boolean((_b = contextInstance.manifest.data.project.test) == null ? void 0 : _b[test]);
-  if (!isTestDefined && process.env.NODE_ENV !== "production") {
-    console.warn(`Test "${test}" is not defined in Uniform manifest.`);
-  }
   const { index, event } = runTest(props);
   if (index === null || event === null) {
     return null;
   }
-  const component = typeof index === "number" ? (_e = (_d = (_c = props.slots) == null ? void 0 : _c[CANVAS_TEST_SLOT]) == null ? void 0 : _d.items[index]) != null ? _e : null : null;
+  const component = typeof index === "number" ? (_d = (_c = (_b = props.slots) == null ? void 0 : _b[CANVAS_TEST_SLOT]) == null ? void 0 : _c.items[index]) != null ? _d : null : null;
   const eventElement = createElement2(ContextTestTransfer, {
     event,
     key: `${props.slotName}-${props.slotIndex}-server-transfer`
@@ -700,7 +737,7 @@ import {
   evaluateNodeVisibilityParameter
 } from "@uniformdev/canvas";
 import { VisibilityRulesWrapperClient } from "@uniformdev/canvas-next-rsc-client";
-import React6 from "react";
+import React7 from "react";
 var VisibilityRulesWrapper = (props) => {
   const { context, ...rest } = props;
   let isVisible = null;
@@ -711,12 +748,13 @@ var VisibilityRulesWrapper = (props) => {
       parameter: props.parameter
     });
   }
-  return /* @__PURE__ */ React6.createElement(VisibilityRulesWrapperClient, { ...rest, initialIsVisible: isVisible });
+  return /* @__PURE__ */ React7.createElement(VisibilityRulesWrapperClient, { ...rest, initialIsVisible: isVisible });
 };
 
 // src/components/UniformComposition.ts
 var UniformComposition = async ({
   resolveComponent,
+  resolveEmptyPlaceholder,
   route,
   ...props
 }) => {
@@ -741,13 +779,16 @@ 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;
       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 : [];
         Object.keys(node.node.parameters).forEach((key) => {
           const parameter = node.node.parameters[key];
           if (parameter.type === "text") {
             const contextualParameter = parameter;
             contextualParameter._contextualEditing = {
-              isEditable: true
+              isEditable: editableFields.includes(key)
             };
           }
         });
@@ -771,7 +812,8 @@ var UniformComposition = async ({
     resolveComponent,
     serverContext,
     compositionContext,
-    mode: props.mode
+    mode: props.mode,
+    resolveEmptyPlaceholder
   });
   let transfer = null;
   if (props.mode === "server") {
@@ -824,7 +866,7 @@ var resolveSystemComponent = ({
   let resolved = null;
   let suspense = void 0;
   if (component.type === CANVAS_PERSONALIZE_TYPE) {
-    resolved = server ? PersonalizeServer : PersonalizeClientWrapper;
+    resolved = server ? resolveServerPersonalizeComponent({ config }) : PersonalizeClientWrapper;
     suspense = server && ((_a = config.ppr) == null ? void 0 : _a.personalizationSuspense);
   }
   if (component.type === CANVAS_TEST_TYPE) {
@@ -836,10 +878,15 @@ var resolveSystemComponent = ({
     suspense
   };
 };
+var resolveServerPersonalizeComponent = ({ config }) => {
+  var _a;
+  return ((_a = config.evaluation) == null ? void 0 : _a.personalization) === "hybrid" ? PersonalizeServerHybrid : PersonalizeServer;
+};
 var resolveSlots = ({
   component,
   root,
   resolveComponent,
+  resolveEmptyPlaceholder,
   serverContext,
   compositionContext,
   mode
@@ -859,7 +906,8 @@ var resolveSlots = ({
         resolveComponent,
         serverContext,
         compositionContext,
-        mode
+        mode,
+        resolveEmptyPlaceholder
       });
       if (resolved) {
         slots[slotName] = {
@@ -890,6 +938,7 @@ var resolveComponents = ({
   slotName,
   slotIndex,
   resolveComponent,
+  resolveEmptyPlaceholder,
   compositionContext,
   mode
 }) => {
@@ -915,11 +964,29 @@ var resolveComponents = ({
       component,
       server: isServer
     });
+    const isPlaceholder = isComponentPlaceholderId(component == null ? void 0 : component._id);
+    let resolveResult = null;
+    if (isPlaceholder && resolveEmptyPlaceholder) {
+      const resolvedPlaceholder = resolveEmptyPlaceholder({
+        parentComponent: parent,
+        component,
+        slotName,
+        slotIndex: componentIndex
+      });
+      if (resolvedPlaceholder) {
+        resolveResult = {
+          component: resolvedPlaceholder.component
+        };
+      }
+    }
+    if (!resolveResult) {
+      resolveResult = resolveComponent({ component });
+    }
     const {
       component: regularComponent,
       includeContext,
       suspense: componentSuspense
-    } = resolveComponent({ component }) || {
+    } = resolveResult || {
       component: null
     };
     if (!systemComponent && !regularComponent) {
@@ -931,6 +998,7 @@ var resolveComponents = ({
       resolveComponent,
       serverContext,
       compositionContext,
+      resolveEmptyPlaceholder,
       mode
     });
     const resolvedComponent = systemComponent || regularComponent;
@@ -980,13 +1048,13 @@ var resolveComponents = ({
       if (tagElement) {
         elements.push(tagElement);
       }
-      const isPlaceholder = isComponentPlaceholderId(component == null ? void 0 : component._id);
-      if (!isPlaceholder || compositionContext.previewMode === "editor") {
+      const isPlaceholder2 = isComponentPlaceholderId(component == null ? void 0 : component._id);
+      if (!isPlaceholder2 || compositionContext.previewMode === "editor") {
         childNode = createElement3(
           PureContextualEditingComponentWrapper,
           {
             key: `${slotName}-${componentIndex}-wrapper`,
-            isPlaceholder,
+            isPlaceholder: isPlaceholder2,
             parentComponent: parent,
             component,
             slotName,
@@ -1051,12 +1119,12 @@ import {
   UniformScript
 } from "@uniformdev/canvas-next-rsc-client";
 import { Suspense as Suspense2 } from "react";
-import React7 from "react";
+import React8 from "react";
 var UniformContext = async ({
   clientContextComponent,
   children
 }) => {
-  var _a;
+  var _a, _b;
   const manifest = await getManifest({
     searchParams: {}
   });
@@ -1064,23 +1132,25 @@ var UniformContext = async ({
   const serverConfig2 = getServerConfig();
   const disableDevTools = ((_a = serverConfig2.context) == null ? void 0 : _a.disableDevTools) || false;
   const defaultConsent = serverConfig2.defaultConsent || false;
-  return /* @__PURE__ */ React7.createElement(React7.Fragment, null, children, /* @__PURE__ */ React7.createElement(
+  const experimentalQuirkSerialization = ((_b = serverConfig2.experimental) == null ? void 0 : _b.quirkSerialization) || false;
+  return /* @__PURE__ */ React8.createElement(React8.Fragment, null, children, /* @__PURE__ */ React8.createElement(
     ContextComponent,
     {
       manifest,
       disableDevTools,
-      defaultConsent
+      defaultConsent,
+      experimentalQuirkSerialization
     }
-  ), /* @__PURE__ */ React7.createElement(Suspense2, { fallback: /* @__PURE__ */ React7.createElement(React7.Fragment, null) }, /* @__PURE__ */ React7.createElement(UniformScript, null)));
+  ), /* @__PURE__ */ React8.createElement(Suspense2, { fallback: /* @__PURE__ */ React8.createElement(React8.Fragment, null) }, /* @__PURE__ */ React8.createElement(UniformScript, null)));
 };
 
 // src/components/UniformPlayground.tsx
 import { CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE3, CANVAS_EDITOR_STATE as CANVAS_EDITOR_STATE3 } from "@uniformdev/canvas";
 import { notFound as notFound2 } from "next/navigation";
-import React8 from "react";
+import React9 from "react";
 var UniformPlayground = async ({ searchParams, ...rest }) => {
   if (!isDraftModeEnabled({ searchParams })) {
-    return /* @__PURE__ */ React8.createElement("div", null, /* @__PURE__ */ React8.createElement("h1", null, "Playground is only available in draft mode"));
+    return /* @__PURE__ */ React9.createElement("div", null, /* @__PURE__ */ React9.createElement("h1", null, "Playground is only available in draft mode"));
   }
   const id = searchParams["id"];
   if (!id) {
@@ -1111,7 +1181,7 @@ var UniformPlayground = async ({ searchParams, ...rest }) => {
   if (!composition) {
     notFound2();
   }
-  return /* @__PURE__ */ React8.createElement(
+  return /* @__PURE__ */ React9.createElement(
     UniformComposition,
     {
       mode: "server",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next-rsc",
-  "version": "19.199.0",
+  "version": "19.199.1-alpha.10+7f62130189",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "build": "tsup",
@@ -13,9 +13,9 @@
   "types": "dist/index.d.ts",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
       "require": "./dist/index.js",
-      "import": "./dist/index.esm.js",
-      "types": "./dist/index.d.ts"
+      "import": "./dist/index.esm.js"
     },
     "./handler": {
       "require": "./dist/handler.js",
@@ -23,14 +23,14 @@
       "types": "./dist/handler.d.ts"
     },
     "./config": {
+      "types": "./dist/config.d.ts",
       "require": "./dist/config.js",
-      "import": "./dist/config.mjs",
-      "types": "./dist/config.d.ts"
+      "import": "./dist/config.mjs"
     },
     "./component": {
+      "types": "./dist/component.d.ts",
       "require": "./dist/component.js",
-      "import": "./dist/component.mjs",
-      "types": "./dist/component.d.ts"
+      "import": "./dist/component.mjs"
     }
   },
   "typesVersions": {
@@ -53,23 +53,23 @@
     "/dist"
   ],
   "devDependencies": {
-    "@types/node": "20.10.6",
-    "@types/react": "18.3.3",
+    "@types/node": "22.7.8",
+    "@types/react": "18.3.11",
     "eslint": "9.9.0",
     "next": "^14.0.0",
     "react": "18.3.1",
     "react-dom": "18.3.1"
   },
   "dependencies": {
-    "@uniformdev/canvas": "19.199.0",
-    "@uniformdev/canvas-next-rsc-client": "^19.199.0",
-    "@uniformdev/canvas-next-rsc-shared": "^19.199.0",
-    "@uniformdev/canvas-react": "19.199.0",
-    "@uniformdev/context": "19.199.0",
-    "@uniformdev/project-map": "19.199.0",
-    "@uniformdev/redirect": "19.199.0",
-    "@uniformdev/richtext": "19.199.0",
-    "@uniformdev/webhooks": "19.199.0",
+    "@uniformdev/canvas": "19.199.1-alpha.10+7f62130189",
+    "@uniformdev/canvas-next-rsc-client": "^19.199.1-alpha.10+7f62130189",
+    "@uniformdev/canvas-next-rsc-shared": "^19.199.1-alpha.10+7f62130189",
+    "@uniformdev/canvas-react": "19.199.1-alpha.10+7f62130189",
+    "@uniformdev/context": "19.199.1-alpha.10+7f62130189",
+    "@uniformdev/project-map": "19.199.1-alpha.10+7f62130189",
+    "@uniformdev/redirect": "19.199.1-alpha.10+7f62130189",
+    "@uniformdev/richtext": "19.199.1-alpha.10+7f62130189",
+    "@uniformdev/webhooks": "19.199.1-alpha.10+7f62130189",
     "@vercel/edge-config": "^0.4.0",
     "encoding": "^0.1.13",
     "server-only": "^0.0.1",
@@ -86,5 +86,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "10b981b78ca171d82d8535f8162c2072e1e944c5"
+  "gitHead": "7f62130189d43f7ecaaed0a41c929e5c166860d2"
 }