@akinon/next 1.90.0 → 1.91.0-rc.0

package/utils/app-fetch.ts

@@ -43,12 +43,12 @@ const appFetch = async <T>({
     const requestURL = `${decodeURIComponent(commerceUrl)}${url}`;
 
     init.headers = {
+      cookie: nextCookies.toString(),
       ...(init.headers ?? {}),
       ...(ServerVariables.globalHeaders ?? {}),
       'Accept-Language': currentLocale.apiValue,
       'x-currency': currency,
-      'x-forwarded-for': ip,
-      cookie: nextCookies.toString()
+      'x-forwarded-for': ip
     };
 
     init.next = {

package/utils/index.ts

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

package/utils/redirect-ignore.ts

@@ -0,0 +1,35 @@
+import settings from 'settings';
+import { getUrlPathWithLocale } from './localization';
+
+type IgnorePath = string | RegExp;
+
+const defaultIgnoreList: string[] = [];
+
+const extraIgnores: IgnorePath[] = Array.isArray(
+  settings.commerceRedirectionIgnoreList
+)
+  ? settings.commerceRedirectionIgnoreList.map((path) => {
+      if (path === '/users/reset') {
+        return /^\/users\/reset\/[^/]+\/[^/]+\/$/;
+      }
+      return path;
+    })
+  : [];
+
+export function shouldIgnoreRedirect(
+  pathname: string,
+  locale: string
+): boolean {
+  if (!pathname) return false;
+
+  const rawIgnoreList: IgnorePath[] = [...defaultIgnoreList, ...extraIgnores];
+
+  return rawIgnoreList.some((ignorePath) => {
+    if (ignorePath instanceof RegExp) {
+      return ignorePath.test(pathname);
+    }
+
+    const localized = getUrlPathWithLocale(ignorePath, locale);
+    return localized === pathname;
+  });
+}