@tego/devkit 1.3.43 → 1.3.45

package/lib/builder/build/constant.mjs

@@ -33,6 +33,7 @@ var PACKAGES_PATH = path.join(ROOT_PATH, "packages");
 var getPluginPackages = (packages) => packages.filter((item) => !!item.manifest.name?.match(PATTERN_PLUGIN) || !!item.manifest.name?.match(PATTERN_MODULE));
 var CORE_APP = path.join(ROOT_PATH, "apps/web");
 var CORE_CLIENT = path.join(PACKAGES_PATH, "client");
+var PACKAGE_CLIENT = "@tachybase/client";
 var ESM_PACKAGES = ["@tachybase/test"];
 var CJS_EXCLUDE_PACKAGES = [path.join(ROOT_PATH, "apps/devkit"), CORE_CLIENT, CORE_APP];
 var getCjsPackages = (packages) => packages.filter((item) => !item.manifest.name?.match(PATTERN_PLUGIN)).filter((item) => !item.manifest.name?.match(PATTERN_MODULE)).filter((item) => !CJS_EXCLUDE_PACKAGES.includes(item.dir));
@@ -46,6 +47,7 @@ export {
   EsbuildSupportExts,
   NODE_MODULES,
   PACKAGES_PATH,
+  PACKAGE_CLIENT,
   PATTERN_MODULE,
   PATTERN_PLUGIN,
   PLUGIN_PATTRN,

package/lib/builder/buildable-packages/lib-package.mjs

@@ -3,7 +3,7 @@ import { buildCjs } from "../build/buildCjs.mjs";
 import { buildClient } from "../build/buildClient.mjs";
 import { buildDeclaration } from "../build/buildDeclaration.mjs";
 import { buildEsm } from "../build/buildEsm.mjs";
-import { CORE_CLIENT, ESM_PACKAGES } from "../build/constant.mjs";
+import { ESM_PACKAGES, PACKAGE_CLIENT } from "../build/constant.mjs";
 import { tarPlugin } from "../build/tarPlugin.mjs";
 import { getPkgLog, getUserConfig } from "../build/utils/index.mjs";
 var LibPackage = class {
@@ -18,7 +18,7 @@ var LibPackage = class {
     this.dir = dir;
     this.context = context;
     this.isEsm = ESM_PACKAGES.includes(this.name);
-    this.isClient = this.dir === CORE_CLIENT;
+    this.isClient = this.name === PACKAGE_CLIENT;
   }
   async build() {
     const log = getPkgLog(this.name);

package/lib/builder/buildable-packages/plugin-package.mjs

@@ -44,7 +44,7 @@ var external = [
   "@tachybase/schema",
   "@tachybase/components",
   "@tachybase/requirejs",
-  "@tachybase/server",
+  "@tego/core",
   "@tachybase/test",
   "@tachybase/utils",
   "@tachybase/globals",

package/lib/commands/create-nginx-conf.mjs

@@ -8,7 +8,7 @@ var create_nginx_conf_default = (cli) => {
     const file = resolve(__dirname, "../../tachybase.conf.tpl");
     const data = readFileSync(file, "utf-8");
     const replaced = data.replace(/\{\{cwd\}\}/g, "/app/tachybase").replace(/\{\{publicPath\}\}/g, process.env.APP_PUBLIC_PATH).replace(/\{\{apiPort\}\}/g, process.env.APP_PORT);
-    const targetFile = resolve(process.cwd(), "storage", "tachybase.conf");
+    const targetFile = resolve(process.env.TEGO_RUNTIME_HOME, "storage", "tachybase.conf");
     writeFileSync(targetFile, replaced);
   });
 };

package/lib/commands/p-test.mjs

@@ -50,13 +50,12 @@ async function runApp(dir, index = 0) {
       APP_PORT: 2e4 + index + "",
       DB_DATABASE: `tachybase${index}`,
       SOCKET_PATH: `storage/e2e/gateway-e2e-${index}.sock`,
-      PM2_HOME: resolve(process.cwd(), `storage/e2e/.pm2-${index}`),
-      PLAYWRIGHT_AUTH_FILE: resolve(process.cwd(), `storage/playwright/.auth/admin-${index}.json`)
+      PLAYWRIGHT_AUTH_FILE: `storage/playwright/.auth/admin-${index}.json`
     }
   });
 }
 async function pTest(options) {
-  const dir = resolve(process.cwd(), "storage/e2e");
+  const dir = resolve(process.env.TEGO_RUNTIME_HOME, "storage/e2e");
   if (!existsSync(dir)) {
     mkdirSync(dir, { recursive: true });
   }

package/lib/util.mjs

@@ -15,6 +15,7 @@ import {
 import { mkdir, readFile, stat, unlink, writeFile } from "fs/promises";
 import { createRequire } from "module";
 import { Socket } from "net";
+import os from "os";
 import { dirname, join, resolve, sep } from "path";
 import { pipeline } from "stream/promises";
 import chalk from "chalk";
@@ -239,7 +240,7 @@ async function genTsConfigPaths() {
 }
 function generatePlaywrightPath(clean = false) {
   try {
-    const playwright = resolve(process.cwd(), "storage/playwright/tests");
+    const playwright = resolve(process.env.TEGO_RUNTIME_HOME, "storage/playwright/tests");
     if (clean && _existsSync(playwright)) {
       rmSync(dirname(playwright), { force: true, recursive: true });
     }
@@ -273,20 +274,21 @@ function initEnv() {
     DB_UNDERSCORED: parseEnv("DB_UNDERSCORED"),
     DEFAULT_STORAGE_TYPE: "local",
     LOCAL_STORAGE_DEST: "storage/uploads",
-    PLUGIN_STORAGE_PATH: resolve(process.cwd(), "storage/plugins"),
+    PLUGIN_STORAGE_PATH: "storage/plugins",
     MFSU_AD: "none",
     WS_PATH: "/ws",
     SOCKET_PATH: "storage/gateway.sock",
-    PM2_HOME: resolve(process.cwd(), "./storage/.pm2"),
     PLUGIN_PACKAGE_PREFIX: "@tachybase/plugin-,@tachybase/module-",
     SERVER_TSCONFIG_PATH: "./tsconfig.server.json",
-    PLAYWRIGHT_AUTH_FILE: resolve(process.cwd(), "storage/playwright/.auth/admin.json"),
+    PLAYWRIGHT_AUTH_FILE: "storage/playwright/.auth/admin.json",
     CACHE_DEFAULT_STORE: "memory",
     CACHE_MEMORY_MAX: 2e3,
     PLUGIN_STATICS_PATH: "/static/plugins/",
     LOGGER_BASE_PATH: "storage/logs",
     APP_SERVER_BASE_URL: "",
-    APP_PUBLIC_PATH: "/"
+    APP_PUBLIC_PATH: "/",
+    TEGO_HOME: join(os.homedir(), ".tego"),
+    TEGO_RUNTIME_NAME: "current"
   };
   if (!process.env.APP_ENV_PATH && process.argv[2] && ["test", "test:client", "test:server"].includes(process.argv[2])) {
     if (_existsSync(resolve(process.cwd(), ".env.test"))) {
@@ -315,6 +317,9 @@ function initEnv() {
       process.env[key] = env[key];
     }
   }
+  if (!process.env.TEGO_RUNTIME_HOME) {
+    process.env.TEGO_RUNTIME_HOME = join(process.env.TEGO_HOME, process.env.TEGO_RUNTIME_NAME);
+  }
   if (!process.env.__env_modified__ && process.env.APP_PUBLIC_PATH) {
     const publicPath = process.env.APP_PUBLIC_PATH.replace(/\/$/g, "");
     const keys = ["API_BASE_PATH", "WS_PATH", "PLUGIN_STATICS_PATH"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tego/devkit",
-  "version": "1.3.43",
+  "version": "1.3.45",
   "description": "",
   "license": "Apache-2.0",
   "type": "module",