@akinon/next 1.91.0-rc.1 → 1.91.0-rc.3

package/CHANGELOG.md

@@ -1,5 +1,68 @@
 # @akinon/next
 
+## 1.91.0-rc.3
+
+### Minor Changes
+
+- 5dfeea04: ZERO-2801: Revert ZERO-2801
+- 823d82f9: ZERO-3393: Enhance error handling in checkout middleware to ensure errors are checked for existence before processing
+- 63774a6a: ZERO-3351: Add commerce redirection ignore list functionality and related utility
+- 2d9b2b2c: ZERO-2816: Add segment to headers
+- 5e1feca6: Revert "ZERO-3286: Add notFound handling for chunk URLs starting with \_next"
+- d8fad39f: ZERO-3370: include plugins test to build stage
+- 40a46853: ZERO-3182: Optimize basket update mutation with optimistic update
+- 68bbcb27: ZERO-3393: Fix error handling in checkout middleware to check for errors array length
+- 25524867: ZERO-3391: Add subdomain support to setLocale function
+- f49bb74f: ZERO-3097: Add setCookie to logging in payment redirection middlewares
+- e9541a13: ZERO-2816: Add headers to url
+- 9b7d0de6: ZERO-3393: Improve error handling in checkout middleware to support both object and array error formats
+- 72fd4d67: ZERO-3084: Fix URL search parameters encoding in default middleware
+- c53ef7b9: ZERO-2668: The Link component has been updated to improve the logic for handling href values. Previously, if the href was not a string or started with 'http', it would return the href as is. Now, if the href is not provided, it will default to '#' to prevent any potential errors. Additionally, if the href is a string and does not start with 'http', it will be formatted with the locale and pathname, based on the localeUrlStrategy and defaultLocaleValue. This ensures that the correct href is generated based on the localization settings.
+- f8e4cac6: ZERO-3343: restrict root hostname to only locale subdomains
+- 64699d3f: ZERO-2761: Fix invalid import for plugin module
+- 832bee36: ZERO-3343: add domain to cookie for subdomain locale strategy
+- e974d8e8: ZERO-3406: Fix rc build
+- 28a59d49: ZERO-3400: refactor cookie domain logic using fallback host
+- 8feabe9a: ZERO-3343: add custom NextAuth options support
+- bf354de4: ZERO-3321: add babel compiler for akinon/next test
+- 7727ae55: ZERO-3073: Refactor basket page to use server-side data fetching and simplify component structure
+- d552629f: ZERO-3182: Refactor basketApi to use invalidatesTags and comment out onQueryStarted logic
+- 448adefb: ZERO-3321: move csp test to akinon-next
+- 17f87524: ZERO-2816: Make the incoming currency lowercase
+- 65d3b862: ZERO-3054: Update headers in appFetch
+- bbe18b9f: ZERO-2575: Fix build error
+- 17bfadc4: ZERO-3275: Disable OpenTelemetry monitoring in production environment
+- 4920742c: Disable getCachedTranslations
+- b6e5b624: ZERO-3257: Enhance locale middleware to redirect using existing or default locale and support 303 status for POST requests
+- 6c3629c2: ZERO-3321: fix jest tests in akinon-next for standalone projects
+- 6bc260be: ZERO-3295: update default tailwind content list
+- 7e56d6b6: ZERO-2841: Update api tagTypes
+- dfaceffd: ZERO-3356: Add useLoyaltyAvailability hook and update checkout state management
+- 33377cfd: ZERO-3267: Refactor import statement for ROUTES in error-page component
+- 43c182ee: ZERO-3054: Update Redis variable checks to conditionally include CACHE_SECRET
+- 943a239e: ZERO-3370: add allowJs in akinon-next test tsconfig
+- 068dc394: ZERO-3343: update get-root-hostname logic
+- 942490f2: ZERO-3295: move third party tailwind content list to akinon-next
+- eeb20bea: Revert "ZERO-3054: Refactor cache handler to use custom Redis handler and implement key hashing"
+- 3bf63c8a: ZERO-3286: Add notFound handling for chunk URLs starting with \_next
+- 9be2c081: ZERO-3243: Improve basket update query handling with optimistic updates
+- f2c92d5c: ZERO-2816: Update cookie name
+- 7bd3d992: ZERO-2801: Refactor locale middleware to handle single locale configuration
+- b6d5bda2: ZERO-3343: update changeset config
+- fdd255ee: ZERO-3054: Refactor cache handler to use custom Redis handler and implement key hashing
+- acf03209: ZERO-3321: remove babel config
+- 387356b6: ZERO-3323: Refactor locale filtering logic in URL matcher regex
+- 49eeebfa: ZERO-2909: Add deleteCollectionItem query to wishlistApi
+- 3f9b8d7e: ZERO-2761: Update plugins.js for akinon-next
+- b2ee69b9: ZERO-3321: delete unnecessary files
+- 0cabbda3: ZERO-3370: replace inline monorepo check with reusable utility
+
+## 1.91.0-rc.2
+
+### Minor Changes
+
+- 2552486: ZERO-3391: Add subdomain support to setLocale function
+
 ## 1.91.0-rc.1
 
 ## 1.91.0-rc.0

package/api/auth.ts

@@ -1,5 +1,5 @@
 import { NextApiRequest, NextApiResponse } from 'next';
-import NextAuth, { Session } from 'next-auth';
+import NextAuth, { Session, NextAuthOptions } from 'next-auth';
 import CredentialProvider from 'next-auth/providers/credentials';
 import { ROUTES } from 'routes';
 import { URLS, user } from '../data/urls';
@@ -7,6 +7,8 @@ import Settings from 'settings';
 import { urlLocaleMatcherRegex } from '../utils';
 import logger from '@akinon/next/utils/log';
 import { AuthError } from '../types';
+import getRootHostname from '../utils/get-root-hostname';
+import { LocaleUrlStrategy } from '../localization';
 
 async function getCurrentUser(sessionId: string, currency = '') {
   const headers = {
@@ -40,7 +42,15 @@ async function getCurrentUser(sessionId: string, currency = '') {
   };
 }
 
-const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
+type CustomNextAuthOptions = (
+  req: NextApiRequest,
+  res: NextApiResponse
+) => Partial<NextAuthOptions>;
+
+const defaultNextAuthOptions = (
+  req: NextApiRequest,
+  res: NextApiResponse
+): NextAuthOptions => {
   return {
     providers: [
       CredentialProvider({
@@ -150,7 +160,19 @@ const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
 
           if (sessionId) {
             const maxAge = 30 * 24 * 60 * 60; // 30 days in seconds
-            const cookieOptions = `Path=/; HttpOnly; Secure; Max-Age=${maxAge}`;
+            const { localeUrlStrategy } = Settings.localization;
+
+            const fallbackHost =
+              req.headers['x-forwarded-host']?.toString() ||
+              req.headers.host?.toString();
+            const hostname =
+              process.env.NEXT_PUBLIC_URL || `https://${fallbackHost}`;
+            const rootHostname =
+              localeUrlStrategy === LocaleUrlStrategy.Subdomain
+                ? getRootHostname(hostname)
+                : null;
+            const domainOption = rootHostname ? `Domain=${rootHostname};` : '';
+            const cookieOptions = `Path=/; HttpOnly; Secure; Max-Age=${maxAge}; ${domainOption}`;
 
             res.setHeader('Set-Cookie', [
               `osessionid=${sessionId}; ${cookieOptions}`,
@@ -253,8 +275,36 @@ const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
   };
 };
 
-const Auth = (req, res) => {
-  return NextAuth(req, res, nextAuthOptions(req, res));
+const Auth = (
+  req: NextApiRequest,
+  res: NextApiResponse,
+  customOptions?: CustomNextAuthOptions
+) => {
+  const baseOptions = defaultNextAuthOptions(req, res);
+  const customOptionsResult = customOptions ? customOptions(req, res) : {};
+
+  const mergedOptions = {
+    ...baseOptions,
+    ...customOptionsResult,
+    providers: [
+      ...baseOptions.providers,
+      ...(customOptionsResult.providers || [])
+    ],
+    callbacks: {
+      ...baseOptions.callbacks,
+      ...customOptionsResult.callbacks
+    },
+    events: {
+      ...baseOptions.events,
+      ...customOptionsResult.events
+    },
+    pages: {
+      ...baseOptions.pages,
+      ...customOptionsResult.pages
+    }
+  };
+
+  return NextAuth(req, res, mergedOptions);
 };
 
 export default Auth;

package/api/client.ts

@@ -5,6 +5,8 @@ import logger from '../utils/log';
 import formatCookieString from '../utils/format-cookie-string';
 import cookieParser from 'set-cookie-parser';
 import { cookies } from 'next/headers';
+import getRootHostname from '../utils/get-root-hostname';
+import { LocaleUrlStrategy } from '../localization';
 
 interface RouteParams {
   params: {
@@ -190,8 +192,23 @@ async function proxyRequest(...args) {
     const responseHeaders: any = {};
 
     if (filteredCookies.length > 0) {
+      const { localeUrlStrategy } = settings.localization;
+
+      const fallbackHost =
+        req.headers.get('x-forwarded-host') || req.headers.get('host');
+      const hostname = process.env.NEXT_PUBLIC_URL || `https://${fallbackHost}`;
+      const rootHostname =
+        localeUrlStrategy === LocaleUrlStrategy.Subdomain
+          ? getRootHostname(hostname)
+          : null;
+
       responseHeaders['set-cookie'] = filteredCookies
-        .map(formatCookieString)
+        .map((cookie) => {
+          if (!cookie.domain && rootHostname) {
+            cookie.domain = rootHostname;
+          }
+          return formatCookieString(cookie);
+        })
         .join(', ');
     }
 

package/hooks/use-localization.ts

@@ -25,19 +25,33 @@ export const useLocalization = () => {
    * @param locale Locale value defined in the settings.
    */
   const setLocale = (locale: string) => {
-    const localePath =
-      locale === defaultLocaleValue &&
-      localeUrlStrategy !== LocaleUrlStrategy.ShowAllLocales
-        ? ''
-        : `/${locale}`;
+    const { protocol, hostname, port, search, pathname } = location;
+    const pathnameWithoutLocale = pathname.replace(urlLocaleMatcherRegex, '');
 
-    const pathnameWithoutLocale = location.pathname.replace(
-      urlLocaleMatcherRegex,
-      ''
-    );
+    let targetUrl;
+
+    if (localeUrlStrategy === LocaleUrlStrategy.Subdomain) {
+      const hostParts = hostname.split('.');
+      const subDomain = hostParts[0];
+      const isSubdomainLocale = locales.some((loc) => loc.value === subDomain);
+      const baseDomain = isSubdomainLocale
+        ? hostParts.slice(1).join('.')
+        : hostname;
+
+      const formattedPort = port ? `:${port}` : '';
+
+      targetUrl = `${protocol}//${locale}.${baseDomain}${formattedPort}${pathnameWithoutLocale}${search}`;
+    } else {
+      const shouldHideLocale =
+        locale === defaultLocaleValue &&
+        localeUrlStrategy !== LocaleUrlStrategy.ShowAllLocales;
+      const localePath = shouldHideLocale ? '' : `/${locale}`;
+
+      targetUrl = `${localePath}${pathnameWithoutLocale}${search}`;
+    }
 
     // router.push is not used because reloading the page also clears the client side cache.
-    location.href = `${localePath}${pathnameWithoutLocale}${location.search}`;
+    location.href = targetUrl;
   };
 
   /**

package/middlewares/default.ts

@@ -19,6 +19,8 @@ import withLocale from './locale';
 import logger from '../utils/log';
 import { user } from '../data/urls';
 import { getUrlPathWithLocale } from '../utils/localization';
+import getRootHostname from '../utils/get-root-hostname';
+import { LocaleUrlStrategy } from '../localization';
 
 const withPzDefault =
   (middleware: NextMiddleware) =>
@@ -296,7 +298,7 @@ const withPzDefault =
                                 !req.middlewareParams.found &&
                                 Settings.customNotFoundEnabled
                               ) {
-                                let pathname = url.pathname
+                                const pathname = url.pathname
                                   .replace(/\/+$/, '')
                                   .split('/');
                                 url.pathname = url.pathname.replace(
@@ -341,6 +343,21 @@ const withPzDefault =
                                 middlewareResult = NextResponse.rewrite(url);
                               }
 
+                              const { localeUrlStrategy } =
+                                Settings.localization;
+
+                              const fallbackHost =
+                                req.headers.get('x-forwarded-host') ||
+                                req.headers.get('host');
+                              const hostname =
+                                process.env.NEXT_PUBLIC_URL ||
+                                `https://${fallbackHost}`;
+                              const rootHostname =
+                                localeUrlStrategy ===
+                                LocaleUrlStrategy.Subdomain
+                                  ? getRootHostname(hostname)
+                                  : null;
+
                               if (
                                 !url.pathname.startsWith(`/${currency}/orders`)
                               ) {
@@ -350,6 +367,7 @@ const withPzDefault =
                                     ? locale
                                     : defaultLocaleValue,
                                   {
+                                    domain: rootHostname,
                                     sameSite: 'none',
                                     secure: true,
                                     expires: new Date(
@@ -358,10 +376,12 @@ const withPzDefault =
                                   }
                                 );
                               }
+
                               middlewareResult.cookies.set(
                                 'pz-currency',
                                 currency,
                                 {
+                                  domain: rootHostname,
                                   sameSite: 'none',
                                   secure: true,
                                   expires: new Date(
@@ -410,7 +430,10 @@ const withPzDefault =
                                   ).json();
                                   middlewareResult.cookies.set(
                                     'csrftoken',
-                                    csrf_token
+                                    csrf_token,
+                                    {
+                                      domain: rootHostname
+                                    }
                                   );
                                 }
                               } catch (error) {

package/middlewares/locale.ts

@@ -13,7 +13,8 @@ const getMatchedLocale = (pathname: string, req: PzNextRequest) => {
   const { localeUrlStrategy, defaultLocaleValue } = settings.localization;
 
   if (localeUrlStrategy === LocaleUrlStrategy.Subdomain) {
-    const host = req.headers.get('x-forwarded-host');
+    const host =
+      req.headers.get('x-forwarded-host') || req.headers.get('host') || '';
 
     if (host) {
       const subDomain = host.split('.')[0] || '';
@@ -44,7 +45,9 @@ const withLocale =
     try {
       const url = req.nextUrl.clone();
       const matchedLocale = getMatchedLocale(url.pathname, req);
-      let { localeUrlStrategy, defaultLocaleValue, redirectToDefaultLocale } =
+      let { localeUrlStrategy } = settings.localization;
+
+      const { defaultLocaleValue, redirectToDefaultLocale } =
         settings.localization;
 
       localeUrlStrategy =

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.91.0-rc.1",
+  "version": "1.91.0-rc.3",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -34,7 +34,11 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.91.0-rc.1",
+    "@akinon/eslint-plugin-projectzero": "1.91.0-rc.3",
+    "@babel/core": "7.26.10",
+    "@babel/preset-env": "7.26.9",
+    "@babel/preset-typescript": "7.27.0",
+    "@types/jest": "29.5.14",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
     "@typescript-eslint/eslint-plugin": "6.7.4",

package/tailwind/content.js

@@ -0,0 +1,16 @@
+const defaultPlugins = require('../plugins');
+
+const getAkinonNextContent = (plugins = defaultPlugins) => {
+  return [
+    `./node_modules/@akinon/next/components/**/*.{js,ts,jsx,tsx}`,
+    `../../node_modules/@akinon/next/components/**/*.{js,ts,jsx,tsx}`,
+    ...plugins
+      .map((plugin) => [
+        `./node_modules/@akinon/${plugin}/**/*.{js,ts,jsx,tsx}`,
+        `../../node_modules/@akinon/${plugin}/**/*.{js,ts,jsx,tsx}`
+      ])
+      .flat()
+  ];
+};
+
+module.exports = getAkinonNextContent;

package/utils/get-root-hostname.ts

@@ -0,0 +1,28 @@
+import Settings from 'settings';
+
+export default function getRootHostname(
+  url: string | undefined
+): string | null {
+  if (!url) return null;
+
+  try {
+    const urlObj = new URL(url);
+    const hostname = urlObj.hostname;
+    const parts = hostname.split('.');
+
+    const firstPart = parts[0];
+
+    const isLocale = Settings.localization.locales.some(
+      (locale) => locale.value === firstPart
+    );
+
+    if (isLocale) {
+      const hostnameAfterLocale = parts.slice(1).join('.');
+      return `.${hostnameAfterLocale}`;
+    }
+
+    return `.${hostname}`;
+  } catch {
+    return null;
+  }
+}