@nocobase/cli 1.7.0-beta.21 → 1.7.0-beta.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "1.7.0-beta.21",
+  "version": "1.7.0-beta.23",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "1.7.0-beta.21",
+    "@nocobase/app": "1.7.0-beta.23",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
@@ -26,12 +26,12 @@
     "tsx": "^4.19.0"
   },
   "devDependencies": {
-    "@nocobase/devtools": "1.7.0-beta.21"
+    "@nocobase/devtools": "1.7.0-beta.23"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "845f6124b170717387ba9d7ebf3cc2df7a861bc3"
+  "gitHead": "0c9581f3d38bbf9f93c68d232a48ffa4e7d68390"
 }

package/src/commands/index.js

@@ -30,6 +30,7 @@ module.exports = (cli) => {
   require('./test')(cli);
   require('./test-coverage')(cli);
   require('./umi')(cli);
+  require('./update-deps')(cli);
   require('./upgrade')(cli);
   require('./postinstall')(cli);
   require('./pkg')(cli);

package/src/commands/update-deps.js

@@ -0,0 +1,71 @@
+/**
+ * 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.
+ */
+
+const chalk = require('chalk');
+const { Command } = require('commander');
+const { resolve } = require('path');
+const { run, promptForTs, runAppCommand, hasCorePackages, downloadPro, hasTsNode, checkDBDialect } = require('../util');
+const { existsSync, rmSync } = require('fs');
+const { readJSON, writeJSON } = require('fs-extra');
+const deepmerge = require('deepmerge');
+
+const rmAppDir = () => {
+  // If ts-node is not installed, do not do the following
+  const appDevDir = resolve(process.cwd(), './storage/.app-dev');
+  if (existsSync(appDevDir)) {
+    rmSync(appDevDir, { recursive: true, force: true });
+  }
+};
+
+/**
+ *
+ * @param {Command} cli
+ */
+module.exports = (cli) => {
+  cli
+    .command('update-deps')
+    .option('--force')
+    .allowUnknownOption()
+    .action(async (options) => {
+      if (hasCorePackages() || !hasTsNode()) {
+        await downloadPro();
+        return;
+      }
+      const pkg = require('../../package.json');
+      let distTag = 'latest';
+      if (pkg.version.includes('alpha')) {
+        distTag = 'alpha';
+      } else if (pkg.version.includes('beta')) {
+        distTag = 'beta';
+      }
+      const { stdout } = await run('npm', ['info', `@nocobase/cli@${distTag}`, 'version'], {
+        stdio: 'pipe',
+      });
+      if (!options.force && pkg.version === stdout) {
+        await downloadPro();
+        rmAppDir();
+        return;
+      }
+      const descPath = resolve(process.cwd(), 'package.json');
+      const descJson = await readJSON(descPath, 'utf8');
+      const sourcePath = resolve(__dirname, '../../templates/create-app-package.json');
+      const sourceJson = await readJSON(sourcePath, 'utf8');
+      if (descJson['dependencies']?.['@nocobase/cli']) {
+        descJson['dependencies']['@nocobase/cli'] = stdout;
+      }
+      if (descJson['devDependencies']?.['@nocobase/devtools']) {
+        descJson['devDependencies']['@nocobase/devtools'] = stdout;
+      }
+      const json = deepmerge(descJson, sourceJson);
+      await writeJSON(descPath, json, { spaces: 2, encoding: 'utf8' });
+      await run('yarn', ['install']);
+      await downloadPro();
+      rmAppDir();
+    });
+};

package/src/commands/upgrade.js

@@ -29,7 +29,6 @@ async function updatePackage() {
  * @param {Command} cli
  */
 module.exports = (cli) => {
-  const { APP_PACKAGE_ROOT } = process.env;
   cli
     .command('upgrade')
     .allowUnknownOption()
@@ -38,53 +37,11 @@ module.exports = (cli) => {
     .option('-S|--skip-code-update')
     .action(async (options) => {
       checkDBDialect();
-      if (hasTsNode()) promptForTs();
-      if (hasCorePackages()) {
-        // await run('yarn', ['install']);
-        await downloadPro();
-        await runAppCommand('upgrade');
-        return;
-      }
       if (options.skipCodeUpdate) {
-        await downloadPro();
-        await runAppCommand('upgrade');
-        return;
-      }
-      // await runAppCommand('upgrade');
-      if (!hasTsNode()) {
-        await downloadPro();
-        await runAppCommand('upgrade');
-        return;
-      }
-      const rmAppDir = () => {
-        // If ts-node is not installed, do not do the following
-        const appDevDir = resolve(process.cwd(), './storage/.app-dev');
-        if (existsSync(appDevDir)) {
-          rmSync(appDevDir, { recursive: true, force: true });
-        }
-      };
-      const pkg = require('../../package.json');
-      let distTag = 'latest';
-      if (pkg.version.includes('alpha')) {
-        distTag = 'alpha';
-      } else if (pkg.version.includes('beta')) {
-        distTag = 'beta';
-      }
-      // get latest version
-      const { stdout } = await run('npm', ['info', `@nocobase/cli@${distTag}`, 'version'], {
-        stdio: 'pipe',
-      });
-      if (pkg.version === stdout) {
-        await downloadPro();
         await runAppCommand('upgrade');
-        await rmAppDir();
-        return;
+      } else {
+        await run('nocobase', ['update-deps']);
+        await run('nocobase', ['upgrade', '--skip-code-update']);
       }
-      await run('yarn', ['add', `@nocobase/cli@${distTag}`, `@nocobase/devtools@${distTag}`, '-W']);
-      await updatePackage();
-      await run('yarn', ['install']);
-      await downloadPro();
-      await runAppCommand('upgrade');
-      await rmAppDir();
     });
 };