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

package/CHANGELOG.md

@@ -1,5 +1,69 @@
 # @akinon/next
 
+## 1.48.0-rc.4
+
+### Minor Changes
+
+- 5dfeea0: ZERO-2801: Revert ZERO-2801
+
+## 1.48.0-rc.3
+
+### Minor Changes
+
+- 90282b53: ZERO-2729: Audit packages for yarn and npm and also update app-template
+- 572d2e84: ZERO-2667: Add iframe support for redirection payment methods
+- a4c8d6a9: ZERO-2663: Fix the image url for gif and svgs and return them without options
+- fda5b92: ZERO-2725: fix invalid import
+- 2d9b2b2: ZERO-2816: Add segment to headers
+- c53ea3e6: ZERO-2609: Reset additional form fields when selectedFormType is not company
+- d93a507: ZERO-2900: Fix pretty url rewrite
+- 8d9ac9a: ZERO-2794: Add field to order type
+- 70279e7: ZERO-2817: Add metrics endpoint in default middleware
+- 6c25f66: ZERO-2551: Check CACHE_HOST variable
+- bc2b411: ZERO-2825: Add attribute-based shipping options to checkout page
+- 3bf2dd9: ZERO-2551: Fix search page
+- e9541a1: ZERO-2816: Add headers to url
+- 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.
+- 9d94f7e: ZERO-2820: update parent pk usage for menu generator
+- 2e6104d: ZERO-2888:Edit the numbering in the pagination and the visibility of the prev and next buttons
+- 64699d3: ZERO-2761: Fix invalid import for plugin module
+- 0d3a913e: ZERO-2725: Update decimal scale in Price component
+- 1448a96e: ZERO-2612: add errors type in CheckoutState
+- 1ec2e9d: ZERO-2895: Update app-fetch to include cookies in headers
+- d6edb1d: ZERO-2551: Fix searchparams handling for list and other routes
+- d3474c64: ZERO-2655: Add data source shipping option
+- 75080fd6: ZERO-2630: Add max limit to postcode area
+- 17f8752: ZERO-2816: Make the incoming currency lowercase
+- c45b62c: ZERO-2818: Add upload and download support for b2b package
+- 91265bba: ZERO-2551: Improve pretty url and caching performance
+- bbe18b9f: ZERO-2575: Fix build error
+- d409996: ZERO-2781: Refactor buildClientRequestUrl function to support caching and options
+- 4920742: Disable getCachedTranslations
+- 12a873e: ZERO-2846:Edit the siteKey regex in the response from GetCaptcha
+- 7e56d6b: ZERO-2841: Update api tagTypes
+- 94b6928: ZERO-2551: Add cache handler check in url-redirection middleware
+- 98bb8dcd: ZERO-2706: Cache getTranlations method
+- 46b7aad: ZERO-2775: Add condition and logger for menuitemmodel data
+- dcc8a150: ZERO-2694: added build step to RC branch pipeline
+- 8f47cca: ZERO-2829: fix and add nested JSON support for useFormData in api/client route
+- fad27689: ZERO-2739: add gpay to payment plugin map
+- dff0d595: ZERO-2659: add formData support to proxy api requests
+- fdd0b41: ZERO-2706: Add optimized translation support
+- eecb282: ZERO-2607: Update address-related functions to include invalidateTag option
+- f2c325c: ZERO-2838: Move file input component into @akinon/next
+- 9e25a64: ZERO-2835: Update category page layout with breadcrumb
+- beb499e6: ZERO-2551: Add new tsconfig paths
+- 146ea39: ZERO-2774: Update imports
+- f2c92d5: ZERO-2816: Update cookie name
+- 7bd3d99: ZERO-2801: Refactor locale middleware to handle single locale configuration
+- c47be30d: ZERO-2744: Update Order and OrderItem types
+- e9a46acb: ZERO-2738: add CVC input to registered cards in Masterpass
+- f046f8e0: ZERO-2575: update version for react-number-format
+- b9273fd: ZERO-2889: add host headers to requests
+- 86d25315: ZERO-2693: resolve dependency collision warning for eslint-config-next
+- c670bd4: ZERO-2900: Add middleware rewrite functionality
+- 3f9b8d7: ZERO-2761: Update plugins.js for akinon-next
+
 ## 1.48.0-rc.2
 
 ### 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.2",
+  "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.2",
+    "@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",