@akinon/next 1.34.0 → 1.35.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @akinon/next
 
+## 1.35.0
+
+### 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
+- f0c23bc: ZERO-2135: add custom not found page
+- f488ea8: ZERO-2505: findBaseDir function is united and move on to the utils
+- 6b2972b: ZERO-2514: Fix handling of status 204 and return Commerce status code in client proxy API.
+
 ## 1.34.0
 
 ## 1.33.2

package/api/client.ts

@@ -113,6 +113,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 {
@@ -138,13 +146,9 @@ async function proxyRequest(...args) {
       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: statusCode, headers: responseHeaders }
+      { status: request.status, headers: responseHeaders }
     );
   } catch (error) {
     logger.error('Client proxy request failed', error);

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-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/hooks/use-pagination.ts

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

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.34.0",
+  "version": "1.35.0",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -32,7 +32,7 @@
     "@typescript-eslint/eslint-plugin": "6.7.4",
     "@typescript-eslint/parser": "6.7.4",
     "eslint": "^8.14.0",
-    "@akinon/eslint-plugin-projectzero": "1.34.0",
+    "@akinon/eslint-plugin-projectzero": "1.35.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;