@sitecore-jss/sitecore-jss-nextjs 22.2.0-canary.2 → 22.2.0-canary.20

package/dist/cjs/editing/constants.js

@@ -12,4 +12,4 @@ exports.EDITING_PASS_THROUGH_HEADERS = ['authorization', 'cookie'];
 /**
  * Default allowed origins for editing requests. This is used to enforce CORS, CSP headers.
  */
-exports.EDITING_ALLOWED_ORIGINS = ['https://pages*.cloud', 'https://pages.sitecorecloud.io'];
+exports.EDITING_ALLOWED_ORIGINS = ['https://pages.sitecorecloud.io'];

package/dist/cjs/editing/editing-render-middleware.js

@@ -224,7 +224,6 @@ class MetadataHandler {
         }, 
         // Cache the preview data for 3 seconds to ensure the page is rendered with the correct preview data not the cached one
         {
-            path: query.route,
             maxAge: 3,
         });
         // Cookies with the SameSite=Lax policy set by Next.js setPreviewData function causes CORS issue

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

@@ -69,8 +69,7 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
                     url.href = existsRedirect.target;
                 }
                 else {
-                    const source = `${url.pathname}${url.search}`;
-                    url.search = existsRedirect.isQueryStringPreserved ? url.search : '';
+                    const source = this.normalizeUrl(url.pathname, url.search);
                     const urlFirstPart = existsRedirect.target.split('/')[1];
                     if (this.locales.includes(urlFirstPart)) {
                         url.locale = urlFirstPart;
@@ -80,31 +79,23 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
                         .replace((0, regex_parser_1.default)(existsRedirect.pattern), existsRedirect.target)
                         .replace(/^\/\//, '/')
                         .split('?');
-                    url.pathname = target[0];
+                    url.pathname = `${target[0]}`;
                     if (target[1]) {
-                        const newParams = new URLSearchParams(target[1]);
-                        for (const [key, val] of newParams.entries()) {
-                            url.searchParams.append(key, val);
-                        }
+                        url.search = `?${target[1]}`;
                     }
+                    const newURL = new URL(`${url.pathname}${existsRedirect.isQueryStringPreserved ? url.search : ''}`, url.origin);
+                    url.href = newURL.href;
                 }
                 const redirectUrl = decodeURIComponent(url.href);
                 /** return Response redirect with http code of redirect type **/
                 switch (existsRedirect.redirectType) {
                     case site_1.REDIRECT_TYPE_301:
-                        return server_1.NextResponse.redirect(redirectUrl, {
-                            status: 301,
-                            statusText: 'Moved Permanently',
-                            headers: res === null || res === void 0 ? void 0 : res.headers,
-                        });
+                        return server_1.NextResponse.redirect(redirectUrl, Object.assign(Object.assign({}, res), { status: 301, statusText: 'Moved Permanently', headers: res === null || res === void 0 ? void 0 : res.headers }));
                     case site_1.REDIRECT_TYPE_302:
-                        return server_1.NextResponse.redirect(redirectUrl, {
-                            status: 302,
-                            statusText: 'Found',
-                            headers: res === null || res === void 0 ? void 0 : res.headers,
-                        });
-                    case site_1.REDIRECT_TYPE_SERVER_TRANSFER:
-                        return server_1.NextResponse.rewrite(redirectUrl, res);
+                        return server_1.NextResponse.redirect(redirectUrl, Object.assign(Object.assign({}, res), { status: 302, statusText: 'Found', headers: res === null || res === void 0 ? void 0 : res.headers }));
+                    case site_1.REDIRECT_TYPE_SERVER_TRANSFER: {
+                        return this.rewrite(redirectUrl, req, res || server_1.NextResponse.next());
+                    }
                     default:
                         return res || server_1.NextResponse.next();
                 }
@@ -149,8 +140,9 @@ 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 tragetURL = req.nextUrl.pathname;
-            const targetQS = req.nextUrl.search || '';
+            const normalizedUrl = new URL(this.normalizeUrl(req.nextUrl.pathname, req.nextUrl.search || ''), req.nextUrl.href);
+            const tragetURL = normalizedUrl.pathname;
+            const targetQS = normalizedUrl.search || '';
             const language = this.getLanguage(req);
             const modifyRedirects = structuredClone(redirects);
             return modifyRedirects.length
@@ -173,5 +165,45 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
                 : undefined;
         });
     }
+    /**
+     * 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 {string} pathname
+     * @param {string} queryString
+     * @returns {string} modified url
+     */
+    normalizeUrl(pathname, queryString) {
+        if (!queryString) {
+            return pathname;
+        }
+        /**
+         * Prepare special parameters for exclusion.
+         */
+        const splittedPathname = pathname
+            .split('/')
+            .filter((route) => route)
+            .map((route) => `path=${route}`);
+        /**
+         * Remove special parameters(Next.JS)
+         * Example: /about/contact/us
+         * When a user clicks on this link, Next.js should generate a link for the middleware, formatted like this:
+         * http://host/about/contact/us?path=about&path=contact&path=us
+         */
+        const newQueryString = queryString
+            .replace(/^\?/, '')
+            .split('&')
+            .filter((param) => {
+            if (!splittedPathname.includes(param)) {
+                return param;
+            }
+            return false;
+        })
+            .join('&');
+        if (newQueryString) {
+            return `${pathname}?${newQueryString}`;
+        }
+        return pathname;
+    }
 }
 exports.RedirectsMiddleware = RedirectsMiddleware;

package/dist/esm/editing/constants.js

@@ -9,4 +9,4 @@ export const EDITING_PASS_THROUGH_HEADERS = ['authorization', 'cookie'];
 /**
  * Default allowed origins for editing requests. This is used to enforce CORS, CSP headers.
  */
-export const EDITING_ALLOWED_ORIGINS = ['https://pages*.cloud', 'https://pages.sitecorecloud.io'];
+export const EDITING_ALLOWED_ORIGINS = ['https://pages.sitecorecloud.io'];

package/dist/esm/editing/editing-render-middleware.js

@@ -219,7 +219,6 @@ export class MetadataHandler {
         }, 
         // Cache the preview data for 3 seconds to ensure the page is rendered with the correct preview data not the cached one
         {
-            path: query.route,
             maxAge: 3,
         });
         // Cookies with the SameSite=Lax policy set by Next.js setPreviewData function causes CORS issue

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

@@ -63,8 +63,7 @@ export class RedirectsMiddleware extends MiddlewareBase {
                     url.href = existsRedirect.target;
                 }
                 else {
-                    const source = `${url.pathname}${url.search}`;
-                    url.search = existsRedirect.isQueryStringPreserved ? url.search : '';
+                    const source = this.normalizeUrl(url.pathname, url.search);
                     const urlFirstPart = existsRedirect.target.split('/')[1];
                     if (this.locales.includes(urlFirstPart)) {
                         url.locale = urlFirstPart;
@@ -74,31 +73,23 @@ export class RedirectsMiddleware extends MiddlewareBase {
                         .replace(regexParser(existsRedirect.pattern), existsRedirect.target)
                         .replace(/^\/\//, '/')
                         .split('?');
-                    url.pathname = target[0];
+                    url.pathname = `${target[0]}`;
                     if (target[1]) {
-                        const newParams = new URLSearchParams(target[1]);
-                        for (const [key, val] of newParams.entries()) {
-                            url.searchParams.append(key, val);
-                        }
+                        url.search = `?${target[1]}`;
                     }
+                    const newURL = new URL(`${url.pathname}${existsRedirect.isQueryStringPreserved ? url.search : ''}`, url.origin);
+                    url.href = newURL.href;
                 }
                 const redirectUrl = decodeURIComponent(url.href);
                 /** return Response redirect with http code of redirect type **/
                 switch (existsRedirect.redirectType) {
                     case REDIRECT_TYPE_301:
-                        return NextResponse.redirect(redirectUrl, {
-                            status: 301,
-                            statusText: 'Moved Permanently',
-                            headers: res === null || res === void 0 ? void 0 : res.headers,
-                        });
+                        return NextResponse.redirect(redirectUrl, Object.assign(Object.assign({}, res), { status: 301, statusText: 'Moved Permanently', headers: res === null || res === void 0 ? void 0 : res.headers }));
                     case REDIRECT_TYPE_302:
-                        return NextResponse.redirect(redirectUrl, {
-                            status: 302,
-                            statusText: 'Found',
-                            headers: res === null || res === void 0 ? void 0 : res.headers,
-                        });
-                    case REDIRECT_TYPE_SERVER_TRANSFER:
-                        return NextResponse.rewrite(redirectUrl, res);
+                        return NextResponse.redirect(redirectUrl, Object.assign(Object.assign({}, res), { status: 302, statusText: 'Found', headers: res === null || res === void 0 ? void 0 : res.headers }));
+                    case REDIRECT_TYPE_SERVER_TRANSFER: {
+                        return this.rewrite(redirectUrl, req, res || NextResponse.next());
+                    }
                     default:
                         return res || NextResponse.next();
                 }
@@ -143,8 +134,9 @@ export class RedirectsMiddleware extends MiddlewareBase {
     getExistsRedirect(req, siteName) {
         return __awaiter(this, void 0, void 0, function* () {
             const redirects = yield this.redirectsService.fetchRedirects(siteName);
-            const tragetURL = req.nextUrl.pathname;
-            const targetQS = req.nextUrl.search || '';
+            const normalizedUrl = new URL(this.normalizeUrl(req.nextUrl.pathname, req.nextUrl.search || ''), req.nextUrl.href);
+            const tragetURL = normalizedUrl.pathname;
+            const targetQS = normalizedUrl.search || '';
             const language = this.getLanguage(req);
             const modifyRedirects = structuredClone(redirects);
             return modifyRedirects.length
@@ -167,4 +159,44 @@ export class RedirectsMiddleware extends MiddlewareBase {
                 : undefined;
         });
     }
+    /**
+     * 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 {string} pathname
+     * @param {string} queryString
+     * @returns {string} modified url
+     */
+    normalizeUrl(pathname, queryString) {
+        if (!queryString) {
+            return pathname;
+        }
+        /**
+         * Prepare special parameters for exclusion.
+         */
+        const splittedPathname = pathname
+            .split('/')
+            .filter((route) => route)
+            .map((route) => `path=${route}`);
+        /**
+         * Remove special parameters(Next.JS)
+         * Example: /about/contact/us
+         * When a user clicks on this link, Next.js should generate a link for the middleware, formatted like this:
+         * http://host/about/contact/us?path=about&path=contact&path=us
+         */
+        const newQueryString = queryString
+            .replace(/^\?/, '')
+            .split('&')
+            .filter((param) => {
+            if (!splittedPathname.includes(param)) {
+                return param;
+            }
+            return false;
+        })
+            .join('&');
+        if (newQueryString) {
+            return `${pathname}?${newQueryString}`;
+        }
+        return pathname;
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-nextjs",
-  "version": "22.2.0-canary.2",
+  "version": "22.2.0-canary.20",
   "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.2",
-    "@sitecore-jss/sitecore-jss-dev-tools": "^22.2.0-canary.2",
-    "@sitecore-jss/sitecore-jss-react": "^22.2.0-canary.2",
+    "@sitecore-jss/sitecore-jss": "^22.2.0-canary.20",
+    "@sitecore-jss/sitecore-jss-dev-tools": "^22.2.0-canary.20",
+    "@sitecore-jss/sitecore-jss-react": "^22.2.0-canary.20",
     "@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": "ba1b71ef1209c0e3bdd3557d315a0e2a46ba4580",
+  "gitHead": "c525b47d1480e3e9ba40751f8493513f59fe25d0",
   "files": [
     "dist",
     "types",

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

@@ -37,4 +37,13 @@ export declare class RedirectsMiddleware extends MiddlewareBase {
      * @private
      */
     private getExistsRedirect;
+    /**
+     * 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 {string} pathname
+     * @param {string} queryString
+     * @returns {string} modified url
+     */
+    private normalizeUrl;
 }