@simplysm/sd-cli 7.0.266 → 7.0.269

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 (33) hide show
  1. package/README.md +1 -1
  2. package/dist/bin/sd-cli.mjs +11 -11
  3. package/dist/build-tool/SdCliCordova.mjs +2 -2
  4. package/dist/build-tool/SdCliElectron.mjs +2 -2
  5. package/dist/builder/SdCliClientBuilder.d.ts +2 -2
  6. package/dist/builder/SdCliClientBuilder.mjs +28 -28
  7. package/dist/builder/SdCliServerBuilder.d.ts +2 -2
  8. package/dist/builder/SdCliServerBuilder.mjs +18 -18
  9. package/dist/builder/SdCliTsLibBuilder.d.ts +2 -2
  10. package/dist/builder/SdCliTsLibBuilder.mjs +7 -7
  11. package/dist/entry-points/{SdCliWorkspace.d.ts → SdCliProject.d.ts} +1 -1
  12. package/dist/entry-points/SdCliProject.mjs +416 -0
  13. package/dist/entry-points/SdCliProjectGenerator.mjs +3 -3
  14. package/dist/entry-points/file/project/fc_project_tsconfig.mjs +1 -2
  15. package/dist/index.d.ts +1 -1
  16. package/dist/index.mjs +2 -2
  17. package/dist/packages/SdCliPackage.d.ts +2 -2
  18. package/dist/packages/SdCliPackage.mjs +5 -5
  19. package/dist/worker/build-worker.mjs +5 -5
  20. package/package.json +6 -6
  21. package/src/bin/sd-cli.ts +10 -10
  22. package/src/build-tool/SdCliCordova.ts +1 -1
  23. package/src/build-tool/SdCliElectron.ts +1 -1
  24. package/src/builder/SdCliClientBuilder.ts +29 -28
  25. package/src/builder/SdCliServerBuilder.ts +16 -16
  26. package/src/builder/SdCliTsLibBuilder.ts +5 -5
  27. package/src/entry-points/{SdCliWorkspace.ts → SdCliProject.ts} +3 -1
  28. package/src/entry-points/SdCliProjectGenerator.ts +2 -2
  29. package/src/entry-points/file/project/fc_project_tsconfig.ts +0 -1
  30. package/src/index.ts +1 -1
  31. package/src/packages/SdCliPackage.ts +3 -3
  32. package/src/worker/build-worker.ts +4 -4
  33. package/dist/entry-points/SdCliWorkspace.mjs +0 -414
@@ -224,13 +224,13 @@ export class SdCliProjectGenerator {
224
224
  await FsUtil.writeFileAsync(path.resolve(pkgPath, "src/AppPage.ts"), fc_package_AppPage());
225
225
  this._logger.log(`[${pkgName}] 'src/index.html' 파일 등록`);
226
226
  await FsUtil.writeFileAsync(path.resolve(pkgPath, "src/index.html"), fc_package_index({
227
- description: opt.description
227
+ description: projNpmConfig.description + " - " + opt.description
228
228
  }));
229
229
  this._logger.log(`[${pkgName}] 'src/main.ts' 파일 등록`);
230
230
  await FsUtil.writeFileAsync(path.resolve(pkgPath, "src/main.ts"), fc_package_client_main());
231
231
  this._logger.log(`[${pkgName}] 'src/manifest.json' 파일 등록`);
232
232
  await FsUtil.writeFileAsync(path.resolve(pkgPath, "src/manifest.json"), fc_package_manifest({
233
- description: projNpmConfig.description,
233
+ description: projNpmConfig.description + " - " + opt.description,
234
234
  author: projNpmConfig.author,
235
235
  version: projNpmConfig.version
236
236
  }));
@@ -317,4 +317,4 @@ export class SdCliProjectGenerator {
317
317
  return projNpmConfig;
318
318
  }
319
319
  }
320
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliProjectGenerator.js","sourceRoot":"","sources":["../../src/entry-points/SdCliProjectGenerator.ts"],"names":[],"mappings":"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"}
320
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliProjectGenerator.js","sourceRoot":"","sources":["../../src/entry-points/SdCliProjectGenerator.ts"],"names":[],"mappings":"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"}
@@ -9,7 +9,6 @@ export const fc_project_tsconfig = () => JSON.stringify({
9
9
  strict: true,
10
10
  moduleResolution: "node",
11
11
  esModuleInterop: true,
12
- noImplicitOverride: true,
13
12
  noImplicitReturns: true,
14
13
  noImplicitAny: false,
15
14
  useUnknownInCatchVariables: false,
@@ -23,4 +22,4 @@ export const fc_project_tsconfig = () => JSON.stringify({
23
22
  noUnusedLocals: true
24
23
  }
25
24
  }, undefined, 2);
26
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmNfcHJvamVjdF90c2NvbmZpZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9lbnRyeS1wb2ludHMvZmlsZS9wcm9qZWN0L2ZjX3Byb2plY3RfdHNjb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxDQUFDLE1BQU0sbUJBQW1CLEdBQUcsR0FBVyxFQUFFLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQztJQUM5RCxlQUFlLEVBQUU7UUFDZixXQUFXLEVBQUUsSUFBSTtRQUNqQixrQkFBa0IsRUFBRSxJQUFJO1FBQ3hCLHNCQUFzQixFQUFFLElBQUk7UUFDNUIscUJBQXFCLEVBQUUsSUFBSTtRQUMzQixNQUFNLEVBQUUsUUFBUTtRQUNoQixNQUFNLEVBQUUsUUFBUTtRQUNoQixNQUFNLEVBQUUsSUFBSTtRQUNaLGdCQUFnQixFQUFFLE1BQU07UUFDeEIsZUFBZSxFQUFFLElBQUk7UUFDckIsa0JBQWtCLEVBQUUsSUFBSTtRQUN4QixpQkFBaUIsRUFBRSxJQUFJO1FBQ3ZCLGFBQWEsRUFBRSxLQUFLO1FBQ3BCLDBCQUEwQixFQUFFLEtBQUs7UUFDakMsMEJBQTBCLEVBQUUsSUFBSTtRQUNoQyxlQUFlLEVBQUUsSUFBSTtRQUNyQixtQkFBbUIsRUFBRSxJQUFJO1FBQ3pCLFlBQVksRUFBRSxJQUFJO1FBQ2xCLGdDQUFnQyxFQUFFLElBQUk7UUFDdEMsa0NBQWtDLEVBQUUsSUFBSTtRQUN4QyxhQUFhLEVBQUUsSUFBSTtRQUNuQixjQUFjLEVBQUUsSUFBSTtLQUNyQjtDQUNGLEVBQUUsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDIn0=
25
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmNfcHJvamVjdF90c2NvbmZpZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9lbnRyeS1wb2ludHMvZmlsZS9wcm9qZWN0L2ZjX3Byb2plY3RfdHNjb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxDQUFDLE1BQU0sbUJBQW1CLEdBQUcsR0FBVyxFQUFFLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQztJQUM5RCxlQUFlLEVBQUU7UUFDZixXQUFXLEVBQUUsSUFBSTtRQUNqQixrQkFBa0IsRUFBRSxJQUFJO1FBQ3hCLHNCQUFzQixFQUFFLElBQUk7UUFDNUIscUJBQXFCLEVBQUUsSUFBSTtRQUMzQixNQUFNLEVBQUUsUUFBUTtRQUNoQixNQUFNLEVBQUUsUUFBUTtRQUNoQixNQUFNLEVBQUUsSUFBSTtRQUNaLGdCQUFnQixFQUFFLE1BQU07UUFDeEIsZUFBZSxFQUFFLElBQUk7UUFDckIsaUJBQWlCLEVBQUUsSUFBSTtRQUN2QixhQUFhLEVBQUUsS0FBSztRQUNwQiwwQkFBMEIsRUFBRSxLQUFLO1FBQ2pDLDBCQUEwQixFQUFFLElBQUk7UUFDaEMsZUFBZSxFQUFFLElBQUk7UUFDckIsbUJBQW1CLEVBQUUsSUFBSTtRQUN6QixZQUFZLEVBQUUsSUFBSTtRQUNsQixnQ0FBZ0MsRUFBRSxJQUFJO1FBQ3RDLGtDQUFrQyxFQUFFLElBQUk7UUFDeEMsYUFBYSxFQUFFLElBQUk7UUFDbkIsY0FBYyxFQUFFLElBQUk7S0FDckI7Q0FDRixFQUFFLFNBQVMsRUFBRSxDQUFDLENBQUMsQ0FBQyJ9
package/dist/index.d.ts CHANGED
@@ -36,8 +36,8 @@ export * from "./entry-points/SdCliFileCrypto";
36
36
  export * from "./entry-points/SdCliLocalUpdate";
37
37
  export * from "./entry-points/SdCliNpm";
38
38
  export * from "./entry-points/SdCliPrepare";
39
+ export * from "./entry-points/SdCliProject";
39
40
  export * from "./entry-points/SdCliProjectGenerator";
40
- export * from "./entry-points/SdCliWorkspace";
41
41
  export * from "./ng-tools/babel/SdCliBbFileMetadata";
42
42
  export * from "./ng-tools/babel/SdCliBbRootMetadata";
43
43
  export * from "./ng-tools/babel/SdCliBbUtil";
package/dist/index.mjs CHANGED
@@ -36,8 +36,8 @@ export * from "./entry-points/SdCliFileCrypto";
36
36
  export * from "./entry-points/SdCliLocalUpdate";
37
37
  export * from "./entry-points/SdCliNpm";
38
38
  export * from "./entry-points/SdCliPrepare";
39
+ export * from "./entry-points/SdCliProject";
39
40
  export * from "./entry-points/SdCliProjectGenerator";
40
- export * from "./entry-points/SdCliWorkspace";
41
41
  export * from "./ng-tools/babel/SdCliBbFileMetadata";
42
42
  export * from "./ng-tools/babel/SdCliBbRootMetadata";
43
43
  export * from "./ng-tools/babel/SdCliBbUtil";
@@ -53,4 +53,4 @@ export * from "./SdCliBuildResultError";
53
53
  export * from "./utils/SdCliBuildResultUtil";
54
54
  export * from "./utils/SdCliConfigUtil";
55
55
  export * from "./utils/SdCliNpmConfigUtil";
56
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxxQ0FBcUMsQ0FBQztBQUNwRCxjQUFjLDJCQUEyQixDQUFDO0FBQzFDLGNBQWMsNEJBQTRCLENBQUM7QUFDM0MsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLHNDQUFzQyxDQUFDO0FBQ3JELGNBQWMsdUNBQXVDLENBQUM7QUFDdEQsY0FBYyxpQ0FBaUMsQ0FBQztBQUNoRCxjQUFjLDhCQUE4QixDQUFDO0FBQzdDLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYyw4QkFBOEIsQ0FBQztBQUM3QyxjQUFjLDZCQUE2QixDQUFDO0FBQzVDLGNBQWMsV0FBVyxDQUFDO0FBQzFCLGNBQWMsOENBQThDLENBQUM7QUFDN0QsY0FBYywrQ0FBK0MsQ0FBQztBQUM5RCxjQUFjLDhDQUE4QyxDQUFDO0FBQzdELGNBQWMsaURBQWlELENBQUM7QUFDaEUsY0FBYywrQ0FBK0MsQ0FBQztBQUM5RCxjQUFjLG1EQUFtRCxDQUFDO0FBQ2xFLGNBQWMsNkNBQTZDLENBQUM7QUFDNUQsY0FBYyxnREFBZ0QsQ0FBQztBQUMvRCxjQUFjLDRDQUE0QyxDQUFDO0FBQzNELGNBQWMsaURBQWlELENBQUM7QUFDaEUsY0FBYyw4Q0FBOEMsQ0FBQztBQUM3RCxjQUFjLDZDQUE2QyxDQUFDO0FBQzVELGNBQWMsMkNBQTJDLENBQUM7QUFDMUQsY0FBYyxzREFBc0QsQ0FBQztBQUNyRSxjQUFjLGlEQUFpRCxDQUFDO0FBQ2hFLGNBQWMsc0RBQXNELENBQUM7QUFDckUsY0FBYyxrREFBa0QsQ0FBQztBQUNqRSxjQUFjLGtEQUFrRCxDQUFDO0FBQ2pFLGNBQWMsK0NBQStDLENBQUM7QUFDOUQsY0FBYyxpREFBaUQsQ0FBQztBQUNoRSxjQUFjLGlEQUFpRCxDQUFDO0FBQ2hFLGNBQWMsbURBQW1ELENBQUM7QUFDbEUsY0FBYyxnQ0FBZ0MsQ0FBQztBQUMvQyxjQUFjLGlDQUFpQyxDQUFDO0FBQ2hELGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLHNDQUFzQyxDQUFDO0FBQ3JELGNBQWMsK0JBQStCLENBQUM7QUFDOUMsY0FBYyxzQ0FBc0MsQ0FBQztBQUNyRCxjQUFjLHNDQUFzQyxDQUFDO0FBQ3JELGNBQWMsOEJBQThCLENBQUM7QUFDN0MsY0FBYyxxQ0FBcUMsQ0FBQztBQUNwRCxjQUFjLHVDQUF1QyxDQUFDO0FBQ3RELGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyxtQ0FBbUMsQ0FBQztBQUNsRCxjQUFjLDJDQUEyQyxDQUFDO0FBQzFELGNBQWMsMkNBQTJDLENBQUM7QUFDMUQsY0FBYyxtQ0FBbUMsQ0FBQztBQUNsRCxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYyw4QkFBOEIsQ0FBQztBQUM3QyxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLGNBQWMsNEJBQTRCLENBQUMifQ==
56
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxxQ0FBcUMsQ0FBQztBQUNwRCxjQUFjLDJCQUEyQixDQUFDO0FBQzFDLGNBQWMsNEJBQTRCLENBQUM7QUFDM0MsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLHNDQUFzQyxDQUFDO0FBQ3JELGNBQWMsdUNBQXVDLENBQUM7QUFDdEQsY0FBYyxpQ0FBaUMsQ0FBQztBQUNoRCxjQUFjLDhCQUE4QixDQUFDO0FBQzdDLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYyw4QkFBOEIsQ0FBQztBQUM3QyxjQUFjLDZCQUE2QixDQUFDO0FBQzVDLGNBQWMsV0FBVyxDQUFDO0FBQzFCLGNBQWMsOENBQThDLENBQUM7QUFDN0QsY0FBYywrQ0FBK0MsQ0FBQztBQUM5RCxjQUFjLDhDQUE4QyxDQUFDO0FBQzdELGNBQWMsaURBQWlELENBQUM7QUFDaEUsY0FBYywrQ0FBK0MsQ0FBQztBQUM5RCxjQUFjLG1EQUFtRCxDQUFDO0FBQ2xFLGNBQWMsNkNBQTZDLENBQUM7QUFDNUQsY0FBYyxnREFBZ0QsQ0FBQztBQUMvRCxjQUFjLDRDQUE0QyxDQUFDO0FBQzNELGNBQWMsaURBQWlELENBQUM7QUFDaEUsY0FBYyw4Q0FBOEMsQ0FBQztBQUM3RCxjQUFjLDZDQUE2QyxDQUFDO0FBQzVELGNBQWMsMkNBQTJDLENBQUM7QUFDMUQsY0FBYyxzREFBc0QsQ0FBQztBQUNyRSxjQUFjLGlEQUFpRCxDQUFDO0FBQ2hFLGNBQWMsc0RBQXNELENBQUM7QUFDckUsY0FBYyxrREFBa0QsQ0FBQztBQUNqRSxjQUFjLGtEQUFrRCxDQUFDO0FBQ2pFLGNBQWMsK0NBQStDLENBQUM7QUFDOUQsY0FBYyxpREFBaUQsQ0FBQztBQUNoRSxjQUFjLGlEQUFpRCxDQUFDO0FBQ2hFLGNBQWMsbURBQW1ELENBQUM7QUFDbEUsY0FBYyxnQ0FBZ0MsQ0FBQztBQUMvQyxjQUFjLGlDQUFpQyxDQUFDO0FBQ2hELGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLDZCQUE2QixDQUFDO0FBQzVDLGNBQWMsc0NBQXNDLENBQUM7QUFDckQsY0FBYyxzQ0FBc0MsQ0FBQztBQUNyRCxjQUFjLHNDQUFzQyxDQUFDO0FBQ3JELGNBQWMsOEJBQThCLENBQUM7QUFDN0MsY0FBYyxxQ0FBcUMsQ0FBQztBQUNwRCxjQUFjLHVDQUF1QyxDQUFDO0FBQ3RELGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyxtQ0FBbUMsQ0FBQztBQUNsRCxjQUFjLDJDQUEyQyxDQUFDO0FBQzFELGNBQWMsMkNBQTJDLENBQUM7QUFDMUQsY0FBYyxtQ0FBbUMsQ0FBQztBQUNsRCxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYyw4QkFBOEIsQ0FBQztBQUM3QyxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLGNBQWMsNEJBQTRCLENBQUMifQ==
@@ -2,7 +2,7 @@
2
2
  import { ISdCliPackageBuildResult, TSdCliPackageConfig } from "../commons";
3
3
  import { EventEmitter } from "events";
4
4
  export declare class SdCliPackage extends EventEmitter {
5
- private readonly _workspaceRootPath;
5
+ private readonly _projRootPath;
6
6
  readonly rootPath: string;
7
7
  readonly config: TSdCliPackageConfig;
8
8
  private readonly _npmConfig;
@@ -10,7 +10,7 @@ export declare class SdCliPackage extends EventEmitter {
10
10
  get name(): string;
11
11
  get main(): string | undefined;
12
12
  get allDependencies(): string[];
13
- constructor(_workspaceRootPath: string, rootPath: string, config: TSdCliPackageConfig);
13
+ constructor(_projRootPath: string, rootPath: string, config: TSdCliPackageConfig);
14
14
  on(event: "change", listener: () => void): this;
15
15
  on(event: "complete", listener: (results: ISdCliPackageBuildResult[]) => void): this;
16
16
  setNewVersionAsync(newVersion: string, pkgNames: string[]): Promise<void>;
@@ -9,16 +9,16 @@ import { SdCliGithubApi } from "../build-tool/SdCliGithubApi";
9
9
  import cp from "child_process";
10
10
  import { fileURLToPath } from "url";
11
11
  export class SdCliPackage extends EventEmitter {
12
- constructor(_workspaceRootPath, rootPath, config) {
12
+ constructor(_projRootPath, rootPath, config) {
13
13
  super();
14
- this._workspaceRootPath = _workspaceRootPath;
14
+ this._projRootPath = _projRootPath;
15
15
  this.rootPath = rootPath;
16
16
  this.config = config;
17
17
  const npmConfigFilePath = path.resolve(this.rootPath, "package.json");
18
18
  this._npmConfig = FsUtil.readJson(npmConfigFilePath);
19
19
  }
20
20
  get basename() {
21
- return path.basename(this._workspaceRootPath);
21
+ return path.basename(this._projRootPath);
22
22
  }
23
23
  get name() {
24
24
  return this._npmConfig.name;
@@ -168,7 +168,7 @@ export class SdCliPackage extends EventEmitter {
168
168
  cmd,
169
169
  this.rootPath,
170
170
  JsonConvert.stringify(this.config),
171
- this._workspaceRootPath
171
+ this._projRootPath
172
172
  ], {
173
173
  stdio: ["pipe", "pipe", "pipe", "ipc"],
174
174
  env: process.env
@@ -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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"}
@@ -20,17 +20,17 @@ else {
20
20
  const type = process.argv[2];
21
21
  const rootPath = process.argv[3];
22
22
  const config = JsonConvert.parse(process.argv[4]);
23
- const workspaceRootPath = process.argv[5];
23
+ const projRootPath = process.argv[5];
24
24
  function createBuilder() {
25
25
  const isTs = FsUtil.exists(path.resolve(rootPath, "tsconfig.json"));
26
26
  if (config.type === "library") {
27
- return isTs ? new SdCliTsLibBuilder(rootPath, config, workspaceRootPath) : new SdCliJsLibBuilder(rootPath);
27
+ return isTs ? new SdCliTsLibBuilder(rootPath, config, projRootPath) : new SdCliJsLibBuilder(rootPath);
28
28
  }
29
29
  else if (config.type === "server") {
30
- return new SdCliServerBuilder(rootPath, config, workspaceRootPath);
30
+ return new SdCliServerBuilder(rootPath, config, projRootPath);
31
31
  }
32
32
  else {
33
- return new SdCliClientBuilder(rootPath, config, workspaceRootPath);
33
+ return new SdCliClientBuilder(rootPath, config, projRootPath);
34
34
  }
35
35
  }
36
36
  const builder = createBuilder();
@@ -64,4 +64,4 @@ else {
64
64
  process.exit(1);
65
65
  });
66
66
  }
67
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGQtd29ya2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3dvcmtlci9idWlsZC13b3JrZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDakUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDakUsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDbkUsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDbkUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsY0FBYyxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDeEUsT0FBTyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQ3hCLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUd2RCxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsd0JBQXdCLENBQUMsS0FBSyxPQUFPLEVBQUU7SUFDckQsTUFBTSxDQUFDLFNBQVMsQ0FBQztRQUNmLE9BQU8sRUFBRTtZQUNQLEtBQUssRUFBRSxjQUFjLENBQUMsS0FBSztTQUM1QjtLQUNGLENBQUMsQ0FBQztDQUNKO0tBQ0k7SUFDSCxNQUFNLENBQUMsU0FBUyxDQUFDO1FBQ2YsR0FBRyxFQUFFLElBQUk7S0FDVixDQUFDLENBQUM7Q0FDSjtBQUVELE1BQU0sSUFBSSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUF3QixDQUFDO0FBQ3BELE1BQU0sUUFBUSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDakMsTUFBTSxNQUFNLEdBQUcsV0FBVyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUF3QixDQUFDO0FBQ3pFLE1BQU0saUJBQWlCLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FB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
67
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGQtd29ya2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3dvcmtlci9idWlsZC13b3JrZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDakUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDakUsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDbkUsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDbkUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsY0FBYyxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDeEUsT0FBTyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQ3hCLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUd2RCxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsd0JBQXdCLENBQUMsS0FBSyxPQUFPLEVBQUU7SUFDckQsTUFBTSxDQUFDLFNBQVMsQ0FBQztRQUNmLE9BQU8sRUFBRTtZQUNQLEtBQUssRUFBRSxjQUFjLENBQUMsS0FBSztTQUM1QjtLQUNGLENBQUMsQ0FBQztDQUNKO0tBQ0k7SUFDSCxNQUFNLENBQUMsU0FBUyxDQUFDO1FBQ2YsR0FBRyxFQUFFLElBQUk7S0FDVixDQUFDLENBQUM7Q0FDSjtBQUVELE1BQU0sSUFBSSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUF3QixDQUFDO0FBQ3BELE1BQU0sUUFBUSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDakMsTUFBTSxNQUFNLEdBQUcsV0FBVyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUF3QixDQUFDO0FBQ3pFLE1BQU0sWUFBWSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMs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
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@simplysm/sd-cli",
3
- "version": "7.0.266",
3
+ "version": "7.0.269",
4
4
  "description": "심플리즘 패키지 - CLI",
5
5
  "author": "김석래",
6
6
  "repository": {
@@ -23,11 +23,11 @@
23
23
  "@babel/parser": "^7.17.0",
24
24
  "@babel/types": "^7.17.0",
25
25
  "@ngtools/webpack": "^13.2.2",
26
- "@simplysm/sd-core-common": "7.0.266",
27
- "@simplysm/sd-core-node": "7.0.266",
28
- "@simplysm/sd-service-common": "7.0.266",
29
- "@simplysm/sd-service-server": "7.0.266",
30
- "@simplysm/sd-storage": "7.0.266",
26
+ "@simplysm/sd-core-common": "7.0.269",
27
+ "@simplysm/sd-core-node": "7.0.269",
28
+ "@simplysm/sd-service-common": "7.0.269",
29
+ "@simplysm/sd-service-server": "7.0.269",
30
+ "@simplysm/sd-storage": "7.0.269",
31
31
  "browserslist": "^4.19.1",
32
32
  "chokidar": "^3.5.3",
33
33
  "connect": "^3.7.0",
package/src/bin/sd-cli.ts CHANGED
@@ -3,7 +3,7 @@
3
3
  import yargs from "yargs";
4
4
  import { hideBin } from "yargs/helpers";
5
5
  import { Logger, LoggerSeverity } from "@simplysm/sd-core-node";
6
- import { SdCliWorkspace } from "../entry-points/SdCliWorkspace";
6
+ import { SdCliProject } from "../entry-points/SdCliProject";
7
7
  import { SdCliLocalUpdate } from "../entry-points/SdCliLocalUpdate";
8
8
  import { SdCliNpm } from "../entry-points/SdCliNpm";
9
9
  import { SdCliPrepare } from "../entry-points/SdCliPrepare";
@@ -180,13 +180,9 @@ const argv = (yargs(hideBin(process.argv)) as any)
180
180
  })
181
181
  )
182
182
  .command(
183
- "init [name] <description> <author> <gitUrl>",
183
+ "init <description> <author> <gitUrl> [name]",
184
184
  "프로젝트를 초기화 합니다.",
185
185
  (cmd) => cmd.version(false).hide("help").hide("debug")
186
- .positional("name", {
187
- type: "string",
188
- describe: "프로젝트 영문명 (기본값: 최종폴더명)"
189
- })
190
186
  .positional("description", {
191
187
  type: "string",
192
188
  describe: "프로젝트 설명(=명칭)",
@@ -202,6 +198,10 @@ const argv = (yargs(hideBin(process.argv)) as any)
202
198
  describe: "소스코드 관리를 위한 GIT 레파지토리 URL",
203
199
  demandOption: true
204
200
  })
201
+ .positional("name", {
202
+ type: "string",
203
+ describe: "프로젝트 영문명 (기본값: 최종폴더명)"
204
+ })
205
205
  .example([
206
206
  ["$0 init sample 샘플프로젝트 홍길동 https://github.com/my/sample.git"]
207
207
  ])
@@ -255,7 +255,7 @@ const argv = (yargs(hideBin(process.argv)) as any)
255
255
  ])
256
256
  )
257
257
  .command(
258
- "db-model <dbName> <category></category> <name> <description>",
258
+ "db-model <dbName> <category> <name> <description>",
259
259
  "DB 패키지에 모델를 추가합니다.",
260
260
  (cmd1) => cmd1.version(false).hide("help").hide("debug")
261
261
  .positional("dbName", {
@@ -386,7 +386,7 @@ const logger = Logger.get(["simplysm", "sd-cli", "bin", "sd-cli"]);
386
386
  });
387
387
  }
388
388
  else if (argv._[0] === "watch") {
389
- await new SdCliWorkspace(process.cwd())
389
+ await new SdCliProject(process.cwd())
390
390
  .watchAsync({
391
391
  confFileRelPath: argv.config ?? "simplysm.json",
392
392
  optNames: argv.options ?? [],
@@ -413,7 +413,7 @@ const logger = Logger.get(["simplysm", "sd-cli", "bin", "sd-cli"]);
413
413
  );
414
414
  }
415
415
  else if (argv._[0] === "build") {
416
- await new SdCliWorkspace(process.cwd())
416
+ await new SdCliProject(process.cwd())
417
417
  .buildAsync({
418
418
  confFileRelPath: argv.config ?? "simplysm.json",
419
419
  optNames: argv.options ?? [],
@@ -422,7 +422,7 @@ const logger = Logger.get(["simplysm", "sd-cli", "bin", "sd-cli"]);
422
422
  process.exit(0);
423
423
  }
424
424
  else if (argv._[0] === "publish") {
425
- await new SdCliWorkspace(process.cwd())
425
+ await new SdCliProject(process.cwd())
426
426
  .publishAsync({
427
427
  noBuild: argv.noBuild,
428
428
  confFileRelPath: argv.config ?? "simplysm.json",
@@ -34,7 +34,7 @@ export class SdCliCordova {
34
34
  this._logger.log("이미 생성되어있는 '.cordova'를 사용합니다.");
35
35
  }
36
36
  else {
37
- await this._execAsync(`${this._binPath} telemetry on`, this.cordovaPath);
37
+ await this._execAsync(`${this._binPath} telemetry on`, this._rootPath);
38
38
 
39
39
  // 프로젝트 생성
40
40
  await this._execAsync(`${this._binPath} create "${this.cordovaPath}" "${this._config.appId}" "${this._config.appName}"`, process.cwd());
@@ -20,7 +20,7 @@ export class SdCliElectron {
20
20
  if (!electronConfig) throw new Error("ELECTRON 설정을 찾을 수 없습니다.");
21
21
 
22
22
  const pkgRootPath = path.resolve(this._rootPath, `packages/${pkgName}`);
23
- const electronSrcPath = path.resolve(pkgRootPath, `.electron/src`);
23
+ const electronSrcPath = path.resolve(pkgRootPath, `.cache/electron/src`);
24
24
 
25
25
  await FsUtil.removeAsync(electronSrcPath);
26
26
 
@@ -50,7 +50,7 @@ export class SdCliClientBuilder extends EventEmitter {
50
50
 
51
51
  public constructor(private readonly _rootPath: string,
52
52
  private readonly _config: ISdCliClientPackageConfig,
53
- private readonly _workspaceRootPath: string) {
53
+ private readonly _projRootPath: string) {
54
54
  super();
55
55
 
56
56
  const npmConfig = this._getNpmConfig(this._rootPath)!;
@@ -95,12 +95,12 @@ export class SdCliClientBuilder extends EventEmitter {
95
95
  }
96
96
 
97
97
  private async _checkCacheAsync(watch: boolean): Promise<void> {
98
- const workspacePkgLockContent = await FsUtil.readFileAsync(path.resolve(this._workspaceRootPath, "package-lock.json"));
98
+ const projPkgLockContent = await FsUtil.readFileAsync(path.resolve(this._projRootPath, "package-lock.json"));
99
99
 
100
100
  // const cachePath = path.resolve(cacheBasePath, pkgVersion);
101
101
 
102
102
  const versionHash = createHash("sha1")
103
- .update(workspacePkgLockContent)
103
+ .update(projPkgLockContent)
104
104
  .update(JSON.stringify(this._parsedTsconfig.options))
105
105
  .update(JSON.stringify(this._config))
106
106
  .update(watch.toString())
@@ -121,7 +121,7 @@ export class SdCliClientBuilder extends EventEmitter {
121
121
 
122
122
  public async watchAsync(): Promise<void> {
123
123
  // DIST 비우기
124
- await FsUtil.removeAsync(path.resolve(this._rootPath, ".electron"));
124
+ await FsUtil.removeAsync(path.resolve(this._rootPath, ".cache", "electron"));
125
125
  await FsUtil.removeAsync(this._parsedTsconfig.options.outDir!);
126
126
 
127
127
  // 캐시체크
@@ -183,7 +183,7 @@ export class SdCliClientBuilder extends EventEmitter {
183
183
  const packageKey = npmConfig.name.split("/").last()!;
184
184
 
185
185
  const configDistPath = typeof this._config.server === "string"
186
- ? path.resolve(this._workspaceRootPath, "packages", this._config.server, "dist/www", packageKey, ".config.json")
186
+ ? path.resolve(this._projRootPath, "packages", this._config.server, "dist/www", packageKey, ".config.json")
187
187
  : path.resolve(this._parsedTsconfig.options.outDir!, ".config.json");
188
188
  await FsUtil.writeFileAsync(configDistPath, JSON.stringify(this._config.configs ?? {}, undefined, 2));
189
189
 
@@ -202,7 +202,7 @@ export class SdCliClientBuilder extends EventEmitter {
202
202
  public async buildAsync(): Promise<ISdCliPackageBuildResult[]> {
203
203
  // DIST 비우기
204
204
  this._logger.debug("removeAsync:1");
205
- await FsUtil.removeAsync(path.resolve(this._rootPath, ".electron"));
205
+ await FsUtil.removeAsync(path.resolve(this._rootPath, ".cache", "electron"));
206
206
  this._logger.debug("removeAsync:2");
207
207
  await FsUtil.removeAsync(this._parsedTsconfig.options.outDir!);
208
208
 
@@ -246,10 +246,11 @@ export class SdCliClientBuilder extends EventEmitter {
246
246
  if (builderTypes.includes("web") && FsUtil.exists(path.resolve(this._rootPath, "ngsw-config.json"))) {
247
247
  const packageKey = this._getNpmConfig(this._rootPath)!.name.split("/").last()!;
248
248
  await augmentAppWithServiceWorker(
249
- PathUtil.posix(path.relative(this._workspaceRootPath, this._rootPath)) as any,
250
- PathUtil.posix(path.relative(this._workspaceRootPath, path.resolve(this._parsedTsconfig.options.outDir!))) as any,
249
+ PathUtil.posix(path.relative(this._projRootPath, this._rootPath)) as any,
250
+ PathUtil.posix(this._projRootPath),
251
+ PathUtil.posix(path.relative(this._projRootPath, path.resolve(this._parsedTsconfig.options.outDir!))) as any,
251
252
  `/${packageKey}/` as any,
252
- PathUtil.posix(path.relative(this._workspaceRootPath, path.resolve(this._rootPath, "ngsw-config.json")))
253
+ PathUtil.posix(path.relative(this._projRootPath, path.resolve(this._rootPath, "ngsw-config.json")))
253
254
  );
254
255
  }
255
256
 
@@ -275,8 +276,8 @@ export class SdCliClientBuilder extends EventEmitter {
275
276
 
276
277
  const remoteVersion = npmConfig.dependencies?.["@electron/remote"];
277
278
 
278
- const electronSrcPath = path.resolve(this._rootPath, `.electron/src`);
279
- const electronDistPath = path.resolve(this._rootPath, `.electron/dist`);
279
+ const electronSrcPath = path.resolve(this._rootPath, `.cache/electron/src`);
280
+ const electronDistPath = path.resolve(this._rootPath, `.cache/electron/dist`);
280
281
 
281
282
  await FsUtil.writeJsonAsync(path.resolve(electronSrcPath, `package.json`), {
282
283
  name: npmConfig.name,
@@ -331,12 +332,12 @@ export class SdCliClientBuilder extends EventEmitter {
331
332
  });
332
333
 
333
334
  await FsUtil.copyAsync(
334
- path.resolve(this._rootPath, `.electron/dist/${npmConfig.description} Setup ${npmConfig.version}.exe`),
335
+ path.resolve(this._rootPath, `.cache/electron/dist/${npmConfig.description} Setup ${npmConfig.version}.exe`),
335
336
  path.resolve(this._parsedTsconfig.options.outDir!, `electron/${npmConfig.description}-latest.exe`)
336
337
  );
337
338
 
338
339
  await FsUtil.copyAsync(
339
- path.resolve(this._rootPath, `.electron/dist/${npmConfig.description} Setup ${npmConfig.version}.exe`),
340
+ path.resolve(this._rootPath, `.cache/electron/dist/${npmConfig.description} Setup ${npmConfig.version}.exe`),
340
341
  path.resolve(this._parsedTsconfig.options.outDir!, `electron/updates/${npmConfig.version}.exe`)
341
342
  );
342
343
  }
@@ -346,28 +347,28 @@ export class SdCliClientBuilder extends EventEmitter {
346
347
  return buildResults;
347
348
  }
348
349
 
349
- private _getInternalModuleCachePaths(workspaceName: string): string[] {
350
+ private _getInternalModuleCachePaths(projName: string): string[] {
350
351
  return [
351
- ...FsUtil.findAllParentChildDirPaths("node_modules/*/package.json", this._rootPath, this._workspaceRootPath),
352
- ...FsUtil.findAllParentChildDirPaths(`node_modules/!(@simplysm|@${workspaceName})/*/package.json`, this._rootPath, this._workspaceRootPath),
352
+ ...FsUtil.findAllParentChildDirPaths("node_modules/*/package.json", this._rootPath, this._projRootPath),
353
+ ...FsUtil.findAllParentChildDirPaths(`node_modules/!(@simplysm|@${projName})/*/package.json`, this._rootPath, this._projRootPath),
353
354
  ].map((p) => path.dirname(p));
354
355
  }
355
356
 
356
357
  private _getWebpackConfig(watch: boolean, builderType: "web" | "cordova" | "electron"): webpack.Configuration {
357
- const workspaceNpmConfig = this._getNpmConfig(this._workspaceRootPath)!;
358
- const workspaceName = workspaceNpmConfig.name;
358
+ const projNpmConfig = this._getNpmConfig(this._projRootPath)!;
359
+ const projName = projNpmConfig.name;
359
360
 
360
- const internalModuleCachePaths = watch ? this._getInternalModuleCachePaths(workspaceName) : undefined;
361
+ const internalModuleCachePaths = watch ? this._getInternalModuleCachePaths(projName) : undefined;
361
362
 
362
363
  const npmConfig = this._getNpmConfig(this._rootPath)!;
363
364
 
364
- const workspacePkgLockContent = FsUtil.readFile(path.resolve(this._workspaceRootPath, "package-lock.json"));
365
+ const projPkgLockContent = FsUtil.readFile(path.resolve(this._projRootPath, "package-lock.json"));
365
366
 
366
367
  const pkgKey = npmConfig.name.split("/").last()!;
367
368
  const publicPath = builderType === "web" ? `/${pkgKey}/` : watch ? `/${pkgKey}/${builderType}/` : ``;
368
369
 
369
370
  const distPath = (builderType === "cordova" && !watch) ? path.resolve(this._cordova!.cordovaPath, "www")
370
- : (builderType === "electron" && !watch) ? path.resolve(this._rootPath, ".electron/src")
371
+ : (builderType === "electron" && !watch) ? path.resolve(this._rootPath, ".cache/electron/src")
371
372
  : builderType === "web" ? this._parsedTsconfig.options.outDir
372
373
  : `${this._parsedTsconfig.options.outDir}/${builderType}`;
373
374
 
@@ -378,7 +379,7 @@ export class SdCliClientBuilder extends EventEmitter {
378
379
  const stylesFilePath = path.resolve(this._rootPath, "src/styles.scss");
379
380
 
380
381
  const versionHash = createHash("sha1")
381
- .update(workspacePkgLockContent)
382
+ .update(projPkgLockContent)
382
383
  .update(JSON.stringify(this._parsedTsconfig.options))
383
384
  .update(JSON.stringify(this._config))
384
385
  .update(watch.toString())
@@ -406,14 +407,14 @@ export class SdCliClientBuilder extends EventEmitter {
406
407
  roots: [this._rootPath],
407
408
  extensions: [".ts", ".tsx", ".mjs", ".cjs", ".js", ".jsx"],
408
409
  symlinks: true,
409
- modules: [this._workspaceRootPath, "node_modules"],
410
+ modules: [this._projRootPath, "node_modules"],
410
411
  mainFields: ["es2015", "browser", "module", "main"],
411
412
  conditionNames: ["es2015", "..."],
412
413
  },
413
414
  resolveLoader: {
414
415
  symlinks: true
415
416
  },
416
- context: this._workspaceRootPath,
417
+ context: this._projRootPath,
417
418
  entry: {
418
419
  main: [mainFilePath],
419
420
  ...FsUtil.exists(polyfillsFilePath) ? { polyfills: [polyfillsFilePath] } : {},
@@ -479,7 +480,7 @@ export class SdCliClientBuilder extends EventEmitter {
479
480
  supportedBrowsers: browserslist([
480
481
  "last 1 Chrome versions",
481
482
  "last 2 Edge major versions"
482
- ], { path: this._workspaceRootPath })
483
+ ], { path: this._projRootPath })
483
484
  })
484
485
  ] as any[],
485
486
  moduleIds: "deterministic",
@@ -548,10 +549,10 @@ export class SdCliClientBuilder extends EventEmitter {
548
549
  loader: "source-map-loader",
549
550
  options: {
550
551
  filterSourceMappingUrl: (mapUri: string, resourcePath: string) => {
551
- const workspaceRegex = new RegExp(`node_modules[\\\\/]@${workspaceName}[\\\\/]`);
552
+ const projRegex = new RegExp(`node_modules[\\\\/]@${projName}[\\\\/]`);
552
553
  return !resourcePath.includes("node_modules")
553
554
  || (/node_modules[\\/]@simplysm[\\/]/).test(resourcePath)
554
- || workspaceRegex.test(resourcePath);
555
+ || projRegex.test(resourcePath);
555
556
  }
556
557
  }
557
558
  }
@@ -758,7 +759,7 @@ export class SdCliClientBuilder extends EventEmitter {
758
759
  }),
759
760
  new ESLintWebpackPlugin({
760
761
  context: this._rootPath,
761
- eslintPath: path.resolve(this._workspaceRootPath, "node_modules", "eslint"),
762
+ eslintPath: path.resolve(this._projRootPath, "node_modules", "eslint"),
762
763
  exclude: ["node_modules"],
763
764
  extensions: ["ts", "js", "mjs", "cjs"],
764
765
  fix: false,