glyphix 1.0.41 → 1.1.1

package/bin/glyphix.js

@@ -117,8 +117,44 @@ var import_esbuild = __toESM(require("esbuild"));
 var import_node_path3 = require("path");
 var import_node_fs = require("fs");
 var import_dotenv = __toESM(require("dotenv"));
-var import_lodash = require("lodash");
 var import_node_child_process = require("child_process");
+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")],
@@ -252,7 +287,9 @@ var GxGenerate = class {
     if (!(0, import_node_fs.existsSync)(customConfigPath)) return internalConfig;
     try {
       const useConfig = require(customConfigPath);
-      return (0, import_lodash.merge)(internalConfig, useConfig);
+      const a = mergeEsbuildConfigs(internalConfig, useConfig);
+      console.log(a.plugins);
+      return a;
     } catch (error) {
       console.error(error);
     }
@@ -296,13 +333,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.0.41",
+  "version": "1.1.1",
   "main": "lib/index.js",
   "types": "types/index.d.ts",
   "files": [
@@ -50,13 +50,13 @@
   "dependencies": {
     "adm-zip": "^0.5.16",
     "chalk": "^4.1.2",
+    "deepmerge": "^4.3.1",
     "dotenv": "^16.4.7",
     "esbuild": "^0.24.2",
     "esbuild-plugin-d.ts": "^1.3.1",
     "eslint": "^9.18.0",
     "fs-extra": "^11.2.0",
     "glob": "^11.0.1",
-    "lodash": "^4.17.21",
     "yargs": "^17.7.2"
   },
   "packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"