@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,19 +1,19 @@
|
|
|
1
1
|
import path from "path";
|
|
2
|
-
import {
|
|
2
|
+
import { FsUtils, SdLogger, PathUtils, SdProcess } from "@simplysm/sd-core-node";
|
|
3
3
|
import { pathToFileURL } from "url";
|
|
4
4
|
import semver from "semver";
|
|
5
|
-
import { NeverEntryError,
|
|
5
|
+
import { NeverEntryError, StringUtils, Wait } from "@simplysm/sd-core-common";
|
|
6
6
|
import { SdStorage } from "@simplysm/sd-storage";
|
|
7
|
-
import { SdCliLocalUpdate } from "./
|
|
7
|
+
import { SdCliLocalUpdate } from "./sd-cli-local-update";
|
|
8
8
|
import xml2js from "xml2js";
|
|
9
|
-
import { SdMultiBuildRunner } from "../pkg-builders/
|
|
10
|
-
import {
|
|
11
|
-
import {} from "../types/
|
|
12
|
-
import {} from "../types/common-configs.
|
|
13
|
-
import {} from "../types/build.
|
|
9
|
+
import { SdMultiBuildRunner } from "../pkg-builders/sd-multi.build-runner";
|
|
10
|
+
import { SdCliConvertMessageUtils } from "../utils/sd-cli-convert-message.utils";
|
|
11
|
+
import {} from "../types/config.types";
|
|
12
|
+
import {} from "../types/common-configs.types";
|
|
13
|
+
import {} from "../types/build.types";
|
|
14
14
|
export class SdCliProject {
|
|
15
15
|
static async watchAsync(opt) {
|
|
16
|
-
const logger =
|
|
16
|
+
const logger = SdLogger.get(["simplysm", "sd-cli", "SdCliProject", "watchAsync"]);
|
|
17
17
|
logger.debug("프로젝트 설정 가져오기...");
|
|
18
18
|
const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(true, opt.optNames);
|
|
19
19
|
if (projConf.localUpdates) {
|
|
@@ -24,15 +24,15 @@ export class SdCliProject {
|
|
|
24
24
|
});
|
|
25
25
|
}
|
|
26
26
|
logger.debug("프로젝트 package.json 가져오기...");
|
|
27
|
-
const projNpmConf =
|
|
27
|
+
const projNpmConf = FsUtils.readJson(path.resolve(process.cwd(), "package.json"));
|
|
28
28
|
logger.debug("패키지 목록 구성...");
|
|
29
29
|
if (!projNpmConf.workspaces) {
|
|
30
30
|
throw new Error("프로젝트 package.json에 workspaces가 설정되어있지 않습니다.");
|
|
31
31
|
}
|
|
32
32
|
const allPkgPaths = projNpmConf.workspaces
|
|
33
|
-
.mapMany((item) =>
|
|
33
|
+
.mapMany((item) => FsUtils.glob(item))
|
|
34
34
|
.filter((item) => !item.includes("."))
|
|
35
|
-
.map((item) =>
|
|
35
|
+
.map((item) => PathUtils.norm(item));
|
|
36
36
|
let pkgPaths = allPkgPaths.filter((pkgPath) => path.basename(pkgPath) in projConf.packages);
|
|
37
37
|
if (opt.pkgNames.length !== 0) {
|
|
38
38
|
pkgPaths = pkgPaths.filter((pkgPath) => opt.pkgNames.includes(path.basename(pkgPath)));
|
|
@@ -59,16 +59,16 @@ export class SdCliProject {
|
|
|
59
59
|
});
|
|
60
60
|
}
|
|
61
61
|
static async buildAsync(opt) {
|
|
62
|
-
const logger =
|
|
62
|
+
const logger = SdLogger.get(["simplysm", "sd-cli", "SdCliProject", "buildAsync"]);
|
|
63
63
|
logger.debug("프로젝트 설정 가져오기...");
|
|
64
64
|
const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(false, opt.optNames);
|
|
65
65
|
logger.debug("프로젝트 package.json 가져오기...");
|
|
66
|
-
const projNpmConf =
|
|
66
|
+
const projNpmConf = FsUtils.readJson(path.resolve(process.cwd(), "package.json"));
|
|
67
67
|
logger.debug("패키지 목록 구성...");
|
|
68
68
|
if (!projNpmConf.workspaces) {
|
|
69
69
|
throw new Error("프로젝트 package.json에 workspaces가 설정되어있지 않습니다.");
|
|
70
70
|
}
|
|
71
|
-
const allPkgPaths = projNpmConf.workspaces.mapMany((item) =>
|
|
71
|
+
const allPkgPaths = projNpmConf.workspaces.mapMany((item) => FsUtils.glob(item)).map((item) => PathUtils.norm(item));
|
|
72
72
|
let pkgPaths = allPkgPaths.filter((pkgPath) => path.basename(pkgPath) in projConf.packages);
|
|
73
73
|
if (opt.pkgNames.length !== 0) {
|
|
74
74
|
pkgPaths = pkgPaths.filter((pkgPath) => opt.pkgNames.includes(path.basename(pkgPath)));
|
|
@@ -87,17 +87,17 @@ export class SdCliProject {
|
|
|
87
87
|
this.#logging(messages.mapMany(), logger);
|
|
88
88
|
}
|
|
89
89
|
static async publishAsync(opt) {
|
|
90
|
-
const logger =
|
|
90
|
+
const logger = SdLogger.get(["simplysm", "sd-cli", "SdCliProject", "publishAsync"]);
|
|
91
91
|
logger.debug("프로젝트 설정 가져오기...");
|
|
92
92
|
const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(false, opt.optNames);
|
|
93
93
|
logger.debug("프로젝트 package.json 가져오기...");
|
|
94
|
-
const projNpmConf =
|
|
94
|
+
const projNpmConf = FsUtils.readJson(path.resolve(process.cwd(), "package.json"));
|
|
95
95
|
if (opt.noBuild) {
|
|
96
96
|
logger.warn("빌드하지 않고, 배포하는것은 상당히 위험합니다.");
|
|
97
97
|
await this._waitSecMessageAsync("프로세스를 중지하려면, 'CTRL+C'를 누르세요.", 5);
|
|
98
98
|
}
|
|
99
99
|
// GIT 사용중일 경우, 커밋되지 않은 수정사항이 있는지 확인
|
|
100
|
-
if (
|
|
100
|
+
if (FsUtils.exists(path.resolve(process.cwd(), ".git"))) {
|
|
101
101
|
logger.debug("GIT 커밋여부 확인...");
|
|
102
102
|
const gitStatusResult = await SdProcess.spawnAsync("git status");
|
|
103
103
|
if (gitStatusResult.includes("Changes") || gitStatusResult.includes("Untracked")) {
|
|
@@ -109,9 +109,9 @@ export class SdCliProject {
|
|
|
109
109
|
throw new Error("프로젝트 package.json에 workspaces가 설정되어있지 않습니다.");
|
|
110
110
|
}
|
|
111
111
|
const allPkgPaths = projNpmConf.workspaces
|
|
112
|
-
.mapMany((item) =>
|
|
112
|
+
.mapMany((item) => FsUtils.glob(item))
|
|
113
113
|
.filter((item) => !item.includes("."))
|
|
114
|
-
.map((item) =>
|
|
114
|
+
.map((item) => PathUtils.norm(item));
|
|
115
115
|
let pkgPaths = allPkgPaths.filter((pkgPath) => path.basename(pkgPath) in projConf.packages);
|
|
116
116
|
if (opt.pkgNames.length !== 0) {
|
|
117
117
|
pkgPaths = pkgPaths.filter((pkgPath) => opt.pkgNames.includes(path.basename(pkgPath)));
|
|
@@ -132,7 +132,7 @@ export class SdCliProject {
|
|
|
132
132
|
this.#logging(messages.mapMany(), logger);
|
|
133
133
|
}
|
|
134
134
|
// GIT 사용중일경우, 새 버전 커밋 및 TAG 생성
|
|
135
|
-
if (
|
|
135
|
+
if (FsUtils.exists(path.resolve(process.cwd(), ".git"))) {
|
|
136
136
|
logger.debug("새 버전 커밋 및 TAG 생성...");
|
|
137
137
|
await SdProcess.spawnAsync("git add .");
|
|
138
138
|
await SdProcess.spawnAsync(`git commit -m "v${projNpmConf.version}"`);
|
|
@@ -158,7 +158,7 @@ export class SdCliProject {
|
|
|
158
158
|
if (postPublishItem.type === "script") {
|
|
159
159
|
const script = postPublishItem.script.replace(/%([^%]*)%/g, (item) => {
|
|
160
160
|
const envName = item.replace(/%/g, "");
|
|
161
|
-
if (!
|
|
161
|
+
if (!StringUtils.isNullOrEmpty(projNpmConf.version) && envName === "SD_VERSION") {
|
|
162
162
|
return projNpmConf.version;
|
|
163
163
|
}
|
|
164
164
|
if (envName === "SD_PROJECT_PATH") {
|
|
@@ -180,10 +180,10 @@ export class SdCliProject {
|
|
|
180
180
|
await SdProcess.spawnAsync("yarn npm publish --access public", { cwd: pkgPath });
|
|
181
181
|
}
|
|
182
182
|
else if (pkgPubConf?.type === "local-directory") {
|
|
183
|
-
const pkgNpmConf =
|
|
183
|
+
const pkgNpmConf = FsUtils.readJson(path.resolve(pkgPath, "package.json"));
|
|
184
184
|
const targetRootPath = pkgPubConf.path.replace(/%([^%]*)%/g, (item) => {
|
|
185
185
|
const envName = item.replace(/%/g, "");
|
|
186
|
-
if (!
|
|
186
|
+
if (!StringUtils.isNullOrEmpty(pkgNpmConf.version) && envName === "SD_VERSION") {
|
|
187
187
|
return pkgNpmConf.version;
|
|
188
188
|
}
|
|
189
189
|
if (envName === "SD_PROJECT_PATH") {
|
|
@@ -191,14 +191,14 @@ export class SdCliProject {
|
|
|
191
191
|
}
|
|
192
192
|
return process.env[envName] ?? item;
|
|
193
193
|
});
|
|
194
|
-
const filePaths =
|
|
194
|
+
const filePaths = FsUtils.glob(path.resolve(pkgPath, "dist", "**", "*"), {
|
|
195
195
|
dot: true,
|
|
196
196
|
nodir: true,
|
|
197
197
|
});
|
|
198
198
|
for (const filePath of filePaths) {
|
|
199
199
|
const relativeFilePath = path.relative(path.resolve(pkgPath, "dist"), filePath);
|
|
200
|
-
const targetPath =
|
|
201
|
-
|
|
200
|
+
const targetPath = PathUtils.posix(targetRootPath, relativeFilePath);
|
|
201
|
+
FsUtils.copy(filePath, targetPath);
|
|
202
202
|
}
|
|
203
203
|
}
|
|
204
204
|
else if (pkgPubConf?.type === "ftp" || pkgPubConf?.type === "ftps" || pkgPubConf?.type === "sftp") {
|
|
@@ -231,7 +231,7 @@ export class SdCliProject {
|
|
|
231
231
|
const newVersion = semver.inc(projNpmConf.version, "patch");
|
|
232
232
|
projNpmConf.version = newVersion;
|
|
233
233
|
const pkgNames = allPkgPaths.map((pkgPath) => {
|
|
234
|
-
const pkgNpmConf =
|
|
234
|
+
const pkgNpmConf = FsUtils.readJson(path.resolve(pkgPath, "package.json"));
|
|
235
235
|
return pkgNpmConf.name;
|
|
236
236
|
});
|
|
237
237
|
const updateDepVersion = (deps) => {
|
|
@@ -248,27 +248,27 @@ export class SdCliProject {
|
|
|
248
248
|
updateDepVersion(projNpmConf.devDependencies);
|
|
249
249
|
updateDepVersion(projNpmConf.peerDependencies);
|
|
250
250
|
const projNpmConfFilePath = path.resolve(process.cwd(), "package.json");
|
|
251
|
-
|
|
251
|
+
FsUtils.writeJson(projNpmConfFilePath, projNpmConf, { space: 2 });
|
|
252
252
|
// 각 패키지 package.json 버전 설정
|
|
253
253
|
await allPkgPaths.parallelAsync(async (pkgPath) => {
|
|
254
254
|
const pkgNpmConfFilePath = path.resolve(pkgPath, "package.json");
|
|
255
|
-
const pkgNpmConf =
|
|
255
|
+
const pkgNpmConf = FsUtils.readJson(pkgNpmConfFilePath);
|
|
256
256
|
pkgNpmConf.version = newVersion;
|
|
257
257
|
updateDepVersion(pkgNpmConf.dependencies);
|
|
258
258
|
updateDepVersion(pkgNpmConf.optionalDependencies);
|
|
259
259
|
updateDepVersion(pkgNpmConf.devDependencies);
|
|
260
260
|
updateDepVersion(pkgNpmConf.peerDependencies);
|
|
261
|
-
|
|
262
|
-
if (
|
|
261
|
+
FsUtils.writeJson(pkgNpmConfFilePath, pkgNpmConf, { space: 2 });
|
|
262
|
+
if (FsUtils.exists(path.resolve(pkgPath, "plugin.xml"))) {
|
|
263
263
|
const cordovaPluginConfFilePath = path.resolve(pkgPath, "plugin.xml");
|
|
264
|
-
const cordovaPluginConfXml = await xml2js.parseStringPromise(
|
|
264
|
+
const cordovaPluginConfXml = await xml2js.parseStringPromise(FsUtils.readFile(cordovaPluginConfFilePath));
|
|
265
265
|
cordovaPluginConfXml.plugin.$.version = newVersion;
|
|
266
|
-
|
|
266
|
+
FsUtils.writeFile(cordovaPluginConfFilePath, new xml2js.Builder().buildObject(cordovaPluginConfXml));
|
|
267
267
|
}
|
|
268
268
|
});
|
|
269
269
|
}
|
|
270
270
|
static #logging(buildResults, logger) {
|
|
271
|
-
const messageMap = buildResults.toSetMap((item) => item.severity, (item) =>
|
|
271
|
+
const messageMap = buildResults.toSetMap((item) => item.severity, (item) => SdCliConvertMessageUtils.getBuildMessageString(item));
|
|
272
272
|
if (messageMap.has("message")) {
|
|
273
273
|
logger.log(`알림\n${[...messageMap.get("message")].join("\n")}`);
|
|
274
274
|
}
|
|
@@ -284,4 +284,4 @@ export class SdCliProject {
|
|
|
284
284
|
logger.info("모든 빌드가 완료되었습니다.");
|
|
285
285
|
}
|
|
286
286
|
}
|
|
287
|
-
//# sourceMappingURL=
|
|
287
|
+
//# sourceMappingURL=sd-cli-project.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sd-cli-project.js","sourceRoot":"","sources":["../../src/entry/sd-cli-project.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,31 +1,31 @@
|
|
|
1
|
-
export * from "./entry/
|
|
2
|
-
export * from "./entry/
|
|
3
|
-
export * from "./entry/
|
|
4
|
-
export * from "./entry/
|
|
5
|
-
export * from "./entry/
|
|
6
|
-
export * from "./pkg-builders/client/
|
|
7
|
-
export * from "./pkg-builders/client/
|
|
8
|
-
export * from "./pkg-builders/client/
|
|
9
|
-
export * from "./pkg-builders/client/
|
|
10
|
-
export * from "./pkg-builders/client/
|
|
11
|
-
export * from "./pkg-builders/lib/
|
|
12
|
-
export * from "./pkg-builders/lib/
|
|
13
|
-
export * from "./pkg-builders/lib/
|
|
14
|
-
export * from "./pkg-builders/lib/
|
|
15
|
-
export * from "./pkg-builders/
|
|
16
|
-
export * from "./pkg-builders/server/
|
|
17
|
-
export * from "./pkg-builders/server/
|
|
18
|
-
export * from "./pkg-builders/server/
|
|
1
|
+
export * from "./entry/sd-cli-ai-command";
|
|
2
|
+
export * from "./entry/sd-cli-cordova";
|
|
3
|
+
export * from "./entry/sd-cli-electron";
|
|
4
|
+
export * from "./entry/sd-cli-local-update";
|
|
5
|
+
export * from "./entry/sd-cli-project";
|
|
6
|
+
export * from "./pkg-builders/client/sd-cli-ng-routes.file-generator";
|
|
7
|
+
export * from "./pkg-builders/client/sd-client.build-runner";
|
|
8
|
+
export * from "./pkg-builders/client/sd-ng.bundler-context";
|
|
9
|
+
export * from "./pkg-builders/client/sd-ng.bundler";
|
|
10
|
+
export * from "./pkg-builders/client/sd-ng.plugin-creator";
|
|
11
|
+
export * from "./pkg-builders/lib/sd-cli-index.file-generator";
|
|
12
|
+
export * from "./pkg-builders/lib/sd-js-lib.build-runner";
|
|
13
|
+
export * from "./pkg-builders/lib/sd-ts-lib.build-runner";
|
|
14
|
+
export * from "./pkg-builders/lib/sd-ts-lib.builder";
|
|
15
|
+
export * from "./pkg-builders/sd-multi.build-runner";
|
|
16
|
+
export * from "./pkg-builders/server/sd-server.build-runner";
|
|
17
|
+
export * from "./pkg-builders/server/sd-server.bundler";
|
|
18
|
+
export * from "./pkg-builders/server/sd-server.plugin-creator";
|
|
19
19
|
import "./sd-cli";
|
|
20
|
-
export * from "./ts-
|
|
21
|
-
export * from "./types/build-plugin.
|
|
22
|
-
export * from "./types/build-runner.
|
|
23
|
-
export * from "./types/build.
|
|
24
|
-
export * from "./types/common-configs.
|
|
25
|
-
export * from "./types/
|
|
26
|
-
export * from "./types/ts-compiler.
|
|
27
|
-
export * from "./types/
|
|
28
|
-
export * from "./utils/
|
|
29
|
-
export * from "./utils/
|
|
30
|
-
import "./workers/build-runner
|
|
31
|
-
import "./workers/server
|
|
20
|
+
export * from "./ts-compiler/sd-ts-compiler";
|
|
21
|
+
export * from "./types/build-plugin.types";
|
|
22
|
+
export * from "./types/build-runner.types";
|
|
23
|
+
export * from "./types/build.types";
|
|
24
|
+
export * from "./types/common-configs.types";
|
|
25
|
+
export * from "./types/config.types";
|
|
26
|
+
export * from "./types/ts-compiler.types";
|
|
27
|
+
export * from "./types/worker.types";
|
|
28
|
+
export * from "./utils/sd-cli-convert-message.utils";
|
|
29
|
+
export * from "./utils/sd-cli-performance-time";
|
|
30
|
+
import "./workers/build-runner.worker";
|
|
31
|
+
import "./workers/server.worker";
|
package/dist/index.js
CHANGED
|
@@ -1,32 +1,32 @@
|
|
|
1
|
-
export * from "./entry/
|
|
2
|
-
export * from "./entry/
|
|
3
|
-
export * from "./entry/
|
|
4
|
-
export * from "./entry/
|
|
5
|
-
export * from "./entry/
|
|
6
|
-
export * from "./pkg-builders/client/
|
|
7
|
-
export * from "./pkg-builders/client/
|
|
8
|
-
export * from "./pkg-builders/client/
|
|
9
|
-
export * from "./pkg-builders/client/
|
|
10
|
-
export * from "./pkg-builders/client/
|
|
11
|
-
export * from "./pkg-builders/lib/
|
|
12
|
-
export * from "./pkg-builders/lib/
|
|
13
|
-
export * from "./pkg-builders/lib/
|
|
14
|
-
export * from "./pkg-builders/lib/
|
|
15
|
-
export * from "./pkg-builders/
|
|
16
|
-
export * from "./pkg-builders/server/
|
|
17
|
-
export * from "./pkg-builders/server/
|
|
18
|
-
export * from "./pkg-builders/server/
|
|
1
|
+
export * from "./entry/sd-cli-ai-command";
|
|
2
|
+
export * from "./entry/sd-cli-cordova";
|
|
3
|
+
export * from "./entry/sd-cli-electron";
|
|
4
|
+
export * from "./entry/sd-cli-local-update";
|
|
5
|
+
export * from "./entry/sd-cli-project";
|
|
6
|
+
export * from "./pkg-builders/client/sd-cli-ng-routes.file-generator";
|
|
7
|
+
export * from "./pkg-builders/client/sd-client.build-runner";
|
|
8
|
+
export * from "./pkg-builders/client/sd-ng.bundler-context";
|
|
9
|
+
export * from "./pkg-builders/client/sd-ng.bundler";
|
|
10
|
+
export * from "./pkg-builders/client/sd-ng.plugin-creator";
|
|
11
|
+
export * from "./pkg-builders/lib/sd-cli-index.file-generator";
|
|
12
|
+
export * from "./pkg-builders/lib/sd-js-lib.build-runner";
|
|
13
|
+
export * from "./pkg-builders/lib/sd-ts-lib.build-runner";
|
|
14
|
+
export * from "./pkg-builders/lib/sd-ts-lib.builder";
|
|
15
|
+
export * from "./pkg-builders/sd-multi.build-runner";
|
|
16
|
+
export * from "./pkg-builders/server/sd-server.build-runner";
|
|
17
|
+
export * from "./pkg-builders/server/sd-server.bundler";
|
|
18
|
+
export * from "./pkg-builders/server/sd-server.plugin-creator";
|
|
19
19
|
import "./sd-cli";
|
|
20
|
-
export * from "./ts-
|
|
21
|
-
export * from "./types/build-plugin.
|
|
22
|
-
export * from "./types/build-runner.
|
|
23
|
-
export * from "./types/build.
|
|
24
|
-
export * from "./types/common-configs.
|
|
25
|
-
export * from "./types/
|
|
26
|
-
export * from "./types/ts-compiler.
|
|
27
|
-
export * from "./types/
|
|
28
|
-
export * from "./utils/
|
|
29
|
-
export * from "./utils/
|
|
30
|
-
import "./workers/build-runner
|
|
31
|
-
import "./workers/server
|
|
20
|
+
export * from "./ts-compiler/sd-ts-compiler";
|
|
21
|
+
export * from "./types/build-plugin.types";
|
|
22
|
+
export * from "./types/build-runner.types";
|
|
23
|
+
export * from "./types/build.types";
|
|
24
|
+
export * from "./types/common-configs.types";
|
|
25
|
+
export * from "./types/config.types";
|
|
26
|
+
export * from "./types/ts-compiler.types";
|
|
27
|
+
export * from "./types/worker.types";
|
|
28
|
+
export * from "./utils/sd-cli-convert-message.utils";
|
|
29
|
+
export * from "./utils/sd-cli-performance-time";
|
|
30
|
+
import "./workers/build-runner.worker";
|
|
31
|
+
import "./workers/server.worker";
|
|
32
32
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,wBAAwB,CAAC;AACvC,cAAc,uDAAuD,CAAC;AACtE,cAAc,8CAA8C,CAAC;AAC7D,cAAc,6CAA6C,CAAC;AAC5D,cAAc,qCAAqC,CAAC;AACpD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,gDAAgD,CAAC;AAC/D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,sCAAsC,CAAC;AACrD,cAAc,sCAAsC,CAAC;AACrD,cAAc,8CAA8C,CAAC;AAC7D,cAAc,yCAAyC,CAAC;AACxD,cAAc,gDAAgD,CAAC;AAC/D,OAAO,UAAU,CAAC;AAClB,cAAc,8BAA8B,CAAC;AAC7C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC;AACpC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,sBAAsB,CAAC;AACrC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC;AACrC,cAAc,sCAAsC,CAAC;AACrD,cAAc,iCAAiC,CAAC;AAChD,OAAO,+BAA+B,CAAC;AACvC,OAAO,yBAAyB,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import path from "path";
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
2
|
+
import { FsUtils, PathUtils, SdFsWatcher } from "@simplysm/sd-core-node";
|
|
3
|
+
import { StringUtils } from "@simplysm/sd-core-common";
|
|
4
4
|
export class SdCliNgRoutesFileGenerator {
|
|
5
5
|
static watch(pkgPath, noLazyRoute) {
|
|
6
6
|
const routesFilePath = path.resolve(pkgPath, "src/routes.ts");
|
|
7
|
-
let cache =
|
|
7
|
+
let cache = FsUtils.exists(routesFilePath) ? FsUtils.readFile(routesFilePath) : undefined;
|
|
8
8
|
SdFsWatcher.watch([path.resolve(pkgPath, "src")]).onChange({ delay: 50 }, () => {
|
|
9
9
|
cache = this.run(pkgPath, cache, noLazyRoute);
|
|
10
10
|
});
|
|
@@ -15,9 +15,9 @@ export class SdCliNgRoutesFileGenerator {
|
|
|
15
15
|
const routesFilePath = path.resolve(pkgPath, "src/routes.ts");
|
|
16
16
|
// 내부 파일들 import
|
|
17
17
|
const result = new Map();
|
|
18
|
-
const filePaths =
|
|
18
|
+
const filePaths = FsUtils.glob(path.resolve(appDirPath, "**/*{P,.p}age.ts"));
|
|
19
19
|
for (const filePath of filePaths.orderBy()) {
|
|
20
|
-
const relModulePath =
|
|
20
|
+
const relModulePath = PathUtils.posix(path.relative(appDirPath, filePath)).slice(0, -3);
|
|
21
21
|
const codes = relModulePath
|
|
22
22
|
.replace(/\.page$/, "")
|
|
23
23
|
.replace(/Page$/, "")
|
|
@@ -29,7 +29,7 @@ export class SdCliNgRoutesFileGenerator {
|
|
|
29
29
|
if (i === codes.length - 2)
|
|
30
30
|
continue; // 마지막 모음 폴더 무시.
|
|
31
31
|
const code = codes[i];
|
|
32
|
-
cursorItem = cursor.getOrCreate(
|
|
32
|
+
cursorItem = cursor.getOrCreate(StringUtils.toKebabCase(code), { children: new Map() });
|
|
33
33
|
cursor = cursorItem.children;
|
|
34
34
|
}
|
|
35
35
|
cursorItem.relModulePath = relModulePath;
|
|
@@ -44,13 +44,13 @@ export class SdCliNgRoutesFileGenerator {
|
|
|
44
44
|
if (val.relModulePath != null) {
|
|
45
45
|
if (noLazyRoute) {
|
|
46
46
|
cont += indentStr
|
|
47
|
-
+ ` component: ${
|
|
48
|
-
imports.push(`import { ${
|
|
47
|
+
+ ` component: ${StringUtils.toPascalCase(path.basename(val.relModulePath))},\n`;
|
|
48
|
+
imports.push(`import { ${StringUtils.toPascalCase(path.basename(val.relModulePath))} } from "./app/${val.relModulePath}";`);
|
|
49
49
|
}
|
|
50
50
|
else {
|
|
51
51
|
cont +=
|
|
52
52
|
indentStr +
|
|
53
|
-
` loadComponent: () => import("./app/${val.relModulePath}").then((m) => m.${
|
|
53
|
+
` loadComponent: () => import("./app/${val.relModulePath}").then((m) => m.${StringUtils.toPascalCase(path.basename(val.relModulePath))}),\n`;
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
56
|
if (val.children.size > 0) {
|
|
@@ -64,15 +64,15 @@ export class SdCliNgRoutesFileGenerator {
|
|
|
64
64
|
};
|
|
65
65
|
const routes = fn(result, 2);
|
|
66
66
|
const content = `
|
|
67
|
-
import {
|
|
67
|
+
import type { Routes } from "@angular/router";
|
|
68
68
|
${imports.join("\n")}
|
|
69
69
|
export const routes: Routes = [
|
|
70
70
|
${routes}
|
|
71
71
|
];`.trim();
|
|
72
72
|
if (content !== cache) {
|
|
73
|
-
|
|
73
|
+
FsUtils.writeFile(routesFilePath, content);
|
|
74
74
|
}
|
|
75
75
|
return content;
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
|
-
//# sourceMappingURL=
|
|
78
|
+
//# sourceMappingURL=sd-cli-ng-routes.file-generator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sd-cli-ng-routes.file-generator.js","sourceRoot":"","sources":["../../../src/pkg-builders/client/sd-cli-ng-routes.file-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { EventEmitter } from "events";
|
|
2
2
|
import { type TNormPath } from "@simplysm/sd-core-node";
|
|
3
|
-
import { type ISdProjectConfig } from "../../types/
|
|
4
|
-
import { type ISdBuildRunnerResult } from "../../types/build.
|
|
3
|
+
import { type ISdProjectConfig } from "../../types/config.types";
|
|
4
|
+
import { type ISdBuildRunnerResult } from "../../types/build.types";
|
|
5
5
|
export declare class SdClientBuildRunner extends EventEmitter {
|
|
6
6
|
private _projConf;
|
|
7
7
|
private _pkgPath;
|
|
@@ -1,26 +1,26 @@
|
|
|
1
1
|
import { EventEmitter } from "events";
|
|
2
|
-
import {
|
|
2
|
+
import { FsUtils, SdLogger, PathUtils, SdFsWatcher } from "@simplysm/sd-core-node";
|
|
3
3
|
import path from "path";
|
|
4
|
-
import { SdNgBundler } from "./
|
|
5
|
-
import { SdCliNgRoutesFileGenerator } from "./
|
|
6
|
-
import { SdCliCordova } from "../../entry/
|
|
7
|
-
import { SdCliElectron } from "../../entry/
|
|
8
|
-
import {} from "../../types/
|
|
9
|
-
import {} from "../../types/common-configs.
|
|
10
|
-
import {} from "../../types/build.
|
|
4
|
+
import { SdNgBundler } from "./sd-ng.bundler";
|
|
5
|
+
import { SdCliNgRoutesFileGenerator } from "./sd-cli-ng-routes.file-generator";
|
|
6
|
+
import { SdCliCordova } from "../../entry/sd-cli-cordova";
|
|
7
|
+
import { SdCliElectron } from "../../entry/sd-cli-electron";
|
|
8
|
+
import {} from "../../types/config.types";
|
|
9
|
+
import {} from "../../types/common-configs.types";
|
|
10
|
+
import {} from "../../types/build.types";
|
|
11
11
|
export class SdClientBuildRunner extends EventEmitter {
|
|
12
12
|
constructor(_projConf, _pkgPath) {
|
|
13
13
|
super();
|
|
14
14
|
this._projConf = _projConf;
|
|
15
15
|
this._pkgPath = _pkgPath;
|
|
16
|
-
this._logger =
|
|
16
|
+
this._logger = SdLogger.get(["simplysm", "sd-cli", "SdClientBuildRunner"]);
|
|
17
17
|
this._pkgConf = this._projConf.packages[path.basename(_pkgPath)];
|
|
18
|
-
this._npmConf =
|
|
19
|
-
const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {}).mapMany((key) =>
|
|
18
|
+
this._npmConf = FsUtils.readJson(path.resolve(_pkgPath, "package.json"));
|
|
19
|
+
const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {}).mapMany((key) => FsUtils.glob(path.resolve(this._pkgPath, "../../node_modules", key)));
|
|
20
20
|
this._watchScopePathSet = new Set([
|
|
21
21
|
path.resolve(this._pkgPath, "../"),
|
|
22
|
-
...localUpdatePaths
|
|
23
|
-
].map((item) =>
|
|
22
|
+
...localUpdatePaths,
|
|
23
|
+
].map((item) => PathUtils.norm(item)));
|
|
24
24
|
}
|
|
25
25
|
on(event, listener) {
|
|
26
26
|
super.on(event, listener);
|
|
@@ -28,11 +28,12 @@ export class SdClientBuildRunner extends EventEmitter {
|
|
|
28
28
|
}
|
|
29
29
|
async buildAsync() {
|
|
30
30
|
this._debug("dist 초기화...");
|
|
31
|
-
|
|
31
|
+
FsUtils.remove(path.resolve(this._pkgPath, "dist"));
|
|
32
32
|
this._debug("GEN .config...");
|
|
33
33
|
const confDistPath = path.resolve(this._pkgPath, "dist/.config.json");
|
|
34
|
-
|
|
35
|
-
if (this._npmConf.dependencies && Object.keys(this._npmConf.dependencies)
|
|
34
|
+
FsUtils.writeFile(confDistPath, JSON.stringify(this._pkgConf.configs ?? {}, undefined, 2));
|
|
35
|
+
if (this._npmConf.dependencies && Object.keys(this._npmConf.dependencies)
|
|
36
|
+
.includes("@angular/router")) {
|
|
36
37
|
this._debug(`GEN routes.ts...`);
|
|
37
38
|
SdCliNgRoutesFileGenerator.run(this._pkgPath, undefined, this._pkgConf.noLazyRoute);
|
|
38
39
|
}
|
|
@@ -46,14 +47,15 @@ export class SdClientBuildRunner extends EventEmitter {
|
|
|
46
47
|
async watchAsync() {
|
|
47
48
|
this.emit("change");
|
|
48
49
|
this._debug("dist 초기화...");
|
|
49
|
-
|
|
50
|
-
if (this._npmConf.dependencies && Object.keys(this._npmConf.dependencies)
|
|
50
|
+
FsUtils.remove(path.resolve(this._pkgPath, "dist"));
|
|
51
|
+
if (this._npmConf.dependencies && Object.keys(this._npmConf.dependencies)
|
|
52
|
+
.includes("@angular/router")) {
|
|
51
53
|
this._debug(`WATCH GEN routes.ts...`);
|
|
52
54
|
SdCliNgRoutesFileGenerator.watch(this._pkgPath, this._pkgConf.noLazyRoute);
|
|
53
55
|
}
|
|
54
56
|
this._debug("GEN .config...");
|
|
55
57
|
const confDistPath = path.resolve(this._pkgPath, "dist/.config.json");
|
|
56
|
-
|
|
58
|
+
FsUtils.writeFile(confDistPath, JSON.stringify(this._pkgConf.configs ?? {}, undefined, 2));
|
|
57
59
|
const result = await this._runAsync({ dev: !this._pkgConf.forceProductionMode });
|
|
58
60
|
const res = {
|
|
59
61
|
affectedFilePathSet: result.affectedFileSet,
|
|
@@ -63,7 +65,8 @@ export class SdClientBuildRunner extends EventEmitter {
|
|
|
63
65
|
this.emit("complete", res);
|
|
64
66
|
this._debug("WATCH...");
|
|
65
67
|
let lastWatchFileSet = result.watchFileSet;
|
|
66
|
-
SdFsWatcher.watch(Array.from(this._watchScopePathSet))
|
|
68
|
+
SdFsWatcher.watch(Array.from(this._watchScopePathSet))
|
|
69
|
+
.onChange({ delay: 100 }, async (changeInfos) => {
|
|
67
70
|
const currentChangeInfos = changeInfos.filter((item) => lastWatchFileSet.has(item.path));
|
|
68
71
|
if (currentChangeInfos.length < 1)
|
|
69
72
|
return;
|
|
@@ -98,18 +101,22 @@ export class SdClientBuildRunner extends EventEmitter {
|
|
|
98
101
|
builderType: ngBundlerBuilderType,
|
|
99
102
|
pkgPath: this._pkgPath,
|
|
100
103
|
outputPath: ngBundlerBuilderType === "web"
|
|
101
|
-
?
|
|
104
|
+
? PathUtils.norm(this._pkgPath, "dist")
|
|
102
105
|
: ngBundlerBuilderType === "electron" && !opt.dev
|
|
103
|
-
?
|
|
106
|
+
? PathUtils.norm(this._pkgPath, ".electron/src")
|
|
104
107
|
: ngBundlerBuilderType === "cordova" && !opt.dev
|
|
105
|
-
?
|
|
106
|
-
:
|
|
108
|
+
? PathUtils.norm(this._pkgPath, ".cordova/www")
|
|
109
|
+
: PathUtils.norm(this._pkgPath, "dist", ngBundlerBuilderType),
|
|
107
110
|
env: {
|
|
108
111
|
...this._pkgConf.env,
|
|
109
112
|
...this._pkgConf.builder?.[ngBundlerBuilderType]?.env,
|
|
110
113
|
},
|
|
111
|
-
external: ngBundlerBuilderType === "electron"
|
|
112
|
-
|
|
114
|
+
external: ngBundlerBuilderType === "electron"
|
|
115
|
+
? (this._pkgConf.builder?.electron?.reinstallDependencies ?? [])
|
|
116
|
+
: [],
|
|
117
|
+
cordovaConfig: ngBundlerBuilderType === "cordova"
|
|
118
|
+
? this._pkgConf.builder.cordova
|
|
119
|
+
: undefined,
|
|
113
120
|
watchScopePaths: Array.from(this._watchScopePathSet),
|
|
114
121
|
}));
|
|
115
122
|
}
|
|
@@ -147,4 +154,4 @@ export class SdClientBuildRunner extends EventEmitter {
|
|
|
147
154
|
this._logger.debug(`[${path.basename(this._pkgPath)}] ${msg}`);
|
|
148
155
|
}
|
|
149
156
|
}
|
|
150
|
-
//# sourceMappingURL=
|
|
157
|
+
//# sourceMappingURL=sd-client.build-runner.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sd-client.build-runner.js","sourceRoot":"","sources":["../../../src/pkg-builders/client/sd-client.build-runner.ts"],"names":[],"mappings":"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"}
|