@simplysm/sd-cli 7.0.38 → 7.0.43
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 -2
- package/dist/build-tool/SdCliCacheCompilerHost.mjs +1 -1
- package/dist/build-tool/SdCliNgCacheCompilerHost.mjs +3 -3
- package/dist/build-tool/SdCliPackageLinter.mjs +1 -1
- package/dist/builder/SdCliClientBuilder.mjs +197 -120
- package/dist/builder/SdCliJsLibBuilder.mjs +7 -3
- package/dist/builder/SdCliServerBuilder.mjs +58 -34
- package/dist/builder/SdCliTsLibBuilder.d.ts +1 -1
- package/dist/builder/SdCliTsLibBuilder.mjs +13 -9
- package/dist/commons.d.ts +1 -0
- package/dist/entry-points/SdCliLocalUpdate.mjs +1 -1
- package/dist/entry-points/SdCliNpm.mjs +1 -1
- package/dist/entry-points/SdCliPrepare.mjs +1 -1
- package/dist/entry-points/SdCliWorkspace.mjs +5 -5
- package/dist/packages/SdCliPackage.mjs +2 -2
- package/dist/utils/SdCliBuildResultUtil.mjs +2 -2
- package/dist/utils/SdCliConfigUtil.mjs +2 -2
- package/package.json +5 -5
- package/src/bin/sd-cli.ts +2 -1
- package/src/build-tool/SdCliCacheCompilerHost.ts +1 -1
- package/src/build-tool/SdCliNgCacheCompilerHost.ts +3 -3
- package/src/build-tool/SdCliPackageLinter.ts +1 -1
- package/src/builder/SdCliClientBuilder.ts +199 -118
- package/src/builder/SdCliJsLibBuilder.ts +7 -3
- package/src/builder/SdCliServerBuilder.ts +59 -33
- package/src/builder/SdCliTsLibBuilder.ts +14 -9
- package/src/commons.ts +1 -0
- package/src/entry-points/SdCliLocalUpdate.ts +1 -1
- package/src/entry-points/SdCliNpm.ts +1 -1
- package/src/entry-points/SdCliPrepare.ts +1 -1
- package/src/entry-points/SdCliWorkspace.ts +5 -4
- package/src/packages/SdCliPackage.ts +2 -2
- package/src/utils/SdCliBuildResultUtil.ts +1 -1
- package/src/utils/SdCliConfigUtil.ts +2 -2
- package/tsconfig.json +4 -7
package/.eslintrc.cjs
CHANGED
package/dist/bin/sd-cli.mjs
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
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
|
-
import { Logger, LoggerSeverity } from "@simplysm/sd-core
|
|
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
7
|
import sourceMapSupport from "source-map-support";
|
|
@@ -128,5 +128,6 @@ const logger = Logger.get(["simplysm", "sd-cli", "bin", "sd-cli"]);
|
|
|
128
128
|
}
|
|
129
129
|
})().catch((err) => {
|
|
130
130
|
logger.error(err);
|
|
131
|
+
process.exit(1);
|
|
131
132
|
});
|
|
132
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
133
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2QtY2xpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jpbi9zZC1jbGkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUVBLE9BQU8sS0FBSyxNQUFNLE9BQU8sQ0FBQztBQUMxQixPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3hDLE9BQU8sRUFBRSxNQUFNLEVBQUUsY0FBYyxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDaEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ2hFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ3BFLE9BQU8sZ0JBQWdCLE1BQU0sb0JBQW9CLENBQUM7QUFDbEQsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUU1RCxnQkFBZ0IsQ0FBQyxPQUFPLEVBQUUsQ0FBQztBQUUzQixLQUFLLENBQUMsZUFBZSxHQUFHLFFBQVEsQ0FBQztBQUVqQyxNQUFNLElBQUksR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztLQUN0QyxPQUFPLENBQUMsS0FBSyxDQUFDO0tBQ2QsSUFBSSxDQUFDLE1BQU0sRUFBRSxLQUFLLENBQUM7S0FDbkIsS0FBSyxDQUFDLE1BQU0sRUFBRSxHQUFHLENBQUM7S0FDbEIsT0FBTyxDQUFDO0lBQ1AsS0FBSyxFQUFFO1FBQ0wsSUFBSSxFQUFFLFNBQVM7UUFDZixRQUFRLEVBQUUsb0JBQW9CO1FBQzlCLE9BQU8sRUFBRSxLQUFLO0tBQ2Y7Q0FDRixDQUFDO0tBQ0QsT0FBTyxDQUNOLFNBQVMsRUFDVCxXQUFXLEVBQ1gsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQzVCO0tBQ0EsT0FBTyxDQUNOLFFBQVEs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
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import ts from "typescript";
|
|
2
|
-
import { PathUtil } from "@simplysm/sd-core
|
|
2
|
+
import { PathUtil } from "@simplysm/sd-core/node";
|
|
3
3
|
export class SdCliCacheCompilerHost {
|
|
4
4
|
static create(parsedTsconfig, moduleResolutionCache, sourceFileCache, outputFileCache) {
|
|
5
5
|
const compilerHost = ts.createIncrementalCompilerHost(parsedTsconfig.options);
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { PathUtil } from "@simplysm/sd-core
|
|
1
|
+
import { PathUtil } from "@simplysm/sd-core/node";
|
|
2
2
|
import sass from "sass";
|
|
3
3
|
import { pathToFileURL, URL } from "url";
|
|
4
4
|
export class SdCliNgCacheCompilerHost {
|
|
@@ -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
|
|
@@ -1,22 +1,28 @@
|
|
|
1
1
|
import { EventEmitter } from "events";
|
|
2
|
-
import { FsUtil, Logger, PathUtil } from "@simplysm/sd-core
|
|
2
|
+
import { FsUtil, Logger, PathUtil } from "@simplysm/sd-core/node";
|
|
3
3
|
import webpack from "webpack";
|
|
4
4
|
import path from "path";
|
|
5
5
|
import ts from "typescript";
|
|
6
6
|
import { SdCliBuildResultUtil } from "../utils/SdCliBuildResultUtil";
|
|
7
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";
|
|
8
|
+
import { AnyComponentStyleBudgetChecker, CommonJsUsageWarnPlugin, DedupeModuleResolvePlugin, JavaScriptOptimizerPlugin, SuppressExtractedTextChunksWebpackPlugin } from "@angular-devkit/build-angular/src/webpack/plugins";
|
|
9
9
|
import CopyWebpackPlugin from "copy-webpack-plugin";
|
|
10
10
|
import MiniCssExtractPlugin from "mini-css-extract-plugin";
|
|
11
11
|
import { AngularWebpackPlugin } from "@ngtools/webpack";
|
|
12
12
|
import { IndexHtmlWebpackPlugin } from "@angular-devkit/build-angular/src/webpack/plugins/index-html-webpack-plugin";
|
|
13
|
-
import { createHash } from "crypto";
|
|
14
13
|
import { SassWorkerImplementation } from "@angular-devkit/build-angular/src/sass/sass-service";
|
|
15
14
|
import { HmrLoader } from "@angular-devkit/build-angular/src/webpack/plugins/hmr/hmr-loader";
|
|
16
15
|
import wdm from "webpack-dev-middleware";
|
|
17
16
|
import whm from "webpack-hot-middleware";
|
|
18
17
|
import { LicenseWebpackPlugin } from "license-webpack-plugin";
|
|
19
18
|
import { Type } from "@angular-devkit/build-angular";
|
|
19
|
+
import NodePolyfillPlugin from "node-polyfill-webpack-plugin";
|
|
20
|
+
import { createHash } from "crypto";
|
|
21
|
+
import ESLintWebpackPlugin from "eslint-webpack-plugin";
|
|
22
|
+
import os from "os";
|
|
23
|
+
import { TransferSizePlugin } from "@angular-devkit/build-angular/src/webpack/plugins/transfer-size-plugin";
|
|
24
|
+
import { CssOptimizerPlugin } from "@angular-devkit/build-angular/src/webpack/plugins/css-optimizer-plugin";
|
|
25
|
+
import browserslist from "browserslist";
|
|
20
26
|
export class SdCliClientBuilder extends EventEmitter {
|
|
21
27
|
constructor(_rootPath, _config, _workspaceRootPath) {
|
|
22
28
|
super();
|
|
@@ -91,11 +97,15 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
91
97
|
return buildResults;
|
|
92
98
|
}
|
|
93
99
|
_getWebpackConfig(watch) {
|
|
100
|
+
const internalModuleCachePaths = watch
|
|
101
|
+
? FsUtil.findAllParentChildDirPaths("node_modules/!(@simplysm)", this._rootPath, this._workspaceRootPath)
|
|
102
|
+
: undefined;
|
|
94
103
|
const npmConfig = this._getNpmConfig(this._rootPath);
|
|
95
104
|
const pkgVersion = npmConfig.version;
|
|
105
|
+
const ngVersion = this._getNpmConfig(FsUtil.findAllParentChildDirPaths("node_modules/@angular/core", this._rootPath, this._workspaceRootPath)[0]).version;
|
|
96
106
|
const pkgKey = npmConfig.name.split("/").last();
|
|
97
107
|
const publicPath = `/${pkgKey}/`;
|
|
98
|
-
const cacheBasePath = path.resolve(this._rootPath, ".
|
|
108
|
+
const cacheBasePath = path.resolve(this._rootPath, ".cache");
|
|
99
109
|
const cachePath = path.resolve(cacheBasePath, pkgVersion);
|
|
100
110
|
const distPath = this._parsedTsconfig.options.outDir;
|
|
101
111
|
const sassImplementation = new SassWorkerImplementation();
|
|
@@ -122,7 +132,7 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
122
132
|
entry: {
|
|
123
133
|
main: [
|
|
124
134
|
...watch ? [
|
|
125
|
-
`webpack-hot-middleware/client?path=${publicPath}__webpack_hmr&timeout=20000&reload=true&overlay=true
|
|
135
|
+
`webpack-hot-middleware/client?path=${publicPath}__webpack_hmr&timeout=20000&reload=true&overlay=true`
|
|
126
136
|
] : [],
|
|
127
137
|
mainFilePath
|
|
128
138
|
],
|
|
@@ -140,7 +150,7 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
140
150
|
libraryTarget: undefined,
|
|
141
151
|
crossOriginLoading: false,
|
|
142
152
|
trustedTypes: "angular#bundler",
|
|
143
|
-
scriptType: "module"
|
|
153
|
+
scriptType: "module"
|
|
144
154
|
},
|
|
145
155
|
watch: false,
|
|
146
156
|
watchOptions: { poll: undefined, ignored: undefined },
|
|
@@ -148,7 +158,7 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
148
158
|
ignoreWarnings: [
|
|
149
159
|
/Failed to parse source map from/,
|
|
150
160
|
/Add postcss as project dependency/,
|
|
151
|
-
/"@charset" must be the first rule in the file
|
|
161
|
+
/"@charset" must be the first rule in the file/
|
|
152
162
|
],
|
|
153
163
|
experiments: { backCompat: false, syncWebAssembly: true, asyncWebAssembly: true },
|
|
154
164
|
infrastructureLogging: { level: "error" },
|
|
@@ -158,11 +168,46 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
158
168
|
profile: watch ? undefined : false,
|
|
159
169
|
cacheDirectory: path.resolve(cachePath, "angular-webpack"),
|
|
160
170
|
maxMemoryGenerations: 1,
|
|
161
|
-
name: createHash("sha1")
|
|
171
|
+
name: createHash("sha1")
|
|
172
|
+
.update(pkgVersion)
|
|
173
|
+
.update(ngVersion)
|
|
174
|
+
.update(JSON.stringify(this._parsedTsconfig.options))
|
|
175
|
+
.update(this._workspaceRootPath)
|
|
176
|
+
.update(this._rootPath)
|
|
177
|
+
.update(JSON.stringify(this._config))
|
|
178
|
+
.update(watch.toString())
|
|
179
|
+
.digest("hex")
|
|
162
180
|
},
|
|
181
|
+
...watch ? {
|
|
182
|
+
snapshot: {
|
|
183
|
+
immutablePaths: internalModuleCachePaths,
|
|
184
|
+
managedPaths: internalModuleCachePaths
|
|
185
|
+
}
|
|
186
|
+
} : {},
|
|
163
187
|
node: false,
|
|
164
188
|
optimization: {
|
|
165
|
-
minimizer: []
|
|
189
|
+
minimizer: watch ? [] : [
|
|
190
|
+
new JavaScriptOptimizerPlugin({
|
|
191
|
+
define: {
|
|
192
|
+
ngDevMode: false,
|
|
193
|
+
ngI18nClosureMode: false,
|
|
194
|
+
ngJitMode: false
|
|
195
|
+
},
|
|
196
|
+
sourcemap: false,
|
|
197
|
+
target: ts.ScriptTarget.ES2017,
|
|
198
|
+
keepIdentifierNames: true,
|
|
199
|
+
keepNames: true,
|
|
200
|
+
removeLicenses: true,
|
|
201
|
+
advanced: true
|
|
202
|
+
}),
|
|
203
|
+
new TransferSizePlugin(),
|
|
204
|
+
new CssOptimizerPlugin({
|
|
205
|
+
supportedBrowsers: browserslist([
|
|
206
|
+
"last 1 Chrome versions",
|
|
207
|
+
"last 2 Edge major versions"
|
|
208
|
+
], { path: this._workspaceRootPath })
|
|
209
|
+
})
|
|
210
|
+
],
|
|
166
211
|
moduleIds: "deterministic",
|
|
167
212
|
chunkIds: watch ? "named" : "deterministic",
|
|
168
213
|
emitOnErrors: watch,
|
|
@@ -192,111 +237,6 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
192
237
|
}
|
|
193
238
|
}
|
|
194
239
|
},
|
|
195
|
-
plugins: [
|
|
196
|
-
new NamedChunksPlugin(),
|
|
197
|
-
new DedupeModuleResolvePlugin(),
|
|
198
|
-
/*new webpack.ProgressPlugin({
|
|
199
|
-
handler: (per: number, msg: string, ...args: string[]) => {
|
|
200
|
-
const phaseText = msg ? ` - phase: ${msg}` : "";
|
|
201
|
-
const argsText = args.length > 0 ? ` - args: [${args.join(", ")}]` : "";
|
|
202
|
-
this._logger.debug(`Webpack 빌드 수행중...(${Math.round(per * 100)}%)${phaseText}${argsText}`);
|
|
203
|
-
}
|
|
204
|
-
}),*/
|
|
205
|
-
new CommonJsUsageWarnPlugin(),
|
|
206
|
-
...watch ? [] : [
|
|
207
|
-
new LicenseWebpackPlugin({
|
|
208
|
-
stats: { warnings: false, errors: false, },
|
|
209
|
-
perChunkOutput: false,
|
|
210
|
-
outputFilename: "3rdpartylicenses.txt",
|
|
211
|
-
skipChildCompilers: true
|
|
212
|
-
})
|
|
213
|
-
],
|
|
214
|
-
new CopyWebpackPlugin({
|
|
215
|
-
patterns: [
|
|
216
|
-
...["favicon.ico", "assets/", "manifest.webmanifest"].map((item) => ({
|
|
217
|
-
context: this._rootPath,
|
|
218
|
-
to: item,
|
|
219
|
-
from: `src/${item}`,
|
|
220
|
-
noErrorOnMissing: true,
|
|
221
|
-
force: true,
|
|
222
|
-
globOptions: {
|
|
223
|
-
dot: true,
|
|
224
|
-
followSymbolicLinks: false,
|
|
225
|
-
ignore: [
|
|
226
|
-
".gitkeep",
|
|
227
|
-
"**/.DS_Store",
|
|
228
|
-
"**/Thumbs.db"
|
|
229
|
-
].map((i) => PathUtil.posix(this._rootPath, i))
|
|
230
|
-
},
|
|
231
|
-
priority: 0
|
|
232
|
-
}))
|
|
233
|
-
]
|
|
234
|
-
}),
|
|
235
|
-
...watch ? [
|
|
236
|
-
new webpack.SourceMapDevToolPlugin({
|
|
237
|
-
filename: "[file].map",
|
|
238
|
-
include: [/js$/, /css$/],
|
|
239
|
-
sourceRoot: "webpack:///",
|
|
240
|
-
moduleFilenameTemplate: "[resource-path]",
|
|
241
|
-
append: undefined,
|
|
242
|
-
})
|
|
243
|
-
] : [],
|
|
244
|
-
new AngularWebpackPlugin({
|
|
245
|
-
tsconfig: this._tsconfigFilePath,
|
|
246
|
-
compilerOptions: {
|
|
247
|
-
sourceMap: watch,
|
|
248
|
-
declaration: false,
|
|
249
|
-
declarationMap: false,
|
|
250
|
-
preserveSymlinks: false
|
|
251
|
-
},
|
|
252
|
-
jitMode: false,
|
|
253
|
-
emitNgModuleScope: watch,
|
|
254
|
-
inlineStyleFileExtension: "scss"
|
|
255
|
-
}),
|
|
256
|
-
new AnyComponentStyleBudgetChecker(watch ? [] : [
|
|
257
|
-
{ type: Type.AnyComponentStyle, maximumWarning: "2kb", maximumError: "4kb" }
|
|
258
|
-
]),
|
|
259
|
-
{
|
|
260
|
-
apply: (compiler) => {
|
|
261
|
-
compiler.hooks.shutdown.tap("sass-worker", () => {
|
|
262
|
-
sassImplementation.close();
|
|
263
|
-
});
|
|
264
|
-
}
|
|
265
|
-
},
|
|
266
|
-
new MiniCssExtractPlugin({ filename: "[name].css" }),
|
|
267
|
-
new SuppressExtractedTextChunksWebpackPlugin(),
|
|
268
|
-
// NgBuildAnalyticsPlugin,
|
|
269
|
-
new IndexHtmlWebpackPlugin({
|
|
270
|
-
indexPath: path.resolve(this._rootPath, "src/index.html"),
|
|
271
|
-
outputPath: "index.html",
|
|
272
|
-
baseHref: publicPath,
|
|
273
|
-
entrypoints: [
|
|
274
|
-
["runtime", true],
|
|
275
|
-
["polyfills", true],
|
|
276
|
-
["styles", false],
|
|
277
|
-
["vendor", true],
|
|
278
|
-
["main", true]
|
|
279
|
-
],
|
|
280
|
-
deployUrl: undefined,
|
|
281
|
-
sri: false,
|
|
282
|
-
cache: {
|
|
283
|
-
enabled: true,
|
|
284
|
-
basePath: cacheBasePath,
|
|
285
|
-
path: cachePath
|
|
286
|
-
},
|
|
287
|
-
postTransform: undefined,
|
|
288
|
-
optimization: {
|
|
289
|
-
scripts: !watch,
|
|
290
|
-
styles: { minify: !watch, inlineCritical: !watch },
|
|
291
|
-
fonts: { inline: !watch }
|
|
292
|
-
},
|
|
293
|
-
crossOrigin: "none",
|
|
294
|
-
lang: undefined
|
|
295
|
-
}),
|
|
296
|
-
...watch ? [
|
|
297
|
-
new webpack.HotModuleReplacementPlugin()
|
|
298
|
-
] : []
|
|
299
|
-
],
|
|
300
240
|
module: {
|
|
301
241
|
strictExportPresence: true,
|
|
302
242
|
parser: { javascript: { url: false, worker: false } },
|
|
@@ -308,7 +248,7 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
308
248
|
},
|
|
309
249
|
{
|
|
310
250
|
test: /[/\\]rxjs[/\\]add[/\\].+\.js$/,
|
|
311
|
-
sideEffects: true
|
|
251
|
+
sideEffects: true
|
|
312
252
|
},
|
|
313
253
|
{
|
|
314
254
|
test: /\.[cm]?[tj]sx?$/,
|
|
@@ -325,7 +265,7 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
325
265
|
instrumentCode: undefined
|
|
326
266
|
}
|
|
327
267
|
}
|
|
328
|
-
]
|
|
268
|
+
]
|
|
329
269
|
},
|
|
330
270
|
...watch ? [
|
|
331
271
|
{
|
|
@@ -333,8 +273,8 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
333
273
|
enforce: "pre",
|
|
334
274
|
loader: "source-map-loader",
|
|
335
275
|
options: {
|
|
336
|
-
filterSourceMappingUrl: (
|
|
337
|
-
return !resourcePath.includes("node_modules") || (/@simplysm[\\/]
|
|
276
|
+
filterSourceMappingUrl: (mapUri, resourcePath) => {
|
|
277
|
+
return !resourcePath.includes("node_modules") || (/@simplysm[\\/]/).test(resourcePath);
|
|
338
278
|
}
|
|
339
279
|
}
|
|
340
280
|
}
|
|
@@ -342,7 +282,7 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
342
282
|
{
|
|
343
283
|
test: /\.[cm]?tsx?$/,
|
|
344
284
|
loader: "@ngtools/webpack",
|
|
345
|
-
exclude: [/[/\\](?:css-loader|mini-css-extract-plugin|webpack-dev-server|webpack)[/\\]/]
|
|
285
|
+
exclude: [/[/\\](?:css-loader|mini-css-extract-plugin|webpack-dev-server|webpack)[/\\]/]
|
|
346
286
|
},
|
|
347
287
|
{
|
|
348
288
|
test: /\.css$/i,
|
|
@@ -405,6 +345,143 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
405
345
|
] : []
|
|
406
346
|
]
|
|
407
347
|
},
|
|
348
|
+
plugins: [
|
|
349
|
+
new NodePolyfillPlugin(),
|
|
350
|
+
new NamedChunksPlugin(),
|
|
351
|
+
new DedupeModuleResolvePlugin(),
|
|
352
|
+
/*new webpack.ProgressPlugin({
|
|
353
|
+
handler: (per: number, msg: string, ...args: string[]) => {
|
|
354
|
+
const phaseText = msg ? ` - phase: ${msg}` : "";
|
|
355
|
+
const argsText = args.length > 0 ? ` - args: [${args.join(", ")}]` : "";
|
|
356
|
+
this._logger.debug(`Webpack 빌드 수행중...(${Math.round(per * 100)}%)${phaseText}${argsText}`);
|
|
357
|
+
}
|
|
358
|
+
}),*/
|
|
359
|
+
new CommonJsUsageWarnPlugin(),
|
|
360
|
+
...watch ? [] : [
|
|
361
|
+
new LicenseWebpackPlugin({
|
|
362
|
+
stats: { warnings: false, errors: false },
|
|
363
|
+
perChunkOutput: false,
|
|
364
|
+
outputFilename: "3rdpartylicenses.txt",
|
|
365
|
+
skipChildCompilers: true
|
|
366
|
+
})
|
|
367
|
+
],
|
|
368
|
+
new CopyWebpackPlugin({
|
|
369
|
+
patterns: [
|
|
370
|
+
...["favicon.ico", "assets/", "manifest.webmanifest"].map((item) => ({
|
|
371
|
+
context: this._rootPath,
|
|
372
|
+
to: item,
|
|
373
|
+
from: `src/${item}`,
|
|
374
|
+
noErrorOnMissing: true,
|
|
375
|
+
force: true,
|
|
376
|
+
globOptions: {
|
|
377
|
+
dot: true,
|
|
378
|
+
followSymbolicLinks: false,
|
|
379
|
+
ignore: [
|
|
380
|
+
".gitkeep",
|
|
381
|
+
"**/.DS_Store",
|
|
382
|
+
"**/Thumbs.db"
|
|
383
|
+
].map((i) => PathUtil.posix(this._rootPath, i))
|
|
384
|
+
},
|
|
385
|
+
priority: 0
|
|
386
|
+
}))
|
|
387
|
+
]
|
|
388
|
+
}),
|
|
389
|
+
...watch ? [
|
|
390
|
+
new webpack.SourceMapDevToolPlugin({
|
|
391
|
+
filename: "[file].map",
|
|
392
|
+
include: [/js$/, /css$/],
|
|
393
|
+
sourceRoot: "webpack:///",
|
|
394
|
+
moduleFilenameTemplate: "[resource-path]",
|
|
395
|
+
append: undefined
|
|
396
|
+
})
|
|
397
|
+
] : [],
|
|
398
|
+
new AngularWebpackPlugin({
|
|
399
|
+
tsconfig: this._tsconfigFilePath,
|
|
400
|
+
compilerOptions: {
|
|
401
|
+
sourceMap: watch,
|
|
402
|
+
declaration: false,
|
|
403
|
+
declarationMap: false,
|
|
404
|
+
preserveSymlinks: false
|
|
405
|
+
},
|
|
406
|
+
jitMode: false,
|
|
407
|
+
emitNgModuleScope: watch,
|
|
408
|
+
inlineStyleFileExtension: "scss"
|
|
409
|
+
}),
|
|
410
|
+
new AnyComponentStyleBudgetChecker(watch ? [] : [
|
|
411
|
+
{ type: Type.AnyComponentStyle, maximumWarning: "2kb", maximumError: "4kb" }
|
|
412
|
+
]),
|
|
413
|
+
{
|
|
414
|
+
apply: (compiler) => {
|
|
415
|
+
compiler.hooks.shutdown.tap("sass-worker", () => {
|
|
416
|
+
sassImplementation.close();
|
|
417
|
+
});
|
|
418
|
+
}
|
|
419
|
+
},
|
|
420
|
+
new MiniCssExtractPlugin({ filename: "[name].css" }),
|
|
421
|
+
new SuppressExtractedTextChunksWebpackPlugin(),
|
|
422
|
+
// NgBuildAnalyticsPlugin,
|
|
423
|
+
new IndexHtmlWebpackPlugin({
|
|
424
|
+
indexPath: path.resolve(this._rootPath, "src/index.html"),
|
|
425
|
+
outputPath: "index.html",
|
|
426
|
+
baseHref: publicPath,
|
|
427
|
+
entrypoints: [
|
|
428
|
+
["runtime", true],
|
|
429
|
+
["polyfills", true],
|
|
430
|
+
["styles", false],
|
|
431
|
+
["vendor", true],
|
|
432
|
+
["main", true]
|
|
433
|
+
],
|
|
434
|
+
deployUrl: undefined,
|
|
435
|
+
sri: false,
|
|
436
|
+
cache: {
|
|
437
|
+
enabled: true,
|
|
438
|
+
basePath: cacheBasePath,
|
|
439
|
+
path: cachePath
|
|
440
|
+
},
|
|
441
|
+
postTransform: undefined,
|
|
442
|
+
optimization: {
|
|
443
|
+
scripts: !watch,
|
|
444
|
+
styles: { minify: !watch, inlineCritical: !watch },
|
|
445
|
+
fonts: { inline: !watch }
|
|
446
|
+
},
|
|
447
|
+
crossOrigin: "none",
|
|
448
|
+
lang: undefined
|
|
449
|
+
}),
|
|
450
|
+
...watch ? [
|
|
451
|
+
new webpack.HotModuleReplacementPlugin()
|
|
452
|
+
] : [],
|
|
453
|
+
new webpack.EnvironmentPlugin({
|
|
454
|
+
SD_VERSION: this._getNpmConfig(this._rootPath).version,
|
|
455
|
+
...this._config.env
|
|
456
|
+
}),
|
|
457
|
+
new ESLintWebpackPlugin({
|
|
458
|
+
context: this._rootPath,
|
|
459
|
+
eslintPath: path.resolve(this._workspaceRootPath, "node_modules", "eslint"),
|
|
460
|
+
exclude: ["node_modules"],
|
|
461
|
+
extensions: ["ts", "js", "mjs", "cjs"],
|
|
462
|
+
fix: false,
|
|
463
|
+
threads: false,
|
|
464
|
+
formatter: (results) => {
|
|
465
|
+
const resultMessages = [];
|
|
466
|
+
for (const result of results) {
|
|
467
|
+
for (const msg of result.messages) {
|
|
468
|
+
const severity = msg.severity === 1 ? "warning" : msg.severity === 2 ? "error" : undefined;
|
|
469
|
+
if (severity === undefined)
|
|
470
|
+
continue;
|
|
471
|
+
resultMessages.push(SdCliBuildResultUtil.getMessage({
|
|
472
|
+
filePath: result.filePath,
|
|
473
|
+
line: msg.line,
|
|
474
|
+
char: msg.column,
|
|
475
|
+
code: msg.ruleId?.toString(),
|
|
476
|
+
severity,
|
|
477
|
+
message: msg.message
|
|
478
|
+
}));
|
|
479
|
+
}
|
|
480
|
+
}
|
|
481
|
+
return resultMessages.join(os.EOL);
|
|
482
|
+
}
|
|
483
|
+
})
|
|
484
|
+
]
|
|
408
485
|
};
|
|
409
486
|
}
|
|
410
487
|
_getNpmConfig(pkgPath) {
|
|
@@ -414,4 +491,4 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
414
491
|
return this._npmConfigMap.get(pkgPath);
|
|
415
492
|
}
|
|
416
493
|
}
|
|
417
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliClientBuilder.js","sourceRoot":"","sources":["../../src/builder/SdCliClientBuilder.ts"],"names":[],"mappings":"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"}
|
|
494
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliClientBuilder.js","sourceRoot":"","sources":["../../src/builder/SdCliClientBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { EventEmitter } from "events";
|
|
2
|
-
import { FsUtil, Logger, SdFsWatcher } from "@simplysm/sd-core
|
|
2
|
+
import { FsUtil, Logger, SdFsWatcher } from "@simplysm/sd-core/node";
|
|
3
3
|
import * as path from "path";
|
|
4
4
|
import { SdCliPackageLinter } from "../build-tool/SdCliPackageLinter";
|
|
5
5
|
export class SdCliJsLibBuilder extends EventEmitter {
|
|
@@ -22,7 +22,11 @@ export class SdCliJsLibBuilder extends EventEmitter {
|
|
|
22
22
|
return;
|
|
23
23
|
this._logger.debug("파일 변경 감지", changeInfos);
|
|
24
24
|
this.emit("change");
|
|
25
|
-
const watchBuildResults =
|
|
25
|
+
const watchBuildResults = [];
|
|
26
|
+
const lintFilePaths = changeInfos.filter((item) => ["add", "change"].includes(item.event)).map((item) => item.path);
|
|
27
|
+
if (lintFilePaths.length > 0) {
|
|
28
|
+
watchBuildResults.push(...await this._linter.lintAsync(lintFilePaths));
|
|
29
|
+
}
|
|
26
30
|
const watchRelatedPaths = await this.getRelatedPathsAsync();
|
|
27
31
|
watcher.add(watchRelatedPaths);
|
|
28
32
|
this.emit("complete", watchBuildResults);
|
|
@@ -47,4 +51,4 @@ export class SdCliJsLibBuilder extends EventEmitter {
|
|
|
47
51
|
return [...mySourceFilePaths, path.resolve(this._rootPath, ".eslintrc.cjs")].distinct();
|
|
48
52
|
}
|
|
49
53
|
}
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
54
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2RDbGlKc0xpYkJ1aWxkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYnVpbGRlci9TZENsaUpzTGliQnVpbGRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sUUFBUSxDQUFDO0FBQ3RDLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3JFLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQzdCLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBRXRFLE1BQU0sT0FBTyxpQkFBa0IsU0FBUSxZQUFZO0lBS2pELFlBQW9DLFNBQWlCO1FBQ25ELEtBQUssRUFBRSxDQUFDO1FBRDBCLGNBQVMsR0FBVCxTQUFTLENBQVE7UUFKcEMsWUFBTyxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxVQUFVLEVBQUUsUUFBUSxFQUFFLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQU1uRixJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksa0JBQWtCLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ3hELENBQUM7SUFJZSxFQUFFLENBQUMsS0FBc0IsRUFBRSxRQUFrQztRQUMzRSxPQUFPLEtBQUssQ0FBQyxFQUFFLENBQUMsS0FBSyxFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBQ25DLENBQUM7SUFFTSxLQUFLLENBQUMsVUFBVTtRQUNyQixJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBRXBCLE1BQU0sWUFBWSxHQUFHLE1BQU0sSUFBSSxDQUFDLG9CQUFvQixFQUFFLENBQUM7UUFDdkQsTUFBTSxPQUFPLEdBQUcsV0FBVyxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsQ0FBQztRQUNoRCxPQUFPLENBQUMsUUFBUSxDQUFDLEVBQUUsRUFB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
|