@akinon/next 1.82.0-rc.11 → 1.82.0-rc.13

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @akinon/next
 
+## 1.82.0-rc.13
+
+### Minor Changes
+
+- 3bf63c8: ZERO-3286: Add notFound handling for chunk URLs starting with \_next
+
+## 1.82.0-rc.12
+
+### Minor Changes
+
+- ac65ca9: ZERO-3269: Enhance locale handling by adding Subdomain strategy and updating related functions
+
 ## 1.82.0-rc.11
 
 ## 1.82.0-rc.10

package/hocs/server/with-segment-defaults.tsx

@@ -1,6 +1,6 @@
 import settings from 'settings';
 import { LayoutProps, PageProps, RootLayoutProps } from '../../types';
-import { redirect } from 'next/navigation';
+import { redirect, notFound } from 'next/navigation';
 import { ServerVariables } from '../../utils/server-variables';
 import { ROUTES } from 'routes';
 import logger from '../../utils/log';
@@ -21,6 +21,12 @@ export const withSegmentDefaults =
   async (props: T) => {
     let componentProps = { ...props };
 
+    // Handle not found chunk urls starting with _next
+    // Normally, next.js router should handle these urls and should not reach this point
+    if (props.params.commerce === '_next') {
+      return notFound();
+    }
+
     if (options.segmentType === 'root-layout') {
       componentProps = (await addRootLayoutProps(
         componentProps as RootLayoutProps

package/hooks/use-router.ts

@@ -27,8 +27,11 @@ export const useRouter = () => {
     );
 
     url.pathname = `${
-      locale === defaultLocale?.value &&
-      localeUrlStrategy === LocaleUrlStrategy.HideDefaultLocale
+      localeUrlStrategy === LocaleUrlStrategy.Subdomain ||
+      (locale === defaultLocale?.value &&
+        [LocaleUrlStrategy.HideDefaultLocale].includes(
+          localeUrlStrategy as LocaleUrlStrategy
+        ))
         ? ''
         : `/${locale}`
     }${pathnameWithoutLocale}`;

package/localization/index.ts

@@ -1,5 +1,6 @@
 export enum LocaleUrlStrategy {
   HideAllLocales = 'hide-all-locales',
   HideDefaultLocale = 'hide-default-locale',
-  ShowAllLocales = 'show-all-locales'
+  ShowAllLocales = 'show-all-locales',
+  Subdomain = 'subdomain'
 }

package/middlewares/locale.ts

@@ -4,17 +4,32 @@ import { PzNextRequest } from '.';
 import { LocaleUrlStrategy } from '../localization';
 import { urlLocaleMatcherRegex } from '../utils';
 import logger from '../utils/log';
+import { getUrlPathWithLocale } from '../utils/localization';
 
-const getMatchedLocale = (pathname: string) => {
+const getMatchedLocale = (pathname: string, req: PzNextRequest) => {
   let matchedLocale = pathname.match(urlLocaleMatcherRegex)?.[0] ?? '';
   matchedLocale = matchedLocale.replace('/', '');
 
+  const { localeUrlStrategy, defaultLocaleValue } = settings.localization;
+
+  if (localeUrlStrategy === LocaleUrlStrategy.Subdomain) {
+    const host = req.headers.get('x-forwarded-host');
+
+    if (host) {
+      const subDomain = host.split('.')[0] || '';
+      const subDomainLocaleMatched = `/${subDomain}`.match(
+        urlLocaleMatcherRegex
+      );
+
+      if (subDomainLocaleMatched && subDomainLocaleMatched[0]) {
+        matchedLocale = subDomainLocaleMatched[0].slice(1);
+      }
+    }
+  }
+
   if (!matchedLocale.length) {
-    if (
-      settings.localization.localeUrlStrategy !==
-      LocaleUrlStrategy.ShowAllLocales
-    ) {
-      matchedLocale = settings.localization.defaultLocaleValue;
+    if (localeUrlStrategy !== LocaleUrlStrategy.ShowAllLocales) {
+      matchedLocale = defaultLocaleValue;
     }
   }
 
@@ -28,7 +43,7 @@ const withLocale =
 
     try {
       const url = req.nextUrl.clone();
-      const matchedLocale = getMatchedLocale(url.pathname);
+      const matchedLocale = getMatchedLocale(url.pathname, req);
       let { localeUrlStrategy, defaultLocaleValue, redirectToDefaultLocale } =
         settings.localization;
 
@@ -50,8 +65,15 @@ const withLocale =
         redirectToDefaultLocale &&
         req.method === 'GET'
       ) {
-        url.pathname = `/${defaultLocaleValue}${url.pathname}`;
-        return NextResponse.redirect(url);
+        // Redirect to existing or default locale
+
+        url.pathname = getUrlPathWithLocale(
+          url.pathname,
+          req.cookies.get('pz-locale')?.value
+        );
+
+        // Use 303 for POST requests
+        return NextResponse.redirect(url, 303);
       }
 
       req.middlewareParams.rewrites.locale = matchedLocale;
@@ -61,7 +83,6 @@ const withLocale =
         ip
       });
     }
-
     return middleware(req, event);
   };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.82.0-rc.11",
+  "version": "1.82.0-rc.13",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -30,7 +30,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.82.0-rc.11",
+    "@akinon/eslint-plugin-projectzero": "1.82.0-rc.13",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
     "@typescript-eslint/eslint-plugin": "6.7.4",

package/utils/index.ts

@@ -1,6 +1,6 @@
 import settings from 'settings';
 import { LocaleUrlStrategy } from '../localization';
-import { CDNOptions, ClientRequestOptions } from '../types';
+import { CDNOptions, ClientRequestOptions, Locale } from '../types';
 
 export * from './get-currency';
 export * from './menu-generator';
@@ -152,14 +152,17 @@ export function buildCDNUrl(url: string, config?: CDNOptions) {
   return `${rootWithoutOptions}${options}${fileExtension}`;
 }
 
+const { locales, localeUrlStrategy, defaultLocaleValue } =
+  settings.localization;
+
+const isLocaleExcluded = (locale: Locale) =>
+  ![LocaleUrlStrategy.ShowAllLocales, LocaleUrlStrategy.Subdomain].includes(
+    localeUrlStrategy
+  ) && locale.value !== defaultLocaleValue;
+
 export const urlLocaleMatcherRegex = new RegExp(
-  `^/(${settings.localization.locales
-    .filter((l) =>
-      settings.localization.localeUrlStrategy !==
-      LocaleUrlStrategy.ShowAllLocales
-        ? l.value !== settings.localization.defaultLocaleValue
-        : l
-    )
+  `^/(${locales
+    .filter((l) => !isLocaleExcluded(l))
     .map((l) => l.value)
     .join('|')})(?=/|$)`
 );

package/utils/localization.ts

@@ -11,6 +11,10 @@ export const getUrlPathWithLocale = (
     currentLocale = defaultLocaleValue;
   }
 
+  if (localeUrlStrategy === LocaleUrlStrategy.Subdomain) {
+    return pathname;
+  }
+
   if (localeUrlStrategy === LocaleUrlStrategy.HideAllLocales) {
     return pathname;
   }