@akinon/next 1.30.0 → 1.31.0-rc.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @akinon/next
 
+## 1.31.0-rc.0
+
+### 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.30.0
 
 ### 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: {
@@ -113,6 +115,14 @@ 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 {
@@ -131,20 +141,26 @@ 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())
-      ? 200
-      : request.status;
-
     return NextResponse.json(
       options.responseType === 'text' ? { result: response } : response,
-      { status: statusCode, headers: responseHeaders }
+      { status: request.status, headers: responseHeaders }
     );
   } catch (error) {
     logger.error('Client proxy request failed', error);

package/bin/pz-copy-template.js

@@ -0,0 +1,43 @@
+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

@@ -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-install-plugins.js

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

package/bin/pz-install-theme.js

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

package/bin/pz-pre-check-dist.js

@@ -0,0 +1,14 @@
+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/bin/pz-prebuild.js

@@ -1,4 +1,6 @@
 #!/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,5 +1,7 @@
 #!/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/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.30.0",
+  "version": "1.31.0-rc.0",
   "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": {
     "@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.30.0",
+    "@akinon/eslint-plugin-projectzero": "1.31.0-rc.0",
     "eslint-config-prettier": "8.5.0"
   }
 }

package/types/index.ts

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

package/utils/find-base-dir.js

@@ -0,0 +1,13 @@
+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

@@ -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('; ');
+}

package/utils/hash-directory.js

@@ -0,0 +1,18 @@
+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;