@akinon/projectzero 1.84.0 → 1.85.0-rc.0

package/app-template/next.config.mjs

@@ -26,7 +26,10 @@ const withPwaConfig = withPWA({
 
 const sentryConfig = {
   silent: true,
-  dryRun: !process.env.SENTRY_DSN
+  dryRun: !process.env.SENTRY_DSN,
+  org: 'akinon'
+  // project: 'enter_your_project_name_here',
+  // authToken: 'enter_your_auth_token_here'
 };
 
 const enhancedConfig = withPzConfig(nextConfig);

package/app-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectzeronext",
-  "version": "1.84.0",
+  "version": "1.85.0-rc.0",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -22,26 +22,25 @@
     "prestart": "pz-prestart"
   },
   "dependencies": {
-    "@akinon/next": "1.84.0",
-    "@akinon/pz-akifast": "1.84.0",
-    "@akinon/pz-b2b": "1.84.0",
-    "@akinon/pz-basket-gift-pack": "1.84.0",
-    "@akinon/pz-bkm": "1.84.0",
-    "@akinon/pz-checkout-gift-pack": "1.84.0",
-    "@akinon/pz-click-collect": "1.84.0",
-    "@akinon/pz-credit-payment": "1.84.0",
-    "@akinon/pz-gpay": "1.84.0",
-    "@akinon/pz-masterpass": "1.84.0",
-    "@akinon/pz-one-click-checkout": "1.84.0",
-    "@akinon/pz-otp": "1.84.0",
-    "@akinon/pz-pay-on-delivery": "1.84.0",
-    "@akinon/pz-saved-card": "1.84.0",
-    "@akinon/pz-tabby-extension": "1.84.0",
-    "@akinon/pz-tamara-extension": "1.84.0",
+    "@akinon/next": "1.85.0-rc.0",
+    "@akinon/pz-akifast": "1.85.0-rc.0",
+    "@akinon/pz-b2b": "1.85.0-rc.0",
+    "@akinon/pz-basket-gift-pack": "1.85.0-rc.0",
+    "@akinon/pz-bkm": "1.85.0-rc.0",
+    "@akinon/pz-checkout-gift-pack": "1.85.0-rc.0",
+    "@akinon/pz-click-collect": "1.85.0-rc.0",
+    "@akinon/pz-credit-payment": "1.85.0-rc.0",
+    "@akinon/pz-gpay": "1.85.0-rc.0",
+    "@akinon/pz-masterpass": "1.85.0-rc.0",
+    "@akinon/pz-one-click-checkout": "1.85.0-rc.0",
+    "@akinon/pz-otp": "1.85.0-rc.0",
+    "@akinon/pz-pay-on-delivery": "1.85.0-rc.0",
+    "@akinon/pz-saved-card": "1.85.0-rc.0",
+    "@akinon/pz-tabby-extension": "1.85.0-rc.0",
+    "@akinon/pz-tamara-extension": "1.85.0-rc.0",
     "@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.25",
@@ -62,7 +61,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.84.0",
+    "@akinon/eslint-plugin-projectzero": "1.85.0-rc.0",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",

package/app-template/public/locales/en/common.json

@@ -38,6 +38,12 @@
     "description": "Please try again later.",
     "link_text": "Return to home page"
   },
+  "client_error": {
+    "title": "We encountered a problem with the page.",
+    "description": "This appears to be a client-side issue. Please try refreshing the page or clearing your browser cache.",
+    "link_text": "Return to home page"
+  },
+  "try_again": "Try Again",
   "breadcrumb": {
     "homepage": "Homepage"
   },

package/app-template/public/locales/tr/common.json

@@ -38,6 +38,12 @@
     "description": "Lütfen daha sonra tekrar deneyiniz.",
     "link_text": "Ana sayfaya dön"
   },
+  "client_error": {
+    "title": "Sayfada bir sorunla karşılaştık.",
+    "description": "Bu bir tarayıcı hatası gibi görünüyor. Lütfen sayfayı yenileyin veya tarayıcı önbelleğinizi temizleyin.",
+    "link_text": "Ana sayfaya dön"
+  },
+  "try_again": "Tekrar Dene",
   "breadcrumb": {
     "homepage": "Anasayfa"
   },

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

@@ -1,87 +1,14 @@
-'use client';
-
-import { useEffect } from 'react';
-import { ROUTES } from '@theme/routes';
-import { useGetBasketQuery } from '@akinon/next/data/client/basket';
-import { pushCartView } from '@theme/utils/gtm';
-import { Button, LoaderSpinner, Link } from '@theme/components';
-import { BasketItem, Summary } from '@theme/views/basket';
-import { useLocalization } from '@akinon/next/hooks';
-import PluginModule, { Component } from '@akinon/next/components/plugin-module';
+import { BasketContent } from '@theme/views/basket/basket-content';
+import { getBasketData } from '@akinon/next/data/server/basket';
 import settings from '@theme/settings';
 
-export default function Page() {
-  const { data: basket, isLoading, isSuccess } = useGetBasketQuery();
-  const { t } = useLocalization();
-  const multiBasket = settings.plugins?.multiBasket ?? false;
-
-  useEffect(() => {
-    if (isSuccess) {
-      const products = basket.basketitem_set.map((basketItem) => ({
-        ...basketItem.product
-      }));
-      pushCartView(products);
-    }
-  }, [basket, isSuccess]);
-
-  return (
-    <div className="max-w-screen-xl p-4 flex flex-col text-primary-800 lg:p-8 xl:flex-row xl:mx-auto">
-      {isLoading && (
-        <div className="flex justify-center w-full">
-          <LoaderSpinner />
-        </div>
-      )}
-      {isSuccess &&
-        (basket && basket.basketitem_set && basket.basketitem_set.length > 0 ? (
-          <>
-            <div className="flex-1 xl:mr-16">
-              <div className="flex items-center justify-between py-2 border-b border-gray-200 lg:py-3">
-                <h2 className="text-xl lg:text-2xl font-light">
-                  {t('basket.my_cart')}
-                </h2>
-                <Link
-                  href={ROUTES.HOME}
-                  className="text-xs hover:text-secondary-500"
-                >
-                  {t('basket.back_to_shopping')}
-                </Link>
-              </div>
-              <ul>
-                {multiBasket ? (
-                  <PluginModule
-                    component={Component.MultiBasket}
-                    props={{ BasketItem }}
-                  />
-                ) : (
-                  basket.basketitem_set.map((basketItem, index) => (
-                    <BasketItem basketItem={basketItem} key={index} />
-                  ))
-                )}
-              </ul>
-            </div>
-            <Summary basket={basket} />
-          </>
-        ) : (
-          <div className="flex flex-col items-center container max-w-screen-sm py-4 px-4 xs:py-6 xs:px-6 sm:py-8 sm:px-8 lg:max-w-screen-xl">
-            <h1
-              className="w-full text-xl font-light text-secondary text-center sm:text-2xl"
-              data-testid="basket-empty"
-            >
-              {t('basket.empty.title')}
-            </h1>
+export default async function Page() {
+  const { basket } = await getBasketData();
 
-            <div className="w-full text-sm text-black-800 text-center my-4 mb-2 sm:text-base">
-              <p>{t('basket.empty.content_first')}</p>
-              <p>{t('basket.empty.content_second')}.</p>
-            </div>
+  const multiBasket: boolean =
+    typeof settings.plugins?.multiBasket === 'boolean'
+      ? settings.plugins.multiBasket
+      : false;
 
-            <Link href={ROUTES.HOME} passHref>
-              <Button className="px-10 mt-2" appearance="filled">
-                {t('basket.empty.button')}
-              </Button>
-            </Link>
-          </div>
-        ))}
-    </div>
-  );
+  return <BasketContent initialBasket={basket} multiBasket={multiBasket} />;
 }

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

@@ -1,20 +1,17 @@
 'use client';
 
-import { useLocalization } from '@akinon/next/hooks';
-import { Link } from '@theme/components';
-import { ROUTES } from '@theme/routes';
+import { useSentryUncaughtErrors } from '@akinon/next/hooks';
+import PzErrorPage from '@akinon/next/views/error-page';
 
-export default function Error() {
-  const { t } = useLocalization();
+export default function ErrorPage({
+  error,
+  reset
+}: {
+  error: Error & { digest?: string; isServerError?: boolean };
+  reset: () => void;
+}) {
+  // DO NOT REMOVE THIS LINE TO REPORT UNCAUGHT ERRORS TO SENTRY
+  useSentryUncaughtErrors(error);
 
-  return (
-    <section className="text-center px-6 my-14 md:px-0 md:m-14">
-      <div className="text-7xl font-bold md:text-8xl">500</div>
-      <h1 className="text-lg md:text-xl"> {t('common.page_500.title')} </h1>
-      <p className="text-lg md:text-xl"> {t('common.page_500.description')} </p>
-      <Link href={ROUTES.HOME} className="text-lg underline">
-        {t('common.page_500.link_text')}
-      </Link>
-    </section>
-  );
+  return <PzErrorPage error={error} reset={reset} />;
 }

package/app-template/src/settings.js

@@ -1,6 +1,10 @@
 const { LocaleUrlStrategy } = require('@akinon/next/localization');
 const { ROUTES } = require('@theme/routes');
 
+/* IMPORTANT *
+ * In order to use one locale in the locales array and hide the default locale in the URL, you need to set the localeUrlStrategy to LocaleUrlStrategy.ShowAllLocales.
+ */
+
 const commerceUrl = encodeURI(process.env.SERVICE_BACKEND_URL ?? 'default');
 
 /** @type {import('@akinon/next/types').Settings} */
@@ -14,6 +18,7 @@ module.exports = {
     { translationKey: 'size', key: 'size' }
   ],
   localization: {
+    // If there is one locale in the locales array, the default locale will be hidden in the URL.
     locales: [
       {
         label: 'EN',
@@ -41,7 +46,7 @@ module.exports = {
       }
     ],
     defaultLocaleValue: 'en',
-    localeUrlStrategy: LocaleUrlStrategy.HideDefaultLocale,
+    localeUrlStrategy: LocaleUrlStrategy.HideDefaultLocale, // If there is one locale in the locales array, the default locale will be hidden in the URL and localeUrlStrategy should be set to LocaleUrlStrategy.ShowAllLocales.
     redirectToDefaultLocale: true,
     defaultCurrencyCode: 'usd'
   },

package/app-template/src/views/basket/basket-content.tsx

@@ -0,0 +1,106 @@
+'use client';
+
+import { useLocalization } from '@akinon/next/hooks';
+import { Basket } from '@akinon/next/types';
+import { Button, LoaderSpinner, Link } from '@theme/components';
+import { BasketItem, Summary } from '@theme/views/basket';
+import { ROUTES } from '@theme/routes';
+import PluginModule, { Component } from '@akinon/next/components/plugin-module';
+import { useEffect, useState } from 'react';
+import { pushCartView } from '@theme/utils/gtm';
+
+interface BasketContentProps {
+  initialBasket: Basket;
+  multiBasket: boolean;
+}
+
+export function BasketContent({
+  initialBasket,
+  multiBasket
+}: BasketContentProps) {
+  const { t } = useLocalization();
+  const [basket, setBasket] = useState<Basket>(initialBasket);
+
+  useEffect(() => {
+    if (basket) {
+      const products = basket.basketitem_set.map((basketItem) => ({
+        ...basketItem.product
+      }));
+      pushCartView(products);
+    }
+  }, [basket]);
+
+  const handleBasketUpdate = (updatedBasket: Basket) => {
+    setBasket(updatedBasket);
+  };
+
+  if (!basket) {
+    return (
+      <div className="flex justify-center w-full">
+        <LoaderSpinner />
+      </div>
+    );
+  }
+
+  return (
+    <div className="max-w-screen-xl p-4 flex flex-col text-primary-800 lg:p-8 xl:flex-row xl:mx-auto">
+      {basket.basketitem_set && basket.basketitem_set.length > 0 ? (
+        <>
+          <div className="flex-1 xl:mr-16">
+            <div className="flex items-center justify-between py-2 border-b border-gray-200 lg:py-3">
+              <h2 className="text-xl lg:text-2xl font-light">
+                {t('basket.my_cart')}
+              </h2>
+              <Link
+                href={ROUTES.HOME}
+                className="text-xs hover:text-secondary-500"
+              >
+                {t('basket.back_to_shopping')}
+              </Link>
+            </div>
+            <ul>
+              {multiBasket ? (
+                <PluginModule
+                  component={Component.MultiBasket}
+                  props={{
+                    BasketItem,
+                    onBasketUpdate: handleBasketUpdate
+                  }}
+                />
+              ) : (
+                basket.basketitem_set.map((basketItem, index) => (
+                  <BasketItem
+                    key={index}
+                    basketItem={basketItem}
+                    onBasketUpdate={handleBasketUpdate}
+                  />
+                ))
+              )}
+            </ul>
+          </div>
+          <Summary basket={basket} onBasketUpdate={handleBasketUpdate} />
+        </>
+      ) : (
+        <div className="flex flex-col items-center container max-w-screen-sm py-4 px-4 xs:py-6 xs:px-6 sm:py-8 sm:px-8 lg:max-w-screen-xl">
+          <h1
+            className="w-full text-xl font-light text-secondary text-center sm:text-2xl"
+            data-testid="basket-empty"
+          >
+            {t('basket.empty.title')}
+          </h1>
+
+          <div className="w-full text-sm text-black-800 text-center my-4 mb-2 sm:text-base">
+            <p>{t('basket.empty.content_first')}</p>
+            <p>{t('basket.empty.content_second')}.</p>
+          </div>
+
+          <Link href={ROUTES.HOME} passHref>
+            <Button className="px-10 mt-2" appearance="filled">
+              {t('basket.empty.button')}
+            </Button>
+          </Link>
+        </div>
+      )}
+    </div>
+  );
+}

package/app-template/src/views/basket/basket-item.tsx

@@ -3,7 +3,7 @@ import {
   useUpdateQuantityMutation
 } from '@akinon/next/data/client/basket';
 import { useAppDispatch } from '@akinon/next/redux/hooks';
-import { BasketItem as BasketItemType } from '@akinon/next/types';
+import { Basket, BasketItem as BasketItemType } from '@akinon/next/types';
 import { Price, Button, Icon, Modal, Select, Link } from '@theme/components';
 import { useState } from 'react';
 import { useAddFavoriteMutation } from '@akinon/next/data/client/wishlist';
@@ -19,11 +19,12 @@ import { pushRemoveFromCart } from '@theme/utils/gtm';
 interface Props {
   basketItem?: BasketItemType;
   namespace?: string;
+  onBasketUpdate?: (basket: Basket) => void;
 }
 
 export const BasketItem = (props: Props) => {
   const { t } = useLocalization();
-  const { basketItem, namespace } = props;
+  const { basketItem, namespace, onBasketUpdate } = props;
   const [updateQuantityMutation] = useUpdateQuantityMutation();
   const dispatch = useAppDispatch();
   const [isRemoveBasketModalOpen, setRemoveBasketModalOpen] = useState(false);
@@ -49,19 +50,21 @@ export const BasketItem = (props: Props) => {
       requestParams.namespace = namespace;
     }
 
-    await updateQuantityMutation(requestParams)
-      .unwrap()
-      .then((data) =>
-        dispatch(
-          basketApi.util.updateQueryData(
-            'getBasket',
-            undefined,
-            (draftBasket) => {
-              Object.assign(draftBasket, data.basket);
-            }
-          )
+    try {
+      const response = await updateQuantityMutation(requestParams).unwrap();
+      dispatch(
+        basketApi.util.updateQueryData(
+          'getBasket',
+          undefined,
+          (draftBasket) => {
+            Object.assign(draftBasket, response.basket);
+          }
         )
       );
+      onBasketUpdate?.(response.basket);
+    } catch (error) {
+      console.error('Error updating quantity:', error);
+    }
   };
 
   const deleteProduct = async (productPk?: number) => {

package/app-template/src/views/basket/summary.tsx

@@ -18,6 +18,7 @@ import clsx from 'clsx';
 
 interface Props {
   basket: Basket;
+  onBasketUpdate?: (basket: Basket) => void;
 }
 
 const voucherCodeFormSchema = (t) =>
@@ -27,7 +28,7 @@ const voucherCodeFormSchema = (t) =>
 
 export const Summary = (props: Props) => {
   const { t } = useLocalization();
-  const { basket } = props;
+  const { basket, onBasketUpdate } = props;
   const router = useRouter();
   const {
     register,
@@ -53,7 +54,7 @@ export const Summary = (props: Props) => {
   const removeVoucherCode = () => {
     removeVoucherCodeMutation()
       .unwrap()
-      .then((basket) =>
+      .then((basket) => {
         dispatch(
           basketApi.util.updateQueryData(
             'getBasket',
@@ -62,8 +63,9 @@ export const Summary = (props: Props) => {
               Object.assign(draftBasket, basket);
             }
           )
-        )
-      )
+        );
+        onBasketUpdate?.(basket);
+      })
       .catch((error: Error) => {
         setError('voucherCode', { message: error.data.non_field_errors });
       });
@@ -74,7 +76,7 @@ export const Summary = (props: Props) => {
       voucher_code: data.voucherCode
     })
       .unwrap()
-      .then((basket) =>
+      .then((basket) => {
         dispatch(
           basketApi.util.updateQueryData(
             'getBasket',
@@ -83,8 +85,9 @@ export const Summary = (props: Props) => {
               Object.assign(draftBasket, basket);
             }
           )
-        )
-      )
+        );
+        onBasketUpdate?.(basket);
+      })
       .catch((error: Error) => {
         setError('voucherCode', { message: error.data.non_field_errors });
       });

package/app-template/src/views/header/action-menu.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { ReactNode, useMemo, useRef, useCallback } from 'react';
-import { useGetBasketQuery } from '@akinon/next/data/client/basket';
+import { useGetMiniBasketQuery } from '@akinon/next/data/client/basket';
 import { useAppDispatch, useAppSelector } from '@akinon/next/redux/hooks';
 import {
   closeMiniBasket,
@@ -29,8 +29,11 @@ interface MenuItem {
 export default function ActionMenu() {
   const dispatch = useAppDispatch();
 
-  const { data } = useGetBasketQuery();
-  const totalQuantity = useMemo(() => data?.total_quantity ?? 0, [data]);
+  const { data: miniBasket } = useGetMiniBasketQuery();
+  const totalQuantity = useMemo(
+    () => miniBasket?.total_quantity ?? 0,
+    [miniBasket]
+  );
 
   const { open: miniBasketOpen } = useAppSelector(
     (state) => state.root.miniBasket

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

@@ -5,6 +5,7 @@ import clsx from 'clsx';
 import {
   basketApi,
   useGetBasketQuery,
+  useGetMiniBasketQuery,
   useUpdateQuantityMutation
 } from '@akinon/next/data/client/basket';
 import { useAppDispatch, useAppSelector } from '@akinon/next/redux/hooks';
@@ -151,12 +152,16 @@ export default function MiniBasket() {
   );
   const dispatch = useAppDispatch();
   const { data: basket, isLoading, isSuccess } = useGetBasketQuery();
+  const { data: miniBasket } = useGetMiniBasketQuery();
   const { t } = useLocalization();
   const { highlightedItem } = useAppSelector((state) => state.root.miniBasket);
   const [highlightedItemPk, setHighlightedItemPk] = useState(0);
   const [sortedBasket, setSortedBasket] = useState([]);
 
-  const totalQuantity = useMemo(() => basket?.total_quantity ?? 0, [basket]);
+  const totalQuantity = useMemo(
+    () => miniBasket?.total_quantity ?? 0,
+    [miniBasket]
+  );
   const miniBasketList = useRef();
 
   useEffect(() => {

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

@@ -10,9 +10,10 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import clsx from 'clsx';
 import { useLocalization } from '@akinon/next/hooks';
 import { useOtpLoginMutation } from '@akinon/next/data/client/user';
-import { useAppSelector } from '@akinon/next/redux/hooks';
+import { useAppDispatch, useAppSelector } from '@akinon/next/redux/hooks';
 import PluginModule, { Component } from '@akinon/next/components/plugin-module';
 import { AuthError } from '@akinon/next/types';
+import { showPopup } from '@akinon/pz-otp/src/redux/reducer';
 
 const loginFormSchema = (t) =>
   yup.object().shape({
@@ -25,9 +26,9 @@ const loginFormSchema = (t) =>
   });
 
 export const OtpLogin = () => {
+  const dispatch = useAppDispatch();
   const { user_phone_format } = useAppSelector((state) => state.config);
   const { t, locale } = useLocalization();
-  const [showOtpModal, setShowOtpModal] = useState(false);
   const [otpLoginMutation] = useOtpLoginMutation();
 
   const {
@@ -79,7 +80,7 @@ export const OtpLogin = () => {
     })
       .unwrap()
       .then(() => {
-        setShowOtpModal(true);
+        dispatch(showPopup());
       })
       .catch((error) => {
         if (error.status === 429) {
@@ -136,17 +137,14 @@ export const OtpLogin = () => {
         </Button>
       </form>
 
-      {showOtpModal && (
-        <PluginModule
-          component={Component.Otp}
-          props={{
-            setShowPopup: setShowOtpModal,
-            data: getValues(),
-            submitAction: loginHandler,
-            error: formError
-          }}
-        />
-      )}
+      <PluginModule
+        component={Component.Otp}
+        props={{
+          data: getValues(),
+          submitAction: loginHandler,
+          error: formError
+        }}
+      />
     </section>
   );
 };

package/codemods/sentry-9/index.js

@@ -0,0 +1,30 @@
+const path = require('path');
+const { execSync } = require('child_process');
+
+const codemodScripts = [
+  path.resolve(__dirname, 'remove-sentry-dependency.js'),
+  path.resolve(__dirname, 'remove-sentry-configs.js'),
+  path.resolve(__dirname, 'replace-error-page.js')
+];
+
+const transform = () => {
+  const workingDir = path.resolve(process.cwd());
+
+  codemodScripts.forEach((script) => {
+    try {
+      execSync(
+        `jscodeshift --ignore-pattern="**/node_modules/**" -t ${script} ${workingDir} --extensions=json,ts,tsx,js,jsx,properties,md`,
+        {
+          cwd: workingDir,
+          stdio: 'inherit'
+        }
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  });
+};
+
+module.exports = {
+  transform
+};

package/codemods/sentry-9/remove-sentry-configs.js

@@ -0,0 +1,14 @@
+const fs = require('fs');
+
+const transform = (fileInfo, api, options) => {
+  const filePath = fileInfo.path;
+  const regex = /sentry\.\w+\.config\.(ts|js)$|sentry\.properties$/i;
+
+  if (regex.test(filePath) && fs.existsSync(filePath)) {
+    fs.unlinkSync(filePath);
+  }
+
+  return fileInfo.source;
+};
+
+module.exports = transform;

package/codemods/sentry-9/remove-sentry-dependency.js

@@ -0,0 +1,25 @@
+const transform = (fileInfo, api, options) => {
+  if (fileInfo.path.endsWith('package.json')) {
+    const packageJson = JSON.parse(fileInfo.source);
+
+    if (
+      packageJson.dependencies &&
+      packageJson.dependencies['@sentry/nextjs']
+    ) {
+      delete packageJson.dependencies['@sentry/nextjs'];
+    }
+
+    if (
+      packageJson.devDependencies &&
+      packageJson.devDependencies['@sentry/nextjs']
+    ) {
+      delete packageJson.devDependencies['@sentry/nextjs'];
+    }
+
+    return JSON.stringify(packageJson, null, 2);
+  }
+
+  return fileInfo.source;
+};
+
+module.exports = transform;