@nocobase/cli-v1 2.2.0-beta.1 → 2.2.0-beta.11

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "@nocobase/cli-v1",
-  "version": "2.2.0-beta.1",
+  "version": "2.2.0-beta.11",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
   "bin": {
+    "nocobase": "./bin/index.js",
     "nocobase-v1": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/cli": "2.2.0-beta.1",
+    "@nocobase/cli": "2.2.0-beta.11",
     "@nocobase/license-kit": "^0.3.8",
-    "@nocobase/utils": "2.2.0-beta.1",
+    "@nocobase/utils": "2.2.0-beta.11",
     "chalk": "^4.1.1",
     "commander": "^9.2.0",
     "deepmerge": "^4.3.1",
@@ -25,7 +26,6 @@
     "tree-kill": "^1.2.2"
   },
   "devDependencies": {
-    "@nocobase/devtools": "2.2.0-beta.1",
     "@types/fs-extra": "^11.0.1"
   },
   "repository": {
@@ -33,5 +33,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "f82fa9d0c3aa8e00e53dd94e404a312483b4866b"
+  "gitHead": "8dab25af2bb83a81da68158d0dcf836f96103d61"
 }

package/src/__tests__/app-dev-utils.test.js

@@ -82,6 +82,7 @@ describe('cli-v1 app-dev utils', () => {
       }),
     ).toEqual([
       'watch',
+      '--clear-screen=false',
       `--ignore=${path.resolve(process.cwd(), 'storage/plugins')}/**`,
       '--tsconfig',
       './tsconfig.server.json',

package/src/__tests__/dev-command.test.js

@@ -0,0 +1,34 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/* eslint-env jest */
+
+const { buildAppDevForwardArgs, forwardDevToAppDev } = require('../commands/dev')._test;
+
+describe('cli-v1 dev command', () => {
+  test('buildAppDevForwardArgs rewrites dev argv to app-dev while preserving extra args', () => {
+    expect(
+      buildAppDevForwardArgs(['node', 'nocobase-v1', 'dev', '--rsbuild', '--port', '13000', '--inspect=9229']),
+    ).toEqual(['app-dev', '--rsbuild', '--port', '13000', '--inspect=9229']);
+  });
+
+  test('forwardDevToAppDev delegates to nocobase-v1 app-dev for create-app projects', async () => {
+    const calls = [];
+    const runCommand = async (...args) => {
+      calls.push(args);
+    };
+
+    await forwardDevToAppDev({
+      argv: ['node', 'nocobase-v1', 'dev', '--port', '13000', '--db-sync'],
+      runCommand,
+    });
+
+    expect(calls).toEqual([['nocobase-v1', ['app-dev', '--port', '13000', '--db-sync']]]);
+  });
+});

package/src/__tests__/util.test.js

@@ -0,0 +1,33 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/* eslint-env jest */
+
+const { colorizedDevLogEnv, createRunWithPrefixLabel } = require('../util')._test;
+
+describe('cli-v1 util helpers', () => {
+  test('colorizedDevLogEnv enables color for dev child output by default', () => {
+    expect(colorizedDevLogEnv({})).toEqual({ FORCE_COLOR: '1' });
+  });
+
+  test('colorizedDevLogEnv keeps explicit FORCE_COLOR', () => {
+    expect(colorizedDevLogEnv({ FORCE_COLOR: '3' })).toEqual({ FORCE_COLOR: '3' });
+  });
+
+  test('colorizedDevLogEnv removes inherited NO_COLOR so dev logs stay colored', () => {
+    expect(colorizedDevLogEnv({ NO_COLOR: '1', TERM: 'dumb' })).toEqual({
+      FORCE_COLOR: '1',
+      TERM: 'dumb',
+    });
+  });
+
+  test('createRunWithPrefixLabel colorizes prefixed output even when the parent disables colors', () => {
+    expect(createRunWithPrefixLabel('client', 'cyan')).toBe('\u001b[36m[client]\u001b[39m');
+  });
+});

package/src/commands/app-dev-utils.js

@@ -150,7 +150,7 @@ function buildAppDevServerArgs({
   argv = process.argv,
   serverTsconfigPath = process.env.SERVER_TSCONFIG_PATH,
 } = {}) {
-  const args = ['watch', `--ignore=${resolvePluginStoragePath()}/**`];
+  const args = ['watch', '--clear-screen=false', `--ignore=${resolvePluginStoragePath()}/**`];
 
   if (serverTsconfigPath) {
     args.push('--tsconfig', serverTsconfigPath);

package/src/commands/dev.js

@@ -10,8 +10,10 @@ const _ = require('lodash');
 const { Command } = require('commander');
 const {
   generatePlugins,
+  hasCorePackages,
   run,
   runWithPrefix,
+  colorizedDevLogEnv,
   postCheck,
   nodeCheck,
   promptForTs,
@@ -41,6 +43,14 @@ async function buildBundleStatusHtml() {
   );
 }
 
+function buildAppDevForwardArgs(argv = process.argv) {
+  return ['app-dev', ...argv.slice(3)];
+}
+
+async function forwardDevToAppDev({ argv = process.argv, runCommand = run } = {}) {
+  await runCommand('nocobase-v1', buildAppDevForwardArgs(argv));
+}
+
 /**
  *
  * @param {Command} cli
@@ -58,6 +68,11 @@ module.exports = (cli) => {
     .option('-i, --inspect [port]')
     .allowUnknownOption()
     .action(async (opts) => {
+      if (!hasCorePackages()) {
+        await forwardDevToAppDev();
+        return;
+      }
+
       checkDBDialect();
       await buildBundleStatusHtml();
 
@@ -184,16 +199,13 @@ module.exports = (cli) => {
         }
         subprocessRef.cancel();
         let i = 0;
-        while (true) {
+        while (i <= 10) {
           ++i;
           const result = await isPortReachable(port);
           if (!result) {
             break;
           }
           await sleep(500);
-          if (i > 10) {
-            break;
-          }
         }
         start();
       };
@@ -202,7 +214,7 @@ module.exports = (cli) => {
         const storagePluginPath = resolvePluginStoragePath();
         const watcher = chokidar.watch(`${storagePluginPath}/**/*`, {
           cwd: process.cwd(),
-          ignored: /(^|[\/\\])\../, // 忽略隐藏文件
+          ignored: /(^|[/\\])\../, // 忽略隐藏文件
           persistent: true,
           depth: 1, // 只监听第一层目录
         });
@@ -246,6 +258,7 @@ module.exports = (cli) => {
 
         const argv = [
           'watch',
+          '--clear-screen=false',
           ...(inspect ? [`--inspect=${inspect === true ? 9229 : inspect}`] : []),
           `--ignore=${resolvePluginStoragePath()}/**`,
           '--tsconfig',
@@ -264,9 +277,9 @@ module.exports = (cli) => {
 
         const runDevServer = () => {
           run('tsx', argv, {
-            env: {
+            env: colorizedDevLogEnv(process.env, {
               APP_PORT: serverPort,
-            },
+            }),
           }).catch((err) => {
             if (err.exitCode == 100) {
               console.log('Restarting server...');
@@ -289,3 +302,8 @@ module.exports = (cli) => {
       }
     });
 };
+
+module.exports._test = {
+  buildAppDevForwardArgs,
+  forwardDevToAppDev,
+};

package/src/commands/update-deps.js

@@ -68,6 +68,14 @@ module.exports = (cli) => {
       if (descJson['dependencies']?.['@nocobase/app']) {
         descJson['dependencies']['@nocobase/app'] = stdout;
       }
+      descJson['scripts']['dev'] = 'nocobase app-dev';
+      if (descJson['dependencies']?.['@nocobase/cli']) {
+        descJson['dependencies']['@nocobase/app'] = stdout;
+        console.log(
+          chalk.yellow('The @nocobase/cli package is no longer needed, it will be removed from dependencies.'),
+        );
+        delete descJson['dependencies']['@nocobase/cli'];
+      }
       if (descJson['devDependencies']?.['@nocobase/devtools']) {
         descJson['devDependencies']['@nocobase/devtools'] = stdout;
       }

package/src/util.js

@@ -84,6 +84,24 @@ exports.run = (command, args, options = {}) => {
   });
 };
 
+function colorizedDevLogEnv(env = process.env, overrides = {}) {
+  const nextEnv = {
+    ...env,
+    ...overrides,
+  };
+  delete nextEnv.NO_COLOR;
+  if (!nextEnv.FORCE_COLOR) {
+    nextEnv.FORCE_COLOR = '1';
+  }
+  return nextEnv;
+}
+
+function createRunWithPrefixLabel(prefix, color) {
+  const forcedChalk = new chalk.Instance({ level: 1 });
+  const colorize = forcedChalk[color] || forcedChalk.cyan;
+  return colorize(`[${prefix}]`);
+}
+
 exports.runWithPrefix = (command, args, options = {}) => {
   if (command === 'tsx') {
     command = 'node';
@@ -92,15 +110,12 @@ exports.runWithPrefix = (command, args, options = {}) => {
 
   const prefix = options.prefix || 'process';
   const color = options.color || 'cyan';
-  const label = chalk[color](`[${prefix}]`);
+  const label = createRunWithPrefixLabel(prefix, color);
   const subprocess = execa(command, args, {
     shell: true,
     stdio: 'pipe',
     ...options,
-    env: {
-      ...process.env,
-      ...options.env,
-    },
+    env: colorizedDevLogEnv(process.env, options.env),
   });
 
   const writePrefixed = (chunk, writer) => {
@@ -122,6 +137,13 @@ exports.runWithPrefix = (command, args, options = {}) => {
   return subprocess;
 };
 
+exports._test = {
+  createRunWithPrefixLabel,
+  colorizedDevLogEnv,
+};
+
+exports.colorizedDevLogEnv = colorizedDevLogEnv;
+
 exports.isPortReachable = async (port, { timeout = 1000, host } = {}) => {
   const promise = new Promise((resolve, reject) => {
     const socket = new net.Socket();
@@ -434,6 +456,9 @@ function isAppDevHtml() {
 }
 
 function buildIndexHtml(force = false) {
+  if (process.env.NOCOBASE_EXTRACT_CLIENT_ASSETS === 'true') {
+    return;
+  }
   const file = `${process.env.APP_PACKAGE_ROOT}/dist/client/index.html`;
   if (!fs.existsSync(file)) {
     return;