Merge pull request #212 from electron-vite/v0.28.2

V0.28.2

Author: caoxiemeihao

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.28.2 (2024-02-11)
+
+- 5b0fc87 feat: use `treeKillSync()` instead `tree-kill`
+
 ## 0.28.1 (2024-02-06)
 
 - efc5826 fix: correct `calcEntryCount()` for startup

README.md

@@ -358,10 +358,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.28.1",
+  "version": "0.28.2",
   "description": "Electron 🔗 Vite",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

src/index.ts

@@ -138,36 +138,13 @@ export async function startup(
 
   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()
-      treeKillSync(process.electronApp.pid!);
-    })
+    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!,
-        'SIGKILL',
-        error => error && process.electronApp.kill(),
-      ))
-      .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)
-        }
-      })
+    treeKillSync(process.electronApp.pid!)
   }
 }

src/utils.ts

@@ -142,11 +142,11 @@ export function treeKillSync(pid: number) {
   if (process.platform === 'win32') {
     cp.execSync(`taskkill /pid ${pid} /T /F`)
   } else {
-    killTree(pidTree())
+    killTree(pidTree({ pid, ppid: process.pid }))
   }
 }
 
-function pidTree(tree: PidTree = { pid: process.pid, ppid: process.ppid }) {
+function pidTree(tree: PidTree) {
   const command = process.platform === 'darwin'
     ? `pgrep -P ${tree.pid}` // Mac
     : `ps -o pid --no-headers --ppid ${tree.ppid}` // Linux