@nocobase/plugin-license 2.1.0-alpha.17 → 2.1.0-alpha.19

package/dist/externalVersion.js

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

package/dist/server/utils/instance.js

@@ -43,9 +43,10 @@ __export(instance_exports, {
 module.exports = __toCommonJS(instance_exports);
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
+var import_utils = require("@nocobase/utils");
 var import_child_process = require("child_process");
 async function getInstanceId() {
-  const dir = import_path.default.resolve(process.cwd(), "storage/.license");
+  const dir = (0, import_utils.storagePathJoin)(".license");
   const filePath = import_path.default.resolve(dir, "instance-id");
   await createInstanceId(true);
   const id = import_fs.default.readFileSync(filePath, "utf-8");
@@ -63,7 +64,7 @@ async function createInstanceId(force = false) {
   });
 }
 async function isLicenseKeyExists() {
-  const dir = import_path.default.resolve(process.cwd(), "storage/.license");
+  const dir = (0, import_utils.storagePathJoin)(".license");
   const filePath = import_path.default.resolve(dir, "license-key");
   return import_fs.default.existsSync(filePath);
 }

package/dist/server/utils/key.js

@@ -48,6 +48,7 @@ __export(key_exports, {
 module.exports = __toCommonJS(key_exports);
 var import_license_kit = require("@nocobase/license-kit");
 var import_path = __toESM(require("path"));
+var import_utils = require("@nocobase/utils");
 var import_fs = __toESM(require("fs"));
 var import_interface2 = require("./interface");
 var import_axios = __toESM(require("axios"));
@@ -88,7 +89,7 @@ async function request({
   }
 }
 async function saveLicenseKey(licenseKey, ctx) {
-  const dir = import_path.default.resolve(process.cwd(), "storage/.license");
+  const dir = (0, import_utils.storagePathJoin)(".license");
   const filePath = import_path.default.resolve(dir, "license-key");
   await import_fs.default.promises.writeFile(filePath, licenseKey);
   if (ctx && ctx.cache) {
@@ -97,7 +98,7 @@ async function saveLicenseKey(licenseKey, ctx) {
   }
 }
 async function getLocalKeyData() {
-  const keyFile = import_path.default.resolve(process.cwd(), "storage/.license/license-key");
+  const keyFile = (0, import_utils.storagePathJoin)(".license", "license-key");
   try {
     const key = (await import_fs.default.promises.readFile(keyFile, "utf8")).trim();
     return JSON.parse((0, import_license_kit.keyDecrypt)(key));
@@ -108,7 +109,7 @@ async function getLocalKeyData() {
 async function getKey(ctx) {
   var _a, _b;
   let key;
-  const keyFile = import_path.default.resolve(process.cwd(), "storage/.license/license-key");
+  const keyFile = (0, import_utils.storagePathJoin)(".license", "license-key");
   if (ctx == null ? void 0 : ctx.cache) {
     try {
       key = await ctx.cache.get(import_interface2.CACHE_KEY);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-license",
-  "version": "2.1.0-alpha.17",
+  "version": "2.1.0-alpha.19",
   "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": "586cb00f56557e66168b9720d0e0193a1b752067"
+  "gitHead": "3d13700360eac1c0f9dbf6a5f167ed396a294a3c"
 }