@akinon/next 2.0.78-rc.0 → 2.0.78-rc.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @akinon/next
 
+## 2.0.78-rc.2
+
+### Patch Changes
+
+- 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
+
+## 2.0.78-rc.1
+
 ## 2.0.78-rc.0
 
 ### Patch Changes

package/data/client/wishlist.ts

@@ -26,6 +26,19 @@ interface GetFavoritesResponse {
   results: FavoriteItem[];
 }
 
+export interface FavouriteProductIdItem {
+  product_id: number;
+  favourite_id: number;
+}
+
+export interface GetFavouriteProductIdsResponse {
+  favourite_products: FavouriteProductIdItem[];
+}
+
+interface GetFavouriteProductIdsParams {
+  productIds: Array<number | string>;
+}
+
 interface AddFavoriteResponse {
   pk: number;
   product: number;
@@ -83,6 +96,14 @@ export const wishlistApi = api.injectEndpoints({
         buildClientRequestUrl(wishlist.getFavorites({ page, limit })),
       providesTags: ['Favorite']
     }),
+    getFavouriteProductIds: build.query<
+      GetFavouriteProductIdsResponse,
+      GetFavouriteProductIdsParams
+    >({
+      query: ({ productIds }) =>
+        buildClientRequestUrl(wishlist.getFavouriteProductIds(productIds)),
+      providesTags: ['Favorite']
+    }),
     addFavorite: build.mutation<AddFavoriteResponse, number>({
       query: (productPk: number) => ({
         url: buildClientRequestUrl(wishlist.addFavorite, {
@@ -196,6 +217,7 @@ export const wishlistApi = api.injectEndpoints({
 
 export const {
   useGetFavoritesQuery,
+  useGetFavouriteProductIdsQuery,
   useAddFavoriteMutation,
   useRemoveFavoriteMutation,
   useAddStockAlertMutation,

package/data/server/category.ts

@@ -98,7 +98,7 @@ export const getCategoryData = async ({
 }) => {
   searchParams = normalizeSearchParams(searchParams);
 
-  return Cache.wrap(
+  const result = await Cache.wrap(
     CacheKey.Category(pk, searchParams, headers),
     locale,
     getCategoryDataHandler(pk, locale, currency, searchParams, headers),

package/data/server/list.ts

@@ -71,7 +71,7 @@ export const getListData = async ({
 }) => {
   searchParams = normalizeSearchParams(searchParams);
 
-  return Cache.wrap(
+  const result = await Cache.wrap(
     CacheKey.List(searchParams, headers),
     locale,
     getListDataHandler(locale, currency, searchParams, headers),

package/data/server/special-page.ts

@@ -51,7 +51,7 @@ export const getSpecialPageData = async ({
 }) => {
   searchParams = normalizeSearchParams(searchParams);
 
-  return Cache.wrap(
+  const result = await Cache.wrap(
     CacheKey.SpecialPage(pk, searchParams, headers),
     locale,
     getSpecialPageDataHandler(pk, locale, currency, searchParams, headers),

package/data/urls.ts

@@ -194,6 +194,10 @@ export const product = {
 export const wishlist = {
   getFavorites: ({ page, limit }: { page?: number; limit?: number }) =>
     `/wishlists/favourite-products/?limit=${limit || 12}&page=${page || 1}`,
+  getFavouriteProductIds: (productIds: Array<number | string>) =>
+    `/wishlists/favourite-product-ids/?${productIds
+      .map((id) => `product_id=${id}`)
+      .join('&')}`,
   addFavorite: '/wishlists/favourite-products/',
   removeFavorite: (favPk: number) => `/wishlists/favourite-products/${favPk}/`,
   addStockAlert: '/wishlists/product-alerts/',

package/middlewares/default.ts

@@ -561,46 +561,6 @@ const withPzDefault =
                                         }
                                       );
 
-                                    middlewareResult.cookies.set(
-                                      'pz-currency',
-                                      currency,
-                                      {
-                                        domain: rootHostname,
-                                        sameSite: 'none',
-                                        secure: true,
-                                        expires: new Date(
-                                          Date.now() + 1000 * 60 * 60 * 24 * 7
-                                        ) // 7 days
-                                      }
-                                    );
-
-                                    if (
-                                      req.cookies.get('pz-locale') &&
-                                      req.cookies.get('pz-locale').value !==
-                                        locale
-                                    ) {
-                                      logger.debug('Locale changed', {
-                                        locale,
-                                        oldLocale:
-                                          req.cookies.get('pz-locale')?.value,
-                                        ip
-                                      });
-                                    }
-
-                                    middlewareResult.headers.set(
-                                      'pz-url',
-                                      req.nextUrl.toString()
-                                    );
-
-                                    if (req.cookies.get('pz-set-currency')) {
-                                      middlewareResult.cookies.delete(
-                                        'pz-set-currency'
-                                      );
-                                    }
-
-                                    if (
-                                      req.cookies.get('pz-post-checkout-flow')
-                                    ) {
                                       if (
                                         req.cookies.get('pz-locale') &&
                                         req.cookies.get('pz-locale').value !==

package/package.json

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