@akinon/next 2.0.10-rc.0 → 2.0.11-beta.0

package/redux/middlewares/checkout.ts

@@ -26,28 +26,13 @@ import {
 } from '../../redux/reducers/checkout';
 import { RootState, TypedDispatch } from 'redux/store';
 import { checkoutApi } from '../../data/client/checkout';
-import { CheckoutContext, MiddlewareAction, PreOrder } from '../../types';
+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 +69,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 +99,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 +134,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();
@@ -232,34 +209,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/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;
   redis: {
     defaultExpirationTime: number;
   };
@@ -223,7 +217,6 @@ export interface Settings {
     separator?: string;
     segments: PzSegmentDefinition[];
   };
-  payloadOptimization?: import('../utils/payload-optimizer').PayloadOptimizationConfig;
 }
 
 export interface CacheOptions {

package/with-pz-config.js

@@ -69,8 +69,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/bin/pz-migrate-eslint.js

@@ -1,6 +0,0 @@
-#!/usr/bin/env node
-
-const path = require('path');
-const { migrate } = require(path.join(__dirname, '..', 'codemods', 'migrate-eslint-flat'));
-
-migrate(process.argv[2]);

package/codemods/migrate-eslint-flat.js

@@ -1,247 +0,0 @@
-/**
- * ESLint flat config migration codemod.
- *
- * Converts a brand project from legacy `.eslintrc.js` to ESLint v9 flat config
- * (`eslint.config.mjs`), consuming the shared base from
- * `@akinon/next/eslint.config.base.mjs`.
- *
- * Idempotent: re-running on an already migrated project is a no-op for
- * already-applied steps.
- *
- * Steps:
- *   1. Read .eslintrc.js (if present) to detect brand-specific settings
- *      (settings.next.rootDir, custom rules).
- *   2. Read .eslintignore (if present) to collect ignore patterns.
- *   3. Write eslint.config.mjs (skipped if already exists).
- *   4. Delete .eslintrc.js and .eslintignore.
- *   5. Rewrite .lintstagedrc.js to use `eslint --fix` instead of `next lint`.
- *   6. Patch package.json:
- *      - scripts.lint: "next lint" -> "eslint ."
- *      - eslint: ^8.x -> ^9.39.4
- *      - eslint-config-prettier: ^8.x -> ^10.1.1
- *      - remove @typescript-eslint/eslint-plugin and @typescript-eslint/parser
- *        (now provided by eslint-config-next/typescript).
- */
-
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-
-const ESLINT_TARGET = '9.39.4';
-const ESLINT_CONFIG_PRETTIER_TARGET = '10.1.1';
-const TYPESCRIPT_ESLINT_DROP = [
-  '@typescript-eslint/eslint-plugin',
-  '@typescript-eslint/parser'
-];
-
-function buildFlatConfig({ rootDir, ignores, customRules }) {
-  const lines = [
-    "import { defineConfig, globalIgnores } from 'eslint/config';",
-    "import baseConfig from '@akinon/next/eslint.config.base.mjs';",
-    '',
-    'export default defineConfig([',
-    '  ...baseConfig'
-  ];
-
-  if (rootDir) {
-    lines[lines.length - 1] += ',';
-    lines.push(
-      '  {',
-      '    settings: {',
-      '      next: {',
-      `        rootDir: ${JSON.stringify(rootDir)}`,
-      '      }',
-      '    }',
-      '  }'
-    );
-  }
-
-  if (customRules) {
-    lines[lines.length - 1] += ',';
-    const indented = JSON.stringify(customRules, null, 2)
-      .split('\n')
-      .map((l, i) => (i === 0 ? '    rules: ' + l : '    ' + l))
-      .join('\n');
-    lines.push('  {', indented, '  }');
-  }
-
-  if (ignores && ignores.length) {
-    lines[lines.length - 1] += ',';
-    lines.push(`  globalIgnores(${JSON.stringify(ignores)})`);
-  }
-
-  lines.push(']);', '');
-
-  return lines.join('\n');
-}
-
-const LINT_STAGED_TEMPLATE = `const path = require('path');
-
-const buildEslintCommand = (filenames) =>
-  \`eslint --fix \${filenames
-    .map((f) => \`"\${path.relative(process.cwd(), f)}"\`)
-    .join(' ')}\`;
-
-module.exports = {
-  '**/*.(ts|tsx)': () => 'yarn tsc --noEmit',
-  '*.{js,jsx,ts,tsx}': [buildEslintCommand, 'prettier --write'],
-  '*.{css,scss}': [
-    'stylelint --fix --allow-empty-input',
-    'prettier --write',
-    'stylelint --allow-empty-input'
-  ]
-};
-`;
-
-function loadLegacyConfig(eslintrcPath) {
-  try {
-    delete require.cache[require.resolve(eslintrcPath)];
-    return require(eslintrcPath);
-  } catch (err) {
-    return { __parseError: err.message };
-  }
-}
-
-function readIgnoreFile(eslintignorePath) {
-  if (!fs.existsSync(eslintignorePath)) return [];
-  const raw = fs.readFileSync(eslintignorePath, 'utf8');
-  return raw
-    .split(/\r?\n/)
-    .map((line) => line.trim())
-    .filter((line) => line && !line.startsWith('#'))
-    .map((pattern) => (pattern.endsWith('/**') ? pattern : pattern + '/**'));
-}
-
-function patchPackageJson(pkgPath) {
-  const raw = fs.readFileSync(pkgPath, 'utf8');
-  const pkg = JSON.parse(raw);
-  const changes = [];
-
-  if (pkg.scripts && typeof pkg.scripts.lint === 'string') {
-    if (/^next\s+lint\b/.test(pkg.scripts.lint.trim())) {
-      pkg.scripts.lint = 'eslint .';
-      changes.push('scripts.lint -> "eslint ."');
-    }
-  }
-
-  const bumpDev = (name, target) => {
-    if (!pkg.devDependencies || !pkg.devDependencies[name]) return;
-    const current = pkg.devDependencies[name].replace(/^\^|^~/, '');
-    if (current === target) return;
-    pkg.devDependencies[name] = target;
-    changes.push(`devDependencies.${name} ${current} -> ${target}`);
-  };
-
-  bumpDev('eslint', ESLINT_TARGET);
-  bumpDev('eslint-config-prettier', ESLINT_CONFIG_PRETTIER_TARGET);
-
-  for (const dep of TYPESCRIPT_ESLINT_DROP) {
-    if (pkg.devDependencies && pkg.devDependencies[dep]) {
-      delete pkg.devDependencies[dep];
-      changes.push(`removed devDependencies.${dep}`);
-    }
-  }
-
-  if (changes.length === 0) return { changed: false, changes };
-
-  fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n', 'utf8');
-  return { changed: true, changes };
-}
-
-function migrate(projectRoot) {
-  const root = path.resolve(projectRoot || process.cwd());
-  const eslintrcPath = path.join(root, '.eslintrc.js');
-  const eslintignorePath = path.join(root, '.eslintignore');
-  const flatConfigPath = path.join(root, 'eslint.config.mjs');
-  const lintStagedPath = path.join(root, '.lintstagedrc.js');
-  const packageJsonPath = path.join(root, 'package.json');
-
-  if (!fs.existsSync(packageJsonPath)) {
-    console.error(`[migrate-eslint-flat] No package.json found in ${root}`);
-    process.exit(1);
-  }
-
-  console.log(`[migrate-eslint-flat] Project root: ${root}`);
-  const summary = [];
-
-  const legacyConfig = fs.existsSync(eslintrcPath)
-    ? loadLegacyConfig(eslintrcPath)
-    : null;
-
-  if (legacyConfig && legacyConfig.__parseError) {
-    console.warn(
-      `[migrate-eslint-flat] Could not parse .eslintrc.js: ${legacyConfig.__parseError}`
-    );
-    console.warn('Continuing with default brand-template settings.');
-  }
-
-  const rootDir = legacyConfig?.settings?.next?.rootDir;
-  const customRules =
-    legacyConfig && legacyConfig.rules && Object.keys(legacyConfig.rules).length
-      ? legacyConfig.rules
-      : null;
-
-  let ignores = readIgnoreFile(eslintignorePath);
-  if (ignores.length === 0) ignores = ['public/**'];
-
-  if (!fs.existsSync(flatConfigPath)) {
-    fs.writeFileSync(
-      flatConfigPath,
-      buildFlatConfig({ rootDir, ignores, customRules }),
-      'utf8'
-    );
-    summary.push('created eslint.config.mjs');
-  } else {
-    summary.push('eslint.config.mjs already exists (skipped)');
-  }
-
-  if (fs.existsSync(eslintrcPath)) {
-    fs.unlinkSync(eslintrcPath);
-    summary.push('removed .eslintrc.js');
-  }
-
-  if (fs.existsSync(eslintignorePath)) {
-    fs.unlinkSync(eslintignorePath);
-    summary.push('removed .eslintignore');
-  }
-
-  if (fs.existsSync(lintStagedPath)) {
-    const before = fs.readFileSync(lintStagedPath, 'utf8');
-    if (before !== LINT_STAGED_TEMPLATE) {
-      fs.writeFileSync(lintStagedPath, LINT_STAGED_TEMPLATE, 'utf8');
-      summary.push('rewrote .lintstagedrc.js');
-    } else {
-      summary.push('.lintstagedrc.js already up to date (skipped)');
-    }
-  }
-
-  const pkgResult = patchPackageJson(packageJsonPath);
-  if (pkgResult.changed) {
-    summary.push(`patched package.json (${pkgResult.changes.join(', ')})`);
-  } else {
-    summary.push('package.json already up to date (skipped)');
-  }
-
-  console.log('\nESLint flat config migration summary:');
-  for (const line of summary) console.log(`  - ${line}`);
-
-  if (customRules) {
-    console.log(
-      `\nNote: ${Object.keys(customRules).length} custom rule(s) from the old ` +
-        '.eslintrc.js were carried over into eslint.config.mjs.\nReview if ' +
-        'they are still needed (some may already be covered by the base config).'
-    );
-  }
-
-  console.log('\nNext steps:');
-  console.log('  1. yarn install');
-  console.log('  2. yarn lint   # expect 0 errors (warnings ok)');
-  console.log('  3. yarn build  # smoke test');
-}
-
-if (require.main === module) {
-  migrate(process.argv[2]);
-}
-
-module.exports = { migrate };