@uniformdev/canvas-next-rsc 19.214.1-alpha.17 → 19.214.1-alpha.33

package/dist/{UniformComposition-IWWzoI_H.d.mts → UniformComposition-D_HC6rSo.d.mts}

@@ -1,7 +1,6 @@
-import * as React$1 from 'react';
-import { ComponentType, ReactNode } from 'react';
 import { ResolvedRouteGetResponse, ComponentInstance } from '@uniformdev/canvas';
 import { PageParameters, ComponentProps, CompositionContext, AppDirectoryServerContext } from '@uniformdev/canvas-next-rsc-shared';
+import React, { ComponentType, ReactNode } from 'react';
 
 type UniformStaticCompositionProps = {
     /**
@@ -57,7 +56,7 @@ type ResolveEmptyPlaceholderResult = {
 declare const resolveComposition: (props: Omit<ResolveComponentsOptions, "slotName" | "slotIndex" | "target"> & {
     composition: ComponentInstance;
     compositionContext: CompositionContext;
-}) => React$1.FunctionComponentElement<{
+}) => React.FunctionComponentElement<{
     children?: ReactNode | undefined;
 }> | null;
 type ResolveComponentsOptions = {

package/dist/{UniformComposition-IWWzoI_H.d.ts → UniformComposition-D_HC6rSo.d.ts}

@@ -1,7 +1,6 @@
-import * as React$1 from 'react';
-import { ComponentType, ReactNode } from 'react';
 import { ResolvedRouteGetResponse, ComponentInstance } from '@uniformdev/canvas';
 import { PageParameters, ComponentProps, CompositionContext, AppDirectoryServerContext } from '@uniformdev/canvas-next-rsc-shared';
+import React, { ComponentType, ReactNode } from 'react';
 
 type UniformStaticCompositionProps = {
     /**
@@ -57,7 +56,7 @@ type ResolveEmptyPlaceholderResult = {
 declare const resolveComposition: (props: Omit<ResolveComponentsOptions, "slotName" | "slotIndex" | "target"> & {
     composition: ComponentInstance;
     compositionContext: CompositionContext;
-}) => React$1.FunctionComponentElement<{
+}) => React.FunctionComponentElement<{
     children?: ReactNode | undefined;
 }> | null;
 type ResolveComponentsOptions = {

package/dist/component.d.mts

@@ -1,18 +1,18 @@
 import { ComponentProps, CompositionContext, SlotDefinition } from '@uniformdev/canvas-next-rsc-shared';
 export { ComponentProps, CompositionContext } from '@uniformdev/canvas-next-rsc-shared';
-import React__default, { PropsWithChildren, ReactNode, Key } from 'react';
-export { R as ResolveComponentFunction, a as ResolveComponentResult } from './UniformComposition-IWWzoI_H.mjs';
+import React, { PropsWithChildren, ReactNode, Key, JSX } from 'react';
+export { R as ResolveComponentFunction, a as ResolveComponentResult } from './UniformComposition-D_HC6rSo.mjs';
 import { ComponentInstance } from '@uniformdev/canvas';
 import { RichTextNode } from '@uniformdev/richtext';
 import { PureUniformTextProps } from '@uniformdev/canvas-react/core';
 export { ClientContextComponent, createClientUniformContext, useInitUniformContext, useUniformContext } from '@uniformdev/canvas-next-rsc-client';
 
-declare const DefaultNotImplementedComponent: ({ component }: ComponentProps) => React__default.JSX.Element | null;
+declare const DefaultNotImplementedComponent: ({ component }: ComponentProps) => React.JSX.Element | null;
 
 type RichTextComponentProps<TNode extends RichTextNode = RichTextNode> = {
     node: TNode;
 };
-type RichTextRendererComponent<TNode extends RichTextNode = RichTextNode> = React__default.ComponentType<PropsWithChildren<RichTextComponentProps<TNode>>>;
+type RichTextRendererComponent<TNode extends RichTextNode = RichTextNode> = React.ComponentType<PropsWithChildren<RichTextComponentProps<TNode>>>;
 /**
  * Function that maps a Rich Text node instance to its React component to render it.
  * The resolver would commonly inspect the `type` of the component to decide.
@@ -24,7 +24,7 @@ type UniformRichTextProps = {
      * The name of the  HTML tag to render.
      * @default "div"
      */
-    as?: React__default.ElementType;
+    as?: React.ElementType;
     /** The ID of the parameter. */
     parameterId: string;
     /**
@@ -43,16 +43,16 @@ type UniformRichTextProps = {
     placeholder?: string | ((parameter: {
         id: string;
     }) => string | undefined);
-} & Omit<React__default.HTMLAttributes<HTMLDivElement>, 'children' | 'placeholder'>;
+} & Omit<React.HTMLAttributes<HTMLDivElement>, 'children' | 'placeholder'>;
 /**
  * Adds rendering support for Uniform Rich Text parameters
  */
-declare const UniformRichText: React__default.ForwardRefExoticComponent<{
+declare const UniformRichText: React.ForwardRefExoticComponent<{
     /**
      * The name of the  HTML tag to render.
      * @default "div"
      */
-    as?: React__default.ElementType;
+    as?: React.ElementType;
     /** The ID of the parameter. */
     parameterId: string;
     /**
@@ -71,7 +71,7 @@ declare const UniformRichText: React__default.ForwardRefExoticComponent<{
     placeholder?: string | ((parameter: {
         id: string;
     }) => string | undefined);
-} & Omit<React__default.HTMLAttributes<HTMLDivElement>, "children" | "placeholder"> & React__default.RefAttributes<unknown>>;
+} & Omit<React.HTMLAttributes<HTMLDivElement>, "children" | "placeholder"> & React.RefAttributes<unknown>>;
 
 type UniformRichTextNodeProps = {
     node: RichTextNode;
@@ -80,7 +80,7 @@ type UniformRichTextNodeProps = {
 /**
  * Render a single RichText node
  */
-declare function UniformRichTextNode({ node, ...props }: UniformRichTextNodeProps): React__default.JSX.Element | null;
+declare function UniformRichTextNode({ node, ...props }: UniformRichTextNodeProps): React.JSX.Element | null;
 
 type CustomSlotChildRenderFunc = (options: {
     child: ReactNode;
@@ -100,6 +100,6 @@ declare const UniformSlot: ({ data, slot, children }: UniformSlotProps) => React
 type UniformTextProps = {
     context: Pick<CompositionContext, 'isContextualEditing'>;
 } & Omit<PureUniformTextProps, 'skipCustomRendering' | 'isContextualEditing'>;
-declare const UniformText: ({ context, ...rest }: UniformTextProps) => React__default.JSX.Element;
+declare const UniformText: ({ context, ...rest }: UniformTextProps) => React.JSX.Element;
 
 export { type CustomSlotChildRenderFunc, DefaultNotImplementedComponent, UniformRichText, UniformRichTextNode, type UniformRichTextNodeProps, type UniformRichTextProps, UniformSlot, type UniformSlotProps, UniformText, type UniformTextProps };

package/dist/component.d.ts

@@ -1,18 +1,18 @@
 import { ComponentProps, CompositionContext, SlotDefinition } from '@uniformdev/canvas-next-rsc-shared';
 export { ComponentProps, CompositionContext } from '@uniformdev/canvas-next-rsc-shared';
-import React__default, { PropsWithChildren, ReactNode, Key } from 'react';
-export { R as ResolveComponentFunction, a as ResolveComponentResult } from './UniformComposition-IWWzoI_H.js';
+import React, { PropsWithChildren, ReactNode, Key, JSX } from 'react';
+export { R as ResolveComponentFunction, a as ResolveComponentResult } from './UniformComposition-D_HC6rSo.js';
 import { ComponentInstance } from '@uniformdev/canvas';
 import { RichTextNode } from '@uniformdev/richtext';
 import { PureUniformTextProps } from '@uniformdev/canvas-react/core';
 export { ClientContextComponent, createClientUniformContext, useInitUniformContext, useUniformContext } from '@uniformdev/canvas-next-rsc-client';
 
-declare const DefaultNotImplementedComponent: ({ component }: ComponentProps) => React__default.JSX.Element | null;
+declare const DefaultNotImplementedComponent: ({ component }: ComponentProps) => React.JSX.Element | null;
 
 type RichTextComponentProps<TNode extends RichTextNode = RichTextNode> = {
     node: TNode;
 };
-type RichTextRendererComponent<TNode extends RichTextNode = RichTextNode> = React__default.ComponentType<PropsWithChildren<RichTextComponentProps<TNode>>>;
+type RichTextRendererComponent<TNode extends RichTextNode = RichTextNode> = React.ComponentType<PropsWithChildren<RichTextComponentProps<TNode>>>;
 /**
  * Function that maps a Rich Text node instance to its React component to render it.
  * The resolver would commonly inspect the `type` of the component to decide.
@@ -24,7 +24,7 @@ type UniformRichTextProps = {
      * The name of the  HTML tag to render.
      * @default "div"
      */
-    as?: React__default.ElementType;
+    as?: React.ElementType;
     /** The ID of the parameter. */
     parameterId: string;
     /**
@@ -43,16 +43,16 @@ type UniformRichTextProps = {
     placeholder?: string | ((parameter: {
         id: string;
     }) => string | undefined);
-} & Omit<React__default.HTMLAttributes<HTMLDivElement>, 'children' | 'placeholder'>;
+} & Omit<React.HTMLAttributes<HTMLDivElement>, 'children' | 'placeholder'>;
 /**
  * Adds rendering support for Uniform Rich Text parameters
  */
-declare const UniformRichText: React__default.ForwardRefExoticComponent<{
+declare const UniformRichText: React.ForwardRefExoticComponent<{
     /**
      * The name of the  HTML tag to render.
      * @default "div"
      */
-    as?: React__default.ElementType;
+    as?: React.ElementType;
     /** The ID of the parameter. */
     parameterId: string;
     /**
@@ -71,7 +71,7 @@ declare const UniformRichText: React__default.ForwardRefExoticComponent<{
     placeholder?: string | ((parameter: {
         id: string;
     }) => string | undefined);
-} & Omit<React__default.HTMLAttributes<HTMLDivElement>, "children" | "placeholder"> & React__default.RefAttributes<unknown>>;
+} & Omit<React.HTMLAttributes<HTMLDivElement>, "children" | "placeholder"> & React.RefAttributes<unknown>>;
 
 type UniformRichTextNodeProps = {
     node: RichTextNode;
@@ -80,7 +80,7 @@ type UniformRichTextNodeProps = {
 /**
  * Render a single RichText node
  */
-declare function UniformRichTextNode({ node, ...props }: UniformRichTextNodeProps): React__default.JSX.Element | null;
+declare function UniformRichTextNode({ node, ...props }: UniformRichTextNodeProps): React.JSX.Element | null;
 
 type CustomSlotChildRenderFunc = (options: {
     child: ReactNode;
@@ -100,6 +100,6 @@ declare const UniformSlot: ({ data, slot, children }: UniformSlotProps) => React
 type UniformTextProps = {
     context: Pick<CompositionContext, 'isContextualEditing'>;
 } & Omit<PureUniformTextProps, 'skipCustomRendering' | 'isContextualEditing'>;
-declare const UniformText: ({ context, ...rest }: UniformTextProps) => React__default.JSX.Element;
+declare const UniformText: ({ context, ...rest }: UniformTextProps) => React.JSX.Element;
 
 export { type CustomSlotChildRenderFunc, DefaultNotImplementedComponent, UniformRichText, UniformRichTextNode, type UniformRichTextNodeProps, type UniformRichTextProps, UniformSlot, type UniformSlotProps, UniformText, type UniformTextProps };

package/dist/config.js

@@ -28,31 +28,58 @@ var import_path = require("path");
 var getConfigPath = () => {
   const possibleExtensions = [".js", ".cjs", ".mjs", ".ts"];
   let configFilePath;
+  let configFileName;
   for (const extension of possibleExtensions) {
-    const filePath = (0, import_path.join)(process.cwd(), `uniform.server.config${extension}`);
+    const fileName = `uniform.server.config${extension}`;
+    const filePath = (0, import_path.join)(process.cwd(), fileName);
     if ((0, import_fs.existsSync)(filePath)) {
       configFilePath = filePath;
+      configFileName = fileName;
       break;
     }
   }
-  return configFilePath;
+  if (!configFilePath) {
+    return void 0;
+  }
+  return {
+    filePath: configFilePath,
+    fileName: configFileName
+  };
 };
-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);
+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);
+        }
+      }
+      return config;
     }
-    return config;
-  }
-});
+  };
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   withUniformConfig

package/dist/config.mjs

@@ -4,31 +4,58 @@ import { join, resolve } from "path";
 var getConfigPath = () => {
   const possibleExtensions = [".js", ".cjs", ".mjs", ".ts"];
   let configFilePath;
+  let configFileName;
   for (const extension of possibleExtensions) {
-    const filePath = join(process.cwd(), `uniform.server.config${extension}`);
+    const fileName = `uniform.server.config${extension}`;
+    const filePath = join(process.cwd(), fileName);
     if (existsSync(filePath)) {
       configFilePath = filePath;
+      configFileName = fileName;
       break;
     }
   }
-  return configFilePath;
+  if (!configFilePath) {
+    return void 0;
+  }
+  return {
+    filePath: configFilePath,
+    fileName: configFileName
+  };
 };
-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);
+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);
+        }
+      }
+      return config;
     }
-    return config;
-  }
-});
+  };
+};
 export {
   withUniformConfig
 };

package/dist/handler.js

@@ -101,14 +101,14 @@ var createPreviewGETRouteHandler = (options) => {
       return new Response("Could not resolve the full path of the preview page", { status: 400 });
     }
     if (disable) {
-      (0, import_headers.draftMode)().disable();
+      (await (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 });
     }
-    (0, import_headers.draftMode)().enable();
+    (await (0, import_headers.draftMode)()).enable();
     const redirectionUrl = new URL(pathToRedirectTo, BASE_URL_EXAMPLE);
     assignRequestQueryToSearchParams(redirectionUrl.searchParams, searchParams);
     if (isPlayground || (options == null ? void 0 : options.playgroundPath) && pathToRedirectTo === options.playgroundPath) {

package/dist/handler.mjs

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

package/dist/index.d.mts

@@ -1,32 +1,26 @@
 import { CanvasClient, RouteClient, ResolvedRouteGetResponse, CompositionGetBySlugParameters, RouteGetParameters } from '@uniformdev/canvas';
-import { UniformServerConfig, PageParameters, AppDirectoryContextState, AppDirectoryServerContext, PlaygroundParameters } from '@uniformdev/canvas-next-rsc-shared';
+import { UniformServerConfig, CompositionContext, AppDirectoryContextState, AppDirectoryServerContext, PlaygroundParameters, AwaitedPageParameters, PageParameters } from '@uniformdev/canvas-next-rsc-shared';
 export { PageParameters, PlaygroundParameters } from '@uniformdev/canvas-next-rsc-shared';
 import { ManifestClient } from '@uniformdev/context/api';
 import { ProjectMapClient, ProjectMapNode } from '@uniformdev/project-map';
 import { ContextState, ContextOptions } from '@uniformdev/context';
-import React__default, { PropsWithChildren } from 'react';
-import { U as UniformCompositionProps } from './UniformComposition-IWWzoI_H.mjs';
-export { b as UniformComposition, r as resolveComposition } from './UniformComposition-IWWzoI_H.mjs';
+import React, { PropsWithChildren } from 'react';
+import { U as UniformCompositionProps } from './UniformComposition-D_HC6rSo.mjs';
+export { b as UniformComposition, r as resolveComposition } from './UniformComposition-D_HC6rSo.mjs';
 import { ClientContextComponent } from '@uniformdev/canvas-next-rsc-client';
 
 type GetCanvasClientOptions = {
     cache: NonNullable<UniformServerConfig['canvasCache']>;
 };
 declare const getCanvasClient: (options: GetCanvasClientOptions) => CanvasClient;
-declare const getDefaultCanvasClient: ({ searchParams, }: {
-    searchParams: PageParameters["searchParams"];
-}) => CanvasClient;
+declare const getDefaultCanvasClient: (options: Pick<CompositionContext, "searchParams">) => Promise<CanvasClient>;
 
 type GetManifestClientOptions = {
     cache: NonNullable<UniformServerConfig['manifestCache']>;
 };
 declare const getManifestClient: (options: GetManifestClientOptions) => ManifestClient;
-declare const getDefaultManifestClient: ({ searchParams, }: {
-    searchParams?: PageParameters["searchParams"];
-}) => ManifestClient;
-declare const getManifest: ({ searchParams }: {
-    searchParams: PageParameters["searchParams"];
-}) => Promise<{
+declare const getDefaultManifestClient: (options: Pick<CompositionContext, "searchParams">) => Promise<ManifestClient>;
+declare const getManifest: (options: Pick<CompositionContext, "searchParams">) => Promise<{
     project: {
         id?: string;
         name?: string;
@@ -186,23 +180,19 @@ type GetProjectMapClientOptions = {
     cache: NonNullable<UniformServerConfig['projectMapCache']>;
 };
 declare const getProjectMapClient: (options: GetProjectMapClientOptions) => ProjectMapClient;
-declare const getDefaultProjectMapClient: ({ searchParams, }: {
-    searchParams: PageParameters["searchParams"];
-}) => ProjectMapClient;
+declare const getDefaultProjectMapClient: (options: Pick<CompositionContext, "searchParams">) => Promise<ProjectMapClient>;
 
 type GetRouteClientOptions = {
     cache: NonNullable<UniformServerConfig['canvasCache']>;
 };
 declare const getRouteClient: (options: GetRouteClientOptions) => RouteClient;
-declare const getDefaultRouteClient: ({ searchParams }: {
-    searchParams: PageParameters["searchParams"];
-}) => RouteClient;
+declare const getDefaultRouteClient: (options: Pick<CompositionContext, "searchParams">) => Promise<RouteClient>;
 
 type ContextUpdateTransferProps = {
     update: Partial<AppDirectoryContextState> | (() => Promise<Partial<ContextState> | undefined>);
     serverContext: AppDirectoryServerContext | undefined;
 };
-declare const ContextUpdateTransfer: React__default.FC<ContextUpdateTransferProps>;
+declare const ContextUpdateTransfer: React.FC<ContextUpdateTransferProps>;
 
 type CreateStaticParamsOptions = {
     expand?: (node: ProjectMapNode) => Promise<string[] | undefined> | string[] | undefined;
@@ -220,21 +210,19 @@ type UniformContextProps = {
      */
     clientContextComponent?: ClientContextComponent;
 };
-declare const UniformContext: React__default.FC<PropsWithChildren<UniformContextProps>>;
+declare const UniformContext: React.FC<PropsWithChildren<UniformContextProps>>;
 
 type UniformPlaygroundProps = PlaygroundParameters & Omit<UniformCompositionProps, 'params' | 'searchParams' | 'route' | 'mode'>;
-declare const UniformPlayground: ({ searchParams, ...rest }: UniformPlaygroundProps) => Promise<React__default.JSX.Element>;
+declare const UniformPlayground: React.FC<UniformPlaygroundProps>;
 
 type CreateServerUniformContextProps = Omit<ContextOptions, 'transitionStore' | 'manifest'> & {
-    searchParams: PageParameters['searchParams'];
+    searchParams: AwaitedPageParameters['searchParams'];
 };
 declare const createServerUniformContext: (options: CreateServerUniformContextProps) => Promise<AppDirectoryServerContext>;
 
 declare const isDraftModeEnabled: ({ searchParams, }: {
-    searchParams: {
-        [key: string]: string | undefined;
-    } | undefined;
-}) => boolean;
+    searchParams: AwaitedPageParameters["searchParams"];
+}) => Promise<boolean>;
 declare const isIncontextEditingEnabled: ({ searchParams, }: {
     searchParams: {
         [key: string]: string | undefined;
@@ -262,6 +250,6 @@ type RetrieveSlugOptions = Pick<CompositionGetBySlugParameters, 'slug' | 'locale
 } & RetrieveCommonOptions;
 type RetrieveRouteFetchOptions = Omit<RouteGetParameters, 'projectId' | 'path' | 'withComponentIDs' | 'withContentSourceMap' | 'state'>;
 declare const retrieveCompositionBySlug: ({ slug, searchParams, skipPrefetch, locale, releaseId, versionId, }: RetrieveSlugOptions) => Promise<ResolvedRouteGetResponse>;
-declare const retrieveRoute: ({ params, searchParams, skipPrefetch }: RetrieveRouteOptions, fetchOptions?: RetrieveRouteFetchOptions) => Promise<ResolvedRouteGetResponse>;
+declare const retrieveRoute: ({ params, searchParams: providedSearchParams, skipPrefetch }: RetrieveRouteOptions, fetchOptions?: RetrieveRouteFetchOptions) => Promise<ResolvedRouteGetResponse>;
 
 export { ContextUpdateTransfer, type ContextUpdateTransferProps, type CreateServerUniformContextProps, type CreateStaticParamsOptions, type GetCanvasClientOptions, type GetManifestClientOptions, type GetProjectMapClientOptions, type GetRouteClientOptions, UniformCompositionProps, UniformContext, type UniformContextProps, UniformPlayground, type UniformPlaygroundProps, createServerUniformContext, createStaticParams, generateStaticParams, getCanvasClient, getDefaultCanvasClient, getDefaultManifestClient, getDefaultProjectMapClient, getDefaultRouteClient, getManifest, getManifestClient, getProjectMapClient, getRouteClient, isDevelopmentEnvironment, isDraftModeEnabled, isIncontextEditingEnabled, isOnVercelPreviewEnvironment, retrieveCompositionBySlug, retrieveRoute };

package/dist/index.d.ts

@@ -1,32 +1,26 @@
 import { CanvasClient, RouteClient, ResolvedRouteGetResponse, CompositionGetBySlugParameters, RouteGetParameters } from '@uniformdev/canvas';
-import { UniformServerConfig, PageParameters, AppDirectoryContextState, AppDirectoryServerContext, PlaygroundParameters } from '@uniformdev/canvas-next-rsc-shared';
+import { UniformServerConfig, CompositionContext, AppDirectoryContextState, AppDirectoryServerContext, PlaygroundParameters, AwaitedPageParameters, PageParameters } from '@uniformdev/canvas-next-rsc-shared';
 export { PageParameters, PlaygroundParameters } from '@uniformdev/canvas-next-rsc-shared';
 import { ManifestClient } from '@uniformdev/context/api';
 import { ProjectMapClient, ProjectMapNode } from '@uniformdev/project-map';
 import { ContextState, ContextOptions } from '@uniformdev/context';
-import React__default, { PropsWithChildren } from 'react';
-import { U as UniformCompositionProps } from './UniformComposition-IWWzoI_H.js';
-export { b as UniformComposition, r as resolveComposition } from './UniformComposition-IWWzoI_H.js';
+import React, { PropsWithChildren } from 'react';
+import { U as UniformCompositionProps } from './UniformComposition-D_HC6rSo.js';
+export { b as UniformComposition, r as resolveComposition } from './UniformComposition-D_HC6rSo.js';
 import { ClientContextComponent } from '@uniformdev/canvas-next-rsc-client';
 
 type GetCanvasClientOptions = {
     cache: NonNullable<UniformServerConfig['canvasCache']>;
 };
 declare const getCanvasClient: (options: GetCanvasClientOptions) => CanvasClient;
-declare const getDefaultCanvasClient: ({ searchParams, }: {
-    searchParams: PageParameters["searchParams"];
-}) => CanvasClient;
+declare const getDefaultCanvasClient: (options: Pick<CompositionContext, "searchParams">) => Promise<CanvasClient>;
 
 type GetManifestClientOptions = {
     cache: NonNullable<UniformServerConfig['manifestCache']>;
 };
 declare const getManifestClient: (options: GetManifestClientOptions) => ManifestClient;
-declare const getDefaultManifestClient: ({ searchParams, }: {
-    searchParams?: PageParameters["searchParams"];
-}) => ManifestClient;
-declare const getManifest: ({ searchParams }: {
-    searchParams: PageParameters["searchParams"];
-}) => Promise<{
+declare const getDefaultManifestClient: (options: Pick<CompositionContext, "searchParams">) => Promise<ManifestClient>;
+declare const getManifest: (options: Pick<CompositionContext, "searchParams">) => Promise<{
     project: {
         id?: string;
         name?: string;
@@ -186,23 +180,19 @@ type GetProjectMapClientOptions = {
     cache: NonNullable<UniformServerConfig['projectMapCache']>;
 };
 declare const getProjectMapClient: (options: GetProjectMapClientOptions) => ProjectMapClient;
-declare const getDefaultProjectMapClient: ({ searchParams, }: {
-    searchParams: PageParameters["searchParams"];
-}) => ProjectMapClient;
+declare const getDefaultProjectMapClient: (options: Pick<CompositionContext, "searchParams">) => Promise<ProjectMapClient>;
 
 type GetRouteClientOptions = {
     cache: NonNullable<UniformServerConfig['canvasCache']>;
 };
 declare const getRouteClient: (options: GetRouteClientOptions) => RouteClient;
-declare const getDefaultRouteClient: ({ searchParams }: {
-    searchParams: PageParameters["searchParams"];
-}) => RouteClient;
+declare const getDefaultRouteClient: (options: Pick<CompositionContext, "searchParams">) => Promise<RouteClient>;
 
 type ContextUpdateTransferProps = {
     update: Partial<AppDirectoryContextState> | (() => Promise<Partial<ContextState> | undefined>);
     serverContext: AppDirectoryServerContext | undefined;
 };
-declare const ContextUpdateTransfer: React__default.FC<ContextUpdateTransferProps>;
+declare const ContextUpdateTransfer: React.FC<ContextUpdateTransferProps>;
 
 type CreateStaticParamsOptions = {
     expand?: (node: ProjectMapNode) => Promise<string[] | undefined> | string[] | undefined;
@@ -220,21 +210,19 @@ type UniformContextProps = {
      */
     clientContextComponent?: ClientContextComponent;
 };
-declare const UniformContext: React__default.FC<PropsWithChildren<UniformContextProps>>;
+declare const UniformContext: React.FC<PropsWithChildren<UniformContextProps>>;
 
 type UniformPlaygroundProps = PlaygroundParameters & Omit<UniformCompositionProps, 'params' | 'searchParams' | 'route' | 'mode'>;
-declare const UniformPlayground: ({ searchParams, ...rest }: UniformPlaygroundProps) => Promise<React__default.JSX.Element>;
+declare const UniformPlayground: React.FC<UniformPlaygroundProps>;
 
 type CreateServerUniformContextProps = Omit<ContextOptions, 'transitionStore' | 'manifest'> & {
-    searchParams: PageParameters['searchParams'];
+    searchParams: AwaitedPageParameters['searchParams'];
 };
 declare const createServerUniformContext: (options: CreateServerUniformContextProps) => Promise<AppDirectoryServerContext>;
 
 declare const isDraftModeEnabled: ({ searchParams, }: {
-    searchParams: {
-        [key: string]: string | undefined;
-    } | undefined;
-}) => boolean;
+    searchParams: AwaitedPageParameters["searchParams"];
+}) => Promise<boolean>;
 declare const isIncontextEditingEnabled: ({ searchParams, }: {
     searchParams: {
         [key: string]: string | undefined;
@@ -262,6 +250,6 @@ type RetrieveSlugOptions = Pick<CompositionGetBySlugParameters, 'slug' | 'locale
 } & RetrieveCommonOptions;
 type RetrieveRouteFetchOptions = Omit<RouteGetParameters, 'projectId' | 'path' | 'withComponentIDs' | 'withContentSourceMap' | 'state'>;
 declare const retrieveCompositionBySlug: ({ slug, searchParams, skipPrefetch, locale, releaseId, versionId, }: RetrieveSlugOptions) => Promise<ResolvedRouteGetResponse>;
-declare const retrieveRoute: ({ params, searchParams, skipPrefetch }: RetrieveRouteOptions, fetchOptions?: RetrieveRouteFetchOptions) => Promise<ResolvedRouteGetResponse>;
+declare const retrieveRoute: ({ params, searchParams: providedSearchParams, skipPrefetch }: RetrieveRouteOptions, fetchOptions?: RetrieveRouteFetchOptions) => Promise<ResolvedRouteGetResponse>;
 
 export { ContextUpdateTransfer, type ContextUpdateTransferProps, type CreateServerUniformContextProps, type CreateStaticParamsOptions, type GetCanvasClientOptions, type GetManifestClientOptions, type GetProjectMapClientOptions, type GetRouteClientOptions, UniformCompositionProps, UniformContext, type UniformContextProps, UniformPlayground, type UniformPlaygroundProps, createServerUniformContext, createStaticParams, generateStaticParams, getCanvasClient, getDefaultCanvasClient, getDefaultManifestClient, getDefaultProjectMapClient, getDefaultRouteClient, getManifest, getManifestClient, getProjectMapClient, getRouteClient, isDevelopmentEnvironment, isDraftModeEnabled, isIncontextEditingEnabled, isOnVercelPreviewEnvironment, retrieveCompositionBySlug, retrieveRoute };