@akinon/next 1.54.0-rc.0 → 1.54.0

package/types/index.ts

@@ -68,17 +68,9 @@ export interface Currency {
    * @see https://en.wikipedia.org/wiki/ISO_4217
    */
   code: string;
-  /**
-   * Number of decimal places to display.
-   *
-   * @example
-   * decimalScale: 3
-   */
-  decimalScale?: number;
 }
 
 export interface Settings {
-  usePrettyUrlRoute?: boolean;
   commerceUrl: string;
   redis: {
     defaultExpirationTime: number;
@@ -191,9 +183,7 @@ export interface Settings {
     masterpassJsUrl?: string;
   };
   customNotFoundEnabled: boolean;
-  useOptimizedTranslations?: boolean;
   plugins?: Record<string, Record<string, any>>;
-  includedProxyHeaders?: string[];
 }
 
 export interface CacheOptions {
@@ -225,7 +215,7 @@ export type ImageOptions = CDNOptions & {
 export type Translations = { [key: string]: object };
 
 export interface PageProps<T = any> {
-  params: T & { locale: string; currency: string };
+  params: T;
   searchParams: URLSearchParams;
 }
 
@@ -234,11 +224,7 @@ export interface LayoutProps<T = any> extends PageProps<T> {
 }
 
 export interface RootLayoutProps<
-  T = {
-    commerce: string;
-    locale: string;
-    currency: string;
-  }
+  T = { commerce: string; locale: string; currency: string }
 > extends LayoutProps<T> {
   translations: Translations;
   locale: Locale & {
@@ -264,8 +250,6 @@ export interface ButtonProps
   appearance?: 'filled' | 'outlined' | 'ghost';
 }
 
-export type FileInputProps = React.HTMLProps<HTMLInputElement>;
-
 export interface PriceProps {
   currencyCode?: string;
   useCurrencySymbol?: boolean;

package/utils/app-fetch.ts

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

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

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

package/utils/index.ts

@@ -63,33 +63,18 @@ export function getTranslateFn(path: string, translations: any) {
 
 export function buildClientRequestUrl(
   path: string,
-  options?: ClientRequestOptions & { cache?: boolean }
+  options?: ClientRequestOptions
 ) {
   let url = `/api/client${path}`;
 
-  let hasQuery = url.includes('?');
-
   if (options) {
-    const { cache, ...otherOptions } = options;
-
-    if (Object.keys(otherOptions).length > 0) {
-      if (hasQuery) {
-        url += '&';
-      } else {
-        url += '?';
-        hasQuery = true;
-      }
-      url += `options=${encodeURIComponent(JSON.stringify(otherOptions))}`;
+    if (url.includes('?')) {
+      url += '&';
+    } else {
+      url += '?';
     }
 
-    if (cache === false) {
-      if (hasQuery) {
-        url += '&';
-      } else {
-        url += '?';
-      }
-      url += `t=${Date.now()}`;
-    }
+    url += `options=${encodeURIComponent(JSON.stringify(options))}`;
   }
 
   return url;
@@ -117,12 +102,6 @@ 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/server-translation.ts

@@ -8,6 +8,7 @@ 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(
@@ -54,14 +55,3 @@ 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,6 +5,5 @@ const { locales, defaultLocaleValue, defaultCurrencyCode } =
 
 export const ServerVariables = {
   locale: locales.find((l) => l.value === defaultLocaleValue)?.value ?? '',
-  currency: defaultCurrencyCode,
-  globalHeaders: {}
+  currency: defaultCurrencyCode
 };

package/with-pz-config.js

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

package/assets/styles/index.css

@@ -1,49 +0,0 @@
-.checkout-payment-iframe-wrapper {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  border: none;
-  z-index: 1000;
-  background-color: white;
-}
-.checkout-payment-iframe-wrapper iframe {
-  width: 100%;
-  height: 100%;
-  border: none;
-  background-color: white;
-}
-.checkout-payment-iframe-wrapper .close-button {
-  position: fixed;
-  top: 16px;
-  right: 16px;
-  width: 32px;
-  height: 32px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  z-index: 1001;
-}
-
-.checkout-payment-redirection-iframe-wrapper {
-  width: 100%;
-  position: relative;
-}
-.checkout-payment-redirection-iframe-wrapper iframe {
-  width: 100%;
-  height: 100%;
-  border: none;
-  background-color: white;
-}
-.checkout-payment-redirection-iframe-wrapper .close-button {
-  position: absolute;
-  top: 16px;
-  right: 16px;
-  width: 32px;
-  height: 32px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  z-index: 1001;
-}/*# sourceMappingURL=index.css.map */

package/assets/styles/index.css.map

@@ -1 +0,0 @@
-{"version":3,"sources":["index.scss","index.css"],"names":[],"mappings":"AAAA;EACE,eAAA;EACA,MAAA;EACA,OAAA;EACA,WAAA;EACA,YAAA;EACA,YAAA;EACA,aAAA;EACA,uBAAA;ACCF;ADCE;EACE,WAAA;EACA,YAAA;EACA,YAAA;EACA,uBAAA;ACCJ;ADEE;EACE,eAAA;EACA,SAAA;EACA,WAAA;EACA,WAAA;EACA,YAAA;EACA,aAAA;EACA,mBAAA;EACA,uBAAA;EACA,aAAA;ACAJ;;ADIA;EACE,WAAA;EACA,kBAAA;ACDF;ADGE;EACE,WAAA;EACA,YAAA;EACA,YAAA;EACA,uBAAA;ACDJ;ADIE;EACE,kBAAA;EACA,SAAA;EACA,WAAA;EACA,WAAA;EACA,YAAA;EACA,aAAA;EACA,mBAAA;EACA,uBAAA;EACA,aAAA;ACFJ","file":"index.css"}

package/bin/pz-generate-translations.js

@@ -1,41 +0,0 @@
-#!/usr/bin/env node
-
-const fs = require('fs');
-const path = require('path');
-const localesPath = path.resolve(`public/locales/`);
-
-async function generateTranslationIndex(locale_) {
-  let translations = {};
-
-  try {
-    const localeDirPath = path.resolve(`public/locales/${locale_}`);
-    const fileNames = fs.readdirSync(localeDirPath);
-
-    for await (const fileName of fileNames) {
-      if (fileName === 'index.json') {
-        continue;
-      }
-
-      const data = fs.readFileSync(
-        path.join(localeDirPath, `/${fileName}`),
-        'utf-8'
-      );
-
-      translations[fileName.substring(0, fileName.lastIndexOf('.'))] =
-        JSON.parse(data);
-    }
-
-    fs.writeFileSync(
-      path.resolve(`public/locales/${locale_}/index.json`),
-      JSON.stringify(translations)
-    );
-  } catch (error) {
-    console.error(error);
-  }
-}
-
-const localePaths = fs.readdirSync(localesPath);
-
-localePaths.forEach((localePath) => {
-  generateTranslationIndex(localePath);
-});

package/components/file-input.tsx

@@ -1,8 +0,0 @@
-import { forwardRef } from 'react';
-import { FileInputProps } from '../types/index';
-
-export const FileInput = forwardRef<HTMLInputElement, FileInputProps>(
-  function fileInput(props, ref) {
-    return <input type="file" {...props} ref={ref} />;
-  }
-);

package/hooks/use-message-listener.ts

@@ -1,24 +0,0 @@
-import { useEffect } from 'react';
-
-export const useMessageListener = () => {
-  useEffect(() => {
-    const handleMessage = (event: MessageEvent) => {
-      if (event.origin !== window.location.origin) {
-        return;
-      }
-
-      if (event.data && typeof event.data === 'string') {
-        const messageData = JSON.parse(event.data);
-        if (messageData?.url) {
-          window.location.href = messageData.url;
-        }
-      }
-    };
-
-    window.addEventListener('message', handleMessage);
-
-    return () => {
-      window.removeEventListener('message', handleMessage);
-    };
-  }, []);
-};

package/lib/cache-handler.mjs

@@ -1,33 +0,0 @@
-import { CacheHandler } from '@neshca/cache-handler';
-import createLruHandler from '@neshca/cache-handler/local-lru';
-import createRedisHandler from '@neshca/cache-handler/redis-stack';
-import { createClient } from 'redis';
-
-CacheHandler.onCreation(async () => {
-  const redisUrl = `redis://${process.env.CACHE_HOST}:${
-    process.env.CACHE_PORT
-  }/${process.env.CACHE_BUCKET ?? '0'}`;
-
-  const client = createClient({
-    url: redisUrl
-  });
-
-  client.on('error', (error) => {
-    console.error('Redis client error', { redisUrl, error });
-  });
-
-  await client.connect();
-
-  const redisHandler = await createRedisHandler({
-    client,
-    timeoutMs: 5000
-  });
-
-  const localHandler = createLruHandler();
-
-  return {
-    handlers: [redisHandler, localHandler]
-  };
-});
-
-export default CacheHandler;

package/routes/pretty-url.tsx

@@ -1,192 +0,0 @@
-import { URLS } from '@akinon/next/data/urls';
-import { Metadata, PageProps } from '@akinon/next/types';
-import logger from '@akinon/next/utils/log';
-import { notFound } from 'next/navigation';
-
-type PrettyUrlResult = {
-  matched: boolean;
-  path?: string;
-  pk?: number;
-};
-
-const resolvePrettyUrlHandler =
-  (pathname: string, ip: string | null) => async () => {
-    let results = [] as { old_path: string }[];
-    let prettyUrlResult: PrettyUrlResult = {
-      matched: false
-    };
-
-    try {
-      const requestUrl = URLS.misc.prettyUrls(`/${pathname}/`);
-
-      logger.debug(`Resolving pretty url`, { pathname, requestUrl, ip });
-
-      const start = Date.now();
-      const apiResponse = await fetch(requestUrl, {
-        next: {
-          revalidate: 0
-        }
-      });
-      const data = await apiResponse.json();
-      ({ results } = data);
-      const end = Date.now();
-      console.warn('Pretty url response time', end - start, requestUrl);
-
-      const matched = results.length > 0;
-      const [{ old_path: path } = { old_path: '' }] = results;
-      let pk;
-
-      if (matched) {
-        const pkRegex = /\/(\d+)\/$/;
-        const match = path.match(pkRegex);
-        pk = match ? parseInt(match[1]) : undefined;
-      }
-
-      prettyUrlResult = {
-        matched,
-        path,
-        pk
-      };
-
-      logger.trace('Pretty url result', { prettyUrlResult, ip });
-    } catch (error) {
-      logger.error('Error resolving pretty url', { error, pathname, ip });
-    }
-
-    return prettyUrlResult;
-  };
-
-export async function generateMetadata({ params }: PageProps) {
-  let result: Metadata = {};
-  const { prettyurl } = params;
-  const pageSlug = prettyurl
-    .filter((x) => !x.startsWith('searchparams'))
-    .join('/');
-
-  const searchParams = new URLSearchParams(
-    decodeURIComponent(
-      prettyurl
-        .find((x) => x.startsWith('searchparams'))
-        ?.replace('searchparams%7C', '')
-    ) ?? {}
-  );
-
-  const prettyUrlResult = await resolvePrettyUrlHandler(pageSlug, null)();
-
-  if (!prettyUrlResult.matched) {
-    return notFound();
-  }
-
-  const commonProps = {
-    params: {
-      ...params,
-      pk: prettyUrlResult.pk
-    },
-    searchParams
-  };
-
-  try {
-    if (prettyUrlResult.path.startsWith('/product/')) {
-      await import('@product/[pk]/page').then(async (module) => {
-        result = await module['generateMetadata']?.(commonProps);
-      });
-    }
-
-    if (prettyUrlResult.path.startsWith('/group-product/')) {
-      await import('@group-product/[pk]/page').then(async (module) => {
-        result = await module['generateMetadata']?.(commonProps);
-      });
-    }
-
-    if (prettyUrlResult.path.startsWith('/category/')) {
-      await import('@category/[pk]/page').then(async (module) => {
-        result = await module['generateMetadata']?.(commonProps);
-      });
-    }
-
-    if (prettyUrlResult.path.startsWith('/special-page/')) {
-      await import('@special-page/[pk]/page').then(async (module) => {
-        result = await module['generateMetadata']?.(commonProps);
-      });
-    }
-
-    if (prettyUrlResult.path.startsWith('/flat-page/')) {
-      await import('@flat-page/[pk]/page').then(async (module) => {
-        result = await module['generateMetadata']?.(commonProps);
-      });
-    }
-    // eslint-disable-next-line no-empty
-  } catch (error) {}
-
-  return result;
-}
-
-export const dynamic = 'force-static';
-export const revalidate = 300;
-
-export default async function Page({ params }) {
-  const { prettyurl } = params;
-  const pageSlug = prettyurl
-    .filter((x) => !x.startsWith('searchparams'))
-    .join('/');
-
-  const urlSearchParams = new URLSearchParams(
-    decodeURIComponent(
-      prettyurl
-        .find((x) => x.startsWith('searchparams'))
-        ?.replace('searchparams%7C', '')
-    ) ?? {}
-  );
-
-  const searchParams = {};
-
-  for (const [key, value] of urlSearchParams.entries() as unknown as Array<
-    [string, string]
-  >) {
-    if (!searchParams[key]) {
-      searchParams[key] = [];
-    }
-    searchParams[key].push(value);
-  }
-
-  const result = await resolvePrettyUrlHandler(pageSlug, null)();
-
-  if (!result.matched) {
-    return notFound();
-  }
-
-  const commonProps = {
-    params: {
-      ...params,
-      pk: result.pk
-    },
-    searchParams: new URLSearchParams(searchParams)
-  };
-
-  if (result.path.startsWith('/category/')) {
-    const CategoryPage = (await import('@category/[pk]/page')).default;
-    return <CategoryPage {...commonProps} />;
-  }
-
-  if (result.path.startsWith('/product/')) {
-    const ProductPage = (await import('@product/[pk]/page')).default;
-    return <ProductPage {...commonProps} />;
-  }
-
-  if (result.path.startsWith('/group-product/')) {
-    const GroupProduct = (await import('@group-product/[pk]/page')).default;
-    return <GroupProduct {...commonProps} />;
-  }
-
-  if (result.path.startsWith('/special-page/')) {
-    const SpecialPage = (await import('@special-page/[pk]/page')).default;
-    return <SpecialPage {...commonProps} />;
-  }
-
-  if (result.path.startsWith('/flat-page/')) {
-    const FlatPage = (await import('@flat-page/[pk]/page')).default;
-    return <FlatPage {...commonProps} />;
-  }
-
-  return null;
-}

package/utils/redirection-iframe.ts

@@ -1,85 +0,0 @@
-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);
-    }
-  });
-};