@nocobase/cli 0.18.0-alpha.1 → 0.18.0-alpha.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "0.18.0-alpha.1",
+  "version": "0.18.0-alpha.9",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "0.18.0-alpha.1",
+    "@nocobase/app": "0.18.0-alpha.9",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
@@ -17,18 +17,19 @@
     "execa": "^5.1.1",
     "fast-glob": "^3.3.1",
     "fs-extra": "^11.1.1",
+    "p-all": "3.0.0",
     "pm2": "^5.2.0",
     "portfinder": "^1.0.28",
     "serve": "^13.0.2",
     "tsx": "^4.6.2"
   },
   "devDependencies": {
-    "@nocobase/devtools": "0.18.0-alpha.1"
+    "@nocobase/devtools": "0.18.0-alpha.9"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "0f5f1c0a37dc397a9dc4c8eec0c4ec20fd8107b0"
+  "gitHead": "34ca0df4eede2e83fc86297b0fe19eba970e2b1b"
 }

package/src/commands/dev.js

@@ -15,6 +15,7 @@ module.exports = (cli) => {
     .option('--client')
     .option('--server')
     .option('--db-sync')
+    .option('--inspect [port]')
     .allowUnknownOption()
     .action(async (opts) => {
       promptForTs();
@@ -33,7 +34,7 @@ module.exports = (cli) => {
         return;
       }
 
-      const { port, client, server } = opts;
+      const { port, client, server, inspect } = opts;
 
       if (port) {
         process.env.APP_PORT = opts.port;
@@ -59,8 +60,13 @@ module.exports = (cli) => {
       if (server || !client) {
         console.log('starting server', serverPort);
 
+        const filteredArgs = process.argv.filter(
+          (item, i) => !item.startsWith('--inspect') && !(process.argv[i - 1] === '--inspect' && Number.parseInt(item)),
+        );
+
         const argv = [
           'watch',
+          ...(inspect ? [`--inspect=${inspect === true ? 9229 : inspect}`] : []),
           '--ignore=./storage/plugins/**',
           '--tsconfig',
           SERVER_TSCONFIG_PATH,
@@ -68,7 +74,7 @@ module.exports = (cli) => {
           'tsconfig-paths/register',
           `${APP_PACKAGE_ROOT}/src/index.ts`,
           'start',
-          ...process.argv.slice(3),
+          ...filteredArgs.slice(3),
           `--port=${serverPort}`,
         ];
 

package/src/commands/e2e.js

@@ -2,6 +2,7 @@ const { Command } = require('commander');
 const { run, isPortReachable } = require('../util');
 const { execSync } = require('node:child_process');
 const axios = require('axios');
+const { pTest } = require('./p-test');
 
 /**
  * 检查服务是否启动成功
@@ -200,4 +201,12 @@ module.exports = (cli) => {
   e2e.command('install-deps').action(async () => {
     await run('npx', ['playwright', 'install', '--with-deps']);
   });
+
+  e2e
+    .command('p-test')
+    .option('--stop-on-error')
+    .option('--concurrency [concurrency]', '', 3)
+    .action(async (opts) => {
+      await pTest(opts);
+    });
 };

package/src/commands/p-test.js

@@ -0,0 +1,72 @@
+const execa = require('execa');
+const { resolve } = require('path');
+const pAll = require('p-all');
+const dotenv = require('dotenv');
+const fs = require('fs');
+const { Client } = require('pg');
+const glob = require('glob');
+const _ = require('lodash');
+
+let ENV_FILE = resolve(process.cwd(), '.env.e2e');
+
+if (!fs.existsSync(ENV_FILE)) {
+  ENV_FILE = resolve(process.cwd(), '.env.e2e.example');
+}
+
+const data = fs.readFileSync(ENV_FILE, 'utf-8');
+const config = {
+  ...dotenv.parse(data),
+  ...process.env,
+};
+
+async function runApp(dir, index = 0) {
+  // 一个进程需要占用两个端口? (一个是应用端口，一个是 socket 端口)
+  index = index * 2;
+
+  const database = `nocobase${index}`;
+  const client = new Client({
+    host: config['DB_HOST'],
+    port: Number(config['DB_PORT']),
+    user: config['DB_USER'],
+    password: config['DB_PASSWORD'],
+    database: 'postgres',
+  });
+  await client.connect();
+  await client.query(`DROP DATABASE IF EXISTS "${database}"`);
+  await client.query(`CREATE DATABASE "${database}";`);
+  await client.end();
+  return execa('yarn', ['nocobase', 'e2e', 'test', dir, '-x', '--skip-reporter'], {
+    shell: true,
+    stdio: 'inherit',
+    env: {
+      ...config,
+      CI: true,
+      __E2E__: true,
+      APP_BASE_URL: undefined,
+      LOGGER_LEVEL: 'error',
+      APP_ENV: 'production',
+      APP_PORT: 20000 + index,
+      DB_DATABASE: `nocobase${index}`,
+      SOCKET_PATH: `storage/gateway-e2e-${index}.sock`,
+      PM2_HOME: resolve(process.cwd(), `storage/.pm2-${index}`),
+      PLAYWRIGHT_AUTH_FILE: resolve(process.cwd(), `storage/playwright/.auth/admin-${index}.json`),
+    },
+  });
+}
+
+exports.pTest = async (options) => {
+  const files = glob.sync('packages/**/__e2e__/**/*.test.ts', {
+    root: process.cwd(),
+  });
+
+  const commands = splitArrayIntoParts(files, options.concurrency || 3).map((v, i) => {
+    return () => runApp(v.join(' '), i);
+  });
+
+  await pAll(commands, { concurrency: 3, stopOnError: false, ...options });
+};
+
+function splitArrayIntoParts(array, parts) {
+  let chunkSize = Math.ceil(array.length / parts);
+  return _.chunk(array, chunkSize);
+}

package/src/util.js

@@ -57,6 +57,10 @@ exports.nodeCheck = () => {
 };
 
 exports.run = (command, args, options = {}) => {
+  if (command === 'tsx') {
+    command = 'node';
+    args = ['./node_modules/tsx/dist/cli.mjs'].concat(args || []);
+  }
   return execa(command, args, {
     shell: true,
     stdio: 'inherit',
@@ -213,6 +217,9 @@ exports.genTsConfigPaths = function genTsConfigPaths() {
       paths[`${packageJsonName}/server`] = [`${relativePath}/src/server`];
       paths[`${packageJsonName}/e2e`] = [`${relativePath}/src/e2e`];
     }
+    if (packageJsonName === '@nocobase/plugin-workflow-test') {
+      paths[`${packageJsonName}/e2e`] = [`${relativePath}/src/e2e`];
+    }
   });
 
   const tsConfigJsonPath = join(cwd, './tsconfig.paths.json');
@@ -268,7 +275,7 @@ exports.initEnv = function initEnv() {
     }
   }
 
-  if (process.argv[2] === 'e2e') {
+  if (!process.env.APP_ENV_PATH && process.argv[2] === 'e2e') {
     // 用于存放 playwright 自动生成的相关的文件
     generatePlaywrightPath();
     if (!fs.existsSync('.env.e2e') && fs.existsSync('.env.e2e.example')) {