@akinon/next 1.89.0-rc.1 → 1.89.0-rc.10

package/CHANGELOG.md

@@ -1,5 +1,129 @@
 # @akinon/next
 
+## 1.89.0-rc.10
+
+### Minor Changes
+
+- 5dfeea04: ZERO-2801: Revert ZERO-2801
+- 63774a6: ZERO-3351: Add commerce redirection ignore list functionality and related utility
+- 2d9b2b2c: ZERO-2816: Add segment to headers
+- 5e1feca6: Revert "ZERO-3286: Add notFound handling for chunk URLs starting with \_next"
+- d8fad39: ZERO-3370: include plugins test to build stage
+- 40a46853: ZERO-3182: Optimize basket update mutation with optimistic update
+- f49bb74f: ZERO-3097: Add setCookie to logging in payment redirection middlewares
+- e9541a13: ZERO-2816: Add headers to url
+- 72fd4d67: ZERO-3084: Fix URL search parameters encoding in default middleware
+- c53ef7b9: ZERO-2668: The Link component has been updated to improve the logic for handling href values. Previously, if the href was not a string or started with 'http', it would return the href as is. Now, if the href is not provided, it will default to '#' to prevent any potential errors. Additionally, if the href is a string and does not start with 'http', it will be formatted with the locale and pathname, based on the localeUrlStrategy and defaultLocaleValue. This ensures that the correct href is generated based on the localization settings.
+- 64699d3f: ZERO-2761: Fix invalid import for plugin module
+- bf354de: ZERO-3321: add babel compiler for akinon/next test
+- 7727ae55: ZERO-3073: Refactor basket page to use server-side data fetching and simplify component structure
+- d552629f: ZERO-3182: Refactor basketApi to use invalidatesTags and comment out onQueryStarted logic
+- 448adef: ZERO-3321: move csp test to akinon-next
+- 17f87524: ZERO-2816: Make the incoming currency lowercase
+- 65d3b862: ZERO-3054: Update headers in appFetch
+- bbe18b9f: ZERO-2575: Fix build error
+- 17bfadc4: ZERO-3275: Disable OpenTelemetry monitoring in production environment
+- 4920742c: Disable getCachedTranslations
+- b6e5b624: ZERO-3257: Enhance locale middleware to redirect using existing or default locale and support 303 status for POST requests
+- 6c3629c: ZERO-3321: fix jest tests in akinon-next for standalone projects
+- 7e56d6b6: ZERO-2841: Update api tagTypes
+- dfaceff: ZERO-3356: Add useLoyaltyAvailability hook and update checkout state management
+- 33377cfd: ZERO-3267: Refactor import statement for ROUTES in error-page component
+- 43c182ee: ZERO-3054: Update Redis variable checks to conditionally include CACHE_SECRET
+- 943a239: ZERO-3370: add allowJs in akinon-next test tsconfig
+- eeb20bea: Revert "ZERO-3054: Refactor cache handler to use custom Redis handler and implement key hashing"
+- 3bf63c8a: ZERO-3286: Add notFound handling for chunk URLs starting with \_next
+- 9be2c081: ZERO-3243: Improve basket update query handling with optimistic updates
+- f2c92d5c: ZERO-2816: Update cookie name
+- 7bd3d992: ZERO-2801: Refactor locale middleware to handle single locale configuration
+- fdd255ee: ZERO-3054: Refactor cache handler to use custom Redis handler and implement key hashing
+- acf0320: ZERO-3321: remove babel config
+- 387356b: ZERO-3323: Refactor locale filtering logic in URL matcher regex
+- 49eeebfa: ZERO-2909: Add deleteCollectionItem query to wishlistApi
+- 3f9b8d7e: ZERO-2761: Update plugins.js for akinon-next
+- b2ee69b: ZERO-3321: delete unnecessary files
+- 0cabbda: ZERO-3370: replace inline monorepo check with reusable utility
+
+## 1.89.0-rc.9
+
+### Minor Changes
+
+- 5dfeea04: ZERO-2801: Revert ZERO-2801
+- 63774a6: ZERO-3351: Add commerce redirection ignore list functionality and related utility
+- 2d9b2b2c: ZERO-2816: Add segment to headers
+- 5e1feca6: Revert "ZERO-3286: Add notFound handling for chunk URLs starting with \_next"
+- d8fad39: ZERO-3370: include plugins test to build stage
+- 40a46853: ZERO-3182: Optimize basket update mutation with optimistic update
+- f49bb74f: ZERO-3097: Add setCookie to logging in payment redirection middlewares
+- e9541a13: ZERO-2816: Add headers to url
+- 72fd4d67: ZERO-3084: Fix URL search parameters encoding in default middleware
+- c53ef7b9: ZERO-2668: The Link component has been updated to improve the logic for handling href values. Previously, if the href was not a string or started with 'http', it would return the href as is. Now, if the href is not provided, it will default to '#' to prevent any potential errors. Additionally, if the href is a string and does not start with 'http', it will be formatted with the locale and pathname, based on the localeUrlStrategy and defaultLocaleValue. This ensures that the correct href is generated based on the localization settings.
+- 64699d3f: ZERO-2761: Fix invalid import for plugin module
+- bf354de: ZERO-3321: add babel compiler for akinon/next test
+- 7727ae55: ZERO-3073: Refactor basket page to use server-side data fetching and simplify component structure
+- d552629f: ZERO-3182: Refactor basketApi to use invalidatesTags and comment out onQueryStarted logic
+- 448adef: ZERO-3321: move csp test to akinon-next
+- 17f87524: ZERO-2816: Make the incoming currency lowercase
+- 65d3b862: ZERO-3054: Update headers in appFetch
+- bbe18b9f: ZERO-2575: Fix build error
+- 17bfadc4: ZERO-3275: Disable OpenTelemetry monitoring in production environment
+- 4920742c: Disable getCachedTranslations
+- b6e5b624: ZERO-3257: Enhance locale middleware to redirect using existing or default locale and support 303 status for POST requests
+- 6c3629c: ZERO-3321: fix jest tests in akinon-next for standalone projects
+- 7e56d6b6: ZERO-2841: Update api tagTypes
+- dfaceff: ZERO-3356: Add useLoyaltyAvailability hook and update checkout state management
+- 33377cfd: ZERO-3267: Refactor import statement for ROUTES in error-page component
+- 43c182ee: ZERO-3054: Update Redis variable checks to conditionally include CACHE_SECRET
+- 943a239: ZERO-3370: add allowJs in akinon-next test tsconfig
+- eeb20bea: Revert "ZERO-3054: Refactor cache handler to use custom Redis handler and implement key hashing"
+- 3bf63c8a: ZERO-3286: Add notFound handling for chunk URLs starting with \_next
+- 9be2c081: ZERO-3243: Improve basket update query handling with optimistic updates
+- f2c92d5c: ZERO-2816: Update cookie name
+- 7bd3d992: ZERO-2801: Refactor locale middleware to handle single locale configuration
+- fdd255ee: ZERO-3054: Refactor cache handler to use custom Redis handler and implement key hashing
+- acf0320: ZERO-3321: remove babel config
+- 387356b: ZERO-3323: Refactor locale filtering logic in URL matcher regex
+- 49eeebfa: ZERO-2909: Add deleteCollectionItem query to wishlistApi
+- 3f9b8d7e: ZERO-2761: Update plugins.js for akinon-next
+- b2ee69b: ZERO-3321: delete unnecessary files
+- 0cabbda: ZERO-3370: replace inline monorepo check with reusable utility
+
+## 1.89.0-rc.8
+
+### Minor Changes
+
+- d8fad39: ZERO-3370: include plugins test to build stage
+- 943a239: ZERO-3370: add allowJs in akinon-next test tsconfig
+- 0cabbda: ZERO-3370: replace inline monorepo check with reusable utility
+
+## 1.89.0-rc.7
+
+### Minor Changes
+
+- dfaceff: ZERO-3356: Add useLoyaltyAvailability hook and update checkout state management
+
+## 1.89.0-rc.6
+
+## 1.89.0-rc.5
+
+## 1.89.0-rc.4
+
+### Minor Changes
+
+- bf354de: ZERO-3321: add babel compiler for akinon/next test
+- 448adef: ZERO-3321: move csp test to akinon-next
+- 6c3629c: ZERO-3321: fix jest tests in akinon-next for standalone projects
+- acf0320: ZERO-3321: remove babel config
+- b2ee69b: ZERO-3321: delete unnecessary files
+
+## 1.89.0-rc.3
+
+### Minor Changes
+
+- 63774a6: ZERO-3351: Add commerce redirection ignore list functionality and related utility
+
+## 1.89.0-rc.2
+
 ## 1.89.0-rc.1
 
 ## 1.89.0-rc.0

package/__tests__/next-config.test.ts

@@ -0,0 +1,83 @@
+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

@@ -0,0 +1,23 @@
+{
+  "$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

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

package/bin/pz-prebuild.js

@@ -2,6 +2,7 @@
 
 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/bin/pz-run-tests.js

@@ -0,0 +1,99 @@
+#!/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
+});

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/hooks/use-loyalty-availability.ts

@@ -0,0 +1,21 @@
+import { useAppSelector } from '../redux/hooks';
+
+export const useLoyaltyAvailability = () => {
+  const { paymentOptions, unavailablePaymentOptions } = useAppSelector(
+    (state) => state.checkout
+  );
+
+  const hasLoyaltyInAvailable = paymentOptions.some(
+    (option) =>
+      option.payment_type === 'loyalty_money' ||
+      option.payment_type === 'loyalty'
+  );
+
+  const hasLoyaltyInUnavailable = unavailablePaymentOptions.some(
+    (option) =>
+      option.payment_type === 'loyalty_money' ||
+      option.payment_type === 'loyalty'
+  );
+
+  return hasLoyaltyInAvailable || hasLoyaltyInUnavailable;
+};

package/jest.config.js

@@ -0,0 +1,19 @@
+const path = require('path');
+
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  rootDir: path.resolve(__dirname),
+  roots: [],
+  testMatch: ['**/*.test.ts'],
+  testPathIgnorePatterns: [],
+  transformIgnorePatterns: [],
+  transform: {
+    '^.+\\.(tsx?|jsx?|mjs?)$': [
+      'ts-jest',
+      {
+        tsconfig: path.resolve(__dirname, '__tests__/tsconfig.json')
+      }
+    ]
+  }
+};

package/middlewares/url-redirection.ts

@@ -4,6 +4,7 @@ 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
@@ -60,20 +61,13 @@ const withUrlRedirection =
 
         const setCookies = request.headers.getSetCookie();
 
-        if (settings.commerceRedirectionIgnoreList) {
-          const shouldIgnoreRedirect =
-            settings.commerceRedirectionIgnoreList.some((ignorePath) =>
-              redirectUrl.pathname.startsWith(
-                getUrlPathWithLocale(
-                  ignorePath,
-                  req.middlewareParams.rewrites.locale
-                )
-              )
-            );
-
-          if (shouldIgnoreRedirect) {
-            return middleware(req, event);
-          }
+        if (
+          shouldIgnoreRedirect(
+            url.pathname,
+            req.middlewareParams.rewrites.locale
+          )
+        ) {
+          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.1",
+  "version": "1.89.0-rc.10",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -13,6 +13,9 @@
     "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",
@@ -31,13 +34,21 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.89.0-rc.1",
+    "@akinon/eslint-plugin-projectzero": "1.89.0-rc.10",
+    "@babel/core": "7.26.10",
+    "@babel/preset-env": "7.26.9",
+    "@babel/preset-typescript": "7.27.0",
+    "@types/jest": "29.5.14",
     "@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"
+    "eslint-config-prettier": "8.5.0",
+    "jest": "29.7.0",
+    "ts-jest": "29.3.2",
+    "typescript": "5.2.2"
   }
 }

package/redux/middlewares/checkout.ts

@@ -20,7 +20,8 @@ import {
   setShippingOptions,
   setHepsipayAvailability,
   setWalletPaymentData,
-  setPayOnDeliveryOtpModalActive
+  setPayOnDeliveryOtpModalActive,
+  setUnavailablePaymentOptions
 } from '../../redux/reducers/checkout';
 import { RootState, TypedDispatch } from 'redux/store';
 import { checkoutApi } from '../../data/client/checkout';
@@ -148,6 +149,14 @@ 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,6 +40,7 @@ export interface CheckoutState {
   shippingOptions: ShippingOption[];
   dataSourceShippingOptions: DataSource[];
   paymentOptions: PaymentOption[];
+  unavailablePaymentOptions: PaymentOption[];
   creditPaymentOptions: CheckoutCreditPaymentOption[];
   selectedCreditPaymentPk: number;
   paymentChoices: PaymentChoice[];
@@ -94,6 +95,7 @@ const initialState: CheckoutState = {
   shippingOptions: [],
   dataSourceShippingOptions: [],
   paymentOptions: [],
+  unavailablePaymentOptions: [],
   creditPaymentOptions: [],
   selectedCreditPaymentPk: null,
   paymentChoices: [],
@@ -157,6 +159,9 @@ const checkoutSlice = createSlice({
     setPaymentOptions(state, { payload }) {
       state.paymentOptions = payload;
     },
+    setUnavailablePaymentOptions(state, { payload }) {
+      state.unavailablePaymentOptions = payload;
+    },
     setPaymentChoices(state, { payload }) {
       state.paymentChoices = payload;
     },
@@ -218,9 +223,10 @@ export const {
   setShippingOptions,
   setDataSourceShippingOptions,
   setPaymentOptions,
+  setUnavailablePaymentOptions,
+  setPaymentChoices,
   setCreditPaymentOptions,
   setSelectedCreditPaymentPk,
-  setPaymentChoices,
   setCardType,
   setInstallmentOptions,
   setBankAccounts,

package/utils/redirect-ignore.ts

@@ -0,0 +1,35 @@
+import settings from 'settings';
+import { getUrlPathWithLocale } from './localization';
+
+type IgnorePath = string | RegExp;
+
+const defaultIgnoreList: string[] = [];
+
+const extraIgnores: IgnorePath[] = Array.isArray(
+  settings.commerceRedirectionIgnoreList
+)
+  ? settings.commerceRedirectionIgnoreList.map((path) => {
+      if (path === '/users/reset') {
+        return /^\/users\/reset\/[^/]+\/[^/]+\/$/;
+      }
+      return path;
+    })
+  : [];
+
+export function shouldIgnoreRedirect(
+  pathname: string,
+  locale: string
+): boolean {
+  if (!pathname) return false;
+
+  const rawIgnoreList: IgnorePath[] = [...defaultIgnoreList, ...extraIgnores];
+
+  return rawIgnoreList.some((ignorePath) => {
+    if (ignorePath instanceof RegExp) {
+      return ignorePath.test(pathname);
+    }
+
+    const localized = getUrlPathWithLocale(ignorePath, locale);
+    return localized === pathname;
+  });
+}