@sitecore-jss/sitecore-jss-nextjs 22.7.0-canary.9 → 22.8.0-beta.0

package/dist/cjs/middleware/middleware.js

@@ -24,11 +24,20 @@ class MiddlewareBase {
      * @returns {boolean} is prefetch
      */
     isPrefetch(req) {
-        return (
-        // eslint-disable-next-line prettier/prettier
-        req.headers.get('purpose') === 'prefetch' || // Pages Router
-            req.headers.get('Next-Router-Prefetch') === '1' // App Router
-        );
+        const isMobile = req.headers.get('sec-ch-ua-mobile') === '?1';
+        const userAgent = req.headers.get('user-agent') || '';
+        const isKnownPlatform = /iPhone|Mac|Linux|Windows|Android/i.test(userAgent);
+        const isKnownDevice = isMobile || isKnownPlatform;
+        const purpose = req.headers.get('purpose');
+        const nextRouterPrefetch = req.headers.get('Next-Router-Prefetch');
+        const middlewarePrefetch = req.headers.get('x-middleware-prefetch');
+        // Some real navigations on different devices may incorrectly include 'prefetch' headers.
+        // To avoid skipping personalization in such cases, we treat 'x-middleware-prefetch' as a more reliable signal of true prefetch behavior.
+        if (isKnownDevice && middlewarePrefetch === '1') {
+            return false;
+        }
+        // Otherwise, standard prefetch detection
+        return purpose === 'prefetch' || nextRouterPrefetch === '1' || middlewarePrefetch === '1';
     }
     excludeRoute(pathname) {
         var _a, _b;

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

@@ -26,7 +26,7 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
     constructor(config) {
         super(config);
         this.config = config;
-        this.handler = (req, res, options) => __awaiter(this, void 0, void 0, function* () {
+        this.processPersonalizationRequest = (req, res, options) => __awaiter(this, void 0, void 0, function* () {
             const pathname = req.nextUrl.pathname;
             const language = this.getLanguage(req);
             const hostname = this.getHostHeader(req) || this.defaultHostname;
@@ -52,7 +52,7 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
             }
             const site = this.getSite(req, response);
             // Get personalization info from Experience Edge
-            const personalizeInfo = yield this.personalizeService.getPersonalizeInfo(pathname, language, site.name);
+            const personalizeInfo = yield this.getPersonalizeInfo(pathname, language, site.name);
             if (!personalizeInfo) {
                 // Likely an invalid route / language
                 sitecore_jss_1.debug.personalize('skipped (personalize info not found)');
@@ -69,6 +69,7 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
                 // Disable preflight caching to force revalidation on client-side navigation (personalization WILL be influenced).
                 // Note the reason we don't move this any earlier in the middleware is that we would then be sacrificing performance for non-personalized pages.
                 response.headers.set('x-middleware-cache', 'no-cache');
+                response.headers.set('Cache-Control', 'no-store, must-revalidate');
                 return response;
             }
             yield this.initPersonalizeServer({
@@ -127,7 +128,7 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
     getHandler() {
         return (req, res, options) => __awaiter(this, void 0, void 0, function* () {
             try {
-                return yield this.handler(req, res, options);
+                return yield this.processPersonalizationRequest(req, res, options);
             }
             catch (error) {
                 console.log('Personalize middleware failed:');
@@ -229,5 +230,10 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
             return results;
         }, results);
     }
+    getPersonalizeInfo(pathname, language, siteName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.personalizeService.getPersonalizeInfo(pathname, language, siteName);
+        });
+    }
 }
 exports.PersonalizeMiddleware = PersonalizeMiddleware;

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

@@ -65,7 +65,7 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
             const { pathname: incomingURL, search: incomingQS = '' } = this.normalizeUrl(req.nextUrl.clone());
             const locale = this.getLanguage(req);
             const normalizedPath = incomingURL.replace(/\/*$/gi, '');
-            const redirects = yield this.redirectsService.fetchRedirects(siteName);
+            const redirects = yield this.getRedirects(siteName);
             const language = this.getLanguage(req);
             const modifyRedirects = structuredClone(redirects);
             let matchedQueryString;
@@ -221,6 +221,17 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
             return response;
         });
     }
+    /**
+     * Fetches all redirects for a given site from the Sitecore instance
+     * @param {string} siteName - The name of the site to fetch redirects for
+     * @returns {Promise<RedirectInfo[]>} A promise that resolves to an array of redirect information
+     * @protected
+     */
+    getRedirects(siteName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.redirectsService.fetchRedirects(siteName);
+        });
+    }
     /**
      * 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.

package/dist/esm/middleware/middleware.js

@@ -21,11 +21,20 @@ export class MiddlewareBase {
      * @returns {boolean} is prefetch
      */
     isPrefetch(req) {
-        return (
-        // eslint-disable-next-line prettier/prettier
-        req.headers.get('purpose') === 'prefetch' || // Pages Router
-            req.headers.get('Next-Router-Prefetch') === '1' // App Router
-        );
+        const isMobile = req.headers.get('sec-ch-ua-mobile') === '?1';
+        const userAgent = req.headers.get('user-agent') || '';
+        const isKnownPlatform = /iPhone|Mac|Linux|Windows|Android/i.test(userAgent);
+        const isKnownDevice = isMobile || isKnownPlatform;
+        const purpose = req.headers.get('purpose');
+        const nextRouterPrefetch = req.headers.get('Next-Router-Prefetch');
+        const middlewarePrefetch = req.headers.get('x-middleware-prefetch');
+        // Some real navigations on different devices may incorrectly include 'prefetch' headers.
+        // To avoid skipping personalization in such cases, we treat 'x-middleware-prefetch' as a more reliable signal of true prefetch behavior.
+        if (isKnownDevice && middlewarePrefetch === '1') {
+            return false;
+        }
+        // Otherwise, standard prefetch detection
+        return purpose === 'prefetch' || nextRouterPrefetch === '1' || middlewarePrefetch === '1';
     }
     excludeRoute(pathname) {
         var _a, _b;

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

@@ -23,7 +23,7 @@ export class PersonalizeMiddleware extends MiddlewareBase {
     constructor(config) {
         super(config);
         this.config = config;
-        this.handler = (req, res, options) => __awaiter(this, void 0, void 0, function* () {
+        this.processPersonalizationRequest = (req, res, options) => __awaiter(this, void 0, void 0, function* () {
             const pathname = req.nextUrl.pathname;
             const language = this.getLanguage(req);
             const hostname = this.getHostHeader(req) || this.defaultHostname;
@@ -49,7 +49,7 @@ export class PersonalizeMiddleware extends MiddlewareBase {
             }
             const site = this.getSite(req, response);
             // Get personalization info from Experience Edge
-            const personalizeInfo = yield this.personalizeService.getPersonalizeInfo(pathname, language, site.name);
+            const personalizeInfo = yield this.getPersonalizeInfo(pathname, language, site.name);
             if (!personalizeInfo) {
                 // Likely an invalid route / language
                 debug.personalize('skipped (personalize info not found)');
@@ -66,6 +66,7 @@ export class PersonalizeMiddleware extends MiddlewareBase {
                 // Disable preflight caching to force revalidation on client-side navigation (personalization WILL be influenced).
                 // Note the reason we don't move this any earlier in the middleware is that we would then be sacrificing performance for non-personalized pages.
                 response.headers.set('x-middleware-cache', 'no-cache');
+                response.headers.set('Cache-Control', 'no-store, must-revalidate');
                 return response;
             }
             yield this.initPersonalizeServer({
@@ -124,7 +125,7 @@ export class PersonalizeMiddleware extends MiddlewareBase {
     getHandler() {
         return (req, res, options) => __awaiter(this, void 0, void 0, function* () {
             try {
-                return yield this.handler(req, res, options);
+                return yield this.processPersonalizationRequest(req, res, options);
             }
             catch (error) {
                 console.log('Personalize middleware failed:');
@@ -226,4 +227,9 @@ export class PersonalizeMiddleware extends MiddlewareBase {
             return results;
         }, results);
     }
+    getPersonalizeInfo(pathname, language, siteName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.personalizeService.getPersonalizeInfo(pathname, language, siteName);
+        });
+    }
 }

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

@@ -59,7 +59,7 @@ export class RedirectsMiddleware extends MiddlewareBase {
             const { pathname: incomingURL, search: incomingQS = '' } = this.normalizeUrl(req.nextUrl.clone());
             const locale = this.getLanguage(req);
             const normalizedPath = incomingURL.replace(/\/*$/gi, '');
-            const redirects = yield this.redirectsService.fetchRedirects(siteName);
+            const redirects = yield this.getRedirects(siteName);
             const language = this.getLanguage(req);
             const modifyRedirects = structuredClone(redirects);
             let matchedQueryString;
@@ -215,6 +215,17 @@ export class RedirectsMiddleware extends MiddlewareBase {
             return response;
         });
     }
+    /**
+     * Fetches all redirects for a given site from the Sitecore instance
+     * @param {string} siteName - The name of the site to fetch redirects for
+     * @returns {Promise<RedirectInfo[]>} A promise that resolves to an array of redirect information
+     * @protected
+     */
+    getRedirects(siteName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.redirectsService.fetchRedirects(siteName);
+        });
+    }
     /**
      * 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.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-nextjs",
-  "version": "22.7.0-canary.9",
+  "version": "22.8.0-beta.0",
   "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.7.0-canary.9",
-    "@sitecore-jss/sitecore-jss-dev-tools": "22.7.0-canary.9",
-    "@sitecore-jss/sitecore-jss-react": "22.7.0-canary.9",
+    "@sitecore-jss/sitecore-jss": "22.8.0-beta.0",
+    "@sitecore-jss/sitecore-jss-dev-tools": "22.8.0-beta.0",
+    "@sitecore-jss/sitecore-jss-react": "22.8.0-beta.0",
     "@vercel/kv": "^0.2.1",
     "regex-parser": "^2.2.11",
     "sync-disk-cache": "^2.1.0"
   },
   "description": "",
   "types": "types/index.d.ts",
-  "gitHead": "93198b6321eb6be9882cb5888826e741925a770d",
+  "gitHead": "2d1e3b85231daf9f632180483b35f0b2041987c6",
   "files": [
     "dist",
     "types",

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

@@ -115,6 +115,7 @@ export declare class PersonalizeMiddleware extends MiddlewareBase {
      * @returns An array of personalize executions
      */
     protected getPersonalizeExecutions(personalizeInfo: PersonalizeInfo, language: string): PersonalizeExecution[];
-    private handler;
+    protected processPersonalizationRequest: (req: NextRequest, res?: NextResponse, options?: PersonalizeOptions) => Promise<NextResponse>;
+    protected getPersonalizeInfo(pathname: string, language: string, siteName: string): Promise<PersonalizeInfo | undefined>;
 }
 export {};

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

@@ -45,6 +45,13 @@ export declare class RedirectsMiddleware extends MiddlewareBase {
      * @returns {Promise<NextResponse>} The redirect response.
      */
     protected processRedirectRequest(req: NextRequest, res?: NextResponse): Promise<NextResponse>;
+    /**
+     * Fetches all redirects for a given site from the Sitecore instance
+     * @param {string} siteName - The name of the site to fetch redirects for
+     * @returns {Promise<RedirectInfo[]>} A promise that resolves to an array of redirect information
+     * @protected
+     */
+    protected getRedirects(siteName: string): Promise<RedirectInfo[]>;
     /**
      * 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.