@akinon/next 1.50.0 → 1.52.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @akinon/next
 
+## 1.52.0
+
+### Minor Changes
+
+- d8dd8dc: ZERO-2729: Audit packages for yarn and npm and also update app-template
+- 8d9ac9a: ZERO-2794: Add field to order type
+- 016d379: ZERO-2729: Update packages and force update dependencies using resolutions
+- 146ea39: ZERO-2774: Update imports
+
+## 1.51.0
+
+### Minor Changes
+
+- 70279e7: ZERO-2817: Add metrics endpoint in default middleware
+- 9d94f7e: ZERO-2820: update parent pk usage for menu generator
+- 1ec2e9d: ZERO-2895: Update app-fetch to include cookies in headers
+- 3d35f70: ZERO-2908: Add cookie to redirect url
+
 ## 1.50.0
 
 ### Minor Changes

package/components/pagination.tsx

@@ -1,10 +1,9 @@
 'use client';
 
 import { MouseEvent, useCallback, useEffect, useState } from 'react';
-import { PaginationProps } from '@theme/components/types';
+import { PaginationProps } from '../types';
 import { twMerge } from 'tailwind-merge';
 import clsx from 'clsx';
-
 import usePagination from '@akinon/next/hooks/use-pagination';
 import { useLocalization } from '@akinon/next/hooks';
 import { useRouter } from '@akinon/next/hooks';

package/data/client/api.ts

@@ -9,7 +9,7 @@ import {
 } from '@reduxjs/toolkit/query/react';
 import settings from 'settings';
 import { getCookie } from '../../utils';
-import { RootState } from '@theme/redux/store';
+import { RootState } from 'redux/store';
 
 interface CustomBaseQueryApi extends BaseQueryApi {
   getState: () => RootState;

package/middlewares/default.ts

@@ -69,6 +69,10 @@ const withPzDefault =
       return NextResponse.json({ status: 'ok' });
     }
 
+    if (url.pathname.startsWith('/metrics')) {
+      return new NextResponse(null, { status: 200 });
+    }
+
     if (req.nextUrl.pathname.startsWith('/.well-known')) {
       const url = new URL(`${Settings.commerceUrl}${req.nextUrl.pathname}`);
       const req_ = await fetch(url.toString());

package/middlewares/url-redirection.ts

@@ -32,7 +32,8 @@ const withUrlRedirection =
         `${settings.commerceUrl}${pathnameWithoutLocale}${url.search}`,
         {
           headers: {
-            'x-forwarded-for': ip
+            'x-forwarded-for': ip,
+            Cookie: req.headers.get('cookie') ?? ''
           },
           redirect: 'manual',
           next: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.50.0",
+  "version": "1.52.0",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -25,16 +25,16 @@
     "react-redux": "8.1.3",
     "react-string-replace": "1.1.1",
     "redis": "4.5.1",
-    "semver": "7.5.4",
+    "semver": "7.6.2",
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
+    "@akinon/eslint-plugin-projectzero": "1.52.0",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
     "@typescript-eslint/eslint-plugin": "6.7.4",
     "@typescript-eslint/parser": "6.7.4",
     "eslint": "^8.14.0",
-    "@akinon/eslint-plugin-projectzero": "1.50.0",
     "eslint-config-prettier": "8.5.0"
   }
 }

package/types/commerce/order.ts

@@ -105,6 +105,13 @@ export interface Order {
   shipping_option: number;
   tracking_number: string;
   tracking_url: string;
+  [key: string]: any;
+  bank: {
+    pk: number;
+    name: string;
+    slug: string;
+    [key: string]: any;
+  };
 }
 
 export interface Quotations {

package/types/index.ts

@@ -2,7 +2,7 @@ import { LocaleUrlStrategy } from '../localization';
 import { PzNextRequest } from '../middlewares';
 import { Control, FieldError } from 'react-hook-form';
 import { ReactNode } from 'react';
-
+import { UsePaginationType } from '../hooks/use-pagination';
 declare global {
   interface Window {
     // we did it like this because declare types needs to be identical, if not it will fail
@@ -283,3 +283,21 @@ export interface AccordionProps {
 export interface PluginModuleComponentProps {
   settings?: Record<string, any>;
 }
+
+export interface PaginationProps {
+  total: number | undefined;
+  limit?: number | undefined;
+  currentPage: number | undefined;
+  numberOfPages?: number | undefined;
+  containerClassName?: string;
+  moreButtonClassName?: string;
+  prevClassName?: string;
+  nextClassName?: string;
+  pageClassName?: string;
+  threshold?: number | undefined;
+  delta?: number | undefined;
+  render?: (pagination: UsePaginationType) => ReactNode;
+  type?: 'infinite' | 'list' | 'more';
+  onPageChange?: (page: number) => void;
+  direction?: 'next' | 'prev';
+}

package/utils/app-fetch.ts

@@ -1,7 +1,7 @@
 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';
 
 export enum FetchResponseType {
   JSON = 'json',
@@ -19,6 +19,7 @@ const appFetch = async <T>(
 
   try {
     const nextHeaders = headers();
+    const nextCookies = cookies();
     ip = nextHeaders.get('x-forwarded-for') ?? '';
 
     const commerceUrl = Settings.commerceUrl;
@@ -37,7 +38,8 @@ const appFetch = async <T>(
       ...(init.headers ?? {}),
       'Accept-Language': currentLocale.apiValue,
       'x-currency': ServerVariables.currency,
-      'x-forwarded-for': ip
+      'x-forwarded-for': ip,
+      cookie: nextCookies.toString()
     };
 
     init.next = {

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