Merge pull request #175 from electron-vite/v0.15.2

V0.15.2

Author: caoxiemeihao

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.15.2 (2023-11-06)
+
+- 9719203 chore: better exit `electron` logic
+
 ## 0.15.1 (2023-11-06)
 
 - 2119108 fix: correct use `tree-kill`

README.md

@@ -323,10 +323,3 @@ Modules in `node_modules` are not bundled during development, it's fast!
 │ const log = require('electron-log') │
 ┗—————————————————————————————————————┛
 ```
-
-## FAQ
-
-- `electron` does not exit correctly | 使用ctrl + c 停止代码，electron后台不关闭 | [#122](https://github.com/electron-vite/vite-plugin-electron/pull/122), [#168](https://github.com/electron-vite/vite-plugin-electron/issues/168)
-
-  * Add `tree-kill` into you dependencies, `npm i -D tree-kill`.
-

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-electron",
-  "version": "0.15.1",
+  "version": "0.15.2",
   "description": "Electron 🔗 Vite",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

src/index.ts

@@ -121,7 +121,7 @@ export async function startup(argv = ['.', '--no-sandbox']) {
   const electron = await import('electron')
   const electronPath = <any>(electron.default ?? electron)
 
-  await startup.exit()
+  startup.exit()
 
   // Start Electron.app
   process.electronApp = spawn(electronPath, argv, { stdio: 'inherit' })
@@ -131,31 +131,14 @@ export async function startup(argv = ['.', '--no-sandbox']) {
 
   if (!startup.hookedProcessExit) {
     startup.hookedProcessExit = true
-    process.once('exit', () => {
-      startup.exit()
-      // When the process exits, `tree-kill` does not have enough time to complete execution, so `electronApp` needs to be killed immediately.
-      process.electronApp.kill()
-    })
+    process.once('exit', startup.exit)
   }
 }
 startup.hookedProcessExit = false
 startup.exit = async () => {
   if (process.electronApp) {
     process.electronApp.removeAllListeners()
-
-    await import('tree-kill')
-      .then(m => m.default(process.electronApp.pid!))
-      .catch(e => {
-        process.electronApp.kill()
-
-        if (e.code === 'ERR_MODULE_NOT_FOUND') {
-          console.log(
-            '[vite-plugin-electron]',
-            'Please install tree-kill to exit all associated processes, run "npm i tree-kill -D".',
-          )
-        } else {
-          console.error(e)
-        }
-      })
+    // SIGINT can be sent to the process tree #122
+    process.electronApp.kill('SIGINT')
   }
 }