glyphix 1.0.31 → 1.0.33

package/bin/glyphix.js

@@ -132,194 +132,222 @@ function buildGlyphix(args) {
 var import_esbuild = __toESM(require("esbuild"));
 var import_node_path3 = require("path");
 var import_node_fs = require("fs");
-var import_fs_extra2 = require("fs-extra");
-var import_eslint = require("eslint");
-var import_glob = require("glob");
-var import_chalk2 = __toESM(require("chalk"));
-var import_node_process = require("process");
 var import_dotenv = __toESM(require("dotenv"));
 var import_lodash = require("lodash");
-function loadEnv() {
-  const dotenvTags = [
-    // 本地环境
-    "development",
-    // 测试环境
-    // 比如：单元测试
-    "test",
-    // 部署环境
-    // 比如：日常、预发、线上
-    "production"
-  ];
-  if (!dotenvTags.includes(process.env.GLYPHIX_ENV ?? "")) {
-    process.env.GLYPHIX_ENV = dotenvTags[0];
-  }
-  const dotenvPath = (0, import_node_path3.resolve)(".env");
-  const dotenvFiles = [
-    dotenvPath,
-    `${dotenvPath}.local`,
-    `${dotenvPath}.${process.env.GLYPHIX_ENV}`,
-    `${dotenvPath}.${process.env.GLYPHIX_ENV}.local`
-  ].filter(import_node_fs.existsSync);
-  dotenvFiles.reverse().forEach((dotenvFile) => {
-    import_dotenv.default.config({ path: dotenvFile });
-  });
-}
-function getOriginFilePath(filePath, rootPath) {
-  const relativePath = (0, import_node_path3.relative)(rootPath, filePath);
-  const projectRoot = process.cwd();
-  const originPath = (0, import_node_path3.resolve)(projectRoot, "src", relativePath);
-  if (originPath.endsWith(".ts")) {
-    const uxOrigin = originPath.slice(0, -3) + ".ux";
-    if ((0, import_node_fs.existsSync)(uxOrigin)) {
-      return uxOrigin;
-    }
-  }
-  return originPath;
-}
-function outErrorLog(results, filepath) {
-  results.messages.forEach((item) => {
-    console.log(
-      `${filepath}:${item.line}:${item.column}`,
-      "\n	",
-      import_chalk2.default.red("error"),
-      "	",
-      item.message,
-      "	",
-      import_chalk2.default.gray(item.ruleId)
+var import_node_child_process = require("child_process");
+var GxGenerate = class {
+  constructor() {
+    // 执行 gx 命令的目录路径
+    this.workspaceRoot = process.cwd();
+    // 正在构建的应用的 src 目录路径
+    this.sourceRoot = (0, import_node_path3.resolve)(
+      this.workspaceRoot,
+      process.env["VITE_SOURCE_DIR"]
+    );
+    // 构建的 build 目录路径
+    this.buildRoot = (0, import_node_path3.resolve)(
+      this.workspaceRoot,
+      process.env["VITE_BUILD_DIR"]
+    );
+    // gx 工具传递过来的入口文件，包括 app.{t,j}s 和各个页面的 js 文件路径
+    this.entries = [];
+    const content = JSON.parse(
+      (0, import_node_fs.readFileSync)((0, import_node_path3.resolve)(this.buildRoot, "entry.vite.json")).toString()
+    );
+    this.entries = content.entry.map(
+      (item) => (0, import_node_path3.resolve)(this.buildRoot, item)
     );
-  });
-}
-function lintFile(rootPath) {
-  const distPath = (0, import_node_path3.join)(rootPath, ".vite-dist");
-  if ((0, import_node_fs.existsSync)(distPath)) {
-    (0, import_fs_extra2.removeSync)(distPath);
   }
-  const sources = (0, import_glob.sync)([
-    `${(0, import_node_path3.resolve)(rootPath)}/**/*.ts`,
-    `${(0, import_node_path3.resolve)(rootPath)}/**/*.js`
-  ]);
-  const eslint = new import_eslint.ESLint({
-    warnIgnored: true,
-    overrideConfig: {
-      rules: {
-        "no-console": "off",
-        "prettier/prettier": "off",
-        "@typescript-eslint/ban-ts-comment": "warn",
-        "@typescript-eslint/no-explicit-any": "off",
-        "@typescript-eslint/no-unused-vars": "warn",
-        quotes: "off"
-      }
+  loadEnv() {
+    const dotenvTags = [
+      // 本地环境
+      "development",
+      // 测试环境
+      // 比如：单元测试
+      "test",
+      // 部署环境
+      // 比如：日常、预发、线上
+      "production"
+    ];
+    if (!dotenvTags.includes(process.env.GLYPHIX_ENV ?? "")) {
+      process.env.GLYPHIX_ENV = dotenvTags[0];
     }
-  });
-  return eslint.lintFiles(sources).then((res) => {
-    return res.filter((item) => item.errorCount).map((item) => {
-      return item;
-    }).flat();
-  }).then((res) => {
-    res.forEach((item) => {
-      const originPath = getOriginFilePath(item.filePath, rootPath);
-      outErrorLog(item, originPath);
+    const dotenvPath = (0, import_node_path3.resolve)(this.sourceRoot, "..", ".env");
+    const dotenvFiles = [
+      dotenvPath,
+      `${dotenvPath}.local`,
+      `${dotenvPath}.${process.env.GLYPHIX_ENV}`,
+      `${dotenvPath}.${process.env.GLYPHIX_ENV}.local`
+    ].filter((item) => {
+      return (0, import_node_fs.existsSync)(item);
     });
-    return res;
-  });
-}
-function dealResource() {
-  if (!process.env["VITE_BUILD_DIR"])
-    throw Error("not set glyphix project path");
-  const rootPath = (0, import_node_path3.resolve)(process.cwd(), process.env["VITE_BUILD_DIR"]);
-  const entryFileContent = JSON.parse(
-    (0, import_node_fs.readFileSync)((0, import_node_path3.resolve)(rootPath, "entry.vite.json")).toString()
-  );
-  const entries = entryFileContent.entry;
-  (0, import_fs_extra2.removeSync)((0, import_node_path3.resolve)(rootPath, ".vite-dist"));
-  let entriedFullPath = entries.map((item) => (0, import_node_path3.resolve)(rootPath, item));
-  return {
-    root: rootPath,
-    entry: entriedFullPath
-  };
-}
-function generateEsbuildConfig(rootPath, entriedFullPath, envDefine) {
-  const resolveExtensions = [".ts", ".js"];
-  const internalConfig = {
-    entryPoints: entriedFullPath,
-    // 入口文件
-    bundle: true,
-    // 启用打包
-    outdir: (0, import_node_path3.resolve)(rootPath, ".vite-dist"),
-    // 输出目录
-    splitting: true,
-    // 启用代码分割
-    format: "esm",
-    // 输出为 ESM 格式
-    resolveExtensions,
-    external: ["@system*"],
-    // 将 lodash 和 axios 作为外部依赖
-    platform: "node",
-    target: "node14",
-    // 目标平台设置为最新 ECMAScript
-    define: envDefine,
-    sourcemap: true,
-    minify: process.env.GLYPHIX_ENV === "development" ? false : true,
-    plugins: [
-      {
-        name: "glyphix-resolve-path",
-        setup(build2) {
-          build2.onResolve({ filter: /^\// }, (args) => {
-            if ((0, import_node_fs.existsSync)(args.path)) {
-              return {
-                path: args.path
-              };
-            }
-            for (let i = 0; i < resolveExtensions.length; i++) {
-              const fullPath = (0, import_node_path3.join)(
-                rootPath,
-                `${args.path}${resolveExtensions[i]}`
-              );
-              if ((0, import_node_fs.existsSync)(fullPath)) {
+    console.info(dotenvFiles);
+    dotenvFiles.reverse().forEach((dotenvFile) => {
+      import_dotenv.default.config({ path: (0, import_node_path3.resolve)(this.sourceRoot, "..", dotenvFile) });
+    });
+    let envDefine = {};
+    Array.from(Object.keys(process.env)).forEach((key) => {
+      if (key.startsWith("GLYPHIX"))
+        envDefine[`process.env.${key}`] = JSON.stringify(process.env[key]);
+    });
+    return envDefine;
+  }
+  generateEsbuildConfig() {
+    const resolveExtensions = [".ts", ".js"];
+    const that = this;
+    const internalConfig = {
+      entryPoints: this.entries,
+      // 入口文件
+      bundle: true,
+      // 启用打包
+      outdir: (0, import_node_path3.resolve)(this.buildRoot, ".vite-dist"),
+      // 输出目录
+      splitting: true,
+      // 启用代码分割
+      format: "esm",
+      // 输出为 ESM 格式
+      resolveExtensions,
+      external: ["@system*"],
+      // 将 lodash 和 axios 作为外部依赖
+      platform: "node",
+      absWorkingDir: (0, import_node_path3.resolve)(this.sourceRoot, ".."),
+      target: "node14",
+      // 目标平台设置为最新 ECMAScript
+      define: {
+        "process.env.GLYPHIX_APP_VERSION": `"${this.getGitVersion()}"`,
+        ...this.loadEnv()
+      },
+      nodePaths: [(0, import_node_path3.resolve)(this.sourceRoot, "..", "node_modules")],
+      sourcemap: true,
+      minify: process.env.GLYPHIX_ENV === "development" ? false : true,
+      plugins: [
+        {
+          name: "glyphix-resolve-path",
+          setup(build) {
+            build.onResolve({ filter: /^\// }, (args) => {
+              if ((0, import_node_fs.existsSync)(args.path)) {
                 return {
-                  path: fullPath
+                  path: args.path
                 };
               }
-            }
-            return {
-              path: args.path
-            };
-          });
+              for (let i = 0; i < resolveExtensions.length; i++) {
+                const fullPath = (0, import_node_path3.join)(
+                  that.buildRoot,
+                  `${args.path}${resolveExtensions[i]}`
+                );
+                if ((0, import_node_fs.existsSync)(fullPath)) {
+                  return {
+                    path: fullPath
+                  };
+                }
+                const fullIndexPath = (0, import_node_path3.join)(
+                  that.buildRoot,
+                  `${args.path}/index${resolveExtensions[i]}`
+                );
+                if ((0, import_node_fs.existsSync)(fullIndexPath)) {
+                  return {
+                    path: fullIndexPath
+                  };
+                }
+              }
+              return {
+                path: args.path
+              };
+            });
+          }
         }
+      ]
+    };
+    const customConfigPath = (0, import_node_path3.resolve)(this.buildRoot, "glyphix.config.js");
+    if (!(0, import_node_fs.existsSync)(customConfigPath)) return internalConfig;
+    try {
+      const useConfig = require(customConfigPath);
+      return (0, import_lodash.merge)(internalConfig, useConfig);
+    } catch (error) {
+      console.error(error);
+    }
+    return internalConfig;
+  }
+  judgeIsWorkspace(parentPath, childPath) {
+    const resolvedParent = (0, import_node_path3.resolve)(parentPath);
+    const resolvedChild = (0, import_node_path3.resolve)(childPath);
+    const normalizedParent = resolvedParent + import_node_path3.sep;
+    const normalizedChild = resolvedChild + import_node_path3.sep;
+    return !normalizedChild.startsWith(normalizedParent);
+  }
+  /**
+   * 安装依赖
+   * 1. 判断是否是 workspace， 非 workspace 不用安装
+   * 2. workspace 项目，需要将 package.json 拷贝到构建目录，在构建目录安装依赖
+   * @returns
+   */
+  installDependencies() {
+    return new Promise((resolve3, reject) => {
+      console.log(
+        "is workspace project",
+        this.judgeIsWorkspace(
+          (0, import_node_path3.resolve)(this.sourceRoot, ".."),
+          this.buildRoot
+        )
+      );
+      if (!this.judgeIsWorkspace(
+        (0, import_node_path3.resolve)(this.sourceRoot, ".."),
+        this.buildRoot
+      )) {
+        resolve3();
+        return;
       }
-    ]
-  };
-  const customConfigPath = (0, import_node_path3.resolve)(process.cwd(), "glyphix.config.js");
-  if (!(0, import_node_fs.existsSync)(customConfigPath)) return internalConfig;
-  try {
-    const useConfig = require(customConfigPath);
-    return (0, import_lodash.merge)(internalConfig, useConfig);
-  } catch (error) {
-    console.error(error);
+      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("message", (msg) => {
+        console.debug(msg);
+      });
+      installDepProcess.on("error", (err) => {
+        console.error(err);
+      });
+      installDepProcess.on("close", (code) => {
+        if (code === 0) {
+          console.info("dependencies install complete");
+          process.chdir(curDir);
+          resolve3();
+        } else {
+          process.chdir(curDir);
+          process.exit(1);
+        }
+      });
+    });
   }
-  return internalConfig;
-}
-function build(rootPath, entriedFullPath) {
-  let envDefine = {};
-  Array.from(Object.keys(process.env)).forEach((key) => {
-    if (key.startsWith("GLYPHIX"))
-      envDefine[`process.env.${key}`] = JSON.stringify(process.env[key]);
-  });
-  import_esbuild.default.build(generateEsbuildConfig(rootPath, entriedFullPath, envDefine)).then(() => {
-    console.log("Build completed!");
-  }).catch((error) => {
-    console.error("Build failed:", error);
-  });
-}
+  getGitVersion() {
+    return (0, import_node_child_process.execSync)("git rev-parse HEAD").toString().trim();
+  }
+  build() {
+    const curDir = process.cwd();
+    this.installDependencies().then(() => {
+      const config = this.generateEsbuildConfig();
+      process.chdir((0, import_node_path3.resolve)(this.sourceRoot, ".."));
+      console.info("cur build directory", process.cwd());
+      console.log(JSON.stringify(config));
+      return import_esbuild.default.build(config);
+    }).then(() => {
+      process.chdir(curDir);
+      console.log("Build completed!");
+    }).catch((error) => {
+      console.error("Build failed:", error);
+    });
+  }
+};
 function generateGlyphix() {
-  const config = dealResource();
-  loadEnv();
-  lintFile(config.root).then((res) => {
-    if (res.length) {
-      (0, import_node_process.exit)(1);
-    }
-    build(config.root, config.entry);
-  });
+  console.info("start gen", process.env["VITE_SOURCE_DIR"]);
+  if (!process.env["VITE_BUILD_DIR"] || !process.env["VITE_SOURCE_DIR"])
+    throw Error("not set glyphix project path");
+  const generate = new GxGenerate();
+  generate.build();
 }
 
 // src/cli/index.ts

package/package.json

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

package/types/index.d.ts

@@ -17,10 +17,12 @@
 /// <reference path="./exchange.d.ts" />
 /// <reference path="./audiokit.d.ts" />
 
+
 declare global {
   function $t(key: string): string;
 }
 
+
 type ComputedResults<C, D> = {
   readonly [K in keyof C as C[K] extends (this: D) => any
     ? K