@electron-forge/plugin-vite 7.5.0 → 7.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/ViteConfig.d.ts +1 -1
- package/dist/ViteConfig.d.ts.map +1 -1
- package/dist/ViteConfig.js +5 -5
- package/dist/VitePlugin.d.ts +2 -3
- package/dist/VitePlugin.d.ts.map +1 -1
- package/dist/VitePlugin.js +32 -33
- package/dist/config/vite.base.config.d.ts.map +1 -1
- package/dist/config/vite.base.config.js +4 -2
- package/dist/config/vite.main.config.d.ts +1 -1
- package/dist/config/vite.main.config.d.ts.map +1 -1
- package/dist/config/vite.main.config.js +11 -8
- package/dist/config/vite.preload.config.d.ts +1 -1
- package/dist/config/vite.preload.config.d.ts.map +1 -1
- package/dist/config/vite.preload.config.js +4 -3
- package/dist/config/vite.renderer.config.d.ts +1 -1
- package/dist/config/vite.renderer.config.d.ts.map +1 -1
- package/dist/config/vite.renderer.config.js +5 -3
- package/forge-vite-env.d.ts +23 -0
- package/package.json +9 -12
- package/src/ViteConfig.ts +5 -5
- package/src/VitePlugin.ts +33 -35
- package/src/config/vite.base.config.ts +4 -1
- package/src/config/vite.main.config.ts +11 -7
- package/src/config/vite.preload.config.ts +3 -2
- package/src/config/vite.renderer.config.ts +6 -4
package/dist/ViteConfig.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { VitePluginBuildConfig, VitePluginConfig, VitePluginRendererConfig } from './Config';
|
|
2
2
|
import type { UserConfig } from 'vite';
|
|
3
|
-
|
|
3
|
+
type Target = NonNullable<VitePluginBuildConfig['target']> | 'renderer';
|
|
4
4
|
export default class ViteConfigGenerator {
|
|
5
5
|
private readonly pluginConfig;
|
|
6
6
|
private readonly projectDir;
|
package/dist/ViteConfig.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ViteConfig.d.ts","sourceRoot":"","sources":["../src/ViteConfig.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAClG,OAAO,KAAK,EAAa,UAAU,EAAE,MAAM,MAAM,CAAC;AAIlD,
|
|
1
|
+
{"version":3,"file":"ViteConfig.d.ts","sourceRoot":"","sources":["../src/ViteConfig.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAClG,OAAO,KAAK,EAAa,UAAU,EAAE,MAAM,MAAM,CAAC;AAIlD,KAAK,MAAM,GAAG,WAAW,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,GAAG,UAAU,CAAC;AAExE,MAAM,CAAC,OAAO,OAAO,mBAAmB;IAC1B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAAoB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAAU,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAA5F,YAAY,EAAE,gBAAgB,EAAmB,UAAU,EAAE,MAAM,EAAmB,MAAM,EAAE,OAAO;IAI5H,aAAa,CAAC,WAAW,EAAE,qBAAqB,GAAG,wBAAwB,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IA2BvH,IAAI,IAAI,IAAI,MAAM,CAKjB;IAEK,cAAc,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAavC,iBAAiB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;CAYjD"}
|
package/dist/ViteConfig.js
CHANGED
|
@@ -28,14 +28,14 @@ class ViteConfigGenerator {
|
|
|
28
28
|
forgeConfigSelf: buildConfig,
|
|
29
29
|
};
|
|
30
30
|
// `configEnv` is to be passed as an arguments when the user export a function in `vite.config.js`.
|
|
31
|
-
const userConfig = (await (0, vite_1.loadConfigFromFile)(configEnv, buildConfig.config))?.config
|
|
31
|
+
const userConfig = (await (0, vite_1.loadConfigFromFile)(configEnv, buildConfig.config))?.config;
|
|
32
32
|
switch (target) {
|
|
33
33
|
case 'main':
|
|
34
|
-
return (0,
|
|
34
|
+
return (0, vite_main_config_1.getConfig)(configEnv, userConfig);
|
|
35
35
|
case 'preload':
|
|
36
|
-
return (0,
|
|
36
|
+
return (0, vite_preload_config_1.getConfig)(configEnv, userConfig);
|
|
37
37
|
case 'renderer':
|
|
38
|
-
return (0,
|
|
38
|
+
return (0, vite_renderer_config_1.getConfig)(configEnv, userConfig);
|
|
39
39
|
default:
|
|
40
40
|
throw new Error(`Unknown target: ${target}, expected 'main', 'preload' or 'renderer'`);
|
|
41
41
|
}
|
|
@@ -68,4 +68,4 @@ class ViteConfigGenerator {
|
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
70
|
exports.default = ViteConfigGenerator;
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
71
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVml0ZUNvbmZpZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9WaXRlQ29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsa0RBQTBCO0FBQzFCLCtCQUEwQztBQUUxQyxnRUFBMkU7QUFDM0Usc0VBQWlGO0FBQ2pGLHdFQUFtRjtBQUtuRixNQUFNLENBQUMsR0FBRyxJQUFBLGVBQUssRUFBQyx3Q0FBd0MsQ0FBQyxDQUFDO0FBSTFELE1BQXFCLG1CQUFtQjtJQUN0QyxZQUE2QixZQUE4QixFQUFtQixVQUFrQixFQUFtQixNQUFlO1FBQXJHLGlCQUFZLEdBQVosWUFBWSxDQUFrQjtRQUFtQixlQUFVLEdBQVYsVUFBVSxDQUFRO1FBQW1CLFdBQU0sR0FBTixNQUFNLENBQVM7UUFDaEksQ0FBQyxDQUFDLGNBQWMsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDL0IsQ0FBQztJQUVELEtBQUssQ0FBQyxhQUFhLENBQUMsV0FBNkQsRUFBRSxNQUFjO1FBQy9GLE1BQU0sU0FBUyxHQUFjO1lBQzNCLHVEQUF1RDtZQUN2RCxPQUFPLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxPQUFPO1lBQ3hDLDBDQUEwQztZQUMxQyxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUk7WUFFZiw2QkFBNkI7WUFDN0IsSUFBSSxFQUFFLElBQUksQ0FBQyxVQUFVO1lBQ3JCLFdBQVcsRUFBRSxJQUFJLENBQUMsWUFBWTtZQUM5QixlQUFlLEVBQUUsV0FBVztTQUM3QixDQUFDO1FBRUYsbUdBQW1HO1FBQ25HLE1BQU0sVUFBVSxHQUFHLENBQUMsTUFBTSxJQUFBLHlCQUFrQixFQUFDLFNBQVMsRUFBRSxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDckYsUUFBUSxNQUFNLEVBQUUsQ0FBQztZQUNmLEtBQUssTUFBTTtnQkFDVCxPQUFPLElBQUEsNEJBQWlCLEVBQUMsU0FBK0IsRUFBRSxVQUFVLENBQUMsQ0FBQztZQUN4RSxLQUFLLFNBQVM7Z0JBQ1osT0FBTyxJQUFBLCtCQUFvQixFQUFDLFNBQStCLEVBQUUsVUFBVSxDQUFDLENBQUM7WUFDM0UsS0FBSyxVQUFVO2dCQUNiLE9BQU8sSUFBQSxnQ0FBcUIsRUFBQyxTQUFrQyxFQUFFLFVBQVUsQ0FBQyxDQUFDO1lBQy9FO2dCQUNFLE1BQU0sSUFBSSxLQUFLLENBQUMsbUJBQW1CLE1BQU0sNENBQTRDLENBQUMsQ0FBQztRQUMzRixDQUFDO0lBQ0gsQ0FBQztJQUVELElBQUksSUFBSTtRQUNOLDhDQUE4QztRQUM5QyxpSEFBaUg7UUFDakgsNEVBQTRFO1FBQzVFLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxhQUFhLENBQUM7SUFDcEQsQ0FBQztJQUVELEtBQUssQ0FBQyxjQUFjO1FBQ2xCLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztZQUM1QyxNQUFNLElBQUksS0FBSyxDQUFDLGlDQUFpQyxDQUFDLENBQUM7UUFDckQsQ0FBQztRQUVELE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsS0FBSztZQUNyQyxrREFBa0Q7YUFDakQsTUFBTSxDQUFDLENBQUMsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDO2FBQzlCLEdBQUcsQ0FBQyxDQUFDLFdBQVcsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxXQUFXLEVBQUUsV0FBVyxDQUFDLE1BQU0sSUFBSSxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBRXZGLE9BQU8sTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3BDLENBQUM7SUFFRCxLQUFLLENBQUMsaUJBQWlCO1FBQ3JCLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQztZQUMvQyxNQUFNLElBQUksS0FBSyxDQUFDLG9DQUFvQyxDQUFDLENBQUM7UUFDeEQsQ0FBQztRQUVELE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsUUFBUTtZQUN4QyxrREFBa0Q7YUFDakQsTUFBTSxDQUFDLENBQUMsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDO2FBQzlCLEdBQUcsQ0FBQyxDQUFDLFdBQVcsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxXQUFXLEVBQUUsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUVyRSxPQUFPLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNwQyxDQUFDO0NBQ0Y7QUFoRUQsc0NBZ0VDIn0=
|
package/dist/VitePlugin.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { PluginBase } from '@electron-forge/plugin-base';
|
|
2
2
|
import type { VitePluginConfig } from './Config';
|
|
3
|
-
import type { ForgeMultiHookMap, ResolvedForgeConfig
|
|
3
|
+
import type { ForgeMultiHookMap, ResolvedForgeConfig } from '@electron-forge/shared-types';
|
|
4
4
|
export default class VitePlugin extends PluginBase<VitePluginConfig> {
|
|
5
5
|
private static alreadyStarted;
|
|
6
6
|
name: string;
|
|
@@ -16,14 +16,13 @@ export default class VitePlugin extends PluginBase<VitePluginConfig> {
|
|
|
16
16
|
getHooks: () => ForgeMultiHookMap;
|
|
17
17
|
resolveForgeConfig: (forgeConfig: ResolvedForgeConfig) => Promise<ResolvedForgeConfig>;
|
|
18
18
|
packageAfterCopy: (_forgeConfig: ResolvedForgeConfig, buildPath: string) => Promise<void>;
|
|
19
|
-
startLogic: () => Promise<StartResult>;
|
|
20
19
|
build: () => Promise<void>;
|
|
21
20
|
buildRenderer: () => Promise<void>;
|
|
22
21
|
launchRendererDevServers: () => Promise<void>;
|
|
23
22
|
exitHandler: (options: {
|
|
24
23
|
cleanup?: boolean;
|
|
25
24
|
exit?: boolean;
|
|
26
|
-
}, err?: Error
|
|
25
|
+
}, err?: Error) => void;
|
|
27
26
|
}
|
|
28
27
|
export { VitePlugin };
|
|
29
28
|
//# sourceMappingURL=VitePlugin.d.ts.map
|
package/dist/VitePlugin.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VitePlugin.d.ts","sourceRoot":"","sources":["../src/VitePlugin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuB,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAU9E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,
|
|
1
|
+
{"version":3,"file":"VitePlugin.d.ts","sourceRoot":"","sources":["../src/VitePlugin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuB,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAU9E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAO3F,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,UAAU,CAAC,gBAAgB,CAAC;IAClE,OAAO,CAAC,MAAM,CAAC,cAAc,CAAS;IAE/B,IAAI,SAAU;IAErB,OAAO,CAAC,MAAM,CAAS;IAGvB,OAAO,CAAC,UAAU,CAAU;IAG5B,OAAO,CAAC,OAAO,CAAU;IAEzB,OAAO,CAAC,oBAAoB,CAAuB;IAEnD,OAAO,CAAC,QAAQ,CAAuB;IAEvC,OAAO,CAAC,OAAO,CAA4B;IAE3C,IAAI,QAAS,MAAM,KAAG,IAAI,CAMxB;IAEK,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAKxC,OAAO,KAAK,eAAe,GAE1B;IAED,QAAQ,QAAO,iBAAiB,CAmD9B;IAEF,kBAAkB,gBAAuB,mBAAmB,KAAG,QAAQ,mBAAmB,CAAC,CAwBzF;IAEF,gBAAgB,iBAAwB,mBAAmB,aAAa,MAAM,KAAG,QAAQ,IAAI,CAAC,CAc5F;IAGF,KAAK,QAAa,QAAQ,IAAI,CAAC,CA4B7B;IAGF,aAAa,QAAa,QAAQ,IAAI,CAAC,CAOrC;IAEF,wBAAwB,QAAa,QAAQ,IAAI,CAAC,CAuBhD;IAEF,WAAW,YAAa;QAAE,OAAO,CAAC,EAAE,OAAO,CAAC;QAAC,IAAI,CAAC,EAAE,OAAO,CAAA;KAAE,QAAQ,KAAK,KAAG,IAAI,CAmB/E;CACH;AAED,OAAO,EAAE,UAAU,EAAE,CAAC"}
|
package/dist/VitePlugin.js
CHANGED
|
@@ -29,6 +29,36 @@ class VitePlugin extends plugin_base_1.PluginBase {
|
|
|
29
29
|
};
|
|
30
30
|
this.getHooks = () => {
|
|
31
31
|
return {
|
|
32
|
+
preStart: [
|
|
33
|
+
(0, plugin_base_1.namedHookWithTaskFn)(async (task) => {
|
|
34
|
+
if (VitePlugin.alreadyStarted)
|
|
35
|
+
return;
|
|
36
|
+
VitePlugin.alreadyStarted = true;
|
|
37
|
+
await fs_extra_1.default.remove(this.baseDir);
|
|
38
|
+
return task?.newListr([
|
|
39
|
+
{
|
|
40
|
+
title: 'Launching dev servers for renderer process code',
|
|
41
|
+
task: async () => {
|
|
42
|
+
await this.launchRendererDevServers();
|
|
43
|
+
},
|
|
44
|
+
rendererOptions: {
|
|
45
|
+
persistentOutput: true,
|
|
46
|
+
timer: { ...listr2_1.PRESET_TIMER },
|
|
47
|
+
},
|
|
48
|
+
},
|
|
49
|
+
// The main process depends on the `server.port` of the renderer process, so the renderer process is run first.
|
|
50
|
+
{
|
|
51
|
+
title: 'Compiling main process code',
|
|
52
|
+
task: async () => {
|
|
53
|
+
await this.build();
|
|
54
|
+
},
|
|
55
|
+
rendererOptions: {
|
|
56
|
+
timer: { ...listr2_1.PRESET_TIMER },
|
|
57
|
+
},
|
|
58
|
+
},
|
|
59
|
+
]);
|
|
60
|
+
}, 'Preparing vite bundles'),
|
|
61
|
+
],
|
|
32
62
|
prePackage: [
|
|
33
63
|
(0, plugin_base_1.namedHookWithTaskFn)(async () => {
|
|
34
64
|
this.isProd = true;
|
|
@@ -80,37 +110,6 @@ the generated files). Instead, it is ${JSON.stringify(pj.main)}`);
|
|
|
80
110
|
}
|
|
81
111
|
await fs_extra_1.default.writeJson(node_path_1.default.resolve(buildPath, 'package.json'), pj, { spaces: 2 });
|
|
82
112
|
};
|
|
83
|
-
this.startLogic = async () => {
|
|
84
|
-
if (VitePlugin.alreadyStarted)
|
|
85
|
-
return false;
|
|
86
|
-
VitePlugin.alreadyStarted = true;
|
|
87
|
-
await fs_extra_1.default.remove(this.baseDir);
|
|
88
|
-
return {
|
|
89
|
-
tasks: [
|
|
90
|
-
{
|
|
91
|
-
title: 'Launching dev servers for renderer process code',
|
|
92
|
-
task: async () => {
|
|
93
|
-
await this.launchRendererDevServers();
|
|
94
|
-
},
|
|
95
|
-
rendererOptions: {
|
|
96
|
-
persistentOutput: true,
|
|
97
|
-
timer: { ...listr2_1.PRESET_TIMER },
|
|
98
|
-
},
|
|
99
|
-
},
|
|
100
|
-
// The main process depends on the `server.port` of the renderer process, so the renderer process is run first.
|
|
101
|
-
{
|
|
102
|
-
title: 'Compiling main process code',
|
|
103
|
-
task: async () => {
|
|
104
|
-
await this.build();
|
|
105
|
-
},
|
|
106
|
-
rendererOptions: {
|
|
107
|
-
timer: { ...listr2_1.PRESET_TIMER },
|
|
108
|
-
},
|
|
109
|
-
},
|
|
110
|
-
],
|
|
111
|
-
result: false,
|
|
112
|
-
};
|
|
113
|
-
};
|
|
114
113
|
// Main process, Preload scripts and Worker process, etc.
|
|
115
114
|
this.build = async () => {
|
|
116
115
|
const configs = await this.configGenerator.getBuildConfig();
|
|
@@ -196,7 +195,7 @@ the generated files). Instead, it is ${JSON.stringify(pj.main)}`);
|
|
|
196
195
|
return (this.configGeneratorCache ??= new ViteConfig_1.default(this.config, this.projectDir, this.isProd));
|
|
197
196
|
}
|
|
198
197
|
}
|
|
199
|
-
exports.default = VitePlugin;
|
|
200
198
|
exports.VitePlugin = VitePlugin;
|
|
201
199
|
VitePlugin.alreadyStarted = false;
|
|
202
|
-
|
|
200
|
+
exports.default = VitePlugin;
|
|
201
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"VitePlugin.js","sourceRoot":"","sources":["../src/VitePlugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vite.base.config.d.ts","sourceRoot":"","sources":["../../src/config/vite.base.config.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAiB,MAAM,MAAM,CAAC;AAEzE,eAAO,MAAM,QAAQ,UAAsE,CAAC;AAE5F,eAAO,MAAM,QAAQ,UAAgB,CAAC;AAMtC,wBAAgB,cAAc,CAAC,GAAG,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG,UAAU,CAgBlE;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE;;
|
|
1
|
+
{"version":3,"file":"vite.base.config.d.ts","sourceRoot":"","sources":["../../src/config/vite.base.config.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAiB,MAAM,MAAM,CAAC;AAEzE,eAAO,MAAM,QAAQ,UAAsE,CAAC;AAE5F,eAAO,MAAM,QAAQ,UAAgB,CAAC;AAMtC,wBAAgB,cAAc,CAAC,GAAG,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG,UAAU,CAgBlE;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE;;EAe5C;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,SAAS,CAAC,OAAO,CAAC,uBAcrD;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAgBzD;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,QAAQ,GAAG,SAAS,GAAG,MAAM,CAiBtE"}
|
|
@@ -26,8 +26,10 @@ function getBuildConfig(env) {
|
|
|
26
26
|
exports.getBuildConfig = getBuildConfig;
|
|
27
27
|
function getDefineKeys(names) {
|
|
28
28
|
const define = {};
|
|
29
|
+
// change name from kebab case to upper snake case to agree with vite:define plugin
|
|
30
|
+
// this allows the VitePluginRendererConfig entries to contain names with dashes
|
|
29
31
|
return names.reduce((acc, name) => {
|
|
30
|
-
const NAME = name.toUpperCase();
|
|
32
|
+
const NAME = name.toUpperCase().replaceAll('-', '_');
|
|
31
33
|
const keys = {
|
|
32
34
|
VITE_DEV_SERVER_URL: `${NAME}_VITE_DEV_SERVER_URL`,
|
|
33
35
|
VITE_NAME: `${NAME}_VITE_NAME`,
|
|
@@ -87,4 +89,4 @@ function pluginHotRestart(command) {
|
|
|
87
89
|
};
|
|
88
90
|
}
|
|
89
91
|
exports.pluginHotRestart = pluginHotRestart;
|
|
90
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
92
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidml0ZS5iYXNlLmNvbmZpZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25maWcvdml0ZS5iYXNlLmNvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2Q0FBNkM7QUFLaEMsUUFBQSxRQUFRLEdBQUcsQ0FBQyxVQUFVLEVBQUUsR0FBRyw0QkFBYyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztBQUUvRSxRQUFBLFFBQVEsR0FBRyxDQUFDLEdBQUcsZ0JBQVEsQ0FBQyxDQUFDO0FBRXRDLDZDQUE2QztBQUM3QyxNQUFNLGNBQWMsR0FBa0MsRUFBRSxDQUFDO0FBQ3pELE1BQU0saUJBQWlCLEdBQTJCLEVBQUUsQ0FBQztBQUVyRCxTQUFnQixjQUFjLENBQUMsR0FBdUI7SUFDcEQsTUFBTSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLEdBQUcsR0FBRyxDQUFDO0lBRXBDLE9BQU87UUFDTCxJQUFJO1FBQ0osSUFBSTtRQUNKLEtBQUssRUFBRTtZQUNMLDREQUE0RDtZQUM1RCxXQUFXLEVBQUUsS0FBSztZQUNsQixtQ0FBbUM7WUFDbkMsTUFBTSxFQUFFLGFBQWE7WUFDckIsS0FBSyxFQUFFLE9BQU8sS0FBSyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSTtZQUN0QyxNQUFNLEVBQUUsT0FBTyxLQUFLLE9BQU87U0FDNUI7UUFDRCxXQUFXLEVBQUUsS0FBSztLQUNuQixDQUFDO0FBQ0osQ0FBQztBQWhCRCx3Q0FnQkM7QUFFRCxTQUFnQixhQUFhLENBQUMsS0FBZTtJQUMzQyxNQUFNLE1BQU0sR0FBOEMsRUFBRSxDQUFDO0lBRTdELG1GQUFtRjtJQUNuRixnRkFBZ0Y7SUFFaEYsT0FBTyxLQUFLLENBQUMsTUFBTSxD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
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { type ConfigEnv, type UserConfig } from 'vite';
|
|
2
|
-
export declare function getConfig(forgeEnv: ConfigEnv<'build'
|
|
2
|
+
export declare function getConfig(forgeEnv: ConfigEnv<'build'>, userConfig?: UserConfig): UserConfig;
|
|
3
3
|
//# sourceMappingURL=vite.main.config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vite.main.config.d.ts","sourceRoot":"","sources":["../../src/config/vite.main.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAe,KAAK,UAAU,EAAE,MAAM,MAAM,CAAC;AAIpE,wBAAgB,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG,UAAU,
|
|
1
|
+
{"version":3,"file":"vite.main.config.d.ts","sourceRoot":"","sources":["../../src/config/vite.main.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAe,KAAK,UAAU,EAAE,MAAM,MAAM,CAAC;AAIpE,wBAAgB,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,OAAO,CAAC,EAAE,UAAU,GAAE,UAAe,GAAG,UAAU,CA4B/F"}
|
|
@@ -3,16 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getConfig = void 0;
|
|
4
4
|
const vite_1 = require("vite");
|
|
5
5
|
const vite_base_config_1 = require("./vite.base.config");
|
|
6
|
-
function getConfig(forgeEnv) {
|
|
6
|
+
function getConfig(forgeEnv, userConfig = {}) {
|
|
7
7
|
const { forgeConfigSelf } = forgeEnv;
|
|
8
8
|
const define = (0, vite_base_config_1.getBuildDefine)(forgeEnv);
|
|
9
9
|
const config = {
|
|
10
10
|
build: {
|
|
11
|
-
lib: {
|
|
12
|
-
entry: forgeConfigSelf.entry,
|
|
13
|
-
fileName: () => '[name].js',
|
|
14
|
-
formats: ['cjs'],
|
|
15
|
-
},
|
|
16
11
|
rollupOptions: {
|
|
17
12
|
external: vite_base_config_1.external,
|
|
18
13
|
},
|
|
@@ -25,7 +20,15 @@ function getConfig(forgeEnv) {
|
|
|
25
20
|
mainFields: ['module', 'jsnext:main', 'jsnext'],
|
|
26
21
|
},
|
|
27
22
|
};
|
|
28
|
-
|
|
23
|
+
const buildConfig = (0, vite_base_config_1.getBuildConfig)(forgeEnv);
|
|
24
|
+
if (userConfig.build?.lib == null) {
|
|
25
|
+
config.build.lib = {
|
|
26
|
+
entry: forgeConfigSelf.entry,
|
|
27
|
+
fileName: () => '[name].js',
|
|
28
|
+
formats: ['cjs'],
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
return (0, vite_1.mergeConfig)((0, vite_1.mergeConfig)(buildConfig, config), userConfig);
|
|
29
32
|
}
|
|
30
33
|
exports.getConfig = getConfig;
|
|
31
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidml0ZS5tYWluLmNvbmZpZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25maWcvdml0ZS5tYWluLmNvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwrQkFBb0U7QUFFcEUseURBQWdHO0FBRWhHLFNBQWdCLFNBQVMsQ0FBQyxRQUE0QixFQUFFLGFBQXlCLEVBQUU7SUFDakYsTUFBTSxFQUFFLGVBQWUsRUFBRSxHQUFHLFFBQVEsQ0FBQztJQUNyQyxNQUFNLE1BQU0sR0FBRyxJQUFBLGlDQUFjLEVBQUMsUUFBUSxDQUFDLENBQUM7SUFDeEMsTUFBTSxNQUFNLEdBQWU7UUFDekIsS0FBSyxFQUFFO1lBQ0wsYUFBYSxFQUFFO2dCQUNiLFFBQVEsRUFBUiwyQkFBUTthQUNUO1NBQ0Y7UUFDRCxPQUFPLEVBQUUsQ0FBQyxJQUFBLG1DQUFnQixFQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ3RDLE1BQU07UUFDTixPQUFPLEVBQUU7WUFDUCwwQkFBMEI7WUFDMUIsVUFBVSxFQUFFLENBQUMsTUFBTSxDQUFDO1lBQ3BCLFVBQVUsRUFBRSxDQUFDLFFBQVEsRUFBRSxhQUFhLEVBQUUsUUFBUSxDQUFDO1NBQ2hEO0tBQ0YsQ0FBQztJQUNGLE1BQU0sV0FBVyxHQUFHLElBQUEsaUNBQWMsRUFBQyxRQUFRLENBQUMsQ0FBQztJQUU3QyxJQUFJLFVBQVUsQ0FBQyxLQUFLLEVBQUUsR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDO1FBQ2xDLE1BQU0sQ0FBQyxLQUFNLENBQUMsR0FBRyxHQUFHO1lBQ2xCLEtBQUssRUFBRSxlQUFlLENBQUMsS0FBSztZQUM1QixRQUFRLEVBQUUsR0FBRyxFQUFFLENBQUMsV0FBVztZQUMzQixPQUFPLEVBQUUsQ0FBQyxLQUFLLENBQUM7U0FDakIsQ0FBQztJQUNKLENBQUM7SUFFRCxPQUFPLElBQUEsa0JBQVcsRUFBQyxJQUFBLGtCQUFXLEVBQUMsV0FBVyxFQUFFLE1BQU0sQ0FBQyxFQUFFLFVBQVUsQ0FBQyxDQUFDO0FBQ25FLENBQUM7QUE1QkQsOEJBNEJDIn0=
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { type ConfigEnv, type UserConfig } from 'vite';
|
|
2
|
-
export declare function getConfig(forgeEnv: ConfigEnv<'build'
|
|
2
|
+
export declare function getConfig(forgeEnv: ConfigEnv<'build'>, userConfig?: UserConfig): UserConfig;
|
|
3
3
|
//# sourceMappingURL=vite.preload.config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vite.preload.config.d.ts","sourceRoot":"","sources":["../../src/config/vite.preload.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAe,KAAK,UAAU,EAAE,MAAM,MAAM,CAAC;AAIpE,wBAAgB,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG,UAAU,
|
|
1
|
+
{"version":3,"file":"vite.preload.config.d.ts","sourceRoot":"","sources":["../../src/config/vite.preload.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAe,KAAK,UAAU,EAAE,MAAM,MAAM,CAAC;AAIpE,wBAAgB,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,OAAO,CAAC,EAAE,UAAU,GAAE,UAAe,GAAG,UAAU,CAuB/F"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getConfig = void 0;
|
|
4
4
|
const vite_1 = require("vite");
|
|
5
5
|
const vite_base_config_1 = require("./vite.base.config");
|
|
6
|
-
function getConfig(forgeEnv) {
|
|
6
|
+
function getConfig(forgeEnv, userConfig = {}) {
|
|
7
7
|
const { forgeConfigSelf } = forgeEnv;
|
|
8
8
|
const config = {
|
|
9
9
|
build: {
|
|
@@ -23,7 +23,8 @@ function getConfig(forgeEnv) {
|
|
|
23
23
|
},
|
|
24
24
|
plugins: [(0, vite_base_config_1.pluginHotRestart)('reload')],
|
|
25
25
|
};
|
|
26
|
-
|
|
26
|
+
const buildConfig = (0, vite_base_config_1.getBuildConfig)(forgeEnv);
|
|
27
|
+
return (0, vite_1.mergeConfig)((0, vite_1.mergeConfig)(buildConfig, config), userConfig);
|
|
27
28
|
}
|
|
28
29
|
exports.getConfig = getConfig;
|
|
29
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
30
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidml0ZS5wcmVsb2FkLmNvbmZpZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25maWcvdml0ZS5wcmVsb2FkLmNvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwrQkFBb0U7QUFFcEUseURBQWdGO0FBRWhGLFNBQWdCLFNBQVMsQ0FBQyxRQUE0QixFQUFFLGFBQXlCLEVBQUU7SUFDakYsTUFBTSxFQUFFLGVBQWUsRUFBRSxHQUFHLFFBQVEsQ0FBQztJQUNyQyxNQUFNLE1BQU0sR0FBZTtRQUN6QixLQUFLLEVBQUU7WUFDTCxhQUFhLEVBQUU7Z0JBQ2IsUUFBUSxFQUFSLDJCQUFRO2dCQUNSLDRHQUE0RztnQkFDNUcsS0FBSyxFQUFFLGVBQWUsQ0FBQyxLQUFLO2dCQUM1QixNQUFNLEVBQUU7b0JBQ04sTUFBTSxFQUFFLEtBQUs7b0JBQ2IsaUNBQWlDO29CQUNqQyxvQkFBb0IsRUFBRSxJQUFJO29CQUMxQixjQUFjLEVBQUUsV0FBVztvQkFDM0IsY0FBYyxFQUFFLFdBQVc7b0JBQzNCLGNBQWMsRUFBRSxjQUFjO2lCQUMvQjthQUNGO1NBQ0Y7UUFDRCxPQUFPLEVBQUUsQ0FBQyxJQUFBLG1DQUFnQixFQUFDLFFBQVEsQ0FBQyxDQUFDO0tBQ3RDLENBQUM7SUFDRixNQUFNLFdBQVcsR0FBRyxJQUFBLGlDQUFjLEVBQUMsUUFBUSxDQUFDLENBQUM7SUFFN0MsT0FBTyxJQUFBLGtCQUFXLEVBQUMsSUFBQSxrQkFBVyxFQUFDLFdBQVcsRUFBRSxNQUFNLENBQUMsRUFBRSxVQUFVLENBQUMsQ0FBQztBQUNuRSxDQUFDO0FBdkJELDhCQXVCQyJ9
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { type ConfigEnv, type UserConfig } from 'vite';
|
|
2
|
-
export declare function getConfig(forgeEnv: ConfigEnv<'renderer'
|
|
2
|
+
export declare function getConfig(forgeEnv: ConfigEnv<'renderer'>, userConfig?: UserConfig): Record<string, any>;
|
|
3
3
|
//# sourceMappingURL=vite.renderer.config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vite.renderer.config.d.ts","sourceRoot":"","sources":["../../src/config/vite.renderer.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,
|
|
1
|
+
{"version":3,"file":"vite.renderer.config.d.ts","sourceRoot":"","sources":["../../src/config/vite.renderer.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAe,KAAK,UAAU,EAAE,MAAM,MAAM,CAAC;AAKpE,wBAAgB,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,UAAU,CAAC,EAAE,UAAU,GAAE,UAAe,uBAmBrF"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getConfig = void 0;
|
|
4
|
+
const vite_1 = require("vite");
|
|
4
5
|
const vite_base_config_1 = require("./vite.base.config");
|
|
5
6
|
// https://vitejs.dev/config
|
|
6
|
-
function getConfig(forgeEnv) {
|
|
7
|
+
function getConfig(forgeEnv, userConfig = {}) {
|
|
7
8
|
const { root, mode, forgeConfigSelf } = forgeEnv;
|
|
8
9
|
const name = forgeConfigSelf.name ?? '';
|
|
9
|
-
|
|
10
|
+
const config = {
|
|
10
11
|
root,
|
|
11
12
|
mode,
|
|
12
13
|
base: './',
|
|
@@ -19,6 +20,7 @@ function getConfig(forgeEnv) {
|
|
|
19
20
|
},
|
|
20
21
|
clearScreen: false,
|
|
21
22
|
};
|
|
23
|
+
return (0, vite_1.mergeConfig)(config, userConfig);
|
|
22
24
|
}
|
|
23
25
|
exports.getConfig = getConfig;
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidml0ZS5yZW5kZXJlci5jb25maWcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL3ZpdGUucmVuZGVyZXIuY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLCtCQUFvRTtBQUVwRSx5REFBMEQ7QUFFMUQsNEJBQTRCO0FBQzVCLFNBQWdCLFNBQVMsQ0FBQyxRQUErQixFQUFFLGFBQXlCLEVBQUU7SUFDcEYsTUFBTSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsZUFBZSxFQUFFLEdBQUcsUUFBUSxDQUFDO0lBQ2pELE1BQU0sSUFBSSxHQUFHLGVBQWUsQ0FBQyxJQUFJLElBQUksRUFBRSxDQUFDO0lBRXhDLE1BQU0sTUFBTSxHQUFlO1FBQ3pCLElBQUk7UUFDSixJQUFJO1FBQ0osSUFBSSxFQUFFLElBQUk7UUFDVixLQUFLLEVBQUU7WUFDTCxNQUFNLEVBQUUsa0JBQWtCLElBQUksRUFBRTtTQUNqQztRQUNELE9BQU8sRUFBRSxDQUFDLElBQUEsdUNBQW9CLEVBQUMsSUFBSSxDQUFDLENBQUM7UUFDckMsT0FBTyxFQUFFO1lBQ1AsZ0JBQWdCLEVBQUUsSUFBSTtTQUN2QjtRQUNELFdBQVcsRUFBRSxLQUFLO0tBQ25CLENBQUM7SUFFRixPQUFPLElBQUEsa0JBQVcsRUFBQyxNQUFNLEVBQUUsVUFBVSxDQUFDLENBQUM7QUFDekMsQ0FBQztBQW5CRCw4QkFtQkMifQ==
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
export {}; // Make this a module
|
|
2
|
+
import type { VitePluginConfig } from './src/Config';
|
|
3
|
+
|
|
4
|
+
declare global {
|
|
5
|
+
// This allows TypeScript to pick up the magic constants that's auto-generated by Forge's Vite
|
|
6
|
+
// plugin that tells the Electron app where to look for the Vite-bundled app code (depending on
|
|
7
|
+
// whether you're running in development or production).
|
|
8
|
+
const MAIN_WINDOW_VITE_DEV_SERVER_URL: string;
|
|
9
|
+
const MAIN_WINDOW_VITE_NAME: string;
|
|
10
|
+
|
|
11
|
+
interface VitePluginRuntimeKeys {
|
|
12
|
+
VITE_DEV_SERVER_URL: `${string}_VITE_DEV_SERVER_URL`;
|
|
13
|
+
VITE_NAME: `${string}_VITE_NAME`;
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
declare module 'vite' {
|
|
18
|
+
interface ConfigEnv<K extends keyof VitePluginConfig = keyof VitePluginConfig> {
|
|
19
|
+
root: string;
|
|
20
|
+
forgeConfig: VitePluginConfig;
|
|
21
|
+
forgeConfigSelf: VitePluginConfig[K][number];
|
|
22
|
+
}
|
|
23
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@electron-forge/plugin-vite",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.6.1",
|
|
4
4
|
"description": "Vite plugin for Electron Forge, lets you use Vite directly in your tooling",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -11,14 +11,11 @@
|
|
|
11
11
|
"license": "MIT",
|
|
12
12
|
"main": "dist/VitePlugin.js",
|
|
13
13
|
"typings": "dist/VitePlugin.d.ts",
|
|
14
|
-
"scripts": {
|
|
15
|
-
"test": "xvfb-maybe mocha --config ../../../.mocharc.js test/**/*_spec.ts test/*_spec.ts"
|
|
16
|
-
},
|
|
17
14
|
"dependencies": {
|
|
18
|
-
"@electron-forge/core-utils": "7.
|
|
19
|
-
"@electron-forge/plugin-base": "7.
|
|
20
|
-
"@electron-forge/shared-types": "7.
|
|
21
|
-
"@electron-forge/web-multi-logger": "7.
|
|
15
|
+
"@electron-forge/core-utils": "7.6.1",
|
|
16
|
+
"@electron-forge/plugin-base": "7.6.1",
|
|
17
|
+
"@electron-forge/shared-types": "7.6.1",
|
|
18
|
+
"@electron-forge/web-multi-logger": "7.6.1",
|
|
22
19
|
"chalk": "^4.0.0",
|
|
23
20
|
"debug": "^4.3.1",
|
|
24
21
|
"fs-extra": "^10.0.0",
|
|
@@ -28,9 +25,8 @@
|
|
|
28
25
|
"@electron/packager": "^18.3.5",
|
|
29
26
|
"@malept/cross-spawn-promise": "^2.0.0",
|
|
30
27
|
"@types/node": "^18.0.3",
|
|
31
|
-
"chai": "^4.3.3",
|
|
32
|
-
"mocha": "^9.0.1",
|
|
33
28
|
"vite": "^5.0.12",
|
|
29
|
+
"vitest": "^3.0.3",
|
|
34
30
|
"which": "^2.0.2",
|
|
35
31
|
"xvfb-maybe": "^0.2.1"
|
|
36
32
|
},
|
|
@@ -42,7 +38,8 @@
|
|
|
42
38
|
},
|
|
43
39
|
"files": [
|
|
44
40
|
"dist",
|
|
45
|
-
"src"
|
|
41
|
+
"src",
|
|
42
|
+
"forge-vite-env.d.ts"
|
|
46
43
|
],
|
|
47
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "a9cac9ad3df1e936bde020f68870b6ed6ffbd282"
|
|
48
45
|
}
|
package/src/ViteConfig.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import debug from 'debug';
|
|
2
|
-
import { loadConfigFromFile
|
|
2
|
+
import { loadConfigFromFile } from 'vite';
|
|
3
3
|
|
|
4
4
|
import { getConfig as getMainViteConfig } from './config/vite.main.config';
|
|
5
5
|
import { getConfig as getPreloadViteConfig } from './config/vite.preload.config';
|
|
@@ -31,14 +31,14 @@ export default class ViteConfigGenerator {
|
|
|
31
31
|
};
|
|
32
32
|
|
|
33
33
|
// `configEnv` is to be passed as an arguments when the user export a function in `vite.config.js`.
|
|
34
|
-
const userConfig = (await loadConfigFromFile(configEnv, buildConfig.config))?.config
|
|
34
|
+
const userConfig = (await loadConfigFromFile(configEnv, buildConfig.config))?.config;
|
|
35
35
|
switch (target) {
|
|
36
36
|
case 'main':
|
|
37
|
-
return
|
|
37
|
+
return getMainViteConfig(configEnv as ConfigEnv<'build'>, userConfig);
|
|
38
38
|
case 'preload':
|
|
39
|
-
return
|
|
39
|
+
return getPreloadViteConfig(configEnv as ConfigEnv<'build'>, userConfig);
|
|
40
40
|
case 'renderer':
|
|
41
|
-
return
|
|
41
|
+
return getRendererViteConfig(configEnv as ConfigEnv<'renderer'>, userConfig);
|
|
42
42
|
default:
|
|
43
43
|
throw new Error(`Unknown target: ${target}, expected 'main', 'preload' or 'renderer'`);
|
|
44
44
|
}
|
package/src/VitePlugin.ts
CHANGED
|
@@ -11,9 +11,9 @@ import { onBuildDone } from './util/plugins';
|
|
|
11
11
|
import ViteConfigGenerator from './ViteConfig';
|
|
12
12
|
|
|
13
13
|
import type { VitePluginConfig } from './Config';
|
|
14
|
-
import type { ForgeMultiHookMap, ResolvedForgeConfig
|
|
14
|
+
import type { ForgeMultiHookMap, ResolvedForgeConfig } from '@electron-forge/shared-types';
|
|
15
15
|
import type { AddressInfo } from 'node:net';
|
|
16
|
-
// eslint-disable-next-line
|
|
16
|
+
// eslint-disable-next-line n/no-extraneous-import
|
|
17
17
|
import type { RollupWatcher } from 'rollup';
|
|
18
18
|
|
|
19
19
|
const d = debug('electron-forge:plugin:vite');
|
|
@@ -56,6 +56,37 @@ export default class VitePlugin extends PluginBase<VitePluginConfig> {
|
|
|
56
56
|
|
|
57
57
|
getHooks = (): ForgeMultiHookMap => {
|
|
58
58
|
return {
|
|
59
|
+
preStart: [
|
|
60
|
+
namedHookWithTaskFn<'preStart'>(async (task) => {
|
|
61
|
+
if (VitePlugin.alreadyStarted) return;
|
|
62
|
+
VitePlugin.alreadyStarted = true;
|
|
63
|
+
|
|
64
|
+
await fs.remove(this.baseDir);
|
|
65
|
+
|
|
66
|
+
return task?.newListr([
|
|
67
|
+
{
|
|
68
|
+
title: 'Launching dev servers for renderer process code',
|
|
69
|
+
task: async () => {
|
|
70
|
+
await this.launchRendererDevServers();
|
|
71
|
+
},
|
|
72
|
+
rendererOptions: {
|
|
73
|
+
persistentOutput: true,
|
|
74
|
+
timer: { ...PRESET_TIMER },
|
|
75
|
+
},
|
|
76
|
+
},
|
|
77
|
+
// The main process depends on the `server.port` of the renderer process, so the renderer process is run first.
|
|
78
|
+
{
|
|
79
|
+
title: 'Compiling main process code',
|
|
80
|
+
task: async () => {
|
|
81
|
+
await this.build();
|
|
82
|
+
},
|
|
83
|
+
rendererOptions: {
|
|
84
|
+
timer: { ...PRESET_TIMER },
|
|
85
|
+
},
|
|
86
|
+
},
|
|
87
|
+
]) as any;
|
|
88
|
+
}, 'Preparing vite bundles'),
|
|
89
|
+
],
|
|
59
90
|
prePackage: [
|
|
60
91
|
namedHookWithTaskFn<'prePackage'>(async () => {
|
|
61
92
|
this.isProd = true;
|
|
@@ -118,39 +149,6 @@ the generated files). Instead, it is ${JSON.stringify(pj.main)}`);
|
|
|
118
149
|
await fs.writeJson(path.resolve(buildPath, 'package.json'), pj, { spaces: 2 });
|
|
119
150
|
};
|
|
120
151
|
|
|
121
|
-
startLogic = async (): Promise<StartResult> => {
|
|
122
|
-
if (VitePlugin.alreadyStarted) return false;
|
|
123
|
-
VitePlugin.alreadyStarted = true;
|
|
124
|
-
|
|
125
|
-
await fs.remove(this.baseDir);
|
|
126
|
-
|
|
127
|
-
return {
|
|
128
|
-
tasks: [
|
|
129
|
-
{
|
|
130
|
-
title: 'Launching dev servers for renderer process code',
|
|
131
|
-
task: async () => {
|
|
132
|
-
await this.launchRendererDevServers();
|
|
133
|
-
},
|
|
134
|
-
rendererOptions: {
|
|
135
|
-
persistentOutput: true,
|
|
136
|
-
timer: { ...PRESET_TIMER },
|
|
137
|
-
},
|
|
138
|
-
},
|
|
139
|
-
// The main process depends on the `server.port` of the renderer process, so the renderer process is run first.
|
|
140
|
-
{
|
|
141
|
-
title: 'Compiling main process code',
|
|
142
|
-
task: async () => {
|
|
143
|
-
await this.build();
|
|
144
|
-
},
|
|
145
|
-
rendererOptions: {
|
|
146
|
-
timer: { ...PRESET_TIMER },
|
|
147
|
-
},
|
|
148
|
-
},
|
|
149
|
-
],
|
|
150
|
-
result: false,
|
|
151
|
-
};
|
|
152
|
-
};
|
|
153
|
-
|
|
154
152
|
// Main process, Preload scripts and Worker process, etc.
|
|
155
153
|
build = async (): Promise<void> => {
|
|
156
154
|
const configs = await this.configGenerator.getBuildConfig();
|
|
@@ -32,8 +32,11 @@ export function getBuildConfig(env: ConfigEnv<'build'>): UserConfig {
|
|
|
32
32
|
export function getDefineKeys(names: string[]) {
|
|
33
33
|
const define: { [name: string]: VitePluginRuntimeKeys } = {};
|
|
34
34
|
|
|
35
|
+
// change name from kebab case to upper snake case to agree with vite:define plugin
|
|
36
|
+
// this allows the VitePluginRendererConfig entries to contain names with dashes
|
|
37
|
+
|
|
35
38
|
return names.reduce((acc, name) => {
|
|
36
|
-
const NAME = name.toUpperCase();
|
|
39
|
+
const NAME = name.toUpperCase().replaceAll('-', '_');
|
|
37
40
|
const keys: VitePluginRuntimeKeys = {
|
|
38
41
|
VITE_DEV_SERVER_URL: `${NAME}_VITE_DEV_SERVER_URL`,
|
|
39
42
|
VITE_NAME: `${NAME}_VITE_NAME`,
|
|
@@ -2,16 +2,11 @@ import { type ConfigEnv, mergeConfig, type UserConfig } from 'vite';
|
|
|
2
2
|
|
|
3
3
|
import { external, getBuildConfig, getBuildDefine, pluginHotRestart } from './vite.base.config';
|
|
4
4
|
|
|
5
|
-
export function getConfig(forgeEnv: ConfigEnv<'build'
|
|
5
|
+
export function getConfig(forgeEnv: ConfigEnv<'build'>, userConfig: UserConfig = {}): UserConfig {
|
|
6
6
|
const { forgeConfigSelf } = forgeEnv;
|
|
7
7
|
const define = getBuildDefine(forgeEnv);
|
|
8
8
|
const config: UserConfig = {
|
|
9
9
|
build: {
|
|
10
|
-
lib: {
|
|
11
|
-
entry: forgeConfigSelf.entry,
|
|
12
|
-
fileName: () => '[name].js',
|
|
13
|
-
formats: ['cjs'],
|
|
14
|
-
},
|
|
15
10
|
rollupOptions: {
|
|
16
11
|
external,
|
|
17
12
|
},
|
|
@@ -24,6 +19,15 @@ export function getConfig(forgeEnv: ConfigEnv<'build'>): UserConfig {
|
|
|
24
19
|
mainFields: ['module', 'jsnext:main', 'jsnext'],
|
|
25
20
|
},
|
|
26
21
|
};
|
|
22
|
+
const buildConfig = getBuildConfig(forgeEnv);
|
|
23
|
+
|
|
24
|
+
if (userConfig.build?.lib == null) {
|
|
25
|
+
config.build!.lib = {
|
|
26
|
+
entry: forgeConfigSelf.entry,
|
|
27
|
+
fileName: () => '[name].js',
|
|
28
|
+
formats: ['cjs'],
|
|
29
|
+
};
|
|
30
|
+
}
|
|
27
31
|
|
|
28
|
-
return mergeConfig(
|
|
32
|
+
return mergeConfig(mergeConfig(buildConfig, config), userConfig);
|
|
29
33
|
}
|
|
@@ -2,7 +2,7 @@ import { type ConfigEnv, mergeConfig, type UserConfig } from 'vite';
|
|
|
2
2
|
|
|
3
3
|
import { external, getBuildConfig, pluginHotRestart } from './vite.base.config';
|
|
4
4
|
|
|
5
|
-
export function getConfig(forgeEnv: ConfigEnv<'build'
|
|
5
|
+
export function getConfig(forgeEnv: ConfigEnv<'build'>, userConfig: UserConfig = {}): UserConfig {
|
|
6
6
|
const { forgeConfigSelf } = forgeEnv;
|
|
7
7
|
const config: UserConfig = {
|
|
8
8
|
build: {
|
|
@@ -22,6 +22,7 @@ export function getConfig(forgeEnv: ConfigEnv<'build'>): UserConfig {
|
|
|
22
22
|
},
|
|
23
23
|
plugins: [pluginHotRestart('reload')],
|
|
24
24
|
};
|
|
25
|
+
const buildConfig = getBuildConfig(forgeEnv);
|
|
25
26
|
|
|
26
|
-
return mergeConfig(
|
|
27
|
+
return mergeConfig(mergeConfig(buildConfig, config), userConfig);
|
|
27
28
|
}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import { type ConfigEnv, type UserConfig } from 'vite';
|
|
1
|
+
import { type ConfigEnv, mergeConfig, type UserConfig } from 'vite';
|
|
2
2
|
|
|
3
3
|
import { pluginExposeRenderer } from './vite.base.config';
|
|
4
4
|
|
|
5
5
|
// https://vitejs.dev/config
|
|
6
|
-
export function getConfig(forgeEnv: ConfigEnv<'renderer'
|
|
6
|
+
export function getConfig(forgeEnv: ConfigEnv<'renderer'>, userConfig: UserConfig = {}) {
|
|
7
7
|
const { root, mode, forgeConfigSelf } = forgeEnv;
|
|
8
8
|
const name = forgeConfigSelf.name ?? '';
|
|
9
9
|
|
|
10
|
-
|
|
10
|
+
const config: UserConfig = {
|
|
11
11
|
root,
|
|
12
12
|
mode,
|
|
13
13
|
base: './',
|
|
@@ -19,5 +19,7 @@ export function getConfig(forgeEnv: ConfigEnv<'renderer'>) {
|
|
|
19
19
|
preserveSymlinks: true,
|
|
20
20
|
},
|
|
21
21
|
clearScreen: false,
|
|
22
|
-
}
|
|
22
|
+
};
|
|
23
|
+
|
|
24
|
+
return mergeConfig(config, userConfig);
|
|
23
25
|
}
|