@next2d/builder 0.0.3 → 0.0.5

package/dist/index.d.ts

@@ -40,6 +40,16 @@ declare let $buildDir: string;
  * @private
  */
 declare let $outDir: string;
+/**
+ * @type {string}
+ * @constant
+ */
+declare const CAPACITOR_CONFIG_NAME: string;
+/**
+ * @type {string}
+ * @constant
+ */
+declare const ELECTRON_CONFIG_NAME: string;
 /**
  * @return {Promise}
  * @method
@@ -104,11 +114,11 @@ declare const generateNativeProject: () => Promise<void>;
  * @description iOS用アプリの書き出し関数
  *              Export function for iOS apps
  *
- * @return {void}
+ * @return {Promise}
  * @method
  * @public
  */
-declare const runNative: () => void;
+declare const runNative: () => Promise<void>;
 /**
  * @description ビルドの実行関数
  *              Build Execution Functions
@@ -118,3 +128,12 @@ declare const runNative: () => void;
  * @public
  */
 declare const build: () => void;
+/**
+ * @description 実行関数
+ *              function execution
+ *
+ * @return {Promise}
+ * @method
+ * @public
+ */
+declare const execute: () => Promise<void>;

package/dist/index.js

@@ -90,6 +90,16 @@ let $outDir = "dist";
 // update env variables
 process.env.NEXT2D_EBUILD_ENVIRONMENT = environment;
 process.env.NEXT2D_TARGET_PLATFORM = platform;
+/**
+ * @type {string}
+ * @constant
+ */
+const CAPACITOR_CONFIG_NAME = "capacitor.config.json";
+/**
+ * @type {string}
+ * @constant
+ */
+const ELECTRON_CONFIG_NAME = "electron.build.json";
 /**
  * @return {Promise}
  * @method
@@ -112,7 +122,8 @@ const loadConfig = () => {
         $buildDir = `${process.cwd()}/${$outDir}/${platformDir}/${environment}`;
         if (!fs.existsSync(`${$buildDir}`)) {
             fs.mkdirSync(`${$buildDir}`, { "recursive": true });
-            console.log(pc.green(`create build dir: ${$buildDir}`));
+            console.log(pc.green(`Create build directory: ${$buildDir}`));
+            console.log();
         }
         resolve();
     });
@@ -126,19 +137,19 @@ const loadConfig = () => {
  * @public
  */
 const buildWeb = () => {
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
         const command = `${process.cwd()}/node_modules/.bin/vite`;
         const stream = cp.spawn(command, [
             "--outDir",
             $buildDir,
             "build"
-        ]);
-        stream.stdout.on("data", (data) => {
-            console.log(data.toString());
-        });
-        stream.on("exit", () => {
-            console.log(pc.green("`HTML` and `JavaScript` files are written out."));
+        ], { "stdio": "inherit" });
+        stream.on("close", (code) => {
+            if (code !== 0) {
+                reject("Export of `HTML` and `JavaScript` failed.");
+            }
             console.log();
+            console.log(pc.green("`HTML` and `JavaScript` files are written out."));
             resolve();
         });
     });
@@ -153,16 +164,16 @@ const buildWeb = () => {
  */
 const generateElectronConfig = () => {
     let config = {};
-    const configPath = `${process.cwd()}/electron.build.json`;
+    const configPath = `${process.cwd()}/${ELECTRON_CONFIG_NAME}`;
     if (!fs.existsSync(configPath)) {
-        console.error(pc.red("The file `electron.build.json` could not be found."));
+        console.error(pc.red(`The file \`${ELECTRON_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.json`.");
+        console.log(`Please set \`appId\` in \`${ELECTRON_CONFIG_NAME}\`.`);
         console.log();
         process.exit(1);
     }
@@ -195,6 +206,20 @@ const generateElectronConfig = () => {
                 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;
+            }
+            break;
         default:
             break;
     }
@@ -206,7 +231,11 @@ const generateElectronConfig = () => {
     if (config.directories.output.slice(-1) !== "/") {
         config.directories.output += "/";
     }
-    config.directories.output += `${platformDir}/${environment}`;
+    if (!("files" in config)) {
+        config.files = [];
+    }
+    config.files.push(`${$outDir}/${platformDir}/${environment}/`);
+    config.directories.output += `${platformDir}/build`;
     return config;
 };
 /**
@@ -261,16 +290,16 @@ const buildSteam = () => {
     if (preview) {
         const stream = cp.spawn(`${process.cwd()}/node_modules/.bin/electron`, [
             `${process.cwd()}/electron.js`
-        ]);
-        stream.on("exit", () => {
-            unlinkElectronIndexPath();
-            // reset
-            fs.writeFileSync(`${process.cwd()}/package.json`, JSON.stringify(packageJson, null, 2));
-        });
-        stream.on("disconnect", () => {
+        ], { "stdio": "inherit" });
+        stream.on("close", (code) => {
+            console.log("preview close.");
             unlinkElectronIndexPath();
             // reset
             fs.writeFileSync(`${process.cwd()}/package.json`, JSON.stringify(packageJson, null, 2));
+            if (code !== 0) {
+                console.log(pc.red("Failed to start Electron."));
+                console.log();
+            }
         });
     }
     else {
@@ -280,6 +309,7 @@ const buildSteam = () => {
          */
         const config = generateElectronConfig();
         console.log(pc.green("Start the `Electron` build process."));
+        console.log();
         const buildObject = {
             "projectDir": process.cwd(),
             "config": config
@@ -297,14 +327,26 @@ const buildSteam = () => {
             case "steam:linux":
                 buildObject.targets = electronBuilder.Platform.LINUX.createTarget();
                 break;
+            default:
+                console.log(pc.red("There is an error in the export platform settings."));
+                console.log();
+                break;
         }
         electronBuilder
             .build(buildObject)
             .then(() => {
             unlinkElectronIndexPath();
-            console.log(pc.green("Finished building `Electron`."));
             // reset
             fs.writeFileSync(`${process.cwd()}/package.json`, JSON.stringify(packageJson, null, 2));
+            console.log(pc.green(`Finished building \`Electron\` for ${platform}.`));
+            console.log();
+        })
+            .catch((error) => {
+            unlinkElectronIndexPath();
+            // reset
+            fs.writeFileSync(`${process.cwd()}/package.json`, JSON.stringify(packageJson, null, 2));
+            console.log(pc.red("Export of Electron failed."));
+            console.log(pc.red(error));
         });
     }
 };
@@ -317,22 +359,18 @@ const buildSteam = () => {
  * @public
  */
 const generateNativeProject = () => {
-    if (fs.existsSync(`${process.cwd()}/${platform}`)) {
-        return Promise.resolve();
-    }
-    return new Promise((resolve) => {
-        const stream = cp.spawn("npx", ["cap", "add", platform]);
-        let errorCheck = false;
-        stream.stderr.on("data", (error) => {
-            errorCheck = true;
-            console.error(pc.red(error.toString()));
-        });
-        stream.stdout.on("data", (data) => {
-            console.log(data.toString());
-        });
-        stream.on("exit", () => {
-            if (errorCheck) {
-                process.exit(1);
+    return new Promise((resolve, reject) => {
+        if (fs.existsSync(`${process.cwd()}/${platform}`)) {
+            return resolve();
+        }
+        const stream = cp.spawn("npx", [
+            "cap",
+            "add",
+            platform
+        ], { "stdio": "inherit" });
+        stream.on("close", (code) => {
+            if (code !== 0) {
+                reject(`Failed generated ${platform} project.`);
             }
             console.log(pc.green(`Successfully generated ${platform} project.`));
             console.log();
@@ -344,26 +382,28 @@ const generateNativeProject = () => {
  * @description iOS用アプリの書き出し関数
  *              Export function for iOS apps
  *
- * @return {void}
+ * @return {Promise}
  * @method
  * @public
  */
-const runNative = () => {
-    generateNativeProject()
-        .then(() => {
-        /**
-         * Capacitorの書き出しに必要な設定を生成
-         * Generate settings necessary for exporting Capacitor
-         */
-        const config = JSON.parse(fs.readFileSync(`${process.cwd()}/capacitor.config.json`, { "encoding": "utf8" }));
-        config.webDir = `${$outDir}/${platformDir}/${environment}/`;
-        fs.writeFileSync(`${process.cwd()}/capacitor.config.json`, JSON.stringify(config, null, 2));
-        const nodePath = process.argv[0];
-        const filePath = process.argv[1];
-        process.argv = [nodePath, filePath, "run", platform];
-        // run simulator
-        cli.run();
-    });
+const runNative = async () => {
+    await generateNativeProject();
+    /**
+     * Capacitorの書き出しに必要な設定を生成
+     * Generate settings necessary for exporting Capacitor
+     */
+    const config = JSON.parse(fs.readFileSync(`${process.cwd()}/${CAPACITOR_CONFIG_NAME}`, { "encoding": "utf8" }));
+    config.webDir = `${$outDir}/${platformDir}/${environment}/`;
+    fs.writeFileSync(`${process.cwd()}/${CAPACITOR_CONFIG_NAME}`, JSON.stringify(config, null, 2));
+    /**
+     * 引数をcapacitorに合わせて書き換え
+     * Rewrite arguments to match capacitor
+     */
+    const nodePath = process.argv[0];
+    const filePath = process.argv[1];
+    process.argv = [nodePath, filePath, "run", platform];
+    // run simulator
+    cli.run();
 };
 /**
  * @description ビルドの実行関数
@@ -384,29 +424,34 @@ const build = () => {
             buildSteam();
             break;
         case "ios":
-            if (preview) {
-                runNative();
-            }
-            break;
         case "android":
             if (preview) {
                 runNative();
             }
             break;
         case "web":
-            console.log(pc.green("build done."));
+            console.log();
             break;
         default:
             echoHelp();
             break;
     }
 };
-loadConfig()
-    .then(() => {
+/**
+ * @description 実行関数
+ *              function execution
+ *
+ * @return {Promise}
+ * @method
+ * @public
+ */
+const execute = async () => {
+    await loadConfig();
     buildWeb()
         .then(build)
         .catch((error) => {
         console.log(pc.red(error));
         process.exit(1);
     });
-});
+};
+execute();

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@next2d/builder",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "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",
-  "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "homepage": "https://next2d.app",
@@ -36,7 +35,7 @@
   "dependencies": {
     "@capacitor/cli": "^5.5.1",
     "@types/node": "^20.9.0",
-    "electron": "^27.0.3",
+    "electron": "^27.0.4",
     "electron-builder": "^24.6.4",
     "picocolors": "^1.0.0",
     "vite": "^4.5.0"