@akinon/next 1.89.0-rc.3 → 1.89.0-rc.4

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @akinon/next
 
+## 1.89.0-rc.4
+
+### Minor Changes
+
+- bf354de: ZERO-3321: add babel compiler for akinon/next test
+- 448adef: ZERO-3321: move csp test to akinon-next
+- 6c3629c: ZERO-3321: fix jest tests in akinon-next for standalone projects
+- acf0320: ZERO-3321: remove babel config
+- b2ee69b: ZERO-3321: delete unnecessary files
+
 ## 1.89.0-rc.3
 
 ### Minor Changes

package/__tests__/next-config.test.ts

@@ -0,0 +1,83 @@
+import { resolve } from 'path';
+import type { NextConfig } from 'next';
+
+function findBaseDir() {
+  const insideNodeModules = __dirname.includes('node_modules');
+
+  if (insideNodeModules) {
+    return resolve(__dirname, '../../../../');
+  } else {
+    return resolve(__dirname, '../../../apps/projectzeronext');
+  }
+}
+
+const baseDir = findBaseDir();
+
+jest.mock('next-pwa', () => {
+  return () => (config: NextConfig) => config;
+});
+
+jest.mock('@sentry/nextjs', () => ({
+  withSentryConfig: (config: NextConfig) => config
+}));
+
+jest.mock('../with-pz-config.js', () => {
+  return (config: NextConfig) => {
+    const originalHeaders = config.headers;
+
+    config.headers = async () => {
+      const originalHeadersResult = (await originalHeaders?.()) ?? [];
+
+      return [
+        {
+          source: '/(.*)',
+          headers: [
+            {
+              key: 'Content-Security-Policy',
+              value: 'https://*.akifast.com akifast.com'
+            }
+          ]
+        },
+        ...originalHeadersResult
+      ];
+    };
+    return config;
+  };
+});
+
+interface Header {
+  key: string;
+  value: string;
+}
+
+interface HeaderGroup {
+  source: string;
+  headers: Header[];
+}
+
+const nextConfigPath = resolve(baseDir, 'next.config.mjs');
+let nextConfig: any;
+
+beforeAll(async () => {
+  nextConfig = await import(nextConfigPath);
+});
+
+describe('Next.js Configuration', () => {
+  it('should contain Content-Security-Policy header with akifast domain values', async () => {
+    const headers = nextConfig.default.headers;
+    expect(headers).toBeDefined();
+
+    const headersResult = await headers();
+
+    const cspHeaders = headersResult
+      .flatMap((headerGroup: HeaderGroup) => headerGroup.headers)
+      .filter((header: Header) => header.key === 'Content-Security-Policy');
+
+    expect(cspHeaders.length).toBeGreaterThan(0);
+
+    const lastCspHeader = cspHeaders[cspHeaders.length - 1];
+
+    expect(lastCspHeader.value).toContain('akifast.com');
+    expect(lastCspHeader.value).toContain('https://*.akifast.com');
+  });
+});

package/__tests__/tsconfig.json

@@ -0,0 +1,22 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "display": "Default",
+  "compilerOptions": {
+    "composite": false,
+    "declaration": true,
+    "declarationMap": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "inlineSources": false,
+    "isolatedModules": true,
+    "moduleResolution": "node",
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
+    "preserveWatchOutput": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "jsx": "react-jsx"
+  },
+  "exclude": ["node_modules"],
+  "include": [".", "../."]
+}

package/babel.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+  presets: [
+    ['@babel/preset-env', { targets: { node: 'current' } }],
+    '@babel/preset-typescript'
+  ]
+};

package/bin/pz-prebuild.js

@@ -2,6 +2,7 @@
 
 const runScript = require('./run-script');
 
+runScript('pz-run-tests.js');
 runScript('pz-install-theme.js');
 runScript('pz-pre-check-dist.js');
 runScript('pz-generate-translations.js');

package/bin/pz-run-tests.js

@@ -0,0 +1,64 @@
+#!/usr/bin/env node
+
+const { spawn } = require('child_process');
+const path = require('path');
+const fs = require('fs');
+const glob = require('glob');
+const findBaseDir = require('../utils/find-base-dir');
+
+const BASE_DIR = findBaseDir();
+
+function isJestAvailable() {
+  try {
+    const jestPath = path.join(BASE_DIR, 'node_modules', '.bin', 'jest');
+    return fs.existsSync(jestPath);
+  } catch (error) {
+    return false;
+  }
+}
+
+function findAkinonNextPath() {
+  const insideNodeModules = __dirname.includes('node_modules');
+
+  if (insideNodeModules) {
+    return path.resolve(__dirname, '..');
+  }
+
+  return path.resolve(__dirname, '../../../packages/akinon-next');
+}
+
+if (!isJestAvailable()) {
+  console.error('\x1b[31mError: Jest is not available!\x1b[0m');
+  console.error(
+    'Please make sure you have installed all dependencies by running:'
+  );
+  console.error('  npm install');
+  console.error('or');
+  console.error('  yarn install');
+  process.exit(1);
+}
+
+const jestPath = path.join(BASE_DIR, 'node_modules', '.bin', 'jest');
+const akinonNextPath = findAkinonNextPath();
+
+const testFiles = glob.sync('__tests__/**/*.test.ts', {
+  cwd: akinonNextPath,
+  absolute: true
+});
+
+const jestArgs = [
+  ...testFiles,
+  `--config ${path.join(akinonNextPath, 'jest.config.js')}`,
+  '--runTestsByPath',
+  '--passWithNoTests'
+];
+
+const jestProcess = spawn(jestPath, jestArgs, {
+  cwd: akinonNextPath,
+  stdio: 'inherit',
+  shell: true
+});
+
+jestProcess.on('close', (code) => {
+  process.exit(code);
+});

package/jest.config.js

@@ -0,0 +1,19 @@
+const path = require('path');
+
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  rootDir: path.resolve(__dirname),
+  roots: [path.resolve(__dirname, '__tests__')],
+  testMatch: ['**/*.test.ts'],
+  testPathIgnorePatterns: [],
+  transformIgnorePatterns: [],
+  transform: {
+    '^.+\\.(tsx?|jsx?|mjs?)$': [
+      'ts-jest',
+      {
+        tsconfig: path.resolve(__dirname, '__tests__/tsconfig.json')
+      }
+    ]
+  }
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.89.0-rc.3",
+  "version": "1.89.0-rc.4",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -13,6 +13,9 @@
     "pz-predev": "bin/pz-predev.js",
     "pz-postdev": "bin/pz-postdev.js"
   },
+  "scripts": {
+    "test": "jest"
+  },
   "dependencies": {
     "@opentelemetry/exporter-trace-otlp-http": "0.46.0",
     "@opentelemetry/resources": "1.19.0",
@@ -31,13 +34,21 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.89.0-rc.3",
+    "@akinon/eslint-plugin-projectzero": "1.89.0-rc.4",
+    "@babel/core": "7.26.10",
+    "@babel/preset-env": "7.26.9",
+    "@babel/preset-typescript": "7.27.0",
+    "@types/jest": "29.5.14",
     "@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",
+    "babel-jest": "29.7.0",
     "eslint": "8.56.0",
     "eslint-config-next": "14.2.3",
-    "eslint-config-prettier": "8.5.0"
+    "eslint-config-prettier": "8.5.0",
+    "jest": "29.7.0",
+    "ts-jest": "29.3.2",
+    "typescript": "5.2.2"
   }
 }