@akinon/next 1.24.0-rc.7 → 1.24.1

package/CHANGELOG.md

@@ -1,59 +1,26 @@
 # @akinon/next
 
-## 1.24.0-rc.7
-
-### Minor Changes
-
-- 6d4aadb9: ZERO-2476: Auto install recommendenent extension
-- 3690d3bd: ZERO-2485: Eslint version dynamically adds as a peerdependinciey and checks the version
-
-## 1.24.0-rc.6
-
-### Minor Changes
-
-- 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
-
-## 1.24.0-rc.5
-
-## 1.24.0-rc.4
-
-### Minor Changes
-
-- 07927ac: ZERO-2457: Add more events for GTM tracking
-
-## 1.24.0-rc.3
-
-## 1.24.0-rc.2
-
-### Patch Changes
-
-- 8c7f5bc: ZERO-2440: Pipeline test
-
-## 1.24.0-rc.1
+## 1.24.1
 
 ### Patch Changes
 
-- 9b10323: ZERO-2440: Add type declarations for @akinon/pz-otp modules
+- 95510c7: ZERO-2508: Enable rc branch pipeline and add check-publish-version step
 
-## 1.24.0-rc.0
+## 1.24.0
 
 ### Minor Changes
 
-- 8bc6085: ZERO-2472: RTK Query Invalidate
-- 02a3c58: ZERO-2460: Breadcrumb checks for undefined values
-- 0181251: ZERO-2440: move otp popup state to redux
-- 07cc81a: Add infinite and more types to pagination
-- 8d6caba: ZERO-2434: enhance error handling and logging in appFetch function
-- b4452e9: ZERO-2463: Refactor Sentry initialization and add Sentry DSN option to settings
-- b2da5e4: Revert ZERO-2435
+- 8bc6085d: ZERO-2472: RTK Query Invalidate
+- 02a3c58b: ZERO-2460: Breadcrumb checks for undefined values
+- 01812512: ZERO-2440: move otp popup state to redux
+- 07cc81a4: ZERO-2388: Add infinite and more types to pagination
+- 8d6caba0: ZERO-2434: enhance error handling and logging in appFetch function
+- 07927acb: ZERO-2457: Add more events for GTM tracking
 
 ### Patch Changes
 
-- da1e501: ZERO-2296: Fix ROUTES import
-- 2e44646: ZERO-2434: Fix category URL in getCategoryDataHandler function
-- 2e9476c: ZERO-2434: remove error throwing in appFetch
+- 9b103231: ZERO-2440: Add type declarations for @akinon/pz-otp modules
+- 2e9476c7: ZERO-2434: remove error throwing in appFetch
 
 ## 1.23.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,17 +220,6 @@ 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

@@ -3,7 +3,6 @@
 const fs = require('fs');
 const path = require('path');
 const semver = require('semver');
-const { execSync } = require('child_process');
 
 function checkDir() {
   let currentDir = __dirname;
@@ -22,50 +21,8 @@ function checkDir() {
   return path.resolve(__dirname, '../../../../');
 }
 
-function getCurrentBranchName() {
-  try {
-    return execSync('git rev-parse --abbrev-ref HEAD').toString().trim();
-  } catch (error) {
-    console.error(`Error fetching current branch name: ${error}`);
-    process.exit(1);
-  }
-}
-
-function fetchLatestPackageVersion(packageName) {
-  const currentBranch = getCurrentBranchName();
-  let npmShowCommand = `npm show ${packageName} version`;
-
-  if (currentBranch === 'rc') {
-    npmShowCommand = `npm show ${packageName}@rc version`;
-  }
-
-  try {
-    return execSync(npmShowCommand).toString().trim();
-  } catch (error) {
-    console.error(
-      `Error fetching latest version for package ${packageName}: ${error}`
-    );
-    process.exit(1);
-  }
-}
-
 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')
@@ -77,30 +34,12 @@ try {
     fs.readFileSync(akinonNextPackagePath, 'utf8')
   );
 
-  const projectZeroNextPackagePath = getProjectZeroNextPackagePath();
+  const projectZeroNextPackagePath = path.join(BASE_DIR, 'package.json');
 
   const projectZeroNextPackage = JSON.parse(
     fs.readFileSync(projectZeroNextPackagePath, 'utf8')
   );
 
-  const eslintPluginLatestVersion = fetchLatestPackageVersion(
-    '@akinon/eslint-plugin-projectzero'
-  );
-
-  akinonNextPackage.peerDependencies = {
-    ...akinonNextPackage.peerDependencies,
-    '@akinon/eslint-plugin-projectzero': `${eslintPluginLatestVersion}`
-  };
-
-  fs.writeFileSync(
-    akinonNextPackagePath,
-    JSON.stringify(akinonNextPackage, null, 2) + '\n'
-  );
-
-  console.log(
-    '@akinon/next peerDependencies updated with the latest @akinon/eslint-plugin-projectzero version'
-  );
-
   const { peerDependencies } = akinonNextPackage;
 
   let hasErrors = false;

package/bin/pz-predev.js

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

package/data/client/user.ts

@@ -71,17 +71,6 @@ 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), {
@@ -121,7 +110,6 @@ export const {
   useConfirmEmailVerificationQuery,
   useValidateCaptchaMutation,
   useLogoutMutation,
-  useOtpLoginMutation,
   useForgotPasswordMutation,
   useGetAnonymousTrackingMutation
 } = userApi;

package/data/urls.ts

@@ -163,7 +163,6 @@ 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.0-rc.7",
+  "version": "1.24.1",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -32,7 +32,7 @@
     "@typescript-eslint/eslint-plugin": "6.7.4",
     "@typescript-eslint/parser": "6.7.4",
     "eslint": "^8.14.0",
-    "@akinon/eslint-plugin-projectzero": "1.24.0-rc.7",
+    "@akinon/eslint-plugin-projectzero": "1.24.0",
     "eslint-config-prettier": "8.5.0"
   }
 }

package/sentry/index.ts

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

package/types/index.ts

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

package/bin/pz-install-extensions.js

@@ -1,27 +0,0 @@
-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}:`);
-    }
-  });
-}