@akinon/next 2.0.0-beta.12 → 2.0.0-beta.13

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;
+  });
+}

package/utils/redirect.ts

@@ -3,21 +3,27 @@ import Settings from 'settings';
 import { headers } from 'next/headers';
 import { ServerVariables } from '@akinon/next/utils/server-variables';
 import { getUrlPathWithLocale } from '@akinon/next/utils/localization';
+import { urlLocaleMatcherRegex } from '@akinon/next/utils';
 
 export const redirect = async (path: string, type?: RedirectType) => {
   const nextHeaders = await headers();
   const pageUrl = new URL(
-    nextHeaders.get('pz-url') ?? process.env.NEXT_PUBLIC_URL
+    nextHeaders.get('pz-url') ?? process.env.NEXT_PUBLIC_URL ?? ''
   );
 
   const currentLocale = Settings.localization.locales.find(
     (locale) => locale.value === ServerVariables.locale
   );
 
-  const callbackUrl = pageUrl.pathname;
+  const searchParams = new URLSearchParams(pageUrl.search);
+
+  const callbackUrl =
+    pageUrl.pathname.replace(urlLocaleMatcherRegex, '') +
+    (searchParams.toString() ? `?${searchParams.toString()}` : '');
+
   const redirectUrlWithLocale = getUrlPathWithLocale(
     path,
-    currentLocale.localePath ?? currentLocale.value
+    currentLocale?.value
   );
 
   const redirectUrl = `${redirectUrlWithLocale}?callbackUrl=${callbackUrl}`;

package/with-pz-config.js

@@ -1,19 +1,22 @@
+const path = require('path');
 const pzPlugins = require('./plugins');
 const deepMerge = require('./utils/deep-merge');
 
 /** @type {import('next').NextConfig} */
 const defaultConfig = {
-  experimental: { instrumentationHook: true },
   reactStrictMode: true,
   transpilePackages: ['@akinon/next', ...pzPlugins.map((p) => `@akinon/${p}`)],
   skipTrailingSlashRedirect: true,
   poweredByHeader: false,
   cacheMaxMemorySize: 0,
+  output: 'standalone',
+  compress: false,
   env: {
     NEXT_PUBLIC_SENTRY_DSN: process.env.SENTRY_DSN
   },
   images: {
     remotePatterns: [
+      //It has to be like this for security reasons
       {
         protocol: 'https',
         hostname: '**.akinoncloud.com'
@@ -53,6 +56,12 @@ const defaultConfig = {
     ];
   },
   webpack: (config, options) => {
+    // Alias 'redux/store' to the app's local redux/store module to prevent
+    // collision with the npm 'redux' package's exports field
+    config.resolve.alias = {
+      ...config.resolve.alias,
+      'redux/store': path.resolve(process.cwd(), 'src/redux/store')
+    };
     config.resolve.fallback = {
       ...config.resolve.fallback,
       ...pzPlugins.reduce((acc, plugin) => {
@@ -63,9 +72,6 @@ const defaultConfig = {
     };
     return config;
   },
-  sentry: {
-    hideSourceMaps: true
-  } // TODO: This section will be reviewed again in the Sentry 8 update.
 };
 
 const withPzConfig = (