@akinon/next 1.43.0-rc.6 → 1.43.0-rc.8

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @akinon/next
 
+## 1.43.0-rc.8
+
+### Minor Changes
+
+- 70279e7: ZERO-2817: Add metrics endpoint in default middleware
+- 9d94f7e: ZERO-2820: update parent pk usage for menu generator
+
+## 1.43.0-rc.7
+
+### Minor Changes
+
+- 7bd3d99: ZERO-2801: Refactor locale middleware to handle single locale configuration
+
 ## 1.43.0-rc.6
 
 ### Minor Changes

package/middlewares/default.ts

@@ -69,6 +69,10 @@ const withPzDefault =
       return NextResponse.json({ status: 'ok' });
     }
 
+    if (url.pathname.startsWith('/metrics')) {
+      return new NextResponse(null, { status: 200 });
+    }
+
     if (req.nextUrl.pathname.startsWith('/.well-known')) {
       const url = new URL(`${Settings.commerceUrl}${req.nextUrl.pathname}`);
       const req_ = await fetch(url.toString());

package/middlewares/locale.ts

@@ -5,22 +5,6 @@ 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) => {
@@ -28,12 +12,12 @@ const withLocale =
 
     try {
       const url = req.nextUrl.clone();
-      const matchedLocale = getMatchedLocale(url.pathname);
-      let { localeUrlStrategy, defaultLocaleValue, redirectToDefaultLocale } =
-        settings.localization;
-
-      localeUrlStrategy =
-        localeUrlStrategy ?? LocaleUrlStrategy.HideDefaultLocale;
+      const {
+        locales,
+        localeUrlStrategy,
+        defaultLocaleValue,
+        redirectToDefaultLocale
+      } = settings.localization;
 
       if (!defaultLocaleValue) {
         logger.error('Default locale value is not defined in settings.', {
@@ -45,16 +29,34 @@ const withLocale =
       }
 
       if (
-        !matchedLocale?.length &&
-        localeUrlStrategy === LocaleUrlStrategy.ShowAllLocales &&
-        redirectToDefaultLocale &&
-        req.method === 'GET'
+        locales.length === 1 &&
+        localeUrlStrategy === LocaleUrlStrategy.ShowAllLocales
       ) {
-        url.pathname = `/${defaultLocaleValue}${url.pathname}`;
-        return NextResponse.redirect(url);
-      }
+        const singleLocale = locales[0].value;
+        const pathParts = url.pathname.split('/').filter(Boolean);
 
-      req.middlewareParams.rewrites.locale = matchedLocale;
+        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;
+      }
     } 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.43.0-rc.6",
+  "version": "1.43.0-rc.8",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -30,7 +30,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.43.0-rc.6",
+    "@akinon/eslint-plugin-projectzero": "1.43.0-rc.8",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
     "@typescript-eslint/eslint-plugin": "6.7.4",

package/utils/menu-generator.ts

@@ -13,8 +13,8 @@ export const menuGenerator = (arr: MenuItemType[]) => {
     });
 
     Object.values(data).forEach((item) => {
-      if (item.parent) {
-        data[item.parent.pk].children.push(item);
+      if (item.parent_pk) {
+        data[item.parent_pk].children.push(item);
       } else {
         tree.push(item);
       }