@nocobase/cli 0.18.0-alpha.8 → 0.19.0-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "0.18.0-alpha.8",
+  "version": "0.19.0-alpha.1",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "0.18.0-alpha.8",
+    "@nocobase/app": "0.19.0-alpha.1",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
@@ -24,12 +24,12 @@
     "tsx": "^4.6.2"
   },
   "devDependencies": {
-    "@nocobase/devtools": "0.18.0-alpha.8"
+    "@nocobase/devtools": "0.19.0-alpha.1"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "727d42f6f14e5f863831da3dbf3255ba1165b567"
+  "gitHead": "64601944412fc4d2e2bd05f4b982118dd28247dc"
 }

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

@@ -3,6 +3,7 @@ const { run, isPortReachable } = require('../util');
 const { execSync } = require('node:child_process');
 const axios = require('axios');
 const { pTest } = require('./p-test');
+const os = require('os');
 
 /**
  * 检查服务是否启动成功
@@ -148,7 +149,13 @@ module.exports = (cli) => {
     .allowUnknownOption()
     .option('--url [url]')
     .option('--skip-reporter')
+    .option('--build')
     .action(async (options) => {
+      process.env.__E2E__ = true;
+      if (options.build) {
+        process.env.APP_ENV = 'production';
+        await run('yarn', ['build']);
+      }
       if (options.skipReporter) {
         process.env.PLAYWRIGHT_SKIP_REPORTER = true;
       }
@@ -183,8 +190,13 @@ module.exports = (cli) => {
   e2e
     .command('start-app')
     .option('--production')
+    .option('--build')
     .option('--port [port]')
     .action(async (options) => {
+      process.env.__E2E__ = true;
+      if (options.build) {
+        await run('yarn', ['build']);
+      }
       if (options.production) {
         process.env.APP_ENV = 'production';
       }
@@ -205,8 +217,14 @@ module.exports = (cli) => {
   e2e
     .command('p-test')
     .option('--stop-on-error')
-    .option('--concurrency [concurrency]', '', 3)
-    .action(async (opts) => {
-      await pTest(opts);
+    .option('--build')
+    .option('--concurrency [concurrency]', '', os.cpus().length)
+    .action(async (options) => {
+      process.env.__E2E__ = true;
+      if (options.build) {
+        process.env.APP_ENV = 'production';
+        await run('yarn', ['build']);
+      }
+      await pTest(options);
     });
 };

package/src/commands/p-test.js

@@ -1,10 +1,11 @@
 const execa = require('execa');
-const { resolve, dirname } = require('path');
+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');
 
@@ -18,7 +19,10 @@ const config = {
   ...process.env,
 };
 
-async function runApp(index = 1, dir) {
+async function runApp(dir, index = 0) {
+  // 一个进程需要占用两个端口? (一个是应用端口，一个是 socket 端口)
+  index = index * 2;
+
   const database = `nocobase${index}`;
   const client = new Client({
     host: config['DB_HOST'],
@@ -31,7 +35,7 @@ async function runApp(index = 1, dir) {
   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'], {
+  return execa('yarn', ['nocobase', 'e2e', 'test', dir, '--skip-reporter'], {
     shell: true,
     stdio: 'inherit',
     env: {
@@ -43,26 +47,32 @@ async function runApp(index = 1, dir) {
       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}`),
+      SOCKET_PATH: `storage/e2e/gateway-e2e-${index}.sock`,
+      PM2_HOME: resolve(process.cwd(), `storage/e2e/.pm2-${index}`),
       PLAYWRIGHT_AUTH_FILE: resolve(process.cwd(), `storage/playwright/.auth/admin-${index}.json`),
     },
   });
 }
 
 exports.pTest = async (options) => {
+  const dir = resolve(process.cwd(), 'storage/e2e');
+
+  if (!fs.existsSync(dir)) {
+    fs.mkdirSync(dir, { recursive: true });
+  }
+
   const files = glob.sync('packages/**/__e2e__/**/*.test.ts', {
     root: process.cwd(),
   });
-  const fileSet = new Set();
 
-  for (const file of files) {
-    fileSet.add(dirname(file));
-  }
-
-  const commands = [...fileSet.values()].map((v, i) => {
-    return () => runApp(i + 1, v);
+  const commands = splitArrayIntoParts(_.shuffle(files), options.concurrency || 4).map((v, i) => {
+    return () => runApp(v.join(' '), i);
   });
 
-  await pAll(commands, { concurrency: 3, stopOnError: false, ...options });
+  await pAll(commands, { concurrency: 4, stopOnError: false, ...options });
 };
+
+function splitArrayIntoParts(array, parts) {
+  let chunkSize = Math.ceil(array.length / parts);
+  return _.chunk(array, chunkSize);
+}

package/src/commands/test.js

@@ -36,26 +36,26 @@ function addTestCommand(name, cli) {
       if (!opts.watch && !opts.run) {
         process.argv.push('--run');
       }
+      const first = paths?.[0];
+      if (!process.env.TEST_ENV && first) {
+        const key = first.split(path.sep).join('/');
+        if (key.includes('/client/')) {
+          process.env.TEST_ENV = 'client-side';
+        } else {
+          process.env.TEST_ENV = 'server-side';
+        }
+      }
       if (process.env.TEST_ENV === 'server-side' && opts.singleThread !== 'false') {
         process.argv.push('--poolOptions.threads.singleThread=true');
       }
       if (opts.singleThread === 'false') {
         process.argv.splice(process.argv.indexOf('--single-thread=false'), 1);
       }
-      const cliArgs = ['--max_old_space_size=4096', './node_modules/.bin/vitest', ...process.argv.slice(3)];
+      const cliArgs = ['--max_old_space_size=14096', './node_modules/.bin/vitest', ...process.argv.slice(3)];
       if (process.argv.includes('-h') || process.argv.includes('--help')) {
         await run('node', cliArgs);
         return;
       }
-      const first = paths?.[0];
-      if (!process.env.TEST_ENV && first) {
-        const key = first.split(path.sep).join('/');
-        if (key.includes('/client/')) {
-          process.env.TEST_ENV = 'client-side';
-        } else {
-          process.env.TEST_ENV = 'server-side';
-        }
-      }
       if (process.env.TEST_ENV) {
         console.log('process.env.TEST_ENV', process.env.TEST_ENV, cliArgs);
         await run('node', cliArgs);

package/src/util.js

@@ -245,6 +245,18 @@ function generatePlaywrightPath(clean = false) {
 
 exports.generatePlaywrightPath = generatePlaywrightPath;
 
+function parseEnv(name) {
+  if (name === 'DB_UNDERSCORED') {
+    if (process.env.DB_UNDERSCORED === 'true') {
+      return 'true';
+    }
+    if (process.env.DB_UNDERSCORED) {
+      return 'true';
+    }
+    return 'false';
+  }
+}
+
 exports.initEnv = function initEnv() {
   const env = {
     APP_ENV: 'development',
@@ -254,6 +266,7 @@ exports.initEnv = function initEnv() {
     DB_DIALECT: 'sqlite',
     DB_STORAGE: 'storage/db/nocobase.sqlite',
     DB_TIMEZONE: '+00:00',
+    DB_UNDERSCORED: parseEnv('DB_UNDERSCORED'),
     DEFAULT_STORAGE_TYPE: 'local',
     LOCAL_STORAGE_DEST: 'storage/uploads',
     PLUGIN_STORAGE_PATH: resolve(process.cwd(), 'storage/plugins'),