create-content-sdk-app 2.0.0 → 2.0.2-canary.0

package/dist/templates/nextjs-app-router/sitecore.config.ts.example

@@ -1,40 +1,40 @@
-import { defineConfig } from '@sitecore-content-sdk/nextjs/config';
-/**
- * @type {import('@sitecore-content-sdk/nextjs/config').SitecoreConfig}
- * See the documentation for `defineConfig`:
- * https://doc.sitecore.com/xmc/en/developers/content-sdk/the-sitecore-configuration-file.html
- */
-export default defineConfig({
-  api: {
-    edge: {
-      contextId:
-        process.env.SITECORE_EDGE_CONTEXT_ID ||
-        process.env.NEXT_PUBLIC_SITECORE_EDGE_CONTEXT_ID ||
-        '',
-      clientContextId: process.env.NEXT_PUBLIC_SITECORE_EDGE_CONTEXT_ID,
-      edgeUrl:
-        process.env.NEXT_PUBLIC_SITECORE_EDGE_PLATFORM_HOSTNAME ||
-        process.env.SITECORE_EDGE_PLATFORM_HOSTNAME,
-    },
-    local: {
-      apiKey: process.env.NEXT_PUBLIC_SITECORE_API_KEY || '',
-      apiHost: process.env.NEXT_PUBLIC_SITECORE_API_HOST || '',
-    },
-  },
-  defaultSite: process.env.NEXT_PUBLIC_DEFAULT_SITE_NAME,
-  defaultLanguage: process.env.NEXT_PUBLIC_DEFAULT_LANGUAGE || 'en',
-  editingSecret: process.env.SITECORE_EDITING_SECRET,
-  redirects: {
-    enabled: true,
-    locales: ['en'],
-  },
-  multisite: {
-    enabled: true,
-    useCookieResolution: () => process.env.VERCEL_ENV === 'preview',
-  },
-  personalize: {
-    scope: process.env.NEXT_PUBLIC_PERSONALIZE_SCOPE,
-    edgeTimeout: parseInt(process.env.PERSONALIZE_PROXY_EDGE_TIMEOUT!, 10),
-    cdpTimeout: parseInt(process.env.PERSONALIZE_PROXY_EDGE_TIMEOUT!, 10),
-  },
-});
+import { defineConfig } from '@sitecore-content-sdk/nextjs/config';
+/**
+ * @type {import('@sitecore-content-sdk/nextjs/config').SitecoreConfig}
+ * See the documentation for `defineConfig`:
+ * https://doc.sitecore.com/xmc/en/developers/content-sdk/the-sitecore-configuration-file.html
+ */
+export default defineConfig({
+  api: {
+    edge: {
+      contextId:
+        process.env.SITECORE_EDGE_CONTEXT_ID ||
+        process.env.NEXT_PUBLIC_SITECORE_EDGE_CONTEXT_ID ||
+        '',
+      clientContextId: process.env.NEXT_PUBLIC_SITECORE_EDGE_CONTEXT_ID,
+      edgeUrl:
+        process.env.NEXT_PUBLIC_SITECORE_EDGE_PLATFORM_HOSTNAME ||
+        process.env.SITECORE_EDGE_PLATFORM_HOSTNAME,
+    },
+    local: {
+      apiKey: process.env.NEXT_PUBLIC_SITECORE_API_KEY || '',
+      apiHost: process.env.NEXT_PUBLIC_SITECORE_API_HOST || '',
+    },
+  },
+  defaultSite: process.env.NEXT_PUBLIC_DEFAULT_SITE_NAME,
+  defaultLanguage: process.env.NEXT_PUBLIC_DEFAULT_LANGUAGE || 'en',
+  editingSecret: process.env.SITECORE_EDITING_SECRET,
+  redirects: {
+    enabled: true,
+    locales: ['en'],
+  },
+  multisite: {
+    enabled: true,
+    useCookieResolution: () => process.env.VERCEL_ENV === 'preview',
+  },
+  personalize: {
+    scope: process.env.NEXT_PUBLIC_PERSONALIZE_SCOPE,
+    edgeTimeout: parseInt(process.env.PERSONALIZE_PROXY_EDGE_TIMEOUT!, 10),
+    cdpTimeout: parseInt(process.env.PERSONALIZE_PROXY_EDGE_TIMEOUT!, 10),
+  },
+});

package/dist/templates/nextjs-app-router/src/Bootstrap.tsx

@@ -1,7 +1,8 @@
 'use client';
 import { useEffect, JSX } from 'react';
-import { CloudSDK } from '@sitecore-cloudsdk/core/browser';
-import '@sitecore-cloudsdk/events/browser';
+import { initContentSdk } from '@sitecore-content-sdk/nextjs';
+import { eventsPlugin } from '@sitecore-content-sdk/events';
+import { analyticsBrowserAdapter, analyticsPlugin } from '@sitecore-content-sdk/analytics-core';
 import config from 'sitecore.config';
 
 const Bootstrap = ({
@@ -23,16 +24,23 @@ const Bootstrap = ({
     }
 
     if (config.api.edge?.clientContextId) {
-      console.log('✨ Initializing CloudSDK for site:', siteName);
-      CloudSDK({
-        sitecoreEdgeUrl: config.api.edge.edgeUrl,
-        sitecoreEdgeContextId: config.api.edge.clientContextId,
-        siteName: siteName || config.defaultSite,
-        enableBrowserCookie: true,
-        cookieDomain: window.location.hostname.replace(/^www\./, ''),
-      })
-        .addEvents()
-        .initialize();
+      initContentSdk({
+        config: {
+          contextId: config.api.edge.clientContextId,
+          edgeUrl: config.api.edge.edgeUrl,
+          siteName: siteName || config.defaultSite,
+        },
+        plugins: [
+          analyticsPlugin({
+            options: {
+              enableCookie: true,
+              cookieDomain: window.location.hostname.replace(/^www\./, ''),
+            },
+            adapter: analyticsBrowserAdapter(),
+          }),
+          eventsPlugin(),
+        ],
+      });
     } else {
       console.error('Client Edge API settings missing from configuration');
     }

package/dist/templates/nextjs-app-router/src/app/[site]/[locale]/[[...path]]/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/dist/templates/nextjs-app-router/src/app/[site]/[locale]/[[...path]]/not-found.tsx

@@ -1,21 +1,13 @@
 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.
-// 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);
+export default async function NotFound() {
+  const { site, locale } = getCachedPageParams();
 
   const page = await client.getErrorPage(ErrorPage.NotFound, {
     site: site || scConfig.defaultSite,
@@ -40,20 +32,3 @@ async function DynamicNotFoundContent() {
     </div>
   );
 }
-
-export default function NotFound() {
-  // Wrap dynamic content in Suspense to enable Next.js 16 Partial Prerendering (PPR).
-  // PPR allows streaming dynamic content while keeping static parts prerendered for better performance.
-  return (
-    <Suspense
-      fallback={
-        <div style={{ padding: 10 }}>
-          <h1>Page not found</h1>
-          <p>Loading...</p>
-        </div>
-      }
-    >
-      <DynamicNotFoundContent />
-    </Suspense>
-  );
-}

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

@@ -1,7 +1,6 @@
 import { isDesignLibraryPreviewData } from '@sitecore-content-sdk/nextjs/editing';
 import { notFound } from 'next/navigation';
 import { draftMode } from 'next/headers';
-import { Suspense } from 'react';
 <% if (prerender === 'SSG') { -%>
 import { SiteInfo } from '@sitecore-content-sdk/nextjs';
 import sites from '.sitecore/sites.json';
@@ -19,11 +18,12 @@ type PageProps = {
   searchParams: Promise<{ [key: string]: string | string[] | undefined }>;
 };
 
-// Part of page component that handles dynamic 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.
-// 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 }> }) {
+export default async function Page({ params, searchParams }: PageProps) {
+  const { site, locale, path } = await params;
+
+  // Set site and locale to be available in src/i18n/request.ts for fetching the dictionary
+  setRequestLocale(`${site}_${locale}`);
+
   const draft = await draftMode();
 
   // Fetch the page data from Sitecore
@@ -53,21 +53,6 @@ async function DynamicPageContent({ site, locale, path, searchParams }: { site:
   );
 }
 
-export default async function Page({ params, searchParams }: PageProps) {
-  const { site, locale, path } = await params;
-
-  // Set site and locale to be available in src/i18n/request.ts for fetching the dictionary
-  setRequestLocale(`${site}_${locale}`);
-
-  // Wrap dynamic content in Suspense to enable Next.js 16 Partial Prerendering (PPR).
-  // 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} />
-    </Suspense>
-  );
-}
-
 <% if (prerender === 'SSG') { -%>
 // This function gets called at build and export time to determine
 // pages for SSG ("paths", as tokenized array).

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

@@ -1,22 +1,6 @@
 import { draftMode } from 'next/headers';
-import { Suspense } from 'react';
 import Bootstrap from 'src/Bootstrap';
 
-// Part of layout component that handles dynamic data, like the `draftMode()` call.
-// 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 DynamicLayoutContent({ site, children }: { site: string; children: React.ReactNode }) {
-  const { isEnabled } = await draftMode();
-
-  return (
-    <>
-      <Bootstrap siteName={site} isPreviewMode={isEnabled} />
-      {children}
-    </>
-  );
-}
-
 export default async function SiteLayout({
   children,
   params,
@@ -25,12 +9,12 @@ export default async function SiteLayout({
   params: Promise<{ site: string }>;
 }) {
   const { site } = await params;
+  const { isEnabled } = await draftMode();
 
-  // Wrap dynamic content in Suspense to enable Next.js 16 Partial Prerendering (PPR).
-  // PPR allows streaming dynamic content while keeping static parts prerendered for better performance.
   return (
-    <Suspense fallback={<>{children}</>}>
-      <DynamicLayoutContent site={site}>{children}</DynamicLayoutContent>
-    </Suspense>
+    <>
+      <Bootstrap siteName={site} isPreviewMode={isEnabled} />
+      {children}
+    </>
   );
 }

package/dist/templates/nextjs-app-router/src/app/globals.css

@@ -1 +1 @@
-@import "tailwindcss";
+@import "tailwindcss";

package/dist/templates/nextjs-app-router/src/app/not-found.tsx

@@ -1,16 +1,11 @@
 import Link from 'next/link';
-import { Suspense } from 'react';
 import client from 'lib/sitecore-client';
 import scConfig from 'sitecore.config';
 import { ErrorPage } from '@sitecore-content-sdk/nextjs';
 import Layout from 'src/Layout';
 import Providers from 'src/Providers';
 
-// 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() {
+export default async function NotFound() {
   if (scConfig.defaultSite) {
     const page = await client.getErrorPage(ErrorPage.NotFound, {
       site: scConfig.defaultSite,
@@ -34,20 +29,3 @@ async function DynamicNotFoundContent() {
     </div>
   );
 }
-
-export default function NotFound() {
-  // Wrap dynamic content in Suspense to enable Next.js 16 Partial Prerendering (PPR).
-  // PPR allows streaming dynamic content while keeping static parts prerendered for better performance.
-  return (
-    <Suspense
-      fallback={
-        <div style={{ padding: 10 }}>
-          <h1>Page not found</h1>
-          <p>Loading...</p>
-        </div>
-      }
-    >
-      <DynamicNotFoundContent />
-    </Suspense>
-  );
-}

package/dist/templates/nextjs-app-router/src/byoc/index.tsx

@@ -1,6 +1,6 @@
 import React, { JSX } from 'react';
 import * as FEAAS from '@sitecore-feaas/clientside/react';
-import * as Events from '@sitecore-cloudsdk/events/browser';
+import * as Events from '@sitecore-content-sdk/events';
 import { LayoutServicePageState, SitecoreProviderReactContext } from '@sitecore-content-sdk/nextjs';
 import '@sitecore/components/context';
 import dynamic from 'next/dynamic';

package/dist/templates/nextjs-app-router/src/components/content-sdk/CdpPageView.tsx

@@ -1,7 +1,7 @@
 'use client';
 import { CdpHelper, useSitecore } from '@sitecore-content-sdk/nextjs';
 import { useEffect, JSX } from 'react';
-import { pageView } from '@sitecore-cloudsdk/events/browser';
+import { pageView } from '@sitecore-content-sdk/events';
 import config from 'sitecore.config';
 
 /**

package/dist/templates/nextjs-app-router/tsconfig.json

@@ -1,48 +1,48 @@
-{
-  "compilerOptions": {
-    "baseUrl": ".",
-    "paths": {
-      "components/*": [
-        "src/components/*"
-      ],
-      "lib/*": [
-        "src/lib/*"
-      ],
-      "temp/*": [
-        "src/temp/*"
-      ],
-      "assets/*": [
-        "src/assets/*"
-      ],
-      ".sitecore/*": [
-        ".sitecore/*"
-      ],
-      <%_ if (helper.isDev) { _%>
-      "next/*": ["node_modules/next/*"],
-      <%_ } _%>
-    },
-    "target": "ES2017",
-    "types": ["node"],
-    "lib": ["dom", "dom.iterable", "esnext"],
-    "allowJs": true,
-    "skipLibCheck": true,
-    "strict": true,
-    "noEmit": true,
-    "esModuleInterop": true,
-    "strictFunctionTypes": false,
-    "module": "esnext",
-    "moduleResolution": "node",
-    "allowSyntheticDefaultImports": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "jsx": "preserve",
-    "incremental": true,
-    "plugins": [
-      {
-        "name": "next"
-      }
-    ],
-  },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
-  "exclude": ["node_modules"]
-}
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "components/*": [
+        "src/components/*"
+      ],
+      "lib/*": [
+        "src/lib/*"
+      ],
+      "temp/*": [
+        "src/temp/*"
+      ],
+      "assets/*": [
+        "src/assets/*"
+      ],
+      ".sitecore/*": [
+        ".sitecore/*"
+      ],
+      <%_ if (helper.isDev) { _%>
+      "next/*": ["node_modules/next/*"],
+      <%_ } _%>
+    },
+    "target": "ES2017",
+    "types": ["node"],
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "strictFunctionTypes": false,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "allowSyntheticDefaultImports": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "preserve",
+    "incremental": true,
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ],
+  },
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
+  "exclude": ["node_modules"]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-content-sdk-app",
-  "version": "2.0.0",
+  "version": "2.0.2-canary.0",
   "description": "Sitecore Content SDK initializer",
   "bin": "./dist/index.js",
   "scripts": {
@@ -70,5 +70,5 @@
     "ts-node": "^10.9.2",
     "typescript": "~5.8.3"
   },
-  "gitHead": "492d7d718c965bbfe394d6c12c2e4870220cf4bf"
+  "gitHead": "2c38dbe915264c92dfc8482535afa0f0466e0b35"
 }

package/dist/initializers/angular/args.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/initializers/angular/index.js

@@ -1,30 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
-const common_1 = require("../../common");
-const prompts_1 = require("./prompts");
-const inquirer_1 = __importDefault(require("inquirer"));
-class AngularInitializer {
-    init(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const answers = yield inquirer_1.default.prompt(prompts_1.prompts, args);
-            const templatePath = path_1.default.resolve(__dirname, '../../templates/angular');
-            yield (0, common_1.transform)(templatePath, Object.assign(Object.assign({}, args), answers));
-            const response = {};
-            return response;
-        });
-    }
-}
-exports.default = AngularInitializer;

package/dist/initializers/angular/prompts.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.prompts = void 0;
-const common_1 = require("../../common");
-const defaultName = 'content-sdk-angular';
-exports.prompts = [
-    ...common_1.baseAppPrompts,
-    {
-        type: 'input',
-        name: 'appName',
-        message: 'What would you like to name your application?',
-        default: defaultName,
-        when: (answers) => {
-            if (answers.yes && !answers.appName) {
-                answers.appName = defaultName;
-            }
-            return !answers.appName;
-        },
-    },
-];

package/dist/templates/angular/.postcssrc.json

@@ -1,5 +0,0 @@
-{
-  "plugins": {
-    "@tailwindcss/postcss": {}
-  }
-}

package/dist/templates/angular/.vscode/extensions.json

@@ -1,4 +0,0 @@
-{
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=827846
-  "recommendations": ["angular.ng-template"]
-}

package/dist/templates/angular/README.md

@@ -1,3 +0,0 @@
-# Content SDK Angular sample
-
-This will be expanded

package/dist/templates/angular/angular.json

@@ -1,79 +0,0 @@
-{
-  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-  "version": 1,
-  "cli": {
-    "packageManager": "yarn"
-  },
-  "newProjectRoot": "projects",
-  "projects": {
-    "<%- appName %>": {
-      "projectType": "application",
-      "schematics": {},
-      "root": "",
-      "sourceRoot": "src",
-      "prefix": "app",
-      "architect": {
-        "build": {
-          "builder": "@angular/build:application",
-          "options": {
-            "browser": "src/main.ts",
-            "tsConfig": "tsconfig.json",
-            "assets": [
-              {
-                "glob": "**/*",
-                "input": "public"
-              }
-            ],
-            "styles": ["src/styles.css"],
-            "server": "src/main.server.ts",
-            "outputMode": "server",
-            "ssr": {
-              "entry": "src/server.ts"
-            }
-          },
-          "configurations": {
-            "production": {
-              "budgets": [
-                {
-                  "type": "initial",
-                  "maximumWarning": "500kB",
-                  "maximumError": "1MB"
-                },
-                {
-                  "type": "anyComponentStyle",
-                  "maximumWarning": "4kB",
-                  "maximumError": "8kB"
-                }
-              ],
-              "outputHashing": "all"
-            },
-            "development": {
-              "optimization": false,
-              "extractLicenses": false,
-              "sourceMap": true
-            }
-          },
-          "defaultConfiguration": "production"
-        },
-        "serve": {
-          "builder": "@angular/build:dev-server",
-          "options": {
-            "prebundle": false
-          },
-          "configurations": {
-            "production": {
-              "buildTarget": "<%- appName %>:build:production"
-            },
-            "development": {
-              "buildTarget": "<%- appName %>:build:development"
-            }
-          },
-          "defaultConfiguration": "development"
-        },
-        "test": {
-          "builder": "@angular/build:unit-test"
-        }
-      }
-    }
-  }
-}