@akinon/next 1.89.0-rc.9 → 1.89.0-snapshot-ZERO-3363-20250507092133

package/bin/pz-prebuild.js

@@ -2,7 +2,6 @@
 
 const runScript = require('./run-script');
 
-runScript('pz-run-tests.js');
 runScript('pz-install-theme.js');
 runScript('pz-pre-check-dist.js');
 runScript('pz-generate-translations.js');

package/components/input.tsx

@@ -1,8 +1,6 @@
 import clsx from 'clsx';
 import { forwardRef, FocusEvent, useState, Ref } from 'react';
 import { Controller } from 'react-hook-form';
-
-// @ts-ignore
 import { PatternFormat, PatternFormatProps } from 'react-number-format';
 import { InputProps } from '../types';
 import { twMerge } from 'tailwind-merge';

package/components/link.tsx

@@ -10,9 +10,7 @@ type LinkProps = Omit<
   React.AnchorHTMLAttributes<HTMLAnchorElement>,
   keyof NextLinkProps
 > &
-  NextLinkProps & {
-    href: string;
-  };
+  NextLinkProps;
 
 export const Link = ({ children, href, ...rest }: LinkProps) => {
   const { locale, defaultLocaleValue, localeUrlStrategy } = useLocalization();
@@ -28,21 +26,19 @@ export const Link = ({ children, href, ...rest }: LinkProps) => {
       return href;
     }
 
-    if (typeof href === 'string' && !href.startsWith('http')) {
-      const pathnameWithoutLocale = href.replace(urlLocaleMatcherRegex, '');
-      const hrefWithLocale = `/${locale}${pathnameWithoutLocale}`;
-
-      if (localeUrlStrategy === LocaleUrlStrategy.ShowAllLocales) {
-        return hrefWithLocale;
-      } else if (
-        localeUrlStrategy === LocaleUrlStrategy.HideDefaultLocale &&
-        locale !== defaultLocaleValue
-      ) {
-        return hrefWithLocale;
-      }
+    const pathnameWithoutLocale = href.replace(urlLocaleMatcherRegex, '');
+    const hrefWithLocale = `/${locale}${pathnameWithoutLocale}`;
+
+    if (localeUrlStrategy === LocaleUrlStrategy.ShowAllLocales) {
+      return hrefWithLocale;
+    } else if (
+      localeUrlStrategy === LocaleUrlStrategy.HideDefaultLocale &&
+      locale !== defaultLocaleValue
+    ) {
+      return hrefWithLocale;
     }
 
-    return href;
+    return href || '#';
   }, [href, defaultLocaleValue, locale, localeUrlStrategy]);
 
   return (

package/components/price.tsx

@@ -55,8 +55,8 @@ export const Price = (props: NumericFormatProps & PriceProps) => {
       : formattedValue;
 
   const currentCurrencyDecimalScale = Settings.localization.currencies.find(
-    (currency) => currency?.code === currencyCode_
-  )?.decimalScale;
+    (currency) => currency.code === currencyCode_
+  ).decimalScale;
 
   return (
     <NumericFormat

package/hocs/server/with-segment-defaults.tsx

@@ -72,13 +72,10 @@ const addRootLayoutProps = async (componentProps: RootLayoutProps) => {
 const checkRedisVariables = () => {
   const requiredVariableValues = [
     process.env.CACHE_HOST,
-    process.env.CACHE_PORT
+    process.env.CACHE_PORT,
+    process.env.CACHE_SECRET
   ];
 
-  if (!settings.usePrettyUrlRoute) {
-    requiredVariableValues.push(process.env.CACHE_SECRET);
-  }
-
   if (
     !requiredVariableValues.every((v) => v) &&
     process.env.NODE_ENV === 'production'

package/instrumentation/node.ts

@@ -4,19 +4,17 @@ import { Resource } from '@opentelemetry/resources';
 import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
 import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-node';
 
-if (process.env.NODE_ENV === 'development') {
-  const sdk = new NodeSDK({
-    resource: new Resource({
-      [SemanticResourceAttributes.SERVICE_NAME]: 'pz-next-app'
-    }),
-    spanProcessor: new SimpleSpanProcessor(
-      new OTLPTraceExporter({
-        url: `${
-          process.env.PZ_DASHBOARD_URL ?? 'http://localhost:3005'
-        }/api/traces`
-      })
-    )
-  });
+const sdk = new NodeSDK({
+  resource: new Resource({
+    [SemanticResourceAttributes.SERVICE_NAME]: 'pz-next-app'
+  }),
+  spanProcessor: new SimpleSpanProcessor(
+    new OTLPTraceExporter({
+      url: `${
+        process.env.PZ_DASHBOARD_URL ?? 'http://localhost:3005'
+      }/api/traces`
+    })
+  )
+});
 
-  sdk.start();
-}
+sdk.start();

package/lib/cache.ts

@@ -31,8 +31,6 @@ export const CacheKey = {
     `category_${pk}_${encodeURIComponent(
       JSON.stringify(searchParams)
     )}${hashCacheKey(headers)}`,
-  Basket: (namespace?: string) => `basket${namespace ? `_${namespace}` : ''}`,
-  AllBaskets: () => 'all_baskets',
   CategorySlug: (slug: string) => `category_${slug}`,
   SpecialPage: (
     pk: number,

package/middlewares/checkout-provider.ts

@@ -64,7 +64,7 @@ const withCheckoutProvider =
           const location = request.headers.get('location');
           const redirectUrl = new URL(
             request.headers.get('location'),
-            location.startsWith('http') ? '' : process.env.NEXT_PUBLIC_URL
+            location.startsWith('http') ? '' : url.origin
           );
 
           redirectUrl.pathname = getUrlPathWithLocale(

package/middlewares/complete-gpay.ts

@@ -145,8 +145,7 @@ const withCompleteGpay =
       logger.info('Redirecting to order success page', {
         middleware: 'complete-gpay',
         redirectUrlWithLocale,
-        ip,
-        setCookie: request.headers.get('set-cookie')
+        ip
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/complete-masterpass.ts

@@ -145,8 +145,7 @@ const withCompleteMasterpass =
       logger.info('Redirecting to order success page', {
         middleware: 'complete-masterpass',
         redirectUrlWithLocale,
-        ip,
-        setCookie: request.headers.get('set-cookie')
+        ip
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/redirection-payment.ts

@@ -146,8 +146,7 @@ const withRedirectionPayment =
       logger.info('Redirecting to order success page', {
         middleware: 'redirection-payment',
         redirectUrlWithLocale,
-        ip,
-        setCookie: request.headers.get('set-cookie')
+        ip
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/saved-card-redirection.ts

@@ -145,8 +145,7 @@ const withSavedCardRedirection =
       logger.info('Redirecting to order success page', {
         middleware: 'saved-card-redirection',
         redirectUrlWithLocale,
-        ip,
-        setCookie: request.headers.get('set-cookie')
+        ip
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/three-d-redirection.ts

@@ -145,8 +145,7 @@ const withThreeDRedirection =
       logger.info('Redirecting to order success page', {
         middleware: 'three-d-redirection',
         redirectUrlWithLocale,
-        ip,
-        setCookie: request.headers.get('set-cookie')
+        ip
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/url-redirection.ts

@@ -4,7 +4,6 @@ import { PzNextRequest } from '.';
 import logger from '../utils/log';
 import { urlLocaleMatcherRegex } from '../utils';
 import { getUrlPathWithLocale } from '../utils/localization';
-import { shouldIgnoreRedirect } from '../utils/redirect-ignore';
 import { ROUTES } from 'routes';
 
 // This middleware is used to handle url redirections set in Omnitron
@@ -51,7 +50,7 @@ const withUrlRedirection =
         const location = request.headers.get('location');
         const redirectUrl = new URL(
           request.headers.get('location'),
-          location.startsWith('http') ? '' : process.env.NEXT_PUBLIC_URL
+          location.startsWith('http') ? '' : url.origin
         );
 
         redirectUrl.pathname = getUrlPathWithLocale(
@@ -61,13 +60,20 @@ const withUrlRedirection =
 
         const setCookies = request.headers.getSetCookie();
 
-        if (
-          shouldIgnoreRedirect(
-            url.pathname,
-            req.middlewareParams.rewrites.locale
-          )
-        ) {
-          return middleware(req, event);
+        if (settings.commerceRedirectionIgnoreList) {
+          const shouldIgnoreRedirect =
+            settings.commerceRedirectionIgnoreList.some((ignorePath) =>
+              redirectUrl.pathname.startsWith(
+                getUrlPathWithLocale(
+                  ignorePath,
+                  req.middlewareParams.rewrites.locale
+                )
+              )
+            );
+
+          if (shouldIgnoreRedirect) {
+            return middleware(req, event);
+          }
         }
 
         const response = NextResponse.redirect(redirectUrl.toString(), {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.89.0-rc.9",
+  "version": "1.89.0-snapshot-ZERO-3363-20250507092133",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -13,9 +13,6 @@
     "pz-predev": "bin/pz-predev.js",
     "pz-postdev": "bin/pz-postdev.js"
   },
-  "scripts": {
-    "test": "jest"
-  },
   "dependencies": {
     "@opentelemetry/exporter-trace-otlp-http": "0.46.0",
     "@opentelemetry/resources": "1.19.0",
@@ -23,7 +20,7 @@
     "@opentelemetry/sdk-trace-node": "1.19.0",
     "@opentelemetry/semantic-conventions": "1.19.0",
     "@reduxjs/toolkit": "1.9.7",
-    "@neshca/cache-handler": "1.9.0",
+    "@neshca/cache-handler": "1.5.1",
     "@sentry/nextjs": "9.5.0",
     "cross-spawn": "7.0.3",
     "generic-pool": "3.9.0",
@@ -34,21 +31,13 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.89.0-rc.9",
-    "@babel/core": "7.26.10",
-    "@babel/preset-env": "7.26.9",
-    "@babel/preset-typescript": "7.27.0",
-    "@types/jest": "29.5.14",
+    "@akinon/eslint-plugin-projectzero": "1.89.0-snapshot-ZERO-3363-20250507092133",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
     "@typescript-eslint/eslint-plugin": "6.7.4",
     "@typescript-eslint/parser": "6.7.4",
-    "babel-jest": "29.7.0",
     "eslint": "8.56.0",
     "eslint-config-next": "14.2.3",
-    "eslint-config-prettier": "8.5.0",
-    "jest": "29.7.0",
-    "ts-jest": "29.3.2",
-    "typescript": "5.2.2"
+    "eslint-config-prettier": "8.5.0"
   }
 }

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';
@@ -149,14 +148,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[];
@@ -95,7 +94,6 @@ const initialState: CheckoutState = {
   shippingOptions: [],
   dataSourceShippingOptions: [],
   paymentOptions: [],
-  unavailablePaymentOptions: [],
   creditPaymentOptions: [],
   selectedCreditPaymentPk: null,
   paymentChoices: [],
@@ -159,9 +157,6 @@ const checkoutSlice = createSlice({
     setPaymentOptions(state, { payload }) {
       state.paymentOptions = payload;
     },
-    setUnavailablePaymentOptions(state, { payload }) {
-      state.unavailablePaymentOptions = payload;
-    },
     setPaymentChoices(state, { payload }) {
       state.paymentChoices = payload;
     },
@@ -223,10 +218,9 @@ export const {
   setShippingOptions,
   setDataSourceShippingOptions,
   setPaymentOptions,
-  setUnavailablePaymentOptions,
-  setPaymentChoices,
   setCreditPaymentOptions,
   setSelectedCreditPaymentPk,
+  setPaymentChoices,
   setCardType,
   setInstallmentOptions,
   setBankAccounts,

package/types/commerce/order.ts

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

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 = {

package/utils/index.ts

@@ -1,6 +1,6 @@
 import settings from 'settings';
 import { LocaleUrlStrategy } from '../localization';
-import { CDNOptions, ClientRequestOptions } from '../types';
+import { CDNOptions, ClientRequestOptions, Locale } from '../types';
 
 export * from './get-currency';
 export * from './menu-generator';
@@ -155,15 +155,14 @@ export function buildCDNUrl(url: string, config?: CDNOptions) {
 const { locales, localeUrlStrategy, defaultLocaleValue } =
   settings.localization;
 
+const isLocaleExcluded = (locale: Locale) =>
+  ![LocaleUrlStrategy.ShowAllLocales, LocaleUrlStrategy.Subdomain].includes(
+    localeUrlStrategy
+  ) && locale.value !== defaultLocaleValue;
+
 export const urlLocaleMatcherRegex = new RegExp(
-  `^/(${settings.localization.locales
-    .filter((l) =>
-      ![LocaleUrlStrategy.ShowAllLocales, LocaleUrlStrategy.Subdomain].includes(
-        settings.localization.localeUrlStrategy
-      )
-        ? l.value !== settings.localization.defaultLocaleValue
-        : l
-    )
+  `^/(${locales
+    .filter((l) => !isLocaleExcluded(l))
     .map((l) => l.value)
     .join('|')})(?=/|$)`
 );

package/__tests__/next-config.test.ts

@@ -1,83 +0,0 @@
-import { resolve } from 'path';
-import type { NextConfig } from 'next';
-
-function findBaseDir() {
-  const insideNodeModules = __dirname.includes('node_modules');
-
-  if (insideNodeModules) {
-    return resolve(__dirname, '../../../../');
-  } else {
-    return resolve(__dirname, '../../../apps/projectzeronext');
-  }
-}
-
-const baseDir = findBaseDir();
-
-jest.mock('next-pwa', () => {
-  return () => (config: NextConfig) => config;
-});
-
-jest.mock('@sentry/nextjs', () => ({
-  withSentryConfig: (config: NextConfig) => config
-}));
-
-jest.mock('../with-pz-config.js', () => {
-  return (config: NextConfig) => {
-    const originalHeaders = config.headers;
-
-    config.headers = async () => {
-      const originalHeadersResult = (await originalHeaders?.()) ?? [];
-
-      return [
-        {
-          source: '/(.*)',
-          headers: [
-            {
-              key: 'Content-Security-Policy',
-              value: 'https://*.akifast.com akifast.com'
-            }
-          ]
-        },
-        ...originalHeadersResult
-      ];
-    };
-    return config;
-  };
-});
-
-interface Header {
-  key: string;
-  value: string;
-}
-
-interface HeaderGroup {
-  source: string;
-  headers: Header[];
-}
-
-const nextConfigPath = resolve(baseDir, 'next.config.mjs');
-let nextConfig: any;
-
-beforeAll(async () => {
-  nextConfig = await import(nextConfigPath);
-});
-
-describe('Next.js Configuration', () => {
-  it('should contain Content-Security-Policy header with akifast domain values', async () => {
-    const headers = nextConfig.default.headers;
-    expect(headers).toBeDefined();
-
-    const headersResult = await headers();
-
-    const cspHeaders = headersResult
-      .flatMap((headerGroup: HeaderGroup) => headerGroup.headers)
-      .filter((header: Header) => header.key === 'Content-Security-Policy');
-
-    expect(cspHeaders.length).toBeGreaterThan(0);
-
-    const lastCspHeader = cspHeaders[cspHeaders.length - 1];
-
-    expect(lastCspHeader.value).toContain('akifast.com');
-    expect(lastCspHeader.value).toContain('https://*.akifast.com');
-  });
-});

package/__tests__/tsconfig.json

@@ -1,23 +0,0 @@
-{
-  "$schema": "https://json.schemastore.org/tsconfig",
-  "display": "Default",
-  "compilerOptions": {
-    "composite": false,
-    "declaration": true,
-    "declarationMap": true,
-    "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true,
-    "inlineSources": false,
-    "isolatedModules": true,
-    "moduleResolution": "node",
-    "noUnusedLocals": false,
-    "noUnusedParameters": false,
-    "preserveWatchOutput": true,
-    "skipLibCheck": true,
-    "strict": true,
-    "jsx": "react-jsx",
-    "allowJs": true
-  },
-  "exclude": ["node_modules"],
-  "include": [".", "../."]
-}

package/babel.config.js

@@ -1,6 +0,0 @@
-module.exports = {
-  presets: [
-    ['@babel/preset-env', { targets: { node: 'current' } }],
-    '@babel/preset-typescript'
-  ]
-};

package/bin/pz-run-tests.js

@@ -1,99 +0,0 @@
-#!/usr/bin/env node
-
-const { spawn } = require('child_process');
-const path = require('path');
-const fs = require('fs');
-const glob = require('glob');
-const findBaseDir = require('../utils/find-base-dir');
-const checkMonorepo = require('../utils/check-monorepo');
-
-const IS_MONOREPO = checkMonorepo() !== null;
-const BASE_DIR = findBaseDir();
-const PLUGINS = require(path.join(BASE_DIR, 'src', 'plugins.js'));
-
-function findPluginTestFiles(akinonNextPackagePath) {
-  const pluginsRootPath = path.join(
-    akinonNextPackagePath,
-    '..',
-    '..',
-    IS_MONOREPO ? 'packages' : '@akinon'
-  );
-
-  if (!fs.existsSync(pluginsRootPath)) {
-    console.log('Plugins directory not found:', pluginsRootPath);
-    return [];
-  }
-
-  return PLUGINS.reduce((testFiles, pluginName) => {
-    const pluginDirectoryPath = path.join(pluginsRootPath, pluginName);
-    if (fs.existsSync(pluginDirectoryPath)) {
-      const pluginTestFiles = glob.sync('**/*.test.ts', {
-        cwd: pluginDirectoryPath,
-        absolute: true
-      });
-
-      return testFiles.concat(pluginTestFiles);
-    } else {
-      console.log(`Plugin directory not found: ${pluginName}`);
-    }
-    return testFiles;
-  }, []);
-}
-
-function isJestInstalled() {
-  try {
-    const jestExecutablePath = path.join(
-      BASE_DIR,
-      'node_modules',
-      '.bin',
-      'jest'
-    );
-    return fs.existsSync(jestExecutablePath);
-  } catch (error) {
-    return false;
-  }
-}
-
-function getAkinonNextPackagePath() {
-  if (!IS_MONOREPO) {
-    return path.resolve(__dirname, '..');
-  }
-
-  return path.resolve(__dirname, '../../../packages/akinon-next');
-}
-
-if (!isJestInstalled()) {
-  console.error('\x1b[31mError: Jest is not installed in the project!\x1b[0m');
-  console.error(
-    'Please install all dependencies by running one of the following commands:'
-  );
-  console.error('  npm install');
-  console.error('  yarn install');
-  process.exit(1);
-}
-
-const jestExecutablePath = path.join(BASE_DIR, 'node_modules', '.bin', 'jest');
-const akinonNextPackagePath = getAkinonNextPackagePath();
-
-const testFiles = [
-  ...glob.sync('__tests__/**/*.test.ts', {
-    cwd: akinonNextPackagePath,
-    absolute: true
-  }),
-  ...findPluginTestFiles(akinonNextPackagePath)
-];
-
-console.log(`Found ${testFiles.length} test files to run`);
-
-const jestArguments = [
-  ...testFiles,
-  `--config ${path.join(akinonNextPackagePath, 'jest.config.js')}`,
-  '--runTestsByPath',
-  '--passWithNoTests'
-];
-
-spawn(jestExecutablePath, jestArguments, {
-  cwd: akinonNextPackagePath,
-  stdio: 'inherit',
-  shell: true
-});