@akinon/next 1.48.0-rc.0 → 1.48.0-rc.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @akinon/next
 
+## 1.48.0-rc.1
+
+### Minor Changes
+
+- fdd0b41: ZERO-2706: Add optimized translation support
+
 ## 1.48.0-rc.0
 
 ### Minor Changes

package/bin/pz-generate-translations.js

@@ -0,0 +1,41 @@
+#!/usr/bin/env node
+
+const fs = require('fs');
+const path = require('path');
+const localesPath = path.resolve(`public/locales/`);
+
+async function generateTranslationIndex(locale_) {
+  let translations = {};
+
+  try {
+    const localeDirPath = path.resolve(`public/locales/${locale_}`);
+    const fileNames = fs.readdirSync(localeDirPath);
+
+    for await (const fileName of fileNames) {
+      if (fileName === 'index.json') {
+        continue;
+      }
+
+      const data = fs.readFileSync(
+        path.join(localeDirPath, `/${fileName}`),
+        'utf-8'
+      );
+
+      translations[fileName.substring(0, fileName.lastIndexOf('.'))] =
+        JSON.parse(data);
+    }
+
+    fs.writeFileSync(
+      path.resolve(`public/locales/${locale_}/index.json`),
+      JSON.stringify(translations)
+    );
+  } catch (error) {
+    console.error(error);
+  }
+}
+
+const localePaths = fs.readdirSync(localesPath);
+
+localePaths.forEach((localePath) => {
+  generateTranslationIndex(localePath);
+});

package/bin/pz-prebuild.js

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

package/bin/pz-predev.js

@@ -5,3 +5,4 @@ const runScript = require('./run-script');
 runScript('pz-install-extensions.js');
 runScript('pz-check-env.js');
 runScript('pz-install-theme.js');
+runScript('pz-generate-translations.js');

package/components/pz-root.tsx

@@ -3,17 +3,29 @@ import ClientRoot from './client-root';
 import { cookies } from 'next/headers';
 import PzProviders from './pz-providers';
 import { WebVitals } from './web-vitals';
+import settings from 'settings';
 
-export default function PzRoot({
+export default async function PzRoot({
   translations,
-  children
+  children,
+  locale
 }: {
-  translations: any;
+  translations?: any;
   children: React.ReactNode;
+  locale?: string;
 }) {
   const nextCookies = cookies();
   const sessionid = nextCookies.get('osessionid')?.value;
 
+  if (!translations) {
+    const { getTranslations } =
+      settings.useOptimizedTranslations && locale
+        ? require('translations')
+        : require('../utils/server-translation');
+
+    translations = await getTranslations(locale);
+  }
+
   return (
     <PzProviders translations={translations}>
       <WebVitals />

package/data/server/category.ts

@@ -5,26 +5,32 @@ 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(
   pk: number,
-  searchParams?: { [key: string]: string | string[] | undefined },
+  locale: string,
+  currency: string,
+  searchParams?: URLSearchParams,
   headers?: Record<string, string>
 ) {
   return async function () {
     const params = generateCommerceSearchParams(searchParams);
 
-    const rawData = await appFetch<string>(
-      `${category.getCategoryByPk(pk)}${params ? params : ''}`,
-      {
+    const rawData = await appFetch<string>({
+      url: `${category.getCategoryByPk(pk)}${params ? params : ''}`,
+      locale,
+      currency,
+      init: {
         headers: {
           Accept: 'application/json',
           'Content-Type': 'application/json',
           ...(headers ?? {})
         }
       },
-      FetchResponseType.TEXT
-    );
+      responseType: FetchResponseType.TEXT
+    });
 
     let data: GetCategoryResponse;
 
@@ -58,15 +64,17 @@ function getCategoryDataHandler(
       return { data, breadcrumbData: undefined };
     }
 
-    const breadcrumbData = await appFetch<any>(
-      product.breadcrumbUrl(menuItemModel),
-      {
+    const breadcrumbData = await appFetch<any>({
+      url: product.breadcrumbUrl(menuItemModel),
+      locale,
+      currency,
+      init: {
         headers: {
           Accept: 'application/json',
           'Content-Type': 'application/json'
         }
       }
-    );
+    });
 
     return { data, breadcrumbData: breadcrumbData?.menu };
   };
@@ -75,33 +83,44 @@ function getCategoryDataHandler(
 export const getCategoryData = ({
   pk,
   searchParams,
-  headers
+  headers,
+  locale = ServerVariables.locale,
+  currency = ServerVariables.currency
 }: {
   pk: number;
-  searchParams?: { [key: string]: string | string[] | undefined };
+  locale?: string;
+  currency?: string;
+  searchParams?: URLSearchParams;
   headers?: Record<string, string>;
 }) => {
   return Cache.wrap(
     CacheKey.Category(pk, searchParams, headers),
-    getCategoryDataHandler(pk, searchParams, headers),
+    locale,
+    getCategoryDataHandler(pk, locale, currency, searchParams, headers),
     {
       expire: 300
     }
   );
 };
 
-function getCategoryBySlugDataHandler(slug: string) {
+function getCategoryBySlugDataHandler(
+  slug: string,
+  locale: string,
+  currency: string
+) {
   return async function () {
-    const rawData = await appFetch<string>(
-      category.getCategoryBySlug(slug),
-      {
+    const rawData = await appFetch<string>({
+      url: category.getCategoryBySlug(slug),
+      locale,
+      currency,
+      init: {
         headers: {
           Accept: 'application/json',
           'Content-Type': 'application/json'
         }
       },
-      FetchResponseType.TEXT
-    );
+      responseType: FetchResponseType.TEXT
+    });
 
     let data: GetCategoryResponse;
 
@@ -129,10 +148,15 @@ function getCategoryBySlugDataHandler(slug: string) {
   };
 }
 
-export const getCategoryBySlugData = async ({ slug }) => {
+export const getCategoryBySlugData = async ({
+  slug,
+  locale = ServerVariables.locale,
+  currency = ServerVariables.currency
+}) => {
   return Cache.wrap(
     CacheKey.CategorySlug(slug),
-    getCategoryBySlugDataHandler(slug),
+    locale,
+    getCategoryBySlugDataHandler(slug, locale, currency),
     {
       expire: 300
     }

package/data/server/flatpage.ts

@@ -2,13 +2,23 @@ import { flatpage } from '../urls';
 import { FlatPage } from '../../types';
 import appFetch from '../../utils/app-fetch';
 import { Cache, CacheKey } from '../../lib/cache';
+import { ServerVariables } from '../../utils/server-variables';
 
-const getFlatPageDataHandler = (pk: number) => {
+const getFlatPageDataHandler = (
+  pk: number,
+  locale: string,
+  currency: string
+) => {
   return async function () {
-    const data = await appFetch<FlatPage>(flatpage.getFlatPageByPk(pk), {
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json'
+    const data = await appFetch<FlatPage>({
+      url: flatpage.getFlatPageByPk(pk),
+      locale,
+      currency,
+      init: {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json'
+        }
       }
     });
 
@@ -16,6 +26,18 @@ const getFlatPageDataHandler = (pk: number) => {
   };
 };
 
-export const getFlatPageData = ({ pk }: { pk: number }) => {
-  return Cache.wrap(CacheKey.FlatPage(pk), getFlatPageDataHandler(pk));
+export const getFlatPageData = ({
+  pk,
+  locale = ServerVariables.locale,
+  currency = ServerVariables.currency
+}: {
+  pk: number;
+  locale?: string;
+  currency?: string;
+}) => {
+  return Cache.wrap(
+    CacheKey.FlatPage(pk),
+    locale,
+    getFlatPageDataHandler(pk, locale, currency)
+  );
 };

package/data/server/form.ts

@@ -1,15 +1,21 @@
-import { Cache, CacheKey } from "../../lib/cache";
-import { FormType } from "../../types/commerce/form";
+import { Cache, CacheKey } from '../../lib/cache';
+import { FormType } from '../../types/commerce/form';
 
-import appFetch from "../../utils/app-fetch";
-import { form } from "../urls";
+import appFetch from '../../utils/app-fetch';
+import { ServerVariables } from '../../utils/server-variables';
+import { form } from '../urls';
 
-const getFormDataHandler = (pk: number) => {
+const getFormDataHandler = (pk: number, locale: string, currency: string) => {
   return async function () {
-    const data = await appFetch<FormType>(form.getForm(pk), {
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json'
+    const data = await appFetch<FormType>({
+      url: form.getForm(pk),
+      locale,
+      currency,
+      init: {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json'
+        }
       }
     });
 
@@ -17,6 +23,18 @@ const getFormDataHandler = (pk: number) => {
   };
 };
 
-export const getFormData = ({ pk }: { pk: number }) => {
-  return Cache.wrap(CacheKey.Form(pk), getFormDataHandler(pk));
+export const getFormData = ({
+  pk,
+  locale = ServerVariables.locale,
+  currency = ServerVariables.currency
+}: {
+  pk: number;
+  locale?: string;
+  currency?: string;
+}) => {
+  return Cache.wrap(
+    CacheKey.Form(pk),
+    locale,
+    getFormDataHandler(pk, locale, currency)
+  );
 };

package/data/server/landingpage.ts

@@ -2,23 +2,42 @@ import { landingpage } from '../urls';
 import { LandingPage } from '../../types/commerce/landingpage';
 import appFetch from '../../utils/app-fetch';
 import { Cache, CacheKey } from '../../lib/cache';
+import { ServerVariables } from '../../utils/server-variables';
 
-const getLandingPageHandler = (pk: number) => {
+const getLandingPageHandler = (
+  pk: number,
+  locale: string,
+  currency: string
+) => {
   return async function () {
-    const data = await appFetch<LandingPage>(
-      landingpage.getLandingPageByPk(pk),
-      {
+    const data = await appFetch<LandingPage>({
+      url: landingpage.getLandingPageByPk(pk),
+      locale,
+      currency,
+      init: {
         headers: {
           Accept: 'application/json',
           'Content-Type': 'application/json'
         }
       }
-    );
+    });
 
     return data;
   };
 };
 
-export const getLandingPageData = ({ pk }: { pk: number }) => {
-  return Cache.wrap(CacheKey.LandingPage(pk), getLandingPageHandler(pk));
+export const getLandingPageData = ({
+  pk,
+  locale = ServerVariables.locale,
+  currency = ServerVariables.currency
+}: {
+  pk: number;
+  locale?: string;
+  currency?: string;
+}) => {
+  return Cache.wrap(
+    CacheKey.LandingPage(pk),
+    locale,
+    getLandingPageHandler(pk, locale, currency)
+  );
 };

package/data/server/list.ts

@@ -5,25 +5,30 @@ import { generateCommerceSearchParams } from '../../utils';
 import appFetch, { FetchResponseType } from '../../utils/app-fetch';
 import { parse } from 'lossless-json';
 import logger from '../../utils/log';
+import { ServerVariables } from '../../utils/server-variables';
 
 const getListDataHandler = (
-  searchParams: { [key: string]: string | string[] | undefined },
+  locale,
+  currency,
+  searchParams: URLSearchParams,
   headers?: Record<string, string>
 ) => {
   return async function () {
     const params = generateCommerceSearchParams(searchParams);
 
-    const rawData = await appFetch<string>(
-      `${category.list}${params}`,
-      {
+    const rawData = await appFetch<string>({
+      url: `${category.list}${params}`,
+      locale,
+      currency,
+      init: {
         headers: {
           Accept: 'application/json',
           'Content-Type': 'application/json',
           ...(headers ?? {})
         }
       },
-      FetchResponseType.TEXT
-    );
+      responseType: FetchResponseType.TEXT
+    });
 
     let data: GetCategoryResponse;
 
@@ -51,15 +56,20 @@ const getListDataHandler = (
 };
 
 export const getListData = async ({
+  locale = ServerVariables.locale,
+  currency = ServerVariables.currency,
   searchParams,
   headers
 }: {
-  searchParams: { [key: string]: string | string[] | undefined };
+  locale?: string;
+  currency?: string;
+  searchParams: URLSearchParams;
   headers?: Record<string, string>;
 }) => {
   return Cache.wrap(
     CacheKey.List(searchParams, headers),
-    getListDataHandler(searchParams, headers),
+    locale,
+    getListDataHandler(locale, currency, searchParams, headers),
     {
       expire: 300
     }

package/data/server/menu.ts

@@ -1,6 +1,7 @@
 import { Cache, CacheKey } from '../../lib/cache';
 import { MenuItemType } from '../../types';
 import appFetch from '../../utils/app-fetch';
+import { ServerVariables } from '../../utils/server-variables';
 import { misc } from '../urls';
 
 interface MenuResponse {
@@ -8,6 +9,8 @@ interface MenuResponse {
 }
 
 interface MenuHandlerParams {
+  locale?: string;
+  currency?: string;
   depth?: number;
   parent?: string;
 }
@@ -15,9 +18,18 @@ interface MenuHandlerParams {
 const DEFAULT_DEPTH = 3;
 
 const getMenuHandler =
-  ({ depth, parent }: MenuHandlerParams = { depth: DEFAULT_DEPTH }) =>
+  ({
+    locale = ServerVariables.locale,
+    currency = ServerVariables.currency,
+    depth,
+    parent
+  }: MenuHandlerParams = {}) =>
   async () => {
-    const response = await appFetch<MenuResponse>(misc.menus(depth, parent));
+    const response = await appFetch<MenuResponse>({
+      url: misc.menus(depth ?? DEFAULT_DEPTH, parent),
+      locale,
+      currency
+    });
 
     return response?.menu;
   };
@@ -30,6 +42,7 @@ const getMenuHandler =
 export const getMenu = async (params?: MenuHandlerParams) => {
   return Cache.wrap(
     CacheKey.Menu(params?.depth ?? DEFAULT_DEPTH, params?.parent),
+    params?.locale ?? ServerVariables.locale,
     getMenuHandler(params)
   );
 };

package/data/server/product.ts

@@ -2,16 +2,21 @@ import { Cache, CacheKey } from '../../lib/cache';
 import { product } from '../urls';
 import { ProductCategoryResult, ProductResult } from '../../types';
 import appFetch from '../../utils/app-fetch';
+import { ServerVariables } from '../../utils/server-variables';
 import logger from '../../utils/log';
 
 type GetProduct = {
   pk: number;
-  searchParams?: { [key: string]: string | string[] | undefined };
+  locale?: string;
+  currency?: string;
+  searchParams?: URLSearchParams;
   groupProduct?: boolean;
 };
 
 const getProductDataHandler = ({
   pk,
+  locale,
+  currency,
   searchParams,
   groupProduct
 }: GetProduct) => {
@@ -28,24 +33,31 @@ const getProductDataHandler = ({
           .join('&');
     }
 
-    const data = await appFetch<ProductResult>(url, {
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json'
+    const data = await appFetch<ProductResult>({
+      url,
+      locale,
+      currency,
+      init: {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json'
+        }
       }
     });
 
     const categoryUrl = product.categoryUrl(data.product.pk);
 
-    const productCategoryData = await appFetch<ProductCategoryResult>(
-      categoryUrl,
-      {
+    const productCategoryData = await appFetch<ProductCategoryResult>({
+      url: categoryUrl,
+      locale,
+      currency,
+      init: {
         headers: {
           Accept: 'application/json',
           'Content-Type': 'application/json'
         }
       }
-    );
+    });
 
     const menuItemModel = productCategoryData?.results[0]?.menuitemmodel;
 
@@ -59,10 +71,15 @@ const getProductDataHandler = ({
 
     const breadcrumbUrl = product.breadcrumbUrl(menuItemModel);
 
-    const breadcrumbData = await appFetch<any>(breadcrumbUrl, {
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json'
+    const breadcrumbData = await appFetch<any>({
+      url: breadcrumbUrl,
+      locale,
+      currency,
+      init: {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json'
+        }
       }
     });
 
@@ -75,12 +92,18 @@ const getProductDataHandler = ({
 
 export const getProductData = async ({
   pk,
+  locale = ServerVariables.locale,
+  currency = ServerVariables.currency,
   searchParams,
   groupProduct
 }: GetProduct) => {
   return Cache.wrap(
-    CacheKey[groupProduct ? 'GroupProduct' : 'Product'](pk, searchParams ?? {}),
-    getProductDataHandler({ pk, searchParams, groupProduct }),
+    CacheKey[groupProduct ? 'GroupProduct' : 'Product'](
+      pk,
+      searchParams ?? new URLSearchParams()
+    ),
+    locale,
+    getProductDataHandler({ pk, locale, currency, searchParams, groupProduct }),
     {
       expire: 300
     }

package/data/server/seo.ts

@@ -1,23 +1,15 @@
 import appFetch from '../../utils/app-fetch';
 import { Cache, CacheKey } from '../../lib/cache';
 import { misc } from '../../data/urls';
-import logger from '../../utils/log';
+import { ServerVariables } from '../../utils/server-variables';
 
-function getRootSeoDataHandler() {
-  return async function () {
-    let data = {};
-
-    try {
-      data = await appFetch<{ [key: string]: string }>(misc.cmsSeo('/'));
-    } catch (error) {
-      logger.error('Error while fetching root seo data', error);
-    }
-
-    return data;
-  };
+interface SeoDataParams {
+  url: string;
+  locale?: string;
+  currency?: string;
 }
 
-function getSeoDataHandler(url: string) {
+function getSeoDataHandler({ url, locale, currency }: SeoDataParams) {
   return async function () {
     let data = {} as {
       title: string;
@@ -27,7 +19,7 @@ function getSeoDataHandler(url: string) {
     };
 
     try {
-      data = await appFetch(misc.cmsSeo(url));
+      data = await appFetch({ url: misc.cmsSeo(url), locale, currency });
     } catch (error) {
       // logger.error('Error while fetching seo data', { url, error });
     }
@@ -36,13 +28,14 @@ function getSeoDataHandler(url: string) {
   };
 }
 
-/**
- * @deprecated Use getSeoData instead
- */
-export const getRootSeo = async () => {
-  return Cache.wrap(CacheKey.RootSeo, getRootSeoDataHandler());
-};
-
-export const getSeoData = async (url: string) => {
-  return Cache.wrap(CacheKey.Seo(url), getSeoDataHandler(url));
+export const getSeoData = async (
+  url,
+  locale = ServerVariables.locale,
+  currency = ServerVariables.currency
+) => {
+  return Cache.wrap(
+    CacheKey.Seo(url),
+    locale,
+    getSeoDataHandler({ url, locale, currency })
+  );
 };

package/data/server/special-page.ts

@@ -4,25 +4,30 @@ import { GetCategoryResponse } from '../../types';
 import { generateCommerceSearchParams } from '../../utils';
 import appFetch from '../../utils/app-fetch';
 import header from '../../redux/reducers/header';
+import { ServerVariables } from '../../utils/server-variables';
 
 const getSpecialPageDataHandler = (
   pk: number,
-  searchParams: { [key: string]: string | string[] | undefined },
+  locale: string,
+  currency: string,
+  searchParams: URLSearchParams,
   headers?: Record<string, string>
 ) => {
   return async function () {
     const params = generateCommerceSearchParams(searchParams);
 
-    const data: GetCategoryResponse = await appFetch(
-      `${category.getSpecialPageByPk(pk)}${params}`,
-      {
+    const data: GetCategoryResponse = await appFetch({
+      url: `${category.getSpecialPageByPk(pk)}${params}`,
+      locale,
+      currency,
+      init: {
         headers: {
           Accept: 'application/json',
           'Content-Type': 'application/json',
           ...(headers ?? {})
         }
       }
-    );
+    });
 
     return data;
   };
@@ -30,16 +35,21 @@ const getSpecialPageDataHandler = (
 
 export const getSpecialPageData = async ({
   pk,
+  locale = ServerVariables.locale,
+  currency = ServerVariables.currency,
   searchParams,
   headers
 }: {
   pk: number;
-  searchParams: { [key: string]: string | string[] | undefined };
+  locale?: string;
+  currency?: string;
+  searchParams: URLSearchParams;
   headers?: Record<string, string>;
 }) => {
   return Cache.wrap(
     CacheKey.SpecialPage(pk, searchParams, headers),
-    getSpecialPageDataHandler(pk, searchParams, headers),
+    locale,
+    getSpecialPageDataHandler(pk, locale, currency, searchParams, headers),
     {
       expire: 300
     }

package/data/server/widget.ts

@@ -3,25 +3,32 @@ import 'server-only';
 import { CacheOptions, WidgetResultType } from '../../types';
 import appFetch from '../../utils/app-fetch';
 import { widgets } from '../urls';
+import { ServerVariables } from '../../utils/server-variables';
 
-const getWidgetDataHandler = (slug: string) => async () => {
-  if (!slug) {
-    return null;
-  }
+const getWidgetDataHandler =
+  (slug: string, locale: string, currency: string) => async () => {
+    if (!slug) {
+      return null;
+    }
 
-  return await appFetch(widgets.getWidget(slug));
-};
+    return await appFetch({ url: widgets.getWidget(slug), locale, currency });
+  };
 
 export const getWidgetData = async <T>({
   slug,
+  locale = ServerVariables.locale,
+  currency = ServerVariables.currency,
   cacheOptions
 }: {
   slug: string;
+  locale?: string;
+  currency?: string;
   cacheOptions?: CacheOptions;
 }): Promise<WidgetResultType<T>> => {
   return Cache.wrap(
     CacheKey.Widget(slug),
-    getWidgetDataHandler(slug),
+    locale,
+    getWidgetDataHandler(slug, locale, currency),
     cacheOptions
   );
 };

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

@@ -2,7 +2,6 @@ import settings from 'settings';
 import { LayoutProps, PageProps, RootLayoutProps } from '../../types';
 import { redirect } from 'next/navigation';
 import { ServerVariables } from '../../utils/server-variables';
-import { getTranslations } from '../../utils/server-translation';
 import { ROUTES } from 'routes';
 import logger from '../../utils/log';
 
@@ -50,7 +49,11 @@ const addRootLayoutProps = async (componentProps: RootLayoutProps) => {
     return redirect(ROUTES.HOME);
   }
 
+  const { getTranslations } = settings.useOptimizedTranslations
+    ? require('translations')
+    : require('../../utils/server-translation');
   const translations = await getTranslations(params.locale);
+
   componentProps.translations = translations;
 
   const locale = settings.localization.locales.find(

package/lib/cache.ts

@@ -3,7 +3,6 @@ import { RedisClientType } from 'redis';
 import Settings from 'settings';
 import { CacheOptions } from '../types';
 import logger from '../utils/log';
-import { ServerVariables } from '../utils/server-variables';
 
 const hashCacheKey = (object?: Record<string, string>) => {
   if (!object) {
@@ -20,16 +19,13 @@ const hashCacheKey = (object?: Record<string, string>) => {
   return `_${encodeURIComponent(cacheKey)}`;
 };
 export const CacheKey = {
-  List: (
-    searchParams: { [key: string]: string | string[] | undefined },
-    headers?: Record<string, string>
-  ) =>
+  List: (searchParams: URLSearchParams, headers?: Record<string, string>) =>
     `list_${encodeURIComponent(JSON.stringify(searchParams))}${hashCacheKey(
       headers
     )}`,
   Category: (
     pk: number,
-    searchParams?: { [key: string]: string | string[] | undefined },
+    searchParams?: URLSearchParams,
     headers?: Record<string, string>
   ) =>
     `category_${pk}_${encodeURIComponent(
@@ -38,20 +34,15 @@ export const CacheKey = {
   CategorySlug: (slug: string) => `category_${slug}`,
   SpecialPage: (
     pk: number,
-    searchParams: { [key: string]: string | string[] | undefined },
+    searchParams: URLSearchParams,
     headers?: Record<string, string>
   ) =>
     `special_page_${pk}_${encodeURIComponent(
       JSON.stringify(searchParams)
     )}${hashCacheKey(headers)}`,
-  Product: (
-    pk: number,
-    searchParams: { [key: string]: string | string[] | undefined }
-  ) => `product_${pk}_${encodeURIComponent(JSON.stringify(searchParams))}`,
-  GroupProduct: (
-    pk: number,
-    searchParams: { [key: string]: string | string[] | undefined }
-  ) =>
+  Product: (pk: number, searchParams: URLSearchParams) =>
+    `product_${pk}_${encodeURIComponent(JSON.stringify(searchParams))}`,
+  GroupProduct: (pk: number, searchParams: URLSearchParams) =>
     `group_product_${pk}_${encodeURIComponent(JSON.stringify(searchParams))}`,
   FlatPage: (pk: number) => `flat_page_${pk}`,
   LandingPage: (pk: number) => `landing_page_${pk}`,
@@ -67,10 +58,8 @@ export const CacheKey = {
 export class Cache {
   static PROXY_URL = `${process.env.NEXT_PUBLIC_URL}/api/cache`;
 
-  static formatKey(key: string) {
-    return encodeURIComponent(
-      `${Settings.commerceUrl}_${ServerVariables.locale}_${key}`
-    );
+  static formatKey(key: string, locale: string) {
+    return encodeURIComponent(`${Settings.commerceUrl}_${locale}_${key}`);
   }
 
   static clientPool: Pool<RedisClientType> = createPool(
@@ -163,6 +152,7 @@ export class Cache {
 
   static async wrap<T = any>(
     key: string,
+    locale: string,
     handler: () => Promise<T>,
     options?: CacheOptions
   ): Promise<T> {
@@ -186,7 +176,7 @@ export class Cache {
     };
 
     const _options = Object.assign(defaultOptions, options);
-    const formattedKey = Cache.formatKey(key);
+    const formattedKey = Cache.formatKey(key, locale);
 
     logger.debug('Cache wrap', { key, formattedKey, _options });
 

package/middlewares/pretty-url.ts

@@ -43,9 +43,14 @@ const resolvePrettyUrlHandler =
     return prettyUrlResult;
   };
 
-const resolvePrettyUrl = async (pathname: string, ip: string | null) => {
+const resolvePrettyUrl = async (
+  pathname: string,
+  locale: string,
+  ip: string | null
+) => {
   return Cache.wrap(
     CacheKey.PrettyUrl(pathname),
+    locale,
     resolvePrettyUrlHandler(pathname, ip),
     {
       useProxy: true
@@ -88,6 +93,7 @@ const withPrettyUrl =
       )
         ? url.pathname
         : prettyUrlPathname,
+      matchedLanguagePrefix,
       ip
     );
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.48.0-rc.0",
+  "version": "1.48.0-rc.1",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -30,7 +30,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.48.0-rc.0",
+    "@akinon/eslint-plugin-projectzero": "1.48.0-rc.1",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
     "@typescript-eslint/eslint-plugin": "6.7.4",

package/routes/pretty-url.tsx

@@ -63,14 +63,12 @@ export async function generateMetadata({ params }: PageProps) {
     .filter((x) => !x.startsWith('searchparams'))
     .join('/');
 
-  const searchParams = Object.fromEntries(
-    new URLSearchParams(
-      decodeURIComponent(
-        prettyurl
-          .find((x) => x.startsWith('searchparams'))
-          ?.replace('searchparams%7C', '')
-      ) ?? {}
-    ).entries()
+  const searchParams = new URLSearchParams(
+    decodeURIComponent(
+      prettyurl
+        .find((x) => x.startsWith('searchparams'))
+        ?.replace('searchparams%7C', '')
+    ) ?? {}
   );
 
   const prettyUrlResult = await resolvePrettyUrlHandler(pageSlug, null)();
@@ -162,7 +160,7 @@ export default async function Page({ params }) {
       ...params,
       pk: result.pk
     },
-    searchParams
+    searchParams: new URLSearchParams(searchParams)
   };
 
   if (result.path.startsWith('/category/')) {

package/types/index.ts

@@ -191,6 +191,7 @@ export interface Settings {
     masterpassJsUrl?: string;
   };
   customNotFoundEnabled: boolean;
+  useOptimizedTranslations?: boolean;
   plugins?: Record<string, Record<string, any>>;
   includedProxyHeaders?: string[];
 }
@@ -224,8 +225,8 @@ export type ImageOptions = CDNOptions & {
 export type Translations = { [key: string]: object };
 
 export interface PageProps<T = any> {
-  params: T;
-  searchParams: { [key: string]: string | string[] | undefined };
+  params: T & { locale: string; currency: string };
+  searchParams: URLSearchParams;
 }
 
 export interface LayoutProps<T = any> extends PageProps<T> {
@@ -233,7 +234,11 @@ export interface LayoutProps<T = any> extends PageProps<T> {
 }
 
 export interface RootLayoutProps<
-  T = { commerce: string; locale: string; currency: string }
+  T = {
+    commerce: string;
+    locale: string;
+    currency: string;
+  }
 > extends LayoutProps<T> {
   translations: Translations;
   locale: Locale & {

package/utils/app-fetch.ts

@@ -1,18 +1,26 @@
 import Settings from 'settings';
-import { ServerVariables } from './server-variables';
 import logger from '../utils/log';
 import { headers, cookies } from 'next/headers';
+import { ServerVariables } from './server-variables';
 
 export enum FetchResponseType {
   JSON = 'json',
   TEXT = 'text'
 }
 
-const appFetch = async <T>(
-  url: RequestInfo,
-  init: RequestInit = {},
+const appFetch = async <T>({
+  url,
+  locale,
+  currency,
+  init = {},
   responseType = FetchResponseType.JSON
-): Promise<T> => {
+}: {
+  url: RequestInfo;
+  locale: string;
+  currency: string;
+  init?: RequestInit;
+  responseType?: FetchResponseType;
+}): Promise<T> => {
   let response: T;
   let status: number;
   let ip = '';
@@ -24,7 +32,7 @@ const appFetch = async <T>(
 
     const commerceUrl = Settings.commerceUrl;
     const currentLocale = Settings.localization.locales.find(
-      (locale) => locale.value === ServerVariables.locale
+      (l) => l.value === locale
     );
 
     if (commerceUrl === 'default') {
@@ -38,7 +46,7 @@ const appFetch = async <T>(
       ...(init.headers ?? {}),
       ...(ServerVariables.globalHeaders ?? {}),
       'Accept-Language': currentLocale.apiValue,
-      'x-currency': ServerVariables.currency,
+      'x-currency': currency,
       'x-forwarded-for': ip,
       cookie: nextCookies.toString()
     };

package/utils/generate-commerce-search-params.ts

@@ -1,15 +1,13 @@
 import logger from './log';
 
-export const generateCommerceSearchParams = (searchParams?: {
-  [key: string]: string | string[] | undefined;
-}) => {
+export const generateCommerceSearchParams = (
+  searchParams?: URLSearchParams
+) => {
   if (!searchParams) {
     return null;
   }
 
-  const urlSerchParams = new URLSearchParams(
-    searchParams as Record<string, string>
-  );
+  const urlSerchParams = new URLSearchParams(searchParams);
 
   Object.entries(searchParams).forEach(([key, value]) => {
     if (typeof value === 'object') {

package/utils/server-translation.ts

@@ -5,7 +5,6 @@ import { getTranslateFn } from '../utils';
 import { Translations } from '../types';
 import settings from 'settings';
 import logger from './log';
-import { unstable_cache } from 'next/cache';
 
 export const translations: Translations = {};
 
@@ -52,10 +51,17 @@ export async function getTranslations(locale_: string) {
   return translations;
 }
 
-export const getCachedTranslations = unstable_cache(async (locale: string) =>
-  getTranslations(locale)
-);
-
 export function t(path: string) {
   return getTranslateFn(path, translations);
 }
+
+export async function t_(path: string, locale?: string) {
+  let translations_ = translations;
+
+  if (settings.useOptimizedTranslations && locale) {
+    const { getTranslations } = require('translations');
+    translations_ = await getTranslations(locale);
+  }
+
+  return getTranslateFn(path, translations_);
+}

package/with-pz-config.js

@@ -57,7 +57,8 @@ const defaultConfig = {
       ...pzPlugins.reduce((acc, plugin) => {
         acc[`@akinon/${plugin}`] = false;
         return acc;
-      }, {})
+      }, {}),
+      translations: false
     };
     return config;
   },