electronup 0.0.8 → 0.1.0

package/README.md

@@ -1,346 +1,48 @@
 # electronup
+[![license](https://img.shields.io/badge/license-MIT-green.svg)](./LICENSE) ![](https://img.shields.io/github/stars/QuiteerJs/electronup) ![](https://img.shields.io/github/forks/QuiteerJs/electronup)
 
+> electronup 是一个集成 Vite4.x、tsup6.x、electron-builder24.x 的桌面端构建工具，一个配置文件完成多环境多目标的构建包。
 
-> 融合构建 electron 应用需要的构建工具,保留原有配置习惯的命令行工具
-
-
-
-## 插件前置
-
-```json
-{
-  "peerDependencies": {
-    "@types/node": ">= 16",
-    "electron": ">= 20",
-    "vue": ">= 3"
-  }
-}
-```
+## 文档地址
 
+文档地址 ：https://quiteerjs.github.io/electronup
 
 ## 安装
 
 ```bash
-npm i @quiteer/electronup -D
+npm install electronup -D
 ```
 
 ```bash
-yarn add @quiteer/electronup -D
+yarn add electronup -D
 ```
 
 ```bash
-pnpm add @quiteer/electronup -D
-```
-
-
-## 使用
-
-- 查看命令行指令
-
-  - `electornup -h`
-
-  - `electornup build -h`
-
-
-- 查看命令行版本
-
-  - `electornup -v`
-
-
-- 开发环境
-
-  - `electornup`
-
-  - `electornup dev`
-
-  - 指定配置文件 `electornup [config file]`
-
-  - 指定配置文件 `electornup dev [config file]`
-
-
-- 构建打包
-
-  - `electornup build`
-
-  - 指定配置文件 `electornup build [config file]`
-
-  - 开启选项式构建 `electornup build -o` 或 `electornup build --option`
-
-  - 输出选项默认当前平台架构
-
-  - 指定平台 `--win` ,`--mac` ,`--linux`
-
-  - 指定架构 `--ia32` ,`--x64` ,`--arm64`
-
-  - 可不指定平台架构版本， 默认为本机当前平台架构版本
-
-## 内置的依赖
-
-> 部分依赖已内置 无需重复安装 （开发此脚手架的目的也是给项目 package 瘦瘦身）
-
-```json
-{
-  "dependencies": {
-    "@quiteer/parser-config": "^1.0.3",
-    "cac": "^6.7.14",
-    "dotenv": "^16.0.3",
-    "electron-builder": "^23.6.0",
-    "fs-extra": "^10.1.0",
-    "inquirer": "8.2.5",
-    "portfinder": "^1.0.32",
-    "rimraf": "^3.0.2",
-    "tsup": "^6.7.0",
-    "typescript": "^5.0.4",
-    "vite": "^4.4.9",
-    "yaml": "^2.2.1"
-  }
-}
+pnpm add electronup -D
 ```
 
-### cli配置项
-
-```ts
-import type { Configuration } from 'electron-builder'
-import type { AliasOptions, PluginOption, ResolveOptions, UserConfig } from 'vite'
-import type { Options } from 'tsup'
-
-interface ViteConfig {
-  resolve?: ResolveOptions & {
-    alias?: AliasOptions
-  }
-  plugins?: PluginOption[]
-  viteOptions?: Omit<UserConfig, 'plugins' | 'resolve' | 'publicDir'>
-}
-
-interface TsupConfig {
-  entry?: string[] | Record<string, string>
-  target?: string | string[]
-  minify?: boolean
-  external?: (string | RegExp)[]
-  noExternal?: (string | RegExp)[]
-}
-
-interface BuilderConfig extends Configuration { }
-
-interface ElectronupConfig {
-  viteConfig?: ViteConfig
-  tsupConfig?: TsupConfig
-  preloadTsup?: Options | Options[]
-  builderConfig: BuilderConfig
-
-  /**
-   * 渲染进程入口目录
-   * @default 'render'
-   */
-  renderDir?: string
-
-  /**
-   * 主进程入口目录
-   * @default 'main'
-   */
-  mainDir?: string
-
-  /**
-  * 静态资源目录
-  * @default 'public'
-  */
-  publicDir?: string
-
-  /**
-  * 动态库目录
-  * @default 'lib'
-  */
-  libDir?: string
-
-  /**
-  * 资源构建输出目录
-  * @default 'dist/resource'
-  */
-  resourceDir?: string
-
-  /**
-   * electron-builder 输出目录
-   * @default 'dist/out'
-   */
-  outDir?: string
-}
-
-interface ConfigEnv {
-  command: 'build' | 'serve'
-  root: string
-}
-
-type ElectronupConfigFn = (env: ConfigEnv) => ElectronupConfig
-type UserElectronupConfig = ElectronupConfig | ElectronupConfigFn
-
-declare const defineConfig: (config: UserElectronupConfig) => UserElectronupConfig
-
-export { BuilderConfig, ConfigEnv, ElectronupConfig, TsupConfig, ViteConfig, defineConfig }
-```
-
-#### 获取类型提示
-
-引入导出的 api 即可获取类型提示
-
-## 环境变量配置
-
-根目录下的 `.env` 文件在任何环境下都会注入到业务代码中
-
-### command
-
-目前 `command` 命令仅支持 `dev` 及 `build`
+## 特性
 
-`dev` 指令下向 `process.env` 中注入 `NODE_ENV` 字段 为 `develpoment`
+- **多框架支持** : 使用 `create-electronup` 询问式创建项目模板 , 内置 `vue3` ， `react` ，`solid` 等项目模板。
+- **Vite + tsup** : 双进程热更新 , 快速开发(主进程代码修改会触发软件重启)。
+- **统一的环境变量** : `dotenv` 加载 , 构建时注入 , 双进程拥有相同的环境变量。
+- **模式构建** : 默认识别当前代码运行的平台输出打包程序 。
+- **可选构建功能提示** : 你将获得可选范围内支持的功能提示 , 选项式自定义构建输出。
+- **TypeScript** : 应用程序级 `JavaScript` 的语言。
+- **集中管理路径** : 解决双进程资源路径的问题。
+- **预置配置** : 内置了很多可以覆盖的构建工具配置。
+- **单文件配置** : 只需一个 **electronup.config.ts** 即可管理项目的运行构建。
+- **多插件** : 作者会继续开发更多无副作用的独立插件，如：创建窗口，预加载，ipc通信，更新等等。
 
-`build` 指令下向 `process.env` 中注入 `NODE_ENV` 字段 为 `production`
+## 声明
 
-双进程下区分环境略有不同 ， 主进程代码中直接访问  `process.env` 上的  `NODE_ENV` 即可，渲染进程中访问 `vite` 提供的 `import.meta.env` 获取
+前提条件
+> 熟悉命令行
+> 已安装 16.0 或更高版本的 Node.js
 
-```typescript
-// main.ts
-// dev
-console.log('NODE_ENV', process.env.NODE_ENV)  // NODE_ENV development
 
-// build
-console.log('NODE_ENV', process.env.NODE_ENV)  // NODE_ENV production
-```
-
-```typescript
-// render.ts
-// dev
-console.log('isDev', import.meta.env.DEV)  // isDev true
-
-// build
-console.log('isDev', import.meta.env.DEV)  // isDev fasle
-```
-
-
-
-### mode
-
-通过添加命令行指令 `-m xxx | -mode xxx` 指定加载环境变量文件以满足不同环境下的不同环境变量。
-
-`mode` 指令传入的 `mode` 字符串需与根目录下的 `env` 文件一致。 规则如下
-
-```shell
-electronup -m test
-```
-
-命令行运行后根据 `mode` 参数加载根目录下的 `.env.test` 环境变量文件
-
-即 `electronup -m test`
-
-`.env`
-
-`.env.test`
-
- 不传 mode 参数，默认根据环境区分加载环境变量。
-
-`electronup dev`
-
-`.env`
-
-`.env.devlepoment`
-
-`electronup build`
-
-`.env`
-
-`.env.production`
-
-当然也可通过传入 mode 参数使 dev 环境加载 production 的环境变量。
-
-`electronup dev -m production`
-
-
-
-#### 文件命名
-
-`.env`
-
-`.env.development`
-
-`.env.production`
-
-`.env.test`
-
-`.env.staging`
-
-
-
-### 预置配置
-
-可自定义配置覆盖默认配置。
-
-#### vite
-
-- `base` :  `./`
-
-- `mode` :  `development` | `production`
-
-- `root` :  `render`
-
-- `publicDir` :  `public`
-
-- `server` :  `{ host: '0.0.0.0' }`
-
-- `build` :
-
-```ts
-{
-  outDir: 'dist',
-  target: 'esnext',
-  minify: true,
-  reportCompressedSize: false,
-  emptyOutDir: true
-}
- ```
-
-所有选项皆可通过 `viteOptions` 覆盖
-
-#### tsup配置选项
-
-- `external` :  `['electorn']`
-- `target` :  `node14`
-- `noExternal` :  `[]`
-
-##### 路径别名
-
-直接在项目中配置 `tsconfig.json` 的 `paths` 选项即可在主进程代码中使用路径别名。
-
-#### electron-builder
-
-可全部覆盖，默认配置如下：
-
-```typescript
-{
-  asar: true,
-  appId: 'org.quiteer.electronup',
-  productName: packages.name,
-  protocols: {
-    name: packages.name,
-    schemes: ['deeplink']
-  },
-  nsis: {
-    oneClick: false,
-    language: '2052',
-    perMachine: true,
-    allowElevation: true,
-    allowToChangeInstallationDirectory: true,
-    runAfterFinish: true,
-    createDesktopShortcut: true,
-    createStartMenuShortcut: true,
-    artifactName: `${packages.name} \${arch} Setup ${packages.version}.\${ext}`
-  },
-  files: [`${allConfig.resourceDir || DefaultDirs.resourceDir}/**/*`],
-  extraFiles: [allConfig.libDir || DefaultDirs.libDir],
-  directories: {
-    output: allConfig.outDir || config.directories?.output || DefaultDirs.outDir
-  },
-  // ...传入同名参数即可完成覆盖
-}
-```
+因为使用了 tsup 构建主进程代码，所以该命令行及脚手架只支持 TypeScript ，不支持 JavaScript。
 
 ## 示例
 
-> https://github.com/TaiAiAc/electron-quiet-monorepo/tree/main/experiment/electronup-test
+> https://github.com/QuiteerJs/electronup/tree/main/playground/electronup-test

package/dist/bin/electronup.js

@@ -29,7 +29,7 @@ var import_node_fs = __toESM(require("fs"));
 var import_cac = require("cac");
 
 // package.json
-var version = "0.0.8";
+var version = "0.1.0";
 
 // transform/getConfig.ts
 var import_path = require("path");
@@ -48,11 +48,6 @@ var Store = class _Store {
   win;
   mac;
   linux;
-  ia32;
-  x64;
-  arm64;
-  armv7l;
-  universal;
   dir;
   asar;
   targets;
@@ -108,44 +103,33 @@ var import_path2 = require("path");
 var import_fs_extra2 = require("fs-extra");
 async function getBuilderConfig(config, allConfig) {
   const packages = await (0, import_fs_extra2.readJSON)((0, import_path2.resolve)(store.root, "package.json"));
-  const outConfig = {
-    targets: store.targets,
-    x64: store.x64,
-    ia32: store.ia32,
-    armv7l: store.armv7l,
-    arm64: store.arm64,
-    universal: store.universal,
-    dir: store.dir
-  };
   const defaultConfig = {
-    config: {
-      asar: store.asar,
-      appId: "org.quiteer.electronup",
-      productName: packages.name,
-      protocols: {
-        name: packages.name,
-        schemes: ["deeplink"]
-      },
-      nsis: {
-        oneClick: false,
-        language: "2052",
-        perMachine: true,
-        allowElevation: true,
-        allowToChangeInstallationDirectory: true,
-        runAfterFinish: true,
-        createDesktopShortcut: true,
-        createStartMenuShortcut: true,
-        artifactName: `${packages.name} \${arch} Setup ${packages.version}.\${ext}`
-      },
-      files: [`${allConfig.resourceDir || "dist/resource" /* resourceDir */}/**/*`],
-      extraFiles: [allConfig.libDir || "lib" /* libDir */],
-      directories: {
-        output: allConfig.outDir || config.directories?.output || "dist/out" /* outDir */
-      },
-      ...config
-    }
+    asar: store.asar,
+    appId: "org.quiteer.electronup",
+    productName: packages.name,
+    protocols: {
+      name: packages.name,
+      schemes: ["deeplink"]
+    },
+    nsis: {
+      oneClick: false,
+      language: "2052",
+      perMachine: true,
+      allowElevation: true,
+      allowToChangeInstallationDirectory: true,
+      runAfterFinish: true,
+      createDesktopShortcut: true,
+      createStartMenuShortcut: true,
+      artifactName: `${packages.name} \${arch} Setup ${packages.version}.\${ext}`
+    },
+    files: [`${allConfig.resourceDir || "dist/resource" /* resourceDir */}/**/*`],
+    extraFiles: [allConfig.libDir || "lib" /* libDir */],
+    directories: {
+      output: allConfig.outDir || config.directories?.output || "dist/out" /* outDir */
+    },
+    ...config
   };
-  return { ...defaultConfig, ...outConfig };
+  return { targets: store.targets, config: defaultConfig };
 }
 
 // configs/tsup.ts
@@ -300,109 +284,170 @@ var import_path5 = __toESM(require("path"));
 var import_electron_builder = require("electron-builder");
 var import_vite3 = require("vite");
 var import_tsup3 = require("tsup");
-var import_inquirer = __toESM(require("inquirer"));
+var import_prompts = __toESM(require("prompts"));
+var import_kolorist = require("kolorist");
 var import_yaml = require("yaml");
 var import_fs_extra3 = require("fs-extra");
+var platformSelect = [
+  {
+    name: "Windows",
+    platform: "win32",
+    createTarget: (archs) => {
+      if (archs.length)
+        return import_electron_builder.Platform.WINDOWS.createTarget(store.dir, ...archs);
+      return import_electron_builder.Platform.WINDOWS.createTarget(store.dir, import_electron_builder.Arch.ia32, import_electron_builder.Arch.x64);
+    },
+    color: import_kolorist.blue,
+    disabled: !(store.isMac || store.isWin),
+    archs: [{
+      name: "x64",
+      arch: import_electron_builder.Arch.x64,
+      disabled: store.currentArch === "ia32",
+      color: import_kolorist.blue
+    }, {
+      name: "ia32",
+      arch: import_electron_builder.Arch.ia32,
+      color: import_kolorist.blue,
+      disabled: false
+    }]
+  },
+  {
+    name: "MacOS",
+    platform: "darwin",
+    createTarget: (archs) => {
+      if (archs.length)
+        return import_electron_builder.Platform.MAC.createTarget(store.dir, import_electron_builder.Arch[store.currentArch]);
+      return import_electron_builder.Platform.MAC.createTarget(store.dir, ...archs);
+    },
+    disabled: !store.isMac,
+    color: import_kolorist.green,
+    archs: [{
+      name: "x64",
+      arch: import_electron_builder.Arch.x64,
+      disabled: false,
+      color: import_kolorist.green
+    }, {
+      name: "arm64",
+      arch: import_electron_builder.Arch.arm64,
+      disabled: false,
+      color: import_kolorist.green
+    }, {
+      name: "universal",
+      arch: import_electron_builder.Arch.universal,
+      disabled: false,
+      color: import_kolorist.green
+    }]
+  },
+  {
+    name: "Linux",
+    platform: "linux",
+    disabled: !(store.isMac || store.isLinux),
+    createTarget: (archs) => {
+      if (archs.length)
+        return import_electron_builder.Platform.LINUX.createTarget(store.dir, import_electron_builder.Arch[store.currentArch]);
+      return import_electron_builder.Platform.LINUX.createTarget(store.dir, ...archs);
+    },
+    color: import_kolorist.yellow,
+    archs: [{
+      name: "x64",
+      arch: import_electron_builder.Arch.x64,
+      disabled: false,
+      color: import_kolorist.yellow
+    }, {
+      name: "arm64",
+      arch: import_electron_builder.Arch.arm64,
+      disabled: false,
+      color: import_kolorist.yellow
+    }, {
+      name: "armv7l",
+      arch: import_electron_builder.Arch.armv7l,
+      disabled: false,
+      color: import_kolorist.yellow
+    }]
+  }
+];
 async function build2(options) {
   if (store.option) {
-    const { isMinify } = await import_inquirer.default.prompt([{ type: "confirm", name: "isMinify", message: "\u662F\u5426\u538B\u7F29\u4EE3\u7801?" }]).catch((err) => {
-      console.error("err: ", err);
+    let result;
+    try {
+      result = await (0, import_prompts.default)([
+        {
+          type: "confirm",
+          name: "isMinify",
+          message: (0, import_kolorist.green)("\u662F\u5426\u538B\u7F29\u4EE3\u7801?")
+        },
+        {
+          type: "confirm",
+          name: "isPackage",
+          message: (0, import_kolorist.blue)("\u662F\u5426\u751F\u6210\u5B89\u88C5\u5305?")
+        },
+        {
+          type: "select",
+          name: "platform",
+          message: "\u8BF7\u9009\u62E9\u6784\u5EFA\u6A21\u5F0F ~",
+          choices: platformSelect.map((item) => ({ title: item.color(item.name), value: item, disabled: item.disabled }))
+        },
+        {
+          type: "multiselect",
+          name: "arch",
+          message: "\u8BF7\u9009\u62E9\u6253\u5305\u67B6\u6784\uFF5E",
+          choices: (platformSelect2) => {
+            return platformSelect2.archs?.map((item) => ({ title: item.color(item.name), value: item.arch, disabled: item.disabled }));
+          }
+        }
+      ], {
+        onCancel: () => {
+          throw new Error(`${(0, import_kolorist.red)("\u2716")} Operation cancelled`);
+        }
+      });
+    } catch (cancelled) {
+      console.error("err: ", cancelled.message);
       process.exit(1);
-    });
+    }
+    const { isMinify, isPackage, platform, arch } = result;
+    console.log("isMinify: ", isMinify);
+    console.log("isPackage: ", isPackage);
+    console.log("platform: ", platform);
+    console.log("arch: ", arch);
     store.minify = isMinify;
-    const { isPackage } = await import_inquirer.default.prompt([{ type: "confirm", name: "isPackage", message: "\u662F\u5426\u751F\u6210\u5B89\u88C5\u5305?" }]).catch((err) => {
-      console.error("err: ", err);
-      process.exit(1);
-    });
-    store.dir = !isPackage;
+    store.dir = isPackage ? null : "dir";
+    store.targets = platform.createTarget(arch);
+  } else {
     if (store.isWin) {
-      if (store.currentArch === "ia32")
-        store.ia32 = true;
-      if (store.currentArch === "x64") {
-        const { pattern } = await import_inquirer.default.prompt([
-          {
-            type: "checkbox",
-            name: "pattern",
-            message: "\u8BF7\u9009\u62E9\u6784\u5EFA\u6A21\u5F0F , \u8DF3\u8FC7\u9009\u62E9\u4E3A\u5F53\u524D\u64CD\u4F5C\u7CFB\u7EDF\u5E73\u53F0 ~",
-            pageSize: 10,
-            choices: [
-              { name: "win-x64", value: "x64" },
-              { name: "win-ia32", value: "ia32" }
-            ]
-          }
-        ]).catch((err) => {
-          console.error("err: ", err);
-          process.exit(1);
-        });
-        if (pattern.length) {
-          pattern.forEach((arch) => {
-            store[arch] = true;
-          });
-        }
-      }
-      store.dir = !isPackage;
+      if (store.win === "ia32")
+        store.targets = import_electron_builder.Platform.WINDOWS.createTarget(store.dir, import_electron_builder.Arch.ia32);
+      else if (store.win === "x64")
+        store.targets = import_electron_builder.Platform.WINDOWS.createTarget(store.dir, import_electron_builder.Arch.x64);
+      else
+        store.targets = import_electron_builder.Platform.WINDOWS.createTarget(store.dir, import_electron_builder.Arch[store.currentArch]);
     }
     if (store.isMac) {
-      const { outPlatform } = await import_inquirer.default.prompt([
-        {
-          type: "list",
-          name: "outPlatform",
-          message: "\u8BF7\u9009\u62E9\u6784\u5EFA\u5E73\u53F0 , \u8DF3\u8FC7\u9009\u62E9\u4E3A\u5F53\u524D\u64CD\u4F5C\u7CFB\u7EDF\u5E73\u53F0 ~",
-          pageSize: 10,
-          choices: [
-            { name: "win", value: "win" },
-            { name: "mac", value: "mac" },
-            { name: "linux", value: "linux" }
-          ]
-        }
-      ]).catch((err) => {
-        console.error("err: ", err);
-        process.exit(1);
-      });
-      if (outPlatform === "mac") {
-        const { pattern } = await import_inquirer.default.prompt([
-          {
-            type: "checkbox",
-            name: "pattern",
-            message: "\u8BF7\u9009\u62E9\u6784\u5EFA\u6A21\u5F0F , \u8DF3\u8FC7\u9009\u62E9\u4E3A\u5F53\u524D\u64CD\u4F5C\u7CFB\u7EDF\u5E73\u53F0 ~",
-            pageSize: 10,
-            choices: [
-              { name: "mac-x64", value: import_electron_builder.Arch.x64 },
-              { name: "mac-arm64", value: import_electron_builder.Arch.arm64 }
-            ]
-          }
-        ]).catch((err) => {
-          console.error("err: ", err);
-          process.exit(1);
-        });
-        const archList = [];
-        pattern.length ? archList.push(...pattern) : archList.push(import_electron_builder.Arch[store.currentArch]);
-        store.targets = import_electron_builder.Platform.MAC.createTarget(!isPackage ? "dir" : null, ...archList);
+      if (store.win) {
+        if (store.win === "ia32")
+          store.targets = import_electron_builder.Platform.WINDOWS.createTarget(store.dir, import_electron_builder.Arch.ia32);
+        else if (store.win === "x64")
+          store.targets = import_electron_builder.Platform.WINDOWS.createTarget(store.dir, import_electron_builder.Arch.x64);
+        else
+          store.targets = import_electron_builder.Platform.WINDOWS.createTarget(store.dir, import_electron_builder.Arch[store.currentArch]);
+      } else if (store.mac) {
+        if (store.mac === "x64")
+          store.targets = import_electron_builder.Platform.MAC.createTarget(store.dir, import_electron_builder.Arch.x64);
+        else if (store.mac === "arm64")
+          store.targets = import_electron_builder.Platform.MAC.createTarget(store.dir, import_electron_builder.Arch.arm64);
+        else if (store.mac === "universal")
+          store.targets = import_electron_builder.Platform.MAC.createTarget(store.dir, import_electron_builder.Arch.universal);
+        else
+          store.targets = import_electron_builder.Platform.MAC.createTarget(store.dir, import_electron_builder.Arch[store.currentArch]);
+      } else if (store.linux) {
+        if (store.linux === true)
+          store.targets = import_electron_builder.Platform.LINUX.createTarget(store.dir);
+        else
+          store.targets = import_electron_builder.Platform.LINUX.createTarget(store.dir, import_electron_builder.Arch[store.currentArch]);
+      } else {
+        store.targets = import_electron_builder.Platform.MAC.createTarget(store.dir, import_electron_builder.Arch[store.currentArch]);
       }
-      if (outPlatform === "win") {
-        const { pattern } = await import_inquirer.default.prompt([
-          {
-            type: "checkbox",
-            name: "pattern",
-            message: "\u8BF7\u9009\u62E9\u6784\u5EFA\u6A21\u5F0F , \u8DF3\u8FC7\u9009\u62E9\u4E3A\u5F53\u524D\u64CD\u4F5C\u7CFB\u7EDF\u5E73\u53F0 ~",
-            pageSize: 10,
-            choices: [
-              { name: "win-x64", value: import_electron_builder.Arch.x64 },
-              { name: "win-ia32", value: import_electron_builder.Arch.ia32 }
-            ]
-          }
-        ]).catch((err) => {
-          console.error("err: ", err);
-          process.exit(1);
-        });
-        const archList = [];
-        pattern.length ? archList.push(...pattern) : archList.push(import_electron_builder.Arch.x64);
-        store.targets = import_electron_builder.Platform.WINDOWS.createTarget(!isPackage ? "dir" : null, ...archList);
-      }
-      if (outPlatform === "linux")
-        store.targets = import_electron_builder.Platform.LINUX.createTarget(!isPackage ? "dir" : null, import_electron_builder.Arch.armv7l);
-    }
-    if (store.isLinux) {
+    } else if (store.isLinux) {
+      store.targets = import_electron_builder.Platform.LINUX.createTarget(store.dir, import_electron_builder.Arch.armv7l);
     }
   }
   const initConfig = await electronupConfig(options);
@@ -418,19 +463,18 @@ async function build2(options) {
 // cli.ts
 var cli = (0, import_cac.cac)("electronup");
 cli.option("-m , --mode <mode>", "[development | production | test | staging | ...] \u73AF\u5883\u6A21\u5F0F ");
-cli.option("--no-minify", "\u4F7F\u4E3B\u8FDB\u7A0B\u548C\u6E32\u67D3\u8FDB\u7A0B\u4EE3\u7801\u538B\u7F29 ");
-cli.command("[config-file]", "start dev server").alias("dev").option("-p , --port <port>", "[number] \u6E32\u67D3\u8FDB\u7A0B\u7684\u7AEF\u53E3\u53F7 \uFF0C\u5982\u679C\u5360\u7528\u4F1A\u5207\u6362\u975E\u5360\u7528\u7684\u7AEF\u53E3 ").action(async (configFile, options) => {
+cli.option("--no-minify", "\u4F7F\u4E3B\u8FDB\u7A0B\u548C\u6E32\u67D3\u8FDB\u7A0B\u4EE3\u7801\u4E0D\u8FDB\u884C\u538B\u7F29 ");
+cli.command("[config-file]", "\u7B49\u540C\u4E8Eelectronup dev ,\u542F\u52A8\u5F00\u53D1\u73AF\u5883\u70ED\u66F4\u65B0").alias("dev").option("-p , --port <port>", "[number] \u6E32\u67D3\u8FDB\u7A0B\u7684\u7AEF\u53E3\u53F7 \uFF0C\u5982\u679C\u5360\u7528\u4F1A\u5207\u6362\u975E\u5360\u7528\u7684\u7AEF\u53E3 ").action(async (configFile, options) => {
   const { mode, port, minify } = options;
   const option = await getConfig(configFile);
   emptyDir((0, import_node_path.resolve)(store.root, option.resourceDir || "dist/resource" /* resourceDir */));
-  emptyDir((0, import_node_path.resolve)(store.root, option.outDir || "dist/out" /* outDir */));
   store.command = "serve";
   store.mode = mode || "development";
   store.port = port || 8090;
   store.minify = !!minify;
   watch(option);
 });
-cli.command("build [root]", "\u6784\u5EFA").option("-o , --option", "\u81EA\u5B9A\u4E49 , \u81EA\u5B9A\u4E49\u6784\u5EFA\u9009\u9879 ").option("--dir", "\u53EA\u751F\u6210\u76EE\u5F55").option("--no-asar", "asar false").option("--win", " \u6784\u5EFA win \u5E73\u53F0\u4E0B\u7684\u8F93\u51FA\u5305").option("--mac", " \u6784\u5EFA mac \u5E73\u53F0\u4E0B\u7684\u8F93\u51FA\u5305").option("--linux", " \u6784\u5EFA linux \u5E73\u53F0\u4E0B\u7684\u8F93\u51FA\u5305").option("--ia32", " \u6784\u5EFA ia32 \u67B6\u6784").option("--x64", " \u6784\u5EFA x64 \u67B6\u6784").option("--arm64", " \u6784\u5EFA arm64 \u67B6\u6784").option("--armv7l", " \u6784\u5EFA armv7l \u67B6\u6784").option("--universal", " \u6784\u5EFA universal \u5E73\u53F0\u5305").action(async (configFile, options) => {
+cli.command("build [root]", "\u5F00\u59CB\u6784\u5EFA\u670D\u52A1 , \u82E5\u4E0D\u6307\u5B9A\u5E73\u53F0\u5219\u9ED8\u8BA4\u5F53\u524D\u64CD\u4F5C\u7CFB\u7EDF\u7684\u67B6\u6784\u7C7B\u578B").option("-o , --option", "\u81EA\u5B9A\u4E49 , \u81EA\u5B9A\u4E49\u6784\u5EFA\u9009\u9879 ").option("--dir", "\u53EA\u751F\u6210\u76EE\u5F55").option("--no-asar", "asar false").option("--win [arch]", "[ia32 | x64] \u6784\u5EFA win \u5E73\u53F0\u4E0B\u7684\u8F93\u51FA\u5305 , \u4E0D\u6307\u5B9A\u67B6\u6784\u5219\u8F93\u51FA ia32 \u548C x64\u7684\u4E24\u4E2A\u5305").option("--mac [arch]", "[x64 | arm64 | universal] \u6784\u5EFA mac \u5E73\u53F0\u4E0B\u7684\u8F93\u51FA\u5305 , \u82E5\u4E0D\u6307\u5B9A\u67B6\u6784\u5219\u9ED8\u8BA4\u5F53\u524D\u64CD\u4F5C\u7CFB\u7EDF\u7684\u67B6\u6784\u7C7B\u578B").option("--linux", "[x64 | arm64 | armv7l] \u6784\u5EFA linux \u5E73\u53F0\u4E0B\u7684\u8F93\u51FA\u5305 , \u82E5\u4E0D\u6307\u5B9A\u67B6\u6784\u5219\u9ED8\u8BA4\u5F53\u524D\u64CD\u4F5C\u7CFB\u7EDF\u7684\u67B6\u6784\u7C7B\u578B").action(async (configFile, options) => {
   const {
     mode,
     minify,
@@ -438,11 +482,6 @@ cli.command("build [root]", "\u6784\u5EFA").option("-o , --option", "\u81EA\u5B9
     win,
     mac,
     linux,
-    ia32,
-    x64,
-    arm64,
-    armv7l,
-    universal,
     dir,
     asar
   } = options;
@@ -453,16 +492,11 @@ cli.command("build [root]", "\u6784\u5EFA").option("-o , --option", "\u81EA\u5B9
   store.mode = mode || "production";
   store.minify = minify;
   store.option = !!option;
-  store.dir = !!dir;
+  store.dir = dir ? "dir" : null;
   store.asar = asar;
-  store.win = !!win;
-  store.mac = !!mac;
-  store.linux = !!linux;
-  store.ia32 = !!ia32;
-  store.x64 = !!x64;
-  store.arm64 = !!arm64;
-  store.armv7l = !!armv7l;
-  store.universal = !!universal;
+  store.win = win;
+  store.mac = mac;
+  store.linux = linux;
   build2(configOption);
 });
 cli.help();

package/dist/client/index.d.mts

@@ -59,13 +59,20 @@ interface ConfigEnv {
   root: string
 }
 
-type ElectronupConfigFnObject = (env: ConfigEnv) => ElectronupConfig;
-type ElectronupConfigFnPromise = (env: ConfigEnv) => Promise<ElectronupConfig>;
-type ElectronupConfigFn = (env: ConfigEnv) => ElectronupConfig | Promise<ElectronupConfig>;
-type ElectronupConfigExport = ElectronupConfig | Promise<ElectronupConfig> | ElectronupConfigFnObject | ElectronupConfigFnPromise | ElectronupConfigFn;
+type ElectronupConfigFnObject = (env: ConfigEnv) => ElectronupConfig
+type ElectronupConfigFnPromise = (env: ConfigEnv) => Promise<ElectronupConfig>
+type ElectronupConfigFn = (env: ConfigEnv) => ElectronupConfig | Promise<ElectronupConfig>
+
+type ElectronupConfigExport =
+  | ElectronupConfig
+  | Promise<ElectronupConfig>
+  | ElectronupConfigFnObject
+  | ElectronupConfigFnPromise
+  | ElectronupConfigFn
+
 declare function defineConfig(config: ElectronupConfig): ElectronupConfig;
 declare function defineConfig(config: Promise<ElectronupConfig>): Promise<ElectronupConfig>;
 declare function defineConfig(config: ElectronupConfigFnObject): ElectronupConfigFnObject;
 declare function defineConfig(config: ElectronupConfigExport): ElectronupConfigExport;
 
-export { BuilderConfig, ConfigEnv, ElectronupConfig, ElectronupConfigExport, ElectronupConfigFn, ElectronupConfigFnObject, ElectronupConfigFnPromise, TsupConfig, ViteConfig, defineConfig };
+export { BuilderConfig, ConfigEnv, ElectronupConfig, TsupConfig, ViteConfig, defineConfig };

package/dist/client/index.d.ts

@@ -59,13 +59,20 @@ interface ConfigEnv {
   root: string
 }
 
-type ElectronupConfigFnObject = (env: ConfigEnv) => ElectronupConfig;
-type ElectronupConfigFnPromise = (env: ConfigEnv) => Promise<ElectronupConfig>;
-type ElectronupConfigFn = (env: ConfigEnv) => ElectronupConfig | Promise<ElectronupConfig>;
-type ElectronupConfigExport = ElectronupConfig | Promise<ElectronupConfig> | ElectronupConfigFnObject | ElectronupConfigFnPromise | ElectronupConfigFn;
+type ElectronupConfigFnObject = (env: ConfigEnv) => ElectronupConfig
+type ElectronupConfigFnPromise = (env: ConfigEnv) => Promise<ElectronupConfig>
+type ElectronupConfigFn = (env: ConfigEnv) => ElectronupConfig | Promise<ElectronupConfig>
+
+type ElectronupConfigExport =
+  | ElectronupConfig
+  | Promise<ElectronupConfig>
+  | ElectronupConfigFnObject
+  | ElectronupConfigFnPromise
+  | ElectronupConfigFn
+
 declare function defineConfig(config: ElectronupConfig): ElectronupConfig;
 declare function defineConfig(config: Promise<ElectronupConfig>): Promise<ElectronupConfig>;
 declare function defineConfig(config: ElectronupConfigFnObject): ElectronupConfigFnObject;
 declare function defineConfig(config: ElectronupConfigExport): ElectronupConfigExport;
 
-export { BuilderConfig, ConfigEnv, ElectronupConfig, ElectronupConfigExport, ElectronupConfigFn, ElectronupConfigFnObject, ElectronupConfigFnPromise, TsupConfig, ViteConfig, defineConfig };
+export { BuilderConfig, ConfigEnv, ElectronupConfig, TsupConfig, ViteConfig, defineConfig };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electronup",
-  "version": "0.0.8",
+  "version": "0.1.0",
   "description": "融合构建 electron 应用需要的构建工具,保留原有配置习惯的命令行工具 ",
   "author": "quiteer",
   "license": "MIT",
@@ -43,18 +43,18 @@
   },
   "dependencies": {
     "@quiteer/parser-config": "^1.0.3",
+    "@types/prompts": "^2.4.4",
     "cac": "^6.7.14",
     "dotenv": "^16.3.1",
-    "electron": "^21.2.2",
-    "electron-builder": "^24.6.3",
-    "fs-extra": "^11.1.1",
-    "inquirer": "^9.2.10",
+    "electron": "^22.3.6",
+    "electron-builder": "^24.9.1",
+    "fs-extra": "^11.2.0",
+    "kolorist": "^1.8.0",
     "portfinder": "^1.0.32",
+    "prompts": "^2.4.2",
     "tsup": "^7.2.0",
-    "vite": "^4.4.9",
-    "yaml": "^2.3.1"
+    "vite": "^4.5.1",
+    "yaml": "^2.3.4"
   },
-  "devDependencies": {
-    "@types/inquirer": "^9.0.3"
-  }
+  "devDependencies": { }
 }