@akinon/next 1.118.0-rc.4 → 1.118.0-rc.6

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @akinon/next
 
+## 1.118.0-rc.6
+
+## 1.118.0-rc.5
+
+### Minor Changes
+
+- aef81c5d: ZERO-4034: Refactor checkout API to use dynamic store imports for improved performance
+- 49c82e1a: ZERO-4047: Remove Sentry configuration from default Next.js config
+
 ## 1.118.0-rc.4
 
 ### Minor Changes

package/data/client/checkout.ts

@@ -20,7 +20,7 @@ import {
 import { buildClientRequestUrl } from '../../utils';
 import { api } from './api';
 import { checkout } from '../urls';
-import { AppDispatch, AppStore, store } from 'redux/store';
+import type { AppDispatch, AppStore } from 'redux/store';
 import settings from 'settings';
 import { showMobile3dIframe } from '../../utils/mobile-3d-iframe';
 import {
@@ -33,6 +33,11 @@ import {
   buildPurchaseForm
 } from '@akinon/pz-masterpass/src/utils';
 
+const getStore = async (): Promise<AppStore> => {
+  const { store } = await import('redux/store');
+  return store;
+};
+
 interface CheckoutResponse {
   pre_order?: PreOrder;
   errors: {
@@ -231,25 +236,32 @@ export const checkoutApi = api.injectEndpoints({
       CheckoutResponse,
       CompleteCreditCardParams
     >({
-      query: ({
-        card_holder,
-        card_cvv,
-        card_number,
-        card_month,
-        card_year,
-        use_three_d = true,
-        save = undefined
-      }) => {
+      async queryFn(
+        {
+          card_holder,
+          card_cvv,
+          card_number,
+          card_month,
+          card_year,
+          use_three_d = true,
+          save = undefined
+        },
+        _queryApi,
+        _extraOptions,
+        baseQuery
+      ) {
+        const reduxStore = await getStore();
         const paymentOption =
-          store.getState().checkout?.preOrder?.payment_option;
+          reduxStore.getState().checkout?.preOrder?.payment_option;
 
         if (paymentOption?.payment_type === 'masterpass') {
-          return {
+          const result = await baseQuery({
             url: buildClientRequestUrl(checkout.getMasterpassOrderNo, {
               useFormData: true
             }),
             method: 'POST'
-          };
+          });
+          return result as { data: CheckoutResponse } | { error: any };
         }
 
         const body: Record<string, string> = {
@@ -266,18 +278,19 @@ export const checkoutApi = api.injectEndpoints({
           body.save = save ? '1' : '0';
         }
 
-        return {
+        const result = await baseQuery({
           url: buildClientRequestUrl(checkout.completeCreditCardPayment, {
             useFormData: true
           }),
           method: 'POST',
           body
-        };
+        });
+        return result as { data: CheckoutResponse } | { error: any };
       },
       async onQueryStarted(args, { dispatch, queryFulfilled }) {
         dispatch(setPaymentStepBusy(true));
         const { data } = await queryFulfilled;
-        const reduxStore = (await import('redux/store')).store;
+        const reduxStore = await getStore();
         const completePaymentContext = data?.context_list?.find(
           (context) => context?.page_name === 'MasterpassCompletePage'
         );
@@ -522,15 +535,16 @@ export const checkoutApi = api.injectEndpoints({
       }
     }),
     setBinNumber: build.mutation<CheckoutResponse, string>({
-      query: (binNumber: string) => {
+      async queryFn(binNumber, _queryApi, _extraOptions, baseQuery) {
+        const reduxStore = await getStore();
         const paymentOption =
-          store.getState().checkout?.preOrder?.payment_option;
+          reduxStore.getState().checkout?.preOrder?.payment_option;
         const binNumberUrl =
           paymentOption?.payment_type === 'masterpass'
             ? checkout.setMasterpassBinNumber
             : checkout.setBinNumber;
 
-        return {
+        const result = await baseQuery({
           url: buildClientRequestUrl(binNumberUrl, {
             useFormData: true
           }),
@@ -538,7 +552,8 @@ export const checkoutApi = api.injectEndpoints({
           body: {
             bin_number: binNumber
           }
-        };
+        });
+        return result as { data: CheckoutResponse } | { error: any };
       },
       async onQueryStarted(arg, { dispatch, queryFulfilled }) {
         dispatch(setPaymentStepBusy(true));
@@ -548,14 +563,16 @@ export const checkoutApi = api.injectEndpoints({
       }
     }),
     setInstallmentOption: build.mutation<CheckoutResponse, number>({
-      query: (pk: number) => {
+      async queryFn(pk, _queryApi, _extraOptions, baseQuery) {
+        const reduxStore = await getStore();
         const paymentOption =
-          store.getState().checkout?.preOrder?.payment_option;
+          reduxStore.getState().checkout?.preOrder?.payment_option;
         const installmentOption =
           paymentOption?.payment_type === 'masterpass'
             ? checkout.setMasterPassInstallmentOption
             : checkout.setInstallmentOption;
-        return {
+
+        const result = await baseQuery({
           url: buildClientRequestUrl(installmentOption, {
             useFormData: true
           }),
@@ -563,7 +580,8 @@ export const checkoutApi = api.injectEndpoints({
           body: {
             installment: String(pk)
           }
-        };
+        });
+        return result as { data: CheckoutResponse } | { error: any };
       },
       async onQueryStarted(arg, { dispatch, queryFulfilled }) {
         dispatch(setPaymentStepBusy(true));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.118.0-rc.4",
+  "version": "1.118.0-rc.6",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -35,7 +35,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.118.0-rc.4",
+    "@akinon/eslint-plugin-projectzero": "1.118.0-rc.6",
     "@babel/core": "7.26.10",
     "@babel/preset-env": "7.26.9",
     "@babel/preset-typescript": "7.27.0",

package/utils/index.ts

@@ -204,6 +204,23 @@ export const getPosError = () => {
   return error;
 };
 
+export const checkPaymentWillRedirect = (response: {
+  context_list?: Array<{
+    page_name: string;
+    page_context?: { context_data?: { redirect_url?: string } };
+  }>;
+  redirect_url?: string;
+  errors?: unknown;
+}): boolean => {
+  if (!response) return false;
+
+  const hasThankYouPage = response.context_list?.some(
+    (c) => c.page_name === 'ThankYouPage'
+  );
+
+  return Boolean(hasThankYouPage || response.redirect_url);
+};
+
 export const urlSchemes = [
   'http',
   'tel:',

package/with-pz-config.js

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