@next2d/builder 0.0.5 → 0.0.7

package/README.md

@@ -16,8 +16,9 @@ Multi-platform builder for Next2D Framework, export to various platforms includi
 
 | platform | detail                   |
 |----------|--------------------------|
-| macOS    | Export dmg file          |
 | Windows  | Export an exe file       |
+| macOS    | Export dmg, app file     |
+| Linux    | Export deb file          |
 | iOS      | Implementing...          |
 | Android  | Implementing...          |
 | web      | Export minfy'd JS files  |

package/dist/index.d.ts

@@ -1,139 +1,2 @@
 #!/usr/bin/env node
-declare const cli: any;
-declare const pc: any;
-declare const fs: any;
-declare const cp: any;
-declare const vite: any;
-declare const electronBuilder: any;
-declare const recommendeVersion: number;
-declare const version: string;
-declare let platform: string;
-declare let environment: string;
-declare let hasHelp: boolean;
-declare let preview: boolean;
-/**
- * @description ヘルプを出力して終了
- *              Output help and exit
- *
- * @return {void}
- * @method
- * @public
- */
-declare const echoHelp: () => void;
-/**
- * @type {string}
- * @private
- */
-declare const platformDir: string;
-/**
- * @type {object}
- * @private
- */
-declare let $configObject: any | null;
-/**
- * @type {string}
- * @private
- */
-declare let $buildDir: string;
-/**
- * @type {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
- * @public
- */
-declare const loadConfig: () => Promise<void>;
-/**
- * @description Web用アプリの書き出し関数
- *              Export function for web applications
- *
- * @return {Promise}
- * @method
- * @public
- */
-declare const buildWeb: () => Promise<void>;
-/**
- * @description Electronの書き出しに必要なconfigを生成
- *              Generate config for Electron export
- *
- * @return {object}
- * @method
- * @public
- */
-declare const generateElectronConfig: () => any;
-/**
- * @description Electronで読み込むindex.htmlのファイルパスをセット
- *              Set the file path of index.html to be loaded by Electron
- *
- * @return {void}
- * @method
- * @public
- */
-declare const setElectronIndexPath: () => void;
-/**
- * @description Electronで読み込むindex.htmlのファイルパスを初期化
- *              Initialize the file path of index.html to be loaded by Electron
- *
- * @return {void}
- * @method
- * @public
- */
-declare const unlinkElectronIndexPath: () => void;
-/**
- * @description Windows用アプリの書き出し関数
- *              Export function for Windows apps
- *
- * @return {void}
- * @method
- * @public
- */
-declare const buildSteam: () => void;
-/**
- * @description iOSのプロジェクトを生成
- *              Generate iOS project
- *
- * @return {Promise<void>}
- * @method
- * @public
- */
-declare const generateNativeProject: () => Promise<void>;
-/**
- * @description iOS用アプリの書き出し関数
- *              Export function for iOS apps
- *
- * @return {Promise}
- * @method
- * @public
- */
-declare const runNative: () => Promise<void>;
-/**
- * @description ビルドの実行関数
- *              Build Execution Functions
- *
- * @return {void}
- * @method
- * @public
- */
-declare const build: () => void;
-/**
- * @description 実行関数
- *              function execution
- *
- * @return {Promise}
- * @method
- * @public
- */
-declare const execute: () => Promise<void>;
+export {};

package/dist/index.js

@@ -1,11 +1,10 @@
 #!/usr/bin/env node
 "use strict";
-const cli = require("@capacitor/cli");
-const pc = require("picocolors");
-const fs = require("fs");
-const cp = require("child_process");
-const vite = require("vite");
-const electronBuilder = require("electron-builder");
+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";
 const recommendeVersion = 18;
 const version = process.versions.node;
 if (recommendeVersion > parseInt(version.split(".")[0])) {
@@ -67,6 +66,24 @@ const echoHelp = () => {
 if (hasHelp) {
     echoHelp();
 }
+if (!platform || !environment) {
+    echoHelp();
+}
+switch (platform) {
+    case "windows":
+    case "macos":
+    case "linux":
+    case "steam:windows":
+    case "steam:macos":
+    case "steam:linux":
+    case "ios":
+    case "android":
+    case "web":
+        break;
+    default:
+        echoHelp();
+        break;
+}
 /**
  * @type {string}
  * @private
@@ -99,7 +116,12 @@ const CAPACITOR_CONFIG_NAME = "capacitor.config.json";
  * @type {string}
  * @constant
  */
-const ELECTRON_CONFIG_NAME = "electron.build.json";
+const ELECTRON_BUILD_CONFIG_NAME = "electron.build.json";
+/**
+ * @type {string}
+ * @constant
+ */
+const ELECTRON_INDEX_CONFIG_NAME = "electron.index.json";
 /**
  * @return {Promise}
  * @method
@@ -113,10 +135,11 @@ const loadConfig = () => {
             // overwride
             fs.writeFileSync(`${process.cwd()}/package.json`, JSON.stringify(packageJson, null, 2));
         }
-        const config = await vite.loadConfigFromFile({
+        const config = await loadConfigFromFile({
             "command": "build",
             "mode": "build"
         }, `${process.cwd()}/vite.config.ts`);
+        // update config
         $configObject = config;
         $outDir = $configObject.config?.build?.outDir || "dist";
         $buildDir = `${process.cwd()}/${$outDir}/${platformDir}/${environment}`;
@@ -138,8 +161,8 @@ const loadConfig = () => {
  */
 const buildWeb = () => {
     return new Promise((resolve, reject) => {
-        const command = `${process.cwd()}/node_modules/.bin/vite`;
-        const stream = cp.spawn(command, [
+        const stream = cp.spawn("npx", [
+            "vite",
             "--outDir",
             $buildDir,
             "build"
@@ -164,16 +187,16 @@ const buildWeb = () => {
  */
 const generateElectronConfig = () => {
     let config = {};
-    const configPath = `${process.cwd()}/${ELECTRON_CONFIG_NAME}`;
+    const configPath = `${process.cwd()}/${ELECTRON_BUILD_CONFIG_NAME}`;
     if (!fs.existsSync(configPath)) {
-        console.error(pc.red(`The file \`${ELECTRON_CONFIG_NAME}\` could not be found.`));
+        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_CONFIG_NAME}\`.`);
+        console.log(`Please set \`appId\` in \`${ELECTRON_BUILD_CONFIG_NAME}\`.`);
         console.log();
         process.exit(1);
     }
@@ -228,14 +251,11 @@ const generateElectronConfig = () => {
             "output": "dist"
         };
     }
-    if (config.directories.output.slice(-1) !== "/") {
-        config.directories.output += "/";
-    }
     if (!("files" in config)) {
         config.files = [];
     }
     config.files.push(`${$outDir}/${platformDir}/${environment}/`);
-    config.directories.output += `${platformDir}/build`;
+    config.directories.output = `${$outDir}/${platformDir}/build`;
     return config;
 };
 /**
@@ -248,7 +268,7 @@ const generateElectronConfig = () => {
  */
 const setElectronIndexPath = () => {
     const htmlFilePath = `${$buildDir}/index.html`;
-    fs.writeFileSync(`${process.cwd()}/electron.index.json`, JSON.stringify({
+    fs.writeFileSync(`${process.cwd()}/${ELECTRON_INDEX_CONFIG_NAME}`, JSON.stringify({
         "path": htmlFilePath.replace(process.cwd(), ".").trim()
     }, null, 2));
 };
@@ -261,7 +281,7 @@ const setElectronIndexPath = () => {
  * @public
  */
 const unlinkElectronIndexPath = () => {
-    const jsonPath = `${process.cwd()}/electron.index.json`;
+    const jsonPath = `${process.cwd()}/${ELECTRON_INDEX_CONFIG_NAME}`;
     if (fs.existsSync(jsonPath)) {
         fs.unlinkSync(jsonPath);
     }
@@ -275,32 +295,26 @@ const unlinkElectronIndexPath = () => {
  * @public
  */
 const buildSteam = () => {
-    const packageJson = JSON.parse(fs.readFileSync(`${process.cwd()}/package.json`, { "encoding": "utf8" }));
-    // edit type
-    packageJson.type = "commonjs";
-    // overwride
-    fs.writeFileSync(`${process.cwd()}/package.json`, JSON.stringify(packageJson, null, 2));
-    // revert type
-    packageJson.type = "module";
     /**
      * Electronで読み込むindex.htmlのパスをセット
      * Set the path to index.html to load in Electron
      */
     setElectronIndexPath();
     if (preview) {
-        const stream = cp.spawn(`${process.cwd()}/node_modules/.bin/electron`, [
+        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`
         ], { "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();
+        setTimeout(() => {
+            if (packageJson.type !== "module") {
+                packageJson.type = "module";
+                // overwride
+                fs.writeFileSync(`${process.cwd()}/package.json`, JSON.stringify(packageJson, null, 2));
             }
-        });
+            unlinkElectronIndexPath();
+        }, 1000);
     }
     else {
         /**
@@ -317,34 +331,31 @@ const buildSteam = () => {
         switch (platform) {
             case "windows":
             case "steam:windows":
-                buildObject.targets = electronBuilder.Platform.WINDOWS.createTarget();
+                buildObject.targets = Platform.WINDOWS.createTarget();
                 break;
             case "macos":
             case "steam:macos":
-                buildObject.targets = electronBuilder.Platform.MAC.createTarget();
+                buildObject.targets = Platform.MAC.createTarget();
                 break;
             case "linux":
             case "steam:linux":
-                buildObject.targets = electronBuilder.Platform.LINUX.createTarget();
+                buildObject.targets = Platform.LINUX.createTarget();
                 break;
             default:
+                unlinkElectronIndexPath();
                 console.log(pc.red("There is an error in the export platform settings."));
                 console.log();
+                process.exit(1);
                 break;
         }
-        electronBuilder
-            .build(buildObject)
+        electronBuilder(buildObject)
             .then(() => {
             unlinkElectronIndexPath();
-            // 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));
         });
@@ -395,15 +406,11 @@ const runNative = async () => {
     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();
+    cp.spawn("npx", [
+        "cap",
+        "run",
+        platform
+    ], { "stdio": "inherit" });
 };
 /**
  * @description ビルドの実行関数
@@ -413,7 +420,7 @@ const runNative = async () => {
  * @method
  * @public
  */
-const build = () => {
+const multiBuild = () => {
     switch (platform) {
         case "windows":
         case "macos":
@@ -448,7 +455,7 @@ const build = () => {
 const execute = async () => {
     await loadConfig();
     buildWeb()
-        .then(build)
+        .then(multiBuild)
         .catch((error) => {
         console.log(pc.red(error));
         process.exit(1);

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@next2d/builder",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "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",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "type": "module",
   "homepage": "https://next2d.app",
   "bugs": "https://github.com/Next2D/view-generator/issues",
   "keywords": [
@@ -33,7 +34,6 @@
     "@next2d/builder": "dist/index.js"
   },
   "dependencies": {
-    "@capacitor/cli": "^5.5.1",
     "@types/node": "^20.9.0",
     "electron": "^27.0.4",
     "electron-builder": "^24.6.4",