glyphix 1.0.33 → 1.0.36

package/bin/glyphix.js

@@ -26,22 +26,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 // src/cli/index.ts
 var import_yargs = __toESM(require("yargs"));
 
-// src/cli/utils/logger.ts
-var import_chalk = __toESM(require("chalk"));
-var { log: originLog } = console;
-console.debug = function(...args) {
-  originLog(import_chalk.default.gray(...args));
-};
-console.info = function(...args) {
-  originLog(import_chalk.default.white(...args));
-};
-console.warn = function(...args) {
-  originLog(import_chalk.default.yellow(...args));
-};
-console.error = function(...args) {
-  originLog(import_chalk.default.red(...args));
-};
-
 // src/cli/command/new.ts
 var import_fs_extra = require("fs-extra");
 var import_child_process = require("child_process");
@@ -181,7 +165,6 @@ var GxGenerate = class {
     ].filter((item) => {
       return (0, import_node_fs.existsSync)(item);
     });
-    console.info(dotenvFiles);
     dotenvFiles.reverse().forEach((dotenvFile) => {
       import_dotenv.default.config({ path: (0, import_node_path3.resolve)(this.sourceRoot, "..", dotenvFile) });
     });
@@ -195,12 +178,13 @@ var GxGenerate = class {
   generateEsbuildConfig() {
     const resolveExtensions = [".ts", ".js"];
     const that = this;
+    const outdir = process.env["GLYPHIX_BUILD_DIR"] ? (0, import_node_path3.resolve)(this.buildRoot, ".node-dist") : (0, import_node_path3.resolve)(this.buildRoot, ".vite-dist");
     const internalConfig = {
       entryPoints: this.entries,
       // 入口文件
       bundle: true,
       // 启用打包
-      outdir: (0, import_node_path3.resolve)(this.buildRoot, ".vite-dist"),
+      outdir,
       // 输出目录
       splitting: true,
       // 启用代码分割
@@ -278,18 +262,10 @@ var GxGenerate = class {
   /**
    * 安装依赖
    * 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
@@ -305,15 +281,11 @@ var GxGenerate = class {
       );
       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 {
@@ -331,20 +303,16 @@ var GxGenerate = class {
     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() {
-  console.info("start gen", process.env["VITE_SOURCE_DIR"]);
-  if (!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();
   generate.build();

package/package.json

@@ -1,38 +1,63 @@
 {
-	"name": "glyphix",
-	"version": "1.0.33",
-	"main": "lib/index.js",
-	"types": "types/index.d.ts",
-	"files": [
-		"glyphix.js",
-		"types/",
-		"template/",
-		"script/",
-		"libs/"
-	],
-	"scripts": {},
-	"bin": {
-		"glyphix": "./bin/glyphix.js"
-	},
-	"sideEffects": false,
-	"exports": {
-		".": {
-			"import": {
-				"types": "./types/index.d.ts",
-				"default": "./libs/index.js"
-			}
-		}
-	},
-	"dependencies": {
-		"adm-zip": "^0.5.16",
-		"chalk": "^4.1.2",
-		"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"
-	}
-}
+  "name": "glyphix",
+  "version": "1.0.36",
+  "main": "lib/index.js",
+  "types": "types/index.d.ts",
+  "files": [
+    "glyphix.js",
+    "types/",
+    "template/",
+    "script/",
+    "libs/"
+  ],
+  "bin": {
+    "glyphix": "./bin/glyphix.js"
+  },
+  "sideEffects": false,
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./types/index.d.ts",
+        "default": "./libs/index.js"
+      }
+    }
+  },
+  "scripts": {
+    "dev": "cross-env NODE_ENV=development ts-node src/index.ts generate",
+    "build": "rimraf dist && ts-node script/build.ts",
+    "dev:local": "ts-node script/build.ts && sudo npm install /Users/hui/Documents/workspaces/work/appstore/develop-tools/gxTools/dist -g"
+  },
+  "keywords": [
+    "glyphix"
+  ],
+  "author": "xfaith",
+  "license": "ISC",
+  "description": "",
+  "devDependencies": {
+    "@types/adm-zip": "^0.5.7",
+    "@types/fs-extra": "^11.0.4",
+    "@types/lodash": "^4.17.15",
+    "@types/node": "^22.10.5",
+    "@types/ramda": "^0.30.2",
+    "@types/yargs": "^17.0.33",
+    "cross-env": "^7.0.3",
+    "globals": "^15.14.0",
+    "ramda": "^0.30.1",
+    "rimraf": "^6.0.1",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.7.3"
+  },
+  "dependencies": {
+    "adm-zip": "^0.5.16",
+    "chalk": "^4.1.2",
+    "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"
+}

package/script/install.js

@@ -1 +0,0 @@
-"use strict";var f=Object.create;var c=Object.defineProperty;var p=Object.getOwnPropertyDescriptor;var h=Object.getOwnPropertyNames;var x=Object.getPrototypeOf,_=Object.prototype.hasOwnProperty;var w=(o,i,n,r)=>{if(i&&typeof i=="object"||typeof i=="function")for(let m of h(i))!_.call(o,m)&&m!==n&&c(o,m,{get:()=>i[m],enumerable:!(r=p(i,m))||r.enumerable});return o};var d=(o,i,n)=>(n=o!=null?f(x(o)):{},w(i||!o||!o.__esModule?c(n,"default",{value:o,enumerable:!0}):n,o));var u=d(require("http")),l=d(require("fs")),a=require("child_process"),s=require("fs-extra"),e=require("path"),g=d(require("adm-zip"));function b(o,i){let n=l.default.createWriteStream(i);return new Promise((r,m)=>{u.default.get(o,t=>{if(t.statusCode!==200){console.error(`Failed to download file: ${t.statusCode}`),t.resume(),m();return}t.pipe(n),n.on("finish",()=>{n.close(()=>{console.log("Download completed."),r(i)})})}).on("error",t=>{l.default.unlink(i,()=>{}),console.error(`Error downloading file: ${t.message}`),m()})})}function y(){let o="http://10.147.18.10:9012/download/gx-build-mac-arm64-test-0.0.1.zip",i=(0,e.parse)(o),n=`${i.name}${i.ext}`,r=(0,e.resolve)(__dirname,"../emu/");return(0,s.existsSync)(r)||(0,s.mkdirSync)(r),b(o,(0,e.resolve)(r,n))}function P(o,i){new g.default(o).extractAllTo(i,!0)}(0,s.existsSync)((0,e.resolve)(__dirname,"emu/bin"))||y().then(o=>{P(o,(0,e.dirname)(o)),(0,a.spawn)("chmod",["+x",(0,e.resolve)(__dirname,"../emu/bin/gx")]),(0,a.spawn)("chmod",["+x",(0,e.resolve)(__dirname,"../emu/bin/glyphix-emu")]),(0,a.spawn)("chmod",["+x",(0,e.resolve)(__dirname,"../emu/bin/glyphix-jsc")]),(0,a.spawn)("chmod",["+x",(0,e.resolve)(__dirname,"../emu/bin/image-forge")])});