@simplysm/sd-cli 12.9.16 → 12.9.18
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/sd-cli-cordova.d.ts +1 -1
- package/dist/entry/sd-cli-cordova.js +3 -3
- package/dist/entry/sd-cli-cordova.js.map +1 -1
- package/dist/entry/sd-cli-electron.d.ts +2 -2
- package/dist/entry/sd-cli-local-update.d.ts +2 -2
- package/dist/entry/sd-cli-local-update.js.map +1 -1
- package/dist/entry/sd-cli-project.d.ts +3 -3
- package/dist/entry/sd-cli-project.js +4 -4
- package/dist/entry/sd-cli-project.js.map +1 -1
- package/dist/entry/utils/loadProjConfAsync.d.ts +1 -1
- package/dist/entry/utils/loadProjConfAsync.js +1 -1
- package/dist/entry/utils/loadProjConfAsync.js.map +1 -1
- package/dist/fix/convert-private-underscore.d.ts +1 -0
- package/dist/fix/convert-private-underscore.js +49 -0
- package/dist/fix/convert-private-underscore.js.map +1 -0
- package/dist/fix/convert-private.d.ts +1 -0
- package/dist/fix/convert-private.js +60 -0
- package/dist/fix/convert-private.js.map +1 -0
- package/dist/pkg-builders/client/sd-cli-ng-routes.file-generator.d.ts +1 -1
- package/dist/pkg-builders/client/sd-cli-ng-routes.file-generator.js +3 -3
- package/dist/pkg-builders/client/sd-cli-ng-routes.file-generator.js.map +1 -1
- package/dist/pkg-builders/client/sd-client.build-runner.d.ts +5 -18
- package/dist/pkg-builders/client/sd-client.build-runner.js +32 -90
- package/dist/pkg-builders/client/sd-client.build-runner.js.map +1 -1
- package/dist/pkg-builders/client/sd-ng.bundler.d.ts +2 -1
- package/dist/pkg-builders/client/sd-ng.bundler.js +2 -2
- package/dist/pkg-builders/client/sd-ng.bundler.js.map +1 -1
- package/dist/pkg-builders/client/sd-ng.plugin-creator.d.ts +2 -1
- package/dist/pkg-builders/client/sd-ng.plugin-creator.js +1 -1
- package/dist/pkg-builders/client/sd-ng.plugin-creator.js.map +1 -1
- package/dist/pkg-builders/commons/build-runner.base.d.ts +27 -0
- package/dist/pkg-builders/commons/build-runner.base.js +93 -0
- package/dist/pkg-builders/commons/build-runner.base.js.map +1 -0
- package/dist/pkg-builders/commons/scope-path.d.ts +7 -0
- package/dist/pkg-builders/commons/scope-path.js +13 -0
- package/dist/pkg-builders/commons/scope-path.js.map +1 -0
- package/dist/pkg-builders/lib/sd-cli-index.file-generator.d.ts +1 -1
- package/dist/pkg-builders/lib/sd-cli-index.file-generator.js +2 -2
- package/dist/pkg-builders/lib/sd-cli-index.file-generator.js.map +1 -1
- package/dist/pkg-builders/lib/sd-js-lib.build-runner.d.ts +7 -15
- package/dist/pkg-builders/lib/sd-js-lib.build-runner.js +15 -54
- package/dist/pkg-builders/lib/sd-js-lib.build-runner.js.map +1 -1
- package/dist/pkg-builders/lib/sd-ts-lib.build-runner.d.ts +5 -16
- package/dist/pkg-builders/lib/sd-ts-lib.build-runner.js +31 -85
- package/dist/pkg-builders/lib/sd-ts-lib.build-runner.js.map +1 -1
- package/dist/pkg-builders/lib/sd-ts-lib.builder.d.ts +2 -1
- package/dist/pkg-builders/lib/sd-ts-lib.builder.js +2 -2
- package/dist/pkg-builders/lib/sd-ts-lib.builder.js.map +1 -1
- package/dist/pkg-builders/sd-multi.build-runner.d.ts +2 -1
- package/dist/pkg-builders/sd-multi.build-runner.js +4 -4
- package/dist/pkg-builders/sd-multi.build-runner.js.map +1 -1
- package/dist/pkg-builders/server/sd-server.build-runner.d.ts +6 -17
- package/dist/pkg-builders/server/sd-server.build-runner.js +87 -137
- package/dist/pkg-builders/server/sd-server.build-runner.js.map +1 -1
- package/dist/pkg-builders/server/sd-server.bundler.d.ts +2 -1
- package/dist/pkg-builders/server/sd-server.bundler.js +2 -2
- package/dist/pkg-builders/server/sd-server.bundler.js.map +1 -1
- package/dist/pkg-builders/server/sd-server.plugin-creator.d.ts +2 -1
- package/dist/pkg-builders/server/sd-server.plugin-creator.js +3 -2
- package/dist/pkg-builders/server/sd-server.plugin-creator.js.map +1 -1
- package/dist/sd-cli-entry.js +69 -61
- package/dist/sd-cli-entry.js.map +1 -1
- package/dist/sd-cli.js +33 -28
- package/dist/sd-cli.js.map +1 -1
- package/dist/ts-compiler/sd-dependency-analyzer.d.ts +3 -3
- package/dist/ts-compiler/sd-dependency-analyzer.js +9 -16
- package/dist/ts-compiler/sd-dependency-analyzer.js.map +1 -1
- package/dist/ts-compiler/sd-ts-compiler.d.ts +1 -2
- package/dist/ts-compiler/sd-ts-compiler.js +70 -19
- package/dist/ts-compiler/sd-ts-compiler.js.map +1 -1
- package/dist/types/config.types.d.ts +3 -2
- package/dist/types/ts-compiler.types.d.ts +2 -1
- package/package.json +8 -7
- package/src/entry/sd-cli-cordova.ts +4 -4
- package/src/entry/sd-cli-electron.ts +2 -2
- package/src/entry/sd-cli-local-update.ts +2 -2
- package/src/entry/sd-cli-project.ts +6 -6
- package/src/entry/utils/loadProjConfAsync.ts +2 -2
- package/src/fix/convert-private-underscore.ts +69 -0
- package/src/fix/convert-private.ts +74 -0
- package/src/pkg-builders/client/sd-cli-ng-routes.file-generator.ts +3 -3
- package/src/pkg-builders/client/sd-client.build-runner.ts +39 -126
- package/src/pkg-builders/client/sd-ng.bundler.ts +4 -3
- package/src/pkg-builders/client/sd-ng.plugin-creator.ts +3 -2
- package/src/pkg-builders/commons/build-runner.base.ts +149 -0
- package/src/pkg-builders/commons/scope-path.ts +17 -0
- package/src/pkg-builders/lib/sd-cli-index.file-generator.ts +2 -2
- package/src/pkg-builders/lib/sd-js-lib.build-runner.ts +29 -74
- package/src/pkg-builders/lib/sd-ts-lib.build-runner.ts +35 -130
- package/src/pkg-builders/lib/sd-ts-lib.builder.ts +3 -2
- package/src/pkg-builders/sd-multi.build-runner.ts +4 -4
- package/src/pkg-builders/server/sd-server.build-runner.ts +99 -187
- package/src/pkg-builders/server/sd-server.bundler.ts +4 -3
- package/src/pkg-builders/server/sd-server.plugin-creator.ts +13 -8
- package/src/sd-cli-entry.ts +115 -81
- package/src/sd-cli.ts +14 -11
- package/src/ts-compiler/sd-dependency-analyzer.ts +10 -17
- package/src/ts-compiler/sd-ts-compiler.ts +79 -30
- package/src/types/config.types.ts +9 -2
- package/src/types/ts-compiler.types.ts +2 -1
- package/tests/deps/sd-dependency-analyzer.spec.ts +1 -1
- package/dist/workers/style-bundler.worker.d.ts +0 -1
- package/dist/workers/style-bundler.worker.js +0 -56
- package/dist/workers/style-bundler.worker.js.map +0 -1
- package/src/workers/style-bundler.worker.ts +0 -70
|
@@ -1,82 +1,77 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { FsUtils, PathUtils, SdFsWatcher, SdLogger } from "@simplysm/sd-core-node";
|
|
1
|
+
import { FsUtils, SdLogger } from "@simplysm/sd-core-node";
|
|
3
2
|
import path from "path";
|
|
4
3
|
import { StringUtils } from "@simplysm/sd-core-common";
|
|
5
4
|
import { SdServerBundler } from "./sd-server.bundler";
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
this._pkgPath = _pkgPath;
|
|
5
|
+
import { BuildRunnerBase } from "../commons/build-runner.base";
|
|
6
|
+
export class SdServerBuildRunner extends BuildRunnerBase {
|
|
7
|
+
constructor() {
|
|
8
|
+
super(...arguments);
|
|
11
9
|
this._logger = SdLogger.get(["simplysm", "sd-cli", "SdCliServerBuildRunner"]);
|
|
12
|
-
this._pkgConf = this._projConf.packages[path.basename(_pkgPath)];
|
|
13
|
-
const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {}).mapMany((key) => FsUtils.glob(path.resolve(this._pkgPath, "../../node_modules", key)));
|
|
14
|
-
this._watchScopePathSet = new Set([path.resolve(this._pkgPath, "../"), ...localUpdatePaths].map((item) => PathUtils.norm(item)));
|
|
15
10
|
}
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
const
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
11
|
+
async _runAsync(dev, modifiedFileSet) {
|
|
12
|
+
if (!dev) {
|
|
13
|
+
await this._generateProductionFilesAsync();
|
|
14
|
+
}
|
|
15
|
+
if (!modifiedFileSet) {
|
|
16
|
+
this._debug("GEN .config...");
|
|
17
|
+
const confDistPath = path.resolve(this._pkgPath, "dist/.config.json");
|
|
18
|
+
FsUtils.writeFile(confDistPath, JSON.stringify(this._pkgConf.configs ?? {}, undefined, 2));
|
|
19
|
+
}
|
|
20
|
+
/*const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {}).mapMany((key) =>
|
|
21
|
+
FsUtils.glob(path.resolve(this._pkgPath, "../../node_modules", key)),
|
|
22
|
+
);*/
|
|
23
|
+
this._debug(`BUILD 준비...`);
|
|
24
|
+
const tsConfig = FsUtils.readJson(path.resolve(this._pkgPath, "tsconfig.json"));
|
|
25
|
+
this._extModules = this._extModules ?? (await this._getExternalModulesAsync());
|
|
26
|
+
this._serverBundler =
|
|
27
|
+
this._serverBundler ??
|
|
28
|
+
new SdServerBundler({
|
|
29
|
+
dev,
|
|
30
|
+
pkgPath: this._pkgPath,
|
|
31
|
+
entryPoints: tsConfig.files
|
|
32
|
+
? tsConfig.files.map((item) => path.resolve(this._pkgPath, item))
|
|
33
|
+
: [
|
|
34
|
+
path.resolve(this._pkgPath, "src/main.ts"),
|
|
35
|
+
...FsUtils.glob(path.resolve(this._pkgPath, "src/workers/*.ts")),
|
|
36
|
+
],
|
|
37
|
+
external: this._extModules.map((item) => item.name),
|
|
38
|
+
watchScopePathSet: this._watchScopePathSet,
|
|
39
|
+
});
|
|
40
|
+
this._debug(`BUILD...`);
|
|
41
|
+
const bundleResult = await this._serverBundler.bundleAsync(modifiedFileSet);
|
|
42
|
+
//-- filePaths
|
|
43
|
+
const watchFileSet = new Set(Array.from(bundleResult.watchFileSet).filter((item) => this._watchScopePathSet.inScope(item)));
|
|
44
|
+
this._debug(`빌드 완료`);
|
|
45
|
+
return {
|
|
46
|
+
watchFileSet,
|
|
47
|
+
affectedFileSet: bundleResult.affectedFileSet,
|
|
48
|
+
buildMessages: bundleResult.results,
|
|
49
|
+
emitFileSet: bundleResult.emitFileSet,
|
|
32
50
|
};
|
|
33
|
-
this.emit("complete", res);
|
|
34
|
-
this._debug("WATCH...");
|
|
35
|
-
let lastWatchFileSet = result.watchFileSet;
|
|
36
|
-
SdFsWatcher.watch(Array.from(this._watchScopePathSet))
|
|
37
|
-
.onChange({ delay: 100 }, async (changeInfos) => {
|
|
38
|
-
const currentChangeInfos = changeInfos.filter((item) => lastWatchFileSet.has(item.path));
|
|
39
|
-
if (currentChangeInfos.length < 1)
|
|
40
|
-
return;
|
|
41
|
-
this.emit("change");
|
|
42
|
-
const watchResult = await this._runAsync(true, new Set(currentChangeInfos.map((item) => PathUtils.norm(item.path))));
|
|
43
|
-
const watchRes = {
|
|
44
|
-
affectedFilePathSet: watchResult.affectedFileSet,
|
|
45
|
-
buildMessages: watchResult.buildMessages,
|
|
46
|
-
emitFileSet: watchResult.emitFileSet,
|
|
47
|
-
};
|
|
48
|
-
this.emit("complete", watchRes);
|
|
49
|
-
lastWatchFileSet = watchResult.watchFileSet;
|
|
50
|
-
});
|
|
51
51
|
}
|
|
52
|
-
async
|
|
53
|
-
const
|
|
54
|
-
const npmConfig = FsUtils.readJson(path.resolve(this._pkgPath, "package.json"));
|
|
55
|
-
const extModules = await this._getExternalModulesAsync();
|
|
56
|
-
this._debug("dist 초기화...");
|
|
57
|
-
FsUtils.remove(path.resolve(this._pkgPath, "dist"));
|
|
58
|
-
this._debug("GEN .config.json...");
|
|
59
|
-
const confDistPath = path.resolve(this._pkgPath, "dist/.config.json");
|
|
60
|
-
FsUtils.writeJson(confDistPath, this._pkgConf.configs ?? {}, { space: 2 });
|
|
52
|
+
async _generateProductionFilesAsync() {
|
|
53
|
+
const npmConf = FsUtils.readJson(path.resolve(this._pkgPath, "package.json"));
|
|
61
54
|
this._debug("GEN package.json...");
|
|
62
55
|
{
|
|
56
|
+
const projNpmConf = FsUtils.readJson(path.resolve(process.cwd(), "package.json"));
|
|
57
|
+
const extModules = await this._getExternalModulesAsync();
|
|
63
58
|
const deps = extModules.filter((item) => item.exists).map((item) => item.name);
|
|
64
59
|
const distNpmConfig = {
|
|
65
|
-
name:
|
|
66
|
-
version:
|
|
67
|
-
type:
|
|
60
|
+
name: npmConf.name,
|
|
61
|
+
version: npmConf.version,
|
|
62
|
+
type: npmConf.type,
|
|
68
63
|
};
|
|
69
64
|
distNpmConfig.dependencies = {};
|
|
70
65
|
for (const dep of deps) {
|
|
71
66
|
distNpmConfig.dependencies[dep] = "*";
|
|
72
67
|
}
|
|
73
|
-
distNpmConfig.scripts = {};
|
|
74
|
-
if (this._pkgConf.pm2 && !this._pkgConf.pm2.noStartScript) {
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
}
|
|
79
|
-
distNpmConfig.volta =
|
|
68
|
+
// distNpmConfig.scripts = {};
|
|
69
|
+
// if (this._pkgConf.pm2 && !this._pkgConf.pm2.noStartScript) {
|
|
70
|
+
// distNpmConfig.scripts["start"] = "pm2 start pm2.config.cjs";
|
|
71
|
+
// distNpmConfig.scripts["stop"] = "pm2 stop pm2.config.cjs";
|
|
72
|
+
// distNpmConfig.scripts["delete"] = "pm2 delete pm2.config.cjs";
|
|
73
|
+
// }
|
|
74
|
+
distNpmConfig.volta = projNpmConf.volta;
|
|
80
75
|
FsUtils.writeJson(path.resolve(this._pkgPath, "dist/package.json"), distNpmConfig, { space: 2 });
|
|
81
76
|
}
|
|
82
77
|
this._debug("GEN .yarnrc.yml...");
|
|
@@ -111,36 +106,36 @@ Options = UnsafeLegacyRenegotiation`.trim());
|
|
|
111
106
|
if (this._pkgConf.pm2) {
|
|
112
107
|
this._debug("GEN pm2.config.cjs...");
|
|
113
108
|
const str = /* language=cjs */ `
|
|
114
|
-
|
|
109
|
+
const cp = require("child_process");
|
|
115
110
|
|
|
116
|
-
|
|
111
|
+
const npmConf = require("./package.json");
|
|
117
112
|
|
|
118
|
-
|
|
119
|
-
|
|
113
|
+
const pm2Conf = ${JSON.stringify(this._pkgConf.pm2)};
|
|
114
|
+
const env = ${JSON.stringify(this._pkgConf.env)};
|
|
120
115
|
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
116
|
+
module.exports = {
|
|
117
|
+
name: pm2Conf.name ?? npmConf.name.replace(/@/g, "").replace(/\\//g, "-"),
|
|
118
|
+
script: "main.js",
|
|
119
|
+
watch: true,
|
|
120
|
+
watch_delay: 2000,
|
|
121
|
+
ignore_watch: [
|
|
122
|
+
"node_modules",
|
|
123
|
+
"www",
|
|
124
|
+
...pm2Conf.ignoreWatchPaths ?? []
|
|
125
|
+
],
|
|
126
|
+
...pm2Conf.noInterpreter ? {} : {interpreter: cp.execSync("volta which node").toString().trim()},
|
|
127
|
+
interpreter_args: "--openssl-config=openssl.cnf",
|
|
128
|
+
env: {
|
|
129
|
+
NODE_ENV: "production",
|
|
130
|
+
TZ: "Asia/Seoul",
|
|
131
|
+
SD_VERSION: npmConf.version,
|
|
132
|
+
...env ?? {}
|
|
133
|
+
},
|
|
134
|
+
arrayProcess: "concat",
|
|
135
|
+
useDelTargetNull: true,
|
|
136
|
+
exec_mode: pm2Conf.instances != null ? "cluster" : "fork",
|
|
137
|
+
instances: pm2Conf.instances ?? 1
|
|
138
|
+
};`
|
|
144
139
|
.replaceAll("\n ", "\n")
|
|
145
140
|
.trim();
|
|
146
141
|
FsUtils.writeFile(path.resolve(this._pkgPath, "dist/pm2.config.cjs"), str);
|
|
@@ -156,7 +151,7 @@ Options = UnsafeLegacyRenegotiation`.trim());
|
|
|
156
151
|
<appSettings>
|
|
157
152
|
<add key="NODE_ENV" value="production" />
|
|
158
153
|
<add key="TZ" value="Asia/Seoul" />
|
|
159
|
-
<add key="SD_VERSION" value="${
|
|
154
|
+
<add key="SD_VERSION" value="${npmConf.version}" />
|
|
160
155
|
${Object.keys(this._pkgConf.env ?? {})
|
|
161
156
|
.map((key) => `<add key="${key}" value="${this._pkgConf.env[key]}"/>`)
|
|
162
157
|
.join("\n ")}
|
|
@@ -178,50 +173,8 @@ Options = UnsafeLegacyRenegotiation`.trim());
|
|
|
178
173
|
</rewrite>
|
|
179
174
|
<httpErrors errorMode="Detailed" />
|
|
180
175
|
</system.webServer>
|
|
181
|
-
</configuration
|
|
182
|
-
`.trim());
|
|
176
|
+
</configuration>`.trim());
|
|
183
177
|
}
|
|
184
|
-
const result = await this._runAsync(false);
|
|
185
|
-
return {
|
|
186
|
-
affectedFilePathSet: result.affectedFileSet,
|
|
187
|
-
buildMessages: result.buildMessages,
|
|
188
|
-
emitFileSet: result.emitFileSet,
|
|
189
|
-
};
|
|
190
|
-
}
|
|
191
|
-
async _runAsync(dev, modifiedFileSet) {
|
|
192
|
-
const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {}).mapMany((key) => FsUtils.glob(path.resolve(this._pkgPath, "../../node_modules", key)));
|
|
193
|
-
this._debug(`BUILD 준비...`);
|
|
194
|
-
const tsConfig = FsUtils.readJson(path.resolve(this._pkgPath, "tsconfig.json"));
|
|
195
|
-
this._extModules = this._extModules ?? (await this._getExternalModulesAsync());
|
|
196
|
-
this._serverBundler =
|
|
197
|
-
this._serverBundler ??
|
|
198
|
-
new SdServerBundler({
|
|
199
|
-
dev,
|
|
200
|
-
pkgPath: this._pkgPath,
|
|
201
|
-
entryPoints: tsConfig.files
|
|
202
|
-
? tsConfig.files.map((item) => path.resolve(this._pkgPath, item))
|
|
203
|
-
: [
|
|
204
|
-
path.resolve(this._pkgPath, "src/main.ts"),
|
|
205
|
-
...FsUtils.glob(path.resolve(this._pkgPath, "src/workers/*.ts")),
|
|
206
|
-
],
|
|
207
|
-
external: this._extModules.map((item) => item.name),
|
|
208
|
-
watchScopePaths: [
|
|
209
|
-
path.resolve(this._pkgPath, "../"),
|
|
210
|
-
...localUpdatePaths,
|
|
211
|
-
].map((item) => PathUtils.norm(item)),
|
|
212
|
-
});
|
|
213
|
-
this._debug(`BUILD...`);
|
|
214
|
-
const bundleResult = await this._serverBundler.bundleAsync(modifiedFileSet);
|
|
215
|
-
//-- filePaths
|
|
216
|
-
const watchFileSet = new Set(Array.from(bundleResult.watchFileSet).filter((item) => PathUtils.isChildPath(item, path.resolve(this._pkgPath, "../")) ||
|
|
217
|
-
localUpdatePaths.some((lu) => PathUtils.isChildPath(item, lu))));
|
|
218
|
-
this._debug(`빌드 완료`);
|
|
219
|
-
return {
|
|
220
|
-
watchFileSet,
|
|
221
|
-
affectedFileSet: bundleResult.affectedFileSet,
|
|
222
|
-
buildMessages: bundleResult.results,
|
|
223
|
-
emitFileSet: bundleResult.emitFileSet,
|
|
224
|
-
};
|
|
225
178
|
}
|
|
226
179
|
async _getExternalModulesAsync() {
|
|
227
180
|
const loadedModuleNames = [];
|
|
@@ -299,8 +252,5 @@ Options = UnsafeLegacyRenegotiation`.trim());
|
|
|
299
252
|
}
|
|
300
253
|
return results;
|
|
301
254
|
}
|
|
302
|
-
_debug(msg) {
|
|
303
|
-
this._logger.debug(`[${path.basename(this._pkgPath)}] ${msg}`);
|
|
304
|
-
}
|
|
305
255
|
}
|
|
306
256
|
//# sourceMappingURL=sd-server.build-runner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sd-server.build-runner.js","sourceRoot":"","sources":["../../../src/pkg-builders/server/sd-server.build-runner.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sd-server.build-runner.js","sourceRoot":"","sources":["../../../src/pkg-builders/server/sd-server.build-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { TNormPath } from "@simplysm/sd-core-node";
|
|
2
2
|
import { ISdBuildMessage } from "../../types/build.types";
|
|
3
|
+
import { ScopePathSet } from "../commons/scope-path";
|
|
3
4
|
export declare class SdServerBundler {
|
|
4
5
|
private _opt;
|
|
5
6
|
private _logger;
|
|
@@ -12,7 +13,7 @@ export declare class SdServerBundler {
|
|
|
12
13
|
pkgPath: TNormPath;
|
|
13
14
|
entryPoints: string[];
|
|
14
15
|
external?: string[];
|
|
15
|
-
|
|
16
|
+
watchScopePathSet: ScopePathSet;
|
|
16
17
|
});
|
|
17
18
|
bundleAsync(modifiedFileSet?: Set<TNormPath>): Promise<{
|
|
18
19
|
watchFileSet: Set<TNormPath>;
|
|
@@ -85,7 +85,7 @@ const __dirname = __path__.dirname(__filename);`.trim(),
|
|
|
85
85
|
dev: this._opt.dev,
|
|
86
86
|
pkgPath: this._opt.pkgPath,
|
|
87
87
|
result: this._resultCache,
|
|
88
|
-
|
|
88
|
+
watchScopePathSet: this._opt.watchScopePathSet,
|
|
89
89
|
}),
|
|
90
90
|
],
|
|
91
91
|
});
|
|
@@ -98,7 +98,7 @@ const __dirname = __path__.dirname(__filename);`.trim(),
|
|
|
98
98
|
for (const outputFile of outputFiles) {
|
|
99
99
|
const distFilePath = PathUtils.norm(this._opt.pkgPath, outputFile.path);
|
|
100
100
|
const prevHash = this._outputHashCache.get(distFilePath);
|
|
101
|
-
const currHash = HashUtils.get(outputFile.contents);
|
|
101
|
+
const currHash = HashUtils.get(Buffer.from(outputFile.contents));
|
|
102
102
|
if (prevHash !== currHash) {
|
|
103
103
|
FsUtils.writeFile(distFilePath, outputFile.contents);
|
|
104
104
|
this._outputHashCache.set(distFilePath, currHash);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sd-server.bundler.js","sourceRoot":"","sources":["../../../src/pkg-builders/server/sd-server.bundler.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAa,MAAM,wBAAwB,CAAC;AAC5F,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AAGpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAEL,mBAAmB,GACpB,MAAM,kDAAkD,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"sd-server.bundler.js","sourceRoot":"","sources":["../../../src/pkg-builders/server/sd-server.bundler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import esbuild from "esbuild";
|
|
2
2
|
import { ISdCliServerPluginResultCache } from "../../types/build-plugin.types";
|
|
3
3
|
import { TNormPath } from "@simplysm/sd-core-node";
|
|
4
|
+
import { ScopePathSet } from "../commons/scope-path";
|
|
4
5
|
export declare function createSdServerPlugin(conf: {
|
|
5
6
|
pkgPath: TNormPath;
|
|
6
7
|
dev: boolean;
|
|
7
8
|
modifiedFileSet: Set<TNormPath>;
|
|
8
9
|
result: ISdCliServerPluginResultCache;
|
|
9
|
-
|
|
10
|
+
watchScopePathSet: ScopePathSet;
|
|
10
11
|
}): esbuild.Plugin;
|
|
@@ -10,7 +10,7 @@ export function createSdServerPlugin(conf) {
|
|
|
10
10
|
additionalOptions: { declaration: false },
|
|
11
11
|
isDevMode: conf.dev,
|
|
12
12
|
isForBundle: true,
|
|
13
|
-
|
|
13
|
+
watchScopePathSet: conf.watchScopePathSet,
|
|
14
14
|
});
|
|
15
15
|
let tsCompileResult;
|
|
16
16
|
build.onStart(async () => {
|
|
@@ -21,7 +21,8 @@ export function createSdServerPlugin(conf) {
|
|
|
21
21
|
return SdCliConvertMessageUtils.convertToEsbuildFromBuildMessages(tsCompileResult.messages, conf.pkgPath);
|
|
22
22
|
});
|
|
23
23
|
build.onLoad({ filter: /\.ts$/ }, (args) => {
|
|
24
|
-
const emittedJsFile = tsCompileResult.emittedFilesCacheMap.get(PathUtils.norm(args.path))
|
|
24
|
+
const emittedJsFile = tsCompileResult.emittedFilesCacheMap.get(PathUtils.norm(args.path))
|
|
25
|
+
?.last();
|
|
25
26
|
if (!emittedJsFile) {
|
|
26
27
|
return {
|
|
27
28
|
errors: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sd-server.plugin-creator.js","sourceRoot":"","sources":["../../../src/pkg-builders/server/sd-server.plugin-creator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AAEpF,OAAO,EAAE,SAAS,EAAa,MAAM,wBAAwB,CAAC;AAE9D,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"sd-server.plugin-creator.js","sourceRoot":"","sources":["../../../src/pkg-builders/server/sd-server.plugin-creator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AAEpF,OAAO,EAAE,SAAS,EAAa,MAAM,wBAAwB,CAAC;AAE9D,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAGhE,MAAM,UAAU,oBAAoB,CAAC,IAMpC;IACC,OAAO;QACL,IAAI,EAAE,mBAAmB;QACzB,KAAK,EAAE,CAAC,KAA0B,EAAE,EAAE;YACpC,MAAM,UAAU,GAAG,IAAI,YAAY,CAAC;gBAClC,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,iBAAiB,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE;gBACzC,SAAS,EAAE,IAAI,CAAC,GAAG;gBACnB,WAAW,EAAE,IAAI;gBACjB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;aAC1C,CAAC,CAAC;YAEH,IAAI,eAAoC,CAAC;YAEzC,KAAK,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE;gBACvB,eAAe,GAAG,MAAM,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;gBAEtE,IAAI,CAAC,MAAM,CAAC,YAAY,GAAG,eAAe,CAAC,YAAY,CAAC;gBACxD,IAAI,CAAC,MAAM,CAAC,eAAe,GAAG,eAAe,CAAC,eAAe,CAAC;gBAE9D,oBAAoB;gBACpB,OAAO,wBAAwB,CAAC,iCAAiC,CAC/D,eAAe,CAAC,QAAQ,EACxB,IAAI,CAAC,OAAO,CACb,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE;gBACzC,MAAM,aAAa,GAAG,eAAe,CAAC,oBAAoB,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBACvF,EAAE,IAAI,EAAE,CAAC;gBACX,IAAI,CAAC,aAAa,EAAE,CAAC;oBACnB,OAAO;wBACL,MAAM,EAAE;4BACN;gCACE,IAAI,EAAE,gCAAgC,IAAI,CAAC,IAAI,EAAE;6BAClD;yBACF;qBACF,CAAC;gBACJ,CAAC;gBAED,MAAM,QAAQ,GAAG,aAAa,CAAC,IAAI,CAAC;gBACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;YACpC,CAAC,CAAC,CAAC;YAEH,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC9C,IAAI,CAAC,MAAM,CAAC,YAAa,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;gBACzD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;YAEH,KAAK,CAAC,MAAM,CACV;gBACE,MAAM,EAAE,IAAI,MAAM,CAChB,GAAG;oBACH,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,MAAO,CAAC;yBACtC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,CAAC;yBAC1B,IAAI,CAAC,GAAG,CAAC;oBACZ,IAAI,CACL;aACF,EACD,CAAC,IAAI,EAAE,EAAE;gBACP,IAAI,CAAC,MAAM,CAAC,YAAa,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;gBACzD,OAAO,IAAI,CAAC;YACd,CAAC,CACF,CAAC;YAEF,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE;gBACrB,IAAI,CAAC,MAAM,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;gBAC7C,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;gBAEvC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;YAC/B,CAAC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC"}
|