feat: support esmodule

electron-vite · Apr 18, 2024 · 9c84030 · 9c84030
1 parent e2c3822
commit 9c84030
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/electron/main.ts b/electron/main.ts
@@ -1,14 +1,18 @@
 import { app, BrowserWindow } from 'electron'
+import { fileURLToPath } from 'node:url'
 import path from 'node:path'
 
+globalThis.__filename = fileURLToPath(import.meta.url)
+globalThis.__dirname = path.dirname(__filename)
+
 // The built directory structure
 //
 // ├─┬─┬ dist
 // │ │ └── index.html
 // │ │
 // │ ├─┬ dist-electron
 // │ │ ├── main.js
-// │ │ └── preload.js
+// │ │ └── preload.mjs
 // │
 process.env.APP_ROOT = path.join(__dirname, '..')
 
@@ -25,7 +29,7 @@ function createWindow() {
   win = new BrowserWindow({
     icon: path.join(process.env.VITE_PUBLIC, 'electron-vite.svg'),
     webPreferences: {
-      preload: path.join(__dirname, 'preload.js'),
+      preload: path.join(__dirname, 'preload.mjs'),
     },
   })
 

diff --git a/src/index.ts b/src/index.ts
@@ -262,7 +262,6 @@ function setupElectron(root: string, framework: Framework) {
   editFile(path.join(root, 'package.json'), content => {
     const json = JSON.parse(content)
     json.main = 'dist-electron/main.js'
-    json.type = undefined // Electron(24-) only support CommonJs now
     json.scripts.build = `${json.scripts.build} && electron-builder`
     json.devDependencies.electron = pkg.devDependencies.electron
     json.devDependencies['electron-builder'] = pkg.devDependencies['electron-builder']