@akinon/projectzero 1.34.0-rc.6 → 1.34.0-rc.8

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # @akinon/projectzero
 
+## 1.34.0-rc.8
+
+## 1.34.0-rc.7
+
 ## 1.34.0-rc.6
 
 ## 1.33.2

package/app-template/CHANGELOG.md

@@ -1,5 +1,38 @@
 # projectzeronext
 
+## 1.34.0-rc.8
+
+### Minor Changes
+
+- 91265bb: ZERO-2551: Improve pretty url and caching performance
+
+### Patch Changes
+
+- Updated dependencies [91265bb]
+  - @akinon/next@1.34.0-rc.8
+  - @akinon/pz-b2b@1.34.0-rc.8
+  - @akinon/pz-gpay@1.34.0-rc.8
+  - @akinon/pz-masterpass@1.34.0-rc.8
+  - @akinon/pz-one-click-checkout@1.34.0-rc.8
+  - @akinon/pz-otp@1.34.0-rc.8
+  - @akinon/pz-pay-on-delivery@1.34.0-rc.8
+
+## 1.34.0-rc.7
+
+### Minor Changes
+
+- 0d0f36c: ZERO-2598: Fix eslint warnings and update dependencies
+
+### Patch Changes
+
+- @akinon/next@1.34.0-rc.7
+- @akinon/pz-b2b@1.34.0-rc.7
+- @akinon/pz-gpay@1.34.0-rc.7
+- @akinon/pz-masterpass@1.34.0-rc.7
+- @akinon/pz-one-click-checkout@1.34.0-rc.7
+- @akinon/pz-otp@1.34.0-rc.7
+- @akinon/pz-pay-on-delivery@1.34.0-rc.7
+
 ## 1.34.0-rc.6
 
 ### Minor Changes

package/app-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectzeronext",
-  "version": "1.34.0-rc.6",
+  "version": "1.34.0-rc.8",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -22,13 +22,13 @@
     "prestart": "pz-prestart"
   },
   "dependencies": {
-    "@akinon/next": "1.34.0-rc.6",
-    "@akinon/pz-b2b": "1.34.0-rc.6",
-    "@akinon/pz-gpay": "1.34.0-rc.6",
-    "@akinon/pz-masterpass": "1.34.0-rc.6",
-    "@akinon/pz-one-click-checkout": "1.34.0-rc.6",
-    "@akinon/pz-otp": "1.34.0-rc.6",
-    "@akinon/pz-pay-on-delivery": "1.34.0-rc.6",
+    "@akinon/next": "1.34.0-rc.8",
+    "@akinon/pz-b2b": "1.34.0-rc.8",
+    "@akinon/pz-gpay": "1.34.0-rc.8",
+    "@akinon/pz-masterpass": "1.34.0-rc.8",
+    "@akinon/pz-one-click-checkout": "1.34.0-rc.8",
+    "@akinon/pz-otp": "1.34.0-rc.8",
+    "@akinon/pz-pay-on-delivery": "1.34.0-rc.8",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "14.1.0",
     "@react-google-maps/api": "2.17.1",
@@ -52,7 +52,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.34.0-rc.6",
+    "@akinon/eslint-plugin-projectzero": "1.34.0-rc.8",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",

package/app-template/src/app/[commerce]/[locale]/[currency]/[...prettyurl]/page.tsx

@@ -0,0 +1,8 @@
+import Page, {
+  dynamic,
+  revalidate,
+  generateMetadata
+} from '@akinon/next/routes/pretty-url';
+
+export { dynamic, revalidate, generateMetadata };
+export default Page;

package/app-template/src/app/[commerce]/[locale]/[currency]/account/change-email/page.tsx

@@ -1,6 +1,5 @@
 'use client';
 
-import { useSession } from 'next-auth/react';
 import { useForm, SubmitHandler } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import * as yup from 'yup';
@@ -34,7 +33,6 @@ const accountChangeEmailSchema = (t) =>
   });
 
 export default function Page() {
-  const { data } = useSession();
   const { data: profileInfo } = useGetProfileInfoQuery();
 
   const { t } = useLocalization();

package/app-template/src/app/[commerce]/[locale]/[currency]/address/stores/page.tsx

@@ -60,7 +60,7 @@ export default function Stores() {
       return options;
     }
     return [];
-  }, [country]);
+  }, [country]); // eslint-disable-line react-hooks/exhaustive-deps
 
   const cityOptions = useMemo(() => {
     if (city) {
@@ -73,7 +73,7 @@ export default function Stores() {
       return options;
     }
     return [];
-  }, [city]);
+  }, [city]); // eslint-disable-line react-hooks/exhaustive-deps
 
   const handleBackButtonClick = () => {
     setSelectedCityPk(null);

package/app-template/src/app/[commerce]/[locale]/[currency]/auth/page.tsx

@@ -33,7 +33,7 @@ export default function Auth() {
     if (session?.user) {
       router.push(searchParams.get('callbackUrl') ?? '/');
     }
-  }, [session?.user]);
+  }, [session?.user]); // eslint-disable-line react-hooks/exhaustive-deps
 
   return (
     <section className="container px-4 my-7 md:mt-20 lg:px-0 lg:mx-auto">

package/app-template/src/app/[commerce]/[locale]/[currency]/landing-page/[pk]/page.tsx

@@ -1,8 +1,6 @@
 import { getLandingPageData } from '@akinon/next/data/server';
 import { withSegmentDefaults } from '@akinon/next/hocs/server';
 import { PageProps } from '@akinon/next/types';
-import logger from '@akinon/next/utils/log';
-import * as console from 'console';
 
 async function Page({ params }: PageProps<{ pk: number }>) {
   const data = await getLandingPageData({ pk: params.pk });

package/app-template/src/app/[commerce]/[locale]/[currency]/orders/checkout/page.tsx

@@ -51,7 +51,7 @@ const Checkout = () => {
       dispatch(setCurrentStep(CheckoutStep.Payment));
       initialStepChanged.current = true;
     }
-  }, [steps.shipping.completed]);
+  }, [steps.shipping.completed]); // eslint-disable-line react-hooks/exhaustive-deps
 
   useEffect(() => {
     if (preOrder && !preOrder.shipping_option) {
@@ -63,7 +63,7 @@ const Checkout = () => {
     return () => {
       dispatch(resetCheckoutState());
     };
-  }, []);
+  }, []); // eslint-disable-line react-hooks/exhaustive-deps
 
   useEffect(() => {
     if (isSuccess) {

package/app-template/src/app/[commerce]/[locale]/[currency]/orders/completed/[token]/page.tsx

@@ -40,7 +40,7 @@ const CheckoutCompleted = ({
     return () => {
       dispatch(setCurrentStep(CheckoutStep.Shipping));
     };
-  }, []);
+  }, []); // eslint-disable-line react-hooks/exhaustive-deps
 
   useEffect(() => {
     if (data?.order) {

package/app-template/src/app/api/form/[...id]/route.ts

@@ -1,7 +1,7 @@
-import { NextRequest, NextResponse } from 'next/server';
+import { NextResponse } from 'next/server';
 
-export async function POST(req: NextRequest) {
+export async function POST() {
   // TODO: Handle Form Data
 
-  return NextResponse.json({message: 'ok'});
+  return NextResponse.json({ message: 'ok' });
 }

package/app-template/src/components/carousel-core.tsx

@@ -28,7 +28,7 @@ const CarouselCore = forwardRef<Carousel, CarouselProps>((props, ref) => {
     } else {
       setAspectRatio(containerAspectRatio.mobile);
     }
-  }, [matches]);
+  }, [matches, containerAspectRatio]);
 
   return (
     <div className="w-full" style={{ aspectRatio }}>

package/app-template/src/components/pagination.tsx

@@ -123,13 +123,13 @@ export const Pagination = (props: PaginationProps) => {
     if (inView) {
       handlePageChange();
     }
-  }, [inView]);
+  }, [inView]); // eslint-disable-line react-hooks/exhaustive-deps
 
   useEffect(() => {
     if (type === 'list') {
       createListItems();
     }
-  }, []);
+  }, []); // eslint-disable-line react-hooks/exhaustive-deps
 
   useEffect(() => {
     if (total && total !== paginationTotal) {

package/app-template/src/middleware.ts

@@ -1,5 +1,5 @@
-import { PzNextRequest, withPzDefault } from '@akinon/next/middlewares';
-import { NextFetchEvent, NextMiddleware, NextResponse } from 'next/server';
+import { withPzDefault } from '@akinon/next/middlewares';
+import { NextMiddleware, NextResponse } from 'next/server';
 
 /**
  * !IMPORTANT
@@ -16,18 +16,18 @@ export const config = {
   ]
 };
 
-const middleware: NextMiddleware = (
-  req: PzNextRequest,
-  event: NextFetchEvent
-) => {
-  // If you use a custom response such as NextResponse.json(),
-  // you should set pz-override-response header to true as shown below.
-  // Otherwise, you'll get a 404 error.
+const middleware: NextMiddleware = () =>
+  // req: PzNextRequest,
+  // event: NextFetchEvent
+  {
+    // If you use a custom response such as NextResponse.json(),
+    // you should set pz-override-response header to true as shown below.
+    // Otherwise, you'll get a 404 error.
 
-  // Example:
-  // return NextResponse.json({ status: 'ok' }, { headers: { 'pz-override-response': 'true' } });
+    // Example:
+    // return NextResponse.json({ status: 'ok' }, { headers: { 'pz-override-response': 'true' } });
 
-  return NextResponse.next();
-};
+    return NextResponse.next();
+  };
 
 export default withPzDefault(middleware);

package/app-template/src/redux/store.ts

@@ -33,7 +33,7 @@ export type AppStore = ReturnType<typeof makeStore>;
 
 export type RootState = ReturnType<AppStore['getState']>;
 
-export type TypedDispatch = ThunkDispatch<RootState, any, AnyAction>;
+export type TypedDispatch = ThunkDispatch<RootState, void, AnyAction>;
 
 export type AppDispatch = AppStore['dispatch'];
 

package/app-template/src/types/next-auth.d.ts

@@ -1,3 +1,4 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 import NextAuth from 'next-auth';
 
 declare module 'next-auth' {

package/app-template/src/views/account/account-menu.tsx

@@ -63,7 +63,6 @@ export default function AccountMenu() {
   const [logout] = useLogoutMutation();
   const pathname = usePathname();
   const accountMenuRegex = new RegExp(`^${ROUTES.ACCOUNT}/?$`).test(pathname);
-
   const handleLogout = async () => {
     logout()
       .unwrap()

package/app-template/src/views/account/address-form.tsx

@@ -121,7 +121,7 @@ export const AddressForm = (props: Props) => {
       return options;
     }
     return [];
-  }, [country]);
+  }, [country]); // eslint-disable-line react-hooks/exhaustive-deps
 
   const cityOptions = useMemo(() => {
     if (city) {
@@ -137,7 +137,7 @@ export const AddressForm = (props: Props) => {
       return options;
     }
     return [];
-  }, [city]);
+  }, [city]); // eslint-disable-line react-hooks/exhaustive-deps
 
   const townshipOptions = useMemo(() => {
     if (township) {
@@ -156,7 +156,7 @@ export const AddressForm = (props: Props) => {
       return options;
     }
     return [];
-  }, [township]);
+  }, [township]); // eslint-disable-line react-hooks/exhaustive-deps
 
   const districtOptions = useMemo(() => {
     if (district) {
@@ -175,7 +175,7 @@ export const AddressForm = (props: Props) => {
       return options;
     }
     return [];
-  }, [district]);
+  }, [district]); // eslint-disable-line react-hooks/exhaustive-deps
 
   useEffect(() => {
     if (data && country) {

package/app-template/src/views/account/orders/order-detail-header.tsx

@@ -14,13 +14,6 @@ export interface Props {
 export const OrderDetailHeader = ({ title, order, children }: Props) => {
   const { t } = useLocalization();
 
-  const orderDate = new Date(order.created_date)
-    .toJSON()
-    .slice(0, 10)
-    .split('-')
-    .reverse()
-    .join(' ');
-
   return (
     <div className="bg-gray-150 flex flex-col items-center justify-center p-6 w-full mb-8 md:flex-row">
       <div className="flex flex-col items-center text-center gap-2">

package/app-template/src/views/category/category-info.tsx

@@ -44,7 +44,7 @@ export default function ListPage(props: ListPageProps) {
       newUrl.searchParams.delete('page');
       router.push(newUrl.pathname + newUrl.search, undefined);
     }
-  }, [searchParams, data.products, page]);
+  }, [searchParams, data.products, page]); // eslint-disable-line react-hooks/exhaustive-deps
 
   const dispatch = useAppDispatch();
   const { t } = useLocalization();

package/app-template/src/views/checkout/auth.tsx

@@ -20,7 +20,7 @@ const CheckoutAuth = () => {
     } else if (status === 'unauthenticated') {
       router.replace(ROUTES.CHECKOUT + `?callbackUrl=${ROUTES.CHECKOUT}`);
     }
-  }, [status]);
+  }, [status]); // eslint-disable-line react-hooks/exhaustive-deps
 
   return (
     <div className="flex flex-col w-full my-5 lg:flex-row">

package/app-template/src/views/checkout/steps/payment/options/credit-card/index.tsx

@@ -151,7 +151,7 @@ const CheckoutCreditCard = () => {
 
     setMonths(months);
     setYears(years);
-  }, []);
+  }, []); // eslint-disable-line react-hooks/exhaustive-deps
 
   useEffect(() => {
     if (installment?.pk) {

package/app-template/src/views/checkout/steps/payment/options/funds-transfer.tsx

@@ -13,10 +13,9 @@ import CheckoutAgreements from '../agreements';
 import PaymentHeader from '../payment-header';
 import { useLocalization } from '@akinon/next/hooks';
 import { Image } from '@akinon/next/components/image';
-import PaymentOptionButtons from '../payment-option-buttons';
 import { Trans } from '@akinon/next/components/trans';
 
-const fundsTransferFormSchema = (t) =>
+const fundsTransferFormSchema = () =>
   yup.object().shape({
     agreement: yup.boolean().oneOf([true], 'This field is required.')
   });
@@ -28,7 +27,7 @@ const CheckoutFundsTransfer = () => {
     control,
     formState: { errors }
   } = useForm({
-    resolver: yupResolver(fundsTransferFormSchema(t))
+    resolver: yupResolver(fundsTransferFormSchema())
   });
   const [formError, setFormError] = useState(null);
   const { bankAccounts, selectedBankAccountPk, preOrder } = useAppSelector(

package/app-template/src/views/checkout/steps/payment/options/redirection.tsx

@@ -1,14 +1,12 @@
 'use client';
 
 import { useCompleteRedirectionPaymentMutation } from '@akinon/next/data/client/checkout';
-import { useLocalization } from '@akinon/next/hooks';
 import { useAppSelector } from '@akinon/next/redux/hooks';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { Button, Checkbox } from '@theme/components';
 import { useForm } from 'react-hook-form';
 import { twMerge } from 'tailwind-merge';
 import * as yup from 'yup';
-import PaymentOptionButtons from '../payment-option-buttons';
 import { useEffect, useState } from 'react';
 import { getPosError } from '@akinon/next/utils';
 
@@ -16,7 +14,7 @@ interface FormValues {
   agreement: boolean;
 }
 
-const formSchema = (t) =>
+const formSchema = () =>
   yup.object().shape({
     agreement: yup
       .boolean()
@@ -28,13 +26,12 @@ export default function RedirectionPayment() {
   const { payment_option } = useAppSelector((state) => state.checkout.preOrder);
   const [formError, setFormError] = useState(null);
 
-  const { t } = useLocalization();
   const {
     register,
     handleSubmit,
     formState: { errors }
   } = useForm<FormValues>({
-    resolver: yupResolver(formSchema(t))
+    resolver: yupResolver(formSchema())
   });
   const [completeRedirectionPayment] = useCompleteRedirectionPaymentMutation();
 

package/app-template/src/views/find-in-store/index.tsx

@@ -63,7 +63,7 @@ export const FindInStore = ({ productPk, productName, variants }) => {
       return options;
     }
     return [];
-  }, [retailStore]);
+  }, [retailStore]); // eslint-disable-line react-hooks/exhaustive-deps
 
   const sizeOptions = useMemo(() => {
     if (variants) {
@@ -80,7 +80,7 @@ export const FindInStore = ({ productPk, productName, variants }) => {
       return options;
     }
     return [];
-  }, [variants]);
+  }, [variants, sizeKey]); // eslint-disable-line react-hooks/exhaustive-deps
 
   const createStockStatus = (stock) => {
     const status = {

package/app-template/src/views/header/mini-basket.tsx

@@ -46,7 +46,7 @@ function MiniBasketItem(props: MiniBasketItemProps) {
         miniBasketList.scrollTop = 0;
       }
     }
-  }, [highlightedItem, basketItem.product.pk]);
+  }, [highlightedItem, basketItem.product.pk, miniBasketListRef]);
 
   const removeItem = () => {
     updateQuantityMutation({
@@ -183,7 +183,7 @@ export default function MiniBasket() {
         setSortedBasket(basket.basketitem_set);
       }
     }
-  }, [isSuccess, highlightedItem, basket]);
+  }, [isSuccess, highlightedItem, basket, highlightedItemPk]);
 
   return (
     <>

package/app-template/src/views/product/product-info.tsx

@@ -36,7 +36,7 @@ export default function ProductInfo({ data }: ProductPageProps) {
 
   useEffect(() => {
     pushProductViewed(data?.product);
-  }, []);
+  }, []); // eslint-disable-line react-hooks/exhaustive-deps
 
   const addProductToCart = async () => {
     if (!variantsSelectionCheck()) {

package/app-template/src/views/product-item/index.tsx

@@ -36,7 +36,7 @@ export const ProductItem = (props: Props) => {
       setViewed(true);
       pushProductListProductViewed(product);
     }
-  }, [inView]);
+  }, [inView, viewed, product]);
 
   return (
     <div

package/app-template/src/widgets/footer-subscription/footer-subscription-form.tsx

@@ -10,7 +10,7 @@ import { useGetWidgetQuery } from '@akinon/next/data/client/misc';
 import { Input, Button, Checkbox, Modal } from '@theme/components';
 import { useLocalization } from '@akinon/next/hooks';
 
-const subscriptionFormSchema = (t: any) =>
+const subscriptionFormSchema = (t: (key: string) => string) =>
   yup.object().shape({
     email: yup
       .string()

package/app-template/tsconfig.json

@@ -3,7 +3,10 @@
   "display": "Default",
   "compilerOptions": {
     "baseUrl": "./src",
-    "paths": { "@theme/*": ["./*"] },
+    "paths": {
+      "@theme/*": ["./*"],
+      "@root/*": ["./app/[commerce]/[locale]/[currency]/*"]
+    },
     "allowSyntheticDefaultImports": true,
     "composite": false,
     "declaration": true,
@@ -40,7 +43,5 @@
     ".next/types/**/*.ts",
     "../../packages/**/*"
   ],
-  "exclude": ["node_modules",
-    "../../packages/projectzero/app-template"
-  ]
+  "exclude": ["node_modules", "../../packages/projectzero/app-template"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akinon/projectzero",
-  "version": "1.34.0-rc.6",
+  "version": "1.34.0-rc.8",
   "private": false,
   "description": "CLI tool to manage your Project Zero Next project",
   "bin": {