@akinon/next 2.0.84-rc.0 → 2.0.84
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 +1 -31
- package/bin/pz-generate-routes.js +1 -4
- package/components/plugin-module.tsx +1 -0
- package/data/client/checkout.ts +1 -0
- package/data/client/wishlist.ts +0 -22
- package/data/server/category.ts +2 -14
- package/data/server/list.ts +1 -13
- package/data/server/product.ts +0 -10
- package/data/server/special-page.ts +1 -14
- package/data/server/widget.ts +0 -10
- package/data/urls.ts +4 -13
- package/hooks/index.ts +0 -1
- package/hooks/use-captcha.tsx +1 -1
- package/middlewares/default.ts +247 -254
- package/middlewares/pretty-url.ts +1 -3
- package/package.json +2 -2
- package/plugins.d.ts +0 -10
- package/plugins.js +0 -1
- package/redux/middlewares/checkout.ts +3 -45
- package/redux/middlewares/pre-order/installment-option.ts +1 -9
- package/types/index.ts +9 -20
- package/utils/csrf.ts +1 -1
- package/with-pz-config.js +1 -6
- package/api/client-env.ts +0 -78
- package/hooks/use-client-env.ts +0 -265
- package/utils/payload-optimizer.ts +0 -481
package/CHANGELOG.md
CHANGED
|
@@ -1,36 +1,6 @@
|
|
|
1
1
|
# @akinon/next
|
|
2
2
|
|
|
3
|
-
## 2.0.84
|
|
4
|
-
|
|
5
|
-
### Patch Changes
|
|
6
|
-
|
|
7
|
-
- 86187b1c: ZERO-4879: Repair sync-merge corruption in default middleware and server data loaders — remove a duplicated block that left an unbalanced brace, and restore the awaited `result` binding the payload optimization reads
|
|
8
|
-
- 0cf9ea239: BRDG-16491: Prevent redirect when iframe payment is active
|
|
9
|
-
- 324f97d55: ZERO-4219: replace masterpass-rest-complete with masterpass-rest-callback
|
|
10
|
-
- 51ea06888: ZERO-4377: Fix checkout card type state being cleared after valid bin number responses.
|
|
11
|
-
- ZERO-4160: Enhance oauth-login middleware with improved request handling and logging
|
|
12
|
-
- 2fea41430: ZERO-4620: Add runtime access to `NEXT_PUBLIC_*` environment variables from Client Components
|
|
13
|
-
- b55acb768: ZERO-2577: Fix pagination bug and update usePagination hook and ensure pagination controls rendering correctly
|
|
14
|
-
- 760258c1c: ZERO-4160: Enhance oauth-login middleware to handle fetch errors and improve response handling
|
|
15
|
-
- 143be2b9d: ZERO-3457: Crop styles are customizable and logic improved for rendering similar products modal
|
|
16
|
-
- 7889b08fe: ZERO-4276: Enhance route generation by adding .env loading and custom skip segments support
|
|
17
|
-
- 9f8cd3bc5: ZERO-3449: AI Search Active Filters & Crop Style changes have been implemented
|
|
18
|
-
- bfafa3f49: ZERO-4160: Refactor oauth-login middleware to use fetchCommerce for API calls and improve cookie handling
|
|
19
|
-
- 57d7eb305: ZERO-4276: Refactor route generation logic by removing environment loading and simplifying skip segments handling
|
|
20
|
-
- d99a6a7d5: ZERO-3457_1: Fixed the settings prop and made sure everything is customizable.
|
|
21
|
-
- 9db81a714: ZERO-4365: Remove brand `@theme/*` alias imports from library packages
|
|
22
|
-
- 591e345e1: ZERO-3855: Enhance credit card payment handling in checkout middlewares
|
|
23
|
-
- 4de5303c5: ZERO-2504: add cookie filter to api client request
|
|
24
|
-
- 95b139dc1: ZERO-3795: Remove duplicate entry for SavedCard in PluginComponents map
|
|
25
|
-
- 1d00f2d06: BRDG-16664: Set secure flag for CSRF token cookies in useCaptcha and default middleware
|
|
26
|
-
- 4ac7b2a1e: ZERO-4219: fix masterpass-rest callback route format and double-encoded error cookie
|
|
27
|
-
- e9598c71d: ZERO-4622: Images remotePatterns for improved readability
|
|
28
|
-
- 4998a9631: ZERO-4168: Add server-side payload optimization
|
|
29
|
-
- 804d2bd6c: ZERO-4536: Add akinon.net domain to CSP frame-ancestors directive
|
|
30
|
-
- 3909d3224: Edit the duplicate Plugin.SimilarProducts in the plugin-module.
|
|
31
|
-
- 6a3d8a631: ZERO-4541: Fix URL query string formatting in getOrders and getOldOrders functions
|
|
32
|
-
- e18836b20: ZERO-4160: Restore scope in Sentry addon configuration in akinon.json
|
|
33
|
-
- b1111d7b: ZERO-4841: Guard `withPrettyUrl` against calling `String.prototype.replace` with an `undefined` locale prefix on projects without a URL locale prefix (e.g. `HideDefaultLocale`) — previously this coerced to the literal string `"undefined"` and silently stripped a trailing `/undefined` segment from the path before the pretty-url lookup, causing bogus URLs like `/{product-slug}/undefined` to resolve and rewrite to the real product page (200) instead of 404
|
|
3
|
+
## 2.0.84
|
|
34
4
|
|
|
35
5
|
## 2.0.83
|
|
36
6
|
|
|
@@ -6,7 +6,6 @@ const findBaseDir = require('../utils/find-base-dir');
|
|
|
6
6
|
|
|
7
7
|
const generateRoutes = () => {
|
|
8
8
|
const baseDir = findBaseDir();
|
|
9
|
-
|
|
10
9
|
const srcDir = path.join(baseDir, 'src');
|
|
11
10
|
const appDir = path.join(srcDir, 'app');
|
|
12
11
|
|
|
@@ -35,10 +34,8 @@ const generateRoutes = () => {
|
|
|
35
34
|
'[segment]',
|
|
36
35
|
'[url]',
|
|
37
36
|
'[theme]',
|
|
38
|
-
'[member_type]'
|
|
39
|
-
'[clienttype]'
|
|
37
|
+
'[member_type]'
|
|
40
38
|
];
|
|
41
|
-
|
|
42
39
|
const skipCatchAllRoutes = ['[...prettyurl]', '[...not_found]'];
|
|
43
40
|
|
|
44
41
|
const walkDirectory = (dir, basePath = '') => {
|
package/data/client/checkout.ts
CHANGED
|
@@ -718,6 +718,7 @@ export const checkoutApi = api.injectEndpoints({
|
|
|
718
718
|
},
|
|
719
719
|
async onQueryStarted(arg, { dispatch, queryFulfilled }) {
|
|
720
720
|
dispatch(setPaymentStepBusy(true));
|
|
721
|
+
dispatch(setCardType(arg));
|
|
721
722
|
await queryFulfilled;
|
|
722
723
|
dispatch(setPaymentStepBusy(false));
|
|
723
724
|
}
|
package/data/client/wishlist.ts
CHANGED
|
@@ -26,19 +26,6 @@ interface GetFavoritesResponse {
|
|
|
26
26
|
results: FavoriteItem[];
|
|
27
27
|
}
|
|
28
28
|
|
|
29
|
-
export interface FavouriteProductIdItem {
|
|
30
|
-
product_id: number;
|
|
31
|
-
favourite_id: number;
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
export interface GetFavouriteProductIdsResponse {
|
|
35
|
-
favourite_products: FavouriteProductIdItem[];
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
interface GetFavouriteProductIdsParams {
|
|
39
|
-
productIds: Array<number | string>;
|
|
40
|
-
}
|
|
41
|
-
|
|
42
29
|
interface AddFavoriteResponse {
|
|
43
30
|
pk: number;
|
|
44
31
|
product: number;
|
|
@@ -96,14 +83,6 @@ export const wishlistApi = api.injectEndpoints({
|
|
|
96
83
|
buildClientRequestUrl(wishlist.getFavorites({ page, limit })),
|
|
97
84
|
providesTags: ['Favorite']
|
|
98
85
|
}),
|
|
99
|
-
getFavouriteProductIds: build.query<
|
|
100
|
-
GetFavouriteProductIdsResponse,
|
|
101
|
-
GetFavouriteProductIdsParams
|
|
102
|
-
>({
|
|
103
|
-
query: ({ productIds }) =>
|
|
104
|
-
buildClientRequestUrl(wishlist.getFavouriteProductIds(productIds)),
|
|
105
|
-
providesTags: ['Favorite']
|
|
106
|
-
}),
|
|
107
86
|
addFavorite: build.mutation<AddFavoriteResponse, number>({
|
|
108
87
|
query: (productPk: number) => ({
|
|
109
88
|
url: buildClientRequestUrl(wishlist.addFavorite, {
|
|
@@ -217,7 +196,6 @@ export const wishlistApi = api.injectEndpoints({
|
|
|
217
196
|
|
|
218
197
|
export const {
|
|
219
198
|
useGetFavoritesQuery,
|
|
220
|
-
useGetFavouriteProductIdsQuery,
|
|
221
199
|
useAddFavoriteMutation,
|
|
222
200
|
useRemoveFavoriteMutation,
|
|
223
201
|
useAddStockAlertMutation,
|
package/data/server/category.ts
CHANGED
|
@@ -8,8 +8,6 @@ import { parse } from 'lossless-json';
|
|
|
8
8
|
import logger from '../../utils/log';
|
|
9
9
|
import { headers as nHeaders } from 'next/headers';
|
|
10
10
|
import { ServerVariables } from '../../utils/server-variables';
|
|
11
|
-
import { optimizeCategoryResponse } from '../../utils/payload-optimizer';
|
|
12
|
-
import settings from 'settings';
|
|
13
11
|
|
|
14
12
|
function getCategoryDataHandler(
|
|
15
13
|
pk: number,
|
|
@@ -83,7 +81,7 @@ function getCategoryDataHandler(
|
|
|
83
81
|
};
|
|
84
82
|
}
|
|
85
83
|
|
|
86
|
-
export const getCategoryData =
|
|
84
|
+
export const getCategoryData = ({
|
|
87
85
|
pk,
|
|
88
86
|
searchParams,
|
|
89
87
|
headers,
|
|
@@ -98,7 +96,7 @@ export const getCategoryData = async ({
|
|
|
98
96
|
}) => {
|
|
99
97
|
searchParams = normalizeSearchParams(searchParams);
|
|
100
98
|
|
|
101
|
-
|
|
99
|
+
return Cache.wrap(
|
|
102
100
|
CacheKey.Category(pk, searchParams, headers),
|
|
103
101
|
locale,
|
|
104
102
|
getCategoryDataHandler(pk, locale, currency, searchParams, headers),
|
|
@@ -107,16 +105,6 @@ export const getCategoryData = async ({
|
|
|
107
105
|
compressed: true
|
|
108
106
|
}
|
|
109
107
|
);
|
|
110
|
-
|
|
111
|
-
if (settings.payloadOptimization?.enabled && result?.data) {
|
|
112
|
-
try {
|
|
113
|
-
return { ...result, data: optimizeCategoryResponse(result.data, settings.payloadOptimization) };
|
|
114
|
-
} catch (e) {
|
|
115
|
-
logger.error('Payload optimization failed for category', { pk, error: (e as Error).message });
|
|
116
|
-
}
|
|
117
|
-
}
|
|
118
|
-
|
|
119
|
-
return result;
|
|
120
108
|
};
|
|
121
109
|
|
|
122
110
|
function getCategoryBySlugDataHandler(
|
package/data/server/list.ts
CHANGED
|
@@ -7,8 +7,6 @@ import appFetch, { FetchResponseType } from '../../utils/app-fetch';
|
|
|
7
7
|
import { parse } from 'lossless-json';
|
|
8
8
|
import logger from '../../utils/log';
|
|
9
9
|
import { ServerVariables } from '../../utils/server-variables';
|
|
10
|
-
import { optimizeCategoryResponse } from '../../utils/payload-optimizer';
|
|
11
|
-
import settings from 'settings';
|
|
12
10
|
|
|
13
11
|
const getListDataHandler = (
|
|
14
12
|
locale,
|
|
@@ -71,7 +69,7 @@ export const getListData = async ({
|
|
|
71
69
|
}) => {
|
|
72
70
|
searchParams = normalizeSearchParams(searchParams);
|
|
73
71
|
|
|
74
|
-
|
|
72
|
+
return Cache.wrap(
|
|
75
73
|
CacheKey.List(searchParams, headers),
|
|
76
74
|
locale,
|
|
77
75
|
getListDataHandler(locale, currency, searchParams, headers),
|
|
@@ -80,14 +78,4 @@ export const getListData = async ({
|
|
|
80
78
|
compressed: true
|
|
81
79
|
}
|
|
82
80
|
);
|
|
83
|
-
|
|
84
|
-
if (settings.payloadOptimization?.enabled && result) {
|
|
85
|
-
try {
|
|
86
|
-
return optimizeCategoryResponse(result, settings.payloadOptimization);
|
|
87
|
-
} catch (e) {
|
|
88
|
-
logger.error('Payload optimization failed for list', { error: (e as Error).message });
|
|
89
|
-
}
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
return result;
|
|
93
81
|
};
|
package/data/server/product.ts
CHANGED
|
@@ -5,8 +5,6 @@ import appFetch from '../../utils/app-fetch';
|
|
|
5
5
|
import { normalizeSearchParams } from '../../utils/normalize-search-params';
|
|
6
6
|
import { ServerVariables } from '../../utils/server-variables';
|
|
7
7
|
import logger from '../../utils/log';
|
|
8
|
-
import { optimizeProductResponse } from '../../utils/payload-optimizer';
|
|
9
|
-
import settings from 'settings';
|
|
10
8
|
|
|
11
9
|
type GetProduct = {
|
|
12
10
|
pk: number | string;
|
|
@@ -168,13 +166,5 @@ export const getProductData = async ({
|
|
|
168
166
|
throw error;
|
|
169
167
|
}
|
|
170
168
|
|
|
171
|
-
if (settings.payloadOptimization?.enabled && result?.data) {
|
|
172
|
-
try {
|
|
173
|
-
return { ...result, data: optimizeProductResponse(result.data, settings.payloadOptimization) };
|
|
174
|
-
} catch (e) {
|
|
175
|
-
logger.error('Payload optimization failed for product', { pk, error: (e as Error).message });
|
|
176
|
-
}
|
|
177
|
-
}
|
|
178
|
-
|
|
179
169
|
return result;
|
|
180
170
|
};
|
|
@@ -5,9 +5,6 @@ import { generateCommerceSearchParams } from '../../utils';
|
|
|
5
5
|
import { normalizeSearchParams } from '../../utils/normalize-search-params';
|
|
6
6
|
import appFetch from '../../utils/app-fetch';
|
|
7
7
|
import { ServerVariables } from '../../utils/server-variables';
|
|
8
|
-
import { optimizeCategoryResponse } from '../../utils/payload-optimizer';
|
|
9
|
-
import logger from '../../utils/log';
|
|
10
|
-
import settings from 'settings';
|
|
11
8
|
|
|
12
9
|
const getSpecialPageDataHandler = (
|
|
13
10
|
pk: number,
|
|
@@ -51,7 +48,7 @@ export const getSpecialPageData = async ({
|
|
|
51
48
|
}) => {
|
|
52
49
|
searchParams = normalizeSearchParams(searchParams);
|
|
53
50
|
|
|
54
|
-
|
|
51
|
+
return Cache.wrap(
|
|
55
52
|
CacheKey.SpecialPage(pk, searchParams, headers),
|
|
56
53
|
locale,
|
|
57
54
|
getSpecialPageDataHandler(pk, locale, currency, searchParams, headers),
|
|
@@ -60,14 +57,4 @@ export const getSpecialPageData = async ({
|
|
|
60
57
|
compressed: true
|
|
61
58
|
}
|
|
62
59
|
);
|
|
63
|
-
|
|
64
|
-
if (settings.payloadOptimization?.enabled && result) {
|
|
65
|
-
try {
|
|
66
|
-
return optimizeCategoryResponse(result, settings.payloadOptimization);
|
|
67
|
-
} catch (e) {
|
|
68
|
-
logger.error('Payload optimization failed for special-page', { pk, error: (e as Error).message });
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
return result;
|
|
73
60
|
};
|
package/data/server/widget.ts
CHANGED
|
@@ -275,16 +275,6 @@ export const getWidgetData = async <T>({
|
|
|
275
275
|
...cacheOptions
|
|
276
276
|
}
|
|
277
277
|
);
|
|
278
|
-
|
|
279
|
-
if (settings.payloadOptimization?.enabled && result) {
|
|
280
|
-
try {
|
|
281
|
-
return optimizeWidgetResponse(result, settings.payloadOptimization) as WidgetResultType<T>;
|
|
282
|
-
} catch (e) {
|
|
283
|
-
logger.error('Payload optimization failed for widget', { slug, error: (e as Error).message });
|
|
284
|
-
}
|
|
285
|
-
}
|
|
286
|
-
|
|
287
|
-
return result as WidgetResultType<T>;
|
|
288
278
|
};
|
|
289
279
|
|
|
290
280
|
const getCollectionWidgetDataHandler =
|
package/data/urls.ts
CHANGED
|
@@ -40,11 +40,10 @@ export const account = {
|
|
|
40
40
|
shipping_option_slug
|
|
41
41
|
? `&shipping_option_slug${shipping_option_operator}${shipping_option_slug}`
|
|
42
42
|
: ''
|
|
43
|
-
}${currency ? `¤cy=${currency}` : ''}
|
|
44
|
-
|
|
45
|
-
}`,
|
|
43
|
+
}${currency ? `¤cy=${currency}` : ''}
|
|
44
|
+
${filterType && filterValue ? `&${filterType}=${filterValue}` : ''}`,
|
|
46
45
|
getOldOrders: ({ page, limit }: { page?: number; limit?: number }) =>
|
|
47
|
-
`/users/old-orders/?page=${page || 1}&limit=${limit || 12}`,
|
|
46
|
+
`/users/old-orders/?page=${page || 1}&limit=${limit || 12}}`,
|
|
48
47
|
getQuotations: (page?: number, status?: string, limit?: number) =>
|
|
49
48
|
`/b2b/my-quotations/?page=${page || 1}` +
|
|
50
49
|
(status ? `&status=${status}` : '') +
|
|
@@ -184,20 +183,12 @@ export const product = {
|
|
|
184
183
|
breadcrumbUrl: (menuitemmodel: string) =>
|
|
185
184
|
`/menus/generate_breadcrumb/?item=${menuitemmodel}&generator_name=menu_item`,
|
|
186
185
|
bundleProduct: (productPk: string, queryString: string) =>
|
|
187
|
-
`/bundle-product/${productPk}/?${queryString}
|
|
188
|
-
similarProducts: (params?: string) =>
|
|
189
|
-
`/similar-products${params ? `?${params}` : ''}`,
|
|
190
|
-
similarProductsList: (params?: string) =>
|
|
191
|
-
`/similar-product-list${params ? `?${params}` : ''}`
|
|
186
|
+
`/bundle-product/${productPk}/?${queryString}`
|
|
192
187
|
};
|
|
193
188
|
|
|
194
189
|
export const wishlist = {
|
|
195
190
|
getFavorites: ({ page, limit }: { page?: number; limit?: number }) =>
|
|
196
191
|
`/wishlists/favourite-products/?limit=${limit || 12}&page=${page || 1}`,
|
|
197
|
-
getFavouriteProductIds: (productIds: Array<number | string>) =>
|
|
198
|
-
`/wishlists/favourite-product-ids/?${productIds
|
|
199
|
-
.map((id) => `product_id=${id}`)
|
|
200
|
-
.join('&')}`,
|
|
201
192
|
addFavorite: '/wishlists/favourite-products/',
|
|
202
193
|
removeFavorite: (favPk: number) => `/wishlists/favourite-products/${favPk}/`,
|
|
203
194
|
addStockAlert: '/wishlists/product-alerts/',
|
package/hooks/index.ts
CHANGED
package/hooks/use-captcha.tsx
CHANGED