@simplysm/sd-cli 7.0.26 → 7.0.40
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/.eslintrc.cjs +2 -2
- package/dist/bin/sd-cli.mjs +3 -1
- package/dist/build-tool/SdCliNgCacheCompilerHost.mjs +3 -3
- package/dist/builder/SdCliClientBuilder.d.ts +20 -0
- package/dist/builder/SdCliClientBuilder.mjs +419 -0
- package/dist/builder/SdCliJsLibBuilder.mjs +2 -2
- package/dist/builder/SdCliServerBuilder.d.ts +6 -4
- package/dist/builder/SdCliServerBuilder.mjs +175 -98
- package/dist/builder/SdCliTsLibBuilder.d.ts +5 -3
- package/dist/builder/SdCliTsLibBuilder.mjs +20 -21
- package/dist/commons.d.ts +10 -1
- package/dist/entry-points/SdCliLocalUpdate.mjs +15 -9
- package/dist/entry-points/SdCliNpm.mjs +8 -4
- package/dist/entry-points/SdCliPrepare.mjs +3 -2
- package/dist/entry-points/SdCliWorkspace.d.ts +1 -0
- package/dist/entry-points/SdCliWorkspace.mjs +57 -24
- package/dist/packages/SdCliPackage.d.ts +4 -4
- package/dist/packages/SdCliPackage.mjs +17 -17
- package/dist/utils/SdCliBuildResultUtil.mjs +4 -4
- package/dist/utils/SdCliNpmConfigUtil.d.ts +7 -0
- package/dist/utils/SdCliNpmConfigUtil.mjs +15 -0
- package/package.json +19 -7
- package/src/bin/sd-cli.ts +2 -0
- package/src/build-tool/SdCliNgCacheCompilerHost.ts +3 -3
- package/src/builder/SdCliClientBuilder.ts +453 -0
- package/src/builder/SdCliJsLibBuilder.ts +2 -2
- package/src/builder/SdCliServerBuilder.ts +195 -98
- package/src/builder/SdCliTsLibBuilder.ts +29 -24
- package/src/commons.ts +9 -1
- package/src/entry-points/SdCliLocalUpdate.ts +14 -8
- package/src/entry-points/SdCliNpm.ts +7 -3
- package/src/entry-points/SdCliPrepare.ts +2 -1
- package/src/entry-points/SdCliWorkspace.ts +65 -26
- package/src/packages/SdCliPackage.ts +18 -18
- package/src/utils/SdCliBuildResultUtil.ts +3 -3
- package/src/utils/SdCliNpmConfigUtil.ts +16 -0
- package/tsconfig.json +1 -1
package/.eslintrc.cjs
CHANGED
package/dist/bin/sd-cli.mjs
CHANGED
|
@@ -113,6 +113,7 @@ const logger = Logger.get(["simplysm", "sd-cli", "bin", "sd-cli"]);
|
|
|
113
113
|
confFileRelPath: argv.config ?? "simplysm.json",
|
|
114
114
|
optNames: argv.options ?? []
|
|
115
115
|
});
|
|
116
|
+
process.exit(0);
|
|
116
117
|
}
|
|
117
118
|
else if (argv._[0] === "publish") {
|
|
118
119
|
await new SdCliWorkspace(process.cwd())
|
|
@@ -127,5 +128,6 @@ const logger = Logger.get(["simplysm", "sd-cli", "bin", "sd-cli"]);
|
|
|
127
128
|
}
|
|
128
129
|
})().catch((err) => {
|
|
129
130
|
logger.error(err);
|
|
131
|
+
process.exit(1);
|
|
130
132
|
});
|
|
131
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
133
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2QtY2xpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jpbi9zZC1jbGkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUVBLE9BQU8sS0FBSyxNQUFNLE9BQU8sQ0FBQztBQUMxQixPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3hDLE9BQU8sRUFBRSxNQUFNLEVBQUUsY0FBYyxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDaEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ2hFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ3BFLE9BQU8sZ0JBQWdCLE1BQU0sb0JBQW9CLENBQUM7QUFDbEQsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUU1RCxnQkFBZ0IsQ0FBQyxPQUFPLEVBQUUsQ0FBQztBQUUzQixLQUFLLENBQUMsZUFBZSxHQUFHLFFBQVEsQ0FBQztBQUVqQyxNQUFNLElBQUksR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztLQUN0QyxPQUFPLENBQUMsS0FBSyxDQUFDO0tBQ2QsSUFBSSxDQUFDLE1BQU0sRUFBRSxLQUFLLENBQUM7S0FDbkIsS0FBSyxDQUFDLE1BQU0sRUFBRSxHQUFHLENBQUM7S0FDbEIsT0FBTyxDQUFDO0lBQ1AsS0FBSyxFQUFFO1FBQ0wsSUFBSSxFQUFFLFNBQVM7UUFDZixRQUFRLEVBQUUsb0JBQW9CO1FBQzlCLE9BQU8sRUFBRSxLQUFLO0tBQ2Y7Q0FDRixDQUFDO0tBQ0QsT0FBTyxDQUNOLFNBQVMsRUFDVCxXQUFXLEVBQ1gsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQzVCO0tBQ0EsT0FBTyxDQUNOLFFBQVEs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
|
|
@@ -12,7 +12,7 @@ export class SdCliNgCacheCompilerHost {
|
|
|
12
12
|
return cache.content;
|
|
13
13
|
};
|
|
14
14
|
cacheCompilerHost["transformResource"] = async (data, context) => {
|
|
15
|
-
if (context.resourceFile || context.type !== "style") {
|
|
15
|
+
if (context.resourceFile != null || context.type !== "style") {
|
|
16
16
|
return null;
|
|
17
17
|
}
|
|
18
18
|
const cache = sourceFileCache.getOrCreate(PathUtil.posix(context.containingFile), {});
|
|
@@ -22,7 +22,7 @@ export class SdCliNgCacheCompilerHost {
|
|
|
22
22
|
importer: {
|
|
23
23
|
findFileUrl: (url) => {
|
|
24
24
|
if (!url.startsWith("~"))
|
|
25
|
-
return
|
|
25
|
+
return pathToFileURL(url);
|
|
26
26
|
return new URL(url.substring(1), pathToFileURL("node_modules"));
|
|
27
27
|
}
|
|
28
28
|
}
|
|
@@ -33,4 +33,4 @@ export class SdCliNgCacheCompilerHost {
|
|
|
33
33
|
return cacheCompilerHost;
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
36
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2RDbGlOZ0NhY2hlQ29tcGlsZXJIb3N0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2J1aWxkLXRvb2wvU2RDbGlOZ0NhY2hlQ29tcGlsZXJIb3N0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNsRCxPQUFPLElBQUksTUFBTSxNQUFNLENBQUM7QUFDeEIsT0FBTyxFQUFFLGFBQWEsRUFBRSxHQUFHLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFekMsTUFBTSxPQUFPLHdCQUF3QjtJQUM1QixNQUFNLENBQUMsSUFBSSxDQUFDLFlBQTZCLEVBQzdCLGVBQXdDO1FBQ3pELE1BQU0saUJBQWlCLEdBQUcsRUFBRSxHQUFHLFlBQVksRUFBRSxDQUFDO1FBRTlDLGlCQUFpQixDQUFDLGNBQWMsQ0FBQyxHQUFHLENBQUMsUUFBZ0IsRUFBRSxFQUFFO1lBQ3ZELE1BQU0sS0FBSyxHQUFHLGVBQWUsQ0FBQyxXQUFXLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztZQUN4RSxJQUFJLEtBQUssQ0FBQyxPQUFPLEtBQUssU0FBUyxFQUFFO2dCQUMvQixLQUFLLENBQUMsT0FBTyxHQUFHLFlBQVksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLGlCQUFpQixFQUFFLFFBQVEsQ0FBQyxDQUFDO2FBQ3pFO1lBQ0QsT0FBTyxLQUFLLENBQUMsT0FBTyxDQUFDO1FBQ3ZCLENBQUMsQ0FBQztRQUVGLGlCQUFpQixDQUFDLG1CQUFtQixDQUFDLEdBQUcsS0FBSyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsRUFBRTtZQUMvRCxJQUFJLE9BQU8sQ0FBQyxZQUFZLElBQUksSUFBSSxJQUFJLE9BQU8sQ0FBQyxJQUFJLEtBQUssT0FBTyxFQUFFO2dCQUM1RCxPQUFPLElBQUksQ0FBQzthQUNiO1lBRUQsTUFBTSxLQUFLLEdBQUcsZUFBZSxDQUFDLFdBQVcsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxjQUFjLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztZQUN0RixJQUFJLEtBQUssQ0FBQyxZQUFZLEtBQUssU0FBUyxFQUFFO2dCQUNwQyxLQUFLLENBQUMsWUFBWSxHQUFHLENBQ25CLE1BQU0sSUFBSSxDQUFDLGtCQUFrQixDQUFDLElBQUksRUFBRTtvQkFDbEMsR0FBRyxFQUFFLElBQUksR0FBRyxDQUFFLE9BQU8sQ0FBQyxjQUF5QixHQUFHLFVBQVUsQ0FBQztvQkFDN0QsUUFBUSxFQUFFO3dCQUNSLFdBQVcsRUFBRSxDQUFDLEdBQUcsRUFBRSxFQUFFOzRCQUNuQixJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUM7Z0NBQUUsT0FBTyxhQUFhLENBQUMsR0FBRyxDQUFDLENBQUM7NEJBQ3BELE9BQU8sSUFBSSxHQUFHLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsRUFBRSxhQUFhLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQzt3QkFDbEUsQ0FBQztxQkFDRjtpQkFDRixDQUFDLENBQ0gsQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFLENBQUM7YUFDbEI7WUFDRCxPQUFPLEVBQUUsT0FBTyxFQUFFLEtBQUssQ0FBQyxZQUFZLEVBQUUsQ0FBQztRQUN6QyxDQUFDLENBQUM7UUFFRixPQUFPLGlCQUFpQixDQUFDO0lBQzNCLENBQUM7Q0FDRiJ9
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
import { ISdCliClientPackageConfig, ISdCliPackageBuildResult } from "../commons";
|
|
3
|
+
import { EventEmitter } from "events";
|
|
4
|
+
import { NextHandleFunction } from "connect";
|
|
5
|
+
export declare class SdCliClientBuilder extends EventEmitter {
|
|
6
|
+
private readonly _rootPath;
|
|
7
|
+
private readonly _config;
|
|
8
|
+
private readonly _workspaceRootPath;
|
|
9
|
+
private readonly _logger;
|
|
10
|
+
private readonly _tsconfigFilePath;
|
|
11
|
+
private readonly _parsedTsconfig;
|
|
12
|
+
private readonly _npmConfigMap;
|
|
13
|
+
constructor(_rootPath: string, _config: ISdCliClientPackageConfig, _workspaceRootPath: string);
|
|
14
|
+
on(event: "change", listener: () => void): this;
|
|
15
|
+
on(event: "complete", listener: (results: ISdCliPackageBuildResult[]) => void): this;
|
|
16
|
+
watchAsync(): Promise<NextHandleFunction[]>;
|
|
17
|
+
buildAsync(): Promise<ISdCliPackageBuildResult[]>;
|
|
18
|
+
private _getWebpackConfig;
|
|
19
|
+
private _getNpmConfig;
|
|
20
|
+
}
|
|
@@ -0,0 +1,419 @@
|
|
|
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 { NamedChunksPlugin } from "@angular-devkit/build-angular/src/webpack/plugins/named-chunks-plugin";
|
|
8
|
+
import { AnyComponentStyleBudgetChecker, CommonJsUsageWarnPlugin, DedupeModuleResolvePlugin, SuppressExtractedTextChunksWebpackPlugin } from "@angular-devkit/build-angular/src/webpack/plugins";
|
|
9
|
+
import CopyWebpackPlugin from "copy-webpack-plugin";
|
|
10
|
+
import MiniCssExtractPlugin from "mini-css-extract-plugin";
|
|
11
|
+
import { AngularWebpackPlugin } from "@ngtools/webpack";
|
|
12
|
+
import { IndexHtmlWebpackPlugin } from "@angular-devkit/build-angular/src/webpack/plugins/index-html-webpack-plugin";
|
|
13
|
+
import { createHash } from "crypto";
|
|
14
|
+
import { SassWorkerImplementation } from "@angular-devkit/build-angular/src/sass/sass-service";
|
|
15
|
+
import { HmrLoader } from "@angular-devkit/build-angular/src/webpack/plugins/hmr/hmr-loader";
|
|
16
|
+
import wdm from "webpack-dev-middleware";
|
|
17
|
+
import whm from "webpack-hot-middleware";
|
|
18
|
+
import { LicenseWebpackPlugin } from "license-webpack-plugin";
|
|
19
|
+
import { Type } from "@angular-devkit/build-angular";
|
|
20
|
+
import NodePolyfillPlugin from "node-polyfill-webpack-plugin";
|
|
21
|
+
export class SdCliClientBuilder extends EventEmitter {
|
|
22
|
+
constructor(_rootPath, _config, _workspaceRootPath) {
|
|
23
|
+
super();
|
|
24
|
+
this._rootPath = _rootPath;
|
|
25
|
+
this._config = _config;
|
|
26
|
+
this._workspaceRootPath = _workspaceRootPath;
|
|
27
|
+
this._logger = Logger.get(["simplysm", "sd-cli", this.constructor.name]);
|
|
28
|
+
this._npmConfigMap = new Map();
|
|
29
|
+
// tsconfig
|
|
30
|
+
this._tsconfigFilePath = path.resolve(this._rootPath, "tsconfig-build.json");
|
|
31
|
+
const tsconfig = FsUtil.readJson(this._tsconfigFilePath);
|
|
32
|
+
this._parsedTsconfig = ts.parseJsonConfigFileContent(tsconfig, ts.sys, this._rootPath);
|
|
33
|
+
}
|
|
34
|
+
on(event, listener) {
|
|
35
|
+
return super.on(event, listener);
|
|
36
|
+
}
|
|
37
|
+
async watchAsync() {
|
|
38
|
+
// DIST 비우기
|
|
39
|
+
await FsUtil.removeAsync(this._parsedTsconfig.options.outDir);
|
|
40
|
+
// 빌드 준비
|
|
41
|
+
const webpackConfig = this._getWebpackConfig(true);
|
|
42
|
+
const compiler = webpack(webpackConfig);
|
|
43
|
+
return await new Promise((resolve, reject) => {
|
|
44
|
+
compiler.hooks.watchRun.tapAsync(this.constructor.name, (args, callback) => {
|
|
45
|
+
this.emit("change");
|
|
46
|
+
callback();
|
|
47
|
+
this._logger.debug("Webpack 빌드 수행...");
|
|
48
|
+
});
|
|
49
|
+
compiler.hooks.failed.tap(this.constructor.name, (err) => {
|
|
50
|
+
reject(err);
|
|
51
|
+
return;
|
|
52
|
+
});
|
|
53
|
+
compiler.hooks.done.tap(this.constructor.name, (stats) => {
|
|
54
|
+
// 결과 반환
|
|
55
|
+
const results = SdCliBuildResultUtil.convertFromWebpackStats(stats);
|
|
56
|
+
this.emit("complete", results);
|
|
57
|
+
// 마무리
|
|
58
|
+
this._logger.debug("Webpack 빌드 완료");
|
|
59
|
+
resolve([devMiddleware, hotMiddleware]);
|
|
60
|
+
});
|
|
61
|
+
const devMiddleware = wdm(compiler, {
|
|
62
|
+
publicPath: webpackConfig.output.publicPath,
|
|
63
|
+
index: "index.html",
|
|
64
|
+
stats: false
|
|
65
|
+
});
|
|
66
|
+
const hotMiddleware = whm(compiler, {
|
|
67
|
+
path: `${webpackConfig.output.publicPath}__webpack_hmr`,
|
|
68
|
+
log: false
|
|
69
|
+
});
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
async buildAsync() {
|
|
73
|
+
// DIST 비우기
|
|
74
|
+
await FsUtil.removeAsync(this._parsedTsconfig.options.outDir);
|
|
75
|
+
// 빌드
|
|
76
|
+
this._logger.debug("Webpack 빌드 수행...");
|
|
77
|
+
const webpackConfig = this._getWebpackConfig(false);
|
|
78
|
+
const compiler = webpack(webpackConfig);
|
|
79
|
+
const buildResults = await new Promise((resolve, reject) => {
|
|
80
|
+
compiler.run((err, stats) => {
|
|
81
|
+
if (err != null || stats == null) {
|
|
82
|
+
reject(err);
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
85
|
+
// 결과 반환
|
|
86
|
+
const results = SdCliBuildResultUtil.convertFromWebpackStats(stats);
|
|
87
|
+
resolve(results);
|
|
88
|
+
});
|
|
89
|
+
});
|
|
90
|
+
// 마무리
|
|
91
|
+
this._logger.debug("Webpack 빌드 완료");
|
|
92
|
+
return buildResults;
|
|
93
|
+
}
|
|
94
|
+
_getWebpackConfig(watch) {
|
|
95
|
+
const npmConfig = this._getNpmConfig(this._rootPath);
|
|
96
|
+
const pkgVersion = npmConfig.version;
|
|
97
|
+
const pkgKey = npmConfig.name.split("/").last();
|
|
98
|
+
const publicPath = `/${pkgKey}/`;
|
|
99
|
+
const cacheBasePath = path.resolve(this._rootPath, ".angular");
|
|
100
|
+
const cachePath = path.resolve(cacheBasePath, pkgVersion);
|
|
101
|
+
const distPath = this._parsedTsconfig.options.outDir;
|
|
102
|
+
const sassImplementation = new SassWorkerImplementation();
|
|
103
|
+
const mainFilePath = path.resolve(this._rootPath, "src/main.ts");
|
|
104
|
+
const polyfillsFilePath = path.resolve(this._rootPath, "src/polyfills.ts");
|
|
105
|
+
const stylesFilePath = path.resolve(this._rootPath, "src/styles.scss");
|
|
106
|
+
return {
|
|
107
|
+
mode: watch ? "development" : "production",
|
|
108
|
+
devtool: false,
|
|
109
|
+
target: ["web", "es2015"],
|
|
110
|
+
profile: false,
|
|
111
|
+
resolve: {
|
|
112
|
+
roots: [this._rootPath],
|
|
113
|
+
extensions: [".ts", ".tsx", ".mjs", ".js"],
|
|
114
|
+
symlinks: true,
|
|
115
|
+
modules: [this._workspaceRootPath, "node_modules"],
|
|
116
|
+
mainFields: ["es2015", "browser", "module", "main"],
|
|
117
|
+
conditionNames: ["es2015", "..."]
|
|
118
|
+
},
|
|
119
|
+
resolveLoader: {
|
|
120
|
+
symlinks: true
|
|
121
|
+
},
|
|
122
|
+
context: this._workspaceRootPath,
|
|
123
|
+
entry: {
|
|
124
|
+
main: [
|
|
125
|
+
...watch ? [
|
|
126
|
+
`webpack-hot-middleware/client?path=${publicPath}__webpack_hmr&timeout=20000&reload=true&overlay=true`
|
|
127
|
+
] : [],
|
|
128
|
+
mainFilePath
|
|
129
|
+
],
|
|
130
|
+
...FsUtil.exists(polyfillsFilePath) ? { polyfills: polyfillsFilePath } : {},
|
|
131
|
+
...FsUtil.exists(stylesFilePath) ? { styles: stylesFilePath } : {}
|
|
132
|
+
},
|
|
133
|
+
output: {
|
|
134
|
+
uniqueName: pkgKey,
|
|
135
|
+
hashFunction: "xxhash64",
|
|
136
|
+
clean: true,
|
|
137
|
+
path: distPath,
|
|
138
|
+
publicPath,
|
|
139
|
+
filename: "[name].js",
|
|
140
|
+
chunkFilename: "[name].js",
|
|
141
|
+
libraryTarget: undefined,
|
|
142
|
+
crossOriginLoading: false,
|
|
143
|
+
trustedTypes: "angular#bundler",
|
|
144
|
+
scriptType: "module"
|
|
145
|
+
},
|
|
146
|
+
watch: false,
|
|
147
|
+
watchOptions: { poll: undefined, ignored: undefined },
|
|
148
|
+
performance: { hints: false },
|
|
149
|
+
ignoreWarnings: [
|
|
150
|
+
/Failed to parse source map from/,
|
|
151
|
+
/Add postcss as project dependency/,
|
|
152
|
+
/"@charset" must be the first rule in the file/
|
|
153
|
+
],
|
|
154
|
+
experiments: { backCompat: false, syncWebAssembly: true, asyncWebAssembly: true },
|
|
155
|
+
infrastructureLogging: { level: "error" },
|
|
156
|
+
stats: "errors-warnings",
|
|
157
|
+
cache: {
|
|
158
|
+
type: "filesystem",
|
|
159
|
+
profile: watch ? undefined : false,
|
|
160
|
+
cacheDirectory: path.resolve(cachePath, "angular-webpack"),
|
|
161
|
+
maxMemoryGenerations: 1,
|
|
162
|
+
name: createHash("sha1").update(pkgVersion).digest("hex")
|
|
163
|
+
},
|
|
164
|
+
node: false,
|
|
165
|
+
optimization: {
|
|
166
|
+
minimizer: [],
|
|
167
|
+
moduleIds: "deterministic",
|
|
168
|
+
chunkIds: watch ? "named" : "deterministic",
|
|
169
|
+
emitOnErrors: watch,
|
|
170
|
+
runtimeChunk: "single",
|
|
171
|
+
splitChunks: {
|
|
172
|
+
maxAsyncRequests: Infinity,
|
|
173
|
+
cacheGroups: {
|
|
174
|
+
default: {
|
|
175
|
+
chunks: "async",
|
|
176
|
+
minChunks: 2,
|
|
177
|
+
priority: 10
|
|
178
|
+
},
|
|
179
|
+
common: {
|
|
180
|
+
name: "common",
|
|
181
|
+
chunks: "async",
|
|
182
|
+
minChunks: 2,
|
|
183
|
+
enforce: true,
|
|
184
|
+
priority: 5
|
|
185
|
+
},
|
|
186
|
+
vendors: false,
|
|
187
|
+
defaultVendors: watch ? {
|
|
188
|
+
name: "vendor",
|
|
189
|
+
chunks: (chunk) => chunk.name === "main",
|
|
190
|
+
enforce: true,
|
|
191
|
+
test: /[\\/]node_modules[\\/]/
|
|
192
|
+
} : false
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
},
|
|
196
|
+
plugins: [
|
|
197
|
+
new NodePolyfillPlugin(),
|
|
198
|
+
new NamedChunksPlugin(),
|
|
199
|
+
new DedupeModuleResolvePlugin(),
|
|
200
|
+
/*new webpack.ProgressPlugin({
|
|
201
|
+
handler: (per: number, msg: string, ...args: string[]) => {
|
|
202
|
+
const phaseText = msg ? ` - phase: ${msg}` : "";
|
|
203
|
+
const argsText = args.length > 0 ? ` - args: [${args.join(", ")}]` : "";
|
|
204
|
+
this._logger.debug(`Webpack 빌드 수행중...(${Math.round(per * 100)}%)${phaseText}${argsText}`);
|
|
205
|
+
}
|
|
206
|
+
}),*/
|
|
207
|
+
new CommonJsUsageWarnPlugin(),
|
|
208
|
+
...watch ? [] : [
|
|
209
|
+
new LicenseWebpackPlugin({
|
|
210
|
+
stats: { warnings: false, errors: false },
|
|
211
|
+
perChunkOutput: false,
|
|
212
|
+
outputFilename: "3rdpartylicenses.txt",
|
|
213
|
+
skipChildCompilers: true
|
|
214
|
+
})
|
|
215
|
+
],
|
|
216
|
+
new CopyWebpackPlugin({
|
|
217
|
+
patterns: [
|
|
218
|
+
...["favicon.ico", "assets/", "manifest.webmanifest"].map((item) => ({
|
|
219
|
+
context: this._rootPath,
|
|
220
|
+
to: item,
|
|
221
|
+
from: `src/${item}`,
|
|
222
|
+
noErrorOnMissing: true,
|
|
223
|
+
force: true,
|
|
224
|
+
globOptions: {
|
|
225
|
+
dot: true,
|
|
226
|
+
followSymbolicLinks: false,
|
|
227
|
+
ignore: [
|
|
228
|
+
".gitkeep",
|
|
229
|
+
"**/.DS_Store",
|
|
230
|
+
"**/Thumbs.db"
|
|
231
|
+
].map((i) => PathUtil.posix(this._rootPath, i))
|
|
232
|
+
},
|
|
233
|
+
priority: 0
|
|
234
|
+
}))
|
|
235
|
+
]
|
|
236
|
+
}),
|
|
237
|
+
...watch ? [
|
|
238
|
+
new webpack.SourceMapDevToolPlugin({
|
|
239
|
+
filename: "[file].map",
|
|
240
|
+
include: [/js$/, /css$/],
|
|
241
|
+
sourceRoot: "webpack:///",
|
|
242
|
+
moduleFilenameTemplate: "[resource-path]",
|
|
243
|
+
append: undefined
|
|
244
|
+
})
|
|
245
|
+
] : [],
|
|
246
|
+
new AngularWebpackPlugin({
|
|
247
|
+
tsconfig: this._tsconfigFilePath,
|
|
248
|
+
compilerOptions: {
|
|
249
|
+
sourceMap: watch,
|
|
250
|
+
declaration: false,
|
|
251
|
+
declarationMap: false,
|
|
252
|
+
preserveSymlinks: false
|
|
253
|
+
},
|
|
254
|
+
jitMode: false,
|
|
255
|
+
emitNgModuleScope: watch,
|
|
256
|
+
inlineStyleFileExtension: "scss"
|
|
257
|
+
}),
|
|
258
|
+
new AnyComponentStyleBudgetChecker(watch ? [] : [
|
|
259
|
+
{ type: Type.AnyComponentStyle, maximumWarning: "2kb", maximumError: "4kb" }
|
|
260
|
+
]),
|
|
261
|
+
{
|
|
262
|
+
apply: (compiler) => {
|
|
263
|
+
compiler.hooks.shutdown.tap("sass-worker", () => {
|
|
264
|
+
sassImplementation.close();
|
|
265
|
+
});
|
|
266
|
+
}
|
|
267
|
+
},
|
|
268
|
+
new MiniCssExtractPlugin({ filename: "[name].css" }),
|
|
269
|
+
new SuppressExtractedTextChunksWebpackPlugin(),
|
|
270
|
+
// NgBuildAnalyticsPlugin,
|
|
271
|
+
new IndexHtmlWebpackPlugin({
|
|
272
|
+
indexPath: path.resolve(this._rootPath, "src/index.html"),
|
|
273
|
+
outputPath: "index.html",
|
|
274
|
+
baseHref: publicPath,
|
|
275
|
+
entrypoints: [
|
|
276
|
+
["runtime", true],
|
|
277
|
+
["polyfills", true],
|
|
278
|
+
["styles", false],
|
|
279
|
+
["vendor", true],
|
|
280
|
+
["main", true]
|
|
281
|
+
],
|
|
282
|
+
deployUrl: undefined,
|
|
283
|
+
sri: false,
|
|
284
|
+
cache: {
|
|
285
|
+
enabled: true,
|
|
286
|
+
basePath: cacheBasePath,
|
|
287
|
+
path: cachePath
|
|
288
|
+
},
|
|
289
|
+
postTransform: undefined,
|
|
290
|
+
optimization: {
|
|
291
|
+
scripts: !watch,
|
|
292
|
+
styles: { minify: !watch, inlineCritical: !watch },
|
|
293
|
+
fonts: { inline: !watch }
|
|
294
|
+
},
|
|
295
|
+
crossOrigin: "none",
|
|
296
|
+
lang: undefined
|
|
297
|
+
}),
|
|
298
|
+
...watch ? [
|
|
299
|
+
new webpack.HotModuleReplacementPlugin()
|
|
300
|
+
] : []
|
|
301
|
+
],
|
|
302
|
+
module: {
|
|
303
|
+
strictExportPresence: true,
|
|
304
|
+
parser: { javascript: { url: false, worker: false } },
|
|
305
|
+
rules: [
|
|
306
|
+
{
|
|
307
|
+
test: /\.?(svg|html)$/,
|
|
308
|
+
resourceQuery: /\?ngResource/,
|
|
309
|
+
type: "asset/source"
|
|
310
|
+
},
|
|
311
|
+
{
|
|
312
|
+
test: /[/\\]rxjs[/\\]add[/\\].+\.js$/,
|
|
313
|
+
sideEffects: true
|
|
314
|
+
},
|
|
315
|
+
{
|
|
316
|
+
test: /\.[cm]?[tj]sx?$/,
|
|
317
|
+
resolve: { fullySpecified: false },
|
|
318
|
+
exclude: [/[/\\](?:core-js|@babel|tslib|web-animations-js|web-streams-polyfill)[/\\]/],
|
|
319
|
+
use: [
|
|
320
|
+
{
|
|
321
|
+
loader: "@angular-devkit/build-angular/src/babel/webpack-loader",
|
|
322
|
+
options: {
|
|
323
|
+
cacheDirectory: path.resolve(cachePath, "babel-webpack"),
|
|
324
|
+
scriptTarget: ts.ScriptTarget.ES2017,
|
|
325
|
+
aot: true,
|
|
326
|
+
optimize: !watch,
|
|
327
|
+
instrumentCode: undefined
|
|
328
|
+
}
|
|
329
|
+
}
|
|
330
|
+
]
|
|
331
|
+
},
|
|
332
|
+
...watch ? [
|
|
333
|
+
{
|
|
334
|
+
test: /\.[cm]?jsx?$/,
|
|
335
|
+
enforce: "pre",
|
|
336
|
+
loader: "source-map-loader",
|
|
337
|
+
options: {
|
|
338
|
+
filterSourceMappingUrl: (mapUri, resourcePath) => {
|
|
339
|
+
return !resourcePath.includes("node_modules") || (/@simplysm[\\/]sd/).test(resourcePath);
|
|
340
|
+
}
|
|
341
|
+
}
|
|
342
|
+
}
|
|
343
|
+
] : [],
|
|
344
|
+
{
|
|
345
|
+
test: /\.[cm]?tsx?$/,
|
|
346
|
+
loader: "@ngtools/webpack",
|
|
347
|
+
exclude: [/[/\\](?:css-loader|mini-css-extract-plugin|webpack-dev-server|webpack)[/\\]/]
|
|
348
|
+
},
|
|
349
|
+
{
|
|
350
|
+
test: /\.css$/i,
|
|
351
|
+
type: "asset/source"
|
|
352
|
+
},
|
|
353
|
+
{
|
|
354
|
+
test: /\.scss$/i,
|
|
355
|
+
rules: [
|
|
356
|
+
{
|
|
357
|
+
oneOf: [
|
|
358
|
+
{
|
|
359
|
+
use: [
|
|
360
|
+
{
|
|
361
|
+
loader: MiniCssExtractPlugin.loader
|
|
362
|
+
},
|
|
363
|
+
{
|
|
364
|
+
loader: "css-loader",
|
|
365
|
+
options: { url: false, sourceMap: watch }
|
|
366
|
+
}
|
|
367
|
+
],
|
|
368
|
+
include: [stylesFilePath],
|
|
369
|
+
resourceQuery: { not: [/\?ngResource/] }
|
|
370
|
+
},
|
|
371
|
+
{
|
|
372
|
+
type: "asset/source",
|
|
373
|
+
resourceQuery: /\?ngResource/
|
|
374
|
+
}
|
|
375
|
+
]
|
|
376
|
+
},
|
|
377
|
+
{
|
|
378
|
+
use: [
|
|
379
|
+
{
|
|
380
|
+
loader: "resolve-url-loader",
|
|
381
|
+
options: { sourceMap: watch }
|
|
382
|
+
},
|
|
383
|
+
{
|
|
384
|
+
loader: "sass-loader",
|
|
385
|
+
options: {
|
|
386
|
+
implementation: sassImplementation,
|
|
387
|
+
sourceMap: true,
|
|
388
|
+
sassOptions: {
|
|
389
|
+
fiber: false,
|
|
390
|
+
precision: 8,
|
|
391
|
+
includePaths: [],
|
|
392
|
+
outputStyle: "expanded",
|
|
393
|
+
quietDeps: true,
|
|
394
|
+
verbose: watch ? undefined : false
|
|
395
|
+
}
|
|
396
|
+
}
|
|
397
|
+
}
|
|
398
|
+
]
|
|
399
|
+
}
|
|
400
|
+
]
|
|
401
|
+
},
|
|
402
|
+
...watch ? [
|
|
403
|
+
{
|
|
404
|
+
loader: HmrLoader,
|
|
405
|
+
include: [mainFilePath]
|
|
406
|
+
}
|
|
407
|
+
] : []
|
|
408
|
+
]
|
|
409
|
+
}
|
|
410
|
+
};
|
|
411
|
+
}
|
|
412
|
+
_getNpmConfig(pkgPath) {
|
|
413
|
+
if (!this._npmConfigMap.has(pkgPath)) {
|
|
414
|
+
this._npmConfigMap.set(pkgPath, FsUtil.readJson(path.resolve(pkgPath, "package.json")));
|
|
415
|
+
}
|
|
416
|
+
return this._npmConfigMap.get(pkgPath);
|
|
417
|
+
}
|
|
418
|
+
}
|
|
419
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliClientBuilder.js","sourceRoot":"","sources":["../../src/builder/SdCliClientBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uEAAuE,CAAC;AAC1G,OAAO,EACL,8BAA8B,EAC9B,uBAAuB,EACvB,yBAAyB,EACzB,wCAAwC,EACzC,MAAM,mDAAmD,CAAC;AAC3D,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,oBAAoB,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,6EAA6E,CAAC;AACrH,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,wBAAwB,EAAE,MAAM,qDAAqD,CAAC;AAC/F,OAAO,EAAE,SAAS,EAAE,MAAM,kEAAkE,CAAC;AAC7F,OAAO,GAAG,MAAM,wBAAwB,CAAC;AACzC,OAAO,GAAG,MAAM,wBAAwB,CAAC;AAEzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,+BAA+B,CAAC;AACrD,OAAO,kBAAkB,MAAM,8BAA8B,CAAC;AAE9D,MAAM,OAAO,kBAAmB,SAAQ,YAAY;IAOlD,YAAoC,SAAiB,EACjB,OAAkC,EAClC,kBAA0B;QAC5D,KAAK,EAAE,CAAC;QAH0B,cAAS,GAAT,SAAS,CAAQ;QACjB,YAAO,GAAP,OAAO,CAA2B;QAClC,uBAAkB,GAAlB,kBAAkB,CAAQ;QAR7C,YAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;QAIpE,kBAAa,GAAG,IAAI,GAAG,EAAsB,CAAC;QAO7D,WAAW;QACX,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC;QAC7E,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACzD,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC,0BAA0B,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACzF,CAAC;IAIe,EAAE,CAAC,KAAsB,EAAE,QAAkC;QAC3E,OAAO,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACnC,CAAC;IAEM,KAAK,CAAC,UAAU;QACrB,WAAW;QACX,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,MAAO,CAAC,CAAC;QAE/D,QAAQ;QACR,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACnD,MAAM,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;QACxC,OAAO,MAAM,IAAI,OAAO,CAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACjE,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;gBACzE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACpB,QAAQ,EAAE,CAAC;gBAEX,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YACzC,CAAC,CAAC,CAAC;YAEH,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE;gBACvD,MAAM,CAAC,GAAG,CAAC,CAAC;gBACZ,OAAO;YACT,CAAC,CAAC,CAAC;YAEH,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;gBACvD,QAAQ;gBACR,MAAM,OAAO,GAAG,oBAAoB,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;gBACpE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;gBAE/B,MAAM;gBACN,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;gBACpC,OAAO,CAAC,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC;YAC1C,CAAC,CAAC,CAAC;YAEH,MAAM,aAAa,GAAG,GAAG,CAAC,QAAQ,EAAE;gBAClC,UAAU,EAAE,aAAa,CAAC,MAAO,CAAC,UAAoB;gBACtD,KAAK,EAAE,YAAY;gBACnB,KAAK,EAAE,KAAK;aACb,CAAC,CAAC;YAEH,MAAM,aAAa,GAAG,GAAG,CAAC,QAAQ,EAAE;gBAClC,IAAI,EAAE,GAAG,aAAa,CAAC,MAAO,CAAC,UAAoB,eAAe;gBAClE,GAAG,EAAE,KAAK;aACX,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,UAAU;QACrB,WAAW;QACX,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,MAAO,CAAC,CAAC;QAE/D,KAAK;QACL,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACvC,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACpD,MAAM,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;QACxC,MAAM,YAAY,GAAG,MAAM,IAAI,OAAO,CAA6B,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrF,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBAC1B,IAAI,GAAG,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI,EAAE;oBAChC,MAAM,CAAC,GAAG,CAAC,CAAC;oBACZ,OAAO;iBACR;gBAED,QAAQ;gBACR,MAAM,OAAO,GAAG,oBAAoB,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;gBACpE,OAAO,CAAC,OAAO,CAAC,CAAC;YACnB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM;QACN,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QACpC,OAAO,YAAY,CAAC;IACtB,CAAC;IAEO,iBAAiB,CAAC,KAAc;QACtC,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAE,CAAC;QACtD,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,CAAC;QAErC,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAG,CAAC;QACjD,MAAM,UAAU,GAAG,IAAI,MAAM,GAAG,CAAC;QAEjC,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAC/D,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QAE1D,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC;QAErD,MAAM,kBAAkB,GAAG,IAAI,wBAAwB,EAAE,CAAC;QAE1D,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;QACjE,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;QAC3E,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;QAEvE,OAAO;YACL,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,YAAY;YAC1C,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC;YACzB,OAAO,EAAE,KAAK;YACd,OAAO,EAAE;gBACP,KAAK,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC;gBACvB,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC;gBAC1C,QAAQ,EAAE,IAAI;gBACd,OAAO,EAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE,cAAc,CAAC;gBAClD,UAAU,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC;gBACnD,cAAc,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC;aAClC;YACD,aAAa,EAAE;gBACb,QAAQ,EAAE,IAAI;aACf;YACD,OAAO,EAAE,IAAI,CAAC,kBAAkB;YAChC,KAAK,EAAE;gBACL,IAAI,EAAE;oBACJ,GAAG,KAAK,CAAC,CAAC,CAAC;wBACT,sCAAsC,UAAU,sDAAsD;qBACvG,CAAC,CAAC,CAAC,EAAE;oBACN,YAAY;iBACb;gBACD,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE;gBAC3E,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE;aACnE;YACD,MAAM,EAAE;gBACN,UAAU,EAAE,MAAM;gBAClB,YAAY,EAAE,UAAU;gBACxB,KAAK,EAAE,IAAI;gBACX,IAAI,EAAE,QAAQ;gBACd,UAAU;gBACV,QAAQ,EAAE,WAAW;gBACrB,aAAa,EAAE,WAAW;gBAC1B,aAAa,EAAE,SAAS;gBACxB,kBAAkB,EAAE,KAAK;gBACzB,YAAY,EAAE,iBAAiB;gBAC/B,UAAU,EAAE,QAAQ;aACrB;YACD,KAAK,EAAE,KAAK;YACZ,YAAY,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE;YACrD,WAAW,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;YAC7B,cAAc,EAAE;gBACd,iCAAiC;gBACjC,mCAAmC;gBACnC,+CAA+C;aAChD;YACD,WAAW,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE;YACjF,qBAAqB,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE;YACzC,KAAK,EAAE,iBAAiB;YACxB,KAAK,EAAE;gBACL,IAAI,EAAE,YAAY;gBAClB,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK;gBAClC,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,iBAAiB,CAAC;gBAC1D,oBAAoB,EAAE,CAAC;gBACvB,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC1D;YACD,IAAI,EAAE,KAAK;YACX,YAAY,EAAE;gBACZ,SAAS,EAAE,EAAE;gBACb,SAAS,EAAE,eAAe;gBAC1B,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe;gBAC3C,YAAY,EAAE,KAAK;gBACnB,YAAY,EAAE,QAAQ;gBACtB,WAAW,EAAE;oBACX,gBAAgB,EAAE,QAAQ;oBAC1B,WAAW,EAAE;wBACX,OAAO,EAAE;4BACP,MAAM,EAAE,OAAO;4BACf,SAAS,EAAE,CAAC;4BACZ,QAAQ,EAAE,EAAE;yBACb;wBACD,MAAM,EAAE;4BACN,IAAI,EAAE,QAAQ;4BACd,MAAM,EAAE,OAAO;4BACf,SAAS,EAAE,CAAC;4BACZ,OAAO,EAAE,IAAI;4BACb,QAAQ,EAAE,CAAC;yBACZ;wBACD,OAAO,EAAE,KAAK;wBACd,cAAc,EAAE,KAAK,CAAC,CAAC,CAAC;4BACtB,IAAI,EAAE,QAAQ;4BACd,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,MAAM;4BACxC,OAAO,EAAE,IAAI;4BACb,IAAI,EAAE,wBAAwB;yBAC/B,CAAC,CAAC,CAAC,KAAK;qBACV;iBACF;aACF;YACD,OAAO,EAAE;gBACP,IAAI,kBAAkB,EAAE;gBACxB,IAAI,iBAAiB,EAAE;gBACvB,IAAI,yBAAyB,EAAE;gBAC/B;;;;;;qBAMK;gBACL,IAAI,uBAAuB,EAAE;gBAC7B,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;oBACd,IAAI,oBAAoB,CAAC;wBACvB,KAAK,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE;wBACzC,cAAc,EAAE,KAAK;wBACrB,cAAc,EAAE,sBAAsB;wBACtC,kBAAkB,EAAE,IAAI;qBACzB,CAAC;iBACH;gBACD,IAAI,iBAAiB,CAAC;oBACpB,QAAQ,EAAE;wBACR,GAAG,CAAC,aAAa,EAAE,SAAS,EAAE,sBAAsB,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;4BACnE,OAAO,EAAE,IAAI,CAAC,SAAS;4BACvB,EAAE,EAAE,IAAI;4BACR,IAAI,EAAE,OAAO,IAAI,EAAE;4BACnB,gBAAgB,EAAE,IAAI;4BACtB,KAAK,EAAE,IAAI;4BACX,WAAW,EAAE;gCACX,GAAG,EAAE,IAAI;gCACT,mBAAmB,EAAE,KAAK;gCAC1B,MAAM,EAAE;oCACN,UAAU;oCACV,cAAc;oCACd,cAAc;iCACf,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;6BAChD;4BACD,QAAQ,EAAE,CAAC;yBACZ,CAAC,CAAC;qBACJ;iBACF,CAAC;gBACF,GAAG,KAAK,CAAC,CAAC,CAAC;oBACT,IAAI,OAAO,CAAC,sBAAsB,CAAC;wBACjC,QAAQ,EAAE,YAAY;wBACtB,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC;wBACxB,UAAU,EAAE,aAAa;wBACzB,sBAAsB,EAAE,iBAAiB;wBACzC,MAAM,EAAE,SAAS;qBAClB,CAAC;iBACH,CAAC,CAAC,CAAC,EAAE;gBACN,IAAI,oBAAoB,CAAC;oBACvB,QAAQ,EAAE,IAAI,CAAC,iBAAiB;oBAChC,eAAe,EAAE;wBACf,SAAS,EAAE,KAAK;wBAChB,WAAW,EAAE,KAAK;wBAClB,cAAc,EAAE,KAAK;wBACrB,gBAAgB,EAAE,KAAK;qBACxB;oBACD,OAAO,EAAE,KAAK;oBACd,iBAAiB,EAAE,KAAK;oBACxB,wBAAwB,EAAE,MAAM;iBACjC,CAAC;gBACF,IAAI,8BAA8B,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;oBAC9C,EAAE,IAAI,EAAE,IAAI,CAAC,iBAAiB,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE;iBAC7E,CAAC;gBACF;oBACE,KAAK,EAAE,CAAC,QAA0B,EAAE,EAAE;wBACpC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,aAAa,EAAE,GAAG,EAAE;4BAC9C,kBAAkB,CAAC,KAAK,EAAE,CAAC;wBAC7B,CAAC,CAAC,CAAC;oBACL,CAAC;iBACF;gBACD,IAAI,oBAAoB,CAAC,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC;gBACpD,IAAI,wCAAwC,EAAE;gBAC9C,0BAA0B;gBAC1B,IAAI,sBAAsB,CAAC;oBACzB,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC;oBACzD,UAAU,EAAE,YAAY;oBACxB,QAAQ,EAAE,UAAU;oBACpB,WAAW,EAAE;wBACX,CAAC,SAAS,EAAE,IAAI,CAAC;wBACjB,CAAC,WAAW,EAAE,IAAI,CAAC;wBACnB,CAAC,QAAQ,EAAE,KAAK,CAAC;wBACjB,CAAC,QAAQ,EAAE,IAAI,CAAC;wBAChB,CAAC,MAAM,EAAE,IAAI,CAAC;qBACf;oBACD,SAAS,EAAE,SAAS;oBACpB,GAAG,EAAE,KAAK;oBACV,KAAK,EAAE;wBACL,OAAO,EAAE,IAAI;wBACb,QAAQ,EAAE,aAAa;wBACvB,IAAI,EAAE,SAAS;qBAChB;oBACD,aAAa,EAAE,SAAS;oBACxB,YAAY,EAAE;wBACZ,OAAO,EAAE,CAAC,KAAK;wBACf,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,cAAc,EAAE,CAAC,KAAK,EAAE;wBAClD,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE;qBAC1B;oBACD,WAAW,EAAE,MAAM;oBACnB,IAAI,EAAE,SAAS;iBAChB,CAAC;gBACF,GAAG,KAAK,CAAC,CAAC,CAAC;oBACT,IAAI,OAAO,CAAC,0BAA0B,EAAE;iBACzC,CAAC,CAAC,CAAC,EAAE;aACE;YACV,MAAM,EAAE;gBACN,oBAAoB,EAAE,IAAI;gBAC1B,MAAM,EAAE,EAAE,UAAU,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;gBACrD,KAAK,EAAE;oBACL;wBACE,IAAI,EAAE,gBAAgB;wBACtB,aAAa,EAAE,cAAc;wBAC7B,IAAI,EAAE,cAAc;qBACrB;oBACD;wBACE,IAAI,EAAE,+BAA+B;wBACrC,WAAW,EAAE,IAAI;qBAClB;oBACD;wBACE,IAAI,EAAE,iBAAiB;wBACvB,OAAO,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE;wBAClC,OAAO,EAAE,CAAC,2EAA2E,CAAC;wBACtF,GAAG,EAAE;4BACH;gCACE,MAAM,EAAE,wDAAwD;gCAChE,OAAO,EAAE;oCACP,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,eAAe,CAAC;oCACxD,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM;oCACpC,GAAG,EAAE,IAAI;oCACT,QAAQ,EAAE,CAAC,KAAK;oCAChB,cAAc,EAAE,SAAS;iCAC1B;6BACF;yBACF;qBACF;oBACD,GAAG,KAAK,CAAC,CAAC,CAAC;wBACT;4BACE,IAAI,EAAE,cAAc;4BACpB,OAAO,EAAE,KAAc;4BACvB,MAAM,EAAE,mBAAmB;4BAC3B,OAAO,EAAE;gCACP,sBAAsB,EAAE,CAAC,MAAc,EAAE,YAAoB,EAAE,EAAE;oCAC/D,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gCAC3F,CAAC;6BACF;yBACF;qBACF,CAAC,CAAC,CAAC,EAAE;oBACN;wBACE,IAAI,EAAE,cAAc;wBACpB,MAAM,EAAE,kBAAkB;wBAC1B,OAAO,EAAE,CAAC,6EAA6E,CAAC;qBACzF;oBACD;wBACE,IAAI,EAAE,SAAS;wBACf,IAAI,EAAE,cAAc;qBACrB;oBACD;wBACE,IAAI,EAAE,UAAU;wBAChB,KAAK,EAAE;4BACL;gCACE,KAAK,EAAE;oCACL;wCACE,GAAG,EAAE;4CACH;gDACE,MAAM,EAAE,oBAAoB,CAAC,MAAM;6CACpC;4CACD;gDACE,MAAM,EAAE,YAAY;gDACpB,OAAO,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE;6CAC1C;yCACF;wCACD,OAAO,EAAE,CAAC,cAAc,CAAC;wCACzB,aAAa,EAAE,EAAE,GAAG,EAAE,CAAC,cAAc,CAAC,EAAE;qCACzC;oCACD;wCACE,IAAI,EAAE,cAAc;wCACpB,aAAa,EAAE,cAAc;qCAC9B;iCACF;6BACF;4BACD;gCACE,GAAG,EAAE;oCACH;wCACE,MAAM,EAAE,oBAAoB;wCAC5B,OAAO,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE;qCAC9B;oCACD;wCACE,MAAM,EAAE,aAAa;wCACrB,OAAO,EAAE;4CACP,cAAc,EAAE,kBAAkB;4CAClC,SAAS,EAAE,IAAI;4CACf,WAAW,EAAE;gDACX,KAAK,EAAE,KAAK;gDACZ,SAAS,EAAE,CAAC;gDACZ,YAAY,EAAE,EAAE;gDAChB,WAAW,EAAE,UAAU;gDACvB,SAAS,EAAE,IAAI;gDACf,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK;6CACnC;yCACF;qCACF;iCACF;6BACF;yBACF;qBACF;oBACD,GAAG,KAAK,CAAC,CAAC,CAAC;wBACT;4BACE,MAAM,EAAE,SAAS;4BACjB,OAAO,EAAE,CAAC,YAAY,CAAC;yBACxB;qBACF,CAAC,CAAC,CAAC,EAAE;iBACP;aACF;SACF,CAAC;IACJ,CAAC;IAEO,aAAa,CAAC,OAAe;QACnC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YACpC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC;SACzF;QACD,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;CACF"}
|
|
@@ -16,7 +16,7 @@ export class SdCliJsLibBuilder extends EventEmitter {
|
|
|
16
16
|
this.emit("change");
|
|
17
17
|
const relatedPaths = await this.getRelatedPathsAsync();
|
|
18
18
|
const watcher = SdFsWatcher.watch(relatedPaths);
|
|
19
|
-
watcher.onChange(async (changeInfos) => {
|
|
19
|
+
watcher.onChange({}, async (changeInfos) => {
|
|
20
20
|
const changeFilePaths = changeInfos.filter((item) => ["add", "change", "unlink"].includes(item.event)).map((item) => item.path);
|
|
21
21
|
if (changeFilePaths.length === 0)
|
|
22
22
|
return;
|
|
@@ -47,4 +47,4 @@ export class SdCliJsLibBuilder extends EventEmitter {
|
|
|
47
47
|
return [...mySourceFilePaths, path.resolve(this._rootPath, ".eslintrc.cjs")].distinct();
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2RDbGlKc0xpYkJ1aWxkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYnVpbGRlci9TZENsaUpzTGliQnVpbGRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sUUFBUSxDQUFDO0FBQ3RDLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3JFLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQzdCLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBRXRFLE1BQU0sT0FBTyxpQkFBa0IsU0FBUSxZQUFZO0lBS2pELFlBQW9DLFNBQWlCO1FBQ25ELEtBQUssRUFBRSxDQUFDO1FBRDBCLGNBQVMsR0FBVCxTQUFTLENBQVE7UUFKcEMsWUFBTyxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxVQUFVLEVBQUUsUUFBUSxFQUFFLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQU1uRixJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksa0JBQWtCLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ3hELENBQUM7SUFJZSxFQUFFLENBQUMsS0FBc0IsRUFBRSxRQUFrQztRQUMzRSxPQUFPLEtBQUssQ0FBQyxFQUFFLENBQUMsS0FBSyxFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBQ25DLENBQUM7SUFFTSxLQUFLLENBQUMsVUFBVTtRQUNyQixJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBRXBCLE1BQU0sWUFBWSxHQUFHLE1BQU0sSUFBSSxDQUFDLG9CQUFvQixFQUFFLENBQUM7UUFDdkQsTUFBTSxPQUFPLEdBQUcsV0FBVyxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsQ0FBQztRQUNoRCxPQUFPLENBQUMsUUFBUSxDQUFDLEVBQUUsRUFBRSxLQUFLLEVBQUUsV0FBVyxFQUFFLEVBQUU7WUFDekMsTUFBTSxlQUFlLEdBQUcsV0FBVyxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsQ0FBQyxLQUFLLEVBQUUsUUFBUSxFQUFFLFFBQVEsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNoSSxJQUFJLGVBQWUsQ0FBQyxNQUFNLEtBQUssQ0FBQztnQkFBRSxPQUFPO1lBRXpDLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLFVBQVUsRUFBRSxXQUFXLENBQUMsQ0FBQztZQUM1QyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBRXBCLE1BQU0saUJBQWlCLEdBQUcsTUFBTSxJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxlQUFlLENBQUMsQ0FBQztZQUV4RSxNQUFNLGlCQUFpQixHQUFHLE1BQU0sSUFBSSxDQUFDLG9CQUFvQixFQUFFLENBQUM7WUFDNUQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO1lBRS9CLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLGlCQUFpQixDQUFDLENBQUM7UUFDM0MsQ0FBQyxDQUFDLENBQUM7UUFFSCxLQUFLO1FBQ0wsTUFBTSxZQUFZLEdBQUcsTUFBTSxJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxZQUFZLENBQUMsQ0FBQztRQUVoRSxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxZQUFZLENBQUMsQ0FBQztJQUN0QyxDQUFDO0lBRU0sS0FBSyxDQUFDLFVBQVU7UUFDckIsTUFBTSxZQUFZLEdBQUcsTUFBTSxJQUFJLENBQUMsb0JBQW9CLEVBQUUsQ0FBQztRQUN2RCxPQUFPLE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsWUFBWSxDQUFDLENBQUM7SUFDcEQsQ0FBQztJQUVPLEtBQUssQ0FBQyxvQkFBb0I7UUFDaEMsTUFBTSxnQkFBZ0IsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsSUFBSSxFQUFFLDBCQUEwQixDQUFDLENBQUM7UUFDeEYsTUFBTSxpQkFBaUIsR0FBRyxNQUFNLE1BQU0sQ0FBQyxTQUFTLENBQUMsZ0JBQWdCLEVBQUU7WUFDakUsTUFBTSxFQUFFO2dCQUNOLG9CQUFvQjtnQkFDcEIsWUFBWTtnQkFDWixVQUFVO2FBQ1g7U0FDRixDQUFDLENBQUM7UUFFSCxPQUFPLENBQUMsR0FBRyxpQkFBaUIsRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsZUFBZSxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQztJQUMxRixDQUFDO0NBQ0YifQ==
|
|
@@ -14,9 +14,11 @@ export declare class SdCliServerBuilder extends EventEmitter {
|
|
|
14
14
|
on(event: "complete", listener: (results: ISdCliPackageBuildResult[]) => void): this;
|
|
15
15
|
watchAsync(): Promise<void>;
|
|
16
16
|
buildAsync(): Promise<ISdCliPackageBuildResult[]>;
|
|
17
|
-
private
|
|
18
|
-
private
|
|
19
|
-
private
|
|
20
|
-
private
|
|
17
|
+
private _writeDistConfigFileAsync;
|
|
18
|
+
private _writeDistPm2ConfigFileAsync;
|
|
19
|
+
private _writeDistIisConfigFileAsync;
|
|
20
|
+
private _writeDistNpmConfigFileAsync;
|
|
21
|
+
private _getWebpackConfig;
|
|
22
|
+
private _getExternalModuleNames;
|
|
21
23
|
private _getNpmConfig;
|
|
22
24
|
}
|