@nocobase/cli 0.19.0-alpha.2 → 0.19.0-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "0.19.0-alpha.2",
+  "version": "0.19.0-alpha.4",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "0.19.0-alpha.2",
+    "@nocobase/app": "0.19.0-alpha.4",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
@@ -21,15 +21,16 @@
     "pm2": "^5.2.0",
     "portfinder": "^1.0.28",
     "serve": "^13.0.2",
+    "tree-kill": "^1.2.2",
     "tsx": "^4.6.2"
   },
   "devDependencies": {
-    "@nocobase/devtools": "0.19.0-alpha.2"
+    "@nocobase/devtools": "0.19.0-alpha.4"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "cff5b77ecf12ccdb450d50d505b3aa44a68478c8"
+  "gitHead": "9583023f7bea828da5192384a5c002782c341b65"
 }

package/src/commands/dev.js

@@ -106,7 +106,9 @@ module.exports = (cli) => {
           env: {
             PORT: clientPort,
             APP_ROOT: `${APP_PACKAGE_ROOT}/client`,
-            WEBSOCKET_URL: process.env.WEBSOCKET_URL || (serverPort ? `ws://localhost:${serverPort}/ws` : undefined),
+            WEBSOCKET_URL:
+              process.env.WEBSOCKET_URL ||
+              (serverPort ? `ws://localhost:${serverPort}${process.env.WS_PATH}` : undefined),
             PROXY_TARGET_URL:
               process.env.PROXY_TARGET_URL || (serverPort ? `http://127.0.0.1:${serverPort}` : undefined),
           },

package/src/commands/e2e.js

@@ -4,6 +4,8 @@ const { execSync } = require('node:child_process');
 const axios = require('axios');
 const { pTest } = require('./p-test');
 const os = require('os');
+const treeKill = require('tree-kill');
+const chalk = require('chalk');
 
 /**
  * 检查服务是否启动成功
@@ -33,7 +35,7 @@ const checkServer = async (duration = 1000, max = 60 * 10) => {
           }
         })
         .catch((error) => {
-          console.error('Request error:', error.message);
+          console.error('Request error:', error?.response?.data?.error);
         });
     }, duration);
   });
@@ -91,6 +93,17 @@ async function runApp(options = {}) {
   run('nocobase', [process.env.APP_ENV === 'production' ? 'start' : 'dev'], options);
 }
 
+process.on('SIGINT', async () => {
+  treeKill(process.pid, (error) => {
+    if (error) {
+      console.error(error);
+    } else {
+      console.log(chalk.yellow('Force killing...'));
+    }
+    process.exit();
+  });
+});
+
 const commonConfig = {
   stdio: 'inherit',
 };
@@ -128,6 +141,12 @@ const filterArgv = () => {
     if (element === '--skip-reporter') {
       continue;
     }
+    if (element === '--build') {
+      continue;
+    }
+    if (element === '--production') {
+      continue;
+    }
     argv.push(element);
   }
   return argv;
@@ -144,14 +163,19 @@ module.exports = (cli) => {
       console.log('APP_BASE_URL:', process.env.APP_BASE_URL);
     }
   });
+
   e2e
     .command('test')
     .allowUnknownOption()
     .option('--url [url]')
     .option('--skip-reporter')
     .option('--build')
+    .option('--production')
     .action(async (options) => {
       process.env.__E2E__ = true;
+      if (options.production) {
+        process.env.APP_ENV = 'production';
+      }
       if (options.build) {
         process.env.APP_ENV = 'production';
         await run('yarn', ['build']);
@@ -225,6 +249,6 @@ module.exports = (cli) => {
         process.env.APP_ENV = 'production';
         await run('yarn', ['build']);
       }
-      await pTest(options);
+      await pTest({ ...options, concurrency: 1 * options.concurrency });
     });
 };

package/src/commands/postinstall.js

@@ -3,7 +3,7 @@ const { run, isDev, isPackageValid, generatePlaywrightPath } = require('../util'
 const { resolve } = require('path');
 const { existsSync } = require('fs');
 const { readFile, writeFile } = require('fs').promises;
-const { createStoragePluginsSymlink } = require('@nocobase/utils/plugin-symlink');
+const { createStoragePluginsSymlink, createDevPluginsSymlink } = require('@nocobase/utils/plugin-symlink');
 
 /**
  * @param {Command} cli
@@ -13,12 +13,14 @@ module.exports = (cli) => {
   cli
     .command('postinstall')
     .allowUnknownOption()
-    .action(async () => {
+    .option('--skip-umi')
+    .action(async (options) => {
       generatePlaywrightPath(true);
       await createStoragePluginsSymlink();
       if (!isDev()) {
         return;
       }
+      await createDevPluginsSymlink();
       const cwd = process.cwd();
       if (!existsSync(resolve(cwd, '.env')) && existsSync(resolve(cwd, '.env.example'))) {
         const content = await readFile(resolve(cwd, '.env.example'), 'utf-8');
@@ -31,11 +33,13 @@ module.exports = (cli) => {
       if (!isPackageValid('umi')) {
         return;
       }
-      run('umi', ['generate', 'tmp'], {
-        stdio: 'pipe',
-        env: {
-          APP_ROOT: `${APP_PACKAGE_ROOT}/client`,
-        },
-      });
+      if (!options.skipUmi) {
+        run('umi', ['generate', 'tmp'], {
+          stdio: 'pipe',
+          env: {
+            APP_ROOT: `${APP_PACKAGE_ROOT}/client`,
+          },
+        });
+      }
     });
 };

package/src/plugin-generator.js

@@ -29,9 +29,10 @@ async function getProjectVersion() {
 
 class PluginGenerator extends Generator {
   constructor(options) {
-    const { context = {}, ...opts } = options;
+    const { log, context = {}, ...opts } = options;
     super(opts);
     this.context = context;
+    this.log = log || console.log;
   }
 
   async getContext() {
@@ -51,20 +52,19 @@ class PluginGenerator extends Generator {
     const { name } = this.context;
     const target = resolve(process.cwd(), 'packages/plugins/', name);
     if (existsSync(target)) {
-      console.log(chalk.red(`[${name}] plugin already exists.`));
+      this.log(chalk.red(`[${name}] plugin already exists.`));
       return;
     }
-    console.log('Creating plugin');
+    this.log('Creating plugin');
     this.copyDirectory({
       target,
       context: await this.getContext(),
       path: join(__dirname, '../templates/plugin'),
     });
-    console.log('');
+    this.log('');
     genTsConfigPaths();
-    execa.sync('yarn', ['install'], { shell: true, stdio: 'inherit' });
-    // execa.sync('yarn', ['build', `plugins/${name}`], { shell: true, stdio: 'inherit' });
-    console.log(`The plugin folder is in ${chalk.green(`packages/plugins/${name}`)}`);
+    execa.sync('yarn', ['postinstall', '--skip-umi'], { shell: true, stdio: 'inherit' });
+    this.log(`The plugin folder is in ${chalk.green(`packages/plugins/${name}`)}`);
   }
 }
 

package/src/util.js

@@ -271,6 +271,7 @@ exports.initEnv = function initEnv() {
     LOCAL_STORAGE_DEST: 'storage/uploads',
     PLUGIN_STORAGE_PATH: resolve(process.cwd(), 'storage/plugins'),
     MFSU_AD: 'none',
+    WS_PATH: '/ws',
     NODE_MODULES_PATH: resolve(process.cwd(), 'node_modules'),
     PM2_HOME: resolve(process.cwd(), './storage/.pm2'),
     PLUGIN_PACKAGE_PREFIX: '@nocobase/plugin-,@nocobase/plugin-sample-,@nocobase/preset-',

package/templates/plugin/src/server/plugin.ts.tpl

@@ -1,13 +1,13 @@
-import { InstallOptions, Plugin } from '@nocobase/server';
+import { Plugin } from '@nocobase/server';
 
 export class {{{pascalCaseName}}}Server extends Plugin {
-  afterAdd() {}
+  async afterAdd() {}
 
-  beforeLoad() {}
+  async beforeLoad() {}
 
   async load() {}
 
-  async install(options?: InstallOptions) {}
+  async install() {}
 
   async afterEnable() {}