@akinon/next 1.32.0-rc.2 → 1.32.0

package/CHANGELOG.md

@@ -1,28 +1,8 @@
 # @akinon/next
 
-## 1.32.0-rc.2
+## 1.32.0
 
-## 1.32.0-rc.1
-
-### Minor Changes
-
-- d09b677: ZERO-2577: Fix pagination bug and update usePagination hook and ensure pagination controls rendering correctly
-- 6d4aadb: ZERO-2476: Auto install recommendenent extension
-- 7cebe87: ZERO-2524: Add check monorepo utility function
-- f0c23bc: ZERO-2135: add custom not found page
-- 495d155: ZERO-2505: findBaseDir function is united and move on to the utils
-- 40ad73e: ZERO-2504: add cookie filter to api client request
-- 495d155: ZERO-2524: Zero-cli dist checks for changes and renders it to the terminal.
-- f046f8e: ZERO-2575: update version for react-number-format
-- 6b2972b: ZERO-2514: Fix handling of status 204 and return Commerce status code in client proxy API.
-- 3e68768: ZERO-2578: Add osessionid check in middleware
-
-## 1.32.0-rc.0
-
-### Minor Changes
-
-- 7cebe87: ZERO-2524: Add check monorepo utility function
-- 3e68768: ZERO-2578: Add osessionid check in middleware
+## 1.31.1
 
 ## 1.31.0
 

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: {
@@ -115,14 +113,6 @@ async function proxyRequest(...args) {
 
   try {
     const request = await fetch(url, fetchOptions);
-
-    // Using NextResponse.json with status 204 will cause an error
-    if (request.status === 204) {
-      return new Response(null, {
-        status: 204
-      });
-    }
-
     let response = {} as any;
 
     try {
@@ -141,26 +131,20 @@ 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())
+      ? 200
+      : request.status;
+
     return NextResponse.json(
       options.responseType === 'text' ? { result: response } : response,
-      { status: request.status, headers: responseHeaders }
+      { status: statusCode, headers: responseHeaders }
     );
   } catch (error) {
     logger.error('Client proxy request failed', error);

package/bin/pz-install-plugins.js

@@ -1,7 +1,13 @@
 const fs = require('fs');
 const path = require('path');
 const { execSync } = require('child_process');
-const findBaseDir = require('../utils/find-base-dir');
+
+function findBaseDir() {
+  const insideNodeModules = __dirname.includes('node_modules');
+  return insideNodeModules
+    ? process.cwd()
+    : path.resolve(__dirname, '../../../apps/projectzeronext');
+}
 
 const BASE_DIR = findBaseDir();
 const getFullPath = (relativePath) => path.join(BASE_DIR, relativePath);

package/bin/pz-install-theme.js

@@ -3,7 +3,16 @@
 const fs = require('fs');
 const path = require('path');
 const spawn = require('cross-spawn');
-const findBaseDir = require('../utils/find-base-dir');
+
+function findBaseDir() {
+  const insideNodeModules = __dirname.includes('node_modules');
+
+  if (insideNodeModules) {
+    return path.resolve(__dirname, '../../../../');
+  } else {
+    return path.resolve(__dirname, '../../../apps/projectzeronext');
+  }
+}
 
 const BASE_DIR = findBaseDir();
 

package/bin/pz-prebuild.js

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

package/bin/pz-predev.js

@@ -1,7 +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/input.tsx

@@ -1,28 +1,17 @@
 import clsx from 'clsx';
-import { forwardRef, FocusEvent, useState, Ref } from 'react';
+import { forwardRef, FocusEvent, useState } from 'react';
 import { Controller } from 'react-hook-form';
-import { PatternFormat, PatternFormatProps } from 'react-number-format';
+import NumberFormat, { NumberFormatProps } from 'react-number-format';
 import { InputProps } from '../types';
 import { twMerge } from 'tailwind-merge';
 
-const PatternFormatWithRef = forwardRef(
-  (props: PatternFormatProps, ref: Ref<HTMLInputElement>) => {
-    return <PatternFormat {...props} getInputRef={ref} />;
-  }
-);
-PatternFormatWithRef.displayName = 'PatternFormatWithRef';
-
 export const Input = forwardRef<
   HTMLInputElement,
   InputProps &
     Pick<
-      PatternFormatProps,
-      'mask' | 'allowEmptyFormatting' | 'onValueChange'
-    > & {
-      format?: string;
-      defaultValue?: string;
-      type?: string;
-    }
+      NumberFormatProps,
+      'format' | 'mask' | 'allowEmptyFormatting' | 'onValueChange'
+    >
 >((props, ref) => {
   const [focused, setFocused] = useState(false);
   const [hasValue, setHasValue] = useState(false);
@@ -48,7 +37,6 @@ export const Input = forwardRef<
     ),
     props.className
   );
-
   const inputProps: any = {
     id,
     ref,
@@ -91,14 +79,14 @@ export const Input = forwardRef<
             <Controller
               name={props.name ?? ''}
               control={props.control}
+              defaultValue={false}
               render={({ field }) => (
-                <PatternFormatWithRef
+                <NumberFormat
                   format={format}
                   mask={mask ?? ''}
                   {...rest}
                   {...field}
                   {...inputProps}
-                  type={props.type as 'text' | 'password' | 'tel'}
                 />
               )}
             />

package/components/price.tsx

@@ -1,11 +1,11 @@
 import { useMemo } from 'react';
-import { NumericFormat, NumericFormatProps } from 'react-number-format';
+import NumberFormat, { NumberFormatProps } from 'react-number-format';
 import { getCurrency } from '@akinon/next/utils';
 
 import { useLocalization } from '@akinon/next/hooks';
 import { PriceProps } from '../types';
 
-export const Price = (props: NumericFormatProps & PriceProps) => {
+export const Price = (props: NumberFormatProps & PriceProps) => {
   const {
     value,
     currencyCode,
@@ -39,7 +39,7 @@ export const Price = (props: NumericFormatProps & PriceProps) => {
   );
 
   return (
-    <NumericFormat
+    <NumberFormat
       value={useNegative ? `-${useNegativeSpace}${_value}` : _value}
       {...{
         [useCurrencyAfterPrice ? 'suffix' : 'prefix']: currency

package/hooks/use-pagination.ts

@@ -28,11 +28,7 @@ function reducer(state: InitialState, action: ACTIONTYPE) {
     case 'setPage':
       return { ...state, page: action.payload };
     case 'setLimit':
-      return {
-        ...state,
-        limit: action.payload,
-        last: Math.ceil(state.total / action.payload)
-      };
+      return { ...state, limit: action.payload };
     default:
       throw new Error();
   }
@@ -50,11 +46,10 @@ export default function usePagination(
     () => new URLSearchParams(searchParams.toString()),
     [searchParams]
   );
-
   const { page, limit } = useMemo(
     () => ({
       page: _page || Number(searchParams.get('page')) || 1,
-      limit: _limit || Number(searchParams.get('limit')) || 12
+      limit: _limit || Number(searchParams.get('limit'))
     }),
     [searchParams, _page, _limit]
   );
@@ -65,7 +60,6 @@ export default function usePagination(
     last: _last || Math.ceil(_total / limit) || 1,
     total: _total
   };
-
   const [state, dispatch] = useReducer(reducer, initialState);
 
   useEffect(() => {
@@ -99,24 +93,23 @@ export default function usePagination(
     [dispatch]
   );
 
-  const pageList = useMemo(
-    () =>
-      Array.from({ length: state.last }, (_, i) => {
-        urlSearchParams.set('page', (i + 1).toString());
-        return {
-          page: i + 1,
-          url: `${pathname}?${urlSearchParams.toString()}`
-        };
-      }),
-    [state.last, pathname, urlSearchParams]
-  );
+  const pageList = useMemo(() => {
+    return Array.from({ length: state.last }, (_, i) => {
+      urlSearchParams.set('page', (i + 1).toString());
+
+      return {
+        page: i + 1,
+        url: `${pathname}?${urlSearchParams.toString()}`
+      };
+    });
+  }, [state.last, pathname, urlSearchParams]);
 
   const prev = useMemo(() => {
     if (state.page > 1) {
       urlSearchParams.set('page', (Number(state.page) - 1).toString());
       return `${pathname}?${urlSearchParams.toString()}`;
     }
-    return '#';
+    return null;
   }, [state.page, pathname, urlSearchParams]);
 
   const next = useMemo(() => {
@@ -124,7 +117,7 @@ export default function usePagination(
       urlSearchParams.set('page', (Number(state.page) + 1).toString());
       return `${pathname}?${urlSearchParams.toString()}`;
     }
-    return '#';
+    return null;
   }, [state.page, state.last, pathname, urlSearchParams]);
 
   return {

package/middlewares/complete-gpay.ts

@@ -33,7 +33,6 @@ const withCompleteGpay =
   async (req: PzNextRequest, event: NextFetchEvent) => {
     const url = req.nextUrl.clone();
     const ip = req.headers.get('x-forwarded-for') ?? '';
-    const sessionId = req.cookies.get('osessionid');
 
     if (url.search.indexOf('GPayCompletePage') === -1) {
       return middleware(req, event);
@@ -51,24 +50,6 @@ const withCompleteGpay =
     try {
       const body = await streamToString(req.body);
 
-      if (!sessionId) {
-        logger.warn(
-          'Make sure that the SESSION_COOKIE_SAMESITE environment variable is set to None in Commerce.',
-          {
-            middleware: 'complete-masterpass',
-            ip
-          }
-        );
-
-        return NextResponse.redirect(
-          `${url.origin}${getUrlPathWithLocale(
-            '/orders/checkout/',
-            req.cookies.get('pz-locale')?.value
-          )}`,
-          303
-        );
-      }
-
       const request = await fetch(requestUrl, {
         method: 'POST',
         headers: requestHeaders,

package/middlewares/complete-masterpass.ts

@@ -33,7 +33,6 @@ const withCompleteMasterpass =
   async (req: PzNextRequest, event: NextFetchEvent) => {
     const url = req.nextUrl.clone();
     const ip = req.headers.get('x-forwarded-for') ?? '';
-    const sessionId = req.cookies.get('osessionid');
 
     if (url.search.indexOf('MasterpassCompletePage') === -1) {
       return middleware(req, event);
@@ -51,24 +50,6 @@ const withCompleteMasterpass =
     try {
       const body = await streamToString(req.body);
 
-      if (!sessionId) {
-        logger.warn(
-          'Make sure that the SESSION_COOKIE_SAMESITE environment variable is set to None in Commerce.',
-          {
-            middleware: 'complete-masterpass',
-            ip
-          }
-        );
-
-        return NextResponse.redirect(
-          `${url.origin}${getUrlPathWithLocale(
-            '/orders/checkout/',
-            req.cookies.get('pz-locale')?.value
-          )}`,
-          303
-        );
-      }
-
       const request = await fetch(requestUrl, {
         method: 'POST',
         headers: requestHeaders,

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/middlewares/redirection-payment.ts

@@ -34,7 +34,6 @@ const withRedirectionPayment =
     const url = req.nextUrl.clone();
     const searchParams = new URLSearchParams(url.search);
     const ip = req.headers.get('x-forwarded-for') ?? '';
-    const sessionId = req.cookies.get('osessionid');
 
     if (searchParams.get('page') !== 'RedirectionPageCompletePage') {
       return middleware(req, event);
@@ -47,29 +46,12 @@ const withRedirectionPayment =
       Cookie: req.headers.get('cookie') ?? '',
       'x-currency': req.cookies.get('pz-currency')?.value ?? '',
       'x-forwarded-for': ip
+
     };
 
     try {
       const body = await streamToString(req.body);
 
-      if (!sessionId) {
-        logger.warn(
-          'Make sure that the SESSION_COOKIE_SAMESITE environment variable is set to None in Commerce.',
-          {
-            middleware: 'redirection-payment',
-            ip
-          }
-        );
-
-        return NextResponse.redirect(
-          `${url.origin}${getUrlPathWithLocale(
-            '/orders/checkout/',
-            req.cookies.get('pz-locale')?.value
-          )}`,
-          303
-        );
-      }
-
       const request = await fetch(requestUrl, {
         method: 'POST',
         headers: requestHeaders,

package/middlewares/three-d-redirection.ts

@@ -33,7 +33,6 @@ const withThreeDRedirection =
   async (req: PzNextRequest, event: NextFetchEvent) => {
     const url = req.nextUrl.clone();
     const ip = req.headers.get('x-forwarded-for') ?? '';
-    const sessionId = req.cookies.get('osessionid');
 
     if (url.search.indexOf('CreditCardThreeDSecurePage') === -1) {
       return middleware(req, event);
@@ -51,24 +50,6 @@ const withThreeDRedirection =
     try {
       const body = await streamToString(req.body);
 
-      if (!sessionId) {
-        logger.warn(
-          'Make sure that the SESSION_COOKIE_SAMESITE environment variable is set to None in Commerce.',
-          {
-            middleware: 'three-d-redirection',
-            ip
-          }
-        );
-
-        return NextResponse.redirect(
-          `${url.origin}${getUrlPathWithLocale(
-            '/orders/checkout/',
-            req.cookies.get('pz-locale')?.value
-          )}`,
-          303
-        );
-      }
-
       const request = await fetch(requestUrl, {
         method: 'POST',
         headers: requestHeaders,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.32.0-rc.2",
+  "version": "1.32.0",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -25,16 +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": {
     "@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.32.0-rc.2",
+    "@akinon/eslint-plugin-projectzero": "1.32.0",
     "eslint-config-prettier": "8.5.0"
   }
 }

package/types/index.ts

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

package/bin/pz-copy-template.js

@@ -1,43 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-const projectZeroNextDir = path.join(
-  __dirname,
-  '../../../apps/projectzeronext'
-);
-
-const templatesDir = path.join(
-  __dirname,
-  '../../../packages/projectzero-cli/app-template'
-);
-
-if (fs.existsSync(templatesDir)) {
-  fs.rmdirSync(templatesDir, { recursive: true });
-}
-
-function copyRecursively(src, dest) {
-  if (path.basename(src) === 'node_modules') {
-    return;
-  }
-
-  if (fs.existsSync(src) && fs.statSync(src).isDirectory()) {
-    fs.mkdirSync(dest, { recursive: true });
-    fs.readdirSync(src).forEach((childItemName) => {
-      const childSrcPath = path.join(src, childItemName);
-      const childDestPath = path.join(dest, childItemName);
-      copyRecursively(childSrcPath, childDestPath);
-    });
-  } else {
-    fs.copyFileSync(src, dest);
-  }
-}
-
-if (!fs.existsSync(templatesDir)) {
-  fs.mkdirSync(templatesDir, { recursive: true });
-}
-
-copyRecursively(projectZeroNextDir, templatesDir);
-
-console.log(
-  '\x1b[33m%s\x1b[0m',
-  'projectzeronext content has been copied to templates.'
-);

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/bin/pz-pre-check-dist.js

@@ -1,21 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-const hashDirectory = require('../utils/hash-directory');
-const checkMonorepo = require('../utils/check-monorepo');
-
-const BASE_DIR = checkMonorepo();
-
-if (!BASE_DIR) {
-  process.exit(0);
-}
-
-const packageDistPath = path.join(
-  __dirname,
-  '../../../packages/projectzero-cli/dist/commands'
-);
-
-const hash = hashDirectory(packageDistPath);
-fs.writeFileSync(
-  path.join(__dirname, '../../../packages/projectzero-cli/dist/dist-hash.txt'),
-  hash
-);

package/utils/check-monorepo.js

@@ -1,15 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-function checkMonorepo() {
-  let currentDir = __dirname;
-  while (currentDir !== path.resolve(currentDir, '..')) {
-    if (fs.existsSync(path.join(currentDir, 'turbo.json'))) {
-      return currentDir;
-    }
-    currentDir = path.resolve(currentDir, '..');
-  }
-  return null;
-}
-
-module.exports = checkMonorepo;

package/utils/find-base-dir.js

@@ -1,13 +0,0 @@
-const path = require('path');
-
-function findBaseDir() {
-  const insideNodeModules = __dirname.includes('node_modules');
-
-  if (insideNodeModules) {
-    return path.resolve(__dirname, '../../../../');
-  } else {
-    return path.resolve(__dirname, '../../../apps/projectzeronext');
-  }
-}
-
-module.exports = findBaseDir;

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/hash-directory.js

@@ -1,18 +0,0 @@
-const { createHash } = require('crypto');
-const fs = require('fs');
-const path = require('path');
-
-function hashDirectory(directory) {
-  const files = fs.readdirSync(directory).sort();
-  const hash = createHash('sha256');
-  files.forEach((file) => {
-    const filePath = path.join(directory, file);
-    if (fs.statSync(filePath).isFile()) {
-      const fileBuffer = fs.readFileSync(filePath);
-      hash.update(fileBuffer);
-    }
-  });
-  return hash.digest('hex');
-}
-
-module.exports = hashDirectory;