@simplysm/sd-cli 7.0.21 → 7.0.25

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.
Files changed (33) hide show
  1. package/dist/bin/sd-cli.d.ts +1 -1
  2. package/dist/bin/sd-cli.mjs +54 -15
  3. package/dist/builder/SdCliServerBuilder.d.ts +22 -0
  4. package/dist/builder/SdCliServerBuilder.mjs +325 -0
  5. package/dist/builder/SdCliTsLibBuilder.mjs +2 -2
  6. package/dist/commons.d.ts +5 -4
  7. package/dist/entry-points/SdCliLocalUpdate.d.ts +7 -4
  8. package/dist/entry-points/SdCliLocalUpdate.mjs +6 -7
  9. package/dist/entry-points/SdCliNpm.d.ts +6 -0
  10. package/dist/entry-points/SdCliNpm.mjs +18 -0
  11. package/dist/entry-points/SdCliPrepare.d.ts +5 -0
  12. package/dist/entry-points/SdCliPrepare.mjs +54 -0
  13. package/dist/entry-points/SdCliWorkspace.d.ts +13 -5
  14. package/dist/entry-points/SdCliWorkspace.mjs +49 -13
  15. package/dist/packages/SdCliPackage.d.ts +6 -2
  16. package/dist/packages/SdCliPackage.mjs +34 -23
  17. package/dist/utils/SdCliBuildResultUtil.d.ts +4 -1
  18. package/dist/utils/SdCliBuildResultUtil.mjs +25 -2
  19. package/dist/utils/SdCliConfigUtil.d.ts +1 -1
  20. package/dist/utils/SdCliConfigUtil.mjs +5 -5
  21. package/package.json +20 -11
  22. package/src/bin/sd-cli.ts +62 -14
  23. package/src/builder/SdCliServerBuilder.ts +361 -0
  24. package/src/builder/SdCliTsLibBuilder.ts +1 -1
  25. package/src/commons.ts +3 -5
  26. package/src/entry-points/SdCliLocalUpdate.ts +5 -6
  27. package/src/entry-points/SdCliNpm.ts +22 -0
  28. package/src/entry-points/SdCliPrepare.ts +54 -0
  29. package/src/entry-points/SdCliWorkspace.ts +65 -15
  30. package/src/packages/SdCliPackage.ts +37 -26
  31. package/src/utils/SdCliBuildResultUtil.ts +31 -1
  32. package/src/utils/SdCliConfigUtil.ts +4 -4
  33. package/tsconfig.json +4 -1
@@ -1,2 +1,2 @@
1
- #!/usr/bin/env node --experimental-specifier-resolution=node
1
+ #!/usr/bin/env node --experimental-specifier-resolution=node --experimental-import-meta-resolve
2
2
  export {};
@@ -1,9 +1,13 @@
1
- #!/usr/bin/env node --experimental-specifier-resolution=node
1
+ #!/usr/bin/env node --experimental-specifier-resolution=node --experimental-import-meta-resolve
2
2
  import yargs from "yargs";
3
3
  import { hideBin } from "yargs/helpers";
4
4
  import { Logger, LoggerSeverity } from "@simplysm/sd-core-node";
5
5
  import { SdCliWorkspace } from "../entry-points/SdCliWorkspace";
6
6
  import { SdCliLocalUpdate } from "../entry-points/SdCliLocalUpdate";
7
+ import sourceMapSupport from "source-map-support";
8
+ import { SdCliNpm } from "../entry-points/SdCliNpm";
9
+ import { SdCliPrepare } from "../entry-points/SdCliPrepare";
10
+ sourceMapSupport.install();
7
11
  Error.stackTraceLimit = Infinity;
8
12
  const argv = yargs(hideBin(process.argv))
9
13
  .version(false)
@@ -16,6 +20,8 @@ const argv = yargs(hideBin(process.argv))
16
20
  default: false
17
21
  }
18
22
  })
23
+ .command("prepare", "sd-cli 준비", (cmd) => cmd.version(false))
24
+ .command("update", "패키지 업데이트 (npm update)", (cmd) => cmd.version(false))
19
25
  .command("local-update", "로컬 라이브러리 업데이트를 수행합니다.", (cmd) => cmd.version(false)
20
26
  .options({
21
27
  config: {
@@ -28,6 +34,11 @@ const argv = yargs(hideBin(process.argv))
28
34
  config: {
29
35
  type: "string",
30
36
  describe: "simplysm.json 파일 경로"
37
+ },
38
+ options: {
39
+ type: "string",
40
+ array: true,
41
+ describe: "옵션 설정 (설정파일에서 @로 시작하는 부분)"
31
42
  }
32
43
  }))
33
44
  .command("build", "프로젝트의 각 패키지에 대한 빌드를 수행합니다.", (cmd) => cmd.version(false)
@@ -35,18 +46,28 @@ const argv = yargs(hideBin(process.argv))
35
46
  config: {
36
47
  type: "string",
37
48
  describe: "simplysm.json 파일 경로"
49
+ },
50
+ options: {
51
+ type: "string",
52
+ array: true,
53
+ describe: "옵션 설정 (설정파일에서 @로 시작하는 부분)"
38
54
  }
39
55
  }))
40
56
  .command("publish", "프로젝트의 각 패키지를 배포합니다.", (cmd) => cmd.version(false)
41
57
  .options({
58
+ noBuild: {
59
+ type: "boolean",
60
+ describe: "빌드를 하지않고 배포합니다.",
61
+ default: false
62
+ },
42
63
  config: {
43
64
  type: "string",
44
65
  describe: "simplysm.json 파일 경로"
45
66
  },
46
- "noBuild": {
47
- type: "boolean",
48
- describe: "빌드를 하지않고 배포합니다.",
49
- default: false
67
+ options: {
68
+ type: "string",
69
+ array: true,
70
+ describe: "옵션 설정 (설정파일에서 @로 시작하는 부분)"
50
71
  }
51
72
  }))
52
73
  .parseSync();
@@ -65,22 +86,40 @@ else {
65
86
  }
66
87
  const logger = Logger.get(["simplysm", "sd-cli", "bin", "sd-cli"]);
67
88
  (async () => {
68
- if (argv._[0] === "local-update") {
69
- await new SdCliLocalUpdate(process.cwd(), argv.config)
70
- .runAsync();
89
+ if (argv._[0] === "prepare") {
90
+ await new SdCliPrepare()
91
+ .prepareAsync();
92
+ }
93
+ else if (argv._[0] === "update") {
94
+ await new SdCliNpm(process.cwd())
95
+ .updateAsync();
96
+ }
97
+ else if (argv._[0] === "local-update") {
98
+ await new SdCliLocalUpdate(process.cwd())
99
+ .runAsync({
100
+ confFileRelPath: argv.config ?? "simplysm.json"
101
+ });
71
102
  }
72
103
  else if (argv._[0] === "watch") {
73
- await new SdCliWorkspace(process.cwd(), argv.config)
74
- .watchAsync();
104
+ await new SdCliWorkspace(process.cwd())
105
+ .watchAsync({
106
+ confFileRelPath: argv.config ?? "simplysm.json",
107
+ optNames: argv.options ?? []
108
+ });
75
109
  }
76
110
  else if (argv._[0] === "build") {
77
- await new SdCliWorkspace(process.cwd(), argv.config)
78
- .buildAsync();
111
+ await new SdCliWorkspace(process.cwd())
112
+ .buildAsync({
113
+ confFileRelPath: argv.config ?? "simplysm.json",
114
+ optNames: argv.options ?? []
115
+ });
79
116
  }
80
117
  else if (argv._[0] === "publish") {
81
- await new SdCliWorkspace(process.cwd(), argv.config)
118
+ await new SdCliWorkspace(process.cwd())
82
119
  .publishAsync({
83
- noBuild: argv.noBuild
120
+ noBuild: argv.noBuild,
121
+ confFileRelPath: argv.config ?? "simplysm.json",
122
+ optNames: argv.options ?? []
84
123
  });
85
124
  }
86
125
  else {
@@ -89,4 +128,4 @@ const logger = Logger.get(["simplysm", "sd-cli", "bin", "sd-cli"]);
89
128
  })().catch((err) => {
90
129
  logger.error(err);
91
130
  });
92
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2QtY2xpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jpbi9zZC1jbGkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUVBLE9BQU8sS0FBSyxNQUFNLE9BQU8sQ0FBQztBQUMxQixPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3hDLE9BQU8sRUFBRSxNQUFNLEVBQUUsY0FBYyxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDaEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ2hFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBRXBFLEtBQUssQ0FBQyxlQUFlLEdBQUcsUUFBUSxDQUFDO0FBRWpDLE1BQU0sSUFBSSxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0tBQ3RDLE9BQU8sQ0FBQyxLQUFLLENBQUM7S0FDZCxJQUFJLENBQUMsTUFBTSxFQUFFLEtBQUssQ0FBQztLQUNuQixLQUFLLENBQUMsTUFBTSxFQUFFLEdBQUcsQ0FBQztLQUNsQixPQUFPLENBQUM7SUFDUCxLQUFLLEVBQUU7UUFDTCxJQUFJLEVBQUUsU0FBUztRQUNmLFFBQVEsRUFBRSxvQkFBb0I7UUFDOUIsT0FBTyxFQUFFLEtBQUs7S0FDZjtDQUNGLENBQUM7S0FDRCxPQUFPLENBQ04sY0FBYyxFQUNkLHVCQUF1QixFQUN2QixDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUM7S0FDeEIsT0FBTyxDQUFDO0lBQ1AsTUFBTSxFQUFFO1FBQ04sSUFBSSxFQUFFLFFBQVE7UUFDZCxRQUFRLEVBQUUscUJBQXFCO0tBQ2hDO0NBQ0YsQ0FBQyxDQUNMO0tBQ0EsT0FBTyxDQUNOLE9BQU8sRUFDUCxpQ0FBaUMsRUFDakMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMs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
131
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2QtY2xpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jpbi9zZC1jbGkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUVBLE9BQU8sS0FBSyxNQUFNLE9BQU8sQ0FBQztBQUMxQixPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3hDLE9BQU8sRUFBRSxNQUFNLEVBQUUsY0FBYyxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDaEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ2hFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ3BFLE9BQU8sZ0JBQWdCLE1BQU0sb0JBQW9CLENBQUM7QUFDbEQsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUU1RCxnQkFBZ0IsQ0FBQyxPQUFPLEVBQUUsQ0FBQztBQUUzQixLQUFLLENBQUMsZUFBZSxHQUFHLFFBQVEsQ0FBQztBQUVqQyxNQUFNLElBQUksR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztLQUN0QyxPQUFPLENBQUMsS0FBSyxDQUFDO0tBQ2QsSUFBSSxDQUFDLE1BQU0sRUFBRSxLQUFLLENBQUM7S0FDbkIsS0FBSyxDQUFDLE1BQU0sRUFBRSxHQUFHLENBQUM7S0FDbEIsT0FBTyxDQUFDO0lBQ1AsS0FBSyxFQUFFO1FBQ0wsSUFBSSxFQUFFLFNBQVM7UUFDZixRQUFRLEVBQUUsb0JBQW9CO1FBQzlCLE9BQU8sRUFBRSxLQUFLO0tBQ2Y7Q0FDRixDQUFDO0tBQ0QsT0FBTyxDQUNOLFNBQVMsRUFDVCxXQUFXLEVBQ1gsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQzVCO0tBQ0EsT0FBTyxDQUNOLFFBQVEs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
@@ -0,0 +1,22 @@
1
+ /// <reference types="node" />
2
+ import { ISdCliPackageBuildResult, ISdCliServerPackageConfig } from "../commons";
3
+ import { EventEmitter } from "events";
4
+ export declare class SdCliServerBuilder extends EventEmitter {
5
+ private readonly _rootPath;
6
+ private readonly _config;
7
+ private readonly _workspaceRootPath;
8
+ private readonly _logger;
9
+ private readonly _tsconfigFilePath;
10
+ private readonly _parsedTsconfig;
11
+ private readonly _npmConfigMap;
12
+ constructor(_rootPath: string, _config: ISdCliServerPackageConfig, _workspaceRootPath: string);
13
+ on(event: "change", listener: () => void): this;
14
+ on(event: "complete", listener: (results: ISdCliPackageBuildResult[]) => void): this;
15
+ watchAsync(): Promise<void>;
16
+ buildAsync(): Promise<ISdCliPackageBuildResult[]>;
17
+ private get _webpackCommonConfig();
18
+ private _getWebpackWatchConfig;
19
+ private _getWebpackBuildConfig;
20
+ private _findExternalModules;
21
+ private _getNpmConfig;
22
+ }
@@ -0,0 +1,325 @@
1
+ import { EventEmitter } from "events";
2
+ import { FsUtil, Logger, PathUtil } from "@simplysm/sd-core-node";
3
+ import webpack from "webpack";
4
+ import path from "path";
5
+ import ts from "typescript";
6
+ import { SdCliBuildResultUtil } from "../utils/SdCliBuildResultUtil";
7
+ import os from "os";
8
+ import * as webpackMerge from "webpack-merge";
9
+ import TerserPlugin from "terser-webpack-plugin";
10
+ import { StringUtil } from "@simplysm/sd-core-common";
11
+ import ESLintWebpackPlugin from "eslint-webpack-plugin";
12
+ import CopyWebpackPlugin from "copy-webpack-plugin";
13
+ import { LicenseWebpackPlugin } from "license-webpack-plugin";
14
+ export class SdCliServerBuilder extends EventEmitter {
15
+ constructor(_rootPath, _config, _workspaceRootPath) {
16
+ super();
17
+ this._rootPath = _rootPath;
18
+ this._config = _config;
19
+ this._workspaceRootPath = _workspaceRootPath;
20
+ this._logger = Logger.get(["simplysm", "sd-cli", this.constructor.name]);
21
+ this._npmConfigMap = new Map();
22
+ // tsconfig
23
+ this._tsconfigFilePath = path.resolve(this._rootPath, "tsconfig-build.json");
24
+ const tsconfig = FsUtil.readJson(this._tsconfigFilePath);
25
+ this._parsedTsconfig = ts.parseJsonConfigFileContent(tsconfig, ts.sys, this._rootPath);
26
+ }
27
+ on(event, listener) {
28
+ return super.on(event, listener);
29
+ }
30
+ async watchAsync() {
31
+ // DIST 비우기
32
+ await FsUtil.removeAsync(this._parsedTsconfig.options.outDir);
33
+ // 빌드 준비
34
+ const webpackConfig = this._getWebpackWatchConfig();
35
+ const compiler = webpack(webpackConfig);
36
+ await new Promise((resolve, reject) => {
37
+ compiler.hooks.watchRun.tapAsync(this.constructor.name, (args, callback) => {
38
+ this.emit("change");
39
+ callback();
40
+ this._logger.debug("Webpack 빌드 수행...");
41
+ });
42
+ compiler.watch({}, (err, stats) => {
43
+ if (err != null || stats == null) {
44
+ reject(err);
45
+ return;
46
+ }
47
+ const results = SdCliBuildResultUtil.convertFromWebpackStats(stats);
48
+ this.emit("complete", results);
49
+ this._logger.debug("Webpack 빌드 완료");
50
+ resolve();
51
+ });
52
+ });
53
+ }
54
+ async buildAsync() {
55
+ // DIST 비우기
56
+ await FsUtil.removeAsync(this._parsedTsconfig.options.outDir);
57
+ // 빌드
58
+ this._logger.debug("Webpack 빌드 수행...");
59
+ const webpackConfig = this._getWebpackBuildConfig();
60
+ const compiler = webpack(webpackConfig);
61
+ const buildResults = await new Promise((resolve, reject) => {
62
+ compiler.run((err, stats) => {
63
+ if (err != null || stats == null) {
64
+ reject(err);
65
+ return;
66
+ }
67
+ // 결과 리턴
68
+ const results = SdCliBuildResultUtil.convertFromWebpackStats(stats);
69
+ resolve(results);
70
+ });
71
+ });
72
+ this._logger.debug("Webpack 빌드 완료");
73
+ return buildResults;
74
+ }
75
+ get _webpackCommonConfig() {
76
+ return {
77
+ devtool: false,
78
+ target: ["node", "es2020"],
79
+ profile: false,
80
+ resolve: {
81
+ roots: [this._rootPath],
82
+ extensions: [".ts", ".js", ".mjs", ".cjs"],
83
+ symlinks: true,
84
+ mainFields: ["es2020", "default", "module", "main"]
85
+ },
86
+ context: this._workspaceRootPath,
87
+ entry: {
88
+ main: [
89
+ path.resolve(this._rootPath, "src/main.ts")
90
+ ]
91
+ },
92
+ output: {
93
+ clean: true,
94
+ path: this._parsedTsconfig.options.outDir,
95
+ filename: "[name].mjs",
96
+ chunkFilename: "[name].mjs",
97
+ assetModuleFilename: "res/[name][ext][query]",
98
+ libraryTarget: "module"
99
+ },
100
+ experiments: {
101
+ outputModule: true
102
+ },
103
+ performance: { hints: false },
104
+ node: false,
105
+ stats: "errors-warnings",
106
+ module: {
107
+ strictExportPresence: true,
108
+ rules: [
109
+ {
110
+ test: /\.m?js/,
111
+ resolve: {
112
+ fullySpecified: false
113
+ }
114
+ },
115
+ {
116
+ test: /\.ts$/,
117
+ exclude: /node_modules/,
118
+ loader: "ts-loader",
119
+ options: {
120
+ configFile: this._tsconfigFilePath,
121
+ errorFormatter: (msg) => {
122
+ return SdCliBuildResultUtil.getMessage({
123
+ filePath: msg.file,
124
+ line: msg.line,
125
+ char: msg.character,
126
+ code: "TS" + msg.code.toString(),
127
+ severity: msg.severity,
128
+ message: msg.content
129
+ });
130
+ }
131
+ }
132
+ },
133
+ {
134
+ test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico|otf|xlsx?|pptx?|docx?|zip|pfx|pkl)$/,
135
+ type: "asset/resource"
136
+ }
137
+ ]
138
+ },
139
+ plugins: [
140
+ new CopyWebpackPlugin({
141
+ patterns: ["assets/"].map((item) => ({
142
+ context: this._rootPath,
143
+ to: item,
144
+ from: `src/${item}`,
145
+ noErrorOnMissing: true,
146
+ force: true,
147
+ globOptions: {
148
+ dot: true,
149
+ followSymbolicLinks: false,
150
+ ignore: [
151
+ ".gitkeep",
152
+ "**/.DS_Store",
153
+ "**/Thumbs.db"
154
+ ].map((i) => PathUtil.posix(this._rootPath, i))
155
+ },
156
+ priority: 0
157
+ }))
158
+ }),
159
+ new webpack.EnvironmentPlugin({
160
+ SD_VERSION: this._getNpmConfig(this._rootPath).version,
161
+ ...this._config.env
162
+ }),
163
+ new ESLintWebpackPlugin({
164
+ context: this._rootPath,
165
+ extensions: ["ts", "js", "mjs", "cjs"],
166
+ fix: false,
167
+ threads: false,
168
+ formatter: (results) => {
169
+ const resultMessages = [];
170
+ for (const result of results) {
171
+ for (const msg of result.messages) {
172
+ const severity = msg.severity === 1 ? "warning" : msg.severity === 2 ? "error" : undefined;
173
+ if (severity === undefined)
174
+ continue;
175
+ resultMessages.push(SdCliBuildResultUtil.getMessage({
176
+ filePath: result.filePath,
177
+ line: msg.line,
178
+ char: msg.column,
179
+ code: msg.ruleId?.toString(),
180
+ severity,
181
+ message: msg.message
182
+ }));
183
+ }
184
+ }
185
+ return resultMessages.join(os.EOL);
186
+ }
187
+ }),
188
+ new webpack.ProgressPlugin({
189
+ handler: (per, msg, ...args) => {
190
+ const phaseText = msg ? ` - phase: ${msg}` : "";
191
+ const argsText = args.length > 0 ? ` - args: [${args.join(", ")}]` : "";
192
+ this._logger.debug(`Webpack 빌드 수행중...(${Math.round(per * 100)}%)${phaseText}${argsText}`);
193
+ }
194
+ })
195
+ ]
196
+ };
197
+ }
198
+ _getWebpackWatchConfig() {
199
+ const internalModuleCachePaths = FsUtil.findAllParentChildDirPaths("node_modules/!(@simplysm)", this._rootPath, this._workspaceRootPath);
200
+ const extModuleNames = this._findExternalModules(true).map((item) => item.name);
201
+ return webpackMerge.merge(this._webpackCommonConfig, {
202
+ mode: "development",
203
+ module: {
204
+ rules: [
205
+ {
206
+ test: /\.m?js$/,
207
+ enforce: "pre",
208
+ loader: "source-map-loader",
209
+ options: {
210
+ filterSourceMappingUrl: (mapUri, resourcePath) => {
211
+ return !resourcePath.includes("node_modules") || (/@simplysm[\\/]sd/).test(resourcePath);
212
+ }
213
+ }
214
+ }
215
+ ]
216
+ },
217
+ cache: { type: "memory", maxGenerations: 1 },
218
+ snapshot: {
219
+ immutablePaths: internalModuleCachePaths,
220
+ managedPaths: internalModuleCachePaths
221
+ },
222
+ optimization: {
223
+ moduleIds: "deterministic",
224
+ chunkIds: "named",
225
+ emitOnErrors: true
226
+ },
227
+ externals: extModuleNames
228
+ });
229
+ }
230
+ _getWebpackBuildConfig() {
231
+ const extModuleNames = this._findExternalModules(false).map((item) => item.name);
232
+ return webpackMerge.merge(this._webpackCommonConfig, {
233
+ mode: "production",
234
+ cache: false,
235
+ optimization: {
236
+ minimize: true,
237
+ minimizer: [
238
+ new TerserPlugin({
239
+ extractComments: false,
240
+ terserOptions: {
241
+ compress: true,
242
+ ecma: 2020,
243
+ sourceMap: false,
244
+ keep_classnames: true,
245
+ keep_fnames: true,
246
+ ie8: false,
247
+ safari10: false,
248
+ module: true,
249
+ format: {
250
+ comments: false
251
+ }
252
+ }
253
+ })
254
+ ],
255
+ moduleIds: "deterministic",
256
+ chunkIds: "deterministic",
257
+ emitOnErrors: false
258
+ },
259
+ plugins: [
260
+ new LicenseWebpackPlugin({
261
+ stats: { warnings: false, errors: false },
262
+ perChunkOutput: false,
263
+ outputFilename: "3rd_party_licenses.txt",
264
+ skipChildCompilers: true
265
+ })
266
+ ],
267
+ externals: extModuleNames
268
+ });
269
+ }
270
+ _findExternalModules(all) {
271
+ const loadedModuleNames = [];
272
+ const externalModules = [];
273
+ const fn = (currPath) => {
274
+ const npmConfig = this._getNpmConfig(currPath);
275
+ if (!npmConfig)
276
+ return;
277
+ const moduleNames = [
278
+ ...Object.keys(npmConfig.dependencies ?? {}),
279
+ ...Object.keys(npmConfig.peerDependencies ?? {}).filter((item) => !npmConfig.peerDependenciesMeta?.[item].optional)
280
+ ];
281
+ const optModuleNames = [
282
+ ...Object.keys(npmConfig.optionalDependencies ?? {}),
283
+ ...Object.keys(npmConfig.peerDependencies ?? {}).filter((item) => npmConfig.peerDependenciesMeta?.[item].optional)
284
+ ].distinct();
285
+ for (const moduleName of moduleNames) {
286
+ if (loadedModuleNames.includes(moduleName))
287
+ continue;
288
+ loadedModuleNames.push(moduleName);
289
+ const modulePath = FsUtil.findAllParentChildDirPaths("node_modules/" + moduleName, currPath, this._workspaceRootPath).first();
290
+ if (StringUtil.isNullOrEmpty(modulePath)) {
291
+ console.log(2, currPath, moduleName);
292
+ continue;
293
+ }
294
+ if (all || FsUtil.exists(path.resolve(modulePath, "binding.gyp"))) {
295
+ externalModules.push({ path: modulePath, name: moduleName });
296
+ }
297
+ fn(modulePath);
298
+ }
299
+ for (const optModuleName of optModuleNames) {
300
+ if (loadedModuleNames.includes(optModuleName))
301
+ continue;
302
+ loadedModuleNames.push(optModuleName);
303
+ const optModulePath = FsUtil.findAllParentChildDirPaths("node_modules/" + optModuleName, currPath, this._workspaceRootPath).first();
304
+ if (StringUtil.isNullOrEmpty(optModulePath)) {
305
+ console.log(1, currPath, optModuleName);
306
+ externalModules.push({ path: optModulePath, name: optModuleName });
307
+ continue;
308
+ }
309
+ if (all || FsUtil.exists(path.resolve(optModulePath, "binding.gyp"))) {
310
+ externalModules.push({ path: optModulePath, name: optModuleName });
311
+ }
312
+ fn(optModulePath);
313
+ }
314
+ };
315
+ fn(this._rootPath);
316
+ return externalModules.distinct();
317
+ }
318
+ _getNpmConfig(pkgPath) {
319
+ if (!this._npmConfigMap.has(pkgPath)) {
320
+ this._npmConfigMap.set(pkgPath, FsUtil.readJson(path.resolve(pkgPath, "package.json")));
321
+ }
322
+ return this._npmConfigMap.get(pkgPath);
323
+ }
324
+ }
325
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliServerBuilder.js","sourceRoot":"","sources":["../../src/builder/SdCliServerBuilder.ts"],"names":[],"mappings":"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"}
@@ -110,7 +110,7 @@ export class SdCliTsLibBuilder extends EventEmitter {
110
110
  }
111
111
  results.push(...diagnostics
112
112
  .filter((item) => [ts.DiagnosticCategory.Error, ts.DiagnosticCategory.Warning].includes(item.category))
113
- .map((item) => SdCliBuildResultUtil.convertDiagsToResult(item))
113
+ .map((item) => SdCliBuildResultUtil.convertFromTsDiag(item))
114
114
  .filterExists());
115
115
  if (results.some((item) => item.severity === "error")) {
116
116
  return results;
@@ -223,4 +223,4 @@ export class SdCliTsLibBuilder extends EventEmitter {
223
223
  return ts.parseJsonConfigFileContent(tsconfig, ts.sys, this._rootPath);
224
224
  }
225
225
  }
226
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliTsLibBuilder.js","sourceRoot":"","sources":["../../src/builder/SdCliTsLibBuilder.ts"],"names":[],"mappings":"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"}
226
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliTsLibBuilder.js","sourceRoot":"","sources":["../../src/builder/SdCliTsLibBuilder.ts"],"names":[],"mappings":"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"}
package/dist/commons.d.ts CHANGED
@@ -14,6 +14,9 @@ export interface INpmConfig {
14
14
  optionalDependencies?: Record<string, string>;
15
15
  devDependencies?: Record<string, string>;
16
16
  peerDependencies?: Record<string, string>;
17
+ peerDependenciesMeta?: Record<string, {
18
+ optional?: boolean;
19
+ }>;
17
20
  }
18
21
  export interface ITsconfig {
19
22
  compilerOptions?: {
@@ -34,14 +37,12 @@ export interface ISdCliConfig {
34
37
  packages: Record<string, TSdCliPackageConfig | undefined>;
35
38
  localUpdates?: Record<string, string>;
36
39
  }
37
- export declare type TSdCliPackageConfig = ISdCliLibPackageConfig | ISdCliNgLibPackageConfig;
40
+ export declare type TSdCliPackageConfig = ISdCliLibPackageConfig | ISdCliServerPackageConfig;
38
41
  export interface ISdCliLibPackageConfig {
39
42
  type: "library";
40
43
  publish?: "npm";
41
44
  }
42
- export interface ISdCliNgLibPackageConfig {
43
- type: "angular";
44
- }
45
45
  export interface ISdCliServerPackageConfig {
46
46
  type: "server";
47
+ env?: Record<string, string>;
47
48
  }
@@ -1,10 +1,13 @@
1
1
  export declare class SdCliLocalUpdate {
2
2
  private readonly _rootPath;
3
- private readonly _configFilePath?;
4
3
  private readonly _logger;
5
- constructor(_rootPath: string, _configFilePath?: string | undefined);
6
- runAsync(): Promise<void>;
7
- watchAsync(): Promise<void>;
4
+ constructor(_rootPath: string);
5
+ runAsync(opt: {
6
+ confFileRelPath: string;
7
+ }): Promise<void>;
8
+ watchAsync(opt: {
9
+ confFileRelPath: string;
10
+ }): Promise<void>;
8
11
  private _getUpdatePathInfosAsync;
9
12
  protected _getWatchPathsAsync(sourcePath: string): Promise<string[]>;
10
13
  }