@simplysm/sd-cli 7.0.247 → 7.0.263
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 +48 -0
- package/dist/bin/sd-cli.mjs +171 -13
- package/dist/build-tool/SdCliElectron.mjs +3 -2
- package/dist/builder/SdCliClientBuilder.mjs +33 -35
- package/dist/builder/SdCliServerBuilder.d.ts +1 -0
- package/dist/builder/SdCliServerBuilder.mjs +58 -22
- package/dist/builder/SdCliTsLibBuilder.mjs +18 -12
- package/dist/commons.d.ts +9 -1
- package/dist/entry-points/SdCliProjectGenerator.d.ts +37 -0
- package/dist/entry-points/SdCliProjectGenerator.mjs +288 -0
- package/dist/entry-points/SdCliWorkspace.d.ts +6 -3
- package/dist/entry-points/SdCliWorkspace.mjs +147 -120
- package/dist/entry-points/file/base/fc_package_eslintrc.d.ts +3 -0
- package/dist/entry-points/file/base/fc_package_eslintrc.mjs +31 -0
- package/dist/entry-points/file/base/fc_package_npmconfig.d.ts +9 -0
- package/dist/entry-points/file/base/fc_package_npmconfig.mjs +32 -0
- package/dist/entry-points/file/base/fc_package_tsconfig.d.ts +4 -0
- package/dist/entry-points/file/base/fc_package_tsconfig.mjs +12 -0
- package/dist/entry-points/file/client/fc_package_AppModule.d.ts +1 -0
- package/dist/entry-points/file/client/fc_package_AppModule.mjs +37 -0
- package/dist/entry-points/file/client/fc_package_AppPage.d.ts +1 -0
- package/dist/entry-points/file/client/fc_package_AppPage.mjs +34 -0
- package/dist/entry-points/file/client/fc_package_appicons.d.ts +1 -0
- package/dist/entry-points/file/client/fc_package_appicons.mjs +6 -0
- package/dist/entry-points/file/client/fc_package_client_main.d.ts +1 -0
- package/dist/entry-points/file/client/fc_package_client_main.mjs +19 -0
- package/dist/entry-points/file/client/fc_package_index.d.ts +3 -0
- package/dist/entry-points/file/client/fc_package_index.mjs +88 -0
- package/dist/entry-points/file/client/fc_package_manifest.d.ts +5 -0
- package/dist/entry-points/file/client/fc_package_manifest.mjs +54 -0
- package/dist/entry-points/file/client/fc_package_polyfills.d.ts +1 -0
- package/dist/entry-points/file/client/fc_package_polyfills.mjs +11 -0
- package/dist/entry-points/file/client/fc_package_styles.d.ts +1 -0
- package/dist/entry-points/file/client/fc_package_styles.mjs +7 -0
- package/dist/entry-points/file/db/fc_package_DbContext.d.ts +3 -0
- package/dist/entry-points/file/db/fc_package_DbContext.mjs +14 -0
- package/dist/entry-points/file/db/fc_package_DbModel.d.ts +4 -0
- package/dist/entry-points/file/db/fc_package_DbModel.mjs +12 -0
- package/dist/entry-points/file/project/fc_project_editor_config.d.ts +1 -0
- package/dist/entry-points/file/project/fc_project_editor_config.mjs +22 -0
- package/dist/entry-points/file/project/fc_project_eslintrc.d.ts +1 -0
- package/dist/entry-points/file/project/fc_project_eslintrc.mjs +30 -0
- package/dist/entry-points/file/project/fc_project_gitattributes.d.ts +1 -0
- package/dist/entry-points/file/project/fc_project_gitattributes.mjs +6 -0
- package/dist/entry-points/file/project/fc_project_gitignore.d.ts +1 -0
- package/dist/entry-points/file/project/fc_project_gitignore.mjs +17 -0
- package/dist/entry-points/file/project/fc_project_npmconfig.d.ts +7 -0
- package/dist/entry-points/file/project/fc_project_npmconfig.mjs +35 -0
- package/dist/entry-points/file/project/fc_project_readme.d.ts +3 -0
- package/dist/entry-points/file/project/fc_project_readme.mjs +12 -0
- package/dist/entry-points/file/project/fc_project_simplysm.d.ts +1 -0
- package/dist/entry-points/file/project/fc_project_simplysm.mjs +2 -0
- package/dist/entry-points/file/project/fc_project_tsconfig.d.ts +1 -0
- package/dist/entry-points/file/project/fc_project_tsconfig.mjs +26 -0
- package/dist/entry-points/file/server/fc_package_server_main.d.ts +4 -0
- package/dist/entry-points/file/server/fc_package_server_main.mjs +60 -0
- package/dist/index.d.ts +23 -0
- package/dist/index.mjs +24 -1
- package/dist/packages/SdCliPackage.d.ts +1 -0
- package/dist/packages/SdCliPackage.mjs +68 -62
- package/dist/utils/SdCliBuildResultUtil.mjs +2 -2
- package/dist/worker/server-worker.d.ts +1 -0
- package/dist/worker/server-worker.mjs +67 -0
- package/package.json +10 -8
- package/src/bin/sd-cli.ts +198 -12
- package/src/build-tool/SdCliElectron.ts +2 -1
- package/src/builder/SdCliClientBuilder.ts +36 -36
- package/src/builder/SdCliJsLibBuilder.ts +70 -70
- package/src/builder/SdCliServerBuilder.ts +58 -20
- package/src/builder/SdCliTsLibBuilder.ts +450 -445
- package/src/commons.ts +7 -1
- package/src/entry-points/SdCliProjectGenerator.ts +353 -0
- package/src/entry-points/SdCliWorkspace.ts +171 -137
- package/src/entry-points/file/assets/assets/icons/icon-128x128.png +0 -0
- package/src/entry-points/file/assets/assets/icons/icon-144x144.png +0 -0
- package/src/entry-points/file/assets/assets/icons/icon-152x152.png +0 -0
- package/src/entry-points/file/assets/assets/icons/icon-192x192.png +0 -0
- package/src/entry-points/file/assets/assets/icons/icon-384x384.png +0 -0
- package/src/entry-points/file/assets/assets/icons/icon-512x512.png +0 -0
- package/src/entry-points/file/assets/assets/icons/icon-72x72.png +0 -0
- package/src/entry-points/file/assets/assets/icons/icon-96x96.png +0 -0
- package/src/entry-points/file/assets/favicon.ico +0 -0
- package/src/entry-points/file/base/fc_package_eslintrc.ts +30 -0
- package/src/entry-points/file/base/fc_package_npmconfig.ts +43 -0
- package/src/entry-points/file/base/fc_package_tsconfig.ts +11 -0
- package/src/entry-points/file/client/fc_package_AppModule.ts +36 -0
- package/src/entry-points/file/client/fc_package_AppPage.ts +33 -0
- package/src/entry-points/file/client/fc_package_appicons.ts +5 -0
- package/src/entry-points/file/client/fc_package_client_main.ts +18 -0
- package/src/entry-points/file/client/fc_package_index.ts +87 -0
- package/src/entry-points/file/client/fc_package_manifest.ts +53 -0
- package/src/entry-points/file/client/fc_package_polyfills.ts +10 -0
- package/src/entry-points/file/client/fc_package_styles.ts +6 -0
- package/src/entry-points/file/db/fc_package_DbContext.ts +14 -0
- package/src/entry-points/file/db/fc_package_DbModel.ts +11 -0
- package/src/entry-points/file/project/fc_project_editor_config.ts +21 -0
- package/src/entry-points/file/project/fc_project_eslintrc.ts +29 -0
- package/src/entry-points/file/project/fc_project_gitattributes.ts +5 -0
- package/src/entry-points/file/project/fc_project_gitignore.ts +16 -0
- package/src/entry-points/file/project/fc_project_npmconfig.ts +34 -0
- package/src/entry-points/file/project/fc_project_readme.ts +11 -0
- package/src/entry-points/file/project/fc_project_simplysm.ts +1 -0
- package/src/entry-points/file/project/fc_project_tsconfig.ts +25 -0
- package/src/entry-points/file/server/fc_package_server_main.ts +62 -0
- package/src/index.ts +23 -0
- package/src/packages/SdCliPackage.ts +75 -58
- package/src/utils/SdCliBuildResultUtil.ts +76 -76
- package/src/worker/server-worker.ts +72 -0
- package/tsconfig-build.json +2 -1
- package/tsconfig.json +2 -1
package/README.md
ADDED
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
## 심플리즘 패키지 - CLI
|
|
2
|
+
|
|
3
|
+
## Requirements
|
|
4
|
+
|
|
5
|
+
* node@16.x
|
|
6
|
+
|
|
7
|
+
## Usage
|
|
8
|
+
|
|
9
|
+
``` bat
|
|
10
|
+
:: [필수] 폴더생성
|
|
11
|
+
mkdir sample
|
|
12
|
+
cd sample
|
|
13
|
+
|
|
14
|
+
:: sd-cli 설치
|
|
15
|
+
npm install sd-cli@~7.0.0
|
|
16
|
+
|
|
17
|
+
:: 프로젝트 초기화
|
|
18
|
+
:: sd-cli init --help 참고
|
|
19
|
+
sd-cli init sample 샘플프로젝트 홍길동 https://github.com/my/sample.git
|
|
20
|
+
|
|
21
|
+
::::::::::::::::::::::::::::::::::::::::
|
|
22
|
+
:: 아래 중 필요한 패키지 추가
|
|
23
|
+
::::::::::::::::::::::::::::::::::::::::
|
|
24
|
+
|
|
25
|
+
:: 라이브러리 패키지 추가
|
|
26
|
+
:: sd-cli add ts-lib --help 참고
|
|
27
|
+
sd-cli add ts-lib common 공통모듈
|
|
28
|
+
|
|
29
|
+
:: 클라이언트용 라이브러리 패키지 추가
|
|
30
|
+
:: sd-cli add ts-lib --help 참고
|
|
31
|
+
sd-cli add ts-lib client-common "클라이언트 공통" --useDom
|
|
32
|
+
|
|
33
|
+
:: DB 라이브러리 패키지 추가
|
|
34
|
+
:: sd-cli add db-lib --help 참고
|
|
35
|
+
sd-cli add db-lib main
|
|
36
|
+
|
|
37
|
+
:: DB 라이브러리 패키지에 모델 추가 (DB 라이브러리 추가가 먼저 되어야 함)
|
|
38
|
+
:: sd-cli add db-model --help 참고
|
|
39
|
+
sd-cli add db-model main base Employee 직원
|
|
40
|
+
|
|
41
|
+
:: 서버 패키지 추가
|
|
42
|
+
:: sd-cli add server --help 참고
|
|
43
|
+
sd-cli add server
|
|
44
|
+
|
|
45
|
+
:: 클라이언트 패키지 추가
|
|
46
|
+
:: sd-cli add client --help 참고
|
|
47
|
+
sd-cli add client admin 관리자 server
|
|
48
|
+
```
|
package/dist/bin/sd-cli.mjs
CHANGED
|
@@ -9,9 +9,9 @@ import { SdCliPrepare } from "../entry-points/SdCliPrepare";
|
|
|
9
9
|
import { SdCliFileCrypto } from "../entry-points/SdCliFileCrypto";
|
|
10
10
|
import { SdCliCordova } from "../build-tool/SdCliCordova";
|
|
11
11
|
import { SdCliElectron } from "../build-tool/SdCliElectron";
|
|
12
|
+
import { SdCliProjectGenerator } from "../entry-points/SdCliProjectGenerator";
|
|
12
13
|
Error.stackTraceLimit = Infinity;
|
|
13
14
|
const argv = yargs(hideBin(process.argv))
|
|
14
|
-
.version(false)
|
|
15
15
|
.help("help", "도움말")
|
|
16
16
|
.alias("help", "h")
|
|
17
17
|
.options({
|
|
@@ -21,16 +21,16 @@ const argv = yargs(hideBin(process.argv))
|
|
|
21
21
|
default: false
|
|
22
22
|
}
|
|
23
23
|
})
|
|
24
|
-
.command("prepare", "sd-cli 준비", (cmd) => cmd.version(false))
|
|
25
|
-
.command("update", "패키지 업데이트 (npm update)", (cmd) => cmd.version(false))
|
|
26
|
-
.command("local-update", "로컬 라이브러리 업데이트를 수행합니다.", (cmd) => cmd.version(false)
|
|
24
|
+
.command("prepare", "sd-cli 준비", (cmd) => cmd.version(false).hide("help").hide("debug"))
|
|
25
|
+
.command("update", "패키지 업데이트 (npm update)", (cmd) => cmd.version(false).hide("help").hide("debug"))
|
|
26
|
+
.command("local-update", "로컬 라이브러리 업데이트를 수행합니다.", (cmd) => cmd.version(false).hide("help").hide("debug")
|
|
27
27
|
.options({
|
|
28
28
|
config: {
|
|
29
29
|
type: "string",
|
|
30
30
|
describe: "simplysm.json 파일 경로"
|
|
31
31
|
}
|
|
32
32
|
}))
|
|
33
|
-
.command("watch", "프로젝트의 각 패키지에 대한 변경감지 빌드를 수행합니다.", (cmd) => cmd.version(false)
|
|
33
|
+
.command("watch", "프로젝트의 각 패키지에 대한 변경감지 빌드를 수행합니다.", (cmd) => cmd.version(false).hide("help").hide("debug")
|
|
34
34
|
.options({
|
|
35
35
|
config: {
|
|
36
36
|
type: "string",
|
|
@@ -69,7 +69,7 @@ const argv = yargs(hideBin(process.argv))
|
|
|
69
69
|
describe: "옵션 설정 (설정파일에서 @로 시작하는 부분)"
|
|
70
70
|
}
|
|
71
71
|
}))
|
|
72
|
-
.command("run-cordova <platform> <package>
|
|
72
|
+
.command("run-cordova <platform> <package> <url>", "변경감지중인 플랫폼을 코도바 디바이스에 앱 형태로 띄웁니다.", (cmd) => cmd
|
|
73
73
|
.positional("platform", {
|
|
74
74
|
type: "string",
|
|
75
75
|
describe: "빌드 플랫폼(android,...)",
|
|
@@ -85,7 +85,7 @@ const argv = yargs(hideBin(process.argv))
|
|
|
85
85
|
describe: "Webview로 오픈할 URL",
|
|
86
86
|
demandOption: true
|
|
87
87
|
}))
|
|
88
|
-
.command("build", "프로젝트의 각 패키지에 대한 빌드를 수행합니다.", (cmd) => cmd.version(false)
|
|
88
|
+
.command("build", "프로젝트의 각 패키지에 대한 빌드를 수행합니다.", (cmd) => cmd.version(false).hide("help").hide("debug")
|
|
89
89
|
.options({
|
|
90
90
|
config: {
|
|
91
91
|
type: "string",
|
|
@@ -102,7 +102,7 @@ const argv = yargs(hideBin(process.argv))
|
|
|
102
102
|
describe: "수행할 패키지 설정"
|
|
103
103
|
}
|
|
104
104
|
}))
|
|
105
|
-
.command("publish", "프로젝트의 각 패키지를 배포합니다.", (cmd) => cmd.version(false)
|
|
105
|
+
.command("publish", "프로젝트의 각 패키지를 배포합니다.", (cmd) => cmd.version(false).hide("help").hide("debug")
|
|
106
106
|
.options({
|
|
107
107
|
noBuild: {
|
|
108
108
|
type: "boolean",
|
|
@@ -124,16 +124,128 @@ const argv = yargs(hideBin(process.argv))
|
|
|
124
124
|
describe: "수행할 패키지 설정"
|
|
125
125
|
}
|
|
126
126
|
}))
|
|
127
|
-
.command("enc-file <file>", "파일을 암호화 합니다.", (cmd) => cmd.version(false)
|
|
127
|
+
.command("enc-file <file>", "파일을 암호화 합니다.", (cmd) => cmd.version(false).hide("help").hide("debug")
|
|
128
128
|
.positional("file", {
|
|
129
129
|
type: "string",
|
|
130
|
-
describe: "암호화할 파일명"
|
|
130
|
+
describe: "암호화할 파일명",
|
|
131
|
+
demandOption: true
|
|
131
132
|
}))
|
|
132
|
-
.command("dec-file <file>", "파일을 복호화 합니다.", (cmd) => cmd.version(false)
|
|
133
|
+
.command("dec-file <file>", "파일을 복호화 합니다.", (cmd) => cmd.version(false).hide("help").hide("debug")
|
|
133
134
|
.positional("file", {
|
|
134
135
|
type: "string",
|
|
135
|
-
describe: "암호화된 파일명"
|
|
136
|
+
describe: "암호화된 파일명",
|
|
137
|
+
demandOption: true
|
|
136
138
|
}))
|
|
139
|
+
.command("init [name] <description> <author> <gitUrl>", "프로젝트를 초기화 합니다.", (cmd) => cmd.version(false).hide("help").hide("debug")
|
|
140
|
+
.positional("name", {
|
|
141
|
+
type: "string",
|
|
142
|
+
describe: "프로젝트 영문명 (기본값: 최종폴더명)"
|
|
143
|
+
})
|
|
144
|
+
.positional("description", {
|
|
145
|
+
type: "string",
|
|
146
|
+
describe: "프로젝트 설명(=명칭)",
|
|
147
|
+
demandOption: true
|
|
148
|
+
})
|
|
149
|
+
.positional("author", {
|
|
150
|
+
type: "string",
|
|
151
|
+
describe: "작성자",
|
|
152
|
+
demandOption: true
|
|
153
|
+
})
|
|
154
|
+
.positional("gitUrl", {
|
|
155
|
+
type: "string",
|
|
156
|
+
describe: "소스코드 관리를 위한 GIT 레파지토리 URL",
|
|
157
|
+
demandOption: true
|
|
158
|
+
})
|
|
159
|
+
.example([
|
|
160
|
+
["$0 init sample 샘플프로젝트 홍길동 https://github.com/my/sample.git"]
|
|
161
|
+
]))
|
|
162
|
+
.command("add", "프로젝트에 패키지/기능등을 추가합니다.", (cmd) => cmd.version(false).hide("help").hide("debug")
|
|
163
|
+
.command("ts-lib <name> <description>", "타입스트립트 라이브러리 패키지를 추가합니다.", (cmd1) => cmd1.version(false).hide("help").hide("debug")
|
|
164
|
+
.positional("name", {
|
|
165
|
+
type: "string",
|
|
166
|
+
describe: "패키지명",
|
|
167
|
+
demandOption: true
|
|
168
|
+
})
|
|
169
|
+
.positional("description", {
|
|
170
|
+
type: "string",
|
|
171
|
+
describe: "패키지설명",
|
|
172
|
+
demandOption: true
|
|
173
|
+
})
|
|
174
|
+
.options({
|
|
175
|
+
useDom: {
|
|
176
|
+
type: "boolean",
|
|
177
|
+
describe: "DOM객체(window, document 등) 사용 여부",
|
|
178
|
+
default: false
|
|
179
|
+
}
|
|
180
|
+
})
|
|
181
|
+
.example([
|
|
182
|
+
["$0 add ts-lib common 공통모듈"],
|
|
183
|
+
["$0 sd-cli add ts-lib client-common \"클라이언트 공통\" --useDom"]
|
|
184
|
+
]))
|
|
185
|
+
.command("db-lib <name>", "DB 라이브러리 패키지를 추가합니다.", (cmd1) => cmd1.version(false).hide("help").hide("debug")
|
|
186
|
+
.positional("name", {
|
|
187
|
+
type: "string",
|
|
188
|
+
describe: "패키지명",
|
|
189
|
+
demandOption: true
|
|
190
|
+
})
|
|
191
|
+
.example([
|
|
192
|
+
["$0 add db-lib main"]
|
|
193
|
+
]))
|
|
194
|
+
.command("db-model <dbName> <category> <name> <description>", "DB 패키지에 모델를 추가합니다.", (cmd1) => cmd1.version(false).hide("help").hide("debug")
|
|
195
|
+
.positional("dbName", {
|
|
196
|
+
type: "string",
|
|
197
|
+
describe: "DB 패키지 영문명 = 'DbContext'명칭",
|
|
198
|
+
demandOption: true
|
|
199
|
+
})
|
|
200
|
+
.positional("category", {
|
|
201
|
+
type: "string",
|
|
202
|
+
describe: "추가할 모델의 분류명",
|
|
203
|
+
demandOption: true
|
|
204
|
+
})
|
|
205
|
+
.positional("name", {
|
|
206
|
+
type: "string",
|
|
207
|
+
describe: "추가할 모델의 명칭 (테이블명)",
|
|
208
|
+
demandOption: true
|
|
209
|
+
})
|
|
210
|
+
.positional("description", {
|
|
211
|
+
type: "string",
|
|
212
|
+
describe: "추가할 모델의 설명 (테이블 설명)",
|
|
213
|
+
demandOption: true
|
|
214
|
+
})
|
|
215
|
+
.example([
|
|
216
|
+
["$0 add db-model main base Employee 직원"]
|
|
217
|
+
]))
|
|
218
|
+
.command("server [name] [description]", "서버 패키지를 추가합니다.", (cmd1) => cmd1.version(false).hide("help").hide("debug")
|
|
219
|
+
.positional("name", {
|
|
220
|
+
type: "string",
|
|
221
|
+
describe: "패키지명"
|
|
222
|
+
})
|
|
223
|
+
.positional("description", {
|
|
224
|
+
type: "string",
|
|
225
|
+
describe: "패키지 설명"
|
|
226
|
+
})
|
|
227
|
+
.example([
|
|
228
|
+
["$0 add server"]
|
|
229
|
+
]))
|
|
230
|
+
.command("client <name> <description> <serverName>", "클라이언트 패키지를 추가합니다.", (cmd1) => cmd1.version(false).hide("help").hide("debug")
|
|
231
|
+
.positional("name", {
|
|
232
|
+
type: "string",
|
|
233
|
+
describe: "패키지명",
|
|
234
|
+
demandOption: true
|
|
235
|
+
})
|
|
236
|
+
.positional("description", {
|
|
237
|
+
type: "string",
|
|
238
|
+
describe: "패키지 설명",
|
|
239
|
+
demandOption: true
|
|
240
|
+
})
|
|
241
|
+
.positional("serverName", {
|
|
242
|
+
type: "string",
|
|
243
|
+
describe: "서버 패키지명",
|
|
244
|
+
demandOption: true
|
|
245
|
+
})
|
|
246
|
+
.example([
|
|
247
|
+
["$0 add client admin 관리자 server"]
|
|
248
|
+
])))
|
|
137
249
|
.parseSync();
|
|
138
250
|
if (argv.debug) {
|
|
139
251
|
process.env["SD_CLI_LOGGER_SEVERITY"] = "DEBUG";
|
|
@@ -209,6 +321,52 @@ const logger = Logger.get(["simplysm", "sd-cli", "bin", "sd-cli"]);
|
|
|
209
321
|
else if (argv._[0] === "dec-file") {
|
|
210
322
|
await new SdCliFileCrypto().decryptAsync(argv.file);
|
|
211
323
|
}
|
|
324
|
+
else if (argv._[0] === "init") {
|
|
325
|
+
await new SdCliProjectGenerator(process.cwd()).initAsync({
|
|
326
|
+
name: argv.name,
|
|
327
|
+
description: argv.description,
|
|
328
|
+
author: argv.author,
|
|
329
|
+
gitUrl: argv.gitUrl
|
|
330
|
+
});
|
|
331
|
+
}
|
|
332
|
+
else if (argv._[0] === "add") {
|
|
333
|
+
if (argv._[1] === "ts-lib") {
|
|
334
|
+
await new SdCliProjectGenerator(process.cwd()).addTsLibAsync({
|
|
335
|
+
name: argv.name,
|
|
336
|
+
description: argv.description,
|
|
337
|
+
useDom: argv.useDom
|
|
338
|
+
});
|
|
339
|
+
}
|
|
340
|
+
else if (argv._[1] === "db-lib") {
|
|
341
|
+
await new SdCliProjectGenerator(process.cwd()).addDbLibAsync({
|
|
342
|
+
name: argv.name
|
|
343
|
+
});
|
|
344
|
+
}
|
|
345
|
+
else if (argv._[1] === "db-model") {
|
|
346
|
+
await new SdCliProjectGenerator(process.cwd()).addDbLibModelAsync({
|
|
347
|
+
dbPkgName: argv.dbName,
|
|
348
|
+
category: argv.category,
|
|
349
|
+
name: argv.name,
|
|
350
|
+
description: argv.description
|
|
351
|
+
});
|
|
352
|
+
}
|
|
353
|
+
else if (argv._[1] === "server") {
|
|
354
|
+
await new SdCliProjectGenerator(process.cwd()).addServerAsync({
|
|
355
|
+
name: argv.name,
|
|
356
|
+
description: argv.description
|
|
357
|
+
});
|
|
358
|
+
}
|
|
359
|
+
else if (argv._[1] === "client") {
|
|
360
|
+
await new SdCliProjectGenerator(process.cwd()).addClientAsync({
|
|
361
|
+
name: argv.name,
|
|
362
|
+
description: argv.description,
|
|
363
|
+
serverName: argv.serverName
|
|
364
|
+
});
|
|
365
|
+
}
|
|
366
|
+
else {
|
|
367
|
+
throw new Error(`명령어가 잘못 되었습니다.\n\t${argv._[1]}\n`);
|
|
368
|
+
}
|
|
369
|
+
}
|
|
212
370
|
else {
|
|
213
371
|
throw new Error(`명령어가 잘못 되었습니다.\n\t${argv._[0]}\n`);
|
|
214
372
|
}
|
|
@@ -216,4 +374,4 @@ const logger = Logger.get(["simplysm", "sd-cli", "bin", "sd-cli"]);
|
|
|
216
374
|
logger.error(err);
|
|
217
375
|
process.exit(1);
|
|
218
376
|
});
|
|
219
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sd-cli.js","sourceRoot":"","sources":["../../src/bin/sd-cli.ts"],"names":[],"mappings":"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"}
|
|
377
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sd-cli.js","sourceRoot":"","sources":["../../src/bin/sd-cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,7 +58,8 @@ export class SdCliElectron {
|
|
|
58
58
|
`SD_VERSION=${npmConfig.version}`,
|
|
59
59
|
`SD_ELECTRON_DEV_URL=${url.replace(/\/$/, "")}/${pkgName}/electron/`,
|
|
60
60
|
(electronConfig.icon !== undefined) ? `SD_ELECTRON_ICON=${electronConfig.icon}` : `SD_ELECTRON_ICON=favicon.ico`,
|
|
61
|
-
...(pkgConfig.env !== undefined) ? Object.keys(pkgConfig.env).map((key) => `${key}=${pkgConfig.env[key]}`) : []
|
|
61
|
+
...(pkgConfig.env !== undefined) ? Object.keys(pkgConfig.env).map((key) => `${key}=${pkgConfig.env[key]}`) : [],
|
|
62
|
+
...(electronConfig.env !== undefined) ? Object.keys(electronConfig.env).map((key) => `${key}=${electronConfig.env[key]}`) : [],
|
|
62
63
|
].filterExists().join("\n"));
|
|
63
64
|
let electronTsFileContent = await FsUtil.readFileAsync(path.resolve(pkgRootPath, `src/electron.ts`));
|
|
64
65
|
electronTsFileContent = "require(\"dotenv\").config({ path: `${__dirname}\\\\.env` });\n" + electronTsFileContent;
|
|
@@ -67,4 +68,4 @@ export class SdCliElectron {
|
|
|
67
68
|
await SdProcess.spawnAsync(`electron ${electronSrcPath}`, { cwd: this._rootPath }, true);
|
|
68
69
|
}
|
|
69
70
|
}
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
71
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2RDbGlFbGVjdHJvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9idWlsZC10b29sL1NkQ2xpRWxlY3Ryb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFbkUsT0FBTyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQ3hCLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFFNUIsTUFBTSxPQUFPLGFBQWE7SUFHeEIsWUFBb0MsU0FBaUI7UUFBakIsY0FBUyxHQUFULFNBQVMsQ0FBUTtRQUZwQyxZQUFPLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLFVBQVUsRUFBRSxRQUFRLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO0lBR3JGLENBQUM7SUFFTSxLQUFLLENBQUMsdUJBQXVCLENBQUMsT0FBZSxFQUFFLEdBQVcsRUFBRSxHQUFvRDtRQUNySCxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO1FBQ3RDLE1BQU0sTUFBTSxHQUFHLE1BQU0sZUFBZSxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsR0FBRyxDQUFDLGVBQWUsQ0FBQyxFQUFFLElBQUksRUFBRSxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDNUgsTUFBTSxTQUFTLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQTBDLENBQUM7UUFDcEYsSUFBSSxDQUFDLFNBQVM7WUFBRSxNQUFNLElBQUksS0FBSyxDQUFDLG9CQUFvQixDQUFDLENBQUM7UUFFdEQsTUFBTSxjQUFjLEdBQUcsU0FBUyxDQUFDLE9BQU8sRUFBRSxRQUFRLENBQUM7UUFD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
|