@akinon/next 2.0.8-rc.0 → 2.0.9-beta.0

package/CHANGELOG.md

@@ -1,30 +1,16 @@
 # @akinon/next
 
-## 2.0.8-rc.0
+## 2.0.9-beta.0
 
 ### Patch Changes
 
-- 0cf9ea23: BRDG-16491: Prevent redirect when iframe payment is active
-- 324f97d5: ZERO-4219: replace masterpass-rest-complete with masterpass-rest-callback
-- 51ea0688: ZERO-4377: Fix checkout card type state being cleared after valid bin number responses.
-- ZERO-4160: Enhance oauth-login middleware with improved request handling and logging
-- b55acb768: ZERO-2577: Fix pagination bug and update usePagination hook and ensure pagination controls rendering correctly
-- 760258c1: ZERO-4160: Enhance oauth-login middleware to handle fetch errors and improve response handling
-- 143be2b9: ZERO-3457: Crop styles are customizable and logic improved for rendering similar products modal
-- 7889b08f: ZERO-4276: Enhance route generation by adding .env loading and custom skip segments support
-- 9f8cd3bc5: ZERO-3449: AI Search Active Filters & Crop Style changes have been implemented
-- bfafa3f4: ZERO-4160: Refactor oauth-login middleware to use fetchCommerce for API calls and improve cookie handling
-- 57d7eb30: ZERO-4276: Refactor route generation logic by removing environment loading and simplifying skip segments handling
-- d99a6a7d: ZERO-3457_1: Fixed the settings prop and made sure everything is customizable.
-- 9db81a71: ZERO-4365: Remove brand `@theme/*` alias imports from library packages
-- 591e345e: ZERO-3855: Enhance credit card payment handling in checkout middlewares
-- 4de5303c5: ZERO-2504: add cookie filter to api client request
-- 95b139dc: ZERO-3795: Remove duplicate entry for SavedCard in PluginComponents map
-- 1d00f2d0: BRDG-16664: Set secure flag for CSRF token cookies in useCaptcha and default middleware
-- 4ac7b2a1: ZERO-4219: fix masterpass-rest callback route format and double-encoded error cookie
-- 4998a963: ZERO-4168: Add server-side payload optimization
-- 3909d322: Edit the duplicate Plugin.SimilarProducts in the plugin-module.
-- e18836b2: ZERO-4160: Restore scope in Sentry addon configuration in akinon.json
+- cbbbfd75: ZERO-4376: Bootstrap beta cycle (next-main pre-release motor)
+
+## 2.0.8
+
+### Patch Changes
+
+- ef867189: ZERO-4437: Add ESLint flat config migration codemod (pz-migrate-eslint)
 
 ## 2.0.7
 

package/bin/pz-generate-routes.js

@@ -6,7 +6,6 @@ const findBaseDir = require('../utils/find-base-dir');
 
 const generateRoutes = () => {
   const baseDir = findBaseDir();
-
   const srcDir = path.join(baseDir, 'src');
   const appDir = path.join(srcDir, 'app');
 
@@ -35,10 +34,8 @@ const generateRoutes = () => {
     '[segment]',
     '[url]',
     '[theme]',
-    '[member_type]',
-    '[clienttype]'
+    '[member_type]'
   ];
-
   const skipCatchAllRoutes = ['[...prettyurl]', '[...not_found]'];
 
   const walkDirectory = (dir, basePath = '') => {

package/bin/pz-migrate-eslint.js

@@ -0,0 +1,6 @@
+#!/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

@@ -0,0 +1,247 @@
+/**
+ * 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 };

package/components/plugin-module.tsx

@@ -116,6 +116,7 @@ const PluginComponents = new Map([
     ]
   ],
   [Plugin.SavedCard, [Component.SavedCard, Component.IyzicoSavedCard]],
+  [Plugin.SavedCard, [Component.SavedCard]],
   [Plugin.FlowPayment, [Component.FlowPayment]],
   [
     Plugin.VirtualTryOn,

package/data/client/checkout.ts

@@ -738,6 +738,7 @@ export const checkoutApi = api.injectEndpoints({
       },
       async onQueryStarted(arg, { dispatch, queryFulfilled }) {
         dispatch(setPaymentStepBusy(true));
+        dispatch(setCardType(arg));
         await queryFulfilled;
         dispatch(setPaymentStepBusy(false));
       }

package/data/server/category.ts

@@ -7,8 +7,6 @@ import { parse } from 'lossless-json';
 import logger from '../../utils/log';
 import { headers as nHeaders } from 'next/headers';
 import { ServerVariables } from '../../utils/server-variables';
-import { optimizeCategoryResponse } from '../../utils/payload-optimizer';
-import settings from 'settings';
 
 function getCategoryDataHandler(
   pk: number,
@@ -82,7 +80,7 @@ function getCategoryDataHandler(
   };
 }
 
-export const getCategoryData = async ({
+export const getCategoryData = ({
   pk,
   searchParams,
   headers,
@@ -95,7 +93,7 @@ export const getCategoryData = async ({
   searchParams?: SearchParams;
   headers?: Record<string, string>;
 }) => {
-  const result = await Cache.wrap(
+  return Cache.wrap(
     CacheKey.Category(pk, searchParams, headers),
     locale,
     getCategoryDataHandler(pk, locale, currency, searchParams, headers),
@@ -104,16 +102,6 @@ export const getCategoryData = async ({
       compressed: true
     }
   );
-
-  if (settings.payloadOptimization?.enabled && result?.data) {
-    try {
-      return { ...result, data: optimizeCategoryResponse(result.data, settings.payloadOptimization) };
-    } catch (e) {
-      logger.error('Payload optimization failed for category', { pk, error: (e as Error).message });
-    }
-  }
-
-  return result;
 };
 
 function getCategoryBySlugDataHandler(

package/data/server/list.ts

@@ -6,8 +6,6 @@ import appFetch, { FetchResponseType } from '../../utils/app-fetch';
 import { parse } from 'lossless-json';
 import logger from '../../utils/log';
 import { ServerVariables } from '../../utils/server-variables';
-import { optimizeCategoryResponse } from '../../utils/payload-optimizer';
-import settings from 'settings';
 
 const getListDataHandler = (
   locale,
@@ -68,7 +66,7 @@ export const getListData = async ({
   searchParams: SearchParams;
   headers?: Record<string, string>;
 }) => {
-  const result = await Cache.wrap(
+  return Cache.wrap(
     CacheKey.List(searchParams, headers),
     locale,
     getListDataHandler(locale, currency, searchParams, headers),
@@ -77,14 +75,4 @@ export const getListData = async ({
       compressed: true
     }
   );
-
-  if (settings.payloadOptimization?.enabled && result) {
-    try {
-      return optimizeCategoryResponse(result, settings.payloadOptimization);
-    } catch (e) {
-      logger.error('Payload optimization failed for list', { error: (e as Error).message });
-    }
-  }
-
-  return result;
 };

package/data/server/product.ts

@@ -4,8 +4,6 @@ import { ProductCategoryResult, ProductResult, SearchParams } from '../../types'
 import appFetch from '../../utils/app-fetch';
 import { ServerVariables } from '../../utils/server-variables';
 import logger from '../../utils/log';
-import { optimizeProductResponse } from '../../utils/payload-optimizer';
-import settings from 'settings';
 
 type GetProduct = {
   pk: number | string;
@@ -165,13 +163,5 @@ export const getProductData = async ({
     throw error;
   }
 
-  if (settings.payloadOptimization?.enabled && result?.data) {
-    try {
-      return { ...result, data: optimizeProductResponse(result.data, settings.payloadOptimization) };
-    } catch (e) {
-      logger.error('Payload optimization failed for product', { pk, error: (e as Error).message });
-    }
-  }
-
   return result;
 };

package/data/server/special-page.ts

@@ -4,9 +4,6 @@ import { GetCategoryResponse, SearchParams } from '../../types';
 import { generateCommerceSearchParams } from '../../utils';
 import appFetch from '../../utils/app-fetch';
 import { ServerVariables } from '../../utils/server-variables';
-import { optimizeCategoryResponse } from '../../utils/payload-optimizer';
-import logger from '../../utils/log';
-import settings from 'settings';
 
 const getSpecialPageDataHandler = (
   pk: number,
@@ -48,7 +45,7 @@ export const getSpecialPageData = async ({
   searchParams: SearchParams;
   headers?: Record<string, string>;
 }) => {
-  const result = await Cache.wrap(
+  return Cache.wrap(
     CacheKey.SpecialPage(pk, searchParams, headers),
     locale,
     getSpecialPageDataHandler(pk, locale, currency, searchParams, headers),
@@ -57,14 +54,4 @@ export const getSpecialPageData = async ({
       compressed: true
     }
   );
-
-  if (settings.payloadOptimization?.enabled && result) {
-    try {
-      return optimizeCategoryResponse(result, settings.payloadOptimization);
-    } catch (e) {
-      logger.error('Payload optimization failed for special-page', { pk, error: (e as Error).message });
-    }
-  }
-
-  return result;
 };

package/data/server/widget.ts

@@ -4,9 +4,6 @@ import { CacheOptions, WidgetResultType, WidgetSchemaType } from '../../types';
 import appFetch from '../../utils/app-fetch';
 import { widgets } from '../urls';
 import { ServerVariables } from '../../utils/server-variables';
-import { optimizeWidgetResponse } from '../../utils/payload-optimizer';
-import logger from '../../utils/log';
-import settings from 'settings';
 
 const getWidgetDataHandler =
   (
@@ -56,7 +53,7 @@ export const getWidgetData = async <T>({
   cacheOptions?: CacheOptions;
   headers?: Record<string, string>;
 }): Promise<WidgetResultType<T>> => {
-  const result = await Cache.wrap(
+  return Cache.wrap(
     CacheKey.Widget(slug),
     locale,
     getWidgetDataHandler(slug, locale, currency, headers),
@@ -65,16 +62,6 @@ export const getWidgetData = async <T>({
       ...cacheOptions
     }
   );
-
-  if (settings.payloadOptimization?.enabled && result) {
-    try {
-      return optimizeWidgetResponse(result, settings.payloadOptimization) as WidgetResultType<T>;
-    } catch (e) {
-      logger.error('Payload optimization failed for widget', { slug, error: (e as Error).message });
-    }
-  }
-
-  return result as WidgetResultType<T>;
 };
 
 const getCollectionWidgetDataHandler =

package/data/urls.ts

@@ -183,11 +183,7 @@ export const product = {
   breadcrumbUrl: (menuitemmodel: string) =>
     `/menus/generate_breadcrumb/?item=${menuitemmodel}&generator_name=menu_item`,
   bundleProduct: (productPk: string, queryString: string) =>
-    `/bundle-product/${productPk}/?${queryString}`,
-  similarProducts: (params?: string) =>
-    `/similar-products${params ? `?${params}` : ''}`,
-  similarProductsList: (params?: string) =>
-    `/similar-product-list${params ? `?${params}` : ''}`
+    `/bundle-product/${productPk}/?${queryString}`
 };
 
 export const wishlist = {

package/hooks/use-captcha.tsx

@@ -39,7 +39,7 @@ export const useCaptcha = () => {
   };
 
   if (csrfToken) {
-    setCookie('csrftoken', csrfToken, { secure: true });
+    setCookie('csrftoken', csrfToken);
   }
 
   const onCaptchaChange = useCallback(async (response) => {

package/middlewares/default.ts

@@ -547,8 +547,7 @@ const withPzDefault =
                                           'csrftoken',
                                           csrf_token,
                                           {
-                                            domain: rootHostname,
-                                            secure: true
+                                            domain: rootHostname
                                           }
                                         );
                                       }