create-content-sdk-app 2.0.0-canary.13 → 2.0.0-canary.15

package/dist/templates/nextjs-app-router/src/app/[site]/[locale]/[[...path]]/not-found.tsx

@@ -1,21 +1,18 @@
 import Link from 'next/link';
-import { headers } from 'next/headers';
 import { Suspense } from 'react';
-import { ErrorPage } from '@sitecore-content-sdk/nextjs';
-import { parseRewriteHeader } from '@sitecore-content-sdk/nextjs/utils';
+import { ErrorPage, getCachedPageParams } from '@sitecore-content-sdk/nextjs';
 import client from 'lib/sitecore-client';
 import scConfig from 'sitecore.config';
 import Layout from 'src/Layout';
 import Providers from 'src/Providers';
 import { NextIntlClientProvider } from 'next-intl';
 
-// Part of not-found component that handles dynamic data, like the `headers()` call and error page fetching.
+// Part of not-found component that handles dynamic data like error page fetching.
 // This component is wrapped in Suspense to enable Next.js 16 Partial Prerendering (PPR),
 // which allows streaming dynamic content while keeping static parts prerendered.
 // This pattern also works seamlessly when Cache Components is enabled.
-async function DynamicNotFoundContent() {
-  const headersList = await headers();
-  const { site, locale } = parseRewriteHeader(headersList);
+async function NotFoundContent() {
+  const { site, locale } = getCachedPageParams();
 
   const page = await client.getErrorPage(ErrorPage.NotFound, {
     site: site || scConfig.defaultSite,
@@ -53,7 +50,7 @@ export default function NotFound() {
         </div>
       }
     >
-      <DynamicNotFoundContent />
+      <NotFoundContent />
     </Suspense>
   );
 }

package/dist/templates/nextjs-app-router/src/app/[site]/[locale]/[[...path]]/page.tsx

@@ -19,11 +19,11 @@ type PageProps = {
   searchParams: Promise<{ [key: string]: string | string[] | undefined }>;
 };
 
-// Part of page component that handles dynamic data, like the `draftMode()` call and data fetching.
+// Part of page component that handles data, like the `draftMode()` call and data fetching.
 // This component is wrapped in Suspense to enable Next.js 16 Partial Prerendering (PPR),
-// which allows streaming dynamic content while keeping static parts prerendered.
+// which allows streaming content while keeping static parts prerendered.
 // This pattern also works seamlessly when Cache Components is enabled.
-async function DynamicPageContent({ site, locale, path, searchParams }: { site: string; locale: string; path?: string[]; searchParams: Promise<{ [key: string]: string | string[] | undefined }> }) {
+async function PageContent({ site, locale, path, searchParams }: { site: string; locale: string; path?: string[]; searchParams: Promise<{ [key: string]: string | string[] | undefined }> }) {
   const draft = await draftMode();
 
   // Fetch the page data from Sitecore
@@ -63,7 +63,7 @@ export default async function Page({ params, searchParams }: PageProps) {
   // PPR allows streaming dynamic content while keeping static parts prerendered for better performance.
   return (
     <Suspense fallback={<div>Loading...</div>}>
-      <DynamicPageContent site={site} locale={locale} path={path} searchParams={searchParams} />
+      <PageContent site={site} locale={locale} path={path} searchParams={searchParams} />
     </Suspense>
   );
 }

package/dist/templates/nextjs-app-router/src/app/[site]/[locale]/layout.tsx

@@ -0,0 +1,19 @@
+import { setCachedPageParams } from '@sitecore-content-sdk/nextjs';
+
+export default async function SiteLayout({
+  children,
+  params,
+}: {
+  children: React.ReactNode;
+  params: Promise<{ site: string; locale: string }>;
+}) {
+  const { site, locale } = await params;
+
+  // Update the cached page info with the current site and locale values.
+  // This ensures the notFound page can access the correct site and locale information when rendered
+  // without opting out of SSG by using functions like `headers()`.
+  setCachedPageParams({ locale, site });
+
+  return <>{children}</>;
+}
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-content-sdk-app",
-  "version": "2.0.0-canary.13",
+  "version": "2.0.0-canary.15",
   "description": "Sitecore Content SDK initializer",
   "bin": "./dist/index.js",
   "scripts": {
@@ -70,5 +70,5 @@
     "ts-node": "^10.9.2",
     "typescript": "~5.8.3"
   },
-  "gitHead": "414b181508e47177e1818381ad4f555c189b9e4a"
+  "gitHead": "1159415b0cb719120735fa7d33e0aaac46a65cdb"
 }