@akinon/next 1.55.0-rc.0 → 1.55.0

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

@@ -2,6 +2,7 @@ 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';
 
@@ -49,11 +50,7 @@ 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/hooks/index.ts

@@ -8,5 +8,4 @@ export * from './use-media-query';
 export * from './use-on-click-outside';
 export * from './use-mobile-iframe-handler';
 export * from './use-payment-options';
-export * from './use-pagination';
-export * from './use-message-listener';
+export * from './use-pagination';

package/hooks/use-pagination.ts

@@ -116,7 +116,7 @@ export default function usePagination(
       urlSearchParams.set('page', (Number(state.page) - 1).toString());
       return `${pathname}?${urlSearchParams.toString()}`;
     }
-    return null;
+    return '#';
   }, [state.page, pathname, urlSearchParams]);
 
   const next = useMemo(() => {
@@ -124,7 +124,7 @@ export default function usePagination(
       urlSearchParams.set('page', (Number(state.page) + 1).toString());
       return `${pathname}?${urlSearchParams.toString()}`;
     }
-    return null;
+    return '#';
   }, [state.page, state.last, pathname, urlSearchParams]);
 
   return {

package/hooks/use-payment-options.ts

@@ -18,8 +18,7 @@ export const usePaymentOptions = () => {
     pay_on_delivery: 'pz-pay-on-delivery',
     bkm_express: 'pz-bkm',
     credit_payment: 'pz-credit-payment',
-    masterpass: 'pz-masterpass',
-    gpay: 'pz-gpay'
+    masterpass: 'pz-masterpass'
   };
 
   const isInitialTypeIncluded = (type: string) => initialTypes.has(type);

package/lib/cache.ts

@@ -3,6 +3,7 @@ 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) {
@@ -58,8 +59,10 @@ export const CacheKey = {
 export class Cache {
   static PROXY_URL = `${process.env.NEXT_PUBLIC_URL}/api/cache`;
 
-  static formatKey(key: string, locale: string) {
-    return encodeURIComponent(`${Settings.commerceUrl}_${locale}_${key}`);
+  static formatKey(key: string) {
+    return encodeURIComponent(
+      `${Settings.commerceUrl}_${ServerVariables.locale}_${key}`
+    );
   }
 
   static clientPool: Pool<RedisClientType> = createPool(
@@ -152,14 +155,9 @@ export class Cache {
 
   static async wrap<T = any>(
     key: string,
-    locale: string,
     handler: () => Promise<T>,
     options?: CacheOptions
   ): Promise<T> {
-    if (Settings.usePrettyUrlRoute) {
-      return await handler();
-    }
-
     const requiredVariables = [
       process.env.CACHE_HOST,
       process.env.CACHE_PORT,
@@ -176,7 +174,7 @@ export class Cache {
     };
 
     const _options = Object.assign(defaultOptions, options);
-    const formattedKey = Cache.formatKey(key, locale);
+    const formattedKey = Cache.formatKey(key);
 
     logger.debug('Cache wrap', { key, formattedKey, _options });
 

package/middlewares/default.ts

@@ -88,44 +88,14 @@ const withPzDefault =
       req.nextUrl.pathname.includes('/orders/hooks/') ||
       req.nextUrl.pathname.includes('/orders/checkout-with-token/')
     ) {
-      const segment = url.searchParams.get('segment');
-      const currency = url.searchParams.get('currency')?.toLowerCase();
-
-      const headers = {};
-
-      if (segment) {
-        headers['X-Segment-Id'] = segment;
-      }
-
-      if (currency) {
-        headers['x-currency'] = currency;
-      }
-
-      const response = NextResponse.rewrite(
+      return NextResponse.rewrite(
         new URL(
           `${Settings.commerceUrl}${req.nextUrl.pathname.replace(
             urlLocaleMatcherRegex,
             ''
           )}`
-        ),
-        {
-          headers
-        }
+        )
       );
-
-      if (segment) {
-        response.cookies.set('pz-segment', segment);
-      }
-
-      if (currency) {
-        response.cookies.set('pz-currency', currency, {
-          sameSite: 'none',
-          secure: true,
-          expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 7) // 7 days
-        });
-      }
-
-      return response;
     }
 
     if (req.nextUrl.pathname.startsWith('/orders/redirection/')) {
@@ -219,41 +189,10 @@ const withPzDefault =
                               ''
                             );
 
-                            middlewareResult = (await middleware(
-                              req,
-                              event
-                            )) as NextResponse | void;
-
-                            let customRewriteUrlDiff = '';
-
-                            if (
-                              middlewareResult instanceof NextResponse &&
-                              middlewareResult.headers.get(
-                                'pz-override-response'
-                              ) &&
-                              middlewareResult.headers.get(
-                                'x-middleware-rewrite'
-                              )
-                            ) {
-                              const rewriteUrl = new URL(
-                                middlewareResult.headers.get(
-                                  'x-middleware-rewrite'
-                                )
-                              );
-                              const originalUrl = new URL(req.url);
-                              customRewriteUrlDiff =
-                                rewriteUrl.pathname.replace(
-                                  originalUrl.pathname,
-                                  ''
-                                );
-                            }
-
                             url.basePath = `/${commerceUrl}`;
                             url.pathname = `/${
                               locale.length ? `${locale}/` : ''
-                            }${currency}/${customRewriteUrlDiff}${
-                              prettyUrl ?? pathnameWithoutLocale
-                            }`.replace(/\/+/g, '/');
+                            }${currency}${prettyUrl ?? pathnameWithoutLocale}`;
 
                             if (
                               !req.middlewareParams.found &&
@@ -268,20 +207,6 @@ const withPzDefault =
                               );
                             }
 
-                            if (
-                              Settings.usePrettyUrlRoute &&
-                              url.searchParams.toString().length > 0 &&
-                              !Object.entries(ROUTES).find(([, value]) =>
-                                new RegExp(`^${value}/?$`).test(
-                                  pathnameWithoutLocale
-                                )
-                              )
-                            ) {
-                              url.pathname =
-                                url.pathname +
-                                `searchparams|${url.searchParams.toString()}`;
-                            }
-
                             Settings.rewrites.forEach((rewrite) => {
                               url.pathname = url.pathname.replace(
                                 rewrite.source,
@@ -289,6 +214,11 @@ const withPzDefault =
                               );
                             });
 
+                            middlewareResult = (await middleware(
+                              req,
+                              event
+                            )) as NextResponse | void;
+
                             // if middleware.ts has a return value for current url
                             if (middlewareResult instanceof NextResponse) {
                               // pz-override-response header is used to prevent 404 page for custom responses.
@@ -301,15 +231,6 @@ const withPzDefault =
                                   'x-middleware-rewrite',
                                   url.href
                                 );
-                              } else if (
-                                middlewareResult.headers.get(
-                                  'x-middleware-rewrite'
-                                ) &&
-                                middlewareResult.headers.get(
-                                  'pz-override-response'
-                                ) === 'true'
-                              ) {
-                                middlewareResult = NextResponse.rewrite(url);
                               }
                             } else {
                               // if middleware.ts doesn't have a return value.

package/middlewares/pretty-url.ts

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

package/middlewares/url-redirection.ts

@@ -11,10 +11,6 @@ import { ROUTES } from 'routes';
 const withUrlRedirection =
   (middleware: NextMiddleware) =>
   async (req: PzNextRequest, event: NextFetchEvent) => {
-    if (settings.usePrettyUrlRoute) {
-      return middleware(req, event);
-    }
-
     const url = req.nextUrl.clone();
     const ip = req.headers.get('x-forwarded-for') ?? '';
     const pathnameWithoutLocale = url.pathname.replace(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.55.0-rc.0",
+  "version": "1.55.0",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -20,17 +20,16 @@
     "@opentelemetry/sdk-trace-node": "1.19.0",
     "@opentelemetry/semantic-conventions": "1.19.0",
     "@reduxjs/toolkit": "1.9.7",
-    "@neshca/cache-handler": "1.5.1",
     "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.6.2",
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.55.0-rc.0",
+    "@akinon/eslint-plugin-projectzero": "1.55.0",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
     "@typescript-eslint/eslint-plugin": "6.7.4",

package/redux/middlewares/checkout.ts

@@ -16,10 +16,8 @@ import {
   setPreOrder,
   setRetailStores,
   setShippingOptions,
-  setDataSourceShippingOptions,
   setShippingStepCompleted,
-  setCreditPaymentOptions,
-  setAttributeBasedShippingOptions
+  setCreditPaymentOptions
 } from '../../redux/reducers/checkout';
 import { RootState, TypedDispatch } from 'redux/store';
 import { checkoutApi } from '../../data/client/checkout';
@@ -28,7 +26,6 @@ import { getCookie, setCookie } from '../../utils';
 import settings from 'settings';
 import { LocaleUrlStrategy } from '../../localization';
 import { showMobile3dIframe } from '../../utils/mobile-3d-iframe';
-import { showRedirectionIframe } from '../../utils/redirection-iframe';
 
 interface CheckoutResult {
   payload: {
@@ -76,10 +73,8 @@ export const preOrderMiddleware: Middleware = ({
       deliveryOptions,
       addressList: addresses,
       shippingOptions,
-      dataSourceShippingOptions,
       paymentOptions,
-      installmentOptions,
-      attributeBasedShippingOptions
+      installmentOptions
     } = getState().checkout;
     const { endpoints: apiEndpoints } = checkoutApi;
 
@@ -130,40 +125,6 @@ export const preOrderMiddleware: Middleware = ({
       dispatch(apiEndpoints.setShippingOption.initiate(shippingOptions[0].pk));
     }
 
-    if (
-      dataSourceShippingOptions.length > 0 &&
-      !preOrder.data_source_shipping_options
-    ) {
-      const selectedDataSourceShippingOptionsPks =
-        dataSourceShippingOptions.map(
-          (opt) => opt.data_source_shipping_options[0].pk
-        );
-
-      dispatch(
-        apiEndpoints.setDataSourceShippingOptions.initiate(
-          selectedDataSourceShippingOptionsPks
-        )
-      );
-    }
-
-    if (
-      Object.keys(attributeBasedShippingOptions).length > 0 &&
-      !preOrder.attribute_based_shipping_options
-    ) {
-      const initialSelectedOptions: Record<string, number> = Object.fromEntries(
-        Object.entries(attributeBasedShippingOptions).map(([key, options]) => [
-          key,
-          options[0].pk
-        ])
-      );
-
-      dispatch(
-        apiEndpoints.setAttributeBasedShippingOptions.initiate(
-          initialSelectedOptions
-        )
-      );
-    }
-
     if (!preOrder.payment_option && paymentOptions.length > 0) {
       dispatch(apiEndpoints.setPaymentOption.initiate(paymentOptions[0].pk));
     }
@@ -202,7 +163,6 @@ export const contextListMiddleware: Middleware = ({
     if (result?.payload?.context_list) {
       result.payload.context_list.forEach((context) => {
         const redirectUrl = context.page_context.redirect_url;
-        const isIframe = context.page_context.is_frame ?? false;
 
         if (redirectUrl) {
           const currentLocale = getCookie('pz-locale');
@@ -221,19 +181,16 @@ export const contextListMiddleware: Middleware = ({
           }
 
           const urlObj = new URL(url, window.location.origin);
-          const isMobileDevice =
-            isMobileApp ||
-            /iPad|iPhone|iPod|Android/i.test(navigator.userAgent);
-          const isIframePaymentOptionExcluded =
-            !settings.checkout?.iframeExcludedPaymentOptions?.includes(
-              result.payload?.pre_order?.payment_option?.slug
-            );
           urlObj.searchParams.set('t', new Date().getTime().toString());
 
-          if (isMobileDevice && !isIframePaymentOptionExcluded) {
+          if (
+            (isMobileApp ||
+              /iPad|iPhone|iPod|Android/i.test(navigator.userAgent)) &&
+            !settings.checkout?.iframeExcludedPaymentOptions?.includes(
+              result.payload?.pre_order?.payment_option?.slug
+            )
+          ) {
             showMobile3dIframe(urlObj.toString());
-          } else if (isIframe && !isIframePaymentOptionExcluded) {
-            showRedirectionIframe(urlObj.toString());
           } else {
             window.location.href = urlObj.toString();
           }
@@ -263,28 +220,12 @@ export const contextListMiddleware: Middleware = ({
           dispatch(setShippingOptions(context.page_context.shipping_options));
         }
 
-        if (context.page_context.data_sources) {
-          dispatch(
-            setDataSourceShippingOptions(context.page_context.data_sources)
-          );
-        }
-
-        if (context.page_context.attribute_based_shipping_options) {
-          dispatch(
-            setAttributeBasedShippingOptions(
-              context.page_context.attribute_based_shipping_options
-            )
-          );
-        }
-
         if (context.page_context.payment_options) {
           dispatch(setPaymentOptions(context.page_context.payment_options));
         }
 
         if (context.page_context.credit_payment_options) {
-          dispatch(
-            setCreditPaymentOptions(context.page_context.credit_payment_options)
-          );
+          dispatch(setCreditPaymentOptions(context.page_context.credit_payment_options));
         }
 
         if (context.page_context.payment_choices) {

package/redux/reducers/checkout.ts

@@ -14,9 +14,7 @@ import {
   CheckoutCreditPaymentOption,
   PreOrder,
   RetailStore,
-  ShippingOption,
-  DataSource,
-  AttributeBasedShippingOption
+  ShippingOption
 } from '../../types';
 
 export interface CheckoutState {
@@ -38,7 +36,6 @@ export interface CheckoutState {
   addressList: Address[];
   deliveryOptions: DeliveryOption[];
   shippingOptions: ShippingOption[];
-  dataSourceShippingOptions: DataSource[];
   paymentOptions: PaymentOption[];
   creditPaymentOptions: CheckoutCreditPaymentOption[];
   selectedCreditPaymentPk: number;
@@ -49,8 +46,6 @@ export interface CheckoutState {
   selectedBankAccountPk: number;
   loyaltyBalance?: string;
   retailStores: RetailStore[];
-  attributeBasedShippingOptions: AttributeBasedShippingOption[];
-  selectedShippingOptions: Record<string, number>;
 }
 
 const initialState: CheckoutState = {
@@ -72,7 +67,6 @@ const initialState: CheckoutState = {
   addressList: [],
   deliveryOptions: [],
   shippingOptions: [],
-  dataSourceShippingOptions: [],
   paymentOptions: [],
   creditPaymentOptions: [],
   selectedCreditPaymentPk: null,
@@ -81,9 +75,7 @@ const initialState: CheckoutState = {
   installmentOptions: [],
   bankAccounts: [],
   selectedBankAccountPk: null,
-  retailStores: [],
-  attributeBasedShippingOptions: [],
-  selectedShippingOptions: {}
+  retailStores: []
 };
 
 const checkoutSlice = createSlice({
@@ -129,9 +121,6 @@ const checkoutSlice = createSlice({
     setShippingOptions(state, { payload }) {
       state.shippingOptions = payload;
     },
-    setDataSourceShippingOptions(state, { payload }) {
-      state.dataSourceShippingOptions = payload;
-    },
     setPaymentOptions(state, { payload }) {
       state.paymentOptions = payload;
     },
@@ -161,12 +150,6 @@ const checkoutSlice = createSlice({
     },
     setRetailStores(state, { payload }) {
       state.retailStores = payload;
-    },
-    setAttributeBasedShippingOptions(state, { payload }) {
-      state.attributeBasedShippingOptions = payload;
-    },
-    setSelectedShippingOptions: (state, { payload }) => {
-      state.selectedShippingOptions = payload;
     }
   }
 });
@@ -185,7 +168,6 @@ export const {
   setAddressList,
   setDeliveryOptions,
   setShippingOptions,
-  setDataSourceShippingOptions,
   setPaymentOptions,
   setCreditPaymentOptions,
   setSelectedCreditPaymentPk,
@@ -195,9 +177,7 @@ export const {
   setBankAccounts,
   setSelectedBankAccountPk,
   setLoyaltyBalance,
-  setRetailStores,
-  setAttributeBasedShippingOptions,
-  setSelectedShippingOptions
+  setRetailStores
 } = checkoutSlice.actions;
 
 export default checkoutSlice.reducer;

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/b2b.ts

@@ -72,7 +72,7 @@ export type BasketItemType = {
   divisions: BasketItemDivision[];
   product: ProductB2b;
   product_remote_id: number;
-};
+}
 
 export type BasketParams = {
   division: string;
@@ -91,7 +91,7 @@ export type CreateQuotationParams = {
 export type UpdateProductParams = {
   product_remote_id: number;
   division: number;
-  quantity: number;
+  quantity: number
 };
 
 export type DeleteProductParams = {
@@ -115,13 +115,3 @@ export type DraftResponse = {
   total_amount: number;
   total_quantity: number;
 };
-
-export type BasketStatusResponse = {
-  is_ready: boolean;
-  status: string;
-  url: string;
-};
-
-export type ExportBasketResponse = {
-  cache_key: string;
-};

package/types/commerce/checkout.ts

@@ -34,23 +34,6 @@ export interface ShippingOption {
   slug: string;
 }
 
-export interface DataSource {
-  pk: number;
-  name: string;
-  data_source_shipping_options: DataSourceShippingOption[];
-}
-
-export interface DataSourceShippingOption {
-  pk: number;
-  shipping_amount: string;
-  shipping_option_name: string;
-  shipping_option_logo: string | null;
-  data_source: {
-    pk: number;
-    title: string | null;
-  };
-}
-
 export interface CheckoutAddressType {
   label: string;
   text: string;
@@ -96,8 +79,6 @@ export interface PreOrder {
   retail_store?: RetailStore;
   gift_box?: GiftBox;
   credit_payment_option?: CheckoutCreditPaymentOption;
-  data_source_shipping_options: any;
-  attribute_based_shipping_options?: AttributeBasedShippingOption[];
   bags?: Product[];
   bags_fee?: string;
 }
@@ -139,7 +120,6 @@ export interface CheckoutContext {
     redirect_url?: string;
     context_data?: any;
     balance?: string;
-    attribute_based_shipping_options?: AttributeBasedShippingOption[];
     [key: string]: any;
   };
 }
@@ -165,13 +145,3 @@ export interface BankAccount {
   pk: number;
   sort_order: number;
 }
-
-export interface AttributeBasedShippingOption {
-  pk: number;
-  shipping_amount: string | null;
-  shipping_option_name: string | null;
-  shipping_option_logo: string | null;
-  attribute_value: string | null;
-  attribute_key: string;
-  [key: string]: any;
-}

package/types/commerce/order.ts

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