@simplysm/sd-cli 12.5.22 → 12.5.24
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/SdCliCordova.js +2 -2
- package/dist/entry/SdCliCordova.js.map +1 -1
- package/dist/entry/SdCliElectron.js +2 -2
- package/dist/entry/SdCliElectron.js.map +1 -1
- package/dist/entry/SdCliLocalUpdate.js +6 -8
- package/dist/entry/SdCliLocalUpdate.js.map +1 -1
- package/dist/entry/SdCliProject.js +4 -4
- package/dist/entry/SdCliProject.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/pkg-builders/SdMultiBuildRunner.d.ts +3 -10
- package/dist/pkg-builders/SdMultiBuildRunner.js +133 -117
- package/dist/pkg-builders/SdMultiBuildRunner.js.map +1 -1
- package/dist/pkg-builders/client/SdCliNgRoutesFileGenerator.js +1 -1
- package/dist/pkg-builders/client/SdCliNgRoutesFileGenerator.js.map +1 -1
- package/dist/pkg-builders/client/SdClientBuildRunner.d.ts +6 -5
- package/dist/pkg-builders/client/SdClientBuildRunner.js +16 -8
- package/dist/pkg-builders/client/SdClientBuildRunner.js.map +1 -1
- package/dist/pkg-builders/client/SdNgBundler.js +13 -61
- package/dist/pkg-builders/client/SdNgBundler.js.map +1 -1
- package/dist/pkg-builders/client/createSdNgPlugin.js +3 -3
- package/dist/pkg-builders/client/createSdNgPlugin.js.map +1 -1
- package/dist/pkg-builders/lib/SdCliIndexFileGenerator.js +1 -1
- package/dist/pkg-builders/lib/SdCliIndexFileGenerator.js.map +1 -1
- package/dist/pkg-builders/lib/SdJsLibBuildRunner.js +1 -1
- package/dist/pkg-builders/lib/SdTsLibBuildRunner.d.ts +6 -1
- package/dist/pkg-builders/lib/SdTsLibBuildRunner.js +27 -28
- package/dist/pkg-builders/lib/SdTsLibBuildRunner.js.map +1 -1
- package/dist/pkg-builders/lib/SdTsLibBuilder.d.ts +3 -4
- package/dist/pkg-builders/lib/SdTsLibBuilder.js +7 -11
- package/dist/pkg-builders/lib/SdTsLibBuilder.js.map +1 -1
- package/dist/pkg-builders/server/SdServerBuildRunner.d.ts +5 -1
- package/dist/pkg-builders/server/SdServerBuildRunner.js +32 -29
- package/dist/pkg-builders/server/SdServerBuildRunner.js.map +1 -1
- package/dist/pkg-builders/server/createSdServerPlugin.js +3 -3
- package/dist/pkg-builders/server/createSdServerPlugin.js.map +1 -1
- package/dist/ts-builder/SdTsCompiler.d.ts +1 -1
- package/dist/ts-builder/SdTsCompiler.js +222 -201
- package/dist/ts-builder/SdTsCompiler.js.map +1 -1
- package/dist/types/build-runner.type.d.ts +7 -0
- package/dist/types/build-runner.type.js +2 -0
- package/dist/types/build-runner.type.js.map +1 -0
- package/dist/types/workers.type.d.ts +15 -1
- package/dist/workers/build-runner-worker.js +45 -0
- package/dist/workers/build-runner-worker.js.map +1 -0
- package/package.json +6 -6
- package/src/entry/SdCliCordova.ts +2 -2
- package/src/entry/SdCliElectron.ts +2 -2
- package/src/entry/SdCliLocalUpdate.ts +8 -8
- package/src/entry/SdCliProject.ts +4 -4
- package/src/index.ts +1 -1
- package/src/pkg-builders/SdMultiBuildRunner.ts +123 -121
- package/src/pkg-builders/client/SdCliNgRoutesFileGenerator.ts +1 -1
- package/src/pkg-builders/client/SdClientBuildRunner.ts +26 -22
- package/src/pkg-builders/client/SdNgBundler.ts +16 -74
- package/src/pkg-builders/client/createSdNgPlugin.ts +3 -3
- package/src/pkg-builders/lib/SdCliIndexFileGenerator.ts +1 -1
- package/src/pkg-builders/lib/SdJsLibBuildRunner.ts +1 -1
- package/src/pkg-builders/lib/SdTsLibBuildRunner.ts +42 -29
- package/src/pkg-builders/lib/SdTsLibBuilder.ts +13 -14
- package/src/pkg-builders/server/SdServerBuildRunner.ts +44 -29
- package/src/pkg-builders/server/createSdServerPlugin.ts +3 -3
- package/src/ts-builder/SdTsCompiler.ts +282 -261
- package/src/types/build-runner.type.ts +8 -0
- package/src/types/workers.type.ts +14 -1
- package/src/workers/build-runner-worker.ts +52 -0
- package/tsconfig.json +1 -1
- package/dist/ts-builder/SdTsCompileWorker.d.ts +0 -9
- package/dist/ts-builder/SdTsCompileWorker.js +0 -16
- package/dist/ts-builder/SdTsCompileWorker.js.map +0 -1
- package/dist/workers/compile-worker.js +0 -27
- package/dist/workers/compile-worker.js.map +0 -1
- package/lib/dev-worker.cjs +0 -5
- package/src/ts-builder/SdTsCompileWorker.ts +0 -21
- package/src/workers/compile-worker.ts +0 -31
- /package/dist/workers/{compile-worker.d.ts → build-runner-worker.d.ts} +0 -0
|
@@ -1,10 +1,6 @@
|
|
|
1
1
|
import { FsUtil, Logger, PathUtil, SdWorker } from "@simplysm/sd-core-node";
|
|
2
2
|
import path from "path";
|
|
3
3
|
import { EventEmitter } from "events";
|
|
4
|
-
import { SdServerBuildRunner } from "./server/SdServerBuildRunner";
|
|
5
|
-
import { SdClientBuildRunner } from "./client/SdClientBuildRunner";
|
|
6
|
-
import { SdTsLibBuildRunner } from "./lib/SdTsLibBuildRunner";
|
|
7
|
-
import { SdJsLibBuildRunner } from "./lib/SdJsLibBuildRunner";
|
|
8
4
|
export class SdMultiBuildRunner extends EventEmitter {
|
|
9
5
|
#logger = Logger.get(["simplysm", "sd-cli", "SdMultiBuildRunner"]);
|
|
10
6
|
#busyCount = 0;
|
|
@@ -15,147 +11,151 @@ export class SdMultiBuildRunner extends EventEmitter {
|
|
|
15
11
|
return this;
|
|
16
12
|
}
|
|
17
13
|
async runAsync(req) {
|
|
18
|
-
const
|
|
19
|
-
|
|
14
|
+
const worker = new SdWorker(import.meta.resolve("../workers/build-runner-worker"))
|
|
15
|
+
.on("change", () => {
|
|
16
|
+
if (this.#busyCount === 0) {
|
|
17
|
+
this.emit("change");
|
|
18
|
+
}
|
|
19
|
+
this.#busyCount++;
|
|
20
|
+
})
|
|
21
|
+
.on("complete", (result) => this.#onComplete(req, result));
|
|
22
|
+
return await worker.run("run", [req]);
|
|
23
|
+
/*const pkgConf = req.projConf.packages[path.basename(req.pkgPath)]!;
|
|
24
|
+
|
|
25
|
+
const buildRunnerType =
|
|
26
|
+
pkgConf.type === "server"
|
|
20
27
|
? SdServerBuildRunner
|
|
21
28
|
: pkgConf.type === "client"
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
29
|
+
? SdClientBuildRunner
|
|
30
|
+
: FsUtil.exists(path.resolve(req.pkgPath, "tsconfig.json"))
|
|
31
|
+
? SdTsLibBuildRunner
|
|
32
|
+
: SdJsLibBuildRunner;
|
|
33
|
+
|
|
26
34
|
const builder = new buildRunnerType(req.projConf, req.pkgPath)
|
|
27
|
-
|
|
28
|
-
|
|
35
|
+
.on("change", () => this.#onMessage(req, { type: "change" }))
|
|
36
|
+
.on("complete", (result) => this.#onMessage(req, { type: "complete", result }));
|
|
37
|
+
|
|
29
38
|
if (req.cmd === "build") {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
}
|
|
39
|
+
const res = await builder.buildAsync();
|
|
40
|
+
return res.buildMessages;
|
|
41
|
+
} else {
|
|
42
|
+
await builder.watchAsync();
|
|
43
|
+
return;
|
|
44
|
+
}*/
|
|
37
45
|
}
|
|
38
|
-
#
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
46
|
+
#onComplete(req, result) {
|
|
47
|
+
this.#resultCache.delete(req.pkgPath);
|
|
48
|
+
for (const affectedFilePath of result.affectedFilePathSet) {
|
|
49
|
+
if (PathUtil.isChildPath(affectedFilePath, req.pkgPath)) {
|
|
50
|
+
this.#resultCache.delete(affectedFilePath);
|
|
42
51
|
}
|
|
43
|
-
this.#busyCount++;
|
|
44
52
|
}
|
|
45
|
-
|
|
46
|
-
this.#resultCache.
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
53
|
+
for (const buildMessage of result.buildMessages) {
|
|
54
|
+
const cacheItem = this.#resultCache.getOrCreate(buildMessage.filePath ?? req.pkgPath, []);
|
|
55
|
+
cacheItem.push(buildMessage);
|
|
56
|
+
}
|
|
57
|
+
const pkgConf = req.projConf.packages[path.basename(req.pkgPath)];
|
|
58
|
+
if (pkgConf.type === "server") {
|
|
59
|
+
const pkgName = path.basename(req.pkgPath);
|
|
60
|
+
const serverInfo = this.#serverInfoMap.getOrCreate(pkgName, {
|
|
61
|
+
hasChanges: true,
|
|
62
|
+
clientChangedFileSet: new Set(),
|
|
63
|
+
clients: {},
|
|
64
|
+
});
|
|
65
|
+
const serverPkgConf = req.projConf.packages[pkgName];
|
|
66
|
+
serverInfo.pkgInfo = {
|
|
67
|
+
path: req.pkgPath,
|
|
68
|
+
conf: serverPkgConf,
|
|
69
|
+
};
|
|
70
|
+
serverInfo.hasChanges = true;
|
|
71
|
+
}
|
|
72
|
+
else if (pkgConf.type === "client") {
|
|
73
|
+
const pkgName = path.basename(req.pkgPath);
|
|
74
|
+
if (pkgConf.server !== undefined) {
|
|
75
|
+
const serverInfo = this.#serverInfoMap.getOrCreate(typeof pkgConf.server === "string" ? pkgConf.server : pkgConf.server.port.toString(), {
|
|
76
|
+
hasChanges: true,
|
|
77
|
+
clientChangedFileSet: new Set(),
|
|
78
|
+
clients: {},
|
|
79
|
+
});
|
|
80
|
+
if (typeof pkgConf.server !== "string") {
|
|
81
|
+
serverInfo.pkgInfo = pkgConf.server;
|
|
50
82
|
}
|
|
83
|
+
serverInfo.clients[pkgName] = {
|
|
84
|
+
path: path.resolve(req.pkgPath, "dist"),
|
|
85
|
+
buildTypes: (pkgConf.builder ? Object.keys(pkgConf.builder) : ["web"]),
|
|
86
|
+
};
|
|
87
|
+
serverInfo.clientChangedFileSet.adds(...result.emitFileSet);
|
|
51
88
|
}
|
|
52
|
-
|
|
53
|
-
const cacheItem = this.#resultCache.getOrCreate(buildMessage.filePath ?? req.pkgPath, []);
|
|
54
|
-
cacheItem.push(buildMessage);
|
|
55
|
-
}
|
|
56
|
-
const pkgConf = req.projConf.packages[path.basename(req.pkgPath)];
|
|
57
|
-
if (pkgConf.type === "server") {
|
|
58
|
-
const pkgName = path.basename(req.pkgPath);
|
|
89
|
+
else {
|
|
59
90
|
const serverInfo = this.#serverInfoMap.getOrCreate(pkgName, {
|
|
60
91
|
hasChanges: true,
|
|
61
92
|
clientChangedFileSet: new Set(),
|
|
62
93
|
clients: {},
|
|
63
94
|
});
|
|
64
|
-
|
|
65
|
-
serverInfo.pkgInfo = {
|
|
66
|
-
path: req.pkgPath,
|
|
67
|
-
conf: serverPkgConf,
|
|
68
|
-
};
|
|
69
|
-
serverInfo.hasChanges = true;
|
|
95
|
+
serverInfo.clientChangedFileSet.adds(...result.emitFileSet);
|
|
70
96
|
}
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
buildTypes: (pkgConf.builder ? Object.keys(pkgConf.builder) : ["web"]),
|
|
85
|
-
};
|
|
86
|
-
serverInfo.clientChangedFileSet.adds(...res.result.emitFileSet);
|
|
87
|
-
}
|
|
88
|
-
else {
|
|
89
|
-
const serverInfo = this.#serverInfoMap.getOrCreate(pkgName, {
|
|
90
|
-
hasChanges: true,
|
|
91
|
-
clientChangedFileSet: new Set(),
|
|
92
|
-
clients: {},
|
|
93
|
-
});
|
|
94
|
-
serverInfo.clientChangedFileSet.adds(...res.result.emitFileSet);
|
|
95
|
-
}
|
|
96
|
-
}
|
|
97
|
-
setTimeout(async () => {
|
|
98
|
-
this.#busyCount--;
|
|
99
|
-
if (this.#busyCount === 0) {
|
|
100
|
-
for (const serverPkgNameOrPort of this.#serverInfoMap.keys()) {
|
|
101
|
-
const serverInfo = this.#serverInfoMap.get(serverPkgNameOrPort);
|
|
102
|
-
if (serverInfo.pkgInfo && serverInfo.hasChanges) {
|
|
103
|
-
this.#logger.debug("서버 재시작...");
|
|
104
|
-
try {
|
|
105
|
-
const restartServerResult = await this.#restartServerAsync(serverInfo.pkgInfo, serverInfo.worker);
|
|
106
|
-
serverInfo.worker = restartServerResult.worker;
|
|
107
|
-
serverInfo.port = restartServerResult.port;
|
|
108
|
-
serverInfo.hasChanges = false;
|
|
109
|
-
}
|
|
110
|
-
catch (err) {
|
|
111
|
-
this.#logger.error(err);
|
|
112
|
-
}
|
|
97
|
+
}
|
|
98
|
+
setTimeout(async () => {
|
|
99
|
+
this.#busyCount--;
|
|
100
|
+
if (this.#busyCount === 0) {
|
|
101
|
+
for (const serverPkgNameOrPort of this.#serverInfoMap.keys()) {
|
|
102
|
+
const serverInfo = this.#serverInfoMap.get(serverPkgNameOrPort);
|
|
103
|
+
if (serverInfo.pkgInfo && serverInfo.hasChanges) {
|
|
104
|
+
this.#logger.debug("서버 재시작...");
|
|
105
|
+
try {
|
|
106
|
+
const restartServerResult = await this.#restartServerAsync(serverInfo.pkgInfo, serverInfo.worker);
|
|
107
|
+
serverInfo.worker = restartServerResult.worker;
|
|
108
|
+
serverInfo.port = restartServerResult.port;
|
|
109
|
+
serverInfo.hasChanges = false;
|
|
113
110
|
}
|
|
114
|
-
|
|
115
|
-
this.#logger.
|
|
116
|
-
await serverInfo.worker.run("setPathProxy", [
|
|
117
|
-
{
|
|
118
|
-
...Object.keys(serverInfo.clients).toObject((key) => key, (key) => serverInfo.clients[key].path),
|
|
119
|
-
node_modules: path.resolve(process.cwd(), "node_modules"),
|
|
120
|
-
},
|
|
121
|
-
]);
|
|
122
|
-
if (serverInfo.clientChangedFileSet.size > 0) {
|
|
123
|
-
this.#logger.debug("클라이언트 새로고침...");
|
|
124
|
-
await serverInfo.worker.run("broadcastReload", [serverInfo.clientChangedFileSet]);
|
|
125
|
-
}
|
|
111
|
+
catch (err) {
|
|
112
|
+
this.#logger.error(err);
|
|
126
113
|
}
|
|
127
114
|
}
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
115
|
+
if (serverInfo.worker) {
|
|
116
|
+
this.#logger.debug("클라이언트 설정...");
|
|
117
|
+
await serverInfo.worker.run("setPathProxy", [
|
|
118
|
+
{
|
|
119
|
+
...Object.keys(serverInfo.clients).toObject((key) => key, (key) => serverInfo.clients[key].path),
|
|
120
|
+
node_modules: path.resolve(process.cwd(), "node_modules"),
|
|
121
|
+
},
|
|
122
|
+
]);
|
|
123
|
+
if (serverInfo.clientChangedFileSet.size > 0) {
|
|
124
|
+
this.#logger.debug("클라이언트 새로고침...");
|
|
125
|
+
await serverInfo.worker.run("broadcastReload", [serverInfo.clientChangedFileSet]);
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
const clientPaths = [];
|
|
130
|
+
for (const serverInfo of this.#serverInfoMap.values()) {
|
|
131
|
+
if (Object.keys(serverInfo.clients).length > 0) {
|
|
132
|
+
for (const clientPkgName of Object.keys(serverInfo.clients)) {
|
|
133
|
+
for (const buildType of serverInfo.clients[clientPkgName].buildTypes) {
|
|
134
|
+
if (buildType === "web") {
|
|
135
|
+
clientPaths.push(`http://localhost:${serverInfo.port}/${clientPkgName}/`);
|
|
136
|
+
}
|
|
137
|
+
else {
|
|
138
|
+
clientPaths.push(`http://localhost:${serverInfo.port}/${clientPkgName}/${buildType}/`);
|
|
139
139
|
}
|
|
140
140
|
}
|
|
141
141
|
}
|
|
142
|
-
else {
|
|
143
|
-
clientPaths.push(`http://localhost:${serverInfo.port}/`);
|
|
144
|
-
}
|
|
145
142
|
}
|
|
146
|
-
|
|
147
|
-
|
|
143
|
+
else {
|
|
144
|
+
clientPaths.push(`http://localhost:${serverInfo.port}/`);
|
|
148
145
|
}
|
|
149
|
-
const messages = Array.from(this.#resultCache.values()).mapMany();
|
|
150
|
-
this.emit("complete", messages);
|
|
151
146
|
}
|
|
152
|
-
|
|
153
|
-
|
|
147
|
+
if (clientPaths.length > 0) {
|
|
148
|
+
this.#logger.info("클라이언트 개발 서버 접속 주소\n" + clientPaths.join("\n"));
|
|
149
|
+
}
|
|
150
|
+
const messages = Array.from(this.#resultCache.values()).mapMany();
|
|
151
|
+
this.emit("complete", messages);
|
|
152
|
+
}
|
|
153
|
+
}, 300);
|
|
154
154
|
}
|
|
155
155
|
async #restartServerAsync(pkgInfo, prevWorker) {
|
|
156
156
|
const logger = Logger.get(["simplysm", "sd-cli", "SdMultiBuildRunner", "#restartServerAsync"]);
|
|
157
157
|
if (prevWorker) {
|
|
158
|
-
prevWorker.
|
|
158
|
+
await prevWorker.killAsync();
|
|
159
159
|
}
|
|
160
160
|
const npmConf = "path" in pkgInfo ? FsUtil.readJson(path.resolve(pkgInfo.path, "package.json")) : undefined;
|
|
161
161
|
const worker = new SdWorker(import.meta.resolve("../workers/server-worker"), {
|
|
@@ -171,4 +171,20 @@ export class SdMultiBuildRunner extends EventEmitter {
|
|
|
171
171
|
return { worker, port };
|
|
172
172
|
}
|
|
173
173
|
}
|
|
174
|
+
/*
|
|
175
|
+
interface IRequest {
|
|
176
|
+
cmd: "watch" | "build";
|
|
177
|
+
pkgPath: TNormPath;
|
|
178
|
+
projConf: ISdProjectConfig;
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
type TResponse =
|
|
182
|
+
| {
|
|
183
|
+
type: "change";
|
|
184
|
+
}
|
|
185
|
+
| {
|
|
186
|
+
type: "complete";
|
|
187
|
+
result: ISdBuildRunnerResult;
|
|
188
|
+
};
|
|
189
|
+
*/
|
|
174
190
|
//# sourceMappingURL=SdMultiBuildRunner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SdMultiBuildRunner.js","sourceRoot":"","sources":["../../src/pkg-builders/SdMultiBuildRunner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAa,MAAM,wBAAwB,CAAC;AACvF,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"SdMultiBuildRunner.js","sourceRoot":"","sources":["../../src/pkg-builders/SdMultiBuildRunner.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ export class SdCliNgRoutesFileGenerator {
|
|
|
5
5
|
static watch(pkgPath, noLazyRoute) {
|
|
6
6
|
const routesFilePath = path.resolve(pkgPath, "src/routes.ts");
|
|
7
7
|
let cache = FsUtil.exists(routesFilePath) ? FsUtil.readFile(routesFilePath) : undefined;
|
|
8
|
-
SdFsWatcher.watch([path.resolve(pkgPath, "src")]).onChange({ delay:
|
|
8
|
+
SdFsWatcher.watch([path.resolve(pkgPath, "src")]).onChange({ delay: 50 }, () => {
|
|
9
9
|
cache = this.run(pkgPath, cache, noLazyRoute);
|
|
10
10
|
});
|
|
11
11
|
cache = this.run(pkgPath, cache, noLazyRoute);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SdCliNgRoutesFileGenerator.js","sourceRoot":"","sources":["../../../src/pkg-builders/client/SdCliNgRoutesFileGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,MAAM,OAAO,0BAA0B;IACrC,MAAM,CAAC,KAAK,CAAC,OAAe,EAAE,WAAqB;QACjD,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAC9D,IAAI,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAExF,WAAW,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"SdCliNgRoutesFileGenerator.js","sourceRoot":"","sources":["../../../src/pkg-builders/client/SdCliNgRoutesFileGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,13 +3,14 @@ import { TNormPath } from "@simplysm/sd-core-node";
|
|
|
3
3
|
import { ISdProjectConfig } from "../../types/sd-configs.type";
|
|
4
4
|
import { ISdBuildRunnerResult } from "../../types/build.type";
|
|
5
5
|
export declare class SdClientBuildRunner extends EventEmitter {
|
|
6
|
-
private
|
|
7
|
-
private
|
|
8
|
-
private
|
|
9
|
-
private
|
|
10
|
-
private
|
|
6
|
+
private _projConf;
|
|
7
|
+
private _pkgPath;
|
|
8
|
+
private _logger;
|
|
9
|
+
private _pkgConf;
|
|
10
|
+
private _npmConf;
|
|
11
11
|
private _ngBundlers?;
|
|
12
12
|
private _cordova?;
|
|
13
|
+
private _watchScopePathSet;
|
|
13
14
|
constructor(_projConf: ISdProjectConfig, _pkgPath: TNormPath);
|
|
14
15
|
on(event: "change", listener: () => void): this;
|
|
15
16
|
on(event: "complete", listener: (result: ISdBuildRunnerResult) => void): this;
|
|
@@ -13,6 +13,8 @@ export class SdClientBuildRunner extends EventEmitter {
|
|
|
13
13
|
this._logger = Logger.get(["simplysm", "sd-cli", "SdClientBuildRunner"]);
|
|
14
14
|
this._pkgConf = this._projConf.packages[path.basename(_pkgPath)];
|
|
15
15
|
this._npmConf = FsUtil.readJson(path.resolve(_pkgPath, "package.json"));
|
|
16
|
+
const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {}).mapMany((key) => FsUtil.glob(path.resolve(this._pkgPath, "../../node_modules", key)));
|
|
17
|
+
this._watchScopePathSet = new Set([path.resolve(this._pkgPath, "../"), ...localUpdatePaths].map((item) => PathUtil.norm(item)));
|
|
16
18
|
}
|
|
17
19
|
on(event, listener) {
|
|
18
20
|
super.on(event, listener);
|
|
@@ -54,10 +56,14 @@ export class SdClientBuildRunner extends EventEmitter {
|
|
|
54
56
|
};
|
|
55
57
|
this.emit("complete", res);
|
|
56
58
|
this._debug("WATCH...");
|
|
57
|
-
|
|
59
|
+
let lastWatchFileSet = result.watchFileSet;
|
|
60
|
+
SdFsWatcher.watch(Array.from(this._watchScopePathSet)).onChange({ delay: 100 }, async (changeInfos) => {
|
|
61
|
+
const currentChangeInfos = changeInfos.filter((item) => lastWatchFileSet.has(item.path));
|
|
62
|
+
if (currentChangeInfos.length < 1)
|
|
63
|
+
return;
|
|
58
64
|
this.emit("change");
|
|
59
65
|
for (const ngBundler of this._ngBundlers) {
|
|
60
|
-
ngBundler.markForChanges(
|
|
66
|
+
ngBundler.markForChanges(currentChangeInfos.map((item) => item.path));
|
|
61
67
|
}
|
|
62
68
|
const watchResult = await this._runAsync({ dev: !this._pkgConf.forceProductionMode });
|
|
63
69
|
const watchRes = {
|
|
@@ -66,11 +72,10 @@ export class SdClientBuildRunner extends EventEmitter {
|
|
|
66
72
|
emitFileSet: watchResult.emitFileSet,
|
|
67
73
|
};
|
|
68
74
|
this.emit("complete", watchRes);
|
|
69
|
-
|
|
75
|
+
lastWatchFileSet = watchResult.watchFileSet;
|
|
70
76
|
});
|
|
71
77
|
}
|
|
72
78
|
async _runAsync(opt) {
|
|
73
|
-
const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {}).mapMany((key) => FsUtil.glob(path.resolve(this._pkgPath, "../../node_modules", key)));
|
|
74
79
|
const ngBundlerBuilderTypes = Object.keys(this._pkgConf.builder ?? { web: {} });
|
|
75
80
|
if (this._pkgConf.builder?.cordova && !this._cordova) {
|
|
76
81
|
this._debug("CORDOVA 준비...");
|
|
@@ -98,7 +103,7 @@ export class SdClientBuildRunner extends EventEmitter {
|
|
|
98
103
|
...this._pkgConf.builder?.[ngBundlerBuilderType]?.env,
|
|
99
104
|
},
|
|
100
105
|
cordovaConfig: ngBundlerBuilderType === "cordova" ? this._pkgConf.builder.cordova : undefined,
|
|
101
|
-
watchScopePaths:
|
|
106
|
+
watchScopePaths: Array.from(this._watchScopePathSet),
|
|
102
107
|
}));
|
|
103
108
|
}
|
|
104
109
|
this._debug(`BUILD...`);
|
|
@@ -119,10 +124,13 @@ export class SdClientBuildRunner extends EventEmitter {
|
|
|
119
124
|
});
|
|
120
125
|
}
|
|
121
126
|
this._debug(`빌드 완료`);
|
|
122
|
-
const currWatchFileSet = new Set(
|
|
123
|
-
|
|
127
|
+
/*const currWatchFileSet = new Set(
|
|
128
|
+
Array.from(watchFileSet).filter((item) =>
|
|
129
|
+
Array.from(this._watchScopePathSet).some((scope) => PathUtil.isChildPath(item, scope)),
|
|
130
|
+
),
|
|
131
|
+
);*/
|
|
124
132
|
return {
|
|
125
|
-
watchFileSet
|
|
133
|
+
watchFileSet,
|
|
126
134
|
affectedFileSet,
|
|
127
135
|
buildMessages: results, //.filter((item) => item.filePath !== path.resolve(this._pkgPath, "src/routes.ts")),
|
|
128
136
|
emitFileSet,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SdClientBuildRunner.js","sourceRoot":"","sources":["../../../src/pkg-builders/client/SdClientBuildRunner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAa,MAAM,wBAAwB,CAAC;AAC1F,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAK1D,MAAM,OAAO,mBAAoB,SAAQ,YAAY;
|
|
1
|
+
{"version":3,"file":"SdClientBuildRunner.js","sourceRoot":"","sources":["../../../src/pkg-builders/client/SdClientBuildRunner.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,9 +9,8 @@ import { MemoryLoadResultCache } from "@angular/build/src/tools/esbuild/load-res
|
|
|
9
9
|
import { convertOutputFile, createOutputFile, transformSupportedBrowsersToTargets, } from "@angular/build/src/tools/esbuild/utils";
|
|
10
10
|
import { BuildOutputFileType, } from "@angular/build/src/tools/esbuild/bundler-context";
|
|
11
11
|
import { extractLicenses } from "@angular/build/src/tools/esbuild/license-extractor";
|
|
12
|
-
import { IndexHtmlGenerator
|
|
12
|
+
import { IndexHtmlGenerator } from "@angular/build/src/utils/index-file/index-html-generator";
|
|
13
13
|
import { CrossOrigin } from "@angular/build/src/builders/application/schema";
|
|
14
|
-
import { InlineCriticalCssProcessor } from "@angular/build/src/utils/index-file/inline-critical-css";
|
|
15
14
|
import { augmentAppWithServiceWorkerEsbuild } from "@angular/build/src/utils/service-worker";
|
|
16
15
|
import { createSourcemapIgnorelistPlugin } from "@angular/build/src/tools/esbuild/sourcemap-ignorelist-plugin";
|
|
17
16
|
import { StylesheetPluginFactory } from "@angular/build/src/tools/esbuild/stylesheets/stylesheet-plugin-factory";
|
|
@@ -23,9 +22,6 @@ import { createSdNgPlugin } from "./createSdNgPlugin";
|
|
|
23
22
|
import { SdCliPerformanceTimer } from "../../utils/SdCliPerformanceTime";
|
|
24
23
|
export class SdNgBundler {
|
|
25
24
|
#logger = Logger.get(["simplysm", "sd-cli", "SdNgBundler"]);
|
|
26
|
-
// private readonly _sourceFileCache = new SourceFileCache(
|
|
27
|
-
// path.resolve(this._opt.pkgPath, ".cache")
|
|
28
|
-
// );
|
|
29
25
|
#modifiedFileSet = new Set();
|
|
30
26
|
#ngResultCache = {
|
|
31
27
|
affectedFileSet: new Set(),
|
|
@@ -100,7 +96,7 @@ export class SdNgBundler {
|
|
|
100
96
|
}
|
|
101
97
|
this.#debug(`create index.html...`);
|
|
102
98
|
await perf.run("create index.html", async () => {
|
|
103
|
-
const genIndexHtmlResult = await this._genIndexHtmlAsync(
|
|
99
|
+
const genIndexHtmlResult = await this._genIndexHtmlAsync(initialFiles);
|
|
104
100
|
for (const warning of genIndexHtmlResult.warnings) {
|
|
105
101
|
results.push({
|
|
106
102
|
filePath: undefined,
|
|
@@ -183,6 +179,7 @@ export class SdNgBundler {
|
|
|
183
179
|
watchFileSet: new Set([
|
|
184
180
|
...this.#ngResultCache.watchFileSet,
|
|
185
181
|
...this.#styleLoadResultCache.watchFiles.map((item) => PathUtil.norm(item)),
|
|
182
|
+
...assetFiles.map((item) => PathUtil.norm(item.source)),
|
|
186
183
|
PathUtil.norm(this.#indexHtmlFilePath),
|
|
187
184
|
]),
|
|
188
185
|
affectedFileSet: this.#ngResultCache.affectedFileSet,
|
|
@@ -190,52 +187,29 @@ export class SdNgBundler {
|
|
|
190
187
|
emitFileSet: emitFileSet,
|
|
191
188
|
};
|
|
192
189
|
}
|
|
193
|
-
async _genIndexHtmlAsync(
|
|
194
|
-
const readAsset = (filePath) => {
|
|
195
|
-
const relFilePath = path.relative("/", filePath);
|
|
196
|
-
const currFile = outputFiles.find((outputFile) => outputFile.path === relFilePath);
|
|
197
|
-
if (currFile) {
|
|
198
|
-
return Promise.resolve(currFile.text);
|
|
199
|
-
}
|
|
200
|
-
throw new Error(`Output file does not exist: ${relFilePath}`);
|
|
201
|
-
};
|
|
190
|
+
async _genIndexHtmlAsync(initialFiles) {
|
|
202
191
|
const indexHtmlGenerator = new IndexHtmlGenerator({
|
|
203
192
|
indexPath: this.#indexHtmlFilePath,
|
|
204
193
|
entrypoints: [
|
|
205
|
-
["runtime", true],
|
|
206
194
|
["polyfills", true],
|
|
207
195
|
["styles", false],
|
|
208
|
-
["vendor", true],
|
|
209
196
|
["main", true],
|
|
210
197
|
...(this._opt.builderType === "cordova" ? [["cordova-entry", true]] : []),
|
|
211
198
|
],
|
|
199
|
+
sri: false,
|
|
212
200
|
optimization: {
|
|
213
201
|
scripts: !this._opt.dev,
|
|
214
|
-
fonts: { inline: !this._opt.dev },
|
|
215
202
|
styles: {
|
|
216
203
|
minify: !this._opt.dev,
|
|
217
|
-
inlineCritical:
|
|
204
|
+
inlineCritical: !this._opt.dev,
|
|
205
|
+
removeSpecialComments: !this._opt.dev,
|
|
218
206
|
},
|
|
207
|
+
fonts: { inline: !this._opt.dev },
|
|
219
208
|
},
|
|
220
209
|
crossOrigin: CrossOrigin.None,
|
|
210
|
+
generateDedicatedSSRContent: false,
|
|
221
211
|
});
|
|
222
|
-
indexHtmlGenerator.
|
|
223
|
-
const hints = [];
|
|
224
|
-
if (!this._opt.dev) {
|
|
225
|
-
for (const [key, value] of initialFiles) {
|
|
226
|
-
if (value.entrypoint) {
|
|
227
|
-
continue;
|
|
228
|
-
}
|
|
229
|
-
if (value.type === "script") {
|
|
230
|
-
hints.push({ url: key, mode: "modulepreload" });
|
|
231
|
-
}
|
|
232
|
-
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
233
|
-
else if (value.type === "style") {
|
|
234
|
-
hints.push({ url: key, mode: "preload", as: "style" });
|
|
235
|
-
}
|
|
236
|
-
}
|
|
237
|
-
}
|
|
238
|
-
const transformResult = await indexHtmlGenerator.process({
|
|
212
|
+
return await indexHtmlGenerator.process({
|
|
239
213
|
baseHref: this.#baseHref,
|
|
240
214
|
lang: undefined,
|
|
241
215
|
outputPath: "/",
|
|
@@ -244,34 +218,12 @@ export class SdNgBundler {
|
|
|
244
218
|
file,
|
|
245
219
|
extension: path.extname(file),
|
|
246
220
|
})),
|
|
247
|
-
hints,
|
|
248
221
|
});
|
|
249
|
-
if (this._opt.dev) {
|
|
250
|
-
return transformResult;
|
|
251
|
-
}
|
|
252
|
-
else {
|
|
253
|
-
const inlineCriticalCssProcessor = new InlineCriticalCssProcessor({
|
|
254
|
-
minify: false,
|
|
255
|
-
readAsset,
|
|
256
|
-
});
|
|
257
|
-
const { content, errors, warnings } = await inlineCriticalCssProcessor.process(transformResult.csrContent, {
|
|
258
|
-
outputPath: "/",
|
|
259
|
-
});
|
|
260
|
-
return {
|
|
261
|
-
warnings: [...transformResult.warnings, ...warnings],
|
|
262
|
-
errors: [...transformResult.errors, ...errors],
|
|
263
|
-
csrContent: content,
|
|
264
|
-
};
|
|
265
|
-
}
|
|
266
222
|
}
|
|
267
|
-
//TODO: index.html 파일에 manifest.json 정보 추가? manifest.webmanifest ? PWA?
|
|
268
223
|
async _copyAssetsAsync() {
|
|
269
224
|
return await resolveAssets([
|
|
270
|
-
{ input: "
|
|
271
|
-
{ input: "
|
|
272
|
-
{ input: "src", glob: "manifest.json", output: "" },
|
|
273
|
-
{ input: "src/assets", glob: "**/*", output: "assets" },
|
|
274
|
-
...(this._opt.dev ? [{ input: "src/assets-dev", glob: "**/*", output: "assets-dev" }] : []),
|
|
225
|
+
{ input: "public", glob: "**/*", output: "." },
|
|
226
|
+
...(this._opt.dev ? [{ input: "public-dev", glob: "**/*", output: "." }] : []),
|
|
275
227
|
...(this._opt.dev && this._opt.builderType === "cordova"
|
|
276
228
|
? Object.keys(this._opt.cordovaConfig?.platform ?? { browser: {} }).mapMany((platform) => [
|
|
277
229
|
{
|
|
@@ -347,7 +299,7 @@ export class SdNgBundler {
|
|
|
347
299
|
polyfills: path.resolve(this._opt.pkgPath, "src/polyfills.ts"),
|
|
348
300
|
...(this._opt.builderType === "cordova"
|
|
349
301
|
? {
|
|
350
|
-
"cordova-entry": path.resolve(path.dirname(fileURLToPath(import.meta.url)),
|
|
302
|
+
"cordova-entry": path.resolve(path.dirname(fileURLToPath(import.meta.url)), `../../../lib/cordova-entry.js`),
|
|
351
303
|
}
|
|
352
304
|
: {}),
|
|
353
305
|
...workerEntries,
|