@simplysm/sd-cli 12.7.5 → 12.7.6
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/entry/{SdAiCommand.d.ts → sd-cli-ai-command.d.ts} +1 -1
- package/dist/entry/{SdAiCommand.js → sd-cli-ai-command.js} +5 -5
- package/dist/entry/sd-cli-ai-command.js.map +1 -0
- package/dist/entry/{SdCliCordova.d.ts → sd-cli-cordova.d.ts} +1 -1
- package/dist/entry/{SdCliCordova.js → sd-cli-cordova.js} +33 -33
- package/dist/entry/sd-cli-cordova.js.map +1 -0
- package/dist/entry/{SdCliElectron.d.ts → sd-cli-electron.d.ts} +1 -1
- package/dist/entry/{SdCliElectron.js → sd-cli-electron.js} +18 -18
- package/dist/entry/sd-cli-electron.js.map +1 -0
- package/dist/entry/{SdCliLocalUpdate.js → sd-cli-local-update.js} +12 -12
- package/dist/entry/sd-cli-local-update.js.map +1 -0
- package/dist/entry/{SdCliProject.js → sd-cli-project.js} +36 -36
- package/dist/entry/sd-cli-project.js.map +1 -0
- package/dist/index.d.ts +30 -30
- package/dist/index.js +30 -30
- package/dist/index.js.map +1 -1
- package/dist/pkg-builders/client/{SdCliNgRoutesFileGenerator.js → sd-cli-ng-routes.file-generator.js} +12 -12
- package/dist/pkg-builders/client/sd-cli-ng-routes.file-generator.js.map +1 -0
- package/dist/pkg-builders/client/{SdClientBuildRunner.d.ts → sd-client.build-runner.d.ts} +2 -2
- package/dist/pkg-builders/client/{SdClientBuildRunner.js → sd-client.build-runner.js} +34 -27
- package/dist/pkg-builders/client/sd-client.build-runner.js.map +1 -0
- package/dist/pkg-builders/client/{SdNgBundlerContext.js → sd-ng.bundler-context.js} +5 -5
- package/dist/pkg-builders/client/sd-ng.bundler-context.js.map +1 -0
- package/dist/pkg-builders/client/{SdNgBundler.d.ts → sd-ng.bundler.d.ts} +2 -2
- package/dist/pkg-builders/client/{SdNgBundler.js → sd-ng.bundler.js} +55 -37
- package/dist/pkg-builders/client/sd-ng.bundler.js.map +1 -0
- package/dist/pkg-builders/client/{createSdNgPlugin.d.ts → sd-ng.plugin-creator.d.ts} +1 -1
- package/dist/pkg-builders/client/{createSdNgPlugin.js → sd-ng.plugin-creator.js} +17 -17
- package/dist/pkg-builders/client/sd-ng.plugin-creator.js.map +1 -0
- package/dist/pkg-builders/lib/{SdCliIndexFileGenerator.js → sd-cli-index.file-generator.js} +8 -8
- package/dist/pkg-builders/lib/sd-cli-index.file-generator.js.map +1 -0
- package/dist/pkg-builders/lib/{SdJsLibBuildRunner.d.ts → sd-js-lib.build-runner.d.ts} +2 -2
- package/dist/pkg-builders/lib/{SdJsLibBuildRunner.js → sd-js-lib.build-runner.js} +17 -17
- package/dist/pkg-builders/lib/sd-js-lib.build-runner.js.map +1 -0
- package/dist/pkg-builders/lib/{SdTsLibBuildRunner.d.ts → sd-ts-lib.build-runner.d.ts} +2 -2
- package/dist/pkg-builders/lib/{SdTsLibBuildRunner.js → sd-ts-lib.build-runner.js} +17 -17
- package/dist/pkg-builders/lib/sd-ts-lib.build-runner.js.map +1 -0
- package/dist/pkg-builders/lib/{SdTsLibBuilder.d.ts → sd-ts-lib.builder.d.ts} +1 -1
- package/dist/pkg-builders/lib/{SdTsLibBuilder.js → sd-ts-lib.builder.js} +11 -11
- package/dist/pkg-builders/lib/sd-ts-lib.builder.js.map +1 -0
- package/dist/pkg-builders/{SdMultiBuildRunner.d.ts → sd-multi.build-runner.d.ts} +2 -2
- package/dist/pkg-builders/{SdMultiBuildRunner.js → sd-multi.build-runner.js} +13 -13
- package/dist/pkg-builders/sd-multi.build-runner.js.map +1 -0
- package/dist/pkg-builders/server/{SdServerBuildRunner.d.ts → sd-server.build-runner.d.ts} +2 -2
- package/dist/pkg-builders/server/{SdServerBuildRunner.js → sd-server.build-runner.js} +35 -35
- package/dist/pkg-builders/server/sd-server.build-runner.js.map +1 -0
- package/dist/pkg-builders/server/{SdServerBundler.d.ts → sd-server.bundler.d.ts} +1 -1
- package/dist/pkg-builders/server/{SdServerBundler.js → sd-server.bundler.js} +15 -15
- package/dist/pkg-builders/server/sd-server.bundler.js.map +1 -0
- package/dist/pkg-builders/server/{createSdServerPlugin.d.ts → sd-server.plugin-creator.d.ts} +1 -1
- package/dist/pkg-builders/server/{createSdServerPlugin.js → sd-server.plugin-creator.js} +10 -10
- package/dist/pkg-builders/server/sd-server.plugin-creator.js.map +1 -0
- package/dist/sd-cli.js +10 -10
- package/dist/sd-cli.js.map +1 -1
- package/dist/{ts-builder/SdTsCompiler.d.ts → ts-compiler/sd-ts-compiler.d.ts} +1 -1
- package/dist/{ts-builder/SdTsCompiler.js → ts-compiler/sd-ts-compiler.js} +60 -60
- package/dist/ts-compiler/sd-ts-compiler.js.map +1 -0
- package/dist/types/{build-plugin.type.js → build-plugin.types.js} +1 -1
- package/dist/types/build-plugin.types.js.map +1 -0
- package/dist/types/{build-runner.type.d.ts → build-runner.types.d.ts} +1 -1
- package/dist/types/build-runner.types.js +3 -0
- package/dist/types/build-runner.types.js.map +1 -0
- package/dist/types/{build.type.js → build.types.js} +1 -1
- package/dist/types/build.types.js.map +1 -0
- package/dist/types/common-configs.types.js +2 -0
- package/dist/types/common-configs.types.js.map +1 -0
- package/dist/types/config.types.js +2 -0
- package/dist/types/config.types.js.map +1 -0
- package/dist/types/{ts-compiler.type.d.ts → ts-compiler.types.d.ts} +1 -1
- package/dist/types/{ts-compiler.type.js → ts-compiler.types.js} +2 -2
- package/dist/types/ts-compiler.types.js.map +1 -0
- package/dist/types/{workers.type.d.ts → worker.types.d.ts} +2 -2
- package/dist/types/worker.types.js +3 -0
- package/dist/types/worker.types.js.map +1 -0
- package/dist/utils/{SdCliConvertMessageUtil.d.ts → sd-cli-convert-message.utils.d.ts} +2 -2
- package/dist/utils/{SdCliConvertMessageUtil.js → sd-cli-convert-message.utils.js} +7 -7
- package/dist/utils/sd-cli-convert-message.utils.js.map +1 -0
- package/dist/utils/{SdCliPerformanceTime.js → sd-cli-performance-time.js} +1 -1
- package/dist/utils/sd-cli-performance-time.js.map +1 -0
- package/dist/workers/{build-runner-worker.js → build-runner.worker.js} +13 -13
- package/dist/workers/build-runner.worker.js.map +1 -0
- package/dist/workers/{server-worker.js → server.worker.js} +6 -6
- package/dist/workers/server.worker.js.map +1 -0
- package/package.json +5 -5
- package/src/entry/{SdAiCommand.ts → sd-cli-ai-command.ts} +4 -4
- package/src/entry/{SdCliCordova.ts → sd-cli-cordova.ts} +32 -32
- package/src/entry/{SdCliElectron.ts → sd-cli-electron.ts} +17 -17
- package/src/entry/{SdCliLocalUpdate.ts → sd-cli-local-update.ts} +11 -11
- package/src/entry/{SdCliProject.ts → sd-cli-project.ts} +36 -36
- package/src/index.ts +30 -30
- package/src/pkg-builders/client/{SdCliNgRoutesFileGenerator.ts → sd-cli-ng-routes.file-generator.ts} +11 -11
- package/src/pkg-builders/client/{SdClientBuildRunner.ts → sd-client.build-runner.ts} +52 -45
- package/src/pkg-builders/client/{SdNgBundlerContext.ts → sd-ng.bundler-context.ts} +4 -4
- package/src/pkg-builders/client/{SdNgBundler.ts → sd-ng.bundler.ts} +94 -61
- package/src/pkg-builders/client/{createSdNgPlugin.ts → sd-ng.plugin-creator.ts} +16 -16
- package/src/pkg-builders/lib/{SdCliIndexFileGenerator.ts → sd-cli-index.file-generator.ts} +7 -7
- package/src/pkg-builders/lib/{SdJsLibBuildRunner.ts → sd-js-lib.build-runner.ts} +16 -16
- package/src/pkg-builders/lib/{SdTsLibBuildRunner.ts → sd-ts-lib.build-runner.ts} +17 -17
- package/src/pkg-builders/lib/{SdTsLibBuilder.ts → sd-ts-lib.builder.ts} +10 -10
- package/src/pkg-builders/{SdMultiBuildRunner.ts → sd-multi.build-runner.ts} +12 -12
- package/src/pkg-builders/server/{SdServerBuildRunner.ts → sd-server.build-runner.ts} +34 -34
- package/src/pkg-builders/server/{SdServerBundler.ts → sd-server.bundler.ts} +14 -14
- package/src/pkg-builders/server/{createSdServerPlugin.ts → sd-server.plugin-creator.ts} +9 -9
- package/src/sd-cli.ts +10 -10
- package/src/{ts-builder/SdTsCompiler.ts → ts-compiler/sd-ts-compiler.ts} +60 -60
- package/src/types/{build-runner.type.ts → build-runner.types.ts} +1 -1
- package/src/types/{ts-compiler.type.ts → ts-compiler.types.ts} +1 -1
- package/src/types/{workers.type.ts → worker.types.ts} +2 -2
- package/src/utils/{SdCliConvertMessageUtil.ts → sd-cli-convert-message.utils.ts} +6 -6
- package/src/workers/{build-runner-worker.ts → build-runner.worker.ts} +12 -12
- package/src/workers/{server-worker.ts → server.worker.ts} +5 -5
- package/dist/entry/SdAiCommand.js.map +0 -1
- package/dist/entry/SdCliCordova.js.map +0 -1
- package/dist/entry/SdCliElectron.js.map +0 -1
- package/dist/entry/SdCliLocalUpdate.js.map +0 -1
- package/dist/entry/SdCliProject.js.map +0 -1
- package/dist/pkg-builders/SdMultiBuildRunner.js.map +0 -1
- package/dist/pkg-builders/client/SdCliNgRoutesFileGenerator.js.map +0 -1
- package/dist/pkg-builders/client/SdClientBuildRunner.js.map +0 -1
- package/dist/pkg-builders/client/SdNgBundler.js.map +0 -1
- package/dist/pkg-builders/client/SdNgBundlerContext.js.map +0 -1
- package/dist/pkg-builders/client/createSdNgPlugin.js.map +0 -1
- package/dist/pkg-builders/lib/SdCliIndexFileGenerator.js.map +0 -1
- package/dist/pkg-builders/lib/SdJsLibBuildRunner.js.map +0 -1
- package/dist/pkg-builders/lib/SdTsLibBuildRunner.js.map +0 -1
- package/dist/pkg-builders/lib/SdTsLibBuilder.js.map +0 -1
- package/dist/pkg-builders/server/SdServerBuildRunner.js.map +0 -1
- package/dist/pkg-builders/server/SdServerBundler.js.map +0 -1
- package/dist/pkg-builders/server/createSdServerPlugin.js.map +0 -1
- package/dist/ts-builder/SdTsCompiler.js.map +0 -1
- package/dist/types/build-plugin.type.js.map +0 -1
- package/dist/types/build-runner.type.js +0 -3
- package/dist/types/build-runner.type.js.map +0 -1
- package/dist/types/build.type.js.map +0 -1
- package/dist/types/common-configs.type.js +0 -2
- package/dist/types/common-configs.type.js.map +0 -1
- package/dist/types/sd-configs.type.js +0 -2
- package/dist/types/sd-configs.type.js.map +0 -1
- package/dist/types/ts-compiler.type.js.map +0 -1
- package/dist/types/workers.type.js +0 -3
- package/dist/types/workers.type.js.map +0 -1
- package/dist/utils/SdCliConvertMessageUtil.js.map +0 -1
- package/dist/utils/SdCliPerformanceTime.js.map +0 -1
- package/dist/workers/build-runner-worker.js.map +0 -1
- package/dist/workers/server-worker.js.map +0 -1
- /package/dist/entry/{SdCliLocalUpdate.d.ts → sd-cli-local-update.d.ts} +0 -0
- /package/dist/entry/{SdCliProject.d.ts → sd-cli-project.d.ts} +0 -0
- /package/dist/pkg-builders/client/{SdCliNgRoutesFileGenerator.d.ts → sd-cli-ng-routes.file-generator.d.ts} +0 -0
- /package/dist/pkg-builders/client/{SdNgBundlerContext.d.ts → sd-ng.bundler-context.d.ts} +0 -0
- /package/dist/pkg-builders/lib/{SdCliIndexFileGenerator.d.ts → sd-cli-index.file-generator.d.ts} +0 -0
- /package/dist/types/{build-plugin.type.d.ts → build-plugin.types.d.ts} +0 -0
- /package/dist/types/{build.type.d.ts → build.types.d.ts} +0 -0
- /package/dist/types/{common-configs.type.d.ts → common-configs.types.d.ts} +0 -0
- /package/dist/types/{sd-configs.type.d.ts → config.types.d.ts} +0 -0
- /package/dist/utils/{SdCliPerformanceTime.d.ts → sd-cli-performance-time.d.ts} +0 -0
- /package/dist/workers/{build-runner-worker.d.ts → build-runner.worker.d.ts} +0 -0
- /package/dist/workers/{server-worker.d.ts → server.worker.d.ts} +0 -0
- /package/src/types/{build-plugin.type.ts → build-plugin.types.ts} +0 -0
- /package/src/types/{build.type.ts → build.types.ts} +0 -0
- /package/src/types/{common-configs.type.ts → common-configs.types.ts} +0 -0
- /package/src/types/{sd-configs.type.ts → config.types.ts} +0 -0
- /package/src/utils/{SdCliPerformanceTime.ts → sd-cli-performance-time.ts} +0 -0
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import { SdProcess } from "@simplysm/sd-core-node";
|
|
2
|
-
import { NeverEntryError,
|
|
2
|
+
import { NeverEntryError, StringUtils } from "@simplysm/sd-core-common";
|
|
3
3
|
import Anthropic from "@anthropic-ai/sdk";
|
|
4
|
-
export class
|
|
4
|
+
export class SdCliAiCommand {
|
|
5
5
|
static async commitAsync() {
|
|
6
|
-
if (
|
|
6
|
+
if (StringUtils.isNullOrEmpty(process.env["ANTHROPIC_API_KEY"])) {
|
|
7
7
|
throw new Error("ANTHROPIC_API_KEY 환경변수가 설정되어 있지 않습니다.");
|
|
8
8
|
}
|
|
9
9
|
process.stdout.write("실행중: git add .\n");
|
|
10
10
|
await SdProcess.spawnAsync("git add .", { cwd: process.cwd() });
|
|
11
11
|
process.stdout.write(`실행중: git diff --staged -- . ":(exclude).*!/" ":(exclude)_*/ ":(exclude)yarn.lock" ":(exclude)packages/*/styles.css"\n`);
|
|
12
12
|
const diff = await SdProcess.spawnAsync(`git diff --text --staged -- . ":(exclude).*" ":(exclude)_*" ":(exclude)yarn.lock" ":(exclude)packages/*/styles.css"`, { cwd: process.cwd() });
|
|
13
|
-
if (
|
|
13
|
+
if (StringUtils.isNullOrEmpty(diff.trim())) {
|
|
14
14
|
throw new Error("변경사항이 없습니다.");
|
|
15
15
|
}
|
|
16
16
|
const client = new Anthropic({ apiKey: process.env["ANTHROPIC_API_KEY"] });
|
|
@@ -51,4 +51,4 @@ ${diff}`,
|
|
|
51
51
|
process.stdout.write("커밋이 완료되었습니다. 위 커밋메시지가 맘에들지 않을경우, 직접 커밋을 취소하세요.\n");
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
|
-
//# sourceMappingURL=
|
|
54
|
+
//# sourceMappingURL=sd-cli-ai-command.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sd-cli-ai-command.js","sourceRoot":"","sources":["../../src/entry/sd-cli-ai-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,SAAS,MAAM,mBAAmB,CAAC;AAE1C,MAAM,OAAO,cAAc;IACzB,MAAM,CAAC,KAAK,CAAC,WAAW;QACtB,IAAI,WAAW,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC;YAChE,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAC3D,CAAC;QAED,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACzC,MAAM,SAAS,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAEhE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uHAAuH,CAAC,CAAC;QAC9I,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,UAAU,CACrC,qHAAqH,EACrH,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CACvB,CAAC;QAEF,IAAI,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;QACjC,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;QAE3E,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC3C,KAAK,EAAE,yBAAyB;YAChC,UAAU,EAAE,IAAI;YAChB,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE;;;;;;;;;;;;;;;EAejB,IAAI,EAAE;iBACC;aACF;SACF,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACvC,MAAM,IAAI,eAAe,EAAE,CAAC;QAC9B,CAAC;QACD,iDAAiD;QAEjD,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QACpE,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEtF,MAAM,SAAS,CAAC,UAAU,CACxB,kBAAkB,aAAa,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,EAC3D,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CACvB,CAAC;QACF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,aAAa,GAAG,MAAM,CAAC,CAAC;QACtD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;IAC3E,CAAC;CACF"}
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import * as path from "path";
|
|
2
|
-
import {
|
|
2
|
+
import { FsUtils, SdLogger, SdProcess } from "@simplysm/sd-core-node";
|
|
3
3
|
import xml2js from "xml2js";
|
|
4
4
|
import JSZip from "jszip";
|
|
5
|
-
import {} from "../types/common-configs.
|
|
6
|
-
import {} from "../types/
|
|
5
|
+
import {} from "../types/common-configs.types";
|
|
6
|
+
import {} from "../types/config.types";
|
|
7
7
|
const BIN_PATH = path.resolve(process.cwd(), "node_modules/.bin/cordova.cmd");
|
|
8
8
|
export class SdCliCordova {
|
|
9
9
|
constructor(_opt) {
|
|
10
10
|
this._opt = _opt;
|
|
11
|
-
this._logger =
|
|
11
|
+
this._logger = SdLogger.get(["simplysm", "sd-cli", "SdCliCordova"]);
|
|
12
12
|
this._platforms = Object.keys(this._opt.config.platform ?? { browser: {} });
|
|
13
|
-
this._npmConfig =
|
|
13
|
+
this._npmConfig = FsUtils.readJson(path.resolve(this._opt.pkgPath, "package.json"));
|
|
14
14
|
// this._logger = Logger.get(["simplysm", "sd-cli", this.constructor.name, this._npmConfig.name]);
|
|
15
15
|
}
|
|
16
16
|
async _execAsync(cmd, cwd) {
|
|
@@ -20,7 +20,7 @@ export class SdCliCordova {
|
|
|
20
20
|
}
|
|
21
21
|
async initializeAsync() {
|
|
22
22
|
const cordovaPath = path.resolve(this._opt.pkgPath, ".cordova");
|
|
23
|
-
if (
|
|
23
|
+
if (FsUtils.exists(cordovaPath)) {
|
|
24
24
|
this._logger.log("이미 생성되어있는 '.cordova'를 사용합니다.");
|
|
25
25
|
}
|
|
26
26
|
else {
|
|
@@ -37,11 +37,11 @@ export class SdCliCordova {
|
|
|
37
37
|
FsUtil.writeJson(path.resolve(cordovaPath, "package.json"), npmConfig);*/
|
|
38
38
|
}
|
|
39
39
|
// platforms 폴더 혹시 없으면 생성
|
|
40
|
-
|
|
40
|
+
FsUtils.mkdirs(path.resolve(cordovaPath, "platforms"));
|
|
41
41
|
// www 폴더 혹시 없으면 생성
|
|
42
|
-
|
|
42
|
+
FsUtils.mkdirs(path.resolve(cordovaPath, "www"));
|
|
43
43
|
// 미설치 빌드 플랫폼 신규 생성
|
|
44
|
-
const alreadyPlatforms =
|
|
44
|
+
const alreadyPlatforms = FsUtils.readdir(path.resolve(cordovaPath, "platforms"));
|
|
45
45
|
for (const platform of this._platforms) {
|
|
46
46
|
if (!alreadyPlatforms.includes(platform)) {
|
|
47
47
|
// await this._execAsync(`${BIN_PATH} platform add ${platform}`, cordovaPath);
|
|
@@ -60,8 +60,8 @@ export class SdCliCordova {
|
|
|
60
60
|
}
|
|
61
61
|
}*/
|
|
62
62
|
// 설치된 미사용 플러그인 삭제
|
|
63
|
-
const pluginsFetch =
|
|
64
|
-
?
|
|
63
|
+
const pluginsFetch = FsUtils.exists(path.resolve(cordovaPath, "plugins/fetch.json"))
|
|
64
|
+
? FsUtils.readJson(path.resolve(cordovaPath, "plugins/fetch.json"))
|
|
65
65
|
: undefined;
|
|
66
66
|
const alreadyPlugins = [];
|
|
67
67
|
if (pluginsFetch != null) {
|
|
@@ -95,15 +95,15 @@ export class SdCliCordova {
|
|
|
95
95
|
}
|
|
96
96
|
// ANDROID SIGN 파일 복사
|
|
97
97
|
if (this._opt.config.platform?.android?.sign) {
|
|
98
|
-
|
|
98
|
+
FsUtils.copy(path.resolve(this._opt.pkgPath, this._opt.config.platform.android.sign.keystore), path.resolve(cordovaPath, "android.keystore"));
|
|
99
99
|
}
|
|
100
100
|
else {
|
|
101
|
-
|
|
101
|
+
FsUtils.remove(path.resolve(cordovaPath, "android.keystore"));
|
|
102
102
|
// SIGN을 안쓸경우 아래 파일이 생성되어 있으면 오류남
|
|
103
|
-
|
|
103
|
+
FsUtils.remove(path.resolve(cordovaPath, "platforms/android/release-signing.properties"));
|
|
104
104
|
}
|
|
105
105
|
// 빌드 옵션 파일 생성
|
|
106
|
-
|
|
106
|
+
FsUtils.writeJson(path.resolve(cordovaPath, "build.json"), {
|
|
107
107
|
...(this._opt.config.platform?.android
|
|
108
108
|
? {
|
|
109
109
|
android: {
|
|
@@ -125,14 +125,14 @@ export class SdCliCordova {
|
|
|
125
125
|
});
|
|
126
126
|
// ICON 파일 복사
|
|
127
127
|
if (this._opt.config.icon != null) {
|
|
128
|
-
|
|
128
|
+
FsUtils.copy(path.resolve(this._opt.pkgPath, this._opt.config.icon), path.resolve(cordovaPath, "res/icons", path.basename(this._opt.config.icon)));
|
|
129
129
|
}
|
|
130
130
|
else {
|
|
131
|
-
|
|
131
|
+
FsUtils.remove(path.resolve(cordovaPath, "res/icons"));
|
|
132
132
|
}
|
|
133
133
|
// SplashScreen 파일 생성
|
|
134
134
|
if (this._opt.config.platform?.android && this._opt.config.icon != null) {
|
|
135
|
-
|
|
135
|
+
FsUtils.writeFile(path.resolve(cordovaPath, "res/screen/android/splashscreen.xml"), `
|
|
136
136
|
<?xml version="1.0" encoding="utf-8"?>
|
|
137
137
|
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
|
138
138
|
<item
|
|
@@ -145,11 +145,11 @@ export class SdCliCordova {
|
|
|
145
145
|
// CONFIG: 초기값 백업
|
|
146
146
|
const configFilePath = path.resolve(cordovaPath, "config.xml");
|
|
147
147
|
const configBackFilePath = path.resolve(cordovaPath, "config.xml.bak");
|
|
148
|
-
if (!
|
|
149
|
-
|
|
148
|
+
if (!FsUtils.exists(configBackFilePath)) {
|
|
149
|
+
FsUtils.copy(configFilePath, configBackFilePath);
|
|
150
150
|
}
|
|
151
151
|
// CONFIG: 초기값 읽기
|
|
152
|
-
const configFileContent =
|
|
152
|
+
const configFileContent = FsUtils.readFile(configBackFilePath);
|
|
153
153
|
const configXml = await xml2js.parseStringPromise(configFileContent);
|
|
154
154
|
// CONFIG: 버전 설정
|
|
155
155
|
configXml.widget.$.version = this._npmConfig.version;
|
|
@@ -246,7 +246,7 @@ export class SdCliCordova {
|
|
|
246
246
|
}
|
|
247
247
|
// CONFIG: 파일 새로 쓰기
|
|
248
248
|
const configResultContent = new xml2js.Builder().buildObject(configXml);
|
|
249
|
-
|
|
249
|
+
FsUtils.writeFile(configFilePath, configResultContent);
|
|
250
250
|
//android.json의 undefined 문제 해결
|
|
251
251
|
/*const androidJsonFilePath = path.resolve(cordovaPath, "platforms/android/android.json");
|
|
252
252
|
if (FsUtil.exists(androidJsonFilePath)) {
|
|
@@ -274,37 +274,37 @@ export class SdCliCordova {
|
|
|
274
274
|
? `app-${buildType}.apk`
|
|
275
275
|
: `app-${buildType}-unsigned.apk`;
|
|
276
276
|
const latestDistApkFileName = path.basename(`${this._opt.config.appName}${this._opt.config.platform.android.sign ? "" : "-unsigned"}-latest.apk`);
|
|
277
|
-
|
|
278
|
-
|
|
277
|
+
FsUtils.mkdirs(targetOutPath);
|
|
278
|
+
FsUtils.copy(path.resolve(cordovaPath, "platforms/android/app/build/outputs/apk", buildType, apkFileName), path.resolve(targetOutPath, latestDistApkFileName));
|
|
279
279
|
}
|
|
280
280
|
// 자동업데이트를 위한 파일 쓰기 (ZIP)
|
|
281
281
|
const zip = new JSZip();
|
|
282
|
-
const wwwFiles =
|
|
282
|
+
const wwwFiles = FsUtils.glob(path.resolve(cordovaPath, "www/**/*"), { nodir: true });
|
|
283
283
|
for (const wwwFile of wwwFiles) {
|
|
284
284
|
const relFilePath = path.relative(path.resolve(cordovaPath, "www"), wwwFile);
|
|
285
|
-
const fileBuffer =
|
|
285
|
+
const fileBuffer = FsUtils.readFileBuffer(wwwFile);
|
|
286
286
|
zip.file(relFilePath, fileBuffer);
|
|
287
287
|
}
|
|
288
|
-
const platformWwwFiles =
|
|
288
|
+
const platformWwwFiles = FsUtils.glob(path.resolve(cordovaPath, "platforms", platform, "platform_www/**/*"), {
|
|
289
289
|
nodir: true,
|
|
290
290
|
});
|
|
291
291
|
for (const platformWwwFile of platformWwwFiles) {
|
|
292
292
|
const relFilePath = path.relative(path.resolve(cordovaPath, "platforms", platform, "platform_www"), platformWwwFile);
|
|
293
|
-
const fileBuffer =
|
|
293
|
+
const fileBuffer = FsUtils.readFileBuffer(platformWwwFile);
|
|
294
294
|
zip.file(relFilePath, fileBuffer);
|
|
295
295
|
}
|
|
296
|
-
|
|
296
|
+
FsUtils.writeFile(path.resolve(path.resolve(outPath, platform, "updates"), this._npmConfig.version + ".zip"), await zip.generateAsync({ type: "nodebuffer" }));
|
|
297
297
|
}
|
|
298
298
|
}
|
|
299
299
|
static async runWebviewOnDeviceAsync(opt) {
|
|
300
300
|
const cordovaPath = path.resolve(process.cwd(), `packages/${opt.pkgName}/.cordova/`);
|
|
301
301
|
if (opt.url !== undefined) {
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
302
|
+
FsUtils.remove(path.resolve(cordovaPath, "www"));
|
|
303
|
+
FsUtils.mkdirs(path.resolve(cordovaPath, "www"));
|
|
304
|
+
FsUtils.writeFile(path.resolve(cordovaPath, "www/index.html"), `'${opt.url}'로 이동중... <script>setTimeout(function () {window.location.href = "${opt.url.replace(/\/$/, "")}/${opt.pkgName}/cordova/"}, 3000);</script>`.trim());
|
|
305
305
|
}
|
|
306
306
|
const binPath = path.resolve(process.cwd(), "node_modules/.bin/cordova.cmd");
|
|
307
307
|
await SdProcess.spawnAsync(`${binPath} run ${opt.platform} --device`, { cwd: cordovaPath }, true);
|
|
308
308
|
}
|
|
309
309
|
}
|
|
310
|
-
//# sourceMappingURL=
|
|
310
|
+
//# sourceMappingURL=sd-cli-cordova.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sd-cli-cordova.js","sourceRoot":"","sources":["../../src/entry/sd-cli-cordova.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { FsUtils, SdLogger, SdProcess } from "@simplysm/sd-core-node";
|
|
2
2
|
import { pathToFileURL } from "url";
|
|
3
3
|
import path from "path";
|
|
4
4
|
import electronBuilder from "electron-builder";
|
|
5
|
-
import {} from "../types/
|
|
6
|
-
import {} from "../types/common-configs.
|
|
5
|
+
import {} from "../types/config.types";
|
|
6
|
+
import {} from "../types/common-configs.types";
|
|
7
7
|
export class SdCliElectron {
|
|
8
8
|
static async runAsync(opt) {
|
|
9
|
-
const logger =
|
|
9
|
+
const logger = SdLogger.get(["simplysm", "sd-cli", "SdCliElectron", "runAsync"]);
|
|
10
10
|
const pkgPath = path.resolve(process.cwd(), `packages/${opt.pkgName}`);
|
|
11
11
|
const electronPath = path.resolve(pkgPath, "dist/electron");
|
|
12
12
|
logger.log("설정 가져오기...");
|
|
@@ -16,9 +16,9 @@ export class SdCliElectron {
|
|
|
16
16
|
throw new Error();
|
|
17
17
|
}
|
|
18
18
|
logger.log("package.json 파일 쓰기...");
|
|
19
|
-
const npmConfig =
|
|
19
|
+
const npmConfig = FsUtils.readJson(path.resolve(pkgPath, `package.json`));
|
|
20
20
|
const reinstallPkgNames = pkgConf.builder.electron.reinstallDependencies ?? [];
|
|
21
|
-
|
|
21
|
+
FsUtils.writeJson(path.resolve(electronPath, `package.json`), {
|
|
22
22
|
name: npmConfig.name.replace(/^@/, "").replace(/\//, "-"),
|
|
23
23
|
version: npmConfig.version,
|
|
24
24
|
description: npmConfig.description,
|
|
@@ -50,7 +50,7 @@ export class SdCliElectron {
|
|
|
50
50
|
await SdProcess.spawnAsync(`electron .`, { cwd: electronPath }, true);
|
|
51
51
|
}
|
|
52
52
|
static async buildForDevAsync(opt) {
|
|
53
|
-
const logger =
|
|
53
|
+
const logger = SdLogger.get(["simplysm", "sd-cli", "SdCliElectron", "buildForDevAsync"]);
|
|
54
54
|
const pkgPath = path.resolve(process.cwd(), `packages/${opt.pkgName}`);
|
|
55
55
|
const electronPath = path.resolve(pkgPath, "dist/electron");
|
|
56
56
|
const electronDistPath = path.resolve(pkgPath, ".electron/dist");
|
|
@@ -61,9 +61,9 @@ export class SdCliElectron {
|
|
|
61
61
|
throw new Error();
|
|
62
62
|
}
|
|
63
63
|
logger.log("package.json 파일 쓰기...");
|
|
64
|
-
const npmConfig =
|
|
64
|
+
const npmConfig = FsUtils.readJson(path.resolve(pkgPath, `package.json`));
|
|
65
65
|
const reinstallPkgNames = pkgConf.builder.electron.reinstallDependencies ?? [];
|
|
66
|
-
|
|
66
|
+
FsUtils.writeJson(path.resolve(electronPath, `package.json`), {
|
|
67
67
|
name: npmConfig.name.replace(/^@/, "").replace(/\//, "-"),
|
|
68
68
|
version: npmConfig.version,
|
|
69
69
|
description: npmConfig.description,
|
|
@@ -80,7 +80,7 @@ export class SdCliElectron {
|
|
|
80
80
|
logger.log("npm install...");
|
|
81
81
|
await SdProcess.spawnAsync(`npm install`, { cwd: electronPath }, true);
|
|
82
82
|
for (const reinstallPkgName of reinstallPkgNames) {
|
|
83
|
-
if (
|
|
83
|
+
if (FsUtils.exists(path.resolve(electronPath, "node_modules", reinstallPkgName, "binding.gyp"))) {
|
|
84
84
|
logger.log(`electron rebuild (${reinstallPkgName})...`);
|
|
85
85
|
await SdProcess.spawnAsync(`electron-rebuild -m ./node_modules/${reinstallPkgName}`, { cwd: electronPath }, true);
|
|
86
86
|
}
|
|
@@ -108,16 +108,16 @@ export class SdCliElectron {
|
|
|
108
108
|
removePackageScripts: false,
|
|
109
109
|
},
|
|
110
110
|
});
|
|
111
|
-
|
|
111
|
+
FsUtils.copy(path.resolve(electronDistPath, `${npmConfig.description} ${pkgConf.builder.electron.portable ? "" : "Setup "}${npmConfig.version}.exe`), path.resolve(pkgPath, `dist/electron/${npmConfig.description}${pkgConf.builder.electron.portable ? "-portable" : ""}-dev.exe`));
|
|
112
112
|
}
|
|
113
113
|
static async buildAsync(opt) {
|
|
114
|
-
const logger =
|
|
114
|
+
const logger = SdLogger.get(["simplysm", "sd-cli", "SdCliElectron", "buildAsync"]);
|
|
115
115
|
const electronSrcPath = path.resolve(opt.pkgPath, ".electron/src");
|
|
116
116
|
const electronDistPath = path.resolve(opt.pkgPath, ".electron/dist");
|
|
117
117
|
logger.log("package.json 파일 쓰기...");
|
|
118
|
-
const npmConfig =
|
|
118
|
+
const npmConfig = FsUtils.readJson(path.resolve(opt.pkgPath, `package.json`));
|
|
119
119
|
const reinstallPkgNames = opt.config.reinstallDependencies ?? [];
|
|
120
|
-
|
|
120
|
+
FsUtils.writeJson(path.resolve(electronSrcPath, `package.json`), {
|
|
121
121
|
name: npmConfig.name.replace(/^@/, "").replace(/\//, "-"),
|
|
122
122
|
version: npmConfig.version,
|
|
123
123
|
description: npmConfig.description,
|
|
@@ -134,7 +134,7 @@ export class SdCliElectron {
|
|
|
134
134
|
logger.log("npm install...");
|
|
135
135
|
await SdProcess.spawnAsync(`npm install`, { cwd: electronSrcPath }, true);
|
|
136
136
|
for (const reinstallPkgName of reinstallPkgNames) {
|
|
137
|
-
if (
|
|
137
|
+
if (FsUtils.exists(path.resolve(electronSrcPath, "node_modules", reinstallPkgName, "binding.gyp"))) {
|
|
138
138
|
logger.log(`electron rebuild (${reinstallPkgName})...`);
|
|
139
139
|
await SdProcess.spawnAsync(`electron-rebuild -m ./node_modules/${reinstallPkgName}`, { cwd: electronSrcPath }, true);
|
|
140
140
|
}
|
|
@@ -162,8 +162,8 @@ export class SdCliElectron {
|
|
|
162
162
|
removePackageScripts: false,
|
|
163
163
|
},
|
|
164
164
|
});
|
|
165
|
-
|
|
166
|
-
|
|
165
|
+
FsUtils.copy(path.resolve(electronDistPath, `${npmConfig.description} ${opt.config.portable ? "" : "Setup "}${npmConfig.version}.exe`), path.resolve(opt.pkgPath, `dist/electron/${npmConfig.description}${opt.config.portable ? "-portable" : ""}-latest.exe`));
|
|
166
|
+
FsUtils.copy(path.resolve(electronDistPath, `${npmConfig.description} ${opt.config.portable ? "" : "Setup "}${npmConfig.version}.exe`), path.resolve(opt.pkgPath, `dist/electron/updates/${npmConfig.version}.exe`));
|
|
167
167
|
}
|
|
168
168
|
}
|
|
169
|
-
//# sourceMappingURL=
|
|
169
|
+
//# sourceMappingURL=sd-cli-electron.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sd-cli-electron.js","sourceRoot":"","sources":["../../src/entry/sd-cli-electron.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { FsUtils, SdLogger, PathUtils, SdFsWatcher } from "@simplysm/sd-core-node";
|
|
2
2
|
import path from "path";
|
|
3
3
|
import { pathToFileURL } from "url";
|
|
4
|
-
import {} from "../types/
|
|
4
|
+
import {} from "../types/config.types";
|
|
5
5
|
export class SdCliLocalUpdate {
|
|
6
6
|
static async runAsync(opt) {
|
|
7
|
-
const logger =
|
|
7
|
+
const logger = SdLogger.get(["simplysm", "sd-cli", "SdCliLocalUpdate", "runAsync"]);
|
|
8
8
|
logger.debug("프로젝트 설정 가져오기...");
|
|
9
9
|
const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(true, opt.optNames);
|
|
10
10
|
if (!projConf.localUpdates)
|
|
@@ -13,19 +13,19 @@ export class SdCliLocalUpdate {
|
|
|
13
13
|
logger.debug("로컬 업데이트 구성", updatePathInfos);
|
|
14
14
|
logger.log("로컬 라이브러리 업데이트 시작...");
|
|
15
15
|
for (const updatePathInfo of updatePathInfos) {
|
|
16
|
-
if (!
|
|
16
|
+
if (!FsUtils.exists(updatePathInfo.source)) {
|
|
17
17
|
logger.warn(`소스경로를 찾을 수 없어 무시됩니다(${updatePathInfo.source})`);
|
|
18
18
|
return;
|
|
19
19
|
}
|
|
20
20
|
// 소스경로에서 대상경로로 파일 복사
|
|
21
|
-
|
|
21
|
+
FsUtils.copy(updatePathInfo.source, updatePathInfo.target, (src) => {
|
|
22
22
|
return !src.includes("node_modules") && !src.endsWith("package.json");
|
|
23
23
|
});
|
|
24
24
|
}
|
|
25
25
|
logger.info("로컬 라이브러리 업데이트 완료");
|
|
26
26
|
}
|
|
27
27
|
static async watchAsync(opt) {
|
|
28
|
-
const logger =
|
|
28
|
+
const logger = SdLogger.get(["simplysm", "sd-cli", "SdCliLocalUpdate", "watchAsync"]);
|
|
29
29
|
logger.debug("프로젝트 설정 가져오기...");
|
|
30
30
|
const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(true, opt.optNames);
|
|
31
31
|
if (!projConf.localUpdates)
|
|
@@ -41,17 +41,17 @@ export class SdCliLocalUpdate {
|
|
|
41
41
|
logger.log("로컬 라이브러리 변경감지...");
|
|
42
42
|
for (const changedFileInfo of changedFileInfos) {
|
|
43
43
|
for (const updatePathInfo of updatePathInfos) {
|
|
44
|
-
if (!
|
|
44
|
+
if (!PathUtils.isChildPath(changedFileInfo.path, updatePathInfo.source))
|
|
45
45
|
continue;
|
|
46
46
|
const sourceRelPath = path.relative(updatePathInfo.source, changedFileInfo.path);
|
|
47
47
|
const targetFilePath = path.resolve(updatePathInfo.target, sourceRelPath);
|
|
48
48
|
if (changedFileInfo.event === "unlink") {
|
|
49
49
|
logger.debug(`변경파일감지(삭제): ${targetFilePath}`);
|
|
50
|
-
|
|
50
|
+
FsUtils.remove(targetFilePath);
|
|
51
51
|
}
|
|
52
52
|
else {
|
|
53
53
|
logger.debug(`변경파일감지(복사): ${changedFileInfo.path} => ${targetFilePath}`);
|
|
54
|
-
|
|
54
|
+
FsUtils.copy(changedFileInfo.path, targetFilePath);
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
57
|
}
|
|
@@ -66,8 +66,8 @@ export class SdCliLocalUpdate {
|
|
|
66
66
|
for (const pkgGlobPath of Object.keys(record)) {
|
|
67
67
|
// "node_modules'에서 로컬업데이트 설정에 맞는 패키지를 "glob"하여 대상 패키지경로 목록 가져오기
|
|
68
68
|
const targetPaths = [
|
|
69
|
-
...
|
|
70
|
-
...
|
|
69
|
+
...FsUtils.glob(path.resolve(process.cwd(), "node_modules", pkgGlobPath)),
|
|
70
|
+
...FsUtils.glob(path.resolve(process.cwd(), "packages", "*", "node_modules", pkgGlobPath)),
|
|
71
71
|
];
|
|
72
72
|
result.push(...targetPaths
|
|
73
73
|
.map((targetPath) => {
|
|
@@ -86,4 +86,4 @@ export class SdCliLocalUpdate {
|
|
|
86
86
|
return result;
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
|
-
//# sourceMappingURL=
|
|
89
|
+
//# sourceMappingURL=sd-cli-local-update.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sd-cli-local-update.js","sourceRoot":"","sources":["../../src/entry/sd-cli-local-update.ts"],"names":[],"mappings":"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"}
|