@akinon/next 2.0.0-beta.1 → 2.0.0-beta.11

package/data/urls.ts

@@ -74,7 +74,10 @@ export const address = {
 
 export const basket = {
   getBasket: '/baskets/basket/',
+  getMiniBasket: '/baskets/basket/mini/',
   getBasketDetail: (namespace: string) => `/baskets/basket/${namespace}/`,
+  getMiniBasketDetail: (namespace: string) =>
+    `/baskets/basket/${namespace}/mini/`,
   getAllBaskets: '/baskets/basket-list/',
   removeBasket: (pk: number) => `/baskets/basket-list/${pk}/`,
   selectMainBasket: (pk: number) => `/baskets/basket-list/id/${pk}/main/`,
@@ -137,7 +140,9 @@ export const checkout = {
     '/orders/checkout/?page=AttributeBasedShippingOptionSelectionPage',
   deliveryBagsPage: '/orders/checkout/?page=DeliveryBagsPage',
   setOrderSelectionPage: '/orders/checkout/?page=OrderSelectionPage',
-  loyaltyCardPage: '/orders/checkout/?page=LoyaltyCardPage'
+  loyaltyCardPage: '/orders/checkout/?page=LoyaltyCardPage',
+  sendSmsPage: '/orders/checkout/?page=SendSmsPage',
+  verifySmsPage: '/orders/checkout/?page=VerifySmsPage'
 };
 
 export const flatpage = {
@@ -160,7 +165,8 @@ export const misc = {
       parent ? `&parent=${parent}` : ''
     }`,
   cmsSeo: (slug: string | string[]) => `/cms/seo/?url=${slug ? slug : '/'}`,
-  setCurrency: '/users/activate-currency/'
+  setCurrency: '/users/activate-currency/',
+  bukalemunImageUrl: (params: string) => `/bukalemun/?${params}`
 };
 
 export const product = {
@@ -174,7 +180,9 @@ export const product = {
   slug: (slug: string) => `/${slug}/`,
   categoryUrl: (pk: number) => `/products/${pk}/category_nodes/?limit=1`,
   breadcrumbUrl: (menuitemmodel: string) =>
-    `/menus/generate_breadcrumb/?item=${menuitemmodel}&generator_name=menu_item`
+    `/menus/generate_breadcrumb/?item=${menuitemmodel}&generator_name=menu_item`,
+  bundleProduct: (productPk: string, queryString: string) =>
+    `/bundle-product/${productPk}/?${queryString}`
 };
 
 export const wishlist = {

package/hooks/index.ts

@@ -10,3 +10,4 @@ export * from './use-mobile-iframe-handler';
 export * from './use-payment-options';
 export * from './use-pagination';
 export * from './use-message-listener';
+export * from './use-sentry-uncaught-errors';

package/hooks/use-localization.ts

@@ -25,19 +25,33 @@ export const useLocalization = () => {
    * @param locale Locale value defined in the settings.
    */
   const setLocale = (locale: string) => {
-    const localePath =
-      locale === defaultLocaleValue &&
-      localeUrlStrategy !== LocaleUrlStrategy.ShowAllLocales
-        ? ''
-        : `/${locale}`;
+    const { protocol, hostname, port, search, pathname } = location;
+    const pathnameWithoutLocale = pathname.replace(urlLocaleMatcherRegex, '');
 
-    const pathnameWithoutLocale = location.pathname.replace(
-      urlLocaleMatcherRegex,
-      ''
-    );
+    let targetUrl;
+
+    if (localeUrlStrategy === LocaleUrlStrategy.Subdomain) {
+      const hostParts = hostname.split('.');
+      const subDomain = hostParts[0];
+      const isSubdomainLocale = locales.some((loc) => loc.value === subDomain);
+      const baseDomain = isSubdomainLocale
+        ? hostParts.slice(1).join('.')
+        : hostname;
+
+      const formattedPort = port ? `:${port}` : '';
+
+      targetUrl = `${protocol}//${locale}.${baseDomain}${formattedPort}${pathnameWithoutLocale}${search}`;
+    } else {
+      const shouldHideLocale =
+        locale === defaultLocaleValue &&
+        localeUrlStrategy !== LocaleUrlStrategy.ShowAllLocales;
+      const localePath = shouldHideLocale ? '' : `/${locale}`;
+
+      targetUrl = `${localePath}${pathnameWithoutLocale}${search}`;
+    }
 
     // router.push is not used because reloading the page also clears the client side cache.
-    location.href = `${localePath}${pathnameWithoutLocale}${location.search}`;
+    location.href = targetUrl;
   };
 
   /**

package/hooks/use-router.ts

@@ -27,8 +27,11 @@ export const useRouter = () => {
     );
 
     url.pathname = `${
-      locale === defaultLocale?.value &&
-      localeUrlStrategy === LocaleUrlStrategy.HideDefaultLocale
+      localeUrlStrategy === LocaleUrlStrategy.Subdomain ||
+      (locale === defaultLocale?.value &&
+        [LocaleUrlStrategy.HideDefaultLocale].includes(
+          localeUrlStrategy as LocaleUrlStrategy
+        ))
         ? ''
         : `/${locale}`
     }${pathnameWithoutLocale}`;

package/hooks/use-sentry-uncaught-errors.ts

@@ -0,0 +1,24 @@
+import { useEffect } from 'react';
+import * as Sentry from '@sentry/nextjs';
+import { ClientLogType } from '@akinon/next/sentry';
+
+export const useSentryUncaughtErrors = (error: Error & { digest?: string }) => {
+  useEffect(() => {
+    Sentry.withScope(function (scope) {
+      scope.setLevel('fatal');
+      scope.setTags({
+        APP_TYPE: 'ProjectZeroNext',
+        TYPE: 'Client',
+        LOG_TYPE: ClientLogType.UNCAUGHT_ERROR_PAGE
+      });
+      scope.setExtra('error', error);
+
+      const error_ = new Error('FATAL: Uncaught client error');
+      error_.name = 'UNCAUGHT_ERROR_PAGE';
+
+      Sentry.captureException(error_, {
+        fingerprint: ['UNCAUGHT_ERROR_PAGE', error.digest]
+      });
+    });
+  }, [error]);
+};

package/instrumentation/index.ts

@@ -1,5 +1,15 @@
+import { initSentry } from '../sentry';
+import * as Sentry from '@sentry/nextjs';
+
 export async function register() {
   if (process.env.NEXT_RUNTIME === 'nodejs') {
     await import('./node');
+    initSentry('Server');
+  }
+
+  if (process.env.NEXT_RUNTIME === 'edge') {
+    initSentry('Edge');
   }
 }
+
+export const onRequestError = Sentry.captureRequestError;

package/jest.config.js

@@ -0,0 +1,19 @@
+const path = require('path');
+
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  rootDir: path.resolve(__dirname),
+  roots: [],
+  testMatch: ['**/*.test.ts'],
+  testPathIgnorePatterns: [],
+  transformIgnorePatterns: [],
+  transform: {
+    '^.+\\.(tsx?|jsx?|mjs?)$': [
+      'ts-jest',
+      {
+        tsconfig: path.resolve(__dirname, '__tests__/tsconfig.json')
+      }
+    ]
+  }
+};

package/lib/cache-handler.mjs

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

package/lib/cache.ts

@@ -156,10 +156,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,
@@ -178,6 +174,10 @@ export class Cache {
     const _options = Object.assign(defaultOptions, options);
     const formattedKey = Cache.formatKey(key, locale);
 
+    if (Settings.usePrettyUrlRoute) {
+      _options.expire = 120;
+    }
+
     logger.debug('Cache wrap', { key, formattedKey, _options });
 
     if (_options.cache) {

package/localization/index.ts

@@ -1,5 +1,6 @@
 export enum LocaleUrlStrategy {
   HideAllLocales = 'hide-all-locales',
   HideDefaultLocale = 'hide-default-locale',
-  ShowAllLocales = 'show-all-locales'
+  ShowAllLocales = 'show-all-locales',
+  Subdomain = 'subdomain'
 }

package/middlewares/default.ts

@@ -19,6 +19,8 @@ import withLocale from './locale';
 import logger from '../utils/log';
 import { user } from '../data/urls';
 import { getUrlPathWithLocale } from '../utils/localization';
+import getRootHostname from '../utils/get-root-hostname';
+import { LocaleUrlStrategy } from '../localization';
 
 const withPzDefault =
   (middleware: NextMiddleware) =>
@@ -95,7 +97,9 @@ const withPzDefault =
 
     if (
       req.nextUrl.pathname.includes('/orders/hooks/') ||
-      req.nextUrl.pathname.includes('/orders/checkout-with-token/')
+      req.nextUrl.pathname.includes('/orders/checkout-with-token/') ||
+      req.nextUrl.pathname.includes('/hooks/cash_register/complete/') ||
+      req.nextUrl.pathname.includes('/hooks/cash_register/pre_order/')
     ) {
       const queryString = searchParams.toString();
       const currency = searchParams.get('currency')?.toLowerCase();
@@ -285,14 +289,16 @@ const withPzDefault =
                                 url.pathname =
                                   url.pathname +
                                   (/\/$/.test(url.pathname) ? '' : '/') +
-                                  `searchparams|${url.searchParams.toString()}`;
+                                  `searchparams|${encodeURIComponent(
+                                    url.searchParams.toString()
+                                  )}`;
                               }
 
                               if (
                                 !req.middlewareParams.found &&
                                 Settings.customNotFoundEnabled
                               ) {
-                                let pathname = url.pathname
+                                const pathname = url.pathname
                                   .replace(/\/+$/, '')
                                   .split('/');
                                 url.pathname = url.pathname.replace(
@@ -337,6 +343,21 @@ const withPzDefault =
                                 middlewareResult = NextResponse.rewrite(url);
                               }
 
+                              const { localeUrlStrategy } =
+                                Settings.localization;
+
+                              const fallbackHost =
+                                req.headers.get('x-forwarded-host') ||
+                                req.headers.get('host');
+                              const hostname =
+                                process.env.NEXT_PUBLIC_URL ||
+                                `https://${fallbackHost}`;
+                              const rootHostname =
+                                localeUrlStrategy ===
+                                LocaleUrlStrategy.Subdomain
+                                  ? getRootHostname(hostname)
+                                  : null;
+
                               if (
                                 !url.pathname.startsWith(`/${currency}/orders`)
                               ) {
@@ -346,6 +367,7 @@ const withPzDefault =
                                     ? locale
                                     : defaultLocaleValue,
                                   {
+                                    domain: rootHostname,
                                     sameSite: 'none',
                                     secure: true,
                                     expires: new Date(
@@ -354,10 +376,12 @@ const withPzDefault =
                                   }
                                 );
                               }
+
                               middlewareResult.cookies.set(
                                 'pz-currency',
                                 currency,
                                 {
+                                  domain: rootHostname,
                                   sameSite: 'none',
                                   secure: true,
                                   expires: new Date(
@@ -406,7 +430,10 @@ const withPzDefault =
                                   ).json();
                                   middlewareResult.cookies.set(
                                     'csrftoken',
-                                    csrf_token
+                                    csrf_token,
+                                    {
+                                      domain: rootHostname
+                                    }
                                   );
                                 }
                               } catch (error) {

package/middlewares/locale.ts

@@ -4,17 +4,33 @@ import { PzNextRequest } from '.';
 import { LocaleUrlStrategy } from '../localization';
 import { urlLocaleMatcherRegex } from '../utils';
 import logger from '../utils/log';
+import { getUrlPathWithLocale } from '../utils/localization';
 
-const getMatchedLocale = (pathname: string) => {
+const getMatchedLocale = (pathname: string, req: PzNextRequest) => {
   let matchedLocale = pathname.match(urlLocaleMatcherRegex)?.[0] ?? '';
   matchedLocale = matchedLocale.replace('/', '');
 
+  const { localeUrlStrategy, defaultLocaleValue } = settings.localization;
+
+  if (localeUrlStrategy === LocaleUrlStrategy.Subdomain) {
+    const host =
+      req.headers.get('x-forwarded-host') || req.headers.get('host') || '';
+
+    if (host) {
+      const subDomain = host.split('.')[0] || '';
+      const subDomainLocaleMatched = `/${subDomain}`.match(
+        urlLocaleMatcherRegex
+      );
+
+      if (subDomainLocaleMatched && subDomainLocaleMatched[0]) {
+        matchedLocale = subDomainLocaleMatched[0].slice(1);
+      }
+    }
+  }
+
   if (!matchedLocale.length) {
-    if (
-      settings.localization.localeUrlStrategy !==
-      LocaleUrlStrategy.ShowAllLocales
-    ) {
-      matchedLocale = settings.localization.defaultLocaleValue;
+    if (localeUrlStrategy !== LocaleUrlStrategy.ShowAllLocales) {
+      matchedLocale = defaultLocaleValue;
     }
   }
 
@@ -28,8 +44,10 @@ const withLocale =
 
     try {
       const url = req.nextUrl.clone();
-      const matchedLocale = getMatchedLocale(url.pathname);
-      let { localeUrlStrategy, defaultLocaleValue, redirectToDefaultLocale } =
+      const matchedLocale = getMatchedLocale(url.pathname, req);
+      let { localeUrlStrategy } = settings.localization;
+
+      const { defaultLocaleValue, redirectToDefaultLocale } =
         settings.localization;
 
       localeUrlStrategy =
@@ -50,8 +68,15 @@ const withLocale =
         redirectToDefaultLocale &&
         req.method === 'GET'
       ) {
-        url.pathname = `/${defaultLocaleValue}${url.pathname}`;
-        return NextResponse.redirect(url);
+        // Redirect to existing or default locale
+
+        url.pathname = getUrlPathWithLocale(
+          url.pathname,
+          req.cookies.get('pz-locale')?.value
+        );
+
+        // Use 303 for POST requests
+        return NextResponse.redirect(url, 303);
       }
 
       req.middlewareParams.rewrites.locale = matchedLocale;
@@ -61,7 +86,6 @@ const withLocale =
         ip
       });
     }
-
     return middleware(req, event);
   };
 

package/middlewares/url-redirection.ts

@@ -60,6 +60,22 @@ const withUrlRedirection =
 
         const setCookies = request.headers.getSetCookie();
 
+        if (settings.commerceRedirectionIgnoreList) {
+          const shouldIgnoreRedirect =
+            settings.commerceRedirectionIgnoreList.some((ignorePath) =>
+              redirectUrl.pathname.startsWith(
+                getUrlPathWithLocale(
+                  ignorePath,
+                  req.middlewareParams.rewrites.locale
+                )
+              )
+            );
+
+          if (shouldIgnoreRedirect) {
+            return middleware(req, event);
+          }
+        }
+
         const response = NextResponse.redirect(redirectUrl.toString(), {
           status: request.status
         });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.11",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -13,14 +13,18 @@
     "pz-predev": "bin/pz-predev.js",
     "pz-postdev": "bin/pz-postdev.js"
   },
+  "scripts": {
+    "test": "jest"
+  },
   "dependencies": {
+    "@neshca/cache-handler": "1.5.1",
     "@opentelemetry/exporter-trace-otlp-http": "0.46.0",
     "@opentelemetry/resources": "1.19.0",
     "@opentelemetry/sdk-node": "0.46.0",
     "@opentelemetry/sdk-trace-node": "1.19.0",
     "@opentelemetry/semantic-conventions": "1.19.0",
     "@reduxjs/toolkit": "1.9.7",
-    "@neshca/cache-handler": "1.5.1",
+    "@sentry/nextjs": "9.5.0",
     "cross-spawn": "7.0.3",
     "generic-pool": "3.9.0",
     "react-redux": "8.1.3",
@@ -30,13 +34,13 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "2.0.0-beta.1",
+    "@akinon/eslint-plugin-projectzero": "2.0.0-beta.11",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
     "@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-next": "15.3.2",
     "eslint-config-prettier": "9.1.0"
   }
 }

package/plugins.js

@@ -14,5 +14,6 @@ module.exports = [
   'pz-multi-basket',
   'pz-saved-card',
   'pz-tabby-extension',
-  'pz-apple-pay'
+  'pz-apple-pay',
+  'pz-tamara-extension'
 ];

package/redux/middlewares/checkout.ts

@@ -16,12 +16,11 @@ import {
   setLoyaltyBalance,
   setPaymentChoices,
   setPaymentOptions,
-  setPreOrder,
   setRetailStores,
   setShippingOptions,
-  setShippingStepCompleted,
   setHepsipayAvailability,
-  setWalletPaymentData
+  setWalletPaymentData,
+  setPayOnDeliveryOtpModalActive
 } from '../../redux/reducers/checkout';
 import { RootState, TypedDispatch } from 'redux/store';
 import { checkoutApi } from '../../data/client/checkout';
@@ -37,6 +36,7 @@ interface CheckoutResult {
     errors?: Record<string, string[]>;
     pre_order?: PreOrder;
     context_list?: CheckoutContext[];
+    redirect_url?: string;
   };
 }
 
@@ -58,142 +58,29 @@ export const errorMiddleware: Middleware = ({ dispatch }: MiddlewareParams) => {
   };
 };
 
-export const preOrderMiddleware: Middleware = ({
-  getState,
-  dispatch
-}: MiddlewareParams) => {
+export const redirectUrlMiddleware: Middleware = () => {
   return (next) => (action) => {
     const result: CheckoutResult = next(action);
-    const preOrder = result?.payload?.pre_order;
+    const redirectUrl = result?.payload?.redirect_url;
 
-    if (
-      !preOrder ||
-      action?.meta?.arg?.endpointName === 'guestLogin' ||
-      action?.meta?.arg?.endpointName === 'getCheckoutLoyaltyBalance'
-    ) {
-      return result;
-    }
+    if (redirectUrl) {
+      const currentLocale = getCookie('pz-locale');
 
-    const {
-      deliveryOptions,
-      addressList: addresses,
-      shippingOptions,
-      dataSourceShippingOptions,
-      paymentOptions,
-      installmentOptions,
-      attributeBasedShippingOptions
-    } = getState().checkout;
-    const { endpoints: apiEndpoints } = checkoutApi;
+      let url = redirectUrl;
 
-    if (preOrder.is_redirected) {
-      const contextList = result?.payload?.context_list;
+      if (currentLocale && !redirectUrl.includes('/orders/redirection')) {
+        const { defaultLocaleValue, localeUrlStrategy } = settings.localization;
 
-      if (
-        contextList.find(
-          (ctx) => ctx.page_name === 'RedirectionPaymentSelectedPage'
-        )
-      ) {
-        dispatch(
-          apiEndpoints.setPaymentOption.initiate(preOrder.payment_option?.pk)
-        );
-        return;
+        url =
+          currentLocale === defaultLocaleValue &&
+          localeUrlStrategy !== LocaleUrlStrategy.ShowAllLocales
+            ? redirectUrl
+            : `/${currentLocale}${redirectUrl}`;
       }
-    }
-
-    dispatch(setPreOrder(preOrder));
 
-    if (!preOrder.delivery_option && deliveryOptions.length > 0) {
-      dispatch(
-        apiEndpoints.setDeliveryOption.initiate(
-          deliveryOptions.find((opt) => opt.delivery_option_type === 'customer')
-            ?.pk
-        )
-      );
-    }
-
-    if (
-      (!preOrder.shipping_address || !preOrder.billing_address) &&
-      addresses.length > 0 &&
-      (!preOrder.delivery_option ||
-        preOrder.delivery_option.delivery_option_type === 'customer')
-    ) {
-      dispatch(
-        apiEndpoints.setAddresses.initiate({
-          shippingAddressPk: addresses[0].pk,
-          billingAddressPk: addresses[0].pk
-        })
-      );
-    }
-
-    if (
-      shippingOptions.length > 0 &&
-      (!preOrder.shipping_option ||
-        !shippingOptions.find((opt) => opt.pk === preOrder.shipping_option?.pk))
-    ) {
-      dispatch(apiEndpoints.setShippingOption.initiate(shippingOptions[0].pk));
+      window.location.href = url;
     }
 
-    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.attribute_based_shipping_options[0].pk
-        ])
-      );
-
-      dispatch(
-        apiEndpoints.setAttributeBasedShippingOptions.initiate(
-          initialSelectedOptions
-        )
-      );
-    }
-
-    if (!preOrder.payment_option && paymentOptions.length > 0) {
-      dispatch(apiEndpoints.setPaymentOption.initiate(paymentOptions[0].pk));
-    }
-
-    if (
-      !preOrder.installment &&
-      preOrder.payment_option?.payment_type !== 'saved_card' &&
-      installmentOptions.length > 0
-    ) {
-      dispatch(
-        apiEndpoints.setInstallmentOption.initiate(installmentOptions[0].pk)
-      );
-    }
-
-    dispatch(
-      setShippingStepCompleted(
-        [
-          preOrder.delivery_option?.delivery_option_type === 'retail_store'
-            ? true
-            : preOrder.shipping_address?.pk,
-          preOrder.billing_address?.pk,
-          preOrder.shipping_option?.pk,
-          addresses.length > 0
-        ].every(Boolean)
-      )
-    );
-
     return result;
   };
 };
@@ -203,8 +90,9 @@ export const contextListMiddleware: Middleware = ({
   getState
 }: MiddlewareParams) => {
   return (next) => (action) => {
-    const { isMobileApp } = getState().root;
+    const { isMobileApp, userPhoneNumber } = getState().root;
     const result: CheckoutResult = next(action);
+    const preOrder = result?.payload?.pre_order;
 
     if (result?.payload?.context_list) {
       result.payload.context_list.forEach((context) => {
@@ -323,6 +211,18 @@ export const contextListMiddleware: Middleware = ({
         if (context.page_context.retail_stores) {
           dispatch(setRetailStores(context.page_context.retail_stores));
         }
+
+        if (context.page_name === 'SendSmsPage' && !preOrder?.phone_number) {
+          dispatch(
+            checkoutApi.endpoints.sendSms.initiate({
+              phone_number: userPhoneNumber ?? preOrder?.user_phone_number
+            })
+          );
+        }
+
+        if (context.page_name === 'VerifySmsPage') {
+          dispatch(setPayOnDeliveryOtpModalActive(true));
+        }
       });
     }