@akinon/next 1.99.0-snapshot-ZERO-3640-20250919140935 → 1.100.0-rc.71

package/data/server/category.ts

@@ -5,7 +5,6 @@ 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(
@@ -18,19 +17,30 @@ function getCategoryDataHandler(
   return async function () {
     const params = generateCommerceSearchParams(searchParams);
 
-    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 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;
+    }
 
     let data: GetCategoryResponse;
 
@@ -64,17 +74,27 @@ function getCategoryDataHandler(
       return { data, breadcrumbData: undefined };
     }
 
-    const breadcrumbData = await appFetch<any>({
-      url: product.breadcrumbUrl(menuItemModel),
-      locale,
-      currency,
-      init: {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json'
+    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'
+          }
         }
-      }
-    });
+      });
+    } catch (error) {
+      logger.warn('Failed to fetch breadcrumb data', {
+        handler: 'getCategoryDataHandler',
+        pk,
+        error: error.message
+      });
+    }
 
     return { data, breadcrumbData: breadcrumbData?.menu };
   };
@@ -98,7 +118,8 @@ export const getCategoryData = ({
     locale,
     getCategoryDataHandler(pk, locale, currency, searchParams, headers),
     {
-      expire: 300
+      expire: 300,
+      compressed: true
     }
   );
 };
@@ -158,7 +179,8 @@ export const getCategoryBySlugData = async ({
     locale,
     getCategoryBySlugDataHandler(slug, locale, currency),
     {
-      expire: 300
+      expire: 300,
+      compressed: true
     }
   );
 };

package/data/server/flatpage.ts

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

package/data/server/list.ts

@@ -16,19 +16,29 @@ const getListDataHandler = (
   return async function () {
     const params = generateCommerceSearchParams(searchParams);
 
-    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 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;
+    }
 
     let data: GetCategoryResponse;
 
@@ -71,7 +81,8 @@ export const getListData = async ({
     locale,
     getListDataHandler(locale, currency, searchParams, headers),
     {
-      expire: 300
+      expire: 300,
+      compressed: true
     }
   );
 };

package/data/server/menu.ts

@@ -48,6 +48,9 @@ export const getMenu = async (params?: MenuHandlerParams) => {
   return Cache.wrap(
     CacheKey.Menu(params?.depth ?? DEFAULT_DEPTH, params?.parent),
     params?.locale ?? ServerVariables.locale,
-    getMenuHandler(params)
+    getMenuHandler(params),
+    {
+      compressed: true
+    }
   );
 };

package/data/server/product.ts

@@ -35,57 +35,84 @@ const getProductDataHandler = ({
           .join('&');
     }
 
-    const data = await appFetch<ProductResult>({
-      url,
-      locale,
-      currency,
-      init: {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json',
-          ...(headers ?? {})
+    let data: ProductResult;
+
+    try {
+      data = await appFetch<ProductResult>({
+        url,
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json',
+            ...(headers ?? {})
+          }
         }
-      }
-    });
+      });
+    } catch (error) {
+      logger.error('Failed to fetch product data', {
+        handler: 'getProductDataHandler',
+        pk,
+        error: error.message,
+        url
+      });
+      return null;
+    }
 
     const categoryUrl = product.categoryUrl(data.product.pk);
 
-    const productCategoryData = await appFetch<ProductCategoryResult>({
-      url: categoryUrl,
-      locale,
-      currency,
-      init: {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json'
+    let productCategoryData: ProductCategoryResult;
+    let breadcrumbData: { menu?: unknown } = {};
+
+    try {
+      productCategoryData = await appFetch<ProductCategoryResult>({
+        url: categoryUrl,
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json'
+          }
         }
+      });
+
+      const menuItemModel = productCategoryData?.results[0]?.menuitemmodel;
+
+      if (!menuItemModel) {
+        logger.warn(
+          'menuItemModel is undefined, skipping breadcrumbData fetch',
+          {
+            handler: 'getProductDataHandler',
+            pk
+          }
+        );
+        return { data, breadcrumbData: undefined };
       }
-    });
 
-    const menuItemModel = productCategoryData?.results[0]?.menuitemmodel;
+      const breadcrumbUrl = product.breadcrumbUrl(menuItemModel);
 
-    if (!menuItemModel) {
-      logger.warn('menuItemModel is undefined, skipping breadcrumbData fetch', {
+      breadcrumbData = await appFetch<{ menu?: unknown }>({
+        url: breadcrumbUrl,
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json'
+          }
+        }
+      });
+    } catch (error) {
+      logger.warn('Failed to fetch breadcrumb data', {
         handler: 'getProductDataHandler',
-        pk
+        pk,
+        error: error.message
       });
-      return { data, breadcrumbData: undefined };
+      // Continue without breadcrumb data
     }
 
-    const breadcrumbUrl = product.breadcrumbUrl(menuItemModel);
-
-    const breadcrumbData = await appFetch<any>({
-      url: breadcrumbUrl,
-      locale,
-      currency,
-      init: {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json'
-        }
-      }
-    });
-
     return {
       data,
       breadcrumbData: breadcrumbData?.menu
@@ -116,7 +143,8 @@ export const getProductData = async ({
       headers
     }),
     {
-      expire: 300
+      expire: 300,
+      compressed: true
     }
   );
 };

package/data/server/seo.ts

@@ -43,6 +43,9 @@ export const getSeoData = async (
   return Cache.wrap(
     CacheKey.Seo(url),
     locale,
-    getSeoDataHandler({ url, locale, currency, headers })
+    getSeoDataHandler({ url, locale, currency, headers }),
+    {
+      compressed: true
+    }
   );
 };

package/data/server/special-page.ts

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

package/data/server/widget.ts

@@ -44,6 +44,9 @@ export const getWidgetData = async <T>({
     CacheKey.Widget(slug),
     locale,
     getWidgetDataHandler(slug, locale, currency, headers),
-    cacheOptions
+    {
+      compressed: true,
+      ...cacheOptions
+    }
   );
 };

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/jest.config.js

@@ -1,13 +1,19 @@
 const path = require('path');
+const findBaseDir = require('./utils/find-base-dir');
+
+const baseDir = findBaseDir();
 
 module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
   rootDir: path.resolve(__dirname),
-  roots: [],
   testMatch: ['**/*.test.ts'],
   testPathIgnorePatterns: [],
+  roots: [path.resolve(__dirname)],
   transformIgnorePatterns: [],
+  moduleNameMapper: {
+    '^settings$': path.resolve(baseDir, 'src/settings.js')
+  },
   transform: {
     '^.+\\.(tsx?|jsx?|mjs?)$': [
       'ts-jest',