@tomjs/vite-plugin-electron 1.1.2 → 1.2.1

package/README.md

@@ -6,6 +6,8 @@
 
 > A Simple [vite](https://vitejs.dev/) plugin for [electron](https://www.electronjs.org), supports `esm` and `cjs`.
 
+I learned [caoxiemeihao](https://github.com/caoxiemeihao)'s [vite-plugin-electron](https://github.com/electron-vite/vite-plugin-electron) and [Doubleshotjs](https://github.com/Doubleshotjs)'s [doubleshot](https://github.com/Doubleshotjs/doubleshot) These two excellent works, combined with some of my own ideas, developed this plugin. I hope that using it can simplify the development configuration and only focus on business development.
+
 ## Features
 
 - Fast build `main` and `preload` with [tsup](https://github.com/egoist/tsup)
@@ -37,9 +39,11 @@ npm i @tomjs/vite-plugin-electron --save-dev
 
 ## Usage
 
-### Project structure
+### Recommended Agreement
+
+#### Directory Structure
 
-- Recommended `electron` front-end code directory structure
+- Recommend `electron` and page `src` code directory structure
 
 ```
 |--electron
@@ -52,7 +56,7 @@ npm i @tomjs/vite-plugin-electron --save-dev
 |  |--main.ts
 ```
 
-- Use the default dist output directory of the plugin
+- Zero configuration, default dist output directory
 
 ```
 |--dist
@@ -66,6 +70,10 @@ npm i @tomjs/vite-plugin-electron --save-dev
 |  |  |--index.html
 ```
 
+#### Default configuration and behavior
+
+See [PluginOptions](#pluginoptions) and `recommended` parameter descriptions in detail
+
 ### electron
 
 `electron/main/index.ts`
@@ -105,10 +113,12 @@ app.whenReady().then(createWindow);
 
 ### vue
 
-Support `ES modules`
+Take using `esm` as an example, but it requires Electron>=28
 
 - `package.json`
 
+Electron preload must use the `mjs` suffix, otherwise an error will be reported. So `esm` also uses the `mjs` suffix for output by default.
+
 ```json
 {
   "type": "module",
@@ -126,14 +136,17 @@ import vue from '@vitejs/plugin-vue';
 export default defineConfig({
   plugins: [
     vue(),
-    electron({
-      main: {
-        entry: 'electron/main/index.ts',
-      },
-      preload: {
-        entry: 'electron/preload/index.ts',
-      },
-    }),
+    // If you use the agreed directory structure, no configuration is required
+    electron(),
+    // If the directory structure is customized, the value must be assigned according to the actual situation
+    // electron({
+    //   main: {
+    //     entry: 'electron/main/index.ts',
+    //   },
+    //   preload: {
+    //     entry: 'electron/preload/index.ts',
+    //   },
+    // }),
     // renderer(),
   ],
 });
@@ -141,7 +154,7 @@ export default defineConfig({
 
 ### react
 
-Support `CommonJS`
+Take using `cjs` as an example
 
 - `package.json`
 
@@ -156,23 +169,11 @@ Support `CommonJS`
 
 ```ts
 import { defineConfig } from 'vite';
-// import renderer from 'vite-plugin-electron-renderer'; // Enable nodeIntegration
 import electron from '@tomjs/vite-plugin-electron';
 import react from '@vitejs/plugin-react-swc';
 
 export default defineConfig({
-  plugins: [
-    react(),
-    electron({
-      main: {
-        entry: 'electron/main/index.ts',
-      },
-      preload: {
-        entry: 'electron/preload/index.ts',
-      },
-    }),
-    // renderer(),
-  ],
+  plugins: [react(), electron()],
 });
 ```
 
@@ -193,6 +194,14 @@ export default defineConfig({
 | preload | [PreloadOptions](#PreloadOptions) |  | Configuration options for the electron preload process. |
 | inspect | `boolean` | true | If set to true, electron will start with the `--inspect` flag. |
 
+**Notice**
+
+The `recommended` option is used to set the default configuration and behavior, which can be used with almost zero configuration. The default is `true`. If you want to customize the configuration, set it to `false`. The following default prerequisites are to use the recommended [project structure](#directory-structure).
+
+- Check whether `electron/main/index.ts` and `electron/main/index.ts` exist, and if so, assign values to `main.entry` and `preload.entry` respectively. If it does not exist, `main.entry` must be actively assigned, and an error will be reported.
+- The output directory is based on the `build.outDir` parameter of `vite`, and outputs `electron/main`, `electron/preload` and `src` to `dist/main`, `dist/preload` and `dist/renderer` respectively.
+- Other behaviors to be implemented
+
 ### MainOptions
 
 Based on [Options](https://paka.dev/npm/tsup) of [tsup](https://tsup.egoist.dev/), some default values are added for ease of use.

package/README.zh_CN.md

@@ -6,6 +6,8 @@
 
 > 一个简单的 [electron](https://www.electronjs.org/zh/) [vite](https://cn.vitejs.dev/) 插件，支持 `esm` 和 `cjs`
 
+学习了 [caoxiemeihao](https://github.com/caoxiemeihao) 的 [vite-plugin-electron](https://github.com/electron-vite/vite-plugin-electron) 和 [Doubleshotjs](https://github.com/Doubleshotjs) 的 [doubleshot](https://github.com/Doubleshotjs/doubleshot) 这两个优秀的作品，结合自己的一些想法，开发了该插件。希望使用它能简化开发配置，只关注业务开发。
+
 ## 特性
 
 - 使用 [tsup](https://github.com/egoist/tsup) 快速构建 `main` 和 `preload`
@@ -37,9 +39,11 @@ npm i @tomjs/vite-plugin-electron --save-dev
 
 ## 使用说明
 
-### 项目结构
+### 推荐约定
+
+#### 目录结构
 
-- 推荐 `electron` 的 前端代码目录结构
+- 推荐 `electron` 和 页面 `src` 代码目录结构
 
 ```
 |--electron
@@ -52,7 +56,7 @@ npm i @tomjs/vite-plugin-electron --save-dev
 |  |--main.ts
 ```
 
-- 使用插件默认 dist 输出目录
+- 零配置，默认 dist 输出目录
 
 ```
 |--dist
@@ -66,6 +70,10 @@ npm i @tomjs/vite-plugin-electron --save-dev
 |  |  |--index.html
 ```
 
+#### 默认配置和行为
+
+详细查看 [PluginOptions](#pluginoptions) 和 `recommended` 参数说明
+
 ### electron
 
 `electron/main/index.ts`
@@ -105,10 +113,12 @@ app.whenReady().then(createWindow);
 
 ### vue
 
-支持 `ES modules`
+以使用 `esm` 为例，不过要求 `Electron>=28`
 
 - `package.json`
 
+Electron preload 必须使用 `mjs` 后缀，否则报错。所以 `esm` 也默认输出使用 `mjs` 后缀。
+
 ```json
 {
   "type": "module",
@@ -127,14 +137,17 @@ import vue from '@vitejs/plugin-vue';
 export default defineConfig({
   plugins: [
     vue(),
-    electron({
-      main: {
-        entry: 'electron/main/index.ts',
-      },
-      preload: {
-        entry: 'electron/preload/index.ts',
-      },
-    }),
+    // 如使用约定的目录结构，则不需要配置
+    electron(),
+    // 如果自定义了目录结构，则必须根据实际情况赋值
+    // electron({
+    //   main: {
+    //     entry: 'electron/main/index.ts',
+    //   },
+    //   preload: {
+    //     entry: 'electron/preload/index.ts',
+    //   },
+    // }),
     // renderer(),
   ],
 });
@@ -142,7 +155,7 @@ export default defineConfig({
 
 ### react
 
-支持 `CommonJS`
+以使用 `cjs` 为例
 
 - `package.json`
 
@@ -157,23 +170,11 @@ export default defineConfig({
 
 ```ts
 import { defineConfig } from 'vite';
-// import renderer from 'vite-plugin-electron-renderer'; // 启用 nodeIntegration
 import electron from '@tomjs/vite-plugin-electron';
 import react from '@vitejs/plugin-react-swc';
 
 export default defineConfig({
-  plugins: [
-    react(),
-    electron({
-      main: {
-        entry: 'electron/main/index.ts',
-      },
-      preload: {
-        entry: 'electron/preload/index.ts',
-      },
-    }),
-    // renderer(),
-  ],
+  plugins: [react(), electron()],
 });
 ```
 
@@ -190,10 +191,16 @@ export default defineConfig({
 | --- | --- | --- | --- |
 | recommended | `boolean` | `true` | 推荐开关，如果为true，将具有以下默认行为：将main/preload/renderer的outDir更改为并行的outDir；例如，如果vite build.outDir为'dist'，将main/preload/render更改为'dist/main'、'dist/preload'和'dist/renderer' |
 | external | `string[]` |  | 不打包这些模块 |
-| **main** | [MainOptions](#MainOptions) |  | electron main 进程选项 |
+| main | [MainOptions](#MainOptions) |  | electron main 进程选项 |
 | preload | [PreloadOptions](#PreloadOptions) |  | electron preload 进程选项 |
 | inspect | `boolean` | `true` | electron启动时使用`--inspect`参数 |
 
+`recommended` 选项用于设置默认配置和行为，几乎可以达到零配置使用，默认为 `true` 。如果你要自定义配置，请设置它为`false`。以下默认的前提条件是使用推荐的 [项目结构](#目录结构)。
+
+- 检查是否存在 `electron/main/index.ts` 和 `electron/main/index.ts`，如果有则分别给 `main.entry` 和 `preload.entry` 赋值。如果不存在，`main.entry` 必须主动赋值，负责会报错
+- 输出目录根据 `vite` 的 `build.outDir` 参数， 将 `electron/main`、`electron/preload`、`src` 分别输出到 `dist/main`、`dist/preload`、`dist/renderer`
+- 其他待实现的行为
+
 ### MainOptions
 
 继承自 [tsup](https://tsup.egoist.dev/) 的 [Options](https://paka.dev/npm/tsup)，添加了一些默认值，方便使用。

package/dist/index.d.mts

@@ -2,18 +2,15 @@ import { Plugin } from 'vite';
 import { Options } from 'tsup';
 
 /**
- * Electron main process options
+ * Electron main process options.
+ * @see https://paka.dev/npm/tsup
+ * @see https://unpkg.com/browse/tsup/dist/index.d.ts
  */
-interface MainOptions extends Omit<Options, 'name' | 'entry' | 'format' | 'outDir' | 'watch' | 'onSuccess'> {
-    /**
-     * The name of the electron main process.
-     * @default "main"
-     */
-    name?: string;
+interface MainOptions extends Omit<Options, 'entry' | 'format' | 'outDir' | 'watch' | 'onSuccess'> {
     /**
      * The main process entry file.
      */
-    entry: string;
+    entry?: string;
     /**
      * The bundle format. If not specified, it will use the "type" field from package.json.
      */
@@ -29,14 +26,11 @@ interface MainOptions extends Omit<Options, 'name' | 'entry' | 'format' | 'outDi
     onSuccess?: () => Promise<void | undefined | (() => void | Promise<void>)>;
 }
 /**
- * Electron preload process options
+ * Electron preload process options.
+ * @see https://paka.dev/npm/tsup
+ * @see https://unpkg.com/browse/tsup/dist/index.d.ts
  */
-interface PreloadOptions extends Omit<Options, 'name' | 'entry' | 'format' | 'outDir' | 'watch' | 'onSuccess'> {
-    /**
-     * The name of the electron preload process.
-     * @default "preload"
-     */
-    name?: string;
+interface PreloadOptions extends Omit<Options, 'entry' | 'format' | 'outDir' | 'watch' | 'onSuccess'> {
     /**
      * The preload process entry file
      */
@@ -46,7 +40,7 @@ interface PreloadOptions extends Omit<Options, 'name' | 'entry' | 'format' | 'ou
      */
     format?: 'cjs' | 'esm';
     /**
-     * The output directory for the preload process files. Defaults to `"dist-electron/preload"`.
+     * The output directory for the preload process files. Defaults is `"dist-electron/preload"`.
      * @default "dist-electron/preload"
      */
     outDir?: string;
@@ -60,7 +54,8 @@ interface PreloadOptions extends Omit<Options, 'name' | 'entry' | 'format' | 'ou
  */
 interface PluginOptions {
     /**
-     * Recommended switch, if true, will have the following default behavior
+     * Recommended switch. Default is true.
+     * if true, will have the following default behavior:
      * * will change the main/preload/renderer outDir to be parallel outDir;
      * eg. if vite build.outDir is 'dist', will change main/preload/render to 'dist/main' and 'dist/preload' and 'dist/renderer'
      * @default true
@@ -73,7 +68,7 @@ interface PluginOptions {
     /**
      * electron main process options
      */
-    main: MainOptions;
+    main?: MainOptions;
     /**
      * electron preload process options
      */
@@ -84,28 +79,7 @@ interface PluginOptions {
      */
     inspect?: boolean;
 }
-/**
- * Only used internally
- */
-interface InnerOptions {
-    /**
-     * whether is vite server
-     */
-    isServer?: boolean;
-    /**
-     * vite server url, will be passed to electron
-     */
-    serverUrl?: string;
-    /**
-     * renderer outDir
-     */
-    rendererOutDir?: string;
-    /**
-     * electron main entry file
-     */
-    mainFile?: string;
-}
 
 declare function vitePluginElectron(options?: PluginOptions): Plugin;
 
-export { InnerOptions, MainOptions, PluginOptions, PreloadOptions, vitePluginElectron as default, vitePluginElectron };
+export { MainOptions, PluginOptions, PreloadOptions, vitePluginElectron as default, vitePluginElectron };

package/dist/index.d.ts

@@ -2,18 +2,15 @@ import { Plugin } from 'vite';
 import { Options } from 'tsup';
 
 /**
- * Electron main process options
+ * Electron main process options.
+ * @see https://paka.dev/npm/tsup
+ * @see https://unpkg.com/browse/tsup/dist/index.d.ts
  */
-interface MainOptions extends Omit<Options, 'name' | 'entry' | 'format' | 'outDir' | 'watch' | 'onSuccess'> {
-    /**
-     * The name of the electron main process.
-     * @default "main"
-     */
-    name?: string;
+interface MainOptions extends Omit<Options, 'entry' | 'format' | 'outDir' | 'watch' | 'onSuccess'> {
     /**
      * The main process entry file.
      */
-    entry: string;
+    entry?: string;
     /**
      * The bundle format. If not specified, it will use the "type" field from package.json.
      */
@@ -29,14 +26,11 @@ interface MainOptions extends Omit<Options, 'name' | 'entry' | 'format' | 'outDi
     onSuccess?: () => Promise<void | undefined | (() => void | Promise<void>)>;
 }
 /**
- * Electron preload process options
+ * Electron preload process options.
+ * @see https://paka.dev/npm/tsup
+ * @see https://unpkg.com/browse/tsup/dist/index.d.ts
  */
-interface PreloadOptions extends Omit<Options, 'name' | 'entry' | 'format' | 'outDir' | 'watch' | 'onSuccess'> {
-    /**
-     * The name of the electron preload process.
-     * @default "preload"
-     */
-    name?: string;
+interface PreloadOptions extends Omit<Options, 'entry' | 'format' | 'outDir' | 'watch' | 'onSuccess'> {
     /**
      * The preload process entry file
      */
@@ -46,7 +40,7 @@ interface PreloadOptions extends Omit<Options, 'name' | 'entry' | 'format' | 'ou
      */
     format?: 'cjs' | 'esm';
     /**
-     * The output directory for the preload process files. Defaults to `"dist-electron/preload"`.
+     * The output directory for the preload process files. Defaults is `"dist-electron/preload"`.
      * @default "dist-electron/preload"
      */
     outDir?: string;
@@ -60,7 +54,8 @@ interface PreloadOptions extends Omit<Options, 'name' | 'entry' | 'format' | 'ou
  */
 interface PluginOptions {
     /**
-     * Recommended switch, if true, will have the following default behavior
+     * Recommended switch. Default is true.
+     * if true, will have the following default behavior:
      * * will change the main/preload/renderer outDir to be parallel outDir;
      * eg. if vite build.outDir is 'dist', will change main/preload/render to 'dist/main' and 'dist/preload' and 'dist/renderer'
      * @default true
@@ -73,7 +68,7 @@ interface PluginOptions {
     /**
      * electron main process options
      */
-    main: MainOptions;
+    main?: MainOptions;
     /**
      * electron preload process options
      */
@@ -84,28 +79,7 @@ interface PluginOptions {
      */
     inspect?: boolean;
 }
-/**
- * Only used internally
- */
-interface InnerOptions {
-    /**
-     * whether is vite server
-     */
-    isServer?: boolean;
-    /**
-     * vite server url, will be passed to electron
-     */
-    serverUrl?: string;
-    /**
-     * renderer outDir
-     */
-    rendererOutDir?: string;
-    /**
-     * electron main entry file
-     */
-    mainFile?: string;
-}
 
 declare function vitePluginElectron(options?: PluginOptions): Plugin;
 
-export { InnerOptions, MainOptions, PluginOptions, PreloadOptions, vitePluginElectron as default, vitePluginElectron };
+export { MainOptions, PluginOptions, PreloadOptions, vitePluginElectron as default, vitePluginElectron };

package/dist/index.js

@@ -1,11 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
-
-// src/index.ts
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }// src/index.ts
 var _fs = require('fs'); var _fs2 = _interopRequireDefault(_fs);
 var _lodashclonedeep = require('lodash.clonedeep'); var _lodashclonedeep2 = _interopRequireDefault(_lodashclonedeep);
 var _lodashmerge = require('lodash.merge'); var _lodashmerge2 = _interopRequireDefault(_lodashmerge);
@@ -17,16 +10,16 @@ var PLUGIN_NAME = "@tomjs:electron";
 // src/main.ts
 var _child_process = require('child_process');
 var _electron = require('electron'); var _electron2 = _interopRequireDefault(_electron);
-var _kolorist = require('kolorist');
+var _treekill = require('tree-kill'); var _treekill2 = _interopRequireDefault(_treekill);
 var _tsup = require('tsup');
 
 // src/logger.ts
 var _dayjs = require('dayjs'); var _dayjs2 = _interopRequireDefault(_dayjs);
-
+var _kolorist = require('kolorist');
 var Logger = class {
   constructor(tag, withTime) {
-    __publicField(this, "tag", PLUGIN_NAME);
-    __publicField(this, "withTime", true);
+    this.tag = PLUGIN_NAME;
+    this.withTime = true;
     this.tag = `[${tag}]`;
     this.withTime = _nullishCoalesce(withTime, () => ( true));
   }
@@ -64,50 +57,47 @@ var createLogger = (tag) => {
 
 // src/main.ts
 var logger = createLogger();
-function getBuildOptions(options, innerOpts) {
-  const env = {
-    APP_DEV_SERVER_URL: innerOpts == null ? void 0 : innerOpts.serverUrl
-  };
-  Object.keys(env).forEach((key) => {
-    if (env[key] === void 0) {
-      delete env[key];
-    }
-  });
+function getBuildOptions(options) {
   return ["main", "preload"].filter((s) => options[s] && options[s].entry).map((s) => {
     options[s].__NAME__ = s;
     return options[s];
   }).map((cfg) => {
     return {
       ...cfg,
-      env,
       silent: true
     };
   });
 }
-function exitMainProcess() {
-  logger.info("exit main process");
-  process.exit(0);
-}
-function runMainProcess(options, innerOpts) {
-  const mainFile = innerOpts.mainFile;
-  logger.info(`run main file: ${_kolorist.lightGreen.call(void 0, mainFile)}`);
-  const args = options.inspect ? ["--inspect"] : [];
-  return _child_process.spawn.call(void 0, _electron2.default, [...args, mainFile], {
+async function startup(options) {
+  await startup.exit();
+  const args = [];
+  options.inspect && args.push("--inspect");
+  process.electronApp = _child_process.spawn.call(void 0, _electron2.default, [".", ...args], {
     stdio: "inherit"
-  }).on("exit", exitMainProcess);
+  });
+  process.electronApp.once("exit", process.exit);
+  process.once("exit", () => {
+    startup.exit();
+    process.electronApp.kill();
+  });
 }
-async function runServe(options, innerOpts, server) {
-  let mainProcess;
-  const killProcess = () => {
-    if (mainProcess) {
-      mainProcess.off("exit", exitMainProcess);
-      mainProcess.kill();
-    }
-  };
-  process.on("exit", () => {
-    killProcess();
+startup.exit = async () => {
+  if (!process.electronApp) {
+    return;
+  }
+  process.electronApp.removeAllListeners();
+  return new Promise((resolve, reject) => {
+    _treekill2.default.call(void 0, process.electronApp.pid, (err) => {
+      if (err) {
+        reject(err);
+      } else {
+        resolve(true);
+      }
+    });
   });
-  const buildOptions = getBuildOptions(options, innerOpts);
+};
+async function runServe(options, server) {
+  const buildOptions = getBuildOptions(options);
   for (let i = 0; i < buildOptions.length; i++) {
     let isFirstBuild = true;
     const tsOpts = buildOptions[i];
@@ -124,8 +114,8 @@ async function runServe(options, innerOpts, server) {
       }
       logger.success(`${name} rebuild succeeded!`);
       if (name === "main") {
-        killProcess();
-        mainProcess = runMainProcess(options, innerOpts);
+        console.log("main process exit");
+        await startup(options);
       } else {
         server.ws.send({
           type: "full-reload"
@@ -134,13 +124,10 @@ async function runServe(options, innerOpts, server) {
     };
     await _tsup.build.call(void 0, { onSuccess, watch: true, ...tsupOptions });
   }
-  mainProcess = runMainProcess(options, innerOpts);
-  return {
-    kill: killProcess
-  };
+  await startup(options);
 }
-async function runBuild(options, innerOpts) {
-  const buildOptions = getBuildOptions(options, innerOpts);
+async function runBuild(options) {
+  const buildOptions = getBuildOptions(options);
   for (let i = 0; i < buildOptions.length; i++) {
     await _tsup.build.call(void 0, buildOptions[i]);
   }
@@ -185,11 +172,9 @@ function preMergeOptions(options) {
       recommended: true,
       external: ["electron"],
       main: {
-        name: "main",
         ...electron2
       },
       preload: {
-        name: "payload",
         ...electron2
       }
     },
@@ -200,41 +185,45 @@ function preMergeOptions(options) {
     const fmt = opt.format;
     opt.format = ["cjs", "esm"].includes(fmt) ? [fmt] : [format];
     const entry = opt.entry;
-    if (typeof entry === "string") {
+    if (entry == void 0) {
+      const filePath = `electron/${prop}/index.ts`;
+      if (_fs2.default.existsSync(_path2.default.join(process.cwd(), filePath))) {
+        opt.entry = [filePath];
+      }
+    } else if (typeof entry === "string") {
       opt.entry = [entry];
     }
     const external = opt.external || opts.external || ["electron"];
     opt.external = [...new Set(["electron"].concat(external))];
   });
-  const innerOpts = {
-    mainFile: pkg.main
-  };
-  return { opts, innerOpts };
+  return opts;
 }
 function vitePluginElectron(options) {
-  const { opts, innerOpts } = preMergeOptions(options);
+  const opts = preMergeOptions(options);
   const isDev = process.env.NODE_ENV === "development";
+  let isServer = false;
   return {
     name: PLUGIN_NAME,
     config(config, env) {
       var _a;
-      innerOpts.isServer = env.mode === "serve";
+      isServer = env.command === "serve";
       let outDir = ((_a = config == null ? void 0 : config.build) == null ? void 0 : _a.outDir) || "dist";
-      opts.preload = opts.preload || {};
+      opts.main ||= {};
+      opts.preload ||= {};
       if (opts.recommended) {
         opts.main.outDir = _path2.default.join(outDir, "main");
         opts.preload.outDir = _path2.default.join(outDir, "preload");
         outDir = _path2.default.join(outDir, "renderer");
       } else {
-        opts.main.outDir = opts.main.outDir || _path2.default.join("dist-electron", "main");
-        opts.preload.outDir = opts.preload.outDir || _path2.default.join("dist-electron", "preload");
+        opts.main.outDir ||= _path2.default.join("dist-electron", "main");
+        opts.preload.outDir ||= _path2.default.join("dist-electron", "preload");
       }
       if (isDev) {
-        opts.main.sourcemap = _nullishCoalesce(opts.main.sourcemap, () => ( true));
-        opts.preload.sourcemap = _nullishCoalesce(opts.main.sourcemap, () => ( true));
+        opts.main.sourcemap ??= true;
+        opts.preload.sourcemap ??= true;
       } else {
-        opts.main.minify = _nullishCoalesce(opts.main.minify, () => ( true));
-        opts.preload.minify = _nullishCoalesce(opts.preload.minify, () => ( true));
+        opts.main.minify ??= true;
+        opts.preload.minify ??= true;
       }
       return {
         build: {
@@ -247,25 +236,23 @@ function vitePluginElectron(options) {
         return;
       }
       server.httpServer.on("listening", async () => {
-        var _a;
         if (server.httpServer) {
           const serve = server.httpServer.address();
           const { address, port, family } = serve;
           if (family === "IPv6") {
-            innerOpts.serverUrl = `http://[${address}]:${port}`;
+            process.env.APP_DEV_SERVER_URL = `http://[${address}]:${port}`;
           } else {
-            innerOpts.serverUrl = `http://${address}:${port}`;
+            process.env.APP_DEV_SERVER_URL = `http://${address}:${port}`;
           }
         }
-        (_a = process.__tomjs_electron_serve__) == null ? void 0 : _a.kill();
-        process.__tomjs_electron_serve__ = await runServe(opts, innerOpts, server);
+        await runServe(opts, server);
       });
     },
     async closeBundle() {
-      if (innerOpts.isServer) {
+      if (isServer) {
         return;
       }
-      await runBuild(opts, innerOpts);
+      await runBuild(opts);
     }
   };
 }

package/dist/index.mjs

@@ -1,10 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
-
 // src/index.ts
 import fs2 from "fs";
 import cloneDeep from "lodash.clonedeep";
@@ -17,7 +10,7 @@ var PLUGIN_NAME = "@tomjs:electron";
 // src/main.ts
 import { spawn } from "child_process";
 import electron from "electron";
-import { lightGreen } from "kolorist";
+import treeKill from "tree-kill";
 import { build as tsupBuild } from "tsup";
 
 // src/logger.ts
@@ -25,8 +18,8 @@ import dayjs from "dayjs";
 import { blue, gray, green, red, yellow } from "kolorist";
 var Logger = class {
   constructor(tag, withTime) {
-    __publicField(this, "tag", PLUGIN_NAME);
-    __publicField(this, "withTime", true);
+    this.tag = PLUGIN_NAME;
+    this.withTime = true;
     this.tag = `[${tag}]`;
     this.withTime = withTime ?? true;
   }
@@ -64,50 +57,47 @@ var createLogger = (tag) => {
 
 // src/main.ts
 var logger = createLogger();
-function getBuildOptions(options, innerOpts) {
-  const env = {
-    APP_DEV_SERVER_URL: innerOpts == null ? void 0 : innerOpts.serverUrl
-  };
-  Object.keys(env).forEach((key) => {
-    if (env[key] === void 0) {
-      delete env[key];
-    }
-  });
+function getBuildOptions(options) {
   return ["main", "preload"].filter((s) => options[s] && options[s].entry).map((s) => {
     options[s].__NAME__ = s;
     return options[s];
   }).map((cfg) => {
     return {
       ...cfg,
-      env,
       silent: true
     };
   });
 }
-function exitMainProcess() {
-  logger.info("exit main process");
-  process.exit(0);
-}
-function runMainProcess(options, innerOpts) {
-  const mainFile = innerOpts.mainFile;
-  logger.info(`run main file: ${lightGreen(mainFile)}`);
-  const args = options.inspect ? ["--inspect"] : [];
-  return spawn(electron, [...args, mainFile], {
+async function startup(options) {
+  await startup.exit();
+  const args = [];
+  options.inspect && args.push("--inspect");
+  process.electronApp = spawn(electron, [".", ...args], {
     stdio: "inherit"
-  }).on("exit", exitMainProcess);
+  });
+  process.electronApp.once("exit", process.exit);
+  process.once("exit", () => {
+    startup.exit();
+    process.electronApp.kill();
+  });
 }
-async function runServe(options, innerOpts, server) {
-  let mainProcess;
-  const killProcess = () => {
-    if (mainProcess) {
-      mainProcess.off("exit", exitMainProcess);
-      mainProcess.kill();
-    }
-  };
-  process.on("exit", () => {
-    killProcess();
+startup.exit = async () => {
+  if (!process.electronApp) {
+    return;
+  }
+  process.electronApp.removeAllListeners();
+  return new Promise((resolve, reject) => {
+    treeKill(process.electronApp.pid, (err) => {
+      if (err) {
+        reject(err);
+      } else {
+        resolve(true);
+      }
+    });
   });
-  const buildOptions = getBuildOptions(options, innerOpts);
+};
+async function runServe(options, server) {
+  const buildOptions = getBuildOptions(options);
   for (let i = 0; i < buildOptions.length; i++) {
     let isFirstBuild = true;
     const tsOpts = buildOptions[i];
@@ -124,8 +114,8 @@ async function runServe(options, innerOpts, server) {
       }
       logger.success(`${name} rebuild succeeded!`);
       if (name === "main") {
-        killProcess();
-        mainProcess = runMainProcess(options, innerOpts);
+        console.log("main process exit");
+        await startup(options);
       } else {
         server.ws.send({
           type: "full-reload"
@@ -134,13 +124,10 @@ async function runServe(options, innerOpts, server) {
     };
     await tsupBuild({ onSuccess, watch: true, ...tsupOptions });
   }
-  mainProcess = runMainProcess(options, innerOpts);
-  return {
-    kill: killProcess
-  };
+  await startup(options);
 }
-async function runBuild(options, innerOpts) {
-  const buildOptions = getBuildOptions(options, innerOpts);
+async function runBuild(options) {
+  const buildOptions = getBuildOptions(options);
   for (let i = 0; i < buildOptions.length; i++) {
     await tsupBuild(buildOptions[i]);
   }
@@ -184,11 +171,9 @@ function preMergeOptions(options) {
       recommended: true,
       external: ["electron"],
       main: {
-        name: "main",
         ...electron2
       },
       preload: {
-        name: "payload",
         ...electron2
       }
     },
@@ -199,41 +184,45 @@ function preMergeOptions(options) {
     const fmt = opt.format;
     opt.format = ["cjs", "esm"].includes(fmt) ? [fmt] : [format];
     const entry = opt.entry;
-    if (typeof entry === "string") {
+    if (entry == void 0) {
+      const filePath = `electron/${prop}/index.ts`;
+      if (fs2.existsSync(path.join(process.cwd(), filePath))) {
+        opt.entry = [filePath];
+      }
+    } else if (typeof entry === "string") {
       opt.entry = [entry];
     }
     const external = opt.external || opts.external || ["electron"];
     opt.external = [...new Set(["electron"].concat(external))];
   });
-  const innerOpts = {
-    mainFile: pkg.main
-  };
-  return { opts, innerOpts };
+  return opts;
 }
 function vitePluginElectron(options) {
-  const { opts, innerOpts } = preMergeOptions(options);
+  const opts = preMergeOptions(options);
   const isDev = process.env.NODE_ENV === "development";
+  let isServer = false;
   return {
     name: PLUGIN_NAME,
     config(config, env) {
       var _a;
-      innerOpts.isServer = env.mode === "serve";
+      isServer = env.command === "serve";
       let outDir = ((_a = config == null ? void 0 : config.build) == null ? void 0 : _a.outDir) || "dist";
-      opts.preload = opts.preload || {};
+      opts.main ||= {};
+      opts.preload ||= {};
       if (opts.recommended) {
         opts.main.outDir = path.join(outDir, "main");
         opts.preload.outDir = path.join(outDir, "preload");
         outDir = path.join(outDir, "renderer");
       } else {
-        opts.main.outDir = opts.main.outDir || path.join("dist-electron", "main");
-        opts.preload.outDir = opts.preload.outDir || path.join("dist-electron", "preload");
+        opts.main.outDir ||= path.join("dist-electron", "main");
+        opts.preload.outDir ||= path.join("dist-electron", "preload");
       }
       if (isDev) {
-        opts.main.sourcemap = opts.main.sourcemap ?? true;
-        opts.preload.sourcemap = opts.main.sourcemap ?? true;
+        opts.main.sourcemap ??= true;
+        opts.preload.sourcemap ??= true;
       } else {
-        opts.main.minify = opts.main.minify ?? true;
-        opts.preload.minify = opts.preload.minify ?? true;
+        opts.main.minify ??= true;
+        opts.preload.minify ??= true;
       }
       return {
         build: {
@@ -246,25 +235,23 @@ function vitePluginElectron(options) {
         return;
       }
       server.httpServer.on("listening", async () => {
-        var _a;
         if (server.httpServer) {
           const serve = server.httpServer.address();
           const { address, port, family } = serve;
           if (family === "IPv6") {
-            innerOpts.serverUrl = `http://[${address}]:${port}`;
+            process.env.APP_DEV_SERVER_URL = `http://[${address}]:${port}`;
           } else {
-            innerOpts.serverUrl = `http://${address}:${port}`;
+            process.env.APP_DEV_SERVER_URL = `http://${address}:${port}`;
           }
         }
-        (_a = process.__tomjs_electron_serve__) == null ? void 0 : _a.kill();
-        process.__tomjs_electron_serve__ = await runServe(opts, innerOpts, server);
+        await runServe(opts, server);
       });
     },
     async closeBundle() {
-      if (innerOpts.isServer) {
+      if (isServer) {
         return;
       }
-      await runBuild(opts, innerOpts);
+      await runBuild(opts);
     }
   };
 }

package/env.d.ts

@@ -12,6 +12,6 @@ declare namespace NodeJS {
     /**
      * The url of the dev server.
      */
-    readonly APP_DEV_SERVER_URL: string;
+    APP_DEV_SERVER_URL?: string;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomjs/vite-plugin-electron",
-  "version": "1.1.2",
+  "version": "1.2.1",
   "description": "A simple vite plugin for electron, supports esm/cjs.",
   "keywords": [
     "vite",
@@ -44,6 +44,7 @@
     "lodash.clonedeep": "^4.5.0",
     "lodash.merge": "^4.6.2",
     "shelljs": "^0.8.5",
+    "tree-kill": "^1.2.2",
     "tsup": "7.2.0"
   },
   "devDependencies": {
@@ -51,8 +52,8 @@
     "@tomjs/commitlint": "^2.0.5",
     "@tomjs/eslint": "^1.1.1",
     "@tomjs/prettier": "^1.0.6",
-    "@tomjs/stylelint": "^1.1.0",
-    "@tomjs/tsconfig": "^1.0.8",
+    "@tomjs/stylelint": "^1.1.1",
+    "@tomjs/tsconfig": "^1.1.2",
     "@types/lodash.clonedeep": "^4.5.9",
     "@types/lodash.merge": "^4.6.9",
     "@types/node": "^18.19.3",
@@ -60,7 +61,7 @@
     "eslint": "^8.55.0",
     "husky": "^8.0.3",
     "lint-staged": "^15.2.0",
-    "np": "^9.1.0",
+    "np": "^9.2.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.1.0",
     "rimraf": "^5.0.5",