@akinon/next 1.96.0-rc.57 → 1.96.0-snapshot-ZERO-35861-20250908151109

package/__tests__/next-config.test.ts

@@ -1,6 +1,15 @@
 import { resolve } from 'path';
 import type { NextConfig } from 'next';
-const findBaseDir = require('../utils/find-base-dir');
+
+function findBaseDir() {
+  const insideNodeModules = __dirname.includes('node_modules');
+
+  if (insideNodeModules) {
+    return resolve(__dirname, '../../../../');
+  } else {
+    return resolve(__dirname, '../../../apps/projectzeronext');
+  }
+}
 
 const baseDir = findBaseDir();
 

package/api/cache.ts

@@ -21,20 +21,54 @@ async function handleRequest(...args) {
   }
 
   const formData = await req.formData();
-  const body = {} as { key: string; value?: string; expire?: number };
+  const body = {} as {
+    key: string;
+    value?: string;
+    expire?: number;
+    keyValuePairs?: string;
+    compressed?: string;
+  };
 
   formData.forEach((value, key) => {
     body[key] = value;
   });
 
-  const { key, value, expire } = body;
-  let response: string | boolean;
+  const { key, value, expire, keyValuePairs, compressed } = body;
+  let response: any;
 
   try {
     if (req.method === 'POST') {
-      response = await Cache.get(key);
+      if (compressed === 'true') {
+        response = await Cache.getCompressed(key);
+      } else {
+        response = await Cache.get(key);
+      }
     } else if (req.method === 'PUT') {
-      response = await Cache.set(key, value, expire);
+      if (keyValuePairs) {
+        try {
+          const parsedKeyValuePairs = JSON.parse(keyValuePairs);
+          if (
+            typeof parsedKeyValuePairs !== 'object' ||
+            parsedKeyValuePairs === null ||
+            Array.isArray(parsedKeyValuePairs)
+          ) {
+            throw new Error('Invalid keyValuePairs format - must be an object');
+          }
+          response = await Cache.mset(parsedKeyValuePairs, expire);
+        } catch (error) {
+          logger.error('Invalid keyValuePairs in mset request', { error });
+          return NextResponse.json(
+            { error: 'Invalid keyValuePairs format' },
+            { status: 400 }
+          );
+        }
+      } else {
+        if (compressed === 'true') {
+          response = await Cache.setCompressed(key, value, expire);
+        } else {
+          response = await Cache.set(key, value, expire);
+        }
+      }
     }
   } catch (error) {
     logger.error(error);

package/components/accordion.tsx

@@ -7,19 +7,15 @@ import { AccordionProps } from '../types';
 
 export const Accordion = ({
   isCollapse = false,
-  collapseClassName,
   title,
   subTitle,
   icons = ['chevron-up', 'chevron-down'],
   iconSize = 16,
   iconColor = 'fill-[#000000]',
   children,
-  headerClassName,
   className,
   titleClassName,
-  subTitleClassName,
-  dataTestId,
-  contentClassName
+  dataTestId
 }: AccordionProps) => {
   const [collapse, setCollapse] = useState(isCollapse);
 
@@ -31,22 +27,15 @@ export const Accordion = ({
       )}
     >
       <div
-        className={twMerge(
-          'flex items-center justify-between cursor-pointer',
-          headerClassName
-        )}
+        className="flex items-center justify-between cursor-pointer"
         onClick={() => setCollapse(!collapse)}
         data-testid={dataTestId}
       >
-        <div className={twMerge('flex flex-col', contentClassName)}>
+        <div className="flex flex-col">
           {title && (
             <h3 className={twMerge('text-sm', titleClassName)}>{title}</h3>
           )}
-          {subTitle && (
-            <h4 className={twMerge('text-xs text-gray-700', subTitleClassName)}>
-              {subTitle}
-            </h4>
-          )}
+          {subTitle && <h4 className="text-xs text-gray-700">{subTitle}</h4>}
         </div>
 
         {icons && (
@@ -57,11 +46,7 @@ export const Accordion = ({
           />
         )}
       </div>
-      {collapse && (
-        <div className={twMerge('mt-3 text-sm', collapseClassName)}>
-          {children}
-        </div>
-      )}
+      {collapse && <div className="mt-3 text-sm">{children}</div>}
     </div>
   );
 };

package/components/file-input.tsx

@@ -1,70 +1,8 @@
-import { useState } from 'react';
 import { forwardRef } from 'react';
-import { useLocalization } from '@akinon/next/hooks';
-import { twMerge } from 'tailwind-merge';
-import { FileInputProps } from '../types';
+import { FileInputProps } from '../types/index';
 
 export const FileInput = forwardRef<HTMLInputElement, FileInputProps>(
-  function FileInput(
-    {
-      buttonClassName,
-      onChange,
-      fileClassName,
-      fileNameWrapperClassName,
-      fileInputClassName,
-      ...props
-    },
-    ref
-  ) {
-    const { t } = useLocalization();
-    const [fileNames, setFileNames] = useState<string[]>([]);
-
-    const handleFileChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-      const files = Array.from(event.target.files || []);
-      setFileNames(files.map((file) => file.name));
-
-      if (onChange) {
-        onChange(event);
-      }
-    };
-
-    return (
-      <div className="relative">
-        <input
-          type="file"
-          {...props}
-          ref={ref}
-          className={twMerge(
-            'absolute inset-0 w-full h-full opacity-0 cursor-pointer',
-            fileInputClassName
-          )}
-          onChange={handleFileChange}
-        />
-        <button
-          type="button"
-          className={twMerge(
-            'bg-primary text-white py-2 px-4 text-sm',
-            buttonClassName
-          )}
-        >
-          {t('common.file_input.select_file')}
-        </button>
-        <div
-          className={twMerge('mt-1 text-gray-500', fileNameWrapperClassName)}
-        >
-          {fileNames.length > 0 ? (
-            <ul className={twMerge('list-disc pl-4 text-xs', fileClassName)}>
-              {fileNames.map((name, index) => (
-                <li key={index}>{name}</li>
-              ))}
-            </ul>
-          ) : (
-            <span className={twMerge('text-xs', fileClassName)}>
-              {t('common.file_input.no_file')}
-            </span>
-          )}
-        </div>
-      </div>
-    );
+  function fileInput(props, ref) {
+    return <input type="file" {...props} ref={ref} />;
   }
 );

package/components/input.tsx

@@ -1,8 +1,6 @@
 import clsx from 'clsx';
 import { forwardRef, FocusEvent, useState, Ref } from 'react';
 import { Controller } from 'react-hook-form';
-
-// @ts-ignore
 import { PatternFormat, PatternFormatProps } from 'react-number-format';
 import { InputProps } from '../types';
 import { twMerge } from 'tailwind-merge';

package/components/link.tsx

@@ -10,9 +10,7 @@ type LinkProps = Omit<
   React.AnchorHTMLAttributes<HTMLAnchorElement>,
   keyof NextLinkProps
 > &
-  NextLinkProps & {
-    href: string;
-  };
+  NextLinkProps;
 
 export const Link = ({ children, href, ...rest }: LinkProps) => {
   const { locale, defaultLocaleValue, localeUrlStrategy } = useLocalization();
@@ -28,21 +26,19 @@ export const Link = ({ children, href, ...rest }: LinkProps) => {
       return href;
     }
 
-    if (typeof href === 'string' && !href.startsWith('http')) {
-      const pathnameWithoutLocale = href.replace(urlLocaleMatcherRegex, '');
-      const hrefWithLocale = `/${locale}${pathnameWithoutLocale}`;
-
-      if (localeUrlStrategy === LocaleUrlStrategy.ShowAllLocales) {
-        return hrefWithLocale;
-      } else if (
-        localeUrlStrategy === LocaleUrlStrategy.HideDefaultLocale &&
-        locale !== defaultLocaleValue
-      ) {
-        return hrefWithLocale;
-      }
+    const pathnameWithoutLocale = href.replace(urlLocaleMatcherRegex, '');
+    const hrefWithLocale = `/${locale}${pathnameWithoutLocale}`;
+
+    if (localeUrlStrategy === LocaleUrlStrategy.ShowAllLocales) {
+      return hrefWithLocale;
+    } else if (
+      localeUrlStrategy === LocaleUrlStrategy.HideDefaultLocale &&
+      locale !== defaultLocaleValue
+    ) {
+      return hrefWithLocale;
     }
 
-    return href;
+    return href || '#';
   }, [href, defaultLocaleValue, locale, localeUrlStrategy]);
 
   return (

package/components/modal.tsx

@@ -4,7 +4,16 @@ import { ReactPortal } from './react-portal';
 import { Icon } from './icon';
 import { twMerge } from 'tailwind-merge';
 import { useEffect } from 'react';
-import { ModalProps } from '../types';
+
+export interface ModalProps {
+  portalId: string;
+  children?: React.ReactNode;
+  open?: boolean;
+  setOpen?: (open: boolean) => void;
+  title?: React.ReactNode;
+  showCloseButton?: React.ReactNode;
+  className?: string;
+}
 
 export const Modal = (props: ModalProps) => {
   const {
@@ -14,14 +23,7 @@ export const Modal = (props: ModalProps) => {
     setOpen,
     title = '',
     showCloseButton = true,
-    className,
-    overlayClassName,
-    headerWrapperClassName,
-    titleClassName,
-    closeButtonClassName,
-    iconName = 'close',
-    iconSize = 16,
-    iconClassName
+    className
   } = props;
 
   useEffect(() => {
@@ -36,12 +38,7 @@ export const Modal = (props: ModalProps) => {
 
   return (
     <ReactPortal wrapperId={portalId}>
-      <div
-        className={twMerge(
-          'fixed top-0 left-0 w-screen h-screen bg-primary bg-opacity-60 z-50',
-          overlayClassName
-        )}
-      />
+      <div className="fixed top-0 left-0 w-screen h-screen bg-primary bg-opacity-60 z-50" />
       <section
         className={twMerge(
           'fixed top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 z-50 bg-white',
@@ -49,28 +46,15 @@ export const Modal = (props: ModalProps) => {
         )}
       >
         {(showCloseButton || title) && (
-          <div
-            className={twMerge(
-              'flex px-6 py-4 border-b border-gray-400',
-              headerWrapperClassName
-            )}
-          >
-            {title && (
-              <h3 className={twMerge('text-lg font-light', titleClassName)}>
-                {title}
-              </h3>
-            )}
+          <div className="flex px-6 py-4 border-b border-gray-400">
+            {title && <h3 className="text-lg font-light">{title}</h3>}
             {showCloseButton && (
               <button
                 type="button"
                 onClick={() => setOpen(false)}
-                className={twMerge('ml-auto', closeButtonClassName)}
+                className="ml-auto"
               >
-                <Icon
-                  name={iconName}
-                  size={iconSize}
-                  className={iconClassName}
-                />
+                <Icon name="close" size={16} />
               </button>
             )}
           </div>

package/components/plugin-module.tsx

@@ -21,9 +21,7 @@ enum Plugin {
   Akifast = 'pz-akifast',
   MultiBasket = 'pz-multi-basket',
   SavedCard = 'pz-saved-card',
-  Hepsipay = 'pz-hepsipay',
-  FlowPayment = 'pz-flow-payment',
-  SimilarProducts = 'pz-similar-products'
+  FlowPayment = 'pz-flow-payment'
 }
 
 export enum Component {
@@ -49,15 +47,7 @@ export enum Component {
   AkifastCheckoutButton = 'CheckoutButton',
   MultiBasket = 'MultiBasket',
   SavedCard = 'SavedCardOption',
-  Hepsipay = 'Hepsipay',
-  FlowPayment = 'FlowPayment',
-  SimilarProductsModal = 'SimilarProductsModal',
-  SimilarProductsFilterSidebar = 'SimilarProductsFilterSidebar',
-  SimilarProductsResultsGrid = 'SimilarProductsResultsGrid',
-  SimilarProductsPlugin = 'SimilarProductsPlugin',
-  ProductImageSearchFeature = 'ProductImageSearchFeature',
-  ImageSearchButton = 'ImageSearchButton',
-  HeaderImageSearchFeature = 'HeaderImageSearchFeature'
+  FlowPayment = 'FlowPayment'
 }
 
 const PluginComponents = new Map([
@@ -91,20 +81,7 @@ const PluginComponents = new Map([
   ],
   [Plugin.MultiBasket, [Component.MultiBasket]],
   [Plugin.SavedCard, [Component.SavedCard]],
-  [Plugin.Hepsipay, [Component.Hepsipay]],
-  [Plugin.FlowPayment, [Component.FlowPayment]],
-  [
-    Plugin.SimilarProducts,
-    [
-      Component.SimilarProductsModal,
-      Component.SimilarProductsFilterSidebar,
-      Component.SimilarProductsResultsGrid,
-      Component.SimilarProductsPlugin,
-      Component.ProductImageSearchFeature,
-      Component.ImageSearchButton,
-      Component.HeaderImageSearchFeature
-    ]
-  ]
+  [Plugin.FlowPayment, [Component.FlowPayment]]
 ]);
 
 const getPlugin = (component: Component) => {
@@ -169,12 +146,8 @@ export default function PluginModule({
               promise = import(`${'@akinon/pz-multi-basket'}`);
             } else if (plugin === Plugin.SavedCard) {
               promise = import(`${'@akinon/pz-saved-card'}`);
-            } else if (plugin === Plugin.Hepsipay) {
-              promise = import(`${'@akinon/pz-hepsipay'}`);
             } else if (plugin === Plugin.FlowPayment) {
               promise = import(`${'@akinon/pz-flow-payment'}`);
-            } else if (plugin === Plugin.SimilarProducts) {
-              promise = import(`${'@akinon/pz-similar-products'}`);
             }
           } catch (error) {
             logger.error(error);

package/data/client/checkout.ts

@@ -35,10 +35,8 @@ import {
 
 interface CheckoutResponse {
   pre_order?: PreOrder;
-  errors?: {
-    non_field_errors?: string;
-    sample_products?: string[];
-    [key: string]: string | string[] | undefined;
+  errors: {
+    non_field_errors: string;
   };
   context_list?: CheckoutContext[];
   template_name?: string;
@@ -886,7 +884,8 @@ export const checkoutApi = api.injectEndpoints({
           method: 'POST',
           body: formData
         };
-      }
+      },
+      invalidatesTags: ['Checkout']
     })
   }),
   overrideExisting: false

package/data/server/category.ts

@@ -5,6 +5,7 @@ import { category, product } from '../urls';
 import { Cache, CacheKey } from '../../lib/cache';
 import { parse } from 'lossless-json';
 import logger from '../../utils/log';
+import { headers as nHeaders } from 'next/headers';
 import { ServerVariables } from '../../utils/server-variables';
 
 function getCategoryDataHandler(
@@ -17,30 +18,19 @@ function getCategoryDataHandler(
   return async function () {
     const params = generateCommerceSearchParams(searchParams);
 
-    let rawData: string;
-
-    try {
-      rawData = await appFetch<string>({
-        url: `${category.getCategoryByPk(pk)}${params ? params : ''}`,
-        locale,
-        currency,
-        init: {
-          headers: {
-            Accept: 'application/json',
-            'Content-Type': 'application/json',
-            ...(headers ?? {})
-          }
-        },
-        responseType: FetchResponseType.TEXT
-      });
-    } catch (error) {
-      logger.error('Failed to fetch category data', {
-        handler: 'getCategoryDataHandler',
-        pk,
-        error: error.message
-      });
-      return null;
-    }
+    const rawData = await appFetch<string>({
+      url: `${category.getCategoryByPk(pk)}${params ? params : ''}`,
+      locale,
+      currency,
+      init: {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json',
+          ...(headers ?? {})
+        }
+      },
+      responseType: FetchResponseType.TEXT
+    });
 
     let data: GetCategoryResponse;
 
@@ -58,8 +48,8 @@ function getCategoryDataHandler(
       logger.fatal('Error while parsing category data', {
         handler: 'getCategoryDataHandler',
         error,
-        rawData: rawData?.startsWith?.('<!DOCTYPE html>')
-          ? `${rawData?.substring(0, 50)}...`
+        rawData: rawData.startsWith('<!DOCTYPE html>')
+          ? `${rawData.substring(0, 50)}...`
           : rawData
       });
     }
@@ -74,27 +64,17 @@ function getCategoryDataHandler(
       return { data, breadcrumbData: undefined };
     }
 
-    let breadcrumbData: { menu?: unknown } = {};
-
-    try {
-      breadcrumbData = await appFetch<{ menu?: unknown }>({
-        url: product.breadcrumbUrl(menuItemModel),
-        locale,
-        currency,
-        init: {
-          headers: {
-            Accept: 'application/json',
-            'Content-Type': 'application/json'
-          }
+    const breadcrumbData = await appFetch<any>({
+      url: product.breadcrumbUrl(menuItemModel),
+      locale,
+      currency,
+      init: {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json'
         }
-      });
-    } catch (error) {
-      logger.warn('Failed to fetch breadcrumb data', {
-        handler: 'getCategoryDataHandler',
-        pk,
-        error: error.message
-      });
-    }
+      }
+    });
 
     return { data, breadcrumbData: breadcrumbData?.menu };
   };
@@ -118,7 +98,8 @@ export const getCategoryData = ({
     locale,
     getCategoryDataHandler(pk, locale, currency, searchParams, headers),
     {
-      expire: 300
+      expire: 300,
+      compressed: true
     }
   );
 };
@@ -158,8 +139,8 @@ function getCategoryBySlugDataHandler(
       logger.fatal('Error while parsing category data', {
         handler: 'getCategoryBySlugDataHandler',
         error,
-        rawData: rawData?.startsWith?.('<!DOCTYPE html>')
-          ? `${rawData?.substring(0, 50)}...`
+        rawData: rawData.startsWith('<!DOCTYPE html>')
+          ? `${rawData.substring(0, 50)}...`
           : rawData
       });
     }
@@ -178,7 +159,8 @@ export const getCategoryBySlugData = async ({
     locale,
     getCategoryBySlugDataHandler(slug, locale, currency),
     {
-      expire: 300
+      expire: 300,
+      compressed: true
     }
   );
 };

package/data/server/flatpage.ts

@@ -11,24 +11,20 @@ const getFlatPageDataHandler = (
   headers?: Record<string, string>
 ) => {
   return async function () {
-    try {
-      const data = await appFetch<FlatPage>({
-        url: flatpage.getFlatPageByPk(pk),
-        locale,
-        currency,
-        init: {
-          headers: {
-            Accept: 'application/json',
-            'Content-Type': 'application/json',
-            ...(headers ?? {})
-          }
+    const data = await appFetch<FlatPage>({
+      url: flatpage.getFlatPageByPk(pk),
+      locale,
+      currency,
+      init: {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json',
+          ...(headers ?? {})
         }
-      });
+      }
+    });
 
-      return data;
-    } catch (error) {
-      return null;
-    }
+    return data;
   };
 };
 
@@ -46,6 +42,9 @@ export const getFlatPageData = ({
   return Cache.wrap(
     CacheKey.FlatPage(pk),
     locale,
-    getFlatPageDataHandler(pk, locale, currency, headers)
+    getFlatPageDataHandler(pk, locale, currency, headers),
+    {
+      compressed: true
+    }
   );
 };

package/data/server/form.ts

@@ -43,6 +43,9 @@ export const getFormData = ({
   return Cache.wrap(
     CacheKey.Form(pk),
     locale,
-    getFormDataHandler(pk, locale, currency, headers)
+    getFormDataHandler(pk, locale, currency, headers),
+    {
+      compressed: true
+    }
   );
 };

package/data/server/landingpage.ts

@@ -11,24 +11,20 @@ const getLandingPageHandler = (
   headers?: Record<string, string>
 ) => {
   return async function () {
-    try {
-      const data = await appFetch<LandingPage>({
-        url: landingpage.getLandingPageByPk(pk),
-        locale,
-        currency,
-        init: {
-          headers: {
-            Accept: 'application/json',
-            'Content-Type': 'application/json',
-            ...(headers ?? {})
-          }
+    const data = await appFetch<LandingPage>({
+      url: landingpage.getLandingPageByPk(pk),
+      locale,
+      currency,
+      init: {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json',
+          ...(headers ?? {})
         }
-      });
+      }
+    });
 
-      return data;
-    } catch (error) {
-      return null;
-    }
+    return data;
   };
 };