@simplysm/sd-cli 12.13.36 → 12.13.38
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/SdCliLocalUpdate.js +12 -12
- package/dist/entry/SdCliLocalUpdate.js.map +1 -1
- package/dist/entry/SdCliProject.js +3 -3
- package/dist/entry/SdCliProject.js.map +1 -1
- package/dist/pkg-builders/SdBuildRunnerBase.d.ts +14 -0
- package/dist/pkg-builders/SdBuildRunnerBase.js +23 -0
- package/dist/pkg-builders/SdBuildRunnerBase.js.map +1 -0
- package/dist/pkg-builders/SdProjectBuildRunner.js +19 -15
- package/dist/pkg-builders/SdProjectBuildRunner.js.map +1 -1
- package/dist/pkg-builders/client/SdCliNgRoutesFileGenerator.d.ts +1 -1
- package/dist/pkg-builders/client/SdCliNgRoutesFileGenerator.js +5 -4
- package/dist/pkg-builders/client/SdCliNgRoutesFileGenerator.js.map +1 -1
- package/dist/pkg-builders/client/SdClientBuildRunner.d.ts +1 -1
- package/dist/pkg-builders/client/SdClientBuildRunner.js +17 -36
- package/dist/pkg-builders/client/SdClientBuildRunner.js.map +1 -1
- package/dist/pkg-builders/client/SdNgBundler.d.ts +10 -16
- package/dist/pkg-builders/client/SdNgBundler.js +59 -54
- package/dist/pkg-builders/client/SdNgBundler.js.map +1 -1
- package/dist/pkg-builders/client/createSdNgPlugin.d.ts +2 -11
- package/dist/pkg-builders/client/createSdNgPlugin.js +16 -25
- package/dist/pkg-builders/client/createSdNgPlugin.js.map +1 -1
- package/dist/pkg-builders/lib/SdCliDbContextFileGenerator.d.ts +1 -1
- package/dist/pkg-builders/lib/SdCliDbContextFileGenerator.js +4 -3
- package/dist/pkg-builders/lib/SdCliDbContextFileGenerator.js.map +1 -1
- package/dist/pkg-builders/lib/SdCliIndexFileGenerator.d.ts +1 -1
- package/dist/pkg-builders/lib/SdCliIndexFileGenerator.js +5 -4
- package/dist/pkg-builders/lib/SdCliIndexFileGenerator.js.map +1 -1
- package/dist/pkg-builders/lib/SdJsLibBuildRunner.d.ts +1 -1
- package/dist/pkg-builders/lib/SdJsLibBuildRunner.js +5 -5
- package/dist/pkg-builders/lib/SdJsLibBuildRunner.js.map +1 -1
- package/dist/pkg-builders/lib/SdTsLibBuildRunner.d.ts +1 -1
- package/dist/pkg-builders/lib/SdTsLibBuildRunner.js +6 -6
- package/dist/pkg-builders/lib/SdTsLibBuildRunner.js.map +1 -1
- package/dist/pkg-builders/lib/SdTsLibBuilder.d.ts +3 -3
- package/dist/pkg-builders/lib/SdTsLibBuilder.js +6 -15
- package/dist/pkg-builders/lib/SdTsLibBuilder.js.map +1 -1
- package/dist/pkg-builders/server/SdServerBuildRunner.d.ts +1 -1
- package/dist/pkg-builders/server/SdServerBuildRunner.js +25 -42
- package/dist/pkg-builders/server/SdServerBuildRunner.js.map +1 -1
- package/dist/pkg-builders/server/SdServerBundler.d.ts +4 -10
- package/dist/pkg-builders/server/SdServerBundler.js +15 -22
- package/dist/pkg-builders/server/SdServerBundler.js.map +1 -1
- package/dist/pkg-builders/server/createSdServerPlugin.d.ts +2 -11
- package/dist/pkg-builders/server/createSdServerPlugin.js +10 -19
- package/dist/pkg-builders/server/createSdServerPlugin.js.map +1 -1
- package/dist/sd-cli-entry.js +1 -1
- package/dist/sd-cli-entry.js.map +1 -1
- package/dist/ts-compiler/ScopePathSet.js.map +1 -0
- package/dist/ts-compiler/SdDepAnalyzer.d.ts +1 -1
- package/dist/ts-compiler/SdStyleBundler.d.ts +8 -5
- package/dist/ts-compiler/SdStyleBundler.js +30 -15
- package/dist/ts-compiler/SdStyleBundler.js.map +1 -1
- package/dist/ts-compiler/SdTsCompiler.d.ts +2 -1
- package/dist/ts-compiler/SdTsCompiler.js +73 -53
- package/dist/ts-compiler/SdTsCompiler.js.map +1 -1
- package/dist/types/build/ISdTsCompilerOptions.d.ts +6 -9
- package/dist/types/worker/ISdBuildRunnerWorkerType.d.ts +4 -7
- package/dist/workers/build-runner.worker.js +4 -5
- package/dist/workers/build-runner.worker.js.map +1 -1
- package/package.json +5 -5
- package/src/entry/SdCliLocalUpdate.ts +12 -12
- package/src/entry/SdCliProject.ts +3 -3
- package/src/pkg-builders/SdBuildRunnerBase.ts +36 -0
- package/src/pkg-builders/SdProjectBuildRunner.ts +26 -17
- package/src/pkg-builders/client/SdCliNgRoutesFileGenerator.ts +5 -4
- package/src/pkg-builders/client/SdClientBuildRunner.ts +28 -46
- package/src/pkg-builders/client/SdNgBundler.ts +69 -73
- package/src/pkg-builders/client/createSdNgPlugin.ts +21 -35
- package/src/pkg-builders/lib/SdCliDbContextFileGenerator.ts +4 -3
- package/src/pkg-builders/lib/SdCliIndexFileGenerator.ts +5 -4
- package/src/pkg-builders/lib/SdJsLibBuildRunner.ts +5 -5
- package/src/pkg-builders/lib/SdTsLibBuildRunner.ts +12 -13
- package/src/pkg-builders/lib/SdTsLibBuilder.ts +7 -23
- package/src/pkg-builders/server/SdServerBuildRunner.ts +32 -50
- package/src/pkg-builders/server/SdServerBundler.ts +16 -32
- package/src/pkg-builders/server/createSdServerPlugin.ts +15 -29
- package/src/sd-cli-entry.ts +1 -1
- package/src/ts-compiler/SdDepAnalyzer.ts +1 -1
- package/src/ts-compiler/SdStyleBundler.ts +34 -15
- package/src/ts-compiler/SdTsCompiler.ts +80 -63
- package/src/types/build/ISdTsCompilerOptions.ts +6 -9
- package/src/types/worker/ISdBuildRunnerWorkerType.ts +4 -9
- package/src/workers/build-runner.worker.ts +7 -16
- package/dist/fix/convert-extends-sd-modal-base-to-interface.d.ts +0 -1
- package/dist/fix/convert-extends-sd-modal-base-to-interface.js +0 -289
- package/dist/fix/convert-extends-sd-modal-base-to-interface.js.map +0 -1
- package/dist/fix/convert-extends-sd-print-template-base-to-interface.d.ts +0 -1
- package/dist/fix/convert-extends-sd-print-template-base-to-interface.js +0 -179
- package/dist/fix/convert-extends-sd-print-template-base-to-interface.js.map +0 -1
- package/dist/fix/convert-flat-pages-to-flat-menus.d.ts +0 -1
- package/dist/fix/convert-flat-pages-to-flat-menus.js +0 -68
- package/dist/fix/convert-flat-pages-to-flat-menus.js.map +0 -1
- package/dist/fix/convert-get-menus-to-usable-menus.d.ts +0 -1
- package/dist/fix/convert-get-menus-to-usable-menus.js +0 -48
- package/dist/fix/convert-get-menus-to-usable-menus.js.map +0 -1
- package/dist/fix/convert-modal-show-params.d.ts +0 -1
- package/dist/fix/convert-modal-show-params.js +0 -29
- package/dist/fix/convert-modal-show-params.js.map +0 -1
- package/dist/fix/convert-print-params.d.ts +0 -1
- package/dist/fix/convert-print-params.js +0 -37
- package/dist/fix/convert-print-params.js.map +0 -1
- package/dist/fix/convert-sd-icon-to-fa-icon.d.ts +0 -1
- package/dist/fix/convert-sd-icon-to-fa-icon.js +0 -80
- package/dist/fix/convert-sd-icon-to-fa-icon.js.map +0 -1
- package/dist/fix/convert-sd-sheet-bindings-safety.d.ts +0 -1
- package/dist/fix/convert-sd-sheet-bindings-safety.js +0 -57
- package/dist/fix/convert-sd-sheet-bindings-safety.js.map +0 -1
- package/dist/fix/convert-select-modal-button-to-select-button.d.ts +0 -1
- package/dist/fix/convert-select-modal-button-to-select-button.js +0 -64
- package/dist/fix/convert-select-modal-button-to-select-button.js.map +0 -1
- package/dist/fix/convert-setup-cumulate-selected-keys-to-object-param.d.ts +0 -1
- package/dist/fix/convert-setup-cumulate-selected-keys-to-object-param.js +0 -38
- package/dist/fix/convert-setup-cumulate-selected-keys-to-object-param.js.map +0 -1
- package/dist/fix/convert-to-use-perms-signal.d.ts +0 -1
- package/dist/fix/convert-to-use-perms-signal.js +0 -99
- package/dist/fix/convert-to-use-perms-signal.js.map +0 -1
- package/dist/fix/core/remove-named-import.d.ts +0 -1
- package/dist/fix/core/remove-named-import.js +0 -14
- package/dist/fix/core/remove-named-import.js.map +0 -1
- package/dist/pkg-builders/commons/ScopePathSet.js.map +0 -1
- package/dist/pkg-builders/commons/SdBuildRunnerBase.d.ts +0 -20
- package/dist/pkg-builders/commons/SdBuildRunnerBase.js +0 -30
- package/dist/pkg-builders/commons/SdBuildRunnerBase.js.map +0 -1
- package/src/fix/convert-extends-sd-modal-base-to-interface.ts +0 -324
- package/src/fix/convert-extends-sd-print-template-base-to-interface.ts +0 -201
- package/src/fix/convert-flat-pages-to-flat-menus.ts +0 -83
- package/src/fix/convert-get-menus-to-usable-menus.ts +0 -60
- package/src/fix/convert-modal-show-params.ts +0 -37
- package/src/fix/convert-print-params.ts +0 -51
- package/src/fix/convert-sd-icon-to-fa-icon.ts +0 -95
- package/src/fix/convert-sd-sheet-bindings-safety.ts +0 -73
- package/src/fix/convert-select-modal-button-to-select-button.ts +0 -91
- package/src/fix/convert-setup-cumulate-selected-keys-to-object-param.ts +0 -44
- package/src/fix/convert-to-use-perms-signal.ts +0 -133
- package/src/fix/core/remove-named-import.ts +0 -14
- package/src/pkg-builders/commons/SdBuildRunnerBase.ts +0 -47
- /package/dist/{pkg-builders/commons → ts-compiler}/ScopePathSet.d.ts +0 -0
- /package/dist/{pkg-builders/commons → ts-compiler}/ScopePathSet.js +0 -0
- /package/src/{pkg-builders/commons → ts-compiler}/ScopePathSet.ts +0 -0
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { FsUtils, PathUtils, SdLogger } from "@simplysm/sd-core-node";
|
|
2
2
|
import path from "path";
|
|
3
3
|
import { ESLint } from "eslint";
|
|
4
|
-
import { SdBuildRunnerBase } from "../
|
|
4
|
+
import { SdBuildRunnerBase } from "../SdBuildRunnerBase";
|
|
5
5
|
import { SdCliConvertMessageUtils } from "../../utils/SdCliConvertMessageUtils";
|
|
6
6
|
export class SdJsLibBuildRunner extends SdBuildRunnerBase {
|
|
7
7
|
constructor() {
|
|
@@ -9,7 +9,7 @@ export class SdJsLibBuildRunner extends SdBuildRunnerBase {
|
|
|
9
9
|
this._logger = SdLogger.get(["simplysm", "sd-cli", "SdJsLibBuildRunner"]);
|
|
10
10
|
}
|
|
11
11
|
async _runAsync(modifiedFileSet) {
|
|
12
|
-
if (this.
|
|
12
|
+
if (this._opt.watch?.emitOnly) {
|
|
13
13
|
return {
|
|
14
14
|
buildMessages: [],
|
|
15
15
|
watchFileSet: new Set(),
|
|
@@ -18,7 +18,7 @@ export class SdJsLibBuildRunner extends SdBuildRunnerBase {
|
|
|
18
18
|
};
|
|
19
19
|
}
|
|
20
20
|
const filePathSet = modifiedFileSet ??
|
|
21
|
-
new Set(FsUtils.glob(path.resolve(this.
|
|
21
|
+
new Set(FsUtils.glob(path.resolve(this._opt.pkgPath, "src/**/*.js")).map((item) => PathUtils.norm(item)));
|
|
22
22
|
this._debug("LINT...");
|
|
23
23
|
const lintResults = await this.#lintAsync(filePathSet);
|
|
24
24
|
const messages = SdCliConvertMessageUtils.convertToBuildMessagesFromEslint(lintResults);
|
|
@@ -32,13 +32,13 @@ export class SdJsLibBuildRunner extends SdBuildRunnerBase {
|
|
|
32
32
|
}
|
|
33
33
|
async #lintAsync(fileSet) {
|
|
34
34
|
const lintFilePaths = Array.from(fileSet)
|
|
35
|
-
.filter((item) => PathUtils.isChildPath(item, path.resolve(this.
|
|
35
|
+
.filter((item) => PathUtils.isChildPath(item, path.resolve(this._opt.pkgPath, "src")))
|
|
36
36
|
.filter((item) => item.endsWith(".js"))
|
|
37
37
|
.filter((item) => FsUtils.exists(item));
|
|
38
38
|
if (lintFilePaths.length === 0) {
|
|
39
39
|
return [];
|
|
40
40
|
}
|
|
41
|
-
const linter = new ESLint({ cwd: this.
|
|
41
|
+
const linter = new ESLint({ cwd: this._opt.pkgPath, cache: false });
|
|
42
42
|
return await linter.lintFiles(lintFilePaths);
|
|
43
43
|
}
|
|
44
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SdJsLibBuildRunner.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/SdJsLibBuildRunner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAa,MAAM,wBAAwB,CAAC;AACjF,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"SdJsLibBuildRunner.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/SdJsLibBuildRunner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAa,MAAM,wBAAwB,CAAC;AACjF,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAEhF,MAAM,OAAO,kBAAmB,SAAQ,iBAA4B;IAApE;;QACqB,YAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAC,CAAC;IAkD1F,CAAC;IAhDoB,KAAK,CAAC,SAAS,CAAC,eAAgC;QACjE,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC;YAC9B,OAAO;gBACL,aAAa,EAAE,EAAE;gBAEjB,YAAY,EAAE,IAAI,GAAG,EAAE;gBACvB,eAAe,EAAE,IAAI,GAAG,EAAE;gBAC1B,WAAW,EAAE,IAAI,GAAG,EAAE;aACvB,CAAC;QACJ,CAAC;QAED,MAAM,WAAW,GACf,eAAe;YACf,IAAI,GAAG,CACL,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACxE,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CACrB,CACF,CAAC;QAEJ,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAEvB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QACvD,MAAM,QAAQ,GAAG,wBAAwB,CAAC,gCAAgC,CAAC,WAAW,CAAC,CAAC;QAExF,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAEvB,OAAO;YACL,aAAa,EAAE,QAAQ;YAEvB,YAAY,EAAE,WAAW;YACzB,eAAe,EAAE,WAAW;YAC5B,WAAW,EAAE,IAAI,GAAG,EAAE;SACvB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,OAAoB;QACnC,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;aACtC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;aACrF,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;aACtC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAE1C,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QACpE,OAAO,MAAM,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IAC/C,CAAC;CACF"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { SdLogger, TNormPath } from "@simplysm/sd-core-node";
|
|
2
|
-
import { SdBuildRunnerBase } from "../
|
|
2
|
+
import { SdBuildRunnerBase } from "../SdBuildRunnerBase";
|
|
3
3
|
import { ISdBuildResult } from "../../types/build/ISdBuildResult";
|
|
4
4
|
export declare class SdTsLibBuildRunner extends SdBuildRunnerBase<"library"> {
|
|
5
5
|
#private;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { SdBuildRunnerBase } from "../
|
|
1
|
+
import { SdLogger } from "@simplysm/sd-core-node";
|
|
2
|
+
import { SdBuildRunnerBase } from "../SdBuildRunnerBase";
|
|
3
3
|
import { SdTsLibBuilder } from "./SdTsLibBuilder";
|
|
4
4
|
import { SdCliIndexFileGenerator } from "./SdCliIndexFileGenerator";
|
|
5
5
|
import { SdCliDbContextFileGenerator } from "./SdCliDbContextFileGenerator";
|
|
@@ -12,20 +12,20 @@ export class SdTsLibBuildRunner extends SdBuildRunnerBase {
|
|
|
12
12
|
async _runAsync(modifiedFileSet) {
|
|
13
13
|
// 최초한번
|
|
14
14
|
if (!modifiedFileSet) {
|
|
15
|
-
if (!this.
|
|
15
|
+
if (!this._opt.watch?.noEmit) {
|
|
16
16
|
// index
|
|
17
17
|
if (!this._pkgConf.noGenIndex) {
|
|
18
18
|
this._debug("GEN index.ts...");
|
|
19
|
-
new SdCliIndexFileGenerator().
|
|
19
|
+
await new SdCliIndexFileGenerator().watchAsync(this._opt.pkgPath, this._pkgConf.polyfills);
|
|
20
20
|
}
|
|
21
21
|
// db-context
|
|
22
22
|
if (this._pkgConf.dbContext != null) {
|
|
23
23
|
this._debug(`GEN ${this._pkgConf.dbContext}.ts...`);
|
|
24
|
-
new SdCliDbContextFileGenerator().
|
|
24
|
+
await new SdCliDbContextFileGenerator().watchAsync(this._opt.pkgPath, this._pkgConf.dbContext);
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
27
|
this._debug(`BUILD 준비...`);
|
|
28
|
-
this.#builder = new SdTsLibBuilder(
|
|
28
|
+
this.#builder = new SdTsLibBuilder(this._opt);
|
|
29
29
|
}
|
|
30
30
|
this._debug(`BUILD...`);
|
|
31
31
|
const buildResult = await this.#builder.buildAsync(modifiedFileSet);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SdTsLibBuildRunner.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/SdTsLibBuildRunner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"SdTsLibBuildRunner.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/SdTsLibBuildRunner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAE5E,MAAM,OAAO,kBAAmB,SAAQ,iBAA4B;IAApE;;QACqB,YAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAC,CAAC;IAqC1F,CAAC;IAnCC,QAAQ,CAAkB;IAEP,KAAK,CAAC,SAAS,CAAC,eAAgC;QACjE,OAAO;QACP,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC;gBAC7B,QAAQ;gBACR,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;oBAC9B,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;oBAC/B,MAAM,IAAI,uBAAuB,EAAE,CAAC,UAAU,CAC5C,IAAI,CAAC,IAAI,CAAC,OAAO,EACjB,IAAI,CAAC,QAAQ,CAAC,SAAS,CACxB,CAAC;gBACJ,CAAC;gBAED,aAAa;gBACb,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;oBACpC,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,QAAQ,CAAC,CAAC;oBACpD,MAAM,IAAI,2BAA2B,EAAE,CAAC,UAAU,CAChD,IAAI,CAAC,IAAI,CAAC,OAAO,EACjB,IAAI,CAAC,QAAQ,CAAC,SAAS,CACxB,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;YAC3B,IAAI,CAAC,QAAQ,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChD,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACxB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,QAAS,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QAErE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACrB,OAAO,WAAW,CAAC;IACrB,CAAC;CACF"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { TNormPath } from "@simplysm/sd-core-node";
|
|
2
|
-
import { ScopePathSet } from "../commons/ScopePathSet";
|
|
3
2
|
import { ISdBuildResult } from "../../types/build/ISdBuildResult";
|
|
3
|
+
import { ISdTsCompilerOptions } from "../../types/build/ISdTsCompilerOptions";
|
|
4
4
|
export declare class SdTsLibBuilder {
|
|
5
5
|
#private;
|
|
6
|
-
private readonly
|
|
7
|
-
constructor(
|
|
6
|
+
private readonly _opt;
|
|
7
|
+
constructor(_opt: ISdTsCompilerOptions);
|
|
8
8
|
buildAsync(modifiedFileSet?: Set<TNormPath>): Promise<ISdBuildResult>;
|
|
9
9
|
}
|
|
@@ -5,18 +5,9 @@ import { SdTsCompiler } from "../../ts-compiler/SdTsCompiler";
|
|
|
5
5
|
export class SdTsLibBuilder {
|
|
6
6
|
#tsCompiler;
|
|
7
7
|
#outputHashCache = new Map();
|
|
8
|
-
constructor(
|
|
9
|
-
this.
|
|
10
|
-
this.#tsCompiler = new SdTsCompiler(
|
|
11
|
-
pkgPath: this._pkgPath,
|
|
12
|
-
additionalOptions: { declaration: true },
|
|
13
|
-
isWatchMode: watch,
|
|
14
|
-
isDevMode: dev,
|
|
15
|
-
isEmitOnly: emitOnly,
|
|
16
|
-
isNoEmit: noEmit,
|
|
17
|
-
isForBundle: false,
|
|
18
|
-
scopePathSet,
|
|
19
|
-
});
|
|
8
|
+
constructor(_opt) {
|
|
9
|
+
this._opt = _opt;
|
|
10
|
+
this.#tsCompiler = new SdTsCompiler(_opt, false);
|
|
20
11
|
}
|
|
21
12
|
async buildAsync(modifiedFileSet) {
|
|
22
13
|
const tsCompileResult = await this.#tsCompiler.compileAsync(modifiedFileSet ?? new Set());
|
|
@@ -40,8 +31,8 @@ export class SdTsLibBuilder {
|
|
|
40
31
|
const globalStylesheetBundlingResult = tsCompileResult.stylesheetBundlingResultMap.get(emitFile);
|
|
41
32
|
if (globalStylesheetBundlingResult && "outputFiles" in globalStylesheetBundlingResult) {
|
|
42
33
|
for (const outputFile of globalStylesheetBundlingResult.outputFiles) {
|
|
43
|
-
const distPath = PathUtils.norm(this.
|
|
44
|
-
if (PathUtils.isChildPath(distPath, path.resolve(this.
|
|
34
|
+
const distPath = PathUtils.norm(this._opt.pkgPath, "dist", path.relative(this._opt.pkgPath, outputFile.path));
|
|
35
|
+
if (PathUtils.isChildPath(distPath, path.resolve(this._opt.pkgPath, "dist"))) {
|
|
45
36
|
const prevHash = this.#outputHashCache.get(distPath);
|
|
46
37
|
const currHash = HashUtils.get(Buffer.from(outputFile.text));
|
|
47
38
|
if (prevHash !== currHash) {
|
|
@@ -53,7 +44,7 @@ export class SdTsLibBuilder {
|
|
|
53
44
|
}
|
|
54
45
|
}
|
|
55
46
|
}
|
|
56
|
-
const styleResults = Array.from(tsCompileResult.stylesheetBundlingResultMap.values()).mapMany((item) => SdCliConvertMessageUtils.convertToBuildMessagesFromEsbuild(item, this.
|
|
47
|
+
const styleResults = Array.from(tsCompileResult.stylesheetBundlingResultMap.values()).mapMany((item) => SdCliConvertMessageUtils.convertToBuildMessagesFromEsbuild(item, this._opt.pkgPath));
|
|
57
48
|
return {
|
|
58
49
|
buildMessages: [...tsCompileResult.messages, ...styleResults],
|
|
59
50
|
watchFileSet: tsCompileResult.watchFileSet,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SdTsLibBuilder.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/SdTsLibBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAa,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAI9D,MAAM,OAAO,cAAc;IACzB,WAAW,CAAe;IAC1B,gBAAgB,GAAG,IAAI,GAAG,EAAqB,CAAC;IAEhD,
|
|
1
|
+
{"version":3,"file":"SdTsLibBuilder.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/SdTsLibBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { SdLogger, TNormPath } from "@simplysm/sd-core-node";
|
|
2
|
-
import { SdBuildRunnerBase } from "../
|
|
2
|
+
import { SdBuildRunnerBase } from "../SdBuildRunnerBase";
|
|
3
3
|
import { ISdBuildResult } from "../../types/build/ISdBuildResult";
|
|
4
4
|
export declare class SdServerBuildRunner extends SdBuildRunnerBase<"server"> {
|
|
5
5
|
#private;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { FsUtils, SdLogger } from "@simplysm/sd-core-node";
|
|
2
2
|
import path from "path";
|
|
3
3
|
import { javascript, StringUtils } from "@simplysm/sd-core-common";
|
|
4
|
-
import { SdBuildRunnerBase } from "../
|
|
4
|
+
import { SdBuildRunnerBase } from "../SdBuildRunnerBase";
|
|
5
5
|
import { SdServerBundler } from "./SdServerBundler";
|
|
6
6
|
export class SdServerBuildRunner extends SdBuildRunnerBase {
|
|
7
7
|
constructor() {
|
|
@@ -9,36 +9,21 @@ export class SdServerBuildRunner extends SdBuildRunnerBase {
|
|
|
9
9
|
this._logger = SdLogger.get(["simplysm", "sd-cli", "SdServerBuild2Runner"]);
|
|
10
10
|
}
|
|
11
11
|
#serverBundler;
|
|
12
|
-
#extModules;
|
|
13
12
|
async _runAsync(modifiedFileSet) {
|
|
14
|
-
// prod일때 각종 파일들 생성
|
|
15
|
-
if (!this._dev) {
|
|
16
|
-
await this.#generateProductionFilesAsync();
|
|
17
|
-
}
|
|
18
13
|
// 최초
|
|
19
14
|
if (!modifiedFileSet) {
|
|
20
|
-
|
|
15
|
+
const externalModules = this.#getExternalModules();
|
|
16
|
+
if (!this._opt.watch?.dev) {
|
|
17
|
+
this.#generateProductionFiles(externalModules.filter((item) => item.exists).map((item) => item.name));
|
|
18
|
+
}
|
|
19
|
+
if (!this._opt.watch?.noEmit) {
|
|
21
20
|
this._debug("GEN .config...");
|
|
22
|
-
const confDistPath = path.resolve(this.
|
|
21
|
+
const confDistPath = path.resolve(this._opt.pkgPath, "dist/.config.json");
|
|
23
22
|
FsUtils.writeFile(confDistPath, JSON.stringify(this._pkgConf.configs ?? {}, undefined, 2));
|
|
24
23
|
}
|
|
25
24
|
this._debug(`BUILD 준비...`);
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
this.#serverBundler = new SdServerBundler({
|
|
29
|
-
watch: this._watch,
|
|
30
|
-
dev: this._dev,
|
|
31
|
-
emitOnly: this._emitOnly ?? false,
|
|
32
|
-
noEmit: this._noEmit ?? false,
|
|
33
|
-
pkgPath: this._pkgPath,
|
|
34
|
-
entryPoints: tsConfig.files
|
|
35
|
-
? tsConfig.files.map((item) => path.resolve(this._pkgPath, item))
|
|
36
|
-
: [
|
|
37
|
-
path.resolve(this._pkgPath, "src/main.ts"),
|
|
38
|
-
...FsUtils.glob(path.resolve(this._pkgPath, "src/workers/*.ts")),
|
|
39
|
-
],
|
|
40
|
-
external: this.#extModules.map((item) => item.name),
|
|
41
|
-
scopePathSet: this._scopePathSet,
|
|
25
|
+
this.#serverBundler = new SdServerBundler(this._opt, {
|
|
26
|
+
external: externalModules.map((item) => item.name),
|
|
42
27
|
});
|
|
43
28
|
}
|
|
44
29
|
this._debug(`BUILD...`);
|
|
@@ -46,34 +31,32 @@ export class SdServerBuildRunner extends SdBuildRunnerBase {
|
|
|
46
31
|
this._debug(`빌드 완료`);
|
|
47
32
|
return bundleResult;
|
|
48
33
|
}
|
|
49
|
-
|
|
50
|
-
const npmConf = FsUtils.readJson(path.resolve(this.
|
|
34
|
+
#generateProductionFiles(externals) {
|
|
35
|
+
const npmConf = FsUtils.readJson(path.resolve(this._opt.pkgPath, "package.json"));
|
|
51
36
|
this._debug("GEN package.json...");
|
|
52
37
|
{
|
|
53
38
|
const projNpmConf = FsUtils.readJson(path.resolve(process.cwd(), "package.json"));
|
|
54
|
-
const extModules = await this.#getExternalModulesAsync();
|
|
55
|
-
const deps = extModules.filter((item) => item.exists).map((item) => item.name);
|
|
56
39
|
const distNpmConfig = {
|
|
57
40
|
name: npmConf.name,
|
|
58
41
|
version: npmConf.version,
|
|
59
42
|
type: npmConf.type,
|
|
60
43
|
};
|
|
61
44
|
distNpmConfig.dependencies = {};
|
|
62
|
-
for (const
|
|
63
|
-
distNpmConfig.dependencies[
|
|
45
|
+
for (const external of externals) {
|
|
46
|
+
distNpmConfig.dependencies[external] = "*";
|
|
64
47
|
}
|
|
65
48
|
distNpmConfig.volta = projNpmConf.volta;
|
|
66
|
-
FsUtils.writeJson(path.resolve(this.
|
|
49
|
+
FsUtils.writeJson(path.resolve(this._opt.pkgPath, "dist/package.json"), distNpmConfig, {
|
|
67
50
|
space: 2,
|
|
68
51
|
});
|
|
69
52
|
}
|
|
70
53
|
this._debug("GEN .yarnrc.yml...");
|
|
71
54
|
{
|
|
72
|
-
FsUtils.writeFile(path.resolve(this.
|
|
55
|
+
FsUtils.writeFile(path.resolve(this._opt.pkgPath, "dist/.yarnrc.yml"), "nodeLinker: node-modules");
|
|
73
56
|
}
|
|
74
57
|
this._debug("GEN openssl.cnf...");
|
|
75
58
|
{
|
|
76
|
-
FsUtils.writeFile(path.resolve(this.
|
|
59
|
+
FsUtils.writeFile(path.resolve(this._opt.pkgPath, "dist/openssl.cnf"), `
|
|
77
60
|
nodejs_conf = openssl_init
|
|
78
61
|
|
|
79
62
|
[openssl_init]
|
|
@@ -131,11 +114,11 @@ Options = UnsafeLegacyRenegotiation`.trim());
|
|
|
131
114
|
};`
|
|
132
115
|
.replaceAll("\n ", "\n")
|
|
133
116
|
.trim();
|
|
134
|
-
FsUtils.writeFile(path.resolve(this.
|
|
117
|
+
FsUtils.writeFile(path.resolve(this._opt.pkgPath, "dist/pm2.config.cjs"), str);
|
|
135
118
|
}
|
|
136
119
|
if (this._pkgConf.iis) {
|
|
137
120
|
this._debug("GEN web.config...");
|
|
138
|
-
const iisDistPath = path.resolve(this.
|
|
121
|
+
const iisDistPath = path.resolve(this._opt.pkgPath, "dist/web.config");
|
|
139
122
|
const nodeVersion = process.versions.node.substring(1);
|
|
140
123
|
const serverExeFilePath = this._pkgConf.iis.nodeExeFilePath ??
|
|
141
124
|
`%HOMEDRIVE%%HOMEPATH%\\AppData\\Local\\Volta\\tools\\image\\node\\${nodeVersion}\\node.exe`;
|
|
@@ -169,11 +152,11 @@ Options = UnsafeLegacyRenegotiation`.trim());
|
|
|
169
152
|
</configuration>`.trim());
|
|
170
153
|
}
|
|
171
154
|
}
|
|
172
|
-
|
|
155
|
+
#getExternalModules() {
|
|
173
156
|
const loadedModuleNames = [];
|
|
174
157
|
const results = [];
|
|
175
158
|
const npmConfigMap = new Map();
|
|
176
|
-
const fn =
|
|
159
|
+
const fn = (currPath) => {
|
|
177
160
|
const npmConfig = npmConfigMap.getOrCreate(currPath, FsUtils.readJson(path.resolve(currPath, "package.json")));
|
|
178
161
|
const deps = {
|
|
179
162
|
defaults: [
|
|
@@ -189,7 +172,7 @@ Options = UnsafeLegacyRenegotiation`.trim());
|
|
|
189
172
|
if (loadedModuleNames.includes(moduleName))
|
|
190
173
|
continue;
|
|
191
174
|
loadedModuleNames.push(moduleName);
|
|
192
|
-
const modulePath = FsUtils.findAllParentChildPaths("node_modules/" + moduleName, currPath, path.resolve(this.
|
|
175
|
+
const modulePath = FsUtils.findAllParentChildPaths("node_modules/" + moduleName, currPath, path.resolve(this._opt.pkgPath, "../../")).first();
|
|
193
176
|
if (StringUtils.isNullOrEmpty(modulePath)) {
|
|
194
177
|
continue;
|
|
195
178
|
}
|
|
@@ -205,13 +188,13 @@ Options = UnsafeLegacyRenegotiation`.trim());
|
|
|
205
188
|
exists: true,
|
|
206
189
|
});
|
|
207
190
|
}
|
|
208
|
-
|
|
191
|
+
fn(modulePath);
|
|
209
192
|
}
|
|
210
193
|
for (const optModuleName of deps.optionals) {
|
|
211
194
|
if (loadedModuleNames.includes(optModuleName))
|
|
212
195
|
continue;
|
|
213
196
|
loadedModuleNames.push(optModuleName);
|
|
214
|
-
const optModulePath = FsUtils.findAllParentChildPaths("node_modules/" + optModuleName, currPath, path.resolve(this.
|
|
197
|
+
const optModulePath = FsUtils.findAllParentChildPaths("node_modules/" + optModuleName, currPath, path.resolve(this._opt.pkgPath, "../../")).first();
|
|
215
198
|
if (StringUtils.isNullOrEmpty(optModulePath)) {
|
|
216
199
|
results.push({
|
|
217
200
|
name: optModuleName,
|
|
@@ -231,10 +214,10 @@ Options = UnsafeLegacyRenegotiation`.trim());
|
|
|
231
214
|
exists: true,
|
|
232
215
|
});
|
|
233
216
|
}
|
|
234
|
-
|
|
217
|
+
fn(optModulePath);
|
|
235
218
|
}
|
|
236
219
|
};
|
|
237
|
-
|
|
220
|
+
fn(this._opt.pkgPath);
|
|
238
221
|
for (const external of this._pkgConf.externals ?? []) {
|
|
239
222
|
if (!results.some((item) => item.name === external)) {
|
|
240
223
|
results.push({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SdServerBuildRunner.js","sourceRoot":"","sources":["../../../src/pkg-builders/server/SdServerBuildRunner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAa,MAAM,wBAAwB,CAAC;AACtE,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"SdServerBuildRunner.js","sourceRoot":"","sources":["../../../src/pkg-builders/server/SdServerBuildRunner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,12 @@
|
|
|
1
1
|
import { TNormPath } from "@simplysm/sd-core-node";
|
|
2
|
-
import { ScopePathSet } from "../commons/ScopePathSet";
|
|
3
2
|
import { ISdBuildResult } from "../../types/build/ISdBuildResult";
|
|
3
|
+
import { ISdTsCompilerOptions } from "../../types/build/ISdTsCompilerOptions";
|
|
4
4
|
export declare class SdServerBundler {
|
|
5
5
|
#private;
|
|
6
6
|
private readonly _opt;
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
emitOnly: boolean;
|
|
11
|
-
noEmit: boolean;
|
|
12
|
-
pkgPath: TNormPath;
|
|
13
|
-
entryPoints: string[];
|
|
14
|
-
external?: string[];
|
|
15
|
-
scopePathSet: ScopePathSet;
|
|
7
|
+
private readonly _conf;
|
|
8
|
+
constructor(_opt: ISdTsCompilerOptions, _conf: {
|
|
9
|
+
external: string[];
|
|
16
10
|
});
|
|
17
11
|
bundleAsync(modifiedFileSet?: Set<TNormPath>): Promise<ISdBuildResult>;
|
|
18
12
|
}
|
|
@@ -12,8 +12,9 @@ export class SdServerBundler {
|
|
|
12
12
|
#modifiedFileSet = new Set();
|
|
13
13
|
#resultCache = {};
|
|
14
14
|
#outputHashCache = new Map();
|
|
15
|
-
constructor(_opt) {
|
|
15
|
+
constructor(_opt, _conf) {
|
|
16
16
|
this._opt = _opt;
|
|
17
|
+
this._conf = _conf;
|
|
17
18
|
}
|
|
18
19
|
async bundleAsync(modifiedFileSet) {
|
|
19
20
|
this.#modifiedFileSet.clear();
|
|
@@ -22,20 +23,23 @@ export class SdServerBundler {
|
|
|
22
23
|
}
|
|
23
24
|
if (!this.#context) {
|
|
24
25
|
this.#context = await esbuild.context({
|
|
25
|
-
entryPoints:
|
|
26
|
+
entryPoints: [
|
|
27
|
+
path.resolve(this._opt.pkgPath, "src/main.ts"),
|
|
28
|
+
...FsUtils.glob(path.resolve(this._opt.pkgPath, "src/workers/*.ts")),
|
|
29
|
+
],
|
|
26
30
|
keepNames: true,
|
|
27
31
|
bundle: true,
|
|
28
|
-
sourcemap: this._opt.dev,
|
|
32
|
+
sourcemap: !!this._opt.watch?.dev,
|
|
29
33
|
target: "node18",
|
|
30
34
|
mainFields: ["es2020", "es2015", "module", "main"],
|
|
31
35
|
conditions: ["es2020", "es2015", "module"],
|
|
32
36
|
tsconfig: path.resolve(this._opt.pkgPath, "tsconfig.json"),
|
|
33
37
|
write: false,
|
|
34
38
|
metafile: true,
|
|
35
|
-
legalComments: this._opt.dev ? "eof" : "none",
|
|
36
|
-
minifyIdentifiers: !this._opt.dev,
|
|
37
|
-
minifySyntax: !this._opt.dev,
|
|
38
|
-
minifyWhitespace: !this._opt.dev,
|
|
39
|
+
legalComments: this._opt.watch?.dev ? "eof" : "none",
|
|
40
|
+
minifyIdentifiers: !this._opt.watch?.dev,
|
|
41
|
+
minifySyntax: !this._opt.watch?.dev,
|
|
42
|
+
minifyWhitespace: !this._opt.watch?.dev,
|
|
39
43
|
outdir: path.resolve(this._opt.pkgPath, "dist"),
|
|
40
44
|
format: "esm",
|
|
41
45
|
resolveExtensions: [".js", ".mjs", ".cjs", ".ts"],
|
|
@@ -69,7 +73,7 @@ export class SdServerBundler {
|
|
|
69
73
|
},
|
|
70
74
|
platform: "node",
|
|
71
75
|
logLevel: "silent",
|
|
72
|
-
external: this.
|
|
76
|
+
external: this._conf.external,
|
|
73
77
|
banner: {
|
|
74
78
|
js: `
|
|
75
79
|
import __path__ from 'path';
|
|
@@ -80,23 +84,12 @@ const require = __createRequire__(import.meta.url);
|
|
|
80
84
|
const __filename = __fileURLToPath__(import.meta.url);
|
|
81
85
|
const __dirname = __path__.dirname(__filename);`.trim(),
|
|
82
86
|
},
|
|
83
|
-
plugins: [
|
|
84
|
-
createSdServerPlugin({
|
|
85
|
-
modifiedFileSet: this.#modifiedFileSet,
|
|
86
|
-
watch: this._opt.watch,
|
|
87
|
-
dev: this._opt.dev,
|
|
88
|
-
emitOnly: this._opt.emitOnly,
|
|
89
|
-
noEmit: this._opt.noEmit,
|
|
90
|
-
pkgPath: this._opt.pkgPath,
|
|
91
|
-
result: this.#resultCache,
|
|
92
|
-
scopePathSet: this._opt.scopePathSet,
|
|
93
|
-
}),
|
|
94
|
-
],
|
|
87
|
+
plugins: [createSdServerPlugin(this._opt, this.#modifiedFileSet, this.#resultCache)],
|
|
95
88
|
});
|
|
96
89
|
}
|
|
97
90
|
let esbuildResult;
|
|
98
91
|
esbuildResult = await this.#context.rebuild();
|
|
99
|
-
if (this._opt.noEmit) {
|
|
92
|
+
if (this._opt.watch?.noEmit) {
|
|
100
93
|
return {
|
|
101
94
|
buildMessages: SdCliConvertMessageUtils.convertToBuildMessagesFromEsbuild(esbuildResult, this._opt.pkgPath),
|
|
102
95
|
watchFileSet: this.#resultCache.watchFileSet,
|
|
@@ -121,7 +114,7 @@ const __dirname = __path__.dirname(__filename);`.trim(),
|
|
|
121
114
|
//-- copy assets
|
|
122
115
|
const assetFiles = await resolveAssets([
|
|
123
116
|
{ input: "public", glob: "**/*", output: "." },
|
|
124
|
-
...(this._opt.dev ? [{ input: "public-dev", glob: "**/*", output: "." }] : []),
|
|
117
|
+
...(this._opt.watch?.dev ? [{ input: "public-dev", glob: "**/*", output: "." }] : []),
|
|
125
118
|
], this._opt.pkgPath);
|
|
126
119
|
for (const assetFile of assetFiles) {
|
|
127
120
|
const prevHash = this.#outputHashCache.get(PathUtils.norm(assetFile.source));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SdServerBundler.js","sourceRoot":"","sources":["../../../src/pkg-builders/server/SdServerBundler.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,sCAAsC,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAEL,mBAAmB,GACpB,MAAM,kDAAkD,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAKxE,MAAM,OAAO,eAAe;IAC1B,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,iBAAiB,CAAC,CAAC,CAAC;IAElE,QAAQ,CAAwB;IAEhC,gBAAgB,GAAG,IAAI,GAAG,EAAa,CAAC;IACxC,YAAY,GAAkC,EAAE,CAAC;IAEjD,gBAAgB,GAAG,IAAI,GAAG,EAAqB,CAAC;IAEhD,YACmB,
|
|
1
|
+
{"version":3,"file":"SdServerBundler.js","sourceRoot":"","sources":["../../../src/pkg-builders/server/SdServerBundler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,5 @@
|
|
|
1
1
|
import esbuild from "esbuild";
|
|
2
2
|
import { TNormPath } from "@simplysm/sd-core-node";
|
|
3
|
-
import { ScopePathSet } from "../commons/ScopePathSet";
|
|
4
3
|
import { ISdCliServerPluginResultCache } from "../../types/plugin/ISdCliServerPluginResultCache";
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
watch: boolean;
|
|
8
|
-
dev: boolean;
|
|
9
|
-
emitOnly: boolean;
|
|
10
|
-
noEmit: boolean;
|
|
11
|
-
modifiedFileSet: Set<TNormPath>;
|
|
12
|
-
result: ISdCliServerPluginResultCache;
|
|
13
|
-
scopePathSet: ScopePathSet;
|
|
14
|
-
}): esbuild.Plugin;
|
|
4
|
+
import { ISdTsCompilerOptions } from "../../types/build/ISdTsCompilerOptions";
|
|
5
|
+
export declare function createSdServerPlugin(conf: ISdTsCompilerOptions, modifiedFileSet: Set<TNormPath>, resultCache: ISdCliServerPluginResultCache): esbuild.Plugin;
|
|
@@ -1,25 +1,16 @@
|
|
|
1
1
|
import { SdCliConvertMessageUtils } from "../../utils/SdCliConvertMessageUtils";
|
|
2
2
|
import { PathUtils } from "@simplysm/sd-core-node";
|
|
3
3
|
import { SdTsCompiler } from "../../ts-compiler/SdTsCompiler";
|
|
4
|
-
export function createSdServerPlugin(conf) {
|
|
4
|
+
export function createSdServerPlugin(conf, modifiedFileSet, resultCache) {
|
|
5
5
|
return {
|
|
6
6
|
name: "sd-server-compile",
|
|
7
7
|
setup: (build) => {
|
|
8
|
-
const tsCompiler = new SdTsCompiler(
|
|
9
|
-
pkgPath: conf.pkgPath,
|
|
10
|
-
additionalOptions: { declaration: false },
|
|
11
|
-
isWatchMode: conf.watch,
|
|
12
|
-
isDevMode: conf.dev,
|
|
13
|
-
isNoEmit: conf.noEmit,
|
|
14
|
-
isEmitOnly: conf.emitOnly,
|
|
15
|
-
isForBundle: true,
|
|
16
|
-
scopePathSet: conf.scopePathSet,
|
|
17
|
-
});
|
|
8
|
+
const tsCompiler = new SdTsCompiler(conf, true);
|
|
18
9
|
let tsCompileResult;
|
|
19
10
|
build.onStart(async () => {
|
|
20
|
-
tsCompileResult = await tsCompiler.compileAsync(
|
|
21
|
-
|
|
22
|
-
|
|
11
|
+
tsCompileResult = await tsCompiler.compileAsync(modifiedFileSet);
|
|
12
|
+
resultCache.watchFileSet = tsCompileResult.watchFileSet;
|
|
13
|
+
resultCache.affectedFileSet = tsCompileResult.affectedFileSet;
|
|
23
14
|
//-- return err/warn
|
|
24
15
|
return SdCliConvertMessageUtils.convertToEsbuildFromBuildMessages(tsCompileResult.messages, conf.pkgPath);
|
|
25
16
|
});
|
|
@@ -39,7 +30,7 @@ export function createSdServerPlugin(conf) {
|
|
|
39
30
|
return { contents: emittedJsFile?.text, loader: "js" };
|
|
40
31
|
});
|
|
41
32
|
build.onLoad({ filter: /\.[cm]?js$/ }, (args) => {
|
|
42
|
-
|
|
33
|
+
resultCache.watchFileSet.add(PathUtils.norm(args.path));
|
|
43
34
|
return null;
|
|
44
35
|
});
|
|
45
36
|
build.onLoad({
|
|
@@ -49,13 +40,13 @@ export function createSdServerPlugin(conf) {
|
|
|
49
40
|
.join("|") +
|
|
50
41
|
")$"),
|
|
51
42
|
}, (args) => {
|
|
52
|
-
|
|
43
|
+
resultCache.watchFileSet.add(PathUtils.norm(args.path));
|
|
53
44
|
return null;
|
|
54
45
|
});
|
|
55
46
|
build.onEnd((result) => {
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
47
|
+
resultCache.outputFiles = result.outputFiles;
|
|
48
|
+
resultCache.metafile = result.metafile;
|
|
49
|
+
modifiedFileSet.clear();
|
|
59
50
|
});
|
|
60
51
|
},
|
|
61
52
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createSdServerPlugin.js","sourceRoot":"","sources":["../../../src/pkg-builders/server/createSdServerPlugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAE,SAAS,EAAa,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAK9D,MAAM,UAAU,oBAAoB,
|
|
1
|
+
{"version":3,"file":"createSdServerPlugin.js","sourceRoot":"","sources":["../../../src/pkg-builders/server/createSdServerPlugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAE,SAAS,EAAa,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAK9D,MAAM,UAAU,oBAAoB,CAClC,IAA0B,EAC1B,eAA+B,EAC/B,WAA0C;IAE1C,OAAO;QACL,IAAI,EAAE,mBAAmB;QACzB,KAAK,EAAE,CAAC,KAA0B,EAAE,EAAE;YACpC,MAAM,UAAU,GAAG,IAAI,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAEhD,IAAI,eAAoC,CAAC;YAEzC,KAAK,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE;gBACvB,eAAe,GAAG,MAAM,UAAU,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;gBAEjE,WAAW,CAAC,YAAY,GAAG,eAAe,CAAC,YAAY,CAAC;gBACxD,WAAW,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;qBACvD,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAC/B,EAAE,IAAI,EAAE,CAAC;gBACX;;;;;;;;mBAQG;gBAEH,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;YACzD,CAAC,CAAC,CAAC;YAEH,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC9C,WAAW,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;oBACD,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,CACP;aACF,EACD,CAAC,IAAI,EAAE,EAAE;gBACP,WAAW,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,WAAW,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;gBAC7C,WAAW,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;gBAEvC,eAAe,CAAC,KAAK,EAAE,CAAC;YAC1B,CAAC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC"}
|