@nocobase/cli-v1 2.1.3 → 2.1.5

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "@nocobase/cli-v1",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
   "bin": {
+    "nocobase": "./bin/index.js",
     "nocobase-v1": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/cli": "2.1.3",
+    "@nocobase/cli": "2.1.5",
     "@nocobase/license-kit": "^0.3.8",
-    "@nocobase/utils": "2.1.3",
+    "@nocobase/utils": "2.1.5",
     "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.1.3",
     "@types/fs-extra": "^11.0.1"
   },
   "repository": {
@@ -33,5 +33,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "f61e75119a74bbac25879f4edb8cf9913c99098a"
+  "gitHead": "fb6550c3c607ea45ce5389dafe9d98f17f201aad"
 }

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/commands/dev.js

@@ -10,6 +10,7 @@ const _ = require('lodash');
 const { Command } = require('commander');
 const {
   generatePlugins,
+  hasCorePackages,
   run,
   runWithPrefix,
   postCheck,
@@ -41,6 +42,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 +67,11 @@ module.exports = (cli) => {
     .option('-i, --inspect [port]')
     .allowUnknownOption()
     .action(async (opts) => {
+      if (!hasCorePackages()) {
+        await forwardDevToAppDev();
+        return;
+      }
+
       checkDBDialect();
       await buildBundleStatusHtml();
 
@@ -289,3 +303,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;
       }