@electron-forge/plugin-vite 7.8.1 → 7.8.2
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 +2 -2
- package/dist/VitePlugin.d.ts +12 -4
- package/dist/VitePlugin.d.ts.map +1 -1
- package/dist/VitePlugin.js +156 -67
- package/package.json +5 -7
- package/src/ViteConfig.ts +1 -1
- package/src/VitePlugin.ts +199 -91
package/dist/ViteConfig.d.ts
CHANGED
|
@@ -8,7 +8,7 @@ export default class ViteConfigGenerator {
|
|
|
8
8
|
constructor(pluginConfig: VitePluginConfig, projectDir: string, isProd: boolean);
|
|
9
9
|
resolveConfig(buildConfig: VitePluginBuildConfig | VitePluginRendererConfig, target: Target): Promise<UserConfig>;
|
|
10
10
|
get mode(): string;
|
|
11
|
-
|
|
11
|
+
getBuildConfigs(): Promise<UserConfig[]>;
|
|
12
12
|
getRendererConfig(): Promise<UserConfig[]>;
|
|
13
13
|
}
|
|
14
14
|
export {};
|
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,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,
|
|
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,eAAe,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAaxC,iBAAiB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;CAYjD"}
|
package/dist/ViteConfig.js
CHANGED
|
@@ -46,7 +46,7 @@ class ViteConfigGenerator {
|
|
|
46
46
|
// The `mode` set by the end user in `vite.config.js` has a higher priority.
|
|
47
47
|
return this.isProd ? 'production' : 'development';
|
|
48
48
|
}
|
|
49
|
-
async
|
|
49
|
+
async getBuildConfigs() {
|
|
50
50
|
if (!Array.isArray(this.pluginConfig.build)) {
|
|
51
51
|
throw new Error('"config.build" must be an Array');
|
|
52
52
|
}
|
|
@@ -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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVml0ZUNvbmZpZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9WaXRlQ29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsa0RBQTBCO0FBQzFCLCtCQUEwQztBQUUxQyxnRUFBMkU7QUFDM0Usc0VBQWlGO0FBQ2pGLHdFQUFtRjtBQUtuRixNQUFNLENBQUMsR0FBRyxJQUFBLGVBQUssRUFBQyx3Q0FBd0MsQ0FBQyxDQUFDO0FBSTFELE1BQXFCLG1CQUFtQjtJQUN0QyxZQUE2QixZQUE4QixFQUFtQixVQUFrQixFQUFtQixNQUFlO1FBQXJHLGlCQUFZLEdBQVosWUFBWSxDQUFrQjtRQUFtQixlQUFVLEdBQVYsVUFBVSxDQUFRO1FBQW1CLFdBQU0sR0FBTixNQUFNLENBQVM7UUFDaEksQ0FBQyxDQUFDLGNBQWMsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDL0IsQ0FBQztJQUVELEtBQUssQ0FBQyxhQUFhLENBQUMsV0FBNkQsRUFBRSxNQUFjO1FBQy9GLE1BQU0sU0FBUyxHQUFjO1lBQzNCLHVEQUF1RDtZQUN2RCxPQUFPLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxPQUFPO1lBQ3hDLDBDQUEwQztZQUMxQyxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUk7WUFFZiw2QkFBNkI7WUFDN0IsSUFBSSxFQUFFLElBQUksQ0FBQyxVQUFVO1lBQ3JCLFdBQVcsRUFBRSxJQUFJLENBQUMsWUFBWTtZQUM5QixlQUFlLEVBQUUsV0FBVztTQUM3QixDQUFDO1FBRUYsbUdBQW1HO1FBQ25HLE1BQU0sVUFBVSxHQUFHLENBQUMsTUFBTSxJQUFBLHlCQUFrQixFQUFDLFNBQVMsRUFBRSxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDckYsUUFBUSxNQUFNLEVBQUUsQ0FBQztZQUNmLEtBQUssTUFBTTtnQkFDVCxPQUFPLElBQUEsNEJBQWlCLEVBQUMsU0FBK0IsRUFBRSxVQUFVLENBQUMsQ0FBQztZQUN4RSxLQUFLLFNBQVM7Z0JBQ1osT0FBTyxJQUFBLCtCQUFvQixFQUFDLFNBQStCLEVBQUUsVUFBVSxDQUFDLENBQUM7WUFDM0UsS0FBSyxVQUFVO2dCQUNiLE9BQU8sSUFBQSxnQ0FBcUIsRUFBQyxTQUFrQyxFQUFFLFVBQVUsQ0FBQyxDQUFDO1lBQy9FO2dCQUNFLE1BQU0sSUFBSSxLQUFLLENBQUMsbUJBQW1CLE1BQU0sNENBQTRDLENBQUMsQ0FBQztRQUMzRixDQUFDO0lBQ0gsQ0FBQztJQUVELElBQUksSUFBSTtRQUNOLDhDQUE4QztRQUM5QyxpSEFBaUg7UUFDakgsNEVBQTRFO1FBQzVFLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxhQUFhLENBQUM7SUFDcEQsQ0FBQztJQUVELEtBQUssQ0FBQyxlQUFlO1FBQ25CLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztZQUM1QyxNQUFNLElBQUksS0FBSyxDQUFDLGlDQUFpQyxDQUFDLENBQUM7UUFDckQsQ0FBQztRQUVELE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsS0FBSztZQUNyQyxrREFBa0Q7YUFDakQsTUFBTSxDQUFDLENBQUMsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDO2FBQzlCLEdBQUcsQ0FBQyxDQUFDLFdBQVcsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxXQUFXLEVBQUUsV0FBVyxDQUFDLE1BQU0sSUFBSSxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBRXZGLE9BQU8sTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3BDLENBQUM7SUFFRCxLQUFLLENBQUMsaUJBQWlCO1FBQ3JCLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQztZQUMvQyxNQUFNLElBQUksS0FBSyxDQUFDLG9DQUFvQyxDQUFDLENBQUM7UUFDeEQsQ0FBQztRQUVELE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsUUFBUTtZQUN4QyxrREFBa0Q7YUFDakQsTUFBTSxDQUFDLENBQUMsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDO2FBQzlCLEdBQUcsQ0FBQyxDQUFDLFdBQVcsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxXQUFXLEVBQUUsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUVyRSxPQUFPLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNwQyxDQUFDO0NBQ0Y7QUFoRUQsc0NBZ0VDIn0=
|
package/dist/VitePlugin.d.ts
CHANGED
|
@@ -1,24 +1,32 @@
|
|
|
1
1
|
import { PluginBase } from '@electron-forge/plugin-base';
|
|
2
|
+
import { Listr } from 'listr2';
|
|
2
3
|
import type { VitePluginConfig } from './Config';
|
|
3
|
-
import type { ForgeMultiHookMap, ResolvedForgeConfig } from '@electron-forge/shared-types';
|
|
4
|
+
import type { ForgeListrTask, ForgeMultiHookMap, ResolvedForgeConfig } from '@electron-forge/shared-types';
|
|
4
5
|
export default class VitePlugin extends PluginBase<VitePluginConfig> {
|
|
5
6
|
private static alreadyStarted;
|
|
6
7
|
name: string;
|
|
7
8
|
private isProd;
|
|
9
|
+
/**
|
|
10
|
+
* Path to the root of the Electron app
|
|
11
|
+
*/
|
|
8
12
|
private projectDir;
|
|
13
|
+
/**
|
|
14
|
+
* Path where Vite output is generated. Usually `${projectDir}/.vite`
|
|
15
|
+
*/
|
|
9
16
|
private baseDir;
|
|
10
17
|
private configGeneratorCache;
|
|
11
18
|
private watchers;
|
|
12
19
|
private servers;
|
|
20
|
+
private timeFormatter;
|
|
13
21
|
init: (dir: string) => void;
|
|
14
22
|
setDirectories(dir: string): void;
|
|
15
23
|
private get configGenerator();
|
|
16
24
|
getHooks: () => ForgeMultiHookMap;
|
|
17
25
|
resolveForgeConfig: (forgeConfig: ResolvedForgeConfig) => Promise<ResolvedForgeConfig>;
|
|
18
26
|
packageAfterCopy: (_forgeConfig: ResolvedForgeConfig, buildPath: string) => Promise<void>;
|
|
19
|
-
build: () => Promise<void>;
|
|
20
|
-
buildRenderer: () => Promise<
|
|
21
|
-
launchRendererDevServers: () => Promise<
|
|
27
|
+
build: (task?: ForgeListrTask<null>) => Promise<Listr | void>;
|
|
28
|
+
buildRenderer: (task?: ForgeListrTask<null>) => Promise<Listr<NewCtx, any, any> | undefined>;
|
|
29
|
+
launchRendererDevServers: (task?: ForgeListrTask<null>) => Promise<Listr<NewCtx, any, any> | undefined>;
|
|
22
30
|
exitHandler: (options: {
|
|
23
31
|
cleanup?: boolean;
|
|
24
32
|
exit?: boolean;
|
package/dist/VitePlugin.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VitePlugin.d.ts","sourceRoot":"","sources":["../src/VitePlugin.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"VitePlugin.d.ts","sourceRoot":"","sources":["../src/VitePlugin.ts"],"names":[],"mappings":"AAKA,OAAO,EAAuB,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAI9E,OAAO,EAAE,KAAK,EAAgB,MAAM,QAAQ,CAAC;AAM7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAK3G,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;IAEvB;;OAEG;IACH,OAAO,CAAC,UAAU,CAAU;IAE5B;;OAEG;IACH,OAAO,CAAC,OAAO,CAAU;IAEzB,OAAO,CAAC,oBAAoB,CAAuB;IAEnD,OAAO,CAAC,QAAQ,CAAmC;IAEnD,OAAO,CAAC,OAAO,CAA4B;IAG3C,OAAO,CAAC,aAAa,CAIlB;IAEH,IAAI,QAAS,MAAM,KAAG,IAAI,CAUxB;IAEK,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAKxC,OAAO,KAAK,eAAe,GAE1B;IAED,QAAQ,QAAO,iBAAiB,CA8E9B;IAEF,kBAAkB,gBAAuB,mBAAmB,KAAG,QAAQ,mBAAmB,CAAC,CAwBzF;IAEF,gBAAgB,iBAAwB,mBAAmB,aAAa,MAAM,KAAG,QAAQ,IAAI,CAAC,CAc5F;IAGF,KAAK,UAAiB,eAAe,IAAI,CAAC,KAAG,QAAQ,KAAK,GAAG,IAAI,CAAC,CAyDhE;IAGF,aAAa,UAAiB,eAAe,IAAI,CAAC,kDAchD;IAEF,wBAAwB,UAAiB,eAAe,IAAI,CAAC,kDAiC3D;IAEF,WAAW,YAAa;QAAE,OAAO,CAAC,EAAE,OAAO,CAAC;QAAC,IAAI,CAAC,EAAE,OAAO,CAAA;KAAE,QAAQ,KAAK,KAAG,IAAI,CAiB/E;CACH;AAuBD,OAAO,EAAE,UAAU,EAAE,CAAC"}
|
package/dist/VitePlugin.js
CHANGED
|
@@ -4,6 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.VitePlugin = void 0;
|
|
7
|
+
// TODO(erickzhao): Remove this when upgrading to Vite 6 and converting to ESM
|
|
8
|
+
process.env.VITE_CJS_IGNORE_WARNING = 'true';
|
|
7
9
|
const node_path_1 = __importDefault(require("node:path"));
|
|
8
10
|
const plugin_base_1 = require("@electron-forge/plugin-base");
|
|
9
11
|
const chalk_1 = __importDefault(require("chalk"));
|
|
@@ -21,11 +23,21 @@ class VitePlugin extends plugin_base_1.PluginBase {
|
|
|
21
23
|
this.isProd = false;
|
|
22
24
|
this.watchers = [];
|
|
23
25
|
this.servers = [];
|
|
26
|
+
// Matches the format of the default Vite logger
|
|
27
|
+
this.timeFormatter = new Intl.DateTimeFormat(undefined, {
|
|
28
|
+
hour: 'numeric',
|
|
29
|
+
minute: 'numeric',
|
|
30
|
+
second: 'numeric',
|
|
31
|
+
});
|
|
24
32
|
this.init = (dir) => {
|
|
25
33
|
this.setDirectories(dir);
|
|
26
34
|
d('hooking process events');
|
|
27
|
-
process.on('exit', (_code) =>
|
|
28
|
-
|
|
35
|
+
process.on('exit', (_code) => {
|
|
36
|
+
this.exitHandler({ cleanup: true });
|
|
37
|
+
});
|
|
38
|
+
process.on('SIGINT', (_signal) => {
|
|
39
|
+
this.exitHandler({ exit: true });
|
|
40
|
+
});
|
|
29
41
|
};
|
|
30
42
|
this.getHooks = () => {
|
|
31
43
|
return {
|
|
@@ -34,12 +46,15 @@ class VitePlugin extends plugin_base_1.PluginBase {
|
|
|
34
46
|
if (VitePlugin.alreadyStarted)
|
|
35
47
|
return;
|
|
36
48
|
VitePlugin.alreadyStarted = true;
|
|
49
|
+
d(`preStart: removing old content from ${this.baseDir}`);
|
|
37
50
|
await fs_extra_1.default.remove(this.baseDir);
|
|
38
51
|
return task?.newListr([
|
|
39
52
|
{
|
|
40
|
-
title: 'Launching dev servers for renderer process code',
|
|
41
|
-
task: async () => {
|
|
42
|
-
await this.launchRendererDevServers();
|
|
53
|
+
title: 'Launching Vite dev servers for renderer process code...',
|
|
54
|
+
task: async (_ctx, task) => {
|
|
55
|
+
const result = await this.launchRendererDevServers(task);
|
|
56
|
+
task.title = 'Launched Vite dev servers for renderer process code';
|
|
57
|
+
return result;
|
|
43
58
|
},
|
|
44
59
|
rendererOptions: {
|
|
45
60
|
persistentOutput: true,
|
|
@@ -48,23 +63,41 @@ class VitePlugin extends plugin_base_1.PluginBase {
|
|
|
48
63
|
},
|
|
49
64
|
// The main process depends on the `server.port` of the renderer process, so the renderer process is run first.
|
|
50
65
|
{
|
|
51
|
-
title: '
|
|
52
|
-
task: async () => {
|
|
53
|
-
await this.build();
|
|
66
|
+
title: 'Building main process and preload bundles...',
|
|
67
|
+
task: async (_ctx, task) => {
|
|
68
|
+
const result = await this.build(task);
|
|
69
|
+
task.title = 'Built main process and preload bundles';
|
|
70
|
+
return result;
|
|
54
71
|
},
|
|
55
72
|
rendererOptions: {
|
|
73
|
+
persistentOutput: true,
|
|
56
74
|
timer: { ...listr2_1.PRESET_TIMER },
|
|
57
75
|
},
|
|
58
76
|
},
|
|
59
|
-
]);
|
|
60
|
-
}, 'Preparing
|
|
77
|
+
], { concurrent: false });
|
|
78
|
+
}, 'Preparing Vite bundles'),
|
|
61
79
|
],
|
|
62
80
|
prePackage: [
|
|
63
|
-
(0, plugin_base_1.namedHookWithTaskFn)(async () => {
|
|
81
|
+
(0, plugin_base_1.namedHookWithTaskFn)(async (task) => {
|
|
64
82
|
this.isProd = true;
|
|
65
83
|
await fs_extra_1.default.remove(this.baseDir);
|
|
66
|
-
|
|
67
|
-
|
|
84
|
+
return task?.newListr([
|
|
85
|
+
{
|
|
86
|
+
title: 'Building main and preload targets...',
|
|
87
|
+
task: async (_ctx, subtask) => {
|
|
88
|
+
const results = await this.build(subtask);
|
|
89
|
+
return results;
|
|
90
|
+
},
|
|
91
|
+
},
|
|
92
|
+
{
|
|
93
|
+
title: 'Building renderer targets...',
|
|
94
|
+
task: async (_ctx, subtask) => {
|
|
95
|
+
const results = await this.buildRenderer(subtask);
|
|
96
|
+
return results;
|
|
97
|
+
},
|
|
98
|
+
},
|
|
99
|
+
], { concurrent: true });
|
|
100
|
+
}, 'Building production Vite bundles'),
|
|
68
101
|
],
|
|
69
102
|
postStart: async (_config, child) => {
|
|
70
103
|
d('hooking electron process exit');
|
|
@@ -103,7 +136,7 @@ Your packaged app may be larger than expected if you dont ignore everything othe
|
|
|
103
136
|
if (!pj.main?.includes('.vite/')) {
|
|
104
137
|
throw new Error(`Electron Forge is configured to use the Vite plugin. The plugin expects the
|
|
105
138
|
"main" entry point in "package.json" to be ".vite/*" (where the plugin outputs
|
|
106
|
-
the generated files). Instead, it is ${JSON.stringify(pj.main)}
|
|
139
|
+
the generated files). Instead, it is ${JSON.stringify(pj.main)}.`);
|
|
107
140
|
}
|
|
108
141
|
if (pj.config) {
|
|
109
142
|
delete pj.config.forge;
|
|
@@ -111,59 +144,98 @@ the generated files). Instead, it is ${JSON.stringify(pj.main)}`);
|
|
|
111
144
|
await fs_extra_1.default.writeJson(node_path_1.default.resolve(buildPath, 'package.json'), pj, { spaces: 2 });
|
|
112
145
|
};
|
|
113
146
|
// Main process, Preload scripts and Worker process, etc.
|
|
114
|
-
this.build = async () => {
|
|
115
|
-
const configs = await this.configGenerator.
|
|
116
|
-
const
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
//
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
147
|
+
this.build = async (task) => {
|
|
148
|
+
const configs = await this.configGenerator.getBuildConfigs();
|
|
149
|
+
const isRollupWatcher = (x) => x && typeof x === 'object' && 'on' in x && typeof x.on === 'function' && 'close' in x && typeof x.close === 'function';
|
|
150
|
+
return task?.newListr(configs.map((userConfig) => {
|
|
151
|
+
const target = (userConfig.build?.rollupOptions?.input || (typeof userConfig.build?.lib !== 'boolean' && userConfig.build?.lib?.entry)) ?? '';
|
|
152
|
+
return {
|
|
153
|
+
title: `Building ${chalk_1.default.green(target)} target`,
|
|
154
|
+
task: async (_ctx, subtask) => {
|
|
155
|
+
// We wrap this function in a Promise to ensure that the task is marked as completed
|
|
156
|
+
// only after all bundles are done generated. This is done in the `closeBundle` Rollup hook
|
|
157
|
+
// rather than when the `vite.build` promise resolves.
|
|
158
|
+
await new Promise((resolve, reject) => {
|
|
159
|
+
vite_1.default
|
|
160
|
+
.build({
|
|
161
|
+
// Avoid recursive builds caused by users configuring @electron-forge/plugin-vite in Vite config file.
|
|
162
|
+
configFile: false,
|
|
163
|
+
logLevel: 'silent', // We suppress Vite output and instead log lines using RollupWatcher events
|
|
164
|
+
...userConfig,
|
|
165
|
+
plugins: [(0, plugins_1.onBuildDone)(resolve), ...(userConfig.plugins ?? [])],
|
|
166
|
+
clearScreen: false,
|
|
167
|
+
})
|
|
168
|
+
.then((result) => {
|
|
169
|
+
if (isRollupWatcher(result)) {
|
|
170
|
+
result.on('event', (event) => {
|
|
171
|
+
if (event.code === 'ERROR') {
|
|
172
|
+
console.error(`\n${this.timeFormatter.format(new Date())} ${event.error.message}`);
|
|
173
|
+
reject(event.error);
|
|
174
|
+
}
|
|
175
|
+
else if (event.code === 'BUNDLE_END') {
|
|
176
|
+
console.log(`${chalk_1.default.dim(this.timeFormatter.format(new Date()))} ${chalk_1.default.cyan.bold('[@electron-forge/plugin-vite]')} ${chalk_1.default.green('target built')} ${chalk_1.default.dim(target)}`);
|
|
177
|
+
}
|
|
178
|
+
});
|
|
179
|
+
this.watchers.push(result);
|
|
180
|
+
}
|
|
181
|
+
else {
|
|
182
|
+
subtask.title = `Built target ${chalk_1.default.dim(target)}`;
|
|
183
|
+
}
|
|
184
|
+
return result;
|
|
185
|
+
})
|
|
186
|
+
.catch(reject);
|
|
187
|
+
});
|
|
188
|
+
},
|
|
189
|
+
rendererOptions: {
|
|
190
|
+
persistentOutput: true,
|
|
191
|
+
},
|
|
192
|
+
exitOnError: true,
|
|
193
|
+
};
|
|
194
|
+
}), {
|
|
195
|
+
concurrent: true,
|
|
196
|
+
});
|
|
138
197
|
};
|
|
139
198
|
// Renderer process
|
|
140
|
-
this.buildRenderer = async () => {
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
199
|
+
this.buildRenderer = async (task) => {
|
|
200
|
+
const rendererConfigs = await this.configGenerator.getRendererConfig();
|
|
201
|
+
return task?.newListr(rendererConfigs.map((userConfig) => ({
|
|
202
|
+
task: async (_ctx, subtask) => {
|
|
203
|
+
await vite_1.default.build({
|
|
204
|
+
configFile: false,
|
|
205
|
+
logLevel: 'error',
|
|
206
|
+
...userConfig,
|
|
207
|
+
});
|
|
208
|
+
subtask.title = `Built target ${chalk_1.default.dim(node_path_1.default.basename(userConfig.build?.outDir ?? ''))}`;
|
|
209
|
+
},
|
|
210
|
+
})));
|
|
147
211
|
};
|
|
148
|
-
this.launchRendererDevServers = async () => {
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
if (
|
|
162
|
-
|
|
163
|
-
|
|
212
|
+
this.launchRendererDevServers = async (task) => {
|
|
213
|
+
const rendererConfigs = await this.configGenerator.getRendererConfig();
|
|
214
|
+
return task?.newListr(rendererConfigs.map((userConfig) => ({
|
|
215
|
+
title: `Target ${chalk_1.default.cyan(node_path_1.default.basename(userConfig.build?.outDir ?? ''))}`,
|
|
216
|
+
task: async (_ctx, subtask) => {
|
|
217
|
+
const viteDevServer = await vite_1.default.createServer({
|
|
218
|
+
configFile: false,
|
|
219
|
+
...userConfig,
|
|
220
|
+
});
|
|
221
|
+
await viteDevServer.listen();
|
|
222
|
+
const urls = getServerURLs(viteDevServer.resolvedUrls);
|
|
223
|
+
subtask.output = urls;
|
|
224
|
+
this.servers.push(viteDevServer);
|
|
225
|
+
if (viteDevServer.httpServer) {
|
|
226
|
+
// Make sure that `getDefines` in VitePlugin.ts gets the correct `server.port`. (#3198)
|
|
227
|
+
const addressInfo = viteDevServer.httpServer.address();
|
|
228
|
+
const isAddressInfo = (x) => (typeof x === 'object' ? typeof x?.address === 'string' : false);
|
|
229
|
+
if (isAddressInfo(addressInfo)) {
|
|
230
|
+
userConfig.server ??= {};
|
|
231
|
+
userConfig.server.port = addressInfo.port;
|
|
232
|
+
}
|
|
164
233
|
}
|
|
165
|
-
}
|
|
166
|
-
|
|
234
|
+
},
|
|
235
|
+
rendererOptions: {
|
|
236
|
+
persistentOutput: true,
|
|
237
|
+
},
|
|
238
|
+
})));
|
|
167
239
|
};
|
|
168
240
|
this.exitHandler = (options, err) => {
|
|
169
241
|
d('handling process exit with:', options);
|
|
@@ -181,10 +253,8 @@ the generated files). Instead, it is ${JSON.stringify(pj.main)}`);
|
|
|
181
253
|
}
|
|
182
254
|
if (err)
|
|
183
255
|
console.error(err.stack);
|
|
184
|
-
// Why: This is literally what the option says to do.
|
|
185
|
-
// eslint-disable-next-line no-process-exit
|
|
186
256
|
if (options.exit)
|
|
187
|
-
process.exit();
|
|
257
|
+
process.exit(0);
|
|
188
258
|
};
|
|
189
259
|
}
|
|
190
260
|
setDirectories(dir) {
|
|
@@ -198,4 +268,23 @@ the generated files). Instead, it is ${JSON.stringify(pj.main)}`);
|
|
|
198
268
|
exports.VitePlugin = VitePlugin;
|
|
199
269
|
VitePlugin.alreadyStarted = false;
|
|
200
270
|
exports.default = VitePlugin;
|
|
201
|
-
|
|
271
|
+
/**
|
|
272
|
+
* Get a string for Vite's printServerUrls function without actually printing it.
|
|
273
|
+
* Allows us to set `task.output` to that value without having to pass a custom logger into Vite.
|
|
274
|
+
* @see https://github.com/vitejs/vite/blob/42233d39674be808a6a1a79f1a6e44ed23ba0d61/packages/vite/src/node/logger.ts#L168-L188
|
|
275
|
+
*/
|
|
276
|
+
function getServerURLs(urls) {
|
|
277
|
+
let output = '';
|
|
278
|
+
const colorUrl = (url) => chalk_1.default.cyan(url.replace(/:(\d+)\//, (_, port) => `:${chalk_1.default.bold(port)}/`));
|
|
279
|
+
for (const url of urls.local) {
|
|
280
|
+
output += ` ${chalk_1.default.green('➜')} ${chalk_1.default.bold('Local')}: ${colorUrl(url)}`;
|
|
281
|
+
}
|
|
282
|
+
for (const url of urls.network) {
|
|
283
|
+
output += ` \n${chalk_1.default.green('➜')} ${chalk_1.default.bold('Network')}: ${colorUrl(url)}`;
|
|
284
|
+
}
|
|
285
|
+
if (urls.network.length === 0) {
|
|
286
|
+
output += chalk_1.default.dim(` \n${chalk_1.default.green('➜')} ${chalk_1.default.bold('Network')}: use `) + chalk_1.default.bold('--host') + chalk_1.default.dim(' to expose');
|
|
287
|
+
}
|
|
288
|
+
return output;
|
|
289
|
+
}
|
|
290
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"VitePlugin.js","sourceRoot":"","sources":["../src/VitePlugin.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@electron-forge/plugin-vite",
|
|
3
|
-
"version": "7.8.
|
|
3
|
+
"version": "7.8.2",
|
|
4
4
|
"description": "Vite plugin for Electron Forge, lets you use Vite directly in your tooling",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -12,10 +12,8 @@
|
|
|
12
12
|
"main": "dist/VitePlugin.js",
|
|
13
13
|
"typings": "dist/VitePlugin.d.ts",
|
|
14
14
|
"dependencies": {
|
|
15
|
-
"@electron-forge/
|
|
16
|
-
"@electron-forge/
|
|
17
|
-
"@electron-forge/shared-types": "7.8.1",
|
|
18
|
-
"@electron-forge/web-multi-logger": "7.8.1",
|
|
15
|
+
"@electron-forge/plugin-base": "7.8.2",
|
|
16
|
+
"@electron-forge/shared-types": "7.8.2",
|
|
19
17
|
"chalk": "^4.0.0",
|
|
20
18
|
"debug": "^4.3.1",
|
|
21
19
|
"fs-extra": "^10.0.0",
|
|
@@ -26,7 +24,7 @@
|
|
|
26
24
|
"@malept/cross-spawn-promise": "^2.0.0",
|
|
27
25
|
"@types/node": "^18.0.3",
|
|
28
26
|
"vite": "^5.0.12",
|
|
29
|
-
"vitest": "^3.
|
|
27
|
+
"vitest": "^3.1.3",
|
|
30
28
|
"which": "^2.0.2",
|
|
31
29
|
"xvfb-maybe": "^0.2.1"
|
|
32
30
|
},
|
|
@@ -41,5 +39,5 @@
|
|
|
41
39
|
"src",
|
|
42
40
|
"forge-vite-env.d.ts"
|
|
43
41
|
],
|
|
44
|
-
"gitHead": "
|
|
42
|
+
"gitHead": "b8bc79894f2aa410f037784b848fbd947ff53417"
|
|
45
43
|
}
|
package/src/ViteConfig.ts
CHANGED
|
@@ -51,7 +51,7 @@ export default class ViteConfigGenerator {
|
|
|
51
51
|
return this.isProd ? 'production' : 'development';
|
|
52
52
|
}
|
|
53
53
|
|
|
54
|
-
async
|
|
54
|
+
async getBuildConfigs(): Promise<UserConfig[]> {
|
|
55
55
|
if (!Array.isArray(this.pluginConfig.build)) {
|
|
56
56
|
throw new Error('"config.build" must be an Array');
|
|
57
57
|
}
|
package/src/VitePlugin.ts
CHANGED
|
@@ -1,20 +1,21 @@
|
|
|
1
|
+
// TODO(erickzhao): Remove this when upgrading to Vite 6 and converting to ESM
|
|
2
|
+
process.env.VITE_CJS_IGNORE_WARNING = 'true';
|
|
3
|
+
|
|
1
4
|
import path from 'node:path';
|
|
2
5
|
|
|
3
6
|
import { namedHookWithTaskFn, PluginBase } from '@electron-forge/plugin-base';
|
|
4
7
|
import chalk from 'chalk';
|
|
5
8
|
import debug from 'debug';
|
|
6
9
|
import fs from 'fs-extra';
|
|
7
|
-
import { PRESET_TIMER } from 'listr2';
|
|
10
|
+
import { Listr, PRESET_TIMER } from 'listr2';
|
|
8
11
|
import { default as vite } from 'vite';
|
|
9
12
|
|
|
10
13
|
import { onBuildDone } from './util/plugins';
|
|
11
14
|
import ViteConfigGenerator from './ViteConfig';
|
|
12
15
|
|
|
13
16
|
import type { VitePluginConfig } from './Config';
|
|
14
|
-
import type { ForgeMultiHookMap, ResolvedForgeConfig } from '@electron-forge/shared-types';
|
|
17
|
+
import type { ForgeListrTask, ForgeMultiHookMap, ResolvedForgeConfig } from '@electron-forge/shared-types';
|
|
15
18
|
import type { AddressInfo } from 'node:net';
|
|
16
|
-
// eslint-disable-next-line n/no-extraneous-import
|
|
17
|
-
import type { RollupWatcher } from 'rollup';
|
|
18
19
|
|
|
19
20
|
const d = debug('electron-forge:plugin:vite');
|
|
20
21
|
|
|
@@ -25,24 +26,39 @@ export default class VitePlugin extends PluginBase<VitePluginConfig> {
|
|
|
25
26
|
|
|
26
27
|
private isProd = false;
|
|
27
28
|
|
|
28
|
-
|
|
29
|
+
/**
|
|
30
|
+
* Path to the root of the Electron app
|
|
31
|
+
*/
|
|
29
32
|
private projectDir!: string;
|
|
30
33
|
|
|
31
|
-
|
|
34
|
+
/**
|
|
35
|
+
* Path where Vite output is generated. Usually `${projectDir}/.vite`
|
|
36
|
+
*/
|
|
32
37
|
private baseDir!: string;
|
|
33
38
|
|
|
34
39
|
private configGeneratorCache!: ViteConfigGenerator;
|
|
35
40
|
|
|
36
|
-
private watchers: RollupWatcher[] = [];
|
|
41
|
+
private watchers: vite.Rollup.RollupWatcher[] = [];
|
|
37
42
|
|
|
38
43
|
private servers: vite.ViteDevServer[] = [];
|
|
39
44
|
|
|
45
|
+
// Matches the format of the default Vite logger
|
|
46
|
+
private timeFormatter = new Intl.DateTimeFormat(undefined, {
|
|
47
|
+
hour: 'numeric',
|
|
48
|
+
minute: 'numeric',
|
|
49
|
+
second: 'numeric',
|
|
50
|
+
});
|
|
51
|
+
|
|
40
52
|
init = (dir: string): void => {
|
|
41
53
|
this.setDirectories(dir);
|
|
42
54
|
|
|
43
55
|
d('hooking process events');
|
|
44
|
-
process.on('exit', (_code) =>
|
|
45
|
-
|
|
56
|
+
process.on('exit', (_code) => {
|
|
57
|
+
this.exitHandler({ cleanup: true });
|
|
58
|
+
});
|
|
59
|
+
process.on('SIGINT' as NodeJS.Signals, (_signal) => {
|
|
60
|
+
this.exitHandler({ exit: true });
|
|
61
|
+
});
|
|
46
62
|
};
|
|
47
63
|
|
|
48
64
|
public setDirectories(dir: string): void {
|
|
@@ -61,39 +77,66 @@ export default class VitePlugin extends PluginBase<VitePluginConfig> {
|
|
|
61
77
|
if (VitePlugin.alreadyStarted) return;
|
|
62
78
|
VitePlugin.alreadyStarted = true;
|
|
63
79
|
|
|
80
|
+
d(`preStart: removing old content from ${this.baseDir}`);
|
|
64
81
|
await fs.remove(this.baseDir);
|
|
65
82
|
|
|
66
|
-
return task?.newListr(
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
title: 'Compiling main process code',
|
|
80
|
-
task: async () => {
|
|
81
|
-
await this.build();
|
|
83
|
+
return task?.newListr(
|
|
84
|
+
[
|
|
85
|
+
{
|
|
86
|
+
title: 'Launching Vite dev servers for renderer process code...',
|
|
87
|
+
task: async (_ctx, task) => {
|
|
88
|
+
const result = await this.launchRendererDevServers(task);
|
|
89
|
+
task.title = 'Launched Vite dev servers for renderer process code';
|
|
90
|
+
return result;
|
|
91
|
+
},
|
|
92
|
+
rendererOptions: {
|
|
93
|
+
persistentOutput: true,
|
|
94
|
+
timer: { ...PRESET_TIMER },
|
|
95
|
+
},
|
|
82
96
|
},
|
|
83
|
-
|
|
84
|
-
|
|
97
|
+
// The main process depends on the `server.port` of the renderer process, so the renderer process is run first.
|
|
98
|
+
{
|
|
99
|
+
title: 'Building main process and preload bundles...',
|
|
100
|
+
task: async (_ctx, task) => {
|
|
101
|
+
const result = await this.build(task);
|
|
102
|
+
task.title = 'Built main process and preload bundles';
|
|
103
|
+
return result;
|
|
104
|
+
},
|
|
105
|
+
rendererOptions: {
|
|
106
|
+
persistentOutput: true,
|
|
107
|
+
timer: { ...PRESET_TIMER },
|
|
108
|
+
},
|
|
85
109
|
},
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
110
|
+
],
|
|
111
|
+
{ concurrent: false }
|
|
112
|
+
);
|
|
113
|
+
}, 'Preparing Vite bundles'),
|
|
89
114
|
],
|
|
90
115
|
prePackage: [
|
|
91
|
-
namedHookWithTaskFn<'prePackage'>(async () => {
|
|
116
|
+
namedHookWithTaskFn<'prePackage'>(async (task) => {
|
|
92
117
|
this.isProd = true;
|
|
93
118
|
await fs.remove(this.baseDir);
|
|
94
119
|
|
|
95
|
-
|
|
96
|
-
|
|
120
|
+
return task?.newListr(
|
|
121
|
+
[
|
|
122
|
+
{
|
|
123
|
+
title: 'Building main and preload targets...',
|
|
124
|
+
task: async (_ctx, subtask) => {
|
|
125
|
+
const results = await this.build(subtask);
|
|
126
|
+
return results;
|
|
127
|
+
},
|
|
128
|
+
},
|
|
129
|
+
{
|
|
130
|
+
title: 'Building renderer targets...',
|
|
131
|
+
task: async (_ctx, subtask) => {
|
|
132
|
+
const results = await this.buildRenderer(subtask);
|
|
133
|
+
return results;
|
|
134
|
+
},
|
|
135
|
+
},
|
|
136
|
+
],
|
|
137
|
+
{ concurrent: true }
|
|
138
|
+
);
|
|
139
|
+
}, 'Building production Vite bundles'),
|
|
97
140
|
],
|
|
98
141
|
postStart: async (_config, child) => {
|
|
99
142
|
d('hooking electron process exit');
|
|
@@ -139,7 +182,7 @@ Your packaged app may be larger than expected if you dont ignore everything othe
|
|
|
139
182
|
if (!pj.main?.includes('.vite/')) {
|
|
140
183
|
throw new Error(`Electron Forge is configured to use the Vite plugin. The plugin expects the
|
|
141
184
|
"main" entry point in "package.json" to be ".vite/*" (where the plugin outputs
|
|
142
|
-
the generated files). Instead, it is ${JSON.stringify(pj.main)}
|
|
185
|
+
the generated files). Instead, it is ${JSON.stringify(pj.main)}.`);
|
|
143
186
|
}
|
|
144
187
|
|
|
145
188
|
if (pj.config) {
|
|
@@ -150,69 +193,115 @@ the generated files). Instead, it is ${JSON.stringify(pj.main)}`);
|
|
|
150
193
|
};
|
|
151
194
|
|
|
152
195
|
// Main process, Preload scripts and Worker process, etc.
|
|
153
|
-
build = async (): Promise<void> => {
|
|
154
|
-
const configs = await this.configGenerator.
|
|
155
|
-
const
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
196
|
+
build = async (task?: ForgeListrTask<null>): Promise<Listr | void> => {
|
|
197
|
+
const configs = await this.configGenerator.getBuildConfigs();
|
|
198
|
+
const isRollupWatcher = (x: vite.Rollup.RollupWatcher | vite.Rollup.RollupOutput | vite.Rollup.RollupOutput[]): x is vite.Rollup.RollupWatcher =>
|
|
199
|
+
x && typeof x === 'object' && 'on' in x && typeof x.on === 'function' && 'close' in x && typeof x.close === 'function';
|
|
200
|
+
|
|
201
|
+
return task?.newListr(
|
|
202
|
+
configs.map((userConfig) => {
|
|
203
|
+
const target = (userConfig.build?.rollupOptions?.input || (typeof userConfig.build?.lib !== 'boolean' && userConfig.build?.lib?.entry)) ?? '';
|
|
204
|
+
return {
|
|
205
|
+
title: `Building ${chalk.green(target)} target`,
|
|
206
|
+
task: async (_ctx, subtask) => {
|
|
207
|
+
// We wrap this function in a Promise to ensure that the task is marked as completed
|
|
208
|
+
// only after all bundles are done generated. This is done in the `closeBundle` Rollup hook
|
|
209
|
+
// rather than when the `vite.build` promise resolves.
|
|
210
|
+
await new Promise<void>((resolve, reject) => {
|
|
211
|
+
vite
|
|
212
|
+
.build({
|
|
213
|
+
// Avoid recursive builds caused by users configuring @electron-forge/plugin-vite in Vite config file.
|
|
214
|
+
configFile: false,
|
|
215
|
+
logLevel: 'silent', // We suppress Vite output and instead log lines using RollupWatcher events
|
|
216
|
+
...userConfig,
|
|
217
|
+
plugins: [onBuildDone(resolve), ...(userConfig.plugins ?? [])],
|
|
218
|
+
clearScreen: false,
|
|
219
|
+
})
|
|
220
|
+
.then((result) => {
|
|
221
|
+
if (isRollupWatcher(result)) {
|
|
222
|
+
result.on('event', (event) => {
|
|
223
|
+
if (event.code === 'ERROR') {
|
|
224
|
+
console.error(`\n${this.timeFormatter.format(new Date())} ${event.error.message}`);
|
|
225
|
+
reject(event.error);
|
|
226
|
+
} else if (event.code === 'BUNDLE_END') {
|
|
227
|
+
console.log(
|
|
228
|
+
`${chalk.dim(this.timeFormatter.format(new Date()))} ${chalk.cyan.bold('[@electron-forge/plugin-vite]')} ${chalk.green(
|
|
229
|
+
'target built'
|
|
230
|
+
)} ${chalk.dim(target)}`
|
|
231
|
+
);
|
|
232
|
+
}
|
|
233
|
+
});
|
|
234
|
+
this.watchers.push(result);
|
|
235
|
+
} else {
|
|
236
|
+
subtask.title = `Built target ${chalk.dim(target)}`;
|
|
237
|
+
}
|
|
238
|
+
return result;
|
|
239
|
+
})
|
|
240
|
+
.catch(reject);
|
|
241
|
+
});
|
|
242
|
+
},
|
|
243
|
+
rendererOptions: {
|
|
244
|
+
persistentOutput: true,
|
|
245
|
+
},
|
|
246
|
+
exitOnError: true,
|
|
247
|
+
};
|
|
248
|
+
}),
|
|
249
|
+
{
|
|
250
|
+
concurrent: true,
|
|
251
|
+
}
|
|
252
|
+
);
|
|
181
253
|
};
|
|
182
254
|
|
|
183
255
|
// Renderer process
|
|
184
|
-
buildRenderer = async (
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
256
|
+
buildRenderer = async (task?: ForgeListrTask<null>) => {
|
|
257
|
+
const rendererConfigs = await this.configGenerator.getRendererConfig();
|
|
258
|
+
return task?.newListr(
|
|
259
|
+
rendererConfigs.map((userConfig) => ({
|
|
260
|
+
task: async (_ctx, subtask) => {
|
|
261
|
+
await vite.build({
|
|
262
|
+
configFile: false,
|
|
263
|
+
logLevel: 'error',
|
|
264
|
+
...userConfig,
|
|
265
|
+
});
|
|
266
|
+
subtask.title = `Built target ${chalk.dim(path.basename(userConfig.build?.outDir ?? ''))}`;
|
|
267
|
+
},
|
|
268
|
+
}))
|
|
269
|
+
);
|
|
191
270
|
};
|
|
192
271
|
|
|
193
|
-
launchRendererDevServers = async (
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
272
|
+
launchRendererDevServers = async (task?: ForgeListrTask<null>) => {
|
|
273
|
+
const rendererConfigs = await this.configGenerator.getRendererConfig();
|
|
274
|
+
return task?.newListr(
|
|
275
|
+
rendererConfigs.map((userConfig) => ({
|
|
276
|
+
title: `Target ${chalk.cyan(path.basename(userConfig.build?.outDir ?? ''))}`,
|
|
277
|
+
task: async (_ctx, subtask) => {
|
|
278
|
+
const viteDevServer = await vite.createServer({
|
|
279
|
+
configFile: false,
|
|
280
|
+
...userConfig,
|
|
281
|
+
});
|
|
199
282
|
|
|
200
|
-
|
|
201
|
-
|
|
283
|
+
await viteDevServer.listen();
|
|
284
|
+
const urls = getServerURLs(viteDevServer.resolvedUrls!);
|
|
285
|
+
subtask.output = urls;
|
|
202
286
|
|
|
203
|
-
|
|
287
|
+
this.servers.push(viteDevServer);
|
|
204
288
|
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
289
|
+
if (viteDevServer.httpServer) {
|
|
290
|
+
// Make sure that `getDefines` in VitePlugin.ts gets the correct `server.port`. (#3198)
|
|
291
|
+
const addressInfo = viteDevServer.httpServer.address();
|
|
292
|
+
const isAddressInfo = (x: AddressInfo | string | null): x is AddressInfo => (typeof x === 'object' ? typeof x?.address === 'string' : false);
|
|
209
293
|
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
294
|
+
if (isAddressInfo(addressInfo)) {
|
|
295
|
+
userConfig.server ??= {};
|
|
296
|
+
userConfig.server.port = addressInfo.port;
|
|
297
|
+
}
|
|
298
|
+
}
|
|
299
|
+
},
|
|
300
|
+
rendererOptions: {
|
|
301
|
+
persistentOutput: true,
|
|
302
|
+
},
|
|
303
|
+
}))
|
|
304
|
+
);
|
|
216
305
|
};
|
|
217
306
|
|
|
218
307
|
exitHandler = (options: { cleanup?: boolean; exit?: boolean }, err?: Error): void => {
|
|
@@ -231,10 +320,29 @@ the generated files). Instead, it is ${JSON.stringify(pj.main)}`);
|
|
|
231
320
|
this.servers = [];
|
|
232
321
|
}
|
|
233
322
|
if (err) console.error(err.stack);
|
|
234
|
-
|
|
235
|
-
// eslint-disable-next-line no-process-exit
|
|
236
|
-
if (options.exit) process.exit();
|
|
323
|
+
if (options.exit) process.exit(0);
|
|
237
324
|
};
|
|
238
325
|
}
|
|
239
326
|
|
|
327
|
+
/**
|
|
328
|
+
* Get a string for Vite's printServerUrls function without actually printing it.
|
|
329
|
+
* Allows us to set `task.output` to that value without having to pass a custom logger into Vite.
|
|
330
|
+
* @see https://github.com/vitejs/vite/blob/42233d39674be808a6a1a79f1a6e44ed23ba0d61/packages/vite/src/node/logger.ts#L168-L188
|
|
331
|
+
*/
|
|
332
|
+
function getServerURLs(urls: vite.ResolvedServerUrls) {
|
|
333
|
+
let output = '';
|
|
334
|
+
const colorUrl = (url: string) => chalk.cyan(url.replace(/:(\d+)\//, (_, port) => `:${chalk.bold(port)}/`));
|
|
335
|
+
for (const url of urls.local) {
|
|
336
|
+
output += ` ${chalk.green('➜')} ${chalk.bold('Local')}: ${colorUrl(url)}`;
|
|
337
|
+
}
|
|
338
|
+
for (const url of urls.network) {
|
|
339
|
+
output += ` \n${chalk.green('➜')} ${chalk.bold('Network')}: ${colorUrl(url)}`;
|
|
340
|
+
}
|
|
341
|
+
if (urls.network.length === 0) {
|
|
342
|
+
output += chalk.dim(` \n${chalk.green('➜')} ${chalk.bold('Network')}: use `) + chalk.bold('--host') + chalk.dim(' to expose');
|
|
343
|
+
}
|
|
344
|
+
|
|
345
|
+
return output;
|
|
346
|
+
}
|
|
347
|
+
|
|
240
348
|
export { VitePlugin };
|