glyphix 1.0.36 → 1.0.38

package/bin/glyphix.js

@@ -126,17 +126,18 @@ var GxGenerate = class {
     // 正在构建的应用的 src 目录路径
     this.sourceRoot = (0, import_node_path3.resolve)(
       this.workspaceRoot,
-      process.env["VITE_SOURCE_DIR"]
+      process.env["VITE_SOURCE_DIR"] ?? process.env["GLYPHIX_SOURCE_DIR"]
     );
     // 构建的 build 目录路径
     this.buildRoot = (0, import_node_path3.resolve)(
       this.workspaceRoot,
-      process.env["VITE_BUILD_DIR"]
+      process.env["VITE_BUILD_DIR"] ?? process.env["GLYPHIX_BUILD_DIR"]
     );
     // gx 工具传递过来的入口文件，包括 app.{t,j}s 和各个页面的 js 文件路径
     this.entries = [];
+    const entryFile = process.env["GLYPHIX_BUILD_DIR"] ? ".node-entry.json" : "entry.vite.json";
     const content = JSON.parse(
-      (0, import_node_fs.readFileSync)((0, import_node_path3.resolve)(this.buildRoot, "entry.vite.json")).toString()
+      (0, import_node_fs.readFileSync)((0, import_node_path3.resolve)(this.buildRoot, entryFile)).toString()
     );
     this.entries = content.entry.map(
       (item) => (0, import_node_path3.resolve)(this.buildRoot, item)
@@ -242,7 +243,11 @@ var GxGenerate = class {
         }
       ]
     };
-    const customConfigPath = (0, import_node_path3.resolve)(this.buildRoot, "glyphix.config.js");
+    const customConfigPath = (0, import_node_path3.resolve)(
+      this.sourceRoot,
+      "..",
+      "glyphix.config.js"
+    );
     if (!(0, import_node_fs.existsSync)(customConfigPath)) return internalConfig;
     try {
       const useConfig = require(customConfigPath);
@@ -274,11 +279,6 @@ var GxGenerate = class {
         return;
       }
       const curDir = process.cwd();
-      const userConfig = (0, import_node_path3.resolve)(
-        this.sourceRoot,
-        "..",
-        "glyphix.config.js"
-      );
       process.chdir((0, import_node_path3.resolve)(this.sourceRoot, ".."));
       const installDepProcess = (0, import_node_child_process.spawn)("npm", ["install"]);
       installDepProcess.on("error", (err) => {
@@ -312,6 +312,10 @@ var GxGenerate = class {
   }
 };
 function generateGlyphix() {
+  console.log(
+    "process",
+    !process.env["VITE_BUILD_DIR"] || !process.env["VITE_SOURCE_DIR"]
+  );
   if ((!process.env["VITE_BUILD_DIR"] || !process.env["VITE_SOURCE_DIR"]) && (!process.env["GLYPHIX_BUILD_DIR"] || !process.env["GLYPHIX_SOURCE_DIR"]))
     throw Error("not set glyphix project path");
   const generate = new GxGenerate();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "glyphix",
-  "version": "1.0.36",
+  "version": "1.0.38",
   "main": "lib/index.js",
   "types": "types/index.d.ts",
   "files": [