@simplysm/sd-cli 13.0.93 → 13.0.96

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.
Files changed (67) hide show
  1. package/README.md +67 -44
  2. package/dist/capacitor/capacitor.d.ts +15 -1
  3. package/dist/capacitor/capacitor.d.ts.map +1 -1
  4. package/dist/capacitor/capacitor.js +52 -31
  5. package/dist/capacitor/capacitor.js.map +1 -1
  6. package/dist/electron/electron.d.ts +6 -2
  7. package/dist/electron/electron.d.ts.map +1 -1
  8. package/dist/electron/electron.js +12 -6
  9. package/dist/electron/electron.js.map +1 -1
  10. package/dist/orchestrators/DevOrchestrator.d.ts.map +1 -1
  11. package/dist/orchestrators/DevOrchestrator.js +22 -4
  12. package/dist/orchestrators/DevOrchestrator.js.map +1 -1
  13. package/dist/sd-cli-entry.d.ts.map +1 -1
  14. package/dist/sd-cli-entry.js +4 -1
  15. package/dist/sd-cli-entry.js.map +1 -1
  16. package/dist/utils/esbuild-config.d.ts +2 -0
  17. package/dist/utils/esbuild-config.d.ts.map +1 -1
  18. package/dist/utils/esbuild-config.js +86 -6
  19. package/dist/utils/esbuild-config.js.map +1 -1
  20. package/dist/utils/package-utils.d.ts.map +1 -1
  21. package/dist/utils/package-utils.js +7 -0
  22. package/dist/utils/package-utils.js.map +1 -1
  23. package/dist/utils/replace-deps.d.ts.map +1 -1
  24. package/dist/utils/replace-deps.js +17 -0
  25. package/dist/utils/replace-deps.js.map +1 -1
  26. package/dist/utils/worker-utils.d.ts +9 -1
  27. package/dist/utils/worker-utils.d.ts.map +1 -1
  28. package/dist/utils/worker-utils.js +7 -0
  29. package/dist/utils/worker-utils.js.map +1 -1
  30. package/dist/workers/client.worker.d.ts.map +1 -1
  31. package/dist/workers/client.worker.js +2 -1
  32. package/dist/workers/client.worker.js.map +1 -1
  33. package/dist/workers/dts.worker.d.ts.map +1 -1
  34. package/dist/workers/dts.worker.js +2 -1
  35. package/dist/workers/dts.worker.js.map +1 -1
  36. package/dist/workers/library.worker.d.ts.map +1 -1
  37. package/dist/workers/library.worker.js +2 -1
  38. package/dist/workers/library.worker.js.map +1 -1
  39. package/dist/workers/server-runtime.worker.d.ts +1 -0
  40. package/dist/workers/server-runtime.worker.d.ts.map +1 -1
  41. package/dist/workers/server-runtime.worker.js +36 -2
  42. package/dist/workers/server-runtime.worker.js.map +1 -1
  43. package/dist/workers/server.worker.d.ts.map +1 -1
  44. package/dist/workers/server.worker.js +144 -4
  45. package/dist/workers/server.worker.js.map +1 -1
  46. package/docs/architecture.md +14 -14
  47. package/docs/config-types.md +12 -2
  48. package/package.json +4 -4
  49. package/src/capacitor/capacitor.ts +59 -31
  50. package/src/electron/electron.ts +13 -6
  51. package/src/orchestrators/DevOrchestrator.ts +20 -1
  52. package/src/sd-cli-entry.ts +4 -1
  53. package/src/utils/esbuild-config.ts +86 -6
  54. package/src/utils/package-utils.ts +8 -0
  55. package/src/utils/replace-deps.ts +20 -0
  56. package/src/utils/worker-utils.ts +14 -1
  57. package/src/workers/client.worker.ts +3 -1
  58. package/src/workers/dts.worker.ts +3 -1
  59. package/src/workers/library.worker.ts +3 -1
  60. package/src/workers/server-runtime.worker.ts +42 -2
  61. package/src/workers/server.worker.ts +165 -3
  62. package/templates/init/package.json.hbs +3 -3
  63. package/templates/init/packages/client-admin/package.json.hbs +7 -7
  64. package/templates/init/packages/db-main/package.json.hbs +2 -2
  65. package/templates/init/packages/server/package.json.hbs +5 -5
  66. package/templates/init/tests-e2e/package.json.hbs +1 -1
  67. package/tests/capacitor.spec.ts +49 -0
package/README.md CHANGED
@@ -5,9 +5,16 @@ Simplysm 프로젝트용 CLI 도구. pnpm 모노레포 환경에서 빌드, 개
5
5
  ## 설치
6
6
 
7
7
  ```bash
8
- npm install @simplysm/sd-cli
8
+ pnpm add @simplysm/sd-cli
9
9
  ```
10
10
 
11
+ ## 문서
12
+
13
+ | 카테고리 | 설명 |
14
+ |---------|------|
15
+ | [설정 타입 레퍼런스](docs/config-types.md) | `sd.config.ts`에서 사용하는 모든 타입 상세 |
16
+ | [아키텍처](docs/architecture.md) | 내부 구조, 빌드 파이프라인, 오케스트레이터, Worker, 인프라 |
17
+
11
18
  ## 빠른 시작
12
19
 
13
20
  ```bash
@@ -238,49 +245,6 @@ interface SdConfigParams {
238
245
 
239
246
  상세 API는 [설정 타입 레퍼런스](docs/config-types.md) 참조.
240
247
 
241
- ## 아키텍처
242
-
243
- 상세 아키텍처는 [아키텍처 문서](docs/architecture.md) 참조.
244
-
245
- ### 핵심 구조
246
-
247
- ```
248
- sd-cli.ts (런처)
249
- └─ sd-cli-entry.ts (CLI 파서, yargs)
250
- ├─ commands/ ← 각 명령어 진입점
251
- ├─ orchestrators/ ← 빌드 워크플로우 관리
252
- ├─ builders/ ← 빌더 (esbuild/dts)
253
- ├─ workers/ ← Worker 스레드 (병렬 처리)
254
- ├─ infra/ ← 인프라 (결과 수집, 시그널, 워커 관리)
255
- ├─ capacitor/ ← Capacitor 프로젝트 관리
256
- ├─ electron/ ← Electron 프로젝트 관리
257
- └─ utils/ ← 유틸리티
258
- ```
259
-
260
- ### 오케스트레이터
261
-
262
- | 클래스 | 용도 |
263
- |--------|------|
264
- | `BuildOrchestrator` | 프로덕션 빌드 (클린 → 린트+빌드 병렬) |
265
- | `DevOrchestrator` | 개발 모드 (Vite 서버 + Fastify 서버 + 프록시) |
266
- | `WatchOrchestrator` | 라이브러리 watch 모드 (esbuild watch + dts) |
267
-
268
- ### 빌더
269
-
270
- | 클래스 | 역할 |
271
- |--------|------|
272
- | `BaseBuilder` | 빌더 공통 추상 클래스 |
273
- | `LibraryBuilder` | esbuild 기반 라이브러리 JS 빌드 |
274
- | `DtsBuilder` | TypeScript .d.ts 파일 생성 |
275
-
276
- ### 인프라
277
-
278
- | 클래스 | 역할 |
279
- |--------|------|
280
- | `WorkerManager` | Worker 생성/조회/종료 관리 |
281
- | `ResultCollector` | 빌드 결과 수집 및 상태 관리 |
282
- | `SignalHandler` | SIGINT/SIGTERM 시그널 처리 |
283
-
284
248
  ## 라이브러리 API
285
249
 
286
250
  `@simplysm/sd-cli`는 CLI 외에도 프로그래밍 방식으로 사용할 수 있는 API를 export한다.
@@ -327,6 +291,22 @@ const config = createViteConfig({
327
291
  });
328
292
  ```
329
293
 
294
+ #### ViteConfigOptions
295
+
296
+ ```typescript
297
+ interface ViteConfigOptions {
298
+ pkgDir: string;
299
+ name: string;
300
+ tsconfigPath: string;
301
+ compilerOptions: Record<string, unknown>;
302
+ env?: Record<string, string>;
303
+ mode: "build" | "dev";
304
+ serverPort?: number;
305
+ replaceDeps?: string[];
306
+ onScopeRebuild?: () => void;
307
+ }
308
+ ```
309
+
330
310
  `createViteConfig`는 다음을 자동 구성한다:
331
311
  - SolidJS 플러그인
332
312
  - TailwindCSS (postcss)
@@ -335,3 +315,46 @@ const config = createViteConfig({
335
315
  - scope 패키지 dist 변경 감지 (sdScopeWatchPlugin)
336
316
  - public-dev/ 디렉토리 우선 서빙 (dev 모드)
337
317
  - process.env 치환 (define)
318
+
319
+ ## 아키텍처
320
+
321
+ 상세 아키텍처는 [아키텍처 문서](docs/architecture.md) 참조.
322
+
323
+ ### 핵심 구조
324
+
325
+ ```
326
+ sd-cli.ts (런처)
327
+ └─ sd-cli-entry.ts (CLI 파서, yargs)
328
+ ├─ commands/ <- 각 명령어 진입점
329
+ ├─ orchestrators/ <- 빌드 워크플로우 관리
330
+ ├─ builders/ <- 빌더 (esbuild/dts)
331
+ ├─ workers/ <- Worker 스레드 (병렬 처리)
332
+ ├─ infra/ <- 인프라 (결과 수집, 시그널, 워커 관리)
333
+ ├─ capacitor/ <- Capacitor 프로젝트 관리
334
+ ├─ electron/ <- Electron 프로젝트 관리
335
+ └─ utils/ <- 유틸리티
336
+ ```
337
+
338
+ ### 오케스트레이터
339
+
340
+ | 클래스 | 용도 |
341
+ |--------|------|
342
+ | `BuildOrchestrator` | 프로덕션 빌드 (클린 -> 린트+빌드 병렬) |
343
+ | `DevOrchestrator` | 개발 모드 (Vite 서버 + Fastify 서버 + 프록시) |
344
+ | `WatchOrchestrator` | 라이브러리 watch 모드 (esbuild watch + dts) |
345
+
346
+ ### 빌더
347
+
348
+ | 클래스 | 역할 |
349
+ |--------|------|
350
+ | `BaseBuilder` | 빌더 공통 추상 클래스 |
351
+ | `LibraryBuilder` | esbuild 기반 라이브러리 JS 빌드 |
352
+ | `DtsBuilder` | TypeScript .d.ts 파일 생성 |
353
+
354
+ ### 인프라
355
+
356
+ | 클래스 | 역할 |
357
+ |--------|------|
358
+ | `WorkerManager` | Worker 생성/조회/종료 관리 |
359
+ | `ResultCollector` | 빌드 결과 수집 및 상태 관리 |
360
+ | `SignalHandler` | SIGINT/SIGTERM 시그널 처리 |
@@ -12,6 +12,8 @@ export declare class Capacitor {
12
12
  private static readonly _ANDROID_KEYSTORE_FILE_NAME;
13
13
  private static readonly _LOCK_FILE_NAME;
14
14
  private static readonly _logger;
15
+ private static readonly _utf8Decoder;
16
+ private static readonly _fallbackDecoder;
15
17
  private readonly _capPath;
16
18
  private readonly _platforms;
17
19
  private readonly _npmConfig;
@@ -24,10 +26,22 @@ export declare class Capacitor {
24
26
  * F5: Validate configuration
25
27
  */
26
28
  private static _validateConfig;
29
+ /**
30
+ * Execute a Capacitor CLI command via npx
31
+ */
32
+ private _execCap;
33
+ /**
34
+ * Execute capacitor-assets CLI command via npx
35
+ */
36
+ private _execCapAssets;
27
37
  /**
28
38
  * Execute command (with logging)
29
39
  */
30
40
  private _exec;
41
+ /**
42
+ * Decode command output (UTF-8 first, fallback to EUC-KR for Windows CP949)
43
+ */
44
+ private static _decodeOutput;
31
45
  /**
32
46
  * F10: Acquire lock to prevent concurrent execution
33
47
  */
@@ -64,7 +78,7 @@ export declare class Capacitor {
64
78
  */
65
79
  private _validateUrl;
66
80
  /**
67
- * Basic Capacitor project initialization (package.json, npm install, cap init)
81
+ * Basic Capacitor project initialization (package.json, pnpm install, cap init)
68
82
  */
69
83
  private _initCap;
70
84
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"capacitor.d.ts","sourceRoot":"","sources":["..\\..\\src\\capacitor\\capacitor.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAyB5D;;;;;;GAMG;AACH,qBAAa,SAAS;IAUlB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAV1B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,2BAA2B,CAAsB;IACzE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAqB;IAC5D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAuC;IAEtE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAW;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IAEvC,OAAO;IAUP;;OAEG;WACU,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,SAAS,CAAC;IAQnF;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;IAuB9B;;OAEG;YACW,KAAK;IAOnB;;OAEG;YACW,YAAY;IAa1B;;OAEG;YACW,YAAY;IAK1B;;OAEG;YACW,cAAc;IAsB5B;;;;;;;;;OASG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAmCjC;;OAEG;IACG,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB3C;;OAEG;IACG,WAAW,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB9C;;OAEG;IACH,OAAO,CAAC,YAAY;IAgBpB;;OAEG;YACW,QAAQ;IA6BtB;;OAEG;YACW,aAAa;IAgF3B;;OAEG;YACW,aAAa;IAoC3B;;OAEG;YACW,aAAa;IAY3B;;OAEG;YACW,UAAU;IAiExB;;OAEG;YACW,iBAAiB;IAc/B;;OAEG;YACW,6BAA6B;IAoB3C;;OAEG;YACW,WAAW;IAoBzB;;OAEG;YACW,wBAAwB;IAgBtC;;OAEG;YACW,eAAe;IAsB7B;;OAEG;YACW,yBAAyB;IAsEvC;;OAEG;YACW,4BAA4B;IAgF1C;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAQlC;;OAEG;YACW,aAAa;IAoB3B;;OAEG;YACW,uBAAuB;IAkDrC;;OAEG;YACW,gBAAgB;IAoB9B;;OAEG;IACH,OAAO,CAAC,aAAa;CAOtB"}
1
+ {"version":3,"file":"capacitor.d.ts","sourceRoot":"","sources":["..\\..\\src\\capacitor\\capacitor.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAyB5D;;;;;;GAMG;AACH,qBAAa,SAAS;IAYlB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAZ1B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,2BAA2B,CAAsB;IACzE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAqB;IAC5D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAuC;IACtE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAA6C;IACjF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAA6B;IAErE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAW;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IAEvC,OAAO;IAUP;;OAEG;WACU,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,SAAS,CAAC;IAQnF;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;IAuB9B;;OAEG;YACW,QAAQ;IAItB;;OAEG;YACW,cAAc;IAI5B;;OAEG;YACW,KAAK;IAenB;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,aAAa;IAQ5B;;OAEG;YACW,YAAY;IAa1B;;OAEG;YACW,YAAY;IAK1B;;OAEG;YACW,cAAc;IAsB5B;;;;;;;;;OASG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAmCjC;;OAEG;IACG,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB3C;;OAEG;IACG,WAAW,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB9C;;OAEG;IACH,OAAO,CAAC,YAAY;IAgBpB;;OAEG;YACW,QAAQ;IA2BtB;;OAEG;YACW,aAAa;IAgF3B;;OAEG;YACW,aAAa;IAoC3B;;OAEG;YACW,aAAa;IAY3B;;OAEG;YACW,UAAU;IA4DxB;;OAEG;YACW,iBAAiB;IAc/B;;OAEG;YACW,6BAA6B;IAoB3C;;OAEG;YACW,WAAW;IAoBzB;;OAEG;YACW,wBAAwB;IAgBtC;;OAEG;YACW,eAAe;IAsB7B;;OAEG;YACW,yBAAyB;IAsEvC;;OAEG;YACW,4BAA4B;IAgF1C;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAQlC;;OAEG;YACW,aAAa;IAoB3B;;OAEG;YACW,uBAAuB;IAkDrC;;OAEG;YACW,gBAAgB;IAoB9B;;OAEG;IACH,OAAO,CAAC,aAAa;CAOtB"}
@@ -21,6 +21,8 @@ class Capacitor {
21
21
  static _ANDROID_KEYSTORE_FILE_NAME = "android.keystore";
22
22
  static _LOCK_FILE_NAME = ".capacitor.lock";
23
23
  static _logger = consola.withTag("sd:cli:capacitor");
24
+ static _utf8Decoder = new TextDecoder("utf-8", { fatal: true });
25
+ static _fallbackDecoder = new TextDecoder("euc-kr");
24
26
  _capPath;
25
27
  _platforms;
26
28
  _npmConfig;
@@ -45,7 +47,7 @@ class Capacitor {
45
47
  if (typeof config.appName !== "string" || config.appName.trim() === "") {
46
48
  throw new CapacitorConfigError("capacitor.appName is required.");
47
49
  }
48
- if (!/^[a-zA-Z0-9 \-]+$/.test(config.appName)) {
50
+ if (!/^[\p{L}\p{N} \-]+$/u.test(config.appName)) {
49
51
  throw new CapacitorConfigError(`capacitor.appName contains invalid characters: ${config.appName}`);
50
52
  }
51
53
  if (config.platform != null) {
@@ -57,14 +59,41 @@ class Capacitor {
57
59
  }
58
60
  }
59
61
  }
62
+ /**
63
+ * Execute a Capacitor CLI command via npx
64
+ */
65
+ async _execCap(args) {
66
+ return this._exec("npx", ["cap", ...args], this._capPath);
67
+ }
68
+ /**
69
+ * Execute capacitor-assets CLI command via npx
70
+ */
71
+ async _execCapAssets(args) {
72
+ return this._exec("npx", ["capacitor-assets", ...args], this._capPath);
73
+ }
60
74
  /**
61
75
  * Execute command (with logging)
62
76
  */
63
77
  async _exec(cmd, args, cwd) {
64
78
  Capacitor._logger.debug(`executed command: ${cmd} ${args.join(" ")}`);
65
- const { stdout: result } = await execa(cmd, args, { cwd });
66
- Capacitor._logger.debug(`execution result: ${result}`);
67
- return result;
79
+ const result = await execa(cmd, args, { cwd, reject: false, encoding: "buffer" });
80
+ const stdout = Capacitor._decodeOutput(result.stdout);
81
+ if (result.exitCode !== 0) {
82
+ const stderr = Capacitor._decodeOutput(result.stderr);
83
+ throw new Error(`${cmd} ${args.join(" ")} failed (exit ${result.exitCode}): ${stderr || stdout}`);
84
+ }
85
+ Capacitor._logger.debug(`execution result: ${stdout}`);
86
+ return stdout;
87
+ }
88
+ /**
89
+ * Decode command output (UTF-8 first, fallback to EUC-KR for Windows CP949)
90
+ */
91
+ static _decodeOutput(bytes) {
92
+ try {
93
+ return Capacitor._utf8Decoder.decode(bytes);
94
+ } catch {
95
+ return Capacitor._fallbackDecoder.decode(bytes);
96
+ }
68
97
  }
69
98
  /**
70
99
  * F10: Acquire lock to prevent concurrent execution
@@ -128,9 +157,9 @@ class Capacitor {
128
157
  await this._configureAndroid();
129
158
  }
130
159
  if (changed) {
131
- await this._exec("npx", ["cap", "sync"], this._capPath);
160
+ await this._execCap(["sync"]);
132
161
  } else {
133
- await this._exec("npx", ["cap", "copy"], this._capPath);
162
+ await this._execCap(["copy"]);
134
163
  }
135
164
  } finally {
136
165
  await this._releaseLock();
@@ -144,7 +173,7 @@ class Capacitor {
144
173
  try {
145
174
  const buildType = this._config.debug ? "debug" : "release";
146
175
  for (const platform of this._platforms) {
147
- await this._exec("npx", ["cap", "copy", platform], this._capPath);
176
+ await this._execCap(["copy", platform]);
148
177
  if (platform === "android") {
149
178
  await this._buildAndroid(outPath, buildType);
150
179
  } else {
@@ -164,9 +193,9 @@ class Capacitor {
164
193
  await this._updateServerUrl(url);
165
194
  }
166
195
  for (const platform of this._platforms) {
167
- await this._exec("npx", ["cap", "copy", platform], this._capPath);
196
+ await this._execCap(["copy", platform]);
168
197
  try {
169
- await this._exec("npx", ["cap", "run", platform], this._capPath);
198
+ await this._execCap(["run", platform]);
170
199
  } catch (err) {
171
200
  if (platform === "android") {
172
201
  try {
@@ -196,20 +225,17 @@ class Capacitor {
196
225
  }
197
226
  //#region Private - Initialization
198
227
  /**
199
- * Basic Capacitor project initialization (package.json, npm install, cap init)
228
+ * Basic Capacitor project initialization (package.json, pnpm install, cap init)
200
229
  */
201
230
  async _initCap() {
202
231
  const depChanged = await this._setupNpmConf();
203
- if (!depChanged) return false;
204
- const installResult = await this._exec("pnpm", ["install"], this._capPath);
205
- Capacitor._logger.debug(`pnpm install completed: ${installResult}`);
232
+ const nodeModulesExists = await fsx.exists(path.resolve(this._capPath, "node_modules"));
233
+ if (!depChanged && nodeModulesExists) return false;
234
+ const installResult = await this._exec("npm", ["install"], this._capPath);
235
+ Capacitor._logger.debug(`npm install completed: ${installResult}`);
206
236
  const configPath = path.resolve(this._capPath, "capacitor.config.ts");
207
237
  if (!await fsx.exists(configPath)) {
208
- await this._exec(
209
- "npx",
210
- ["cap", "init", this._config.appName, this._config.appId],
211
- this._capPath
212
- );
238
+ await this._execCap(["init", this._config.appId, this._config.appId]);
213
239
  }
214
240
  const wwwPath = path.resolve(this._capPath, "www");
215
241
  await fsx.mkdir(wwwPath);
@@ -314,7 +340,7 @@ export default config;
314
340
  Capacitor._logger.debug(`platform already exists: ${platform}`);
315
341
  continue;
316
342
  }
317
- await this._exec("npx", ["cap", "add", platform], this._capPath);
343
+ await this._execCap(["add", platform]);
318
344
  }
319
345
  }
320
346
  /**
@@ -345,18 +371,13 @@ export default config;
345
371
  right: padding,
346
372
  background: { r: 0, g: 0, b: 0, alpha: 0 }
347
373
  }).toFile(logoPath);
348
- await this._exec(
349
- "npx",
350
- [
351
- "@capacitor/assets",
352
- "generate",
353
- "--iconBackgroundColor",
354
- "#ffffff",
355
- "--splashBackgroundColor",
356
- "#ffffff"
357
- ],
358
- this._capPath
359
- );
374
+ await this._execCapAssets([
375
+ "generate",
376
+ "--iconBackgroundColor",
377
+ "#ffffff",
378
+ "--splashBackgroundColor",
379
+ "#ffffff"
380
+ ]);
360
381
  } catch (err) {
361
382
  Capacitor._logger.warn(
362
383
  `icon generation failed: ${err instanceof Error ? err.message : err}. Using default icon.`
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/capacitor/capacitor.ts"],
4
- "mappings": "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",
4
+ "mappings": "AAAA,OAAO,UAAU;AACjB,SAAS,WAAW;AACpB,SAAS,WAAW;AACpB,SAAS,eAAe;AACxB,OAAO,WAAW;AAElB,SAAS,aAAa;AAiBtB,MAAM,6BAA6B,MAAM;AAAA,EACvC,YAAY,SAAiB;AAC3B,UAAM,OAAO;AACb,SAAK,OAAO;AAAA,EACd;AACF;AASO,MAAM,UAAU;AAAA,EAWb,YACW,UACA,SACjB,WACA;AAHiB;AACA;AAGjB,SAAK,aAAa,OAAO,KAAK,KAAK,QAAQ,YAAY,CAAC,CAAC;AACzD,SAAK,aAAa;AAClB,SAAK,WAAW,KAAK,QAAQ,KAAK,UAAU,YAAY;AAAA,EAC1D;AAAA,EAlBA,OAAwB,8BAA8B;AAAA,EACtD,OAAwB,kBAAkB;AAAA,EAC1C,OAAwB,UAAU,QAAQ,QAAQ,kBAAkB;AAAA,EACpE,OAAwB,eAAe,IAAI,YAAY,SAAS,EAAE,OAAO,KAAK,CAAC;AAAA,EAC/E,OAAwB,mBAAmB,IAAI,YAAY,QAAQ;AAAA,EAElD;AAAA,EACA;AAAA,EACA;AAAA;AAAA;AAAA;AAAA,EAejB,aAAa,OAAO,SAAiB,QAA+C;AAElF,cAAU,gBAAgB,MAAM;AAEhC,UAAM,YAAY,MAAM,IAAI,SAAoB,KAAK,QAAQ,SAAS,cAAc,CAAC;AACrF,WAAO,IAAI,UAAU,SAAS,QAAQ,SAAS;AAAA,EACjD;AAAA;AAAA;AAAA;AAAA,EAKA,OAAe,gBAAgB,QAAiC;AAC9D,QAAI,OAAO,OAAO,UAAU,YAAY,OAAO,MAAM,KAAK,MAAM,IAAI;AAClE,YAAM,IAAI,qBAAqB,8BAA8B;AAAA,IAC/D;AACA,QAAI,CAAC,yCAAyC,KAAK,OAAO,KAAK,GAAG;AAChE,YAAM,IAAI,qBAAqB,sCAAsC,OAAO,KAAK,EAAE;AAAA,IACrF;AACA,QAAI,OAAO,OAAO,YAAY,YAAY,OAAO,QAAQ,KAAK,MAAM,IAAI;AACtE,YAAM,IAAI,qBAAqB,gCAAgC;AAAA,IACjE;AACA,QAAI,CAAC,sBAAsB,KAAK,OAAO,OAAO,GAAG;AAC/C,YAAM,IAAI,qBAAqB,kDAAkD,OAAO,OAAO,EAAE;AAAA,IACnG;AACA,QAAI,OAAO,YAAY,MAAM;AAC3B,YAAM,YAAY,OAAO,KAAK,OAAO,QAAQ;AAC7C,iBAAW,KAAK,WAAW;AACzB,YAAI,MAAM,WAAW;AACnB,gBAAM,IAAI,qBAAqB,yBAAyB,CAAC,wCAAwC;AAAA,QACnG;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA;AAAA;AAAA;AAAA,EAKA,MAAc,SAAS,MAAiC;AACtD,WAAO,KAAK,MAAM,OAAO,CAAC,OAAO,GAAG,IAAI,GAAG,KAAK,QAAQ;AAAA,EAC1D;AAAA;AAAA;AAAA;AAAA,EAKA,MAAc,eAAe,MAAiC;AAC5D,WAAO,KAAK,MAAM,OAAO,CAAC,oBAAoB,GAAG,IAAI,GAAG,KAAK,QAAQ;AAAA,EACvE;AAAA;AAAA;AAAA;AAAA,EAKA,MAAc,MAAM,KAAa,MAAgB,KAA8B;AAC7E,cAAU,QAAQ,MAAM,qBAAqB,GAAG,IAAI,KAAK,KAAK,GAAG,CAAC,EAAE;AAEpE,UAAM,SAAS,MAAM,MAAM,KAAK,MAAM,EAAE,KAAK,QAAQ,OAAO,UAAU,SAAS,CAAC;AAChF,UAAM,SAAS,UAAU,cAAc,OAAO,MAAM;AAEpD,QAAI,OAAO,aAAa,GAAG;AACzB,YAAM,SAAS,UAAU,cAAc,OAAO,MAAM;AACpD,YAAM,IAAI,MAAM,GAAG,GAAG,IAAI,KAAK,KAAK,GAAG,CAAC,iBAAiB,OAAO,QAAQ,MAAM,UAAU,MAAM,EAAE;AAAA,IAClG;AAEA,cAAU,QAAQ,MAAM,qBAAqB,MAAM,EAAE;AACrD,WAAO;AAAA,EACT;AAAA;AAAA;AAAA;AAAA,EAKA,OAAe,cAAc,OAA2B;AACtD,QAAI;AACF,aAAO,UAAU,aAAa,OAAO,KAAK;AAAA,IAC5C,QAAQ;AACN,aAAO,UAAU,iBAAiB,OAAO,KAAK;AAAA,IAChD;AAAA,EACF;AAAA;AAAA;AAAA;AAAA,EAKA,MAAc,eAA8B;AAC1C,UAAM,WAAW,KAAK,QAAQ,KAAK,UAAU,UAAU,eAAe;AACtE,QAAI,MAAM,IAAI,OAAO,QAAQ,GAAG;AAC9B,YAAM,cAAc,MAAM,IAAI,KAAK,QAAQ;AAC3C,YAAM,IAAI;AAAA,QACR,oDAAoD,WAAW,sCAC1B,QAAQ;AAAA,MAC/C;AAAA,IACF;AACA,UAAM,IAAI,MAAM,KAAK,QAAQ;AAC7B,UAAM,IAAI,MAAM,UAAU,OAAO,QAAQ,GAAG,CAAC;AAAA,EAC/C;AAAA;AAAA;AAAA;AAAA,EAKA,MAAc,eAA8B;AAC1C,UAAM,WAAW,KAAK,QAAQ,KAAK,UAAU,UAAU,eAAe;AACtE,UAAM,IAAI,GAAG,QAAQ;AAAA,EACvB;AAAA;AAAA;AAAA;AAAA,EAKA,MAAc,iBAAgC;AAE5C,UAAM,UAAU,MAAM,KAAK,gBAAgB;AAC3C,QAAI,WAAW,MAAM;AACnB,YAAM,IAAI;AAAA,QACR;AAAA,MAGF;AAAA,IACF;AAGA,QAAI,KAAK,WAAW,SAAS,SAAS,GAAG;AACvC,YAAM,WAAW,MAAM,KAAK,YAAY;AACxC,UAAI,YAAY,MAAM;AACpB,kBAAU,QAAQ;AAAA,UAChB;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAYA,MAAM,aAA4B;AAChC,UAAM,KAAK,aAAa;AAExB,QAAI;AAEF,YAAM,KAAK,eAAe;AAG1B,YAAM,UAAU,MAAM,KAAK,SAAS;AAGpC,YAAM,KAAK,cAAc;AAGzB,YAAM,KAAK,cAAc;AAGzB,YAAM,KAAK,WAAW;AAGtB,UAAI,KAAK,WAAW,SAAS,SAAS,GAAG;AACvC,cAAM,KAAK,kBAAkB;AAAA,MAC/B;AAGA,UAAI,SAAS;AACX,cAAM,KAAK,SAAS,CAAC,MAAM,CAAC;AAAA,MAC9B,OAAO;AACL,cAAM,KAAK,SAAS,CAAC,MAAM,CAAC;AAAA,MAC9B;AAAA,IACF,UAAE;AACA,YAAM,KAAK,aAAa;AAAA,IAC1B;AAAA,EACF;AAAA;AAAA;AAAA;AAAA,EAKA,MAAM,MAAM,SAAgC;AAC1C,UAAM,KAAK,aAAa;AAExB,QAAI;AACF,YAAM,YAAY,KAAK,QAAQ,QAAQ,UAAU;AAEjD,iBAAW,YAAY,KAAK,YAAY;AACtC,cAAM,KAAK,SAAS,CAAC,QAAQ,QAAQ,CAAC;AAEtC,YAAI,aAAa,WAAW;AAC1B,gBAAM,KAAK,cAAc,SAAS,SAAS;AAAA,QAC7C,OAAO;AACL,gBAAM,IAAI,MAAM,yBAAyB,QAAQ,EAAE;AAAA,QACrD;AAAA,MACF;AAAA,IACF,UAAE;AACA,YAAM,KAAK,aAAa;AAAA,IAC1B;AAAA,EACF;AAAA;AAAA;AAAA;AAAA,EAKA,MAAM,YAAY,KAA6B;AAE7C,QAAI,OAAO,MAAM;AACf,WAAK,aAAa,GAAG;AACrB,YAAM,KAAK,iBAAiB,GAAG;AAAA,IACjC;AAEA,eAAW,YAAY,KAAK,YAAY;AACtC,YAAM,KAAK,SAAS,CAAC,QAAQ,QAAQ,CAAC;AAEtC,UAAI;AACF,cAAM,KAAK,SAAS,CAAC,OAAO,QAAQ,CAAC;AAAA,MACvC,SAAS,KAAK;AACZ,YAAI,aAAa,WAAW;AAC1B,cAAI;AACF,kBAAM,KAAK,MAAM,OAAO,CAAC,aAAa,GAAG,KAAK,QAAQ;AAAA,UACxD,QAAQ;AAAA,UAER;AAAA,QACF;AACA,cAAM;AAAA,MACR;AAAA,IACF;AAAA,EACF;AAAA;AAAA;AAAA;AAAA,EAKQ,aAAa,KAAmB;AACtC,QAAI;AACF,YAAM,SAAS,IAAI,IAAI,GAAG;AAC1B,UAAI,CAAC,CAAC,SAAS,QAAQ,EAAE,SAAS,OAAO,QAAQ,GAAG;AAClD,cAAM,IAAI,MAAM,yBAAyB,OAAO,QAAQ,EAAE;AAAA,MAC5D;AAAA,IACF,SAAS,KAAK;AACZ,UAAI,eAAe,WAAW;AAC5B,cAAM,IAAI,MAAM,gBAAgB,GAAG,EAAE;AAAA,MACvC;AACA,YAAM;AAAA,IACR;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,MAAc,WAA6B;AACzC,UAAM,aAAa,MAAM,KAAK,cAAc;AAC5C,UAAM,oBAAoB,MAAM,IAAI,OAAO,KAAK,QAAQ,KAAK,UAAU,cAAc,CAAC;AAEtF,QAAI,CAAC,cAAc,kBAAmB,QAAO;AAG7C,UAAM,gBAAgB,MAAM,KAAK,MAAM,OAAO,CAAC,SAAS,GAAG,KAAK,QAAQ;AACxE,cAAU,QAAQ,MAAM,0BAA0B,aAAa,EAAE;AAGjE,UAAM,aAAa,KAAK,QAAQ,KAAK,UAAU,qBAAqB;AACpE,QAAI,CAAE,MAAM,IAAI,OAAO,UAAU,GAAI;AACnC,YAAM,KAAK,SAAS,CAAC,QAAQ,KAAK,QAAQ,OAAO,KAAK,QAAQ,KAAK,CAAC;AAAA,IACtE;AAGA,UAAM,UAAU,KAAK,QAAQ,KAAK,UAAU,KAAK;AACjD,UAAM,IAAI,MAAM,OAAO;AACvB,UAAM,IAAI;AAAA,MACR,KAAK,QAAQ,SAAS,YAAY;AAAA,MAClC;AAAA,IACF;AAEA,WAAO;AAAA,EACT;AAAA;AAAA;AAAA;AAAA,EAKA,MAAc,gBAAkC;AAC9C,UAAM,oBAAoB,KAAK,QAAQ,KAAK,UAAU,oBAAoB;AAG1E,QAAI,CAAE,MAAM,IAAI,OAAO,iBAAiB,GAAI;AAC1C,YAAM,IAAI,MAAM,gCAAgC,iBAAiB,EAAE;AAAA,IACrE;AAEA,UAAM,gBAAgB,MAAM,IAAI,SAAoB,iBAAiB;AAErE,UAAM,iBAAiB,KAAK,QAAQ,KAAK,UAAU,cAAc;AACjE,UAAM,gBAA4B,MAAM,IAAI,OAAO,cAAc,IAC7D,MAAM,IAAI,SAAoB,cAAc,IAC5C,EAAE,MAAM,IAAI,SAAS,GAAG;AAE5B,UAAM,aAAwB,EAAE,GAAG,cAAc;AACjD,eAAW,OAAO,KAAK,QAAQ;AAC/B,eAAW,UAAU,KAAK,WAAW;AACrC,QAAI,cAAc,SAAS,MAAM;AAC/B,iBAAW,QAAQ,cAAc;AAAA,IACnC;AAGA,eAAW,eAAe,WAAW,gBAAgB,CAAC;AACtD,eAAW,aAAa,iBAAiB,IAAI;AAC7C,eAAW,aAAa,gBAAgB,IAAI;AAC5C,eAAW,YAAY,KAAK,YAAY;AACtC,iBAAW,aAAa,cAAc,QAAQ,EAAE,IAAI;AAAA,IACtD;AAEA,eAAW,kBAAkB,WAAW,mBAAmB,CAAC;AAC5D,eAAW,gBAAgB,gBAAgB,IAAI;AAC/C,eAAW,gBAAgB,mBAAmB,IAAI;AAGlD,UAAM,WAAW;AAAA,MACf,GAAG,KAAK,WAAW;AAAA,MACnB,GAAG,KAAK,WAAW;AAAA,MACnB,GAAG,KAAK,WAAW;AAAA,IACrB;AAEA,UAAM,aAAa,OAAO,KAAK,KAAK,QAAQ,WAAW,CAAC,CAAC;AAEzD,UAAM,cAAc,OAAO,KAAK,WAAW,YAAY,EAAE;AAAA,MACvD,CAAC,SACC,CAAC,CAAC,mBAAmB,sBAAsB,kBAAkB,gBAAgB,EAAE;AAAA,QAC7E;AAAA,MACF;AAAA,IACJ;AAGA,eAAW,cAAc,aAAa;AACpC,UAAI,CAAC,WAAW,SAAS,UAAU,GAAG;AACpC,eAAO,WAAW,aAAa,UAAU;AACzC,kBAAU,QAAQ,MAAM,mBAAmB,UAAU,EAAE;AAAA,MACzD;AAAA,IACF;AAGA,eAAW,UAAU,YAAY;AAC/B,UAAI,EAAE,UAAU,WAAW,eAAe;AACxC,cAAM,UAAU,SAAS,MAAM,KAAK;AACpC,mBAAW,aAAa,MAAM,IAAI;AAClC,kBAAU,QAAQ,MAAM,iBAAiB,MAAM,IAAI,OAAO,EAAE;AAAA,MAC9D;AAAA,IACF;AAGA,UAAM,IAAI,MAAM,KAAK,QAAQ;AAC7B,UAAM,IAAI,UAAU,gBAAgB,YAAY,EAAE,OAAO,EAAE,CAAC;AAG5D,UAAM,YACJ,cAAc,UAAU,WAAW,SACnC,KAAK,UAAU,cAAc,YAAY,MAAM,KAAK,UAAU,WAAW,YAAY,KACrF,KAAK,UAAU,cAAc,eAAe,MAAM,KAAK,UAAU,WAAW,eAAe;AAE7F,WAAO;AAAA,EACT;AAAA;AAAA;AAAA;AAAA,EAKA,MAAc,gBAA+B;AAC3C,UAAM,WAAW,KAAK,QAAQ,KAAK,UAAU,qBAAqB;AAGlE,UAAM,gBAAyD,CAAC;AAChE,eAAW,CAAC,YAAY,OAAO,KAAK,OAAO,QAAQ,KAAK,QAAQ,WAAW,CAAC,CAAC,GAAG;AAC9E,UAAI,YAAY,MAAM;AACpB,cAAM,YAAY,KAAK,cAAc,WAAW,MAAM,GAAG,EAAE,GAAG,EAAE,CAAE;AAClE,sBAAc,SAAS,IAAI;AAAA,MAC7B;AAAA,IACF;AAEA,UAAM,mBACJ,OAAO,KAAK,aAAa,EAAE,SAAS,IAChC,KAAK,UAAU,eAAe,MAAM,CAAC,EAAE,QAAQ,OAAO,IAAI,EAAE,KAAK,IACjE;AAEN,UAAM,gBAAgB;AAAA;AAAA;AAAA,YAGd,KAAK,QAAQ,KAAK;AAAA,cAChB,KAAK,QAAQ,OAAO;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,aAMrB,gBAAgB;AAAA;AAAA;AAAA;AAAA;AAMzB,UAAM,IAAI,MAAM,UAAU,aAAa;AAAA,EACzC;AAAA;AAAA;AAAA;AAAA,EAKA,MAAc,gBAA+B;AAC3C,eAAW,YAAY,KAAK,YAAY;AACtC,YAAM,eAAe,KAAK,QAAQ,KAAK,UAAU,QAAQ;AACzD,UAAI,MAAM,IAAI,OAAO,YAAY,GAAG;AAClC,kBAAU,QAAQ,MAAM,4BAA4B,QAAQ,EAAE;AAC9D;AAAA,MACF;AAEA,YAAM,KAAK,SAAS,CAAC,OAAO,QAAQ,CAAC;AAAA,IACvC;AAAA,EACF;AAAA;AAAA;AAAA;AAAA,EAKA,MAAc,aAA4B;AACxC,UAAM,gBAAgB,KAAK,QAAQ,KAAK,UAAU,QAAQ;AAE1D,QAAI,KAAK,QAAQ,QAAQ,MAAM;AAC7B,YAAM,aAAa,KAAK,QAAQ,KAAK,UAAU,KAAK,QAAQ,IAAI;AAGhE,UAAI,CAAE,MAAM,IAAI,OAAO,UAAU,GAAI;AACnC,kBAAU,QAAQ;AAAA,UAChB,wBAAwB,UAAU;AAAA,QACpC;AACA;AAAA,MACF;AAEA,UAAI;AACF,cAAM,IAAI,MAAM,aAAa;AAG7B,cAAM,WAAW,KAAK,QAAQ,eAAe,UAAU;AAEvD,cAAM,WAAW,KAAK,MAAM,OAAO,GAAG;AACtC,cAAM,UAAU,KAAK,OAAO,OAAO,YAAY,CAAC;AAGhD,cAAM,MAAM,UAAU,EACnB,OAAO,UAAU,UAAU;AAAA,UAC1B,KAAK;AAAA,UACL,YAAY,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,OAAO,EAAE;AAAA,QAC3C,CAAC,EACA,OAAO;AAAA,UACN,KAAK;AAAA,UACL,QAAQ;AAAA,UACR,MAAM;AAAA,UACN,OAAO;AAAA,UACP,YAAY,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,OAAO,EAAE;AAAA,QAC3C,CAAC,EACA,OAAO,QAAQ;AAElB,cAAM,KAAK,eAAe;AAAA,UACxB;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,QACF,CAAC;AAAA,MACH,SAAS,KAAK;AACZ,kBAAU,QAAQ;AAAA,UAChB,2BAA2B,eAAe,QAAQ,IAAI,UAAU,GAAG;AAAA,QACrE;AAAA,MAEF;AAAA,IACF,OAAO;AACL,YAAM,IAAI,GAAG,aAAa;AAAA,IAC5B;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASA,MAAc,oBAAmC;AAC/C,UAAM,cAAc,KAAK,QAAQ,KAAK,UAAU,SAAS;AAGzD,QAAI,CAAE,MAAM,IAAI,OAAO,WAAW,GAAI;AACpC,YAAM,IAAI,MAAM,wCAAwC,WAAW,EAAE;AAAA,IACvE;AAEA,UAAM,KAAK,8BAA8B,WAAW;AACpD,UAAM,KAAK,yBAAyB,WAAW;AAC/C,UAAM,KAAK,0BAA0B,WAAW;AAChD,UAAM,KAAK,6BAA6B,WAAW;AAAA,EACrD;AAAA;AAAA;AAAA;AAAA,EAKA,MAAc,8BAA8B,aAAoC;AAC9E,UAAM,kBAAkB,KAAK,QAAQ,aAAa,mBAAmB;AAGrE,QAAI,CAAE,MAAM,IAAI,OAAO,eAAe,GAAI;AACxC,gBAAU,QAAQ,KAAK,qCAAqC,eAAe,EAAE;AAC7E;AAAA,IACF;AAEA,QAAI,UAAU,MAAM,IAAI,KAAK,eAAe;AAE5C,UAAM,aAAa,MAAM,KAAK,YAAY;AAC1C,QAAI,cAAc,QAAQ,CAAC,QAAQ,SAAS,sBAAsB,GAAG;AAEnE,YAAM,cAAc,WAAW,QAAQ,OAAO,MAAM;AACpD,iBAAW;AAAA,uBAA0B,WAAW;AAAA;AAChD,YAAM,IAAI,MAAM,iBAAiB,OAAO;AAAA,IAC1C;AAAA,EACF;AAAA;AAAA;AAAA;AAAA,EAKA,MAAc,cAA2C;AACvD,UAAM,WAAW;AAAA,MACf;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAEA,eAAW,WAAW,UAAU;AAC9B,YAAM,UAAU,MAAM,IAAI,KAAK,OAAO;AACtC,UAAI,QAAQ,SAAS,GAAG;AACtB,eAAO,QAAQ,KAAK,EAAE,GAAG,EAAE;AAAA,MAC7B;AAAA,IACF;AAEA,WAAO;AAAA,EACT;AAAA;AAAA;AAAA;AAAA,EAKA,MAAc,yBAAyB,aAAoC;AACzE,UAAM,iBAAiB,KAAK,QAAQ,aAAa,kBAAkB;AAEnE,UAAM,UAAU,MAAM,KAAK,gBAAgB;AAC3C,QAAI,WAAW,MAAM;AAEnB,YAAM,IAAI,MAAM,gBAAgB,WAAW,QAAQ,QAAQ,OAAO,GAAG,CAAC;AAAA,CAAI;AAAA,IAC5E,OAAO;AACL,YAAM,IAAI;AAAA,QACR;AAAA,MAGF;AAAA,IACF;AAAA,EACF;AAAA;AAAA;AAAA;AAAA,EAKA,MAAc,kBAA+C;AAC3D,UAAM,UAAW,IAAI,cAAc,KAAK,IAAI,kBAAkB;AAC9D,QAAI,WAAW,QAAS,MAAM,IAAI,OAAO,OAAO,GAAI;AAClD,aAAO;AAAA,IACT;AAEA,UAAM,aAAa;AAAA,MACjB,KAAK,QAAS,IAAI,cAAc,KAA4B,IAAI,aAAa;AAAA,MAC7E,KAAK,QAAS,IAAI,MAAM,KAA4B,IAAI,aAAa;AAAA,MACrE;AAAA,MACA;AAAA,IACF;AAEA,eAAW,aAAa,YAAY;AAClC,UAAI,MAAM,IAAI,OAAO,SAAS,GAAG;AAC/B,eAAO;AAAA,MACT;AAAA,IACF;AAEA,WAAO;AAAA,EACT;AAAA;AAAA;AAAA;AAAA,EAKA,MAAc,0BAA0B,aAAoC;AAC1E,UAAM,eAAe,KAAK,QAAQ,aAAa,kCAAkC;AAGjF,QAAI,CAAE,MAAM,IAAI,OAAO,YAAY,GAAI;AACrC,YAAM,IAAI,MAAM,uCAAuC,YAAY,EAAE;AAAA,IACvE;AAEA,QAAI,UAAU,MAAM,IAAI,KAAK,YAAY;AAGzC,QAAI,CAAC,QAAQ,SAAS,8BAA8B,GAAG;AACrD,gBAAU,QAAQ,QAAQ,gBAAgB,kDAAkD;AAAA,IAC9F;AAGA,UAAM,cAAc,KAAK,QAAQ,UAAU,SAAS,eAAe,CAAC;AACpE,eAAW,QAAQ,aAAa;AAC9B,YAAM,UAAU,qDAAqD,KAAK,IAAI;AAC9E,UAAI,CAAC,QAAQ,SAAS,OAAO,GAAG;AAC9B,cAAM,aACJ,KAAK,iBAAiB,OAAO,2BAA2B,KAAK,aAAa,MAAM;AAClF,cAAM,aAAa,KAAK,UAAU,OAAO,kBAAkB,KAAK,MAAM,MAAM;AAC5E,cAAM,WAAW,OAAO,OAAO,GAAG,UAAU,GAAG,UAAU;AAAA;AAEzD,YAAI,KAAK,UAAU,QAAQ,CAAC,QAAQ,SAAS,cAAc,GAAG;AAC5D,oBAAU,QAAQ;AAAA,YAChB;AAAA,YACA;AAAA,UACF;AAAA,QACF;AAEA,kBAAU,QAAQ,QAAQ,eAAe,GAAG,QAAQ,aAAa;AAAA,MACnE;AAAA,IACF;AAGA,UAAM,YAAY,KAAK,QAAQ,UAAU,SAAS;AAClD,QAAI,WAAW;AACb,iBAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,SAAS,GAAG;AACpD,cAAM,OAAO,WAAW,GAAG,KAAK,KAAK;AACrC,YAAI,CAAC,QAAQ,SAAS,WAAW,GAAG,GAAG,GAAG;AACxC,oBAAU,QAAQ,QAAQ,gBAAgB,gBAAgB,IAAI,EAAE;AAAA,QAClE;AAAA,MACF;AAAA,IACF;AAGA,UAAM,gBAAgB,KAAK,QAAQ,UAAU,SAAS,iBAAiB,CAAC;AACxE,eAAW,UAAU,eAAe;AAClC,YAAM,YAAY,OAAO,UAAU,OAAO,YAAY;AACtD,UAAI,aAAa,CAAC,QAAQ,SAAS,SAAS,GAAG;AAC7C,cAAM,aAAa,OAAO,UAAU,OAAO,yBAAyB,OAAO,MAAM,QAAQ;AACzF,cAAM,eACJ,OAAO,YAAY,OAAO,2BAA2B,OAAO,QAAQ,QAAQ;AAE9E,kBAAU,QAAQ;AAAA,UAChB;AAAA,UACA;AAAA;AAAA,kBAEQ,UAAU;AAAA,kBACV,YAAY;AAAA;AAAA,QAEtB;AAAA,MACF;AAAA,IACF;AAEA,UAAM,IAAI,MAAM,cAAc,OAAO;AAAA,EACvC;AAAA;AAAA;AAAA;AAAA,EAKA,MAAc,6BAA6B,aAAoC;AAC7E,UAAM,kBAAkB,KAAK,QAAQ,aAAa,kBAAkB;AAGpE,QAAI,CAAE,MAAM,IAAI,OAAO,eAAe,GAAI;AACxC,YAAM,IAAI,MAAM,gCAAgC,eAAe,EAAE;AAAA,IACnE;AAEA,QAAI,UAAU,MAAM,IAAI,KAAK,eAAe;AAG5C,UAAM,UAAU,KAAK,WAAW;AAChC,UAAM,eAAe,QAAQ,QAAQ,QAAQ,EAAE;AAC/C,UAAM,eAAe,aAAa,MAAM,GAAG;AAC3C,UAAM,cACJ,SAAS,aAAa,CAAC,KAAK,GAAG,IAAI,MACnC,SAAS,aAAa,CAAC,KAAK,GAAG,IAAI,MACnC,SAAS,aAAa,CAAC,KAAK,GAAG;AAEjC,cAAU,QAAQ,QAAQ,mBAAmB,eAAe,WAAW,EAAE;AACzE,cAAU,QAAQ,QAAQ,uBAAuB,gBAAgB,OAAO,GAAG;AAG3E,QAAI,KAAK,QAAQ,UAAU,SAAS,cAAc,MAAM;AACtD,YAAM,aAAa,KAAK,QAAQ,SAAS,QAAQ;AACjD,gBAAU,QAAQ,QAAQ,oBAAoB,iBAAiB,UAAU,EAAE;AAC3E,gBAAU,QAAQ,QAAQ,uBAAuB,oBAAoB,UAAU,EAAE;AAAA,IACnF,OAAO;AACL,gBAAU,QAAQ,QAAQ,oBAAoB,6CAA6C;AAC3F,gBAAU,QAAQ;AAAA,QAChB;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAGA,UAAM,eAAe,KAAK,QAAQ,KAAK,UAAU,UAAU,2BAA2B;AACtF,UAAM,aAAa,KAAK,QAAQ,UAAU,SAAS;AACnD,QAAI,YAAY;AACd,YAAM,iBAAiB,KAAK,QAAQ,KAAK,UAAU,WAAW,QAAQ;AAEtE,UAAI,CAAE,MAAM,IAAI,OAAO,cAAc,GAAI;AACvC,cAAM,IAAI,MAAM,4BAA4B,cAAc,EAAE;AAAA,MAC9D;AACA,YAAM,IAAI,KAAK,gBAAgB,YAAY;AAG3C,YAAM,uBAAuB,KAC1B,SAAS,KAAK,QAAQ,eAAe,GAAG,YAAY,EACpD,QAAQ,OAAO,GAAG;AACrB,YAAM,eAAe,WAAW,gBAAgB;AAEhD,UAAI,CAAC,QAAQ,SAAS,gBAAgB,GAAG;AACvC,cAAM,sBAAsB;AAAA;AAAA;AAAA,8BAGN,oBAAoB;AAAA,6BACrB,UAAU,oBAAoB,WAAW,aAAa,CAAC;AAAA,wBAC5D,UAAU,oBAAoB,WAAW,KAAK,CAAC;AAAA,2BAC5C,UAAU,oBAAoB,WAAW,QAAQ,CAAC;AAAA,yBACpD,YAAY;AAAA;AAAA;AAAA;AAI7B,kBAAU,QAAQ,QAAQ,kBAAkB,CAAC,UAAU,GAAG,KAAK,GAAG,mBAAmB,EAAE;AAAA,MACzF;AAEA,UAAI,CAAC,QAAQ,SAAS,sCAAsC,GAAG;AAC7D,kBAAU,QAAQ;AAAA,UAChB;AAAA,UACA;AAAA;AAAA,QACF;AAAA,MACF;AAAA,IACF,OAAO;AACL,YAAM,IAAI,GAAG,YAAY;AAAA,IAC3B;AAEA,UAAM,IAAI,MAAM,iBAAiB,OAAO;AAAA,EAC1C;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,OAAe,oBAAoB,OAAuB;AACxD,WAAO,MAAM,QAAQ,MAAM,KAAK;AAAA,EAClC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASA,MAAc,cAAc,SAAiB,WAAkC;AAC7E,UAAM,cAAc,KAAK,QAAQ,KAAK,UAAU,SAAS;AACzD,UAAM,gBAAgB,KAAK,QAAQ,SAAS,SAAS;AAErD,UAAM,WAAW,KAAK,QAAQ,UAAU,SAAS;AACjD,UAAM,aACJ,cAAc,YAAa,WAAW,kBAAkB,oBAAqB;AAI/E,QAAI,QAAQ,aAAa,SAAS;AAChC,YAAM,KAAK,MAAM,OAAO,CAAC,MAAM,eAAe,YAAY,aAAa,GAAG,WAAW;AAAA,IACvF,OAAO;AACL,YAAM,KAAK,MAAM,MAAM,CAAC,aAAa,YAAY,aAAa,GAAG,WAAW;AAAA,IAC9E;AAGA,UAAM,KAAK,wBAAwB,aAAa,eAAe,SAAS;AAAA,EAC1E;AAAA;AAAA;AAAA;AAAA,EAKA,MAAc,wBACZ,aACA,eACA,WACe;AACf,UAAM,WAAW,KAAK,QAAQ,UAAU,SAAS;AACjD,UAAM,WAAW,QAAQ,KAAK,QAAQ,UAAU,SAAS,IAAI;AAE7D,UAAM,MAAM,WAAW,QAAQ;AAC/B,UAAM,aAAa,WAAW,WAAW;AACzC,UAAM,WAAW,WAAW,OAAO,SAAS,IAAI,GAAG,KAAK,OAAO,SAAS,aAAa,GAAG;AAExF,UAAM,aAAa,KAAK;AAAA,MACtB;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAEA,UAAM,aAAc,MAAM,IAAI,OAAO,UAAU,IAC3C,aACA,KAAK;AAAA,MACH;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO,SAAS,IAAI,GAAG;AAAA,IACzB;AAEJ,QAAI,CAAE,MAAM,IAAI,OAAO,UAAU,GAAI;AACnC,gBAAU,QAAQ,KAAK,2BAA2B,UAAU,EAAE;AAC9D;AAAA,IACF;AAEA,UAAM,iBAAiB,GAAG,KAAK,QAAQ,OAAO,GAAG,WAAW,KAAK,WAAW,WAAW,GAAG;AAE1F,UAAM,IAAI,MAAM,aAAa;AAC7B,UAAM,IAAI,KAAK,YAAY,KAAK,QAAQ,eAAe,cAAc,CAAC;AAGtE,UAAM,cAAc,KAAK,QAAQ,eAAe,SAAS;AACzD,UAAM,IAAI,MAAM,WAAW;AAC3B,UAAM,IAAI,KAAK,YAAY,KAAK,QAAQ,aAAa,GAAG,KAAK,WAAW,OAAO,IAAI,GAAG,EAAE,CAAC;AAAA,EAC3F;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASA,MAAc,iBAAiB,KAA4B;AACzD,UAAM,aAAa,KAAK,QAAQ,KAAK,UAAU,qBAAqB;AAEpE,QAAI,CAAE,MAAM,IAAI,OAAO,UAAU,EAAI;AAErC,QAAI,UAAU,MAAM,IAAI,KAAK,UAAU;AAEvC,QAAI,QAAQ,SAAS,MAAM,GAAG;AAC5B,gBAAU,QAAQ,QAAQ,kBAAkB,SAAS,GAAG,GAAG;AAAA,IAC7D,WAAW,QAAQ,SAAS,SAAS,GAAG;AACtC,gBAAU,QAAQ,QAAQ,gBAAgB;AAAA,YAAwB,GAAG,IAAI;AAAA,IAC3E;AAEA,UAAM,IAAI,MAAM,YAAY,OAAO;AAAA,EACrC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASQ,cAAc,KAAqB;AACzC,WAAO,IACJ,QAAQ,YAAY,CAAC,GAAG,MAAc,EAAE,YAAY,CAAC,EACrD,QAAQ,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC;AAAA,EACzC;AAAA;AAGF;",
5
5
  "names": []
6
6
  }
@@ -21,6 +21,10 @@ export declare class Electron {
21
21
  * Validate configuration
22
22
  */
23
23
  private static _validateConfig;
24
+ /**
25
+ * Resolve binary path from {pkgPath}/node_modules/.bin/
26
+ */
27
+ private _localBin;
24
28
  /**
25
29
  * Execute command (with logging)
26
30
  */
@@ -29,7 +33,7 @@ export declare class Electron {
29
33
  * Initialize Electron project
30
34
  *
31
35
  * 1. Create .electron/src/package.json
32
- * 2. Run npm install
36
+ * 2. Run pnpm install
33
37
  * 3. Run electron-rebuild (rebuild native modules)
34
38
  */
35
39
  initialize(): Promise<void>;
@@ -48,7 +52,7 @@ export declare class Electron {
48
52
  *
49
53
  * 1. Bundle electron-main.ts with esbuild
50
54
  * 2. Create dist/electron/package.json
51
- * 3. Run npx electron .
55
+ * 3. Run electron .
52
56
  */
53
57
  run(url?: string): Promise<void>;
54
58
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"electron.d.ts","sourceRoot":"","sources":["..\\..\\src\\electron\\electron.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAa3D;;;;;;GAMG;AACH,qBAAa,QAAQ;IAOjB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAP1B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAsC;IAErE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IAEvC,OAAO;IASP;;OAEG;WACU,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAOjF;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;IAM9B;;OAEG;YACW,KAAK;IAcnB;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBjC;;;;;;;;OAQG;IACG,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB3C;;;;;;OAMG;IACG,GAAG,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+BtC;;OAEG;YACW,iBAAiB;IAiC/B;;OAEG;YACW,kBAAkB;IA4BhC;;OAEG;YACW,cAAc;IAY5B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAiBhC;;OAEG;YACW,mBAAmB;IAwCjC;;OAEG;YACW,gBAAgB;CA4B/B"}
1
+ {"version":3,"file":"electron.d.ts","sourceRoot":"","sources":["..\\..\\src\\electron\\electron.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAa3D;;;;;;GAMG;AACH,qBAAa,QAAQ;IAOjB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAP1B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAsC;IAErE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IAEvC,OAAO;IASP;;OAEG;WACU,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAOjF;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;IAM9B;;OAEG;IACH,OAAO,CAAC,SAAS;IAIjB;;OAEG;YACW,KAAK;IAcnB;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBjC;;;;;;;;OAQG;IACG,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB3C;;;;;;OAMG;IACG,GAAG,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+BtC;;OAEG;YACW,iBAAiB;IAiC/B;;OAEG;YACW,kBAAkB;IA4BhC;;OAEG;YACW,cAAc;IAY5B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAiBhC;;OAEG;YACW,mBAAmB;IAwCjC;;OAEG;YACW,gBAAgB;CA4B/B"}
@@ -31,6 +31,12 @@ class Electron {
31
31
  throw new Error("electron.appId is required.");
32
32
  }
33
33
  }
34
+ /**
35
+ * Resolve binary path from {pkgPath}/node_modules/.bin/
36
+ */
37
+ _localBin(name) {
38
+ return path.resolve(this._pkgPath, "node_modules/.bin", name);
39
+ }
34
40
  /**
35
41
  * Execute command (with logging)
36
42
  */
@@ -45,7 +51,7 @@ class Electron {
45
51
  * Initialize Electron project
46
52
  *
47
53
  * 1. Create .electron/src/package.json
48
- * 2. Run npm install
54
+ * 2. Run pnpm install
49
55
  * 3. Run electron-rebuild (rebuild native modules)
50
56
  */
51
57
  async initialize() {
@@ -54,7 +60,7 @@ class Electron {
54
60
  await this._exec("npm", ["install"], srcPath);
55
61
  const reinstallDeps = this._config.reinstallDependencies ?? [];
56
62
  if (reinstallDeps.length > 0) {
57
- await this._exec("npx", ["electron-rebuild"], srcPath);
63
+ await this._exec(this._localBin("electron-rebuild"), [], srcPath);
58
64
  }
59
65
  }
60
66
  /**
@@ -78,7 +84,7 @@ class Electron {
78
84
  *
79
85
  * 1. Bundle electron-main.ts with esbuild
80
86
  * 2. Create dist/electron/package.json
81
- * 3. Run npx electron .
87
+ * 3. Run electron .
82
88
  */
83
89
  async run(url) {
84
90
  const electronRunPath = path.resolve(this._pkgPath, "dist/electron");
@@ -96,7 +102,7 @@ class Electron {
96
102
  if (url != null) {
97
103
  runEnv["ELECTRON_DEV_URL"] = url;
98
104
  }
99
- await this._exec("npx", ["electron", "."], electronRunPath, runEnv);
105
+ await this._exec(this._localBin("electron"), ["."], electronRunPath, runEnv);
100
106
  }
101
107
  //#endregion
102
108
  //#region Private - Initialization
@@ -213,8 +219,8 @@ class Electron {
213
219
  const configFilePath = path.resolve(this._electronPath, "builder-config.json");
214
220
  await fsx.writeJson(configFilePath, builderConfig, { space: 2 });
215
221
  await this._exec(
216
- "npx",
217
- ["electron-builder", "--win", "--config", configFilePath],
222
+ this._localBin("electron-builder"),
223
+ ["--win", "--config", configFilePath],
218
224
  this._pkgPath
219
225
  );
220
226
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/electron/electron.ts"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": []
6
6
  }
@@ -1 +1 @@
1
- {"version":3,"file":"DevOrchestrator.d.ts","sourceRoot":"","sources":["..\\..\\src\\orchestrators\\DevOrchestrator.ts"],"names":[],"mappings":"AA0BA;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,sEAAsE;IACtE,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AA8BD;;;;;;;;;GASG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAyB;IAClD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiC;IACzD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAG9B,OAAO,CAAC,SAAS,CAAuB;IACxC,OAAO,CAAC,QAAQ,CAA2C;IAE3D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA8D;IAC9F,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA8D;IAC9F,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA+B;IACjE,OAAO,CAAC,YAAY,CAAS;IAG7B,OAAO,CAAC,wBAAwB,CAA0B;IAC1D,OAAO,CAAC,kBAAkB,CAA0B;IACpD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAQhC;IACJ,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAGlC;IAGJ,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkC;IAC3D,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,kBAAkB,CAAoC;IAC9D,OAAO,CAAC,kBAAkB,CAA4C;gBAE1D,OAAO,EAAE,sBAAsB;IAK3C;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAO7B;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAmEjC;;;;;;OAMG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA6J5B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAgF3B;;OAEG;IACH,OAAO,CAAC,aAAa;IAqJrB;;;OAGG;YACW,mBAAmB;IAwFjC;;OAEG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAOvC;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAgBhC"}
1
+ {"version":3,"file":"DevOrchestrator.d.ts","sourceRoot":"","sources":["..\\..\\src\\orchestrators\\DevOrchestrator.ts"],"names":[],"mappings":"AA0BA;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,sEAAsE;IACtE,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AA8BD;;;;;;;;;GASG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAyB;IAClD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiC;IACzD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAG9B,OAAO,CAAC,SAAS,CAAuB;IACxC,OAAO,CAAC,QAAQ,CAA2C;IAE3D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA8D;IAC9F,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA8D;IAC9F,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA+B;IACjE,OAAO,CAAC,YAAY,CAAS;IAG7B,OAAO,CAAC,wBAAwB,CAA0B;IAC1D,OAAO,CAAC,kBAAkB,CAA0B;IACpD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAQhC;IACJ,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAGlC;IAGJ,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkC;IAC3D,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,kBAAkB,CAAoC;IAC9D,OAAO,CAAC,kBAAkB,CAA4C;gBAE1D,OAAO,EAAE,sBAAsB;IAK3C;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAO7B;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAmEjC;;;;;;OAMG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA6J5B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAgF3B;;OAEG;IACH,OAAO,CAAC,aAAa;IAsJrB;;;OAGG;YACW,mBAAmB;IA0GjC;;OAEG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAOvC;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAgBhC"}
@@ -340,7 +340,7 @@ class DevOrchestrator {
340
340
  const updatedBuild = this._serverBuildWorkers.get(serverName);
341
341
  updatedBuild.buildResolver();
342
342
  };
343
- for (const { name } of this._serverPackages) {
343
+ for (const { name, config } of this._serverPackages) {
344
344
  const serverBuild = this._serverBuildWorkers.get(name);
345
345
  serverBuild.worker.on("buildStart", () => {
346
346
  if (!isFirstBuild.get(name)) {
@@ -373,7 +373,8 @@ class DevOrchestrator {
373
373
  serverRuntimeWorkerPath,
374
374
  serverRuntimePromises,
375
375
  resolveServerStep,
376
- viteClientReadyPromises
376
+ viteClientReadyPromises,
377
+ { ...this._baseEnv, ...config.env }
377
378
  ).catch((err) => {
378
379
  const message = errNs.message(err);
379
380
  this._logger.error(`[${name}] Error starting Server Runtime:`, message);
@@ -429,15 +430,21 @@ class DevOrchestrator {
429
430
  * Start server runtime worker.
430
431
  * Separated as a dedicated method to catch errors from async event handlers.
431
432
  */
432
- async _startServerRuntime(serverName, mainJsPath, serverRuntimeWorkerPath, serverRuntimePromises, resolveServerStep, viteClientReadyPromises) {
433
+ async _startServerRuntime(serverName, mainJsPath, serverRuntimeWorkerPath, serverRuntimePromises, resolveServerStep, viteClientReadyPromises, env) {
434
+ const runtimeStartTime = performance.now();
433
435
  this._logger.debug(`[${serverName}] _startServerRuntime: ${mainJsPath}`);
434
436
  const updatedBuild = this._serverBuildWorkers.get(serverName);
435
437
  updatedBuild.mainJsPath = mainJsPath;
436
438
  const existingRuntime = this._serverRuntimeWorkers.get(serverName);
437
439
  if (existingRuntime != null) {
438
440
  this._logger.info(`[${serverName}] Restarting server...`);
441
+ const terminateStart = performance.now();
439
442
  await existingRuntime.terminate();
443
+ this._logger.debug(
444
+ `[${serverName}] Previous runtime terminated (${Math.round(performance.now() - terminateStart)}ms)`
445
+ );
440
446
  }
447
+ this._logger.debug(`[${serverName}] Creating runtime worker...`);
441
448
  const runtimeWorker = Worker.create(serverRuntimeWorkerPath);
442
449
  this._serverRuntimeWorkers.set(serverName, runtimeWorker);
443
450
  const connectedClients = this._serverClientsMap.get(serverName) ?? [];
@@ -446,7 +453,11 @@ class DevOrchestrator {
446
453
  `[${serverName}] Waiting for clients: ${String(clientReadyPromises.length)} total`
447
454
  );
448
455
  if (clientReadyPromises.length > 0) {
456
+ const waitStart = performance.now();
449
457
  await Promise.all(clientReadyPromises);
458
+ this._logger.debug(
459
+ `[${serverName}] Clients ready (${Math.round(performance.now() - waitStart)}ms)`
460
+ );
450
461
  }
451
462
  const serverClientPorts = {};
452
463
  for (const clientName of connectedClients) {
@@ -454,6 +465,9 @@ class DevOrchestrator {
454
465
  serverClientPorts[clientName] = this._clientPorts[clientName];
455
466
  }
456
467
  }
468
+ this._logger.debug(
469
+ `[${serverName}] Client ports: ${JSON.stringify(serverClientPorts)}`
470
+ );
457
471
  runtimeWorker.on("serverReady", (readyData) => {
458
472
  const readyEvent = readyData;
459
473
  resolveServerStep(serverName, `${serverName}:server`, {
@@ -474,9 +488,13 @@ class DevOrchestrator {
474
488
  message: errorEvent.message
475
489
  });
476
490
  });
491
+ this._logger.debug(
492
+ `[${serverName}] Starting runtime worker... (setup took ${Math.round(performance.now() - runtimeStartTime)}ms)`
493
+ );
477
494
  runtimeWorker.start({
478
495
  mainJsPath,
479
- clientPorts: serverClientPorts
496
+ clientPorts: serverClientPorts,
497
+ env
480
498
  }).catch((err) => {
481
499
  const message = errNs.message(err);
482
500
  this._logger.error(`[${serverName}] Server Runtime Worker crashed:`, message);