@akinon/next 2.0.59-rc.0 → 2.0.59

package/CHANGELOG.md

@@ -1,34 +1,10 @@
 # @akinon/next
 
-## 2.0.59-rc.0
+## 2.0.59
 
 ### Patch Changes
 
-- 0cf9ea239: BRDG-16491: Prevent redirect when iframe payment is active
-- 324f97d55: ZERO-4219: replace masterpass-rest-complete with masterpass-rest-callback
-- 51ea06888: ZERO-4377: Fix checkout card type state being cleared after valid bin number responses.
-- ZERO-4160: Enhance oauth-login middleware with improved request handling and logging
-- 2fea4143: ZERO-4620: Add runtime access to `NEXT_PUBLIC_*` environment variables from Client Components
-- b55acb768: ZERO-2577: Fix pagination bug and update usePagination hook and ensure pagination controls rendering correctly
-- 760258c1c: ZERO-4160: Enhance oauth-login middleware to handle fetch errors and improve response handling
-- 143be2b9d: ZERO-3457: Crop styles are customizable and logic improved for rendering similar products modal
-- 7889b08fe: ZERO-4276: Enhance route generation by adding .env loading and custom skip segments support
-- 9f8cd3bc5: ZERO-3449: AI Search Active Filters & Crop Style changes have been implemented
-- bfafa3f49: ZERO-4160: Refactor oauth-login middleware to use fetchCommerce for API calls and improve cookie handling
-- 57d7eb305: ZERO-4276: Refactor route generation logic by removing environment loading and simplifying skip segments handling
-- d99a6a7d5: ZERO-3457_1: Fixed the settings prop and made sure everything is customizable.
-- 9db81a714: ZERO-4365: Remove brand `@theme/*` alias imports from library packages
-- 591e345e1: ZERO-3855: Enhance credit card payment handling in checkout middlewares
-- 4de5303c5: ZERO-2504: add cookie filter to api client request
-- 95b139dc1: ZERO-3795: Remove duplicate entry for SavedCard in PluginComponents map
-- 1d00f2d06: BRDG-16664: Set secure flag for CSRF token cookies in useCaptcha and default middleware
-- 4ac7b2a1e: ZERO-4219: fix masterpass-rest callback route format and double-encoded error cookie
-- e9598c71: ZERO-4622: Images remotePatterns for improved readability
-- 4998a9631: ZERO-4168: Add server-side payload optimization
-- 804d2bd6: ZERO-4536: Add akinon.net domain to CSP frame-ancestors directive
-- 3909d3224: Edit the duplicate Plugin.SimilarProducts in the plugin-module.
-- 6a3d8a63: ZERO-4541: Fix URL query string formatting in getOrders and getOldOrders functions
-- e18836b20: ZERO-4160: Restore scope in Sentry addon configuration in akinon.json
+- 9a1a2df: ZERO-4804: Port the deterministic checkout fix to v2 by removing the shared checkout abort controller and the 250 ms delayed validation, and guarding pre-order auto-select middlewares with pre_order preconditions
 
 ## 2.0.58
 

package/bin/pz-generate-routes.js

@@ -6,7 +6,6 @@ const findBaseDir = require('../utils/find-base-dir');
 
 const generateRoutes = () => {
   const baseDir = findBaseDir();
-
   const srcDir = path.join(baseDir, 'src');
   const appDir = path.join(srcDir, 'app');
 
@@ -35,10 +34,8 @@ const generateRoutes = () => {
     '[segment]',
     '[url]',
     '[theme]',
-    '[member_type]',
-    '[clienttype]'
+    '[member_type]'
   ];
-
   const skipCatchAllRoutes = ['[...prettyurl]', '[...not_found]'];
 
   const walkDirectory = (dir, basePath = '') => {

package/components/plugin-module.tsx

@@ -116,6 +116,7 @@ const PluginComponents = new Map([
     ]
   ],
   [Plugin.SavedCard, [Component.SavedCard, Component.IyzicoSavedCard]],
+  [Plugin.SavedCard, [Component.SavedCard]],
   [Plugin.FlowPayment, [Component.FlowPayment]],
   [
     Plugin.VirtualTryOn,

package/data/client/api.ts

@@ -33,6 +33,15 @@ const customBaseQuery: BaseQueryFn<
     ).length > 1
   ) {
     api.abort('Mutation already in progress.');
+
+    // Short-circuit explicitly instead of relying on the abort to settle
+    // before the request reaches the network (ZERO-4638).
+    return {
+      error: {
+        status: 'CUSTOM_ERROR',
+        error: 'Mutation already in progress.'
+      } as FetchBaseQueryError
+    };
   }
 
   const baseQuery = fetchBaseQuery({

package/data/client/checkout.ts

@@ -36,12 +36,6 @@ import {
 import { devLogger } from '@akinon/next/hooks/use-logger-context';
 import { LogLevel } from '@akinon/next/hooks/use-logger';
 
-const getLatestState = async (getState: () => any): Promise<any> => {
-  await new Promise((resolve) => setTimeout(resolve, 250));
-
-  return getState();
-};
-
 const recentLogMessages = new Map<string, number>();
 
 const getStore = async (): Promise<AppStore> => {
@@ -59,6 +53,10 @@ interface CheckoutResponse {
   redirect_url?: string;
 }
 
+// Log-only diagnostics: checkout mutations are never aborted based on these
+// checks anymore. Invalid auto-dispatches are prevented at their source in
+// redux/middlewares/pre-order, and Commerce stays the authority for manual
+// dispatches (ZERO-4638).
 const validateCheckoutState = (
   state: any,
   validations: Array<{
@@ -66,17 +64,10 @@ const validateCheckoutState = (
     errorMessage: string;
     severity?: LogLevel;
     data?: any;
-    action?: () => void;
   }>
 ) => {
   validations.forEach(
-    ({
-      condition,
-      errorMessage,
-      severity = 'error',
-      data: logData,
-      action
-    }) => {
+    ({ condition, errorMessage, severity = 'error', data: logData }) => {
       if (condition(state)) {
         const now = Date.now();
         const lastLogged = recentLogMessages.get(errorMessage) || 0;
@@ -90,15 +81,12 @@ const validateCheckoutState = (
                 errorMessage,
                 logData || state.checkout?.preOrder
               );
-              action?.();
               break;
             case 'warn':
               devLogger.warn(errorMessage, logData || state.checkout?.preOrder);
-              action?.();
               break;
             default:
               devLogger.info(errorMessage, logData || state.checkout?.preOrder);
-              action?.();
           }
         }
       }
@@ -254,6 +242,12 @@ const completeMasterpassPayment = async (
 
 let checkoutAbortController = new AbortController();
 
+/**
+ * @deprecated Checkout mutations no longer share an abort signal; nothing in
+ * the core aborts this controller anymore. Premature auto-dispatches are
+ * prevented in redux/middlewares/pre-order instead (ZERO-4638). Kept only so
+ * existing external imports keep compiling.
+ */
 export const getCheckoutAbortSignal = () => {
   if (checkoutAbortController.signal.aborted) {
     checkoutAbortController = new AbortController();
@@ -261,11 +255,6 @@ export const getCheckoutAbortSignal = () => {
   return checkoutAbortController.signal;
 };
 
-const abortCheckout = () => {
-  checkoutAbortController.abort();
-  checkoutAbortController = new AbortController();
-};
-
 export const checkoutApi = api.injectEndpoints({
   endpoints: (build) => ({
     fetchCheckout: build.query<CheckoutResponse, void>({
@@ -452,13 +441,12 @@ export const checkoutApi = api.injectEndpoints({
         method: 'POST',
         body: {
           delivery_option: String(pk)
-        },
-        signal: getCheckoutAbortSignal()
+        }
       }),
       async onQueryStarted(arg, { dispatch, queryFulfilled, getState }) {
         dispatch(setShippingStepBusy(true));
 
-        const state = await getLatestState(getState);
+        const state = getState();
 
         validateCheckoutState(state, [
           {
@@ -468,8 +456,7 @@ export const checkoutApi = api.injectEndpoints({
               return preOrder?.basket?.basketitem_set?.length === 0;
             },
             errorMessage:
-              'Your shopping basket is empty. Please add items to your basket before selecting a delivery option.',
-            action: () => abortCheckout()
+              'Your shopping basket is empty. Please add items to your basket before selecting a delivery option.'
           }
         ]);
 
@@ -490,13 +477,12 @@ export const checkoutApi = api.injectEndpoints({
         body: {
           shipping_address: String(shippingAddressPk),
           billing_address: String(billingAddressPk)
-        },
-        signal: getCheckoutAbortSignal()
+        }
       }),
       async onQueryStarted(arg, { dispatch, queryFulfilled, getState }) {
         dispatch(setShippingStepBusy(true));
 
-        const state = await getLatestState(getState);
+        const state = getState();
 
         validateCheckoutState(state, [
           {
@@ -509,8 +495,7 @@ export const checkoutApi = api.injectEndpoints({
                 : false;
             },
             errorMessage:
-              'You need to select a delivery option before setting your addresses. Dispatch setAddresses action after delivery option selection.',
-            action: () => abortCheckout()
+              'You need to select a delivery option before setting your addresses. Dispatch setAddresses action after delivery option selection.'
           }
         ]);
 
@@ -530,13 +515,12 @@ export const checkoutApi = api.injectEndpoints({
         method: 'POST',
         body: {
           shipping_option: String(pk)
-        },
-        signal: getCheckoutAbortSignal()
+        }
       }),
       async onQueryStarted(arg, { dispatch, queryFulfilled, getState }) {
         dispatch(setShippingStepBusy(true));
 
-        const state = await getLatestState(getState);
+        const state = getState();
 
         validateCheckoutState(state, [
           {
@@ -546,8 +530,7 @@ export const checkoutApi = api.injectEndpoints({
               return !preOrder?.billing_address;
             },
             errorMessage:
-              'You need to provide a billing address before selecting a shipping option. Dispatch setShippingOption action after billing address selection.',
-            action: () => abortCheckout()
+              'You need to provide a billing address before selecting a shipping option. Dispatch setShippingOption action after billing address selection.'
           },
           {
             condition: (state) => {
@@ -556,8 +539,7 @@ export const checkoutApi = api.injectEndpoints({
               return !preOrder?.shipping_address;
             },
             errorMessage:
-              'You need to provide a shipping address before selecting a shipping option. Dispatch setShippingOption action after shipping address selection.',
-            action: () => abortCheckout()
+              'You need to provide a shipping address before selecting a shipping option. Dispatch setShippingOption action after shipping address selection.'
           }
         ]);
 
@@ -614,8 +596,7 @@ export const checkoutApi = api.injectEndpoints({
         method: 'POST',
         body: {
           payment_option: String(pk)
-        },
-        signal: getCheckoutAbortSignal()
+        }
       }),
       async onQueryStarted(arg, { dispatch, queryFulfilled, getState }) {
         dispatch(setPaymentStepBusy(true));
@@ -624,7 +605,7 @@ export const checkoutApi = api.injectEndpoints({
         dispatch(setSelectedBankAccountPk(null));
         dispatch(setCardType(null));
 
-        const state = await getLatestState(getState);
+        const state = getState();
 
         validateCheckoutState(state, [
           {
@@ -634,8 +615,7 @@ export const checkoutApi = api.injectEndpoints({
               return !preOrder?.shipping_option?.pk;
             },
             errorMessage:
-              'You need to select a shipping option before choosing a payment method. Dispatch setPaymentOption action after shipping option selection.',
-            action: () => abortCheckout()
+              'You need to select a shipping option before choosing a payment method. Dispatch setPaymentOption action after shipping option selection.'
           }
         ]);
 
@@ -738,6 +718,7 @@ export const checkoutApi = api.injectEndpoints({
       },
       async onQueryStarted(arg, { dispatch, queryFulfilled }) {
         dispatch(setPaymentStepBusy(true));
+        dispatch(setCardType(arg));
         await queryFulfilled;
         dispatch(setPaymentStepBusy(false));
       }

package/data/server/category.ts

@@ -8,8 +8,6 @@ import { parse } from 'lossless-json';
 import logger from '../../utils/log';
 import { headers as nHeaders } from 'next/headers';
 import { ServerVariables } from '../../utils/server-variables';
-import { optimizeCategoryResponse } from '../../utils/payload-optimizer';
-import settings from 'settings';
 
 function getCategoryDataHandler(
   pk: number,
@@ -83,7 +81,7 @@ function getCategoryDataHandler(
   };
 }
 
-export const getCategoryData = async ({
+export const getCategoryData = ({
   pk,
   searchParams,
   headers,
@@ -107,16 +105,6 @@ export const getCategoryData = async ({
       compressed: true
     }
   );
-
-  if (settings.payloadOptimization?.enabled && result?.data) {
-    try {
-      return { ...result, data: optimizeCategoryResponse(result.data, settings.payloadOptimization) };
-    } catch (e) {
-      logger.error('Payload optimization failed for category', { pk, error: (e as Error).message });
-    }
-  }
-
-  return result;
 };
 
 function getCategoryBySlugDataHandler(

package/data/server/list.ts

@@ -7,8 +7,6 @@ import appFetch, { FetchResponseType } from '../../utils/app-fetch';
 import { parse } from 'lossless-json';
 import logger from '../../utils/log';
 import { ServerVariables } from '../../utils/server-variables';
-import { optimizeCategoryResponse } from '../../utils/payload-optimizer';
-import settings from 'settings';
 
 const getListDataHandler = (
   locale,
@@ -80,14 +78,4 @@ export const getListData = async ({
       compressed: true
     }
   );
-
-  if (settings.payloadOptimization?.enabled && result) {
-    try {
-      return optimizeCategoryResponse(result, settings.payloadOptimization);
-    } catch (e) {
-      logger.error('Payload optimization failed for list', { error: (e as Error).message });
-    }
-  }
-
-  return result;
 };

package/data/server/product.ts

@@ -5,8 +5,6 @@ import appFetch from '../../utils/app-fetch';
 import { normalizeSearchParams } from '../../utils/normalize-search-params';
 import { ServerVariables } from '../../utils/server-variables';
 import logger from '../../utils/log';
-import { optimizeProductResponse } from '../../utils/payload-optimizer';
-import settings from 'settings';
 
 type GetProduct = {
   pk: number | string;
@@ -168,13 +166,5 @@ export const getProductData = async ({
     throw error;
   }
 
-  if (settings.payloadOptimization?.enabled && result?.data) {
-    try {
-      return { ...result, data: optimizeProductResponse(result.data, settings.payloadOptimization) };
-    } catch (e) {
-      logger.error('Payload optimization failed for product', { pk, error: (e as Error).message });
-    }
-  }
-
   return result;
 };

package/data/server/special-page.ts

@@ -5,9 +5,6 @@ import { generateCommerceSearchParams } from '../../utils';
 import { normalizeSearchParams } from '../../utils/normalize-search-params';
 import appFetch from '../../utils/app-fetch';
 import { ServerVariables } from '../../utils/server-variables';
-import { optimizeCategoryResponse } from '../../utils/payload-optimizer';
-import logger from '../../utils/log';
-import settings from 'settings';
 
 const getSpecialPageDataHandler = (
   pk: number,
@@ -60,14 +57,4 @@ export const getSpecialPageData = async ({
       compressed: true
     }
   );
-
-  if (settings.payloadOptimization?.enabled && result) {
-    try {
-      return optimizeCategoryResponse(result, settings.payloadOptimization);
-    } catch (e) {
-      logger.error('Payload optimization failed for special-page', { pk, error: (e as Error).message });
-    }
-  }
-
-  return result;
 };

package/data/server/widget.ts

@@ -4,9 +4,6 @@ import { CacheOptions, WidgetResultType, WidgetSchemaType } from '../../types';
 import appFetch from '../../utils/app-fetch';
 import { widgets } from '../urls';
 import { ServerVariables } from '../../utils/server-variables';
-import { optimizeWidgetResponse } from '../../utils/payload-optimizer';
-import logger from '../../utils/log';
-import settings from 'settings';
 
 const getWidgetDataHandler =
   (
@@ -56,7 +53,7 @@ export const getWidgetData = async <T>({
   cacheOptions?: CacheOptions;
   headers?: Record<string, string>;
 }): Promise<WidgetResultType<T>> => {
-  const result = await Cache.wrap(
+  return Cache.wrap(
     CacheKey.Widget(slug),
     locale,
     getWidgetDataHandler(slug, locale, currency, headers),
@@ -65,16 +62,6 @@ export const getWidgetData = async <T>({
       ...cacheOptions
     }
   );
-
-  if (settings.payloadOptimization?.enabled && result) {
-    try {
-      return optimizeWidgetResponse(result, settings.payloadOptimization) as WidgetResultType<T>;
-    } catch (e) {
-      logger.error('Payload optimization failed for widget', { slug, error: (e as Error).message });
-    }
-  }
-
-  return result as WidgetResultType<T>;
 };
 
 const getCollectionWidgetDataHandler =

package/data/urls.ts

@@ -40,11 +40,10 @@ export const account = {
       shipping_option_slug
         ? `&shipping_option_slug${shipping_option_operator}${shipping_option_slug}`
         : ''
-    }${currency ? `&currency=${currency}` : ''}${
-      filterType && filterValue ? `&${filterType}=${filterValue}` : ''
-    }`,
+    }${currency ? `&currency=${currency}` : ''}
+    ${filterType && filterValue ? `&${filterType}=${filterValue}` : ''}`,
   getOldOrders: ({ page, limit }: { page?: number; limit?: number }) =>
-    `/users/old-orders/?page=${page || 1}&limit=${limit || 12}`,
+    `/users/old-orders/?page=${page || 1}&limit=${limit || 12}}`,
   getQuotations: (page?: number, status?: string, limit?: number) =>
     `/b2b/my-quotations/?page=${page || 1}` +
     (status ? `&status=${status}` : '') +
@@ -184,11 +183,7 @@ export const product = {
   breadcrumbUrl: (menuitemmodel: string) =>
     `/menus/generate_breadcrumb/?item=${menuitemmodel}&generator_name=menu_item`,
   bundleProduct: (productPk: string, queryString: string) =>
-    `/bundle-product/${productPk}/?${queryString}`,
-  similarProducts: (params?: string) =>
-    `/similar-products${params ? `?${params}` : ''}`,
-  similarProductsList: (params?: string) =>
-    `/similar-product-list${params ? `?${params}` : ''}`
+    `/bundle-product/${productPk}/?${queryString}`
 };
 
 export const wishlist = {

package/hooks/index.ts

@@ -15,4 +15,3 @@ export * from './use-logger-context';
 export * from './use-sentry-uncaught-errors';
 export * from './use-pz-params';
 export * from './use-toast';
-export * from './use-client-env';

package/hooks/use-captcha.tsx

@@ -39,7 +39,7 @@ export const useCaptcha = () => {
   };
 
   if (csrfToken) {
-    setCookie('csrftoken', csrfToken, { secure: true });
+    setCookie('csrftoken', csrfToken);
   }
 
   const onCaptchaChange = useCallback(async (response) => {