@eziapp-org/builder 0.0.0-beta.6 → 0.0.0-beta.7

package/dist/src/builder.d.ts

@@ -1,7 +1,8 @@
 type BuildMode = 'debug' | 'release';
 type Platform = 'windows' | 'linux' | 'macos';
 export declare class Builder {
-    private viteConfigPath;
+    private viteTsConfigPath;
+    private viteJsConfigPath;
     private eziConfigPath;
     private genTempFilePath;
     private outDir;
@@ -9,15 +10,17 @@ export declare class Builder {
     private eziConfig;
     private mode;
     private platform;
+    private defaultEziConfig;
     constructor(config: {
-        viteConfigPath?: string;
+        viteTsConfigPath?: string;
+        viteJsConfigPath?: string;
         eziConfigPath?: string;
+        genTempFilePath?: string;
         outDir?: string;
         mode?: BuildMode;
         platform?: Platform;
-        genTempFilePath?: string;
     });
-    LoadConfig(): Promise<void>;
+    loadConfig(): Promise<void>;
     genAssets(): Promise<void>;
     genIcon(): Promise<void>;
     build(): Promise<void>;

package/dist/src/builder.js

@@ -55,47 +55,50 @@ const eziDevExePaths = {
 };
 class Builder {
     constructor(config) {
+        this.defaultEziConfig = {
+            application: {
+                name: "EziApplication",
+                package: "com.ezi.app",
+            },
+            window: {
+                title: "Ezi Application"
+            }
+        };
         this.mode = config.mode || (0, utils_1.getArg)("--mode") || 'debug';
         this.platform = config.platform || (0, utils_1.getArg)("--platform") || (0, utils_1.getCurrentPlatformName)();
-        this.viteConfigPath = path.join(process.cwd(), config.viteConfigPath ?? "vite.config.js");
+        this.viteTsConfigPath = path.join(process.cwd(), config.viteTsConfigPath ?? "vite.config.ts");
+        this.viteJsConfigPath = path.join(process.cwd(), config.viteJsConfigPath ?? "vite.config.js");
         this.eziConfigPath = path.join(process.cwd(), config.eziConfigPath ?? "ezi.config.ts");
         this.outDir = path.join(process.cwd(), config.outDir ?? "build");
-        this.genTempFilePath = path.join(process.cwd(), config.genTempFilePath ?? "temp");
+        this.genTempFilePath = path.join(process.cwd(), config.genTempFilePath ?? "node_modules/.eziapp");
+        // 确保生成临时文件的目录存在
+        // 用于生成打包资源文件和调试时的配置文件
+        if (!fs.existsSync(this.genTempFilePath)) {
+            fs.mkdirSync(this.genTempFilePath, { recursive: true });
+        }
     }
-    async LoadConfig() {
+    async loadConfig() {
         // vite config
-        let viteConfig = {};
-        try {
-            viteConfig = await Promise.resolve(`${this.viteConfigPath}`).then(s => __importStar(require(s)));
-            if (viteConfig.default) {
-                viteConfig = viteConfig.default;
-            }
+        if (fs.existsSync(this.viteTsConfigPath)) {
+            const mod = await Promise.resolve(`${this.viteTsConfigPath}`).then(s => __importStar(require(s)));
+            this.viteConfig = mod.default || mod;
+        }
+        else if (fs.existsSync(this.viteJsConfigPath)) {
+            const mod = await Promise.resolve(`${this.viteJsConfigPath}`).then(s => __importStar(require(s)));
+            this.viteConfig = mod.default || mod;
         }
-        catch (e) {
-            console.log(yellow("! no vite.config.js found, using default config."));
+        else {
+            console.log(yellow(`! no ${path.basename(this.viteTsConfigPath)} found, using default config.`));
         }
-        this.viteConfig = viteConfig;
         // ezi config
-        let eziConfig = {};
-        try {
-            eziConfig = await Promise.resolve(`${this.eziConfigPath}`).then(s => __importStar(require(s)));
-            if (eziConfig.default) {
-                eziConfig = eziConfig.default;
-            }
+        if (fs.existsSync(this.eziConfigPath)) {
+            const mod = await Promise.resolve(`${this.eziConfigPath}`).then(s => __importStar(require(s)));
+            this.eziConfig = mod.default || mod;
         }
-        catch (e) {
-            console.log(yellow("! no ezi.config.ts found, using default config."));
-            eziConfig = {
-                application: {
-                    name: "EziApplication",
-                    package: "com.ezi.app",
-                },
-                window: {
-                    title: "Ezi Application"
-                }
-            };
+        else {
+            console.log(yellow(`! no ${path.basename(this.eziConfigPath)} found, using default config.`));
+            this.eziConfig = this.defaultEziConfig;
         }
-        this.eziConfig = eziConfig;
     }
     async genAssets() {
         const assetsMatas = {};
@@ -115,7 +118,7 @@ class Builder {
             const filePath = path.join(assetsDir, file);
             const stat = fs.statSync(filePath);
             if (stat.isFile()) {
-                const packageName = this.eziConfig?.application?.package || "com.ezi.app";
+                const packageName = this.eziConfig?.application?.package || this.defaultEziConfig.application.package;
                 const fileBuffer = await (0, zstd_1.compress)(fs.readFileSync(filePath));
                 const assetsId = `https://${packageName}/${file.split(path.sep).join("/")}`;
                 const size = fileBuffer.length;
@@ -136,9 +139,6 @@ class Builder {
         const headerBuffer = Buffer.alloc(manifestSizeFlag);
         headerBuffer.writeUInt32LE(manifestSize, 0);
         assetsBinarys.push(headerBuffer);
-        if (!fs.existsSync(this.genTempFilePath)) {
-            fs.mkdirSync(this.genTempFilePath, { recursive: true });
-        }
         fs.writeFileSync(path.join(this.genTempFilePath, 'ezi.assets.binary'), Buffer.concat(assetsBinarys));
         console.log(green("✓ assets generated."));
     }
@@ -167,14 +167,15 @@ class Builder {
             console.error(red(`✗ Unsupported platform: ${this.platform}`));
             process.exit(1);
         }
+        // 获取输出目录
         if (!this.eziConfig.application.buildEntry) {
             this.eziConfig.application.buildEntry = this.viteConfig?.build?.outDir || "dist";
         }
-        await (0, vite_1.build)(this.viteConfig);
+        await (0, vite_1.build)();
         await this.genAssets();
         await this.genIcon();
         const packagerModule = await Promise.resolve(`${path.join(__dirname, packagerPath)}`).then(s => __importStar(require(s)));
-        const PackagerClass = packagerModule.default;
+        const PackagerClass = packagerModule.default || packagerModule;
         const packager = new PackagerClass({
             eziConfig: this.eziConfig,
             outDir: this.outDir,
@@ -204,11 +205,8 @@ class Builder {
             }
         }
         const eziConfigJsonPath = path.join(this.genTempFilePath, "ezi.config.json");
-        if (!fs.existsSync(this.genTempFilePath)) {
-            fs.mkdirSync(this.genTempFilePath, { recursive: true });
-        }
         fs.writeFileSync(eziConfigJsonPath, JSON.stringify(devEziConfig, null, 4), { encoding: "utf-8" });
-        const appName = devEziConfig?.application?.name || "EziApplication";
+        const appName = devEziConfig?.application?.name || this.defaultEziConfig.application.name;
         const child = (0, child_process_1.spawn)(devExePath, [
             '--configpath',
             eziConfigJsonPath,
@@ -221,9 +219,9 @@ class Builder {
         child.stdout?.on("data", (data) => {
             process.stdout.write((0, utils_1.getCurrentTimeString)() + bold(blue(` [${appName}] `)) + data);
         });
-        const srcDir = path.join(process.cwd(), this.viteConfig?.root || "");
+        const srcDir = path.join(process.cwd(), this.viteConfig?.root || "").replaceAll("\\", "/");
         child.stderr?.on("data", (data) => {
-            const errorMsg = data.toString().replace("LOCATION_ORIGIN", srcDir.replaceAll("\\", "/"));
+            const errorMsg = data.toString().replaceAll("LOCATION_ORIGIN", srcDir);
             process.stderr.write(red(errorMsg));
         });
         child.on("exit", (code) => {
@@ -262,7 +260,7 @@ class Builder {
     async main() {
         console.log(yellow("! EziApp 正在快速迭代中，当前 API 尚未稳定，请不要用于生产环境。"));
         console.log(yellow("! EziApp is rapidly evolving, the API is not yet stable, please do not use it in production."));
-        await this.LoadConfig();
+        await this.loadConfig();
         switch (this.mode) {
             case 'debug':
                 await this.dev();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eziapp-org/builder",
-    "version": "0.0.0-beta.6",
+    "version": "0.0.0-beta.7",
     "license": "MIT",
     "repository": {
         "type": "git",