@nocobase/server 2.1.0-beta.33 → 2.1.0-beta.35

package/lib/gateway/index.js

@@ -294,6 +294,7 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
       __nocobase_api_client_share_token__: import_node_process.default.env.API_CLIENT_SHARE_TOKEN === "true",
       __nocobase_ws_url__: import_node_process.default.env.WEBSOCKET_URL || "",
       __nocobase_ws_path__: import_node_process.default.env.WS_PATH,
+      __nocobase_app_dev__: import_node_process.default.env.NOCOBASE_APP_DEV === "true",
       __esm_cdn_base_url__: import_node_process.default.env.ESM_CDN_BASE_URL || "https://esm.sh",
       __esm_cdn_suffix__: import_node_process.default.env.ESM_CDN_SUFFIX || ""
     };

package/lib/main-data-source.js

@@ -158,7 +158,11 @@ const _MainDataSource = class _MainDataSource extends import_data_source_manager
       ctx.log.error(err);
     }
     const toLoadCollections = this.mergeWithLoadedCollections(collections, loadedCollections);
+    const currentSchema = process.env.COLLECTION_MANAGER_SCHEMA || db.options.schema || "public";
     for (const values of toLoadCollections) {
+      if (values.schema === currentSchema) {
+        delete values.schema;
+      }
       const existsFields = loadedCollections[values.tableName].fields;
       const deletedFields = existsFields.filter((field) => !values.fields.find((f) => f.name === field.name));
       await db.sequelize.transaction(async (transaction) => {

package/lib/plugin-manager/options/resource.d.ts

@@ -12,6 +12,7 @@ export declare class PackageUrls {
     static clear(): void;
     static getCacheKey(packageName: string, lane: PluginClientLane): string;
     static get(packageName: string, lane?: PluginClientLane): Promise<string>;
+    static getAppDevUrl(packageName: string, lane: PluginClientLane): string;
     static hasClientEntry(packageName: string, lane: PluginClientLane): Promise<boolean>;
     static fetch(packageName: string, lane?: PluginClientLane): Promise<string>;
 }

package/lib/plugin-manager/options/resource.js

@@ -48,6 +48,7 @@ var import_crypto = __toESM(require("crypto"));
 var import_fs = __toESM(require("fs"));
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_path = __toESM(require("path"));
+var import_plugin_manager = __toESM(require("../plugin-manager"));
 var import_utils2 = require("../utils");
 var import_package = __toESM(require("../../../package.json"));
 const PLUGIN_CLIENT_ENTRY_FILES = {
@@ -58,6 +59,32 @@ const PLUGIN_CLIENT_MARKER_FILES = {
   client: "client.js",
   "client-v2": "client-v2.js"
 };
+function getAppDevPluginUrls() {
+  if (process.env.NOCOBASE_APP_DEV !== "true" || !process.env.NOCOBASE_APP_DEV_PLUGIN_URLS) {
+    return {};
+  }
+  try {
+    return JSON.parse(process.env.NOCOBASE_APP_DEV_PLUGIN_URLS);
+  } catch (error) {
+    return {};
+  }
+}
+__name(getAppDevPluginUrls, "getAppDevPluginUrls");
+function getAppDevPluginDependencies(packageJson2, lane) {
+  const appDevPluginUrls = getAppDevPluginUrls();
+  const deps = {
+    ...packageJson2.dependencies,
+    ...packageJson2.peerDependencies,
+    ...packageJson2.devDependencies
+  };
+  return Object.keys(deps).filter(
+    (packageName) => {
+      var _a;
+      return ((_a = appDevPluginUrls[packageName]) == null ? void 0 : _a[lane]) || packageName.startsWith("@nocobase/plugin-") || packageName.startsWith("@nocobase/preset-");
+    }
+  );
+}
+__name(getAppDevPluginDependencies, "getAppDevPluginDependencies");
 const _PackageUrls = class _PackageUrls {
   static clear() {
     this.items = {};
@@ -66,6 +93,10 @@ const _PackageUrls = class _PackageUrls {
     return `${lane}:${packageName}`;
   }
   static async get(packageName, lane = "client") {
+    const appDevUrl = this.getAppDevUrl(packageName, lane);
+    if (appDevUrl) {
+      return appDevUrl;
+    }
     const cacheKey = this.getCacheKey(packageName, lane);
     const cached = this.items[cacheKey];
     if (cached) {
@@ -79,7 +110,14 @@ const _PackageUrls = class _PackageUrls {
     }
     return nextUrl;
   }
+  static getAppDevUrl(packageName, lane) {
+    var _a;
+    return (_a = getAppDevPluginUrls()[packageName]) == null ? void 0 : _a[lane];
+  }
   static async hasClientEntry(packageName, lane) {
+    if (this.getAppDevUrl(packageName, lane)) {
+      return true;
+    }
     const pkgPath = import_path.default.resolve(process.env.NODE_MODULES_PATH, packageName);
     if (!await import_fs_extra.default.exists(pkgPath)) {
       return false;
@@ -141,6 +179,11 @@ async function listEnabledPlugins(ctx, lane = "client") {
         options,
         url
       };
+      if (PackageUrls.getAppDevUrl(packageName, lane)) {
+        const packageJson2 = await import_plugin_manager.default.getPackageJson(packageName);
+        entry.devMode = "esm";
+        entry.appDevDependencies = getAppDevPluginDependencies(packageJson2, lane);
+      }
       if (lane === "client" && await PackageUrls.hasClientEntry(packageName, "client-v2")) {
         const clientV2Url = await PackageUrls.get(packageName, "client-v2");
         if (clientV2Url) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.1.0-beta.33",
+  "version": "2.1.0-beta.35",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -10,21 +10,21 @@
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.1.0",
     "@koa/router": "^13.1.0",
-    "@nocobase/acl": "2.1.0-beta.33",
-    "@nocobase/actions": "2.1.0-beta.33",
-    "@nocobase/ai": "2.1.0-beta.33",
-    "@nocobase/auth": "2.1.0-beta.33",
-    "@nocobase/cache": "2.1.0-beta.33",
-    "@nocobase/data-source-manager": "2.1.0-beta.33",
-    "@nocobase/database": "2.1.0-beta.33",
-    "@nocobase/evaluators": "2.1.0-beta.33",
-    "@nocobase/lock-manager": "2.1.0-beta.33",
-    "@nocobase/logger": "2.1.0-beta.33",
-    "@nocobase/resourcer": "2.1.0-beta.33",
-    "@nocobase/sdk": "2.1.0-beta.33",
-    "@nocobase/snowflake-id": "2.1.0-beta.33",
-    "@nocobase/telemetry": "2.1.0-beta.33",
-    "@nocobase/utils": "2.1.0-beta.33",
+    "@nocobase/acl": "2.1.0-beta.35",
+    "@nocobase/actions": "2.1.0-beta.35",
+    "@nocobase/ai": "2.1.0-beta.35",
+    "@nocobase/auth": "2.1.0-beta.35",
+    "@nocobase/cache": "2.1.0-beta.35",
+    "@nocobase/data-source-manager": "2.1.0-beta.35",
+    "@nocobase/database": "2.1.0-beta.35",
+    "@nocobase/evaluators": "2.1.0-beta.35",
+    "@nocobase/lock-manager": "2.1.0-beta.35",
+    "@nocobase/logger": "2.1.0-beta.35",
+    "@nocobase/resourcer": "2.1.0-beta.35",
+    "@nocobase/sdk": "2.1.0-beta.35",
+    "@nocobase/snowflake-id": "2.1.0-beta.35",
+    "@nocobase/telemetry": "2.1.0-beta.35",
+    "@nocobase/utils": "2.1.0-beta.35",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -61,5 +61,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "4815c394e80a264fa8ed619246280923c47aeb72"
+  "gitHead": "74310d8b9e9581fcde14b5a93d12b41ddb5bb325"
 }