@akinon/next 1.26.0-rc.9 → 1.27.0

package/CHANGELOG.md

@@ -1,119 +1,19 @@
 # @akinon/next
 
-## 1.26.0-rc.9
+## 1.27.0
 
 ### Minor Changes
 
-- 6d4aadb: ZERO-2476: Auto install recommendenent extension
-- a7e432f: ZERO-2534: Fix for recapthca regex for replacing the special chars.
-- 02fa342: ZERO-2507: Add web vitals endpoint
+- 9b48372: ZERO-2564:fix eslint shortland warning
 - 7e41bdc: BRDG-9158: Remove redirect-three-d page endpoint
-- f0c23bc: ZERO-2135: add custom not found page
 - 1289982: ZERO-2521: Add x-forwarded-for header to requests
-- 3690d3b: ZERO-2485: Check ESLint peerDependency version
-- 40ad73e: ZERO-2504: add cookie filter to api client request
-- b4452e9: ZERO-2463: Refactor Sentry initialization and add Sentry DSN option to settings
-- b2da5e4: Revert ZERO-2435
-- f76f079: ZERO-2493: Add redirect util function
-- d6d2533: ZERO-2560: Add installment count to masterpass payment forms
-- ff89630: ZERO-2498: Add script for env control
-
-### Patch Changes
-
-- da1e501: ZERO-2296: Fix ROUTES import
-- 073fbd2: ZERO-2503: Add check changeset control script
-- 2e44646: ZERO-2434: Fix category URL in getCategoryDataHandler function
-- 183674f: BRDG-9158: Handle locale prefix
-- 8c7f5bc: ZERO-2440: Pipeline test
-- Updated dependencies [073fbd2]
-  - @akinon/eslint-plugin-projectzero@1.26.0-rc.9
-
-## 1.26.0-rc.8
-
-### Minor Changes
-
-- f0c23bc: ZERO-2135: add custom not found page
-
-### Patch Changes
-
-- @akinon/eslint-plugin-projectzero@1.26.0-rc.8
-
-## 1.26.0-rc.7
-
-### Patch Changes
-
-- @akinon/eslint-plugin-projectzero@1.26.0-rc.7
-
-## 1.26.0-rc.6
-
-### Minor Changes
-
-- 40ad73e: ZERO-2504: add cookie filter to api client request
-
-### Patch Changes
-
-- @akinon/eslint-plugin-projectzero@1.26.0-rc.6
-
-## 1.26.0-rc.5
-
-### Patch Changes
-
-- @akinon/eslint-plugin-projectzero@1.26.0-rc.5
-
-## 1.26.0-rc.4
-
-### Patch Changes
-
-- @akinon/eslint-plugin-projectzero@1.26.0-rc.4
-
-## 1.26.0-rc.3
-
-### Minor Changes
-
 - d6d2533: ZERO-2560: Add installment count to masterpass payment forms
-- ff89630: ZERO-2498: Add script for env control
-
-### Patch Changes
-
-- 073fbd2: ZERO-2503: Add check changeset control script
-- Updated dependencies [073fbd2]
-  - @akinon/eslint-plugin-projectzero@1.26.0-rc.3
 
-## 1.26.0-rc.2
-
-### Patch Changes
-
-- @akinon/eslint-plugin-projectzero@1.26.0-rc.2
-
-## 1.26.0-rc.1
-
-### Minor Changes
-
-- a7e432f: ZERO-2534: Fix for recapthca regex for replacing the special chars.
-
-### Patch Changes
-
-- @akinon/eslint-plugin-projectzero@1.26.0-rc.1
-
-## 1.26.0-rc.0
+## 1.26.0
 
 ### Minor Changes
 
-- 6d4aadb: ZERO-2476: Auto install recommendenent extension
-- 7e41bdc: BRDG-9158: Remove redirect-three-d page endpoint
-- 1289982: ZERO-2521: Add x-forwarded-for header to requests
-- 3690d3b: ZERO-2485: Check ESLint peerDependency version
-- b4452e9: ZERO-2463: Refactor Sentry initialization and add Sentry DSN option to settings
-- b2da5e4: Revert ZERO-2435
-- f76f079: ZERO-2493: Add redirect util function
-
-### Patch Changes
-
-- da1e501: ZERO-2296: Fix ROUTES import
-- 2e44646: ZERO-2434: Fix category URL in getCategoryDataHandler function
-- 183674f: BRDG-9158: Handle locale prefix
-- 8c7f5bc: ZERO-2440: Pipeline test
-  - @akinon/eslint-plugin-projectzero@1.26.0-rc.0
+- 02fa342: ZERO-2507: Add web vitals endpoint
 
 ## 1.25.0
 
@@ -132,83 +32,7 @@
 
 ### Patch Changes
 
-- da1e501: ZERO-2296: Fix ROUTES import
-- 2e44646: ZERO-2434: Fix category URL in getCategoryDataHandler function
-- 183674f: BRDG-9158: Handle locale prefix
-- 8c7f5bc: ZERO-2440: Pipeline test
-  - @akinon/eslint-plugin-projectzero@1.25.0-rc.5
-
-## 1.25.0-rc.4
-
-### Patch Changes
-
-- 183674f: BRDG-9158: Handle locale prefix
-  - @akinon/eslint-plugin-projectzero@1.25.0-rc.4
-
-## 1.25.0-rc.3
-
-### Minor Changes
-
-- 1289982: ZERO-2521: Add x-forwarded-for header to requests
-
-### Patch Changes
-
-- @akinon/eslint-plugin-projectzero@1.25.0-rc.3
-
-## 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
-
-- 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

@@ -229,17 +229,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/api/client.ts

@@ -2,8 +2,6 @@ import { ClientRequestOptions } from '../types';
 import { NextResponse } from 'next/server';
 import settings from 'settings';
 import logger from '../utils/log';
-import formatCookieString from '../utils/format-cookie-string';
-import cookieParser from 'set-cookie-parser';
 
 interface RouteParams {
   params: {
@@ -133,21 +131,11 @@ async function proxyRequest(...args) {
       );
     }
 
-    const setCookieHeaders = req.headers.getSetCookie();
-    const exceptCookieKeys = ['pz-locale', 'pz-currency'];
-
-    const isExcludedCookie = (name: string) => exceptCookieKeys.includes(name);
-
-    const filteredCookies = cookieParser
-      .parse(setCookieHeaders)
-      .filter((cookie) => !isExcludedCookie(cookie.name));
-
+    const setCookieHeader = request.headers.get('set-cookie');
     const responseHeaders: any = {};
 
-    if (filteredCookies.length > 0) {
-      responseHeaders['set-cookie'] = filteredCookies
-        .map(formatCookieString)
-        .join(', ');
+    if (setCookieHeader) {
+      responseHeaders['set-cookie'] = setCookieHeader;
     }
 
     const statusCode = new RegExp(/^20./).test(request.status.toString())

package/bin/pz-check-dependencies.js

@@ -23,21 +23,6 @@ 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')
@@ -49,7 +34,7 @@ try {
     fs.readFileSync(akinonNextPackagePath, 'utf8')
   );
 
-  const projectZeroNextPackagePath = getProjectZeroNextPackagePath();
+  const projectZeroNextPackagePath = path.join(BASE_DIR, 'package.json');
 
   const projectZeroNextPackage = JSON.parse(
     fs.readFileSync(projectZeroNextPackagePath, 'utf8')

package/bin/pz-predev.js

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

package/data/client/user.ts

@@ -22,9 +22,9 @@ const userApi = api.injectEndpoints({
     getCaptcha: build.query<GetCaptchaResponse, void>({
       query: () => buildClientRequestUrl(user.captcha),
       transformResponse: (response: { html: string }) => {
-        const siteKeyMatch = response.html.match(/sitekey=["|'][^"']+/gi);
+        const siteKeyMatch = response.html.match(/sitekey=["|']\w+/gi);
         const csrfTokenMatch = response.html.match(
-          /name=['|"]csrfmiddlewaretoken['|"] value=['|"][^'"]+/gi
+          /name=['|"]csrfmiddlewaretoken['|"] value=['|"]\w+/gi
         );
         const siteKey = siteKeyMatch?.[0].replace(/sitekey=["|']/, '') || '';
         const csrfToken =

package/middlewares/default.ts

@@ -153,7 +153,6 @@ const withPzDefault =
 
     req.middlewareParams = {
       commerceUrl,
-      found: true,
       rewrites: {}
     };
 
@@ -187,19 +186,6 @@ const withPzDefault =
                               locale.length ? `${locale}/` : ''
                             }${currency}${prettyUrl ?? pathnameWithoutLocale}`;
 
-                            if (
-                              !req.middlewareParams.found &&
-                              Settings.customNotFoundEnabled
-                            ) {
-                              let pathname = url.pathname
-                                .replace(/\/+$/, '')
-                                .split('/');
-                              url.pathname = url.pathname.replace(
-                                pathname.pop(),
-                                'pz-not-found'
-                              );
-                            }
-
                             Settings.rewrites.forEach((rewrite) => {
                               url.pathname = url.pathname.replace(
                                 rewrite.source,

package/middlewares/index.ts

@@ -26,7 +26,6 @@ export {
 export interface PzNextRequest extends NextRequest {
   middlewareParams: {
     commerceUrl: string;
-    found: boolean;
     rewrites: {
       locale?: string;
       prettyUrl?: string;

package/middlewares/pretty-url.ts

@@ -98,8 +98,6 @@ const withPrettyUrl =
       return middleware(req, event);
     }
 
-    req.middlewareParams.found = false;
-
     return middleware(req, event);
   };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.26.0-rc.9",
+  "version": "1.27.0",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -25,19 +25,14 @@
     "react-redux": "8.1.3",
     "react-string-replace": "1.1.1",
     "redis": "4.5.1",
-    "semver": "7.5.4",
-    "set-cookie-parser": "2.6.0"
+    "semver": "7.5.4"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.24.0",
     "@types/react-redux": "7.1.30",
-    "@types/set-cookie-parser": "2.4.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",
     "eslint-config-prettier": "8.5.0"
-  },
-  "peerDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.24.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;
   };
@@ -187,7 +181,6 @@ export interface Settings {
     extraPaymentTypes?: string[];
     masterpassJsUrl?: string;
   };
-  customNotFoundEnabled: boolean;
 }
 
 export interface CacheOptions {

package/utils/log.ts

@@ -85,9 +85,9 @@ function createCustomSpan({ level, message, payload }: Message) {
   const span = tracer.startSpan('custom-operation-log');
 
   span.setAttributes({
-    level: level,
-    message: message,
-    payload: payload
+    level,
+    message,
+    payload
   });
 
   span.end();

package/bin/pz-check-env.js

@@ -1,27 +0,0 @@
-#!/usr/bin/env node
-
-const fs = require('fs');
-
-const invalidEnvList = [
-  { key: 'NEXT_TELEMETRY_DISABLED', value: 1 },
-  { key: 'OTEL_SDK_DISABLED', value: true }
-];
-
-function checkEnv(invalidEnvList) {
-  if (!fs.existsSync('.env')) {
-    return false;
-  }
-
-  const envContent = fs.readFileSync('.env', 'utf8');
-
-  invalidEnvList.forEach(({ key, value }) => {
-    const env = `${key}=${value}`;
-
-    if (envContent.includes(env)) {
-      console.error(`Remove the ${key} environment variable`);
-      process.exit(1);
-    }
-  });
-}
-
-checkEnv(invalidEnvList);

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

package/utils/format-cookie-string.ts

@@ -1,27 +0,0 @@
-export default function formatCookieString(cookieObj: Record<string, any>) {
-  const cookieParts = [`${cookieObj.name}=${cookieObj.value}`];
-
-  if (cookieObj.expires) {
-    cookieParts.push(`Expires=${cookieObj.expires.toUTCString()}`);
-  }
-  if (cookieObj.maxAge) {
-    cookieParts.push(`Max-Age=${cookieObj.maxAge}`);
-  }
-  if (cookieObj.path) {
-    cookieParts.push(`Path=${cookieObj.path}`);
-  }
-  if (cookieObj.domain) {
-    cookieParts.push(`Domain=${cookieObj.domain}`);
-  }
-  if (cookieObj.secure) {
-    cookieParts.push('Secure');
-  }
-  if (cookieObj.httpOnly) {
-    cookieParts.push('HttpOnly');
-  }
-  if (cookieObj.sameSite) {
-    cookieParts.push(`SameSite=${cookieObj.sameSite}`);
-  }
-
-  return cookieParts.join('; ');
-}

package/utils/redirect.ts

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