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
13 changes: 3 additions & 10 deletions examples/nextjs-app-router-localization-starter/next.config.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
const withNextIntl = require("next-intl/plugin")();
const { withUniformConfig } = require("@uniformdev/canvas-next-rsc/config");

/** @type {import('next').NextConfig} */
const nextConfig = {
typescript: {
// !! WARN !!
// Dangerously allow production builds to successfully complete even if
// your project has type errors.
// !! WARN !!
ignoreBuildErrors: true,
},
};
const nextConfig = {};

module.exports = withNextIntl(nextConfig);
module.exports = withNextIntl(withUniformConfig(nextConfig));

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"@types/node": "20.10.6",
"@types/react": "18.2.40",
"@types/react-dom": "18.2.17",
"@uniformdev/canvas": "^19.178.0",
"@uniformdev/canvas-next-rsc": "^19.178.0",
"@uniformdev/project-map": "^19.178.0",
"autoprefixer": "10.4.16",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,33 @@
import React from "react";
import { Metadata } from "next";
import { notFound } from "next/navigation";
import { unstable_setRequestLocale } from "next-intl/server";

import Composition from "@/components/composition";
import { getStaticParams } from "@/lib/uniform/utils";
import {
getPageMetaData,
getStaticParams,
isRouteWithoutErrors,
getRouteData,
} from "@/lib/uniform/utils";

export type RouteParams = { path: string[]; locale: string };

export async function generateMetadata(props: {
params: RouteParams;
}): Promise<Metadata> {
const route = await getRouteData(props.params);
if (!isRouteWithoutErrors(route)) return notFound();
return getPageMetaData(route);
}

export async function generateStaticParams() {
return await getStaticParams();
}

type Props = {
params: { locale: string; path: Array<string> };
};

export default function Home({ params: { locale, path } }: Props) {
export default function Home({ params }: { params: RouteParams }) {
const { locale } = params;
unstable_setRequestLocale(locale);
return <Composition locale={locale} path={path.join("/")} />;
return <Composition {...params} />;
}

export const dynamic = "force-static";
Original file line number Diff line number Diff line change
@@ -1,15 +1,30 @@
import Composition from "@/components/composition";
import { Metadata } from "next";
import { unstable_setRequestLocale } from "next-intl/server";
import { notFound } from "next/navigation";
import { retrieveRoute } from "@uniformdev/canvas-next-rsc";
import Composition from "@/components/composition";
import { getPageMetaData, isRouteWithoutErrors } from "@/lib/uniform/utils";

type Props = {
params: { locale: string };
};

export async function generateMetadata(props: {
params: { path: string[]; locale: string };
}): Promise<Metadata> {
const { locale } = props.params;
const params = { params: { path: locale } };
const route = await retrieveRoute(params);

if (!isRouteWithoutErrors(route)) return notFound();
return getPageMetaData(route);
}

export default function IndexPage({ params: { locale } }: Props) {
// Enable static rendering
unstable_setRequestLocale(locale);

return <Composition locale={locale} path="/" />;
return <Composition locale={locale} path={["/"]} />;
}

export const dynamic = "force-static";
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import {
UniformPlayground,
UniformPlaygroundProps,
} from "@uniformdev/canvas-next-rsc";
import { resolveComponent } from "@/lib/uniform/componentResolver";

export default function PlaygroundPage(props: {
searchParams: UniformPlaygroundProps["searchParams"];
}) {
return <UniformPlayground {...props} resolveComponent={resolveComponent} />;
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import {
createPreviewOPTIONSRouteHandler,
} from "@uniformdev/canvas-next-rsc/handler";

export const GET = createPreviewGETRouteHandler();
export const GET = createPreviewGETRouteHandler({
playgroundPath: "/playground",
});

export const POST = createPreviewPOSTRouteHandler();
export const OPTIONS = createPreviewOPTIONSRouteHandler();
Original file line number Diff line number Diff line change
@@ -1,28 +1,24 @@
import {retrieveRoute, UniformComposition} from '@uniformdev/canvas-next-rsc';
import {notFound} from 'next/navigation';
import {resolveComponent} from '../lib/uniform/componentResolver';
import { UniformComposition } from "@uniformdev/canvas-next-rsc";
import { notFound } from "next/navigation";
import { resolveComponent } from "@/lib/uniform/componentResolver";
import { getRouteData } from "@/lib/uniform/utils";

export default async function Composition({
locale,
path = '/'
}: {
export default async function Composition(params: {
locale: string;
path: string;
path: string[];
}) {
const routePath = path !== '/' ? `${locale}/${path}` : locale;
const params = {params: {path: routePath}};
const route = await retrieveRoute(params);

const { path } = params;
const route = await getRouteData(params);
if (
route.type === 'notFound' ||
(route.type === 'composition' &&
route.compositionApiResponse.errors?.some((e) => e.type === 'data'))
route.type === "notFound" ||
(route.type === "composition" &&
route.compositionApiResponse.errors?.some((e) => e.type === "data"))
) {
// if we got data errors, we could not resolve a data resource and we choose to return a 404 instead of partial content
// eslint-disable-next-line no-console
console.log('Returning 404 because data errors: ', {
console.log("Returning 404 because data errors: ", {
path,
route
route,
});
return notFound();
}
Expand All @@ -32,7 +28,7 @@ export default async function Composition({
mode="static"
resolveComponent={resolveComponent}
route={route}
{...params}
params={{ path: Array.isArray(path) ? path.join("/") : path }}
/>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ import Link from "next/link";

export const Header = () => {
const locale = useLocale();
// @ts-expect-error
const t = useTranslations("Global");

return (
<>
<Link href={`/${locale}`} className="self-start flex-1 text-blue-700">
{/* @ts-expect-error */}
{t("homeLink")}
</Link>
<header className="navigation">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { getRequestConfig } from "next-intl/server";
import { notFound } from "next/navigation";

// Can be imported from a shared config
const locales = ['en', 'de'];
const locales = ['en', 'de', 'ja'];

/** Configure i18n static translation messages */
export default getRequestConfig(async ({ locale }) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// components will be registered here
export { pageMapping } from "@/components/page/mapping";
export { heroMapping } from "@/components/hero/mapping";
export { heroMapping } from "@/components/hero/mapping";
Original file line number Diff line number Diff line change
@@ -1,30 +1,80 @@
import { flattenValues, LocaleClient, LocalesGetResponse, ResolvedRouteGetResponse, RootComponentInstance, RouteGetResponseEdgehancedComposition } from "@uniformdev/canvas";
import { ProjectMapClient } from "@uniformdev/project-map";
import { retrieveRoute } from "@uniformdev/canvas-next-rsc";
import { RouteParams } from "@/app/[locale]/[...path]/page";

export async function getStaticParams(defaultLocale: string = "en") {
export async function getRouteData(params: RouteParams): Promise<ResolvedRouteGetResponse> {
const { path, locale } = params;
const routePath = Array.isArray(path) ? `${locale}/${path.join("/")}` : locale;
const data = { params: { path: routePath } };
const routeData = await retrieveRoute(data);
return routeData;
}

export const isRouteWithoutErrors = (
route: ResolvedRouteGetResponse
): route is RouteGetResponseEdgehancedComposition =>
"compositionApiResponse" in route &&
route.compositionApiResponse !== undefined &&
"composition" in route.compositionApiResponse;

export const getPageMetaData = (compositionResponse: RouteGetResponseEdgehancedComposition) => {
const { composition } = compositionResponse.compositionApiResponse || {};
const compositionParameters = flattenValues(composition);
const {
metaTitle,
metaDescription,
pageKeywords,
} = compositionParameters || {};

return {
metadataBase: new URL(process.env.SITE_URL || 'http://localhost:3000'),
title: metaTitle as string ?? 'Home',
description: metaDescription as string,
keywords: pageKeywords as string,
};
};

export async function getLocales(): Promise<string[]> {
const client = new LocaleClient({
apiKey: process.env.UNIFORM_API_KEY,
projectId: process.env.UNIFORM_PROJECT_ID,
});

const localeResponse: LocalesGetResponse = await client.get();

const { results: localeDefinitions } = localeResponse;
return localeDefinitions.map((locale) => locale.locale);
}

export async function getStaticParams() {
const client = getProjectMapClient();
const { nodes } = await client.getNodes({});
const resolvedPaths: { path: string[], locale: string }[] = [];

const locales = await getLocales();
if (nodes) {
for (let i = 0; i < nodes.length; i++) {
const node = nodes[i];
const path = node.path.replace("/:locale", "/");
if (path !== "/") {
resolvedPaths.push({ path: path.split('/').filter(Boolean), locale: defaultLocale });

// adding localized paths
const locales = node.locales;
if (locales) {
Object.keys(locales).forEach((locale) => {
resolvedPaths.push({ path: locales[locale].pathSegment.split('/').filter(Boolean), locale: locale });
})
const nodeLocales = node.locales;
locales.forEach((locale: string) => {
// if there are any locales defined for the node
if (nodeLocales && Object.keys(nodeLocales).indexOf(locale) !== -1) {
const nodePath = nodeLocales[locale].pathSegment.split('/').filter(Boolean);
resolvedPaths.push({ path: nodePath, locale: locale });
} else {
resolvedPaths.push({ path: path.split('/').filter(Boolean), locale: locale });
}
}
);
}
}
}
};

return resolvedPaths;
};
}


export const getProjectMapClient = () => {
const manifestClient = new ProjectMapClient({
Expand Down