@nocobase/cli 1.5.0-beta.1 → 1.5.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "1.5.0-beta.1",
+  "version": "1.5.0-beta.3",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "1.5.0-beta.1",
+    "@nocobase/app": "1.5.0-beta.3",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
@@ -25,12 +25,12 @@
     "tsx": "^4.19.0"
   },
   "devDependencies": {
-    "@nocobase/devtools": "1.5.0-beta.1"
+    "@nocobase/devtools": "1.5.0-beta.3"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "10c6f1f3d90e91f3aabfa80449c7ef062e90f6af"
+  "gitHead": "81afcf4affdb652faf4636e6d9351828ce8906be"
 }

package/src/commands/dev.js

@@ -30,10 +30,10 @@ module.exports = (cli) => {
   cli
     .command('dev')
     .option('-p, --port [port]')
-    .option('--client')
-    .option('--server')
+    .option('-c, --client')
+    .option('-s, --server')
     .option('--db-sync')
-    .option('--inspect [port]')
+    .option('-i, --inspect [port]')
     .allowUnknownOption()
     .action(async (opts) => {
       let subprocess;

package/src/commands/pkg.js

@@ -58,14 +58,16 @@ class Package {
       return [version, this.data.versions[version].dist.tarball];
     }
 
-    if (version.includes('beta')) {
-      version = version.split('beta')[0] + 'beta';
-    } else if (version.includes('alpha')) {
-      const prefix = (version = version.split('alpha')[0]);
-      version = Object.keys(this.data.versions)
-        .filter((ver) => ver.startsWith(`${prefix}alpha`))
-        .sort()
-        .pop();
+    const keys = version.split('.');
+    const length = keys.length;
+
+    if (version.includes('rc')) {
+      version = version.split('-').shift();
+    }
+
+    if (length === 5) {
+      keys.pop();
+      version = keys.join('.');
     }
 
     if (version === 'latest') {
@@ -93,11 +95,25 @@ class Package {
     return false;
   }
 
+  async isDownloaded(version) {
+    const packageFile = path.resolve(process.env.PLUGIN_STORAGE_PATH, this.packageName, 'package.json');
+    if (await fs.exists(packageFile)) {
+      const json = await fs.readJson(packageFile);
+      if (json.version === version) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   async download(options = {}) {
     if (await this.isDevPackage()) {
       console.log(chalk.yellowBright(`Skipped: ${this.packageName} is dev package`));
       return;
     }
+    if (await this.isDownloaded(options.version)) {
+      return;
+    }
     await this.getInfo();
     if (!this.data) {
       console.log(chalk.redBright(`Download failed: ${this.packageName} package does not exist`));
@@ -105,6 +121,9 @@ class Package {
     }
     try {
       const [version, url] = this.getTarball(options.version);
+      if (await this.isDownloaded(version)) {
+        return;
+      }
       const response = await axios({
         url,
         responseType: 'stream',
@@ -200,8 +219,12 @@ module.exports = (cli) => {
     .command('download-pro')
     .option('-V, --version [version]')
     .action(async () => {
-      const { NOCOBASE_PKG_URL, NOCOBASE_PKG_USERNAME, NOCOBASE_PKG_PASSWORD } = process.env;
-      if (!(NOCOBASE_PKG_URL && NOCOBASE_PKG_USERNAME && NOCOBASE_PKG_PASSWORD)) {
+      const {
+        NOCOBASE_PKG_URL = 'https://pkg.nocobase.com/',
+        NOCOBASE_PKG_USERNAME,
+        NOCOBASE_PKG_PASSWORD,
+      } = process.env;
+      if (!(NOCOBASE_PKG_USERNAME && NOCOBASE_PKG_PASSWORD)) {
         return;
       }
       const credentials = { username: NOCOBASE_PKG_USERNAME, password: NOCOBASE_PKG_PASSWORD };

package/src/util.js

@@ -337,6 +337,7 @@ exports.initEnv = function initEnv() {
     LOCAL_STORAGE_DEST: 'storage/uploads',
     PLUGIN_STORAGE_PATH: resolve(process.cwd(), 'storage/plugins'),
     MFSU_AD: 'none',
+    MAKO_AD: 'none',
     WS_PATH: '/ws',
     SOCKET_PATH: 'storage/gateway.sock',
     NODE_MODULES_PATH: resolve(process.cwd(), 'node_modules'),