Merge pull request #173 from electron-vite/v0.15.0

V0.15.0

CHANGELOG.md

@@ -1,3 +1,30 @@
+## 0.15.0 (2023-11-06)
+
+- 234be07 fix: `tree-kill` doesn't work
+- 5e6c36d feat: `calcEntryCount()`
+- bbd6bd1 Merge branch 'main' of github.com:electron-vite/vite-plugin-electron into main
+- 9a910e5 Merge pull request #166 from CommandMC/fix/wait-for-all-files
+- 3962718 fix: startup electron wait for all files built
+- 7f75ae2 Merge branch 'fix/wait-for-all-files' of https://github.com/CommandMC/vite-plugin-electron into main
+- 65b73c2 Merge pull request #122 from sevenc-nanashi/main
+- e4033c3 Merge pull request #1 from caoxiemeihao/cleanup
+- 8e70a39 chore: cleanup
+- 20dd675 refactor: migrate examples to `github.com/caoxiemeihao/electron-vite-samples`
+- de9259f Change: Use peer-dependency
+- 8247192 Merge: main -> main
+- ab990b9 Wait until the last file is done bundling before starting Electron
+- 6e5a033 Merge pull request #163 from electron-vite/v0.14.1
+
+**Fixs:**
+
+- `electron` does not exit correctly | 使用ctrl + c 停止代码，electron后台不关闭 [#168](https://github.com/electron-vite/vite-plugin-electron/issues/168), [#122](https://github.com/electron-vite/vite-plugin-electron/pull/122)
+- Fixed `electron` startup timing [#166](https://github.com/electron-vite/vite-plugin-electron/pull/166)
+
+**Contributors:**
+
+- [#122](https://github.com/electron-vite/vite-plugin-electron/pull/122)@[sevenc-nanashi](https://github.com/sevenc-nanashi)
+- [#166](https://github.com/electron-vite/vite-plugin-electron/pull/166)@[CommandMC](https://github.com/CommandMC)
+
 ## 0.14.1 (2023-09-10)
 
 - ba14f55 feat(simple): Preload scripts code not split by default

package.json

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

src/index.ts

@@ -138,11 +138,20 @@ startup.hookProcessExit = false
 startup.exit = async () => {
   if (process.electronApp) {
     process.electronApp.removeAllListeners()
-    try {
-      const { default: treeKill } = await import('tree-kill')
-      treeKill(process.electronApp.pid!)
-    } catch (e) {
-      process.electronApp.kill()
-    }
+
+    import('tree-kill')
+      .then(m => m.default(process.electronApp.pid!))
+      .catch(e => {
+        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".',
+          )
+        } else {
+          console.error(e)
+        }
+      })
+
+    process.electronApp.kill() // `tree-kill` doesn't work locally on my Mac(2023-11-06) 🤔
   }
 }

src/utils.ts

@@ -110,3 +110,23 @@ export function resolveServerUrl(server: ViteDevServer): string | void {
     return url
   }
 }
+
+export function calcEntryCount(optionsArray: ElectronOptions[]) {
+  return optionsArray.reduce((count, options) => {
+    const input = options.vite?.build?.rollupOptions?.input
+
+    // `input` option have higher priority.
+    // https://github.com/vitejs/vite/blob/v4.4.9/packages/vite/src/node/build.ts#L494
+    if (input) {
+      count += typeof input === 'string'
+        ? 1
+        : Object.keys(input).length
+    } else if (options.entry) {
+      count += typeof options.entry === 'string'
+        ? 1
+        : Object.keys(options.entry).length
+    }
+
+    return count
+  }, 0)
+}