@sitecore-jss/sitecore-jss-nextjs 22.2.0-canary.63 → 22.2.0-canary.67

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

@@ -65,6 +65,7 @@ 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;
                 }
                 const url = this.normalizeUrl(req.nextUrl.clone());
                 if (REGEXP_ABSOLUTE_URL.test(existsRedirect.target)) {
@@ -93,18 +94,20 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
                     }
                     const prepareNewURL = new URL(`${target[0]}${url.search}`, url.origin);
                     url.href = prepareNewURL.href;
+                    url.pathname = prepareNewURL.pathname;
+                    url.search = prepareNewURL.search;
+                    url.locale = req.nextUrl.locale;
                 }
-                const redirectUrl = decodeURIComponent(url.href);
                 /** return Response redirect with http code of redirect type **/
                 switch (existsRedirect.redirectType) {
                     case site_1.REDIRECT_TYPE_301: {
-                        return this.createRedirectResponse(redirectUrl, res, 301, 'Moved Permanently');
+                        return this.createRedirectResponse(url, res, 301, 'Moved Permanently');
                     }
                     case site_1.REDIRECT_TYPE_302: {
-                        return this.createRedirectResponse(redirectUrl, res, 302, 'Found');
+                        return this.createRedirectResponse(url, res, 302, 'Found');
                     }
                     case site_1.REDIRECT_TYPE_SERVER_TRANSFER: {
-                        return this.rewrite(redirectUrl, req, res || server_1.NextResponse.next());
+                        return this.rewrite(url.href, req, res || server_1.NextResponse.next());
                     }
                     default:
                         return res || server_1.NextResponse.next();
@@ -150,9 +153,7 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
     getExistsRedirect(req, siteName) {
         return __awaiter(this, void 0, void 0, function* () {
             const redirects = yield this.redirectsService.fetchRedirects(siteName);
-            const normalizedUrl = this.normalizeUrl(req.nextUrl.clone());
-            const tragetURL = normalizedUrl.pathname;
-            const targetQS = normalizedUrl.search || '';
+            const { pathname: targetURL, search: targetQS = '', locale } = this.normalizeUrl(req.nextUrl.clone());
             const language = this.getLanguage(req);
             const modifyRedirects = structuredClone(redirects);
             return modifyRedirects.length
@@ -192,20 +193,18 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
                      * string contributed to a successful redirect match.
                      */
                     const matchedQueryString = this.isPermutedQueryMatch({
-                        pathname: tragetURL,
+                        pathname: targetURL,
                         queryString: targetQS,
                         pattern: redirect.pattern,
-                        locale: req.nextUrl.locale,
+                        locale,
                     });
                     // Save the matched query string (if found) into the redirect object
                     redirect.matchedQueryString = matchedQueryString || '';
                     // Return the redirect if the URL path or any query string permutation matches the pattern
-                    return (((0, regex_parser_1.default)(redirect.pattern).test(tragetURL) ||
-                        (0, regex_parser_1.default)(redirect.pattern).test(`/${req.nextUrl.locale}${tragetURL}`) ||
+                    return (((0, regex_parser_1.default)(redirect.pattern).test(targetURL) ||
+                        (0, regex_parser_1.default)(redirect.pattern).test(`/${req.nextUrl.locale}${targetURL}`) ||
                         matchedQueryString) &&
-                        (redirect.locale
-                            ? redirect.locale.toLowerCase() === req.nextUrl.locale.toLowerCase()
-                            : true));
+                        (redirect.locale ? redirect.locale.toLowerCase() === locale.toLowerCase() : true));
                 })
                 : undefined;
         });
@@ -214,7 +213,7 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
      * When a user clicks on a link generated by the Link component from next/link,
      * Next.js adds special parameters in the route called path.
      * This method removes these special parameters.
-     * @param {URL} url
+     * @param {NextURL} url
      * @returns {string} normalize url
      */
     normalizeUrl(url) {
@@ -244,14 +243,15 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
             return false;
         })
             .join('&');
-        if (newQueryString) {
-            return new URL(`${url.pathname}?${newQueryString}`, url.origin);
-        }
-        return new URL(`${url.pathname}`, url.origin);
+        const newUrl = new URL(`${url.pathname}?${newQueryString}`, url.origin);
+        url.search = newUrl.search;
+        url.pathname = newUrl.pathname;
+        url.href = newUrl.href;
+        return url;
     }
     /**
      * Helper function to create a redirect response and remove the x-middleware-next header.
-     * @param {string} url The URL to redirect to.
+     * @param {NextURL} url The URL to redirect to.
      * @param {Response} res The response object.
      * @param {number} status The HTTP status code of the redirect.
      * @param {string} statusText The status text of the redirect.

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

@@ -59,6 +59,7 @@ 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;
                 }
                 const url = this.normalizeUrl(req.nextUrl.clone());
                 if (REGEXP_ABSOLUTE_URL.test(existsRedirect.target)) {
@@ -87,18 +88,20 @@ export class RedirectsMiddleware extends MiddlewareBase {
                     }
                     const prepareNewURL = new URL(`${target[0]}${url.search}`, url.origin);
                     url.href = prepareNewURL.href;
+                    url.pathname = prepareNewURL.pathname;
+                    url.search = prepareNewURL.search;
+                    url.locale = req.nextUrl.locale;
                 }
-                const redirectUrl = decodeURIComponent(url.href);
                 /** return Response redirect with http code of redirect type **/
                 switch (existsRedirect.redirectType) {
                     case REDIRECT_TYPE_301: {
-                        return this.createRedirectResponse(redirectUrl, res, 301, 'Moved Permanently');
+                        return this.createRedirectResponse(url, res, 301, 'Moved Permanently');
                     }
                     case REDIRECT_TYPE_302: {
-                        return this.createRedirectResponse(redirectUrl, res, 302, 'Found');
+                        return this.createRedirectResponse(url, res, 302, 'Found');
                     }
                     case REDIRECT_TYPE_SERVER_TRANSFER: {
-                        return this.rewrite(redirectUrl, req, res || NextResponse.next());
+                        return this.rewrite(url.href, req, res || NextResponse.next());
                     }
                     default:
                         return res || NextResponse.next();
@@ -144,9 +147,7 @@ export class RedirectsMiddleware extends MiddlewareBase {
     getExistsRedirect(req, siteName) {
         return __awaiter(this, void 0, void 0, function* () {
             const redirects = yield this.redirectsService.fetchRedirects(siteName);
-            const normalizedUrl = this.normalizeUrl(req.nextUrl.clone());
-            const tragetURL = normalizedUrl.pathname;
-            const targetQS = normalizedUrl.search || '';
+            const { pathname: targetURL, search: targetQS = '', locale } = this.normalizeUrl(req.nextUrl.clone());
             const language = this.getLanguage(req);
             const modifyRedirects = structuredClone(redirects);
             return modifyRedirects.length
@@ -186,20 +187,18 @@ export class RedirectsMiddleware extends MiddlewareBase {
                      * string contributed to a successful redirect match.
                      */
                     const matchedQueryString = this.isPermutedQueryMatch({
-                        pathname: tragetURL,
+                        pathname: targetURL,
                         queryString: targetQS,
                         pattern: redirect.pattern,
-                        locale: req.nextUrl.locale,
+                        locale,
                     });
                     // Save the matched query string (if found) into the redirect object
                     redirect.matchedQueryString = matchedQueryString || '';
                     // Return the redirect if the URL path or any query string permutation matches the pattern
-                    return ((regexParser(redirect.pattern).test(tragetURL) ||
-                        regexParser(redirect.pattern).test(`/${req.nextUrl.locale}${tragetURL}`) ||
+                    return ((regexParser(redirect.pattern).test(targetURL) ||
+                        regexParser(redirect.pattern).test(`/${req.nextUrl.locale}${targetURL}`) ||
                         matchedQueryString) &&
-                        (redirect.locale
-                            ? redirect.locale.toLowerCase() === req.nextUrl.locale.toLowerCase()
-                            : true));
+                        (redirect.locale ? redirect.locale.toLowerCase() === locale.toLowerCase() : true));
                 })
                 : undefined;
         });
@@ -208,7 +207,7 @@ export class RedirectsMiddleware extends MiddlewareBase {
      * When a user clicks on a link generated by the Link component from next/link,
      * Next.js adds special parameters in the route called path.
      * This method removes these special parameters.
-     * @param {URL} url
+     * @param {NextURL} url
      * @returns {string} normalize url
      */
     normalizeUrl(url) {
@@ -238,14 +237,15 @@ export class RedirectsMiddleware extends MiddlewareBase {
             return false;
         })
             .join('&');
-        if (newQueryString) {
-            return new URL(`${url.pathname}?${newQueryString}`, url.origin);
-        }
-        return new URL(`${url.pathname}`, url.origin);
+        const newUrl = new URL(`${url.pathname}?${newQueryString}`, url.origin);
+        url.search = newUrl.search;
+        url.pathname = newUrl.pathname;
+        url.href = newUrl.href;
+        return url;
     }
     /**
      * Helper function to create a redirect response and remove the x-middleware-next header.
-     * @param {string} url The URL to redirect to.
+     * @param {NextURL} url The URL to redirect to.
      * @param {Response} res The response object.
      * @param {number} status The HTTP status code of the redirect.
      * @param {string} statusText The status text of the redirect.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-nextjs",
-  "version": "22.2.0-canary.63",
+  "version": "22.2.0-canary.67",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -72,9 +72,9 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^22.2.0-canary.63",
-    "@sitecore-jss/sitecore-jss-dev-tools": "^22.2.0-canary.63",
-    "@sitecore-jss/sitecore-jss-react": "^22.2.0-canary.63",
+    "@sitecore-jss/sitecore-jss": "^22.2.0-canary.67",
+    "@sitecore-jss/sitecore-jss-dev-tools": "^22.2.0-canary.67",
+    "@sitecore-jss/sitecore-jss-react": "^22.2.0-canary.67",
     "@vercel/kv": "^0.2.1",
     "prop-types": "^15.8.1",
     "regex-parser": "^2.2.11",
@@ -82,7 +82,7 @@
   },
   "description": "",
   "types": "types/index.d.ts",
-  "gitHead": "320dcbeb8398d1a7854fd93244f73fc6b9ee8f66",
+  "gitHead": "8773ee414183e87677989c98398ebf4199e493cc",
   "files": [
     "dist",
     "types",

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

@@ -41,13 +41,13 @@ export declare class RedirectsMiddleware extends MiddlewareBase {
      * When a user clicks on a link generated by the Link component from next/link,
      * Next.js adds special parameters in the route called path.
      * This method removes these special parameters.
-     * @param {URL} url
+     * @param {NextURL} url
      * @returns {string} normalize url
      */
     private normalizeUrl;
     /**
      * Helper function to create a redirect response and remove the x-middleware-next header.
-     * @param {string} url The URL to redirect to.
+     * @param {NextURL} url The URL to redirect to.
      * @param {Response} res The response object.
      * @param {number} status The HTTP status code of the redirect.
      * @param {string} statusText The status text of the redirect.