tego 1.3.45 → 1.3.47

package/lib/constants.d.ts

@@ -1,5 +1,4 @@
 export declare const DEFAULT_DEV_PLUGINS_PATH: string;
 export declare const DEFAULT_REMOTE_PLUGINS_PATH: string;
 export declare const DEFAULT_BUILTIN_PLUGINS_PATH: string;
-export declare const DEFAULT_BUILTIN_PLUGINS_RELATIVE_PATH: string;
 export declare const DEFAULT_WEB_PACKAGE_NAME = "@tego/web";

package/lib/constants.js

@@ -28,22 +28,21 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var constants_exports = {};
 __export(constants_exports, {
   DEFAULT_BUILTIN_PLUGINS_PATH: () => DEFAULT_BUILTIN_PLUGINS_PATH,
-  DEFAULT_BUILTIN_PLUGINS_RELATIVE_PATH: () => DEFAULT_BUILTIN_PLUGINS_RELATIVE_PATH,
   DEFAULT_DEV_PLUGINS_PATH: () => DEFAULT_DEV_PLUGINS_PATH,
   DEFAULT_REMOTE_PLUGINS_PATH: () => DEFAULT_REMOTE_PLUGINS_PATH,
   DEFAULT_WEB_PACKAGE_NAME: () => DEFAULT_WEB_PACKAGE_NAME
 });
 module.exports = __toCommonJS(constants_exports);
 var import_node_path = __toESM(require("node:path"));
-const DEFAULT_DEV_PLUGINS_PATH = import_node_path.default.resolve("plugins", "dev");
-const DEFAULT_REMOTE_PLUGINS_PATH = import_node_path.default.resolve("plugins", "remote");
-const DEFAULT_BUILTIN_PLUGINS_PATH = import_node_path.default.resolve("plugins", "builtin");
-const DEFAULT_BUILTIN_PLUGINS_RELATIVE_PATH = import_node_path.default.join("plugins", "builtin");
+var import_utils = require("./utils");
+(0, import_utils.parseEnvironment)();
+const DEFAULT_DEV_PLUGINS_PATH = import_node_path.default.join(process.env.TEGO_RUNTIME_HOME, "plugins", "dev");
+const DEFAULT_REMOTE_PLUGINS_PATH = import_node_path.default.join(process.env.TEGO_RUNTIME_HOME, "plugins", "remote");
+const DEFAULT_BUILTIN_PLUGINS_PATH = import_node_path.default.join(process.env.TEGO_RUNTIME_HOME, "plugins", "builtin");
 const DEFAULT_WEB_PACKAGE_NAME = "@tego/web";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   DEFAULT_BUILTIN_PLUGINS_PATH,
-  DEFAULT_BUILTIN_PLUGINS_RELATIVE_PATH,
   DEFAULT_DEV_PLUGINS_PATH,
   DEFAULT_REMOTE_PLUGINS_PATH,
   DEFAULT_WEB_PACKAGE_NAME

package/lib/index.js

@@ -31,7 +31,12 @@ var import_config = require("./config");
 var import_plugin_presets = __toESM(require("./plugin-presets"));
 var import_prepare = require("./prepare");
 var import_utils2 = require("./utils");
-(0, import_utils2.parseEnvironment)();
+if (!process.env.SERVE_PATH) {
+  const servePath = (0, import_utils2.guessServePath)();
+  if (servePath) {
+    process.env.SERVE_PATH = servePath;
+  }
+}
 const program = new import_commander.Command();
 program.name("tego").version(require("../package.json").version);
 const run = /* @__PURE__ */ __name(async () => {

package/lib/prepare.js

@@ -62,10 +62,9 @@ async function prepare({
   } catch {
     npmExist = false;
   }
-  const prefix = import_node_path.default.join(name, import_constants.DEFAULT_BUILTIN_PLUGINS_RELATIVE_PATH);
   console.log("\u{1F680} ~ start download ~ front end files");
   const spinner = (0, import_yocto_spinner.default)({ text: `Loading ${import_constants.DEFAULT_WEB_PACKAGE_NAME}` }).start();
-  await (0, import_utils.downloadTar)(import_constants.DEFAULT_WEB_PACKAGE_NAME, `${prefix}/${import_constants.DEFAULT_WEB_PACKAGE_NAME}`);
+  await (0, import_utils.downloadTar)(import_constants.DEFAULT_WEB_PACKAGE_NAME, `${import_constants.DEFAULT_BUILTIN_PLUGINS_PATH}/${import_constants.DEFAULT_WEB_PACKAGE_NAME}`);
   spinner.success();
   console.log();
   console.log("\u{1F680} ~ start download ~ required modules");
@@ -73,9 +72,9 @@ async function prepare({
   let index = 1;
   for (const moduleName of moduleNames) {
     const spinner2 = (0, import_yocto_spinner.default)({ text: `[${index++}/${moduleNames.length}] Loading ${moduleName}` }).start();
-    await (0, import_utils.downloadTar)(moduleName, `${prefix}/${moduleName}`);
+    await (0, import_utils.downloadTar)(moduleName, `${import_constants.DEFAULT_BUILTIN_PLUGINS_PATH}/${moduleName}`);
     if (npmExist) {
-      await npmInstall(`${prefix}/${moduleName}`, spinner2);
+      await npmInstall(`${import_constants.DEFAULT_BUILTIN_PLUGINS_PATH}/${moduleName}`, spinner2);
     }
     spinner2.success();
   }
@@ -85,9 +84,9 @@ async function prepare({
   const pluginNames = plugins.map((pluginName) => `@tachybase/plugin-${pluginName}`);
   for (const pluginName of pluginNames) {
     const spinner2 = (0, import_yocto_spinner.default)({ text: `[${index++}/${pluginNames.length}] Loading ${pluginName}` }).start();
-    await (0, import_utils.downloadTar)(pluginName, `${prefix}/${pluginName}`);
+    await (0, import_utils.downloadTar)(pluginName, `${import_constants.DEFAULT_BUILTIN_PLUGINS_PATH}/${pluginName}`);
     if (npmExist) {
-      await npmInstall(`${prefix}/${pluginName}`, spinner2);
+      await npmInstall(`${import_constants.DEFAULT_BUILTIN_PLUGINS_PATH}/${pluginName}`, spinner2);
     }
     spinner2.success();
   }

package/lib/utils.js

@@ -106,6 +106,9 @@ function parseEnvironment() {
   }
   if (!process.env.TEGO_RUNTIME_HOME) {
     process.env.TEGO_RUNTIME_HOME = (0, import_node_path.join)(process.env.TEGO_HOME, process.env.TEGO_RUNTIME_NAME);
+    if (!process.env.TEGO_RUNTIME_NAME && import_node_fs.default.existsSync((0, import_node_path.resolve)(process.cwd(), "storage"))) {
+      process.env.TEGO_RUNTIME_HOME = (0, import_node_path.resolve)(process.cwd(), "storage");
+    }
   }
   if (!process.env.__env_modified__ && process.env.APP_PUBLIC_PATH) {
     const publicPath = process.env.APP_PUBLIC_PATH.replace(/\/$/g, "");
@@ -119,12 +122,6 @@ function parseEnvironment() {
     process.env.API_BASE_URL = process.env.APP_SERVER_BASE_URL + process.env.API_BASE_PATH;
     process.env.__env_modified__ = "1";
   }
-  if (!process.env.SERVE_PATH) {
-    const servePath = guessServePath();
-    if (servePath) {
-      process.env.SERVE_PATH = servePath;
-    }
-  }
 }
 __name(parseEnvironment, "parseEnvironment");
 function guessServePath() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tego",
-  "version": "1.3.45",
+  "version": "1.3.47",
   "description": "",
   "keywords": [
     "tego",
@@ -49,20 +49,20 @@
     "umzug": "3.8.2",
     "winston": "3.17.0",
     "winston-daily-rotate-file": "^5.0.0",
-    "@tachybase/acl": "1.3.45",
-    "@tachybase/auth": "1.3.45",
-    "@tachybase/actions": "1.3.45",
-    "@tachybase/cache": "1.3.45",
-    "@tachybase/data-source": "1.3.45",
-    "@tachybase/evaluators": "1.3.45",
-    "@tachybase/globals": "1.3.45",
-    "@tachybase/database": "1.3.45",
-    "@tachybase/loader": "1.3.45",
-    "@tachybase/schema": "1.3.45",
-    "@tachybase/resourcer": "1.3.45",
-    "@tachybase/logger": "1.3.45",
-    "@tachybase/utils": "1.3.45",
-    "@tego/core": "1.3.45"
+    "@tachybase/acl": "1.3.47",
+    "@tachybase/actions": "1.3.47",
+    "@tachybase/auth": "1.3.47",
+    "@tachybase/cache": "1.3.47",
+    "@tachybase/data-source": "1.3.47",
+    "@tachybase/evaluators": "1.3.47",
+    "@tachybase/globals": "1.3.47",
+    "@tachybase/loader": "1.3.47",
+    "@tachybase/logger": "1.3.47",
+    "@tachybase/resourcer": "1.3.47",
+    "@tachybase/schema": "1.3.47",
+    "@tachybase/utils": "1.3.47",
+    "@tachybase/database": "1.3.47",
+    "@tego/core": "1.3.47"
   },
   "devDependencies": {
     "@types/lodash": "4.17.20",

package/presets/.env.example

@@ -3,6 +3,13 @@ APP_ENV=development
 APP_PORT=3000
 APP_KEY=test-key
 
+# 默认为 ~/.tego
+TEGO_HOME=
+# 默认为 current
+TEGO_RUNTIME_NAME=
+# 默认为 ~/.tego/current，设置后会覆盖 TEGO_RUNTIME_NAME
+TEGO_RUNTIME_HOME=
+
 # experimental support
 EXTENSION_UI_BASE_PATH=/adapters/
 

package/src/constants.ts

@@ -1,7 +1,11 @@
 import path from 'node:path';
 
-export const DEFAULT_DEV_PLUGINS_PATH = path.resolve('plugins', 'dev');
-export const DEFAULT_REMOTE_PLUGINS_PATH = path.resolve('plugins', 'remote');
-export const DEFAULT_BUILTIN_PLUGINS_PATH = path.resolve('plugins', 'builtin');
-export const DEFAULT_BUILTIN_PLUGINS_RELATIVE_PATH = path.join('plugins', 'builtin');
+import { parseEnvironment } from './utils';
+
+// 解析环境变量
+parseEnvironment();
+
+export const DEFAULT_DEV_PLUGINS_PATH = path.join(process.env.TEGO_RUNTIME_HOME, 'plugins', 'dev');
+export const DEFAULT_REMOTE_PLUGINS_PATH = path.join(process.env.TEGO_RUNTIME_HOME, 'plugins', 'remote');
+export const DEFAULT_BUILTIN_PLUGINS_PATH = path.join(process.env.TEGO_RUNTIME_HOME, 'plugins', 'builtin');
 export const DEFAULT_WEB_PACKAGE_NAME = '@tego/web';

package/src/index.ts

@@ -3,17 +3,21 @@ import './preload';
 import { performance } from 'node:perf_hooks';
 import TachybaseGlobal from '@tachybase/globals';
 import { createDevPluginsSymlink, createStoragePluginsSymlink } from '@tachybase/utils';
-
 import { Gateway } from '@tego/core';
+
 import { Command } from 'commander';
 
 import { getConfig } from './config';
 import PluginPresets from './plugin-presets';
 import { prepare } from './prepare';
-import { parseEnvironment } from './utils';
+import { guessServePath } from './utils';
 
-// 解析环境变量
-parseEnvironment();
+if (!process.env.SERVE_PATH) {
+  const servePath = guessServePath();
+  if (servePath) {
+    process.env.SERVE_PATH = servePath;
+  }
+}
 
 const program = new Command();
 program.name('tego').version(require('../package.json').version);

package/src/prepare.ts

@@ -5,7 +5,7 @@ import process from 'node:process';
 import yoctoSpinner from '@socketregistry/yocto-spinner/index.cjs';
 import execa from 'execa';
 
-import { DEFAULT_BUILTIN_PLUGINS_RELATIVE_PATH, DEFAULT_WEB_PACKAGE_NAME } from './constants';
+import { DEFAULT_BUILTIN_PLUGINS_PATH, DEFAULT_WEB_PACKAGE_NAME } from './constants';
 import { defaultModules } from './default-modules';
 import { defaultPlugins } from './default-plugins';
 import { downloadTar, initEnvFile } from './utils';
@@ -38,11 +38,10 @@ export async function prepare({
     npmExist = false;
   }
 
-  const prefix = path.join(name, DEFAULT_BUILTIN_PLUGINS_RELATIVE_PATH);
   // 安装前端代码
   console.log('🚀 ~ start download ~ front end files');
   const spinner = yoctoSpinner({ text: `Loading ${DEFAULT_WEB_PACKAGE_NAME}` }).start();
-  await downloadTar(DEFAULT_WEB_PACKAGE_NAME, `${prefix}/${DEFAULT_WEB_PACKAGE_NAME}`);
+  await downloadTar(DEFAULT_WEB_PACKAGE_NAME, `${DEFAULT_BUILTIN_PLUGINS_PATH}/${DEFAULT_WEB_PACKAGE_NAME}`);
   spinner.success();
   console.log();
 
@@ -52,9 +51,9 @@ export async function prepare({
   let index = 1;
   for (const moduleName of moduleNames) {
     const spinner = yoctoSpinner({ text: `[${index++}/${moduleNames.length}] Loading ${moduleName}` }).start();
-    await downloadTar(moduleName, `${prefix}/${moduleName}`);
+    await downloadTar(moduleName, `${DEFAULT_BUILTIN_PLUGINS_PATH}/${moduleName}`);
     if (npmExist) {
-      await npmInstall(`${prefix}/${moduleName}`, spinner);
+      await npmInstall(`${DEFAULT_BUILTIN_PLUGINS_PATH}/${moduleName}`, spinner);
     }
     spinner.success();
   }
@@ -66,9 +65,9 @@ export async function prepare({
   const pluginNames = plugins.map((pluginName: string) => `@tachybase/plugin-${pluginName}`);
   for (const pluginName of pluginNames) {
     const spinner = yoctoSpinner({ text: `[${index++}/${pluginNames.length}] Loading ${pluginName}` }).start();
-    await downloadTar(pluginName, `${prefix}/${pluginName}`);
+    await downloadTar(pluginName, `${DEFAULT_BUILTIN_PLUGINS_PATH}/${pluginName}`);
     if (npmExist) {
-      await npmInstall(`${prefix}/${pluginName}`, spinner);
+      await npmInstall(`${DEFAULT_BUILTIN_PLUGINS_PATH}/${pluginName}`, spinner);
     }
     spinner.success();
   }

package/src/utils.ts

@@ -81,6 +81,10 @@ export function parseEnvironment() {
 
   if (!process.env.TEGO_RUNTIME_HOME) {
     process.env.TEGO_RUNTIME_HOME = join(process.env.TEGO_HOME!, process.env.TEGO_RUNTIME_NAME!);
+    // 兼容旧版本过的用户
+    if (!process.env.TEGO_RUNTIME_NAME && fs.existsSync(resolve(process.cwd(), 'storage'))) {
+      process.env.TEGO_RUNTIME_HOME = resolve(process.cwd(), 'storage');
+    }
   }
 
   if (!process.env.__env_modified__ && process.env.APP_PUBLIC_PATH) {
@@ -96,13 +100,6 @@ export function parseEnvironment() {
     process.env.API_BASE_URL = process.env.APP_SERVER_BASE_URL + process.env.API_BASE_PATH;
     process.env.__env_modified__ = '1';
   }
-
-  if (!process.env.SERVE_PATH) {
-    const servePath = guessServePath();
-    if (servePath) {
-      process.env.SERVE_PATH = servePath;
-    }
-  }
 }
 
 export function guessServePath() {