@simplysm/sd-cli 7.1.19 → 7.1.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/README.md +16 -16
  2. package/dist/build-tool/SdCliElectron.mjs +11 -12
  3. package/dist/builder/SdCliClientBuilder.mjs +22 -16
  4. package/dist/entry-points/file/project/fc_project_npmconfig.mjs +6 -6
  5. package/dist/ng-tools/typescript/SdCliTsFileMetadata.mjs +4 -4
  6. package/docs/lib-local-update.md +5 -5
  7. package/package.json +27 -27
  8. package/src/build-tool/SdCliElectron.ts +5 -6
  9. package/src/builder/SdCliClientBuilder.ts +14 -8
  10. package/src/entry-points/file/project/fc_project_npmconfig.ts +5 -5
  11. package/src/ng-tools/typescript/SdCliTsFileMetadata.ts +3 -3
package/README.md CHANGED
@@ -24,8 +24,8 @@ yarn add @simplysm/sd-cli@~7.1.0
24
24
  ### 3. 프로젝트 초기화
25
25
 
26
26
  ``` bat
27
- :: npx sd-cli init --help 참고
28
- npx sd-cli init "샘플프로젝트" "홍길동" https://github.com/my/sample.git
27
+ :: sd-cli init --help 참고
28
+ sd-cli init "샘플프로젝트" "홍길동" https://github.com/my/sample.git
29
29
  ```
30
30
 
31
31
  필요시 아래 작업 수행
@@ -38,15 +38,15 @@ npx sd-cli init "샘플프로젝트" "홍길동" https://github.com/my/sample.gi
38
38
  #### 서버 패키지 추가
39
39
 
40
40
  ``` bat
41
- :: npx sd-cli add server --help 참고
42
- npx sd-cli add server
41
+ :: sd-cli add server --help 참고
42
+ sd-cli add server
43
43
  ```
44
44
 
45
45
  #### 클라이언트 패키지 추가
46
46
 
47
47
  ``` bat
48
- :: npx sd-cli add client --help 참고
49
- npx sd-cli add client admin 관리자 server
48
+ :: sd-cli add client --help 참고
49
+ sd-cli add client admin 관리자 server
50
50
  ```
51
51
 
52
52
  추가 작업
@@ -57,29 +57,29 @@ npx sd-cli add client admin 관리자 server
57
57
  #### 일반 라이브러리 패키지 추가
58
58
 
59
59
  ``` bat
60
- :: npx sd-cli add ts-lib --help 참고
61
- npx sd-cli add ts-lib common 공통모듈
60
+ :: sd-cli add ts-lib --help 참고
61
+ sd-cli add ts-lib common 공통모듈
62
62
  ```
63
63
 
64
64
  #### 브라우저용 라이브러리 패키지 추가
65
65
 
66
66
  ``` bat
67
- :: npx sd-cli add ts-lib --help 참고
68
- npx sd-cli add ts-lib browser-common "브라우저 공통" --useDom
67
+ :: sd-cli add ts-lib --help 참고
68
+ sd-cli add ts-lib browser-common "브라우저 공통" --useDom
69
69
  ```
70
70
 
71
71
  #### Angular용 라이브러리 패키지 추가
72
72
 
73
73
  ``` bat
74
- :: npx sd-cli add ts-lib --help 참고
75
- npx sd-cli add ts-lib client-common "클라이언트 공통" --isForAngular
74
+ :: sd-cli add ts-lib --help 참고
75
+ sd-cli add ts-lib client-common "클라이언트 공통" --isForAngular
76
76
  ```
77
77
 
78
78
  #### DB 라이브러리 패키지 추가
79
79
 
80
80
  ``` bat
81
- :: npx sd-cli add db-lib --help 참고
82
- npx sd-cli add db-lib main
81
+ :: sd-cli add db-lib --help 참고
82
+ sd-cli add db-lib main
83
83
  ```
84
84
 
85
85
  추가 작업
@@ -93,8 +93,8 @@ npx sd-cli add db-lib main
93
93
  #### DB 라이브러리 패키지에 모델 추가
94
94
 
95
95
  ``` bat
96
- :: npx sd-cli add db-model --help 참고
97
- npx sd-cli add db-model main base Employee 직원
96
+ :: sd-cli add db-model --help 참고
97
+ sd-cli add db-model main base Employee 직원
98
98
  ```
99
99
 
100
100
  주의사항
package/dist/build-tool/SdCliElectron.mjs CHANGED
@@ -1,7 +1,6 @@
1
1
  import { FsUtil, Logger, SdProcess } from "@simplysm/sd-core-node";
2
2
  import path from "path";
3
3
  import { SdCliConfigUtil } from "../utils/SdCliConfigUtil";
4
- import ts from "typescript";
5
4
  export class SdCliElectron {
6
5
  constructor(_rootPath) {
7
6
  this._rootPath = _rootPath;
@@ -28,23 +27,23 @@ export class SdCliElectron {
28
27
  if (dotenvVersion === undefined) {
29
28
  throw new Error("ELECTRON 빌드 패키지의 'dependencies'에는 'dotenv'가 반드시 포함되어야 합니다.");
30
29
  }
31
- const remoteVersion = npmConfig.dependencies?.["@electron/remote"];
30
+ // const remoteVersion = npmConfig.dependencies?.["@electron/remote"];
32
31
  await FsUtil.writeJsonAsync(path.resolve(electronSrcPath, `package.json`), {
33
32
  name: npmConfig.name,
34
33
  version: npmConfig.version,
35
34
  description: npmConfig.description,
36
35
  main: "electron.js",
37
36
  author: npmConfig.author,
38
- license: npmConfig.license,
37
+ license: npmConfig.license /*,
39
38
  devDependencies: {
40
- "electron": electronVersion.replace("^", "")
39
+ "electron": electronVersion.replace("^", "")
41
40
  },
42
41
  dependencies: {
43
- "dotenv": dotenvVersion,
44
- ...remoteVersion !== undefined ? {
45
- "@electron/remote": remoteVersion
46
- } : {}
47
- }
42
+ "dotenv": dotenvVersion,
43
+ ...remoteVersion !== undefined ? {
44
+ "@electron/remote": remoteVersion
45
+ } : {}
46
+ }*/
48
47
  });
49
48
  if (FsUtil.exists(path.resolve(pkgRootPath, "src/favicon.ico"))) {
50
49
  await FsUtil.copyAsync(path.resolve(pkgRootPath, "src/favicon.ico"), path.resolve(electronSrcPath, "favicon.ico"));
@@ -61,12 +60,12 @@ export class SdCliElectron {
61
60
  ...(pkgConfig.env !== undefined) ? Object.keys(pkgConfig.env).map((key) => `${key}=${pkgConfig.env[key]}`) : [],
62
61
  ...(electronConfig.env !== undefined) ? Object.keys(electronConfig.env).map((key) => `${key}=${electronConfig.env[key]}`) : [],
63
62
  ].filterExists().join("\n"));
64
- let electronTsFileContent = await FsUtil.readFileAsync(path.resolve(pkgRootPath, `src/electron.ts`));
63
+ /*let electronTsFileContent = await FsUtil.readFileAsync(path.resolve(pkgRootPath, `src/electron.ts`));
65
64
  electronTsFileContent = "require(\"dotenv\").config({ path: `${__dirname}\\\\.env` });\n" + electronTsFileContent;
66
65
  const result = ts.transpileModule(electronTsFileContent, { compilerOptions: { module: ts.ModuleKind.CommonJS } });
67
- await FsUtil.writeFileAsync(path.resolve(electronSrcPath, "electron.js"), result.outputText);
66
+ await FsUtil.writeFileAsync(path.resolve(electronSrcPath, "electron.js"), result.outputText);*/
68
67
  await SdProcess.spawnAsync("electron-rebuild", { cwd: pkgRootPath }, true);
69
68
  await SdProcess.spawnAsync(`electron ${electronSrcPath}`, { cwd: this._rootPath }, true);
70
69
  }
71
70
  }
72
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2RDbGlFbGVjdHJvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9idWlsZC10b29sL1NkQ2xpRWxlY3Ryb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFbkUsT0FBTyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQ3hCLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFFNUIsTUFBTSxPQUFPLGFBQWE7SUFHeEIsWUFBb0MsU0FBaUI7UUFBakIsY0FBUyxHQUFULFNBQVMsQ0FBUTtRQUZwQyxZQUFPLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLFVBQVUsRUFBRSxRQUFRLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO0lBR3JGLENBQUM7SUFFTSxLQUFLLENBQUMsdUJBQXVCLENBQUMsT0FBZSxFQUFFLEdBQVcsRUFBRSxHQUFvRDtRQUNySCxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO1FBQ3RDLE1BQU0sTUFBTSxHQUFHLE1BQU0sZUFBZSxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsR0FBRyxDQUFDLGVBQWUsQ0FBQyxFQUFFLElBQUksRUFBRSxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDNUgsTUFBTSxTQUFTLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQTBDLENBQUM7UUFDcEYsSUFBSSxDQUFDLFNBQVM7WUFBRSxNQUFNLElBQUksS0FBSyxDQUFDLG9CQUFvQixDQUFDLENBQUM7UUFFdEQsTUFBTSxjQUFjLEdBQUcsU0FBUyxDQUFDLE9BQU8sRUFBRSxRQUFRLENBQUM7UUFD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
71
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2RDbGlFbGVjdHJvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9idWlsZC10b29sL1NkQ2xpRWxlY3Ryb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFbkUsT0FBTyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQ3hCLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUUzRCxNQUFNLE9BQU8sYUFBYTtJQUd4QixZQUFvQyxTQUFpQjtRQUFqQixjQUFTLEdBQVQsU0FBUyxDQUFRO1FBRnBDLFlBQU8sR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsVUFBVSxFQUFFLFFBQVEsRUFBRSxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7SUFHckYsQ0FBQztJQUVNLEtBQUssQ0FBQyx1QkFBdUIsQ0FBQyxPQUFlLEVBQUUsR0FBVyxFQUFFLEdBQW9EO1FBQ3JILElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLGlCQUFpQixDQUFDLENBQUM7UUFDdEMsTUFBTSxNQUFNLEdBQUcsTUFBTSxlQUFlLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxHQUFHLENBQUMsZUFBZSxDQUFDLEVBQUUsSUFBSSxFQUFFLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUM1SCxNQUFNLFNBQVMsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBMEMsQ0FBQztRQUNwRixJQUFJLENBQUMsU0FBUztZQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsb0JBQW9CLENBQUMsQ0FBQztRQUV0RCxNQUFNLGNBQWMsR0FBRyxTQUFTLENBQUMsT0FBTyxFQUFFLFFBQVEsQ0FBQztRQUNuRCxJQUFJLENBQUMsY0FBYztZQUFFLE1BQU0sSUFB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
package/dist/builder/SdCliClientBuilder.mjs CHANGED
@@ -208,7 +208,7 @@ export class SdCliClientBuilder extends EventEmitter {
208
208
  if (dotenvVersion === undefined) {
209
209
  throw new Error("ELECTRON 빌드 패키지의 'dependencies'에는 'dotenv'가 반드시 포함되어야 합니다.");
210
210
  }
211
- const remoteVersion = npmConfig.dependencies?.["@electron/remote"];
211
+ // const remoteVersion = npmConfig.dependencies?.["@electron/remote"];
212
212
  const electronSrcPath = path.resolve(this._rootPath, `.cache/electron/src`);
213
213
  const electronDistPath = path.resolve(this._rootPath, `.cache/electron/dist`);
214
214
  await FsUtil.writeJsonAsync(path.resolve(electronSrcPath, `package.json`), {
@@ -217,18 +217,18 @@ export class SdCliClientBuilder extends EventEmitter {
217
217
  description: npmConfig.description,
218
218
  main: "electron.js",
219
219
  author: npmConfig.author,
220
- license: npmConfig.license,
220
+ license: npmConfig.license /*,
221
221
  devDependencies: {
222
- "electron": electronVersion.replace("^", "")
222
+ "electron": electronVersion.replace("^", "")
223
223
  },
224
224
  dependencies: {
225
- "dotenv": dotenvVersion,
226
- ...remoteVersion !== undefined ? {
227
- "@electron/remote": remoteVersion
228
- } : {},
229
- ...extModules.filter((item) => item.exists).map((item) => item.name)
230
- .toObject((item) => item, () => "*")
231
- }
225
+ "dotenv": dotenvVersion,
226
+ ...remoteVersion !== undefined ? {
227
+ "@electron/remote": remoteVersion
228
+ } : {},
229
+ ...extModules.filter((item) => item.exists).map((item) => item.name)
230
+ .toObject((item) => item, () => "*")
231
+ }*/
232
232
  }, { space: 2 });
233
233
  await FsUtil.writeFileAsync(path.resolve(electronSrcPath, "yarn.lock"), "");
234
234
  await FsUtil.writeFileAsync(path.resolve(electronSrcPath, `.env`), [
@@ -238,10 +238,10 @@ export class SdCliClientBuilder extends EventEmitter {
238
238
  ...(this._config.env !== undefined) ? Object.keys(this._config.env).map((key) => `${key}=${this._config.env[key]}`) : [],
239
239
  ...(this._config.builder.electron.env !== undefined) ? Object.keys(this._config.builder.electron.env).map((key) => `${key}=${this._config.builder.electron.env[key]}`) : []
240
240
  ].filterExists().join("\n"));
241
- let electronTsFileContent = await FsUtil.readFileAsync(path.resolve(this._rootPath, `src/electron.ts`));
241
+ /*let electronTsFileContent = await FsUtil.readFileAsync(path.resolve(this._rootPath, `src/electron.ts`));
242
242
  electronTsFileContent = "require(\"dotenv\").config({ path: `${__dirname}\\\\.env` });\n" + electronTsFileContent;
243
243
  const result = ts.transpileModule(electronTsFileContent, { compilerOptions: { module: ts.ModuleKind.CommonJS } });
244
- await FsUtil.writeFileAsync(path.resolve(electronSrcPath, "electron.js"), result.outputText);
244
+ await FsUtil.writeFileAsync(path.resolve(electronSrcPath, "electron.js"), result.outputText);*/
245
245
  await electronBuilder.build({
246
246
  targets: electronBuilder.Platform.WINDOWS.createTarget(),
247
247
  config: {
@@ -309,7 +309,7 @@ export class SdCliClientBuilder extends EventEmitter {
309
309
  return {
310
310
  mode: watch ? "development" : "production",
311
311
  devtool: false,
312
- target: builderType === "electron" ? ["electron-renderer", "es2015"] : ["web", "es2015"],
312
+ target: builderType === "electron" ? ["electron-renderer", "electron-main", "es2015"] : ["web", "es2015"],
313
313
  profile: false,
314
314
  resolve: {
315
315
  roots: [this._rootPath],
@@ -327,7 +327,8 @@ export class SdCliClientBuilder extends EventEmitter {
327
327
  main: [mainFilePath],
328
328
  ...FsUtil.exists(polyfillsFilePath) ? { polyfills: [polyfillsFilePath] } : {},
329
329
  ...FsUtil.exists(stylesFilePath) ? { styles: [stylesFilePath] } : {},
330
- ...builderType === "cordova" ? { "cordova-entry": path.resolve(path.dirname(fileURLToPath(import.meta.url)), `../../lib/cordova-entry.js`) } : {}
330
+ ...builderType === "cordova" ? { "cordova-entry": path.resolve(path.dirname(fileURLToPath(import.meta.url)), `../../lib/cordova-entry.js`) } : {},
331
+ ...builderType === "electron" ? { "electron": path.resolve(this._rootPath, "src/electron.ts") } : {}
331
332
  },
332
333
  output: {
333
334
  uniqueName: pkgKey,
@@ -361,7 +362,12 @@ export class SdCliClientBuilder extends EventEmitter {
361
362
  infrastructureLogging: { level: "error" },
362
363
  stats: "errors-warnings",
363
364
  // externals: extModules.toObject((item) => item.name, (item) => item.exists ? "commonjs2 " + item.name : `var {name: '${item.name}'}`),
364
- externals: extModules.toObject((item) => item.name, (item) => "commonjs2 " + item.name),
365
+ externals: {
366
+ ...extModules.toObject((item) => item.name, (item) => "commonjs2 " + item.name),
367
+ ...builderType === "electron" ? {
368
+ "electron": "commonjs2 electron"
369
+ } : {}
370
+ },
365
371
  cache: {
366
372
  type: "filesystem",
367
373
  profile: undefined,
@@ -753,4 +759,4 @@ export class SdCliClientBuilder extends EventEmitter {
753
759
  return this._npmConfigMap.get(pkgPath);
754
760
  }
755
761
  }
756
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliClientBuilder.js","sourceRoot":"","sources":["../../src/builder/SdCliClientBuilder.ts"],"names":[],"mappings":"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"}
762
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliClientBuilder.js","sourceRoot":"","sources":["../../src/builder/SdCliClientBuilder.ts"],"names":[],"mappings":"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"}
package/dist/entry-points/file/project/fc_project_npmconfig.mjs CHANGED
@@ -19,11 +19,11 @@ export const fc_project_npmconfig = (opt) => JSON.stringify({
19
19
  "test"
20
20
  ],
21
21
  scripts: {
22
- "watch": "npx sd-cli watch",
23
- "build": "npx sd-cli build",
24
- "publish": "npx sd-cli publish",
22
+ "watch": "sd-cli watch",
23
+ "build": "sd-cli build",
24
+ "publish": "sd-cli publish",
25
25
  "----- utils": "",
26
- "postinstall": "npx sd-cli prepare"
26
+ "postinstall": "sd-cli prepare"
27
27
  },
28
28
  devDependencies: {
29
29
  "@simplysm/eslint-plugin": "~7.1.0",
@@ -31,7 +31,7 @@ export const fc_project_npmconfig = (opt) => JSON.stringify({
31
31
  "@types/node": "^16.11.47",
32
32
  "cross-env": "^7.0.3",
33
33
  "eslint": "~8.22.0",
34
- "typescript": "~4.7.4"
34
+ "typescript": "~4.8.4"
35
35
  }
36
36
  }, undefined, 2);
37
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmNfcHJvamVjdF9ucG1jb25maWcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvZW50cnktcG9pbnRzL2ZpbGUvcHJvamVjdC9mY19wcm9qZWN0X25wbWNvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxNQUFNLENBQUMsTUFBTSxvQkFBb0IsR0FBRyxDQUFDLEdBQStGLEVBQVUsRUFBRSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUM7SUFDOUosSUFBSSxFQUFFLEdBQUcsQ0FBQyxJQUFJO0lBQ2QsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLEdBQUcsQ0FBQyxXQUFXO0lBQzVCLE1BQU0sRUFBRSxHQUFHLENBQUMsTUFBTTtJQUNsQixVQUFVLEVBQUU7UUFDVixJQUFJLEVBQUUsS0FBSztRQUNYLEdBQUcsRUFBRSxHQUFHLENBQUMsTUFBTTtLQUNoQjtJQUNELElBQUksRUFBRSxRQUFRO0lBQ2QsT0FBTyxFQUFFLFlBQVk7SUFDckIsT0FBTyxFQUFFLElBQUk7SUFDYixjQUFjLEVBQUUsWUFBWTtJQUM1QixPQUFPLEVBQUU7UUFDUCxJQUFJLEVBQUUsS0FBSztLQUNaO0lBQ0QsVUFBVSxFQUFFO1FBQ1YsWUFBWTtRQUNaLE1BQU07S0FDUDtJQUNELE9BQU8sRUFBRTtRQUNQLE9BQU8sRUFBRSxrQkFBa0I7UUFDM0IsT0FBTyxFQUFFLGtCQUFrQjtRQUMzQixTQUFTLEVBQUUsb0JBQW9CO1FBQy9CLGFBQWEsRUFBRSxFQUFFO1FBQ2pCLGFBQWEsRUFBRSxvQkFBb0I7S0FDcEM7SUFDRCxlQUFlLEVBQUU7UUFDZix5QkFBeUIsRUFBRSxRQUFRO1FBQ25DLGtCQUFrQixFQUFFLEdBQUcsQ0FBQyxVQUFVLElBQUksUUFBUTtRQUM5QyxhQUFhLEVBQUUsV0FBVztRQUMxQixXQUFXLEVBQUUsUUFBUTtRQUNyQixRQUFRLEVBQUUsU0FBUztRQUNuQixZQUFZLEVBQUUsUUFBUTtLQUN2QjtDQUNGLEVBQUUsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDIn0=
37
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmNfcHJvamVjdF9ucG1jb25maWcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvZW50cnktcG9pbnRzL2ZpbGUvcHJvamVjdC9mY19wcm9qZWN0X25wbWNvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxNQUFNLENBQUMsTUFBTSxvQkFBb0IsR0FBRyxDQUFDLEdBQStGLEVBQVUsRUFBRSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUM7SUFDOUosSUFBSSxFQUFFLEdBQUcsQ0FBQyxJQUFJO0lBQ2QsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLEdBQUcsQ0FBQyxXQUFXO0lBQzVCLE1BQU0sRUFBRSxHQUFHLENBQUMsTUFBTTtJQUNsQixVQUFVLEVBQUU7UUFDVixJQUFJLEVBQUUsS0FBSztRQUNYLEdBQUcsRUFBRSxHQUFHLENBQUMsTUFBTTtLQUNoQjtJQUNELElBQUksRUFBRSxRQUFRO0lBQ2QsT0FBTyxFQUFFLFlBQVk7SUFDckIsT0FBTyxFQUFFLElBQUk7SUFDYixjQUFjLEVBQUUsWUFBWTtJQUM1QixPQUFPLEVBQUU7UUFDUCxJQUFJLEVBQUUsS0FBSztLQUNaO0lBQ0QsVUFBVSxFQUFFO1FBQ1YsWUFBWTtRQUNaLE1BQU07S0FDUDtJQUNELE9BQU8sRUFBRTtRQUNQLE9BQU8sRUFBRSxjQUFjO1FBQ3ZCLE9BQU8sRUFBRSxjQUFjO1FBQ3ZCLFNBQVMsRUFBRSxnQkFBZ0I7UUFDM0IsYUFBYSxFQUFFLEVBQUU7UUFDakIsYUFBYSxFQUFFLGdCQUFnQjtLQUNoQztJQUNELGVBQWUsRUFBRTtRQUNmLHlCQUF5QixFQUFFLFFBQVE7UUFDbkMsa0JBQWtCLEVBQUUsR0FBRyxDQUFDLFVBQVUsSUFBSSxRQUFRO1FBQzlDLGFBQWEsRUFBRSxXQUFXO1FBQzFCLFdBQVcsRUFBRSxRQUFRO1FBQ3JCLFFBQVEsRUFBRSxTQUFTO1FBQ25CLFlBQVksRUFBRSxRQUFRO0tBQ3ZCO0NBQ0YsRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFDLENBQUMifQ==
package/dist/ng-tools/typescript/SdCliTsFileMetadata.mjs CHANGED
@@ -13,7 +13,7 @@ export class SdCliTsFileMetadata {
13
13
  return this._directExportClassesCache;
14
14
  const result = [];
15
15
  this.sourceFile.forEachChild((node) => {
16
- if (!node.modifiers || !node.modifiers.some((item) => item.kind === ts.SyntaxKind.ExportKeyword))
16
+ if (!ts.canHaveModifiers(node) || !ts.getModifiers(node)?.some((item) => item.kind === ts.SyntaxKind.ExportKeyword))
17
17
  return;
18
18
  if (!ts.isClassDeclaration(node))
19
19
  return;
@@ -173,9 +173,9 @@ export class SdCliTsClassMetadata {
173
173
  get ngDecl() {
174
174
  if (this._ngDeclCache !== undefined)
175
175
  return this._ngDeclCache;
176
- if (!this._node.decorators)
176
+ if (!ts.canHaveDecorators(this._node))
177
177
  return undefined;
178
- for (const deco of this._node.decorators) {
178
+ for (const deco of ts.getDecorators(this._node) ?? []) {
179
179
  if (!ts.isCallExpression(deco.expression))
180
180
  continue;
181
181
  if (!ts.isIdentifier(deco.expression.expression)) {
@@ -322,4 +322,4 @@ export class SdCliTsNgPipeMetadata {
322
322
  throw new NeverEntryError();
323
323
  }
324
324
  }
325
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliTsFileMetadata.js","sourceRoot":"","sources":["../../../src/ng-tools/typescript/SdCliTsFileMetadata.ts"],"names":[],"mappings":"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"}
325
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliTsFileMetadata.js","sourceRoot":"","sources":["../../../src/ng-tools/typescript/SdCliTsFileMetadata.ts"],"names":[],"mappings":"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"}
package/docs/lib-local-update.md CHANGED
@@ -26,7 +26,7 @@
26
26
  ``` bat
27
27
  :: 주의사항: 대상이되는 라이브러리는 반드시 빌드되어 있거나, 변경감지 중이여야 합니다.
28
28
  :: sd-cli local-update --help 참고
29
- npx sd-cli local-update
29
+ sd-cli local-update
30
30
  ```
31
31
 
32
32
  또한, `sd-cli watch` 를 수행할 경우에는, 로컬 라이브러리 파일이 변경되면 자동으로 해당 파일을 다시 덮어씁니다.
@@ -39,11 +39,11 @@ npx sd-cli local-update
39
39
  {
40
40
  ...,
41
41
  "scripts": {
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",
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",
45
45
  "----- utils": "",
46
- "postinstall": "npx sd-cli local-update && npx sd-cli prepare"
46
+ "postinstall": "sd-cli local-update && 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.1.19",
3
+ "version": "7.1.22",
4
4
  "description": "심플리즘 패키지 - CLI",
5
5
  "author": "김석래",
6
6
  "repository": {
@@ -20,51 +20,51 @@
20
20
  "**/*"
21
21
  ],
22
22
  "dependencies": {
23
- "@angular-devkit/build-angular": "^14.2.3",
24
- "@angular/common": "^14.2.2",
25
- "@angular/compiler": "^14.2.2",
26
- "@angular/compiler-cli": "^14.2.2",
27
- "@angular/core": "^14.2.2",
28
- "@babel/parser": "^7.19.1",
29
- "@babel/types": "^7.19.0",
23
+ "@angular-devkit/build-angular": "^14.2.6",
24
+ "@angular/common": "^14.2.6",
25
+ "@angular/compiler": "^14.2.6",
26
+ "@angular/compiler-cli": "^14.2.6",
27
+ "@angular/core": "^14.2.6",
28
+ "@babel/parser": "^7.19.4",
29
+ "@babel/types": "^7.19.4",
30
30
  "@compodoc/compodoc": "^1.1.19",
31
- "@ngtools/webpack": "^14.2.3",
32
- "@simplysm/sd-core-common": "7.1.19",
33
- "@simplysm/sd-core-node": "7.1.19",
34
- "@simplysm/sd-service-common": "7.1.19",
35
- "@simplysm/sd-service-server": "7.1.19",
36
- "@simplysm/sd-storage": "7.1.19",
31
+ "@ngtools/webpack": "^14.2.6",
32
+ "@simplysm/sd-core-common": "7.1.22",
33
+ "@simplysm/sd-core-node": "7.1.22",
34
+ "@simplysm/sd-service-common": "7.1.22",
35
+ "@simplysm/sd-service-server": "7.1.22",
36
+ "@simplysm/sd-storage": "7.1.22",
37
37
  "browserslist": "^4.21.4",
38
38
  "chokidar": "^3.5.3",
39
39
  "connect": "^3.7.0",
40
40
  "copy-webpack-plugin": "^11.0.0",
41
41
  "cordova": "^11.0.0",
42
42
  "css-loader": "^6.7.1",
43
- "electron": "^20.1.4",
44
- "electron-builder": "~23.3.3",
43
+ "electron": "^21.1.1",
44
+ "electron-builder": "~23.6.0",
45
45
  "electron-rebuild": "^3.2.9",
46
- "eslint": "~8.23.1",
46
+ "eslint": "~8.25.0",
47
47
  "eslint-webpack-plugin": "^3.2.0",
48
- "jsdom": "^20.0.0",
48
+ "jsdom": "^20.0.1",
49
49
  "jszip": "^3.10.1",
50
50
  "license-webpack-plugin": "^4.0.2",
51
51
  "mime": "^3.0.0",
52
52
  "mini-css-extract-plugin": "^2.6.1",
53
53
  "node-polyfill-webpack-plugin": "^2.0.1",
54
54
  "resolve-url-loader": "^5.0.0",
55
- "rxjs": "^7.5.6",
56
- "sass": "^1.54.9",
57
- "sass-loader": "^13.0.2",
58
- "semver": "^7.3.7",
59
- "source-map-loader": "^4.0.0",
55
+ "rxjs": "^7.5.7",
56
+ "sass": "^1.55.0",
57
+ "sass-loader": "^13.1.0",
58
+ "semver": "^7.3.8",
59
+ "source-map-loader": "^4.0.1",
60
60
  "source-map-support": "^0.5.21",
61
61
  "terser-webpack-plugin": "^5.3.6",
62
62
  "ts-loader": "^9.4.1",
63
- "typedoc": "^0.23.15",
64
- "typescript": "~4.7.4",
63
+ "typedoc": "^0.23.17",
64
+ "typescript": "~4.8.4",
65
65
  "webpack": "^5.74.0",
66
66
  "xml2js": "^0.4.23",
67
- "yargs": "^17.5.1",
67
+ "yargs": "^17.6.0",
68
68
  "zone.js": "^0.11.8"
69
69
  },
70
70
  "devDependencies": {
@@ -74,6 +74,6 @@
74
74
  "@types/semver": "^7.3.12",
75
75
  "@types/source-map-support": "^0.5.6",
76
76
  "@types/xml2js": "^0.4.11",
77
- "@types/yargs": "^17.0.12"
77
+ "@types/yargs": "^17.0.13"
78
78
  }
79
79
  }
package/src/build-tool/SdCliElectron.ts CHANGED
@@ -2,7 +2,6 @@ import { FsUtil, Logger, SdProcess } from "@simplysm/sd-core-node";
2
2
  import { INpmConfig, ISdCliClientPackageConfig } from "../commons";
3
3
  import path from "path";
4
4
  import { SdCliConfigUtil } from "../utils/SdCliConfigUtil";
5
- import ts from "typescript";
6
5
 
7
6
  export class SdCliElectron {
8
7
  private readonly _logger = Logger.get(["simplysm", "sd-cli", this.constructor.name]);
@@ -35,7 +34,7 @@ export class SdCliElectron {
35
34
  throw new Error("ELECTRON 빌드 패키지의 'dependencies'에는 'dotenv'가 반드시 포함되어야 합니다.");
36
35
  }
37
36
 
38
- const remoteVersion = npmConfig.dependencies?.["@electron/remote"];
37
+ // const remoteVersion = npmConfig.dependencies?.["@electron/remote"];
39
38
 
40
39
  await FsUtil.writeJsonAsync(path.resolve(electronSrcPath, `package.json`), {
41
40
  name: npmConfig.name,
@@ -43,7 +42,7 @@ export class SdCliElectron {
43
42
  description: npmConfig.description,
44
43
  main: "electron.js",
45
44
  author: npmConfig.author,
46
- license: npmConfig.license,
45
+ license: npmConfig.license/*,
47
46
  devDependencies: {
48
47
  "electron": electronVersion.replace("^", "")
49
48
  },
@@ -52,7 +51,7 @@ export class SdCliElectron {
52
51
  ...remoteVersion !== undefined ? {
53
52
  "@electron/remote": remoteVersion
54
53
  } : {}
55
- }
54
+ }*/
56
55
  });
57
56
 
58
57
  if (FsUtil.exists(path.resolve(pkgRootPath, "src/favicon.ico"))) {
@@ -72,10 +71,10 @@ export class SdCliElectron {
72
71
  ...(electronConfig.env !== undefined) ? Object.keys(electronConfig.env).map((key) => `${key}=${electronConfig.env![key]}`) : [],
73
72
  ].filterExists().join("\n"));
74
73
 
75
- let electronTsFileContent = await FsUtil.readFileAsync(path.resolve(pkgRootPath, `src/electron.ts`));
74
+ /*let electronTsFileContent = await FsUtil.readFileAsync(path.resolve(pkgRootPath, `src/electron.ts`));
76
75
  electronTsFileContent = "require(\"dotenv\").config({ path: `${__dirname}\\\\.env` });\n" + electronTsFileContent;
77
76
  const result = ts.transpileModule(electronTsFileContent, { compilerOptions: { module: ts.ModuleKind.CommonJS } });
78
- await FsUtil.writeFileAsync(path.resolve(electronSrcPath, "electron.js"), result.outputText);
77
+ await FsUtil.writeFileAsync(path.resolve(electronSrcPath, "electron.js"), result.outputText);*/
79
78
 
80
79
  await SdProcess.spawnAsync("electron-rebuild", { cwd: pkgRootPath }, true);
81
80
 
package/src/builder/SdCliClientBuilder.ts CHANGED
@@ -277,7 +277,7 @@ export class SdCliClientBuilder extends EventEmitter {
277
277
  throw new Error("ELECTRON 빌드 패키지의 'dependencies'에는 'dotenv'가 반드시 포함되어야 합니다.");
278
278
  }
279
279
 
280
- const remoteVersion = npmConfig.dependencies?.["@electron/remote"];
280
+ // const remoteVersion = npmConfig.dependencies?.["@electron/remote"];
281
281
 
282
282
  const electronSrcPath = path.resolve(this._rootPath, `.cache/electron/src`);
283
283
  const electronDistPath = path.resolve(this._rootPath, `.cache/electron/dist`);
@@ -288,7 +288,7 @@ export class SdCliClientBuilder extends EventEmitter {
288
288
  description: npmConfig.description,
289
289
  main: "electron.js",
290
290
  author: npmConfig.author,
291
- license: npmConfig.license,
291
+ license: npmConfig.license/*,
292
292
  devDependencies: {
293
293
  "electron": electronVersion.replace("^", "")
294
294
  },
@@ -299,7 +299,7 @@ export class SdCliClientBuilder extends EventEmitter {
299
299
  } : {},
300
300
  ...extModules.filter((item) => item.exists).map((item) => item.name)
301
301
  .toObject((item) => item, () => "*")
302
- }
302
+ }*/
303
303
  }, { space: 2 });
304
304
  await FsUtil.writeFileAsync(path.resolve(electronSrcPath, "yarn.lock"), "");
305
305
 
@@ -311,10 +311,10 @@ export class SdCliClientBuilder extends EventEmitter {
311
311
  ...(this._config.builder.electron.env !== undefined) ? Object.keys(this._config.builder.electron.env).map((key) => `${key}=${this._config.builder!.electron!.env![key]}`) : []
312
312
  ].filterExists().join("\n"));
313
313
 
314
- let electronTsFileContent = await FsUtil.readFileAsync(path.resolve(this._rootPath, `src/electron.ts`));
314
+ /*let electronTsFileContent = await FsUtil.readFileAsync(path.resolve(this._rootPath, `src/electron.ts`));
315
315
  electronTsFileContent = "require(\"dotenv\").config({ path: `${__dirname}\\\\.env` });\n" + electronTsFileContent;
316
316
  const result = ts.transpileModule(electronTsFileContent, { compilerOptions: { module: ts.ModuleKind.CommonJS } });
317
- await FsUtil.writeFileAsync(path.resolve(electronSrcPath, "electron.js"), result.outputText);
317
+ await FsUtil.writeFileAsync(path.resolve(electronSrcPath, "electron.js"), result.outputText);*/
318
318
 
319
319
  await electronBuilder.build({
320
320
  targets: electronBuilder.Platform.WINDOWS.createTarget(),
@@ -406,7 +406,7 @@ export class SdCliClientBuilder extends EventEmitter {
406
406
  return {
407
407
  mode: watch ? "development" : "production",
408
408
  devtool: false,
409
- target: builderType === "electron" ? ["electron-renderer", "es2015"] : ["web", "es2015"],
409
+ target: builderType === "electron" ? ["electron-renderer", "electron-main", "es2015"] : ["web", "es2015"],
410
410
  profile: false,
411
411
  resolve: {
412
412
  roots: [this._rootPath],
@@ -424,7 +424,8 @@ export class SdCliClientBuilder extends EventEmitter {
424
424
  main: [mainFilePath],
425
425
  ...FsUtil.exists(polyfillsFilePath) ? { polyfills: [polyfillsFilePath] } : {},
426
426
  ...FsUtil.exists(stylesFilePath) ? { styles: [stylesFilePath] } : {},
427
- ...builderType === "cordova" ? { "cordova-entry": path.resolve(path.dirname(fileURLToPath(import.meta.url)), `../../lib/cordova-entry.js`) } : {}
427
+ ...builderType === "cordova" ? { "cordova-entry": path.resolve(path.dirname(fileURLToPath(import.meta.url)), `../../lib/cordova-entry.js`) } : {},
428
+ ...builderType === "electron" ? { "electron": path.resolve(this._rootPath, "src/electron.ts") } : {}
428
429
  },
429
430
  output: {
430
431
  uniqueName: pkgKey,
@@ -458,7 +459,12 @@ export class SdCliClientBuilder extends EventEmitter {
458
459
  infrastructureLogging: { level: "error" },
459
460
  stats: "errors-warnings",
460
461
  // externals: extModules.toObject((item) => item.name, (item) => item.exists ? "commonjs2 " + item.name : `var {name: '${item.name}'}`),
461
- externals: extModules.toObject((item) => item.name, (item) => "commonjs2 " + item.name),
462
+ externals: {
463
+ ...extModules.toObject((item) => item.name, (item) => "commonjs2 " + item.name),
464
+ ...builderType === "electron" ? {
465
+ "electron": "commonjs2 electron"
466
+ } : {}
467
+ },
462
468
  cache: {
463
469
  type: "filesystem",
464
470
  profile: undefined,
package/src/entry-points/file/project/fc_project_npmconfig.ts CHANGED
@@ -19,11 +19,11 @@ export const fc_project_npmconfig = (opt: { name: string; description: string; a
19
19
  "test"
20
20
  ],
21
21
  scripts: {
22
- "watch": "npx sd-cli watch",
23
- "build": "npx sd-cli build",
24
- "publish": "npx sd-cli publish",
22
+ "watch": "sd-cli watch",
23
+ "build": "sd-cli build",
24
+ "publish": "sd-cli publish",
25
25
  "----- utils": "",
26
- "postinstall": "npx sd-cli prepare"
26
+ "postinstall": "sd-cli prepare"
27
27
  },
28
28
  devDependencies: {
29
29
  "@simplysm/eslint-plugin": "~7.1.0",
@@ -31,6 +31,6 @@ export const fc_project_npmconfig = (opt: { name: string; description: string; a
31
31
  "@types/node": "^16.11.47",
32
32
  "cross-env": "^7.0.3",
33
33
  "eslint": "~8.22.0",
34
- "typescript": "~4.7.4"
34
+ "typescript": "~4.8.4"
35
35
  }
36
36
  }, undefined, 2);
package/src/ng-tools/typescript/SdCliTsFileMetadata.ts CHANGED
@@ -19,7 +19,7 @@ export class SdCliTsFileMetadata {
19
19
 
20
20
  const result: { exportedName: string; target: SdCliTsClassMetadata }[] = [];
21
21
  this.sourceFile.forEachChild((node) => {
22
- if (!node.modifiers || !node.modifiers.some((item) => item.kind === ts.SyntaxKind.ExportKeyword)) return;
22
+ if (!ts.canHaveModifiers(node) || !ts.getModifiers(node)?.some((item) => item.kind === ts.SyntaxKind.ExportKeyword)) return;
23
23
  if (!ts.isClassDeclaration(node)) return;
24
24
  if (node.name === undefined) {
25
25
  throw new NeverEntryError();
@@ -195,9 +195,9 @@ export class SdCliTsClassMetadata {
195
195
  public get ngDecl(): TSdCliTsNgMetadata | undefined {
196
196
  if (this._ngDeclCache !== undefined) return this._ngDeclCache;
197
197
 
198
- if (!this._node.decorators) return undefined;
198
+ if (!ts.canHaveDecorators(this._node)) return undefined;
199
199
 
200
- for (const deco of this._node.decorators) {
200
+ for (const deco of ts.getDecorators(this._node) ?? []) {
201
201
  if (!ts.isCallExpression(deco.expression)) continue;
202
202
  if (!ts.isIdentifier(deco.expression.expression)) {
203
203
  throw new NeverEntryError();