@akinon/next 2.0.0-beta.2 → 2.0.0-beta.3

package/CHANGELOG.md

@@ -1,9 +1,19 @@
 # @akinon/next
 
+## 2.0.0-beta.3
+
+### Minor Changes
+
+- 5536b80: ZERO-3104: Add optional headers parameter
+
 ## 2.0.0-beta.2
 
 ### Minor Changes
 
+- a006015: ZERO-3116: Add not-found page and update default middleware.
+- 999168d: ZERO-3104: Remove local cache handler from CacheHandler initialization
+- 1eeb3d8: ZERO-3116: Add not found page
+- 86a5a62: ZERO-3104: Add optional headers parameter to data fetching functions
 - dd69cc6: ZERO-3079: Modularize pre-order middleware
 
 ## 2.0.0-beta.1

package/data/server/flatpage.ts

@@ -7,7 +7,8 @@ import { ServerVariables } from '../../utils/server-variables';
 const getFlatPageDataHandler = (
   pk: number,
   locale: string,
-  currency: string
+  currency: string,
+  headers?: Record<string, string>
 ) => {
   return async function () {
     const data = await appFetch<FlatPage>({
@@ -17,7 +18,8 @@ const getFlatPageDataHandler = (
       init: {
         headers: {
           Accept: 'application/json',
-          'Content-Type': 'application/json'
+          'Content-Type': 'application/json',
+          ...(headers ?? {})
         }
       }
     });
@@ -29,15 +31,17 @@ const getFlatPageDataHandler = (
 export const getFlatPageData = ({
   pk,
   locale = ServerVariables.locale,
-  currency = ServerVariables.currency
+  currency = ServerVariables.currency,
+  headers
 }: {
   pk: number;
   locale?: string;
   currency?: string;
+  headers?: Record<string, string>;
 }) => {
   return Cache.wrap(
     CacheKey.FlatPage(pk),
     locale,
-    getFlatPageDataHandler(pk, locale, currency)
+    getFlatPageDataHandler(pk, locale, currency, headers)
   );
 };

package/data/server/form.ts

@@ -5,7 +5,12 @@ import appFetch from '../../utils/app-fetch';
 import { ServerVariables } from '../../utils/server-variables';
 import { form } from '../urls';
 
-const getFormDataHandler = (pk: number, locale: string, currency: string) => {
+const getFormDataHandler = (
+  pk: number,
+  locale: string,
+  currency: string,
+  headers?: Record<string, string>
+) => {
   return async function () {
     const data = await appFetch<FormType>({
       url: form.getForm(pk),
@@ -14,7 +19,8 @@ const getFormDataHandler = (pk: number, locale: string, currency: string) => {
       init: {
         headers: {
           Accept: 'application/json',
-          'Content-Type': 'application/json'
+          'Content-Type': 'application/json',
+          ...(headers ?? {})
         }
       }
     });
@@ -26,15 +32,17 @@ const getFormDataHandler = (pk: number, locale: string, currency: string) => {
 export const getFormData = ({
   pk,
   locale = ServerVariables.locale,
-  currency = ServerVariables.currency
+  currency = ServerVariables.currency,
+  headers
 }: {
   pk: number;
   locale?: string;
   currency?: string;
+  headers?: Record<string, string>;
 }) => {
   return Cache.wrap(
     CacheKey.Form(pk),
     locale,
-    getFormDataHandler(pk, locale, currency)
+    getFormDataHandler(pk, locale, currency, headers)
   );
 };

package/data/server/landingpage.ts

@@ -7,7 +7,8 @@ import { ServerVariables } from '../../utils/server-variables';
 const getLandingPageHandler = (
   pk: number,
   locale: string,
-  currency: string
+  currency: string,
+  headers?: Record<string, string>
 ) => {
   return async function () {
     const data = await appFetch<LandingPage>({
@@ -17,7 +18,8 @@ const getLandingPageHandler = (
       init: {
         headers: {
           Accept: 'application/json',
-          'Content-Type': 'application/json'
+          'Content-Type': 'application/json',
+          ...(headers ?? {})
         }
       }
     });
@@ -29,15 +31,17 @@ const getLandingPageHandler = (
 export const getLandingPageData = ({
   pk,
   locale = ServerVariables.locale,
-  currency = ServerVariables.currency
+  currency = ServerVariables.currency,
+  headers
 }: {
   pk: number;
   locale?: string;
   currency?: string;
+  headers?: Record<string, string>;
 }) => {
   return Cache.wrap(
     CacheKey.LandingPage(pk),
     locale,
-    getLandingPageHandler(pk, locale, currency)
+    getLandingPageHandler(pk, locale, currency, headers)
   );
 };

package/data/server/menu.ts

@@ -13,6 +13,7 @@ interface MenuHandlerParams {
   currency?: string;
   depth?: number;
   parent?: string;
+  headers?: Record<string, string>;
 }
 
 const DEFAULT_DEPTH = 3;
@@ -22,13 +23,17 @@ const getMenuHandler =
     locale = ServerVariables.locale,
     currency = ServerVariables.currency,
     depth,
-    parent
+    parent,
+    headers
   }: MenuHandlerParams = {}) =>
   async () => {
     const response = await appFetch<MenuResponse>({
       url: misc.menus(depth ?? DEFAULT_DEPTH, parent),
       locale,
-      currency
+      currency,
+      init: {
+        headers
+      }
     });
 
     return response?.menu;

package/data/server/product.ts

@@ -11,6 +11,7 @@ type GetProduct = {
   currency?: string;
   searchParams?: URLSearchParams;
   groupProduct?: boolean;
+  headers?: Record<string, string>;
 };
 
 const getProductDataHandler = ({
@@ -18,7 +19,8 @@ const getProductDataHandler = ({
   locale,
   currency,
   searchParams,
-  groupProduct
+  groupProduct,
+  headers
 }: GetProduct) => {
   return async function () {
     let url = groupProduct
@@ -40,7 +42,8 @@ const getProductDataHandler = ({
       init: {
         headers: {
           Accept: 'application/json',
-          'Content-Type': 'application/json'
+          'Content-Type': 'application/json',
+          ...(headers ?? {})
         }
       }
     });
@@ -95,7 +98,8 @@ export const getProductData = async ({
   locale = ServerVariables.locale,
   currency = ServerVariables.currency,
   searchParams,
-  groupProduct
+  groupProduct,
+  headers
 }: GetProduct) => {
   return Cache.wrap(
     CacheKey[groupProduct ? 'GroupProduct' : 'Product'](
@@ -103,7 +107,14 @@ export const getProductData = async ({
       searchParams ?? new URLSearchParams()
     ),
     locale,
-    getProductDataHandler({ pk, locale, currency, searchParams, groupProduct }),
+    getProductDataHandler({
+      pk,
+      locale,
+      currency,
+      searchParams,
+      groupProduct,
+      headers
+    }),
     {
       expire: 300
     }

package/data/server/seo.ts

@@ -7,9 +7,10 @@ interface SeoDataParams {
   url: string;
   locale?: string;
   currency?: string;
+  headers?: Record<string, string>;
 }
 
-function getSeoDataHandler({ url, locale, currency }: SeoDataParams) {
+function getSeoDataHandler({ url, locale, currency, headers }: SeoDataParams) {
   return async function () {
     let data = {} as {
       title: string;
@@ -19,7 +20,12 @@ function getSeoDataHandler({ url, locale, currency }: SeoDataParams) {
     };
 
     try {
-      data = await appFetch({ url: misc.cmsSeo(url), locale, currency });
+      data = await appFetch({
+        url: misc.cmsSeo(url),
+        locale,
+        currency,
+        init: { headers }
+      });
     } catch (error) {
       // logger.error('Error while fetching seo data', { url, error });
     }
@@ -31,11 +37,12 @@ function getSeoDataHandler({ url, locale, currency }: SeoDataParams) {
 export const getSeoData = async (
   url,
   locale = ServerVariables.locale,
-  currency = ServerVariables.currency
+  currency = ServerVariables.currency,
+  headers?: Record<string, string>
 ) => {
   return Cache.wrap(
     CacheKey.Seo(url),
     locale,
-    getSeoDataHandler({ url, locale, currency })
+    getSeoDataHandler({ url, locale, currency, headers })
   );
 };

package/data/server/widget.ts

@@ -6,29 +6,44 @@ import { widgets } from '../urls';
 import { ServerVariables } from '../../utils/server-variables';
 
 const getWidgetDataHandler =
-  (slug: string, locale: string, currency: string) => async () => {
+  (
+    slug: string,
+    locale: string,
+    currency: string,
+    headers?: Record<string, string>
+  ) =>
+  async () => {
     if (!slug) {
       return null;
     }
 
-    return await appFetch({ url: widgets.getWidget(slug), locale, currency });
+    return await appFetch({
+      url: widgets.getWidget(slug),
+      locale,
+      currency,
+      init: {
+        headers
+      }
+    });
   };
 
 export const getWidgetData = async <T>({
   slug,
   locale = ServerVariables.locale,
   currency = ServerVariables.currency,
-  cacheOptions
+  cacheOptions,
+  headers
 }: {
   slug: string;
   locale?: string;
   currency?: string;
   cacheOptions?: CacheOptions;
+  headers?: Record<string, string>;
 }): Promise<WidgetResultType<T>> => {
   return Cache.wrap(
     CacheKey.Widget(slug),
     locale,
-    getWidgetDataHandler(slug, locale, currency),
+    getWidgetDataHandler(slug, locale, currency, headers),
     cacheOptions
   );
 };

package/lib/cache-handler.mjs

@@ -23,10 +23,10 @@ CacheHandler.onCreation(async () => {
     timeoutMs: 5000
   });
 
-  const localHandler = createLruHandler();
+  // const localHandler = createLruHandler();
 
   return {
-    handlers: [redisHandler, localHandler]
+    handlers: [redisHandler]
   };
 });
 

package/middlewares/default.ts

@@ -288,19 +288,6 @@ const withPzDefault =
                                   `searchparams|${url.searchParams.toString()}`;
                               }
 
-                              if (
-                                !req.middlewareParams.found &&
-                                Settings.customNotFoundEnabled
-                              ) {
-                                let 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,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.3",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -30,7 +30,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "2.0.0-beta.2",
+    "@akinon/eslint-plugin-projectzero": "2.0.0-beta.3",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
     "@typescript-eslint/eslint-plugin": "8.18.2",

package/types/index.ts

@@ -199,7 +199,6 @@ export interface Settings {
     extraPaymentTypes?: string[];
     masterpassJsUrl?: string;
   };
-  customNotFoundEnabled: boolean;
   useOptimizedTranslations?: boolean;
   plugins?: Record<string, Record<string, any>>;
   includedProxyHeaders?: string[];