@sitecore-jss/sitecore-jss-nextjs 22.11.0-canary.2 → 22.11.0-canary.4

package/dist/cjs/components/Link.js

@@ -41,12 +41,24 @@ exports.Link = void 0;
 const react_1 = __importStar(require("react"));
 const link_1 = __importDefault(require("next/link"));
 const sitecore_jss_react_1 = require("@sitecore-jss/sitecore-jss-react");
+/**
+ * The list of NextLink props to be supported by the Link component.
+ */
+const supportedNextLinkProps = [
+    'as',
+    'onNavigate',
+    'passHref',
+    'prefetch',
+    'replace',
+    'scroll',
+    'shallow',
+];
 /**
  * Matches relative URLs that end with a file extension.
  */
 const FILE_EXTENSION_MATCHER = /^\/.*\.\w+$/;
 exports.Link = (0, react_1.forwardRef)((props, ref) => {
-    const { field, editable = true, children, internalLinkMatcher = /^\//g, showLinkTextWithChildrenPresent } = props, htmlLinkProps = __rest(props, ["field", "editable", "children", "internalLinkMatcher", "showLinkTextWithChildrenPresent"]);
+    const { field, editable = true, children, internalLinkMatcher = /^\//g, showLinkTextWithChildrenPresent } = props, rest = __rest(props, ["field", "editable", "children", "internalLinkMatcher", "showLinkTextWithChildrenPresent"]);
     if (!field ||
         (!field.editable &&
             !field.value &&
@@ -66,18 +78,31 @@ exports.Link = (0, react_1.forwardRef)((props, ref) => {
         const isFileUrl = FILE_EXTENSION_MATCHER.test(href);
         // determine if a link is a route or not. File extensions are not routes and should not be pre-fetched.
         if (isMatching && !isFileUrl) {
-            delete htmlLinkProps.emptyFieldEditingComponent;
-            return (react_1.default.createElement(link_1.default, Object.assign({ href: { pathname: href, query: querystring, hash: anchor }, key: "link", locale: false, title: value.title, target: value.target, className: value.class, prefetch: props.prefetch }, htmlLinkProps, { ref: ref }, (process.env.TEST
-                ? { 'data-nextjs-link': true, 'data-nextjs-link-prefetch': props.prefetch }
+            delete rest.emptyFieldEditingComponent;
+            return (react_1.default.createElement(link_1.default, Object.assign({ href: { pathname: href, query: querystring, hash: anchor }, key: "link", title: value.title, target: value.target, className: value.class }, rest, { locale: false, ref: ref }, (process.env.TEST
+                ? {
+                    'data-nextjs-link': true,
+                    'data-nextjs-link-prefetch': props.prefetch,
+                }
                 : {})),
                 text,
                 children));
         }
     }
-    // prevent passing internalLinkMatcher or prefetch as it is an invalid DOM element prop
-    const reactLinkProps = Object.assign({}, props);
-    delete reactLinkProps.internalLinkMatcher;
-    delete reactLinkProps.prefetch;
+    const reactLinkProps = sanitizeLinkProps(props);
     return (react_1.default.createElement(sitecore_jss_react_1.Link, Object.assign({}, reactLinkProps, { ref: ref }, (process.env.TEST ? { 'data-react-link': true } : {}))));
 });
 exports.Link.displayName = 'NextLink';
+/**
+ * Sanitize props for ReactLink by removing Next.js and internal props to prevent invalid DOM attributes.
+ * @param {LinkProps} props - The props the Link component received.
+ * @returns sanitized props for ReactLink.
+ */
+function sanitizeLinkProps(props) {
+    const internalProps = ['internalLinkMatcher'];
+    const sanitizedProps = Object.assign({}, props);
+    for (const prop of [...supportedNextLinkProps, ...internalProps]) {
+        delete sanitizedProps[prop];
+    }
+    return sanitizedProps;
+}

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

@@ -278,9 +278,11 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
                 return this.createRedirectResponse(target, res, 301, 'Moved Permanently');
             case site_1.REDIRECT_TYPE_302:
                 return this.createRedirectResponse(target, res, 302, 'Found');
-            case site_1.REDIRECT_TYPE_SERVER_TRANSFER:
-                // rewrite expects a string; unwrap NextURL if needed
-                return this.rewrite(typeof target === 'string' ? target : target.href, req, res, isExternal);
+            case site_1.REDIRECT_TYPE_SERVER_TRANSFER: {
+                // rewrite expects a path string; for NextURL extract pathname + search, not full href
+                const rewritePath = typeof target === 'string' ? target : `${target.pathname}${target.search}`;
+                return this.rewrite(rewritePath, req, res, isExternal);
+            }
             default:
                 // Unknown type: return the input response unchanged
                 return res;

package/dist/esm/components/Link.js

@@ -12,12 +12,24 @@ var __rest = (this && this.__rest) || function (s, e) {
 import React, { forwardRef } from 'react';
 import NextLink from 'next/link';
 import { Link as ReactLink, } from '@sitecore-jss/sitecore-jss-react';
+/**
+ * The list of NextLink props to be supported by the Link component.
+ */
+const supportedNextLinkProps = [
+    'as',
+    'onNavigate',
+    'passHref',
+    'prefetch',
+    'replace',
+    'scroll',
+    'shallow',
+];
 /**
  * Matches relative URLs that end with a file extension.
  */
 const FILE_EXTENSION_MATCHER = /^\/.*\.\w+$/;
 export const Link = forwardRef((props, ref) => {
-    const { field, editable = true, children, internalLinkMatcher = /^\//g, showLinkTextWithChildrenPresent } = props, htmlLinkProps = __rest(props, ["field", "editable", "children", "internalLinkMatcher", "showLinkTextWithChildrenPresent"]);
+    const { field, editable = true, children, internalLinkMatcher = /^\//g, showLinkTextWithChildrenPresent } = props, rest = __rest(props, ["field", "editable", "children", "internalLinkMatcher", "showLinkTextWithChildrenPresent"]);
     if (!field ||
         (!field.editable &&
             !field.value &&
@@ -37,18 +49,31 @@ export const Link = forwardRef((props, ref) => {
         const isFileUrl = FILE_EXTENSION_MATCHER.test(href);
         // determine if a link is a route or not. File extensions are not routes and should not be pre-fetched.
         if (isMatching && !isFileUrl) {
-            delete htmlLinkProps.emptyFieldEditingComponent;
-            return (React.createElement(NextLink, Object.assign({ href: { pathname: href, query: querystring, hash: anchor }, key: "link", locale: false, title: value.title, target: value.target, className: value.class, prefetch: props.prefetch }, htmlLinkProps, { ref: ref }, (process.env.TEST
-                ? { 'data-nextjs-link': true, 'data-nextjs-link-prefetch': props.prefetch }
+            delete rest.emptyFieldEditingComponent;
+            return (React.createElement(NextLink, Object.assign({ href: { pathname: href, query: querystring, hash: anchor }, key: "link", title: value.title, target: value.target, className: value.class }, rest, { locale: false, ref: ref }, (process.env.TEST
+                ? {
+                    'data-nextjs-link': true,
+                    'data-nextjs-link-prefetch': props.prefetch,
+                }
                 : {})),
                 text,
                 children));
         }
     }
-    // prevent passing internalLinkMatcher or prefetch as it is an invalid DOM element prop
-    const reactLinkProps = Object.assign({}, props);
-    delete reactLinkProps.internalLinkMatcher;
-    delete reactLinkProps.prefetch;
+    const reactLinkProps = sanitizeLinkProps(props);
     return (React.createElement(ReactLink, Object.assign({}, reactLinkProps, { ref: ref }, (process.env.TEST ? { 'data-react-link': true } : {}))));
 });
 Link.displayName = 'NextLink';
+/**
+ * Sanitize props for ReactLink by removing Next.js and internal props to prevent invalid DOM attributes.
+ * @param {LinkProps} props - The props the Link component received.
+ * @returns sanitized props for ReactLink.
+ */
+function sanitizeLinkProps(props) {
+    const internalProps = ['internalLinkMatcher'];
+    const sanitizedProps = Object.assign({}, props);
+    for (const prop of [...supportedNextLinkProps, ...internalProps]) {
+        delete sanitizedProps[prop];
+    }
+    return sanitizedProps;
+}

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

@@ -272,9 +272,11 @@ export class RedirectsMiddleware extends MiddlewareBase {
                 return this.createRedirectResponse(target, res, 301, 'Moved Permanently');
             case REDIRECT_TYPE_302:
                 return this.createRedirectResponse(target, res, 302, 'Found');
-            case REDIRECT_TYPE_SERVER_TRANSFER:
-                // rewrite expects a string; unwrap NextURL if needed
-                return this.rewrite(typeof target === 'string' ? target : target.href, req, res, isExternal);
+            case REDIRECT_TYPE_SERVER_TRANSFER: {
+                // rewrite expects a path string; for NextURL extract pathname + search, not full href
+                const rewritePath = typeof target === 'string' ? target : `${target.pathname}${target.search}`;
+                return this.rewrite(rewritePath, req, res, isExternal);
+            }
             default:
                 // Unknown type: return the input response unchanged
                 return res;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-nextjs",
-  "version": "22.11.0-canary.2",
+  "version": "22.11.0-canary.4",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -72,16 +72,16 @@
     "react-dom": "^19.1.0"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "22.11.0-canary.2",
-    "@sitecore-jss/sitecore-jss-dev-tools": "22.11.0-canary.2",
-    "@sitecore-jss/sitecore-jss-react": "22.11.0-canary.2",
+    "@sitecore-jss/sitecore-jss": "22.11.0-canary.4",
+    "@sitecore-jss/sitecore-jss-dev-tools": "22.11.0-canary.4",
+    "@sitecore-jss/sitecore-jss-react": "22.11.0-canary.4",
     "@vercel/kv": "^0.2.1",
     "regex-parser": "^2.2.11",
     "sync-disk-cache": "^2.1.0"
   },
   "description": "",
   "types": "types/index.d.ts",
-  "gitHead": "a2f6bec65f2127ae1aed808c999b47977df371d6",
+  "gitHead": "c0455eac6a27d2fa7d9eb1ad721f3985d2292105",
   "files": [
     "dist",
     "types",

package/types/components/Link.d.ts

@@ -1,15 +1,16 @@
 import React from 'react';
 import { LinkProps as NextLinkProps } from 'next/link';
 import { LinkProps as ReactLinkProps } from '@sitecore-jss/sitecore-jss-react';
+/**
+ * The list of NextLink props to be supported by the Link component.
+ */
+declare const supportedNextLinkProps: readonly ["as", "onNavigate", "passHref", "prefetch", "replace", "scroll", "shallow"];
 export type LinkProps = ReactLinkProps & {
     /**
      * If `href` match with `internalLinkMatcher` regexp, then it's internal link and NextLink will be rendered
      * @default /^\//g
      */
     internalLinkMatcher?: RegExp;
-    /**
-     * Next.js Link prefetch.
-     */
-    prefetch?: NextLinkProps['prefetch'];
-};
+} & Pick<NextLinkProps, typeof supportedNextLinkProps[number]>;
 export declare const Link: React.ForwardRefExoticComponent<Omit<LinkProps, "ref"> & React.RefAttributes<HTMLAnchorElement>>;
+export {};