@simplysm/sd-cli 14.0.53 → 14.0.55
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/capacitor/capacitor-android.d.ts.map +1 -1
- package/dist/capacitor/capacitor-android.js +32 -0
- package/dist/capacitor/capacitor-android.js.map +1 -1
- package/dist/capacitor/capacitor-icon.js +1 -1
- package/dist/capacitor/capacitor-icon.js.map +1 -1
- package/dist/capacitor/capacitor-npm-config.d.ts.map +1 -1
- package/dist/capacitor/capacitor-npm-config.js +5 -4
- package/dist/capacitor/capacitor-npm-config.js.map +1 -1
- package/dist/capacitor/capacitor.d.ts +1 -1
- package/dist/capacitor/capacitor.d.ts.map +1 -1
- package/dist/capacitor/capacitor.js +7 -7
- package/dist/capacitor/capacitor.js.map +1 -1
- package/dist/commands/check.d.ts.map +1 -1
- package/dist/commands/check.js +21 -12
- package/dist/commands/check.js.map +1 -1
- package/dist/commands/device.d.ts.map +1 -1
- package/dist/commands/device.js +13 -1
- package/dist/commands/device.js.map +1 -1
- package/dist/commands/publish/git-phase.d.ts +1 -1
- package/dist/commands/publish/git-phase.d.ts.map +1 -1
- package/dist/commands/publish/git-phase.js +12 -22
- package/dist/commands/publish/git-phase.js.map +1 -1
- package/dist/commands/publish/npm-publisher.js +2 -2
- package/dist/commands/publish/npm-publisher.js.map +1 -1
- package/dist/commands/publish/publish-command.d.ts.map +1 -1
- package/dist/commands/publish/publish-command.js +3 -2
- package/dist/commands/publish/publish-command.js.map +1 -1
- package/dist/electron/electron.d.ts.map +1 -1
- package/dist/electron/electron.js +4 -5
- package/dist/electron/electron.js.map +1 -1
- package/dist/utils/shell-spawn.d.ts +6 -0
- package/dist/utils/shell-spawn.d.ts.map +1 -0
- package/dist/utils/shell-spawn.js +5 -0
- package/dist/utils/shell-spawn.js.map +1 -0
- package/package.json +5 -5
- package/src/capacitor/capacitor-android.ts +44 -0
- package/src/capacitor/capacitor-icon.ts +1 -1
- package/src/capacitor/capacitor-npm-config.ts +5 -4
- package/src/capacitor/capacitor.ts +8 -6
- package/src/commands/check.ts +21 -12
- package/src/commands/device.ts +13 -1
- package/src/commands/publish/git-phase.ts +12 -22
- package/src/commands/publish/npm-publisher.ts +2 -2
- package/src/commands/publish/publish-command.ts +3 -2
- package/src/electron/electron.ts +5 -5
- package/src/utils/shell-spawn.ts +10 -0
- package/tests/capacitor/capacitor-icon.spec.ts +23 -1
- package/tests/capacitor/capacitor-npm-config.acc.spec.ts +14 -6
- package/tests/commands/check.spec.ts +21 -0
- package/tests/commands/git-phase.acc.spec.ts +14 -11
- package/tests/commands/publish.spec.ts +22 -13
- package/tests/electron/electron.spec.ts +9 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish-command.js","sourceRoot":"","sources":["../../../src/commands/publish/publish-command.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"publish-command.js","sourceRoot":"","sources":["../../../src/commands/publish/publish-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron.d.ts","sourceRoot":"","sources":["../../src/electron/electron.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"electron.d.ts","sourceRoot":"","sources":["../../src/electron/electron.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAa,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGzE,qBAAa,QAAQ;IAOjB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAT3B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAuC;IAEtE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAElC,OAAO;WAUM,MAAM,CACjB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,gBAAgB,EACxB,OAAO,CAAC,EAAE,MAAM,EAAE,GACjB,OAAO,CAAC,QAAQ,CAAC;IAOpB,OAAO,CAAC,MAAM,CAAC,eAAe;YAMhB,KAAK;IAmBb,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B3B,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiG/B,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YA4B7B,aAAa;IAqD3B;;;OAGG;YACW,yBAAyB;YA6BzB,kBAAkB;YAUlB,iBAAiB;YAcjB,cAAc;IAW5B,OAAO,CAAC,MAAM,CAAC,iBAAiB;YAiBlB,mBAAmB;YAyCnB,gBAAgB;CA+B/B"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import os from "os";
|
|
2
2
|
import fs from "fs";
|
|
3
3
|
import module from "module";
|
|
4
|
-
import {
|
|
4
|
+
import { fsx, pathx } from "@simplysm/core-node";
|
|
5
5
|
import { consola, LogLevels } from "consola";
|
|
6
6
|
import { createLazyLogger } from "../runtime/lazy-logger.js";
|
|
7
|
+
import { shellSpawn } from "../utils/shell-spawn.js";
|
|
7
8
|
import { createEnvBanner } from "../esbuild/esbuild-config.js";
|
|
8
9
|
export class Electron {
|
|
9
10
|
_pkgPath;
|
|
@@ -34,10 +35,9 @@ export class Electron {
|
|
|
34
35
|
async _exec(cmd, args, cwd, env) {
|
|
35
36
|
Electron._logger.debug(`실행: ${cmd} ${args.join(" ")}`);
|
|
36
37
|
const isDebug = consola.level >= LogLevels.debug;
|
|
37
|
-
const { stdout: result } = await
|
|
38
|
+
const { stdout: result } = await shellSpawn(cmd, args, {
|
|
38
39
|
cwd,
|
|
39
40
|
env,
|
|
40
|
-
shell: true,
|
|
41
41
|
...(isDebug ? { stdio: "inherit" } : {}),
|
|
42
42
|
});
|
|
43
43
|
Electron._logger.debug(`결과: ${result}`);
|
|
@@ -77,10 +77,9 @@ export class Electron {
|
|
|
77
77
|
let resolveTermination = null;
|
|
78
78
|
const spawnElectron = () => {
|
|
79
79
|
Electron._logger.debug("Electron 프로세스 시작");
|
|
80
|
-
currentElectron =
|
|
80
|
+
currentElectron = shellSpawn("pnpm", ["exec", "electron", "."], {
|
|
81
81
|
cwd: this._srcPath,
|
|
82
82
|
stdio: "inherit",
|
|
83
|
-
shell: true,
|
|
84
83
|
reject: false,
|
|
85
84
|
});
|
|
86
85
|
void currentElectron.then(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron.js","sourceRoot":"","sources":["../../src/electron/electron.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"electron.js","sourceRoot":"","sources":["../../src/electron/electron.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type { SpawnOptions } from "child_process";
|
|
2
|
+
import { cpx } from "@simplysm/core-node";
|
|
3
|
+
export declare function shellSpawn(cmd: string, args: string[], options?: SpawnOptions & {
|
|
4
|
+
reject?: boolean;
|
|
5
|
+
}): cpx.SpawnProcess;
|
|
6
|
+
//# sourceMappingURL=shell-spawn.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shell-spawn.d.ts","sourceRoot":"","sources":["../../src/utils/shell-spawn.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAE1C,wBAAgB,UAAU,CACxB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,CAAC,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GAC5C,GAAG,CAAC,YAAY,CAElB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shell-spawn.js","sourceRoot":"","sources":["../../src/utils/shell-spawn.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAE1C,MAAM,UAAU,UAAU,CACxB,GAAW,EACX,IAAc,EACd,OAA6C;IAE7C,OAAO,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAC3D,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@simplysm/sd-cli",
|
|
3
|
-
"version": "14.0.
|
|
3
|
+
"version": "14.0.55",
|
|
4
4
|
"description": "Simplysm package - CLI tool",
|
|
5
5
|
"author": "simplysm",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"sideEffects": false,
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@angular/build": "^21.2.8",
|
|
23
|
-
"@angular/compiler-cli": "^21.2.
|
|
23
|
+
"@angular/compiler-cli": "^21.2.10",
|
|
24
24
|
"@fastify/http-proxy": "^11.4.4",
|
|
25
25
|
"@inquirer/prompts": "^8.4.2",
|
|
26
26
|
"acorn": "^8.16.0",
|
|
@@ -44,9 +44,9 @@
|
|
|
44
44
|
"ws": "^8.20.0",
|
|
45
45
|
"yaml": "^2.8.3",
|
|
46
46
|
"yargs": "^18.0.0",
|
|
47
|
-
"@simplysm/core-common": "14.0.
|
|
48
|
-
"@simplysm/core-node": "14.0.
|
|
49
|
-
"@simplysm/storage": "14.0.
|
|
47
|
+
"@simplysm/core-common": "14.0.55",
|
|
48
|
+
"@simplysm/core-node": "14.0.55",
|
|
49
|
+
"@simplysm/storage": "14.0.55"
|
|
50
50
|
},
|
|
51
51
|
"devDependencies": {
|
|
52
52
|
"@types/semver": "^7.7.1",
|
|
@@ -45,6 +45,10 @@ export async function configureAndroid(
|
|
|
45
45
|
_logger.debug("styles.xml 설정 시작");
|
|
46
46
|
await _configureStyles(androidPath);
|
|
47
47
|
_logger.debug("styles.xml 설정 완료");
|
|
48
|
+
|
|
49
|
+
_logger.debug("MainActivity.java textZoom 설정 시작");
|
|
50
|
+
await _configureMainActivity(androidPath, config.appId);
|
|
51
|
+
_logger.debug("MainActivity.java textZoom 설정 완료");
|
|
48
52
|
}
|
|
49
53
|
|
|
50
54
|
/**
|
|
@@ -322,6 +326,46 @@ async function _configureBuildGradle(
|
|
|
322
326
|
await fsx.write(buildGradlePath, content);
|
|
323
327
|
}
|
|
324
328
|
|
|
329
|
+
/**
|
|
330
|
+
* MainActivity.java에 textZoom 100% 고정 설정
|
|
331
|
+
*
|
|
332
|
+
* 시스템 글꼴 크기 설정과 무관하게 WebView 텍스트 줌을 100%로 고정한다.
|
|
333
|
+
* BridgeActivity.load() 오버라이드를 사용한다 (onCreate 시점에서는 bridge가 아직 null).
|
|
334
|
+
*/
|
|
335
|
+
async function _configureMainActivity(androidPath: string, appId: string): Promise<void> {
|
|
336
|
+
const mainActivityPath = pathx.posixResolve(
|
|
337
|
+
androidPath,
|
|
338
|
+
`app/src/main/java/${appId.replace(/\./g, "/")}/MainActivity.java`,
|
|
339
|
+
);
|
|
340
|
+
|
|
341
|
+
if (!(await fsx.exists(mainActivityPath))) {
|
|
342
|
+
_logger.warn(`MainActivity.java 파일을 찾을 수 없습니다: ${mainActivityPath}`);
|
|
343
|
+
return;
|
|
344
|
+
}
|
|
345
|
+
|
|
346
|
+
let content = await fsx.read(mainActivityPath);
|
|
347
|
+
|
|
348
|
+
if (content.includes("setTextZoom")) {
|
|
349
|
+
return;
|
|
350
|
+
}
|
|
351
|
+
|
|
352
|
+
if (content.includes("public class MainActivity extends BridgeActivity {}")) {
|
|
353
|
+
content = content.replace(
|
|
354
|
+
"public class MainActivity extends BridgeActivity {}",
|
|
355
|
+
[
|
|
356
|
+
"public class MainActivity extends BridgeActivity {",
|
|
357
|
+
" @Override",
|
|
358
|
+
" protected void load() {",
|
|
359
|
+
" super.load();",
|
|
360
|
+
" getBridge().getWebView().getSettings().setTextZoom(100);",
|
|
361
|
+
" }",
|
|
362
|
+
"}",
|
|
363
|
+
].join("\n"),
|
|
364
|
+
);
|
|
365
|
+
await fsx.write(mainActivityPath, content);
|
|
366
|
+
}
|
|
367
|
+
}
|
|
368
|
+
|
|
325
369
|
/**
|
|
326
370
|
* styles.xml의 스플래시 테마 수정
|
|
327
371
|
*
|
|
@@ -2,8 +2,9 @@ import path from "path";
|
|
|
2
2
|
import { existsSync } from "node:fs";
|
|
3
3
|
import { createRequire } from "module";
|
|
4
4
|
import { consola, LogLevels } from "consola";
|
|
5
|
-
import {
|
|
5
|
+
import { fsx, pathx } from "@simplysm/core-node";
|
|
6
6
|
import { createLazyLogger } from "../runtime/lazy-logger";
|
|
7
|
+
import { shellSpawn } from "../utils/shell-spawn";
|
|
7
8
|
import type { NpmConfig, SdCapacitorConfig } from "../sd-config.types.js";
|
|
8
9
|
|
|
9
10
|
const logger = createLazyLogger("sd:cli:capacitor:npm-config");
|
|
@@ -143,11 +144,11 @@ export async function initCapNpmProject(
|
|
|
143
144
|
// pnpm install + 빌드 스크립트 승인
|
|
144
145
|
const isDebug = consola.level >= LogLevels.debug;
|
|
145
146
|
logger.debug("pnpm install 시작");
|
|
146
|
-
await
|
|
147
|
+
await shellSpawn("pnpm", ["install"], {
|
|
147
148
|
cwd: capPath,
|
|
148
149
|
...(isDebug ? { stdio: ["ignore", "inherit", "inherit"] } : {}),
|
|
149
150
|
});
|
|
150
|
-
await
|
|
151
|
+
await shellSpawn("pnpm", ["approve-builds", "--all"], {
|
|
151
152
|
cwd: capPath,
|
|
152
153
|
...(isDebug ? { stdio: ["ignore", "inherit", "inherit"] } : {}),
|
|
153
154
|
});
|
|
@@ -157,7 +158,7 @@ export async function initCapNpmProject(
|
|
|
157
158
|
const configPath = pathx.posixResolve(capPath, "capacitor.config.ts");
|
|
158
159
|
if (!(await fsx.exists(configPath))) {
|
|
159
160
|
logger.debug("cap init 시작");
|
|
160
|
-
await
|
|
161
|
+
await shellSpawn("pnpm", ["exec", "cap", "init", config.appId, config.appId], {
|
|
161
162
|
cwd: capPath,
|
|
162
163
|
...(isDebug ? { stdio: ["ignore", "inherit", "inherit"] } : {}),
|
|
163
164
|
});
|
|
@@ -278,7 +278,7 @@ export class Capacitor {
|
|
|
278
278
|
* 2. cap copy — 웹 에셋 동기화
|
|
279
279
|
* 3. cap run — 기기에서 앱 실행
|
|
280
280
|
*/
|
|
281
|
-
async run(url: string): Promise<void> {
|
|
281
|
+
async run(url: string, extraReversePorts?: number[]): Promise<void> {
|
|
282
282
|
Capacitor._logger.start(`run 중... (url: ${url})`);
|
|
283
283
|
Capacitor._logger.debug(`server.url 설정: ${url}`);
|
|
284
284
|
await updateServerUrl(this._capPath, url);
|
|
@@ -290,11 +290,13 @@ export class Capacitor {
|
|
|
290
290
|
if (urlObj.hostname === "localhost" || urlObj.hostname === "127.0.0.1") {
|
|
291
291
|
const port = urlObj.port || (urlObj.protocol === "https:" ? "443" : "80");
|
|
292
292
|
Capacitor._logger.debug(`[${platform}] adb reverse tcp:${port} 설정`);
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
const
|
|
297
|
-
|
|
293
|
+
await this._exec("adb", ["reverse", `tcp:${port}`, `tcp:${port}`], this._capPath);
|
|
294
|
+
|
|
295
|
+
if (extraReversePorts != null) {
|
|
296
|
+
for (const extraPort of extraReversePorts) {
|
|
297
|
+
Capacitor._logger.debug(`[${platform}] adb reverse tcp:${extraPort} 설정`);
|
|
298
|
+
await this._exec("adb", ["reverse", `tcp:${extraPort}`, `tcp:${extraPort}`], this._capPath);
|
|
299
|
+
}
|
|
298
300
|
}
|
|
299
301
|
}
|
|
300
302
|
}
|
package/src/commands/check.ts
CHANGED
|
@@ -69,14 +69,21 @@ export async function runCheck(options: CheckOptions): Promise<void> {
|
|
|
69
69
|
formattedOutput: r.formattedOutput,
|
|
70
70
|
});
|
|
71
71
|
|
|
72
|
-
// Lint 결과: lint
|
|
73
|
-
if (needsLint
|
|
74
|
-
let lintResult = r.lint
|
|
72
|
+
// Lint 결과: 엔진 lint 결과가 없더라도 scripts 패키지 lint는 별도 실행한다.
|
|
73
|
+
if (needsLint) {
|
|
74
|
+
let lintResult: LintResult = r.lint ?? {
|
|
75
|
+
success: true,
|
|
76
|
+
errorCount: 0,
|
|
77
|
+
warningCount: 0,
|
|
78
|
+
formattedOutput: "",
|
|
79
|
+
};
|
|
75
80
|
|
|
76
81
|
// scripts 패키지가 있으면 별도 runLintInWorker 호출 후 결과 병합
|
|
77
|
-
|
|
82
|
+
const scriptsPackagePaths = r.scriptsPackagePaths ?? [];
|
|
83
|
+
const hasScriptsPackages = scriptsPackagePaths.length > 0;
|
|
84
|
+
if (hasScriptsPackages) {
|
|
78
85
|
const scriptsLintResult: LintResult = await runLintInWorker({
|
|
79
|
-
targets:
|
|
86
|
+
targets: scriptsPackagePaths,
|
|
80
87
|
fix: options.fix,
|
|
81
88
|
timing: false,
|
|
82
89
|
});
|
|
@@ -90,13 +97,15 @@ export async function runCheck(options: CheckOptions): Promise<void> {
|
|
|
90
97
|
};
|
|
91
98
|
}
|
|
92
99
|
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
+
if (r.lint != null || hasScriptsPackages) {
|
|
101
|
+
results.push({
|
|
102
|
+
name: "LINT",
|
|
103
|
+
success: lintResult.success,
|
|
104
|
+
errorCount: lintResult.errorCount,
|
|
105
|
+
warningCount: lintResult.warningCount,
|
|
106
|
+
formattedOutput: lintResult.formattedOutput,
|
|
107
|
+
});
|
|
108
|
+
}
|
|
100
109
|
}
|
|
101
110
|
|
|
102
111
|
return results;
|
package/src/commands/device.ts
CHANGED
|
@@ -60,6 +60,7 @@ export async function runDevice(options: DeviceOptions): Promise<void> {
|
|
|
60
60
|
|
|
61
61
|
// 서버 URL 결정
|
|
62
62
|
let serverUrl = options.url;
|
|
63
|
+
let extraReversePorts: number[] | undefined;
|
|
63
64
|
if (serverUrl == null) {
|
|
64
65
|
if (typeof clientConfig.server === "number") {
|
|
65
66
|
serverUrl = `http://localhost:${clientConfig.server}/${targetName}/`;
|
|
@@ -78,6 +79,17 @@ export async function runDevice(options: DeviceOptions): Promise<void> {
|
|
|
78
79
|
const port = Number(portStr);
|
|
79
80
|
serverUrl = `http://localhost:${port}/${targetName}/`;
|
|
80
81
|
|
|
82
|
+
// 클라이언트 dev server 포트 (HMR WebSocket용 adb reverse)
|
|
83
|
+
const clientPortFile = path.join(pkgDir, "dist", ".dev-port");
|
|
84
|
+
try {
|
|
85
|
+
const clientPort = Number(fs.readFileSync(clientPortFile, "utf-8").trim());
|
|
86
|
+
if (clientPort !== port) {
|
|
87
|
+
extraReversePorts = [clientPort];
|
|
88
|
+
}
|
|
89
|
+
} catch {
|
|
90
|
+
logger.warn("클라이언트 dev server 포트를 읽지 못했습니다. HMR이 동작하지 않을 수 있습니다.");
|
|
91
|
+
}
|
|
92
|
+
|
|
81
93
|
// HTTP 헬스체크
|
|
82
94
|
const alive = await checkDevServer(serverUrl);
|
|
83
95
|
if (!alive) {
|
|
@@ -97,7 +109,7 @@ export async function runDevice(options: DeviceOptions): Promise<void> {
|
|
|
97
109
|
} else if (clientConfig.capacitor != null) {
|
|
98
110
|
logger.start(`${targetName} (capacitor) 실행 중...`);
|
|
99
111
|
const cap = await Capacitor.create(pkgDir, clientConfig.capacitor, clientConfig.exclude);
|
|
100
|
-
await cap.run(serverUrl);
|
|
112
|
+
await cap.run(serverUrl, extraReversePorts);
|
|
101
113
|
logger.success(`${targetName} (capacitor) 실행 완료`);
|
|
102
114
|
} else {
|
|
103
115
|
throw new SdError(`${targetName}에 capacitor 또는 electron 설정이 없습니다.`);
|
|
@@ -2,7 +2,7 @@ import type { consola } from "consola";
|
|
|
2
2
|
import { cpx } from "@simplysm/core-node";
|
|
3
3
|
|
|
4
4
|
/**
|
|
5
|
-
* 미커밋 변경사항을 감지하고
|
|
5
|
+
* 미커밋 변경사항을 감지하고 Codex CLI로 자동 커밋을 시도한다.
|
|
6
6
|
* @throws 자동 커밋 실패 시 Error
|
|
7
7
|
*/
|
|
8
8
|
export async function ensureCleanWorkingTree(
|
|
@@ -18,34 +18,24 @@ export async function ensureCleanWorkingTree(
|
|
|
18
18
|
|
|
19
19
|
if (diff.trim() === "" && stagedDiff.trim() === "") return;
|
|
20
20
|
|
|
21
|
-
logger.info("커밋되지 않은 변경사항 감지.
|
|
21
|
+
logger.info("커밋되지 않은 변경사항 감지. codex로 자동 커밋 시도 중...");
|
|
22
22
|
try {
|
|
23
23
|
await cpx.spawn(
|
|
24
|
-
"
|
|
24
|
+
"pnpm",
|
|
25
25
|
[
|
|
26
|
-
"
|
|
27
|
-
"
|
|
28
|
-
"
|
|
26
|
+
"exec",
|
|
27
|
+
"codex",
|
|
28
|
+
"exec",
|
|
29
|
+
"--dangerously-bypass-approvals-and-sandbox",
|
|
30
|
+
"--ephemeral",
|
|
29
31
|
"--model",
|
|
30
|
-
"
|
|
31
|
-
"
|
|
32
|
-
"
|
|
32
|
+
"gpt-5.3-codex-spark",
|
|
33
|
+
"-c",
|
|
34
|
+
'model_reasoning_effort="low"',
|
|
35
|
+
"$sd-commit",
|
|
33
36
|
],
|
|
34
37
|
{
|
|
35
38
|
stdio: "inherit",
|
|
36
|
-
env: {
|
|
37
|
-
// eslint-disable-next-line no-restricted-properties -- 자식 프로세스에 env 전달
|
|
38
|
-
...process.env,
|
|
39
|
-
MCP_CONNECTION_NONBLOCKING: "true",
|
|
40
|
-
CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: "1",
|
|
41
|
-
DISABLE_TELEMETRY: "1",
|
|
42
|
-
CLAUDE_CODE_DISABLE_BACKGROUND_TASKS: "1",
|
|
43
|
-
CLAUDE_CODE_DISABLE_AUTO_MEMORY: "1",
|
|
44
|
-
CLAUDE_CODE_DISABLE_FILE_CHECKPOINTING: "1",
|
|
45
|
-
CLAUDE_CODE_DISABLE_SESSION_DATA_UPLOAD: "1",
|
|
46
|
-
CLAUDE_CODE_SKIP_PROMPT_HISTORY: "1",
|
|
47
|
-
CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS: "1",
|
|
48
|
-
},
|
|
49
39
|
},
|
|
50
40
|
);
|
|
51
41
|
} catch (e) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import semver from "semver";
|
|
2
2
|
import type { consola } from "consola";
|
|
3
|
-
import {
|
|
3
|
+
import { shellSpawn } from "../../utils/shell-spawn";
|
|
4
4
|
|
|
5
5
|
/**
|
|
6
6
|
* npm 레지스트리에 패키지를 배포한다
|
|
@@ -26,5 +26,5 @@ export async function publishNpm(
|
|
|
26
26
|
logger.debug(`[${pkgName}] pnpm ${args.join(" ")}`);
|
|
27
27
|
}
|
|
28
28
|
|
|
29
|
-
await
|
|
29
|
+
await shellSpawn("pnpm", args, { cwd: pkgPath });
|
|
30
30
|
}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import path from "path";
|
|
2
2
|
import { consola } from "consola";
|
|
3
|
-
import {
|
|
3
|
+
import { fsx } from "@simplysm/core-node";
|
|
4
4
|
import "@simplysm/core-common";
|
|
5
5
|
import type { SdConfig, SdPublishConfig } from "../../sd-config.types";
|
|
6
6
|
import { loadSdConfig } from "../../utils/sd-config";
|
|
7
7
|
import { validateTargets } from "../../utils/package-utils";
|
|
8
|
+
import { shellSpawn } from "../../utils/shell-spawn";
|
|
8
9
|
import { runBuild } from "../build";
|
|
9
10
|
import { parseWorkspaceGlobs } from "../../deps/replace-deps/replace-deps-resolve";
|
|
10
11
|
import fs from "fs";
|
|
@@ -136,7 +137,7 @@ export async function runPublish(options: PublishOptions): Promise<void> {
|
|
|
136
137
|
if (publishPackages.some((p) => p.config.type === "npm")) {
|
|
137
138
|
logger.debug("npm 인증 검증 중...");
|
|
138
139
|
try {
|
|
139
|
-
const { stdout: whoami } = await
|
|
140
|
+
const { stdout: whoami } = await shellSpawn("npm", ["whoami"]);
|
|
140
141
|
if (whoami.trim() === "") {
|
|
141
142
|
throw new Error("npm 로그인 정보를 찾을 수 없습니다.");
|
|
142
143
|
}
|
package/src/electron/electron.ts
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import os from "os";
|
|
2
2
|
import fs from "fs";
|
|
3
3
|
import module from "module";
|
|
4
|
-
import {
|
|
4
|
+
import { fsx, pathx } from "@simplysm/core-node";
|
|
5
|
+
import type { cpx } from "@simplysm/core-node";
|
|
5
6
|
import { consola, LogLevels } from "consola";
|
|
6
7
|
import { createLazyLogger } from "../runtime/lazy-logger";
|
|
8
|
+
import { shellSpawn } from "../utils/shell-spawn";
|
|
7
9
|
import type { NpmConfig, SdElectronConfig } from "../sd-config.types.js";
|
|
8
10
|
import { createEnvBanner } from "../esbuild/esbuild-config.js";
|
|
9
11
|
|
|
@@ -48,10 +50,9 @@ export class Electron {
|
|
|
48
50
|
): Promise<string> {
|
|
49
51
|
Electron._logger.debug(`실행: ${cmd} ${args.join(" ")}`);
|
|
50
52
|
const isDebug = consola.level >= LogLevels.debug;
|
|
51
|
-
const { stdout: result } = await
|
|
53
|
+
const { stdout: result } = await shellSpawn(cmd, args, {
|
|
52
54
|
cwd,
|
|
53
55
|
env,
|
|
54
|
-
shell: true,
|
|
55
56
|
...(isDebug ? { stdio: "inherit" } : {}),
|
|
56
57
|
});
|
|
57
58
|
Electron._logger.debug(`결과: ${result}`);
|
|
@@ -102,10 +103,9 @@ export class Electron {
|
|
|
102
103
|
|
|
103
104
|
const spawnElectron = () => {
|
|
104
105
|
Electron._logger.debug("Electron 프로세스 시작");
|
|
105
|
-
currentElectron =
|
|
106
|
+
currentElectron = shellSpawn("pnpm", ["exec", "electron", "."], {
|
|
106
107
|
cwd: this._srcPath,
|
|
107
108
|
stdio: "inherit",
|
|
108
|
-
shell: true,
|
|
109
109
|
reject: false,
|
|
110
110
|
});
|
|
111
111
|
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import type { SpawnOptions } from "child_process";
|
|
2
|
+
import { cpx } from "@simplysm/core-node";
|
|
3
|
+
|
|
4
|
+
export function shellSpawn(
|
|
5
|
+
cmd: string,
|
|
6
|
+
args: string[],
|
|
7
|
+
options?: SpawnOptions & { reject?: boolean },
|
|
8
|
+
): cpx.SpawnProcess {
|
|
9
|
+
return cpx.spawn(cmd, args, { ...options, shell: true });
|
|
10
|
+
}
|
|
@@ -171,7 +171,12 @@ describe("Capacitor 아이콘 처리", () => {
|
|
|
171
171
|
const assetsCmd = execaCalls.find(
|
|
172
172
|
(c) => c.command === "pnpm" && c.args.includes("capacitor-assets"),
|
|
173
173
|
);
|
|
174
|
-
|
|
174
|
+
if (assetsCmd == null) {
|
|
175
|
+
throw new Error("capacitor-assets generate 명령이 실행되지 않았습니다.");
|
|
176
|
+
}
|
|
177
|
+
const iconBackgroundColorArgIndex = assetsCmd.args.indexOf("--iconBackgroundColor");
|
|
178
|
+
expect(iconBackgroundColorArgIndex).not.toBe(-1);
|
|
179
|
+
expect(assetsCmd.args[iconBackgroundColorArgIndex + 1]).toBe("#ffffff");
|
|
175
180
|
|
|
176
181
|
// sharp가 소스 이미지를 처리했는지 확인
|
|
177
182
|
expect(mockSharp).toHaveBeenCalled();
|
|
@@ -259,5 +264,22 @@ describe("Capacitor 아이콘 처리", () => {
|
|
|
259
264
|
);
|
|
260
265
|
expect(logoCall).toBeDefined();
|
|
261
266
|
});
|
|
267
|
+
|
|
268
|
+
it("capacitor-assets generate 명령에 흰색 아이콘 배경색을 전달한다", async () => {
|
|
269
|
+
const { setupIcon } = await import("../../src/capacitor/capacitor-icon.js");
|
|
270
|
+
|
|
271
|
+
await setupIcon(PKG_PATH, _CAP_PATH, "assets/icon.png");
|
|
272
|
+
|
|
273
|
+
const assetsCmd = execaCalls.find(
|
|
274
|
+
(c) => c.command === "pnpm" && c.args.includes("capacitor-assets"),
|
|
275
|
+
);
|
|
276
|
+
if (assetsCmd == null) {
|
|
277
|
+
throw new Error("capacitor-assets generate 명령이 실행되지 않았습니다.");
|
|
278
|
+
}
|
|
279
|
+
|
|
280
|
+
const iconBackgroundColorArgIndex = assetsCmd.args.indexOf("--iconBackgroundColor");
|
|
281
|
+
expect(iconBackgroundColorArgIndex).not.toBe(-1);
|
|
282
|
+
expect(assetsCmd.args[iconBackgroundColorArgIndex + 1]).toBe("#ffffff");
|
|
283
|
+
});
|
|
262
284
|
});
|
|
263
285
|
});
|
|
@@ -27,9 +27,13 @@ vi.mock("@simplysm/core-node", async (importOriginal) => {
|
|
|
27
27
|
};
|
|
28
28
|
});
|
|
29
29
|
|
|
30
|
-
const execaCalls: { command: string; args: string[] }[] = [];
|
|
30
|
+
const execaCalls: { command: string; args: string[]; options: unknown }[] = [];
|
|
31
31
|
const mockCpxSpawn = vi.fn((...args: unknown[]) => {
|
|
32
|
-
execaCalls.push({
|
|
32
|
+
execaCalls.push({
|
|
33
|
+
command: args[0] as string,
|
|
34
|
+
args: (args[1] as string[] | undefined) ?? [],
|
|
35
|
+
options: args[2],
|
|
36
|
+
});
|
|
33
37
|
return Promise.resolve({ stdout: "", stderr: "", exitCode: 0 });
|
|
34
38
|
});
|
|
35
39
|
|
|
@@ -118,7 +122,9 @@ describe("initCapNpmProject", () => {
|
|
|
118
122
|
}, ["android"], []);
|
|
119
123
|
|
|
120
124
|
expect(changed).toBe(true);
|
|
121
|
-
|
|
125
|
+
const installCall = execaCalls.find((c) => c.command === "pnpm" && c.args.includes("install"));
|
|
126
|
+
expect(installCall).toBeDefined();
|
|
127
|
+
expect(installCall?.options).toEqual(expect.objectContaining({ shell: true }));
|
|
122
128
|
});
|
|
123
129
|
|
|
124
130
|
it("최초 실행 시 cap init을 수행한다", async () => {
|
|
@@ -148,9 +154,11 @@ describe("initCapNpmProject", () => {
|
|
|
148
154
|
appName: "Test App",
|
|
149
155
|
}, { name: "test-pkg", version: "1.0.0" }, [], []);
|
|
150
156
|
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
)
|
|
157
|
+
const capInitCall = execaCalls.find(
|
|
158
|
+
(c) => c.command === "pnpm" && c.args.includes("cap") && c.args.includes("init"),
|
|
159
|
+
);
|
|
160
|
+
expect(capInitCall).toBeDefined();
|
|
161
|
+
expect(capInitCall?.options).toEqual(expect.objectContaining({ shell: true }));
|
|
154
162
|
});
|
|
155
163
|
});
|
|
156
164
|
|