diff --git a/src/renderer/vite.config.ts b/src/renderer/vite.config.ts index f4f634f..82b125c 100644 --- a/src/renderer/vite.config.ts +++ b/src/renderer/vite.config.ts @@ -41,26 +41,15 @@ export default defineConfig({ // ------- For use Electron, NodeJs in Renderer-process ------- // https://github.com/caoxiemeihao/electron-vue-vite/issues/52 -export function resolveElectron(resolves: Parameters[0] = {}): Plugin[] { +export function resolveElectron(resolves: Parameters[0] = {}): Plugin { const builtins = builtinModules.filter(t => !t.startsWith('_')) - return [ - { - name: 'vite-plugin-electron-config', - config(config) { - if (!config.optimizeDeps) config.optimizeDeps = {} - if (!config.optimizeDeps.exclude) config.optimizeDeps.exclude = [] - - config.optimizeDeps.exclude.push('electron', ...builtins) - }, - }, - // https://github.com/caoxiemeihao/vite-plugins/tree/main/packages/resolve#readme - resolve({ - electron: electronExport(), - ...builtinModulesExport(builtins), - ...resolves, - }) - ] + // https://github.com/caoxiemeihao/vite-plugins/tree/main/packages/resolve#readme + return resolve({ + electron: electronExport(), + ...builtinModulesExport(builtins), + ...resolves, + }) function electronExport() { return ` @@ -98,9 +87,9 @@ export function resolveElectron(resolves: Parameters[0] = {}): P function builtinModulesExport(modules: string[]) { return modules.map((moduleId) => { const nodeModule = require(moduleId) - const requireModule = `const __builtinModule = require("${moduleId}");` - const exportDefault = `export default __builtinModule` - const exportMembers = Object.keys(nodeModule).map(attr => `export const ${attr} = __builtinModule.${attr}`).join(';\n') + ';' + const requireModule = `const M = require("${moduleId}");` + const exportDefault = `export default M;` + const exportMembers = Object.keys(nodeModule).map(attr => `export const ${attr} = M.${attr}`).join(';\n') + ';' const nodeModuleCode = ` ${requireModule}