@akinon/projectzero 2.0.0-beta.0 → 2.0.0-beta.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @akinon/projectzero
 
+## 2.0.0-beta.2
+
+## 2.0.0-beta.1
+
+### Minor Changes
+
+- ZERO-3091: Upgrade Next.js to v15 and React to v19
+
 ## 2.0.0-beta.0
 
 ### Major Changes

package/app-template/CHANGELOG.md

@@ -1,5 +1,55 @@
 # projectzeronext
 
+## 2.0.0-beta.2
+
+### Minor Changes
+
+- dd69cc6: ZERO-3079: Modularize pre-order middleware
+
+### Patch Changes
+
+- Updated dependencies [dd69cc6]
+  - @akinon/next@2.0.0-beta.2
+  - @akinon/pz-akifast@2.0.0-beta.2
+  - @akinon/pz-b2b@2.0.0-beta.2
+  - @akinon/pz-basket-gift-pack@2.0.0-beta.2
+  - @akinon/pz-bkm@2.0.0-beta.2
+  - @akinon/pz-checkout-gift-pack@2.0.0-beta.2
+  - @akinon/pz-click-collect@2.0.0-beta.2
+  - @akinon/pz-credit-payment@2.0.0-beta.2
+  - @akinon/pz-gpay@2.0.0-beta.2
+  - @akinon/pz-masterpass@2.0.0-beta.2
+  - @akinon/pz-one-click-checkout@2.0.0-beta.2
+  - @akinon/pz-otp@2.0.0-beta.2
+  - @akinon/pz-pay-on-delivery@2.0.0-beta.2
+  - @akinon/pz-saved-card@2.0.0-beta.2
+  - @akinon/pz-tabby-extension@2.0.0-beta.2
+
+## 2.0.0-beta.1
+
+### Minor Changes
+
+- ZERO-3091: Upgrade Next.js to v15 and React to v19
+
+### Patch Changes
+
+- Updated dependencies
+  - @akinon/pz-checkout-gift-pack@2.0.0-beta.1
+  - @akinon/pz-one-click-checkout@2.0.0-beta.1
+  - @akinon/pz-basket-gift-pack@2.0.0-beta.1
+  - @akinon/pz-pay-on-delivery@2.0.0-beta.1
+  - @akinon/pz-tabby-extension@2.0.0-beta.1
+  - @akinon/pz-credit-payment@2.0.0-beta.1
+  - @akinon/pz-click-collect@2.0.0-beta.1
+  - @akinon/pz-masterpass@2.0.0-beta.1
+  - @akinon/pz-saved-card@2.0.0-beta.1
+  - @akinon/next@2.0.0-beta.1
+  - @akinon/pz-akifast@2.0.0-beta.1
+  - @akinon/pz-gpay@2.0.0-beta.1
+  - @akinon/pz-b2b@2.0.0-beta.1
+  - @akinon/pz-bkm@2.0.0-beta.1
+  - @akinon/pz-otp@2.0.0-beta.1
+
 ## 2.0.0-beta.0
 
 ### Major Changes

package/app-template/next-env.d.ts

@@ -3,4 +3,4 @@
 /// <reference types="next/navigation-types/compat/navigation" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

package/app-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectzeronext",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.2",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -22,34 +22,34 @@
     "prestart": "pz-prestart"
   },
   "dependencies": {
-    "@akinon/next": "2.0.0-beta.0",
-    "@akinon/pz-akifast": "2.0.0-beta.0",
-    "@akinon/pz-b2b": "2.0.0-beta.0",
-    "@akinon/pz-basket-gift-pack": "2.0.0-beta.0",
-    "@akinon/pz-bkm": "2.0.0-beta.0",
-    "@akinon/pz-checkout-gift-pack": "2.0.0-beta.0",
-    "@akinon/pz-click-collect": "2.0.0-beta.0",
-    "@akinon/pz-credit-payment": "2.0.0-beta.0",
-    "@akinon/pz-gpay": "2.0.0-beta.0",
-    "@akinon/pz-masterpass": "2.0.0-beta.0",
-    "@akinon/pz-one-click-checkout": "2.0.0-beta.0",
-    "@akinon/pz-otp": "2.0.0-beta.0",
-    "@akinon/pz-pay-on-delivery": "2.0.0-beta.0",
-    "@akinon/pz-saved-card": "2.0.0-beta.0",
-    "@akinon/pz-tabby-extension": "2.0.0-beta.0",
+    "@akinon/next": "2.0.0-beta.2",
+    "@akinon/pz-akifast": "2.0.0-beta.2",
+    "@akinon/pz-b2b": "2.0.0-beta.2",
+    "@akinon/pz-basket-gift-pack": "2.0.0-beta.2",
+    "@akinon/pz-bkm": "2.0.0-beta.2",
+    "@akinon/pz-checkout-gift-pack": "2.0.0-beta.2",
+    "@akinon/pz-click-collect": "2.0.0-beta.2",
+    "@akinon/pz-credit-payment": "2.0.0-beta.2",
+    "@akinon/pz-gpay": "2.0.0-beta.2",
+    "@akinon/pz-masterpass": "2.0.0-beta.2",
+    "@akinon/pz-one-click-checkout": "2.0.0-beta.2",
+    "@akinon/pz-otp": "2.0.0-beta.2",
+    "@akinon/pz-pay-on-delivery": "2.0.0-beta.2",
+    "@akinon/pz-saved-card": "2.0.0-beta.2",
+    "@akinon/pz-tabby-extension": "2.0.0-beta.2",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "14.1.0",
     "@react-google-maps/api": "2.17.1",
     "@sentry/nextjs": "7.116.0",
     "dayjs": "1.11.5",
     "lossless-json": "2.0.5",
-    "next": "14.2.5",
-    "next-auth": "4.24.5",
+    "next": "15.1.2",
+    "next-auth": "4.24.11",
     "next-pwa": "5.6.0",
     "pino": "8.11.0",
-    "postcss": "8.4.49",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
+    "postcss": "8.4.31",
+    "react": "19.0.0",
+    "react-dom": "19.0.0",
     "react-google-recaptcha": "2.1.0",
     "react-hook-form": "7.31.3",
     "react-intersection-observer": "9.4.0",
@@ -61,7 +61,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "2.0.0-beta.0",
+    "@akinon/eslint-plugin-projectzero": "2.0.0-beta.2",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",
@@ -72,23 +72,23 @@
     "@testing-library/user-event": "14.1.1",
     "@types/googlemaps": "3.43.3",
     "@types/jest": "27.4.1",
-    "@types/react": "18.2.27",
-    "@types/react-dom": "18.2.12",
-    "@typescript-eslint/eslint-plugin": "6.7.4",
-    "@typescript-eslint/parser": "6.7.4",
-    "autoprefixer": "10.4.20",
+    "@types/react": "19.0.2",
+    "@types/react-dom": "19.0.2",
+    "@typescript-eslint/eslint-plugin": "8.18.2",
+    "@typescript-eslint/parser": "8.18.2",
+    "autoprefixer": "10.4.13",
     "client-only": "0.0.1",
     "clsx": "1.1.1",
     "currency-symbol-map": "5.1.0",
-    "eslint": "8.14.0",
-    "eslint-config-next": "14.2.3",
-    "eslint-config-prettier": "8.5.0",
+    "eslint": "9.17.0",
+    "eslint-config-next": "15.1.2",
+    "eslint-config-prettier": "9.1.0",
     "husky": "8.0.0",
     "jest": "29.7.0",
     "jest-css-modules-transform": "4.3.0",
     "lint-staged": "13.1.0",
-    "prettier": "2.6.2",
-    "react-number-format": "5.3.4",
+    "prettier": "3.4.2",
+    "react-number-format": "5.4.2",
     "sass": "1.49.9",
     "semantic-release": "19.0.5",
     "server-only": "0.0.1",
@@ -100,10 +100,10 @@
     "tailwindcss": "3.4.14",
     "ts-jest": "29.1.1",
     "ts-node": "10.7.0",
-    "typescript": "5.2.2"
+    "typescript": "5.7.2"
   },
   "resolutions": {
     "**/postcss": "8.4.31"
   },
-  "packageManager": "yarn@1.22.17"
+  "packageManager": "yarn@1.22.22"
 }

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

@@ -56,7 +56,8 @@ const resolvePrettyUrlHandler =
     return prettyUrlResult;
   };
 
-export async function generateMetadata({ params }: PageProps) {
+export async function generateMetadata(props: PageProps) {
+  const params = await props.params;
   let result: Metadata = {};
   const { prettyurl } = params;
   const pageSlug = prettyurl
@@ -81,7 +82,7 @@ export async function generateMetadata({ params }: PageProps) {
       ...params,
       pk: prettyUrlResult.pk
     },
-    searchParams
+    searchParams: Promise.resolve(searchParams)
   };
 
   try {
@@ -123,7 +124,8 @@ export async function generateMetadata({ params }: PageProps) {
 export const dynamic = 'force-static';
 export const revalidate = 300;
 
-export default async function Page({ params }) {
+export default async function Page(props) {
+  const params = await props.params;
   const { prettyurl } = params;
   const pageSlug = prettyurl
     .filter((x) => !x.startsWith('searchparams'))
@@ -159,7 +161,7 @@ export default async function Page({ params }) {
       ...params,
       pk: result.pk
     },
-    searchParams: urlSearchParams
+    searchParams: Promise.resolve(urlSearchParams)
   };
 
   if (result.path.startsWith('/category/')) {

package/app-template/src/app/[commerce]/[locale]/[currency]/account/orders/[id]/cancellation/page.tsx

@@ -8,7 +8,7 @@ import {
   useGetOrderQuery,
   useGetCancellationReasonsQuery
 } from '@akinon/next/data/client/account';
-import { AccountOrderCancellation } from '@akinon/next/types';
+import type { AccountOrderCancellation } from '@akinon/next/types';
 import {
   Button,
   Checkbox,
@@ -17,7 +17,7 @@ import {
   LoaderSpinner,
   Link
 } from '@theme/components';
-import { useState } from 'react';
+import { useState, use } from 'react';
 import { OrderDetailHeader } from '@theme/views/account/orders/order-detail-header';
 import { OrderCancellationItem } from '@theme/views/account/orders/order-cancellation-item';
 import { useLocalization } from '@akinon/next/hooks';
@@ -27,6 +27,8 @@ const accountOrderCancellationSchema = yup.object().shape({
 });
 
 const AccountOrderCancellation = ({ params }) => {
+  const pageParams = use(params) as { id: string };
+
   const { t } = useLocalization();
   const {
     register,
@@ -46,7 +48,7 @@ const AccountOrderCancellation = ({ params }) => {
     data: order,
     isLoading,
     isSuccess: orderSuccess
-  } = useGetOrderQuery(params.id);
+  } = useGetOrderQuery(pageParams.id);
 
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [responseMessage, setResponseMessage] = useState({

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

@@ -5,7 +5,7 @@ import { Image } from '@akinon/next/components/image';
 import clsx from 'clsx';
 import { SalesContractModal } from '@theme/views/sales-contract-modal';
 import { useGetOrderQuery } from '@akinon/next/data/client/account';
-import { useEffect, useState } from 'react';
+import { useEffect, useState, use } from 'react';
 
 import { OrderDetailHeader } from '@theme/views/account/orders/order-detail-header';
 import { ROUTES } from '@theme/routes';
@@ -13,7 +13,9 @@ import { useLocalization } from '@akinon/next/hooks';
 import settings from 'settings';
 import { getOrderStatus } from 'utils';
 
-const AccountOrderDetail = ({ params: { id } }) => {
+const AccountOrderDetail = ({ params }) => {
+  const pageParams = use(params) as { id: string };
+
   const { locale, t } = useLocalization();
 
   const localeValue = settings.localization.locales.find(
@@ -25,7 +27,7 @@ const AccountOrderDetail = ({ params: { id } }) => {
     isLoading,
     isSuccess,
     isFetching
-  } = useGetOrderQuery(id);
+  } = useGetOrderQuery(pageParams.id);
   const [orderDate, setOrderDate] = useState('');
 
   const groupedOrder = [];

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

@@ -252,7 +252,7 @@ export default function Page() {
             <Input
               label={t('account.my_profile.form.phone.placeholder')}
               type="tel"
-              format={user_phone_format.replace(/\9/g, '#')}
+              format={user_phone_format.replace(/9/g, '#')}
               mask="_"
               allowEmptyFormatting={true}
               control={control}

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

@@ -3,7 +3,10 @@ import { withSegmentDefaults } from '@akinon/next/hocs/server';
 import { PageProps } from '@akinon/next/types';
 import CategoryLayout from '@theme/views/category/layout';
 
-async function Page({ params, searchParams }: PageProps<{ pk: number }>) {
+async function Page(props: PageProps<{ pk: number }>) {
+  const params = await props.params;
+  const searchParams = await props.searchParams;
+
   const { data, breadcrumbData } = await getCategoryData({
     pk: params.pk,
     searchParams

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

@@ -2,7 +2,9 @@ import { getFlatPageData } from '@akinon/next/data/server';
 import { withSegmentDefaults } from '@akinon/next/hocs/server';
 import { PageProps } from '@akinon/next/types';
 
-async function Page({ params }: PageProps<{ pk: number }>) {
+async function Page(props: PageProps<{ pk: number }>) {
+  const params = await props.params;
+
   const data = await getFlatPageData({ pk: params.pk });
 
   return (

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

@@ -2,7 +2,9 @@ import { getFormData } from '@akinon/next/data/server';
 import { t } from '@akinon/next/utils/server-translation';
 import { GenerateFormFields } from '@theme/components/generate-form-fields';
 
-export default async function Page({ params }) {
+export default async function Page(props) {
+  const params = await props.params;
+
   const data = await getFormData({ pk: params.pk });
   const { schema, is_active, name, pk } = data;
 
@@ -39,7 +41,7 @@ export default async function Page({ params }) {
         formProperties={{
           actionUrl: `/api/form/${pk}/`,
           className:
-            'w-[calc(100%-36px)] md:w-[570px] px-[18px] py-[60px] md:p-[100px] border border-[#cbc8c8] border-t-[3px] border-t-[#e95151] mx-auto -mt-[100px] bg-white mb-14',
+            'w-[calc(100%-36px)] md:w-[570px] px-[18px] py-[60px] md:p-[100px] border border-[#cbc8c8] border-t-[3px] border-t-[#e95151] mx-auto -mt-[100px] bg-white mb-14'
         }}
         submitButtonText={t('form.form_page.submit_button_text')}
       />

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

@@ -5,11 +5,10 @@ import { withSegmentDefaults } from '@akinon/next/hocs/server';
 import { PageProps, Metadata } from '@akinon/next/types';
 import { generateJsonLd } from '@theme/utils/generate-jsonld';
 
-export async function generateMetadata({
-  params,
-  searchParams
-}: PageProps<{ pk: number }>) {
+export async function generateMetadata(props: PageProps): Promise<Metadata> {
   let result: Metadata = {};
+  const searchParams = await props.searchParams;
+  const params = await props.params;
 
   try {
     const {
@@ -41,7 +40,10 @@ export async function generateMetadata({
   return result;
 }
 
-async function Page({ params, searchParams }: PageProps<{ pk: number }>) {
+async function Page(props: PageProps<{ pk: number }>) {
+  const params = await props.params;
+  const searchParams = await props.searchParams;
+
   const [{ data, breadcrumbData }, deliveryReturn] = await Promise.all([
     getProductData({
       pk: params.pk,

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

@@ -2,7 +2,9 @@ import { getLandingPageData } from '@akinon/next/data/server';
 import { withSegmentDefaults } from '@akinon/next/hocs/server';
 import { PageProps } from '@akinon/next/types';
 
-async function Page({ params }: PageProps<{ pk: number }>) {
+async function Page(props: PageProps<{ pk: number }>) {
+  const params = await props.params;
+
   const data = await getLandingPageData({ pk: params.pk });
 
   const content = data.landing_page;

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

@@ -48,11 +48,13 @@ async function RootLayout({
   translations,
   children
 }: RootLayoutProps) {
+  const layoutParams = await params;
+
   return (
     <html lang={locale.isoCode} {...(locale.rtl ? { dir: 'rtl' } : {})}>
       <head />
       <body className="overflow-x-hidden">
-        <PzRoot translations={translations} {...params}>
+        <PzRoot translations={translations} {...layoutParams}>
           <ClientRoot>
             <div className="overflow-x-hidden">
               <MobileAppToggler>

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

@@ -3,7 +3,9 @@ import { withSegmentDefaults } from '@akinon/next/hocs/server';
 import { PageProps } from '@akinon/next/types';
 import CategoryLayout from '@theme/views/category/layout';
 
-async function Page({ searchParams }: PageProps) {
+async function Page(props: PageProps) {
+  const searchParams = await props.searchParams;
+
   const data = await getListData({ searchParams });
 
   return (

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

@@ -1,6 +1,6 @@
 'use client';
 
-import { useEffect, useRef } from 'react';
+import { useEffect, useRef, use } from 'react';
 import { useAppDispatch } from '@akinon/next/redux/hooks';
 import { setCurrentStep } from '@akinon/next/redux/reducers/checkout';
 import { ROUTES } from '@theme/routes';
@@ -14,14 +14,10 @@ import { Image } from '@akinon/next/components/image';
 import { Trans } from '@akinon/next/components/trans';
 import { pushPurchaseEvent } from '@theme/utils/gtm';
 
-const CheckoutCompleted = ({
-  params
-}: PageProps<{
-  token: string;
-}>) => {
+const CheckoutCompleted = (props) => {
   const { t } = useLocalization();
   const dispatch = useAppDispatch();
-
+  const params = use(props.params) as { token: string };
   const { data, isLoading } = useFetchCheckoutResultQuery(String(params.token));
 
   const carouselRef = useRef(null);

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

@@ -5,12 +5,12 @@ import { generateJsonLd } from '@theme/utils/generate-jsonld';
 import { AccordionWrapper, ProductInfo } from '@theme/views/product';
 import ProductLayout from '@theme/views/product/layout';
 
-export async function generateMetadata({
-  params,
-  searchParams
-}: PageProps<{ pk: number }>) {
+export async function generateMetadata(props: PageProps): Promise<Metadata> {
   let result: Metadata = {};
 
+  const params = await props.params;
+  const searchParams = await props.searchParams;
+
   try {
     const {
       data: { product }
@@ -40,7 +40,10 @@ export async function generateMetadata({
   return result;
 }
 
-async function Page({ params, searchParams }: PageProps<{ pk: number }>) {
+async function Page(props: PageProps<{ pk: number }>) {
+  const params = await props.params;
+  const searchParams = await props.searchParams;
+
   const [{ data, breadcrumbData }, deliveryReturn] = await Promise.all([
     getProductData({
       pk: params.pk,

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

@@ -5,7 +5,9 @@ import CategoryLayout from '@theme/views/category/layout';
 import SpecialPageBanner from '@theme/widgets/special-page-banner';
 import SpecialPageCarousel from '@theme/widgets/special-page-carousel';
 
-async function Page({ params, searchParams }: PageProps<{ pk: number }>) {
+async function Page(props: PageProps<{ pk: number }>) {
+  const params = await props.params;
+  const searchParams = await props.searchParams;
   const data = await getSpecialPageData({ pk: params.pk, searchParams });
 
   return (

package/app-template/src/app/[commerce]/[locale]/[currency]/users/email-set-primary/[[...id]]/page.tsx

@@ -2,8 +2,11 @@
 import { Icon, Link, LoaderSpinner } from '@theme/components';
 import { useLocalization } from '@akinon/next/hooks';
 import { useChangeEmailVerificationQuery } from '@akinon/next/data/client/user';
+import { use } from 'react';
+
+export default function Page(props) {
+  const { id } = use(props.params) as { id: string[] };
 
-export default function Page({ params: { id } }) {
   const { t } = useLocalization();
   const { isSuccess, isLoading } = useChangeEmailVerificationQuery(
     id.join('/')

package/app-template/src/app/[commerce]/[locale]/[currency]/users/registration/account-confirm-email/[[...id]]/page.tsx

@@ -2,8 +2,10 @@
 import { Icon, Link, LoaderSpinner } from '@theme/components';
 import { useLocalization } from '@akinon/next/hooks';
 import { useConfirmEmailVerificationQuery } from '@akinon/next/data/client/user';
+import { use } from 'react';
 
-export default function Page({ params: { id } }) {
+export default function Page(props) {
+  const { id } = use(props.params) as { id: string[] };
   const { t } = useLocalization();
   const { isSuccess, isLoading } = useConfirmEmailVerificationQuery(
     id.join('/')

package/app-template/src/app/[commerce]/[locale]/[currency]/users/reset/[[...id]]/page.tsx

@@ -10,8 +10,10 @@ import {
 } from '@akinon/next/data/client/account';
 import { useLocalization } from '@akinon/next/hooks';
 import PasswordRulesFeedback from '@theme/components/password-rules-feedback';
+import { use } from 'react';
 
-export default function NewPassword({ params: { id } }) {
+export default function NewPassword(props) {
+  const { id } = use(props.params) as { id: string };
   const { t } = useLocalization();
   const [newPassword, { isSuccess: formSuccess }] = usePasswordResetMutation();
 
@@ -24,7 +26,10 @@ export default function NewPassword({ params: { id } }) {
           /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{6,}$/,
           t('forgot_password.create_new_password.form.error.password_rule')
         )
-        .max(50, t('forgot_password.create_new_password.form.error.password_max')),
+        .max(
+          50,
+          t('forgot_password.create_new_password.form.error.password_max')
+        ),
       repeatPassword: yup
         .string()
         .required(t('forgot_password.create_new_password.form.error.required'))
@@ -79,7 +84,10 @@ export default function NewPassword({ params: { id } }) {
                   required
                 />
 
-                <PasswordRulesFeedback password={passwordValue} isVisible={errors?.password ? true : false}/>
+                <PasswordRulesFeedback
+                  password={passwordValue}
+                  isVisible={errors?.password ? true : false}
+                />
               </div>
 
               <div className="mb-2 text-left">

package/app-template/src/app/[commerce]/[locale]/[currency]/xml-sitemap/[node]/route.ts

@@ -3,7 +3,7 @@ import { urlLocaleMatcherRegex } from '@akinon/next/utils';
 export const dynamic = 'force-dynamic';
 
 export async function GET(request: Request, context: { params }) {
-  const node = context.params.node;
+  const node = (await context.params).node;
   const url = new URL(request.url);
   const matchedLocale = url.pathname.match(urlLocaleMatcherRegex);
 

package/app-template/src/components/pwa-tags.tsx

@@ -2,7 +2,6 @@ import { Metadata } from '@akinon/next/types';
 
 const pwaTags: Metadata = {
   manifest: '/manifest.json',
-  themeColor: '#FFFFFF',
   formatDetection: {
     telephone: false
   },

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

@@ -6,6 +6,7 @@ import {
   Action,
   AnyAction,
   configureStore,
+  Middleware,
   Store,
   ThunkAction,
   ThunkDispatch
@@ -13,20 +14,20 @@ import {
 import categoryReducer from '@theme/redux/reducers/category';
 import categoryMiddleware from '@theme/redux/middlewares/category';
 
+const _middlewares: Middleware[] = [...middlewares, categoryMiddleware];
+
 const _reducers = {
   ...reducers,
   category: categoryReducer
 };
 
-const _middlewares = [...middlewares, categoryMiddleware];
-
 export const makeStore = (): Store<{
   [key in keyof typeof _reducers]: ReturnType<typeof _reducers[key]>;
 }> =>
   configureStore({
     reducer: _reducers,
     middleware: (getDefaultMiddleware) =>
-      getDefaultMiddleware().concat([..._middlewares])
+      getDefaultMiddleware().concat(_middlewares)
   });
 
 export type AppStore = ReturnType<typeof makeStore>;

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

@@ -247,7 +247,7 @@ export const AddressForm = (props: Props) => {
       />
       <Input
         label={t('account.address_book.form.phone.placeholder')}
-        format={config.user_phone_format.replaceAll(/\9/g, '#')}
+        format={config.user_phone_format.replaceAll(/9/g, '#')}
         mask="_"
         allowEmptyFormatting={true}
         control={control}
@@ -339,7 +339,7 @@ export const AddressForm = (props: Props) => {
         error={errors.postcode}
         data-testid="address-form-post-code"
         required
-        format={config.user_post_code_format.replaceAll(/\9/g, '#')}
+        format={config.user_post_code_format.replaceAll(/9/g, '#')}
         control={control}
         mask="_"
         allowEmptyFormatting

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

@@ -192,7 +192,7 @@ const ContactForm = () => {
                 label={t('account.contact.form.phone.placeholder')}
                 type="tel"
                 className="mb-1"
-                format={user_phone_format.replace(/\9/g, '#')}
+                format={user_phone_format.replace(/9/g, '#')}
                 mask="_"
                 allowEmptyFormatting={true}
                 control={control}

package/app-template/src/views/guest-login/index.tsx

@@ -83,7 +83,7 @@ const GuestLogin = () => {
           className="h-14"
           name="phone_number"
           type="tel"
-          format={user_phone_format.replace(/\9/g, '#')}
+          format={user_phone_format.replace(/9/g, '#')}
           mask="_"
           control={control}
           {...register('phone_number')}

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

@@ -157,7 +157,7 @@ export default function MiniBasket() {
   const [sortedBasket, setSortedBasket] = useState([]);
 
   const totalQuantity = useMemo(() => basket?.total_quantity ?? 0, [basket]);
-  const miniBasketList = useRef();
+  const miniBasketList = useRef(null);
 
   useEffect(() => {
     if (highlightedItem > 0) {

package/app-template/src/views/otp-login/index.tsx

@@ -108,7 +108,7 @@ export const OtpLogin = () => {
             className="h-14"
             label={t('auth.login.form.phone.placeholder')}
             type="tel"
-            format={user_phone_format.replace(/\9/g, '#')}
+            format={user_phone_format.replace(/9/g, '#')}
             mask="_"
             allowEmptyFormatting={true}
             control={control}

package/app-template/src/views/register/index.tsx

@@ -303,7 +303,7 @@ export const Register = () => {
             labelStyle="floating"
             label={t('auth.register.form.phone.placeholder')}
             className="h-14"
-            format={user_phone_format.replace(/\9/g, '#')}
+            format={user_phone_format.replace(/9/g, '#')}
             allowEmptyFormatting
             mask="_"
             control={control}

package/dist/commands/commerce-url.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/dist/commands/create.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {

package/dist/commands/plugins.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {

package/package.json

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