glyphix 1.1.1 → 1.2.1

package/bin/glyphix.js

@@ -171,6 +171,7 @@ var GxGenerate = class {
     );
     // gx 工具传递过来的入口文件，包括 app.{t,j}s 和各个页面的 js 文件路径
     this.entries = [];
+    process.env.GLYPHIX_EXEC_ROOT = this.workspaceRoot;
     const entryFile = process.env["GLYPHIX_BUILD_DIR"] ? ".node-entry.json" : "entry.vite.json";
     const content = JSON.parse(
       (0, import_node_fs.readFileSync)((0, import_node_path3.resolve)(this.buildRoot, entryFile)).toString()
@@ -210,7 +211,10 @@ var GxGenerate = class {
       if (key.startsWith("GLYPHIX"))
         envDefine[`process.env.${key}`] = JSON.stringify(process.env[key]);
     });
-    return envDefine;
+    return {
+      ...envDefine,
+      GLYPHIX_EXEC_ROOT: JSON.stringify(this.workspaceRoot)
+    };
   }
   generateEsbuildConfig() {
     const resolveExtensions = [".ts", ".js"];
@@ -279,16 +283,29 @@ 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))
+      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 = mergeEsbuildConfigs(internalConfig, useConfig);
-      console.log(a.plugins);
       return a;
     } catch (error) {
       console.error(error);
@@ -347,10 +364,6 @@ var GxGenerate = class {
   }
 };
 function generateGlyphix() {
-  console.log(
-    "process",
-    !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();

package/cjs/plugin/buildServer.js

@@ -0,0 +1,132 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var buildServer_exports = {};
+__export(buildServer_exports, {
+  buildServerPlugin: () => buildServerPlugin
+});
+module.exports = __toCommonJS(buildServer_exports);
+var import_esbuild = __toESM(require("esbuild"));
+var path = __toESM(require("path"));
+var import_fs_extra = __toESM(require("fs-extra"));
+const disallowed = [
+  "@system.router",
+  "@system.prompt",
+  "@system.device",
+  "@system.battery",
+  "@system.schedule",
+  "@system.notification",
+  "@system.notification",
+  "@system.vibrator",
+  "@system.internal",
+  "@system.test",
+  "@system.media",
+  "@system.audiokit",
+  "@system.calendar",
+  "@system.geolocation"
+];
+function buildServerPlugin(options) {
+  return {
+    name: "build-server",
+    async setup(build) {
+      build.onEnd(async (result) => {
+      });
+      const resolveExtensions = [".ts", ".js"];
+      console.log("00000", build.initialOptions.define);
+      const execRoot = JSON.parse(
+        build.initialOptions.define["GLYPHIX_EXEC_ROOT"]
+      );
+      const serverOutputPath = path.resolve(
+        execRoot,
+        process.env["GLYPHIX_BUILD_DIR"],
+        "assets"
+      );
+      if (!import_fs_extra.default.existsSync(serverOutputPath)) {
+        import_fs_extra.default.mkdirSync(serverOutputPath);
+      }
+      const manifestPath = path.resolve(
+        execRoot,
+        process.env["GLYPHIX_SOURCE_DIR"],
+        "manifest.json"
+      );
+      const packageName = JSON.parse(
+        import_fs_extra.default.readFileSync(manifestPath).toString()
+      ).package;
+      try {
+        await import_esbuild.default.build({
+          entryPoints: [options.entry],
+          // 入口文件
+          bundle: true,
+          // 启用打包
+          outfile: path.resolve(serverOutputPath, "server.jsc"),
+          splitting: false,
+          // 启用代码分割
+          format: "esm",
+          // 输出为 ESM 格式
+          resolveExtensions,
+          external: ["@system*"],
+          platform: "node",
+          target: "node14",
+          // 目标平台设置为最新 ECMAScript
+          define: build.initialOptions.define,
+          sourcemap: false,
+          minify: options.minify,
+          banner: {
+            js: `const packageName = "${packageName}";`
+          },
+          plugins: [
+            {
+              name: "forbid-modules",
+              setup(build2) {
+                build2.onResolve({ filter: /.*/ }, (args) => {
+                  if (disallowed.includes(args.path)) {
+                    return {
+                      errors: [
+                        {
+                          text: `\u274C worker \u4E2D\u4F7F\u7528\u4E86\u88AB\u7981\u6B62\u7684\u6A21\u5757 "${args.path}"\uFF0C\u8BF7\u79FB\u9664\uFF01`
+                        }
+                      ]
+                    };
+                  }
+                  return null;
+                });
+              }
+            },
+            ...options.plugins ?? []
+          ]
+        });
+      } catch (err) {
+        process.exit(21);
+      }
+    }
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  buildServerPlugin
+});

package/cjs/plugin/index.js

@@ -0,0 +1,22 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var index_exports = {};
+module.exports = __toCommonJS(index_exports);
+__reExport(index_exports, require("./buildServer"), module.exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ...require("./buildServer")
+});

package/libs/plugin/buildServer.js

@@ -0,0 +1,121 @@
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import esbuild from "esbuild";
+import * as path from "path";
+import fse from "fs-extra";
+const disallowed = [
+  "@system.router",
+  "@system.prompt",
+  "@system.device",
+  "@system.battery",
+  "@system.schedule",
+  "@system.notification",
+  "@system.notification",
+  "@system.vibrator",
+  "@system.internal",
+  "@system.test",
+  "@system.media",
+  "@system.audiokit",
+  "@system.calendar",
+  "@system.geolocation"
+];
+function buildServerPlugin(options) {
+  return {
+    name: "build-server",
+    setup(build) {
+      return __async(this, null, function* () {
+        var _a2;
+        build.onEnd((result) => __async(this, null, function* () {
+        }));
+        const resolveExtensions = [".ts", ".js"];
+        console.log("00000", build.initialOptions.define);
+        const execRoot = JSON.parse(
+          build.initialOptions.define["GLYPHIX_EXEC_ROOT"]
+        );
+        const serverOutputPath = path.resolve(
+          execRoot,
+          process.env["GLYPHIX_BUILD_DIR"],
+          "assets"
+        );
+        if (!fse.existsSync(serverOutputPath)) {
+          fse.mkdirSync(serverOutputPath);
+        }
+        const manifestPath = path.resolve(
+          execRoot,
+          process.env["GLYPHIX_SOURCE_DIR"],
+          "manifest.json"
+        );
+        const packageName = JSON.parse(
+          fse.readFileSync(manifestPath).toString()
+        ).package;
+        try {
+          yield esbuild.build({
+            entryPoints: [options.entry],
+            // 入口文件
+            bundle: true,
+            // 启用打包
+            outfile: path.resolve(serverOutputPath, "server.jsc"),
+            splitting: false,
+            // 启用代码分割
+            format: "esm",
+            // 输出为 ESM 格式
+            resolveExtensions,
+            external: ["@system*"],
+            platform: "node",
+            target: "node14",
+            // 目标平台设置为最新 ECMAScript
+            define: build.initialOptions.define,
+            sourcemap: false,
+            minify: options.minify,
+            banner: {
+              js: `const packageName = "${packageName}";`
+            },
+            plugins: [
+              {
+                name: "forbid-modules",
+                setup(build2) {
+                  build2.onResolve({ filter: /.*/ }, (args) => {
+                    if (disallowed.includes(args.path)) {
+                      return {
+                        errors: [
+                          {
+                            text: `\u274C worker \u4E2D\u4F7F\u7528\u4E86\u88AB\u7981\u6B62\u7684\u6A21\u5757 "${args.path}"\uFF0C\u8BF7\u79FB\u9664\uFF01`
+                          }
+                        ]
+                      };
+                    }
+                    return null;
+                  });
+                }
+              },
+              ...(_a2 = options.plugins) != null ? _a2 : []
+            ]
+          });
+        } catch (err) {
+          process.exit(21);
+        }
+      });
+    }
+  };
+}
+export {
+  buildServerPlugin
+};

package/libs/plugin/index.js

@@ -0,0 +1 @@
+export * from "./buildServer";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "glyphix",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "main": "lib/index.js",
   "types": "types/index.d.ts",
   "files": [
@@ -8,7 +8,8 @@
     "types/",
     "template/",
     "script/",
-    "libs/"
+    "libs/",
+    "cjs/"
   ],
   "bin": {
     "glyphix": "./bin/glyphix.js"
@@ -19,12 +20,26 @@
       "import": {
         "types": "./types/index.d.ts",
         "default": "./libs/index.js"
+      },
+      "require": {
+        "types": "./types/index.d.ts",
+        "default": "./cjs/index.js"
+      }
+    },
+    "./plugin": {
+      "import": {
+        "types": "./types/plugin/index.d.ts",
+        "default": "./libs/plugin/index.js"
+      },
+      "require": {
+        "types": "./types/plugin/index.d.ts",
+        "default": "./cjs/plugin/index.js"
       }
     }
   },
   "scripts": {
     "dev": "cross-env NODE_ENV=development ts-node src/index.ts generate",
-    "build": "rimraf dist && ts-node script/build.ts",
+    "build": "rimraf dist && ts-node script/build.ts && ts-node script/buildPlugin.ts",
     "dev:local": "ts-node script/build.ts && sudo npm install /Users/hui/Documents/workspaces/work/appstore/develop-tools/gxTools/dist -g"
   },
   "keywords": [
@@ -37,7 +52,7 @@
     "@types/adm-zip": "^0.5.7",
     "@types/fs-extra": "^11.0.4",
     "@types/lodash": "^4.17.15",
-    "@types/node": "^22.10.5",
+    "@types/node": "^24.1.0",
     "@types/ramda": "^0.30.2",
     "@types/yargs": "^17.0.33",
     "cross-env": "^7.0.3",
@@ -60,4 +75,4 @@
     "yargs": "^17.7.2"
   },
   "packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
-}
+}

package/types/plugin/buildServer.d.ts

@@ -0,0 +1,7 @@
+import { Plugin } from 'esbuild';
+export declare function buildServerPlugin(options: {
+    entry: string;
+    minify?: boolean;
+    plugins?: Array<Plugin>;
+}): Plugin;
+//# sourceMappingURL=buildServer.d.ts.map

package/types/plugin/index.d.ts

@@ -0,0 +1,2 @@
+export * from './buildServer';
+//# sourceMappingURL=index.d.ts.map