@akinon/next 1.105.0-rc.84 → 1.105.0

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/bin/pz-prebuild.js

@@ -2,7 +2,6 @@
 
 const runScript = require('./run-script');
 
-runScript('pz-run-tests.js');
 runScript('pz-install-theme.js');
 runScript('pz-pre-check-dist.js');
 runScript('pz-generate-translations.js');

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/plugin-module.tsx

@@ -22,8 +22,7 @@ enum Plugin {
   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 {
@@ -50,15 +49,7 @@ export enum Component {
   MultiBasket = 'MultiBasket',
   SavedCard = 'SavedCardOption',
   Hepsipay = 'Hepsipay',
-  FlowPayment = 'FlowPayment',
-  SimilarProductsModal = 'SimilarProductsModal',
-  SimilarProductsFilterSidebar = 'SimilarProductsFilterSidebar',
-  SimilarProductsResultsGrid = 'SimilarProductsResultsGrid',
-  SimilarProductsPlugin = 'SimilarProductsPlugin',
-  ProductImageSearchFeature = 'ProductImageSearchFeature',
-  ImageSearchButton = 'ImageSearchButton',
-  HeaderImageSearchFeature = 'HeaderImageSearchFeature',
-  IyzicoSavedCard = 'IyzicoSavedCardOption'
+  FlowPayment = 'FlowPayment'
 }
 
 const PluginComponents = new Map([
@@ -91,21 +82,9 @@ const PluginComponents = new Map([
     [Component.AkifastQuickLoginButton, Component.AkifastCheckoutButton]
   ],
   [Plugin.MultiBasket, [Component.MultiBasket]],
-  [Plugin.SavedCard, [Component.SavedCard, Component.IyzicoSavedCard]],
+  [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) => {
@@ -174,8 +153,6 @@ export default function PluginModule({
               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;

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;
 
@@ -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 };
   };

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

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

package/data/server/list.ts

@@ -16,29 +16,19 @@ const getListDataHandler = (
   return async function () {
     const params = generateCommerceSearchParams(searchParams);
 
-    let rawData: string;
-
-    try {
-      rawData = await appFetch<string>({
-        url: `${category.list}${params}`,
-        locale,
-        currency,
-        init: {
-          headers: {
-            Accept: 'application/json',
-            'Content-Type': 'application/json',
-            ...(headers ?? {})
-          }
-        },
-        responseType: FetchResponseType.TEXT
-      });
-    } catch (error) {
-      logger.error('Failed to fetch list data', {
-        handler: 'getListDataHandler',
-        error: error.message
-      });
-      return null;
-    }
+    const rawData = await appFetch<string>({
+      url: `${category.list}${params}`,
+      locale,
+      currency,
+      init: {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json',
+          ...(headers ?? {})
+        }
+      },
+      responseType: FetchResponseType.TEXT
+    });
 
     let data: GetCategoryResponse;
 

package/data/server/special-page.ts

@@ -15,24 +15,20 @@ const getSpecialPageDataHandler = (
   return async function () {
     const params = generateCommerceSearchParams(searchParams);
 
-    try {
-      const data: GetCategoryResponse = await appFetch({
-        url: `${category.getSpecialPageByPk(pk)}${params}`,
-        locale,
-        currency,
-        init: {
-          headers: {
-            Accept: 'application/json',
-            'Content-Type': 'application/json',
-            ...(headers ?? {})
-          }
+    const data: GetCategoryResponse = await appFetch({
+      url: `${category.getSpecialPageByPk(pk)}${params}`,
+      locale,
+      currency,
+      init: {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json',
+          ...(headers ?? {})
         }
-      });
+      }
+    });
 
-      return data;
-    } catch (error) {
-      return null;
-    }
+    return data;
   };
 };
 

package/data/urls.ts

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

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

@@ -72,13 +72,10 @@ const addRootLayoutProps = async (componentProps: RootLayoutProps) => {
 const checkRedisVariables = () => {
   const requiredVariableValues = [
     process.env.CACHE_HOST,
-    process.env.CACHE_PORT
+    process.env.CACHE_PORT,
+    process.env.CACHE_SECRET
   ];
 
-  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,6 +4,7 @@ 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 {
@@ -17,6 +18,8 @@ export const useLocalization = () => {
     localeUrlStrategy
   } = useContext(LocalizationContext);
 
+  const router = useRouter();
+
   /**
    * Sets the locale in the URL.
    * @param locale Locale value defined in the settings.
@@ -27,8 +30,6 @@ 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,8 +148,7 @@ const withCompleteGpay =
       logger.info('Redirecting to order success page', {
         middleware: 'complete-gpay',
         redirectUrlWithLocale,
-        ip,
-        setCookie: request.headers.get('set-cookie')
+        ip
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/complete-masterpass.ts

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

package/middlewares/locale.ts

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

package/middlewares/redirection-payment.ts

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

package/middlewares/saved-card-redirection.ts

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

package/middlewares/three-d-redirection.ts

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