@akinon/next 1.76.0-rc.0 → 2.0.0-beta.1

package/api/client.ts

@@ -14,6 +14,7 @@ interface RouteParams {
 
 async function proxyRequest(...args) {
   const [req, { params }] = args as [req: Request, params: RouteParams];
+  const resolvedParams = await params;
   const { searchParams } = new URL(req.url);
   const commerceUrl = settings.commerceUrl;
 
@@ -32,7 +33,7 @@ async function proxyRequest(...args) {
     responseType: 'json'
   };
 
-  const slug = `${params.slug.join('/')}/`;
+  const slug = `${resolvedParams.slug.join('/')}/`;
   const options_ = JSON.parse(
     decodeURIComponent((searchParams.get('options') as string) ?? '{}')
   );
@@ -85,7 +86,7 @@ async function proxyRequest(...args) {
     }
   } as RequestInit;
 
-  const nextCookies = cookies();
+  const nextCookies = await cookies();
   const segment = nextCookies.get('pz-segment')?.value;
   const currency = nextCookies.get('pz-external-currency')?.value;
 

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/pz-root.tsx

@@ -14,7 +14,7 @@ export default async function PzRoot({
   children: React.ReactNode;
   locale?: string;
 }) {
-  const nextCookies = cookies();
+  const nextCookies = await cookies();
   const sessionid = nextCookies.get('osessionid')?.value;
 
   if (!translations) {

package/data/server/flatpage.ts

@@ -7,8 +7,7 @@ import { ServerVariables } from '../../utils/server-variables';
 const getFlatPageDataHandler = (
   pk: number,
   locale: string,
-  currency: string,
-  headers?: Record<string, string>
+  currency: string
 ) => {
   return async function () {
     const data = await appFetch<FlatPage>({
@@ -18,8 +17,7 @@ const getFlatPageDataHandler = (
       init: {
         headers: {
           Accept: 'application/json',
-          'Content-Type': 'application/json',
-          ...(headers ?? {})
+          'Content-Type': 'application/json'
         }
       }
     });
@@ -31,17 +29,15 @@ const getFlatPageDataHandler = (
 export const getFlatPageData = ({
   pk,
   locale = ServerVariables.locale,
-  currency = ServerVariables.currency,
-  headers
+  currency = ServerVariables.currency
 }: {
   pk: number;
   locale?: string;
   currency?: string;
-  headers?: Record<string, string>;
 }) => {
   return Cache.wrap(
     CacheKey.FlatPage(pk),
     locale,
-    getFlatPageDataHandler(pk, locale, currency, headers)
+    getFlatPageDataHandler(pk, locale, currency)
   );
 };

package/data/server/form.ts

@@ -5,12 +5,7 @@ import appFetch from '../../utils/app-fetch';
 import { ServerVariables } from '../../utils/server-variables';
 import { form } from '../urls';
 
-const getFormDataHandler = (
-  pk: number,
-  locale: string,
-  currency: string,
-  headers?: Record<string, string>
-) => {
+const getFormDataHandler = (pk: number, locale: string, currency: string) => {
   return async function () {
     const data = await appFetch<FormType>({
       url: form.getForm(pk),
@@ -19,8 +14,7 @@ const getFormDataHandler = (
       init: {
         headers: {
           Accept: 'application/json',
-          'Content-Type': 'application/json',
-          ...(headers ?? {})
+          'Content-Type': 'application/json'
         }
       }
     });
@@ -32,17 +26,15 @@ const getFormDataHandler = (
 export const getFormData = ({
   pk,
   locale = ServerVariables.locale,
-  currency = ServerVariables.currency,
-  headers
+  currency = ServerVariables.currency
 }: {
   pk: number;
   locale?: string;
   currency?: string;
-  headers?: Record<string, string>;
 }) => {
   return Cache.wrap(
     CacheKey.Form(pk),
     locale,
-    getFormDataHandler(pk, locale, currency, headers)
+    getFormDataHandler(pk, locale, currency)
   );
 };

package/data/server/landingpage.ts

@@ -7,8 +7,7 @@ import { ServerVariables } from '../../utils/server-variables';
 const getLandingPageHandler = (
   pk: number,
   locale: string,
-  currency: string,
-  headers?: Record<string, string>
+  currency: string
 ) => {
   return async function () {
     const data = await appFetch<LandingPage>({
@@ -18,8 +17,7 @@ const getLandingPageHandler = (
       init: {
         headers: {
           Accept: 'application/json',
-          'Content-Type': 'application/json',
-          ...(headers ?? {})
+          'Content-Type': 'application/json'
         }
       }
     });
@@ -31,17 +29,15 @@ const getLandingPageHandler = (
 export const getLandingPageData = ({
   pk,
   locale = ServerVariables.locale,
-  currency = ServerVariables.currency,
-  headers
+  currency = ServerVariables.currency
 }: {
   pk: number;
   locale?: string;
   currency?: string;
-  headers?: Record<string, string>;
 }) => {
   return Cache.wrap(
     CacheKey.LandingPage(pk),
     locale,
-    getLandingPageHandler(pk, locale, currency, headers)
+    getLandingPageHandler(pk, locale, currency)
   );
 };

package/data/server/menu.ts

@@ -13,7 +13,6 @@ interface MenuHandlerParams {
   currency?: string;
   depth?: number;
   parent?: string;
-  headers?: Record<string, string>;
 }
 
 const DEFAULT_DEPTH = 3;
@@ -23,17 +22,13 @@ const getMenuHandler =
     locale = ServerVariables.locale,
     currency = ServerVariables.currency,
     depth,
-    parent,
-    headers
+    parent
   }: MenuHandlerParams = {}) =>
   async () => {
     const response = await appFetch<MenuResponse>({
       url: misc.menus(depth ?? DEFAULT_DEPTH, parent),
       locale,
-      currency,
-      init: {
-        headers
-      }
+      currency
     });
 
     return response?.menu;

package/data/server/product.ts

@@ -11,7 +11,6 @@ type GetProduct = {
   currency?: string;
   searchParams?: URLSearchParams;
   groupProduct?: boolean;
-  headers?: Record<string, string>;
 };
 
 const getProductDataHandler = ({
@@ -19,8 +18,7 @@ const getProductDataHandler = ({
   locale,
   currency,
   searchParams,
-  groupProduct,
-  headers
+  groupProduct
 }: GetProduct) => {
   return async function () {
     let url = groupProduct
@@ -42,8 +40,7 @@ const getProductDataHandler = ({
       init: {
         headers: {
           Accept: 'application/json',
-          'Content-Type': 'application/json',
-          ...(headers ?? {})
+          'Content-Type': 'application/json'
         }
       }
     });
@@ -98,8 +95,7 @@ export const getProductData = async ({
   locale = ServerVariables.locale,
   currency = ServerVariables.currency,
   searchParams,
-  groupProduct,
-  headers
+  groupProduct
 }: GetProduct) => {
   return Cache.wrap(
     CacheKey[groupProduct ? 'GroupProduct' : 'Product'](
@@ -107,14 +103,7 @@ export const getProductData = async ({
       searchParams ?? new URLSearchParams()
     ),
     locale,
-    getProductDataHandler({
-      pk,
-      locale,
-      currency,
-      searchParams,
-      groupProduct,
-      headers
-    }),
+    getProductDataHandler({ pk, locale, currency, searchParams, groupProduct }),
     {
       expire: 300
     }

package/data/server/seo.ts

@@ -7,10 +7,9 @@ interface SeoDataParams {
   url: string;
   locale?: string;
   currency?: string;
-  headers?: Record<string, string>;
 }
 
-function getSeoDataHandler({ url, locale, currency, headers }: SeoDataParams) {
+function getSeoDataHandler({ url, locale, currency }: SeoDataParams) {
   return async function () {
     let data = {} as {
       title: string;
@@ -20,12 +19,7 @@ function getSeoDataHandler({ url, locale, currency, headers }: SeoDataParams) {
     };
 
     try {
-      data = await appFetch({
-        url: misc.cmsSeo(url),
-        locale,
-        currency,
-        init: { headers }
-      });
+      data = await appFetch({ url: misc.cmsSeo(url), locale, currency });
     } catch (error) {
       // logger.error('Error while fetching seo data', { url, error });
     }
@@ -37,12 +31,11 @@ function getSeoDataHandler({ url, locale, currency, headers }: SeoDataParams) {
 export const getSeoData = async (
   url,
   locale = ServerVariables.locale,
-  currency = ServerVariables.currency,
-  headers?: Record<string, string>
+  currency = ServerVariables.currency
 ) => {
   return Cache.wrap(
     CacheKey.Seo(url),
     locale,
-    getSeoDataHandler({ url, locale, currency, headers })
+    getSeoDataHandler({ url, locale, currency })
   );
 };

package/data/server/widget.ts

@@ -6,44 +6,29 @@ import { widgets } from '../urls';
 import { ServerVariables } from '../../utils/server-variables';
 
 const getWidgetDataHandler =
-  (
-    slug: string,
-    locale: string,
-    currency: string,
-    headers?: Record<string, string>
-  ) =>
-  async () => {
+  (slug: string, locale: string, currency: string) => async () => {
     if (!slug) {
       return null;
     }
 
-    return await appFetch({
-      url: widgets.getWidget(slug),
-      locale,
-      currency,
-      init: {
-        headers
-      }
-    });
+    return await appFetch({ url: widgets.getWidget(slug), locale, currency });
   };
 
 export const getWidgetData = async <T>({
   slug,
   locale = ServerVariables.locale,
   currency = ServerVariables.currency,
-  cacheOptions,
-  headers
+  cacheOptions
 }: {
   slug: string;
   locale?: string;
   currency?: string;
   cacheOptions?: CacheOptions;
-  headers?: Record<string, string>;
 }): Promise<WidgetResultType<T>> => {
   return Cache.wrap(
     CacheKey.Widget(slug),
     locale,
-    getWidgetDataHandler(slug, locale, currency, headers),
+    getWidgetDataHandler(slug, locale, currency),
     cacheOptions
   );
 };

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

@@ -1,5 +1,5 @@
 import { LayoutProps, PageProps, RootLayoutProps } from '../../types';
-import React from 'react';
+import React, { JSX } from 'react';
 
 type SegmentType = 'client-root' | 'layout' | 'page';
 

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

@@ -1,4 +1,5 @@
 import settings from 'settings';
+import { JSX } from 'react';
 import { LayoutProps, PageProps, RootLayoutProps } from '../../types';
 import { redirect } from 'next/navigation';
 import { ServerVariables } from '../../utils/server-variables';
@@ -21,6 +22,8 @@ export const withSegmentDefaults =
   async (props: T) => {
     let componentProps = { ...props };
 
+    const { locale, currency } = await props.params;
+
     if (options.segmentType === 'root-layout') {
       componentProps = (await addRootLayoutProps(
         componentProps as RootLayoutProps
@@ -29,8 +32,8 @@ export const withSegmentDefaults =
       checkRedisVariables();
     }
 
-    ServerVariables.locale = props.params.locale;
-    ServerVariables.currency = props.params.currency;
+    ServerVariables.locale = await locale;
+    ServerVariables.currency = await currency;
 
     return await (
       <>
@@ -40,7 +43,7 @@ export const withSegmentDefaults =
   };
 
 const addRootLayoutProps = async (componentProps: RootLayoutProps) => {
-  const params = componentProps.params;
+  const params = await componentProps.params;
 
   if (
     params.commerce !== encodeURIComponent(decodeURI(settings.commerceUrl)) ||
@@ -72,13 +75,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/instrumentation/index.ts

@@ -1,12 +1,5 @@
-import { initSentry } from '../sentry';
-
 export async function register() {
   if (process.env.NEXT_RUNTIME === 'nodejs') {
     await import('./node');
-    initSentry('Server');
-  }
-
-  if (process.env.NEXT_RUNTIME === 'edge') {
-    initSentry('Edge');
   }
 }

package/lib/cache-handler.mjs

@@ -23,10 +23,10 @@ CacheHandler.onCreation(async () => {
     timeoutMs: 5000
   });
 
-  // const localHandler = createLruHandler();
+  const localHandler = createLruHandler();
 
   return {
-    handlers: [redisHandler]
+    handlers: [redisHandler, localHandler]
   };
 });
 

package/lib/cache.ts

@@ -31,8 +31,6 @@ export const CacheKey = {
     `category_${pk}_${encodeURIComponent(
       JSON.stringify(searchParams)
     )}${hashCacheKey(headers)}`,
-  Basket: (namespace?: string) => `basket${namespace ? `_${namespace}` : ''}`,
-  AllBaskets: () => 'all_baskets',
   CategorySlug: (slug: string) => `category_${slug}`,
   SpecialPage: (
     pk: number,

package/middlewares/complete-gpay.ts

@@ -145,8 +145,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

@@ -145,8 +145,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/default.ts

@@ -285,9 +285,7 @@ const withPzDefault =
                                 url.pathname =
                                   url.pathname +
                                   (/\/$/.test(url.pathname) ? '' : '/') +
-                                  `searchparams|${url.searchParams
-                                    .toString()
-                                    .replace(/%26/g, '--amp--')}`;
+                                  `searchparams|${url.searchParams.toString()}`;
                               }
 
                               if (

package/middlewares/redirection-payment.ts

@@ -146,8 +146,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

@@ -145,8 +145,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

@@ -145,8 +145,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,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.76.0-rc.0",
+  "version": "2.0.0-beta.1",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -20,7 +20,7 @@
     "@opentelemetry/sdk-trace-node": "1.19.0",
     "@opentelemetry/semantic-conventions": "1.19.0",
     "@reduxjs/toolkit": "1.9.7",
-    "@neshca/cache-handler": "1.9.0",
+    "@neshca/cache-handler": "1.5.1",
     "cross-spawn": "7.0.3",
     "generic-pool": "3.9.0",
     "react-redux": "8.1.3",
@@ -30,13 +30,13 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.76.0-rc.0",
+    "@akinon/eslint-plugin-projectzero": "2.0.0-beta.1",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
-    "@typescript-eslint/eslint-plugin": "6.7.4",
-    "@typescript-eslint/parser": "6.7.4",
-    "eslint": "8.56.0",
-    "eslint-config-next": "14.2.3",
-    "eslint-config-prettier": "8.5.0"
+    "@typescript-eslint/eslint-plugin": "8.18.2",
+    "@typescript-eslint/parser": "8.18.2",
+    "eslint": "9.17.0",
+    "eslint-config-next": "15.1.2",
+    "eslint-config-prettier": "9.1.0"
   }
 }

package/types/commerce/checkout.ts

@@ -3,6 +3,7 @@ import { Basket } from './basket';
 import { RetailStore } from './misc';
 import { PaymentOption } from './order';
 import { Product } from './product';
+import { JSX } from 'react';
 
 export enum CheckoutStep {
   Shipping = 'shipping',

package/types/commerce/order.ts

@@ -114,7 +114,6 @@ export interface Order {
     pk: number;
     name: string;
     slug: string;
-    logo: string;
     [key: string]: any;
   };
 }

package/types/index.ts

@@ -239,8 +239,8 @@ export type ImageOptions = CDNOptions & {
 export type Translations = { [key: string]: object };
 
 export interface PageProps<T = any> {
-  params: T & { locale: string; currency: string };
-  searchParams: URLSearchParams;
+  params: Promise<T & { locale: string; currency: string }>;
+  searchParams: Promise<URLSearchParams>;
 }
 
 export interface LayoutProps<T = any> extends PageProps<T> {

package/utils/app-fetch.ts

@@ -26,8 +26,8 @@ const appFetch = async <T>({
   let ip = '';
 
   try {
-    const nextHeaders = headers();
-    const nextCookies = cookies();
+    const nextHeaders = await headers();
+    const nextCookies = await cookies();
     ip = nextHeaders.get('x-forwarded-for') ?? '';
 
     const commerceUrl = Settings.commerceUrl;
@@ -43,12 +43,12 @@ const appFetch = async <T>({
     const requestURL = `${decodeURIComponent(commerceUrl)}${url}`;
 
     init.headers = {
-      cookie: nextCookies.toString(),
       ...(init.headers ?? {}),
       ...(ServerVariables.globalHeaders ?? {}),
       'Accept-Language': currentLocale.apiValue,
       'x-currency': currency,
-      'x-forwarded-for': ip
+      'x-forwarded-for': ip,
+      cookie: nextCookies.toString()
     };
 
     init.next = {

package/utils/redirect.ts

@@ -4,8 +4,8 @@ import { headers } from 'next/headers';
 import { ServerVariables } from '@akinon/next/utils/server-variables';
 import { getUrlPathWithLocale } from '@akinon/next/utils/localization';
 
-export const redirect = (path: string, type?: RedirectType) => {
-  const nextHeaders = headers();
+export const redirect = async (path: string, type?: RedirectType) => {
+  const nextHeaders = await headers();
   const pageUrl = new URL(
     nextHeaders.get('pz-url') ?? process.env.NEXT_PUBLIC_URL
   );

package/with-pz-config.js

@@ -64,7 +64,7 @@ const defaultConfig = {
   },
   sentry: {
     hideSourceMaps: true
-  } // TODO: This section will be reviewed again in the Sentry 8 update.
+  }
 };
 
 const withPzConfig = (