glyphix 1.0.9 → 1.0.10

package/glyphix.js

@@ -108,6 +108,7 @@ function findGlyphixTools() {
 }
 function buildGlyphix(args) {
   var _a, _b;
+  console.log(findGlyphixTools(), reconstructArgs(args));
   const childProcess = (0, import_child_process2.execFile)(findGlyphixTools(), reconstructArgs(args), {
     cwd: process.cwd()
   });
@@ -117,6 +118,9 @@ function buildGlyphix(args) {
   (_b = childProcess.stderr) == null ? void 0 : _b.on("data", (data) => {
     console.error(data);
   });
+  childProcess.on("error", (err) => {
+    console.error(err);
+  });
   childProcess.on("exit", () => {
     console.log("exit");
   });
@@ -134,6 +138,32 @@ 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"));
+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();
@@ -195,15 +225,6 @@ function dealResource() {
   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));
-  entriedFullPath = entriedFullPath.map((item) => {
-    if ((0, import_node_fs.existsSync)(item)) {
-      const dest = item.replace(".js", ".ts");
-      if ((0, import_node_fs.existsSync)(dest)) (0, import_fs_extra2.removeSync)(dest);
-      (0, import_fs_extra2.moveSync)(item, dest);
-      return dest;
-    }
-    return item;
-  });
   return {
     root: rootPath,
     entry: entriedFullPath
@@ -211,6 +232,11 @@ function dealResource() {
 }
 function build(rootPath, entriedFullPath) {
   const resolveExtensions = [".ts", ".js"];
+  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({
     entryPoints: entriedFullPath,
     // 入口文件
@@ -228,6 +254,7 @@ function build(rootPath, entriedFullPath) {
     platform: "node",
     target: "node14",
     // 目标平台设置为最新 ECMAScript
+    define: envDefine,
     minify: process.env.GLYPHIX_ENV === "development" ? false : true,
     plugins: [
       {
@@ -265,6 +292,7 @@ function build(rootPath, entriedFullPath) {
 }
 function generateGlyphix() {
   const config = dealResource();
+  loadEnv();
   lintFile(config.root).then((res) => {
     if (res.length) {
       (0, import_node_process.exit)(1);
@@ -274,25 +302,58 @@ function generateGlyphix() {
 }
 
 // src/index.ts
-import_yargs.default.option("create", { describe: "create a new project" }).command("create", "create a glyphix project", {}, (args) => {
+import_yargs.default.command("create", "create a glyphix project", {}, (args) => {
   console.debug("create project", __dirname);
   if (args._.length < 2) {
     console.error("miss project name");
     return;
   }
   createProject(process.cwd(), args._[1] + "");
-}).command("generate", "compiler glyphix project", {}, generateGlyphix).command("build", "build glyphix project", {}, buildGlyphix).command(
-  "emu",
-  "run emulator",
+}).command("generate", "compiler glyphix project", {}, generateGlyphix).command(
+  "build",
+  "build glyphix project",
   (yargs2) => {
-    return yargs2.positional("glyphix emu [OPTIONS]", {
-      describe: "213",
-      type: "string"
-    }).options("device", {
-      alias: "d",
+    return yargs2.options("device", {
+      describe: "The name of the device to use when building.\nThereafter, emulation and packaging will use this\nconfiguration.",
+      type: "string",
+      alias: "d"
+    }).options("emulator", {
+      describe: "Build packages for the emulator, not the target device",
+      type: "boolean",
+      alias: "e"
+    }).options("image-rules", {
+      describe: "Use the specified image rules description file\n(default is config/image-rules.json).",
+      type: "string",
+      alias: "r"
+    }).options("full", {
+      describe: "Rebuild all the files for the project.",
       type: "string",
-      description: "The name of the device to use when building, \n emulation and packaging"
+      alias: "f"
+    }).options("dump", {
+      describe: "Dump details of the build process to aid debugging.",
+      type: "boolean"
     }).help().argv;
   },
   buildGlyphix
-).help().alias("help", "h").argv;
+).command("emu", "run emulator", (yargs2) => {
+  return yargs2.options("device", {
+    describe: "The name of the device to use when building,\nemulation and packaging.",
+    type: "string",
+    alias: "d",
+    demandOption: false
+  }).options("emulator-exe", {
+    describe: "Path to the glyphix-emu executable",
+    type: "string",
+    alias: "e",
+    normalize: true,
+    demandOption: false
+  }).options("language", {
+    describe: "Set the system language name. The default value is zh-CN.",
+    type: "string",
+    alias: "l"
+  }).options("inspector", {
+    describe: "Scale the window size to real device screen.",
+    type: "string",
+    alias: "l"
+  }).help().argv;
+}).help().alias("help", "h").argv;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "glyphix",
-	"version": "1.0.9",
+	"version": "1.0.10",
 	"main": "lib/index.js",
 	"types": "types/index.d.ts",
 	"files": [
@@ -18,6 +18,7 @@
 	"dependencies": {
 		"adm-zip": "^0.5.16",
 		"chalk": "^4.1.2",
+		"dotenv": "^16.4.7",
 		"esbuild": "^0.24.2",
 		"eslint": "^9.18.0",
 		"fs-extra": "^11.2.0",