@uniformdev/canvas-next-rsc 19.206.0 → 19.207.1-alpha.20

package/dist/component.js

@@ -134,10 +134,16 @@ var AssetRichTextNode = ({ node }) => {
   if (__asset === void 0) {
     return null;
   }
-  if (__asset.type !== "image") {
-    return null;
+  if (__asset.type === "image") {
+    return /* @__PURE__ */ import_react2.default.createElement("figure", null, /* @__PURE__ */ import_react2.default.createElement("img", { src: __asset.fields.url.value, alt: (_a = __asset.fields.title) == null ? void 0 : _a.value }), ((_b = __asset.fields.description) == null ? void 0 : _b.value) ? /* @__PURE__ */ import_react2.default.createElement("figcaption", null, __asset.fields.description.value) : null);
+  }
+  if (__asset.type === "video") {
+    return /* @__PURE__ */ import_react2.default.createElement("video", { src: __asset.fields.url.value, controls: true });
+  }
+  if (__asset.type === "audio") {
+    return /* @__PURE__ */ import_react2.default.createElement("audio", { src: __asset.fields.url.value, controls: true });
   }
-  return /* @__PURE__ */ import_react2.default.createElement("figure", null, /* @__PURE__ */ import_react2.default.createElement("img", { src: __asset.fields.url.value, alt: (_a = __asset.fields.title) == null ? void 0 : _a.value }), ((_b = __asset.fields.description) == null ? void 0 : _b.value) ? /* @__PURE__ */ import_react2.default.createElement("figcaption", null, __asset.fields.description.value) : null);
+  return null;
 };
 
 // src/components/nodes/HeadingRichTextNode.tsx

package/dist/component.mjs

@@ -95,10 +95,16 @@ var AssetRichTextNode = ({ node }) => {
   if (__asset === void 0) {
     return null;
   }
-  if (__asset.type !== "image") {
-    return null;
+  if (__asset.type === "image") {
+    return /* @__PURE__ */ React2.createElement("figure", null, /* @__PURE__ */ React2.createElement("img", { src: __asset.fields.url.value, alt: (_a = __asset.fields.title) == null ? void 0 : _a.value }), ((_b = __asset.fields.description) == null ? void 0 : _b.value) ? /* @__PURE__ */ React2.createElement("figcaption", null, __asset.fields.description.value) : null);
+  }
+  if (__asset.type === "video") {
+    return /* @__PURE__ */ React2.createElement("video", { src: __asset.fields.url.value, controls: true });
+  }
+  if (__asset.type === "audio") {
+    return /* @__PURE__ */ React2.createElement("audio", { src: __asset.fields.url.value, controls: true });
   }
-  return /* @__PURE__ */ React2.createElement("figure", null, /* @__PURE__ */ React2.createElement("img", { src: __asset.fields.url.value, alt: (_a = __asset.fields.title) == null ? void 0 : _a.value }), ((_b = __asset.fields.description) == null ? void 0 : _b.value) ? /* @__PURE__ */ React2.createElement("figcaption", null, __asset.fields.description.value) : null);
+  return null;
 };
 
 // src/components/nodes/HeadingRichTextNode.tsx

package/dist/handler.js

@@ -91,6 +91,7 @@ var createPreviewGETRouteHandler = (options) => {
     const secret = getQueryParam(request, import_canvas.SECRET_QUERY_STRING_PARAM);
     const referer = request.headers.get("referer");
     const isUniformContextualEditing = getQueryParam(request, import_canvas.IN_CONTEXT_EDITOR_QUERY_STRING_PARAM) === "true" && (0, import_canvas.isAllowedReferrer)(referer || void 0);
+    const releaseId = getQueryParam(request, "releaseId");
     if (typeof pathToRedirectTo === "undefined") {
       const resolveFullPath = (options == null ? void 0 : options.resolveFullPath) || resolveFullPathDefault;
       pathToRedirectTo = resolveFullPath({ id, slug, path, locale });
@@ -113,6 +114,9 @@ var createPreviewGETRouteHandler = (options) => {
     if (isPlayground || (options == null ? void 0 : options.playgroundPath) && pathToRedirectTo === options.playgroundPath) {
       redirectionUrl.searchParams.set("id", searchParams.get("id") || "");
     }
+    if (releaseId) {
+      redirectionUrl.searchParams.set("releaseId", releaseId);
+    }
     if (!isUniformContextualEditing) {
       contextualEditingQueryParams.forEach((param) => {
         redirectionUrl.searchParams.delete(param);

package/dist/handler.mjs

@@ -58,6 +58,7 @@ var createPreviewGETRouteHandler = (options) => {
     const secret = getQueryParam(request, SECRET_QUERY_STRING_PARAM);
     const referer = request.headers.get("referer");
     const isUniformContextualEditing = getQueryParam(request, IN_CONTEXT_EDITOR_QUERY_STRING_PARAM) === "true" && isAllowedReferrer(referer || void 0);
+    const releaseId = getQueryParam(request, "releaseId");
     if (typeof pathToRedirectTo === "undefined") {
       const resolveFullPath = (options == null ? void 0 : options.resolveFullPath) || resolveFullPathDefault;
       pathToRedirectTo = resolveFullPath({ id, slug, path, locale });
@@ -80,6 +81,9 @@ var createPreviewGETRouteHandler = (options) => {
     if (isPlayground || (options == null ? void 0 : options.playgroundPath) && pathToRedirectTo === options.playgroundPath) {
       redirectionUrl.searchParams.set("id", searchParams.get("id") || "");
     }
+    if (releaseId) {
+      redirectionUrl.searchParams.set("releaseId", releaseId);
+    }
     if (!isUniformContextualEditing) {
       contextualEditingQueryParams.forEach((param) => {
         redirectionUrl.searchParams.delete(param);

package/dist/index.esm.js

@@ -441,7 +441,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 +455,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 +539,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 +566,8 @@ var retrieveRouteByPath = async ({
   path,
   state,
   searchParams,
-  fetchOptions
+  fetchOptions,
+  releaseId
 }) => {
   var _a;
   const client = getDefaultRouteClient({
@@ -580,7 +592,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 +617,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";
@@ -1051,7 +1074,7 @@ var UniformContext = async ({
   clientContextComponent,
   children
 }) => {
-  var _a;
+  var _a, _b;
   const manifest = await getManifest({
     searchParams: {}
   });
@@ -1059,12 +1082,14 @@ var UniformContext = async ({
   const serverConfig2 = getServerConfig();
   const disableDevTools = ((_a = serverConfig2.context) == null ? void 0 : _a.disableDevTools) || false;
   const defaultConsent = serverConfig2.defaultConsent || false;
+  const experimentalQuirkSerialization = ((_b = serverConfig2.experimental) == null ? void 0 : _b.quirkSerialization) || false;
   return /* @__PURE__ */ React7.createElement(React7.Fragment, null, children, /* @__PURE__ */ React7.createElement(
     ContextComponent,
     {
       manifest,
       disableDevTools,
-      defaultConsent
+      defaultConsent,
+      experimentalQuirkSerialization
     }
   ), /* @__PURE__ */ React7.createElement(Suspense2, { fallback: /* @__PURE__ */ React7.createElement(React7.Fragment, null) }, /* @__PURE__ */ React7.createElement(UniformScript, null)));
 };

package/dist/index.js

@@ -492,10 +492,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 = (0, import_canvas_next_rsc_shared.createUniformContext)({
     ...options || {},
-    serverCookieValue: (_a = (0, import_headers2.cookies)().get(import_context.UNIFORM_DEFAULT_COOKIE_NAME)) == null ? void 0 : _a.value
+    serverCookieValue: (_b = (0, import_headers2.cookies)().get(import_context.UNIFORM_DEFAULT_COOKIE_NAME)) == null ? void 0 : _b.value,
+    experimental_quirksEnabled: quirksEnabled,
+    quirkCookieValue: quirksEnabled ? (_c = (0, import_headers2.cookies)().get(import_context.UNIFORM_DEFAULT_QUIRK_COOKIE_NAME)) == null ? void 0 : _c.value : void 0
   });
   return context;
 };
@@ -568,12 +571,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);
@@ -590,7 +598,8 @@ var retrieveRouteByPath = async ({
   path,
   state,
   searchParams,
-  fetchOptions
+  fetchOptions,
+  releaseId
 }) => {
   var _a;
   const client = getDefaultRouteClient({
@@ -615,7 +624,8 @@ var retrieveRouteByPath = async ({
     state,
     dataSourceVariant: (0, import_canvas4.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) => {
@@ -639,6 +649,16 @@ var determineState = ({ searchParams }) => {
   }
   return states;
 };
+var determineReleaseId = ({
+  searchParams,
+  state
+}) => {
+  const draftMode2 = isDraftModeEnabled({ searchParams });
+  if (!draftMode2 || state === import_canvas4.CANVAS_PUBLISHED_STATE) {
+    return void 0;
+  }
+  return searchParams == null ? void 0 : searchParams.releaseId;
+};
 
 // src/components/ContextUpdateTrigger.tsx
 var import_canvas_next_rsc_client2 = require("@uniformdev/canvas-next-rsc-client");
@@ -1078,7 +1098,7 @@ var UniformContext = async ({
   clientContextComponent,
   children
 }) => {
-  var _a;
+  var _a, _b;
   const manifest = await getManifest({
     searchParams: {}
   });
@@ -1086,12 +1106,14 @@ var UniformContext = async ({
   const serverConfig2 = getServerConfig();
   const disableDevTools = ((_a = serverConfig2.context) == null ? void 0 : _a.disableDevTools) || false;
   const defaultConsent = serverConfig2.defaultConsent || false;
+  const experimentalQuirkSerialization = ((_b = serverConfig2.experimental) == null ? void 0 : _b.quirkSerialization) || false;
   return /* @__PURE__ */ import_react11.default.createElement(import_react11.default.Fragment, null, children, /* @__PURE__ */ import_react11.default.createElement(
     ContextComponent,
     {
       manifest,
       disableDevTools,
-      defaultConsent
+      defaultConsent,
+      experimentalQuirkSerialization
     }
   ), /* @__PURE__ */ import_react11.default.createElement(import_react10.Suspense, { fallback: /* @__PURE__ */ import_react11.default.createElement(import_react11.default.Fragment, null) }, /* @__PURE__ */ import_react11.default.createElement(import_canvas_next_rsc_client8.UniformScript, null)));
 };

package/dist/index.mjs

@@ -441,7 +441,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 +455,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 +539,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 +566,8 @@ var retrieveRouteByPath = async ({
   path,
   state,
   searchParams,
-  fetchOptions
+  fetchOptions,
+  releaseId
 }) => {
   var _a;
   const client = getDefaultRouteClient({
@@ -580,7 +592,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 +617,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";
@@ -1051,7 +1074,7 @@ var UniformContext = async ({
   clientContextComponent,
   children
 }) => {
-  var _a;
+  var _a, _b;
   const manifest = await getManifest({
     searchParams: {}
   });
@@ -1059,12 +1082,14 @@ var UniformContext = async ({
   const serverConfig2 = getServerConfig();
   const disableDevTools = ((_a = serverConfig2.context) == null ? void 0 : _a.disableDevTools) || false;
   const defaultConsent = serverConfig2.defaultConsent || false;
+  const experimentalQuirkSerialization = ((_b = serverConfig2.experimental) == null ? void 0 : _b.quirkSerialization) || false;
   return /* @__PURE__ */ React7.createElement(React7.Fragment, null, children, /* @__PURE__ */ React7.createElement(
     ContextComponent,
     {
       manifest,
       disableDevTools,
-      defaultConsent
+      defaultConsent,
+      experimentalQuirkSerialization
     }
   ), /* @__PURE__ */ React7.createElement(Suspense2, { fallback: /* @__PURE__ */ React7.createElement(React7.Fragment, null) }, /* @__PURE__ */ React7.createElement(UniformScript, null)));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next-rsc",
-  "version": "19.206.0",
+  "version": "19.207.1-alpha.20+9dc4b12464",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "build": "tsup",
@@ -61,15 +61,15 @@
     "react-dom": "18.3.1"
   },
   "dependencies": {
-    "@uniformdev/canvas": "19.206.0",
-    "@uniformdev/canvas-next-rsc-client": "^19.206.0",
-    "@uniformdev/canvas-next-rsc-shared": "^19.206.0",
-    "@uniformdev/canvas-react": "19.206.0",
-    "@uniformdev/context": "19.206.0",
-    "@uniformdev/project-map": "19.206.0",
-    "@uniformdev/redirect": "19.206.0",
-    "@uniformdev/richtext": "19.206.0",
-    "@uniformdev/webhooks": "19.206.0",
+    "@uniformdev/canvas": "19.207.1-alpha.20+9dc4b12464",
+    "@uniformdev/canvas-next-rsc-client": "^19.207.1-alpha.20+9dc4b12464",
+    "@uniformdev/canvas-next-rsc-shared": "^19.207.1-alpha.20+9dc4b12464",
+    "@uniformdev/canvas-react": "19.207.1-alpha.20+9dc4b12464",
+    "@uniformdev/context": "19.207.1-alpha.20+9dc4b12464",
+    "@uniformdev/project-map": "19.207.1-alpha.20+9dc4b12464",
+    "@uniformdev/redirect": "19.207.1-alpha.20+9dc4b12464",
+    "@uniformdev/richtext": "19.207.1-alpha.20+9dc4b12464",
+    "@uniformdev/webhooks": "19.207.1-alpha.20+9dc4b12464",
     "@vercel/edge-config": "^0.4.0",
     "encoding": "^0.1.13",
     "server-only": "^0.0.1",
@@ -86,5 +86,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1053420353bc9a7ec6930f9e65e18089c6497977"
+  "gitHead": "9dc4b1246494bc273e86dd22cd4818aa4ebd1c24"
 }