@uniformdev/canvas-next-rsc 19.211.1-alpha.2 → 19.212.2-alpha.2

package/dist/index.mjs

@@ -13,7 +13,7 @@ import {
   IN_CONTEXT_EDITOR_QUERY_STRING_PARAM
 } from "@uniformdev/canvas";
 import { draftMode } from "next/headers";
-var isDraftModeEnabled = async ({
+var isDraftModeEnabled = ({
   searchParams
 }) => {
   if (isDevelopmentEnvironment()) {
@@ -21,7 +21,7 @@ var isDraftModeEnabled = async ({
   }
   let draftModeEnabled = false;
   try {
-    draftModeEnabled = (await draftMode()).isEnabled;
+    draftModeEnabled = draftMode().isEnabled;
   } catch (e) {
   }
   return draftModeEnabled || isIncontextEditingEnabled({ searchParams });
@@ -63,8 +63,8 @@ var isDevelopmentEnvironment = () => {
 var getServerConfig = () => {
   return serverConfig;
 };
-var shouldCacheBeDisabled = async (options) => {
-  if (await isDraftModeEnabled(options)) {
+var shouldCacheBeDisabled = (options) => {
+  if (isDraftModeEnabled(options)) {
     return { disabled: true, reason: "DRAFT" };
   }
   if (isIncontextEditingEnabled(options)) {
@@ -78,8 +78,8 @@ var shouldCacheBeDisabled = async (options) => {
     reason: void 0
   };
 };
-var getCanvasCacheStrategy = async (options) => {
-  const { disabled, reason } = await shouldCacheBeDisabled(options);
+var getCanvasCacheStrategy = (options) => {
+  const { disabled, reason } = shouldCacheBeDisabled(options);
   const config = getServerConfig();
   if (disabled) {
     if (reason === "DEV" && config.canvasCache) {
@@ -98,8 +98,8 @@ var getCanvasCacheStrategy = async (options) => {
     type: "force-cache"
   };
 };
-var getManifestCacheStrategy = async (options) => {
-  const { disabled, reason } = await shouldCacheBeDisabled(options);
+var getManifestCacheStrategy = (options) => {
+  const { disabled, reason } = shouldCacheBeDisabled(options);
   const config = getServerConfig();
   if (disabled) {
     if (reason === "DEV" && config.manifestCache) {
@@ -117,8 +117,8 @@ var getManifestCacheStrategy = async (options) => {
     type: "force-cache"
   };
 };
-var getProjectMapCacheStrategy = async (options) => {
-  const { disabled, reason } = await shouldCacheBeDisabled(options);
+var getProjectMapCacheStrategy = (options) => {
+  const { disabled, reason } = shouldCacheBeDisabled(options);
   const config = getServerConfig();
   if (disabled) {
     if (reason === "DEV" && config.projectMapCache) {
@@ -227,9 +227,13 @@ var getCanvasClient = (options) => {
     }
   });
 };
-var getDefaultCanvasClient = async (options) => {
+var getDefaultCanvasClient = ({
+  searchParams
+}) => {
   return getCanvasClient({
-    cache: await getCanvasCacheStrategy(options)
+    cache: getCanvasCacheStrategy({
+      searchParams
+    })
   });
 };
 
@@ -258,13 +262,19 @@ var getManifestClient = (options) => {
   });
   return manifestClient;
 };
-var getDefaultManifestClient = async (options) => {
+var getDefaultManifestClient = ({
+  searchParams
+}) => {
   return getManifestClient({
-    cache: await getManifestCacheStrategy(options)
+    cache: getManifestCacheStrategy({
+      searchParams
+    })
   });
 };
-var getManifest = async (options) => {
-  const manifestClient = await getDefaultManifestClient(options);
+var getManifest = ({ searchParams }) => {
+  const manifestClient = getDefaultManifestClient({
+    searchParams
+  });
   return manifestClient.get();
 };
 
@@ -292,9 +302,13 @@ var getProjectMapClient = (options) => {
   });
   return manifestClient;
 };
-var getDefaultProjectMapClient = async (options) => {
+var getDefaultProjectMapClient = ({
+  searchParams
+}) => {
   return getProjectMapClient({
-    cache: await getProjectMapCacheStrategy(options)
+    cache: getProjectMapCacheStrategy({
+      searchParams
+    })
   });
 };
 
@@ -345,9 +359,11 @@ var getRouteClient = (options) => {
   });
   return client;
 };
-var getDefaultRouteClient = async (options) => {
+var getDefaultRouteClient = ({ searchParams }) => {
   return getRouteClient({
-    cache: await getCanvasCacheStrategy(options)
+    cache: getCanvasCacheStrategy({
+      searchParams
+    })
   });
 };
 
@@ -442,12 +458,11 @@ var createServerUniformContext = async (options) => {
 var createServerUniformContextFromManifest = async (options) => {
   var _a, _b, _c;
   const quirksEnabled = (_a = getServerConfig().experimental) == null ? void 0 : _a.quirkSerialization;
-  const cookieValues = await cookies();
   const context = createUniformContext({
     ...options || {},
-    serverCookieValue: (_b = cookieValues.get(UNIFORM_DEFAULT_COOKIE_NAME)) == null ? void 0 : _b.value,
+    serverCookieValue: (_b = cookies().get(UNIFORM_DEFAULT_COOKIE_NAME)) == null ? void 0 : _b.value,
     experimental_quirksEnabled: quirksEnabled,
-    quirkCookieValue: quirksEnabled ? (_c = cookieValues.get(UNIFORM_DEFAULT_QUIRK_COOKIE_NAME)) == null ? void 0 : _c.value : void 0
+    quirkCookieValue: quirksEnabled ? (_c = cookies().get(UNIFORM_DEFAULT_QUIRK_COOKIE_NAME)) == null ? void 0 : _c.value : void 0
   });
   return context;
 };
@@ -459,10 +474,7 @@ import {
   CANVAS_PUBLISHED_STATE,
   getDataSourceVariantFromRouteGetParams
 } from "@uniformdev/canvas";
-import {
-  getBaseUrl,
-  resolvePath
-} from "@uniformdev/canvas-next-rsc-shared";
+import { getBaseUrl, resolvePath } from "@uniformdev/canvas-next-rsc-shared";
 import { getTargetVariableExpandedUrl } from "@uniformdev/redirect";
 var retrieveCompositionBySlug = async ({
   slug,
@@ -479,12 +491,12 @@ var retrieveCompositionBySlug = async ({
     });
   }
   let result;
-  const states = await determineState({
+  const states = determineState({
     searchParams
   });
   for (let i = 0; i < states.length; i++) {
     const state = states[i];
-    const canvasClient = await getDefaultCanvasClient({
+    const canvasClient = getDefaultCanvasClient({
       searchParams
     });
     try {
@@ -513,17 +525,16 @@ var retrieveCompositionBySlug = async ({
     type: "notFound"
   };
 };
-var retrieveRoute = async ({ params, searchParams: providedSearchParams, skipPrefetch }, fetchOptions) => {
-  const searchParams = await providedSearchParams;
+var retrieveRoute = async ({ params, searchParams, skipPrefetch }, fetchOptions) => {
   if (!skipPrefetch) {
     void getManifest({
       searchParams
     });
   }
   const { value } = resolvePath({
-    params: await params
+    params
   });
-  const states = await determineState({
+  const states = determineState({
     searchParams
   });
   let result;
@@ -560,7 +571,7 @@ var retrieveRouteByPath = async ({
   releaseId
 }) => {
   var _a;
-  const client = await getDefaultRouteClient({
+  const client = getDefaultRouteClient({
     searchParams
   });
   let queryPath = path;
@@ -592,10 +603,8 @@ var resolveRedirectHref = (resolveResult, path) => {
   const url = new URL(expandedUrl);
   return url.pathname;
 };
-var determineState = async ({ searchParams }) => {
-  const isDraftMode = await isDraftModeEnabled({
-    searchParams
-  });
+var determineState = ({ searchParams }) => {
+  const draftMode2 = isDraftModeEnabled({ searchParams });
   const previewEnvironment = isOnVercelPreviewEnvironment();
   const isDevelopment = isDevelopmentEnvironment();
   const isCanvasEditing = isIncontextEditingEnabled({
@@ -605,7 +614,7 @@ var determineState = async ({ searchParams }) => {
   if (isCanvasEditing) {
     states = [CANVAS_EDITOR_STATE, CANVAS_DRAFT_STATE];
   } else {
-    states = isDraftMode || previewEnvironment || isDevelopment ? [CANVAS_DRAFT_STATE] : [CANVAS_PUBLISHED_STATE];
+    states = draftMode2 || previewEnvironment || isDevelopment ? [CANVAS_DRAFT_STATE] : [CANVAS_PUBLISHED_STATE];
   }
   return states;
 };
@@ -613,9 +622,7 @@ var determineReleaseId = ({
   searchParams,
   state
 }) => {
-  const draftMode2 = isDraftModeEnabled({
-    searchParams
-  });
+  const draftMode2 = isDraftModeEnabled({ searchParams });
   if (!draftMode2 || state === CANVAS_PUBLISHED_STATE) {
     return void 0;
   }
@@ -756,15 +763,12 @@ var UniformComposition = async ({
   if (props.mode === "static") {
     searchParams = void 0;
   } else if (props.mode === "server") {
-    searchParams = await props.searchParams;
     serverContext = props.serverContext || await createServerUniformContext({
-      searchParams
+      searchParams: props.searchParams
     });
+    searchParams = props.searchParams;
   }
-  const awaitedParams = await props.params;
-  const { value: path } = resolvePath2({
-    params: awaitedParams
-  });
+  const { value: path } = resolvePath2(props);
   if (!route || route.type === "notFound") {
     notFound();
   }
@@ -798,7 +802,7 @@ var UniformComposition = async ({
     dynamicInputs: route.dynamicInputs,
     type: "composition",
     isContextualEditing: isIncontextEditingEnabled({ searchParams }),
-    isDraftMode: await isDraftModeEnabled({ searchParams }),
+    isDraftMode: isDraftModeEnabled({ searchParams }),
     state: route.compositionApiResponse.state,
     path,
     previewMode: determinePreviewMode({ searchParams })
@@ -813,14 +817,14 @@ var UniformComposition = async ({
   });
   let transfer = null;
   if (props.mode === "server") {
-    const headersValue = await headers();
+    const headersValue = headers();
     const missingQuirkValue = "unknown";
     transfer = createElement3(ContextUpdateTransfer, {
       serverContext,
       update: {
-        params: awaitedParams,
+        params: props.params,
         searchParams,
-        cookies: (await cookies2()).getAll().reduce(
+        cookies: cookies2().getAll().reduce(
           (acc, cookie) => {
             acc[cookie.name] = cookie.value;
             return acc;
@@ -1115,7 +1119,7 @@ import {
   UniformScript
 } from "@uniformdev/canvas-next-rsc-client";
 import { Suspense as Suspense2 } from "react";
-import React9 from "react";
+import React8 from "react";
 var UniformContext = async ({
   clientContextComponent,
   children
@@ -1129,7 +1133,7 @@ var UniformContext = async ({
   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__ */ React9.createElement(React9.Fragment, null, children, /* @__PURE__ */ React9.createElement(
+  return /* @__PURE__ */ React8.createElement(React8.Fragment, null, children, /* @__PURE__ */ React8.createElement(
     ContextComponent,
     {
       manifest,
@@ -1137,19 +1141,18 @@ var UniformContext = async ({
       defaultConsent,
       experimentalQuirkSerialization
     }
-  ), /* @__PURE__ */ React9.createElement(Suspense2, { fallback: /* @__PURE__ */ React9.createElement(React9.Fragment, null) }, /* @__PURE__ */ React9.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 React10 from "react";
+import React9 from "react";
 var UniformPlayground = async ({ searchParams, ...rest }) => {
-  const awaitedSearchParams = await searchParams;
-  if (!isDraftModeEnabled({ searchParams: awaitedSearchParams })) {
-    return /* @__PURE__ */ React10.createElement("div", null, /* @__PURE__ */ React10.createElement("h1", null, "Playground is only available in draft mode"));
+  if (!isDraftModeEnabled({ searchParams })) {
+    return /* @__PURE__ */ React9.createElement("div", null, /* @__PURE__ */ React9.createElement("h1", null, "Playground is only available in draft mode"));
   }
-  const id = awaitedSearchParams["id"];
+  const id = searchParams["id"];
   if (!id) {
     notFound2();
   }
@@ -1178,11 +1181,11 @@ var UniformPlayground = async ({ searchParams, ...rest }) => {
   if (!composition) {
     notFound2();
   }
-  return /* @__PURE__ */ React10.createElement(
+  return /* @__PURE__ */ React9.createElement(
     UniformComposition,
     {
       mode: "server",
-      params: void 0,
+      params: {},
       searchParams,
       route: {
         type: "composition",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next-rsc",
-  "version": "19.211.1-alpha.2+498f57ab58",
+  "version": "19.212.2-alpha.2+bda012917f",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "build": "tsup",
@@ -56,35 +56,35 @@
     "@types/node": "22.7.8",
     "@types/react": "18.3.11",
     "eslint": "9.9.0",
-    "next": "15.1.0",
+    "next": "^14.0.0",
     "react": "18.3.1",
     "react-dom": "18.3.1"
   },
   "dependencies": {
-    "@uniformdev/canvas": "19.211.1-alpha.2+498f57ab58",
-    "@uniformdev/canvas-next-rsc-client": "^19.211.1-alpha.2+498f57ab58",
-    "@uniformdev/canvas-next-rsc-shared": "^19.211.1-alpha.2+498f57ab58",
-    "@uniformdev/canvas-react": "19.211.1-alpha.2+498f57ab58",
-    "@uniformdev/context": "19.211.1-alpha.2+498f57ab58",
-    "@uniformdev/project-map": "19.211.1-alpha.2+498f57ab58",
-    "@uniformdev/redirect": "19.211.1-alpha.2+498f57ab58",
-    "@uniformdev/richtext": "19.211.1-alpha.2+498f57ab58",
-    "@uniformdev/webhooks": "19.211.1-alpha.2+498f57ab58",
+    "@uniformdev/canvas": "19.212.2-alpha.2+bda012917f",
+    "@uniformdev/canvas-next-rsc-client": "^19.212.2-alpha.2+bda012917f",
+    "@uniformdev/canvas-next-rsc-shared": "^19.212.2-alpha.2+bda012917f",
+    "@uniformdev/canvas-react": "19.212.2-alpha.2+bda012917f",
+    "@uniformdev/context": "19.212.2-alpha.2+bda012917f",
+    "@uniformdev/project-map": "19.212.2-alpha.2+bda012917f",
+    "@uniformdev/redirect": "19.212.2-alpha.2+bda012917f",
+    "@uniformdev/richtext": "19.212.2-alpha.2+bda012917f",
+    "@uniformdev/webhooks": "19.212.2-alpha.2+bda012917f",
     "@vercel/edge-config": "^0.4.0",
     "encoding": "^0.1.13",
     "server-only": "^0.0.1",
     "svix": "^1.5.0"
   },
   "engines": {
-    "node": "^18.18.0 || ^19.8.0 || >= 20.0.0"
+    "node": ">=16.14.0"
   },
   "peerDependencies": {
-    "next": ">=15.1.0",
-    "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"
+    "next": ">=13.4.7",
+    "react": ">=18.2",
+    "react-dom": ">=18.2"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "498f57ab585765304de6e7bf46d6c5408b9c03e2"
+  "gitHead": "bda012917f3dd9c8eac49fa1ab49d1de577853ef"
 }