@nocobase/cli 1.9.0-beta.9 → 2.0.0-alpha.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "1.9.0-beta.9",
+  "version": "2.0.0-alpha.11",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "1.9.0-beta.9",
+    "@nocobase/app": "2.0.0-alpha.11",
     "@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.9"
+    "@nocobase/devtools": "2.0.0-alpha.11"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "b44464f1d1bbc96022d0f622e0a2f1d7e8d7142f"
+  "gitHead": "172b05411f66f7024d5294caf2852533569c3796"
 }

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/')) {
+        if (key.includes('/client/') || key.includes('/flow-engine/')) {
           process.env.TEST_ENV = 'client-side';
         } else {
           process.env.TEST_ENV = 'server-side';

package/templates/create-app-package.json

@@ -22,8 +22,8 @@
     "cytoscape": "3.28.0",
     "@types/react": "18.3.18",
     "@types/react-dom": "^18.0.0",
-    "react-router-dom": "6.28.1",
-    "react-router": "6.28.1",
+    "react-router-dom": "^6.30.1",
+    "react-router": "^6.30.1",
     "async": "^3.2.6",
     "antd": "5.12.8",
     "rollup": "4.24.0",

package/templates/plugin/src/client/index.tsx.tpl

@@ -1,21 +1 @@
-import { Plugin } from '@nocobase/client';
-
-export class {{{pascalCaseName}}}Client extends Plugin {
-  async afterAdd() {
-    // await this.app.pm.add()
-  }
-
-  async beforeLoad() {}
-
-  // You can get and modify the app instance here
-  async load() {
-    console.log(this.app);
-    // this.app.addComponents({})
-    // this.app.addScopes({})
-    // this.app.addProvider()
-    // this.app.addProviders()
-    // this.app.router.add()
-  }
-}
-
-export default {{{pascalCaseName}}}Client;
+export { default } from './plugin';

package/templates/plugin/src/client/locale.ts

@@ -1,12 +1,21 @@
+/**
+ * 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.
+ */
+
+import { tExpr as _tExpr, useFlowEngine } from '@nocobase/flow-engine';
 // @ts-ignore
 import pkg from './../../package.json';
-import { useApp } from '@nocobase/client';
 
 export function useT() {
-  const app = useApp();
-  return (str: string) => app.i18n.t(str, { ns: [pkg.name, 'client'] });
+  const engine = useFlowEngine();
+  return (str: string) => engine.context.t(str, { ns: [pkg.name, 'client'] });
 }
 
-export function tStr(key: string) {
-  return `{{t(${JSON.stringify(key)}, { ns: ['${pkg.name}', 'client'], nsMode: 'fallback' })}}`;
+export function tExpr(key: string) {
+  return _tExpr(key, { ns: [pkg.name, 'client'] });
 }

package/templates/plugin/src/client/models/index.ts

@@ -0,0 +1,12 @@
+/**
+ * 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.
+ */
+
+import { ModelConstructor } from '@nocobase/flow-engine';
+
+export default {} as Record<string, ModelConstructor>;

package/templates/plugin/src/client/plugin.tsx.tpl

@@ -0,0 +1,10 @@
+import { Plugin } from '@nocobase/client';
+import models from './models';
+
+export class {{{pascalCaseName}}}Client extends Plugin {
+  async load() {
+    this.flowEngine.registerModels(models);
+  }
+}
+
+export default {{{pascalCaseName}}}Client;

package/templates/plugin/src/locale/nl-NL.json

@@ -1 +0,0 @@
-{}