@akinon/next 1.48.0-rc.3 → 1.48.0-rc.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @akinon/next
 
+## 1.48.0-rc.4
+
+### Minor Changes
+
+- 5dfeea0: ZERO-2801: Revert ZERO-2801
+
 ## 1.48.0-rc.3
 
 ### Minor Changes

package/middlewares/locale.ts

@@ -5,6 +5,22 @@ import { LocaleUrlStrategy } from '../localization';
 import { urlLocaleMatcherRegex } from '../utils';
 import logger from '../utils/log';
 
+const getMatchedLocale = (pathname: string) => {
+  let matchedLocale = pathname.match(urlLocaleMatcherRegex)?.[0] ?? '';
+  matchedLocale = matchedLocale.replace('/', '');
+
+  if (!matchedLocale.length) {
+    if (
+      settings.localization.localeUrlStrategy !==
+      LocaleUrlStrategy.ShowAllLocales
+    ) {
+      matchedLocale = settings.localization.defaultLocaleValue;
+    }
+  }
+
+  return matchedLocale;
+};
+
 const withLocale =
   (middleware: NextMiddleware) =>
   async (req: PzNextRequest, event: NextFetchEvent) => {
@@ -12,12 +28,12 @@ const withLocale =
 
     try {
       const url = req.nextUrl.clone();
-      const {
-        locales,
-        localeUrlStrategy,
-        defaultLocaleValue,
-        redirectToDefaultLocale
-      } = settings.localization;
+      const matchedLocale = getMatchedLocale(url.pathname);
+      let { localeUrlStrategy, defaultLocaleValue, redirectToDefaultLocale } =
+        settings.localization;
+
+      localeUrlStrategy =
+        localeUrlStrategy ?? LocaleUrlStrategy.HideDefaultLocale;
 
       if (!defaultLocaleValue) {
         logger.error('Default locale value is not defined in settings.', {
@@ -29,34 +45,16 @@ const withLocale =
       }
 
       if (
-        locales.length === 1 &&
-        localeUrlStrategy === LocaleUrlStrategy.ShowAllLocales
+        !matchedLocale?.length &&
+        localeUrlStrategy === LocaleUrlStrategy.ShowAllLocales &&
+        redirectToDefaultLocale &&
+        req.method === 'GET'
       ) {
-        const singleLocale = locales[0].value;
-        const pathParts = url.pathname.split('/').filter(Boolean);
-
-        if (pathParts[0] === singleLocale) {
-          url.pathname = '/' + pathParts.slice(1).join('/');
-          return NextResponse.redirect(url);
-        }
-
-        req.middlewareParams.rewrites.locale = singleLocale;
-      } else {
-        const matchedLocale =
-          url.pathname.match(urlLocaleMatcherRegex)?.[0]?.replace('/', '') ||
-          '';
-        if (
-          !matchedLocale &&
-          localeUrlStrategy === LocaleUrlStrategy.ShowAllLocales &&
-          redirectToDefaultLocale &&
-          req.method === 'GET'
-        ) {
-          url.pathname = `/${defaultLocaleValue}${url.pathname}`;
-          return NextResponse.redirect(url);
-        }
-        req.middlewareParams.rewrites.locale =
-          matchedLocale || defaultLocaleValue;
+        url.pathname = `/${defaultLocaleValue}${url.pathname}`;
+        return NextResponse.redirect(url);
       }
+
+      req.middlewareParams.rewrites.locale = matchedLocale;
     } catch (error) {
       logger.error('withLocale error', {
         error,

package/package.json

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