@akinon/next 1.26.0-rc.1 → 1.26.0-rc.10

package/CHANGELOG.md

@@ -1,5 +1,96 @@
 # @akinon/next
 
+## 1.26.0-rc.10
+
+### Patch Changes
+
+- @akinon/eslint-plugin-projectzero@1.26.0-rc.10
+
+## 1.26.0-rc.9
+
+### 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
+- 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

package/api/client.ts

@@ -2,6 +2,8 @@ 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: {
@@ -131,11 +133,21 @@ async function proxyRequest(...args) {
       );
     }
 
-    const setCookieHeader = request.headers.get('set-cookie');
+    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 responseHeaders: any = {};
 
-    if (setCookieHeader) {
-      responseHeaders['set-cookie'] = setCookieHeader;
+    if (filteredCookies.length > 0) {
+      responseHeaders['set-cookie'] = filteredCookies
+        .map(formatCookieString)
+        .join(', ');
     }
 
     const statusCode = new RegExp(/^20./).test(request.status.toString())

package/api/web-vitals.ts

@@ -0,0 +1,15 @@
+import { NextResponse } from 'next/server';
+import { trace, context } from '@opentelemetry/api';
+
+export async function POST(req: Request) {
+  const { name, value, rating, page, pathname } = await req.json();
+  const span = trace.getSpan(context.active());
+
+  span?.setAttribute('page', page);
+  span?.setAttribute(name, value);
+  span?.setAttribute('rating', rating);
+  span?.setAttribute('pathname', pathname);
+  span?.end();
+
+  return NextResponse.json({ success: true });
+}

package/bin/pz-check-env.js

@@ -0,0 +1,27 @@
+#!/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-predev.js

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

package/components/pz-root.tsx

@@ -2,6 +2,7 @@ import 'server-only';
 import ClientRoot from './client-root';
 import { cookies } from 'next/headers';
 import PzProviders from './pz-providers';
+import { WebVitals } from './web-vitals';
 
 export default function PzRoot({
   translations,
@@ -15,6 +16,7 @@ export default function PzRoot({
 
   return (
     <PzProviders translations={translations}>
+      <WebVitals />
       <ClientRoot sessionId={sessionid}>{children}</ClientRoot>
     </PzProviders>
   );

package/components/web-vitals.tsx

@@ -0,0 +1,33 @@
+'use client';
+
+import { useReportWebVitals } from 'next/web-vitals';
+import { useSelectedLayoutSegment } from 'next/navigation';
+import { usePathname } from 'next/navigation';
+
+export function WebVitals() {
+  let layoutSegment = useSelectedLayoutSegment();
+  const pathname = usePathname();
+
+  if (pathname === '/' && layoutSegment === null) {
+    layoutSegment = 'home';
+  }
+
+  useReportWebVitals((metric) => {
+    if (process.env.NODE_ENV !== 'development') {
+      return;
+    }
+
+    const { name, value, rating } = metric;
+    const page = layoutSegment || 'unknown';
+
+    fetch(`${process.env.NEXT_PUBLIC_URL}/api/web-vitals`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify({ name, value, rating, page, pathname })
+    });
+  });
+
+  return null;
+}

package/data/client/checkout.ts

@@ -103,7 +103,8 @@ const completeMasterpassPayment = async (
     merchantId: credentials?.merchant_id ?? null,
     msisdn,
     amount: preOrder?.unpaid_amount?.replace('.', '') ?? '',
-    additionalParams: additionalParams ?? extras?.additionalParams
+    additionalParams: additionalParams ?? extras?.additionalParams,
+    installmentCount: preOrder?.installment?.installment_count ?? 1
   };
 
   const form = isDirectPurchase

package/middlewares/default.ts

@@ -153,6 +153,7 @@ const withPzDefault =
 
     req.middlewareParams = {
       commerceUrl,
+      found: true,
       rewrites: {}
     };
 
@@ -186,6 +187,19 @@ 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,6 +26,7 @@ export {
 export interface PzNextRequest extends NextRequest {
   middlewareParams: {
     commerceUrl: string;
+    found: boolean;
     rewrites: {
       locale?: string;
       prettyUrl?: string;

package/middlewares/pretty-url.ts

@@ -98,6 +98,8 @@ 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.1",
+  "version": "1.26.0-rc.10",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -25,14 +25,16 @@
     "react-redux": "8.1.3",
     "react-string-replace": "1.1.1",
     "redis": "4.5.1",
-    "semver": "7.5.4"
+    "semver": "7.5.4",
+    "set-cookie-parser": "2.6.0"
   },
   "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": {

package/types/index.ts

@@ -187,6 +187,7 @@ export interface Settings {
     extraPaymentTypes?: string[];
     masterpassJsUrl?: string;
   };
+  customNotFoundEnabled: boolean;
 }
 
 export interface CacheOptions {

package/utils/format-cookie-string.ts

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