@nocobase/cli 0.12.0-alpha.5 → 0.13.0-alpha.10

package/bin/index.js

@@ -3,6 +3,7 @@
 const dotenv = require('dotenv');
 const { resolve } = require('path');
 const { existsSync } = require('fs');
+const chalk = require('chalk');
 
 const env = {
   APP_ENV: 'development',
@@ -35,6 +36,11 @@ for (const key in env) {
   }
 }
 
+if (require('semver').satisfies(process.version, '<16')) {
+  console.error(chalk.red('[nocobase cli]: Node.js version must be >= 16'));
+  process.exit(1);
+}
+
 if (require('semver').satisfies(process.version, '>16') && !process.env.UNSET_NODE_OPTIONS) {
   if (process.env.NODE_OPTIONS) {
     let opts = process.env.NODE_OPTIONS;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "0.12.0-alpha.5",
+  "version": "0.13.0-alpha.10",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "0.12.0-alpha.5",
+    "@nocobase/app": "0.13.0-alpha.10",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
@@ -23,12 +23,12 @@
     "tsx": "^3.12.7"
   },
   "devDependencies": {
-    "@nocobase/devtools": "0.12.0-alpha.5"
+    "@nocobase/devtools": "0.13.0-alpha.10"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "689cc16e83361c4d0b91907e0deac30bdb907692"
+  "gitHead": "5360ed81650f6895f3ed39aede2706467d55862c"
 }

package/src/commands/build.js

@@ -1,41 +1,34 @@
-const { resolve, dirname } = require('path');
+const { resolve } = require('path');
 const { Command } = require('commander');
-const { run, nodeCheck, isPackageValid, promptForTs, hasCorePackages } = require('../util');
+const { run, nodeCheck, isPackageValid } = require('../util');
 
 /**
  *
  * @param {Command} cli
  */
 module.exports = (cli) => {
-  const { APP_PACKAGE_ROOT } = process.env;
-  const clientPackage = `core/app`;
   cli
     .command('build')
     .allowUnknownOption()
     .argument('[packages...]')
+    .option('-v, --version', 'print version')
     .option('-c, --compile', 'compile the @nocobase/build package')
+    .option('-w, --watch', 'watch compile the @nocobase/build package')
+    .option('-s, --sourcemap', 'generate sourcemap')
+    .option('--no-dts', 'not generate dts')
     .action(async (pkgs, options) => {
-      promptForTs();
       nodeCheck();
-      if (isPackageValid('umi-tools/cli')) {
-        if (options.compile || !isPackageValid('@nocobase/build/lib')) {
-          await run('umi-tools', ['build'], {
-            cwd: resolve(process.cwd(), 'packages/core/build'),
-          });
-        }
-      }
-      await run('nocobase-build', process.argv.slice(3));
-      if (!hasCorePackages()) {
-        return;
-      }
-      if (!pkgs.length || pkgs.includes(clientPackage)) {
-        const file = require.resolve('@nocobase/app');
-        await run('umi', ['build'], {
-          env: {
-            APP_ROOT: `${dirname(dirname(file))}/client`,
-            NODE_ENV: 'production',
-          },
+      if (options.compile || options.watch || isPackageValid('@nocobase/build/src/index.ts')) {
+        await run('yarn', ['build', options.watch ? '--watch' : ''], {
+          cwd: resolve(process.cwd(), 'packages/core/build'),
         });
+        if (options.watch) return;
       }
+      await run('nocobase-build', [
+        ...pkgs,
+        options.version ? '--version' : '',
+        !options.dts ? '--no-dts' : '',
+        options.sourcemap ? '--sourcemap' : '',
+      ]);
     });
 };

package/src/commands/clean.js

@@ -15,7 +15,6 @@ module.exports = (cli) => {
         return;
       }
       run('rimraf', ['-rf', './storage/app-dev']);
-      run('rimraf', ['-rf', './**/{.umi,.umi-production}']);
       run('rimraf', ['-rf', 'packages/*/*/{lib,esm,es,dist,node_modules}']);
     });
 };

package/src/commands/dev.js

@@ -54,8 +54,6 @@ module.exports = (cli) => {
         });
       }
 
-      await runAppCommand('install', ['--silent']);
-
       if (server || !client) {
         console.log('starting server', serverPort);
 
@@ -99,6 +97,7 @@ module.exports = (cli) => {
           env: {
             PORT: clientPort,
             APP_ROOT: `${APP_PACKAGE_ROOT}/client`,
+            WEBSOCKET_URL: process.env.WEBSOCKET_URL || (serverPort ? `ws://localhost:${serverPort}/ws` : undefined),
             PROXY_TARGET_URL:
               process.env.PROXY_TARGET_URL || (serverPort ? `http://127.0.0.1:${serverPort}` : undefined),
           },

package/src/commands/global.js

@@ -12,11 +12,10 @@ module.exports = (cli) => {
     .option('-h, --help')
     .option('--ts-node-dev')
     .action((options) => {
-      const { tsNodeDev } = options;
       if (isDev()) {
         promptForTs();
-        run(tsNodeDev ? 'ts-node-dev' : 'ts-node', [
-          '-P',
+        run('tsx', [
+          '--tsconfig',
           './tsconfig.server.json',
           '-r',
           'tsconfig-paths/register',

package/src/commands/start.js

@@ -41,16 +41,6 @@ module.exports = (cli) => {
         return;
       }
       await postCheck(opts);
-      const restartMark = resolve(process.cwd(), 'storage', 'restart');
-      if (!existsSync(restartMark)) {
-        if (opts.quickstart) {
-          await run('node', [`${APP_PACKAGE_ROOT}/lib/index.js`, 'install', '--ignore-installed']);
-          await run('node', [`${APP_PACKAGE_ROOT}/lib/index.js`, 'upgrade']);
-        }
-        if (opts.dbSync) {
-          await run('node', [`${APP_PACKAGE_ROOT}/lib/index.js`, 'db:sync']);
-        }
-      }
       if (opts.daemon) {
         run('pm2', ['start', `${APP_PACKAGE_ROOT}/lib/index.js`, '--', ...process.argv.slice(2)]);
       } else {