@akinon/next 1.28.0-rc.1 → 1.29.0

package/CHANGELOG.md

@@ -1,13 +1,11 @@
 # @akinon/next
 
-## 1.28.0-rc.1
-
-## 1.28.0-rc.0
+## 1.29.0
 
 ### Minor Changes
 
-- 495d155: ZERO-2505: findBaseDir function is united and move on to the utils
-- 495d155: ZERO-2524: Zero-cli dist checks for changes and renders it to the terminal.
+- a7e432f: ZERO-2534: Fix for recapthca regex for replacing the special chars.
+- f76f079: ZERO-2493: Add redirect util function
 
 ## 1.27.0
 

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/data/client/user.ts

@@ -22,9 +22,9 @@ const userApi = api.injectEndpoints({
     getCaptcha: build.query<GetCaptchaResponse, void>({
       query: () => buildClientRequestUrl(user.captcha),
       transformResponse: (response: { html: string }) => {
-        const siteKeyMatch = response.html.match(/sitekey=["|']\w+/gi);
+        const siteKeyMatch = response.html.match(/sitekey=["|'][^"']+/gi);
         const csrfTokenMatch = response.html.match(
-          /name=['|"]csrfmiddlewaretoken['|"] value=['|"]\w+/gi
+          /name=['|"]csrfmiddlewaretoken['|"] value=['|"][^'"]+/gi
         );
         const siteKey = siteKeyMatch?.[0].replace(/sitekey=["|']/, '') || '';
         const csrfToken =

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.28.0-rc.1",
+  "version": "1.29.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.28.0-rc.1",
+    "@akinon/eslint-plugin-projectzero": "1.29.0",
     "eslint-config-prettier": "8.5.0"
   }
 }

package/utils/redirect.ts

@@ -0,0 +1,30 @@
+import { redirect as nextRedirect, RedirectType } from 'next/navigation';
+import Settings from 'settings';
+import { headers } from 'next/headers';
+import { ServerVariables } from '@akinon/next/utils/server-variables';
+import { getUrlPathWithLocale } from '@akinon/next/utils/localization';
+
+export const redirect = (path: string, type?: RedirectType) => {
+  const nextHeaders = headers();
+  const pageUrl = new URL(
+    nextHeaders.get('pz-url') ?? process.env.NEXT_PUBLIC_URL
+  );
+
+  const currentLocale = Settings.localization.locales.find(
+    (locale) => locale.value === ServerVariables.locale
+  );
+
+  const callbackUrl = pageUrl.pathname;
+  const redirectUrlWithLocale = getUrlPathWithLocale(
+    path,
+    currentLocale.localePath ?? currentLocale.value
+  );
+
+  const redirectUrl = `${redirectUrlWithLocale}?callbackUrl=${callbackUrl}`;
+
+  if (type) {
+    return nextRedirect(redirectUrl, type);
+  } else {
+    return nextRedirect(redirectUrl);
+  }
+};

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-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/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;