@simplysm/sd-cli 12.10.3 → 12.10.5

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 (8) hide show
  1. package/dist/entry/sd-cli-cordova.d.ts +0 -2
  2. package/dist/entry/sd-cli-cordova.js +47 -35
  3. package/dist/entry/sd-cli-cordova.js.map +1 -1
  4. package/dist/fix/convert-modal-show-params.js +8 -11
  5. package/dist/fix/convert-modal-show-params.js.map +1 -1
  6. package/package.json +5 -5
  7. package/src/entry/sd-cli-cordova.ts +93 -94
  8. package/src/fix/convert-modal-show-params.ts +8 -12
package/dist/entry/sd-cli-cordova.d.ts CHANGED
@@ -39,8 +39,6 @@ export declare class SdCliCordova {
39
39
  buildAsync(outPath: string): Promise<void>;
40
40
  private _processBuildOutputAsync;
41
41
  private _copyAndroidBuildOutput;
42
- private _createUpdateZipAsync;
43
- private _addFilesToZip;
44
42
  static runWebviewOnDeviceAsync(opt: {
45
43
  platform: string;
46
44
  package: string;
package/dist/entry/sd-cli-cordova.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import * as path from "path";
2
2
  import { FsUtils, PathUtils, SdLogger, SdProcess } from "@simplysm/sd-core-node";
3
- import { SdZip, XmlConvert } from "@simplysm/sd-core-common";
3
+ import { XmlConvert } from "@simplysm/sd-core-common";
4
4
  export class SdCliCordova {
5
5
  constructor(_opt) {
6
6
  this._opt = _opt;
@@ -91,10 +91,8 @@ export class SdCliCordova {
91
91
  // 3. 플러그인 관리
92
92
  async _managePluginsAsync(cordovaPath) {
93
93
  const pluginsFetchPath = path.resolve(cordovaPath, this.PLUGINS_DIR_NAME, this.PLUGINS_FETCH_FILE);
94
- const pluginsFetch = FsUtils.exists(pluginsFetchPath)
95
- ? FsUtils.readJson(pluginsFetchPath)
96
- : {};
97
- const alreadyPlugins = Object.keys(pluginsFetch).map(key => ({
94
+ const pluginsFetch = FsUtils.exists(pluginsFetchPath) ? FsUtils.readJson(pluginsFetchPath) : {};
95
+ const alreadyPlugins = Object.keys(pluginsFetch).map((key) => ({
98
96
  name: key,
99
97
  id: pluginsFetch[key].source.id,
100
98
  dependencies: pluginsFetch[key].dependencies,
@@ -123,7 +121,7 @@ export class SdCliCordova {
123
121
  async _installNewPluginsAsync(cordovaPath, alreadyPlugins, usePlugins) {
124
122
  // 병렬로 플러그인을 설치하면 충돌이 발생할 수 있으므로 순차 처리
125
123
  for (const usePlugin of usePlugins) {
126
- const isPluginAlreadyInstalled = alreadyPlugins.some(plugin => usePlugin === plugin.id || usePlugin === plugin.name);
124
+ const isPluginAlreadyInstalled = alreadyPlugins.some((plugin) => usePlugin === plugin.id || usePlugin === plugin.name);
127
125
  if (!isPluginAlreadyInstalled) {
128
126
  await SdCliCordova._execAsync(`npx cordova plugin add ${usePlugin}`, cordovaPath);
129
127
  }
@@ -277,10 +275,9 @@ export class SdCliCordova {
277
275
  {
278
276
  $: {
279
277
  "android:usesCleartextTraffic": "true",
280
- ...this._opt.config.platform.android.config
281
- ? Object.keys(this._opt.config.platform.android.config)
282
- .toObject(key => "android:" + key, key => this._opt.config.platform.android.config[key])
283
- : {},
278
+ ...(this._opt.config.platform.android.config
279
+ ? Object.keys(this._opt.config.platform.android.config).toObject((key) => "android:" + key, (key) => this._opt.config.platform.android.config[key])
280
+ : {}),
284
281
  },
285
282
  },
286
283
  ],
@@ -348,7 +345,7 @@ export class SdCliCordova {
348
345
  // 빌드 실행 - 병렬 처리로 개선
349
346
  const buildType = this._opt.config.debug ? "debug" : "release";
350
347
  // 모든 플랫폼 동시에 빌드
351
- await Promise.all(this._platforms.map(platform => SdCliCordova._execAsync(`npx cordova build ${platform} --${buildType}`, cordovaPath)));
348
+ await Promise.all(this._platforms.map((platform) => SdCliCordova._execAsync(`npx cordova build ${platform} --${buildType}`, cordovaPath)));
352
349
  // 결과물 복사 및 ZIP 파일 생성 - 병렬 처리
353
350
  await Promise.all(Object.keys(this._opt.config.platform ?? {}).map(async (platform) => {
354
351
  await this._processBuildOutputAsync(cordovaPath, outPath, platform, buildType);
@@ -361,41 +358,56 @@ export class SdCliCordova {
361
358
  this._copyAndroidBuildOutput(cordovaPath, targetOutPath, buildType);
362
359
  }
363
360
  // 자동업데이트를 위한 파일 생성
364
- await this._createUpdateZipAsync(cordovaPath, outPath, platform);
361
+ // await this._createUpdateZipAsync(cordovaPath, outPath, platform);
365
362
  }
366
363
  _copyAndroidBuildOutput(cordovaPath, targetOutPath, buildType) {
367
364
  const apkFileName = this._opt.config.platform.android.sign
368
365
  ? `app-${buildType}.apk`
369
366
  : `app-${buildType}-unsigned.apk`;
370
- const latestDistApkFileName = path.basename(`${this._opt.config.appName}${this._opt.config.platform.android.sign
371
- ? ""
372
- : "-unsigned"}-latest.apk`);
367
+ const latestDistApkFileName = path.basename(`${this._opt.config.appName}${this._opt.config.platform.android.sign ? "" : "-unsigned"}-latest.apk`);
373
368
  FsUtils.mkdirs(targetOutPath);
374
369
  FsUtils.copy(path.resolve(cordovaPath, "platforms/android/app/build/outputs/apk", buildType, apkFileName), path.resolve(targetOutPath, latestDistApkFileName));
370
+ // 업데이트파일
371
+ FsUtils.copy(path.resolve(cordovaPath, "platforms/android/app/build/outputs/apk", buildType, apkFileName), path.resolve(targetOutPath, "updates", `${this._npmConfig.version}.apk`));
375
372
  }
376
- async _createUpdateZipAsync(cordovaPath, outPath, platform) {
377
- const zip = new SdZip();
378
- const wwwPath = path.resolve(cordovaPath, this.WWW_DIR_NAME);
379
- const platformWwwPath = path.resolve(cordovaPath, this.PLATFORMS_DIR_NAME, platform, "platform_www");
380
- this._addFilesToZip(zip, wwwPath);
381
- this._addFilesToZip(zip, platformWwwPath);
382
- // ZIP 파일 생성
383
- const updateDirPath = path.resolve(outPath, platform, "updates");
384
- FsUtils.mkdirs(updateDirPath);
385
- FsUtils.writeFile(path.resolve(updateDirPath, this._npmConfig.version + ".zip"), await zip.compressAsync());
386
- }
387
- _addFilesToZip(zip, dirPath) {
388
- const files = FsUtils.glob(path.resolve(dirPath, "**/*"), { nodir: true });
389
- for (const file of files) {
390
- const relFilePath = path.relative(dirPath, file);
391
- const fileBuffer = FsUtils.readFileBuffer(file);
392
- zip.write(relFilePath, fileBuffer);
393
- }
394
- }
373
+ // private async _createUpdateZipAsync(
374
+ // cordovaPath: string,
375
+ // outPath: string,
376
+ // platform: string,
377
+ // ): Promise<void> {
378
+ // const zip = new SdZip();
379
+ // const wwwPath = path.resolve(cordovaPath, this.WWW_DIR_NAME);
380
+ // const platformWwwPath = path.resolve(
381
+ // cordovaPath,
382
+ // this.PLATFORMS_DIR_NAME,
383
+ // platform,
384
+ // "platform_www",
385
+ // );
386
+ //
387
+ // this._addFilesToZip(zip, wwwPath);
388
+ // this._addFilesToZip(zip, platformWwwPath);
389
+ //
390
+ // // ZIP 파일 생성
391
+ // const updateDirPath = path.resolve(outPath, platform, "updates");
392
+ // FsUtils.mkdirs(updateDirPath);
393
+ // FsUtils.writeFile(
394
+ // path.resolve(updateDirPath, this._npmConfig.version + ".zip"),
395
+ // await zip.compressAsync(),
396
+ // );
397
+ // }
398
+ //
399
+ // private _addFilesToZip(zip: SdZip, dirPath: string) {
400
+ // const files = FsUtils.glob(path.resolve(dirPath, "**/*"), { nodir: true });
401
+ // for (const file of files) {
402
+ // const relFilePath = path.relative(dirPath, file);
403
+ // const fileBuffer = FsUtils.readFileBuffer(file);
404
+ // zip.write(relFilePath, fileBuffer);
405
+ // }
406
+ // }
395
407
  static async runWebviewOnDeviceAsync(opt) {
396
408
  const projNpmConf = FsUtils.readJson(path.resolve(process.cwd(), "package.json"));
397
409
  const allPkgPaths = projNpmConf.workspaces.mapMany((item) => FsUtils.glob(PathUtils.posix(process.cwd(), item)));
398
- const cordovaPath = path.resolve(allPkgPaths.single(item => item.endsWith(opt.package)), ".cordova");
410
+ const cordovaPath = path.resolve(allPkgPaths.single((item) => item.endsWith(opt.package)), ".cordova");
399
411
  if (opt.url !== undefined) {
400
412
  FsUtils.remove(path.resolve(cordovaPath, "www"));
401
413
  FsUtils.mkdirs(path.resolve(cordovaPath, "www"));
package/dist/entry/sd-cli-cordova.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"sd-cli-cordova.js","sourceRoot":"","sources":["../../src/entry/sd-cli-cordova.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sd-cli-cordova.js","sourceRoot":"","sources":["../../src/entry/sd-cli-cordova.ts"],"names":[],"mappings":"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"}
package/dist/fix/convert-modal-show-params.js CHANGED
@@ -13,18 +13,15 @@ export default function convertShowAsyncCall() {
13
13
  });
14
14
  for (const callExpr of callExprs) {
15
15
  const args = callExpr.getArguments();
16
- if (args.length < 2 || args.length > 3)
17
- continue;
18
- const [typeArg, titleArg, inputsArg] = args;
19
- // 반드시 교체 전에 텍스트만 추출
20
- const typeText = typeArg.getText();
21
- const titleText = titleArg.getText();
22
- const inputsText = inputsArg.getText();
16
+ if (args.length < 3)
17
+ continue; // 최소 3개는 있어야 함
18
+ const typeText = args[0].getText();
19
+ const titleText = args[1].getText();
20
+ const inputsText = args[2]?.getText() ?? "{}";
23
21
  const props = [`type: ${typeText}`, `title: ${titleText}`, `inputs: ${inputsText}`];
24
- const objectLiteralText = `{
25
- ${props.join(",\n ")}
26
- }`;
27
- callExpr.replaceWithText(`this._sdModal.showAsync(${objectLiteralText})`);
22
+ const objectLiteralText = `{\n ${props.join(",\n ")}\n}`;
23
+ const newArgs = [`${objectLiteralText}`, ...args.slice(3).map((arg) => arg.getText())].join(", ");
24
+ callExpr.replaceWithText(`this._sdModal.showAsync(${newArgs})`);
28
25
  }
29
26
  sourceFile.saveSync();
30
27
  }
package/dist/fix/convert-modal-show-params.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"convert-modal-show-params.js","sourceRoot":"","sources":["../../src/fix/convert-modal-show-params.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,qBAAqB,MAAM,kCAAkC,CAAC;AAErE,MAAM,CAAC,OAAO,UAAU,oBAAoB;IAC1C,MAAM,WAAW,GAAG,qBAAqB,EAAE,CAAC;IAE5C,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,MAAM,SAAS,GAAG,UAAU;aACzB,oBAAoB,CAAC,UAAU,CAAC,cAAc,CAAC;aAC/C,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE;YACnB,MAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,EAAE,CAAC;YACtC,OAAO,CACL,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC;gBACrC,IAAI,CAAC,OAAO,EAAE,KAAK,WAAW;gBAC9B,IAAI,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,KAAK,eAAe,CACnD,CAAC;QACJ,CAAC,CAAC,CAAC;QAEL,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,MAAM,IAAI,GAAG,QAAQ,CAAC,YAAY,EAAE,CAAC;YACrC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;gBAAE,SAAS;YAEjD,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC;YAE5C,oBAAoB;YACpB,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;YACnC,MAAM,SAAS,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC;YACrC,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;YAEvC,MAAM,KAAK,GAAa,CAAC,SAAS,QAAQ,EAAE,EAAE,UAAU,SAAS,EAAE,EAAE,WAAW,UAAU,EAAE,CAAC,CAAC;YAE9F,MAAM,iBAAiB,GAAG;IAC5B,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;EACrB,CAAC;YAEG,QAAQ,CAAC,eAAe,CAAC,2BAA2B,iBAAiB,GAAG,CAAC,CAAC;QAC5E,CAAC;QAED,UAAU,CAAC,QAAQ,EAAE,CAAC;IACxB,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"convert-modal-show-params.js","sourceRoot":"","sources":["../../src/fix/convert-modal-show-params.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,qBAAqB,MAAM,kCAAkC,CAAC;AAErE,MAAM,CAAC,OAAO,UAAU,oBAAoB;IAC1C,MAAM,WAAW,GAAG,qBAAqB,EAAE,CAAC;IAE5C,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,MAAM,SAAS,GAAG,UAAU;aACzB,oBAAoB,CAAC,UAAU,CAAC,cAAc,CAAC;aAC/C,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE;YACnB,MAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,EAAE,CAAC;YACtC,OAAO,CACL,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC;gBACrC,IAAI,CAAC,OAAO,EAAE,KAAK,WAAW;gBAC9B,IAAI,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,KAAK,eAAe,CACnD,CAAC;QACJ,CAAC,CAAC,CAAC;QAEL,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,MAAM,IAAI,GAAG,QAAQ,CAAC,YAAY,EAAE,CAAC;YACrC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;gBAAE,SAAS,CAAC,eAAe;YAE9C,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;YACnC,MAAM,SAAS,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;YACpC,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,IAAI,CAAC;YAE9C,MAAM,KAAK,GAAG,CAAC,SAAS,QAAQ,EAAE,EAAE,UAAU,SAAS,EAAE,EAAE,WAAW,UAAU,EAAE,CAAC,CAAC;YACpF,MAAM,iBAAiB,GAAG,QAAQ,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;YAE3D,MAAM,OAAO,GAAG,CAAC,GAAG,iBAAiB,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAElG,QAAQ,CAAC,eAAe,CAAC,2BAA2B,OAAO,GAAG,CAAC,CAAC;QAClE,CAAC;QAED,UAAU,CAAC,QAAQ,EAAE,CAAC;IACxB,CAAC;AACH,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@simplysm/sd-cli",
3
- "version": "12.10.3",
3
+ "version": "12.10.5",
4
4
  "description": "심플리즘 패키지 - CLI",
5
5
  "author": "김석래",
6
6
  "repository": {
@@ -17,10 +17,10 @@
17
17
  "@angular/compiler-cli": "^19.2.12",
18
18
  "@anthropic-ai/sdk": "^0.52.0",
19
19
  "@electron/rebuild": "^4.0.1",
20
- "@simplysm/sd-core-common": "12.10.3",
21
- "@simplysm/sd-core-node": "12.10.3",
22
- "@simplysm/sd-service-server": "12.10.3",
23
- "@simplysm/sd-storage": "12.10.3",
20
+ "@simplysm/sd-core-common": "12.10.5",
21
+ "@simplysm/sd-core-node": "12.10.5",
22
+ "@simplysm/sd-service-server": "12.10.5",
23
+ "@simplysm/sd-storage": "12.10.5",
24
24
  "browserslist": "^4.24.5",
25
25
  "cordova": "^12.0.0",
26
26
  "css-has-pseudo": "^7.0.2",
package/src/entry/sd-cli-cordova.ts CHANGED
@@ -2,7 +2,7 @@ import * as path from "path";
2
2
  import { FsUtils, PathUtils, SdLogger, SdProcess } from "@simplysm/sd-core-node";
3
3
  import { INpmConfig } from "../types/common-configs.types";
4
4
  import { ISdClientBuilderCordovaConfig } from "../types/config.types";
5
- import { SdZip, XmlConvert } from "@simplysm/sd-core-common";
5
+ import { XmlConvert } from "@simplysm/sd-core-common";
6
6
 
7
7
  export class SdCliCordova {
8
8
  // 상수 정의
@@ -23,7 +23,6 @@ export class SdCliCordova {
23
23
  private readonly SPLASH_SCREEN_DIR_PATH = "res/screen/android";
24
24
  private readonly SPLASH_SCREEN_XML_FILE = "splashscreen.xml";
25
25
 
26
-
27
26
  private _platforms: string[];
28
27
  private _npmConfig: INpmConfig;
29
28
 
@@ -83,8 +82,7 @@ export class SdCliCordova {
83
82
  private async _initializeCordovaProjectAsync(cordovaPath: string): Promise<void> {
84
83
  if (FsUtils.exists(cordovaPath)) {
85
84
  SdCliCordova._logger.log("이미 생성되어있는 '.cordova'를 사용합니다.");
86
- }
87
- else {
85
+ } else {
88
86
  await SdCliCordova._execAsync(`npx cordova telemetry on`, this._opt.pkgPath);
89
87
 
90
88
  // 프로젝트 생성
@@ -114,8 +112,7 @@ export class SdCliCordova {
114
112
  `npx cordova platform add ${platform}@${this.ANDROID_PLATFORM_VERSION}`,
115
113
  cordovaPath,
116
114
  );
117
- }
118
- else {
115
+ } else {
119
116
  await SdCliCordova._execAsync(`npx cordova platform add ${platform}`, cordovaPath);
120
117
  }
121
118
  }
@@ -128,15 +125,13 @@ export class SdCliCordova {
128
125
  this.PLUGINS_DIR_NAME,
129
126
  this.PLUGINS_FETCH_FILE,
130
127
  );
131
- const pluginsFetch = FsUtils.exists(pluginsFetchPath)
132
- ? FsUtils.readJson(pluginsFetchPath)
133
- : {};
128
+ const pluginsFetch = FsUtils.exists(pluginsFetchPath) ? FsUtils.readJson(pluginsFetchPath) : {};
134
129
 
135
130
  const alreadyPlugins: Array<{
136
131
  name: string;
137
132
  id: string;
138
- dependencies?: string[]
139
- }> = Object.keys(pluginsFetch).map(key => ({
133
+ dependencies?: string[];
134
+ }> = Object.keys(pluginsFetch).map((key) => ({
140
135
  name: key,
141
136
  id: pluginsFetch[key].source.id,
142
137
  dependencies: pluginsFetch[key].dependencies,
@@ -161,8 +156,7 @@ export class SdCliCordova {
161
156
  `npx cordova plugin remove ${alreadyPlugin.name}`,
162
157
  cordovaPath,
163
158
  );
164
- }
165
- catch (err) {
159
+ } catch (err) {
166
160
  // 의존성으로 인한 skip 메시지는 무시 (로그 생략)
167
161
  const msg = err instanceof Error ? err.message : String(err);
168
162
  if (!msg.includes("is required by") || !msg.includes("skipping uninstallation")) {
@@ -181,7 +175,7 @@ export class SdCliCordova {
181
175
  // 병렬로 플러그인을 설치하면 충돌이 발생할 수 있으므로 순차 처리
182
176
  for (const usePlugin of usePlugins) {
183
177
  const isPluginAlreadyInstalled = alreadyPlugins.some(
184
- plugin => usePlugin === plugin.id || usePlugin === plugin.name,
178
+ (plugin) => usePlugin === plugin.id || usePlugin === plugin.name,
185
179
  );
186
180
 
187
181
  if (!isPluginAlreadyInstalled) {
@@ -200,8 +194,7 @@ export class SdCliCordova {
200
194
  path.resolve(this._opt.pkgPath, this._opt.config.platform.android.sign.keystore),
201
195
  keystorePath,
202
196
  );
203
- }
204
- else {
197
+ } else {
205
198
  FsUtils.remove(keystorePath);
206
199
  // SIGN을 안쓸경우 아래 파일이 생성되어 있으면 오류남
207
200
  FsUtils.remove(signingPropsPath);
@@ -215,21 +208,21 @@ export class SdCliCordova {
215
208
 
216
209
  const androidConfig = this._opt.config.platform?.android
217
210
  ? {
218
- android: {
219
- release: {
220
- packageType: this._opt.config.platform.android.bundle ? "bundle" : "apk",
221
- ...(this._opt.config.platform.android.sign
222
- ? {
223
- keystore: keystorePath,
224
- storePassword: this._opt.config.platform.android.sign.storePassword,
225
- alias: this._opt.config.platform.android.sign.alias,
226
- password: this._opt.config.platform.android.sign.password,
227
- keystoreType: this._opt.config.platform.android.sign.keystoreType,
228
- }
229
- : {}),
211
+ android: {
212
+ release: {
213
+ packageType: this._opt.config.platform.android.bundle ? "bundle" : "apk",
214
+ ...(this._opt.config.platform.android.sign
215
+ ? {
216
+ keystore: keystorePath,
217
+ storePassword: this._opt.config.platform.android.sign.storePassword,
218
+ alias: this._opt.config.platform.android.sign.alias,
219
+ password: this._opt.config.platform.android.sign.password,
220
+ keystoreType: this._opt.config.platform.android.sign.keystoreType,
221
+ }
222
+ : {}),
223
+ },
230
224
  },
231
- },
232
- }
225
+ }
233
226
  : {};
234
227
 
235
228
  FsUtils.writeJson(buildJsonPath, androidConfig);
@@ -248,8 +241,7 @@ export class SdCliCordova {
248
241
  path.resolve(this._opt.pkgPath, this._opt.config.icon),
249
242
  path.resolve(iconDirPath, path.basename(this._opt.config.icon)),
250
243
  );
251
- }
252
- else {
244
+ } else {
253
245
  FsUtils.remove(iconDirPath);
254
246
  }
255
247
 
@@ -366,13 +358,12 @@ export class SdCliCordova {
366
358
  {
367
359
  $: {
368
360
  "android:usesCleartextTraffic": "true",
369
- ...this._opt.config.platform!.android!.config
370
- ? Object.keys(this._opt.config.platform!.android!.config)
371
- .toObject(
372
- key => "android:" + key,
373
- key => this._opt.config.platform!.android!.config![key],
361
+ ...(this._opt.config.platform!.android!.config
362
+ ? Object.keys(this._opt.config.platform!.android!.config).toObject(
363
+ (key) => "android:" + key,
364
+ (key) => this._opt.config.platform!.android!.config![key],
374
365
  )
375
- : {},
366
+ : {}),
376
367
  },
377
368
  },
378
369
  ],
@@ -425,13 +416,13 @@ export class SdCliCordova {
425
416
  "android:name": `android.permission.${perm.name}`,
426
417
  ...(perm.maxSdkVersion != null
427
418
  ? {
428
- "android:maxSdkVersion": `${perm.maxSdkVersion}`,
429
- }
419
+ "android:maxSdkVersion": `${perm.maxSdkVersion}`,
420
+ }
430
421
  : {}),
431
422
  ...(perm.ignore != null
432
423
  ? {
433
- "tools:ignore": `${perm.ignore}`,
434
- }
424
+ "tools:ignore": `${perm.ignore}`,
425
+ }
435
426
  : {}),
436
427
  },
437
428
  })),
@@ -448,14 +439,18 @@ export class SdCliCordova {
448
439
  const buildType = this._opt.config.debug ? "debug" : "release";
449
440
 
450
441
  // 모든 플랫폼 동시에 빌드
451
- await Promise.all(this._platforms.map(platform =>
452
- SdCliCordova._execAsync(`npx cordova build ${platform} --${buildType}`, cordovaPath),
453
- ));
442
+ await Promise.all(
443
+ this._platforms.map((platform) =>
444
+ SdCliCordova._execAsync(`npx cordova build ${platform} --${buildType}`, cordovaPath),
445
+ ),
446
+ );
454
447
 
455
448
  // 결과물 복사 및 ZIP 파일 생성 - 병렬 처리
456
- await Promise.all(Object.keys(this._opt.config.platform ?? {}).map(async platform => {
457
- await this._processBuildOutputAsync(cordovaPath, outPath, platform, buildType);
458
- }));
449
+ await Promise.all(
450
+ Object.keys(this._opt.config.platform ?? {}).map(async (platform) => {
451
+ await this._processBuildOutputAsync(cordovaPath, outPath, platform, buildType);
452
+ }),
453
+ );
459
454
  }
460
455
 
461
456
  private async _processBuildOutputAsync(
@@ -472,22 +467,18 @@ export class SdCliCordova {
472
467
  }
473
468
 
474
469
  // 자동업데이트를 위한 파일 생성
475
- await this._createUpdateZipAsync(cordovaPath, outPath, platform);
470
+ // await this._createUpdateZipAsync(cordovaPath, outPath, platform);
476
471
  }
477
472
 
478
- private _copyAndroidBuildOutput(
479
- cordovaPath: string,
480
- targetOutPath: string,
481
- buildType: string,
482
- ) {
473
+ private _copyAndroidBuildOutput(cordovaPath: string, targetOutPath: string, buildType: string) {
483
474
  const apkFileName = this._opt.config.platform!.android!.sign
484
475
  ? `app-${buildType}.apk`
485
476
  : `app-${buildType}-unsigned.apk`;
486
477
 
487
478
  const latestDistApkFileName = path.basename(
488
- `${this._opt.config.appName}${this._opt.config.platform!.android!.sign
489
- ? ""
490
- : "-unsigned"}-latest.apk`,
479
+ `${this._opt.config.appName}${
480
+ this._opt.config.platform!.android!.sign ? "" : "-unsigned"
481
+ }-latest.apk`,
491
482
  );
492
483
 
493
484
  FsUtils.mkdirs(targetOutPath);
@@ -495,54 +486,62 @@ export class SdCliCordova {
495
486
  path.resolve(cordovaPath, "platforms/android/app/build/outputs/apk", buildType, apkFileName),
496
487
  path.resolve(targetOutPath, latestDistApkFileName),
497
488
  );
498
- }
499
-
500
- private async _createUpdateZipAsync(
501
- cordovaPath: string,
502
- outPath: string,
503
- platform: string,
504
- ): Promise<void> {
505
- const zip = new SdZip();
506
- const wwwPath = path.resolve(cordovaPath, this.WWW_DIR_NAME);
507
- const platformWwwPath = path.resolve(
508
- cordovaPath,
509
- this.PLATFORMS_DIR_NAME,
510
- platform,
511
- "platform_www",
512
- );
513
489
 
514
- this._addFilesToZip(zip, wwwPath);
515
- this._addFilesToZip(zip, platformWwwPath);
516
-
517
- // ZIP 파일 생성
518
- const updateDirPath = path.resolve(outPath, platform, "updates");
519
- FsUtils.mkdirs(updateDirPath);
520
- FsUtils.writeFile(
521
- path.resolve(updateDirPath, this._npmConfig.version + ".zip"),
522
- await zip.compressAsync(),
490
+ // 업데이트파일
491
+ FsUtils.copy(
492
+ path.resolve(cordovaPath, "platforms/android/app/build/outputs/apk", buildType, apkFileName),
493
+ path.resolve(targetOutPath, "updates", `${this._npmConfig.version}.apk`),
523
494
  );
524
495
  }
525
496
 
526
- private _addFilesToZip(zip: SdZip, dirPath: string) {
527
- const files = FsUtils.glob(path.resolve(dirPath, "**/*"), { nodir: true });
528
- for (const file of files) {
529
- const relFilePath = path.relative(dirPath, file);
530
- const fileBuffer = FsUtils.readFileBuffer(file);
531
- zip.write(relFilePath, fileBuffer);
532
- }
533
- }
497
+ // private async _createUpdateZipAsync(
498
+ // cordovaPath: string,
499
+ // outPath: string,
500
+ // platform: string,
501
+ // ): Promise<void> {
502
+ // const zip = new SdZip();
503
+ // const wwwPath = path.resolve(cordovaPath, this.WWW_DIR_NAME);
504
+ // const platformWwwPath = path.resolve(
505
+ // cordovaPath,
506
+ // this.PLATFORMS_DIR_NAME,
507
+ // platform,
508
+ // "platform_www",
509
+ // );
510
+ //
511
+ // this._addFilesToZip(zip, wwwPath);
512
+ // this._addFilesToZip(zip, platformWwwPath);
513
+ //
514
+ // // ZIP 파일 생성
515
+ // const updateDirPath = path.resolve(outPath, platform, "updates");
516
+ // FsUtils.mkdirs(updateDirPath);
517
+ // FsUtils.writeFile(
518
+ // path.resolve(updateDirPath, this._npmConfig.version + ".zip"),
519
+ // await zip.compressAsync(),
520
+ // );
521
+ // }
522
+ //
523
+ // private _addFilesToZip(zip: SdZip, dirPath: string) {
524
+ // const files = FsUtils.glob(path.resolve(dirPath, "**/*"), { nodir: true });
525
+ // for (const file of files) {
526
+ // const relFilePath = path.relative(dirPath, file);
527
+ // const fileBuffer = FsUtils.readFileBuffer(file);
528
+ // zip.write(relFilePath, fileBuffer);
529
+ // }
530
+ // }
534
531
 
535
532
  static async runWebviewOnDeviceAsync(opt: {
536
533
  platform: string;
537
534
  package: string;
538
- url?: string
535
+ url?: string;
539
536
  }): Promise<void> {
540
537
  const projNpmConf = FsUtils.readJson(path.resolve(process.cwd(), "package.json")) as INpmConfig;
541
- const allPkgPaths = projNpmConf.workspaces!.mapMany((item) => FsUtils.glob(PathUtils.posix(process.cwd(), item)));
538
+ const allPkgPaths = projNpmConf.workspaces!.mapMany((item) =>
539
+ FsUtils.glob(PathUtils.posix(process.cwd(), item)),
540
+ );
542
541
 
543
542
  const cordovaPath = path.resolve(
544
- allPkgPaths.single(item => item.endsWith(opt.package))!,
545
- ".cordova"
543
+ allPkgPaths.single((item) => item.endsWith(opt.package))!,
544
+ ".cordova",
546
545
  );
547
546
 
548
547
  if (opt.url !== undefined) {
@@ -562,4 +561,4 @@ export class SdCliCordova {
562
561
 
563
562
  await SdCliCordova._execAsync(`npx cordova run ${opt.platform} --device`, cordovaPath);
564
563
  }
565
- }
564
+ }
package/src/fix/convert-modal-show-params.ts CHANGED
@@ -18,22 +18,18 @@ export default function convertShowAsyncCall() {
18
18
 
19
19
  for (const callExpr of callExprs) {
20
20
  const args = callExpr.getArguments();
21
- if (args.length < 2 || args.length > 3) continue;
21
+ if (args.length < 3) continue; // 최소 3개는 있어야 함
22
22
 
23
- const [typeArg, titleArg, inputsArg] = args;
23
+ const typeText = args[0].getText();
24
+ const titleText = args[1].getText();
25
+ const inputsText = args[2]?.getText() ?? "{}";
24
26
 
25
- // 반드시 교체 전에 텍스트만 추출
26
- const typeText = typeArg.getText();
27
- const titleText = titleArg.getText();
28
- const inputsText = inputsArg.getText();
27
+ const props = [`type: ${typeText}`, `title: ${titleText}`, `inputs: ${inputsText}`];
28
+ const objectLiteralText = `{\n ${props.join(",\n ")}\n}`;
29
29
 
30
- const props: string[] = [`type: ${typeText}`, `title: ${titleText}`, `inputs: ${inputsText}`];
30
+ const newArgs = [`${objectLiteralText}`, ...args.slice(3).map((arg) => arg.getText())].join(", ");
31
31
 
32
- const objectLiteralText = `{
33
- ${props.join(",\n ")}
34
- }`;
35
-
36
- callExpr.replaceWithText(`this._sdModal.showAsync(${objectLiteralText})`);
32
+ callExpr.replaceWithText(`this._sdModal.showAsync(${newArgs})`);
37
33
  }
38
34
 
39
35
  sourceFile.saveSync();