@akinon/next 1.93.0-rc.49 → 1.93.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.93.0-rc.49",
+  "version": "1.93.0",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -17,13 +17,13 @@
     "test": "jest"
   },
   "dependencies": {
+    "@neshca/cache-handler": "1.5.1",
     "@opentelemetry/exporter-trace-otlp-http": "0.46.0",
     "@opentelemetry/resources": "1.19.0",
     "@opentelemetry/sdk-node": "0.46.0",
     "@opentelemetry/sdk-trace-node": "1.19.0",
     "@opentelemetry/semantic-conventions": "1.19.0",
     "@reduxjs/toolkit": "1.9.7",
-    "@neshca/cache-handler": "1.9.0",
     "@sentry/nextjs": "9.5.0",
     "cross-spawn": "7.0.3",
     "generic-pool": "3.9.0",
@@ -34,7 +34,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.93.0-rc.49",
+    "@akinon/eslint-plugin-projectzero": "1.93.0",
     "@babel/core": "7.26.10",
     "@babel/preset-env": "7.26.9",
     "@babel/preset-typescript": "7.27.0",

package/plugins.d.ts

@@ -36,13 +36,3 @@ declare module '@akinon/pz-iyzico-saved-card' {
 }
 
 declare module '@akinon/pz-apple-pay' {}
-
-declare module '@akinon/pz-flow-payment' {}
-
-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;
-}

package/plugins.js

@@ -15,8 +15,5 @@ module.exports = [
   'pz-saved-card',
   'pz-tabby-extension',
   'pz-apple-pay',
-  'pz-tamara-extension',
-  'pz-hepsipay',
-  'pz-flow-payment',
-  'pz-similar-products'
+  'pz-tamara-extension'
 ];

package/redux/middlewares/checkout.ts

@@ -20,8 +20,7 @@ import {
   setShippingOptions,
   setHepsipayAvailability,
   setWalletPaymentData,
-  setPayOnDeliveryOtpModalActive,
-  setUnavailablePaymentOptions
+  setPayOnDeliveryOtpModalActive
 } from '../../redux/reducers/checkout';
 import { RootState, TypedDispatch } from 'redux/store';
 import { checkoutApi } from '../../data/client/checkout';
@@ -51,11 +50,7 @@ export const errorMiddleware: Middleware = ({ dispatch }: MiddlewareParams) => {
     const result: CheckoutResult = next(action);
     const errors = result?.payload?.errors;
 
-    if (
-      !!errors &&
-      ((typeof errors === 'object' && Object.keys(errors).length > 0) ||
-        (Array.isArray(errors) && errors.length > 0))
-    ) {
+    if (errors) {
       dispatch(setErrors(errors));
     }
 
@@ -181,14 +176,6 @@ export const contextListMiddleware: Middleware = ({
           dispatch(setPaymentOptions(context.page_context.payment_options));
         }
 
-        if (context.page_context.unavailable_options) {
-          dispatch(
-            setUnavailablePaymentOptions(
-              context.page_context.unavailable_options
-            )
-          );
-        }
-
         if (context.page_context.credit_payment_options) {
           dispatch(
             setCreditPaymentOptions(context.page_context.credit_payment_options)

package/redux/reducers/checkout.ts

@@ -40,7 +40,6 @@ export interface CheckoutState {
   shippingOptions: ShippingOption[];
   dataSourceShippingOptions: DataSource[];
   paymentOptions: PaymentOption[];
-  unavailablePaymentOptions: PaymentOption[];
   creditPaymentOptions: CheckoutCreditPaymentOption[];
   selectedCreditPaymentPk: number;
   paymentChoices: PaymentChoice[];
@@ -61,8 +60,6 @@ export interface CheckoutState {
       countryCode: string;
       currencyCode: string;
       version: string;
-      public_key: string;
-      [key: string]: any;
     };
     detail: {
       label: string;
@@ -97,7 +94,6 @@ const initialState: CheckoutState = {
   shippingOptions: [],
   dataSourceShippingOptions: [],
   paymentOptions: [],
-  unavailablePaymentOptions: [],
   creditPaymentOptions: [],
   selectedCreditPaymentPk: null,
   paymentChoices: [],
@@ -161,9 +157,6 @@ const checkoutSlice = createSlice({
     setPaymentOptions(state, { payload }) {
       state.paymentOptions = payload;
     },
-    setUnavailablePaymentOptions(state, { payload }) {
-      state.unavailablePaymentOptions = payload;
-    },
     setPaymentChoices(state, { payload }) {
       state.paymentChoices = payload;
     },
@@ -225,10 +218,9 @@ export const {
   setShippingOptions,
   setDataSourceShippingOptions,
   setPaymentOptions,
-  setUnavailablePaymentOptions,
-  setPaymentChoices,
   setCreditPaymentOptions,
   setSelectedCreditPaymentPk,
+  setPaymentChoices,
   setCardType,
   setInstallmentOptions,
   setBankAccounts,

package/sentry/index.ts

@@ -13,73 +13,36 @@ const ALLOWED_CLIENT_LOG_TYPES: ClientLogType[] = [
   ClientLogType.CHECKOUT
 ];
 
-const isNetworkError = (exception: unknown): boolean => {
-  if (!(exception instanceof Error)) return false;
-
-  const networkErrorPatterns = [
-    'networkerror',
-    'failed to fetch',
-    'network request failed',
-    'network error',
-    'loading chunk',
-    'chunk load failed'
-  ];
-
-  if (exception.name === 'NetworkError') return true;
-
-  if (exception.name === 'TypeError') {
-    return networkErrorPatterns.some((pattern) =>
-      exception.message.toLowerCase().includes(pattern)
-    );
-  }
-
-  return networkErrorPatterns.some((pattern) =>
-    exception.message.toLowerCase().includes(pattern)
-  );
-};
-
 export const initSentry = (
   type: 'Server' | 'Client' | 'Edge',
   options: Sentry.BrowserOptions | Sentry.NodeOptions | Sentry.EdgeOptions = {}
 ) => {
-  // TODO: Remove Zero Project DSN
+  // TODO: Handle options with ESLint rules
 
-  const baseConfig = {
+  Sentry.init({
     dsn:
-      SENTRY_DSN ||
       options.dsn ||
+      SENTRY_DSN ||
       'https://d8558ef8997543deacf376c7d8d7cf4b@o64293.ingest.sentry.io/4504338423742464',
     initialScope: {
       tags: {
         APP_TYPE: 'ProjectZeroNext',
-        TYPE: type,
-        ...((options.initialScope as any)?.tags || {})
+        TYPE: type
       }
     },
     tracesSampleRate: 0,
-    integrations: []
-  };
-
-  if (type === 'Server' || type === 'Edge') {
-    Sentry.init(baseConfig);
-  } else if (type === 'Client') {
-    Sentry.init({
-      ...baseConfig,
-      beforeSend: (event, hint) => {
-        if (
-          !ALLOWED_CLIENT_LOG_TYPES.includes(
-            event.tags?.LOG_TYPE as ClientLogType
-          )
-        ) {
-          return null;
-        }
-
-        if (isNetworkError(hint?.originalException)) {
-          return null;
-        }
-
-        return event;
+    integrations: [],
+    beforeSend: (event, hint) => {
+      if (
+        type === 'Client' &&
+        !ALLOWED_CLIENT_LOG_TYPES.includes(
+          event.tags?.LOG_TYPE as ClientLogType
+        )
+      ) {
+        return null;
       }
-    });
-  }
+
+      return event;
+    }
+  });
 };

package/types/commerce/order.ts

@@ -114,7 +114,6 @@ export interface Order {
     pk: number;
     name: string;
     slug: string;
-    logo: string;
     [key: string]: any;
   };
 }

package/types/index.ts

@@ -83,12 +83,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;
   redis: {
     defaultExpirationTime: number;
   };
@@ -224,14 +218,6 @@ export interface CacheOptions {
   useProxy?: boolean;
 }
 
-export interface SetCookieOptions {
-  expires?: number; // days
-  path?: string;
-  domain?: string;
-  secure?: boolean;
-  sameSite?: 'strict' | 'lax' | 'none';
-}
-
 export interface ClientRequestOptions {
   useTrailingSlash?: boolean;
   useFormData?: boolean;
@@ -297,13 +283,7 @@ export interface ButtonProps
   target?: '_blank' | '_self' | '_parent' | '_top';
 }
 
-export interface FileInputProps extends React.HTMLProps<HTMLInputElement> {
-  fileClassName?: string;
-  fileNameWrapperClassName?: string;
-  fileInputClassName?: string;
-  onChange?: (event: React.ChangeEvent<HTMLInputElement>) => void;
-  buttonClassName?: string;
-}
+export type FileInputProps = React.HTMLProps<HTMLInputElement>;
 
 export interface PriceProps {
   currencyCode?: string;
@@ -324,19 +304,15 @@ export interface InputProps extends React.HTMLProps<HTMLInputElement> {
 
 export interface AccordionProps {
   isCollapse?: boolean;
-  collapseClassName?: string;
   title?: string;
   subTitle?: string;
   icons?: string[];
   iconSize?: number;
   iconColor?: string;
   children?: ReactNode;
-  headerClassName?: string;
   className?: string;
   titleClassName?: string;
-  subTitleClassName?: string;
   dataTestId?: string;
-  contentClassName?: string;
 }
 
 export interface PluginModuleComponentProps {
@@ -361,20 +337,3 @@ export interface PaginationProps {
   direction?: 'next' | 'prev';
   isLoading?: boolean;
 }
-
-export interface ModalProps {
-  portalId: string;
-  children?: React.ReactNode;
-  open?: boolean;
-  setOpen?: (open: boolean) => void;
-  title?: React.ReactNode;
-  showCloseButton?: React.ReactNode;
-  className?: string;
-  overlayClassName?: string;
-  headerWrapperClassName?: string;
-  titleClassName?: string;
-  closeButtonClassName?: string;
-  iconName?: string;
-  iconSize?: number;
-  iconClassName?: string;
-}

package/utils/app-fetch.ts

@@ -43,12 +43,12 @@ const appFetch = async <T>({
     const requestURL = `${decodeURIComponent(commerceUrl)}${url}`;
 
     init.headers = {
-      cookie: nextCookies.toString(),
       ...(init.headers ?? {}),
       ...(ServerVariables.globalHeaders ?? {}),
       'Accept-Language': currentLocale.apiValue,
       'x-currency': currency,
-      'x-forwarded-for': ip
+      'x-forwarded-for': ip,
+      cookie: nextCookies.toString()
     };
 
     init.next = {
@@ -60,11 +60,6 @@ const appFetch = async <T>({
     status = req.status;
     logger.debug(`FETCH END ${url}`, { status: req.status, ip });
 
-    if (!req.ok) {
-      const errorMessage = `HTTP ${req.status}: ${req.statusText}`;
-      throw new Error(errorMessage);
-    }
-
     if (responseType === FetchResponseType.JSON) {
       response = (await req.json()) as T;
     } else {

package/utils/index.ts

@@ -1,7 +1,6 @@
 import settings from 'settings';
 import { LocaleUrlStrategy } from '../localization';
-import { CDNOptions, ClientRequestOptions, SetCookieOptions } from '../types';
-import getRootHostname from './get-root-hostname';
+import { CDNOptions, ClientRequestOptions } from '../types';
 
 export * from './get-currency';
 export * from './menu-generator';
@@ -21,40 +20,14 @@ export function getCookie(name: string) {
   }
 }
 
-export function setCookie(
-  name: string,
-  value: string,
-  options: SetCookieOptions = {}
-) {
-  const cookieParts = [`${name}=${value}`];
-
-  if (options.expires) {
-    const date = new Date();
-    date.setTime(date.getTime() + options.expires * 24 * 60 * 60 * 1000);
-    cookieParts.push(`expires=${date.toUTCString()}`);
-  }
+export function setCookie(name: string, val: string) {
+  const date = new Date();
+  const value = val;
 
-  cookieParts.push(`path=${options.path ?? '/'}`);
+  date.setTime(date.getTime() + 7 * 24 * 60 * 60 * 1000);
 
-  if (options.secure) {
-    cookieParts.push('secure');
-  }
-
-  if (options.sameSite) {
-    cookieParts.push(`sameSite=${options.sameSite}`);
-  }
-
-  const domain =
-    options.domain ??
-    (settings.localization.localeUrlStrategy === LocaleUrlStrategy.Subdomain
-      ? getRootHostname(document.location.href)
-      : null);
-
-  if (domain) {
-    cookieParts.push(`domain=${domain}`);
-  }
-
-  document.cookie = cookieParts.join('; ');
+  document.cookie =
+    name + '=' + value + '; expires=' + date.toUTCString() + '; path=/';
 }
 
 export function removeCookie(name: string) {
@@ -179,6 +152,9 @@ export function buildCDNUrl(url: string, config?: CDNOptions) {
   return `${rootWithoutOptions}${options}${fileExtension}`;
 }
 
+const { locales, localeUrlStrategy, defaultLocaleValue } =
+  settings.localization;
+
 export const urlLocaleMatcherRegex = new RegExp(
   `^/(${settings.localization.locales
     .filter((l) =>

package/utils/redirect.ts

@@ -1,48 +1,23 @@
 import { redirect as nextRedirect, RedirectType } from 'next/navigation';
 import Settings from 'settings';
-import { headers, cookies } from 'next/headers';
+import { headers } from 'next/headers';
+import { ServerVariables } from '@akinon/next/utils/server-variables';
 import { getUrlPathWithLocale } from '@akinon/next/utils/localization';
-import { urlLocaleMatcherRegex } from '@akinon/next/utils';
 
 export const redirect = (path: string, type?: RedirectType) => {
   const nextHeaders = headers();
-  const nextCookies = cookies();
   const pageUrl = new URL(
-    nextHeaders.get('pz-url') ?? process.env.NEXT_PUBLIC_URL ?? ''
+    nextHeaders.get('pz-url') ?? process.env.NEXT_PUBLIC_URL
   );
 
-  let currentLocaleValue = Settings.localization.defaultLocaleValue;
-  const urlLocaleMatch = pageUrl.pathname.match(urlLocaleMatcherRegex);
-
-  if (urlLocaleMatch && urlLocaleMatch[0]) {
-    currentLocaleValue = urlLocaleMatch[0].replace('/', '');
-  } else {
-    const cookieLocale = nextCookies.get('pz-locale')?.value;
-    if (
-      cookieLocale &&
-      Settings.localization.locales.find((l) => l.value === cookieLocale)
-    ) {
-      currentLocaleValue = cookieLocale;
-    }
-  }
-
   const currentLocale = Settings.localization.locales.find(
-    (locale) => locale.value === currentLocaleValue
+    (locale) => locale.value === ServerVariables.locale
   );
 
-  if (!currentLocale) {
-    currentLocaleValue = Settings.localization.defaultLocaleValue;
-  }
-
-  const searchParams = new URLSearchParams(pageUrl.search);
-
-  const callbackUrl =
-    pageUrl.pathname.replace(urlLocaleMatcherRegex, '') +
-    (searchParams.toString() ? `?${searchParams.toString()}` : '');
-
+  const callbackUrl = pageUrl.pathname;
   const redirectUrlWithLocale = getUrlPathWithLocale(
     path,
-    currentLocale?.value
+    currentLocale.localePath ?? currentLocale.value
   );
 
   const redirectUrl = `${redirectUrlWithLocale}?callbackUrl=${callbackUrl}`;

package/with-pz-config.js

@@ -16,8 +16,12 @@ const defaultConfig = {
     remotePatterns: [
       {
         protocol: 'https',
-        hostname: '**'
+        hostname: '**.akinoncloud.com'
       },
+      {
+        protocol: 'https',
+        hostname: '**.akinoncdn.com'
+      }
     ]
   },
   modularizeImports: {