@uniformdev/canvas-next-rsc 19.196.1-alpha.2 → 19.196.1

package/dist/config.js

@@ -28,58 +28,31 @@ var import_path = require("path");
 var getConfigPath = () => {
   const possibleExtensions = [".js", ".cjs", ".mjs", ".ts"];
   let configFilePath;
-  let configFileName;
   for (const extension of possibleExtensions) {
-    const fileName = `uniform.server.config${extension}`;
-    const filePath = (0, import_path.join)(process.cwd(), fileName);
+    const filePath = (0, import_path.join)(process.cwd(), `uniform.server.config${extension}`);
     if ((0, import_fs.existsSync)(filePath)) {
       configFilePath = filePath;
-      configFileName = fileName;
       break;
     }
   }
-  if (!configFilePath) {
-    return void 0;
-  }
-  return {
-    filePath: configFilePath,
-    fileName: configFileName
-  };
+  return configFilePath;
 };
-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) || {}
-  };
-  if (uniformConfigFileName) {
-    console.log("(Turbo) Using Uniform config from", uniformConfigFileName);
-    turboResolveAliases["uniform.server.config"] = `./${uniformConfigFileName}`;
-  }
-  return {
-    ...nextConfig,
-    experimental: {
-      ...nextConfig.experimental || {},
-      turbo: {
-        ...((_c = nextConfig.experimental) == null ? void 0 : _c.turbo) || {},
-        resolveAlias: turboResolveAliases
-      }
-    },
-    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);
-        }
+var withUniformConfig = (nextConfig) => ({
+  ...nextConfig,
+  webpack: (config, context) => {
+    if (nextConfig.webpack) {
+      nextConfig.webpack(config, context);
+    }
+    if (context.isServer) {
+      const uniformConfigPath = getConfigPath();
+      if (uniformConfigPath) {
+        console.log("Using Uniform config from", uniformConfigPath);
+        config.resolve.alias["uniform.server.config"] = (0, import_path.resolve)(config.context, uniformConfigPath);
       }
-      return config;
     }
-  };
-};
+    return config;
+  }
+});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   withUniformConfig

package/dist/config.mjs

@@ -4,58 +4,31 @@ import { join, resolve } from "path";
 var getConfigPath = () => {
   const possibleExtensions = [".js", ".cjs", ".mjs", ".ts"];
   let configFilePath;
-  let configFileName;
   for (const extension of possibleExtensions) {
-    const fileName = `uniform.server.config${extension}`;
-    const filePath = join(process.cwd(), fileName);
+    const filePath = join(process.cwd(), `uniform.server.config${extension}`);
     if (existsSync(filePath)) {
       configFilePath = filePath;
-      configFileName = fileName;
       break;
     }
   }
-  if (!configFilePath) {
-    return void 0;
-  }
-  return {
-    filePath: configFilePath,
-    fileName: configFileName
-  };
+  return configFilePath;
 };
-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) || {}
-  };
-  if (uniformConfigFileName) {
-    console.log("(Turbo) Using Uniform config from", uniformConfigFileName);
-    turboResolveAliases["uniform.server.config"] = `./${uniformConfigFileName}`;
-  }
-  return {
-    ...nextConfig,
-    experimental: {
-      ...nextConfig.experimental || {},
-      turbo: {
-        ...((_c = nextConfig.experimental) == null ? void 0 : _c.turbo) || {},
-        resolveAlias: turboResolveAliases
-      }
-    },
-    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);
-        }
+var withUniformConfig = (nextConfig) => ({
+  ...nextConfig,
+  webpack: (config, context) => {
+    if (nextConfig.webpack) {
+      nextConfig.webpack(config, context);
+    }
+    if (context.isServer) {
+      const uniformConfigPath = getConfigPath();
+      if (uniformConfigPath) {
+        console.log("Using Uniform config from", uniformConfigPath);
+        config.resolve.alias["uniform.server.config"] = resolve(config.context, uniformConfigPath);
       }
-      return config;
     }
-  };
-};
+    return config;
+  }
+});
 export {
   withUniformConfig
 };

package/dist/handler.js

@@ -100,14 +100,14 @@ var createPreviewGETRouteHandler = (options) => {
       return new Response("Could not resolve the full path of the preview page", { status: 400 });
     }
     if (disable) {
-      (await (0, import_headers.draftMode)()).disable();
+      (0, import_headers.draftMode)().disable();
       (0, import_navigation.redirect)(pathToRedirectTo);
       return;
     }
     if (secret !== process.env.UNIFORM_PREVIEW_SECRET) {
       return new Response("Invalid preview secret", { status: 401 });
     }
-    (await (0, import_headers.draftMode)()).enable();
+    (0, import_headers.draftMode)().enable();
     const redirectionUrl = new URL(pathToRedirectTo, BASE_URL_EXAMPLE);
     assignRequestQueryToSearchParams(redirectionUrl.searchParams, searchParams);
     if (isPlayground) {

package/dist/handler.mjs

@@ -67,14 +67,14 @@ var createPreviewGETRouteHandler = (options) => {
       return new Response("Could not resolve the full path of the preview page", { status: 400 });
     }
     if (disable) {
-      (await draftMode()).disable();
+      draftMode().disable();
       redirect(pathToRedirectTo);
       return;
     }
     if (secret !== process.env.UNIFORM_PREVIEW_SECRET) {
       return new Response("Invalid preview secret", { status: 401 });
     }
-    (await draftMode()).enable();
+    draftMode().enable();
     const redirectionUrl = new URL(pathToRedirectTo, BASE_URL_EXAMPLE);
     assignRequestQueryToSearchParams(redirectionUrl.searchParams, searchParams);
     if (isPlayground) {

package/dist/index.d.mts

@@ -14,18 +14,18 @@ type GetCanvasClientOptions = {
 };
 declare const getCanvasClient: (options: GetCanvasClientOptions) => CanvasClient;
 declare const getDefaultCanvasClient: ({ searchParams, }: {
-    searchParams: Awaited<PageParameters["searchParams"]>;
-}) => Promise<CanvasClient>;
+    searchParams: PageParameters["searchParams"];
+}) => CanvasClient;
 
 type GetManifestClientOptions = {
     cache: NonNullable<UniformServerConfig['manifestCache']>;
 };
 declare const getManifestClient: (options: GetManifestClientOptions) => ManifestClient;
 declare const getDefaultManifestClient: ({ searchParams, }: {
-    searchParams?: Awaited<PageParameters["searchParams"]>;
-}) => Promise<ManifestClient>;
-declare const getManifest: ({ searchParams, }: {
-    searchParams: Awaited<PageParameters["searchParams"]>;
+    searchParams?: PageParameters["searchParams"];
+}) => ManifestClient;
+declare const getManifest: ({ searchParams }: {
+    searchParams: PageParameters["searchParams"];
 }) => Promise<{
     project: {
         id?: string;
@@ -187,16 +187,16 @@ type GetProjectMapClientOptions = {
 };
 declare const getProjectMapClient: (options: GetProjectMapClientOptions) => ProjectMapClient;
 declare const getDefaultProjectMapClient: ({ searchParams, }: {
-    searchParams: Awaited<PageParameters["searchParams"]>;
-}) => Promise<ProjectMapClient>;
+    searchParams: PageParameters["searchParams"];
+}) => ProjectMapClient;
 
 type GetRouteClientOptions = {
     cache: NonNullable<UniformServerConfig['canvasCache']>;
 };
 declare const getRouteClient: (options: GetRouteClientOptions) => RouteClient;
-declare const getDefaultRouteClient: ({ searchParams, }: {
-    searchParams: Awaited<PageParameters["searchParams"]>;
-}) => Promise<RouteClient>;
+declare const getDefaultRouteClient: ({ searchParams }: {
+    searchParams: PageParameters["searchParams"];
+}) => RouteClient;
 
 type ContextUpdateTransferProps = {
     update: Partial<AppDirectoryContextState> | (() => Promise<Partial<ContextState> | undefined>);
@@ -223,10 +223,10 @@ type UniformContextProps = {
 declare const UniformContext: React__default.FC<PropsWithChildren<UniformContextProps>>;
 
 type UniformPlaygroundProps = PlaygroundParameters & Omit<UniformCompositionProps, 'params' | 'searchParams' | 'route' | 'mode'>;
-declare const UniformPlayground: ({ searchParams: providedSearchParams, ...rest }: UniformPlaygroundProps) => Promise<React__default.JSX.Element>;
+declare const UniformPlayground: ({ searchParams, ...rest }: UniformPlaygroundProps) => Promise<React__default.JSX.Element>;
 
 type CreateServerUniformContextProps = Omit<ContextOptions, 'transitionStore' | 'manifest'> & {
-    searchParams: Awaited<PageParameters['searchParams']>;
+    searchParams: PageParameters['searchParams'];
 };
 declare const createServerUniformContext: (options: CreateServerUniformContextProps) => Promise<AppDirectoryServerContext>;
 
@@ -234,10 +234,12 @@ declare const isDraftModeEnabled: ({ searchParams, }: {
     searchParams: {
         [key: string]: string | undefined;
     } | undefined;
-}) => Promise<boolean>;
-declare const isIncontextEditingEnabled: ({ searchParams: providedSearchParams, }: {
-    searchParams: Awaited<PageParameters["searchParams"]>;
-}) => Promise<boolean>;
+}) => boolean;
+declare const isIncontextEditingEnabled: ({ searchParams, }: {
+    searchParams: {
+        [key: string]: string | undefined;
+    } | undefined;
+}) => boolean;
 declare const isOnVercelPreviewEnvironment: () => boolean;
 declare const isDevelopmentEnvironment: () => boolean;
 
@@ -249,10 +251,7 @@ type RetrieveCommonOptions = {
      */
     skipPrefetch?: boolean;
 };
-type RetrieveRouteOptions = {
-    params: Awaited<PageParameters['params']>;
-    searchParams: Awaited<PageParameters['searchParams']>;
-} & RetrieveCommonOptions;
+type RetrieveRouteOptions = PageParameters & RetrieveCommonOptions;
 type RetrieveSlugOptions = Pick<CompositionGetBySlugParameters, 'slug' | 'locale' | 'releaseId' | 'versionId'> & {
     /**
      * The searchParams object from Next.js router. Used for signal evaluation.

package/dist/index.d.ts

@@ -14,18 +14,18 @@ type GetCanvasClientOptions = {
 };
 declare const getCanvasClient: (options: GetCanvasClientOptions) => CanvasClient;
 declare const getDefaultCanvasClient: ({ searchParams, }: {
-    searchParams: Awaited<PageParameters["searchParams"]>;
-}) => Promise<CanvasClient>;
+    searchParams: PageParameters["searchParams"];
+}) => CanvasClient;
 
 type GetManifestClientOptions = {
     cache: NonNullable<UniformServerConfig['manifestCache']>;
 };
 declare const getManifestClient: (options: GetManifestClientOptions) => ManifestClient;
 declare const getDefaultManifestClient: ({ searchParams, }: {
-    searchParams?: Awaited<PageParameters["searchParams"]>;
-}) => Promise<ManifestClient>;
-declare const getManifest: ({ searchParams, }: {
-    searchParams: Awaited<PageParameters["searchParams"]>;
+    searchParams?: PageParameters["searchParams"];
+}) => ManifestClient;
+declare const getManifest: ({ searchParams }: {
+    searchParams: PageParameters["searchParams"];
 }) => Promise<{
     project: {
         id?: string;
@@ -187,16 +187,16 @@ type GetProjectMapClientOptions = {
 };
 declare const getProjectMapClient: (options: GetProjectMapClientOptions) => ProjectMapClient;
 declare const getDefaultProjectMapClient: ({ searchParams, }: {
-    searchParams: Awaited<PageParameters["searchParams"]>;
-}) => Promise<ProjectMapClient>;
+    searchParams: PageParameters["searchParams"];
+}) => ProjectMapClient;
 
 type GetRouteClientOptions = {
     cache: NonNullable<UniformServerConfig['canvasCache']>;
 };
 declare const getRouteClient: (options: GetRouteClientOptions) => RouteClient;
-declare const getDefaultRouteClient: ({ searchParams, }: {
-    searchParams: Awaited<PageParameters["searchParams"]>;
-}) => Promise<RouteClient>;
+declare const getDefaultRouteClient: ({ searchParams }: {
+    searchParams: PageParameters["searchParams"];
+}) => RouteClient;
 
 type ContextUpdateTransferProps = {
     update: Partial<AppDirectoryContextState> | (() => Promise<Partial<ContextState> | undefined>);
@@ -223,10 +223,10 @@ type UniformContextProps = {
 declare const UniformContext: React__default.FC<PropsWithChildren<UniformContextProps>>;
 
 type UniformPlaygroundProps = PlaygroundParameters & Omit<UniformCompositionProps, 'params' | 'searchParams' | 'route' | 'mode'>;
-declare const UniformPlayground: ({ searchParams: providedSearchParams, ...rest }: UniformPlaygroundProps) => Promise<React__default.JSX.Element>;
+declare const UniformPlayground: ({ searchParams, ...rest }: UniformPlaygroundProps) => Promise<React__default.JSX.Element>;
 
 type CreateServerUniformContextProps = Omit<ContextOptions, 'transitionStore' | 'manifest'> & {
-    searchParams: Awaited<PageParameters['searchParams']>;
+    searchParams: PageParameters['searchParams'];
 };
 declare const createServerUniformContext: (options: CreateServerUniformContextProps) => Promise<AppDirectoryServerContext>;
 
@@ -234,10 +234,12 @@ declare const isDraftModeEnabled: ({ searchParams, }: {
     searchParams: {
         [key: string]: string | undefined;
     } | undefined;
-}) => Promise<boolean>;
-declare const isIncontextEditingEnabled: ({ searchParams: providedSearchParams, }: {
-    searchParams: Awaited<PageParameters["searchParams"]>;
-}) => Promise<boolean>;
+}) => boolean;
+declare const isIncontextEditingEnabled: ({ searchParams, }: {
+    searchParams: {
+        [key: string]: string | undefined;
+    } | undefined;
+}) => boolean;
 declare const isOnVercelPreviewEnvironment: () => boolean;
 declare const isDevelopmentEnvironment: () => boolean;
 
@@ -249,10 +251,7 @@ type RetrieveCommonOptions = {
      */
     skipPrefetch?: boolean;
 };
-type RetrieveRouteOptions = {
-    params: Awaited<PageParameters['params']>;
-    searchParams: Awaited<PageParameters['searchParams']>;
-} & RetrieveCommonOptions;
+type RetrieveRouteOptions = PageParameters & RetrieveCommonOptions;
 type RetrieveSlugOptions = Pick<CompositionGetBySlugParameters, 'slug' | 'locale' | 'releaseId' | 'versionId'> & {
     /**
      * The searchParams object from Next.js router. Used for signal evaluation.

package/dist/index.esm.js

@@ -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,15 +21,14 @@ var isDraftModeEnabled = async ({
   }
   let draftModeEnabled = false;
   try {
-    draftModeEnabled = (await draftMode()).isEnabled;
+    draftModeEnabled = draftMode().isEnabled;
   } catch (e) {
   }
   return draftModeEnabled || isIncontextEditingEnabled({ searchParams });
 };
-var isIncontextEditingEnabled = async ({
-  searchParams: providedSearchParams
+var isIncontextEditingEnabled = ({
+  searchParams
 }) => {
-  const searchParams = await (providedSearchParams || Promise.resolve(void 0));
   const containsKey = typeof (searchParams == null ? void 0 : searchParams[IN_CONTEXT_EDITOR_QUERY_STRING_PARAM]) !== "undefined";
   return containsKey;
 };
@@ -64,11 +63,11 @@ 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 (await isIncontextEditingEnabled(options)) {
+  if (isIncontextEditingEnabled(options)) {
     return { disabled: true, reason: "INCONTEXT" };
   }
   if (isDevelopmentEnvironment()) {
@@ -79,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) {
@@ -99,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) {
@@ -118,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) {
@@ -228,11 +227,11 @@ var getCanvasClient = (options) => {
     }
   });
 };
-var getDefaultCanvasClient = async ({
+var getDefaultCanvasClient = ({
   searchParams
 }) => {
   return getCanvasClient({
-    cache: await getCanvasCacheStrategy({
+    cache: getCanvasCacheStrategy({
       searchParams
     })
   });
@@ -263,19 +262,17 @@ var getManifestClient = (options) => {
   });
   return manifestClient;
 };
-var getDefaultManifestClient = async ({
+var getDefaultManifestClient = ({
   searchParams
 }) => {
   return getManifestClient({
-    cache: await getManifestCacheStrategy({
+    cache: getManifestCacheStrategy({
       searchParams
     })
   });
 };
-var getManifest = async ({
-  searchParams
-}) => {
-  const manifestClient = await getDefaultManifestClient({
+var getManifest = ({ searchParams }) => {
+  const manifestClient = getDefaultManifestClient({
     searchParams
   });
   return manifestClient.get();
@@ -305,11 +302,11 @@ var getProjectMapClient = (options) => {
   });
   return manifestClient;
 };
-var getDefaultProjectMapClient = async ({
+var getDefaultProjectMapClient = ({
   searchParams
 }) => {
   return getProjectMapClient({
-    cache: await getProjectMapCacheStrategy({
+    cache: getProjectMapCacheStrategy({
       searchParams
     })
   });
@@ -362,11 +359,9 @@ var getRouteClient = (options) => {
   });
   return client;
 };
-var getDefaultRouteClient = async ({
-  searchParams
-}) => {
+var getDefaultRouteClient = ({ searchParams }) => {
   return getRouteClient({
-    cache: await getCanvasCacheStrategy({
+    cache: getCanvasCacheStrategy({
       searchParams
     })
   });
@@ -460,7 +455,7 @@ var createServerUniformContextFromManifest = async (options) => {
   var _a;
   const context = createUniformContext({
     ...options || {},
-    serverCookieValue: (_a = (await cookies()).get(UNIFORM_DEFAULT_COOKIE_NAME)) == null ? void 0 : _a.value
+    serverCookieValue: (_a = cookies().get(UNIFORM_DEFAULT_COOKIE_NAME)) == null ? void 0 : _a.value
   });
   return context;
 };
@@ -489,12 +484,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 {
@@ -532,7 +527,7 @@ var retrieveRoute = async ({ params, searchParams, skipPrefetch }, fetchOptions)
   const { value } = resolvePath({
     params
   });
-  const states = await determineState({
+  const states = determineState({
     searchParams
   });
   let result;
@@ -559,12 +554,11 @@ var retrieveRoute = async ({ params, searchParams, skipPrefetch }, fetchOptions)
 var retrieveRouteByPath = async ({
   path,
   state,
-  searchParams: providedSearchParams,
+  searchParams,
   fetchOptions
 }) => {
   var _a;
-  const searchParams = await (providedSearchParams != null ? providedSearchParams : Promise.resolve(void 0));
-  const client = await getDefaultRouteClient({
+  const client = getDefaultRouteClient({
     searchParams
   });
   let queryPath = path;
@@ -595,13 +589,11 @@ var resolveRedirectHref = (resolveResult, path) => {
   const url = new URL(expandedUrl);
   return url.pathname;
 };
-var determineState = async ({
-  searchParams
-}) => {
-  const draftMode2 = await isDraftModeEnabled({ searchParams });
+var determineState = ({ searchParams }) => {
+  const draftMode2 = isDraftModeEnabled({ searchParams });
   const previewEnvironment = isOnVercelPreviewEnvironment();
   const isDevelopment = isDevelopmentEnvironment();
-  const isCanvasEditing = await isIncontextEditingEnabled({
+  const isCanvasEditing = isIncontextEditingEnabled({
     searchParams
   });
   let states;
@@ -733,14 +725,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 { value: path } = resolvePath2({
-    params: await props.params
-  });
+  const { value: path } = resolvePath2(props);
   if (!route || route.type === "notFound") {
     notFound();
   }
@@ -770,8 +760,8 @@ var UniformComposition = async ({
     searchParams,
     dynamicInputs: route.dynamicInputs,
     type: "composition",
-    isContextualEditing: await isIncontextEditingEnabled({ searchParams }),
-    isDraftMode: await isDraftModeEnabled({ searchParams }),
+    isContextualEditing: isIncontextEditingEnabled({ searchParams }),
+    isDraftMode: isDraftModeEnabled({ searchParams }),
     state: route.compositionApiResponse.state,
     path,
     previewMode: determinePreviewMode({ searchParams })
@@ -785,14 +775,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: await props.params,
+        params: props.params,
         searchParams,
-        cookies: (await cookies2()).getAll().reduce(
+        cookies: cookies2().getAll().reduce(
           (acc, cookie) => {
             acc[cookie.name] = cookie.value;
             return acc;
@@ -1086,12 +1076,8 @@ var UniformContext = async ({
 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";
-var UniformPlayground = async ({
-  searchParams: providedSearchParams,
-  ...rest
-}) => {
-  const searchParams = await (providedSearchParams != null ? providedSearchParams : {});
-  if (!await isDraftModeEnabled({ searchParams })) {
+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"));
   }
   const id = searchParams["id"];

package/dist/index.js

@@ -66,7 +66,7 @@ var import_uniform_server = __toESM(require("uniform.server.config"));
 // src/utils/draft.ts
 var import_canvas = require("@uniformdev/canvas");
 var import_headers = require("next/headers");
-var isDraftModeEnabled = async ({
+var isDraftModeEnabled = ({
   searchParams
 }) => {
   if (isDevelopmentEnvironment()) {
@@ -74,15 +74,14 @@ var isDraftModeEnabled = async ({
   }
   let draftModeEnabled = false;
   try {
-    draftModeEnabled = (await (0, import_headers.draftMode)()).isEnabled;
+    draftModeEnabled = (0, import_headers.draftMode)().isEnabled;
   } catch (e) {
   }
   return draftModeEnabled || isIncontextEditingEnabled({ searchParams });
 };
-var isIncontextEditingEnabled = async ({
-  searchParams: providedSearchParams
+var isIncontextEditingEnabled = ({
+  searchParams
 }) => {
-  const searchParams = await (providedSearchParams || Promise.resolve(void 0));
   const containsKey = typeof (searchParams == null ? void 0 : searchParams[import_canvas.IN_CONTEXT_EDITOR_QUERY_STRING_PARAM]) !== "undefined";
   return containsKey;
 };
@@ -117,11 +116,11 @@ var isDevelopmentEnvironment = () => {
 var getServerConfig = () => {
   return import_uniform_server.default;
 };
-var shouldCacheBeDisabled = async (options) => {
-  if (await isDraftModeEnabled(options)) {
+var shouldCacheBeDisabled = (options) => {
+  if (isDraftModeEnabled(options)) {
     return { disabled: true, reason: "DRAFT" };
   }
-  if (await isIncontextEditingEnabled(options)) {
+  if (isIncontextEditingEnabled(options)) {
     return { disabled: true, reason: "INCONTEXT" };
   }
   if (isDevelopmentEnvironment()) {
@@ -132,8 +131,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) {
@@ -152,8 +151,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) {
@@ -171,8 +170,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) {
@@ -281,11 +280,11 @@ var getCanvasClient = (options) => {
     }
   });
 };
-var getDefaultCanvasClient = async ({
+var getDefaultCanvasClient = ({
   searchParams
 }) => {
   return getCanvasClient({
-    cache: await getCanvasCacheStrategy({
+    cache: getCanvasCacheStrategy({
       searchParams
     })
   });
@@ -316,19 +315,17 @@ var getManifestClient = (options) => {
   });
   return manifestClient;
 };
-var getDefaultManifestClient = async ({
+var getDefaultManifestClient = ({
   searchParams
 }) => {
   return getManifestClient({
-    cache: await getManifestCacheStrategy({
+    cache: getManifestCacheStrategy({
       searchParams
     })
   });
 };
-var getManifest = async ({
-  searchParams
-}) => {
-  const manifestClient = await getDefaultManifestClient({
+var getManifest = ({ searchParams }) => {
+  const manifestClient = getDefaultManifestClient({
     searchParams
   });
   return manifestClient.get();
@@ -358,11 +355,11 @@ var getProjectMapClient = (options) => {
   });
   return manifestClient;
 };
-var getDefaultProjectMapClient = async ({
+var getDefaultProjectMapClient = ({
   searchParams
 }) => {
   return getProjectMapClient({
-    cache: await getProjectMapCacheStrategy({
+    cache: getProjectMapCacheStrategy({
       searchParams
     })
   });
@@ -415,11 +412,9 @@ var getRouteClient = (options) => {
   });
   return client;
 };
-var getDefaultRouteClient = async ({
-  searchParams
-}) => {
+var getDefaultRouteClient = ({ searchParams }) => {
   return getRouteClient({
-    cache: await getCanvasCacheStrategy({
+    cache: getCanvasCacheStrategy({
       searchParams
     })
   });
@@ -500,7 +495,7 @@ var createServerUniformContextFromManifest = async (options) => {
   var _a;
   const context = (0, import_canvas_next_rsc_shared.createUniformContext)({
     ...options || {},
-    serverCookieValue: (_a = (await (0, import_headers2.cookies)()).get(import_context.UNIFORM_DEFAULT_COOKIE_NAME)) == null ? void 0 : _a.value
+    serverCookieValue: (_a = (0, import_headers2.cookies)().get(import_context.UNIFORM_DEFAULT_COOKIE_NAME)) == null ? void 0 : _a.value
   });
   return context;
 };
@@ -524,12 +519,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 {
@@ -567,7 +562,7 @@ var retrieveRoute = async ({ params, searchParams, skipPrefetch }, fetchOptions)
   const { value } = (0, import_canvas_next_rsc_shared2.resolvePath)({
     params
   });
-  const states = await determineState({
+  const states = determineState({
     searchParams
   });
   let result;
@@ -594,12 +589,11 @@ var retrieveRoute = async ({ params, searchParams, skipPrefetch }, fetchOptions)
 var retrieveRouteByPath = async ({
   path,
   state,
-  searchParams: providedSearchParams,
+  searchParams,
   fetchOptions
 }) => {
   var _a;
-  const searchParams = await (providedSearchParams != null ? providedSearchParams : Promise.resolve(void 0));
-  const client = await getDefaultRouteClient({
+  const client = getDefaultRouteClient({
     searchParams
   });
   let queryPath = path;
@@ -630,13 +624,11 @@ var resolveRedirectHref = (resolveResult, path) => {
   const url = new URL(expandedUrl);
   return url.pathname;
 };
-var determineState = async ({
-  searchParams
-}) => {
-  const draftMode2 = await isDraftModeEnabled({ searchParams });
+var determineState = ({ searchParams }) => {
+  const draftMode2 = isDraftModeEnabled({ searchParams });
   const previewEnvironment = isOnVercelPreviewEnvironment();
   const isDevelopment = isDevelopmentEnvironment();
-  const isCanvasEditing = await isIncontextEditingEnabled({
+  const isCanvasEditing = isIncontextEditingEnabled({
     searchParams
   });
   let states;
@@ -763,14 +755,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 { value: path } = (0, import_canvas_next_rsc_shared6.resolvePath)({
-    params: await props.params
-  });
+  const { value: path } = (0, import_canvas_next_rsc_shared6.resolvePath)(props);
   if (!route || route.type === "notFound") {
     (0, import_navigation.notFound)();
   }
@@ -800,8 +790,8 @@ var UniformComposition = async ({
     searchParams,
     dynamicInputs: route.dynamicInputs,
     type: "composition",
-    isContextualEditing: await isIncontextEditingEnabled({ searchParams }),
-    isDraftMode: await isDraftModeEnabled({ searchParams }),
+    isContextualEditing: isIncontextEditingEnabled({ searchParams }),
+    isDraftMode: isDraftModeEnabled({ searchParams }),
     state: route.compositionApiResponse.state,
     path,
     previewMode: determinePreviewMode({ searchParams })
@@ -815,14 +805,14 @@ var UniformComposition = async ({
   });
   let transfer = null;
   if (props.mode === "server") {
-    const headersValue = await (0, import_headers3.headers)();
+    const headersValue = (0, import_headers3.headers)();
     const missingQuirkValue = "unknown";
     transfer = (0, import_react9.createElement)(ContextUpdateTransfer, {
       serverContext,
       update: {
-        params: await props.params,
+        params: props.params,
         searchParams,
-        cookies: (await (0, import_headers3.cookies)()).getAll().reduce(
+        cookies: (0, import_headers3.cookies)().getAll().reduce(
           (acc, cookie) => {
             acc[cookie.name] = cookie.value;
             return acc;
@@ -1113,12 +1103,8 @@ var UniformContext = async ({
 var import_canvas9 = require("@uniformdev/canvas");
 var import_navigation2 = require("next/navigation");
 var import_react12 = __toESM(require("react"));
-var UniformPlayground = async ({
-  searchParams: providedSearchParams,
-  ...rest
-}) => {
-  const searchParams = await (providedSearchParams != null ? providedSearchParams : {});
-  if (!await isDraftModeEnabled({ searchParams })) {
+var UniformPlayground = async ({ searchParams, ...rest }) => {
+  if (!isDraftModeEnabled({ searchParams })) {
     return /* @__PURE__ */ import_react12.default.createElement("div", null, /* @__PURE__ */ import_react12.default.createElement("h1", null, "Playground is only available in draft mode"));
   }
   const id = searchParams["id"];

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,15 +21,14 @@ var isDraftModeEnabled = async ({
   }
   let draftModeEnabled = false;
   try {
-    draftModeEnabled = (await draftMode()).isEnabled;
+    draftModeEnabled = draftMode().isEnabled;
   } catch (e) {
   }
   return draftModeEnabled || isIncontextEditingEnabled({ searchParams });
 };
-var isIncontextEditingEnabled = async ({
-  searchParams: providedSearchParams
+var isIncontextEditingEnabled = ({
+  searchParams
 }) => {
-  const searchParams = await (providedSearchParams || Promise.resolve(void 0));
   const containsKey = typeof (searchParams == null ? void 0 : searchParams[IN_CONTEXT_EDITOR_QUERY_STRING_PARAM]) !== "undefined";
   return containsKey;
 };
@@ -64,11 +63,11 @@ 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 (await isIncontextEditingEnabled(options)) {
+  if (isIncontextEditingEnabled(options)) {
     return { disabled: true, reason: "INCONTEXT" };
   }
   if (isDevelopmentEnvironment()) {
@@ -79,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) {
@@ -99,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) {
@@ -118,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) {
@@ -228,11 +227,11 @@ var getCanvasClient = (options) => {
     }
   });
 };
-var getDefaultCanvasClient = async ({
+var getDefaultCanvasClient = ({
   searchParams
 }) => {
   return getCanvasClient({
-    cache: await getCanvasCacheStrategy({
+    cache: getCanvasCacheStrategy({
       searchParams
     })
   });
@@ -263,19 +262,17 @@ var getManifestClient = (options) => {
   });
   return manifestClient;
 };
-var getDefaultManifestClient = async ({
+var getDefaultManifestClient = ({
   searchParams
 }) => {
   return getManifestClient({
-    cache: await getManifestCacheStrategy({
+    cache: getManifestCacheStrategy({
       searchParams
     })
   });
 };
-var getManifest = async ({
-  searchParams
-}) => {
-  const manifestClient = await getDefaultManifestClient({
+var getManifest = ({ searchParams }) => {
+  const manifestClient = getDefaultManifestClient({
     searchParams
   });
   return manifestClient.get();
@@ -305,11 +302,11 @@ var getProjectMapClient = (options) => {
   });
   return manifestClient;
 };
-var getDefaultProjectMapClient = async ({
+var getDefaultProjectMapClient = ({
   searchParams
 }) => {
   return getProjectMapClient({
-    cache: await getProjectMapCacheStrategy({
+    cache: getProjectMapCacheStrategy({
       searchParams
     })
   });
@@ -362,11 +359,9 @@ var getRouteClient = (options) => {
   });
   return client;
 };
-var getDefaultRouteClient = async ({
-  searchParams
-}) => {
+var getDefaultRouteClient = ({ searchParams }) => {
   return getRouteClient({
-    cache: await getCanvasCacheStrategy({
+    cache: getCanvasCacheStrategy({
       searchParams
     })
   });
@@ -460,7 +455,7 @@ var createServerUniformContextFromManifest = async (options) => {
   var _a;
   const context = createUniformContext({
     ...options || {},
-    serverCookieValue: (_a = (await cookies()).get(UNIFORM_DEFAULT_COOKIE_NAME)) == null ? void 0 : _a.value
+    serverCookieValue: (_a = cookies().get(UNIFORM_DEFAULT_COOKIE_NAME)) == null ? void 0 : _a.value
   });
   return context;
 };
@@ -489,12 +484,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 {
@@ -532,7 +527,7 @@ var retrieveRoute = async ({ params, searchParams, skipPrefetch }, fetchOptions)
   const { value } = resolvePath({
     params
   });
-  const states = await determineState({
+  const states = determineState({
     searchParams
   });
   let result;
@@ -559,12 +554,11 @@ var retrieveRoute = async ({ params, searchParams, skipPrefetch }, fetchOptions)
 var retrieveRouteByPath = async ({
   path,
   state,
-  searchParams: providedSearchParams,
+  searchParams,
   fetchOptions
 }) => {
   var _a;
-  const searchParams = await (providedSearchParams != null ? providedSearchParams : Promise.resolve(void 0));
-  const client = await getDefaultRouteClient({
+  const client = getDefaultRouteClient({
     searchParams
   });
   let queryPath = path;
@@ -595,13 +589,11 @@ var resolveRedirectHref = (resolveResult, path) => {
   const url = new URL(expandedUrl);
   return url.pathname;
 };
-var determineState = async ({
-  searchParams
-}) => {
-  const draftMode2 = await isDraftModeEnabled({ searchParams });
+var determineState = ({ searchParams }) => {
+  const draftMode2 = isDraftModeEnabled({ searchParams });
   const previewEnvironment = isOnVercelPreviewEnvironment();
   const isDevelopment = isDevelopmentEnvironment();
-  const isCanvasEditing = await isIncontextEditingEnabled({
+  const isCanvasEditing = isIncontextEditingEnabled({
     searchParams
   });
   let states;
@@ -733,14 +725,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 { value: path } = resolvePath2({
-    params: await props.params
-  });
+  const { value: path } = resolvePath2(props);
   if (!route || route.type === "notFound") {
     notFound();
   }
@@ -770,8 +760,8 @@ var UniformComposition = async ({
     searchParams,
     dynamicInputs: route.dynamicInputs,
     type: "composition",
-    isContextualEditing: await isIncontextEditingEnabled({ searchParams }),
-    isDraftMode: await isDraftModeEnabled({ searchParams }),
+    isContextualEditing: isIncontextEditingEnabled({ searchParams }),
+    isDraftMode: isDraftModeEnabled({ searchParams }),
     state: route.compositionApiResponse.state,
     path,
     previewMode: determinePreviewMode({ searchParams })
@@ -785,14 +775,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: await props.params,
+        params: props.params,
         searchParams,
-        cookies: (await cookies2()).getAll().reduce(
+        cookies: cookies2().getAll().reduce(
           (acc, cookie) => {
             acc[cookie.name] = cookie.value;
             return acc;
@@ -1086,12 +1076,8 @@ var UniformContext = async ({
 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";
-var UniformPlayground = async ({
-  searchParams: providedSearchParams,
-  ...rest
-}) => {
-  const searchParams = await (providedSearchParams != null ? providedSearchParams : {});
-  if (!await isDraftModeEnabled({ searchParams })) {
+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"));
   }
   const id = searchParams["id"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next-rsc",
-  "version": "19.196.1-alpha.2+b5b5fd8fb8",
+  "version": "19.196.1",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "build": "tsup",
@@ -53,39 +53,38 @@
     "/dist"
   ],
   "devDependencies": {
-    "@types/node": "20.16.14",
-    "@types/react": "18.3.11",
+    "@types/node": "20.10.6",
+    "@types/react": "18.3.3",
     "eslint": "9.9.0",
-    "next": "15.0.0",
-    "react": "19.0.0-rc-65a56d0e-20241020",
-    "react-dom": "19.0.0-rc-65a56d0e-20241020",
-    "typescript": "5.6.3"
+    "next": "^14.0.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1"
   },
   "dependencies": {
-    "@uniformdev/canvas": "19.196.1-alpha.2+b5b5fd8fb8",
-    "@uniformdev/canvas-next-rsc-client": "^19.196.1-alpha.2+b5b5fd8fb8",
-    "@uniformdev/canvas-next-rsc-shared": "^19.196.1-alpha.2+b5b5fd8fb8",
-    "@uniformdev/canvas-react": "19.196.1-alpha.2+b5b5fd8fb8",
-    "@uniformdev/context": "19.196.1-alpha.2+b5b5fd8fb8",
-    "@uniformdev/project-map": "19.196.1-alpha.2+b5b5fd8fb8",
-    "@uniformdev/redirect": "19.196.1-alpha.2+b5b5fd8fb8",
-    "@uniformdev/richtext": "19.196.1-alpha.2+b5b5fd8fb8",
-    "@uniformdev/webhooks": "19.196.1-alpha.2+b5b5fd8fb8",
+    "@uniformdev/canvas": "19.196.1",
+    "@uniformdev/canvas-next-rsc-client": "^19.196.1",
+    "@uniformdev/canvas-next-rsc-shared": "^19.196.1",
+    "@uniformdev/canvas-react": "19.196.1",
+    "@uniformdev/context": "19.196.1",
+    "@uniformdev/project-map": "19.196.1",
+    "@uniformdev/redirect": "19.196.1",
+    "@uniformdev/richtext": "19.196.1",
+    "@uniformdev/webhooks": "19.196.1",
     "@vercel/edge-config": "^0.4.0",
     "encoding": "^0.1.13",
     "server-only": "^0.0.1",
     "svix": "^1.5.0"
   },
   "engines": {
-    "node": ">=18.18.0"
+    "node": ">=16.14.0"
   },
   "peerDependencies": {
-    "next": ">=15.0.0",
-    "react": "^18.2.0 || 19.0.0-rc-65a56d0e-20241020",
-    "react-dom": "^18.2.0 || 19.0.0-rc-65a56d0e-20241020"
+    "next": ">=13.4.7",
+    "react": ">=18.2",
+    "react-dom": ">=18.2"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b5b5fd8fb8c08700c600b0761efd6723cee2413f"
+  "gitHead": "2956ed44925708e9c670de8f8fa8227208f03584"
 }