diff --git a/electron/main.ts b/electron/main.ts index b9c7317..db90183 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -1,6 +1,10 @@ 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 @@ -8,7 +12,7 @@ import path from 'node:path' // │ │ // │ ├─┬ 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 index b68e6e3..507eeb2 100644 --- 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']