@akinon/next 1.92.0-rc.9 → 1.92.0-snapshot-ZERO-3449-20250618101111

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/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/default.ts

@@ -11,8 +11,7 @@ import {
   withRedirectionPayment,
   withSavedCardRedirection,
   withThreeDRedirection,
-  withUrlRedirection,
-  withWalletCompleteRedirection
+  withUrlRedirection
 } from '.';
 import { urlLocaleMatcherRegex } from '../utils';
 import withCurrency from './currency';
@@ -229,168 +228,144 @@ const withPzDefault =
                     withCompleteGpay(
                       withCompleteMasterpass(
                         withSavedCardRedirection(
-                          withWalletCompleteRedirection(
-                            async (
-                              req: PzNextRequest,
-                              event: NextFetchEvent
-                            ) => {
-                              let middlewareResult: NextResponse | void =
-                                NextResponse.next();
-
-                              try {
-                                const { locale, prettyUrl, currency } =
-                                  req.middlewareParams.rewrites;
-                                const { defaultLocaleValue } =
-                                  Settings.localization;
-                                const url = req.nextUrl.clone();
-                                const pathnameWithoutLocale =
-                                  url.pathname.replace(
-                                    urlLocaleMatcherRegex,
+                          async (req: PzNextRequest, event: NextFetchEvent) => {
+                            let middlewareResult: NextResponse | void =
+                              NextResponse.next();
+
+                            try {
+                              const { locale, prettyUrl, currency } =
+                                req.middlewareParams.rewrites;
+                              const { defaultLocaleValue } =
+                                Settings.localization;
+                              const url = req.nextUrl.clone();
+                              const pathnameWithoutLocale =
+                                url.pathname.replace(urlLocaleMatcherRegex, '');
+
+                              middlewareResult = (await middleware(
+                                req,
+                                event
+                              )) as NextResponse | void;
+
+                              let customRewriteUrlDiff = '';
+
+                              if (
+                                middlewareResult instanceof NextResponse &&
+                                middlewareResult.headers.get(
+                                  'pz-override-response'
+                                ) &&
+                                middlewareResult.headers.get(
+                                  'x-middleware-rewrite'
+                                )
+                              ) {
+                                const rewriteUrl = new URL(
+                                  middlewareResult.headers.get(
+                                    'x-middleware-rewrite'
+                                  )
+                                );
+                                const originalUrl = new URL(req.url);
+                                customRewriteUrlDiff =
+                                  rewriteUrl.pathname.replace(
+                                    originalUrl.pathname,
                                     ''
                                   );
+                              }
 
-                                middlewareResult = (await middleware(
-                                  req,
-                                  event
-                                )) as NextResponse | void;
+                              url.basePath = `/${commerceUrl}`;
+                              url.pathname = `/${
+                                locale.length ? `${locale}/` : ''
+                              }${currency}/${customRewriteUrlDiff}${
+                                prettyUrl ?? pathnameWithoutLocale
+                              }`.replace(/\/+/g, '/');
+
+                              if (
+                                Settings.usePrettyUrlRoute &&
+                                url.searchParams.toString().length > 0 &&
+                                !Object.entries(ROUTES).find(([, value]) =>
+                                  new RegExp(`^${value}/?$`).test(
+                                    pathnameWithoutLocale
+                                  )
+                                )
+                              ) {
+                                url.pathname =
+                                  url.pathname +
+                                  (/\/$/.test(url.pathname) ? '' : '/') +
+                                  `searchparams|${encodeURIComponent(
+                                    url.searchParams.toString()
+                                  )}`;
+                              }
 
-                                let customRewriteUrlDiff = '';
+                              if (
+                                !req.middlewareParams.found &&
+                                Settings.customNotFoundEnabled
+                              ) {
+                                const pathname = url.pathname
+                                  .replace(/\/+$/, '')
+                                  .split('/');
+                                url.pathname = url.pathname.replace(
+                                  pathname.pop(),
+                                  'pz-not-found'
+                                );
+                              }
+
+                              Settings.rewrites.forEach((rewrite) => {
+                                url.pathname = url.pathname.replace(
+                                  rewrite.source,
+                                  rewrite.destination
+                                );
+                              });
 
+                              // if middleware.ts has a return value for current url
+                              if (middlewareResult instanceof NextResponse) {
+                                // pz-override-response header is used to prevent 404 page for custom responses.
                                 if (
-                                  middlewareResult instanceof NextResponse &&
                                   middlewareResult.headers.get(
                                     'pz-override-response'
-                                  ) &&
-                                  middlewareResult.headers.get(
-                                    'x-middleware-rewrite'
-                                  )
+                                  ) !== 'true'
                                 ) {
-                                  const rewriteUrl = new URL(
-                                    middlewareResult.headers.get(
-                                      'x-middleware-rewrite'
-                                    )
+                                  middlewareResult.headers.set(
+                                    'x-middleware-rewrite',
+                                    url.href
                                   );
-                                  const originalUrl = new URL(req.url);
-                                  customRewriteUrlDiff =
-                                    rewriteUrl.pathname.replace(
-                                      originalUrl.pathname,
-                                      ''
-                                    );
-                                }
-
-                                url.basePath = `/${commerceUrl}`;
-                                url.pathname = `/${
-                                  locale.length ? `${locale}/` : ''
-                                }${currency}/${customRewriteUrlDiff}${
-                                  prettyUrl ?? pathnameWithoutLocale
-                                }`.replace(/\/+/g, '/');
-
-                                if (
-                                  Settings.usePrettyUrlRoute &&
-                                  url.searchParams.toString().length > 0 &&
-                                  !Object.entries(ROUTES).find(([, value]) =>
-                                    new RegExp(`^${value}/?$`).test(
-                                      pathnameWithoutLocale
-                                    )
-                                  )
-                                ) {
-                                  url.pathname =
-                                    url.pathname +
-                                    (/\/$/.test(url.pathname) ? '' : '/') +
-                                    `searchparams|${encodeURIComponent(
-                                      url.searchParams.toString()
-                                    )}`;
-                                }
-
-                                if (
-                                  !req.middlewareParams.found &&
-                                  Settings.customNotFoundEnabled
+                                } else if (
+                                  middlewareResult.headers.get(
+                                    'x-middleware-rewrite'
+                                  ) &&
+                                  middlewareResult.headers.get(
+                                    'pz-override-response'
+                                  ) === 'true'
                                 ) {
-                                  const pathname = url.pathname
-                                    .replace(/\/+$/, '')
-                                    .split('/');
-                                  url.pathname = url.pathname.replace(
-                                    pathname.pop(),
-                                    'pz-not-found'
-                                  );
-                                }
-
-                                Settings.rewrites.forEach((rewrite) => {
-                                  url.pathname = url.pathname.replace(
-                                    rewrite.source,
-                                    rewrite.destination
-                                  );
-                                });
-
-                                // if middleware.ts has a return value for current url
-                                if (middlewareResult instanceof NextResponse) {
-                                  // pz-override-response header is used to prevent 404 page for custom responses.
-                                  if (
-                                    middlewareResult.headers.get(
-                                      'pz-override-response'
-                                    ) !== 'true'
-                                  ) {
-                                    middlewareResult.headers.set(
-                                      'x-middleware-rewrite',
-                                      url.href
-                                    );
-                                  } else if (
-                                    middlewareResult.headers.get(
-                                      'x-middleware-rewrite'
-                                    ) &&
-                                    middlewareResult.headers.get(
-                                      'pz-override-response'
-                                    ) === 'true'
-                                  ) {
-                                    middlewareResult =
-                                      NextResponse.rewrite(url);
-                                  }
-                                } else {
-                                  // if middleware.ts doesn't have a return value.
-                                  // e.g. NextResponse.next() doesn't exist in middleware.ts
-
                                   middlewareResult = NextResponse.rewrite(url);
                                 }
+                              } else {
+                                // if middleware.ts doesn't have a return value.
+                                // e.g. NextResponse.next() doesn't exist in middleware.ts
 
-                                const { localeUrlStrategy } =
-                                  Settings.localization;
-
-                                const fallbackHost =
-                                  req.headers.get('x-forwarded-host') ||
-                                  req.headers.get('host');
-                                const hostname =
-                                  process.env.NEXT_PUBLIC_URL ||
-                                  `https://${fallbackHost}`;
-                                const rootHostname =
-                                  localeUrlStrategy ===
-                                  LocaleUrlStrategy.Subdomain
-                                    ? getRootHostname(hostname)
-                                    : null;
-
-                                if (
-                                  !url.pathname.startsWith(
-                                    `/${currency}/orders`
-                                  )
-                                ) {
-                                  middlewareResult.cookies.set(
-                                    'pz-locale',
-                                    locale?.length > 0
-                                      ? locale
-                                      : defaultLocaleValue,
-                                    {
-                                      domain: rootHostname,
-                                      sameSite: 'none',
-                                      secure: true,
-                                      expires: new Date(
-                                        Date.now() + 1000 * 60 * 60 * 24 * 7
-                                      ) // 7 days
-                                    }
-                                  );
-                                }
+                                middlewareResult = NextResponse.rewrite(url);
+                              }
 
+                              const { localeUrlStrategy } =
+                                Settings.localization;
+
+                              const fallbackHost =
+                                req.headers.get('x-forwarded-host') ||
+                                req.headers.get('host');
+                              const hostname =
+                                process.env.NEXT_PUBLIC_URL ||
+                                `https://${fallbackHost}`;
+                              const rootHostname =
+                                localeUrlStrategy ===
+                                LocaleUrlStrategy.Subdomain
+                                  ? getRootHostname(hostname)
+                                  : null;
+
+                              if (
+                                !url.pathname.startsWith(`/${currency}/orders`)
+                              ) {
                                 middlewareResult.cookies.set(
-                                  'pz-currency',
-                                  currency,
+                                  'pz-locale',
+                                  locale?.length > 0
+                                    ? locale
+                                    : defaultLocaleValue,
                                   {
                                     domain: rootHostname,
                                     sameSite: 'none',
@@ -400,69 +375,82 @@ const withPzDefault =
                                     ) // 7 days
                                   }
                                 );
+                              }
 
-                                if (
-                                  req.cookies.get('pz-locale') &&
-                                  req.cookies.get('pz-locale').value !== locale
-                                ) {
-                                  logger.debug('Locale changed', {
-                                    locale,
-                                    oldLocale:
-                                      req.cookies.get('pz-locale')?.value,
-                                    ip
-                                  });
+                              middlewareResult.cookies.set(
+                                'pz-currency',
+                                currency,
+                                {
+                                  domain: rootHostname,
+                                  sameSite: 'none',
+                                  secure: true,
+                                  expires: new Date(
+                                    Date.now() + 1000 * 60 * 60 * 24 * 7
+                                  ) // 7 days
                                 }
+                              );
+
+                              if (
+                                req.cookies.get('pz-locale') &&
+                                req.cookies.get('pz-locale').value !== locale
+                              ) {
+                                logger.debug('Locale changed', {
+                                  locale,
+                                  oldLocale:
+                                    req.cookies.get('pz-locale')?.value,
+                                  ip
+                                });
+                              }
+
+                              middlewareResult.headers.set(
+                                'pz-url',
+                                req.nextUrl.toString()
+                              );
+
+                              if (req.cookies.get('pz-set-currency')) {
+                                middlewareResult.cookies.delete(
+                                  'pz-set-currency'
+                                );
+                              }
 
+                              if (process.env.ACC_APP_VERSION) {
                                 middlewareResult.headers.set(
-                                  'pz-url',
-                                  req.nextUrl.toString()
+                                  'acc-app-version',
+                                  process.env.ACC_APP_VERSION
                                 );
+                              }
 
-                                if (req.cookies.get('pz-set-currency')) {
-                                  middlewareResult.cookies.delete(
-                                    'pz-set-currency'
-                                  );
-                                }
+                              // Set CSRF token if not set
+                              try {
+                                const url = `${Settings.commerceUrl}${user.csrfToken}`;
 
-                                if (process.env.ACC_APP_VERSION) {
-                                  middlewareResult.headers.set(
-                                    'acc-app-version',
-                                    process.env.ACC_APP_VERSION
+                                if (!req.cookies.get('csrftoken')) {
+                                  const { csrf_token } = await (
+                                    await fetch(url)
+                                  ).json();
+                                  middlewareResult.cookies.set(
+                                    'csrftoken',
+                                    csrf_token,
+                                    {
+                                      domain: rootHostname
+                                    }
                                   );
                                 }
-
-                                // Set CSRF token if not set
-                                try {
-                                  const url = `${Settings.commerceUrl}${user.csrfToken}`;
-
-                                  if (!req.cookies.get('csrftoken')) {
-                                    const { csrf_token } = await (
-                                      await fetch(url)
-                                    ).json();
-                                    middlewareResult.cookies.set(
-                                      'csrftoken',
-                                      csrf_token,
-                                      {
-                                        domain: rootHostname
-                                      }
-                                    );
-                                  }
-                                } catch (error) {
-                                  logger.error('CSRF Error', {
-                                    error,
-                                    ip
-                                  });
-                                }
                               } catch (error) {
-                                logger.error('withPzDefault Error', {
+                                logger.error('CSRF Error', {
                                   error,
                                   ip
                                 });
                               }
-
-                              return middlewareResult;
+                            } catch (error) {
+                              logger.error('withPzDefault Error', {
+                                error,
+                                ip
+                              });
                             }
-                          )
+
+                            return middlewareResult;
+                          }
                         )
                       )
                     )

package/middlewares/index.ts

@@ -9,7 +9,6 @@ import withCompleteGpay from './complete-gpay';
 import withCompleteMasterpass from './complete-masterpass';
 import withCheckoutProvider from './checkout-provider';
 import withSavedCardRedirection from './saved-card-redirection';
-import withWalletCompleteRedirection from './wallet-complete-redirection';
 import { NextRequest } from 'next/server';
 
 export {
@@ -23,8 +22,7 @@ export {
   withCompleteGpay,
   withCompleteMasterpass,
   withCheckoutProvider,
-  withSavedCardRedirection,
-  withWalletCompleteRedirection
+  withSavedCardRedirection
 };
 
 export interface PzNextRequest extends NextRequest {

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
@@ -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.92.0-rc.9",
+  "version": "1.92.0-snapshot-ZERO-3449-20250618101111",
   "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.92.0-rc.9",
+    "@akinon/eslint-plugin-projectzero": "1.92.0-snapshot-ZERO-3449-20250618101111",
     "@babel/core": "7.26.10",
     "@babel/preset-env": "7.26.9",
     "@babel/preset-typescript": "7.27.0",

package/plugins.d.ts

@@ -36,5 +36,3 @@ declare module '@akinon/pz-iyzico-saved-card' {
 }
 
 declare module '@akinon/pz-apple-pay' {}
-
-declare module '@akinon/pz-flow-payment' {}

package/plugins.js

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