Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions apps/csk-marketing-site/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@uniformdev/csk-marketing-site",
"version": "7.0.2",
"version": "7.0.3",
"private": true,
"engines": {
"yarn": "please-use-npm",
Expand Down Expand Up @@ -37,14 +37,14 @@
"make-components-preview": "tsx ./src/scripts/make-preview-images.ts"
},
"dependencies": {
"@uniformdev/assets": "^20.66.4",
"@uniformdev/canvas": "^20.66.4",
"@uniformdev/context": "^20.66.4",
"@uniformdev/assets": "^20.79.1",
"@uniformdev/canvas": "^20.79.1",
"@uniformdev/context": "^20.79.1",
"@uniformdev/csk-components": "*",
"@uniformdev/design-extensions-tools": "*",
"@uniformdev/next-app-router": "^20.66.4",
"@uniformdev/next-app-router-client": "^20.66.4",
"@uniformdev/next-app-router-shared": "^20.66.4",
"@uniformdev/next-app-router": "^20.79.1",
"@uniformdev/next-app-router-client": "^20.79.1",
"@uniformdev/next-app-router-shared": "^20.79.1",
"next": "^16.2.6",
"next-themes": "^0.4.6",
"react": "^19.2.6",
Expand All @@ -58,7 +58,7 @@
"@types/node": "^25.9.1",
"@types/react": "^19.2.15",
"@types/react-dom": "^19.2.3",
"@uniformdev/cli": "^20.66.4",
"@uniformdev/cli": "^20.79.1",
"@uniformdev/csk-cli": "*",
"cross-env": "^10.1.0",
"eslint": "^9.31.0",
Expand Down
43 changes: 32 additions & 11 deletions apps/csk-marketing-site/src/app/uniform/[code]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { CANVAS_EDITOR_STATE } from '@uniformdev/canvas';
import { Suspense } from 'react';
import { CANVAS_PUBLISHED_STATE } from '@uniformdev/canvas';
import { emptyPlaceholderResolver } from '@uniformdev/csk-components/components/canvas/emptyPlaceholders';
import { compositionCache } from '@uniformdev/csk-components/utils/getSlotComponents';
import { DesignExtensionsProvider } from '@uniformdev/design-extensions-tools/components/providers/server';
Expand All @@ -8,6 +9,7 @@ import {
UniformComposition,
UniformPageParameters,
} from '@uniformdev/next-app-router';
import { deserializeEvaluationResult } from '@uniformdev/next-app-router-shared';
import { componentResolver } from '@/components';
import getAllStaticGeneratedPages from '@/utils/getAllStaticGeneratedPages';

Expand All @@ -16,19 +18,38 @@ export const generateStaticParams = async () => {
return createUniformStaticParams({ paths });
};

export default async function UniformPage({ params }: UniformPageParameters) {
const Composition = ({ code }: { code: string }) => (
<UniformComposition
code={code}
resolveRoute={resolveRouteFromCode}
resolveComponent={componentResolver}
resolveEmptyPlaceholder={emptyPlaceholderResolver}
compositionCache={compositionCache}
/>
);

// Published pages are rendered once and cached as a whole.
const PublishedComposition = async ({ code }: { code: string }) => {
'use cache';
return <Composition code={code} />;
};

export default async function UniformPage({ params }: UniformPageParameters) {
const { code } = await params;
const result = await resolveRouteFromCode({ code });

const result = deserializeEvaluationResult({ input: code });

return (
<DesignExtensionsProvider isPreviewMode={result.pageState.compositionState === CANVAS_EDITOR_STATE}>
<UniformComposition
code={code}
resolveRoute={resolveRouteFromCode}
resolveComponent={componentResolver}
resolveEmptyPlaceholder={emptyPlaceholderResolver}
compositionCache={compositionCache}
/>
<DesignExtensionsProvider isPreviewMode={result.previewMode === 'editor'}>
{result.compositionState === CANVAS_PUBLISHED_STATE ? (
<PublishedComposition code={code} />
) : (
// Draft and editor states are evaluated per request (cookies, headers),
// so they cannot be cached and must be streamed inside a Suspense boundary.
<Suspense>
<Composition code={code} />
</Suspense>
)}
</DesignExtensionsProvider>
);
}
Expand Down
6 changes: 3 additions & 3 deletions apps/csk-storybook/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@uniformdev/csk-storybook",
"version": "7.0.2",
"version": "7.0.3",
"description": "CSK vNext Storybook is an interactive Storybook build showcasing components from the CSK vNext component starter kit. It provides detailed documentation, live previews, and testing capabilities for easy integration into your projects.",
"main": "index.js",
"scripts": {
Expand All @@ -22,8 +22,8 @@
"@tailwindcss/typography": "^0.5.19",
"@uniformdev/csk-components": "*",
"@uniformdev/design-extensions-tools": "*",
"@uniformdev/next-app-router": "^20.66.4",
"@uniformdev/next-app-router-shared": "^20.66.4",
"@uniformdev/next-app-router": "^20.79.1",
"@uniformdev/next-app-router-shared": "^20.79.1",
"eslint-plugin-storybook": "^10.4.0",
"next": "^16.2.6",
"next-themes": "^0.4.6",
Expand Down
14 changes: 7 additions & 7 deletions apps/csk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@uniformdev/component-starter-kit",
"version": "7.0.2",
"version": "7.0.3",
"private": true,
"engines": {
"yarn": "please-use-npm",
Expand Down Expand Up @@ -36,14 +36,14 @@
"recipes": "csk-recipes init"
},
"dependencies": {
"@uniformdev/assets": "^20.66.4",
"@uniformdev/canvas": "^20.66.4",
"@uniformdev/assets": "^20.79.1",
"@uniformdev/canvas": "^20.79.1",
"@uniformdev/csk-cli": "*",
"@uniformdev/csk-components": "*",
"@uniformdev/design-extensions-tools": "*",
"@uniformdev/next-app-router": "^20.66.4",
"@uniformdev/next-app-router-client": "^20.66.4",
"@uniformdev/next-app-router-shared": "^20.66.4",
"@uniformdev/next-app-router": "^20.79.1",
"@uniformdev/next-app-router-client": "^20.79.1",
"@uniformdev/next-app-router-shared": "^20.79.1",
"js-cookie": "^3.0.7",
"next": "^16.2.6",
"next-themes": "^0.4.6",
Expand All @@ -58,7 +58,7 @@
"@types/node": "^25.9.1",
"@types/react": "^19.2.15",
"@types/react-dom": "^19.2.3",
"@uniformdev/cli": "^20.66.4",
"@uniformdev/cli": "^20.79.1",
"@uniformdev/csk-recipes": "*",
"cross-env": "^10.1.0",
"eslint": "^9.31.0",
Expand Down
35 changes: 27 additions & 8 deletions apps/csk/src/app/uniform/[code]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { Suspense } from 'react';
import { CANVAS_PUBLISHED_STATE } from '@uniformdev/canvas';
import { emptyPlaceholderResolver } from '@uniformdev/csk-components/components/canvas/emptyPlaceholders';
import { compositionCache } from '@uniformdev/csk-components/utils/getSlotComponents';
import { DesignExtensionsProvider } from '@uniformdev/design-extensions-tools/components/providers/server';
Expand All @@ -18,21 +20,38 @@ export const generateStaticParams = async () => {
});
};

export default async function UniformPage({ params }: UniformPageParameters) {
const Composition = ({ code }: { code: string }) => (
<UniformComposition
code={code}
resolveRoute={resolveRouteFromCode}
resolveComponent={componentResolver}
resolveEmptyPlaceholder={emptyPlaceholderResolver}
compositionCache={compositionCache}
/>
);

// Published pages are rendered once and cached as a whole.
const PublishedComposition = async ({ code }: { code: string }) => {
'use cache';
return <Composition code={code} />;
};

export default async function UniformPage({ params }: UniformPageParameters) {
const { code } = await params;

const result = deserializeEvaluationResult({ input: code });

return (
<DesignExtensionsProvider isPreviewMode={result.previewMode === 'editor'}>
<UniformComposition
code={code}
resolveRoute={resolveRouteFromCode}
resolveComponent={componentResolver}
resolveEmptyPlaceholder={emptyPlaceholderResolver}
compositionCache={compositionCache}
/>
{result.compositionState === CANVAS_PUBLISHED_STATE ? (
<PublishedComposition code={code} />
) : (
// Draft and editor states are evaluated per request (cookies, headers),
// so they cannot be cached and must be streamed inside a Suspense boundary.
<Suspense>
<Composition code={code} />
</Suspense>
)}
</DesignExtensionsProvider>
);
}
Expand Down
Loading
Loading