@akinon/next 1.41.0-rc.1 → 1.41.0

package/CHANGELOG.md

@@ -1,25 +1,10 @@
 # @akinon/next
 
-## 1.41.0-rc.1
+## 1.41.0
 
 ### Minor Changes
 
-- 98bb8dc: ZERO-2706: Cache getTranlations method
-
-## 1.41.0-rc.0
-
-### Minor Changes
-
-- a4c8d6a: ZERO-2663: Fix the image url for gif and svgs and return them without options
-- c53ea3e: ZERO-2609: Reset additional form fields when selectedFormType is not company
-- c53ef7b: ZERO-2668: The Link component has been updated to improve the logic for handling href values. Previously, if the href was not a string or started with 'http', it would return the href as is. Now, if the href is not provided, it will default to '#' to prevent any potential errors. Additionally, if the href is a string and does not start with 'http', it will be formatted with the locale and pathname, based on the localeUrlStrategy and defaultLocaleValue. This ensures that the correct href is generated based on the localization settings.
-- 1448a96: ZERO-2612: add errors type in CheckoutState
-- 75080fd: ZERO-2630: Add max limit to postcode area
-- 91265bb: ZERO-2551: Improve pretty url and caching performance
-- bbe18b9: ZERO-2575: Fix build error
-- dff0d59: ZERO-2659: add formData support to proxy api requests
-- beb499e: ZERO-2551: Add new tsconfig paths
-- f046f8e: ZERO-2575: update version for react-number-format
+- 8f09473: ZERO-2686: create akifast plugin
 
 ## 1.40.0
 

package/api/client.ts

@@ -78,13 +78,12 @@ async function proxyRequest(...args) {
     fetchOptions.headers['Content-Type'] = options.contentType;
   }
 
-  const isMultipartFormData = req.headers.get('content-type')?.includes('multipart/form-data;');
-
   if (req.method !== 'GET') {
-    let body: Record<string, any> | FormData = {};
+    const formData = new URLSearchParams();
+    let body = {};
 
     try {
-      body = isMultipartFormData ? await req.formData() : await req.json();
+      body = await req.json();
     } catch (error) {
       logger.error(
         `Client Proxy Request - Error while parsing request body to JSON`,
@@ -95,21 +94,13 @@ async function proxyRequest(...args) {
       );
     }
 
-    if (isMultipartFormData) {
-      fetchOptions.body = body as FormData;
-    } else {
-      const formData = new FormData();
-
-      Object.keys(body ?? {}).forEach((key) => {
-        if (body[key]) {
-          formData.append(key, body[key]);
-        }
-      });
+    Object.keys(body ?? {}).forEach((key) => {
+      if (body[key]) {
+        formData.append(key, body[key]);
+      }
+    });
 
-      fetchOptions.body = !options.useFormData
-        ? JSON.stringify(body)
-        : formData;
-    }
+    fetchOptions.body = !options.useFormData ? JSON.stringify(body) : formData;
   }
 
   let url = `${commerceUrl}/${slug.replace(/,/g, '/')}`;

package/components/input.tsx

@@ -1,29 +1,17 @@
 import clsx from 'clsx';
-import { forwardRef, FocusEvent, useState, Ref } from 'react';
+import { forwardRef, FocusEvent, useState } from 'react';
 import { Controller } from 'react-hook-form';
-// @ts-ignore
-import { PatternFormat, PatternFormatProps } from 'react-number-format';
+import NumberFormat, { NumberFormatProps } from 'react-number-format';
 import { InputProps } from '../types';
 import { twMerge } from 'tailwind-merge';
 
-const PatternFormatWithRef = forwardRef(
-  (props: PatternFormatProps, ref: Ref<HTMLInputElement>) => {
-    return <PatternFormat {...props} getInputRef={ref} />;
-  }
-);
-PatternFormatWithRef.displayName = 'PatternFormatWithRef';
-
 export const Input = forwardRef<
   HTMLInputElement,
   InputProps &
     Pick<
-      PatternFormatProps,
-      'mask' | 'allowEmptyFormatting' | 'onValueChange'
-    > & {
-      format?: string;
-      defaultValue?: string;
-      type?: string;
-    }
+      NumberFormatProps,
+      'format' | 'mask' | 'allowEmptyFormatting' | 'onValueChange'
+    >
 >((props, ref) => {
   const [focused, setFocused] = useState(false);
   const [hasValue, setHasValue] = useState(false);
@@ -49,7 +37,6 @@ export const Input = forwardRef<
     ),
     props.className
   );
-
   const inputProps: any = {
     id,
     ref,
@@ -92,14 +79,14 @@ export const Input = forwardRef<
             <Controller
               name={props.name ?? ''}
               control={props.control}
+              defaultValue={false}
               render={({ field }) => (
-                <PatternFormatWithRef
+                <NumberFormat
                   format={format}
                   mask={mask ?? ''}
                   {...rest}
                   {...field}
                   {...inputProps}
-                  type={props.type as 'text' | 'password' | 'tel'}
                 />
               )}
             />

package/components/link.tsx

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

@@ -4,6 +4,7 @@ import dynamic from 'next/dynamic';
 import plugins from 'plugins';
 import logger from '../utils/log';
 import { useMemo } from 'react';
+import settings from 'settings';
 
 enum Plugin {
   BasketGiftPack = 'pz-basket-gift-pack',
@@ -16,13 +17,15 @@ enum Plugin {
   BKMExpress = 'pz-bkm',
   CreditPayment = 'pz-credit-payment',
   Masterpass = 'pz-masterpass',
-  B2B = 'pz-b2b'
+  B2B = 'pz-b2b',
+  Akifast = 'pz-akifast'
 }
 
 export enum Component {
   BasketGiftPack = 'BasketGiftPack',
   ClickCollect = 'ClickCollect',
   OneClickCheckoutButtons = 'OneClickCheckoutButtons',
+  OneClickProviderButton = 'OneClickCheckoutButton',
   PayOnDelivery = 'PayOnDelivery',
   CheckoutGiftPack = 'CheckoutGiftPack',
   GPay = 'GPayOption',
@@ -36,13 +39,18 @@ export enum Component {
   MasterpassOtpModal = 'MasterpassOtpModal',
   MasterpassLinkModal = 'MasterpassLinkModal',
   MyQuotationsB2B = 'AccountMyQuotations',
-  BasketB2B = 'BasketB2b'
+  BasketB2B = 'BasketB2b',
+  AkifastQuickLoginButton = 'QuickLoginButton',
+  AkifastCheckoutButton = 'CheckoutButton'
 }
 
 const PluginComponents = new Map([
   [Plugin.BasketGiftPack, [Component.BasketGiftPack]],
   [Plugin.ClickCollect, [Component.ClickCollect]],
-  [Plugin.OneClickCheckout, [Component.OneClickCheckoutButtons]],
+  [
+    Plugin.OneClickCheckout,
+    [Component.OneClickCheckoutButtons, Component.OneClickProviderButton]
+  ],
   [Plugin.PayOnDelivery, [Component.PayOnDelivery]],
   [Plugin.CheckoutGiftPack, [Component.CheckoutGiftPack]],
   [Plugin.GPay, [Component.GPay]],
@@ -60,7 +68,11 @@ const PluginComponents = new Map([
       Component.MasterpassLinkModal
     ]
   ],
-  [Plugin.B2B, [Component.MyQuotationsB2B, Component.BasketB2B]]
+  [Plugin.B2B, [Component.MyQuotationsB2B, Component.BasketB2B]],
+  [
+    Plugin.Akifast,
+    [Component.AkifastQuickLoginButton, Component.AkifastCheckoutButton]
+  ]
 ]);
 
 const getPlugin = (component: Component) => {
@@ -81,6 +93,14 @@ export default function PluginModule({
   children?: React.ReactNode;
 }) {
   const plugin = getPlugin(component);
+  const pluginSettings = settings.plugins?.[plugin];
+
+  if (pluginSettings) {
+    props = {
+      ...props,
+      settings: pluginSettings
+    };
+  }
 
   const Component = useMemo(
     () =>
@@ -111,6 +131,8 @@ export default function PluginModule({
               promise = import(`${'@akinon/pz-masterpass'}`);
             } else if (plugin === Plugin.B2B) {
               promise = import(`${'@akinon/pz-b2b'}`);
+            } else if (plugin === Plugin.Akifast) {
+              promise = import(`${'@akinon/pz-akifast'}`);
             }
           } catch (error) {
             logger.error(error);

package/components/price.tsx

@@ -1,12 +1,11 @@
 import { useMemo } from 'react';
-// @ts-ignore
-import { NumericFormat, NumericFormatProps } from 'react-number-format';
+import NumberFormat, { NumberFormatProps } from 'react-number-format';
 import { getCurrency } from '@akinon/next/utils';
 
 import { useLocalization } from '@akinon/next/hooks';
 import { PriceProps } from '../types';
 
-export const Price = (props: NumericFormatProps & PriceProps) => {
+export const Price = (props: NumberFormatProps & PriceProps) => {
   const {
     value,
     currencyCode,
@@ -40,7 +39,7 @@ export const Price = (props: NumericFormatProps & PriceProps) => {
   );
 
   return (
-    <NumericFormat
+    <NumberFormat
       value={useNegative ? `-${useNegativeSpace}${_value}` : _value}
       {...{
         [useCurrencyAfterPrice ? 'suffix' : 'prefix']: currency

package/data/client/account.ts

@@ -123,16 +123,15 @@ const accountApi = api.injectEndpoints({
       query: ({ page, status, limit }) =>
         buildClientRequestUrl(account.getQuotations(page, status, limit))
     }),
-    sendContact: builder.mutation<void, FormData>({
-      query: (body) => {
-        return {
-          url: buildClientRequestUrl(account.sendContact, {
-            useFormData: true
-          }),
-          method: 'POST',
-          body
-        };
-      }
+    sendContact: builder.mutation<void, ContactFormType>({
+      query: (body) => ({
+        url: buildClientRequestUrl(account.sendContact, {
+          contentType: 'application/json',
+          responseType: 'text'
+        }),
+        method: 'POST',
+        body
+      })
     }),
     cancelOrder: builder.mutation<void, AccountOrderCancellation>({
       query: ({ id, ...body }) => ({

package/data/server/category.ts

@@ -8,7 +8,7 @@ import logger from '../../utils/log';
 
 function getCategoryDataHandler(
   pk: number,
-  searchParams?: { [key: string]: string | string[] | undefined },
+  searchParams?: URLSearchParams,
   headers?: Record<string, string>
 ) {
   return async function () {
@@ -78,7 +78,7 @@ export const getCategoryData = ({
   headers
 }: {
   pk: number;
-  searchParams?: { [key: string]: string | string[] | undefined };
+  searchParams?: URLSearchParams;
   headers?: Record<string, string>;
 }) => {
   return Cache.wrap(

package/data/server/list.ts

@@ -7,7 +7,7 @@ import { parse } from 'lossless-json';
 import logger from '../../utils/log';
 
 const getListDataHandler = (
-  searchParams: { [key: string]: string | string[] | undefined },
+  searchParams: URLSearchParams,
   headers?: Record<string, string>
 ) => {
   return async function () {
@@ -54,7 +54,7 @@ export const getListData = async ({
   searchParams,
   headers
 }: {
-  searchParams: { [key: string]: string | string[] | undefined };
+  searchParams: URLSearchParams;
   headers?: Record<string, string>;
 }) => {
   return Cache.wrap(

package/data/server/product.ts

@@ -9,7 +9,7 @@ import appFetch from '../../utils/app-fetch';
 
 type GetProduct = {
   pk: number;
-  searchParams?: { [key: string]: string | string[] | undefined };
+  searchParams?: URLSearchParams;
   groupProduct?: boolean;
 };
 
@@ -74,7 +74,10 @@ export const getProductData = async ({
   groupProduct
 }: GetProduct) => {
   return Cache.wrap(
-    CacheKey[groupProduct ? 'GroupProduct' : 'Product'](pk, searchParams ?? {}),
+    CacheKey[groupProduct ? 'GroupProduct' : 'Product'](
+      pk,
+      searchParams ?? new URLSearchParams()
+    ),
     getProductDataHandler({ pk, searchParams, groupProduct }),
     {
       expire: 300

package/data/server/special-page.ts

@@ -7,7 +7,7 @@ import header from '../../redux/reducers/header';
 
 const getSpecialPageDataHandler = (
   pk: number,
-  searchParams: { [key: string]: string | string[] | undefined },
+  searchParams: URLSearchParams,
   headers?: Record<string, string>
 ) => {
   return async function () {
@@ -34,7 +34,7 @@ export const getSpecialPageData = async ({
   headers
 }: {
   pk: number;
-  searchParams: { [key: string]: string | string[] | undefined };
+  searchParams: URLSearchParams;
   headers?: Record<string, string>;
 }) => {
   return Cache.wrap(

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

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

package/lib/cache.ts

@@ -20,16 +20,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 +35,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}`,
@@ -166,10 +158,6 @@ export class Cache {
     handler: () => Promise<T>,
     options?: CacheOptions
   ): Promise<T> {
-    if (Settings.usePrettyUrlRoute) {
-      return await handler();
-    }
-
     const requiredVariables = [
       process.env.CACHE_HOST,
       process.env.CACHE_PORT,

package/middlewares/default.ts

@@ -203,15 +203,6 @@ const withPzDefault =
                               );
                             }
 
-                            if (
-                              Settings.usePrettyUrlRoute &&
-                              url.searchParams.toString().length > 0
-                            ) {
-                              url.pathname =
-                                url.pathname +
-                                `searchparams|${url.searchParams.toString()}`;
-                            }
-
                             Settings.rewrites.forEach((rewrite) => {
                               url.pathname = url.pathname.replace(
                                 rewrite.source,

package/middlewares/pretty-url.ts

@@ -56,10 +56,6 @@ const resolvePrettyUrl = async (pathname: string, ip: string | null) => {
 const withPrettyUrl =
   (middleware: NextMiddleware) =>
   async (req: PzNextRequest, event: NextFetchEvent) => {
-    if (Settings.usePrettyUrlRoute) {
-      return middleware(req, event);
-    }
-
     const url = req.nextUrl.clone();
     const matchedLanguagePrefix = url.pathname.match(
       urlLocaleMatcherRegex

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.41.0-rc.1",
+  "version": "1.41.0",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -20,12 +20,11 @@
     "@opentelemetry/sdk-trace-node": "1.19.0",
     "@opentelemetry/semantic-conventions": "1.19.0",
     "@reduxjs/toolkit": "1.9.7",
-    "@neshca/cache-handler": "1.0.7",
     "cross-spawn": "7.0.3",
     "generic-pool": "3.9.0",
     "react-redux": "8.1.3",
     "react-string-replace": "1.1.1",
-    "redis": "4.6.13",
+    "redis": "4.5.1",
     "semver": "7.5.4",
     "set-cookie-parser": "2.6.0"
   },
@@ -35,7 +34,7 @@
     "@typescript-eslint/eslint-plugin": "6.7.4",
     "@typescript-eslint/parser": "6.7.4",
     "eslint": "^8.14.0",
-    "@akinon/eslint-plugin-projectzero": "1.41.0-rc.1",
+    "@akinon/eslint-plugin-projectzero": "1.41.0",
     "eslint-config-prettier": "8.5.0"
   }
 }

package/plugins.js

@@ -9,5 +9,6 @@ module.exports = [
   'pz-bkm',
   'pz-credit-payment',
   'pz-masterpass',
-  'pz-b2b'
+  'pz-b2b',
+  'pz-akifast'
 ];

package/redux/middlewares/checkout.ts

@@ -29,7 +29,7 @@ import { showMobile3dIframe } from '../../utils/mobile-3d-iframe';
 
 interface CheckoutResult {
   payload: {
-    errors?: Record<string, string[]>;
+    errors?: any;
     pre_order?: PreOrder;
     context_list?: CheckoutContext[];
   };

package/redux/reducers/checkout.ts

@@ -18,7 +18,8 @@ import {
 } from '../../types';
 
 export interface CheckoutState {
-  errors: Record<string, string[]>;
+  // TODO: Add types
+  errors: any;
   hasGiftBox: boolean;
   canGuestPurchase: boolean;
   steps: {

package/redux/reducers/config.ts

@@ -6,8 +6,6 @@ import { Config } from '../../types';
 const initialState: Config = {
   user_phone_regex: '^(05)\\d{9}$',
   user_phone_format: '05999999999',
-  user_post_code_regex: '^\\d{5}$',
-  user_post_code_format: '99999',
   country: {
     pk: 1,
     name: 'Türkiye',

package/types/commerce/account.ts

@@ -61,5 +61,4 @@ export type ContactFormType = {
   order?: string;
   country_code?: string;
   order_needed?: boolean;
-  file?: FileList
 };

package/types/commerce/address.ts

@@ -17,7 +17,7 @@ export type AddressFormType = {
   line: string;
   postcode: string;
   company_name?: string;
-  tax_no?: string;
+  tax_no?: number;
   tax_office?: string;
   e_bill_taxpayer?: boolean;
   country_code?: string;

package/types/commerce/misc.ts

@@ -2,8 +2,6 @@ import { District } from './address';
 export interface Config {
   user_phone_regex: string;
   user_phone_format: string;
-  user_post_code_regex: string;
-  user_post_code_format: string;
   country: {
     pk: number;
     name: string;

package/types/index.ts

@@ -8,6 +8,7 @@ declare global {
     // we did it like this because declare types needs to be identical, if not it will fail
     // eslint-disable-next-line @typescript-eslint/ban-types
     dataLayer?: Object[];
+
     [key: string]: any;
   }
 }
@@ -70,7 +71,6 @@ export interface Currency {
 }
 
 export interface Settings {
-  usePrettyUrlRoute?: boolean;
   commerceUrl: string;
   redis: {
     defaultExpirationTime: number;
@@ -183,6 +183,7 @@ export interface Settings {
     masterpassJsUrl?: string;
   };
   customNotFoundEnabled: boolean;
+  plugins?: Record<string, Record<string, any>>;
 }
 
 export interface CacheOptions {
@@ -215,7 +216,7 @@ export type Translations = { [key: string]: object };
 
 export interface PageProps<T = any> {
   params: T;
-  searchParams: { [key: string]: string | string[] | undefined };
+  searchParams: URLSearchParams;
 }
 
 export interface LayoutProps<T = any> extends PageProps<T> {
@@ -278,3 +279,7 @@ export interface AccordionProps {
   titleClassName?: string;
   dataTestId?: string;
 }
+
+export interface PluginModuleComponentProps {
+  settings?: Record<string, any>;
+}

package/utils/app-fetch.ts

@@ -41,7 +41,7 @@ const appFetch = async <T>(
     };
 
     init.next = {
-      revalidate: Settings.usePrettyUrlRoute ? 0 : 60
+      revalidate: 60
     };
 
     logger.debug(`FETCH START ${url}`, { requestURL, init, ip });

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

@@ -1,15 +1,11 @@
 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/index.ts

@@ -102,12 +102,6 @@ export function buildCDNUrl(url: string, config?: CDNOptions) {
     ''
   );
 
-  const noOptionFileExtension = url?.split('.').pop()?.toLowerCase() ?? '';
-
-  if (noOptionFileExtension === 'svg' || noOptionFileExtension === 'gif') {
-    return url;
-  }
-
   let options = '';
 
   if (config) {

package/utils/server-translation.ts

@@ -5,10 +5,10 @@ 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 = {};
 
+// TODO: Read translations from cache
 export async function getTranslations(locale_: string) {
   try {
     const locale = settings.localization.locales.find(
@@ -52,10 +52,6 @@ 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);
 }

package/with-pz-config.js

@@ -8,7 +8,6 @@ const defaultConfig = {
   transpilePackages: ['@akinon/next', ...pzPlugins.map((p) => `@akinon/${p}`)],
   skipTrailingSlashRedirect: true,
   poweredByHeader: false,
-  cacheMaxMemorySize: 0,
   env: {
     NEXT_PUBLIC_SENTRY_DSN: process.env.SENTRY_DSN
   },
@@ -66,12 +65,7 @@ const defaultConfig = {
   }
 };
 
-const withPzConfig = (
-  myNextConfig = {},
-  options = {
-    useCacheHandler: false
-  }
-) => {
+const withPzConfig = (myNextConfig = {}) => {
   let extendedConfig = deepMerge({}, defaultConfig, myNextConfig);
 
   const originalPzHeadersFunction = defaultConfig.headers;
@@ -97,10 +91,6 @@ const withPzConfig = (
     return [...pzRewrites, ...myRewrites];
   };
 
-  if (options.useCacheHandler) {
-    extendedConfig.cacheHandler = require.resolve('./lib/cache-handler.mjs');
-  }
-
   return extendedConfig;
 };
 

package/lib/cache-handler.mjs

@@ -1,33 +0,0 @@
-import { CacheHandler } from '@neshca/cache-handler';
-import createLruHandler from '@neshca/cache-handler/local-lru';
-import createRedisHandler from '@neshca/cache-handler/redis-stack';
-import { createClient } from 'redis';
-
-CacheHandler.onCreation(async () => {
-  const redisUrl = `redis://${process.env.CACHE_HOST}:${
-    process.env.CACHE_PORT
-  }/${process.env.CACHE_BUCKET ?? '0'}`;
-
-  const client = createClient({
-    url: redisUrl
-  });
-
-  client.on('error', (error) => {
-    console.error('Redis client error', { redisUrl, error });
-  });
-
-  await client.connect();
-
-  const redisHandler = await createRedisHandler({
-    client,
-    timeoutMs: 5000
-  });
-
-  const localHandler = createLruHandler();
-
-  return {
-    handlers: [redisHandler, localHandler]
-  };
-});
-
-export default CacheHandler;

package/routes/pretty-url.tsx

@@ -1,194 +0,0 @@
-import { URLS } from '@akinon/next/data/urls';
-import { Metadata, PageProps } from '@akinon/next/types';
-import logger from '@akinon/next/utils/log';
-import { notFound } from 'next/navigation';
-
-type PrettyUrlResult = {
-  matched: boolean;
-  path?: string;
-  pk?: number;
-};
-
-const resolvePrettyUrlHandler =
-  (pathname: string, ip: string | null) => async () => {
-    let results = [] as { old_path: string }[];
-    let prettyUrlResult: PrettyUrlResult = {
-      matched: false
-    };
-
-    try {
-      const requestUrl = URLS.misc.prettyUrls(`/${pathname}/`);
-
-      logger.debug(`Resolving pretty url`, { pathname, requestUrl, ip });
-
-      const start = Date.now();
-      const apiResponse = await fetch(requestUrl, {
-        next: {
-          revalidate: 0
-        }
-      });
-      const data = await apiResponse.json();
-      ({ results } = data);
-      const end = Date.now();
-      console.warn('Pretty url response time', end - start, requestUrl);
-
-      const matched = results.length > 0;
-      const [{ old_path: path } = { old_path: '' }] = results;
-      let pk;
-
-      if (matched) {
-        const pkRegex = /\/(\d+)\/$/;
-        const match = path.match(pkRegex);
-        pk = match ? parseInt(match[1]) : undefined;
-      }
-
-      prettyUrlResult = {
-        matched,
-        path,
-        pk
-      };
-
-      logger.trace('Pretty url result', { prettyUrlResult, ip });
-    } catch (error) {
-      logger.error('Error resolving pretty url', { error, pathname, ip });
-    }
-
-    return prettyUrlResult;
-  };
-
-export async function generateMetadata({ params }: PageProps) {
-  let result: Metadata = {};
-  const { prettyurl } = params;
-  const pageSlug = prettyurl
-    .filter((x) => !x.startsWith('searchparams'))
-    .join('/');
-
-  const searchParams = Object.fromEntries(
-    new URLSearchParams(
-      decodeURIComponent(
-        prettyurl
-          .find((x) => x.startsWith('searchparams'))
-          ?.replace('searchparams%7C', '')
-      ) ?? {}
-    ).entries()
-  );
-
-  const prettyUrlResult = await resolvePrettyUrlHandler(pageSlug, null)();
-
-  if (!prettyUrlResult.matched) {
-    return notFound();
-  }
-
-  const commonProps = {
-    params: {
-      ...params,
-      pk: prettyUrlResult.pk
-    },
-    searchParams
-  };
-
-  try {
-    if (prettyUrlResult.path.startsWith('/product/')) {
-      await import('@product/[pk]/page').then(async (module) => {
-        result = await module['generateMetadata']?.(commonProps);
-      });
-    }
-
-    if (prettyUrlResult.path.startsWith('/group-product/')) {
-      await import('@group-product/[pk]/page').then(async (module) => {
-        result = await module['generateMetadata']?.(commonProps);
-      });
-    }
-
-    if (prettyUrlResult.path.startsWith('/category/')) {
-      await import('@category/[pk]/page').then(async (module) => {
-        result = await module['generateMetadata']?.(commonProps);
-      });
-    }
-
-    if (prettyUrlResult.path.startsWith('/special-page/')) {
-      await import('@special-page/[pk]/page').then(async (module) => {
-        result = await module['generateMetadata']?.(commonProps);
-      });
-    }
-
-    if (prettyUrlResult.path.startsWith('/flat-page/')) {
-      await import('@flat-page/[pk]/page').then(async (module) => {
-        result = await module['generateMetadata']?.(commonProps);
-      });
-    }
-    // eslint-disable-next-line no-empty
-  } catch (error) {}
-
-  return result;
-}
-
-export const dynamic = 'force-static';
-export const revalidate = 300;
-
-export default async function Page({ params }) {
-  const { prettyurl } = params;
-  const pageSlug = prettyurl
-    .filter((x) => !x.startsWith('searchparams'))
-    .join('/');
-
-  const urlSearchParams = new URLSearchParams(
-    decodeURIComponent(
-      prettyurl
-        .find((x) => x.startsWith('searchparams'))
-        ?.replace('searchparams%7C', '')
-    ) ?? {}
-  );
-
-  const searchParams = {};
-
-  for (const [key, value] of urlSearchParams.entries() as unknown as Array<
-    [string, string]
-  >) {
-    if (!searchParams[key]) {
-      searchParams[key] = [];
-    }
-    searchParams[key].push(value);
-  }
-
-  const result = await resolvePrettyUrlHandler(pageSlug, null)();
-
-  if (!result.matched) {
-    return notFound();
-  }
-
-  const commonProps = {
-    params: {
-      ...params,
-      pk: result.pk
-    },
-    searchParams
-  };
-
-  if (result.path.startsWith('/category/')) {
-    const CategoryPage = (await import('@category/[pk]/page')).default;
-    return <CategoryPage {...commonProps} />;
-  }
-
-  if (result.path.startsWith('/product/')) {
-    const ProductPage = (await import('@product/[pk]/page')).default;
-    return <ProductPage {...commonProps} />;
-  }
-
-  if (result.path.startsWith('/group-product/')) {
-    const GroupProduct = (await import('@group-product/[pk]/page')).default;
-    return <GroupProduct {...commonProps} />;
-  }
-
-  if (result.path.startsWith('/special-page/')) {
-    const SpecialPage = (await import('@special-page/[pk]/page')).default;
-    return <SpecialPage {...commonProps} />;
-  }
-
-  if (result.path.startsWith('/flat-page/')) {
-    const FlatPage = (await import('@flat-page/[pk]/page')).default;
-    return <FlatPage {...commonProps} />;
-  }
-
-  return null;
-}