@sitecore-content-sdk/nextjs 1.3.0-canary.21 → 1.3.0-canary.23

package/dist/cjs/middleware/redirects-middleware.js

@@ -54,6 +54,7 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
                     core_1.debug.redirects('skipped (redirects middleware is disabled)');
                     return res;
                 }
+                const isAppRouterRequest = this.isAppRouter(res);
                 const createResponse = () => __awaiter(this, void 0, void 0, function* () {
                     var _a;
                     if (this.isPreview(req)) {
@@ -81,7 +82,9 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
                         !(REGEXP_ABSOLUTE_URL.test(existsRedirect.target) &&
                             existsRedirect.target.includes(hostname))) {
                         existsRedirect.target = existsRedirect.target.replace(REGEXP_CONTEXT_SITE_LANG, site.language);
-                        req.nextUrl.locale = site.language;
+                        if (!isAppRouterRequest) {
+                            req.nextUrl.locale = site.language;
+                        }
                     }
                     const url = this.normalizeUrl(req.nextUrl.clone());
                     // Redirect logic for external (absolute) URLS. To avoid locale stripping: use plain string for external URLs to prevent Next.js rewriting.
@@ -105,7 +108,9 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
                         const targetParts = existsRedirect.target.split('/');
                         const urlFirstPart = targetParts[1];
                         if (this.locales.includes(urlFirstPart)) {
-                            req.nextUrl.locale = urlFirstPart;
+                            if (!isAppRouterRequest) {
+                                req.nextUrl.locale = urlFirstPart;
+                            }
                             existsRedirect.target = existsRedirect.target.replace(`/${urlFirstPart}`, '');
                         }
                         const targetSegments = isUrl
@@ -124,7 +129,9 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
                         url.href = prepareNewURL.href;
                         url.pathname = prepareNewURL.pathname;
                         url.search = prepareNewURL.search;
-                        url.locale = req.nextUrl.locale;
+                        if (!isAppRouterRequest) {
+                            url.locale = req.nextUrl.locale;
+                        }
                     }
                     /** return Response redirect with http code of redirect type */
                     return this.dispatchRedirect(url, existsRedirect.redirectType, req, res, false);

package/dist/cjs/route-handler/editing-config-route-handler.js

@@ -23,7 +23,7 @@ const utils_2 = require("../utils/utils");
  * @public
  */
 const createEditingConfigRouteHandler = (options) => {
-    const { components, metadata } = options;
+    const { components, metadata, clientComponents } = options;
     const validateRequest = (req) => {
         const secret = req.nextUrl.searchParams.get(editing_1.QUERY_PARAM_EDITING_SECRET);
         const corsHeaders = (0, utils_1.getEnforcedCorsHeaders)({
@@ -56,8 +56,11 @@ const createEditingConfigRouteHandler = (options) => {
                 });
             }
             const componentNames = Array.from(components.keys());
+            const clientComponentNames = clientComponents ? Array.from(clientComponents.keys()) : [];
             const responseData = {
+                framework: 'nextjs-approuter',
                 components: componentNames,
+                clientComponents: clientComponentNames,
                 packages: metadata.packages,
                 editMode: layout_1.EditMode.Metadata,
             };

package/dist/esm/middleware/redirects-middleware.js

@@ -48,6 +48,7 @@ export class RedirectsMiddleware extends MiddlewareBase {
                     debug.redirects('skipped (redirects middleware is disabled)');
                     return res;
                 }
+                const isAppRouterRequest = this.isAppRouter(res);
                 const createResponse = () => __awaiter(this, void 0, void 0, function* () {
                     var _a;
                     if (this.isPreview(req)) {
@@ -75,7 +76,9 @@ export class RedirectsMiddleware extends MiddlewareBase {
                         !(REGEXP_ABSOLUTE_URL.test(existsRedirect.target) &&
                             existsRedirect.target.includes(hostname))) {
                         existsRedirect.target = existsRedirect.target.replace(REGEXP_CONTEXT_SITE_LANG, site.language);
-                        req.nextUrl.locale = site.language;
+                        if (!isAppRouterRequest) {
+                            req.nextUrl.locale = site.language;
+                        }
                     }
                     const url = this.normalizeUrl(req.nextUrl.clone());
                     // Redirect logic for external (absolute) URLS. To avoid locale stripping: use plain string for external URLs to prevent Next.js rewriting.
@@ -99,7 +102,9 @@ export class RedirectsMiddleware extends MiddlewareBase {
                         const targetParts = existsRedirect.target.split('/');
                         const urlFirstPart = targetParts[1];
                         if (this.locales.includes(urlFirstPart)) {
-                            req.nextUrl.locale = urlFirstPart;
+                            if (!isAppRouterRequest) {
+                                req.nextUrl.locale = urlFirstPart;
+                            }
                             existsRedirect.target = existsRedirect.target.replace(`/${urlFirstPart}`, '');
                         }
                         const targetSegments = isUrl
@@ -118,7 +123,9 @@ export class RedirectsMiddleware extends MiddlewareBase {
                         url.href = prepareNewURL.href;
                         url.pathname = prepareNewURL.pathname;
                         url.search = prepareNewURL.search;
-                        url.locale = req.nextUrl.locale;
+                        if (!isAppRouterRequest) {
+                            url.locale = req.nextUrl.locale;
+                        }
                     }
                     /** return Response redirect with http code of redirect type */
                     return this.dispatchRedirect(url, existsRedirect.redirectType, req, res, false);

package/dist/esm/route-handler/editing-config-route-handler.js

@@ -20,7 +20,7 @@ import { getEditingSecret } from '../utils/utils';
  * @public
  */
 export const createEditingConfigRouteHandler = (options) => {
-    const { components, metadata } = options;
+    const { components, metadata, clientComponents } = options;
     const validateRequest = (req) => {
         const secret = req.nextUrl.searchParams.get(QUERY_PARAM_EDITING_SECRET);
         const corsHeaders = getEnforcedCorsHeaders({
@@ -53,8 +53,11 @@ export const createEditingConfigRouteHandler = (options) => {
                 });
             }
             const componentNames = Array.from(components.keys());
+            const clientComponentNames = clientComponents ? Array.from(clientComponents.keys()) : [];
             const responseData = {
+                framework: 'nextjs-approuter',
                 components: componentNames,
+                clientComponents: clientComponentNames,
                 packages: metadata.packages,
                 editMode: EditMode.Metadata,
             };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-content-sdk/nextjs",
-  "version": "1.3.0-canary.21",
+  "version": "1.3.0-canary.23",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -91,15 +91,15 @@
   },
   "dependencies": {
     "@babel/parser": "^7.27.2",
-    "@sitecore-content-sdk/core": "1.3.0-canary.21",
-    "@sitecore-content-sdk/react": "1.3.0-canary.21",
+    "@sitecore-content-sdk/core": "1.3.0-canary.23",
+    "@sitecore-content-sdk/react": "1.3.0-canary.23",
     "recast": "^0.23.11",
     "regex-parser": "^2.3.1",
     "sync-disk-cache": "^2.1.0"
   },
   "description": "",
   "types": "types/index.d.ts",
-  "gitHead": "05b609278f4583775665257f6398c175e04ecd15",
+  "gitHead": "cc2c3a40c84e6072add7f3ddbf75ccf862a037a5",
   "files": [
     "dist",
     "types",

package/types/middleware/redirects-middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"redirects-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/redirects-middleware.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EAItB,YAAY,EAEb,MAAM,iCAAiC,CAAC;AAOzC,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAExD,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAuB,MAAM,cAAc,CAAC;AACzF,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAK3C,KAAK,cAAc,GAAG,YAAY,GAAG;IAAE,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAErE;;;GAGG;AACH,MAAM,MAAM,yBAAyB,GAAG,IAAI,CAAC,sBAAsB,EAAE,OAAO,GAAG,eAAe,CAAC,GAC7F,cAAc,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,GAC7B,oBAAoB,GACpB,cAAc,CAAC,WAAW,CAAC,GAAG;IAC5B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,CAAC;AACJ;;;;GAIG;AACH,qBAAa,mBAAoB,SAAQ,cAAc;IAOzC,SAAS,CAAC,MAAM,EAAE,yBAAyB;IANvD,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC7C,OAAO,CAAC,OAAO,CAAW;IAE1B;;OAEG;gBACmB,MAAM,EAAE,yBAAyB;IAuBvD,MAAM,GAAU,KAAK,WAAW,EAAE,KAAK,YAAY,KAAG,OAAO,CAAC,YAAY,CAAC,CAmJzE;IAEF;;;;;;OAMG;cACa,iBAAiB,CAC/B,GAAG,EAAE,WAAW,EAChB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IA2EtC;;;;;;OAMG;IACH,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO;IAuC7C;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CACxB,MAAM,EAAE,OAAO,GAAG,MAAM,EACxB,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,WAAW,EAChB,GAAG,EAAE,YAAY,EACjB,UAAU,UAAQ,GACjB,YAAY;IAmBf;;;;;;;OAOG;IACH,SAAS,CAAC,sBAAsB,CAC9B,GAAG,EAAE,OAAO,GAAG,MAAM,EACrB,GAAG,EAAE,QAAQ,GAAG,SAAS,EACzB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,GACjB,YAAY;CAahB"}
+{"version":3,"file":"redirects-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/redirects-middleware.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EAItB,YAAY,EAEb,MAAM,iCAAiC,CAAC;AAOzC,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAExD,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAuB,MAAM,cAAc,CAAC;AACzF,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAK3C,KAAK,cAAc,GAAG,YAAY,GAAG;IAAE,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAErE;;;GAGG;AACH,MAAM,MAAM,yBAAyB,GAAG,IAAI,CAAC,sBAAsB,EAAE,OAAO,GAAG,eAAe,CAAC,GAC7F,cAAc,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,GAC7B,oBAAoB,GACpB,cAAc,CAAC,WAAW,CAAC,GAAG;IAC5B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,CAAC;AACJ;;;;GAIG;AACH,qBAAa,mBAAoB,SAAQ,cAAc;IAOzC,SAAS,CAAC,MAAM,EAAE,yBAAyB;IANvD,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC7C,OAAO,CAAC,OAAO,CAAW;IAE1B;;OAEG;gBACmB,MAAM,EAAE,yBAAyB;IAuBvD,MAAM,GAAU,KAAK,WAAW,EAAE,KAAK,YAAY,KAAG,OAAO,CAAC,YAAY,CAAC,CA2JzE;IAEF;;;;;;OAMG;cACa,iBAAiB,CAC/B,GAAG,EAAE,WAAW,EAChB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IA2EtC;;;;;;OAMG;IACH,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO;IAuC7C;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CACxB,MAAM,EAAE,OAAO,GAAG,MAAM,EACxB,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,WAAW,EAChB,GAAG,EAAE,YAAY,EACjB,UAAU,UAAQ,GACjB,YAAY;IAmBf;;;;;;;OAOG;IACH,SAAS,CAAC,sBAAsB,CAC9B,GAAG,EAAE,OAAO,GAAG,MAAM,EACrB,GAAG,EAAE,QAAQ,GAAG,SAAS,EACzB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,GACjB,YAAY;CAahB"}

package/types/route-handler/editing-config-route-handler.d.ts

@@ -11,6 +11,10 @@ export type EditingConfigRouteHandlerOptions = {
      * Application metadata
      */
     metadata: Metadata;
+    /**
+     * Contains only client and universal components that can be used in client bundles
+     */
+    clientComponents?: ComponentMap<NextjsContentSdkComponent>;
 };
 /**
  * Creates a route handler for the editing config API route (e.g. '/api/editing/config')

package/types/route-handler/editing-config-route-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editing-config-route-handler.d.ts","sourceRoot":"","sources":["../../src/route-handler/editing-config-route-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAM1C,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAI9D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAE3E,MAAM,MAAM,gCAAgC,GAAG;IAC7C;;OAEG;IACH,UAAU,EAAE,YAAY,CAAC,yBAAyB,CAAC,CAAC;IACpD;;OAEG;IACH,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,+BAA+B,GAAI,SAAS,gCAAgC;eAe/D,WAAW;mBA+DP,WAAW;CAkCxC,CAAC"}
+{"version":3,"file":"editing-config-route-handler.d.ts","sourceRoot":"","sources":["../../src/route-handler/editing-config-route-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAM1C,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAI9D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAE3E,MAAM,MAAM,gCAAgC,GAAG;IAC7C;;OAEG;IACH,UAAU,EAAE,YAAY,CAAC,yBAAyB,CAAC,CAAC;IACpD;;OAEG;IACH,QAAQ,EAAE,QAAQ,CAAC;IACnB;;OAEG;IACH,gBAAgB,CAAC,EAAE,YAAY,CAAC,yBAAyB,CAAC,CAAC;CAC5D,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,+BAA+B,GAAI,SAAS,gCAAgC;eAe/D,WAAW;mBAkEP,WAAW;CAkCxC,CAAC"}