@simplysm/sd-cli 7.0.305 → 7.1.11
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/README.md +24 -18
- package/dist/bin/sd-cli.d.ts +1 -1
- package/dist/bin/sd-cli.mjs +2 -8
- package/dist/builder/SdCliClientBuilder.d.ts +1 -1
- package/dist/builder/SdCliClientBuilder.mjs +75 -23
- package/dist/builder/SdCliServerBuilder.d.ts +1 -1
- package/dist/builder/SdCliServerBuilder.mjs +8 -7
- package/dist/builder/SdCliTsLibBuilder.mjs +2 -2
- package/dist/commons.d.ts +2 -1
- package/dist/entry-points/SdCliPrepare.mjs +53 -22
- package/dist/entry-points/SdCliProjectGenerator.mjs +37 -27
- package/dist/entry-points/file/base/fc_package_npmconfig.mjs +2 -1
- package/dist/entry-points/file/project/fc_project_gitignore.mjs +12 -2
- package/dist/entry-points/file/project/fc_project_npmconfig.mjs +13 -11
- package/dist/entry-points/file/project/fc_project_readme.mjs +1 -1
- package/dist/entry-points/file/project/fc_project_tsconfig.mjs +2 -2
- package/dist/entry-points/file/project/fc_project_yarnrc.d.ts +1 -0
- package/dist/entry-points/file/project/fc_project_yarnrc.mjs +15 -0
- package/dist/index.d.ts +1 -1
- package/dist/index.mjs +2 -2
- package/dist/ng-tools/SdCliNgModuleGenerator.d.ts +2 -1
- package/dist/ng-tools/SdCliNgModuleGenerator.mjs +41 -21
- package/dist/ng-tools/babel/SdCliBbFileMetadata.mjs +17 -5
- package/dist/ng-tools/babel/SdCliBbRootMetadata.mjs +19 -7
- package/dist/ng-tools/babel/SdCliBbUtil.d.ts +2 -2
- package/dist/ng-tools/babel/SdCliBbUtil.mjs +3 -3
- package/dist/ng-tools/babel/TSdCliBbTypeMetadata.d.ts +13 -2
- package/dist/ng-tools/babel/TSdCliBbTypeMetadata.mjs +25 -1
- package/dist/packages/SdCliPackage.mjs +2 -2
- package/dist/utils/SdCliBuildResultUtil.mjs +3 -3
- package/docs/client-router.md +1 -1
- package/docs/client-sw.md +1 -1
- package/docs/conf-orm.md +1 -1
- package/docs/lib-local-update.md +5 -5
- package/package.json +46 -42
- package/src/bin/sd-cli.ts +1 -11
- package/src/builder/SdCliClientBuilder.ts +81 -22
- package/src/builder/SdCliServerBuilder.ts +7 -6
- package/src/builder/SdCliTsLibBuilder.ts +1 -1
- package/src/commons.ts +2 -1
- package/src/entry-points/SdCliPrepare.ts +52 -21
- package/src/entry-points/SdCliProjectGenerator.ts +40 -27
- package/src/entry-points/file/base/fc_package_npmconfig.ts +1 -0
- package/src/entry-points/file/project/fc_project_gitignore.ts +11 -1
- package/src/entry-points/file/project/fc_project_npmconfig.ts +12 -10
- package/src/entry-points/file/project/fc_project_readme.ts +1 -1
- package/src/entry-points/file/project/fc_project_tsconfig.ts +1 -1
- package/src/entry-points/file/project/fc_project_yarnrc.ts +14 -0
- package/src/index.ts +1 -1
- package/src/ng-tools/SdCliNgModuleGenerator.ts +53 -20
- package/src/ng-tools/babel/SdCliBbFileMetadata.ts +16 -2
- package/src/ng-tools/babel/SdCliBbRootMetadata.ts +22 -6
- package/src/ng-tools/babel/SdCliBbUtil.ts +4 -4
- package/src/ng-tools/babel/TSdCliBbTypeMetadata.ts +36 -1
- package/src/packages/SdCliPackage.ts +1 -1
- package/src/utils/SdCliBuildResultUtil.ts +3 -2
- package/.eslintrc.cjs +0 -21
- package/dist/entry-points/SdCliNpm.d.ts +0 -6
- package/dist/entry-points/SdCliNpm.mjs +0 -24
- package/src/entry-points/SdCliNpm.ts +0 -28
- package/tsconfig-build.json +0 -16
- package/tsconfig.json +0 -39
|
@@ -124,4 +124,28 @@ export class SdCliBbArrayMetadata {
|
|
|
124
124
|
return this._valueCache;
|
|
125
125
|
}
|
|
126
126
|
}
|
|
127
|
-
|
|
127
|
+
export class SdCliBbConditionMetadata {
|
|
128
|
+
constructor(_fileMeta, _metadata) {
|
|
129
|
+
this._fileMeta = _fileMeta;
|
|
130
|
+
this._metadata = _metadata;
|
|
131
|
+
}
|
|
132
|
+
get test() {
|
|
133
|
+
if (this._testCache === undefined) {
|
|
134
|
+
this._testCache = this._fileMeta.getMetaFromRaw(this._metadata.test);
|
|
135
|
+
}
|
|
136
|
+
return this._testCache;
|
|
137
|
+
}
|
|
138
|
+
get consequent() {
|
|
139
|
+
if (this._consequentCache === undefined) {
|
|
140
|
+
this._consequentCache = this._fileMeta.getMetaFromRaw(this._metadata.consequent);
|
|
141
|
+
}
|
|
142
|
+
return this._consequentCache;
|
|
143
|
+
}
|
|
144
|
+
get alternate() {
|
|
145
|
+
if (this._alternateCache === undefined) {
|
|
146
|
+
this._alternateCache = this._fileMeta.getMetaFromRaw(this._metadata.alternate);
|
|
147
|
+
}
|
|
148
|
+
return this._alternateCache;
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVFNkQ2xpQmJUeXBlTWV0YWRhdGEuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbmctdG9vbHMvYmFiZWwvVFNkQ2xpQmJUeXBlTWV0YWRhdGEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUtMLHNCQUFzQixFQUN0QixxQkFBcUIsRUFDckIsWUFBWSxFQUNaLGtCQUFrQixFQUNsQixnQkFBZ0IsRUFHakIsTUFBTSxjQUFjLENBQUM7QUFDdEIsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRTNELE9BQU8sRUFDTCwwQkFBMEIsRUFDMUIsMEJBQTBCLEVBQzFCLDJCQUEyQixFQUMzQix1QkFBdUIsRUFDdkIscUJBQXFCLEVBRXRCLE1BQU0sc0JBQXNCLENBQUM7QUFVOUIsTUFBTSxPQUFPLG9CQUFvQjtJQUMvQixZQUFvQyxTQUE4QixFQUM5QixRQUEwQjtRQUQxQixjQUFTLEdBQVQsU0FBUyxDQUFxQjtRQUM5QixhQUFRLEdBQVIsUUFBUSxDQUFrQjtJQUM5RCxDQUFDO0lBRUQsSUFBVyxRQUFRO1FBQ2pCLE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUM7SUFDakMsQ0FBQztJQUVELElBQVcsSUFBSTtRQUNiLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDO0lBQy9CLENBQUM7SUFJRCxJQUFXLE1BQU07UUFDZixJQUFJLElBQUksQ0FBQyxZQUFZLEtBQUssU0FBUyxFQUFFO1lBQ25DLE9BQU8sSUFBSSxDQUFDLFlBQVksS0FBSyxNQUFNLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQztTQUNyRTtRQUVELEtBQUssTUFBTSxJQUFJLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxRQUFRLEVBQUU7WUFDMUMsSUFDRSxxQkFBcUIsQ0FBQyxJQUFJLENBQUM7Z0JBQzNCLHNCQUFzQixD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
|
|
@@ -93,7 +93,7 @@ export class SdCliPackage extends EventEmitter {
|
|
|
93
93
|
if (this.config.type === "library") {
|
|
94
94
|
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
95
95
|
if (this.config.publish === "npm") {
|
|
96
|
-
await SdProcess.spawnAsync("npm publish --access public", { cwd: this.rootPath });
|
|
96
|
+
await SdProcess.spawnAsync("yarn npm publish --access public", { cwd: this.rootPath });
|
|
97
97
|
}
|
|
98
98
|
else {
|
|
99
99
|
throw new NeverEntryError();
|
|
@@ -203,4 +203,4 @@ export class SdCliPackage extends EventEmitter {
|
|
|
203
203
|
});
|
|
204
204
|
}
|
|
205
205
|
}
|
|
206
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliPackage.js","sourceRoot":"","sources":["../../src/packages/SdCliPackage.ts"],"names":[],"mappings":"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"}
|
|
206
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliPackage.js","sourceRoot":"","sources":["../../src/packages/SdCliPackage.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,8 +38,8 @@ export class SdCliBuildResultUtil {
|
|
|
38
38
|
static _convertFromWebpackError(severity, err) {
|
|
39
39
|
return {
|
|
40
40
|
filePath: err.file ?? err.module?.["request"],
|
|
41
|
-
line: err.file ? err.loc["start"]?.line : undefined,
|
|
42
|
-
char: err.file ? err.loc["start"]?.column : undefined,
|
|
41
|
+
line: err.file ? err.loc?.["start"]?.line : undefined,
|
|
42
|
+
char: err.file ? err.loc?.["start"]?.column : undefined,
|
|
43
43
|
code: err.name,
|
|
44
44
|
severity,
|
|
45
45
|
message: err.message
|
|
@@ -60,4 +60,4 @@ export class SdCliBuildResultUtil {
|
|
|
60
60
|
return str;
|
|
61
61
|
}
|
|
62
62
|
}
|
|
63
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
63
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2RDbGlCdWlsZFJlc3VsdFV0aWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvU2RDbGlCdWlsZFJlc3VsdFV0aWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQzVCLE9BQU8sRUFBRSxNQUFNLElBQUksQ0FBQztBQUNwQixPQUFPLElBQUksTUFBTSxNQUFNLENBQUM7QUFJeEIsTUFBTSxPQUFPLG9CQUFvQjtJQUN4QixNQUFNLENBQUMsaUJBQWlCLENBQUMsSUFBbUI7UUFDakQsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLFFBQVEsS0FBSyxFQUFFLENBQUMsa0JBQWtCLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxPQUFPO1lBQ3RFLENBQUMsQ0FBQyxJQUFJLENBQUMsUUFBUSxLQUFLLEVBQUUsQ0FBQyxrQkFBa0IsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLFNBQVM7Z0JBQzNELENBQUMsQ0FBQyxTQUFTLENBQUM7UUFDaEIsSUFBSSxDQUFDLFFBQVE7WUFBRSxPQUFPLFNBQVMsQ0FBQztRQUVoQyxNQUFNLElBQUksR0FBRyxLQUFLLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUM5QixNQUFNLE9BQU8sR0FBRyxFQUFFLENBQUMsNEJBQTRCLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLENBQUM7UUFHMUUsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7UUFDMUUsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLElBQUksSUFBSSxJQUFJLENBQUMsS0FBSyxLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyw2QkFBNkIs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
|
package/docs/client-router.md
CHANGED
package/docs/client-sw.md
CHANGED
package/docs/conf-orm.md
CHANGED
package/docs/lib-local-update.md
CHANGED
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
``` bat
|
|
27
27
|
:: 주의사항: 대상이되는 라이브러리는 반드시 빌드되어 있거나, 변경감지 중이여야 합니다.
|
|
28
28
|
:: sd-cli local-update --help 참고
|
|
29
|
-
sd-cli local-update
|
|
29
|
+
npx sd-cli local-update
|
|
30
30
|
```
|
|
31
31
|
|
|
32
32
|
또한, `sd-cli watch` 를 수행할 경우에는, 로컬 라이브러리 파일이 변경되면 자동으로 해당 파일을 다시 덮어씁니다.
|
|
@@ -39,11 +39,11 @@ sd-cli local-update
|
|
|
39
39
|
{
|
|
40
40
|
...,
|
|
41
41
|
"scripts": {
|
|
42
|
-
"watch": "sd-cli local-update && sd-cli watch",
|
|
43
|
-
"build": "sd-cli local-update && sd-cli build",
|
|
44
|
-
"publish": "sd-cli local-update && sd-cli publish",
|
|
42
|
+
"watch": "npx sd-cli local-update && npx sd-cli watch",
|
|
43
|
+
"build": "npx sd-cli local-update && npx sd-cli build",
|
|
44
|
+
"publish": "npx sd-cli local-update && npx sd-cli publish",
|
|
45
45
|
"----- utils": "",
|
|
46
|
-
"postinstall": "sd-cli local-update && sd-cli prepare"
|
|
46
|
+
"postinstall": "npx sd-cli local-update && npx sd-cli prepare"
|
|
47
47
|
},
|
|
48
48
|
...
|
|
49
49
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@simplysm/sd-cli",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.1.11",
|
|
4
4
|
"description": "심플리즘 패키지 - CLI",
|
|
5
5
|
"author": "김석래",
|
|
6
6
|
"repository": {
|
|
@@ -20,57 +20,61 @@
|
|
|
20
20
|
"**/*"
|
|
21
21
|
],
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@angular-
|
|
24
|
-
"@angular/
|
|
25
|
-
"@angular/
|
|
26
|
-
"@angular
|
|
27
|
-
"@
|
|
28
|
-
"@
|
|
29
|
-
"@
|
|
30
|
-
"@
|
|
31
|
-
"@
|
|
32
|
-
"@
|
|
33
|
-
"@simplysm/sd-
|
|
34
|
-
"@simplysm/sd-
|
|
35
|
-
"
|
|
23
|
+
"@angular-architects/module-federation": "^14.3.10",
|
|
24
|
+
"@angular-devkit/build-angular": "^14.1.3",
|
|
25
|
+
"@angular/common": "^14.1.3",
|
|
26
|
+
"@angular/compiler": "^14.1.3",
|
|
27
|
+
"@angular/compiler-cli": "^14.1.3",
|
|
28
|
+
"@angular/core": "^14.1.3",
|
|
29
|
+
"@babel/parser": "^7.18.11",
|
|
30
|
+
"@babel/types": "^7.18.10",
|
|
31
|
+
"@compodoc/compodoc": "^1.1.19",
|
|
32
|
+
"@ngtools/webpack": "^14.1.3",
|
|
33
|
+
"@simplysm/sd-core-common": "7.1.11",
|
|
34
|
+
"@simplysm/sd-core-node": "7.1.11",
|
|
35
|
+
"@simplysm/sd-service-common": "7.1.11",
|
|
36
|
+
"@simplysm/sd-service-server": "7.1.11",
|
|
37
|
+
"@simplysm/sd-storage": "7.1.11",
|
|
38
|
+
"browserslist": "^4.21.3",
|
|
36
39
|
"chokidar": "^3.5.3",
|
|
37
40
|
"connect": "^3.7.0",
|
|
38
|
-
"copy-webpack-plugin": "^
|
|
41
|
+
"copy-webpack-plugin": "^11.0.0",
|
|
39
42
|
"cordova": "^11.0.0",
|
|
40
|
-
"css-loader": "^6.
|
|
41
|
-
"electron": "^
|
|
42
|
-
"electron-builder": "^23.
|
|
43
|
-
"electron-rebuild": "^3.2.
|
|
44
|
-
"eslint": "^8.
|
|
45
|
-
"eslint-webpack-plugin": "^3.
|
|
46
|
-
"jsdom": "^
|
|
47
|
-
"jszip": "^3.
|
|
48
|
-
"license-webpack-plugin": "^4.0.
|
|
43
|
+
"css-loader": "^6.7.1",
|
|
44
|
+
"electron": "^20.0.3",
|
|
45
|
+
"electron-builder": "^23.3.3",
|
|
46
|
+
"electron-rebuild": "^3.2.9",
|
|
47
|
+
"eslint": "^8.22.0",
|
|
48
|
+
"eslint-webpack-plugin": "^3.2.0",
|
|
49
|
+
"jsdom": "^20.0.0",
|
|
50
|
+
"jszip": "^3.10.1",
|
|
51
|
+
"license-webpack-plugin": "^4.0.2",
|
|
49
52
|
"mime": "^3.0.0",
|
|
50
|
-
"mini-css-extract-plugin": "^2.
|
|
51
|
-
"node-polyfill-webpack-plugin": "^
|
|
53
|
+
"mini-css-extract-plugin": "^2.6.1",
|
|
54
|
+
"node-polyfill-webpack-plugin": "^2.0.1",
|
|
52
55
|
"resolve-url-loader": "^5.0.0",
|
|
53
|
-
"
|
|
54
|
-
"sass
|
|
55
|
-
"
|
|
56
|
-
"
|
|
56
|
+
"rxjs": "^7.5.6",
|
|
57
|
+
"sass": "^1.54.4",
|
|
58
|
+
"sass-loader": "^13.0.2",
|
|
59
|
+
"semver": "^7.3.7",
|
|
60
|
+
"source-map-loader": "^4.0.0",
|
|
57
61
|
"source-map-support": "^0.5.21",
|
|
58
|
-
"terser-webpack-plugin": "^5.3.
|
|
59
|
-
"ts-loader": "^9.
|
|
60
|
-
"
|
|
61
|
-
"
|
|
62
|
+
"terser-webpack-plugin": "^5.3.5",
|
|
63
|
+
"ts-loader": "^9.3.1",
|
|
64
|
+
"typedoc": "^0.23.10",
|
|
65
|
+
"typescript": "~4.7.4",
|
|
66
|
+
"webpack": "^5.74.0",
|
|
62
67
|
"xml2js": "^0.4.23",
|
|
63
|
-
"yargs": "^17.
|
|
64
|
-
"
|
|
65
|
-
"@compodoc/compodoc": "^1.1.7"
|
|
68
|
+
"yargs": "^17.5.1",
|
|
69
|
+
"zone.js": "~0.11.8"
|
|
66
70
|
},
|
|
67
71
|
"devDependencies": {
|
|
68
72
|
"@types/connect": "^3.4.35",
|
|
69
|
-
"@types/jsdom": "^
|
|
70
|
-
"@types/mime": "^
|
|
71
|
-
"@types/semver": "^7.3.
|
|
73
|
+
"@types/jsdom": "^20.0.0",
|
|
74
|
+
"@types/mime": "^3.0.1",
|
|
75
|
+
"@types/semver": "^7.3.12",
|
|
72
76
|
"@types/source-map-support": "^0.5.4",
|
|
73
|
-
"@types/xml2js": "^0.4.
|
|
74
|
-
"@types/yargs": "^17.0.
|
|
77
|
+
"@types/xml2js": "^0.4.11",
|
|
78
|
+
"@types/yargs": "^17.0.11"
|
|
75
79
|
}
|
|
76
80
|
}
|
package/src/bin/sd-cli.ts
CHANGED
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
#!/usr/bin/env node --experimental-specifier-resolution=node --experimental-import-meta-resolve
|
|
1
|
+
#!/usr/bin/env node --no-warnings --experimental-specifier-resolution=node --experimental-import-meta-resolve
|
|
2
2
|
|
|
3
3
|
import yargs from "yargs";
|
|
4
4
|
import { hideBin } from "yargs/helpers";
|
|
5
5
|
import { Logger, LoggerSeverity } from "@simplysm/sd-core-node";
|
|
6
6
|
import { SdCliProject } from "../entry-points/SdCliProject";
|
|
7
7
|
import { SdCliLocalUpdate } from "../entry-points/SdCliLocalUpdate";
|
|
8
|
-
import { SdCliNpm } from "../entry-points/SdCliNpm";
|
|
9
8
|
import { SdCliPrepare } from "../entry-points/SdCliPrepare";
|
|
10
9
|
import { SdCliFileCrypto } from "../entry-points/SdCliFileCrypto";
|
|
11
10
|
import { SdCliCordova } from "../build-tool/SdCliCordova";
|
|
@@ -29,11 +28,6 @@ const argv = (yargs(hideBin(process.argv)) as any)
|
|
|
29
28
|
"sd-cli 준비",
|
|
30
29
|
(cmd) => cmd.version(false).hide("help").hide("debug")
|
|
31
30
|
)
|
|
32
|
-
.command(
|
|
33
|
-
"update",
|
|
34
|
-
"패키지 업데이트 (npm update)",
|
|
35
|
-
(cmd) => cmd.version(false).hide("help").hide("debug")
|
|
36
|
-
)
|
|
37
31
|
.command(
|
|
38
32
|
"local-update",
|
|
39
33
|
"로컬 라이브러리 업데이트를 수행합니다.",
|
|
@@ -375,10 +369,6 @@ const logger = Logger.get(["simplysm", "sd-cli", "bin", "sd-cli"]);
|
|
|
375
369
|
await new SdCliPrepare()
|
|
376
370
|
.prepareAsync();
|
|
377
371
|
}
|
|
378
|
-
else if (argv._[0] === "update") {
|
|
379
|
-
await new SdCliNpm(process.cwd())
|
|
380
|
-
.updateAsync();
|
|
381
|
-
}
|
|
382
372
|
else if (argv._[0] === "local-update") {
|
|
383
373
|
await new SdCliLocalUpdate(process.cwd())
|
|
384
374
|
.runAsync({
|
|
@@ -33,7 +33,7 @@ import electronBuilder from "electron-builder";
|
|
|
33
33
|
import { fileURLToPath } from "url";
|
|
34
34
|
import { Entrypoint } from "@angular-devkit/build-angular/src/utils/index-file/augment-index-html";
|
|
35
35
|
import { StringUtil } from "@simplysm/sd-core-common";
|
|
36
|
-
import
|
|
36
|
+
import mf from "@angular-architects/module-federation/webpack";
|
|
37
37
|
import LintResult = ESLint.LintResult;
|
|
38
38
|
|
|
39
39
|
export class SdCliClientBuilder extends EventEmitter {
|
|
@@ -97,7 +97,7 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
97
97
|
}
|
|
98
98
|
|
|
99
99
|
private async _checkCacheAsync(watch: boolean): Promise<void> {
|
|
100
|
-
const projPkgLockContent = await FsUtil.readFileAsync(path.resolve(this._projRootPath, "
|
|
100
|
+
const projPkgLockContent = await FsUtil.readFileAsync(path.resolve(this._projRootPath, "yarn.lock"));
|
|
101
101
|
|
|
102
102
|
// const cachePath = path.resolve(cacheBasePath, pkgVersion);
|
|
103
103
|
|
|
@@ -140,8 +140,8 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
140
140
|
|
|
141
141
|
// 빌드 준비
|
|
142
142
|
const extModules = this._config.builder?.electron ? this._getExternalModules() : [];
|
|
143
|
-
const webpackConfigs = (Object.keys(this._config.builder ?? { web: {} }) as ("web" | "cordova" | "electron")[])
|
|
144
|
-
.
|
|
143
|
+
const webpackConfigs = await (Object.keys(this._config.builder ?? { web: {} }) as ("web" | "cordova" | "electron")[])
|
|
144
|
+
.mapAsync(async (builderType) => await this._getWebpackConfigAsync(true, builderType, extModules));
|
|
145
145
|
const multiCompiler = webpack(webpackConfigs);
|
|
146
146
|
await new Promise<void>((resolve, reject) => {
|
|
147
147
|
// const invalidFiles: string[] = [];
|
|
@@ -227,7 +227,7 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
227
227
|
this._logger.debug("Webpack 빌드 수행...");
|
|
228
228
|
const extModules = this._config.builder?.electron ? this._getExternalModules() : [];
|
|
229
229
|
const builderTypes = (Object.keys(this._config.builder ?? { web: {} }) as ("web" | "cordova" | "electron")[]);
|
|
230
|
-
const webpackConfigs = builderTypes.
|
|
230
|
+
const webpackConfigs = await builderTypes.mapAsync(async (builderType) => await this._getWebpackConfigAsync(false, builderType, extModules));
|
|
231
231
|
const multipleCompiler = webpack(webpackConfigs);
|
|
232
232
|
const buildResults = await new Promise<ISdCliPackageBuildResult[]>((resolve, reject) => {
|
|
233
233
|
multipleCompiler.run((err, multiStats) => {
|
|
@@ -302,7 +302,7 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
302
302
|
.toObject((item) => item, () => "*")
|
|
303
303
|
}
|
|
304
304
|
}, { space: 2 });
|
|
305
|
-
await FsUtil.writeFileAsync(path.resolve(electronSrcPath, "
|
|
305
|
+
await FsUtil.writeFileAsync(path.resolve(electronSrcPath, "yarn.lock"), "");
|
|
306
306
|
|
|
307
307
|
await FsUtil.writeFileAsync(path.resolve(electronSrcPath, `.env`), [
|
|
308
308
|
"NODE_ENV=production",
|
|
@@ -360,7 +360,7 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
360
360
|
].map((p) => path.dirname(p));
|
|
361
361
|
}
|
|
362
362
|
|
|
363
|
-
private
|
|
363
|
+
private async _getWebpackConfigAsync(watch: boolean, builderType: "web" | "cordova" | "electron", extModules: { name: string; exists: boolean }[]): Promise<webpack.Configuration> {
|
|
364
364
|
const projNpmConfig = this._getNpmConfig(this._projRootPath)!;
|
|
365
365
|
const projName = projNpmConfig.name;
|
|
366
366
|
|
|
@@ -368,7 +368,7 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
368
368
|
|
|
369
369
|
const npmConfig = this._getNpmConfig(this._rootPath)!;
|
|
370
370
|
|
|
371
|
-
const projPkgLockContent = FsUtil.readFile(path.resolve(this._projRootPath, "
|
|
371
|
+
const projPkgLockContent = FsUtil.readFile(path.resolve(this._projRootPath, "yarn.lock"));
|
|
372
372
|
|
|
373
373
|
const pkgKey = npmConfig.name.split("/").last()!;
|
|
374
374
|
const publicPath = builderType === "web" ? `/${pkgKey}/` : watch ? `/${pkgKey}/${builderType}/` : ``;
|
|
@@ -403,6 +403,16 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
403
403
|
// 버전쓰기
|
|
404
404
|
FsUtil.writeFile(path.resolve(this._cacheBasePath, "version"), versionHash);
|
|
405
405
|
|
|
406
|
+
// ModuleFederation 관련
|
|
407
|
+
const sharedMappings = new mf.SharedMappings();
|
|
408
|
+
sharedMappings.register(this._tsconfigFilePath, []);
|
|
409
|
+
|
|
410
|
+
const deps = SdCliNpmConfigUtil.getDependencies(npmConfig);
|
|
411
|
+
const shared = deps.defaults
|
|
412
|
+
.concat(deps.optionals)
|
|
413
|
+
.distinct()
|
|
414
|
+
.toObject((item) => item, () => ({ singleton: true, strictVersion: true, requiredVersion: "auto" }));
|
|
415
|
+
|
|
406
416
|
let prevProgressMessage = "";
|
|
407
417
|
return {
|
|
408
418
|
mode: watch ? "development" : "production",
|
|
@@ -414,8 +424,12 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
414
424
|
extensions: [".ts", ".tsx", ".mjs", ".cjs", ".js", ".jsx"],
|
|
415
425
|
symlinks: true,
|
|
416
426
|
modules: [this._projRootPath, "node_modules"],
|
|
417
|
-
mainFields: ["es2015", "browser", "module", "main"],
|
|
418
|
-
conditionNames: ["es2015", "..."],
|
|
427
|
+
mainFields: ["es2020", "es2015", "browser", "module", "main"],
|
|
428
|
+
conditionNames: ["es2020", "es2015", "..."],
|
|
429
|
+
|
|
430
|
+
...this._config.moduleFederation ? {
|
|
431
|
+
alias: sharedMappings.getAliases()
|
|
432
|
+
} : {}
|
|
419
433
|
},
|
|
420
434
|
resolveLoader: {
|
|
421
435
|
symlinks: true
|
|
@@ -438,7 +452,11 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
438
452
|
libraryTarget: undefined,
|
|
439
453
|
crossOriginLoading: false,
|
|
440
454
|
trustedTypes: "angular#bundler",
|
|
441
|
-
scriptType: "module"
|
|
455
|
+
scriptType: "module",
|
|
456
|
+
|
|
457
|
+
...this._config.moduleFederation ? {
|
|
458
|
+
publicPath: "auto"
|
|
459
|
+
} : {}
|
|
442
460
|
},
|
|
443
461
|
watch: false,
|
|
444
462
|
watchOptions: {
|
|
@@ -451,7 +469,12 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
451
469
|
/Add postcss as project dependency/,
|
|
452
470
|
/"@charset" must be the first rule in the file/
|
|
453
471
|
],
|
|
454
|
-
experiments: {
|
|
472
|
+
experiments: {
|
|
473
|
+
backCompat: false,
|
|
474
|
+
syncWebAssembly: true,
|
|
475
|
+
asyncWebAssembly: true,
|
|
476
|
+
...this._config.moduleFederation ? { outputModule: true } : {}
|
|
477
|
+
},
|
|
455
478
|
infrastructureLogging: { level: "error" },
|
|
456
479
|
stats: "errors-warnings",
|
|
457
480
|
// externals: extModules.toObject((item) => item.name, (item) => item.exists ? "commonjs2 " + item.name : `var {name: '${item.name}'}`),
|
|
@@ -518,7 +541,11 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
518
541
|
test: /[\\/]node_modules[\\/]/
|
|
519
542
|
} : false
|
|
520
543
|
}
|
|
521
|
-
}
|
|
544
|
+
},
|
|
545
|
+
|
|
546
|
+
...this._config.moduleFederation ? {
|
|
547
|
+
runtimeChunk: false
|
|
548
|
+
} : {}
|
|
522
549
|
},
|
|
523
550
|
module: {
|
|
524
551
|
strictExportPresence: true,
|
|
@@ -539,7 +566,7 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
539
566
|
exclude: [/[/\\](?:core-js|@babel|tslib|web-animations-js|web-streams-polyfill)[/\\]/],
|
|
540
567
|
use: [
|
|
541
568
|
{
|
|
542
|
-
loader: "@angular-devkit/build-angular/src/babel/webpack-loader",
|
|
569
|
+
loader: fileURLToPath(await import.meta.resolve!("@angular-devkit/build-angular/src/babel/webpack-loader")),
|
|
543
570
|
options: {
|
|
544
571
|
cacheDirectory: path.resolve(this._cacheBasePath, "webpack-babel"),
|
|
545
572
|
scriptTarget: ts.ScriptTarget.ES2017,
|
|
@@ -554,7 +581,7 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
554
581
|
{
|
|
555
582
|
test: /\.[cm]?jsx?$/,
|
|
556
583
|
enforce: "pre" as const,
|
|
557
|
-
loader: "source-map-loader",
|
|
584
|
+
loader: fileURLToPath(await import.meta.resolve!("source-map-loader")),
|
|
558
585
|
options: {
|
|
559
586
|
filterSourceMappingUrl: (mapUri: string, resourcePath: string) => {
|
|
560
587
|
const projRegex = new RegExp(`node_modules[\\\\/]@${projName}[\\\\/]`);
|
|
@@ -567,7 +594,7 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
567
594
|
] : [],
|
|
568
595
|
{
|
|
569
596
|
test: /\.[cm]?tsx?$/,
|
|
570
|
-
loader: "@ngtools/webpack",
|
|
597
|
+
loader: fileURLToPath(await import.meta.resolve!("@ngtools/webpack")),
|
|
571
598
|
exclude: [/[/\\](?:css-loader|mini-css-extract-plugin|webpack)[/\\]/]
|
|
572
599
|
},
|
|
573
600
|
{
|
|
@@ -585,7 +612,7 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
585
612
|
loader: MiniCssExtractPlugin.loader
|
|
586
613
|
},
|
|
587
614
|
{
|
|
588
|
-
loader: "css-loader",
|
|
615
|
+
loader: fileURLToPath(await import.meta.resolve!("css-loader")),
|
|
589
616
|
options: { url: false, sourceMap: watch }
|
|
590
617
|
}
|
|
591
618
|
],
|
|
@@ -601,11 +628,11 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
601
628
|
{
|
|
602
629
|
use: [
|
|
603
630
|
{
|
|
604
|
-
loader: "resolve-url-loader",
|
|
631
|
+
loader: fileURLToPath(await import.meta.resolve!("resolve-url-loader")),
|
|
605
632
|
options: { sourceMap: watch }
|
|
606
633
|
},
|
|
607
634
|
{
|
|
608
|
-
loader: "sass-loader",
|
|
635
|
+
loader: fileURLToPath(await import.meta.resolve!("sass-loader")),
|
|
609
636
|
options: {
|
|
610
637
|
implementation: sassImplementation,
|
|
611
638
|
sourceMap: true,
|
|
@@ -792,10 +819,42 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
792
819
|
return resultMessages.join(os.EOL);
|
|
793
820
|
}
|
|
794
821
|
}),
|
|
795
|
-
...this._config.moduleFederation ? [
|
|
822
|
+
...this._config.moduleFederation === "remote" ? [
|
|
796
823
|
new webpack.container.ModuleFederationPlugin({
|
|
797
|
-
|
|
798
|
-
|
|
824
|
+
library: { type: "module" },
|
|
825
|
+
name: npmConfig.name.replace(/[^0-9A-z]/g, "_"),
|
|
826
|
+
filename: "remoteEntry.js",
|
|
827
|
+
exposes: {
|
|
828
|
+
"./AppMfeModule": path.resolve(this._rootPath, "src/AppMfeModule")
|
|
829
|
+
},
|
|
830
|
+
shared: mf.share({
|
|
831
|
+
/*"@angular/core": { singleton: true, strictVersion: true, requiredVersion: "auto" },
|
|
832
|
+
"@angular/common": { singleton: true, strictVersion: true, requiredVersion: "auto" },
|
|
833
|
+
"@angular/common/http": { singleton: true, strictVersion: true, requiredVersion: "auto" },
|
|
834
|
+
"@angular/router": { singleton: true, strictVersion: true, requiredVersion: "auto" },
|
|
835
|
+
"@simplysm/sd-angular": { singleton: true, strictVersion: true, requiredVersion: "auto" },*/
|
|
836
|
+
|
|
837
|
+
...shared,
|
|
838
|
+
...sharedMappings.getDescriptors()
|
|
839
|
+
} as any, path.resolve(this._rootPath, "package.json"))
|
|
840
|
+
}),
|
|
841
|
+
sharedMappings.getPlugin()
|
|
842
|
+
] : this._config.moduleFederation === "host" ? [
|
|
843
|
+
new webpack.container.ModuleFederationPlugin({
|
|
844
|
+
library: { type: "module" },
|
|
845
|
+
remotes: {},
|
|
846
|
+
shared: mf.share({
|
|
847
|
+
/*"@angular/core": { singleton: true, strictVersion: true, requiredVersion: "auto" },
|
|
848
|
+
"@angular/common": { singleton: true, strictVersion: true, requiredVersion: "auto" },
|
|
849
|
+
"@angular/common/http": { singleton: true, strictVersion: true, requiredVersion: "auto" },
|
|
850
|
+
"@angular/router": { singleton: true, strictVersion: true, requiredVersion: "auto" },
|
|
851
|
+
"@simplysm/sd-angular": { singleton: true, strictVersion: true, requiredVersion: "auto" },*/
|
|
852
|
+
|
|
853
|
+
...shared,
|
|
854
|
+
...sharedMappings.getDescriptors()
|
|
855
|
+
} as any, path.resolve(this._rootPath, "package.json"))
|
|
856
|
+
}),
|
|
857
|
+
sharedMappings.getPlugin()
|
|
799
858
|
] : []
|
|
800
859
|
] as any[]
|
|
801
860
|
};
|