@akinon/next 2.0.137-rc.0 → 2.0.137

package/middlewares/pretty-url.ts

@@ -86,9 +86,7 @@ const withPrettyUrl =
     const matchedLanguagePrefix = url.pathname.match(
       urlLocaleMatcherRegex
     )?.[0];
-    const prettyUrlPathname = matchedLanguagePrefix
-      ? url.pathname.replace(matchedLanguagePrefix, '')
-      : url.pathname;
+    const prettyUrlPathname = url.pathname.replace(matchedLanguagePrefix, '');
     const isValidPrettyUrlPath = (pathname: string) => {
       return (
         new RegExp(/^\/[a-zA-Z0-9/]+(?:-[a-zA-Z0-9/]+)*$/).test(pathname) &&

package/package.json

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

package/plugins.d.ts

@@ -37,16 +37,6 @@ declare module '@akinon/pz-cybersource-uc/src/redux/middleware' {
   export default middleware as any;
 }
 
-declare module '@akinon/pz-apple-pay' {}
-
-declare module '@akinon/pz-similar-products' {
-  export const SimilarProductsModal: any;
-  export const SimilarProductsFilterSidebar: any;
-  export const SimilarProductsResultsGrid: any;
-  export const SimilarProductsPlugin: any;
-  export const SimilarProductsButtonPlugin: any;
-}
-
 declare module '@akinon/pz-cybersource-uc/src/redux/reducer' {
   export default reducer as any;
 }

package/plugins.js

@@ -16,7 +16,6 @@ module.exports = [
   'pz-tabby-extension',
   'pz-apple-pay',
   'pz-tamara-extension',
-  'pz-similar-products',
   'pz-cybersource-uc',
   'pz-hepsipay',
   'pz-flow-payment',

package/redux/middlewares/checkout.ts

@@ -25,29 +25,17 @@ import {
   setUnavailablePaymentOptions
 } from '../../redux/reducers/checkout';
 import { RootState, TypedDispatch } from 'redux/store';
-import { checkoutApi } from '../../data/client/checkout';
-import { CheckoutContext, MiddlewareAction, PreOrder } from '../../types';
+import {
+  checkoutApi,
+  setAttributeBasedShippingPageName
+} from '../../data/client/checkout';
+import { CheckoutContext, PreOrder } from '../../types';
 import { getCookie } from '../../utils';
 import settings from 'settings';
 import { LocaleUrlStrategy } from '../../localization';
 import { showMobile3dIframe } from '../../utils/mobile-3d-iframe';
 import { showRedirectionIframe } from '../../utils/redirection-iframe';
 
-const IFRAME_REDIRECTION_KEY = 'pz-iframe-redirection-active';
-
-const isIframeRedirectionActive = () =>
-  typeof window !== 'undefined' &&
-  sessionStorage.getItem(IFRAME_REDIRECTION_KEY) === 'true';
-
-const setIframeRedirectionActive = (active: boolean) => {
-  if (typeof window === 'undefined') return;
-  if (active) {
-    sessionStorage.setItem(IFRAME_REDIRECTION_KEY, 'true');
-  } else {
-    sessionStorage.removeItem(IFRAME_REDIRECTION_KEY);
-  }
-};
-
 interface CheckoutResult {
   payload: {
     errors?: Record<string, string[]>;
@@ -84,7 +72,7 @@ export const redirectUrlMiddleware: Middleware = () => {
     const result = next(action) as CheckoutResult;
     const redirectUrl = result?.payload?.redirect_url;
 
-    if (redirectUrl && !isIframeRedirectionActive()) {
+    if (redirectUrl) {
       const currentLocale = getCookie('pz-locale');
 
       let url = redirectUrl;
@@ -114,15 +102,8 @@ export const contextListMiddleware: Middleware = ({
     const { isMobileApp, userPhoneNumber } = getState().root;
     const result = next(action) as CheckoutResult;
     const preOrder = result?.payload?.pre_order;
-    const act = action as MiddlewareAction;
 
     if (result?.payload?.context_list) {
-      const endpointName = act.meta?.arg?.endpointName;
-      const isBinNumberResponse = endpointName === 'setBinNumber';
-      const hasCardTypeInContextList = result.payload.context_list.some(
-        (ctx) => ctx.page_context.card_type
-      );
-
       result.payload.context_list.forEach((context) => {
         const redirectUrl = context.page_context.redirect_url;
         const isIframe = context.page_context.is_iframe ?? false;
@@ -156,7 +137,6 @@ export const contextListMiddleware: Middleware = ({
           if (isMobileDevice && isIframePaymentOptionIncluded) {
             showMobile3dIframe(urlObj.toString());
           } else if (isIframe) {
-            setIframeRedirectionActive(true);
             showRedirectionIframe(urlObj.toString());
           } else {
             window.location.href = urlObj.toString();
@@ -194,6 +174,7 @@ export const contextListMiddleware: Middleware = ({
         }
 
         if (context.page_context.attribute_based_shipping_options) {
+          setAttributeBasedShippingPageName(context.page_name);
           dispatch(
             setAttributeBasedShippingOptions(
               context.page_context.attribute_based_shipping_options
@@ -232,34 +213,15 @@ export const contextListMiddleware: Middleware = ({
             (ctx) => ctx.page_name === 'DeliveryOptionSelectionPage'
           )
         ) {
-          const isCreditCardPayment =
-            preOrder?.payment_option?.payment_type === 'credit_card' ||
-            preOrder?.payment_option?.payment_type === 'masterpass';
-
           if (context.page_context.card_type) {
             dispatch(setCardType(context.page_context.card_type));
-          } else if (
-            isCreditCardPayment &&
-            isBinNumberResponse &&
-            !hasCardTypeInContextList
-          ) {
-            dispatch(setCardType(null));
-            dispatch(setInstallmentOptions([]));
           }
 
           if (
             context.page_context.installments &&
             preOrder?.payment_option?.payment_type !== 'masterpass_rest'
           ) {
-            if (
-              !isCreditCardPayment ||
-              context.page_context.card_type ||
-              hasCardTypeInContextList
-            ) {
-              dispatch(
-                setInstallmentOptions(context.page_context.installments)
-              );
-            }
+            dispatch(setInstallmentOptions(context.page_context.installments));
           }
         }
 

package/redux/middlewares/pre-order/attribute-based-shipping-option.ts

@@ -21,12 +21,28 @@ export const attributeBasedShippingOptionMiddleware: Middleware = ({
       Object.keys(attributeBasedShippingOptions).length > 0 &&
       !preOrder.attribute_based_shipping_options
     ) {
-      const initialSelectedOptions: Record<string, number> = Object.fromEntries(
-        Object.entries(attributeBasedShippingOptions).map(([key, options]) => [
-          key,
-          options.attribute_based_shipping_options[0].pk
-        ])
-      );
+      // A group can come back without any option: the service logs it and still
+      // reports the group with an empty list, so indexing into it would throw
+      // inside the middleware chain and drop the whole checkout response.
+      const initialSelectedOptions: Record<string, number> = {};
+
+      Object.entries(attributeBasedShippingOptions).forEach(([key, group]) => {
+        const pk = group?.attribute_based_shipping_options?.[0]?.pk;
+
+        if (typeof pk === 'number') {
+          initialSelectedOptions[key] = pk;
+        }
+      });
+
+      // The backend rejects a selection that does not cover every group it
+      // reported, and the rejection leaves pre_order empty, which brings us
+      // straight back here. Post nothing rather than start that loop.
+      if (
+        Object.keys(initialSelectedOptions).length !==
+        Object.keys(attributeBasedShippingOptions).length
+      ) {
+        return result;
+      }
 
       dispatch(
         apiEndpoints.setAttributeBasedShippingOptions.initiate(

package/redux/middlewares/pre-order/installment-option.ts

@@ -14,17 +14,9 @@ export const installmentOptionMiddleware: Middleware = ({
       return result;
     }
 
-    const { installmentOptions, cardType } = getState().checkout;
+    const { installmentOptions } = getState().checkout;
     const { endpoints: apiEndpoints } = checkoutApi;
 
-    const isCreditCardPayment =
-      preOrder?.payment_option?.payment_type === 'credit_card' ||
-      preOrder?.payment_option?.payment_type === 'masterpass';
-
-    if (isCreditCardPayment && !cardType) {
-      return result;
-    }
-
     if (
       !preOrder?.installment &&
       preOrder?.payment_option?.payment_type !== 'saved_card' &&

package/types/index.ts

@@ -85,12 +85,6 @@ export interface Settings {
   };
   usePrettyUrlRoute?: boolean;
   commerceUrl: string;
-  /**
-   * This option allows you to track Sentry events on the client side, in addition to server and edge environments.
-   *
-   * It overrides process.env.NEXT_PUBLIC_SENTRY_DSN and process.env.SENTRY_DSN.
-   */
-  sentryDsn?: string;
   /**
    * CSRF cookie hardening settings.
    *
@@ -242,7 +236,6 @@ export interface Settings {
     separator?: string;
     segments: PzSegmentDefinition[];
   };
-  payloadOptimization?: import('../utils/payload-optimizer').PayloadOptimizationConfig;
 }
 
 export interface CacheOptions {
@@ -302,9 +295,7 @@ export interface PzSegmentsConfig {
 }
 
 // Search params type compatible with both Next.js resolved searchParams and URLSearchParams
-export type SearchParams =
-  | Record<string, string | string[] | undefined>
-  | URLSearchParams;
+export type SearchParams = Record<string, string | string[] | undefined> | URLSearchParams;
 
 // Raw Next 16 server prop shape, used at the middleware/HOC boundary before normalization
 export type RawSearchParams = Record<string, string | string[] | undefined>;
@@ -337,16 +328,14 @@ export interface RootLayoutProps<T = any> extends LayoutProps<T> {
 
 // Async versions for Next.js 16 generateMetadata and internal use
 export interface AsyncPageProps<T = any> {
-  params: Promise<
-    T & {
-      pz?: string;
-      commerce?: string;
-      locale?: string;
-      currency?: string;
-      url?: string;
-      [key: string]: any;
-    }
-  >;
+  params: Promise<T & {
+    pz?: string;
+    commerce?: string;
+    locale?: string;
+    currency?: string;
+    url?: string;
+    [key: string]: any;
+  }>;
   searchParams: Promise<{ [key: string]: string | string[] | undefined }>;
 }
 

package/utils/csrf.ts

@@ -46,7 +46,7 @@ export function getCsrfCookieFlags(): CsrfCookieFlags {
 
   return {
     httpOnly,
-    secure: process.env.NODE_ENV === 'production',
+    secure: httpOnly && process.env.NODE_ENV === 'production',
     sameSite: 'lax'
   };
 }

package/with-pz-config.js

@@ -30,10 +30,6 @@ const defaultConfig = {
       {
         protocol: 'https',
         hostname: '**.akinoncdn.com'
-      },
-      {
-        protocol: 'https',
-        hostname: '**.akinoncloudcdn.com'
       }
     ]
   },
@@ -78,8 +74,7 @@ const defaultConfig = {
         acc[`@akinon/${plugin}`] = false;
         return acc;
       }, {}),
-      translations: false,
-      '@opentelemetry/exporter-jaeger': false
+      translations: false
     };
     // Ensure webpack can resolve deps from the app's node_modules when
     // compiling transpiled packages (e.g. @akinon/next) whose imports

package/api/client-env.ts

@@ -1,78 +0,0 @@
-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/hooks/use-client-env.ts

@@ -1,265 +0,0 @@
-'use client';
-
-import { useEffect, useState } from 'react';
-
-/**
- * Runtime access to public (`NEXT_PUBLIC_*`) environment variables from Client
- * Components.
- *
- * `process.env.NEXT_PUBLIC_*` is inlined at *build* time, so on platforms where
- * the build has no environment (e.g. Akinon Cloud Commerce) it resolves to
- * `undefined` in the browser. These helpers read the value from the server
- * runtime through the `/api/client-env` route handler instead
- * (`@akinon/next/api/client-env`).
- *
- * Always pass the full variable name, including the `NEXT_PUBLIC_` prefix:
- *
- * ```tsx
- * // inside a Client Component
- * const { value, isLoading } = useClientEnv('NEXT_PUBLIC_MAP_API_KEY');
- *
- * // imperative (event handlers, third-party init, ...)
- * const key = await getClientEnv('NEXT_PUBLIC_MAP_API_KEY');
- * ```
- *
- * Server Components do not need this — read the value with computed access
- * (`process.env['NEXT_PUBLIC_MAP_API_KEY']`) so it is not build-time inlined.
- */
-
-const ENDPOINT = '/api/client-env';
-
-// Shared across every caller so each variable is fetched at most once per page
-// load, no matter how many components ask for it.
-const cache = new Map<string, string | null>();
-const inflight = new Map<string, Promise<string | null>>();
-
-function request(names: string[]): void {
-  const pending = names.filter(
-    (name) => !cache.has(name) && !inflight.has(name)
-  );
-
-  if (pending.length === 0) return;
-
-  const query = pending
-    .map((name) => `env=${encodeURIComponent(name)}`)
-    .join('&');
-
-  const response = fetch(`${ENDPOINT}?${query}`, {
-    headers: { Accept: 'application/json' }
-  })
-    .then((res) => {
-      if (!res.ok) {
-        throw new Error(`Failed to load client env (status ${res.status}).`);
-      }
-      return res.json() as Promise<Record<string, string | null>>;
-    })
-    .then((data) => {
-      pending.forEach((name) => cache.set(name, data?.[name] ?? null));
-    });
-
-  // One in-flight entry per name so concurrent callers dedupe. On failure the
-  // entry is cleared (not cached) so a later render can retry.
-  pending.forEach((name) => {
-    inflight.set(
-      name,
-      response
-        .then(() => cache.get(name) ?? null)
-        .finally(() => inflight.delete(name))
-    );
-  });
-}
-
-function resolve(name: string): Promise<string | null> {
-  if (cache.has(name)) return Promise.resolve(cache.get(name) ?? null);
-  return inflight.get(name) ?? Promise.resolve(null);
-}
-
-/**
- * Read a single public (`NEXT_PUBLIC_*`) environment variable at runtime,
- * outside React (event handlers, third-party SDK init, …). Cached and
- * deduplicated across callers.
- *
- * @param name - Full variable name, including the `NEXT_PUBLIC_` prefix.
- * @returns The runtime value, or `null` when the variable is unset. Rejects if
- * the request fails, so wrap direct calls in `try`/`catch`. A failed request is
- * not cached — a later call retries.
- *
- * @example
- * ```tsx
- * import { getClientEnv } from '@akinon/next/hooks'
- *
- * const handleShare = async () => {
- *   const baseUrl = await getClientEnv('NEXT_PUBLIC_URL')
- *   navigator.clipboard.writeText(`${baseUrl}/product/123`)
- * }
- * ```
- */
-export async function getClientEnv(name: string): Promise<string | null> {
-  request([name]);
-  return resolve(name);
-}
-
-/**
- * Read several public (`NEXT_PUBLIC_*`) environment variables at runtime in a
- * single request, outside React.
- *
- * @param names - Full variable names, each including the `NEXT_PUBLIC_` prefix.
- * @returns A `{ [name]: value | null }` map. Rejects if the request fails.
- *
- * @example
- * ```ts
- * import { getClientEnvs } from '@akinon/next/hooks'
- *
- * const env = await getClientEnvs(['NEXT_PUBLIC_GTM_KEY', 'NEXT_PUBLIC_URL'])
- * // env['NEXT_PUBLIC_URL']
- * ```
- */
-export async function getClientEnvs(
-  names: string[]
-): Promise<Record<string, string | null>> {
-  request(names);
-  const values = await Promise.all(names.map((name) => resolve(name)));
-  return names.reduce<Record<string, string | null>>((acc, name, index) => {
-    acc[name] = values[index];
-    return acc;
-  }, {});
-}
-
-/**
- * Read a single public (`NEXT_PUBLIC_*`) environment variable at runtime from a
- * Client Component.
- *
- * @param name - Full variable name, including the `NEXT_PUBLIC_` prefix.
- * @returns `{ value, isLoading, error }`. `value` is `null` while loading, when
- * the variable is unset, or on failure.
- *
- * @example
- * ```tsx
- * 'use client'
- * import { useClientEnv } from '@akinon/next/hooks'
- *
- * export const StoreMap = () => {
- *   const { value: mapApiKey, isLoading } = useClientEnv('NEXT_PUBLIC_MAP_API_KEY')
- *
- *   if (isLoading) return <Spinner />
- *   if (!mapApiKey) return null
- *
- *   return <GoogleMap apiKey={mapApiKey} />
- * }
- * ```
- */
-export function useClientEnv(name: string) {
-  const [value, setValue] = useState<string | null>(
-    () => cache.get(name) ?? null
-  );
-  const [isLoading, setIsLoading] = useState(() => !cache.has(name));
-  const [error, setError] = useState<Error | null>(null);
-
-  useEffect(() => {
-    let active = true;
-
-    if (cache.has(name)) {
-      setValue(cache.get(name) ?? null);
-      setIsLoading(false);
-      setError(null);
-      return;
-    }
-
-    setIsLoading(true);
-    setError(null);
-
-    getClientEnv(name)
-      .then((resolved) => {
-        if (!active) return;
-        setValue(resolved);
-        setIsLoading(false);
-      })
-      .catch((err) => {
-        if (!active) return;
-        setError(err instanceof Error ? err : new Error(String(err)));
-        setIsLoading(false);
-      });
-
-    return () => {
-      active = false;
-    };
-  }, [name]);
-
-  return { value, isLoading, error };
-}
-
-/**
- * Read several public (`NEXT_PUBLIC_*`) environment variables at runtime in a
- * single request from a Client Component.
- *
- * @param names - Full variable names, each including the `NEXT_PUBLIC_` prefix.
- * @returns `{ values, isLoading, error }` where `values` is a
- * `{ [name]: value | null }` map.
- *
- * @example
- * ```tsx
- * 'use client'
- * import { useClientEnvs } from '@akinon/next/hooks'
- *
- * const { values, isLoading } = useClientEnvs([
- *   'NEXT_PUBLIC_GTM_KEY',
- *   'NEXT_PUBLIC_URL'
- * ])
- *
- * const gtmKey = values['NEXT_PUBLIC_GTM_KEY']
- * ```
- */
-export function useClientEnvs(names: string[]) {
-  // Stable serialization so the effect re-runs only when the set changes, not
-  // on every render (a new array identity would otherwise loop it forever).
-  const key = names.join(',');
-
-  const [values, setValues] = useState<Record<string, string | null>>(() => {
-    const initial: Record<string, string | null> = {};
-    names.forEach((name) => {
-      if (cache.has(name)) initial[name] = cache.get(name) ?? null;
-    });
-    return initial;
-  });
-  const [isLoading, setIsLoading] = useState(
-    () => !names.every((name) => cache.has(name))
-  );
-  const [error, setError] = useState<Error | null>(null);
-
-  useEffect(() => {
-    let active = true;
-    const list = key ? key.split(',') : [];
-
-    if (list.every((name) => cache.has(name))) {
-      const resolved: Record<string, string | null> = {};
-      list.forEach((name) => (resolved[name] = cache.get(name) ?? null));
-      setValues(resolved);
-      setIsLoading(false);
-      setError(null);
-      return;
-    }
-
-    setIsLoading(true);
-    setError(null);
-
-    getClientEnvs(list)
-      .then((resolved) => {
-        if (!active) return;
-        setValues(resolved);
-        setIsLoading(false);
-      })
-      .catch((err) => {
-        if (!active) return;
-        setError(err instanceof Error ? err : new Error(String(err)));
-        setIsLoading(false);
-      });
-
-    return () => {
-      active = false;
-    };
-    // `key` is the stable serialization of `names`.
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [key]);
-
-  return { values, isLoading, error };
-}