Merge pull request #174 from electron-vite/v0.15.1

V0.15.1

Author: caoxiemeihao

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.15.1 (2023-11-06)
+
+- 2119108 fix: correct use `tree-kill`
+
 ## 0.15.0 (2023-11-06)
 
 - 234be07 fix: `tree-kill` doesn't work

package.json

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

src/index.ts

@@ -129,29 +129,33 @@ export async function startup(argv = ['.', '--no-sandbox']) {
   // Exit command after Electron.app exits
   process.electronApp.once('exit', process.exit)
 
-  if (!startup.hookProcessExit) {
-    startup.hookProcessExit = true
-    process.once('exit', startup.exit)
+  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()
+    })
   }
 }
-startup.hookProcessExit = false
+startup.hookedProcessExit = false
 startup.exit = async () => {
   if (process.electronApp) {
     process.electronApp.removeAllListeners()
 
-    import('tree-kill')
+    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]',
-            'install tree-kill to exit all associated processes, place run "npm i tree-kill".',
+            'Please install tree-kill to exit all associated processes, run "npm i tree-kill -D".',
           )
         } else {
           console.error(e)
         }
       })
-
-    process.electronApp.kill() // `tree-kill` doesn't work locally on my Mac(2023-11-06) 🤔
   }
 }