@tachybase/plugin-devkit 1.6.0 → 1.6.3

package/dist/externalVersion.js

@@ -1,4 +1,4 @@
 module.exports = {
-  "@tachybase/client": "1.6.0",
-  "@tego/server": "1.3.52"
+  "@tachybase/client": "1.6.3",
+  "@tego/server": "1.6.1"
 };

package/dist/server/utils.js

@@ -26,7 +26,28 @@ var import_node_fs = require("node:fs");
 var import_node_path = require("node:path");
 var import_fast_glob = require("fast-glob");
 var import_package = require("../../package.json");
-const ProjectRoot = process.cwd();
+function detectProjectRoot() {
+  let dir = process.cwd();
+  const filesystemRoot = (0, import_node_path.parse)(dir).root;
+  while (dir && dir !== filesystemRoot) {
+    if ((0, import_node_fs.existsSync)((0, import_node_path.join)(dir, "pnpm-workspace.yaml"))) {
+      return dir;
+    }
+    dir = (0, import_node_path.dirname)(dir);
+  }
+  dir = (0, import_node_path.dirname)((0, import_node_path.dirname)((0, import_node_path.dirname)(__dirname)));
+  while (dir && dir !== filesystemRoot) {
+    if ((0, import_node_fs.existsSync)((0, import_node_path.join)(dir, "pnpm-workspace.yaml"))) {
+      return dir;
+    }
+    dir = (0, import_node_path.dirname)(dir);
+  }
+  return process.cwd();
+}
+function getProjectRoot() {
+  return detectProjectRoot();
+}
+const ProjectRoot = getProjectRoot();
 function getUmiConfig() {
   const { APP_PORT, API_BASE_URL, APP_PUBLIC_PATH } = process.env;
   const API_BASE_PATH = process.env.API_BASE_PATH || "/api/";
@@ -82,29 +103,31 @@ function getUmiConfig() {
   };
 }
 function getTsconfigPaths() {
-  const content = (0, import_node_fs.readFileSync)((0, import_node_path.resolve)(ProjectRoot, "tsconfig.paths.json"), "utf-8");
+  const root = getProjectRoot();
+  const content = (0, import_node_fs.readFileSync)((0, import_node_path.resolve)(root, "tsconfig.paths.json"), "utf-8");
   const json = JSON.parse(content);
   return json.compilerOptions.paths;
 }
 function getPackagePaths() {
+  const root = getProjectRoot();
   const paths = getTsconfigPaths();
   const pkgs = [];
   for (const key in paths) {
     if (Object.hasOwnProperty.call(paths, key)) {
       for (let dir of paths[key]) {
         if (dir.includes("*")) {
-          const files = (0, import_fast_glob.sync)(dir, { cwd: ProjectRoot, onlyDirectories: true });
+          const files = (0, import_fast_glob.sync)(dir, { cwd: root, onlyDirectories: true });
           for (const file of files) {
-            const dirname = (0, import_node_path.resolve)(ProjectRoot, file);
+            const dirname = (0, import_node_path.resolve)(root, file);
             if ((0, import_node_fs.existsSync)(dirname)) {
               const re = new RegExp(dir.replace("*", "(.+)"));
-              const p = dirname.substring(ProjectRoot.length + 1).split(import_node_path.sep).join("/");
+              const p = dirname.substring(root.length + 1).split(import_node_path.sep).join("/");
               const match = re.exec(p);
               pkgs.push([key.replace("*", match == null ? void 0 : match[1]), dirname]);
             }
           }
         } else {
-          const dirname = (0, import_node_path.resolve)(ProjectRoot, dir);
+          const dirname = (0, import_node_path.resolve)(root, dir);
           pkgs.push([key, dirname]);
         }
       }
@@ -120,7 +143,8 @@ function resolveTachybasePackagesAlias(config) {
   }
 }
 function getNodeModulesPath(packageDir) {
-  const node_modules_dir = (0, import_node_path.join)(ProjectRoot, "node_modules");
+  const root = getProjectRoot();
+  const node_modules_dir = (0, import_node_path.join)(root, "node_modules");
   return (0, import_node_path.join)(node_modules_dir, packageDir);
 }
 class IndexGenerator {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/plugin-devkit",
-  "version": "1.6.0",
+  "version": "1.6.3",
   "main": "dist/server/index.js",
   "dependencies": {
     "@rsbuild/core": "^1.4.7",
@@ -10,9 +10,9 @@
     "fast-glob": "^3.3.3"
   },
   "devDependencies": {
-    "@tachybase/test": "1.3.52",
-    "@tego/client": "1.3.52",
-    "@tego/server": "1.3.52",
-    "@tachybase/client": "1.6.0"
+    "@tachybase/test": "1.6.1",
+    "@tego/client": "1.6.1",
+    "@tego/server": "1.6.1",
+    "@tachybase/client": "1.6.3"
   }
 }