@nocobase/cli 2.0.0-alpha.4 → 2.0.0-alpha.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.0.0-alpha.4",
+  "version": "2.0.0-alpha.41",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "2.0.0-alpha.4",
+    "@nocobase/app": "2.0.0-alpha.41",
     "@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": "2.0.0-alpha.4"
+    "@nocobase/devtools": "2.0.0-alpha.41"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "54f3cab47e7efbdc73377014d05f5fc66a4affbb"
+  "gitHead": "889e81eef0280c2e45571bd0a4b2db6aa004f8c1"
 }

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

@@ -93,10 +93,18 @@ class Package {
     if (await fs.exists(file)) {
       return true;
     }
-    file = path.resolve(process.cwd(), 'node_modules', this.packageName, 'package.json');
-    if (await fs.exists(file)) {
-      console.log(chalk.yellowBright(`Skipped: ${this.packageName} is in node_modules`));
-      return true;
+    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;
   }
@@ -117,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;
     }

package/src/commands/test.js

@@ -54,7 +54,7 @@ function addTestCommand(name, cli) {
       const first = paths?.[0];
       if (!process.env.TEST_ENV && first) {
         const key = first.split(path.sep).join('/');
-        if (key.includes('/client/') || key.includes('/flow-engine/')) {
+        if (key.includes('/client/') || key.includes('/client-v2/') || key.includes('/flow-engine/')) {
           process.env.TEST_ENV = 'client-side';
         } else {
           process.env.TEST_ENV = 'server-side';

package/templates/plugin/package.json.tpl

@@ -4,8 +4,8 @@
   "main": "dist/server/index.js",
   "dependencies": {},
   "peerDependencies": {
-    "@nocobase/client": "1.x",
-    "@nocobase/server": "1.x",
-    "@nocobase/test": "1.x"
+    "@nocobase/client": "2.x",
+    "@nocobase/server": "2.x",
+    "@nocobase/test": "2.x"
   }
 }