From 6e8572d9b7a09b92e4e1ac07b032f2223c9936aa Mon Sep 17 00:00:00 2001 From: alex8088 <244096523@qq.com> Date: Wed, 22 Jan 2025 22:24:04 +0800 Subject: [PATCH] feat: resolve conditions for preload --- src/plugins/electron.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/plugins/electron.ts b/src/plugins/electron.ts index 4c1bb84..1ac861c 100644 --- a/src/plugins/electron.ts +++ b/src/plugins/electron.ts @@ -198,6 +198,12 @@ export function electronPreloadVitePlugin(options?: ElectronPluginOptions): Plug const format = pkg.type && pkg.type === 'module' && supportESM() ? 'es' : 'cjs' const defaultConfig = { + ssr: { + resolve: { + conditions: ['module', 'browser', 'development|production'], + mainFields: ['browser', 'module', 'jsnext:main', 'jsnext'] + } + }, build: { outDir: path.resolve(root, 'out', 'preload'), target: nodeTarget, @@ -272,7 +278,8 @@ export function electronPreloadVitePlugin(options?: ElectronPluginOptions): Plug // enable ssr build config.build.ssr = true config.build.ssrEmitAssets = true - config.ssr = { ...config.ssr, ...{ noExternal: true } } + config.ssr = mergeConfig(defaultConfig.ssr, config.ssr || {}) + config.ssr.noExternal = true } }, {