@nocobase/cli 1.9.0-beta.8 → 1.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "1.9.0-beta.8",
+  "version": "1.9.0",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "1.9.0-beta.8",
+    "@nocobase/app": "1.9.0",
     "@nocobase/license-kit": "^0.2.17",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
@@ -27,12 +27,12 @@
     "tsx": "^4.19.0"
   },
   "devDependencies": {
-    "@nocobase/devtools": "1.9.0-beta.8"
+    "@nocobase/devtools": "1.9.0"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "f3d4f3d1ba7adbf4d4c60e656c23da45565769c8"
+  "gitHead": "d92ce9096c2b3b5a8f205ecc0e1dedd64d7ee48b"
 }

package/src/commands/perf.js

@@ -53,8 +53,8 @@ module.exports = (cli) => {
           dotenv.config({ path: envFilePath, override: true });
         }
       }
-      if (!process.env.API_BASE_URL) {
-        throw new Error('Please set API_BASE_URL in environment variables or in .env.perf file');
+      if (!process.env.TARGET_ORIGIN) {
+        throw new Error('Please set TARGET_ORIGIN in environment variables or in .env.perf file');
       }
       const args = command.args.filter((arg) => arg !== file);
       await run(`k6`, ['run', f, ...(args.length ? ['--', ...args] : [])]);

package/src/commands/pkg.js

@@ -96,6 +96,19 @@ class Package {
     return false;
   }
 
+  async isDepPackage() {
+    const pkg1 = path.resolve(process.cwd(), 'node_modules', this.packageName, 'package.json');
+    const pkg2 = path.resolve(process.cwd(), process.env.PLUGIN_STORAGE_PATH, this.packageName, 'package.json');
+    if (await fs.exists(pkg1) && await fs.exists(pkg2)) {
+      const readPath1 = fs.realpathSync(pkg1);
+      const readPath2 = fs.realpathSync(pkg2);
+      if (readPath1 !== readPath2) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   async isDownloaded(version) {
     const packageFile = path.resolve(process.env.PLUGIN_STORAGE_PATH, this.packageName, 'package.json');
     if (await fs.exists(packageFile)) {
@@ -112,6 +125,10 @@ class Package {
       console.log(chalk.yellowBright(`Skipped: ${this.packageName} is dev package`));
       return;
     }
+    if (await this.isDepPackage()) {
+      console.log(chalk.yellowBright(`Skipped: ${this.packageName} is dependency package`));
+      return;
+    }
     if (await this.isDownloaded(options.version)) {
       return;
     }