diff --git a/.changeset/fix-root-not-found.md b/.changeset/fix-root-not-found.md new file mode 100644 index 000000000..0fe33621e --- /dev/null +++ b/.changeset/fix-root-not-found.md @@ -0,0 +1,5 @@ +--- +"@bigcommerce/catalyst-core": patch +--- + +Add root-level not-found page so /404 renders a branded page instead of the default Vercel error screen diff --git a/core/app/[locale]/layout.tsx b/core/app/[locale]/layout.tsx index f0a08d7f3..11d3d88e8 100644 --- a/core/app/[locale]/layout.tsx +++ b/core/app/[locale]/layout.tsx @@ -1,6 +1,5 @@ import { Analytics } from '@vercel/analytics/react'; import { SpeedInsights } from '@vercel/speed-insights/next'; -import { clsx } from 'clsx'; import type { Metadata } from 'next'; import { notFound } from 'next/navigation'; import { NextIntlClientProvider } from 'next-intl'; @@ -8,9 +7,6 @@ import { setRequestLocale } from 'next-intl/server'; import { NuqsAdapter } from 'nuqs/adapters/next/app'; import { cache, PropsWithChildren } from 'react'; -import '../../globals.css'; - -import { fonts } from '~/app/fonts'; import { CookieNotifications } from '~/app/notifications'; import { Providers } from '~/app/providers'; import { client } from '~/client'; @@ -140,34 +136,32 @@ export default async function RootLayout({ params, children }: Props) { const privacyPolicyUrl = rootData.data.site.settings?.privacy?.privacyPolicyUrl; return ( - f.variable))} lang={locale}> - - - - - - - {toastNotificationCookieData && ( - - )} - {children} - - - - - - - - - + <> + + + + + + {toastNotificationCookieData && ( + + )} + {children} + + + + + + + + ); } diff --git a/core/app/layout.tsx b/core/app/layout.tsx new file mode 100644 index 000000000..ea754b0fb --- /dev/null +++ b/core/app/layout.tsx @@ -0,0 +1,14 @@ +import { clsx } from 'clsx'; +import { PropsWithChildren } from 'react'; + +import '../globals.css'; + +import { fonts } from '~/app/fonts'; + +export default function RootLayout({ children }: PropsWithChildren) { + return ( + f.variable))} lang="en"> + {children} + + ); +} diff --git a/core/app/not-found.tsx b/core/app/not-found.tsx new file mode 100644 index 000000000..63ff9b6f9 --- /dev/null +++ b/core/app/not-found.tsx @@ -0,0 +1,16 @@ +export default function RootNotFound() { + return ( +
+

Page not found

+

+ The page you are looking for could not be found. +

+ + Go to homepage + +
+ ); +}