@akinon/next 1.48.0 → 1.50.0-rc.0

package/utils/app-fetch.ts

@@ -1,29 +1,38 @@
 import Settings from 'settings';
-import { ServerVariables } from './server-variables';
 import logger from '../utils/log';
-import { headers } from 'next/headers';
+import { headers, cookies } from 'next/headers';
+import { ServerVariables } from './server-variables';
 
 export enum FetchResponseType {
   JSON = 'json',
   TEXT = 'text'
 }
 
-const appFetch = async <T>(
-  url: RequestInfo,
-  init: RequestInit = {},
+const appFetch = async <T>({
+  url,
+  locale,
+  currency,
+  init = {},
   responseType = FetchResponseType.JSON
-): Promise<T> => {
+}: {
+  url: RequestInfo;
+  locale: string;
+  currency: string;
+  init?: RequestInit;
+  responseType?: FetchResponseType;
+}): Promise<T> => {
   let response: T;
   let status: number;
   let ip = '';
 
   try {
     const nextHeaders = headers();
+    const nextCookies = cookies();
     ip = nextHeaders.get('x-forwarded-for') ?? '';
 
     const commerceUrl = Settings.commerceUrl;
     const currentLocale = Settings.localization.locales.find(
-      (locale) => locale.value === ServerVariables.locale
+      (l) => l.value === locale
     );
 
     if (commerceUrl === 'default') {
@@ -35,13 +44,15 @@ const appFetch = async <T>(
 
     init.headers = {
       ...(init.headers ?? {}),
+      ...(ServerVariables.globalHeaders ?? {}),
       'Accept-Language': currentLocale.apiValue,
-      'x-currency': ServerVariables.currency,
-      'x-forwarded-for': ip
+      'x-currency': currency,
+      'x-forwarded-for': ip,
+      cookie: nextCookies.toString()
     };
 
     init.next = {
-      revalidate: 60
+      revalidate: Settings.usePrettyUrlRoute ? 0 : 60
     };
 
     logger.debug(`FETCH START ${url}`, { requestURL, init, ip });

package/utils/generate-commerce-search-params.ts

@@ -1,6 +1,8 @@
 import logger from './log';
 
-export const generateCommerceSearchParams = (searchParams?: URLSearchParams) => {
+export const generateCommerceSearchParams = (
+  searchParams?: URLSearchParams
+) => {
   if (!searchParams) {
     return null;
   }

package/utils/index.ts

@@ -63,18 +63,33 @@ export function getTranslateFn(path: string, translations: any) {
 
 export function buildClientRequestUrl(
   path: string,
-  options?: ClientRequestOptions
+  options?: ClientRequestOptions & { cache?: boolean }
 ) {
   let url = `/api/client${path}`;
 
+  let hasQuery = url.includes('?');
+
   if (options) {
-    if (url.includes('?')) {
-      url += '&';
-    } else {
-      url += '?';
+    const { cache, ...otherOptions } = options;
+
+    if (Object.keys(otherOptions).length > 0) {
+      if (hasQuery) {
+        url += '&';
+      } else {
+        url += '?';
+        hasQuery = true;
+      }
+      url += `options=${encodeURIComponent(JSON.stringify(otherOptions))}`;
     }
 
-    url += `options=${encodeURIComponent(JSON.stringify(options))}`;
+    if (cache === false) {
+      if (hasQuery) {
+        url += '&';
+      } else {
+        url += '?';
+      }
+      url += `t=${Date.now()}`;
+    }
   }
 
   return url;
@@ -102,6 +117,12 @@ export function buildCDNUrl(url: string, config?: CDNOptions) {
     ''
   );
 
+  const noOptionFileExtension = url?.split('.').pop()?.toLowerCase() ?? '';
+
+  if (noOptionFileExtension === 'svg' || noOptionFileExtension === 'gif') {
+    return url;
+  }
+
   let options = '';
 
   if (config) {

package/utils/menu-generator.ts

@@ -13,8 +13,8 @@ export const menuGenerator = (arr: MenuItemType[]) => {
     });
 
     Object.values(data).forEach((item) => {
-      if (item.parent) {
-        data[item.parent.pk].children.push(item);
+      if (item.parent_pk) {
+        data[item.parent_pk].children.push(item);
       } else {
         tree.push(item);
       }

package/utils/redirection-iframe.ts

@@ -0,0 +1,85 @@
+const iframeURLChange = (iframe, callback) => {
+  iframe.addEventListener('load', () => {
+    setTimeout(() => {
+      if (iframe?.contentWindow?.location) {
+        callback(iframe.contentWindow.location);
+      }
+    }, 0);
+  });
+};
+
+const removeIframe = async () => {
+  const iframeSelector = document.querySelector(
+    '.checkout-payment-redirection-iframe-wrapper'
+  );
+
+  const redirectionPaymentWrapper = document.querySelector(
+    '.checkout-redirection-payment-wrapper'
+  );
+
+  const form = redirectionPaymentWrapper.querySelector('form') as HTMLElement;
+
+  if (!iframeSelector) {
+    return;
+  }
+
+  iframeSelector.remove();
+
+  if (form) {
+    form.style.display = 'block';
+  }
+
+  location.reload();
+};
+
+export const showRedirectionIframe = (redirectUrl: string) => {
+  const iframeWrapper = document.createElement('div');
+  const iframe = document.createElement('iframe');
+  const closeButton = document.createElement('div');
+  const redirectionPaymentWrapper = document.querySelector(
+    '.checkout-redirection-payment-wrapper'
+  );
+  const form = redirectionPaymentWrapper.querySelector('form') as HTMLElement;
+
+  iframeWrapper.className = 'checkout-payment-redirection-iframe-wrapper';
+  closeButton.className = 'close-button';
+
+  iframe.setAttribute('src', redirectUrl);
+  closeButton.innerHTML = '&#x2715';
+  closeButton.addEventListener('click', removeIframe);
+
+  iframeWrapper.append(iframe, closeButton);
+
+  if (form) {
+    form.style.display = 'none';
+  }
+
+  redirectionPaymentWrapper.appendChild(iframeWrapper);
+
+  iframeURLChange(iframe, (location) => {
+    if (location.origin !== window.location.origin) {
+      return false;
+    }
+
+    const searchParams = new URLSearchParams(location.search);
+    const isOrderCompleted = location.href.includes('/orders/completed');
+
+    if (isOrderCompleted) {
+      (window.parent as any)?.postMessage?.(
+        JSON.stringify({
+          url: location.pathname
+        })
+      );
+    }
+
+    if (
+      searchParams.has('success') ||
+      isOrderCompleted ||
+      location.href.includes('/orders/checkout')
+    ) {
+      setTimeout(() => {
+        removeIframe();
+      }, 0);
+    }
+  });
+};

package/utils/server-translation.ts

@@ -8,7 +8,6 @@ import logger from './log';
 
 export const translations: Translations = {};
 
-// TODO: Read translations from cache
 export async function getTranslations(locale_: string) {
   try {
     const locale = settings.localization.locales.find(
@@ -55,3 +54,14 @@ export async function getTranslations(locale_: string) {
 export function t(path: string) {
   return getTranslateFn(path, translations);
 }
+
+export async function t_(path: string, locale?: string) {
+  let translations_ = translations;
+
+  if (settings.useOptimizedTranslations && locale) {
+    const { getTranslations } = require('translations');
+    translations_ = await getTranslations(locale);
+  }
+
+  return getTranslateFn(path, translations_);
+}

package/utils/server-variables.ts

@@ -5,5 +5,6 @@ const { locales, defaultLocaleValue, defaultCurrencyCode } =
 
 export const ServerVariables = {
   locale: locales.find((l) => l.value === defaultLocaleValue)?.value ?? '',
-  currency: defaultCurrencyCode
+  currency: defaultCurrencyCode,
+  globalHeaders: {}
 };

package/with-pz-config.js

@@ -8,6 +8,7 @@ const defaultConfig = {
   transpilePackages: ['@akinon/next', ...pzPlugins.map((p) => `@akinon/${p}`)],
   skipTrailingSlashRedirect: true,
   poweredByHeader: false,
+  cacheMaxMemorySize: 0,
   env: {
     NEXT_PUBLIC_SENTRY_DSN: process.env.SENTRY_DSN
   },
@@ -56,7 +57,8 @@ const defaultConfig = {
       ...pzPlugins.reduce((acc, plugin) => {
         acc[`@akinon/${plugin}`] = false;
         return acc;
-      }, {})
+      }, {}),
+      translations: false
     };
     return config;
   },
@@ -65,7 +67,12 @@ const defaultConfig = {
   }
 };
 
-const withPzConfig = (myNextConfig = {}) => {
+const withPzConfig = (
+  myNextConfig = {},
+  options = {
+    useCacheHandler: false
+  }
+) => {
   let extendedConfig = deepMerge({}, defaultConfig, myNextConfig);
 
   const originalPzHeadersFunction = defaultConfig.headers;
@@ -91,6 +98,10 @@ const withPzConfig = (myNextConfig = {}) => {
     return [...pzRewrites, ...myRewrites];
   };
 
+  if (options.useCacheHandler && process.env.CACHE_HOST) {
+    extendedConfig.cacheHandler = require.resolve('./lib/cache-handler.mjs');
+  }
+
   return extendedConfig;
 };