@akinon/next 2.0.18-beta.0 → 2.0.18-rc.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +23 -2
- package/bin/pz-generate-routes.js +4 -1
- package/components/plugin-module.tsx +0 -1
- package/data/client/checkout.ts +0 -1
- package/data/server/category.ts +14 -2
- package/data/server/list.ts +13 -1
- package/data/server/product.ts +10 -0
- package/data/server/special-page.ts +14 -1
- package/data/server/widget.ts +14 -1
- package/data/urls.ts +5 -1
- package/hooks/use-captcha.tsx +1 -1
- package/middlewares/default.ts +254 -249
- package/middlewares/masterpass-rest-callback.ts +89 -202
- package/package.json +2 -2
- package/plugins.d.ts +10 -0
- package/plugins.js +1 -0
- package/redux/middlewares/checkout.ts +45 -3
- package/redux/middlewares/pre-order/installment-option.ts +9 -1
- package/types/index.ts +20 -9
- package/utils/csrf.ts +1 -1
- package/utils/payload-optimizer.ts +481 -0
- package/with-pz-config.js +2 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,10 +1,31 @@
|
|
|
1
1
|
# @akinon/next
|
|
2
2
|
|
|
3
|
-
## 2.0.18-
|
|
3
|
+
## 2.0.18-rc.0
|
|
4
4
|
|
|
5
5
|
### Patch Changes
|
|
6
6
|
|
|
7
|
-
-
|
|
7
|
+
- 0cf9ea23: BRDG-16491: Prevent redirect when iframe payment is active
|
|
8
|
+
- 324f97d5: ZERO-4219: replace masterpass-rest-complete with masterpass-rest-callback
|
|
9
|
+
- 51ea0688: ZERO-4377: Fix checkout card type state being cleared after valid bin number responses.
|
|
10
|
+
- ZERO-4160: Enhance oauth-login middleware with improved request handling and logging
|
|
11
|
+
- b55acb768: ZERO-2577: Fix pagination bug and update usePagination hook and ensure pagination controls rendering correctly
|
|
12
|
+
- 760258c1: ZERO-4160: Enhance oauth-login middleware to handle fetch errors and improve response handling
|
|
13
|
+
- 143be2b9d: ZERO-3457: Crop styles are customizable and logic improved for rendering similar products modal
|
|
14
|
+
- 7889b08f: ZERO-4276: Enhance route generation by adding .env loading and custom skip segments support
|
|
15
|
+
- 9f8cd3bc5: ZERO-3449: AI Search Active Filters & Crop Style changes have been implemented
|
|
16
|
+
- d51fa68e: ZERO-4399: add card rewards to pz-masterpass-rest
|
|
17
|
+
- bfafa3f4: ZERO-4160: Refactor oauth-login middleware to use fetchCommerce for API calls and improve cookie handling
|
|
18
|
+
- 57d7eb30: ZERO-4276: Refactor route generation logic by removing environment loading and simplifying skip segments handling
|
|
19
|
+
- d99a6a7d5: ZERO-3457_1: Fixed the settings prop and made sure everything is customizable.
|
|
20
|
+
- 9db81a71: ZERO-4365: Remove brand `@theme/*` alias imports from library packages
|
|
21
|
+
- 591e345e: ZERO-3855: Enhance credit card payment handling in checkout middlewares
|
|
22
|
+
- 4de5303c5: ZERO-2504: add cookie filter to api client request
|
|
23
|
+
- 95b139dc: ZERO-3795: Remove duplicate entry for SavedCard in PluginComponents map
|
|
24
|
+
- 1d00f2d0: BRDG-16664: Set secure flag for CSRF token cookies in useCaptcha and default middleware
|
|
25
|
+
- 4ac7b2a1: ZERO-4219: fix masterpass-rest callback route format and double-encoded error cookie
|
|
26
|
+
- 4998a963: ZERO-4168: Add server-side payload optimization
|
|
27
|
+
- 3909d322: Edit the duplicate Plugin.SimilarProducts in the plugin-module.
|
|
28
|
+
- e18836b2: ZERO-4160: Restore scope in Sentry addon configuration in akinon.json
|
|
8
29
|
|
|
9
30
|
## 2.0.17
|
|
10
31
|
|
|
@@ -6,6 +6,7 @@ const findBaseDir = require('../utils/find-base-dir');
|
|
|
6
6
|
|
|
7
7
|
const generateRoutes = () => {
|
|
8
8
|
const baseDir = findBaseDir();
|
|
9
|
+
|
|
9
10
|
const srcDir = path.join(baseDir, 'src');
|
|
10
11
|
const appDir = path.join(srcDir, 'app');
|
|
11
12
|
|
|
@@ -34,8 +35,10 @@ const generateRoutes = () => {
|
|
|
34
35
|
'[segment]',
|
|
35
36
|
'[url]',
|
|
36
37
|
'[theme]',
|
|
37
|
-
'[member_type]'
|
|
38
|
+
'[member_type]',
|
|
39
|
+
'[clienttype]'
|
|
38
40
|
];
|
|
41
|
+
|
|
39
42
|
const skipCatchAllRoutes = ['[...prettyurl]', '[...not_found]'];
|
|
40
43
|
|
|
41
44
|
const walkDirectory = (dir, basePath = '') => {
|
package/data/client/checkout.ts
CHANGED
|
@@ -738,7 +738,6 @@ export const checkoutApi = api.injectEndpoints({
|
|
|
738
738
|
},
|
|
739
739
|
async onQueryStarted(arg, { dispatch, queryFulfilled }) {
|
|
740
740
|
dispatch(setPaymentStepBusy(true));
|
|
741
|
-
dispatch(setCardType(arg));
|
|
742
741
|
await queryFulfilled;
|
|
743
742
|
dispatch(setPaymentStepBusy(false));
|
|
744
743
|
}
|
package/data/server/category.ts
CHANGED
|
@@ -7,6 +7,8 @@ import { parse } from 'lossless-json';
|
|
|
7
7
|
import logger from '../../utils/log';
|
|
8
8
|
import { headers as nHeaders } from 'next/headers';
|
|
9
9
|
import { ServerVariables } from '../../utils/server-variables';
|
|
10
|
+
import { optimizeCategoryResponse } from '../../utils/payload-optimizer';
|
|
11
|
+
import settings from 'settings';
|
|
10
12
|
|
|
11
13
|
function getCategoryDataHandler(
|
|
12
14
|
pk: number,
|
|
@@ -80,7 +82,7 @@ function getCategoryDataHandler(
|
|
|
80
82
|
};
|
|
81
83
|
}
|
|
82
84
|
|
|
83
|
-
export const getCategoryData = ({
|
|
85
|
+
export const getCategoryData = async ({
|
|
84
86
|
pk,
|
|
85
87
|
searchParams,
|
|
86
88
|
headers,
|
|
@@ -93,7 +95,7 @@ export const getCategoryData = ({
|
|
|
93
95
|
searchParams?: SearchParams;
|
|
94
96
|
headers?: Record<string, string>;
|
|
95
97
|
}) => {
|
|
96
|
-
|
|
98
|
+
const result = await Cache.wrap(
|
|
97
99
|
CacheKey.Category(pk, searchParams, headers),
|
|
98
100
|
locale,
|
|
99
101
|
getCategoryDataHandler(pk, locale, currency, searchParams, headers),
|
|
@@ -102,6 +104,16 @@ export const getCategoryData = ({
|
|
|
102
104
|
compressed: true
|
|
103
105
|
}
|
|
104
106
|
);
|
|
107
|
+
|
|
108
|
+
if (settings.payloadOptimization?.enabled && result?.data) {
|
|
109
|
+
try {
|
|
110
|
+
return { ...result, data: optimizeCategoryResponse(result.data, settings.payloadOptimization) };
|
|
111
|
+
} catch (e) {
|
|
112
|
+
logger.error('Payload optimization failed for category', { pk, error: (e as Error).message });
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
return result;
|
|
105
117
|
};
|
|
106
118
|
|
|
107
119
|
function getCategoryBySlugDataHandler(
|
package/data/server/list.ts
CHANGED
|
@@ -6,6 +6,8 @@ import appFetch, { FetchResponseType } from '../../utils/app-fetch';
|
|
|
6
6
|
import { parse } from 'lossless-json';
|
|
7
7
|
import logger from '../../utils/log';
|
|
8
8
|
import { ServerVariables } from '../../utils/server-variables';
|
|
9
|
+
import { optimizeCategoryResponse } from '../../utils/payload-optimizer';
|
|
10
|
+
import settings from 'settings';
|
|
9
11
|
|
|
10
12
|
const getListDataHandler = (
|
|
11
13
|
locale,
|
|
@@ -66,7 +68,7 @@ export const getListData = async ({
|
|
|
66
68
|
searchParams: SearchParams;
|
|
67
69
|
headers?: Record<string, string>;
|
|
68
70
|
}) => {
|
|
69
|
-
|
|
71
|
+
const result = await Cache.wrap(
|
|
70
72
|
CacheKey.List(searchParams, headers),
|
|
71
73
|
locale,
|
|
72
74
|
getListDataHandler(locale, currency, searchParams, headers),
|
|
@@ -75,4 +77,14 @@ export const getListData = async ({
|
|
|
75
77
|
compressed: true
|
|
76
78
|
}
|
|
77
79
|
);
|
|
80
|
+
|
|
81
|
+
if (settings.payloadOptimization?.enabled && result) {
|
|
82
|
+
try {
|
|
83
|
+
return optimizeCategoryResponse(result, settings.payloadOptimization);
|
|
84
|
+
} catch (e) {
|
|
85
|
+
logger.error('Payload optimization failed for list', { error: (e as Error).message });
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
return result;
|
|
78
90
|
};
|
package/data/server/product.ts
CHANGED
|
@@ -4,6 +4,8 @@ import { ProductCategoryResult, ProductResult, SearchParams } from '../../types'
|
|
|
4
4
|
import appFetch from '../../utils/app-fetch';
|
|
5
5
|
import { ServerVariables } from '../../utils/server-variables';
|
|
6
6
|
import logger from '../../utils/log';
|
|
7
|
+
import { optimizeProductResponse } from '../../utils/payload-optimizer';
|
|
8
|
+
import settings from 'settings';
|
|
7
9
|
|
|
8
10
|
type GetProduct = {
|
|
9
11
|
pk: number | string;
|
|
@@ -163,5 +165,13 @@ export const getProductData = async ({
|
|
|
163
165
|
throw error;
|
|
164
166
|
}
|
|
165
167
|
|
|
168
|
+
if (settings.payloadOptimization?.enabled && result?.data) {
|
|
169
|
+
try {
|
|
170
|
+
return { ...result, data: optimizeProductResponse(result.data, settings.payloadOptimization) };
|
|
171
|
+
} catch (e) {
|
|
172
|
+
logger.error('Payload optimization failed for product', { pk, error: (e as Error).message });
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
|
|
166
176
|
return result;
|
|
167
177
|
};
|
|
@@ -4,6 +4,9 @@ import { GetCategoryResponse, SearchParams } from '../../types';
|
|
|
4
4
|
import { generateCommerceSearchParams } from '../../utils';
|
|
5
5
|
import appFetch from '../../utils/app-fetch';
|
|
6
6
|
import { ServerVariables } from '../../utils/server-variables';
|
|
7
|
+
import { optimizeCategoryResponse } from '../../utils/payload-optimizer';
|
|
8
|
+
import logger from '../../utils/log';
|
|
9
|
+
import settings from 'settings';
|
|
7
10
|
|
|
8
11
|
const getSpecialPageDataHandler = (
|
|
9
12
|
pk: number,
|
|
@@ -45,7 +48,7 @@ export const getSpecialPageData = async ({
|
|
|
45
48
|
searchParams: SearchParams;
|
|
46
49
|
headers?: Record<string, string>;
|
|
47
50
|
}) => {
|
|
48
|
-
|
|
51
|
+
const result = await Cache.wrap(
|
|
49
52
|
CacheKey.SpecialPage(pk, searchParams, headers),
|
|
50
53
|
locale,
|
|
51
54
|
getSpecialPageDataHandler(pk, locale, currency, searchParams, headers),
|
|
@@ -54,4 +57,14 @@ export const getSpecialPageData = async ({
|
|
|
54
57
|
compressed: true
|
|
55
58
|
}
|
|
56
59
|
);
|
|
60
|
+
|
|
61
|
+
if (settings.payloadOptimization?.enabled && result) {
|
|
62
|
+
try {
|
|
63
|
+
return optimizeCategoryResponse(result, settings.payloadOptimization);
|
|
64
|
+
} catch (e) {
|
|
65
|
+
logger.error('Payload optimization failed for special-page', { pk, error: (e as Error).message });
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
return result;
|
|
57
70
|
};
|
package/data/server/widget.ts
CHANGED
|
@@ -4,6 +4,9 @@ import { CacheOptions, WidgetResultType, WidgetSchemaType } from '../../types';
|
|
|
4
4
|
import appFetch from '../../utils/app-fetch';
|
|
5
5
|
import { widgets } from '../urls';
|
|
6
6
|
import { ServerVariables } from '../../utils/server-variables';
|
|
7
|
+
import { optimizeWidgetResponse } from '../../utils/payload-optimizer';
|
|
8
|
+
import logger from '../../utils/log';
|
|
9
|
+
import settings from 'settings';
|
|
7
10
|
|
|
8
11
|
const getWidgetDataHandler =
|
|
9
12
|
(
|
|
@@ -53,7 +56,7 @@ export const getWidgetData = async <T>({
|
|
|
53
56
|
cacheOptions?: CacheOptions;
|
|
54
57
|
headers?: Record<string, string>;
|
|
55
58
|
}): Promise<WidgetResultType<T>> => {
|
|
56
|
-
|
|
59
|
+
const result = await Cache.wrap(
|
|
57
60
|
CacheKey.Widget(slug),
|
|
58
61
|
locale,
|
|
59
62
|
getWidgetDataHandler(slug, locale, currency, headers),
|
|
@@ -62,6 +65,16 @@ export const getWidgetData = async <T>({
|
|
|
62
65
|
...cacheOptions
|
|
63
66
|
}
|
|
64
67
|
);
|
|
68
|
+
|
|
69
|
+
if (settings.payloadOptimization?.enabled && result) {
|
|
70
|
+
try {
|
|
71
|
+
return optimizeWidgetResponse(result, settings.payloadOptimization) as WidgetResultType<T>;
|
|
72
|
+
} catch (e) {
|
|
73
|
+
logger.error('Payload optimization failed for widget', { slug, error: (e as Error).message });
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
return result as WidgetResultType<T>;
|
|
65
78
|
};
|
|
66
79
|
|
|
67
80
|
const getCollectionWidgetDataHandler =
|
package/data/urls.ts
CHANGED
|
@@ -183,7 +183,11 @@ export const product = {
|
|
|
183
183
|
breadcrumbUrl: (menuitemmodel: string) =>
|
|
184
184
|
`/menus/generate_breadcrumb/?item=${menuitemmodel}&generator_name=menu_item`,
|
|
185
185
|
bundleProduct: (productPk: string, queryString: string) =>
|
|
186
|
-
`/bundle-product/${productPk}/?${queryString}
|
|
186
|
+
`/bundle-product/${productPk}/?${queryString}`,
|
|
187
|
+
similarProducts: (params?: string) =>
|
|
188
|
+
`/similar-products${params ? `?${params}` : ''}`,
|
|
189
|
+
similarProductsList: (params?: string) =>
|
|
190
|
+
`/similar-product-list${params ? `?${params}` : ''}`
|
|
187
191
|
};
|
|
188
192
|
|
|
189
193
|
export const wishlist = {
|
package/hooks/use-captcha.tsx
CHANGED