@akinon/next 2.0.79-beta.1 → 2.0.79-rc.0

package/CHANGELOG.md

@@ -1,16 +1,36 @@
 # @akinon/next
 
-## 2.0.79-beta.1
+## 2.0.79-rc.0
 
 ### Patch Changes
 
-- cbbbfd757: ZERO-4376: Bootstrap beta cycle (next-main pre-release motor)
-
-## 2.0.79-beta.0
-
-### Patch Changes
-
-- cbbbfd757: ZERO-4376: Bootstrap beta cycle (next-main pre-release motor)
+- 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
+- 2fea4143: 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
+- e9598c71: 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.78
 

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

@@ -1,192 +1,19 @@
 import { Cache, CacheKey } from '../../lib/cache';
 import 'server-only';
-import { draftMode } from 'next/headers';
 import { CacheOptions, WidgetResultType, WidgetSchemaType } from '../../types';
 import appFetch from '../../utils/app-fetch';
 import { widgets } from '../urls';
 import { ServerVariables } from '../../utils/server-variables';
-import {
-  isPreviewCopySlug,
-  isValidPreviewId,
-  previewSlug
-} from '../../utils/preview';
-
-/**
- * Widget preview (draft mode): the theme editor keeps any number of NAMED
- * previews, each storing its pages under `<slug>-preview-<previewId>`. With
- * draft mode on (entered via /api/preview, toggled by `?preview` on any page
- * url) and a preview id on the request, every widget fetch first tries that
- * preview's copy and falls back to the live slug when none exists — a
- * preview renders as "live + that preview's overlay". Preview fetches bypass
- * Redis and the fetch data cache so the editor's latest save is visible.
- *
- * BOTH signals are required: draft mode alone renders live (no id ⇒ no
- * preview slug to try), and an id alone does nothing without draft mode.
- */
-const PREVIEW_SNAPSHOT_ATTRIBUTE = 'preview_snapshot';
-
-const PREVIEW_NO_STORE = { revalidate: 0 };
-
-// The snapshot blob owns theme settings/data sources in preview, so the
-// theme-config widget itself is never slug-transformed; a slug that is
-// already this preview's copy is never transformed twice. Checked against
-// the CURRENT id, not a shape — a live slug may legitimately end in
-// `-preview-<something>` (a custom page named `summer-preview-2026`).
-const isPreviewTransformableSlug = (slug: string, previewId: string): boolean =>
-  slug !== 'theme-config' && !isPreviewCopySlug(slug, previewId);
-
-/**
- * The editor's directory of previews that exist (`theme-previews` widget,
- * `theme_previews` attribute). Deleting a preview removes it here first and
- * clears only the pages the editor had loaded — so this is what makes a
- * deleted preview stop rendering, even for a browser that still carries its
- * cookie. Read uncached, remembered briefly across requests: a deleted
- * preview may linger for at most REGISTRY_TTL_MS. An unreadable registry
- * fails OPEN (behaves as before the check existed) rather than blanking
- * every preview on a transient backend error.
- */
-const PREVIEW_REGISTRY_SLUG = 'theme-previews';
-const PREVIEW_REGISTRY_ATTRIBUTE = 'theme_previews';
-const REGISTRY_TTL_MS = 5_000;
-
-let registryMemo: { ids: Set<string> | null; expires: number } = {
-  ids: null,
-  expires: 0
-};
-
-const unwrapAttribute = (raw: unknown): unknown =>
-  typeof raw === 'object' && raw !== null && 'value' in raw
-    ? (raw as { value?: unknown }).value
-    : raw;
-
-const registryKnowsPreview = async (
-  previewId: string,
-  locale: string,
-  currency: string
-): Promise<boolean> => {
-  const now = Date.now();
-  if (registryMemo.expires <= now) {
-    let ids: Set<string> | null = null;
-    try {
-      const widget = await getWidgetDataHandler(
-        PREVIEW_REGISTRY_SLUG,
-        locale,
-        currency,
-        undefined,
-        PREVIEW_NO_STORE
-      )();
-      const raw = unwrapAttribute(
-        (widget as { attributes?: Record<string, unknown> } | null)
-          ?.attributes?.[PREVIEW_REGISTRY_ATTRIBUTE]
-      );
-      if (typeof raw === 'string' && raw) {
-        const parsed = JSON.parse(raw);
-        if (Array.isArray(parsed?.previews)) {
-          ids = new Set(
-            (parsed.previews as Array<{ id?: unknown }>)
-              .map((entry) => entry?.id)
-              .filter((id): id is string => typeof id === 'string')
-          );
-        }
-      }
-    } catch {
-      ids = null;
-    }
-    registryMemo = { ids, expires: now + REGISTRY_TTL_MS };
-  }
-  return registryMemo.ids ? registryMemo.ids.has(previewId) : true;
-};
-
-/**
- * The named preview this render belongs to, or '' when the request is not a
- * preview at all. The id is decoded from the pz route segment (see
- * utils/preview.ts) and re-validated here — it originates from a cookie.
- */
-const previewIdForRequest = async (
-  locale: string = ServerVariables.locale,
-  currency: string = ServerVariables.currency
-): Promise<string> => {
-  try {
-    if (!(await draftMode()).isEnabled) return '';
-  } catch {
-    // No request scope (e.g. build-time prerender) — never a preview.
-    return '';
-  }
-  const previewId = ServerVariables.previewId;
-  if (!isValidPreviewId(previewId)) return '';
-  return (await registryKnowsPreview(previewId, locale, currency))
-    ? previewId
-    : '';
-};
-
-/**
- * Whole-placeholder preview snapshot written by the theme editor into the
- * `preview_snapshot` attribute of `<placeholderSlug>-preview-<previewId>`.
- * When present (draft mode only), the placeholder renders straight from this
- * blob — no per-section fetches.
- */
-export type PreviewSnapshot = {
-  version: number;
-  savedAt?: string;
-  themeSettings?: Record<string, unknown> | null;
-  dataSources?: unknown[];
-  sections: unknown[];
-};
-
-export const getPreviewSnapshot = async ({
-  slug,
-  locale = ServerVariables.locale,
-  currency = ServerVariables.currency
-}: {
-  slug: string;
-  locale?: string;
-  currency?: string;
-}): Promise<PreviewSnapshot | null> => {
-  const previewId = slug ? await previewIdForRequest(locale, currency) : '';
-  if (!previewId) {
-    return null;
-  }
-
-  const widget = await getWidgetDataHandler(
-    previewSlug(slug, previewId),
-    locale,
-    currency,
-    undefined,
-    PREVIEW_NO_STORE
-  )();
-
-  const rawAttribute = (
-    widget as { attributes?: Record<string, unknown> } | null
-  )?.attributes?.[PREVIEW_SNAPSHOT_ATTRIBUTE];
-  const rawValue =
-    typeof rawAttribute === 'object' &&
-    rawAttribute !== null &&
-    'value' in rawAttribute
-      ? (rawAttribute as { value?: unknown }).value
-      : rawAttribute;
-
-  if (typeof rawValue !== 'string' || !rawValue) {
-    return null;
-  }
-
-  try {
-    const parsed = JSON.parse(rawValue);
-    if (parsed?.version === 1 && Array.isArray(parsed.sections)) {
-      return parsed as PreviewSnapshot;
-    }
-  } catch {
-    // Malformed snapshot — fall back to the live render path.
-  }
-  return null;
-};
+import { optimizeWidgetResponse } from '../../utils/payload-optimizer';
+import logger from '../../utils/log';
+import settings from 'settings';
 
 const getWidgetDataHandler =
   (
     slug: string,
     locale: string,
     currency: string,
-    headers?: Record<string, string>,
-    next?: { revalidate: number }
+    headers?: Record<string, string>
   ) =>
   async () => {
     if (!slug) {
@@ -198,20 +25,13 @@ const getWidgetDataHandler =
       locale,
       currency,
       init: {
-        headers,
-        ...(next ? { next } : {})
+        headers
       }
     });
   };
 
 const getWidgetSchemaDataHandler =
-  (
-    widgetSlug: string,
-    locale: string,
-    currency: string,
-    next?: { revalidate: number }
-  ) =>
-  async () => {
+  (widgetSlug: string, locale: string, currency: string) => async () => {
     if (!widgetSlug) {
       return null;
     }
@@ -219,8 +39,7 @@ const getWidgetSchemaDataHandler =
     return await appFetch({
       url: widgets.getWidgetSchema(widgetSlug),
       locale,
-      currency,
-      init: next ? { next } : {}
+      currency
     });
   };
 
@@ -237,36 +56,7 @@ export const getWidgetData = async <T>({
   cacheOptions?: CacheOptions;
   headers?: Record<string, string>;
 }): Promise<WidgetResultType<T>> => {
-  const requestPreviewId =
-    slug === 'theme-config' ? '' : await previewIdForRequest(locale, currency);
-  const previewId = isPreviewTransformableSlug(slug, requestPreviewId)
-    ? requestPreviewId
-    : '';
-  if (previewId) {
-    const previewData = await getWidgetDataHandler(
-      previewSlug(slug, previewId),
-      locale,
-      currency,
-      headers,
-      PREVIEW_NO_STORE
-    )();
-
-    // A snapshot HOLDER (placeholder blob carrier, consumed exclusively via
-    // getPreviewSnapshot) is not a per-widget preview copy — returning it
-    // here would shadow the live widget with an attribute-less shell when
-    // its blob is malformed and the caller fell back to the live path.
-    const previewAttributes = (
-      previewData as { attributes?: Record<string, unknown> } | null
-    )?.attributes;
-    if (
-      previewAttributes &&
-      previewAttributes[PREVIEW_SNAPSHOT_ATTRIBUTE] === undefined
-    ) {
-      return previewData as WidgetResultType<T>;
-    }
-  }
-
-  return Cache.wrap(
+  const result = await Cache.wrap(
     CacheKey.Widget(slug),
     locale,
     getWidgetDataHandler(slug, locale, currency, headers),
@@ -275,16 +65,20 @@ 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 =
-  (
-    slug: string,
-    locale: string,
-    currency: string,
-    next?: { revalidate: number }
-  ) =>
-  async () => {
+  (slug: string, locale: string, currency: string) => async () => {
     if (!slug) {
       return null;
     }
@@ -292,8 +86,7 @@ const getCollectionWidgetDataHandler =
     return await appFetch({
       url: widgets.getCollectionWidget(slug),
       locale,
-      currency,
-      init: next ? { next } : {}
+      currency
     });
   };
 
@@ -308,24 +101,6 @@ export const getCollectionWidgetData = async <T>({
   currency?: string;
   cacheOptions?: CacheOptions;
 }): Promise<WidgetResultType<T>> => {
-  const requestPreviewId =
-    slug === 'theme-config' ? '' : await previewIdForRequest(locale, currency);
-  const previewId = isPreviewTransformableSlug(slug, requestPreviewId)
-    ? requestPreviewId
-    : '';
-  if (previewId) {
-    const previewData = await getCollectionWidgetDataHandler(
-      previewSlug(slug, previewId),
-      locale,
-      currency,
-      PREVIEW_NO_STORE
-    )();
-
-    if ((previewData as { attributes?: unknown } | null)?.attributes) {
-      return previewData as WidgetResultType<T>;
-    }
-  }
-
   return Cache.wrap(
     CacheKey.Widget(`collection:${slug}`),
     locale,
@@ -348,26 +123,6 @@ export const getWidgetSchemaData = async <T>({
   currency?: string;
   cacheOptions?: CacheOptions;
 }): Promise<WidgetSchemaType<T>> => {
-  const requestPreviewId =
-    widgetSlug === 'theme-config'
-      ? ''
-      : await previewIdForRequest(locale, currency);
-  const previewId = isPreviewTransformableSlug(widgetSlug, requestPreviewId)
-    ? requestPreviewId
-    : '';
-  if (previewId) {
-    const previewData = await getWidgetSchemaDataHandler(
-      previewSlug(widgetSlug, previewId),
-      locale,
-      currency,
-      PREVIEW_NO_STORE
-    )();
-
-    if ((previewData as { schema?: unknown } | null)?.schema) {
-      return previewData as WidgetSchemaType<T>;
-    }
-  }
-
   return Cache.wrap(
     CacheKey.WidgetSchema(widgetSlug),
     locale,