@akinon/next 1.25.0-rc.0 → 1.25.0-rc.2

package/CHANGELOG.md

@@ -1,5 +1,41 @@
 # @akinon/next
 
+## 1.25.0-rc.2
+
+### Minor Changes
+
+- 7e41bdc: BRDG-9158: Remove redirect-three-d page endpoint
+
+### Patch Changes
+
+- @akinon/eslint-plugin-projectzero@1.25.0-rc.2
+
+## 1.25.0-rc.1
+
+### Minor Changes
+
+- 6d4aadb: ZERO-2476: Auto install recommendenent extension
+- e20b27f: ZERO-2454:add otp login
+- e0a945e: ZERO-2494:Add LiveCommerce for managing basket and product actions
+- a4674c6: ZERO-2461: add optional chaining for referrer header and add locale value for redirect url
+- 1ec9775: ZERO-2462:add custom span to logs
+- ab5a493: ZERO-2475:add types [key: string]: any; for unknown attributes
+- 3690d3b: ZERO-2485: Check ESLint peerDependency version
+- 92094d4: ZERO-2477: Update Sentry version and add hideSourceMaps option
+- b4452e9: ZERO-2463: Refactor Sentry initialization and add Sentry DSN option to settings
+- b2da5e4: Revert ZERO-2435
+- d3edd3a: ZERO-2499:add style prop in link component
+- f76f079: ZERO-2493: Add redirect util function
+
+### Patch Changes
+
+- da1e501: ZERO-2296: Fix ROUTES import
+- 95510c7: ZERO-2508: Enable rc branch pipeline and add check-publish-version step
+- 2e44646: ZERO-2434: Fix category URL in getCategoryDataHandler function
+- 8c7f5bc: ZERO-2440: Pipeline test
+- Updated dependencies [95510c7]
+  - @akinon/eslint-plugin-projectzero@1.25.0-rc.1
+
 ## 1.25.0-rc.0
 
 ### Minor Changes

package/components/index.ts

@@ -17,4 +17,5 @@ export * from './react-portal';
 export * from './selected-payment-option-view';
 export * from './trans';
 export * from './link';
-export * from './pagination';
+export * from './pagination';
+export * from './live-commerce';

package/components/link.tsx

@@ -6,19 +6,13 @@ import { urlLocaleMatcherRegex } from '@akinon/next/utils';
 import NextLink, { LinkProps as NextLinkProps } from 'next/link';
 import { useEffect, useState } from 'react';
 
-interface LinkProps extends NextLinkProps {
-  children: React.ReactNode;
-  className?: string;
-  target?: '_blank' | '_self' | '_parent' | '_top';
-}
+type LinkProps = Omit<
+  React.AnchorHTMLAttributes<HTMLAnchorElement>,
+  keyof NextLinkProps
+> &
+  NextLinkProps;
 
-export const Link = ({
-  children,
-  target,
-  className,
-  href,
-  ...rest
-}: LinkProps) => {
+export const Link = ({ children, href, ...rest }: LinkProps) => {
   const { locale, defaultLocaleValue, localeUrlStrategy } = useLocalization();
   const [formattedHref, setFormattedHref] = useState(href ?? '#');
 
@@ -40,12 +34,7 @@ export const Link = ({
   }, [href, defaultLocaleValue, locale, localeUrlStrategy]);
 
   return (
-    <NextLink
-      href={formattedHref}
-      target={target}
-      className={className}
-      {...rest}
-    >
+    <NextLink href={formattedHref} {...rest}>
       {children}
     </NextLink>
   );

package/components/live-commerce.tsx

@@ -0,0 +1,42 @@
+'use client';
+
+import { memo, useEffect } from 'react';
+import { useAppDispatch } from '@akinon/next/redux/hooks';
+import { useAddProductMutation } from '../data/client/product';
+import { basketApi } from '@akinon/next/data/client/basket';
+import { useGetBasketQuery } from '@akinon/next/data/client/basket';
+
+export const LiveCommerce = memo(function Callback() {
+  const dispatch = useAppDispatch();
+  const { refetch: refetchBasketData } = useGetBasketQuery();
+  const [addProduct] = useAddProductMutation();
+
+  useEffect(() => {
+    document.addEventListener('refresh-basket', () => refetchBasketData());
+
+    document.addEventListener('add-to-cart', async (e: CustomEvent) => {
+      const productData = e.detail.data;
+
+      await addProduct({
+        product: productData.product,
+        quantity: productData.quantity,
+        attributes: productData.attributes
+      })
+        .unwrap()
+        .then((data) =>
+          dispatch(
+            basketApi.util.updateQueryData(
+              'getBasket',
+              undefined,
+              (draftBasket) => {
+                Object.assign(draftBasket, data.basket);
+              }
+            )
+          )
+        );
+    });
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  return null;
+});

package/middlewares/default.ts

@@ -97,6 +97,12 @@ const withPzDefault =
       );
     }
 
+    if (req.nextUrl.pathname.startsWith('/orders/redirect-three-d')) {
+      return NextResponse.rewrite(
+        new URL(`${encodeURI(Settings.commerceUrl)}/orders/redirect-three-d/`)
+      );
+    }
+
     // If commerce redirects to /orders/checkout/ without locale
     if (
       req.nextUrl.pathname.match(new RegExp('^/orders/checkout/$')) &&

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.25.0-rc.0",
+  "version": "1.25.0-rc.2",
   "private": false,
   "license": "MIT",
   "bin": {

package/types/commerce/address.ts

@@ -91,4 +91,5 @@ export interface Address {
   address: string;
   fax_phone_number: string;
   image: string;
+  [key: string]: any;
 }

package/types/commerce/category.ts

@@ -93,6 +93,7 @@ export interface GetCategoryResponse {
   search_text: string | null;
   sorters: SortOption[];
   special_page: SpecialPageType;
+  [key: string]: any;
 }
 
 export type BreadcrumbResultType = {

package/types/commerce/product.ts

@@ -54,6 +54,10 @@ export interface Product {
   modified_date: string;
   description?: string;
   quantity: string;
+  extra_data: {
+    [key: string]: any;
+  };
+  [key: string]: any;
 }
 
 export interface FavoriteItem {

package/utils/redirect.ts

@@ -0,0 +1,30 @@
+import { redirect as nextRedirect, RedirectType } from 'next/navigation';
+import Settings from 'settings';
+import { headers } from 'next/headers';
+import { ServerVariables } from '@akinon/next/utils/server-variables';
+import { getUrlPathWithLocale } from '@akinon/next/utils/localization';
+
+export const redirect = (path: string, type?: RedirectType) => {
+  const nextHeaders = headers();
+  const pageUrl = new URL(
+    nextHeaders.get('pz-url') ?? process.env.NEXT_PUBLIC_URL
+  );
+
+  const currentLocale = Settings.localization.locales.find(
+    (locale) => locale.value === ServerVariables.locale
+  );
+
+  const callbackUrl = pageUrl.pathname;
+  const redirectUrlWithLocale = getUrlPathWithLocale(
+    path,
+    currentLocale.localePath ?? currentLocale.value
+  );
+
+  const redirectUrl = `${redirectUrlWithLocale}?callbackUrl=${callbackUrl}`;
+
+  if (type) {
+    return nextRedirect(redirectUrl, type);
+  } else {
+    return nextRedirect(redirectUrl);
+  }
+};

package/with-pz-config.js

@@ -59,6 +59,9 @@ const defaultConfig = {
       }, {})
     };
     return config;
+  },
+  sentry: {
+    hideSourceMaps: true
   }
 };
 

package/components/redirect-three-d/content/index.tsx

@@ -1,74 +0,0 @@
-'use client';
-
-import { useEffect, useState } from 'react';
-import { ROUTES } from 'routes';
-import { useGet3dRedirectFormQuery } from '@akinon/next/data/client/checkout';
-import { LoaderSpinner } from 'components';
-import { useLocalization } from '../../../hooks/use-localization';
-import { getUrlPathWithLocale } from '../../../utils/localization';
-import { useSearchParams } from 'next/navigation';
-
-interface RedirectThreeDContentProps {
-  sessionId: string;
-}
-
-export default function RedirectThreeDContent({
-  sessionId
-}: RedirectThreeDContentProps) {
-  const searchParams = useSearchParams();
-  const { data } = useGet3dRedirectFormQuery();
-  const [error, setError] = useState(null);
-  const { locale } = useLocalization();
-
-  useEffect(() => {
-    if (data) {
-      const fragment = document.createElement('fragment');
-      fragment.innerHTML = data.result;
-
-      const form = fragment.querySelector('form');
-
-      // a way to determine if response includes a redirection form or not
-      if (fragment.querySelector('link[rel="canonical"]') || !form) {
-        setError('Redirecting to checkout page. Please wait...');
-
-        setTimeout(() => {
-          let checkoutUrl = `${ROUTES.CHECKOUT}`;
-
-          // iframe param is used to prevent header and footer rendering
-          if (searchParams.get('iframe') === 'true') {
-            checkoutUrl = `${checkoutUrl}?iframe=true`;
-          }
-
-          // Use `window.location.href` instead of `router.push`
-          // to capture the url change event in iframe
-          location.href = getUrlPathWithLocale(checkoutUrl, locale);
-        }, 3000);
-        return;
-      }
-
-      const pzParamsInput = document.createElement('input');
-      pzParamsInput.setAttribute('type', 'hidden');
-      pzParamsInput.setAttribute('name', 'pzparams');
-      pzParamsInput.setAttribute(
-        'value',
-        encodeURIComponent(
-          JSON.stringify({
-            session: sessionId,
-            locale
-          })
-        )
-      );
-      form.appendChild(pzParamsInput);
-
-      form.style.display = 'none';
-      document.body.appendChild(form);
-      form.submit();
-    }
-  }, [data]);
-
-  return (
-    <div className="flex items-center justify-center py-20">
-      {error ?? <LoaderSpinner />}
-    </div>
-  );
-}

package/components/redirect-three-d/index.tsx

@@ -1,17 +0,0 @@
-import { cookies } from 'next/headers';
-import { redirect } from 'next/navigation';
-import RedirectThreeDContent from './content';
-import { ROUTES } from 'routes';
-
-const RedirectThreeD = async () => {
-  const nextCookies = cookies();
-  const sessionId = await nextCookies.get('osessionid')?.value;
-
-  if (!sessionId) {
-    return redirect(ROUTES.CHECKOUT);
-  }
-
-  return <RedirectThreeDContent sessionId={sessionId} />;
-};
-
-export default RedirectThreeD;