@next2d/builder 0.0.8 → 0.0.10

package/dist/index.js

@@ -4,7 +4,7 @@ import pc from "picocolors";
 import fs from "fs";
 import cp from "child_process";
 import { loadConfigFromFile } from "vite";
-import { Platform, build as electronBuilder } from "electron-builder";
+import { api } from "@electron-forge/core";
 const recommendeVersion = 18;
 const version = process.versions.node;
 if (recommendeVersion > parseInt(version.split(".")[0])) {
@@ -112,23 +112,13 @@ process.env.NEXT2D_TARGET_PLATFORM = platform;
  * @constant
  */
 const CAPACITOR_CONFIG_NAME = "capacitor.config.json";
-/**
- * @type {string}
- * @constant
- */
-const ELECTRON_BUILD_CONFIG_NAME = "electron.build.json";
-/**
- * @type {string}
- * @constant
- */
-const ELECTRON_INDEX_CONFIG_NAME = "electron.index.json";
 /**
  * @return {Promise}
  * @method
  * @public
  */
 const loadConfig = () => {
-    return new Promise(async (resolve) => {
+    return new Promise((resolve) => {
         const packageJson = JSON.parse(fs.readFileSync(`${process.cwd()}/package.json`, { "encoding": "utf8" }));
         if (packageJson.type !== "module") {
             packageJson.type = "module";
@@ -136,20 +126,22 @@ const loadConfig = () => {
             fs.writeFileSync(`${process.cwd()}/package.json`, JSON.stringify(packageJson, null, 2));
         }
         const ext = fs.existsSync(`${process.cwd()}/vite.config.ts`) ? "ts" : "js";
-        const config = await loadConfigFromFile({
+        loadConfigFromFile({
             "command": "build",
             "mode": "build"
-        }, `${process.cwd()}/vite.config.${ext}`);
-        // update config
-        $configObject = config;
-        $outDir = $configObject.config?.build?.outDir || "dist";
-        $buildDir = `${process.cwd()}/${$outDir}/${platformDir}/${environment}`;
-        if (!fs.existsSync(`${$buildDir}`)) {
-            fs.mkdirSync(`${$buildDir}`, { "recursive": true });
-            console.log(pc.green(`Create build directory: ${$buildDir}`));
-            console.log();
-        }
-        resolve();
+        }, `${process.cwd()}/vite.config.${ext}`)
+            .then((config) => {
+            // update config
+            $configObject = config;
+            $outDir = $configObject.config?.build?.outDir || "dist";
+            $buildDir = `${process.cwd()}/${$outDir}/${platformDir}/${environment}`;
+            if (!fs.existsSync(`${$buildDir}`)) {
+                fs.mkdirSync(`${$buildDir}`, { "recursive": true });
+                console.log(pc.green(`Create build directory: ${$buildDir}`));
+                console.log();
+            }
+            resolve();
+        });
     });
 };
 /**
@@ -179,184 +171,134 @@ const buildWeb = () => {
     });
 };
 /**
- * @description Electronの書き出しに必要なconfigを生成
- *              Generate config for Electron export
+ * @description electronがインストールされてなければインストールを実行
+ *              If electron is not installed, run install.
  *
- * @return {object}
+ * @return {Promise}
  * @method
  * @public
  */
-const generateElectronConfig = () => {
-    let config = {};
-    const configPath = `${process.cwd()}/${ELECTRON_BUILD_CONFIG_NAME}`;
-    if (!fs.existsSync(configPath)) {
-        console.error(pc.red(`The file \`${ELECTRON_BUILD_CONFIG_NAME}\` could not be found.`));
-        process.exit(1);
-    }
-    config = Object.assign(config, JSON.parse(fs.readFileSync(configPath, { "encoding": "utf8" })));
-    if (!config.appId) {
-        console.log();
-        console.log(pc.red("`appId` is not set."));
-        console.log(`Please set \`appId\` in \`${ELECTRON_BUILD_CONFIG_NAME}\`.`);
-        console.log();
-        process.exit(1);
-    }
-    switch (platform) {
-        case "windows":
-        case "steam:windows":
-            if (!("win" in config)) {
-                config.win = {
-                    "target": "portable"
-                };
-            }
-            if ("mac" in config) {
-                delete config.mac;
-            }
-            if ("linux" in config) {
-                delete config.linux;
-            }
-            break;
-        case "macos":
-        case "steam:macos":
-            if (!("mac" in config)) {
-                config.mac = {
-                    "target": "dmg"
-                };
-            }
-            if ("win" in config) {
-                delete config.win;
-            }
-            if ("linux" in config) {
-                delete config.linux;
-            }
-            break;
-        case "linux":
-        case "steam:linux":
-            if (!("linux" in config)) {
-                config.linux = {
-                    "target": "deb"
-                };
-            }
-            if ("win" in config) {
-                delete config.win;
-            }
-            if ("mac" in config) {
-                delete config.mac;
+const installElectron = () => {
+    return new Promise((resolve, reject) => {
+        if (fs.existsSync(`${process.cwd()}/electron/node_modules`)) {
+            return resolve();
+        }
+        const stream = cp.spawn("npm", [
+            "--prefix",
+            `${process.cwd()}/electron`,
+            "install",
+            `${process.cwd()}/electron`
+        ], { "stdio": "inherit" });
+        stream.on("close", (code) => {
+            if (code !== 0) {
+                reject("`Electron` installation failed.");
             }
-            break;
-        default:
-            break;
-    }
-    if (!("directories" in config)) {
-        config.directories = {
-            "output": "dist"
-        };
-    }
-    if (!("files" in config)) {
-        config.files = [];
-    }
-    config.files.push(`${$outDir}/${platformDir}/${environment}/`);
-    config.directories.output = `${$outDir}/${platformDir}/build`;
-    return config;
+            console.log(pc.green("`Electron` successfully installed."));
+            resolve();
+        });
+    });
 };
 /**
- * @description Electronで読み込むindex.htmlのファイルパスをセット
- *              Set the file path of index.html to be loaded by Electron
+ * @description electronに含むリソースを初期化
+ *              Initialize resources included in electron
  *
- * @return {void}
+ * @return {Promise}
  * @method
  * @public
  */
-const setElectronIndexPath = () => {
-    const htmlFilePath = `${$buildDir}/index.html`;
-    fs.writeFileSync(`${process.cwd()}/${ELECTRON_INDEX_CONFIG_NAME}`, JSON.stringify({
-        "path": htmlFilePath.replace(process.cwd(), ".").trim()
-    }, null, 2));
+const removeResources = () => {
+    return new Promise((resolve, reject) => {
+        const stream = cp.spawn("rm", [
+            "-rf",
+            `${process.cwd()}/electron/resources/`
+        ], { "stdio": "inherit" });
+        stream.on("close", (code) => {
+            if (code !== 0) {
+                reject("Failed to remove built resources.");
+            }
+            console.log(pc.green("Successfully remove built resources."));
+            resolve();
+        });
+    });
 };
 /**
- * @description Electronで読み込むindex.htmlのファイルパスを初期化
- *              Initialize the file path of index.html to be loaded by Electron
+ * @description ビルドしたリソースをコピー
+ *              Copy built resources
  *
- * @return {void}
+ * @return {Promise}
  * @method
  * @public
  */
-const unlinkElectronIndexPath = () => {
-    const jsonPath = `${process.cwd()}/${ELECTRON_INDEX_CONFIG_NAME}`;
-    if (fs.existsSync(jsonPath)) {
-        fs.unlinkSync(jsonPath);
-    }
+const copyResources = () => {
+    return new Promise((resolve, reject) => {
+        const stream = cp.spawn("cp", [
+            "-r",
+            `${$buildDir}/`,
+            `${process.cwd()}/electron/resources`
+        ], { "stdio": "inherit" });
+        stream.on("close", (code) => {
+            if (code !== 0) {
+                reject("Failed to copy built resources.");
+            }
+            console.log(pc.green("Successfully copy built resources."));
+            resolve();
+        });
+    });
 };
 /**
  * @description Windows用アプリの書き出し関数
  *              Export function for Windows apps
  *
- * @return {void}
+ * @return {Promise}
  * @method
  * @public
  */
-const buildSteam = () => {
-    /**
-     * Electronで読み込むindex.htmlのパスをセット
-     * Set the path to index.html to load in Electron
-     */
-    setElectronIndexPath();
+const buildSteam = async () => {
+    // reset
+    await removeResources();
+    // copy HTML, JavaScript
+    await copyResources();
     if (preview) {
-        const packageJson = JSON.parse(fs.readFileSync(`${process.cwd()}/package.json`, { "encoding": "utf8" }));
-        packageJson.type = "commonjs";
-        fs.writeFileSync(`${process.cwd()}/package.json`, JSON.stringify(packageJson, null, 2));
-        cp.spawn(`${process.cwd()}/node_modules/.bin/electron`, [
-            `${process.cwd()}/electron.js`
+        cp.spawn("npx", [
+            "electron",
+            `${process.cwd()}/electron/index.js`
         ], { "stdio": "inherit" });
-        setTimeout(() => {
-            if (packageJson.type !== "module") {
-                packageJson.type = "module";
-                // overwride
-                fs.writeFileSync(`${process.cwd()}/package.json`, JSON.stringify(packageJson, null, 2));
-            }
-            unlinkElectronIndexPath();
-        }, 1000);
     }
     else {
-        /**
-         * Electronの書き出しに必要な設定を生成
-         * Generate settings necessary for exporting Electron
-         */
-        const config = generateElectronConfig();
+        await installElectron();
         console.log(pc.green("Start the `Electron` build process."));
         console.log();
-        const buildObject = {
-            "projectDir": process.cwd(),
-            "config": config
+        const packageOptions = {
+            "dir": `${process.cwd()}/electron`,
+            "outDir": `${$outDir}/${platformDir}/build`,
+            "platform": "",
+            "arch": "all"
         };
         switch (platform) {
             case "windows":
             case "steam:windows":
-                buildObject.targets = Platform.WINDOWS.createTarget();
+                packageOptions.platform = "win32";
                 break;
             case "macos":
             case "steam:macos":
-                buildObject.targets = Platform.MAC.createTarget();
+                packageOptions.platform = "mas";
                 break;
             case "linux":
             case "steam:linux":
-                buildObject.targets = Platform.LINUX.createTarget();
+                packageOptions.platform = "linux";
                 break;
             default:
-                unlinkElectronIndexPath();
                 console.log(pc.red("There is an error in the export platform settings."));
                 console.log();
                 process.exit(1);
-                break;
         }
-        electronBuilder(buildObject)
+        api
+            .package(packageOptions)
             .then(() => {
-            unlinkElectronIndexPath();
             console.log(pc.green(`Finished building \`Electron\` for ${platform}.`));
             console.log();
         })
             .catch((error) => {
-            unlinkElectronIndexPath();
             console.log(pc.red("Export of Electron failed."));
             console.log(pc.red(error));
         });
@@ -366,7 +308,7 @@ const buildSteam = () => {
  * @description iOSのプロジェクトを生成
  *              Generate iOS project
  *
- * @return {Promise<void>}
+ * @return {Promise}
  * @method
  * @public
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next2d/builder",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "Multi-platform builder for Next2d Framework, supporting export to various platforms such as macOS, Windows, iOS, Android and Web(HTML)",
   "author": "Toshiyuki Ienaga <ienaga@next2d.app>",
   "license": "MIT",
@@ -34,9 +34,8 @@
     "@next2d/builder": "dist/index.js"
   },
   "dependencies": {
+    "@electron-forge/core": "^6.4.2",
     "@types/node": "^20.9.0",
-    "electron": "^27.0.4",
-    "electron-builder": "^24.6.4",
     "picocolors": "^1.0.0",
     "vite": "^4.5.0"
   },