@simplysm/sd-cli 12.7.5 → 12.7.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/entry/{SdAiCommand.d.ts → sd-cli-ai-command.d.ts} +1 -1
- package/dist/entry/{SdAiCommand.js → sd-cli-ai-command.js} +5 -5
- package/dist/entry/sd-cli-ai-command.js.map +1 -0
- package/dist/entry/{SdCliCordova.d.ts → sd-cli-cordova.d.ts} +1 -1
- package/dist/entry/{SdCliCordova.js → sd-cli-cordova.js} +33 -33
- package/dist/entry/sd-cli-cordova.js.map +1 -0
- package/dist/entry/{SdCliElectron.d.ts → sd-cli-electron.d.ts} +1 -1
- package/dist/entry/{SdCliElectron.js → sd-cli-electron.js} +18 -18
- package/dist/entry/sd-cli-electron.js.map +1 -0
- package/dist/entry/{SdCliLocalUpdate.js → sd-cli-local-update.js} +12 -12
- package/dist/entry/sd-cli-local-update.js.map +1 -0
- package/dist/entry/{SdCliProject.js → sd-cli-project.js} +36 -36
- package/dist/entry/sd-cli-project.js.map +1 -0
- package/dist/index.d.ts +30 -30
- package/dist/index.js +30 -30
- package/dist/index.js.map +1 -1
- package/dist/pkg-builders/client/{SdCliNgRoutesFileGenerator.js → sd-cli-ng-routes.file-generator.js} +12 -12
- package/dist/pkg-builders/client/sd-cli-ng-routes.file-generator.js.map +1 -0
- package/dist/pkg-builders/client/{SdClientBuildRunner.d.ts → sd-client.build-runner.d.ts} +2 -2
- package/dist/pkg-builders/client/{SdClientBuildRunner.js → sd-client.build-runner.js} +34 -27
- package/dist/pkg-builders/client/sd-client.build-runner.js.map +1 -0
- package/dist/pkg-builders/client/{SdNgBundlerContext.js → sd-ng.bundler-context.js} +5 -5
- package/dist/pkg-builders/client/sd-ng.bundler-context.js.map +1 -0
- package/dist/pkg-builders/client/{SdNgBundler.d.ts → sd-ng.bundler.d.ts} +2 -2
- package/dist/pkg-builders/client/{SdNgBundler.js → sd-ng.bundler.js} +55 -37
- package/dist/pkg-builders/client/sd-ng.bundler.js.map +1 -0
- package/dist/pkg-builders/client/{createSdNgPlugin.d.ts → sd-ng.plugin-creator.d.ts} +1 -1
- package/dist/pkg-builders/client/{createSdNgPlugin.js → sd-ng.plugin-creator.js} +17 -17
- package/dist/pkg-builders/client/sd-ng.plugin-creator.js.map +1 -0
- package/dist/pkg-builders/lib/{SdCliIndexFileGenerator.js → sd-cli-index.file-generator.js} +8 -8
- package/dist/pkg-builders/lib/sd-cli-index.file-generator.js.map +1 -0
- package/dist/pkg-builders/lib/{SdJsLibBuildRunner.d.ts → sd-js-lib.build-runner.d.ts} +2 -2
- package/dist/pkg-builders/lib/{SdJsLibBuildRunner.js → sd-js-lib.build-runner.js} +17 -17
- package/dist/pkg-builders/lib/sd-js-lib.build-runner.js.map +1 -0
- package/dist/pkg-builders/lib/{SdTsLibBuildRunner.d.ts → sd-ts-lib.build-runner.d.ts} +2 -2
- package/dist/pkg-builders/lib/{SdTsLibBuildRunner.js → sd-ts-lib.build-runner.js} +17 -17
- package/dist/pkg-builders/lib/sd-ts-lib.build-runner.js.map +1 -0
- package/dist/pkg-builders/lib/{SdTsLibBuilder.d.ts → sd-ts-lib.builder.d.ts} +1 -1
- package/dist/pkg-builders/lib/{SdTsLibBuilder.js → sd-ts-lib.builder.js} +11 -11
- package/dist/pkg-builders/lib/sd-ts-lib.builder.js.map +1 -0
- package/dist/pkg-builders/{SdMultiBuildRunner.d.ts → sd-multi.build-runner.d.ts} +2 -2
- package/dist/pkg-builders/{SdMultiBuildRunner.js → sd-multi.build-runner.js} +13 -13
- package/dist/pkg-builders/sd-multi.build-runner.js.map +1 -0
- package/dist/pkg-builders/server/{SdServerBuildRunner.d.ts → sd-server.build-runner.d.ts} +2 -2
- package/dist/pkg-builders/server/{SdServerBuildRunner.js → sd-server.build-runner.js} +35 -35
- package/dist/pkg-builders/server/sd-server.build-runner.js.map +1 -0
- package/dist/pkg-builders/server/{SdServerBundler.d.ts → sd-server.bundler.d.ts} +1 -1
- package/dist/pkg-builders/server/{SdServerBundler.js → sd-server.bundler.js} +15 -15
- package/dist/pkg-builders/server/sd-server.bundler.js.map +1 -0
- package/dist/pkg-builders/server/{createSdServerPlugin.d.ts → sd-server.plugin-creator.d.ts} +1 -1
- package/dist/pkg-builders/server/{createSdServerPlugin.js → sd-server.plugin-creator.js} +10 -10
- package/dist/pkg-builders/server/sd-server.plugin-creator.js.map +1 -0
- package/dist/sd-cli.js +10 -10
- package/dist/sd-cli.js.map +1 -1
- package/dist/{ts-builder/SdTsCompiler.d.ts → ts-compiler/sd-ts-compiler.d.ts} +1 -1
- package/dist/{ts-builder/SdTsCompiler.js → ts-compiler/sd-ts-compiler.js} +60 -60
- package/dist/ts-compiler/sd-ts-compiler.js.map +1 -0
- package/dist/types/{build-plugin.type.js → build-plugin.types.js} +1 -1
- package/dist/types/build-plugin.types.js.map +1 -0
- package/dist/types/{build-runner.type.d.ts → build-runner.types.d.ts} +1 -1
- package/dist/types/build-runner.types.js +3 -0
- package/dist/types/build-runner.types.js.map +1 -0
- package/dist/types/{build.type.js → build.types.js} +1 -1
- package/dist/types/build.types.js.map +1 -0
- package/dist/types/common-configs.types.js +2 -0
- package/dist/types/common-configs.types.js.map +1 -0
- package/dist/types/config.types.js +2 -0
- package/dist/types/config.types.js.map +1 -0
- package/dist/types/{ts-compiler.type.d.ts → ts-compiler.types.d.ts} +1 -1
- package/dist/types/{ts-compiler.type.js → ts-compiler.types.js} +2 -2
- package/dist/types/ts-compiler.types.js.map +1 -0
- package/dist/types/{workers.type.d.ts → worker.types.d.ts} +2 -2
- package/dist/types/worker.types.js +3 -0
- package/dist/types/worker.types.js.map +1 -0
- package/dist/utils/{SdCliConvertMessageUtil.d.ts → sd-cli-convert-message.utils.d.ts} +2 -2
- package/dist/utils/{SdCliConvertMessageUtil.js → sd-cli-convert-message.utils.js} +7 -7
- package/dist/utils/sd-cli-convert-message.utils.js.map +1 -0
- package/dist/utils/{SdCliPerformanceTime.js → sd-cli-performance-time.js} +1 -1
- package/dist/utils/sd-cli-performance-time.js.map +1 -0
- package/dist/workers/{build-runner-worker.js → build-runner.worker.js} +13 -13
- package/dist/workers/build-runner.worker.js.map +1 -0
- package/dist/workers/{server-worker.js → server.worker.js} +6 -6
- package/dist/workers/server.worker.js.map +1 -0
- package/package.json +5 -5
- package/src/entry/{SdAiCommand.ts → sd-cli-ai-command.ts} +4 -4
- package/src/entry/{SdCliCordova.ts → sd-cli-cordova.ts} +32 -32
- package/src/entry/{SdCliElectron.ts → sd-cli-electron.ts} +17 -17
- package/src/entry/{SdCliLocalUpdate.ts → sd-cli-local-update.ts} +11 -11
- package/src/entry/{SdCliProject.ts → sd-cli-project.ts} +36 -36
- package/src/index.ts +30 -30
- package/src/pkg-builders/client/{SdCliNgRoutesFileGenerator.ts → sd-cli-ng-routes.file-generator.ts} +11 -11
- package/src/pkg-builders/client/{SdClientBuildRunner.ts → sd-client.build-runner.ts} +52 -45
- package/src/pkg-builders/client/{SdNgBundlerContext.ts → sd-ng.bundler-context.ts} +4 -4
- package/src/pkg-builders/client/{SdNgBundler.ts → sd-ng.bundler.ts} +94 -61
- package/src/pkg-builders/client/{createSdNgPlugin.ts → sd-ng.plugin-creator.ts} +16 -16
- package/src/pkg-builders/lib/{SdCliIndexFileGenerator.ts → sd-cli-index.file-generator.ts} +7 -7
- package/src/pkg-builders/lib/{SdJsLibBuildRunner.ts → sd-js-lib.build-runner.ts} +16 -16
- package/src/pkg-builders/lib/{SdTsLibBuildRunner.ts → sd-ts-lib.build-runner.ts} +17 -17
- package/src/pkg-builders/lib/{SdTsLibBuilder.ts → sd-ts-lib.builder.ts} +10 -10
- package/src/pkg-builders/{SdMultiBuildRunner.ts → sd-multi.build-runner.ts} +12 -12
- package/src/pkg-builders/server/{SdServerBuildRunner.ts → sd-server.build-runner.ts} +34 -34
- package/src/pkg-builders/server/{SdServerBundler.ts → sd-server.bundler.ts} +14 -14
- package/src/pkg-builders/server/{createSdServerPlugin.ts → sd-server.plugin-creator.ts} +9 -9
- package/src/sd-cli.ts +10 -10
- package/src/{ts-builder/SdTsCompiler.ts → ts-compiler/sd-ts-compiler.ts} +60 -60
- package/src/types/{build-runner.type.ts → build-runner.types.ts} +1 -1
- package/src/types/{ts-compiler.type.ts → ts-compiler.types.ts} +1 -1
- package/src/types/{workers.type.ts → worker.types.ts} +2 -2
- package/src/utils/{SdCliConvertMessageUtil.ts → sd-cli-convert-message.utils.ts} +6 -6
- package/src/workers/{build-runner-worker.ts → build-runner.worker.ts} +12 -12
- package/src/workers/{server-worker.ts → server.worker.ts} +5 -5
- package/dist/entry/SdAiCommand.js.map +0 -1
- package/dist/entry/SdCliCordova.js.map +0 -1
- package/dist/entry/SdCliElectron.js.map +0 -1
- package/dist/entry/SdCliLocalUpdate.js.map +0 -1
- package/dist/entry/SdCliProject.js.map +0 -1
- package/dist/pkg-builders/SdMultiBuildRunner.js.map +0 -1
- package/dist/pkg-builders/client/SdCliNgRoutesFileGenerator.js.map +0 -1
- package/dist/pkg-builders/client/SdClientBuildRunner.js.map +0 -1
- package/dist/pkg-builders/client/SdNgBundler.js.map +0 -1
- package/dist/pkg-builders/client/SdNgBundlerContext.js.map +0 -1
- package/dist/pkg-builders/client/createSdNgPlugin.js.map +0 -1
- package/dist/pkg-builders/lib/SdCliIndexFileGenerator.js.map +0 -1
- package/dist/pkg-builders/lib/SdJsLibBuildRunner.js.map +0 -1
- package/dist/pkg-builders/lib/SdTsLibBuildRunner.js.map +0 -1
- package/dist/pkg-builders/lib/SdTsLibBuilder.js.map +0 -1
- package/dist/pkg-builders/server/SdServerBuildRunner.js.map +0 -1
- package/dist/pkg-builders/server/SdServerBundler.js.map +0 -1
- package/dist/pkg-builders/server/createSdServerPlugin.js.map +0 -1
- package/dist/ts-builder/SdTsCompiler.js.map +0 -1
- package/dist/types/build-plugin.type.js.map +0 -1
- package/dist/types/build-runner.type.js +0 -3
- package/dist/types/build-runner.type.js.map +0 -1
- package/dist/types/build.type.js.map +0 -1
- package/dist/types/common-configs.type.js +0 -2
- package/dist/types/common-configs.type.js.map +0 -1
- package/dist/types/sd-configs.type.js +0 -2
- package/dist/types/sd-configs.type.js.map +0 -1
- package/dist/types/ts-compiler.type.js.map +0 -1
- package/dist/types/workers.type.js +0 -3
- package/dist/types/workers.type.js.map +0 -1
- package/dist/utils/SdCliConvertMessageUtil.js.map +0 -1
- package/dist/utils/SdCliPerformanceTime.js.map +0 -1
- package/dist/workers/build-runner-worker.js.map +0 -1
- package/dist/workers/server-worker.js.map +0 -1
- /package/dist/entry/{SdCliLocalUpdate.d.ts → sd-cli-local-update.d.ts} +0 -0
- /package/dist/entry/{SdCliProject.d.ts → sd-cli-project.d.ts} +0 -0
- /package/dist/pkg-builders/client/{SdCliNgRoutesFileGenerator.d.ts → sd-cli-ng-routes.file-generator.d.ts} +0 -0
- /package/dist/pkg-builders/client/{SdNgBundlerContext.d.ts → sd-ng.bundler-context.d.ts} +0 -0
- /package/dist/pkg-builders/lib/{SdCliIndexFileGenerator.d.ts → sd-cli-index.file-generator.d.ts} +0 -0
- /package/dist/types/{build-plugin.type.d.ts → build-plugin.types.d.ts} +0 -0
- /package/dist/types/{build.type.d.ts → build.types.d.ts} +0 -0
- /package/dist/types/{common-configs.type.d.ts → common-configs.types.d.ts} +0 -0
- /package/dist/types/{sd-configs.type.d.ts → config.types.d.ts} +0 -0
- /package/dist/utils/{SdCliPerformanceTime.d.ts → sd-cli-performance-time.d.ts} +0 -0
- /package/dist/workers/{build-runner-worker.d.ts → build-runner.worker.d.ts} +0 -0
- /package/dist/workers/{server-worker.d.ts → server.worker.d.ts} +0 -0
- /package/src/types/{build-plugin.type.ts → build-plugin.types.ts} +0 -0
- /package/src/types/{build.type.ts → build.types.ts} +0 -0
- /package/src/types/{common-configs.type.ts → common-configs.types.ts} +0 -0
- /package/src/types/{sd-configs.type.ts → config.types.ts} +0 -0
- /package/src/utils/{SdCliPerformanceTime.ts → sd-cli-performance-time.ts} +0 -0
|
@@ -1,19 +1,19 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { FsUtils, SdLogger, PathUtils, SdFsWatcher } from "@simplysm/sd-core-node";
|
|
2
2
|
import path from "path";
|
|
3
3
|
import { EventEmitter } from "events";
|
|
4
|
-
import { SdCliIndexFileGenerator } from "./
|
|
5
|
-
import { SdTsLibBuilder } from "./
|
|
6
|
-
import {} from "../../types/
|
|
7
|
-
import {} from "../../types/build.
|
|
4
|
+
import { SdCliIndexFileGenerator } from "./sd-cli-index.file-generator";
|
|
5
|
+
import { SdTsLibBuilder } from "./sd-ts-lib.builder";
|
|
6
|
+
import {} from "../../types/config.types";
|
|
7
|
+
import {} from "../../types/build.types";
|
|
8
8
|
export class SdTsLibBuildRunner extends EventEmitter {
|
|
9
9
|
constructor(projConf, pkgPath) {
|
|
10
10
|
super();
|
|
11
|
-
this._logger =
|
|
11
|
+
this._logger = SdLogger.get(["simplysm", "sd-cli", "SdCliTsLibBuilder"]);
|
|
12
12
|
this._projConf = projConf;
|
|
13
13
|
this._pkgPath = pkgPath;
|
|
14
14
|
this._pkgConf = projConf.packages[path.basename(pkgPath)];
|
|
15
|
-
const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {}).mapMany((key) =>
|
|
16
|
-
this._watchScopePathSet = new Set([path.resolve(this._pkgPath, "../"), ...localUpdatePaths].map((item) =>
|
|
15
|
+
const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {}).mapMany((key) => FsUtils.glob(path.resolve(this._pkgPath, "../../node_modules", key)));
|
|
16
|
+
this._watchScopePathSet = new Set([path.resolve(this._pkgPath, "../"), ...localUpdatePaths].map((item) => PathUtils.norm(item)));
|
|
17
17
|
}
|
|
18
18
|
on(event, listener) {
|
|
19
19
|
super.on(event, listener);
|
|
@@ -21,7 +21,7 @@ export class SdTsLibBuildRunner extends EventEmitter {
|
|
|
21
21
|
}
|
|
22
22
|
async buildAsync() {
|
|
23
23
|
this._debug("dist 초기화...");
|
|
24
|
-
|
|
24
|
+
FsUtils.remove(path.resolve(this._pkgPath, "dist"));
|
|
25
25
|
if (!this._pkgConf.noGenIndex) {
|
|
26
26
|
this._debug("GEN index.ts...");
|
|
27
27
|
SdCliIndexFileGenerator.run(this._pkgPath, this._pkgConf.polyfills);
|
|
@@ -36,7 +36,7 @@ export class SdTsLibBuildRunner extends EventEmitter {
|
|
|
36
36
|
async watchAsync() {
|
|
37
37
|
this.emit("change");
|
|
38
38
|
this._debug("dist 초기화...");
|
|
39
|
-
|
|
39
|
+
FsUtils.remove(path.resolve(this._pkgPath, "dist"));
|
|
40
40
|
if (!this._pkgConf.noGenIndex) {
|
|
41
41
|
this._debug("WATCH GEN index.ts...");
|
|
42
42
|
SdCliIndexFileGenerator.watch(this._pkgPath, this._pkgConf.polyfills);
|
|
@@ -55,7 +55,7 @@ export class SdTsLibBuildRunner extends EventEmitter {
|
|
|
55
55
|
if (currentChangeInfos.length < 1)
|
|
56
56
|
return;
|
|
57
57
|
this.emit("change");
|
|
58
|
-
const changeFileSet = new Set(currentChangeInfos.map((item) =>
|
|
58
|
+
const changeFileSet = new Set(currentChangeInfos.map((item) => PathUtils.norm(item.path)));
|
|
59
59
|
const watchResult = await this._runAsync(true, changeFileSet);
|
|
60
60
|
const watchRes = {
|
|
61
61
|
affectedFilePathSet: watchResult.affectedFileSet,
|
|
@@ -68,14 +68,14 @@ export class SdTsLibBuildRunner extends EventEmitter {
|
|
|
68
68
|
}
|
|
69
69
|
async _runAsync(dev, modifiedFileSet) {
|
|
70
70
|
const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {})
|
|
71
|
-
.mapMany((key) =>
|
|
72
|
-
.map((item) =>
|
|
71
|
+
.mapMany((key) => FsUtils.glob(path.resolve(this._pkgPath, "../../node_modules", key)))
|
|
72
|
+
.map((item) => PathUtils.norm(item));
|
|
73
73
|
this._debug(`BUILD...`);
|
|
74
|
-
this._builder ??= new SdTsLibBuilder(
|
|
74
|
+
this._builder ??= new SdTsLibBuilder(PathUtils.norm(this._pkgPath), dev, [PathUtils.norm(this._pkgPath, "../"), ...localUpdatePaths].map((item) => PathUtils.norm(item)));
|
|
75
75
|
const buildResult = await this._builder.buildAsync(modifiedFileSet);
|
|
76
76
|
this._debug(`빌드 완료`);
|
|
77
|
-
const watchFileSet = new Set(Array.from(buildResult.watchFileSet).filter((item) =>
|
|
78
|
-
localUpdatePaths.some((lu) =>
|
|
77
|
+
const watchFileSet = new Set(Array.from(buildResult.watchFileSet).filter((item) => PathUtils.isChildPath(item, path.resolve(this._pkgPath, "../")) ||
|
|
78
|
+
localUpdatePaths.some((lu) => PathUtils.isChildPath(item, lu))));
|
|
79
79
|
return {
|
|
80
80
|
watchFileSet,
|
|
81
81
|
affectedFileSet: buildResult.affectedFileSet,
|
|
@@ -87,4 +87,4 @@ export class SdTsLibBuildRunner extends EventEmitter {
|
|
|
87
87
|
this._logger.debug(`[${path.basename(this._pkgPath)}] ${msg}`);
|
|
88
88
|
}
|
|
89
89
|
}
|
|
90
|
-
//# sourceMappingURL=
|
|
90
|
+
//# sourceMappingURL=sd-ts-lib.build-runner.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sd-ts-lib.build-runner.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/sd-ts-lib.build-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type TNormPath } from "@simplysm/sd-core-node";
|
|
2
|
-
import { type ISdBuildMessage } from "../../types/build.
|
|
2
|
+
import { type ISdBuildMessage } from "../../types/build.types";
|
|
3
3
|
export declare class SdTsLibBuilder {
|
|
4
4
|
private _pkgPath;
|
|
5
5
|
private _tsCompiler;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import path from "path";
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {} from "../../types/build.
|
|
5
|
-
import { SdTsCompiler } from "../../ts-
|
|
2
|
+
import { SdCliConvertMessageUtils } from "../../utils/sd-cli-convert-message.utils";
|
|
3
|
+
import { FsUtils, PathUtils } from "@simplysm/sd-core-node";
|
|
4
|
+
import {} from "../../types/build.types";
|
|
5
|
+
import { SdTsCompiler } from "../../ts-compiler/sd-ts-compiler";
|
|
6
6
|
export class SdTsLibBuilder {
|
|
7
7
|
constructor(_pkgPath, dev, watchScopePaths) {
|
|
8
8
|
this._pkgPath = _pkgPath;
|
|
@@ -10,7 +10,7 @@ export class SdTsLibBuilder {
|
|
|
10
10
|
pkgPath: this._pkgPath,
|
|
11
11
|
additionalOptions: { declaration: true },
|
|
12
12
|
isDevMode: dev,
|
|
13
|
-
globalStyleFilePath:
|
|
13
|
+
globalStyleFilePath: PathUtils.norm(this._pkgPath, "src/styles.scss"),
|
|
14
14
|
isForBundle: false,
|
|
15
15
|
watchScopePaths: watchScopePaths,
|
|
16
16
|
});
|
|
@@ -23,7 +23,7 @@ export class SdTsLibBuilder {
|
|
|
23
23
|
if (emitFileInfos) {
|
|
24
24
|
for (const emitFileInfo of emitFileInfos) {
|
|
25
25
|
if (emitFileInfo.outAbsPath != null) {
|
|
26
|
-
|
|
26
|
+
FsUtils.writeFile(emitFileInfo.outAbsPath, emitFileInfo.text);
|
|
27
27
|
emitFileSet.add(emitFileInfo.outAbsPath);
|
|
28
28
|
}
|
|
29
29
|
}
|
|
@@ -31,15 +31,15 @@ export class SdTsLibBuilder {
|
|
|
31
31
|
const globalStylesheetBundlingResult = tsCompileResult.stylesheetBundlingResultMap.get(emitFile);
|
|
32
32
|
if (globalStylesheetBundlingResult) {
|
|
33
33
|
for (const outputFile of globalStylesheetBundlingResult.outputFiles ?? []) {
|
|
34
|
-
const distPath =
|
|
35
|
-
if (
|
|
36
|
-
|
|
34
|
+
const distPath = PathUtils.norm(this._pkgPath, "dist", path.relative(this._pkgPath, outputFile.path));
|
|
35
|
+
if (PathUtils.isChildPath(distPath, path.resolve(this._pkgPath, "dist"))) {
|
|
36
|
+
FsUtils.writeFile(distPath, outputFile.text);
|
|
37
37
|
emitFileSet.add(distPath);
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
|
-
const styleResults = Array.from(tsCompileResult.stylesheetBundlingResultMap.values()).mapMany((item) =>
|
|
42
|
+
const styleResults = Array.from(tsCompileResult.stylesheetBundlingResultMap.values()).mapMany((item) => SdCliConvertMessageUtils.convertToBuildMessagesFromEsbuild(item, this._pkgPath));
|
|
43
43
|
return {
|
|
44
44
|
watchFileSet: tsCompileResult.watchFileSet,
|
|
45
45
|
affectedFileSet: tsCompileResult.affectedFileSet,
|
|
@@ -48,4 +48,4 @@ export class SdTsLibBuilder {
|
|
|
48
48
|
};
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
|
-
//# sourceMappingURL=
|
|
51
|
+
//# sourceMappingURL=sd-ts-lib.builder.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sd-ts-lib.builder.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/sd-ts-lib.builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { EventEmitter } from "events";
|
|
2
|
-
import { type ISdBuildMessage } from "../types/build.
|
|
3
|
-
import { type ISdBuildRunnerWorkerRequest } from "../types/build-runner.
|
|
2
|
+
import { type ISdBuildMessage } from "../types/build.types";
|
|
3
|
+
import { type ISdBuildRunnerWorkerRequest } from "../types/build-runner.types";
|
|
4
4
|
export declare class SdMultiBuildRunner extends EventEmitter {
|
|
5
5
|
#private;
|
|
6
6
|
on(event: "change", listener: () => void): this;
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { FsUtils, SdLogger, PathUtils, SdWorker } from "@simplysm/sd-core-node";
|
|
2
2
|
import path from "path";
|
|
3
3
|
import { EventEmitter } from "events";
|
|
4
|
-
import {} from "../types/
|
|
5
|
-
import {} from "../types/build.
|
|
6
|
-
import {} from "../types/
|
|
7
|
-
import {} from "../types/common-configs.
|
|
8
|
-
import {} from "../types/build-runner.
|
|
4
|
+
import {} from "../types/config.types";
|
|
5
|
+
import {} from "../types/build.types";
|
|
6
|
+
import {} from "../types/worker.types";
|
|
7
|
+
import {} from "../types/common-configs.types";
|
|
8
|
+
import {} from "../types/build-runner.types";
|
|
9
9
|
export class SdMultiBuildRunner extends EventEmitter {
|
|
10
|
-
#logger =
|
|
10
|
+
#logger = SdLogger.get(["simplysm", "sd-cli", "SdMultiBuildRunner"]);
|
|
11
11
|
#busyCount = 0;
|
|
12
12
|
#resultCache = new Map();
|
|
13
13
|
#serverInfoMap = new Map();
|
|
@@ -16,7 +16,7 @@ export class SdMultiBuildRunner extends EventEmitter {
|
|
|
16
16
|
return this;
|
|
17
17
|
}
|
|
18
18
|
async runAsync(req) {
|
|
19
|
-
const worker = new SdWorker(import.meta.resolve("../workers/build-runner
|
|
19
|
+
const worker = new SdWorker(import.meta.resolve("../workers/build-runner.worker"))
|
|
20
20
|
.on("change", () => {
|
|
21
21
|
if (this.#busyCount === 0) {
|
|
22
22
|
this.emit("change");
|
|
@@ -51,7 +51,7 @@ export class SdMultiBuildRunner extends EventEmitter {
|
|
|
51
51
|
#onComplete(req, result) {
|
|
52
52
|
this.#resultCache.delete(req.pkgPath);
|
|
53
53
|
for (const affectedFilePath of result.affectedFilePathSet) {
|
|
54
|
-
if (
|
|
54
|
+
if (PathUtils.isChildPath(affectedFilePath, req.pkgPath)) {
|
|
55
55
|
this.#resultCache.delete(affectedFilePath);
|
|
56
56
|
}
|
|
57
57
|
}
|
|
@@ -158,12 +158,12 @@ export class SdMultiBuildRunner extends EventEmitter {
|
|
|
158
158
|
}, 300);
|
|
159
159
|
}
|
|
160
160
|
async #restartServerAsync(pkgInfo, prevWorker) {
|
|
161
|
-
const logger =
|
|
161
|
+
const logger = SdLogger.get(["simplysm", "sd-cli", "SdMultiBuildRunner", "#restartServerAsync"]);
|
|
162
162
|
if (prevWorker) {
|
|
163
163
|
await prevWorker.killAsync();
|
|
164
164
|
}
|
|
165
|
-
const npmConf = "path" in pkgInfo ?
|
|
166
|
-
const worker = new SdWorker(import.meta.resolve("../workers/server
|
|
165
|
+
const npmConf = "path" in pkgInfo ? FsUtils.readJson(path.resolve(pkgInfo.path, "package.json")) : undefined;
|
|
166
|
+
const worker = new SdWorker(import.meta.resolve("../workers/server.worker"), {
|
|
167
167
|
env: {
|
|
168
168
|
NODE_ENV: "development",
|
|
169
169
|
TZ: "Asia/Seoul",
|
|
@@ -192,4 +192,4 @@ type TResponse =
|
|
|
192
192
|
result: ISdBuildRunnerResult;
|
|
193
193
|
};
|
|
194
194
|
*/
|
|
195
|
-
//# sourceMappingURL=
|
|
195
|
+
//# sourceMappingURL=sd-multi.build-runner.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sd-multi.build-runner.js","sourceRoot":"","sources":["../../src/pkg-builders/sd-multi.build-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { EventEmitter } from "events";
|
|
2
2
|
import { type TNormPath } from "@simplysm/sd-core-node";
|
|
3
|
-
import { type ISdProjectConfig } from "../../types/
|
|
4
|
-
import { type ISdBuildRunnerResult } from "../../types/build.
|
|
3
|
+
import { type ISdProjectConfig } from "../../types/config.types";
|
|
4
|
+
import { type ISdBuildRunnerResult } from "../../types/build.types";
|
|
5
5
|
export declare class SdServerBuildRunner extends EventEmitter {
|
|
6
6
|
private readonly _projConf;
|
|
7
7
|
private readonly _pkgPath;
|
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
import { EventEmitter } from "events";
|
|
2
|
-
import {
|
|
2
|
+
import { FsUtils, SdLogger, PathUtils, SdFsWatcher } from "@simplysm/sd-core-node";
|
|
3
3
|
import path from "path";
|
|
4
|
-
import {
|
|
5
|
-
import { SdServerBundler } from "./
|
|
6
|
-
import {} from "../../types/
|
|
7
|
-
import {} from "../../types/build.
|
|
8
|
-
import {} from "../../types/common-configs.
|
|
4
|
+
import { StringUtils } from "@simplysm/sd-core-common";
|
|
5
|
+
import { SdServerBundler } from "./sd-server.bundler";
|
|
6
|
+
import {} from "../../types/config.types";
|
|
7
|
+
import {} from "../../types/build.types";
|
|
8
|
+
import {} from "../../types/common-configs.types";
|
|
9
9
|
export class SdServerBuildRunner extends EventEmitter {
|
|
10
10
|
constructor(_projConf, _pkgPath) {
|
|
11
11
|
super();
|
|
12
12
|
this._projConf = _projConf;
|
|
13
13
|
this._pkgPath = _pkgPath;
|
|
14
|
-
this._logger =
|
|
14
|
+
this._logger = SdLogger.get(["simplysm", "sd-cli", "SdCliServerBuildRunner"]);
|
|
15
15
|
this._pkgConf = this._projConf.packages[path.basename(_pkgPath)];
|
|
16
|
-
const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {}).mapMany((key) =>
|
|
17
|
-
this._watchScopePathSet = new Set([path.resolve(this._pkgPath, "../"), ...localUpdatePaths].map((item) =>
|
|
16
|
+
const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {}).mapMany((key) => FsUtils.glob(path.resolve(this._pkgPath, "../../node_modules", key)));
|
|
17
|
+
this._watchScopePathSet = new Set([path.resolve(this._pkgPath, "../"), ...localUpdatePaths].map((item) => PathUtils.norm(item)));
|
|
18
18
|
}
|
|
19
19
|
on(event, listener) {
|
|
20
20
|
super.on(event, listener);
|
|
@@ -23,10 +23,10 @@ export class SdServerBuildRunner extends EventEmitter {
|
|
|
23
23
|
async watchAsync() {
|
|
24
24
|
this.emit("change");
|
|
25
25
|
this._debug("dist 초기화...");
|
|
26
|
-
|
|
26
|
+
FsUtils.remove(path.resolve(this._pkgPath, "dist"));
|
|
27
27
|
this._debug("GEN .config...");
|
|
28
28
|
const confDistPath = path.resolve(this._pkgPath, "dist/.config.json");
|
|
29
|
-
|
|
29
|
+
FsUtils.writeFile(confDistPath, JSON.stringify(this._pkgConf.configs ?? {}, undefined, 2));
|
|
30
30
|
const result = await this._runAsync(true);
|
|
31
31
|
const res = {
|
|
32
32
|
affectedFilePathSet: result.affectedFileSet,
|
|
@@ -41,7 +41,7 @@ export class SdServerBuildRunner extends EventEmitter {
|
|
|
41
41
|
if (currentChangeInfos.length < 1)
|
|
42
42
|
return;
|
|
43
43
|
this.emit("change");
|
|
44
|
-
const watchResult = await this._runAsync(true, new Set(currentChangeInfos.map((item) =>
|
|
44
|
+
const watchResult = await this._runAsync(true, new Set(currentChangeInfos.map((item) => PathUtils.norm(item.path))));
|
|
45
45
|
const watchRes = {
|
|
46
46
|
affectedFilePathSet: watchResult.affectedFileSet,
|
|
47
47
|
buildMessages: watchResult.buildMessages,
|
|
@@ -52,14 +52,14 @@ export class SdServerBuildRunner extends EventEmitter {
|
|
|
52
52
|
});
|
|
53
53
|
}
|
|
54
54
|
async buildAsync() {
|
|
55
|
-
const projNpmConfig =
|
|
56
|
-
const npmConfig =
|
|
55
|
+
const projNpmConfig = FsUtils.readJson(path.resolve(process.cwd(), "package.json"));
|
|
56
|
+
const npmConfig = FsUtils.readJson(path.resolve(this._pkgPath, "package.json"));
|
|
57
57
|
const extModules = await this._getExternalModulesAsync();
|
|
58
58
|
this._debug("dist 초기화...");
|
|
59
|
-
|
|
59
|
+
FsUtils.remove(path.resolve(this._pkgPath, "dist"));
|
|
60
60
|
this._debug("GEN .config.json...");
|
|
61
61
|
const confDistPath = path.resolve(this._pkgPath, "dist/.config.json");
|
|
62
|
-
|
|
62
|
+
FsUtils.writeJson(confDistPath, this._pkgConf.configs ?? {}, { space: 2 });
|
|
63
63
|
this._debug("GEN package.json...");
|
|
64
64
|
{
|
|
65
65
|
const deps = extModules.filter((item) => item.exists).map((item) => item.name);
|
|
@@ -79,15 +79,15 @@ export class SdServerBuildRunner extends EventEmitter {
|
|
|
79
79
|
distNpmConfig.scripts["delete"] = "pm2 delete ssipec-petrochem-server";
|
|
80
80
|
}
|
|
81
81
|
distNpmConfig.volta = projNpmConfig.volta;
|
|
82
|
-
|
|
82
|
+
FsUtils.writeJson(path.resolve(this._pkgPath, "dist/package.json"), distNpmConfig, { space: 2 });
|
|
83
83
|
}
|
|
84
84
|
this._debug("GEN .yarnrc.yml...");
|
|
85
85
|
{
|
|
86
|
-
|
|
86
|
+
FsUtils.writeFile(path.resolve(this._pkgPath, "dist/.yarnrc.yml"), "nodeLinker: node-modules");
|
|
87
87
|
}
|
|
88
88
|
this._debug("GEN openssl.cnf...");
|
|
89
89
|
{
|
|
90
|
-
|
|
90
|
+
FsUtils.writeFile(path.resolve(this._pkgPath, "dist/openssl.cnf"), `
|
|
91
91
|
nodejs_conf = openssl_init
|
|
92
92
|
|
|
93
93
|
[openssl_init]
|
|
@@ -145,13 +145,13 @@ Options = UnsafeLegacyRenegotiation`.trim());
|
|
|
145
145
|
};`
|
|
146
146
|
.replaceAll("\n ", "\n")
|
|
147
147
|
.trim();
|
|
148
|
-
|
|
148
|
+
FsUtils.writeFile(path.resolve(this._pkgPath, "dist/pm2.config.cjs"), str);
|
|
149
149
|
}
|
|
150
150
|
if (this._pkgConf.iis) {
|
|
151
151
|
this._debug("GEN web.config...");
|
|
152
152
|
const iisDistPath = path.resolve(this._pkgPath, "dist/web.config");
|
|
153
153
|
const serverExeFilePath = this._pkgConf.iis.nodeExeFilePath ?? "C:\\Program Files\\nodejs\\node.exe";
|
|
154
|
-
|
|
154
|
+
FsUtils.writeFile(iisDistPath, `
|
|
155
155
|
<configuration>
|
|
156
156
|
<appSettings>
|
|
157
157
|
<add key="NODE_ENV" value="production" />
|
|
@@ -190,9 +190,9 @@ Options = UnsafeLegacyRenegotiation`.trim());
|
|
|
190
190
|
};
|
|
191
191
|
}
|
|
192
192
|
async _runAsync(dev, modifiedFileSet) {
|
|
193
|
-
const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {}).mapMany((key) =>
|
|
193
|
+
const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {}).mapMany((key) => FsUtils.glob(path.resolve(this._pkgPath, "../../node_modules", key)));
|
|
194
194
|
this._debug(`BUILD 준비...`);
|
|
195
|
-
const tsConfig =
|
|
195
|
+
const tsConfig = FsUtils.readJson(path.resolve(this._pkgPath, "tsconfig.json"));
|
|
196
196
|
this._extModules = this._extModules ?? (await this._getExternalModulesAsync());
|
|
197
197
|
this._serverBundler =
|
|
198
198
|
this._serverBundler ??
|
|
@@ -203,16 +203,16 @@ Options = UnsafeLegacyRenegotiation`.trim());
|
|
|
203
203
|
? tsConfig.files.map((item) => path.resolve(this._pkgPath, item))
|
|
204
204
|
: [
|
|
205
205
|
path.resolve(this._pkgPath, "src/main.ts"),
|
|
206
|
-
...
|
|
206
|
+
...FsUtils.glob(path.resolve(this._pkgPath, "src/workers/*.ts")),
|
|
207
207
|
],
|
|
208
208
|
external: this._extModules.map((item) => item.name),
|
|
209
|
-
watchScopePaths: [path.resolve(this._pkgPath, "../"), ...localUpdatePaths].map((item) =>
|
|
209
|
+
watchScopePaths: [path.resolve(this._pkgPath, "../"), ...localUpdatePaths].map((item) => PathUtils.norm(item)),
|
|
210
210
|
});
|
|
211
211
|
this._debug(`BUILD...`);
|
|
212
212
|
const bundleResult = await this._serverBundler.bundleAsync(modifiedFileSet);
|
|
213
213
|
//-- filePaths
|
|
214
|
-
const watchFileSet = new Set(Array.from(bundleResult.watchFileSet).filter((item) =>
|
|
215
|
-
localUpdatePaths.some((lu) =>
|
|
214
|
+
const watchFileSet = new Set(Array.from(bundleResult.watchFileSet).filter((item) => PathUtils.isChildPath(item, path.resolve(this._pkgPath, "../")) ||
|
|
215
|
+
localUpdatePaths.some((lu) => PathUtils.isChildPath(item, lu))));
|
|
216
216
|
this._debug(`빌드 완료`);
|
|
217
217
|
return {
|
|
218
218
|
watchFileSet,
|
|
@@ -226,7 +226,7 @@ Options = UnsafeLegacyRenegotiation`.trim());
|
|
|
226
226
|
const results = [];
|
|
227
227
|
const npmConfigMap = new Map();
|
|
228
228
|
const fn = async (currPath) => {
|
|
229
|
-
const npmConfig = npmConfigMap.getOrCreate(currPath,
|
|
229
|
+
const npmConfig = npmConfigMap.getOrCreate(currPath, FsUtils.readJson(path.resolve(currPath, "package.json")));
|
|
230
230
|
const deps = {
|
|
231
231
|
defaults: [
|
|
232
232
|
...Object.keys(npmConfig.dependencies ?? {}),
|
|
@@ -241,11 +241,11 @@ Options = UnsafeLegacyRenegotiation`.trim());
|
|
|
241
241
|
if (loadedModuleNames.includes(moduleName))
|
|
242
242
|
continue;
|
|
243
243
|
loadedModuleNames.push(moduleName);
|
|
244
|
-
const modulePath =
|
|
245
|
-
if (
|
|
244
|
+
const modulePath = FsUtils.findAllParentChildPaths("node_modules/" + moduleName, currPath, path.resolve(this._pkgPath, "../../")).first();
|
|
245
|
+
if (StringUtils.isNullOrEmpty(modulePath)) {
|
|
246
246
|
continue;
|
|
247
247
|
}
|
|
248
|
-
if (
|
|
248
|
+
if (FsUtils.glob(path.resolve(modulePath, "binding.gyp")).length > 0) {
|
|
249
249
|
results.push({
|
|
250
250
|
name: moduleName,
|
|
251
251
|
exists: true,
|
|
@@ -263,15 +263,15 @@ Options = UnsafeLegacyRenegotiation`.trim());
|
|
|
263
263
|
if (loadedModuleNames.includes(optModuleName))
|
|
264
264
|
continue;
|
|
265
265
|
loadedModuleNames.push(optModuleName);
|
|
266
|
-
const optModulePath =
|
|
267
|
-
if (
|
|
266
|
+
const optModulePath = FsUtils.findAllParentChildPaths("node_modules/" + optModuleName, currPath, path.resolve(this._pkgPath, "../../")).first();
|
|
267
|
+
if (StringUtils.isNullOrEmpty(optModulePath)) {
|
|
268
268
|
results.push({
|
|
269
269
|
name: optModuleName,
|
|
270
270
|
exists: false,
|
|
271
271
|
});
|
|
272
272
|
continue;
|
|
273
273
|
}
|
|
274
|
-
if (
|
|
274
|
+
if (FsUtils.glob(path.resolve(optModulePath, "binding.gyp")).length > 0) {
|
|
275
275
|
results.push({
|
|
276
276
|
name: optModuleName,
|
|
277
277
|
exists: true,
|
|
@@ -301,4 +301,4 @@ Options = UnsafeLegacyRenegotiation`.trim());
|
|
|
301
301
|
this._logger.debug(`[${path.basename(this._pkgPath)}] ${msg}`);
|
|
302
302
|
}
|
|
303
303
|
}
|
|
304
|
-
//# sourceMappingURL=
|
|
304
|
+
//# sourceMappingURL=sd-server.build-runner.js.map
|
|
@@ -0,0 +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,15 +1,15 @@
|
|
|
1
1
|
import esbuild from "esbuild";
|
|
2
2
|
import path from "path";
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {} from "../../types/build-plugin.
|
|
6
|
-
import {} from "../../types/build.
|
|
7
|
-
import { createSdServerPlugin } from "./
|
|
3
|
+
import { FsUtils, SdLogger, PathUtils } from "@simplysm/sd-core-node";
|
|
4
|
+
import { SdCliConvertMessageUtils } from "../../utils/sd-cli-convert-message.utils";
|
|
5
|
+
import {} from "../../types/build-plugin.types";
|
|
6
|
+
import {} from "../../types/build.types";
|
|
7
|
+
import { createSdServerPlugin } from "./sd-server.plugin-creator";
|
|
8
8
|
import { BuildOutputFileType } from "@angular/build/src/tools/esbuild/bundler-context";
|
|
9
9
|
import { convertOutputFile } from "@angular/build/src/tools/esbuild/utils";
|
|
10
10
|
import { resolveAssets } from "@angular/build/src/utils/resolve-assets";
|
|
11
11
|
export class SdServerBundler {
|
|
12
|
-
#logger =
|
|
12
|
+
#logger = SdLogger.get(["simplysm", "sd-cli", "SdServerBundler"]);
|
|
13
13
|
#context;
|
|
14
14
|
#modifiedFileSet = new Set();
|
|
15
15
|
#resultCache = {};
|
|
@@ -99,10 +99,10 @@ const __dirname = __path__.dirname(__filename);`.trim(),
|
|
|
99
99
|
result = await this.#context.rebuild();
|
|
100
100
|
const outputFiles = result.outputFiles?.map((file) => convertOutputFile(file, BuildOutputFileType.Root)) ?? [];
|
|
101
101
|
for (const outputFile of outputFiles) {
|
|
102
|
-
const distFilePath =
|
|
102
|
+
const distFilePath = PathUtils.norm(this._opt.pkgPath, outputFile.path);
|
|
103
103
|
const prev = this.#outputCache.get(distFilePath);
|
|
104
104
|
if (prev !== Buffer.from(outputFile.contents).toString("base64")) {
|
|
105
|
-
|
|
105
|
+
FsUtils.writeFile(distFilePath, outputFile.contents);
|
|
106
106
|
this.#outputCache.set(distFilePath, Buffer.from(outputFile.contents).toString("base64"));
|
|
107
107
|
emitFileSet.add(distFilePath);
|
|
108
108
|
}
|
|
@@ -113,12 +113,12 @@ const __dirname = __path__.dirname(__filename);`.trim(),
|
|
|
113
113
|
...(this._opt.dev ? [{ input: "public-dev", glob: "**/*", output: "." }] : []),
|
|
114
114
|
], this._opt.pkgPath);
|
|
115
115
|
for (const assetFile of assetFiles) {
|
|
116
|
-
const prev = this.#outputCache.get(
|
|
117
|
-
const curr =
|
|
116
|
+
const prev = this.#outputCache.get(PathUtils.norm(assetFile.source));
|
|
117
|
+
const curr = FsUtils.lstat(assetFile.source).mtime.getTime();
|
|
118
118
|
if (prev !== curr) {
|
|
119
|
-
|
|
120
|
-
this.#outputCache.set(
|
|
121
|
-
emitFileSet.add(
|
|
119
|
+
FsUtils.copy(assetFile.source, path.resolve(this._opt.pkgPath, "dist", assetFile.destination));
|
|
120
|
+
this.#outputCache.set(PathUtils.norm(assetFile.source), curr);
|
|
121
|
+
emitFileSet.add(PathUtils.norm(assetFile.destination));
|
|
122
122
|
}
|
|
123
123
|
}
|
|
124
124
|
}
|
|
@@ -133,9 +133,9 @@ const __dirname = __path__.dirname(__filename);`.trim(),
|
|
|
133
133
|
return {
|
|
134
134
|
watchFileSet: this.#resultCache.watchFileSet,
|
|
135
135
|
affectedFileSet: this.#resultCache.affectedFileSet,
|
|
136
|
-
results:
|
|
136
|
+
results: SdCliConvertMessageUtils.convertToBuildMessagesFromEsbuild(result, this._opt.pkgPath),
|
|
137
137
|
emitFileSet: emitFileSet,
|
|
138
138
|
};
|
|
139
139
|
}
|
|
140
140
|
}
|
|
141
|
-
//# sourceMappingURL=
|
|
141
|
+
//# sourceMappingURL=sd-server.bundler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sd-server.bundler.js","sourceRoot":"","sources":["../../../src/pkg-builders/server/sd-server.bundler.ts"],"names":[],"mappings":"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"}
|
package/dist/pkg-builders/server/{createSdServerPlugin.d.ts → sd-server.plugin-creator.d.ts}
RENAMED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import esbuild from "esbuild";
|
|
2
|
-
import { type ISdCliServerPluginResultCache } from "../../types/build-plugin.
|
|
2
|
+
import { type ISdCliServerPluginResultCache } from "../../types/build-plugin.types";
|
|
3
3
|
import { type TNormPath } from "@simplysm/sd-core-node";
|
|
4
4
|
export declare function createSdServerPlugin(conf: {
|
|
5
5
|
pkgPath: TNormPath;
|