@sitecore-content-sdk/nextjs 2.1.0-canary.7 → 2.1.0-canary.9

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

@@ -65,7 +65,7 @@ class RedirectsProxy extends proxy_1.ProxyBase {
                 }
                 site = this.getSite(req, res);
                 // Find the redirect from result of RedirectService
-                const existsRedirect = await this.getExistsRedirect(req, site.name);
+                const existsRedirect = await this.getExistsRedirect(req, site.name, language);
                 if (!existsRedirect) {
                     debug_1.default.redirects('skipped (redirect does not exist)');
                     return res;
@@ -202,15 +202,14 @@ class RedirectsProxy extends proxy_1.ProxyBase {
      * @returns Promise<RedirectInfo | undefined>
      * @private
      */
-    async getExistsRedirect(req, siteName) {
+    async getExistsRedirect(req, siteName, requestLocale) {
         if (!this.redirectsService) {
             return undefined;
         }
         const { pathname: incomingURL, search: incomingQS = '' } = this.normalizeUrl(req.nextUrl.clone());
         const normalizedPath = incomingURL.replace(/\/*$/gi, '').toLowerCase();
         const redirects = await this.redirectsService.fetchRedirects(siteName);
-        // locale of current request (from URL, headers or otherwise), used to match versioned redirect rules
-        const requestLocale = this.getLanguage(req);
+        // using locale of current request (from URL, headers or otherwise), used to match versioned redirect rules
         const matchedLocaleRedirect = this.matchRedirectItemRedirect(redirects, requestLocale, normalizedPath);
         if (matchedLocaleRedirect) {
             return matchedLocaleRedirect;
@@ -284,16 +283,17 @@ class RedirectsProxy extends proxy_1.ProxyBase {
      * Processes redirect rules from redirect items (language-versioned)
      * @param {RedirectResult[]} redirects redirect entries from Edge
      * @param {string} locale current request locale
-     * @param {string} currentPath current request path (without locale)
+     * @param {string} currentPath current request path
      * @returns {RedirectResult | undefined} matched redirect item redirect result or undefined
      * @private
      */
     matchRedirectItemRedirect(redirects, locale, currentPath) {
+        const nonLocalePath = currentPath.replace(new RegExp(`^\/?${locale}\/`, 'i'), '/');
         return redirects.length
             ? redirects.find((redirect) => {
                 const patternPath = redirect.pattern.replace(/\/*$/g, '').toLowerCase();
                 // locale rules are easy and nice
-                return redirect.locale === locale && patternPath === currentPath;
+                return redirect.locale === locale && patternPath === nonLocalePath;
             })
             : undefined;
     }

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

@@ -59,7 +59,7 @@ export class RedirectsProxy extends ProxyBase {
                 }
                 site = this.getSite(req, res);
                 // Find the redirect from result of RedirectService
-                const existsRedirect = await this.getExistsRedirect(req, site.name);
+                const existsRedirect = await this.getExistsRedirect(req, site.name, language);
                 if (!existsRedirect) {
                     debug.redirects('skipped (redirect does not exist)');
                     return res;
@@ -196,15 +196,14 @@ export class RedirectsProxy extends ProxyBase {
      * @returns Promise<RedirectInfo | undefined>
      * @private
      */
-    async getExistsRedirect(req, siteName) {
+    async getExistsRedirect(req, siteName, requestLocale) {
         if (!this.redirectsService) {
             return undefined;
         }
         const { pathname: incomingURL, search: incomingQS = '' } = this.normalizeUrl(req.nextUrl.clone());
         const normalizedPath = incomingURL.replace(/\/*$/gi, '').toLowerCase();
         const redirects = await this.redirectsService.fetchRedirects(siteName);
-        // locale of current request (from URL, headers or otherwise), used to match versioned redirect rules
-        const requestLocale = this.getLanguage(req);
+        // using locale of current request (from URL, headers or otherwise), used to match versioned redirect rules
         const matchedLocaleRedirect = this.matchRedirectItemRedirect(redirects, requestLocale, normalizedPath);
         if (matchedLocaleRedirect) {
             return matchedLocaleRedirect;
@@ -278,16 +277,17 @@ export class RedirectsProxy extends ProxyBase {
      * Processes redirect rules from redirect items (language-versioned)
      * @param {RedirectResult[]} redirects redirect entries from Edge
      * @param {string} locale current request locale
-     * @param {string} currentPath current request path (without locale)
+     * @param {string} currentPath current request path
      * @returns {RedirectResult | undefined} matched redirect item redirect result or undefined
      * @private
      */
     matchRedirectItemRedirect(redirects, locale, currentPath) {
+        const nonLocalePath = currentPath.replace(new RegExp(`^\/?${locale}\/`, 'i'), '/');
         return redirects.length
             ? redirects.find((redirect) => {
                 const patternPath = redirect.pattern.replace(/\/*$/g, '').toLowerCase();
                 // locale rules are easy and nice
-                return redirect.locale === locale && patternPath === currentPath;
+                return redirect.locale === locale && patternPath === nonLocalePath;
             })
             : undefined;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-content-sdk/nextjs",
-  "version": "2.1.0-canary.7",
+  "version": "2.1.0-canary.9",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -32,8 +32,8 @@
     "url": "https://github.com/sitecore/content-sdk/issues"
   },
   "devDependencies": {
-    "@sitecore-content-sdk/analytics-core": "2.1.0-canary.7",
-    "@sitecore-content-sdk/personalize": "2.1.0-canary.7",
+    "@sitecore-content-sdk/analytics-core": "2.1.0-canary.9",
+    "@sitecore-content-sdk/personalize": "2.1.0-canary.9",
     "@stylistic/eslint-plugin": "^5.2.2",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/react": "^16.3.0",
@@ -91,10 +91,10 @@
   },
   "dependencies": {
     "@babel/parser": "^7.27.2",
-    "@sitecore-content-sdk/content": "2.1.0-canary.7",
-    "@sitecore-content-sdk/core": "2.1.0-canary.7",
-    "@sitecore-content-sdk/events": "2.1.0-canary.7",
-    "@sitecore-content-sdk/react": "2.1.0-canary.7",
+    "@sitecore-content-sdk/content": "2.1.0-canary.9",
+    "@sitecore-content-sdk/core": "2.1.0-canary.9",
+    "@sitecore-content-sdk/events": "2.1.0-canary.9",
+    "@sitecore-content-sdk/react": "2.1.0-canary.9",
     "recast": "^0.23.11",
     "regex-parser": "^2.3.1",
     "sync-disk-cache": "^2.1.0"
@@ -178,7 +178,7 @@
   },
   "description": "",
   "types": "types/index.d.ts",
-  "gitHead": "bb6498faad659ee6966f24e67d9068e8dc5e94bc",
+  "gitHead": "a4c0a74b11b414ca47e054ae302756a25547b4e0",
   "files": [
     "dist",
     "types",

package/types/proxy/redirects-proxy.d.ts

@@ -35,7 +35,7 @@ export declare class RedirectsProxy extends ProxyBase {
      * @returns Promise<RedirectInfo | undefined>
      * @private
      */
-    protected getExistsRedirect(req: NextRequest, siteName: string): Promise<RedirectResult | undefined>;
+    protected getExistsRedirect(req: NextRequest, siteName: string, requestLocale: string): Promise<RedirectResult | undefined>;
     /**
      * Matches redirect-map rules without a `locale` field against the incoming URL (static or regex patterns).
      * @param {RedirectResult[]} redirects All redirects from the service (non-locale entries are filtered inside).
@@ -50,7 +50,7 @@ export declare class RedirectsProxy extends ProxyBase {
      * Processes redirect rules from redirect items (language-versioned)
      * @param {RedirectResult[]} redirects redirect entries from Edge
      * @param {string} locale current request locale
-     * @param {string} currentPath current request path (without locale)
+     * @param {string} currentPath current request path
      * @returns {RedirectResult | undefined} matched redirect item redirect result or undefined
      * @private
      */

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

@@ -1 +1 @@
-{"version":3,"file":"redirects-proxy.d.ts","sourceRoot":"","sources":["../../src/proxy/redirects-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EAItB,YAAY,EAEb,MAAM,oCAAoC,CAAC;AAO5C,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAExD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAuB,MAAM,SAAS,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAM3C,KAAK,cAAc,GAAG,YAAY,GAAG;IAAE,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAErE;;;GAGG;AACH,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,sBAAsB,EAAE,OAAO,GAAG,eAAe,CAAC,GACxF,cAAc,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,GAC7B,OAAO,CAAC,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GACpD,eAAe,GACf,cAAc,CAAC,WAAW,CAAC,GAAG;IAC5B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,CAAC;AACJ;;;;GAIG;AACH,qBAAa,cAAe,SAAQ,SAAS;IAO/B,SAAS,CAAC,MAAM,EAAE,oBAAoB;IANlD,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACpD,OAAO,CAAC,OAAO,CAAW;IAE1B;;OAEG;gBACmB,MAAM,EAAE,oBAAoB;IAmDlD,MAAM,GAAU,KAAK,WAAW,EAAE,KAAK,YAAY,KAAG,OAAO,CAAC,YAAY,CAAC,CA4KzE;IAEF,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,YAAY,GAAG,OAAO,GAAG,SAAS;IAU5E;;;;;;OAMG;cACa,iBAAiB,CAC/B,GAAG,EAAE,WAAW,EAChB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IA2BtC;;;;;;;;OAQG;IACH,SAAS,CAAC,4BAA4B,CACpC,SAAS,EAAE,cAAc,EAAE,EAC3B,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,GACjB,cAAc,GAAG,SAAS;IAsE7B;;;;;;;OAOG;IACH,SAAS,CAAC,yBAAyB,CACjC,SAAS,EAAE,cAAc,EAAE,EAC3B,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,GAClB,cAAc,GAAG,SAAS;IAU7B;;;;;;OAMG;IACH,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO;IA6C7C;;;;;;;;;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;IAkDf;;;;;;;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;CAehB"}
+{"version":3,"file":"redirects-proxy.d.ts","sourceRoot":"","sources":["../../src/proxy/redirects-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EAItB,YAAY,EAEb,MAAM,oCAAoC,CAAC;AAO5C,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAExD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAuB,MAAM,SAAS,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAM3C,KAAK,cAAc,GAAG,YAAY,GAAG;IAAE,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAErE;;;GAGG;AACH,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,sBAAsB,EAAE,OAAO,GAAG,eAAe,CAAC,GACxF,cAAc,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,GAC7B,OAAO,CAAC,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GACpD,eAAe,GACf,cAAc,CAAC,WAAW,CAAC,GAAG;IAC5B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,CAAC;AACJ;;;;GAIG;AACH,qBAAa,cAAe,SAAQ,SAAS;IAO/B,SAAS,CAAC,MAAM,EAAE,oBAAoB;IANlD,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACpD,OAAO,CAAC,OAAO,CAAW;IAE1B;;OAEG;gBACmB,MAAM,EAAE,oBAAoB;IAmDlD,MAAM,GAAU,KAAK,WAAW,EAAE,KAAK,YAAY,KAAG,OAAO,CAAC,YAAY,CAAC,CA4KzE;IAEF,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,YAAY,GAAG,OAAO,GAAG,SAAS;IAU5E;;;;;;OAMG;cACa,iBAAiB,CAC/B,GAAG,EAAE,WAAW,EAChB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IA0BtC;;;;;;;;OAQG;IACH,SAAS,CAAC,4BAA4B,CACpC,SAAS,EAAE,cAAc,EAAE,EAC3B,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,GACjB,cAAc,GAAG,SAAS;IAsE7B;;;;;;;OAOG;IACH,SAAS,CAAC,yBAAyB,CACjC,SAAS,EAAE,cAAc,EAAE,EAC3B,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,GAClB,cAAc,GAAG,SAAS;IAW7B;;;;;;OAMG;IACH,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO;IA6C7C;;;;;;;;;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;IAkDf;;;;;;;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;CAehB"}