@simplysm/sd-cli 13.0.28 → 13.0.30
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/README.md +30 -28
- package/dist/capacitor/capacitor.d.ts.map +1 -1
- package/dist/capacitor/capacitor.js +55 -10
- package/dist/capacitor/capacitor.js.map +1 -1
- package/dist/commands/add-client.d.ts.map +1 -1
- package/dist/commands/add-client.js +5 -1
- package/dist/commands/add-client.js.map +1 -1
- package/dist/commands/build.d.ts.map +1 -1
- package/dist/commands/build.js +3 -1
- package/dist/commands/build.js.map +1 -1
- package/dist/commands/device.d.ts.map +1 -1
- package/dist/commands/device.js +9 -3
- package/dist/commands/device.js.map +1 -1
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +3 -1
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/lint.d.ts.map +1 -1
- package/dist/commands/lint.js +17 -4
- package/dist/commands/lint.js.map +1 -1
- package/dist/commands/publish.d.ts.map +1 -1
- package/dist/commands/publish.js +16 -4
- package/dist/commands/publish.js.map +1 -1
- package/dist/commands/typecheck.d.ts.map +1 -1
- package/dist/commands/typecheck.js.map +1 -1
- package/dist/commands/watch.d.ts.map +1 -1
- package/dist/commands/watch.js +3 -1
- package/dist/commands/watch.js.map +1 -1
- package/dist/electron/electron.d.ts.map +1 -1
- package/dist/electron/electron.js +8 -2
- package/dist/electron/electron.js.map +1 -1
- package/dist/orchestrators/BuildOrchestrator.d.ts.map +1 -1
- package/dist/orchestrators/BuildOrchestrator.js.map +1 -1
- package/dist/orchestrators/DevOrchestrator.d.ts.map +1 -1
- package/dist/orchestrators/DevOrchestrator.js +24 -7
- package/dist/orchestrators/DevOrchestrator.js.map +1 -1
- package/dist/orchestrators/WatchOrchestrator.d.ts.map +1 -1
- package/dist/orchestrators/WatchOrchestrator.js +4 -1
- package/dist/orchestrators/WatchOrchestrator.js.map +1 -1
- package/dist/sd-cli-entry.js.map +1 -1
- package/dist/sd-cli.js +6 -1
- package/dist/sd-cli.js.map +1 -1
- package/dist/utils/config-editor.d.ts.map +1 -1
- package/dist/utils/config-editor.js +3 -1
- package/dist/utils/config-editor.js.map +1 -1
- package/dist/utils/copy-public.d.ts.map +1 -1
- package/dist/utils/copy-public.js.map +1 -1
- package/dist/utils/esbuild-config.d.ts.map +1 -1
- package/dist/utils/esbuild-config.js +6 -2
- package/dist/utils/esbuild-config.js.map +1 -1
- package/dist/utils/output-utils.d.ts.map +1 -1
- package/dist/utils/output-utils.js.map +1 -1
- package/dist/utils/package-utils.d.ts +4 -3
- package/dist/utils/package-utils.d.ts.map +1 -1
- package/dist/utils/package-utils.js +10 -2
- package/dist/utils/package-utils.js.map +1 -1
- package/dist/utils/rebuild-manager.d.ts.map +1 -1
- package/dist/utils/rebuild-manager.js.map +1 -1
- package/dist/utils/replace-deps.d.ts.map +1 -1
- package/dist/utils/replace-deps.js +3 -1
- package/dist/utils/replace-deps.js.map +1 -1
- package/dist/utils/sd-config.d.ts.map +1 -1
- package/dist/utils/sd-config.js.map +1 -1
- package/dist/utils/spawn.d.ts.map +1 -1
- package/dist/utils/spawn.js +4 -2
- package/dist/utils/spawn.js.map +1 -1
- package/dist/utils/template.d.ts.map +1 -1
- package/dist/utils/template.js +6 -1
- package/dist/utils/template.js.map +1 -1
- package/dist/utils/tsconfig.d.ts.map +1 -1
- package/dist/utils/tsconfig.js +3 -1
- package/dist/utils/tsconfig.js.map +1 -1
- package/dist/utils/typecheck-serialization.d.ts.map +1 -1
- package/dist/utils/typecheck-serialization.js +2 -1
- package/dist/utils/typecheck-serialization.js.map +1 -1
- package/dist/utils/vite-config.d.ts.map +1 -1
- package/dist/utils/vite-config.js +24 -17
- package/dist/utils/vite-config.js.map +1 -1
- package/dist/utils/worker-events.d.ts.map +1 -1
- package/dist/utils/worker-events.js.map +1 -1
- package/dist/utils/worker-utils.d.ts.map +1 -1
- package/dist/utils/worker-utils.js.map +1 -1
- package/dist/workers/client.worker.d.ts.map +1 -1
- package/dist/workers/client.worker.js +10 -2
- package/dist/workers/client.worker.js.map +1 -1
- package/dist/workers/dts.worker.d.ts.map +1 -1
- package/dist/workers/dts.worker.js +14 -4
- package/dist/workers/dts.worker.js.map +1 -1
- package/dist/workers/library.worker.d.ts.map +1 -1
- package/dist/workers/library.worker.js +17 -3
- package/dist/workers/library.worker.js.map +1 -1
- package/dist/workers/server-runtime.worker.d.ts.map +1 -1
- package/dist/workers/server-runtime.worker.js +3 -1
- package/dist/workers/server-runtime.worker.js.map +1 -1
- package/dist/workers/server.worker.d.ts.map +1 -1
- package/dist/workers/server.worker.js +20 -4
- package/dist/workers/server.worker.js.map +1 -1
- package/package.json +5 -5
- package/src/capacitor/capacitor.ts +78 -18
- package/src/commands/add-client.ts +5 -1
- package/src/commands/build.ts +4 -1
- package/src/commands/device.ts +9 -3
- package/src/commands/init.ts +3 -1
- package/src/commands/lint.ts +22 -5
- package/src/commands/publish.ts +22 -6
- package/src/commands/typecheck.ts +5 -1
- package/src/commands/watch.ts +4 -1
- package/src/electron/electron.ts +14 -3
- package/src/orchestrators/BuildOrchestrator.ts +15 -4
- package/src/orchestrators/DevOrchestrator.ts +42 -12
- package/src/orchestrators/WatchOrchestrator.ts +5 -1
- package/src/sd-cli-entry.ts +4 -1
- package/src/sd-cli.ts +6 -1
- package/src/utils/config-editor.ts +15 -5
- package/src/utils/copy-public.ts +4 -1
- package/src/utils/esbuild-config.ts +18 -4
- package/src/utils/output-utils.ts +4 -1
- package/src/utils/package-utils.ts +16 -4
- package/src/utils/rebuild-manager.ts +4 -1
- package/src/utils/replace-deps.ts +7 -2
- package/src/utils/sd-config.ts +5 -1
- package/src/utils/spawn.ts +3 -1
- package/src/utils/template.ts +6 -1
- package/src/utils/tsconfig.ts +7 -2
- package/src/utils/typecheck-serialization.ts +6 -2
- package/src/utils/vite-config.ts +36 -20
- package/src/utils/worker-events.ts +4 -1
- package/src/utils/worker-utils.ts +4 -1
- package/src/workers/client.worker.ts +12 -3
- package/src/workers/dts.worker.ts +24 -7
- package/src/workers/library.worker.ts +17 -3
- package/src/workers/server-runtime.worker.ts +3 -1
- package/src/workers/server.worker.ts +23 -5
- package/templates/add-client/__CLIENT__/package.json.hbs +1 -1
- package/templates/add-server/__SERVER__/package.json.hbs +2 -2
- package/templates/init/package.json.hbs +3 -3
|
@@ -141,8 +141,12 @@ async function buildDts(info) {
|
|
|
141
141
|
];
|
|
142
142
|
const filteredDiagnostics = allDiagnostics.filter(diagnosticFilter);
|
|
143
143
|
const serializedDiagnostics = filteredDiagnostics.map(serializeDiagnostic);
|
|
144
|
-
const errorCount = filteredDiagnostics.filter(
|
|
145
|
-
|
|
144
|
+
const errorCount = filteredDiagnostics.filter(
|
|
145
|
+
(d) => d.category === ts.DiagnosticCategory.Error
|
|
146
|
+
).length;
|
|
147
|
+
const warningCount = filteredDiagnostics.filter(
|
|
148
|
+
(d) => d.category === ts.DiagnosticCategory.Warning
|
|
149
|
+
).length;
|
|
146
150
|
const errors = filteredDiagnostics.filter((d) => d.category === ts.DiagnosticCategory.Error).map((d) => {
|
|
147
151
|
const message = ts.flattenDiagnosticMessageText(d.messageText, "\n");
|
|
148
152
|
if (d.file != null && d.start != null) {
|
|
@@ -177,7 +181,11 @@ async function startDtsWatch(info) {
|
|
|
177
181
|
try {
|
|
178
182
|
const parsedConfig = parseRootTsconfig(info.cwd);
|
|
179
183
|
const rootFiles = getPackageSourceFiles(info.pkgDir, parsedConfig);
|
|
180
|
-
const baseOptions = await getCompilerOptionsForPackage(
|
|
184
|
+
const baseOptions = await getCompilerOptionsForPackage(
|
|
185
|
+
parsedConfig.options,
|
|
186
|
+
info.env,
|
|
187
|
+
info.pkgDir
|
|
188
|
+
);
|
|
181
189
|
const pkgSrcPrefix = path.join(info.pkgDir, "src") + path.sep;
|
|
182
190
|
const options = {
|
|
183
191
|
...baseOptions,
|
|
@@ -200,7 +208,9 @@ async function startDtsWatch(info) {
|
|
|
200
208
|
}
|
|
201
209
|
const message = ts.flattenDiagnosticMessageText(diagnostic.messageText, "\n");
|
|
202
210
|
if (diagnostic.file != null && diagnostic.start != null) {
|
|
203
|
-
const { line, character } = diagnostic.file.getLineAndCharacterOfPosition(
|
|
211
|
+
const { line, character } = diagnostic.file.getLineAndCharacterOfPosition(
|
|
212
|
+
diagnostic.start
|
|
213
|
+
);
|
|
204
214
|
collectedErrors.push(
|
|
205
215
|
`${diagnostic.file.fileName}:${line + 1}:${character + 1}: TS${diagnostic.code}: ${message}`
|
|
206
216
|
);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/workers/dts.worker.ts"],
|
|
4
|
-
"mappings": "AAAA,OAAO,UAAU;AACjB,OAAO,QAAQ;AACf,SAAS,oBAAoB;AAC7B,SAAS,eAAe;AACxB;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OAEK;AACP,SAAS,2BAAsD;AAmE/D,MAAM,SAAS,QAAQ,QAAQ,mBAAmB;AAGlD,IAAI;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["shouldEmit"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.worker.d.ts","sourceRoot":"","sources":["../../src/workers/library.worker.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"library.worker.d.ts","sourceRoot":"","sources":["../../src/workers/library.worker.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAe/D;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,oBAAoB,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,oBAAoB,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,mBAAoB,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAClE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAClC,KAAK,EAAE,iBAAiB,CAAC;IACzB,KAAK,EAAE,iBAAiB,CAAC;CAC1B;AAsCD;;GAEG;AACH,iBAAe,KAAK,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAuCxE;AA6ED;;;;GAIG;AACH,iBAAe,UAAU,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8D/D;AAED;;;GAGG;AACH,iBAAe,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAExC;AAED,QAAA,MAAM,MAAM;;;eACD,OAAO,KAAK;oBAAc,OAAO,UAAU;mBAAa,OAAO,SAAS;;;CAMjF,CAAC;AAEH,eAAe,MAAM,CAAC"}
|
|
@@ -2,7 +2,11 @@ import path from "path";
|
|
|
2
2
|
import esbuild from "esbuild";
|
|
3
3
|
import { createWorker, FsWatcher } from "@simplysm/core-node";
|
|
4
4
|
import { consola } from "consola";
|
|
5
|
-
import {
|
|
5
|
+
import {
|
|
6
|
+
parseRootTsconfig,
|
|
7
|
+
getPackageSourceFiles,
|
|
8
|
+
getCompilerOptionsForPackage
|
|
9
|
+
} from "../utils/tsconfig.js";
|
|
6
10
|
import {
|
|
7
11
|
createLibraryEsbuildOptions,
|
|
8
12
|
getTypecheckEnvFromTarget,
|
|
@@ -25,7 +29,11 @@ async function build(info) {
|
|
|
25
29
|
const parsedConfig = parseRootTsconfig(info.cwd);
|
|
26
30
|
const entryPoints = getPackageSourceFiles(info.pkgDir, parsedConfig);
|
|
27
31
|
const env = getTypecheckEnvFromTarget(info.config.target);
|
|
28
|
-
const compilerOptions = await getCompilerOptionsForPackage(
|
|
32
|
+
const compilerOptions = await getCompilerOptionsForPackage(
|
|
33
|
+
parsedConfig.options,
|
|
34
|
+
env,
|
|
35
|
+
info.pkgDir
|
|
36
|
+
);
|
|
29
37
|
const esbuildOptions = createLibraryEsbuildOptions({
|
|
30
38
|
pkgDir: info.pkgDir,
|
|
31
39
|
entryPoints,
|
|
@@ -107,7 +115,13 @@ async function startWatch(info) {
|
|
|
107
115
|
const firstBuildPromise = new Promise((resolve) => {
|
|
108
116
|
resolveFirstBuild = resolve;
|
|
109
117
|
});
|
|
110
|
-
esbuildContext = await createAndBuildContext(
|
|
118
|
+
esbuildContext = await createAndBuildContext(
|
|
119
|
+
info.pkgDir,
|
|
120
|
+
info.cwd,
|
|
121
|
+
info.config,
|
|
122
|
+
true,
|
|
123
|
+
resolveFirstBuild
|
|
124
|
+
);
|
|
111
125
|
await firstBuildPromise;
|
|
112
126
|
const srcPattern = path.join(info.pkgDir, "src", "**", "*.{ts,tsx}");
|
|
113
127
|
fsWatcher = await FsWatcher.watch([srcPattern]);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/workers/library.worker.ts"],
|
|
4
|
-
"mappings": "AAAA,OAAO,UAAU;AACjB,OAAO,aAAa;AACpB,SAAS,cAAc,iBAAiB;AACxC,SAAS,eAAe;AAExB,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-runtime.worker.d.ts","sourceRoot":"","sources":["../../src/workers/server-runtime.worker.ts"],"names":[],"mappings":"AAQA;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,yBAA0B,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACxE,WAAW,EAAE,uBAAuB,CAAC;IACrC,KAAK,EAAE,uBAAuB,CAAC;CAChC;
|
|
1
|
+
{"version":3,"file":"server-runtime.worker.d.ts","sourceRoot":"","sources":["../../src/workers/server-runtime.worker.ts"],"names":[],"mappings":"AAQA;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,yBAA0B,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACxE,WAAW,EAAE,uBAAuB,CAAC;IACrC,KAAK,EAAE,uBAAuB,CAAC;CAChC;AAmED;;;GAGG;AACH,iBAAe,KAAK,CAAC,IAAI,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyChE;AAED,QAAA,MAAM,MAAM;;;eAAyB,OAAO,KAAK;;;CAE/C,CAAC;AAEH,eAAe,MAAM,CAAC"}
|
|
@@ -42,7 +42,9 @@ async function findAvailablePort(startPort, maxRetries = 20) {
|
|
|
42
42
|
return port;
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
|
-
throw new Error(
|
|
45
|
+
throw new Error(
|
|
46
|
+
`\uD3EC\uD2B8 ${startPort}\uBD80\uD130 ${startPort + maxRetries - 1}\uAE4C\uC9C0 \uC0AC\uC6A9 \uAC00\uB2A5\uD55C \uD3EC\uD2B8\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.`
|
|
47
|
+
);
|
|
46
48
|
}
|
|
47
49
|
async function start(info) {
|
|
48
50
|
try {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/workers/server-runtime.worker.ts"],
|
|
4
|
-
"mappings": "AAAA,OAAO,WAAW;AAClB,SAAS,oBAAoB;AAC7B,SAAS,eAAe;AACxB,OAAO,SAAS;AAChB,SAAS,+BAA+B;AAoCxC,MAAM,SAAS,QAAQ,QAAQ,8BAA8B;AAG7D,IAAI;AAKJ,eAAe,UAAyB;AACtC,QAAM,SAAS;AACf,MAAI,UAAU,MAAM;AAClB,UAAM,OAAO,MAAM;AAAA,EACrB;AACA,mBAAiB;AACnB;AAIA,QAAQ,GAAG,qBAAqB,CAAC,QAAQ;AACvC,SAAO,MAAM,kDAAyB,GAAG;AACzC,SAAO,KAAK,SAAS;AAAA,IACnB,SAAS,eAAe,QAAQ,IAAI,UAAU,OAAO,GAAG;AAAA,EAC1D,CAAC;AACH,CAAC;AAED,QAAQ,GAAG,sBAAsB,CAAC,WAAW;AAC3C,SAAO,MAAM,0DAAiC,MAAM;AACpD,SAAO,KAAK,SAAS;AAAA,IACnB,SAAS,kBAAkB,QAAQ,OAAO,UAAU,OAAO,MAAM;AAAA,EACnE,CAAC;AACH,CAAC;AAED,wBAAwB,SAAS,MAAM;AAKvC,SAAS,gBAAgB,MAAgC;AACvD,SAAO,IAAI,QAAQ,CAAC,YAAY;AAC9B,UAAM,SAAS,IAAI,aAAa;AAChC,WAAO,KAAK,SAAS,MAAM,QAAQ,KAAK,CAAC;AACzC,WAAO,KAAK,aAAa,MAAM;AAC7B,aAAO,MAAM,MAAM,QAAQ,IAAI,CAAC;AAAA,IAClC,CAAC;AACD,WAAO,OAAO,MAAM,SAAS;AAAA,EAC/B,CAAC;AACH;AAKA,eAAe,kBAAkB,WAAmB,aAAa,IAAqB;AACpF,WAAS,IAAI,GAAG,IAAI,YAAY,KAAK;AACnC,UAAM,OAAO,YAAY;AACzB,QAAI,MAAM,gBAAgB,IAAI,GAAG;AAC/B,aAAO;AAAA,IACT;AAAA,EACF;AACA,QAAM,IAAI,
|
|
4
|
+
"mappings": "AAAA,OAAO,WAAW;AAClB,SAAS,oBAAoB;AAC7B,SAAS,eAAe;AACxB,OAAO,SAAS;AAChB,SAAS,+BAA+B;AAoCxC,MAAM,SAAS,QAAQ,QAAQ,8BAA8B;AAG7D,IAAI;AAKJ,eAAe,UAAyB;AACtC,QAAM,SAAS;AACf,MAAI,UAAU,MAAM;AAClB,UAAM,OAAO,MAAM;AAAA,EACrB;AACA,mBAAiB;AACnB;AAIA,QAAQ,GAAG,qBAAqB,CAAC,QAAQ;AACvC,SAAO,MAAM,kDAAyB,GAAG;AACzC,SAAO,KAAK,SAAS;AAAA,IACnB,SAAS,eAAe,QAAQ,IAAI,UAAU,OAAO,GAAG;AAAA,EAC1D,CAAC;AACH,CAAC;AAED,QAAQ,GAAG,sBAAsB,CAAC,WAAW;AAC3C,SAAO,MAAM,0DAAiC,MAAM;AACpD,SAAO,KAAK,SAAS;AAAA,IACnB,SAAS,kBAAkB,QAAQ,OAAO,UAAU,OAAO,MAAM;AAAA,EACnE,CAAC;AACH,CAAC;AAED,wBAAwB,SAAS,MAAM;AAKvC,SAAS,gBAAgB,MAAgC;AACvD,SAAO,IAAI,QAAQ,CAAC,YAAY;AAC9B,UAAM,SAAS,IAAI,aAAa;AAChC,WAAO,KAAK,SAAS,MAAM,QAAQ,KAAK,CAAC;AACzC,WAAO,KAAK,aAAa,MAAM;AAC7B,aAAO,MAAM,MAAM,QAAQ,IAAI,CAAC;AAAA,IAClC,CAAC;AACD,WAAO,OAAO,MAAM,SAAS;AAAA,EAC/B,CAAC;AACH;AAKA,eAAe,kBAAkB,WAAmB,aAAa,IAAqB;AACpF,WAAS,IAAI,GAAG,IAAI,YAAY,KAAK;AACnC,UAAM,OAAO,YAAY;AACzB,QAAI,MAAM,gBAAgB,IAAI,GAAG;AAC/B,aAAO;AAAA,IACT;AAAA,EACF;AACA,QAAM,IAAI;AAAA,IACR,gBAAM,SAAS,gBAAM,YAAY,aAAa,CAAC;AAAA,EACjD;AACF;AAMA,eAAe,MAAM,MAA6C;AAChE,MAAI;AAEF,UAAM,SAAS,MAAM,OAAO,KAAK;AACjC,UAAM,SAAS,OAAO;AAEtB,QAAI,UAAU,MAAM;AAClB,YAAM,IAAI,MAAM,kGAAsC;AAAA,IACxD;AAGA,qBAAiB;AAGjB,UAAM,eAAe,OAAO,QAAQ;AACpC,UAAM,gBAAgB,MAAM,kBAAkB,YAAY;AAC1D,QAAI,kBAAkB,cAAc;AAClC,aAAO,KAAK,gBAAM,YAAY,+BAAW,aAAa,qBAAM;AAC5D,aAAO,QAAQ,OAAO;AAAA,IACxB;AAGA,eAAW,CAAC,MAAM,IAAI,KAAK,OAAO,QAAQ,KAAK,WAAW,GAAG;AAC3D,YAAM,OAAO,QAAQ,SAAS,OAAO;AAAA,QACnC,QAAQ,IAAI,IAAI;AAAA,QAChB,UAAU,oBAAoB,IAAI;AAAA,QAClC,eAAe,IAAI,IAAI;AAAA,QACvB,WAAW;AAAA,MACb,CAAC;AAAA,IACH;AAGA,UAAM,OAAO,OAAO;AAEpB,WAAO,KAAK,eAAe,EAAE,MAAM,OAAO,QAAQ,KAAK,CAAC;AAAA,EAC1D,SAAS,KAAK;AACZ,WAAO,MAAM,4CAAwB,GAAG;AACxC,WAAO,KAAK,SAAS;AAAA,MACnB,SAAS,eAAe,QAAQ,IAAI,UAAU,OAAO,GAAG;AAAA,IAC1D,CAAC;AAAA,EACH;AACF;AAEA,MAAM,SAAS,aAAiE;AAAA,EAC9E;AACF,CAAC;AAED,IAAO,gCAAQ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.worker.d.ts","sourceRoot":"","sources":["../../src/workers/server.worker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"server.worker.d.ts","sourceRoot":"","sources":["../../src/workers/server.worker.ts"],"names":[],"mappings":"AAsBA;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,qCAAqC;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,wCAAwC;IACxC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,2CAA2C;IAC3C,GAAG,CAAC,EAAE;QACJ,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;KAC7B,CAAC;IACF,8EAA8E;IAC9E,cAAc,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CACnC;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,qCAAqC;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,wCAAwC;IACxC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACjE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAClC,KAAK,EAAE,gBAAgB,CAAC;IACxB,KAAK,EAAE,gBAAgB,CAAC;CACzB;AA+LD;;GAEG;AACH,iBAAe,KAAK,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAsDtE;AAKD;;;;GAIG;AACH,iBAAe,UAAU,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CA2F9D;AAED;;;GAGG;AACH,iBAAe,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAExC;AAED,QAAA,MAAM,MAAM;;;eACD,OAAO,KAAK;oBAAc,OAAO,UAAU;mBAAa,OAAO,SAAS;;;CAMjF,CAAC;AAEH,eAAe,MAAM,CAAC"}
|
|
@@ -4,7 +4,11 @@ import cp from "child_process";
|
|
|
4
4
|
import esbuild from "esbuild";
|
|
5
5
|
import { createWorker } from "@simplysm/core-node";
|
|
6
6
|
import { consola } from "consola";
|
|
7
|
-
import {
|
|
7
|
+
import {
|
|
8
|
+
parseRootTsconfig,
|
|
9
|
+
getPackageSourceFiles,
|
|
10
|
+
getCompilerOptionsForPackage
|
|
11
|
+
} from "../utils/tsconfig.js";
|
|
8
12
|
import {
|
|
9
13
|
createServerEsbuildOptions,
|
|
10
14
|
collectUninstalledOptionalPeerDeps,
|
|
@@ -109,7 +113,11 @@ node = "${nodeVersion}"
|
|
|
109
113
|
if (info.pm2 != null) {
|
|
110
114
|
logger.debug("GEN pm2.config.cjs...");
|
|
111
115
|
const pm2Name = info.pm2.name ?? pkgJson.name.replace(/@/g, "").replace(/[/\\]/g, "-");
|
|
112
|
-
const ignoreWatch = JSON.stringify([
|
|
116
|
+
const ignoreWatch = JSON.stringify([
|
|
117
|
+
"node_modules",
|
|
118
|
+
"www",
|
|
119
|
+
...info.pm2.ignoreWatchPaths ?? []
|
|
120
|
+
]);
|
|
113
121
|
const envObj = {
|
|
114
122
|
NODE_ENV: "production",
|
|
115
123
|
TZ: "Asia/Seoul",
|
|
@@ -143,7 +151,11 @@ async function build(info) {
|
|
|
143
151
|
try {
|
|
144
152
|
const parsedConfig = parseRootTsconfig(info.cwd);
|
|
145
153
|
const entryPoints = getPackageSourceFiles(info.pkgDir, parsedConfig);
|
|
146
|
-
const compilerOptions = await getCompilerOptionsForPackage(
|
|
154
|
+
const compilerOptions = await getCompilerOptionsForPackage(
|
|
155
|
+
parsedConfig.options,
|
|
156
|
+
"node",
|
|
157
|
+
info.pkgDir
|
|
158
|
+
);
|
|
147
159
|
const external = collectAllExternals(info.pkgDir, info.externals);
|
|
148
160
|
const esbuildOptions = createServerEsbuildOptions({
|
|
149
161
|
pkgDir: info.pkgDir,
|
|
@@ -182,7 +194,11 @@ async function startWatch(info) {
|
|
|
182
194
|
try {
|
|
183
195
|
const parsedConfig = parseRootTsconfig(info.cwd);
|
|
184
196
|
const entryPoints = getPackageSourceFiles(info.pkgDir, parsedConfig);
|
|
185
|
-
const compilerOptions = await getCompilerOptionsForPackage(
|
|
197
|
+
const compilerOptions = await getCompilerOptionsForPackage(
|
|
198
|
+
parsedConfig.options,
|
|
199
|
+
"node",
|
|
200
|
+
info.pkgDir
|
|
201
|
+
);
|
|
186
202
|
const mainJsPath = path.join(info.pkgDir, "dist", "main.js");
|
|
187
203
|
let resolveFirstBuild;
|
|
188
204
|
const firstBuildPromise = new Promise((resolve) => {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/workers/server.worker.ts"],
|
|
4
|
-
"mappings": "AAAA,OAAO,UAAU;AACjB,OAAO,QAAQ;AACf,OAAO,QAAQ;AACf,OAAO,aAAa;AACpB,SAAS,oBAAoB;AAE7B,SAAS,eAAe;AACxB,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@simplysm/sd-cli",
|
|
3
|
-
"version": "13.0.
|
|
3
|
+
"version": "13.0.30",
|
|
4
4
|
"description": "심플리즘 패키지 - CLI 도구",
|
|
5
5
|
"author": "김석래",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
"esbuild": "^0.27.3",
|
|
29
29
|
"esbuild-plugin-solid": "^0.6.0",
|
|
30
30
|
"eslint": "^9.39.2",
|
|
31
|
-
"glob": "^13.0.
|
|
31
|
+
"glob": "^13.0.5",
|
|
32
32
|
"handlebars": "^4.7.8",
|
|
33
33
|
"jiti": "^2.6.1",
|
|
34
34
|
"semver": "^7.7.4",
|
|
@@ -44,9 +44,9 @@
|
|
|
44
44
|
"vite-plugin-solid": "^2.11.10",
|
|
45
45
|
"vite-tsconfig-paths": "^6.1.1",
|
|
46
46
|
"yargs": "^18.0.0",
|
|
47
|
-
"@simplysm/core-common": "13.0.
|
|
48
|
-
"@simplysm/core-node": "13.0.
|
|
49
|
-
"@simplysm/storage": "13.0.
|
|
47
|
+
"@simplysm/core-common": "13.0.30",
|
|
48
|
+
"@simplysm/core-node": "13.0.30",
|
|
49
|
+
"@simplysm/storage": "13.0.30"
|
|
50
50
|
},
|
|
51
51
|
"devDependencies": {
|
|
52
52
|
"@types/semver": "^7.7.1",
|
|
@@ -1,5 +1,15 @@
|
|
|
1
1
|
import path from "path";
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
fsExists,
|
|
4
|
+
fsMkdir,
|
|
5
|
+
fsRead,
|
|
6
|
+
fsReadJson,
|
|
7
|
+
fsWrite,
|
|
8
|
+
fsWriteJson,
|
|
9
|
+
fsGlob,
|
|
10
|
+
fsCopy,
|
|
11
|
+
fsRm,
|
|
12
|
+
} from "@simplysm/core-node";
|
|
3
13
|
import { env } from "@simplysm/core-common";
|
|
4
14
|
import { consola } from "consola";
|
|
5
15
|
import sharp from "sharp";
|
|
@@ -106,7 +116,8 @@ export class Capacitor {
|
|
|
106
116
|
if (await fsExists(lockPath)) {
|
|
107
117
|
const lockContent = await fsRead(lockPath);
|
|
108
118
|
throw new Error(
|
|
109
|
-
`다른 Capacitor 작업이 진행 중입니다 (PID: ${lockContent}). ` +
|
|
119
|
+
`다른 Capacitor 작업이 진행 중입니다 (PID: ${lockContent}). ` +
|
|
120
|
+
`문제가 있다면 ${lockPath} 파일을 삭제하세요.`,
|
|
110
121
|
);
|
|
111
122
|
}
|
|
112
123
|
await fsMkdir(this._capPath);
|
|
@@ -139,7 +150,9 @@ export class Capacitor {
|
|
|
139
150
|
if (this._platforms.includes("android")) {
|
|
140
151
|
const javaPath = await this._findJava21();
|
|
141
152
|
if (javaPath == null) {
|
|
142
|
-
Capacitor._logger.warn(
|
|
153
|
+
Capacitor._logger.warn(
|
|
154
|
+
"Java 21을 찾을 수 없습니다. Gradle이 내장 JDK를 사용하거나 빌드가 실패할 수 있습니다.",
|
|
155
|
+
);
|
|
143
156
|
}
|
|
144
157
|
}
|
|
145
158
|
}
|
|
@@ -273,13 +286,20 @@ export class Capacitor {
|
|
|
273
286
|
// F12: cap init 멱등성 - capacitor.config.ts가 없을 때만 실행
|
|
274
287
|
const configPath = path.resolve(this._capPath, "capacitor.config.ts");
|
|
275
288
|
if (!(await fsExists(configPath))) {
|
|
276
|
-
await this._exec(
|
|
289
|
+
await this._exec(
|
|
290
|
+
"npx",
|
|
291
|
+
["cap", "init", this._config.appName, this._config.appId],
|
|
292
|
+
this._capPath,
|
|
293
|
+
);
|
|
277
294
|
}
|
|
278
295
|
|
|
279
296
|
// 기본 www/index.html 생성
|
|
280
297
|
const wwwPath = path.resolve(this._capPath, "www");
|
|
281
298
|
await fsMkdir(wwwPath);
|
|
282
|
-
await fsWrite(
|
|
299
|
+
await fsWrite(
|
|
300
|
+
path.resolve(wwwPath, "index.html"),
|
|
301
|
+
"<!DOCTYPE html><html><head></head><body></body></html>",
|
|
302
|
+
);
|
|
283
303
|
|
|
284
304
|
return true;
|
|
285
305
|
}
|
|
@@ -331,7 +351,10 @@ export class Capacitor {
|
|
|
331
351
|
const usePlugins = Object.keys(this._config.plugins ?? {});
|
|
332
352
|
|
|
333
353
|
const prevPlugins = Object.keys(capNpmConf.dependencies).filter(
|
|
334
|
-
(item) =>
|
|
354
|
+
(item) =>
|
|
355
|
+
!["@capacitor/core", "@capacitor/android", "@capacitor/ios", "@capacitor/app"].includes(
|
|
356
|
+
item,
|
|
357
|
+
),
|
|
335
358
|
);
|
|
336
359
|
|
|
337
360
|
// 사용하지 않는 플러그인 제거
|
|
@@ -380,7 +403,9 @@ export class Capacitor {
|
|
|
380
403
|
}
|
|
381
404
|
|
|
382
405
|
const pluginsConfigStr =
|
|
383
|
-
Object.keys(pluginOptions).length > 0
|
|
406
|
+
Object.keys(pluginOptions).length > 0
|
|
407
|
+
? JSON.stringify(pluginOptions, null, 2).replace(/^/gm, " ").trim()
|
|
408
|
+
: "{}";
|
|
384
409
|
|
|
385
410
|
const configContent = `import type { CapacitorConfig } from "@capacitor/cli";
|
|
386
411
|
|
|
@@ -427,7 +452,9 @@ export default config;
|
|
|
427
452
|
|
|
428
453
|
// F6: 소스 아이콘 존재 확인
|
|
429
454
|
if (!(await fsExists(iconSource))) {
|
|
430
|
-
Capacitor._logger.warn(
|
|
455
|
+
Capacitor._logger.warn(
|
|
456
|
+
`아이콘 파일을 찾을 수 없습니다: ${iconSource}. 기본 아이콘을 사용합니다.`,
|
|
457
|
+
);
|
|
431
458
|
return;
|
|
432
459
|
}
|
|
433
460
|
|
|
@@ -457,7 +484,14 @@ export default config;
|
|
|
457
484
|
|
|
458
485
|
await this._exec(
|
|
459
486
|
"npx",
|
|
460
|
-
[
|
|
487
|
+
[
|
|
488
|
+
"@capacitor/assets",
|
|
489
|
+
"generate",
|
|
490
|
+
"--iconBackgroundColor",
|
|
491
|
+
"#ffffff",
|
|
492
|
+
"--splashBackgroundColor",
|
|
493
|
+
"#ffffff",
|
|
494
|
+
],
|
|
461
495
|
this._capPath,
|
|
462
496
|
);
|
|
463
497
|
} catch (err) {
|
|
@@ -605,7 +639,8 @@ export default config;
|
|
|
605
639
|
for (const perm of permissions) {
|
|
606
640
|
const permTag = `<uses-permission android:name="android.permission.${perm.name}"`;
|
|
607
641
|
if (!content.includes(permTag)) {
|
|
608
|
-
const maxSdkAttr =
|
|
642
|
+
const maxSdkAttr =
|
|
643
|
+
perm.maxSdkVersion != null ? ` android:maxSdkVersion="${perm.maxSdkVersion}"` : "";
|
|
609
644
|
const ignoreAttr = perm.ignore != null ? ` tools:ignore="${perm.ignore}"` : "";
|
|
610
645
|
const permLine = ` ${permTag}${maxSdkAttr}${ignoreAttr} />\n`;
|
|
611
646
|
|
|
@@ -637,7 +672,8 @@ export default config;
|
|
|
637
672
|
const filterKey = filter.action ?? filter.category ?? "";
|
|
638
673
|
if (filterKey && !content.includes(filterKey)) {
|
|
639
674
|
const actionLine = filter.action != null ? `<action android:name="${filter.action}"/>` : "";
|
|
640
|
-
const categoryLine =
|
|
675
|
+
const categoryLine =
|
|
676
|
+
filter.category != null ? `<category android:name="${filter.category}"/>` : "";
|
|
641
677
|
|
|
642
678
|
content = content.replace(
|
|
643
679
|
/(<activity[\s\S]*?android:name="\.MainActivity"[\s\S]*?>)/,
|
|
@@ -685,7 +721,10 @@ export default config;
|
|
|
685
721
|
content = content.replace(/targetSdkVersion .+/, `targetSdkVersion ${sdkVersion}`);
|
|
686
722
|
} else {
|
|
687
723
|
content = content.replace(/minSdkVersion .+/, `minSdkVersion rootProject.ext.minSdkVersion`);
|
|
688
|
-
content = content.replace(
|
|
724
|
+
content = content.replace(
|
|
725
|
+
/targetSdkVersion .+/,
|
|
726
|
+
`targetSdkVersion rootProject.ext.targetSdkVersion`,
|
|
727
|
+
);
|
|
689
728
|
}
|
|
690
729
|
|
|
691
730
|
// Signing 설정
|
|
@@ -700,7 +739,9 @@ export default config;
|
|
|
700
739
|
await fsCopy(keystoreSource, keystorePath);
|
|
701
740
|
|
|
702
741
|
// F9: 상대 경로를 forward slash로 변환
|
|
703
|
-
const keystoreRelativePath = path
|
|
742
|
+
const keystoreRelativePath = path
|
|
743
|
+
.relative(path.dirname(buildGradlePath), keystorePath)
|
|
744
|
+
.replace(/\\/g, "/");
|
|
704
745
|
const keystoreType = signConfig.keystoreType ?? "jks";
|
|
705
746
|
|
|
706
747
|
if (!content.includes("signingConfigs")) {
|
|
@@ -743,7 +784,8 @@ export default config;
|
|
|
743
784
|
const targetOutPath = path.resolve(outPath, "android");
|
|
744
785
|
|
|
745
786
|
const isBundle = this._config.platform?.android?.bundle;
|
|
746
|
-
const gradleTask =
|
|
787
|
+
const gradleTask =
|
|
788
|
+
buildType === "release" ? (isBundle ? "bundleRelease" : "assembleRelease") : "assembleDebug";
|
|
747
789
|
|
|
748
790
|
// Gradle 빌드 실행 (크로스 플랫폼)
|
|
749
791
|
// F9: Windows에서 cmd.exe를 통해 실행 (shell: false 이므로)
|
|
@@ -760,7 +802,11 @@ export default config;
|
|
|
760
802
|
/**
|
|
761
803
|
* Android 빌드 결과물 복사
|
|
762
804
|
*/
|
|
763
|
-
private async _copyAndroidBuildOutput(
|
|
805
|
+
private async _copyAndroidBuildOutput(
|
|
806
|
+
androidPath: string,
|
|
807
|
+
targetOutPath: string,
|
|
808
|
+
buildType: string,
|
|
809
|
+
): Promise<void> {
|
|
764
810
|
const isBundle = this._config.platform?.android?.bundle;
|
|
765
811
|
const isSigned = Boolean(this._config.platform?.android?.sign);
|
|
766
812
|
|
|
@@ -768,11 +814,23 @@ export default config;
|
|
|
768
814
|
const outputType = isBundle ? "bundle" : "apk";
|
|
769
815
|
const fileName = isSigned ? `app-${buildType}.${ext}` : `app-${buildType}-unsigned.${ext}`;
|
|
770
816
|
|
|
771
|
-
const sourcePath = path.resolve(
|
|
817
|
+
const sourcePath = path.resolve(
|
|
818
|
+
androidPath,
|
|
819
|
+
"app/build/outputs",
|
|
820
|
+
outputType,
|
|
821
|
+
buildType,
|
|
822
|
+
fileName,
|
|
823
|
+
);
|
|
772
824
|
|
|
773
825
|
const actualPath = (await fsExists(sourcePath))
|
|
774
826
|
? sourcePath
|
|
775
|
-
: path.resolve(
|
|
827
|
+
: path.resolve(
|
|
828
|
+
androidPath,
|
|
829
|
+
"app/build/outputs",
|
|
830
|
+
outputType,
|
|
831
|
+
buildType,
|
|
832
|
+
`app-${buildType}.${ext}`,
|
|
833
|
+
);
|
|
776
834
|
|
|
777
835
|
if (!(await fsExists(actualPath))) {
|
|
778
836
|
Capacitor._logger.warn(`빌드 결과물을 찾을 수 없습니다: ${actualPath}`);
|
|
@@ -821,7 +879,9 @@ export default config;
|
|
|
821
879
|
* 문자열을 PascalCase로 변환
|
|
822
880
|
*/
|
|
823
881
|
private _toPascalCase(str: string): string {
|
|
824
|
-
return str
|
|
882
|
+
return str
|
|
883
|
+
.replace(/[-_](.)/g, (_, c: string) => c.toUpperCase())
|
|
884
|
+
.replace(/^./, (c) => c.toUpperCase());
|
|
825
885
|
}
|
|
826
886
|
|
|
827
887
|
//#endregion
|
|
@@ -115,7 +115,11 @@ export async function runAddClient(_options: AddClientOptions): Promise<void> {
|
|
|
115
115
|
|
|
116
116
|
// 완료
|
|
117
117
|
consola.box(
|
|
118
|
-
[
|
|
118
|
+
[
|
|
119
|
+
`클라이언트 "${clientName}"이(가) 추가되었습니다!`,
|
|
120
|
+
"",
|
|
121
|
+
` pnpm dev ${clientName} 개발 서버 실행`,
|
|
122
|
+
].join("\n"),
|
|
119
123
|
);
|
|
120
124
|
}
|
|
121
125
|
|
package/src/commands/build.ts
CHANGED
package/src/commands/device.ts
CHANGED
|
@@ -75,7 +75,9 @@ export async function runDevice(options: DeviceOptions): Promise<void> {
|
|
|
75
75
|
if (typeof clientConfig.server === "number") {
|
|
76
76
|
serverUrl = `http://localhost:${clientConfig.server}/${packageName}/`;
|
|
77
77
|
} else {
|
|
78
|
-
logger.error(
|
|
78
|
+
logger.error(
|
|
79
|
+
`--url 옵션이 필요합니다. server가 패키지명으로 설정되어 있습니다: ${clientConfig.server}`,
|
|
80
|
+
);
|
|
79
81
|
process.exitCode = 1;
|
|
80
82
|
return;
|
|
81
83
|
}
|
|
@@ -99,7 +101,9 @@ export async function runDevice(options: DeviceOptions): Promise<void> {
|
|
|
99
101
|
if (typeof clientConfig.server === "number") {
|
|
100
102
|
serverUrl = `http://localhost:${clientConfig.server}/${packageName}/capacitor/`;
|
|
101
103
|
} else {
|
|
102
|
-
logger.error(
|
|
104
|
+
logger.error(
|
|
105
|
+
`--url 옵션이 필요합니다. server가 패키지명으로 설정되어 있습니다: ${clientConfig.server}`,
|
|
106
|
+
);
|
|
103
107
|
process.exitCode = 1;
|
|
104
108
|
return;
|
|
105
109
|
}
|
|
@@ -111,7 +115,9 @@ export async function runDevice(options: DeviceOptions): Promise<void> {
|
|
|
111
115
|
|
|
112
116
|
const capPath = path.join(pkgDir, ".capacitor");
|
|
113
117
|
if (!(await fsExists(capPath))) {
|
|
114
|
-
logger.error(
|
|
118
|
+
logger.error(
|
|
119
|
+
`Capacitor 프로젝트가 초기화되지 않았습니다. 먼저 'pnpm watch ${packageName}'를 실행하세요.`,
|
|
120
|
+
);
|
|
115
121
|
process.exitCode = 1;
|
|
116
122
|
return;
|
|
117
123
|
}
|
package/src/commands/init.ts
CHANGED
|
@@ -50,7 +50,9 @@ export async function runInit(_options: InitOptions): Promise<void> {
|
|
|
50
50
|
// 2. 프로젝트명 검증
|
|
51
51
|
const projectName = path.basename(cwd);
|
|
52
52
|
if (!isValidScopeName(projectName)) {
|
|
53
|
-
consola.error(
|
|
53
|
+
consola.error(
|
|
54
|
+
`프로젝트 이름 "${projectName}"이(가) 유효하지 않습니다. 소문자, 숫자, 하이픈만 사용 가능합니다.`,
|
|
55
|
+
);
|
|
54
56
|
process.exitCode = 1;
|
|
55
57
|
return;
|
|
56
58
|
}
|