@akinon/next 1.13.1 → 1.14.0

package/middlewares/url-redirection.ts

@@ -1,65 +1,65 @@
-import { NextFetchEvent, NextMiddleware } from 'next/server';
-import settings from 'settings';
-import { PzNextRequest } from '.';
-import logger from '../utils/log';
-import { urlLocaleMatcherRegex } from '../utils';
-import { getUrlPathWithLocale } from '../utils/localization';
-import { ROUTES } from 'routes';
-
-// This middleware is used to handle url redirections set in Omnitron
-
-const withUrlRedirection =
-  (middleware: NextMiddleware) =>
-  async (req: PzNextRequest, event: NextFetchEvent) => {
-    const url = req.nextUrl.clone();
-    const ip = req.headers.get('x-forwarded-for') ?? '';
-    const pathnameWithoutLocale = url.pathname.replace(
-      urlLocaleMatcherRegex,
-      ''
-    );
-
-    if (
-      Object.entries(ROUTES).find(([, value]) =>
-        new RegExp(`^${value}$`).test(pathnameWithoutLocale)
-      ) ||
-      pathnameWithoutLocale.startsWith('/orders')
-    ) {
-      return middleware(req, event);
-    }
-
-    try {
-      const request = await fetch(
-        `${settings.commerceUrl}${pathnameWithoutLocale}${url.search}`,
-        {
-          redirect: 'manual',
-          next: {
-            revalidate: 0
-          }
-        }
-      );
-
-      if (request.headers.get('location')) {
-        const location = request.headers.get('location');
-        const redirectUrl = new URL(
-          request.headers.get('location'),
-          location.startsWith('http') ? '' : process.env.NEXT_PUBLIC_URL
-        );
-
-        redirectUrl.pathname = getUrlPathWithLocale(
-          redirectUrl.pathname,
-          req.middlewareParams.rewrites.locale
-        );
-
-        return Response.redirect(redirectUrl.toString(), request.status);
-      }
-    } catch (error) {
-      logger.error('withUrlRedirection error', {
-        error,
-        ip
-      });
-    }
-
-    return middleware(req, event);
-  };
-
-export default withUrlRedirection;
+import { NextFetchEvent, NextMiddleware } from 'next/server';
+import settings from 'settings';
+import { PzNextRequest } from '.';
+import logger from '../utils/log';
+import { urlLocaleMatcherRegex } from '../utils';
+import { getUrlPathWithLocale } from '../utils/localization';
+import { ROUTES } from 'routes';
+
+// This middleware is used to handle url redirections set in Omnitron
+
+const withUrlRedirection =
+  (middleware: NextMiddleware) =>
+  async (req: PzNextRequest, event: NextFetchEvent) => {
+    const url = req.nextUrl.clone();
+    const ip = req.headers.get('x-forwarded-for') ?? '';
+    const pathnameWithoutLocale = url.pathname.replace(
+      urlLocaleMatcherRegex,
+      ''
+    );
+
+    if (
+      Object.entries(ROUTES).find(([, value]) =>
+        new RegExp(`^${value}$`).test(pathnameWithoutLocale)
+      ) ||
+      pathnameWithoutLocale.startsWith('/orders')
+    ) {
+      return middleware(req, event);
+    }
+
+    try {
+      const request = await fetch(
+        `${settings.commerceUrl}${pathnameWithoutLocale}${url.search}`,
+        {
+          redirect: 'manual',
+          next: {
+            revalidate: 0
+          }
+        }
+      );
+
+      if (request.headers.get('location')) {
+        const location = request.headers.get('location');
+        const redirectUrl = new URL(
+          request.headers.get('location'),
+          location.startsWith('http') ? '' : process.env.NEXT_PUBLIC_URL
+        );
+
+        redirectUrl.pathname = getUrlPathWithLocale(
+          redirectUrl.pathname,
+          req.middlewareParams.rewrites.locale
+        );
+
+        return Response.redirect(redirectUrl.toString(), request.status);
+      }
+    } catch (error) {
+      logger.error('withUrlRedirection error', {
+        error,
+        ip
+      });
+    }
+
+    return middleware(req, event);
+  };
+
+export default withUrlRedirection;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.13.1",
+  "version": "1.14.0",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -26,7 +26,7 @@
     "@typescript-eslint/eslint-plugin": "6.7.4",
     "@typescript-eslint/parser": "6.7.4",
     "eslint": "^8.14.0",
-    "@akinon/eslint-plugin-projectzero": "1.13.1",
+    "@akinon/eslint-plugin-projectzero": "1.14.0",
     "eslint-config-prettier": "8.5.0"
   }
 }

package/plugins.js

@@ -6,5 +6,6 @@ module.exports = [
   'pz-checkout-gift-pack',
   'pz-gpay',
   'pz-otp',
-  'pz-bkm'
+  'pz-bkm',
+  'pz-masterpass'
 ];

package/redux/hooks.ts

@@ -1,7 +1,7 @@
-'use client';
-
-import { TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux';
-import type { RootState, TypedDispatch } from 'redux/store';
-
-export const useAppDispatch = () => useDispatch<TypedDispatch>();
-export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector;
+'use client';
+
+import { TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux';
+import type { RootState, TypedDispatch } from 'redux/store';
+
+export const useAppDispatch = () => useDispatch<TypedDispatch>();
+export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector;