Skip to content

upgrade to alpha 134 #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexshyba merged 1 commit into from
Jan 15, 2026
Merged

upgrade to alpha 134 #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@
"@ai-sdk/react": "^1.1.23",
"@next/third-parties": "^16.0.3",
"@radix-ui/react-slider": "^1.3.5",
"@uniformdev/assets": "20.7.1-alpha.120",
"@uniformdev/canvas": "20.7.1-alpha.120",
"@uniformdev/next-app-router": "20.7.1-alpha.120",
"@uniformdev/next-app-router-client": "20.7.1-alpha.120",
"@uniformdev/next-app-router-shared": "20.7.1-alpha.120",
"@uniformdev/context-gtag": "20.7.1-alpha.120",
"@uniformdev/assets": "20.7.1-alpha.134",
"@uniformdev/canvas": "20.7.1-alpha.134",
"@uniformdev/next-app-router": "20.7.1-alpha.134",
"@uniformdev/next-app-router-client": "20.7.1-alpha.134",
"@uniformdev/next-app-router-shared": "20.7.1-alpha.134",
"@uniformdev/context-gtag": "20.7.1-alpha.134",
"@uniformdev/csk-components": "*",
"@uniformdev/design-extensions-tools": "*",
"@uniformdev/insights": "20.7.1-alpha.120",
"@uniformdev/insights": "20.7.1-alpha.134",
"ai": "^4.1.61",
"drizzle-orm": "^0.43.1",
"drizzle-zod": "^0.7.1",
Expand All @@ -79,7 +79,7 @@
"@types/node": "^24.10.0",
"@types/react": "^19.2.2",
"@types/react-dom": "^19.2.2",
"@uniformdev/cli": "20.7.1-alpha.120",
"@uniformdev/cli": "20.7.1-alpha.134",
"@uniformdev/csk-cli": "*",
"@uniformdev/csk-recipes": "*",
"cross-env": "^10.1.0",
Expand Down
16 changes: 13 additions & 3 deletions apps/csk/src/app/layout.tsx → apps/csk/src/app/uniform/[code]/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,27 @@ import CoffeeShopProvider from '@/providers';
import { getDir } from '@/utils/localization';
//? if (ga) {
import { GoogleAnalytics } from '@next/third-parties/google';
import { deserializeEvaluationResult } from '@uniformdev/next-app-router-shared';
//? }

export default async function RootLayout({
children,
params,
}: Readonly<{
children: ReactNode;
params: Promise<{ code: string }>;
}>) {
const cookieStore = await cookies();
const locale = cookieStore.get('NEXT_LOCALE')?.value || locales?.defaultLocale;
const { code } = await params;
const pageState = deserializeEvaluationResult({
input: code,
});
return (
<html lang={locale} dir={getDir(locale)} suppressHydrationWarning className={customFontVariables}>
<html
lang={pageState.locale!}
dir={getDir(pageState.locale!)}
suppressHydrationWarning
className={customFontVariables}
>
<body>
<NextIntlClientProvider>
<NextThemeProvider attribute="class" defaultTheme="light" enableSystem>
Expand Down
5 changes: 5 additions & 0 deletions apps/csk/src/middleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { geolocation } from '@vercel/functions';
import { routing } from './i18n/routing';
import { DEVICE_TYPE_COOKIE_NAME, getDeviceType } from './utils/deviceType';
import { formatPath } from './utils/formatPath';
import locales from '@/i18n/locales.json';

const intlMiddleware = createIntlMiddleware(routing);

Expand Down Expand Up @@ -82,9 +83,13 @@ export async function middleware(request: NextRequest) {

if (!baseResponse.ok) return baseResponse;

const cookieLocale = request.cookies.get('NEXT_LOCALE')?.value;
const locale = cookieLocale || locales.defaultLocale;

const response = await uniformMiddleware({
//? if (cookieConsent) {
defaultConsent: true,
locale,
//? }
rewriteRequestPath: async ({ url }) => ({
path: formatPath(url.pathname),
Expand Down
7 changes: 3 additions & 4 deletions apps/csk/src/utils/metadata.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import type { Metadata } from 'next';
import { cookies } from 'next/headers';
import { notFound } from 'next/navigation';
import { AssetParamValue } from '@uniformdev/assets';
import { flattenValues } from '@uniformdev/canvas';
Expand Down Expand Up @@ -45,9 +44,9 @@ type HeaderParameters = {
* @throws Will throw an error if the route contains issues or cannot be found.
*/
export async function generateMetadata(props: UniformPageParameters): Promise<Metadata> {
const result = await resolveRouteFromCode(props);
const cookieStore = await cookies();
const currentLocale = cookieStore.get('NEXT_LOCALE')?.value || locales.defaultLocale;
const { code } = await props.params;
const result = await resolveRouteFromCode({ code });
const currentLocale = result.pageState.locale!;

if (!result.route) {
notFound();
Expand Down
5 changes: 2 additions & 3 deletions apps/csk/src/utils/resolveRouteFromRoutePath.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@ const resolveRouteFromRoutePath = async (routePath: string, isPreviewMode: boole
rules: undefined,
defaultConsent: undefined,
previewMode: undefined,
locale: undefined,
},
});

return await resolveRouteFromCode({
params: Promise.resolve({
code,
}),
code,
});
};

Expand Down
Loading