@nocobase/server 2.2.0-alpha.1 → 2.2.0-alpha.2

package/lib/plugin-manager/deps.js

@@ -47,7 +47,7 @@ const deps = {
   koa: "3.x",
   "@koa/cors": "5.x",
   "@koa/router": "13.x",
-  multer: "1.x",
+  multer: "2.x",
   "@koa/multer": "3.x",
   "koa-bodyparser": "4.x",
   "koa-static": "5.x",

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

@@ -302,12 +302,19 @@ var resource_default = {
       if (!keys.length) {
         ctx.throw(400, "plugin name invalid");
       }
+      for (const key of keys) {
+        try {
+          (0, import_utils2.assertSafePluginPackageName)(key);
+        } catch (error) {
+          ctx.throw(400, "plugin name invalid");
+        }
+      }
       const awaitResponse = coerceAwaitResponse(awaitResponseRaw);
       const argv = ["pm", "enable", ...keys];
       if (awaitResponse) {
         await app.runAsCLI(argv, { from: "user", throwError: true });
       } else {
-        void app.runAsCLI(argv, { from: "user" }).catch((err) => {
+        app.runAsCLI(argv, { from: "user" }).catch((err) => {
           app.log.error(err);
         });
       }
@@ -326,7 +333,7 @@ var resource_default = {
       if (awaitResponse) {
         await app.runAsCLI(argv, { from: "user", throwError: true });
       } else {
-        void app.runAsCLI(argv, { from: "user" }).catch((err) => {
+        app.runAsCLI(argv, { from: "user" }).catch((err) => {
           app.log.error(err);
         });
       }
@@ -344,7 +351,7 @@ var resource_default = {
       await next();
     },
     async list(ctx, next) {
-      const { mode } = ctx.action.params;
+      const { mode, v2 } = ctx.action.params;
       if (mode === "summary") {
         ctx.body = await (0, import_utils2.pmListSummary)(ctx.app);
         return next();
@@ -352,7 +359,18 @@ var resource_default = {
       const locale = ctx.getCurrentLocale();
       const pm = ctx.app.pm;
       const plugin = pm.get("nocobase");
-      ctx.body = await plugin.getAllPlugins(locale);
+      const plugins = await plugin.getAllPlugins(locale);
+      ctx.body = plugins.filter((item) => {
+        var _a;
+        if (process.env.NOCOBASE_SHOW_DEPRECATED_PLUGINS === "true") {
+          return true;
+        }
+        if (!v2) {
+          return true;
+        }
+        const nocobaseConfig = ((_a = item == null ? void 0 : item.packageJson) == null ? void 0 : _a.nocobase) || {};
+        return nocobaseConfig.internal !== true && nocobaseConfig.deprecated !== true;
+      });
       await next();
     },
     async listEnabled(ctx, next) {

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

@@ -233,6 +233,7 @@ const _PluginManager = class _PluginManager {
     }
   }
   static async parseName(nameOrPkg) {
+    (0, import_utils2.assertSafePluginPackageName)(nameOrPkg);
     if (this.parsedNames[nameOrPkg]) {
       return this.parsedNames[nameOrPkg];
     }

package/lib/plugin.js

@@ -276,7 +276,7 @@ const _Plugin = class _Plugin {
       "fr-FR": "fr/"
     };
     if (packageName.startsWith("@nocobase/plugin-")) {
-      packageJson.homepage = `https://v2.docs.nocobase.com/${langMap[locale] || ""}plugins/${packageName}`;
+      packageJson.homepage = `https://docs.nocobase.com/${langMap[locale] || ""}plugins/${packageName}`;
     }
     const results = {
       ...this.options,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.2.0-alpha.1",
+  "version": "2.2.0-alpha.2",
   "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.2.0-alpha.1",
-    "@nocobase/actions": "2.2.0-alpha.1",
-    "@nocobase/ai": "2.2.0-alpha.1",
-    "@nocobase/auth": "2.2.0-alpha.1",
-    "@nocobase/cache": "2.2.0-alpha.1",
-    "@nocobase/data-source-manager": "2.2.0-alpha.1",
-    "@nocobase/database": "2.2.0-alpha.1",
-    "@nocobase/evaluators": "2.2.0-alpha.1",
-    "@nocobase/lock-manager": "2.2.0-alpha.1",
-    "@nocobase/logger": "2.2.0-alpha.1",
-    "@nocobase/resourcer": "2.2.0-alpha.1",
-    "@nocobase/sdk": "2.2.0-alpha.1",
-    "@nocobase/snowflake-id": "2.2.0-alpha.1",
-    "@nocobase/telemetry": "2.2.0-alpha.1",
-    "@nocobase/utils": "2.2.0-alpha.1",
+    "@nocobase/acl": "2.2.0-alpha.2",
+    "@nocobase/actions": "2.2.0-alpha.2",
+    "@nocobase/ai": "2.2.0-alpha.2",
+    "@nocobase/auth": "2.2.0-alpha.2",
+    "@nocobase/cache": "2.2.0-alpha.2",
+    "@nocobase/data-source-manager": "2.2.0-alpha.2",
+    "@nocobase/database": "2.2.0-alpha.2",
+    "@nocobase/evaluators": "2.2.0-alpha.2",
+    "@nocobase/lock-manager": "2.2.0-alpha.2",
+    "@nocobase/logger": "2.2.0-alpha.2",
+    "@nocobase/resourcer": "2.2.0-alpha.2",
+    "@nocobase/sdk": "2.2.0-alpha.2",
+    "@nocobase/snowflake-id": "2.2.0-alpha.2",
+    "@nocobase/telemetry": "2.2.0-alpha.2",
+    "@nocobase/utils": "2.2.0-alpha.2",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -47,7 +47,7 @@
     "koa-send": "^5.0.1",
     "koa-static": "^5.0.0",
     "lodash": "^4.17.21",
-    "multer": "^1.4.5-lts.2",
+    "multer": "^2.1.1",
     "nanoid": "^3.3.11",
     "p-queue": "^6.6.2",
     "redis": "^5.10.0",
@@ -61,5 +61,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "303663aba6c6eefa27e6a6435b4c0352074ec40f"
+  "gitHead": "9dd5224bb8f6c1ac12d766b9f175bdc29bddd845"
 }