@akinon/next 2.0.99-beta.0 → 2.0.99-rc.0

package/CHANGELOG.md

@@ -1,11 +1,36 @@
 # @akinon/next
 
-## 2.0.99-beta.0
+## 2.0.99-rc.0
 
 ### Patch Changes
 
-- cbbbfd757: ZERO-4376: Bootstrap beta cycle (next-main pre-release motor)
-- 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.
+- 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
 
 ## 2.0.98
 

package/api/client-env.ts

@@ -0,0 +1,78 @@
+import { NextRequest, NextResponse } from 'next/server';
+
+/**
+ * Runtime access to public (`NEXT_PUBLIC_*`) environment variables.
+ *
+ * Next.js inlines `process.env.NEXT_PUBLIC_*` into the bundle at *build* time.
+ * On hosting platforms where the build has no access to the environment (e.g.
+ * Akinon Cloud Commerce), those references resolve to `undefined` in the
+ * browser. This route reads the variables from the *server runtime* instead —
+ * `process.env[name]` is a computed lookup, so webpack never statically inlines
+ * it — and hands them back to the client.
+ *
+ * Only `NEXT_PUBLIC_`-prefixed names are resolvable. These values are public by
+ * design (they are shipped to the browser anyway), so nothing secret can leak
+ * through here; the prefix check is what keeps server-only secrets unreadable.
+ *
+ * Query: one or more `env` params, repeated (`?env=A&env=B`) and/or comma
+ * separated (`?env=A,B`). Names must include the full prefix. Responds with a
+ * `{ [name]: value | null }` map (`null` when the variable is not set).
+ *
+ * The consuming route file must set `export const dynamic = 'force-dynamic'` so
+ * Next never statically caches a build-time (empty) response.
+ *
+ * @see `@akinon/next/hooks` — `useClientEnv` / `getClientEnv` read from here.
+ */
+
+const CLIENT_ENV_NAME = /^NEXT_PUBLIC_[A-Za-z0-9_]+$/;
+
+export async function GET(request: NextRequest) {
+  try {
+    const { searchParams } = new URL(request.url);
+
+    const names = Array.from(
+      new Set(
+        searchParams
+          .getAll('env')
+          .flatMap((value) => value.split(','))
+          .map((value) => value.trim())
+          .filter(Boolean)
+      )
+    );
+
+    if (names.length === 0) {
+      return NextResponse.json(
+        { message: 'At least one `env` query parameter is required.' },
+        { status: 400 }
+      );
+    }
+
+    const invalid = names.filter((name) => !CLIENT_ENV_NAME.test(name));
+
+    if (invalid.length > 0) {
+      return NextResponse.json(
+        {
+          message:
+            'Only NEXT_PUBLIC_-prefixed environment variables can be read.',
+          invalid
+        },
+        { status: 400 }
+      );
+    }
+
+    const values = names.reduce<Record<string, string | null>>((acc, name) => {
+      acc[name] = process.env[name] ?? null;
+      return acc;
+    }, {});
+
+    return NextResponse.json(values, {
+      headers: { 'Cache-Control': 'no-store' }
+    });
+  } catch (error) {
+    console.error('Error in client-env API:', error);
+    return NextResponse.json(
+      { message: 'Internal server error' },
+      { status: 500 }
+    );
+  }
+}

package/bin/pz-generate-routes.js

@@ -6,6 +6,7 @@ const findBaseDir = require('../utils/find-base-dir');
 
 const generateRoutes = () => {
   const baseDir = findBaseDir();
+
   const srcDir = path.join(baseDir, 'src');
   const appDir = path.join(srcDir, 'app');
 
@@ -34,8 +35,10 @@ const generateRoutes = () => {
     '[segment]',
     '[url]',
     '[theme]',
-    '[member_type]'
+    '[member_type]',
+    '[clienttype]'
   ];
+
   const skipCatchAllRoutes = ['[...prettyurl]', '[...not_found]'];
 
   const walkDirectory = (dir, basePath = '') => {

package/components/plugin-module.tsx

@@ -116,7 +116,6 @@ 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,7 +718,6 @@ 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,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

@@ -8,6 +8,8 @@ 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,
@@ -81,7 +83,7 @@ function getCategoryDataHandler(
   };
 }
 
-export const getCategoryData = ({
+export const getCategoryData = async ({
   pk,
   searchParams,
   headers,
@@ -96,7 +98,7 @@ export const getCategoryData = ({
 }) => {
   searchParams = normalizeSearchParams(searchParams);
 
-  return Cache.wrap(
+  const result = await Cache.wrap(
     CacheKey.Category(pk, searchParams, headers),
     locale,
     getCategoryDataHandler(pk, locale, currency, searchParams, headers),
@@ -105,6 +107,16 @@ export const getCategoryData = ({
       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,6 +7,8 @@ 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,
@@ -69,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),
@@ -78,4 +80,14 @@ 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,6 +5,8 @@ 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;
@@ -166,5 +168,13 @@ 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,6 +5,9 @@ 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,
@@ -48,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),
@@ -57,4 +60,14 @@ 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,18 +171,7 @@ export const getPreviewSnapshot = async ({
 
   try {
     const parsed = JSON.parse(rawValue);
-    // 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)
-    ) {
+    if (parsed?.version === 1 && Array.isArray(parsed.sections)) {
       return parsed as PreviewSnapshot;
     }
   } catch {
@@ -286,6 +275,16 @@ 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,10 +40,11 @@ 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}` : '') +
@@ -183,12 +184,20 @@ export const product = {
   breadcrumbUrl: (menuitemmodel: string) =>
     `/menus/generate_breadcrumb/?item=${menuitemmodel}&generator_name=menu_item`,
   bundleProduct: (productPk: string, queryString: string) =>
-    `/bundle-product/${productPk}/?${queryString}`
+    `/bundle-product/${productPk}/?${queryString}`,
+  similarProducts: (params?: string) =>
+    `/similar-products${params ? `?${params}` : ''}`,
+  similarProductsList: (params?: string) =>
+    `/similar-product-list${params ? `?${params}` : ''}`
 };
 
 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,3 +15,4 @@ 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);
+    setCookie('csrftoken', csrfToken, { secure: true });
   }
 
   const onCaptchaChange = useCallback(async (response) => {