@simplysm/sd-cli 7.0.66 → 7.0.74

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.
@@ -2,14 +2,15 @@ import { SdCliTsRootMetadata } from "./typescript/SdCliTsRootMetadata";
2
2
  import { SdCliBbRootMetadata } from "./babel/SdCliBbRootMetadata";
3
3
  import { SdCliBbClassMetadata, SdCliBbObjectMetadata } from "./babel/TSdCliBbTypeMetadata";
4
4
  import { SdCliBbNgComponentMetadata, SdCliBbNgDirectiveMetadata, SdCliBbNgModuleMetadata, SdCliBbNgPipeMetadata } from "./babel/TSdCliBbNgMetadata";
5
- import { NeverEntryError, StringUtil } from "@simplysm/sd-core-common";
5
+ import { NeverEntryError, ObjectUtil, StringUtil } from "@simplysm/sd-core-common";
6
6
  import { SdCliTsNgInjectableMetadata } from "./typescript/SdCliTsFileMetadata";
7
7
  import path from "path";
8
8
  import { JSDOM } from "jsdom";
9
- import { FsUtil, PathUtil } from "@simplysm/sd-core-node";
9
+ import { FsUtil, Logger, PathUtil } from "@simplysm/sd-core-node";
10
10
  import os from "os";
11
11
  // TODO: 에러 메시지 처리
12
12
  // TODO: forRoot에 있는 Provider 처리??
13
+ // TODO: CircularDependency
13
14
  export class SdCliNgModuleGenerator {
14
15
  constructor(packagePath, _srcDirRelPaths, _routeOpts) {
15
16
  this._srcDirRelPaths = _srcDirRelPaths;
@@ -24,6 +25,8 @@ export class SdCliNgModuleGenerator {
24
25
  const content = FsUtil.readFile(currFilePath);
25
26
  this._fileWriterCache.set(currFilePath, content);
26
27
  }
28
+ const npmConfig = FsUtil.readJson(path.resolve(packagePath, "package.json"));
29
+ this._logger = Logger.get(["simplysm", "sd-cli", this.constructor.name, npmConfig.name]);
27
30
  }
28
31
  removeCaches(changedFilePaths) {
29
32
  this._bbMeta.removeCaches(changedFilePaths);
@@ -35,16 +38,95 @@ export class SdCliNgModuleGenerator {
35
38
  }
36
39
  }
37
40
  async runAsync() {
41
+ this._logger.debug("Babel NgModule 정의 가져오기...");
38
42
  const bbNgModules = this._getBbNgModuleDefs();
43
+ this._logger.debug("NgModule Preset 구성...");
39
44
  const tsPreset = this._getTsGenNgModulePreset();
45
+ this._logger.debug("RoutingModule 정의 구성...");
40
46
  const genNgRoutingModules = await this._getGenNgRoutingModuleDefsAsync();
47
+ this._logger.debug("NgModule 정의 구성...");
41
48
  const genNgModules = this._getGenNgModuleDefs(bbNgModules, tsPreset.modules, tsPreset.sources);
49
+ this._logger.debug("NgModule 순환참조 병합...");
50
+ const mergedGenNgModules = this._mergeNgModuleCircularDependency(genNgModules);
51
+ this._logger.debug("생성할 파일 내용 구성...");
42
52
  const files = [
43
53
  ...this._getGenNgRoutingModuleFiles(genNgRoutingModules),
44
- ...this._getGenNgModuleFiles(genNgModules)
54
+ ...this._getGenNgModuleFiles(mergedGenNgModules)
45
55
  ];
56
+ this._logger.debug("파일 쓰기...");
46
57
  await this._writeFilesAsync(files);
47
58
  }
59
+ _mergeNgModuleCircularDependency(mods) {
60
+ // 중복 'check'목록 구성
61
+ const check = (mod, ref, chain) => {
62
+ const result = [];
63
+ for (const imp of mod.imports) {
64
+ if ("filePath" in imp) {
65
+ if (imp.filePath === ref.filePath || imp.name === ref.name) {
66
+ result.push(chain.concat([mod]));
67
+ }
68
+ else {
69
+ const childMod = mods.single((item) => item.filePath === imp.filePath && item.name === imp.name);
70
+ if (childMod) {
71
+ if (chain.some((item) => item.filePath === childMod.filePath && item.name === childMod.name)) {
72
+ continue;
73
+ }
74
+ result.push(...check(childMod, ref, chain.concat([mod])));
75
+ }
76
+ }
77
+ }
78
+ }
79
+ return result;
80
+ };
81
+ const checkedList = [];
82
+ for (const mod of mods) {
83
+ const circularDepModules = check(mod, { filePath: mod.filePath, name: mod.name }, []);
84
+ if (circularDepModules.length > 0) {
85
+ checkedList.push(...circularDepModules);
86
+ }
87
+ }
88
+ const mergeModPacks = checkedList.map((item) => item.orderBy((item1) => item1.filePath)).distinct();
89
+ // 'merge'목록 구성
90
+ const currMergedList = [];
91
+ for (const mergeModPack of mergeModPacks) {
92
+ let currMerged = mergeModPack[0];
93
+ for (const mergeMod of mergeModPack.slice(1)) {
94
+ currMerged = {
95
+ filePath: currMerged.filePath,
96
+ name: currMerged.name,
97
+ imports: currMerged.imports.concat(mergeMod.imports).distinct(),
98
+ exports: currMerged.exports.concat(mergeMod.exports).distinct(),
99
+ providers: currMerged.providers.concat(mergeMod.providers).distinct()
100
+ };
101
+ }
102
+ currMerged.imports.remove((imp) => ("filePath" in imp &&
103
+ mergeModPack.some((mergeMod) => (imp.filePath === mergeMod.filePath &&
104
+ imp.name === mergeMod.name))));
105
+ currMergedList.push(currMerged);
106
+ }
107
+ // 기존 'check'된 것들 모두 삭제
108
+ const result = ObjectUtil.clone(mods);
109
+ for (const delMod of mergeModPacks.mapMany()) {
110
+ result.remove((item) => item.filePath === delMod.filePath && item.name === delMod.name);
111
+ }
112
+ // 'merge'된 것들 등록
113
+ result.push(...currMergedList);
114
+ // 모든 결과물에서 'import'에 'merge'된것들이 있으면 'merge'결과물 파일로 변경후, distinct
115
+ for (const resultItem of result) {
116
+ for (const imp of resultItem.imports) {
117
+ if (!("filePath" in imp))
118
+ continue;
119
+ for (const mergeModPack of mergeModPacks) {
120
+ if (mergeModPack.some((mergeModPackItem) => mergeModPackItem.filePath === imp.filePath && mergeModPackItem.name === imp.name)) {
121
+ imp.filePath = mergeModPack[0].filePath;
122
+ imp.name = mergeModPack[0].name;
123
+ }
124
+ }
125
+ }
126
+ resultItem.imports = resultItem.imports.distinct();
127
+ }
128
+ return result;
129
+ }
48
130
  _findBbMetasFromMeta(srcMeta) {
49
131
  const metaTmp = typeof srcMeta !== "string" && "__TSdCliMetaRef__" in srcMeta ? this._bbMeta.findMeta(srcMeta) : srcMeta;
50
132
  return metaTmp instanceof Array ? metaTmp : [metaTmp];
@@ -145,7 +227,7 @@ export class SdCliNgModuleGenerator {
145
227
  const moduleClassName = cls.exportedName + "Module";
146
228
  const moduleFilePath = path.resolve(this._modulesPath, path.relative(this._srcPath, path.dirname(fileMeta.filePath)), moduleClassName);
147
229
  result.sources.push({
148
- filePath: fileMeta.filePath,
230
+ filePath: fileMeta.filePath.replace(/\.[^.]*$/, ""),
149
231
  name: cls.exportedName,
150
232
  module: {
151
233
  filePath: moduleFilePath,
@@ -159,7 +241,7 @@ export class SdCliNgModuleGenerator {
159
241
  filePath: moduleFilePath,
160
242
  name: moduleClassName,
161
243
  source: {
162
- filePath: fileMeta.filePath,
244
+ filePath: fileMeta.filePath.replace(/\.[^.]*$/, ""),
163
245
  name: cls.exportedName
164
246
  },
165
247
  selector: "selector" in cls.target.ngDecl ? cls.target.ngDecl.selector : undefined,
@@ -172,9 +254,9 @@ export class SdCliNgModuleGenerator {
172
254
  }
173
255
  _getGenNgModuleDefs(bbModules, presetModules, presetSources) {
174
256
  const result = [];
175
- for (const el of presetSources) {
257
+ for (const presetSource of presetSources) {
176
258
  const imports = [];
177
- for (const imp of el.imports) {
259
+ for (const imp of presetSource.imports) {
178
260
  if ("moduleName" in imp) {
179
261
  for (const mod of bbModules) {
180
262
  if (mod.exports.some((item) => item.moduleName === imp.moduleName && item.name === imp.name)) {
@@ -193,8 +275,8 @@ export class SdCliNgModuleGenerator {
193
275
  }
194
276
  }
195
277
  }
196
- if (el.template !== undefined) {
197
- const templateDOM = new JSDOM(el.template);
278
+ if (presetSource.template !== undefined) {
279
+ const templateDOM = new JSDOM(presetSource.template);
198
280
  for (const mod of bbModules) {
199
281
  for (const selector of mod.selectors) {
200
282
  if (templateDOM.window.document.querySelector([
@@ -206,7 +288,7 @@ export class SdCliNgModuleGenerator {
206
288
  }
207
289
  }
208
290
  for (const pipeName of mod.pipeNames) {
209
- if (new RegExp("| *" + pipeName + "[^\\w]").test(el.template)) {
291
+ if (new RegExp("| *" + pipeName + "[^\\w]").test(presetSource.template)) {
210
292
  imports.push({ moduleName: mod.moduleName, name: mod.name, __TSdCliMetaRef__: "__TSdCliMetaRef__" });
211
293
  }
212
294
  }
@@ -222,18 +304,18 @@ export class SdCliNgModuleGenerator {
222
304
  }
223
305
  }
224
306
  if (mod.pipeName !== undefined) {
225
- if (new RegExp("| *" + mod.pipeName + "[^\\w]").test(el.template)) {
307
+ if (new RegExp("| *" + mod.pipeName + "[^\\w]").test(presetSource.template)) {
226
308
  imports.push({ filePath: mod.filePath, name: mod.name, __TSdCliMetaRef__: "__TSdCliMetaRef__" });
227
309
  }
228
310
  }
229
311
  }
230
312
  }
231
313
  result.push({
232
- filePath: el.module.filePath,
233
- name: el.module.name,
314
+ filePath: presetSource.module.filePath,
315
+ name: presetSource.module.name,
234
316
  imports: imports.distinct(),
235
- exports: el.isProvider ? [] : [{ filePath: el.filePath, name: el.name }],
236
- providers: el.isProvider ? [{ filePath: el.filePath, name: el.name }] : []
317
+ exports: presetSource.isProvider ? [] : [{ filePath: presetSource.filePath, name: presetSource.name }],
318
+ providers: presetSource.isProvider ? [{ filePath: presetSource.filePath, name: presetSource.name }] : []
237
319
  });
238
320
  }
239
321
  return result;
@@ -401,4 +483,4 @@ export class ${mod.name} {
401
483
  return filePath.startsWith(".") ? filePath : "./" + filePath;
402
484
  }
403
485
  }
404
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliNgModuleGenerator.js","sourceRoot":"","sources":["../../src/ng-tools/SdCliNgModuleGenerator.ts"],"names":[],"mappings":"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"}
486
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliNgModuleGenerator.js","sourceRoot":"","sources":["../../src/ng-tools/SdCliNgModuleGenerator.ts"],"names":[],"mappings":"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"}
@@ -1,12 +1,14 @@
1
1
  import path from "path";
2
- import { FsUtil, SdProcess } from "@simplysm/sd-core-node";
2
+ import { FsUtil, PathUtil, SdProcess } from "@simplysm/sd-core-node";
3
3
  import { EventEmitter } from "events";
4
- import { ObjectUtil } from "@simplysm/sd-core-common";
4
+ import { NeverEntryError, ObjectUtil, StringUtil } from "@simplysm/sd-core-common";
5
5
  import { SdCliTsLibBuilder } from "../builder/SdCliTsLibBuilder";
6
6
  import { SdCliJsLibBuilder } from "../builder/SdCliJsLibBuilder";
7
7
  import { SdCliServerBuilder } from "../builder/SdCliServerBuilder";
8
8
  import { SdCliNpmConfigUtil } from "../utils/SdCliNpmConfigUtil";
9
9
  import { SdCliClientBuilder } from "../builder/SdCliClientBuilder";
10
+ import { SdStorage } from "@simplysm/sd-storage";
11
+ import ts from "typescript";
10
12
  export class SdCliPackage extends EventEmitter {
11
13
  constructor(_workspaceRootPath, rootPath, config) {
12
14
  super();
@@ -66,8 +68,53 @@ export class SdCliPackage extends EventEmitter {
66
68
  return await (await this._createBuilderAsync()).buildAsync();
67
69
  }
68
70
  async publishAsync() {
69
- if (this.config.type === "library" && this.config.publish === "npm") {
70
- await SdProcess.spawnAsync("npm publish --quiet --access public", { cwd: this.rootPath });
71
+ if (this.config.publish !== undefined) {
72
+ if (this.config.type === "library") {
73
+ // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
74
+ if (this.config.publish === "npm") {
75
+ await SdProcess.spawnAsync("npm publish --quiet --access public", { cwd: this.rootPath });
76
+ }
77
+ else {
78
+ throw new NeverEntryError();
79
+ }
80
+ }
81
+ else {
82
+ if (this.config.publish.type === "ftp" || this.config.publish.type === "ftps" || this.config.publish.type === "sftp") {
83
+ const tsconfigPath = path.resolve(this.rootPath, "tsconfig-build.json");
84
+ const tsconfig = FsUtil.readJson(tsconfigPath);
85
+ const parsedTsconfig = ts.parseJsonConfigFileContent(tsconfig, ts.sys, this.rootPath, tsconfig.angularCompilerOptions);
86
+ const ftp = await SdStorage.connectAsync(this.config.publish.type, {
87
+ host: this.config.publish.host,
88
+ port: this.config.publish.port,
89
+ user: this.config.publish.user,
90
+ pass: this.config.publish.pass
91
+ });
92
+ await ftp.uploadDirAsync(parsedTsconfig.options.outDir, this.config.publish.path);
93
+ await ftp.closeAsync();
94
+ }
95
+ // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
96
+ else if (this.config.publish.type === "local-directory") {
97
+ const tsconfigPath = path.resolve(this.rootPath, "tsconfig-build.json");
98
+ const tsconfig = FsUtil.readJson(tsconfigPath);
99
+ const parsedTsconfig = ts.parseJsonConfigFileContent(tsconfig, ts.sys, this.rootPath, tsconfig.angularCompilerOptions);
100
+ const targetRootPath = this.config.publish.path.replace(/%([^%]*)%/g, (item) => {
101
+ const envName = item.replace(/%/g, "");
102
+ if (!StringUtil.isNullOrEmpty(this._npmConfig.version) && envName === "SD_VERSION") {
103
+ return this._npmConfig.version;
104
+ }
105
+ return process.env[envName] ?? item;
106
+ });
107
+ const filePaths = await FsUtil.globAsync(path.resolve(this.rootPath, "**", "*"), {
108
+ dot: true,
109
+ nodir: true
110
+ });
111
+ await filePaths.parallelAsync(async (filePath) => {
112
+ const relativeFilePath = path.relative(parsedTsconfig.options.outDir, filePath);
113
+ const targetPath = PathUtil.posix(targetRootPath, relativeFilePath);
114
+ await FsUtil.copyAsync(filePath, targetPath);
115
+ });
116
+ }
117
+ }
71
118
  }
72
119
  }
73
120
  async _createBuilderAsync() {
@@ -97,4 +144,4 @@ export class SdCliPackage extends EventEmitter {
97
144
  await FsUtil.writeJsonAsync(buildTsconfigFilePath, buildTsconfig, { space: 2 });
98
145
  }
99
146
  }
100
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2RDbGlQYWNrYWdlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3BhY2thZ2VzL1NkQ2xpUGFja2FnZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLElBQUksTUFBTSxNQUFNLENBQUM7QUFDeEIsT0FBTyxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUMzRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sUUFBUSxDQUFDO0FBQ3RDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUN0RCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUNqRSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUNqRSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUNuRSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNqRSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUduRSxNQUFNLE9BQU8sWUFBYSxTQUFRLFlBQVk7SUFzQjVDLFlBQW9DLGtCQUEwQixFQUMzQixRQUFnQixFQUNoQixNQUEyQjtRQUM1RCxLQUFLLEVBQUUsQ0FBQztRQUgwQix1QkFBa0IsR0FBbEIsa0JBQWtCLENBQVE7UUFDM0IsYUFBUSxHQUFSLFFBQVEsQ0FBUTtRQUNoQixXQUFNLEdBQU4sTUFBTSxDQUFxQjtRQUc1RCxNQUFNLGlCQUFpQixHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxjQUFjLENBQUMsQ0FBQztRQUN0RSxJQUFJLENBQUMsVUFBVSxHQUFHLE1BQU0sQ0FBQyxRQUFRLENBQUMsaUJBQWlCLENBQUMsQ0FBQztJQUN2RCxDQUFDO0lBMUJELElBQVcsUUFBUTtRQUNqQixPQUFPLElBQUksQ0FBQyxRQUFRLENBQUMsSUFB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
147
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliPackage.js","sourceRoot":"","sources":["../../src/packages/SdCliPackage.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@simplysm/sd-cli",
3
- "version": "7.0.66",
3
+ "version": "7.0.74",
4
4
  "description": "심플리즘 패키지 - CLI",
5
5
  "author": "김석래",
6
6
  "repository": {
@@ -49,7 +49,6 @@
49
49
  "chokidar": "^3.5.3",
50
50
  "@babel/parser": "^7.17.0",
51
51
  "@babel/types": "^7.17.0",
52
- "babel-loader": "^8.2.3",
53
52
  "jsdom": "^19.0.0",
54
53
  "cordova": "^11.0.0",
55
54
  "jszip": "^3.7.1"
@@ -63,9 +62,10 @@
63
62
  "@types/jsdom": "^16.2.14"
64
63
  },
65
64
  "peerDependencies": {
66
- "@simplysm/sd-core-common": "7.0.66",
67
- "@simplysm/sd-core-node": "7.0.66",
68
- "@simplysm/sd-service-common": "7.0.66",
69
- "@simplysm/sd-service-server": "7.0.66"
65
+ "@simplysm/sd-core-common": "7.0.74",
66
+ "@simplysm/sd-core-node": "7.0.74",
67
+ "@simplysm/sd-service-common": "7.0.74",
68
+ "@simplysm/sd-service-server": "7.0.74",
69
+ "@simplysm/sd-storage": "7.0.74"
70
70
  }
71
71
  }
package/src/bin/sd-cli.ts CHANGED
@@ -58,6 +58,11 @@ const argv = yargs(hideBin(process.argv))
58
58
  type: "string",
59
59
  array: true,
60
60
  describe: "옵션 설정 (설정파일에서 @로 시작하는 부분)"
61
+ },
62
+ packages: {
63
+ type: "string",
64
+ array: true,
65
+ describe: "수행할 패키지 설정"
61
66
  }
62
67
  })
63
68
  )
@@ -74,6 +79,11 @@ const argv = yargs(hideBin(process.argv))
74
79
  type: "string",
75
80
  array: true,
76
81
  describe: "옵션 설정 (설정파일에서 @로 시작하는 부분)"
82
+ },
83
+ packages: {
84
+ type: "string",
85
+ array: true,
86
+ describe: "수행할 패키지 설정"
77
87
  }
78
88
  })
79
89
  )
@@ -95,6 +105,11 @@ const argv = yargs(hideBin(process.argv))
95
105
  type: "string",
96
106
  array: true,
97
107
  describe: "옵션 설정 (설정파일에서 @로 시작하는 부분)"
108
+ },
109
+ packages: {
110
+ type: "string",
111
+ array: true,
112
+ describe: "수행할 패키지 설정"
98
113
  }
99
114
  })
100
115
  )
@@ -136,14 +151,16 @@ const logger = Logger.get(["simplysm", "sd-cli", "bin", "sd-cli"]);
136
151
  await new SdCliWorkspace(process.cwd())
137
152
  .watchAsync({
138
153
  confFileRelPath: argv.config ?? "simplysm.json",
139
- optNames: argv.options ?? []
154
+ optNames: argv.options ?? [],
155
+ pkgs: argv.packages ?? []
140
156
  });
141
157
  }
142
158
  else if (argv._[0] === "build") {
143
159
  await new SdCliWorkspace(process.cwd())
144
160
  .buildAsync({
145
161
  confFileRelPath: argv.config ?? "simplysm.json",
146
- optNames: argv.options ?? []
162
+ optNames: argv.options ?? [],
163
+ pkgs: argv.packages ?? []
147
164
  });
148
165
  process.exit(0);
149
166
  }
@@ -152,7 +169,8 @@ const logger = Logger.get(["simplysm", "sd-cli", "bin", "sd-cli"]);
152
169
  .publishAsync({
153
170
  noBuild: argv.noBuild,
154
171
  confFileRelPath: argv.config ?? "simplysm.json",
155
- optNames: argv.options ?? []
172
+ optNames: argv.options ?? [],
173
+ pkgs: argv.packages ?? []
156
174
  });
157
175
  }
158
176
  else {
@@ -29,7 +29,7 @@ export class SdCliCordova {
29
29
 
30
30
  public async initializeAsync(): Promise<void> {
31
31
  if (FsUtil.exists(this.cordovaPath)) {
32
- this._logger.log("미리 생성되어있는 '.cordova'를 사용합니다.");
32
+ this._logger.log("이미 생성되어있는 '.cordova'를 사용합니다.");
33
33
  }
34
34
  else {
35
35
  await this._execAsync(`${this._binPath} telemetry on`, this._rootPath);
@@ -54,9 +54,13 @@ export class SdCliCordova {
54
54
 
55
55
  // 미설치 플러그인들 설치
56
56
  if (this._config.plugins) {
57
- const pluginsFetch = await FsUtil.readJsonAsync(path.resolve(this.cordovaPath, "plugins/fetch.json"));
58
- const alreadyPlugins = Object.values(pluginsFetch)
59
- .map((item: any) => (item.source.id !== undefined ? item.source.id.replace(/@.*$/, "") : item.source.url));
57
+ const pluginsFetch = FsUtil.exists(path.resolve(this.cordovaPath, "plugins/fetch.json"))
58
+ ? await FsUtil.readJsonAsync(path.resolve(this.cordovaPath, "plugins/fetch.json"))
59
+ : undefined;
60
+ const alreadyPlugins = pluginsFetch != undefined
61
+ ? Object.values(pluginsFetch)
62
+ .map((item: any) => (item.source.id !== undefined ? item.source.id.replace(/@.*$/, "") : item.source.url))
63
+ : [];
60
64
 
61
65
  for (const plugin of this._config.plugins.distinct()) {
62
66
  if (!alreadyPlugins.includes(plugin)) {
@@ -194,13 +198,13 @@ export class SdCliCordova {
194
198
  await FsUtil.writeFileAsync(path.resolve(outPath, "updates/", zipFileName), resultBuffer);
195
199
  }
196
200
 
197
- public async runWebviewOnDeviceAsync(platform: TSdCliCordovaPlatform, url: string): Promise<void> {
198
- await FsUtil.removeAsync(path.resolve(this.cordovaPath, "www"));
199
- await FsUtil.mkdirsAsync(path.resolve(this.cordovaPath, "www"));
200
- await FsUtil.writeFileAsync(path.resolve(this.cordovaPath, "www/index.html"), `'${url}'로 이동중... <script>setTimeout(function () {window.location.href = "${url}"}, 3000);</script>`.trim());
201
+ public static async runWebviewOnDeviceAsync(cordovaPath: string, platform: TSdCliCordovaPlatform, url: string): Promise<void> {
202
+ await FsUtil.removeAsync(path.resolve(cordovaPath, "www"));
203
+ await FsUtil.mkdirsAsync(path.resolve(cordovaPath, "www"));
204
+ await FsUtil.writeFileAsync(path.resolve(cordovaPath, "www/index.html"), `'${url}'로 이동중... <script>setTimeout(function () {window.location.href = "${url}"}, 3000);</script>`.trim());
201
205
 
202
206
  // CONFIG
203
- const configFilePath = path.resolve(this.cordovaPath, "config.xml");
207
+ const configFilePath = path.resolve(cordovaPath, "config.xml");
204
208
  let configFileContent = await FsUtil.readFileAsync(configFilePath);
205
209
 
206
210
  // CONFIG: 접근허용 일단 모두 지우기
@@ -214,6 +218,7 @@ export class SdCliCordova {
214
218
  // CONFIG: 파일쓰기
215
219
  await FsUtil.writeFileAsync(configFilePath, configFileContent);
216
220
 
217
- await SdProcess.spawnAsync(`${this._binPath} run ${platform} --device`, { cwd: this.cordovaPath });
221
+ const binPath = path.resolve(process.cwd(), "node_modules/.bin/cordova.cmd");
222
+ await SdProcess.spawnAsync(`${binPath} run ${platform} --device`, { cwd: cordovaPath });
218
223
  }
219
224
  }
@@ -323,6 +323,7 @@ export class SdCliClientBuilder extends EventEmitter {
323
323
  .update(watch.toString())
324
324
  .digest("hex")
325
325
  },
326
+ // cache: { type: "memory", maxGenerations: 1 },
326
327
  ...watch ? {
327
328
  snapshot: {
328
329
  immutablePaths: internalModuleCachePaths,