@uniformdev/canvas-next-rsc 19.147.1-alpha.1 → 19.147.1-alpha.5

package/dist/{UniformComposition-D4tBQ2U4.d.mts → UniformComposition-B-Z17dUt.d.mts}

@@ -36,6 +36,9 @@ type ResolveComponentFunction = (options: {
 type ResolveComponentResult = {
     component: ComponentType<ComponentProps<any, any>> | null;
     includeContext?: boolean;
+    suspense?: {
+        fallback: ComponentType<any> | undefined;
+    };
 };
 declare const resolveComposition: (props: Omit<ResolveComponentsOptions, 'slotName' | 'slotIndex' | 'target'> & {
     composition: ComponentInstance;

package/dist/{UniformComposition-D4tBQ2U4.d.ts → UniformComposition-B-Z17dUt.d.ts}

@@ -36,6 +36,9 @@ type ResolveComponentFunction = (options: {
 type ResolveComponentResult = {
     component: ComponentType<ComponentProps<any, any>> | null;
     includeContext?: boolean;
+    suspense?: {
+        fallback: ComponentType<any> | undefined;
+    };
 };
 declare const resolveComposition: (props: Omit<ResolveComponentsOptions, 'slotName' | 'slotIndex' | 'target'> & {
     composition: ComponentInstance;

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

package/dist/handler.js

@@ -228,6 +228,7 @@ var getCanvasClient = (options) => {
     apiHost: env.getApiHost(),
     apiKey: env.getApiKey(),
     edgeApiHost: env.getEdgeApiHost(),
+    disableSWR: typeof options.cache.disableSWR !== "undefined" ? options.cache.disableSWR : true,
     fetch: (req, init) => {
       let requestedUrl;
       if (typeof req === "string") {
@@ -259,7 +260,7 @@ var getCanvasClient = (options) => {
         cache,
         headers: {
           ...init == null ? void 0 : init.headers,
-          "x-bypass-cache": "true"
+          "x-bypass-cache": typeof options.cache.bypassCache !== "undefined" ? options.cache.bypassCache.toString() : "false"
         },
         next: {
           revalidate
@@ -282,7 +283,7 @@ var getProjectMapClient = (options) => {
         ...init,
         headers: {
           ...init == null ? void 0 : init.headers,
-          "x-bypass-cache": "true"
+          "x-bypass-cache": typeof options.cache.bypassCache !== "undefined" ? options.cache.bypassCache.toString() : "false"
         },
         cache,
         next: {
@@ -301,6 +302,7 @@ var getRouteClient = (options) => {
     projectId: env.getProjectId(),
     apiKey: env.getApiKey(),
     edgeApiHost: env.getEdgeApiHost(),
+    disableSWR: typeof options.cache.disableSWR !== "undefined" ? options.cache.disableSWR : true,
     fetch: (req, init) => {
       let requestedUrl;
       if (typeof req === "string") {
@@ -328,7 +330,7 @@ var getRouteClient = (options) => {
         ...init,
         headers: {
           ...init == null ? void 0 : init.headers,
-          "x-bypass-cache": "true"
+          "x-bypass-cache": typeof options.cache.bypassCache !== "undefined" ? options.cache.bypassCache.toString() : "false"
         },
         cache,
         next: {
@@ -382,6 +384,7 @@ var processCompositionChange = async (compositionId) => {
     getComposition({ compositionId })
   ]);
   const tags = [];
+  const paths = [];
   if (composition == null ? void 0 : composition.pattern) {
     tags.push("route");
   }
@@ -391,12 +394,17 @@ var processCompositionChange = async (compositionId) => {
       await processEdgeConfigChange({
         source_url: node.path
       });
-      tags.push(...buildProjectMapNodePaths(node.path));
+      const result = buildProjectMapNodePaths(node.path);
+      tags.push(...result.tags);
+      if (result.paths) {
+        paths.push(...result.paths);
+      }
     }
   }
   tags.push(buildCompositionTag(compositionId));
   return {
-    tags
+    tags,
+    paths
   };
 };
 var getComposition = async ({ compositionId }) => {
@@ -419,9 +427,11 @@ var getComposition = async ({ compositionId }) => {
 };
 var buildProjectMapNodePaths = (path) => {
   const tags = [];
+  const paths = [];
   const isDynamic = path.includes(":");
   if (!isDynamic) {
     tags.push(buildPathTag(path));
+    paths.push(path);
   } else {
     const pieces = path.split("/");
     const invalidatePieces = [];
@@ -434,8 +444,12 @@ var buildProjectMapNodePaths = (path) => {
     }
     const toInvalidate = invalidatePieces.join("/");
     tags.push(buildPathTag(toInvalidate));
+    paths.push(toInvalidate);
   }
-  return tags;
+  return {
+    tags,
+    paths
+  };
 };
 var getPathName = (url) => {
   try {
@@ -450,7 +464,8 @@ var processRedirectChange = async (sourceUrl) => {
   const pathName = getPathName(sourceUrl);
   tags.push(buildPathTag(pathName));
   return {
-    tags
+    tags,
+    paths: [pathName]
   };
 };
 var processEdgeConfigChange = async ({ source_url }) => {
@@ -557,7 +572,12 @@ var handleProjectMapNodeDelete = async (body) => {
     return void 0;
   }
   const tags = [];
-  tags.push(...buildProjectMapNodePaths(parsed.data.path));
+  const paths = [];
+  const result = buildProjectMapNodePaths(parsed.data.path);
+  tags.push(...result.tags);
+  if (result.paths) {
+    paths.push(...result.paths);
+  }
   const config = getServerConfig();
   if ((_a = config.experimental) == null ? void 0 : _a.edgeCompositions) {
     await processEdgeConfigChange({
@@ -565,7 +585,8 @@ var handleProjectMapNodeDelete = async (body) => {
     });
   }
   return {
-    tags
+    tags,
+    paths
   };
 };
 
@@ -578,7 +599,12 @@ var handleProjectMapNodeInsert = async (body) => {
     return void 0;
   }
   const tags = [];
-  tags.push(...buildProjectMapNodePaths(parsed.data.path));
+  const paths = [];
+  const result = buildProjectMapNodePaths(parsed.data.path);
+  tags.push(...result.tags);
+  if (result.paths) {
+    paths.push(...result.paths);
+  }
   const config = getServerConfig();
   if ((_a = config.experimental) == null ? void 0 : _a.edgeCompositions) {
     await processEdgeConfigChange({
@@ -586,7 +612,8 @@ var handleProjectMapNodeInsert = async (body) => {
     });
   }
   return {
-    tags
+    tags,
+    paths
   };
 };
 
@@ -599,8 +626,17 @@ var handleProjectMapNodeUpdate = async (body) => {
     return void 0;
   }
   const tags = [];
-  tags.push(...buildProjectMapNodePaths(parsed.data.path));
-  tags.push(...buildProjectMapNodePaths(parsed.data.previous_path));
+  const paths = [];
+  const currentResult = buildProjectMapNodePaths(parsed.data.path);
+  tags.push(...currentResult.tags);
+  if (currentResult.paths) {
+    paths.push(...currentResult.paths);
+  }
+  const previousResult = buildProjectMapNodePaths(parsed.data.previous_path);
+  tags.push(...previousResult.tags);
+  if (previousResult.paths) {
+    paths.push(...previousResult.paths);
+  }
   const config = getServerConfig();
   if ((_a = config.experimental) == null ? void 0 : _a.edgeCompositions) {
     await processEdgeConfigChange({
@@ -608,7 +644,8 @@ var handleProjectMapNodeUpdate = async (body) => {
     });
   }
   return {
-    tags
+    tags,
+    paths
   };
 };
 
@@ -703,6 +740,7 @@ var handleSvixMessage = async (request) => {
     handleManifestPublished
   ];
   let tags = void 0;
+  let paths = void 0;
   let jsonBody;
   try {
     jsonBody = await request.json();
@@ -715,6 +753,7 @@ var handleSvixMessage = async (request) => {
     const result = await handler(jsonBody);
     if (result) {
       tags = result.tags;
+      paths = result.paths;
       break;
     }
   }
@@ -724,10 +763,17 @@ var handleSvixMessage = async (request) => {
       (0, import_cache.revalidateTag)(tag);
     }
   }
+  if (paths == null ? void 0 : paths.length) {
+    for (let i = 0; i < paths.length; i++) {
+      const path = paths[i];
+      (0, import_cache.revalidatePath)(path);
+    }
+  }
   return new Response(
     JSON.stringify({
-      handled: typeof tags !== "undefined",
-      tags
+      handled: typeof tags !== "undefined" || typeof paths !== "undefined",
+      tags,
+      paths
     })
   );
 };

package/dist/handler.mjs

@@ -142,7 +142,7 @@ var createPreviewOPTIONSRouteHandler = () => {
 
 // src/handler/createPreviewPOSTRouteHandler.ts
 import { SECRET_QUERY_STRING_PARAM as SECRET_QUERY_STRING_PARAM2 } from "@uniformdev/canvas";
-import { revalidateTag } from "next/cache";
+import { revalidatePath, revalidateTag } from "next/cache";
 
 // src/handler/helpers.ts
 import { ApiClientError } from "@uniformdev/canvas";
@@ -213,6 +213,7 @@ var getCanvasClient = (options) => {
     apiHost: env.getApiHost(),
     apiKey: env.getApiKey(),
     edgeApiHost: env.getEdgeApiHost(),
+    disableSWR: typeof options.cache.disableSWR !== "undefined" ? options.cache.disableSWR : true,
     fetch: (req, init) => {
       let requestedUrl;
       if (typeof req === "string") {
@@ -244,7 +245,7 @@ var getCanvasClient = (options) => {
         cache,
         headers: {
           ...init == null ? void 0 : init.headers,
-          "x-bypass-cache": "true"
+          "x-bypass-cache": typeof options.cache.bypassCache !== "undefined" ? options.cache.bypassCache.toString() : "false"
         },
         next: {
           revalidate
@@ -267,7 +268,7 @@ var getProjectMapClient = (options) => {
         ...init,
         headers: {
           ...init == null ? void 0 : init.headers,
-          "x-bypass-cache": "true"
+          "x-bypass-cache": typeof options.cache.bypassCache !== "undefined" ? options.cache.bypassCache.toString() : "false"
         },
         cache,
         next: {
@@ -286,6 +287,7 @@ var getRouteClient = (options) => {
     projectId: env.getProjectId(),
     apiKey: env.getApiKey(),
     edgeApiHost: env.getEdgeApiHost(),
+    disableSWR: typeof options.cache.disableSWR !== "undefined" ? options.cache.disableSWR : true,
     fetch: (req, init) => {
       let requestedUrl;
       if (typeof req === "string") {
@@ -313,7 +315,7 @@ var getRouteClient = (options) => {
         ...init,
         headers: {
           ...init == null ? void 0 : init.headers,
-          "x-bypass-cache": "true"
+          "x-bypass-cache": typeof options.cache.bypassCache !== "undefined" ? options.cache.bypassCache.toString() : "false"
         },
         cache,
         next: {
@@ -367,6 +369,7 @@ var processCompositionChange = async (compositionId) => {
     getComposition({ compositionId })
   ]);
   const tags = [];
+  const paths = [];
   if (composition == null ? void 0 : composition.pattern) {
     tags.push("route");
   }
@@ -376,12 +379,17 @@ var processCompositionChange = async (compositionId) => {
       await processEdgeConfigChange({
         source_url: node.path
       });
-      tags.push(...buildProjectMapNodePaths(node.path));
+      const result = buildProjectMapNodePaths(node.path);
+      tags.push(...result.tags);
+      if (result.paths) {
+        paths.push(...result.paths);
+      }
     }
   }
   tags.push(buildCompositionTag(compositionId));
   return {
-    tags
+    tags,
+    paths
   };
 };
 var getComposition = async ({ compositionId }) => {
@@ -404,9 +412,11 @@ var getComposition = async ({ compositionId }) => {
 };
 var buildProjectMapNodePaths = (path) => {
   const tags = [];
+  const paths = [];
   const isDynamic = path.includes(":");
   if (!isDynamic) {
     tags.push(buildPathTag(path));
+    paths.push(path);
   } else {
     const pieces = path.split("/");
     const invalidatePieces = [];
@@ -419,8 +429,12 @@ var buildProjectMapNodePaths = (path) => {
     }
     const toInvalidate = invalidatePieces.join("/");
     tags.push(buildPathTag(toInvalidate));
+    paths.push(toInvalidate);
   }
-  return tags;
+  return {
+    tags,
+    paths
+  };
 };
 var getPathName = (url) => {
   try {
@@ -435,7 +449,8 @@ var processRedirectChange = async (sourceUrl) => {
   const pathName = getPathName(sourceUrl);
   tags.push(buildPathTag(pathName));
   return {
-    tags
+    tags,
+    paths: [pathName]
   };
 };
 var processEdgeConfigChange = async ({ source_url }) => {
@@ -542,7 +557,12 @@ var handleProjectMapNodeDelete = async (body) => {
     return void 0;
   }
   const tags = [];
-  tags.push(...buildProjectMapNodePaths(parsed.data.path));
+  const paths = [];
+  const result = buildProjectMapNodePaths(parsed.data.path);
+  tags.push(...result.tags);
+  if (result.paths) {
+    paths.push(...result.paths);
+  }
   const config = getServerConfig();
   if ((_a = config.experimental) == null ? void 0 : _a.edgeCompositions) {
     await processEdgeConfigChange({
@@ -550,7 +570,8 @@ var handleProjectMapNodeDelete = async (body) => {
     });
   }
   return {
-    tags
+    tags,
+    paths
   };
 };
 
@@ -563,7 +584,12 @@ var handleProjectMapNodeInsert = async (body) => {
     return void 0;
   }
   const tags = [];
-  tags.push(...buildProjectMapNodePaths(parsed.data.path));
+  const paths = [];
+  const result = buildProjectMapNodePaths(parsed.data.path);
+  tags.push(...result.tags);
+  if (result.paths) {
+    paths.push(...result.paths);
+  }
   const config = getServerConfig();
   if ((_a = config.experimental) == null ? void 0 : _a.edgeCompositions) {
     await processEdgeConfigChange({
@@ -571,7 +597,8 @@ var handleProjectMapNodeInsert = async (body) => {
     });
   }
   return {
-    tags
+    tags,
+    paths
   };
 };
 
@@ -584,8 +611,17 @@ var handleProjectMapNodeUpdate = async (body) => {
     return void 0;
   }
   const tags = [];
-  tags.push(...buildProjectMapNodePaths(parsed.data.path));
-  tags.push(...buildProjectMapNodePaths(parsed.data.previous_path));
+  const paths = [];
+  const currentResult = buildProjectMapNodePaths(parsed.data.path);
+  tags.push(...currentResult.tags);
+  if (currentResult.paths) {
+    paths.push(...currentResult.paths);
+  }
+  const previousResult = buildProjectMapNodePaths(parsed.data.previous_path);
+  tags.push(...previousResult.tags);
+  if (previousResult.paths) {
+    paths.push(...previousResult.paths);
+  }
   const config = getServerConfig();
   if ((_a = config.experimental) == null ? void 0 : _a.edgeCompositions) {
     await processEdgeConfigChange({
@@ -593,7 +629,8 @@ var handleProjectMapNodeUpdate = async (body) => {
     });
   }
   return {
-    tags
+    tags,
+    paths
   };
 };
 
@@ -688,6 +725,7 @@ var handleSvixMessage = async (request) => {
     handleManifestPublished
   ];
   let tags = void 0;
+  let paths = void 0;
   let jsonBody;
   try {
     jsonBody = await request.json();
@@ -700,6 +738,7 @@ var handleSvixMessage = async (request) => {
     const result = await handler(jsonBody);
     if (result) {
       tags = result.tags;
+      paths = result.paths;
       break;
     }
   }
@@ -709,10 +748,17 @@ var handleSvixMessage = async (request) => {
       revalidateTag(tag);
     }
   }
+  if (paths == null ? void 0 : paths.length) {
+    for (let i = 0; i < paths.length; i++) {
+      const path = paths[i];
+      revalidatePath(path);
+    }
+  }
   return new Response(
     JSON.stringify({
-      handled: typeof tags !== "undefined",
-      tags
+      handled: typeof tags !== "undefined" || typeof paths !== "undefined",
+      tags,
+      paths
     })
   );
 };

package/dist/index.d.mts

@@ -1,16 +1,16 @@
 import { CanvasClient, RouteClient, ResolvedRouteGetResponse, RouteGetParameters } from '@uniformdev/canvas';
-import { CacheMode, PageParameters, AppDirectoryContextState, AppDirectoryServerContext, PlaygroundParameters } from '@uniformdev/canvas-next-rsc-shared';
+import { UniformServerConfig, 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-D4tBQ2U4.mjs';
-export { a as UniformComposition, r as resolveComposition } from './UniformComposition-D4tBQ2U4.mjs';
+import { U as UniformCompositionProps } from './UniformComposition-B-Z17dUt.mjs';
+export { a as UniformComposition, r as resolveComposition } from './UniformComposition-B-Z17dUt.mjs';
 import { ClientContextComponent } from '@uniformdev/canvas-next-rsc-client';
 
 type GetCanvasClientOptions = {
-    cache: CacheMode;
+    cache: NonNullable<UniformServerConfig['canvasCache']>;
 };
 declare const getCanvasClient: (options: GetCanvasClientOptions) => CanvasClient;
 declare const getDefaultCanvasClient: ({ searchParams, }: {
@@ -18,7 +18,7 @@ declare const getDefaultCanvasClient: ({ searchParams, }: {
 }) => CanvasClient;
 
 type GetManifestClientOptions = {
-    cache: CacheMode;
+    cache: NonNullable<UniformServerConfig['manifestCache']>;
 };
 declare const getManifestClient: (options: GetManifestClientOptions) => ManifestClient;
 declare const getDefaultManifestClient: ({ searchParams, }: {
@@ -183,7 +183,7 @@ declare const getManifest: ({ searchParams }: {
 }>;
 
 type GetProjectMapClientOptions = {
-    cache: CacheMode;
+    cache: NonNullable<UniformServerConfig['projectMapCache']>;
 };
 declare const getProjectMapClient: (options: GetProjectMapClientOptions) => ProjectMapClient;
 declare const getDefaultProjectMapClient: ({ searchParams, }: {
@@ -191,7 +191,7 @@ declare const getDefaultProjectMapClient: ({ searchParams, }: {
 }) => ProjectMapClient;
 
 type GetRouteClientOptions = {
-    cache: CacheMode;
+    cache: NonNullable<UniformServerConfig['canvasCache']>;
 };
 declare const getRouteClient: (options: GetRouteClientOptions) => RouteClient;
 declare const getDefaultRouteClient: ({ searchParams }: {

package/dist/index.d.ts

@@ -1,16 +1,16 @@
 import { CanvasClient, RouteClient, ResolvedRouteGetResponse, RouteGetParameters } from '@uniformdev/canvas';
-import { CacheMode, PageParameters, AppDirectoryContextState, AppDirectoryServerContext, PlaygroundParameters } from '@uniformdev/canvas-next-rsc-shared';
+import { UniformServerConfig, 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-D4tBQ2U4.js';
-export { a as UniformComposition, r as resolveComposition } from './UniformComposition-D4tBQ2U4.js';
+import { U as UniformCompositionProps } from './UniformComposition-B-Z17dUt.js';
+export { a as UniformComposition, r as resolveComposition } from './UniformComposition-B-Z17dUt.js';
 import { ClientContextComponent } from '@uniformdev/canvas-next-rsc-client';
 
 type GetCanvasClientOptions = {
-    cache: CacheMode;
+    cache: NonNullable<UniformServerConfig['canvasCache']>;
 };
 declare const getCanvasClient: (options: GetCanvasClientOptions) => CanvasClient;
 declare const getDefaultCanvasClient: ({ searchParams, }: {
@@ -18,7 +18,7 @@ declare const getDefaultCanvasClient: ({ searchParams, }: {
 }) => CanvasClient;
 
 type GetManifestClientOptions = {
-    cache: CacheMode;
+    cache: NonNullable<UniformServerConfig['manifestCache']>;
 };
 declare const getManifestClient: (options: GetManifestClientOptions) => ManifestClient;
 declare const getDefaultManifestClient: ({ searchParams, }: {
@@ -183,7 +183,7 @@ declare const getManifest: ({ searchParams }: {
 }>;
 
 type GetProjectMapClientOptions = {
-    cache: CacheMode;
+    cache: NonNullable<UniformServerConfig['projectMapCache']>;
 };
 declare const getProjectMapClient: (options: GetProjectMapClientOptions) => ProjectMapClient;
 declare const getDefaultProjectMapClient: ({ searchParams, }: {
@@ -191,7 +191,7 @@ declare const getDefaultProjectMapClient: ({ searchParams, }: {
 }) => ProjectMapClient;
 
 type GetRouteClientOptions = {
-    cache: CacheMode;
+    cache: NonNullable<UniformServerConfig['canvasCache']>;
 };
 declare const getRouteClient: (options: GetRouteClientOptions) => RouteClient;
 declare const getDefaultRouteClient: ({ searchParams }: {

package/dist/index.esm.js

@@ -174,6 +174,7 @@ var getCanvasClient = (options) => {
     apiHost: env.getApiHost(),
     apiKey: env.getApiKey(),
     edgeApiHost: env.getEdgeApiHost(),
+    disableSWR: typeof options.cache.disableSWR !== "undefined" ? options.cache.disableSWR : true,
     fetch: (req, init) => {
       let requestedUrl;
       if (typeof req === "string") {
@@ -205,7 +206,7 @@ var getCanvasClient = (options) => {
         cache,
         headers: {
           ...init == null ? void 0 : init.headers,
-          "x-bypass-cache": "true"
+          "x-bypass-cache": typeof options.cache.bypassCache !== "undefined" ? options.cache.bypassCache.toString() : "false"
         },
         next: {
           revalidate
@@ -237,7 +238,7 @@ var getManifestClient = (options) => {
         ...init,
         headers: {
           ...init == null ? void 0 : init.headers,
-          "x-bypass-cache": "true"
+          "x-bypass-cache": typeof options.cache.bypassCache !== "undefined" ? options.cache.bypassCache.toString() : "false"
         },
         cache,
         next: {
@@ -278,7 +279,7 @@ var getProjectMapClient = (options) => {
         ...init,
         headers: {
           ...init == null ? void 0 : init.headers,
-          "x-bypass-cache": "true"
+          "x-bypass-cache": typeof options.cache.bypassCache !== "undefined" ? options.cache.bypassCache.toString() : "false"
         },
         cache,
         next: {
@@ -306,6 +307,7 @@ var getRouteClient = (options) => {
     projectId: env.getProjectId(),
     apiKey: env.getApiKey(),
     edgeApiHost: env.getEdgeApiHost(),
+    disableSWR: typeof options.cache.disableSWR !== "undefined" ? options.cache.disableSWR : true,
     fetch: (req, init) => {
       let requestedUrl;
       if (typeof req === "string") {
@@ -333,7 +335,7 @@ var getRouteClient = (options) => {
         ...init,
         headers: {
           ...init == null ? void 0 : init.headers,
-          "x-bypass-cache": "true"
+          "x-bypass-cache": typeof options.cache.bypassCache !== "undefined" ? options.cache.bypassCache.toString() : "false"
         },
         cache,
         next: {
@@ -420,7 +422,7 @@ import {
 import { PureContextualEditingComponentWrapper } from "@uniformdev/canvas-react/core";
 import { cookies as cookies2, headers } from "next/headers";
 import { notFound, redirect } from "next/navigation";
-import { createElement as createElement3, Fragment as Fragment3 } from "react";
+import { createElement as createElement3, Fragment as Fragment3, Suspense } from "react";
 
 // src/context/createServerUniformContext.ts
 import {
@@ -585,6 +587,7 @@ var PersonalizeClientWrapper = (props) => {
 // src/components/PersonalizeServer.ts
 import { CANVAS_PERSONALIZE_SLOT } from "@uniformdev/canvas";
 import { runPersonalization as runPersonalization2 } from "@uniformdev/canvas-next-rsc-shared";
+import { unstable_noStore as noStore } from "next/cache";
 import { createElement, Fragment } from "react";
 
 // src/components/ContextPersonalizationTransfer.tsx
@@ -596,15 +599,19 @@ var ContextPersonalizationTransfer = ({ event }) => {
 
 // src/components/PersonalizeServer.ts
 var PersonalizeServer = (props) => {
-  var _a;
+  var _a, _b;
+  if ((_a = getServerConfig().ppr) == null ? void 0 : _a.personalizationSuspense) {
+    noStore();
+  }
   const { indexes, event } = runPersonalization2(props);
-  const slot = (_a = props.slots) == null ? void 0 : _a[CANVAS_PERSONALIZE_SLOT];
+  const slot = (_b = props.slots) == null ? void 0 : _b[CANVAS_PERSONALIZE_SLOT];
   const components = indexes.map((index) => {
     const component = slot.items[index];
     return component;
   });
   const eventElement = createElement(ContextPersonalizationTransfer, {
-    event
+    event,
+    key: `${props.slotName}-${props.slotIndex}-personalization-transfer`
   });
   return createElement(Fragment, void 0, [...components, eventElement]);
 };
@@ -614,6 +621,7 @@ import { CANVAS_TEST_SLOT } from "@uniformdev/canvas";
 import {
   runTest
 } from "@uniformdev/canvas-next-rsc-shared";
+import { unstable_noStore as noStore2 } from "next/cache";
 import { createElement as createElement2, Fragment as Fragment2 } from "react";
 
 // src/components/ContextTestTransfer.tsx
@@ -624,17 +632,24 @@ var ContextTestTransfer = ({ event }) => {
 };
 
 // src/components/TestServer.ts
-var TestServer = (props) => {
-  var _a, _b, _c, _d;
+var TestServer = async (props) => {
+  var _a, _b, _c, _d, _e;
+  if ((_a = getServerConfig().ppr) == null ? void 0 : _a.testSuspense) {
+    noStore2();
+  }
   const { contextInstance, test } = props;
-  const isTestDefined = Boolean((_a = contextInstance.manifest.data.project.test) == null ? void 0 : _a[test]);
+  const isTestDefined = Boolean((_b = contextInstance.manifest.data.project.test) == null ? void 0 : _b[test]);
   if (!isTestDefined && process.env.NODE_ENV !== "production") {
     console.warn(`Test "${test}" is not defined in Uniform manifest.`);
   }
   const { index, event } = runTest(props);
-  const component = typeof index === "number" ? (_d = (_c = (_b = props.slots) == null ? void 0 : _b[CANVAS_TEST_SLOT]) == null ? void 0 : _c.items[index]) != null ? _d : null : null;
+  if (index === null || event === null) {
+    return null;
+  }
+  const component = typeof index === "number" ? (_e = (_d = (_c = props.slots) == null ? void 0 : _c[CANVAS_TEST_SLOT]) == null ? void 0 : _d.items[index]) != null ? _e : null : null;
   const eventElement = createElement2(ContextTestTransfer, {
-    event
+    event,
+    key: `${props.slotName}-${props.slotIndex}-server-transfer`
   });
   return createElement2(Fragment2, void 0, [component, eventElement]);
 };
@@ -738,19 +753,24 @@ var isServerComponent = ({
 };
 var resolveSystemComponent = ({
   component,
-  serverContext
+  server
 }) => {
-  const server = isServerComponent({
-    component,
-    serverContext
-  });
+  var _a, _b;
+  const config = getServerConfig();
+  let resolved = null;
+  let suspense = void 0;
   if (component.type === CANVAS_PERSONALIZE_TYPE) {
-    return server ? PersonalizeServer : PersonalizeClientWrapper;
+    resolved = server ? PersonalizeServer : PersonalizeClientWrapper;
+    suspense = server && ((_a = config.ppr) == null ? void 0 : _a.personalizationSuspense);
   }
   if (component.type === CANVAS_TEST_TYPE) {
-    return server ? TestServer : TestClient;
+    resolved = server ? TestServer : TestClient;
+    suspense = server && ((_b = config.ppr) == null ? void 0 : _b.testSuspense);
   }
-  return null;
+  return {
+    component: resolved,
+    suspense
+  };
 };
 var resolveSlots = ({
   component,
@@ -827,11 +847,15 @@ var resolveComponents = ({
       component,
       serverContext
     });
-    const systemComponent = resolveSystemComponent({
+    const { component: systemComponent, suspense: systemSuspense } = resolveSystemComponent({
       component,
-      serverContext
+      server: isServer
     });
-    const { component: regularComponent, includeContext } = resolveComponent({ component }) || {
+    const {
+      component: regularComponent,
+      includeContext,
+      suspense: componentSuspense
+    } = resolveComponent({ component }) || {
       component: null
     };
     if (!systemComponent && !regularComponent) {
@@ -846,10 +870,11 @@ var resolveComponents = ({
       mode
     });
     const resolvedComponent = systemComponent || regularComponent;
+    const wrapInSuspense = systemSuspense || componentSuspense;
     const parameters = (_a = component.parameters) != null ? _a : {};
     const enrichmentTags = (_b = parameters[CANVAS_ENRICHMENT_TAG_PARAM]) == null ? void 0 : _b.value;
+    const key = `${slotName}-${componentIndex}-component`;
     const componentProps = {
-      key: `${slotName}-${componentIndex}-component`,
       ...Object.keys(parameters).reduce((acc, cur) => {
         acc[cur] = parameters[cur].value;
         return acc;
@@ -861,7 +886,19 @@ var resolveComponents = ({
       slotName,
       slotIndex: isRoot ? void 0 : componentIndex
     };
-    const element = createElement3(resolvedComponent, componentProps);
+    let element = null;
+    if (wrapInSuspense) {
+      element = createElement3(
+        Suspense,
+        {
+          key,
+          fallback: typeof wrapInSuspense === "boolean" || typeof (wrapInSuspense == null ? void 0 : wrapInSuspense.fallback) === "undefined" ? void 0 : createElement3(wrapInSuspense.fallback)
+        },
+        createElement3(resolvedComponent, componentProps)
+      );
+    } else {
+      element = createElement3(resolvedComponent, { ...componentProps, key });
+    }
     let tagElement = null;
     if (enrichmentTags == null ? void 0 : enrichmentTags.length) {
       tagElement = createElement3(ContextUpdateTransfer, {
@@ -935,7 +972,7 @@ import {
   DefaultUniformClientContext,
   UniformScript
 } from "@uniformdev/canvas-next-rsc-client";
-import { Suspense } from "react";
+import { Suspense as Suspense2 } from "react";
 import React6 from "react";
 var UniformContext = async ({
   clientContextComponent,
@@ -956,7 +993,7 @@ var UniformContext = async ({
       disableDevTools,
       defaultConsent
     }
-  ), /* @__PURE__ */ React6.createElement(Suspense, { fallback: /* @__PURE__ */ React6.createElement(React6.Fragment, null) }, /* @__PURE__ */ React6.createElement(UniformScript, null)));
+  ), /* @__PURE__ */ React6.createElement(Suspense2, { fallback: /* @__PURE__ */ React6.createElement(React6.Fragment, null) }, /* @__PURE__ */ React6.createElement(UniformScript, null)));
 };
 
 // src/components/UniformPlayground.tsx

package/dist/index.js

@@ -221,6 +221,7 @@ var getCanvasClient = (options) => {
     apiHost: env.getApiHost(),
     apiKey: env.getApiKey(),
     edgeApiHost: env.getEdgeApiHost(),
+    disableSWR: typeof options.cache.disableSWR !== "undefined" ? options.cache.disableSWR : true,
     fetch: (req, init) => {
       let requestedUrl;
       if (typeof req === "string") {
@@ -252,7 +253,7 @@ var getCanvasClient = (options) => {
         cache,
         headers: {
           ...init == null ? void 0 : init.headers,
-          "x-bypass-cache": "true"
+          "x-bypass-cache": typeof options.cache.bypassCache !== "undefined" ? options.cache.bypassCache.toString() : "false"
         },
         next: {
           revalidate
@@ -284,7 +285,7 @@ var getManifestClient = (options) => {
         ...init,
         headers: {
           ...init == null ? void 0 : init.headers,
-          "x-bypass-cache": "true"
+          "x-bypass-cache": typeof options.cache.bypassCache !== "undefined" ? options.cache.bypassCache.toString() : "false"
         },
         cache,
         next: {
@@ -325,7 +326,7 @@ var getProjectMapClient = (options) => {
         ...init,
         headers: {
           ...init == null ? void 0 : init.headers,
-          "x-bypass-cache": "true"
+          "x-bypass-cache": typeof options.cache.bypassCache !== "undefined" ? options.cache.bypassCache.toString() : "false"
         },
         cache,
         next: {
@@ -353,6 +354,7 @@ var getRouteClient = (options) => {
     projectId: env.getProjectId(),
     apiKey: env.getApiKey(),
     edgeApiHost: env.getEdgeApiHost(),
+    disableSWR: typeof options.cache.disableSWR !== "undefined" ? options.cache.disableSWR : true,
     fetch: (req, init) => {
       let requestedUrl;
       if (typeof req === "string") {
@@ -380,7 +382,7 @@ var getRouteClient = (options) => {
         ...init,
         headers: {
           ...init == null ? void 0 : init.headers,
-          "x-bypass-cache": "true"
+          "x-bypass-cache": typeof options.cache.bypassCache !== "undefined" ? options.cache.bypassCache.toString() : "false"
         },
         cache,
         next: {
@@ -616,6 +618,7 @@ var PersonalizeClientWrapper = (props) => {
 // src/components/PersonalizeServer.ts
 var import_canvas5 = require("@uniformdev/canvas");
 var import_canvas_next_rsc_shared4 = require("@uniformdev/canvas-next-rsc-shared");
+var import_cache = require("next/cache");
 var import_react5 = require("react");
 
 // src/components/ContextPersonalizationTransfer.tsx
@@ -627,15 +630,19 @@ var ContextPersonalizationTransfer = ({ event }) => {
 
 // src/components/PersonalizeServer.ts
 var PersonalizeServer = (props) => {
-  var _a;
+  var _a, _b;
+  if ((_a = getServerConfig().ppr) == null ? void 0 : _a.personalizationSuspense) {
+    (0, import_cache.unstable_noStore)();
+  }
   const { indexes, event } = (0, import_canvas_next_rsc_shared4.runPersonalization)(props);
-  const slot = (_a = props.slots) == null ? void 0 : _a[import_canvas5.CANVAS_PERSONALIZE_SLOT];
+  const slot = (_b = props.slots) == null ? void 0 : _b[import_canvas5.CANVAS_PERSONALIZE_SLOT];
   const components = indexes.map((index) => {
     const component = slot.items[index];
     return component;
   });
   const eventElement = (0, import_react5.createElement)(ContextPersonalizationTransfer, {
-    event
+    event,
+    key: `${props.slotName}-${props.slotIndex}-personalization-transfer`
   });
   return (0, import_react5.createElement)(import_react5.Fragment, void 0, [...components, eventElement]);
 };
@@ -643,6 +650,7 @@ var PersonalizeServer = (props) => {
 // src/components/TestServer.ts
 var import_canvas6 = require("@uniformdev/canvas");
 var import_canvas_next_rsc_shared5 = require("@uniformdev/canvas-next-rsc-shared");
+var import_cache2 = require("next/cache");
 var import_react7 = require("react");
 
 // src/components/ContextTestTransfer.tsx
@@ -653,17 +661,24 @@ var ContextTestTransfer = ({ event }) => {
 };
 
 // src/components/TestServer.ts
-var TestServer = (props) => {
-  var _a, _b, _c, _d;
+var TestServer = async (props) => {
+  var _a, _b, _c, _d, _e;
+  if ((_a = getServerConfig().ppr) == null ? void 0 : _a.testSuspense) {
+    (0, import_cache2.unstable_noStore)();
+  }
   const { contextInstance, test } = props;
-  const isTestDefined = Boolean((_a = contextInstance.manifest.data.project.test) == null ? void 0 : _a[test]);
+  const isTestDefined = Boolean((_b = contextInstance.manifest.data.project.test) == null ? void 0 : _b[test]);
   if (!isTestDefined && process.env.NODE_ENV !== "production") {
     console.warn(`Test "${test}" is not defined in Uniform manifest.`);
   }
   const { index, event } = (0, import_canvas_next_rsc_shared5.runTest)(props);
-  const component = typeof index === "number" ? (_d = (_c = (_b = props.slots) == null ? void 0 : _b[import_canvas6.CANVAS_TEST_SLOT]) == null ? void 0 : _c.items[index]) != null ? _d : null : null;
+  if (index === null || event === null) {
+    return null;
+  }
+  const component = typeof index === "number" ? (_e = (_d = (_c = props.slots) == null ? void 0 : _c[import_canvas6.CANVAS_TEST_SLOT]) == null ? void 0 : _d.items[index]) != null ? _e : null : null;
   const eventElement = (0, import_react7.createElement)(ContextTestTransfer, {
-    event
+    event,
+    key: `${props.slotName}-${props.slotIndex}-server-transfer`
   });
   return (0, import_react7.createElement)(import_react7.Fragment, void 0, [component, eventElement]);
 };
@@ -767,19 +782,24 @@ var isServerComponent = ({
 };
 var resolveSystemComponent = ({
   component,
-  serverContext
+  server
 }) => {
-  const server = isServerComponent({
-    component,
-    serverContext
-  });
+  var _a, _b;
+  const config = getServerConfig();
+  let resolved = null;
+  let suspense = void 0;
   if (component.type === import_canvas7.CANVAS_PERSONALIZE_TYPE) {
-    return server ? PersonalizeServer : PersonalizeClientWrapper;
+    resolved = server ? PersonalizeServer : PersonalizeClientWrapper;
+    suspense = server && ((_a = config.ppr) == null ? void 0 : _a.personalizationSuspense);
   }
   if (component.type === import_canvas7.CANVAS_TEST_TYPE) {
-    return server ? TestServer : import_canvas_next_rsc_client6.TestClient;
+    resolved = server ? TestServer : import_canvas_next_rsc_client6.TestClient;
+    suspense = server && ((_b = config.ppr) == null ? void 0 : _b.testSuspense);
   }
-  return null;
+  return {
+    component: resolved,
+    suspense
+  };
 };
 var resolveSlots = ({
   component,
@@ -856,11 +876,15 @@ var resolveComponents = ({
       component,
       serverContext
     });
-    const systemComponent = resolveSystemComponent({
+    const { component: systemComponent, suspense: systemSuspense } = resolveSystemComponent({
       component,
-      serverContext
+      server: isServer
     });
-    const { component: regularComponent, includeContext } = resolveComponent({ component }) || {
+    const {
+      component: regularComponent,
+      includeContext,
+      suspense: componentSuspense
+    } = resolveComponent({ component }) || {
       component: null
     };
     if (!systemComponent && !regularComponent) {
@@ -875,10 +899,11 @@ var resolveComponents = ({
       mode
     });
     const resolvedComponent = systemComponent || regularComponent;
+    const wrapInSuspense = systemSuspense || componentSuspense;
     const parameters = (_a = component.parameters) != null ? _a : {};
     const enrichmentTags = (_b = parameters[import_canvas7.CANVAS_ENRICHMENT_TAG_PARAM]) == null ? void 0 : _b.value;
+    const key = `${slotName}-${componentIndex}-component`;
     const componentProps = {
-      key: `${slotName}-${componentIndex}-component`,
       ...Object.keys(parameters).reduce((acc, cur) => {
         acc[cur] = parameters[cur].value;
         return acc;
@@ -890,7 +915,19 @@ var resolveComponents = ({
       slotName,
       slotIndex: isRoot ? void 0 : componentIndex
     };
-    const element = (0, import_react8.createElement)(resolvedComponent, componentProps);
+    let element = null;
+    if (wrapInSuspense) {
+      element = (0, import_react8.createElement)(
+        import_react8.Suspense,
+        {
+          key,
+          fallback: typeof wrapInSuspense === "boolean" || typeof (wrapInSuspense == null ? void 0 : wrapInSuspense.fallback) === "undefined" ? void 0 : (0, import_react8.createElement)(wrapInSuspense.fallback)
+        },
+        (0, import_react8.createElement)(resolvedComponent, componentProps)
+      );
+    } else {
+      element = (0, import_react8.createElement)(resolvedComponent, { ...componentProps, key });
+    }
     let tagElement = null;
     if (enrichmentTags == null ? void 0 : enrichmentTags.length) {
       tagElement = (0, import_react8.createElement)(ContextUpdateTransfer, {

package/dist/index.mjs

@@ -174,6 +174,7 @@ var getCanvasClient = (options) => {
     apiHost: env.getApiHost(),
     apiKey: env.getApiKey(),
     edgeApiHost: env.getEdgeApiHost(),
+    disableSWR: typeof options.cache.disableSWR !== "undefined" ? options.cache.disableSWR : true,
     fetch: (req, init) => {
       let requestedUrl;
       if (typeof req === "string") {
@@ -205,7 +206,7 @@ var getCanvasClient = (options) => {
         cache,
         headers: {
           ...init == null ? void 0 : init.headers,
-          "x-bypass-cache": "true"
+          "x-bypass-cache": typeof options.cache.bypassCache !== "undefined" ? options.cache.bypassCache.toString() : "false"
         },
         next: {
           revalidate
@@ -237,7 +238,7 @@ var getManifestClient = (options) => {
         ...init,
         headers: {
           ...init == null ? void 0 : init.headers,
-          "x-bypass-cache": "true"
+          "x-bypass-cache": typeof options.cache.bypassCache !== "undefined" ? options.cache.bypassCache.toString() : "false"
         },
         cache,
         next: {
@@ -278,7 +279,7 @@ var getProjectMapClient = (options) => {
         ...init,
         headers: {
           ...init == null ? void 0 : init.headers,
-          "x-bypass-cache": "true"
+          "x-bypass-cache": typeof options.cache.bypassCache !== "undefined" ? options.cache.bypassCache.toString() : "false"
         },
         cache,
         next: {
@@ -306,6 +307,7 @@ var getRouteClient = (options) => {
     projectId: env.getProjectId(),
     apiKey: env.getApiKey(),
     edgeApiHost: env.getEdgeApiHost(),
+    disableSWR: typeof options.cache.disableSWR !== "undefined" ? options.cache.disableSWR : true,
     fetch: (req, init) => {
       let requestedUrl;
       if (typeof req === "string") {
@@ -333,7 +335,7 @@ var getRouteClient = (options) => {
         ...init,
         headers: {
           ...init == null ? void 0 : init.headers,
-          "x-bypass-cache": "true"
+          "x-bypass-cache": typeof options.cache.bypassCache !== "undefined" ? options.cache.bypassCache.toString() : "false"
         },
         cache,
         next: {
@@ -420,7 +422,7 @@ import {
 import { PureContextualEditingComponentWrapper } from "@uniformdev/canvas-react/core";
 import { cookies as cookies2, headers } from "next/headers";
 import { notFound, redirect } from "next/navigation";
-import { createElement as createElement3, Fragment as Fragment3 } from "react";
+import { createElement as createElement3, Fragment as Fragment3, Suspense } from "react";
 
 // src/context/createServerUniformContext.ts
 import {
@@ -585,6 +587,7 @@ var PersonalizeClientWrapper = (props) => {
 // src/components/PersonalizeServer.ts
 import { CANVAS_PERSONALIZE_SLOT } from "@uniformdev/canvas";
 import { runPersonalization as runPersonalization2 } from "@uniformdev/canvas-next-rsc-shared";
+import { unstable_noStore as noStore } from "next/cache";
 import { createElement, Fragment } from "react";
 
 // src/components/ContextPersonalizationTransfer.tsx
@@ -596,15 +599,19 @@ var ContextPersonalizationTransfer = ({ event }) => {
 
 // src/components/PersonalizeServer.ts
 var PersonalizeServer = (props) => {
-  var _a;
+  var _a, _b;
+  if ((_a = getServerConfig().ppr) == null ? void 0 : _a.personalizationSuspense) {
+    noStore();
+  }
   const { indexes, event } = runPersonalization2(props);
-  const slot = (_a = props.slots) == null ? void 0 : _a[CANVAS_PERSONALIZE_SLOT];
+  const slot = (_b = props.slots) == null ? void 0 : _b[CANVAS_PERSONALIZE_SLOT];
   const components = indexes.map((index) => {
     const component = slot.items[index];
     return component;
   });
   const eventElement = createElement(ContextPersonalizationTransfer, {
-    event
+    event,
+    key: `${props.slotName}-${props.slotIndex}-personalization-transfer`
   });
   return createElement(Fragment, void 0, [...components, eventElement]);
 };
@@ -614,6 +621,7 @@ import { CANVAS_TEST_SLOT } from "@uniformdev/canvas";
 import {
   runTest
 } from "@uniformdev/canvas-next-rsc-shared";
+import { unstable_noStore as noStore2 } from "next/cache";
 import { createElement as createElement2, Fragment as Fragment2 } from "react";
 
 // src/components/ContextTestTransfer.tsx
@@ -624,17 +632,24 @@ var ContextTestTransfer = ({ event }) => {
 };
 
 // src/components/TestServer.ts
-var TestServer = (props) => {
-  var _a, _b, _c, _d;
+var TestServer = async (props) => {
+  var _a, _b, _c, _d, _e;
+  if ((_a = getServerConfig().ppr) == null ? void 0 : _a.testSuspense) {
+    noStore2();
+  }
   const { contextInstance, test } = props;
-  const isTestDefined = Boolean((_a = contextInstance.manifest.data.project.test) == null ? void 0 : _a[test]);
+  const isTestDefined = Boolean((_b = contextInstance.manifest.data.project.test) == null ? void 0 : _b[test]);
   if (!isTestDefined && process.env.NODE_ENV !== "production") {
     console.warn(`Test "${test}" is not defined in Uniform manifest.`);
   }
   const { index, event } = runTest(props);
-  const component = typeof index === "number" ? (_d = (_c = (_b = props.slots) == null ? void 0 : _b[CANVAS_TEST_SLOT]) == null ? void 0 : _c.items[index]) != null ? _d : null : null;
+  if (index === null || event === null) {
+    return null;
+  }
+  const component = typeof index === "number" ? (_e = (_d = (_c = props.slots) == null ? void 0 : _c[CANVAS_TEST_SLOT]) == null ? void 0 : _d.items[index]) != null ? _e : null : null;
   const eventElement = createElement2(ContextTestTransfer, {
-    event
+    event,
+    key: `${props.slotName}-${props.slotIndex}-server-transfer`
   });
   return createElement2(Fragment2, void 0, [component, eventElement]);
 };
@@ -738,19 +753,24 @@ var isServerComponent = ({
 };
 var resolveSystemComponent = ({
   component,
-  serverContext
+  server
 }) => {
-  const server = isServerComponent({
-    component,
-    serverContext
-  });
+  var _a, _b;
+  const config = getServerConfig();
+  let resolved = null;
+  let suspense = void 0;
   if (component.type === CANVAS_PERSONALIZE_TYPE) {
-    return server ? PersonalizeServer : PersonalizeClientWrapper;
+    resolved = server ? PersonalizeServer : PersonalizeClientWrapper;
+    suspense = server && ((_a = config.ppr) == null ? void 0 : _a.personalizationSuspense);
   }
   if (component.type === CANVAS_TEST_TYPE) {
-    return server ? TestServer : TestClient;
+    resolved = server ? TestServer : TestClient;
+    suspense = server && ((_b = config.ppr) == null ? void 0 : _b.testSuspense);
   }
-  return null;
+  return {
+    component: resolved,
+    suspense
+  };
 };
 var resolveSlots = ({
   component,
@@ -827,11 +847,15 @@ var resolveComponents = ({
       component,
       serverContext
     });
-    const systemComponent = resolveSystemComponent({
+    const { component: systemComponent, suspense: systemSuspense } = resolveSystemComponent({
       component,
-      serverContext
+      server: isServer
     });
-    const { component: regularComponent, includeContext } = resolveComponent({ component }) || {
+    const {
+      component: regularComponent,
+      includeContext,
+      suspense: componentSuspense
+    } = resolveComponent({ component }) || {
       component: null
     };
     if (!systemComponent && !regularComponent) {
@@ -846,10 +870,11 @@ var resolveComponents = ({
       mode
     });
     const resolvedComponent = systemComponent || regularComponent;
+    const wrapInSuspense = systemSuspense || componentSuspense;
     const parameters = (_a = component.parameters) != null ? _a : {};
     const enrichmentTags = (_b = parameters[CANVAS_ENRICHMENT_TAG_PARAM]) == null ? void 0 : _b.value;
+    const key = `${slotName}-${componentIndex}-component`;
     const componentProps = {
-      key: `${slotName}-${componentIndex}-component`,
       ...Object.keys(parameters).reduce((acc, cur) => {
         acc[cur] = parameters[cur].value;
         return acc;
@@ -861,7 +886,19 @@ var resolveComponents = ({
       slotName,
       slotIndex: isRoot ? void 0 : componentIndex
     };
-    const element = createElement3(resolvedComponent, componentProps);
+    let element = null;
+    if (wrapInSuspense) {
+      element = createElement3(
+        Suspense,
+        {
+          key,
+          fallback: typeof wrapInSuspense === "boolean" || typeof (wrapInSuspense == null ? void 0 : wrapInSuspense.fallback) === "undefined" ? void 0 : createElement3(wrapInSuspense.fallback)
+        },
+        createElement3(resolvedComponent, componentProps)
+      );
+    } else {
+      element = createElement3(resolvedComponent, { ...componentProps, key });
+    }
     let tagElement = null;
     if (enrichmentTags == null ? void 0 : enrichmentTags.length) {
       tagElement = createElement3(ContextUpdateTransfer, {
@@ -935,7 +972,7 @@ import {
   DefaultUniformClientContext,
   UniformScript
 } from "@uniformdev/canvas-next-rsc-client";
-import { Suspense } from "react";
+import { Suspense as Suspense2 } from "react";
 import React6 from "react";
 var UniformContext = async ({
   clientContextComponent,
@@ -956,7 +993,7 @@ var UniformContext = async ({
       disableDevTools,
       defaultConsent
     }
-  ), /* @__PURE__ */ React6.createElement(Suspense, { fallback: /* @__PURE__ */ React6.createElement(React6.Fragment, null) }, /* @__PURE__ */ React6.createElement(UniformScript, null)));
+  ), /* @__PURE__ */ React6.createElement(Suspense2, { fallback: /* @__PURE__ */ React6.createElement(React6.Fragment, null) }, /* @__PURE__ */ React6.createElement(UniformScript, null)));
 };
 
 // src/components/UniformPlayground.tsx

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next-rsc",
-  "version": "19.147.1-alpha.1+3b71376893",
+  "version": "19.147.1-alpha.5+fd42f9399d",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "build": "tsup",
@@ -56,20 +56,20 @@
     "@types/node": "^20.0.0",
     "@types/react": "18.2.40",
     "eslint": "8.57.0",
-    "next": "^13.4.12",
+    "next": "^14.0.0",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
   "dependencies": {
-    "@uniformdev/canvas": "19.147.1-alpha.1+3b71376893",
-    "@uniformdev/canvas-next-rsc-client": "^19.147.1-alpha.1+3b71376893",
-    "@uniformdev/canvas-next-rsc-shared": "^19.147.1-alpha.1+3b71376893",
-    "@uniformdev/canvas-react": "19.147.1-alpha.1+3b71376893",
-    "@uniformdev/context": "19.147.1-alpha.1+3b71376893",
-    "@uniformdev/project-map": "19.147.1-alpha.1+3b71376893",
-    "@uniformdev/redirect": "19.147.1-alpha.1+3b71376893",
-    "@uniformdev/richtext": "19.147.1-alpha.1+3b71376893",
-    "@uniformdev/webhooks": "19.147.1-alpha.1+3b71376893",
+    "@uniformdev/canvas": "19.147.1-alpha.5+fd42f9399d",
+    "@uniformdev/canvas-next-rsc-client": "^19.147.1-alpha.5+fd42f9399d",
+    "@uniformdev/canvas-next-rsc-shared": "^19.147.1-alpha.5+fd42f9399d",
+    "@uniformdev/canvas-react": "19.147.1-alpha.5+fd42f9399d",
+    "@uniformdev/context": "19.147.1-alpha.5+fd42f9399d",
+    "@uniformdev/project-map": "19.147.1-alpha.5+fd42f9399d",
+    "@uniformdev/redirect": "19.147.1-alpha.5+fd42f9399d",
+    "@uniformdev/richtext": "19.147.1-alpha.5+fd42f9399d",
+    "@uniformdev/webhooks": "19.147.1-alpha.5+fd42f9399d",
     "@vercel/edge-config": "^0.4.0",
     "encoding": "^0.1.13",
     "server-only": "^0.0.1",
@@ -86,5 +86,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3b71376893147a07f47c6118425304f96d099067"
+  "gitHead": "fd42f9399d22a39666b01163b53c2eab646081d2"
 }