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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "0.18.0-alpha.8",
+  "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.8",
+    "@nocobase/app": "0.18.0-alpha.9",
     "@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.18.0-alpha.9"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "727d42f6f14e5f863831da3dbf3255ba1165b567"
+  "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/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'],
@@ -54,15 +58,15 @@ exports.pTest = async (options) => {
   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(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);
+}