@nocobase/plugin-license 2.1.0-alpha.6 → 2.1.0-alpha.7

package/dist/externalVersion.js

@@ -9,16 +9,16 @@
 
 module.exports = {
   "react": "18.2.0",
-  "@nocobase/client": "2.1.0-alpha.6",
+  "@nocobase/client": "2.1.0-alpha.7",
   "antd": "5.24.2",
   "ahooks": "3.7.8",
   "@ant-design/icons": "5.6.1",
   "@formily/react": "2.3.7",
   "@nocobase/license-kit": "0.3.7",
   "react-i18next": "11.18.6",
-  "@nocobase/server": "2.1.0-alpha.6",
+  "@nocobase/server": "2.1.0-alpha.7",
   "lodash": "4.17.21",
   "koa": "2.16.0",
   "axios": "1.7.7",
-  "@nocobase/logger": "2.1.0-alpha.6"
+  "@nocobase/logger": "2.1.0-alpha.7"
 };

package/dist/server/utils/interface.d.ts

@@ -20,6 +20,7 @@ export interface KeyData {
         displayName: string;
         packageName: string;
         updateExpirationDate?: string;
+        openSource?: boolean;
     }>;
     instanceData: {
         timestamp: string;

package/dist/server/utils/plugin.js

@@ -43,7 +43,7 @@ module.exports = __toCommonJS(plugin_exports);
 var import_sortBy = __toESM(require("lodash/sortBy"));
 var import_key = require("./key");
 async function getPlugins({ keyData, ctx }) {
-  var _a;
+  var _a, _b, _c;
   const locale = ctx.getCurrentLocale();
   const plugin = ctx.app.pm.get("nocobase");
   const localPlugins = await plugin.getAllPlugins(locale);
@@ -56,7 +56,13 @@ async function getPlugins({ keyData, ctx }) {
       enabled: p.options.enabled
     });
   }
-  const licensedPlugins = (keyData == null ? void 0 : keyData.plugins) || [];
+  let licensedPlugins = (keyData == null ? void 0 : keyData.plugins) || [];
+  const isVer2 = await ((_b = (_a = ctx == null ? void 0 : ctx.app) == null ? void 0 : _a.version) == null ? void 0 : _b.satisfies(">=2.0.0"));
+  if (isVer2) {
+    licensedPlugins = licensedPlugins.filter((plugin2) => {
+      return !(plugin2 == null ? void 0 : plugin2.openSource);
+    });
+  }
   const allCommericalPluginNames = [...licensedPlugins.map((p) => p.packageName)];
   localPlugins.forEach((p) => {
     const instance = currentPluginInstances == null ? void 0 : currentPluginInstances.find((plugin2) => plugin2.packageName === p.packageName);
@@ -73,7 +79,7 @@ async function getPlugins({ keyData, ctx }) {
   const plugins = [];
   for (const name of installedCommericalPlugins) {
     let status = "unlicensed";
-    const expirationDate = (_a = licensedPlugins == null ? void 0 : licensedPlugins.find((p) => p.packageName === name)) == null ? void 0 : _a.updateExpirationDate;
+    const expirationDate = (_c = licensedPlugins == null ? void 0 : licensedPlugins.find((p) => p.packageName === name)) == null ? void 0 : _c.updateExpirationDate;
     if (expirationDate) {
       const isExpired = (0, import_key.isDateExpired)(expirationDate);
       if (isExpired) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-license",
-  "version": "2.1.0-alpha.6",
+  "version": "2.1.0-alpha.7",
   "main": "dist/server/index.js",
   "displayName": "License settings",
   "displayName.ru-RU": "Настройки лицензии",
@@ -17,5 +17,5 @@
     "ts:env": "tsc -p tsconfig.env.json"
   },
   "license": "Apache-2.0",
-  "gitHead": "189dc0eb7683a8330db1e4c5fd46ee871b8b4e1f"
+  "gitHead": "fe825ef778c0d9a941e8517d6443ffc012238391"
 }