create-content-sdk-app 1.4.0-canary.8 → 1.4.0-canary.9

package/dist/templates/nextjs/src/middleware.ts

@@ -1,4 +1,4 @@
-import { type NextRequest, type NextFetchEvent, NextResponse } from 'next/server';
+import { type NextRequest, type NextFetchEvent } from 'next/server';
 import {
   defineMiddleware,
   MultisiteMiddleware,
@@ -9,13 +9,8 @@ import sites from '.sitecore/sites.json';
 import scConfig from 'sitecore.config';
 
 export function middleware(req: NextRequest, ev: NextFetchEvent) {
-  // Skip middlewares only if neither Edge nor local API configuration is available.
-  // Middlewares can work with either Edge (contextId) or local (apiHost/apiKey) configuration.
-  if (!scConfig.api?.edge?.contextId && !scConfig.api?.local?.apiHost) {
-    return NextResponse.next();
-  }
-
   // Instantiate middlewares - they will use Edge config if available, otherwise fall back to local config
+  // Each middleware will skip processing if required API configuration is not available
   const multisite = new MultisiteMiddleware({
     /**
      * List of sites for site resolver to work with

package/dist/templates/nextjs-app-router/src/middleware.ts

@@ -10,75 +10,78 @@ import sites from '.sitecore/sites.json';
 import scConfig from 'sitecore.config';
 import { routing } from './i18n/routing';
 
-const locale = new LocaleMiddleware({
-  /**
-   * List of sites for site resolver to work with
-   */
-  sites,
-  /**
-   * List of all supported locales configured in routing.ts
-   */
-  locales: routing.locales.slice(),
-  // This function determines if the middleware should be turned off on per-request basis.
-  // Certain paths are ignored by default (e.g. files and Next.js API routes), but you may wish to disable more.
-  // This is an important performance consideration since Next.js Edge middleware runs on every request.
-  // in multilanguage scenarios, we need locale middleware to always run first to ensure locale is set and used correctly by the rest of the middlewares
-  skip: () => false,
-});
+export function middleware(req: NextRequest, ev: NextFetchEvent) {
+  // LocaleMiddleware and AppRouterMultisiteMiddleware must always run for App Router routing
+  const locale = new LocaleMiddleware({
+    /**
+     * List of sites for site resolver to work with
+     */
+    sites,
+    /**
+     * List of all supported locales configured in routing.ts
+     */
+    locales: routing.locales.slice(),
+    // This function determines if the middleware should be turned off on per-request basis.
+    // Certain paths are ignored by default (e.g. files and Next.js API routes), but you may wish to disable more.
+    // This is an important performance consideration since Next.js Edge middleware runs on every request.
+    // in multilanguage scenarios, we need locale middleware to always run first to ensure locale is set and used correctly by the rest of the middlewares
+    skip: () => false,
+  });
 
-const multisite = new AppRouterMultisiteMiddleware({
-  /**
-   * List of sites for site resolver to work with
-   */
-  sites,
-  ...scConfig.multisite,
-  // This function determines if the middleware should be turned off on per-request basis.
-  // Certain paths are ignored by default (e.g. files and Next.js API routes), but you may wish to disable more.
-  // This is an important performance consideration since Next.js Edge middleware runs on every request.
-  skip: () => false,
-});
+  const multisite = new AppRouterMultisiteMiddleware({
+    /**
+     * List of sites for site resolver to work with
+     */
+    sites,
+    ...scConfig.multisite,
+    // This function determines if the middleware should be turned off on per-request basis.
+    // Certain paths are ignored by default (e.g. files and Next.js API routes), but you may wish to disable more.
+    // This is an important performance consideration since Next.js Edge middleware runs on every request.
+    skip: () => false,
+  });
 
-const redirects = new RedirectsMiddleware({
-  /**
-   * List of sites for site resolver to work with
-   */
-  sites,
-  ...scConfig.api.edge,
-  ...scConfig.api.local,
-  ...scConfig.redirects,
-  // This function determines if the middleware should be turned off on per-request basis.
-  // Certain paths are ignored by default (e.g. Next.js API routes), but you may wish to disable more.
-  // By default it is disabled while in development mode.
-  // This is an important performance consideration since Next.js Edge middleware runs on every request.
-  skip: () => false,
-});
+  // Instantiate middlewares - they will use Edge config if available, otherwise fall back to local config
+  // Each middleware will skip processing if required API configuration is not available
+  const redirects = new RedirectsMiddleware({
+    /**
+     * List of sites for site resolver to work with
+     */
+    sites,
+    ...scConfig.api.edge,
+    ...scConfig.api.local,
+    ...scConfig.redirects,
+    // This function determines if the middleware should be turned off on per-request basis.
+    // Certain paths are ignored by default (e.g. Next.js API routes), but you may wish to disable more.
+    // By default it is disabled while in development mode.
+    // This is an important performance consideration since Next.js Edge middleware runs on every request.
+    skip: () => false,
+  });
 
-const personalize = new PersonalizeMiddleware({
-  /**
-   * List of sites for site resolver to work with
-   */
-  sites,
-  ...scConfig.api.edge,
-  ...scConfig.personalize,
-  // This function determines if the middleware should be turned off on per-request basis.
-  // Certain paths are ignored by default (e.g. Next.js API routes), but you may wish to disable more.
-  // By default it is disabled while in development mode.
-  // This is an important performance consideration since Next.js Edge middleware runs on every request.
-  // NOTE: Personalize requires Edge configuration and cannot work with local containers.
-  // The middleware will disable itself if Edge config is not present.
-  skip: () => false,
-  // This is an example of how to provide geo data for personalization.
-  // The provided callback will be called on each request to extract geo data.
-  // extractGeoDataCb: () => {
-  //   return {
-  //     city: 'Athens',
-  //     country: 'Greece',
-  //     region: 'Attica',
-  //   };
-  // },
-});
+  const personalize = new PersonalizeMiddleware({
+    /**
+     * List of sites for site resolver to work with
+     */
+    sites,
+    ...scConfig.api.edge,
+    ...scConfig.personalize,
+    // This function determines if the middleware should be turned off on per-request basis.
+    // Certain paths are ignored by default (e.g. Next.js API routes), but you may wish to disable more.
+    // By default it is disabled while in development mode.
+    // This is an important performance consideration since Next.js Edge middleware runs on every request.
+    // NOTE: Personalize requires Edge configuration and cannot work with local containers.
+    // The middleware will disable itself if Edge config is not present.
+    skip: () => false,
+    // This is an example of how to provide geo data for personalization.
+    // The provided callback will be called on each request to extract geo data.
+    // extractGeoDataCb: () => {
+    //   return {
+    //     city: 'Athens',
+    //     country: 'Greece',
+    //     region: 'Attica',
+    //   };
+    // },
+  });
 
-export function middleware(req: NextRequest, ev: NextFetchEvent) {
   return defineMiddleware(locale, multisite, redirects, personalize).exec(req, ev);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-content-sdk-app",
-  "version": "1.4.0-canary.8",
+  "version": "1.4.0-canary.9",
   "description": "Sitecore Content SDK initializer",
   "bin": "./dist/index.js",
   "scripts": {
@@ -70,5 +70,5 @@
     "ts-node": "^10.9.2",
     "typescript": "~5.8.3"
   },
-  "gitHead": "71c3b69b50eca88649a111bb93047b551dea3a22"
+  "gitHead": "d6d456ba7f417687b97043650089598078a8b5c1"
 }