@akinon/next 1.31.0-rc.2 → 1.31.1

package/CHANGELOG.md

@@ -1,28 +1,18 @@
 # @akinon/next
 
-## 1.31.0-rc.2
+## 1.31.1
 
-### Minor Changes
-
-- 6d4aadb: ZERO-2476: Auto install recommendenent extension
-- 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.
-- 6b2972b: ZERO-2514: Fix handling of status 204 and return Commerce status code in client proxy API.
+## 1.31.0
 
-## 1.31.0-rc.1
+### Minor Changes
 
-## 1.31.0-rc.0
+- 65ddd70: ZERO-2592: Fix regex pattern in buildCDNUrl function
+- c215985: ZERO-2513:Replace the src in the incoming searchParams
+- 21a0ddb: ZERO-2593: Remove body overflow in case of unmount
 
-### Minor Changes
+## 1.30.2
 
-- 6d4aadb: ZERO-2476: Auto install recommendenent extension
-- 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.
-- 6b2972b: ZERO-2514: Fix handling of status 204 and return Commerce status code in client proxy API.
+## 1.30.1
 
 ## 1.30.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/image.tsx

@@ -1,5 +1,6 @@
 'use client';
 
+import React from 'react';
 import { CDNOptions } from '../types';
 import NextImage, { ImageProps as NextImageProps } from 'next/image';
 import { twMerge } from 'tailwind-merge';
@@ -99,6 +100,17 @@ export const Image = (props: ImageProps) => {
     ...restImage
   } = props;
 
+  const optimizeImageURL = ({ src, width }) => {
+    return ImageLoader({
+      src,
+      width,
+      quality: parseInt(String(quality), DEFAULT_QUALITY),
+      crop,
+      fill,
+      aspectRatio
+    });
+  };
+
   const hasGif = typeof src === 'string' && src.includes('.gif');
 
   if (fill && !aspectRatio) {
@@ -119,19 +131,10 @@ export const Image = (props: ImageProps) => {
       <NextImage
         {...restImage}
         width={width}
-        src={src}
+        src={optimizeImageURL({ src, width })}
         sizes={sizes}
         fill={fill}
-        loader={({ src, width }) => {
-          return ImageLoader({
-            src,
-            width,
-            quality: parseInt(String(quality), DEFAULT_QUALITY),
-            crop,
-            fill,
-            aspectRatio
-          });
-        }}
+        loader={({ src, width }) => optimizeImageURL({ src, width })}
         className={imageClassName}
         {...(hasGif && { unoptimized: true })}
         {...(draggable !== undefined && { draggable })}

package/components/modal.tsx

@@ -1,10 +1,10 @@
 'use client';
 
 import { ReactPortal } from './react-portal';
-
 import { Icon } from './icon';
 import { twMerge } from 'tailwind-merge';
 import { useEffect } from 'react';
+
 export interface ModalProps {
   portalId: string;
   children?: React.ReactNode;
@@ -27,11 +27,11 @@ export const Modal = (props: ModalProps) => {
   } = props;
 
   useEffect(() => {
-    if (open) {
-      document.body.style.overflow = 'hidden';
-    } else {
+    document.body.style.overflow = open ? 'hidden' : 'auto';
+
+    return () => {
       document.body.style.overflow = 'auto';
-    }
+    };
   }, [open]);
 
   if (!open) return null;

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.31.0-rc.2",
+  "version": "1.31.1",
   "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.31.0-rc.2",
+    "@akinon/eslint-plugin-projectzero": "1.31.1",
     "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/utils/index.ts

@@ -97,6 +97,10 @@ function splitUrlByFileExtension(path: string) {
 
 export function buildCDNUrl(url: string, config?: CDNOptions) {
   const [root, fileExtension] = splitUrlByFileExtension(url);
+  const rootWithoutOptions = root.replace(
+    /_size\d+(x\d+)?|_quality\d*|_crop\w*|_upscale\d*/g,
+    ''
+  );
 
   let options = '';
 
@@ -124,7 +128,7 @@ export function buildCDNUrl(url: string, config?: CDNOptions) {
     }
   }
 
-  return `${root}${options}${fileExtension}`;
+  return `${rootWithoutOptions}${options}${fileExtension}`;
 }
 
 export const urlLocaleMatcherRegex = new RegExp(

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,14 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-const hashDirectory = require('../utils/hash-directory');
-
-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/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;