@akinon/next 1.24.0-rc.5 → 1.24.0-rc.7

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @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

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

package/bin/pz-check-dependencies.js

@@ -3,6 +3,7 @@
 const fs = require('fs');
 const path = require('path');
 const semver = require('semver');
+const { execSync } = require('child_process');
 
 function checkDir() {
   let currentDir = __dirname;
@@ -21,8 +22,50 @@ 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')
@@ -34,12 +77,30 @@ try {
     fs.readFileSync(akinonNextPackagePath, 'utf8')
   );
 
-  const projectZeroNextPackagePath = path.join(BASE_DIR, 'package.json');
+  const projectZeroNextPackagePath = getProjectZeroNextPackagePath();
 
   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-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/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.0-rc.5",
+  "version": "1.24.0-rc.7",
   "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.5",
+    "@akinon/eslint-plugin-projectzero": "1.24.0-rc.7",
     "eslint-config-prettier": "8.5.0"
   }
 }

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;