@akinon/next 2.0.99-rc.0 → 2.0.99

package/CHANGELOG.md

@@ -1,36 +1,10 @@
 # @akinon/next
 
-## 2.0.99-rc.0
+## 2.0.99
 
 ### 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
-- 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
-- 2fea41430: 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
-- e9598c71d: ZERO-4622: Images remotePatterns for improved readability
-- 4998a9631: ZERO-4168: Add server-side payload optimization
-- 804d2bd6c: ZERO-4536: Add akinon.net domain to CSP frame-ancestors directive
-- 3909d3224: Edit the duplicate Plugin.SimilarProducts in the plugin-module.
-- 6a3d8a631: ZERO-4541: Fix URL query string formatting in getOrders and getOldOrders functions
-- e18836b20: ZERO-4160: Restore scope in Sentry addon configuration in akinon.json
-- 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
+- 216fe8c8: Accept every preview snapshot version the editor writes, not only the first one. A newer blob was silently unrenderable and fell back to the live page.
 
 ## 2.0.98
 

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/checkout.ts

@@ -718,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/client/wishlist.ts

@@ -26,19 +26,6 @@ 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;
@@ -96,14 +83,6 @@ 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, {
@@ -217,7 +196,6 @@ export const wishlistApi = api.injectEndpoints({
 
 export const {
   useGetFavoritesQuery,
-  useGetFavouriteProductIdsQuery,
   useAddFavoriteMutation,
   useRemoveFavoriteMutation,
   useAddStockAlertMutation,

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,
@@ -98,7 +96,7 @@ export const getCategoryData = async ({
 }) => {
   searchParams = normalizeSearchParams(searchParams);
 
-  const result = await Cache.wrap(
+  return Cache.wrap(
     CacheKey.Category(pk, searchParams, headers),
     locale,
     getCategoryDataHandler(pk, locale, currency, 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,
@@ -71,7 +69,7 @@ export const getListData = async ({
 }) => {
   searchParams = normalizeSearchParams(searchParams);
 
-  const result = await Cache.wrap(
+  return Cache.wrap(
     CacheKey.List(searchParams, headers),
     locale,
     getListDataHandler(locale, currency, searchParams, headers),
@@ -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,
@@ -51,7 +48,7 @@ export const getSpecialPageData = async ({
 }) => {
   searchParams = normalizeSearchParams(searchParams);
 
-  const result = await Cache.wrap(
+  return Cache.wrap(
     CacheKey.SpecialPage(pk, searchParams, headers),
     locale,
     getSpecialPageDataHandler(pk, locale, currency, searchParams, headers),
@@ -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

@@ -171,7 +171,18 @@ export const getPreviewSnapshot = async ({
 
   try {
     const parsed = JSON.parse(rawValue);
-    if (parsed?.version === 1 && Array.isArray(parsed.sections)) {
+    // Any version the editor has shipped so far, not just the first one. The
+    // fields this reader uses (`sections`, `themeSettings`, `dataSources`)
+    // have been present since v1 and later versions only ADD keys it ignores
+    // — v2 carries the editor's own brand-config pieces (custom pages, style
+    // presets, section templates) so a theme applied into a working copy is
+    // not lost. Pinning the check to one number meant a blob the editor could
+    // write was silently unrenderable here, falling back to the LIVE page.
+    if (
+      typeof parsed?.version === 'number' &&
+      parsed.version >= 1 &&
+      Array.isArray(parsed.sections)
+    ) {
       return parsed as PreviewSnapshot;
     }
   } catch {
@@ -275,16 +286,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,20 +183,12 @@ 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 = {
   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/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) => {