@akinon/next 1.24.1 → 1.25.0-rc.1

package/CHANGELOG.md

@@ -1,10 +1,49 @@
 # @akinon/next
 
-## 1.24.1
+## 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
+
+- 6d4aadb: ZERO-2476: Auto install recommendenent extension
+- e20b27f: ZERO-2454:add otp login
+- a4674c6: ZERO-2461: add optional chaining for referrer header and add locale value for redirect url
+- 1ec9775: ZERO-2462:add custom span to logs
+- 3690d3b: ZERO-2485: Check ESLint peerDependency version
+- b4452e9: ZERO-2463: Refactor Sentry initialization and add Sentry DSN option to settings
+- b2da5e4: Revert ZERO-2435
+
+### Patch Changes
+
+- da1e501: ZERO-2296: Fix ROUTES import
+- 2e44646: ZERO-2434: Fix category URL in getCategoryDataHandler function
+- 8c7f5bc: ZERO-2440: Pipeline test
+  - @akinon/eslint-plugin-projectzero@1.25.0-rc.0
 
 ## 1.24.0
 

package/api/auth.ts

@@ -199,8 +199,8 @@ const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
         );
 
         const localeResults = req.headers.referer
-          .replace(baseUrl, '')
-          .match(urlLocaleMatcherRegex);
+          ?.replace(baseUrl, '')
+          ?.match(urlLocaleMatcherRegex);
 
         return `${baseUrl}${localeResults?.[0] || ''}${pathnameWithoutLocale}`;
       }
@@ -220,6 +220,17 @@ const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
     pages: {
       signIn: ROUTES.AUTH,
       error: ROUTES.AUTH
+    },
+    cookies: {
+      sessionToken: {
+        name: `__Secure-next-auth.session-token`,
+        options: {
+          httpOnly: true,
+          sameSite: 'none',
+          path: '/',
+          secure: true
+        }
+      }
     }
   };
 };

package/bin/pz-check-dependencies.js

@@ -23,6 +23,21 @@ function checkDir() {
 
 const BASE_DIR = checkDir();
 
+function getProjectZeroNextPackagePath() {
+  const possiblePaths = [
+    path.join(BASE_DIR, 'apps/projectzeronext/package.json'),
+    path.join(BASE_DIR, 'package.json')
+  ];
+
+  for (const packagePath of possiblePaths) {
+    if (fs.existsSync(packagePath)) {
+      return packagePath;
+    }
+  }
+
+  throw new Error('Unable to find package.json in expected locations.');
+}
+
 try {
   const akinonNextPackagePath = fs.existsSync(
     path.join(BASE_DIR, 'packages/akinon-next/package.json')
@@ -34,7 +49,7 @@ try {
     fs.readFileSync(akinonNextPackagePath, 'utf8')
   );
 
-  const projectZeroNextPackagePath = path.join(BASE_DIR, 'package.json');
+  const projectZeroNextPackagePath = getProjectZeroNextPackagePath();
 
   const projectZeroNextPackage = JSON.parse(
     fs.readFileSync(projectZeroNextPackagePath, 'utf8')

package/bin/pz-install-extensions.js

@@ -0,0 +1,27 @@
+const { execSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+
+function findBaseDir() {
+  let currentDir = __dirname;
+  while (currentDir !== path.resolve(currentDir, '..')) {
+    if (fs.existsSync(path.join(currentDir, 'turbo.json'))) {
+      return currentDir;
+    }
+    currentDir = path.resolve(currentDir, '..');
+  }
+  return null;
+}
+
+const BASE_DIR = findBaseDir();
+
+if (BASE_DIR) {
+  const extensions = ['bilal-akinon.pznext'];
+  extensions.forEach((extension) => {
+    try {
+      execSync(`code --install-extension ${extension}`, { stdio: 'inherit' });
+    } catch (error) {
+      console.error(`Error installing ${extension}:`);
+    }
+  });
+}

package/bin/pz-predev.js

@@ -1,4 +1,6 @@
 #!/usr/bin/env node
 
 const runScript = require('./run-script');
+
+runScript('pz-install-extensions.js');
 runScript('pz-install-theme.js');

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/data/client/user.ts

@@ -71,6 +71,17 @@ const userApi = api.injectEndpoints({
         body
       })
     }),
+    otpLogin: build.mutation<void, { phone: string }>({
+      query: ({ phone }) => ({
+        url: buildClientRequestUrl(user.otpLogin, {
+          contentType: 'application/json'
+        }),
+        method: 'POST',
+        body: {
+          phone
+        }
+      })
+    }),
     changeEmailVerification: build.query<void, string>({
       query: (token) => ({
         url: buildClientRequestUrl(user.changeEmailVerification(token), {
@@ -110,6 +121,7 @@ export const {
   useConfirmEmailVerificationQuery,
   useValidateCaptchaMutation,
   useLogoutMutation,
+  useOtpLoginMutation,
   useForgotPasswordMutation,
   useGetAnonymousTrackingMutation
 } = userApi;

package/data/urls.ts

@@ -163,6 +163,7 @@ export const wishlist = {
 export const user = {
   currentUser: '/current_user/',
   login: '/users/login/',
+  otpLogin: '/users/otp-login/',
   register: '/users/registration/',
   logout: '/users/logout',
   captcha: '/users/pz-captcha/',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.24.1",
+  "version": "1.25.0-rc.1",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -34,5 +34,8 @@
     "eslint": "^8.14.0",
     "@akinon/eslint-plugin-projectzero": "1.24.0",
     "eslint-config-prettier": "8.5.0"
+  },
+  "peerDependencies": {
+    "@akinon/eslint-plugin-projectzero": "1.24.0"
   }
 }

package/sentry/index.ts

@@ -1,27 +1,33 @@
 import * as Sentry from '@sentry/nextjs';
+import settings from 'settings';
 
 const SENTRY_DSN: string =
-  process.env.SENTRY_DSN || process.env.NEXT_PUBLIC_SENTRY_DSN;
+  settings.sentryDsn ||
+  process.env.SENTRY_DSN ||
+  process.env.NEXT_PUBLIC_SENTRY_DSN;
 
 export const initSentry = (
   type: 'Server' | 'Client' | 'Edge',
-  options: Sentry.BrowserOptions | Sentry.NodeOptions | Sentry.EdgeOptions = {}
+  options: Sentry.BrowserOptions | Sentry.NodeOptions | Sentry.EdgeOptions = {
+    dsn: SENTRY_DSN,
+    integrations: [],
+    tracesSampleRate: 1.0
+  }
 ) => {
-  // TODO: Handle options with ESLint rules
-
-  // TODO: Remove Zero Project DSN
-
-  Sentry.init({
-    dsn:
-      SENTRY_DSN ||
-      'https://d8558ef8997543deacf376c7d8d7cf4b@o64293.ingest.sentry.io/4504338423742464',
+  const initOptions = {
+    ...options,
     initialScope: {
       tags: {
+        ...((
+          options.initialScope as {
+            tags?: Record<string, string>;
+          }
+        )?.tags ?? {}),
         APP_TYPE: 'ProjectZeroNext',
         TYPE: type
       }
-    },
-    tracesSampleRate: 1.0,
-    integrations: []
-  });
+    }
+  };
+
+  Sentry.init(initOptions);
 };

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/types/index.ts

@@ -71,6 +71,12 @@ export interface Currency {
 
 export interface Settings {
   commerceUrl: string;
+  /**
+   * This option allows you to track Sentry events on the client side, in addition to server and edge environments.
+   *
+   * It overrides process.env.NEXT_PUBLIC_SENTRY_DSN and process.env.SENTRY_DSN.
+   */
+  sentryDsn?: string;
   redis: {
     defaultExpirationTime: number;
   };

package/utils/log.ts

@@ -1,3 +1,5 @@
+import { trace } from '@opentelemetry/api';
+
 enum LogLevel {
   TRACE = 'trace',
   DEBUG = 'debug',
@@ -78,61 +80,42 @@ const writeMsg = ({ level, message, payload }: Message) => {
   }
 };
 
-const info: LoggerFn = (message, payload) => {
-  writeMsg({
-    level: LogLevel.INFO,
-    message,
-    payload
-  });
-};
+function createCustomSpan({ level, message, payload }: Message) {
+  const tracer = trace.getTracer('pz-next-app');
+  const span = tracer.startSpan('custom-operation-log');
 
-const error: LoggerFn = (message, payload) => {
-  writeMsg({
-    level: LogLevel.ERROR,
-    message,
-    payload
-  });
-};
-
-const warn: LoggerFn = (message, payload) => {
-  writeMsg({
-    level: LogLevel.WARN,
-    message,
-    payload
+  span.setAttributes({
+    level: level,
+    message: message,
+    payload: payload
   });
-};
 
-const debug: LoggerFn = (message, payload) => {
-  writeMsg({
-    level: LogLevel.DEBUG,
-    message,
-    payload
-  });
-};
+  span.end();
+}
 
-const trace: LoggerFn = (message, payload) => {
-  writeMsg({
-    level: LogLevel.TRACE,
+const createLogAndSpan = (level: LogLevel, message: string, payload?: any) => {
+  const content = {
+    level,
     message,
-    payload
-  });
-};
+    payload: JSON.stringify(payload)
+  };
 
-const fatal: LoggerFn = (message, payload) => {
-  writeMsg({
-    level: LogLevel.FATAL,
-    message,
-    payload
-  });
+  writeMsg(content);
+  createCustomSpan(content);
 };
 
-const logger = {
-  trace,
-  debug,
-  info,
-  warn,
-  error,
-  fatal
+const logger: Record<LogLevel, LoggerFn> = {
+  trace: (message, payload) =>
+    createLogAndSpan(LogLevel.TRACE, message, payload),
+  debug: (message, payload) =>
+    createLogAndSpan(LogLevel.DEBUG, message, payload),
+  info: (message, payload) => createLogAndSpan(LogLevel.INFO, message, payload),
+  warn: (message, payload) => createLogAndSpan(LogLevel.WARN, message, payload),
+  error: (message, payload) =>
+    createLogAndSpan(LogLevel.ERROR, message, payload),
+  fatal: (message, payload) =>
+    createLogAndSpan(LogLevel.FATAL, message, payload),
+  silent: () => {}
 };
 
 export default logger;

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