glyphix 1.1.0 → 1.2.0

package/bin/glyphix.js

@@ -118,7 +118,43 @@ var import_node_path3 = require("path");
 var import_node_fs = require("fs");
 var import_dotenv = __toESM(require("dotenv"));
 var import_node_child_process = require("child_process");
-var import_deepmerge = __toESM(require("deepmerge"));
+function mergeEsbuildConfigs(...configs) {
+  const result = {};
+  for (const config of configs) {
+    for (const key in config) {
+      const value = config[key];
+      switch (key) {
+        case "entryPoints":
+          result.entryPoints = [
+            ...result.entryPoints || [],
+            ...Array.isArray(value) ? value : [value]
+          ];
+          break;
+        case "plugins":
+          result.plugins = [
+            ...result.plugins || [],
+            ...value || []
+          ];
+          break;
+        case "define":
+        case "loader":
+        case "alias":
+        case "banner":
+        case "footer":
+        case "inject":
+          result[key] = {
+            ...result[key] || {},
+            ...value
+          };
+          break;
+        default:
+          result[key] = value;
+          break;
+      }
+    }
+  }
+  return result;
+}
 var GxGenerate = class {
   constructor() {
     // 执行 gx 命令的目录路径
@@ -199,7 +235,6 @@ var GxGenerate = class {
       target: "node14",
       // 目标平台设置为最新 ECMAScript
       define: {
-        "process.env.GLYPHIX_APP_VERSION": `"${this.getGitVersion()}"`,
         ...this.loadEnv()
       },
       nodePaths: [(0, import_node_path3.resolve)(this.sourceRoot, "..", "node_modules")],
@@ -244,20 +279,31 @@ var GxGenerate = class {
         }
       ]
     };
-    const customConfigPath = (0, import_node_path3.resolve)(
+    let customConfigPath = (0, import_node_path3.resolve)(
       this.sourceRoot,
       "..",
-      "glyphix.config.js"
+      "glyphix.config.ts"
     );
-    if (!(0, import_node_fs.existsSync)(customConfigPath)) return internalConfig;
+    if (!(0, import_node_fs.existsSync)(customConfigPath))
+      customConfigPath = (0, import_node_path3.resolve)(
+        this.sourceRoot,
+        "..",
+        "glyphix.config.js"
+      );
+    if (!(0, import_node_fs.existsSync)(customConfigPath))
+      return internalConfig;
     try {
+      if (customConfigPath.endsWith(".ts")) {
+        require("ts-node").register({
+          transpileOnly: true,
+          compilerOptions: {
+            module: "commonjs"
+          }
+        });
+      }
       const useConfig = require(customConfigPath);
-      const a = (0, import_deepmerge.default)(internalConfig, useConfig, {
-        arrayMerge: (targetArray, sourceArray) => [
-          ...targetArray,
-          ...sourceArray
-        ]
-      });
+      const a = mergeEsbuildConfigs(internalConfig, useConfig);
+      console.log(a.plugins);
       return a;
     } catch (error) {
       console.error(error);
@@ -302,13 +348,6 @@ var GxGenerate = class {
       });
     });
   }
-  getGitVersion() {
-    try {
-      return (0, import_node_child_process.execSync)("git rev-parse HEAD").toString().trim();
-    } catch (err) {
-      return "not git version";
-    }
-  }
   build() {
     const curDir = process.cwd();
     this.installDependencies().then(() => {

package/package.json

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