@akinon/next 1.102.0 → 1.103.0-rc.80

package/data/urls.ts

@@ -183,7 +183,11 @@ export const product = {
   breadcrumbUrl: (menuitemmodel: string) =>
     `/menus/generate_breadcrumb/?item=${menuitemmodel}&generator_name=menu_item`,
   bundleProduct: (productPk: string, queryString: string) =>
-    `/bundle-product/${productPk}/?${queryString}`
+    `/bundle-product/${productPk}/?${queryString}`,
+  similarProducts: (params?: string) =>
+    `/similar-products${params ? `?${params}` : ''}`,
+  similarProductsList: (params?: string) =>
+    `/similar-product-list${params ? `?${params}` : ''}`
 };
 
 export const wishlist = {
@@ -247,7 +251,7 @@ export const widgets = {
 };
 
 export const form = {
-  getForm: (pk: number) => `/forms/${pk}/generate/`
+  getForm: (pk: number) => `/forms/${pk}/generate`
 };
 
 const URLS = {

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

@@ -72,10 +72,13 @@ const addRootLayoutProps = async (componentProps: RootLayoutProps) => {
 const checkRedisVariables = () => {
   const requiredVariableValues = [
     process.env.CACHE_HOST,
-    process.env.CACHE_PORT,
-    process.env.CACHE_SECRET
+    process.env.CACHE_PORT
   ];
 
+  if (!settings.usePrettyUrlRoute) {
+    requiredVariableValues.push(process.env.CACHE_SECRET);
+  }
+
   if (
     !requiredVariableValues.every((v) => v) &&
     process.env.NODE_ENV === 'production'

package/hooks/use-localization.ts

@@ -4,7 +4,6 @@ import { LocalizationContext } from '../localization/provider';
 import { useContext } from 'react';
 import { setCookie, urlLocaleMatcherRegex } from '../utils';
 import { LocaleUrlStrategy } from '../localization';
-import { useRouter } from 'next/navigation';
 
 export const useLocalization = () => {
   const {
@@ -18,8 +17,6 @@ export const useLocalization = () => {
     localeUrlStrategy
   } = useContext(LocalizationContext);
 
-  const router = useRouter();
-
   /**
    * Sets the locale in the URL.
    * @param locale Locale value defined in the settings.
@@ -30,6 +27,8 @@ export const useLocalization = () => {
 
     let targetUrl;
 
+    setCookie('pz-locale', locale);
+
     if (localeUrlStrategy === LocaleUrlStrategy.Subdomain) {
       const hostParts = hostname.split('.');
       const subDomain = hostParts[0];

package/middlewares/complete-gpay.ts

@@ -148,7 +148,8 @@ const withCompleteGpay =
       logger.info('Redirecting to order success page', {
         middleware: 'complete-gpay',
         redirectUrlWithLocale,
-        ip
+        ip,
+        setCookie: request.headers.get('set-cookie')
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/complete-masterpass.ts

@@ -149,7 +149,8 @@ const withCompleteMasterpass =
       logger.info('Redirecting to order success page', {
         middleware: 'complete-masterpass',
         redirectUrlWithLocale,
-        ip
+        ip,
+        setCookie: request.headers.get('set-cookie')
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/default.ts

@@ -338,6 +338,24 @@ const withPzDefault =
                                   middlewareResult = NextResponse.rewrite(url);
                                 }
 
+                                if (
+                                  !req.middlewareParams.found &&
+                                  Settings.customNotFoundEnabled
+                                ) {
+                                  const pathSegments = url.pathname
+                                    .replace(/\/+$/, '')
+                                    .split('/');
+                                  if (pathSegments.length >= 3) {
+                                    url.pathname = `/${pathSegments[1]}/${pathSegments[2]}/pz-not-found`;
+                                  } else {
+                                    url.pathname = '/pz-not-found';
+                                  }
+
+                                  middlewareResult = NextResponse.rewrite(url, {
+                                    status: 404
+                                  });
+                                }
+
                                 const { localeUrlStrategy } =
                                   Settings.localization;
 
@@ -387,6 +405,38 @@ const withPzDefault =
                                   }
                                 );
 
+                                if (
+                                  !url.pathname.startsWith(
+                                    `/${currency}/orders`
+                                  )
+                                ) {
+                                  const currentCookieLocale =
+                                    req.cookies.get('pz-locale')?.value;
+
+                                  const urlHasExplicitLocale =
+                                    url.pathname.match(urlLocaleMatcherRegex);
+                                  const shouldUpdateCookie =
+                                    !currentCookieLocale ||
+                                    urlHasExplicitLocale;
+
+                                  if (shouldUpdateCookie) {
+                                    middlewareResult.cookies.set(
+                                      'pz-locale',
+                                      locale?.length > 0
+                                        ? locale
+                                        : defaultLocaleValue,
+                                      {
+                                        domain: rootHostname,
+                                        sameSite: 'none',
+                                        secure: true,
+                                        expires: new Date(
+                                          Date.now() + 1000 * 60 * 60 * 24 * 7
+                                        ) // 7 days
+                                      }
+                                    );
+                                  }
+                                }
+
                                 if (
                                   req.cookies.get('pz-locale') &&
                                   req.cookies.get('pz-locale').value !== locale

package/middlewares/locale.ts

@@ -23,7 +23,15 @@ const getMatchedLocale = (pathname: string, req: PzNextRequest) => {
       );
 
       if (subDomainLocaleMatched && subDomainLocaleMatched[0]) {
-        matchedLocale = subDomainLocaleMatched[0].slice(1);
+        const subdomainLocale = subDomainLocaleMatched[0].slice(1);
+
+        const isValidSubdomainLocale = settings.localization.locales.find(
+          (l) => l.value === subdomainLocale
+        );
+
+        if (isValidSubdomainLocale) {
+          matchedLocale = subdomainLocale;
+        }
       }
     }
   }

package/middlewares/redirection-payment.ts

@@ -149,7 +149,8 @@ const withRedirectionPayment =
       logger.info('Redirecting to order success page', {
         middleware: 'redirection-payment',
         redirectUrlWithLocale,
-        ip
+        ip,
+        setCookie: request.headers.get('set-cookie')
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/saved-card-redirection.ts

@@ -149,7 +149,8 @@ const withSavedCardRedirection =
       logger.info('Redirecting to order success page', {
         middleware: 'saved-card-redirection',
         redirectUrlWithLocale,
-        ip
+        ip,
+        setCookie: request.headers.get('set-cookie')
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/three-d-redirection.ts

@@ -4,7 +4,6 @@ import { Buffer } from 'buffer';
 import logger from '../utils/log';
 import { getUrlPathWithLocale } from '../utils/localization';
 import { PzNextRequest } from '.';
-import { ServerVariables } from '../utils/server-variables';
 
 const streamToString = async (stream: ReadableStream<Uint8Array> | null) => {
   if (stream) {
@@ -149,7 +148,8 @@ const withThreeDRedirection =
       logger.info('Redirecting to order success page', {
         middleware: 'three-d-redirection',
         redirectUrlWithLocale,
-        ip
+        ip,
+        setCookie: request.headers.get('set-cookie')
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/url-redirection.ts

@@ -4,6 +4,7 @@ import { PzNextRequest } from '.';
 import logger from '../utils/log';
 import { urlLocaleMatcherRegex } from '../utils';
 import { getUrlPathWithLocale } from '../utils/localization';
+import { shouldIgnoreRedirect } from '../utils/redirect-ignore';
 import { ROUTES } from 'routes';
 
 // This middleware is used to handle url redirections set in Omnitron
@@ -60,20 +61,13 @@ const withUrlRedirection =
 
         const setCookies = request.headers.getSetCookie();
 
-        if (settings.commerceRedirectionIgnoreList) {
-          const shouldIgnoreRedirect =
-            settings.commerceRedirectionIgnoreList.some((ignorePath) =>
-              redirectUrl.pathname.startsWith(
-                getUrlPathWithLocale(
-                  ignorePath,
-                  req.middlewareParams.rewrites.locale
-                )
-              )
-            );
-
-          if (shouldIgnoreRedirect) {
-            return middleware(req, event);
-          }
+        if (
+          shouldIgnoreRedirect(
+            url.pathname,
+            req.middlewareParams.rewrites.locale
+          )
+        ) {
+          return middleware(req, event);
         }
 
         const response = NextResponse.redirect(redirectUrl.toString(), {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.102.0",
+  "version": "1.103.0-rc.80",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -35,7 +35,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.102.0",
+    "@akinon/eslint-plugin-projectzero": "1.103.0-rc.80",
     "@babel/core": "7.26.10",
     "@babel/preset-env": "7.26.9",
     "@babel/preset-typescript": "7.27.0",

package/plugins.d.ts

@@ -31,11 +31,14 @@ declare module '@akinon/pz-saved-card' {
   export const SavedCardOption: any;
 }
 
-declare module '@akinon/pz-iyzico-saved-card' {
-  export const iyzicoSavedCardReducer: any;
-  export const iyzicoSavedCardMiddleware: any;
-}
-
 declare module '@akinon/pz-apple-pay' {}
 
 declare module '@akinon/pz-flow-payment' {}
+
+declare module '@akinon/pz-similar-products' {
+  export const SimilarProductsModal: any;
+  export const SimilarProductsFilterSidebar: any;
+  export const SimilarProductsResultsGrid: any;
+  export const SimilarProductsPlugin: any;
+  export const SimilarProductsButtonPlugin: any;
+}

package/plugins.js

@@ -16,5 +16,7 @@ module.exports = [
   'pz-tabby-extension',
   'pz-apple-pay',
   'pz-tamara-extension',
-  'pz-flow-payment'
+  'pz-hepsipay',
+  'pz-flow-payment',
+  'pz-similar-products'
 ];

package/redux/middlewares/checkout.ts

@@ -51,7 +51,11 @@ export const errorMiddleware: Middleware = ({ dispatch }: MiddlewareParams) => {
     const result: CheckoutResult = next(action);
     const errors = result?.payload?.errors;
 
-    if (errors) {
+    if (
+      !!errors &&
+      ((typeof errors === 'object' && Object.keys(errors).length > 0) ||
+        (Array.isArray(errors) && errors.length > 0))
+    ) {
       dispatch(setErrors(errors));
     }
 
@@ -98,7 +102,7 @@ export const contextListMiddleware: Middleware = ({
     if (result?.payload?.context_list) {
       result.payload.context_list.forEach((context) => {
         const redirectUrl = context.page_context.redirect_url;
-        const isIframe = context.page_context.is_frame ?? false;
+        const isIframe = context.page_context.is_iframe ?? false;
 
         if (redirectUrl) {
           const currentLocale = getCookie('pz-locale');

package/types/commerce/order.ts

@@ -114,6 +114,7 @@ export interface Order {
     pk: number;
     name: string;
     slug: string;
+    logo: string;
     [key: string]: any;
   };
 }

package/types/index.ts

@@ -83,6 +83,12 @@ export interface Settings {
   };
   usePrettyUrlRoute?: boolean;
   commerceUrl: string;
+  /**
+   * This option allows you to track Sentry events on the client side, in addition to server and edge environments.
+   *
+   * It overrides process.env.NEXT_PUBLIC_SENTRY_DSN and process.env.SENTRY_DSN.
+   */
+  sentryDsn?: string;
   redis: {
     defaultExpirationTime: number;
   };
@@ -292,7 +298,13 @@ export interface ButtonProps
   target?: '_blank' | '_self' | '_parent' | '_top';
 }
 
-export type FileInputProps = React.HTMLProps<HTMLInputElement>;
+export interface FileInputProps extends React.HTMLProps<HTMLInputElement> {
+  fileClassName?: string;
+  fileNameWrapperClassName?: string;
+  fileInputClassName?: string;
+  onChange?: (event: React.ChangeEvent<HTMLInputElement>) => void;
+  buttonClassName?: string;
+}
 
 export interface PriceProps {
   currencyCode?: string;
@@ -313,15 +325,19 @@ export interface InputProps extends React.HTMLProps<HTMLInputElement> {
 
 export interface AccordionProps {
   isCollapse?: boolean;
+  collapseClassName?: string;
   title?: string;
   subTitle?: string;
   icons?: string[];
   iconSize?: number;
   iconColor?: string;
   children?: ReactNode;
+  headerClassName?: string;
   className?: string;
   titleClassName?: string;
+  subTitleClassName?: string;
   dataTestId?: string;
+  contentClassName?: string;
 }
 
 export interface PluginModuleComponentProps {
@@ -346,3 +362,20 @@ export interface PaginationProps {
   direction?: 'next' | 'prev';
   isLoading?: boolean;
 }
+
+export interface ModalProps {
+  portalId: string;
+  children?: React.ReactNode;
+  open?: boolean;
+  setOpen?: (open: boolean) => void;
+  title?: React.ReactNode;
+  showCloseButton?: React.ReactNode;
+  className?: string;
+  overlayClassName?: string;
+  headerWrapperClassName?: string;
+  titleClassName?: string;
+  closeButtonClassName?: string;
+  iconName?: string;
+  iconSize?: number;
+  iconClassName?: string;
+}

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 = {
@@ -60,6 +60,11 @@ const appFetch = async <T>({
     status = req.status;
     logger.debug(`FETCH END ${url}`, { status: req.status, ip });
 
+    if (!req.ok) {
+      const errorMessage = `HTTP ${req.status}: ${req.statusText}`;
+      throw new Error(errorMessage);
+    }
+
     if (responseType === FetchResponseType.JSON) {
       response = (await req.json()) as T;
     } else {

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;
+  });
+}

package/utils/redirect.ts

@@ -1,20 +1,39 @@
 import { redirect as nextRedirect, RedirectType } from 'next/navigation';
 import Settings from 'settings';
-import { headers } from 'next/headers';
-import { ServerVariables } from '@akinon/next/utils/server-variables';
+import { headers, cookies } from 'next/headers';
 import { getUrlPathWithLocale } from '@akinon/next/utils/localization';
 import { urlLocaleMatcherRegex } from '@akinon/next/utils';
 
 export const redirect = (path: string, type?: RedirectType) => {
   const nextHeaders = headers();
+  const nextCookies = cookies();
   const pageUrl = new URL(
     nextHeaders.get('pz-url') ?? process.env.NEXT_PUBLIC_URL ?? ''
   );
 
+  let currentLocaleValue = Settings.localization.defaultLocaleValue;
+  const urlLocaleMatch = pageUrl.pathname.match(urlLocaleMatcherRegex);
+
+  if (urlLocaleMatch && urlLocaleMatch[0]) {
+    currentLocaleValue = urlLocaleMatch[0].replace('/', '');
+  } else {
+    const cookieLocale = nextCookies.get('pz-locale')?.value;
+    if (
+      cookieLocale &&
+      Settings.localization.locales.find((l) => l.value === cookieLocale)
+    ) {
+      currentLocaleValue = cookieLocale;
+    }
+  }
+
   const currentLocale = Settings.localization.locales.find(
-    (locale) => locale.value === ServerVariables.locale
+    (locale) => locale.value === currentLocaleValue
   );
 
+  if (!currentLocale) {
+    currentLocaleValue = Settings.localization.defaultLocaleValue;
+  }
+
   const searchParams = new URLSearchParams(pageUrl.search);
 
   const callbackUrl =

package/with-pz-config.js

@@ -16,12 +16,8 @@ const defaultConfig = {
     remotePatterns: [
       {
         protocol: 'https',
-        hostname: '**.akinoncloud.com'
+        hostname: '**'
       },
-      {
-        protocol: 'https',
-        hostname: '**.akinoncdn.com'
-      }
     ]
   },
   modularizeImports: {