@uniformdev/canvas-next-rsc 19.74.0 → 19.75.0

package/dist/{UniformComposition-38e22896.d.ts → UniformComposition-d178d865.d.ts}

@@ -1,6 +1,6 @@
 import * as React$1 from 'react';
 import { ComponentType, ReactNode } from 'react';
-import { CompositionResolvedGetResponse, ComponentInstance } from '@uniformdev/canvas';
+import { ResolvedRouteGetResponse, ComponentInstance } from '@uniformdev/canvas';
 import { PageParameters, ComponentProps, CompositionContext, AppDirectoryServerContext } from '@uniformdev/canvas-next-rsc-shared';
 
 type UniformStaticCompositionProps = {
@@ -20,7 +20,10 @@ type UniformServerCompositionProps = {
     serverContext?: AppDirectoryServerContext;
 };
 type UniformCompositionProps = PageParameters & {
-    composition?: CompositionResolvedGetResponse;
+    /**
+     * The route data to render.
+     */
+    route: ResolvedRouteGetResponse | undefined;
     /**
      * Function to map composition components to React components.
      */

package/dist/component.d.mts

@@ -1,7 +1,7 @@
 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, b as ResolveComponentResult } from './UniformComposition-38e22896.js';
+export { R as ResolveComponentFunction, b as ResolveComponentResult } from './UniformComposition-d178d865.js';
 import { ComponentInstance } from '@uniformdev/canvas';
 import { RichTextNode } from '@uniformdev/richtext';
 import { PureUniformTextProps } from '@uniformdev/canvas-react/core';

package/dist/component.d.ts

@@ -1,7 +1,7 @@
 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, b as ResolveComponentResult } from './UniformComposition-38e22896.js';
+export { R as ResolveComponentFunction, b as ResolveComponentResult } from './UniformComposition-d178d865.js';
 import { ComponentInstance } from '@uniformdev/canvas';
 import { RichTextNode } from '@uniformdev/richtext';
 import { PureUniformTextProps } from '@uniformdev/canvas-react/core';

package/dist/handler.js

@@ -248,7 +248,7 @@ var createPreviewGETRouteHandler = (options) => {
         },
         {
           headers: {
-            "Access-Control-Allow-Origin": process.env.UNIFORM_CLI_BASE_URL || "http://uniform.app"
+            "Access-Control-Allow-Origin": process.env.UNIFORM_CLI_BASE_URL || "https://uniform.app"
           }
         }
       );

package/dist/handler.mjs

@@ -228,7 +228,7 @@ var createPreviewGETRouteHandler = (options) => {
         },
         {
           headers: {
-            "Access-Control-Allow-Origin": process.env.UNIFORM_CLI_BASE_URL || "http://uniform.app"
+            "Access-Control-Allow-Origin": process.env.UNIFORM_CLI_BASE_URL || "https://uniform.app"
           }
         }
       );

package/dist/index.d.mts

@@ -1,12 +1,12 @@
-import { CanvasClient, RouteClient } from '@uniformdev/canvas';
+import { CanvasClient, RouteClient, ResolvedRouteGetResponse } from '@uniformdev/canvas';
 import { CacheMode, PageParameters, AppDirectoryContextState, AppDirectoryServerContext, PlaygroundParameters } 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-38e22896.js';
-export { a as UniformComposition, r as resolveComposition } from './UniformComposition-38e22896.js';
+import { U as UniformCompositionProps } from './UniformComposition-d178d865.js';
+export { a as UniformComposition, r as resolveComposition } from './UniformComposition-d178d865.js';
 import { ClientContextComponent } from '@uniformdev/canvas-next-rsc-client';
 
 type GetCanvasClientOptions = {
@@ -219,7 +219,7 @@ type UniformContextProps = {
 };
 declare const UniformContext: React__default.FC<PropsWithChildren<UniformContextProps>>;
 
-type UniformPlaygroundProps = PlaygroundParameters & Omit<UniformCompositionProps, 'params' | 'searchParams' | 'composition' | 'mode'>;
+type UniformPlaygroundProps = PlaygroundParameters & Omit<UniformCompositionProps, 'params' | 'searchParams' | 'route' | 'mode'>;
 declare const UniformPlayground: ({ searchParams, ...rest }: UniformPlaygroundProps) => Promise<React__default.JSX.Element>;
 
 type CreateServerUniformContextProps = Omit<ContextOptions, 'transitionStore' | 'manifest'> & {
@@ -240,4 +240,6 @@ declare const isIncontextEditingEnabled: ({ searchParams, }: {
 declare const isOnVercelPreviewEnvironment: () => boolean;
 declare const isDevelopmentEnvironment: () => boolean;
 
-export { ContextUpdateTransfer, ContextUpdateTransferProps, CreateServerUniformContextProps, CreateStaticParamsOptions, GetCanvasClientOptions, GetManifestClientOptions, GetProjectMapClientOptions, GetRouteClientOptions, UniformCompositionProps, UniformContext, UniformContextProps, UniformPlayground, UniformPlaygroundProps, createServerUniformContext, createStaticParams, generateStaticParams, getCanvasClient, getDefaultCanvasClient, getDefaultManifestClient, getDefaultProjectMapClient, getDefaultRouteClient, getManifest, getManifestClient, getProjectMapClient, getRouteClient, isDevelopmentEnvironment, isDraftModeEnabled, isIncontextEditingEnabled, isOnVercelPreviewEnvironment };
+declare const retrieveRoute: ({ params, searchParams, }: Pick<PageParameters, 'params' | 'searchParams'>) => Promise<ResolvedRouteGetResponse>;
+
+export { ContextUpdateTransfer, ContextUpdateTransferProps, CreateServerUniformContextProps, CreateStaticParamsOptions, GetCanvasClientOptions, GetManifestClientOptions, GetProjectMapClientOptions, GetRouteClientOptions, UniformCompositionProps, UniformContext, UniformContextProps, UniformPlayground, UniformPlaygroundProps, createServerUniformContext, createStaticParams, generateStaticParams, getCanvasClient, getDefaultCanvasClient, getDefaultManifestClient, getDefaultProjectMapClient, getDefaultRouteClient, getManifest, getManifestClient, getProjectMapClient, getRouteClient, isDevelopmentEnvironment, isDraftModeEnabled, isIncontextEditingEnabled, isOnVercelPreviewEnvironment, retrieveRoute };

package/dist/index.d.ts

@@ -1,12 +1,12 @@
-import { CanvasClient, RouteClient } from '@uniformdev/canvas';
+import { CanvasClient, RouteClient, ResolvedRouteGetResponse } from '@uniformdev/canvas';
 import { CacheMode, PageParameters, AppDirectoryContextState, AppDirectoryServerContext, PlaygroundParameters } 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-38e22896.js';
-export { a as UniformComposition, r as resolveComposition } from './UniformComposition-38e22896.js';
+import { U as UniformCompositionProps } from './UniformComposition-d178d865.js';
+export { a as UniformComposition, r as resolveComposition } from './UniformComposition-d178d865.js';
 import { ClientContextComponent } from '@uniformdev/canvas-next-rsc-client';
 
 type GetCanvasClientOptions = {
@@ -219,7 +219,7 @@ type UniformContextProps = {
 };
 declare const UniformContext: React__default.FC<PropsWithChildren<UniformContextProps>>;
 
-type UniformPlaygroundProps = PlaygroundParameters & Omit<UniformCompositionProps, 'params' | 'searchParams' | 'composition' | 'mode'>;
+type UniformPlaygroundProps = PlaygroundParameters & Omit<UniformCompositionProps, 'params' | 'searchParams' | 'route' | 'mode'>;
 declare const UniformPlayground: ({ searchParams, ...rest }: UniformPlaygroundProps) => Promise<React__default.JSX.Element>;
 
 type CreateServerUniformContextProps = Omit<ContextOptions, 'transitionStore' | 'manifest'> & {
@@ -240,4 +240,6 @@ declare const isIncontextEditingEnabled: ({ searchParams, }: {
 declare const isOnVercelPreviewEnvironment: () => boolean;
 declare const isDevelopmentEnvironment: () => boolean;
 
-export { ContextUpdateTransfer, ContextUpdateTransferProps, CreateServerUniformContextProps, CreateStaticParamsOptions, GetCanvasClientOptions, GetManifestClientOptions, GetProjectMapClientOptions, GetRouteClientOptions, UniformCompositionProps, UniformContext, UniformContextProps, UniformPlayground, UniformPlaygroundProps, createServerUniformContext, createStaticParams, generateStaticParams, getCanvasClient, getDefaultCanvasClient, getDefaultManifestClient, getDefaultProjectMapClient, getDefaultRouteClient, getManifest, getManifestClient, getProjectMapClient, getRouteClient, isDevelopmentEnvironment, isDraftModeEnabled, isIncontextEditingEnabled, isOnVercelPreviewEnvironment };
+declare const retrieveRoute: ({ params, searchParams, }: Pick<PageParameters, 'params' | 'searchParams'>) => Promise<ResolvedRouteGetResponse>;
+
+export { ContextUpdateTransfer, ContextUpdateTransferProps, CreateServerUniformContextProps, CreateStaticParamsOptions, GetCanvasClientOptions, GetManifestClientOptions, GetProjectMapClientOptions, GetRouteClientOptions, UniformCompositionProps, UniformContext, UniformContextProps, UniformPlayground, UniformPlaygroundProps, createServerUniformContext, createStaticParams, generateStaticParams, getCanvasClient, getDefaultCanvasClient, getDefaultManifestClient, getDefaultProjectMapClient, getDefaultRouteClient, getManifest, getManifestClient, getProjectMapClient, getRouteClient, isDevelopmentEnvironment, isDraftModeEnabled, isIncontextEditingEnabled, isOnVercelPreviewEnvironment, retrieveRoute };

package/dist/index.esm.js

@@ -487,12 +487,8 @@ var retrieveRoute = async ({
       break;
     }
   }
-  if (!result) {
-    return void 0;
-  }
-  return {
-    ...result,
-    path: value
+  return result || {
+    type: "notFound"
   };
 };
 var retrieveRouteByPath = async ({
@@ -599,6 +595,7 @@ var TestServer = ({ test, component, contextInstance, slots }) => {
 // src/components/UniformComposition.ts
 var UniformComposition = async ({
   resolveComponent,
+  route,
   ...props
 }) => {
   let searchParams;
@@ -611,26 +608,12 @@ var UniformComposition = async ({
     });
     searchParams = props.searchParams;
   }
-  let route = void 0;
-  if (props.composition) {
-    const { value } = resolvePath2(props);
-    route = {
-      type: "composition",
-      compositionApiResponse: props.composition,
-      matchedRoute: "composition",
-      path: value
-    };
-  } else {
-    route = await retrieveRoute({
-      params: props.params,
-      searchParams
-    });
-  }
+  const { value: path } = resolvePath2(props);
   if (!route || route.type === "notFound") {
     notFound();
   }
   if (route.type === "redirect") {
-    const href = resolveRedirectHref(route, route.path);
+    const href = resolveRedirectHref(route, path);
     redirect(href);
   }
   const state = route.compositionApiResponse.state;
@@ -658,7 +641,7 @@ var UniformComposition = async ({
     isContextualEditing: isIncontextEditingEnabled({ searchParams }),
     isDraftMode: isDraftModeEnabled({ searchParams }),
     state: route.compositionApiResponse.state,
-    path: route.path
+    path
   };
   const resolved = resolveComposition({
     composition: route.compositionApiResponse.composition,
@@ -950,7 +933,19 @@ var UniformPlayground = async ({ searchParams, ...rest }) => {
   if (!composition) {
     notFound2();
   }
-  return /* @__PURE__ */ React5.createElement(UniformComposition, { mode: "server", params: {}, composition, ...rest });
+  return /* @__PURE__ */ React5.createElement(
+    UniformComposition,
+    {
+      mode: "server",
+      params: {},
+      route: {
+        type: "composition",
+        compositionApiResponse: composition,
+        matchedRoute: "composition"
+      },
+      ...rest
+    }
+  );
 };
 export {
   ContextUpdateTransfer,
@@ -973,5 +968,6 @@ export {
   isDraftModeEnabled,
   isIncontextEditingEnabled,
   isOnVercelPreviewEnvironment,
-  resolveComposition
+  resolveComposition,
+  retrieveRoute
 };

package/dist/index.js

@@ -50,7 +50,8 @@ __export(src_exports, {
   isDraftModeEnabled: () => isDraftModeEnabled,
   isIncontextEditingEnabled: () => isIncontextEditingEnabled,
   isOnVercelPreviewEnvironment: () => isOnVercelPreviewEnvironment,
-  resolveComposition: () => resolveComposition
+  resolveComposition: () => resolveComposition,
+  retrieveRoute: () => retrieveRoute
 });
 module.exports = __toCommonJS(src_exports);
 var import_server_only = require("server-only");
@@ -525,12 +526,8 @@ var retrieveRoute = async ({
       break;
     }
   }
-  if (!result) {
-    return void 0;
-  }
-  return {
-    ...result,
-    path: value
+  return result || {
+    type: "notFound"
   };
 };
 var retrieveRouteByPath = async ({
@@ -637,6 +634,7 @@ var TestServer = ({ test, component, contextInstance, slots }) => {
 // src/components/UniformComposition.ts
 var UniformComposition = async ({
   resolveComponent,
+  route,
   ...props
 }) => {
   let searchParams;
@@ -649,26 +647,12 @@ var UniformComposition = async ({
     });
     searchParams = props.searchParams;
   }
-  let route = void 0;
-  if (props.composition) {
-    const { value } = (0, import_canvas_next_rsc_shared6.resolvePath)(props);
-    route = {
-      type: "composition",
-      compositionApiResponse: props.composition,
-      matchedRoute: "composition",
-      path: value
-    };
-  } else {
-    route = await retrieveRoute({
-      params: props.params,
-      searchParams
-    });
-  }
+  const { value: path } = (0, import_canvas_next_rsc_shared6.resolvePath)(props);
   if (!route || route.type === "notFound") {
     (0, import_navigation.notFound)();
   }
   if (route.type === "redirect") {
-    const href = resolveRedirectHref(route, route.path);
+    const href = resolveRedirectHref(route, path);
     (0, import_navigation.redirect)(href);
   }
   const state = route.compositionApiResponse.state;
@@ -696,7 +680,7 @@ var UniformComposition = async ({
     isContextualEditing: isIncontextEditingEnabled({ searchParams }),
     isDraftMode: isDraftModeEnabled({ searchParams }),
     state: route.compositionApiResponse.state,
-    path: route.path
+    path
   };
   const resolved = resolveComposition({
     composition: route.compositionApiResponse.composition,
@@ -985,7 +969,19 @@ var UniformPlayground = async ({ searchParams, ...rest }) => {
   if (!composition) {
     (0, import_navigation2.notFound)();
   }
-  return /* @__PURE__ */ import_react9.default.createElement(UniformComposition, { mode: "server", params: {}, composition, ...rest });
+  return /* @__PURE__ */ import_react9.default.createElement(
+    UniformComposition,
+    {
+      mode: "server",
+      params: {},
+      route: {
+        type: "composition",
+        compositionApiResponse: composition,
+        matchedRoute: "composition"
+      },
+      ...rest
+    }
+  );
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -1009,5 +1005,6 @@ var UniformPlayground = async ({ searchParams, ...rest }) => {
   isDraftModeEnabled,
   isIncontextEditingEnabled,
   isOnVercelPreviewEnvironment,
-  resolveComposition
+  resolveComposition,
+  retrieveRoute
 });

package/dist/index.mjs

@@ -487,12 +487,8 @@ var retrieveRoute = async ({
       break;
     }
   }
-  if (!result) {
-    return void 0;
-  }
-  return {
-    ...result,
-    path: value
+  return result || {
+    type: "notFound"
   };
 };
 var retrieveRouteByPath = async ({
@@ -599,6 +595,7 @@ var TestServer = ({ test, component, contextInstance, slots }) => {
 // src/components/UniformComposition.ts
 var UniformComposition = async ({
   resolveComponent,
+  route,
   ...props
 }) => {
   let searchParams;
@@ -611,26 +608,12 @@ var UniformComposition = async ({
     });
     searchParams = props.searchParams;
   }
-  let route = void 0;
-  if (props.composition) {
-    const { value } = resolvePath2(props);
-    route = {
-      type: "composition",
-      compositionApiResponse: props.composition,
-      matchedRoute: "composition",
-      path: value
-    };
-  } else {
-    route = await retrieveRoute({
-      params: props.params,
-      searchParams
-    });
-  }
+  const { value: path } = resolvePath2(props);
   if (!route || route.type === "notFound") {
     notFound();
   }
   if (route.type === "redirect") {
-    const href = resolveRedirectHref(route, route.path);
+    const href = resolveRedirectHref(route, path);
     redirect(href);
   }
   const state = route.compositionApiResponse.state;
@@ -658,7 +641,7 @@ var UniformComposition = async ({
     isContextualEditing: isIncontextEditingEnabled({ searchParams }),
     isDraftMode: isDraftModeEnabled({ searchParams }),
     state: route.compositionApiResponse.state,
-    path: route.path
+    path
   };
   const resolved = resolveComposition({
     composition: route.compositionApiResponse.composition,
@@ -950,7 +933,19 @@ var UniformPlayground = async ({ searchParams, ...rest }) => {
   if (!composition) {
     notFound2();
   }
-  return /* @__PURE__ */ React5.createElement(UniformComposition, { mode: "server", params: {}, composition, ...rest });
+  return /* @__PURE__ */ React5.createElement(
+    UniformComposition,
+    {
+      mode: "server",
+      params: {},
+      route: {
+        type: "composition",
+        compositionApiResponse: composition,
+        matchedRoute: "composition"
+      },
+      ...rest
+    }
+  );
 };
 export {
   ContextUpdateTransfer,
@@ -973,5 +968,6 @@ export {
   isDraftModeEnabled,
   isIncontextEditingEnabled,
   isOnVercelPreviewEnvironment,
-  resolveComposition
+  resolveComposition,
+  retrieveRoute
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next-rsc",
-  "version": "19.74.0",
+  "version": "19.75.0",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "build": "tsup",
@@ -61,15 +61,15 @@
     "react-dom": "18.2.0"
   },
   "dependencies": {
-    "@uniformdev/canvas": "19.74.0",
-    "@uniformdev/canvas-next-rsc-client": "^19.74.0",
-    "@uniformdev/canvas-next-rsc-shared": "^19.74.0",
-    "@uniformdev/canvas-react": "19.74.0",
-    "@uniformdev/context": "19.74.0",
-    "@uniformdev/project-map": "19.74.0",
-    "@uniformdev/redirect": "19.74.0",
-    "@uniformdev/richtext": "19.74.0",
-    "@uniformdev/webhooks": "19.74.0",
+    "@uniformdev/canvas": "19.75.0",
+    "@uniformdev/canvas-next-rsc-client": "^19.75.0",
+    "@uniformdev/canvas-next-rsc-shared": "^19.75.0",
+    "@uniformdev/canvas-react": "19.75.0",
+    "@uniformdev/context": "19.75.0",
+    "@uniformdev/project-map": "19.75.0",
+    "@uniformdev/redirect": "19.75.0",
+    "@uniformdev/richtext": "19.75.0",
+    "@uniformdev/webhooks": "19.75.0",
     "@vercel/edge-config": "^0.4.0",
     "encoding": "^0.1.13",
     "server-only": "^0.0.1",
@@ -86,5 +86,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "05e1f526de0612799567580381c0201905cdecdd"
+  "gitHead": "4d8548444cee7af4c48c76fb1ef5237cc8f44c44"
 }