@simplysm/sd-cli 7.0.243 → 7.0.246

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 (3) hide show
  1. package/dist/build-tool/SdCliCordova.mjs +23 -20
  2. package/package.json +7 -7
  3. package/src/build-tool/SdCliCordova.ts +9 -5
package/dist/build-tool/SdCliCordova.mjs CHANGED
@@ -1,6 +1,5 @@
1
1
  import * as path from "path";
2
2
  import { FsUtil, Logger, SdProcess } from "@simplysm/sd-core-node";
3
- import JSZip from "jszip";
4
3
  import xml2js from "xml2js";
5
4
  export class SdCliCordova {
6
5
  constructor(_rootPath, _config) {
@@ -56,7 +55,7 @@ export class SdCliCordova {
56
55
  ? Object.values(pluginsFetch)
57
56
  .map((item) => (item.source.id !== undefined ? item.source.id : item.source.url))
58
57
  : [];
59
- const usePlugins = ["cordova-plugin-ionic-webview", "cordova-plugin-whitelist", ...this._config.plugins ?? []].distinct();
58
+ const usePlugins = ["cordova-plugin-ionic-webview", ...this._config.plugins ?? []].distinct();
60
59
  for (const alreadyPluginId of alreadyPluginIds) {
61
60
  let hasPlugin = false;
62
61
  for (const usePlugin of usePlugins) {
@@ -176,23 +175,27 @@ export class SdCliCordova {
176
175
  // path.resolve(targetOutPath, distApkFileName)
177
176
  // );
178
177
  await FsUtil.copyAsync(path.resolve(this.cordovaPath, "platforms/android/app/build/outputs/apk", buildType, apkFileName), path.resolve(targetOutPath, latestDistApkFileName));
179
- }
180
- if (this._config.target?.android) {
181
- // 자동업데이트를 위한 zip 파일 쓰기
182
- const zip = new JSZip();
183
- const resultFiles = await FsUtil.globAsync(path.resolve(this.cordovaPath, "platforms", "android", "app", "src", "main", "assets", "www", "**/*"), {
184
- dot: true,
185
- nodir: true
186
- });
187
- for (const resultFile of resultFiles) {
188
- const contentBuffer = await FsUtil.readFileBufferAsync(resultFile);
189
- const relativePath = path.relative(path.resolve(this.cordovaPath, "platforms", "android", "app", "src", "main", "assets", "www"), resultFile);
190
- zip.file("/" + relativePath, contentBuffer);
191
- }
192
- const zipFileName = path.basename(`${this._npmConfig.version}.zip`);
193
- const resultBuffer = await zip.generateAsync({ type: "nodebuffer" });
194
- await FsUtil.writeFileAsync(path.resolve(outPath, "android/updates/", zipFileName), resultBuffer);
195
- }
178
+ // 자동업데이트를 위한 파일 쓰기
179
+ await FsUtil.copyAsync(path.resolve(this.cordovaPath, "platforms/android/app/build/outputs/apk", buildType, apkFileName), path.resolve(path.resolve(targetOutPath, "updates"), this._npmConfig.version + ".apk"));
180
+ }
181
+ /*if (this._config.target?.android) {
182
+ // 자동업데이트를 위한 zip 파일 쓰기
183
+ const zip = new JSZip();
184
+ const resultFiles = await FsUtil.globAsync(path.resolve(this.cordovaPath, "platforms", "android", "app", "src", "main", "assets", "www", "**!/!*"), {
185
+ dot: true,
186
+ nodir: true
187
+ });
188
+ for (const resultFile of resultFiles) {
189
+ const contentBuffer = await FsUtil.readFileBufferAsync(resultFile);
190
+ const relativePath = path.relative(path.resolve(this.cordovaPath, "platforms", "android", "app", "src", "main", "assets", "www"), resultFile);
191
+ zip.file("/" + relativePath, contentBuffer);
192
+ }
193
+
194
+ const zipFileName = path.basename(`${this._npmConfig.version}.zip`);
195
+ const resultBuffer = await zip.generateAsync({ type: "nodebuffer" });
196
+
197
+ await FsUtil.writeFileAsync(path.resolve(outPath, "android/updates/", zipFileName), resultBuffer);
198
+ }*/
196
199
  }
197
200
  static async runWebviewOnDeviceAsync(rootPath, platform, pkgName, url) {
198
201
  const cordovaPath = path.resolve(rootPath, `packages/${pkgName}/.cordova/`);
@@ -206,4 +209,4 @@ export class SdCliCordova {
206
209
  await SdProcess.spawnAsync(`${binPath} run ${platform} --device`, { cwd: cordovaPath }, true);
207
210
  }
208
211
  }
209
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliCordova.js","sourceRoot":"","sources":["../../src/build-tool/SdCliCordova.ts"],"names":[],"mappings":"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"}
212
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliCordova.js","sourceRoot":"","sources":["../../src/build-tool/SdCliCordova.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,MAAM,OAAO,YAAY;IAevB,YAAoC,SAAiB,EAAmB,OAAyC;QAA7E,cAAS,GAAT,SAAS,CAAQ;QAAmB,YAAO,GAAP,OAAO,CAAkC;QAVjG,gBAAW,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QACtD,aAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,+BAA+B,CAAC,CAAC;QAUvF,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC;QAChF,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;IACjG,CAAC;IAVD,IAAW,SAAS;QAClB,OAAO;YACL,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,SAAkB,CAAC,CAAC,CAAC,CAAC,EAAE;YAC3D,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,SAAkB,CAAC,CAAC,CAAC,CAAC,EAAE;SAC5D,CAAC;IACJ,CAAC;IAOO,KAAK,CAAC,UAAU,CAAC,GAAW,EAAE,GAAW;QAC/C,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACxB,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QACrD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAEM,KAAK,CAAC,eAAe;QAC1B,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;YACnC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;SAClD;aACI;YACH,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YAEvE,UAAU;YACV,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,YAAY,IAAI,CAAC,WAAW,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;SACzI;QAED,yBAAyB;QACzB,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;QAEtE,mBAAmB;QACnB,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;QAEhE,mBAAmB;QACnB,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;QAChG,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE;YACrC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBACxC,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,iBAAiB,QAAQ,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;aACtF;SACF;QAED,gBAAgB;QAChB,KAAK,MAAM,eAAe,IAAI,gBAAgB,EAAE;YAC9C,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,eAAe,CAAC,IAAI,IAAI,EAAE;gBAClD,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,oBAAoB,eAAe,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;aAChG;SACF;QAED,kBAAkB;QAClB,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;YACtF,CAAC,CAAC,MAAM,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;YAClF,CAAC,CAAC,SAAS,CAAC;QACd,MAAM,gBAAgB,GAAG,YAAY,IAAI,SAAS;YAChD,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;iBAC1B,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACxF,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,UAAU,GAAG,CAAC,8BAA8B,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;QAE9F,KAAK,MAAM,eAAe,IAAI,gBAAgB,EAAE;YAC9C,IAAI,SAAS,GAAG,KAAK,CAAC;YACtB,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;gBAClC,IACE,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,eAAe,KAAK,SAAS,CAAC;oBAC1D,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,KAAK,SAAS,CAAC,EAC/E;oBACA,SAAS,GAAG,IAAI,CAAC;oBACjB,MAAM;iBACP;aACF;YAED,IAAI,CAAC,SAAS,EAAE;gBACd,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,kBAAkB,eAAe,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;aAClH;SACF;QAED,eAAe;QACf,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YAClC,IACE,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gBAClE,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,eAAe,EAAE,EAAE,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EACjI;gBACA,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,eAAe,SAAS,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;aACrF;SACF;QAED,qBAAqB;QACrB,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE;YACtC,MAAM,MAAM,CAAC,SAAS,CACpB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EACvE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,CACnD,CAAC;SACH;aACI;YACH,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC,CAAC;YAC7E,iCAAiC;YACjC,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,8CAA8C,CAAC,CAAC,CAAC;SAC1G;QAED,cAAc;QACd,MAAM,MAAM,CAAC,cAAc,CACzB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,EAC5C;YACE,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;gBAChC,OAAO,EAAE;oBACP,OAAO,EAAE;wBACP,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK;wBAClE,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;4BACpC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC;4BAC5D,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa;4BAC7D,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK;4BAC7C,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ;4BACnD,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY;yBAC5D,CAAC,CAAC,CAAC,EAAE;qBACP;iBACF;aACF,CAAC,CAAC,CAAC,EAAE;SACP,CACF,CAAC;QAEF,aAAa;QACb,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE;YACnC,MAAM,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;SAC5H;aACI;YACH,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;SAC7E;QAED,iBAAiB;QACjB,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;QACpE,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;QAC5E,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE;YACtC,MAAM,MAAM,CAAC,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;SAC5D;QAED,iBAAiB;QACjB,MAAM,iBAAiB,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC;QACzE,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;QAGrE,gBAAgB;QAChB,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;QAErD,kBAAkB;QAClB,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE;YACnC,SAAS,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC;SACpE;QAED,kBAAkB;QAClB,SAAS,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QAC7D,SAAS,CAAC,QAAQ,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QACrE,SAAS,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QACjE,SAAS,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,kBAAkB,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QAE5F,0CAA0C;QAC1C,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE;YAChC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,4CAA4C,CAAC;YAEnF,SAAS,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;YACxE,SAAS,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC;gBACnC,GAAG,EAAE;oBACH,MAAM,EAAE,SAAS;iBAClB;gBACD,aAAa,EAAE,CAAC;wBACd,GAAG,EAAE;4BACH,MAAM,EAAE,kCAAkC;4BAC1C,MAAM,EAAE,OAAO;4BACf,QAAQ,EAAE,uBAAuB;yBAClC;wBACD,aAAa,EAAE,CAAC;gCACd,GAAG,EAAE;oCACH,8BAA8B,EAAE,MAAM;iCACvC;6BACF,CAAC;qBACH,CAAC;aACH,CAAC,CAAC;SACJ;QAED,mBAAmB;QACnB,MAAM,mBAAmB,GAAG,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QACxE,MAAM,MAAM,CAAC,cAAc,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAC;QAEjE,eAAe;QACf,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IACtE,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,OAAe;QACrC,KAAK;QACL,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;QAC3D,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE;YACrC,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,UAAU,QAAQ,MAAM,SAAS,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;SAC9F;QAED,kBAAkB;QAClB,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE;YAChC,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YACvD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,SAAS,MAAM,CAAC,CAAC,CAAC,OAAO,SAAS,eAAe,CAAC;YAChH,0JAA0J;YAC1J,MAAM,qBAAqB,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,aAAa,CAAC,CAAC;YACxI,MAAM,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;YACxC,0BAA0B;YAC1B,uGAAuG;YACvG,iDAAiD;YACjD,KAAK;YACL,MAAM,MAAM,CAAC,SAAS,CACpB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,yCAAyC,EAAE,SAAS,EAAE,WAAW,CAAC,EACjG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,qBAAqB,CAAC,CACnD,CAAC;YACF,mBAAmB;YACnB,MAAM,MAAM,CAAC,SAAS,CACpB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,yCAAyC,EAAE,SAAS,EAAE,WAAW,CAAC,EACjG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,SAAS,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,GAAG,MAAM,CAAC,CACvF,CAAC;SACH;QAED;;;;;;;;;;;;;;;;;WAiBG;IACL,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,QAAgB,EAAE,QAA+B,EAAE,OAAe,EAAE,GAAY;QAC1H,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,OAAO,YAAY,CAAC,CAAC;QAE5E,IAAI,GAAG,KAAK,SAAS,EAAE;YACrB,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;YAC3D,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;YAC3D,MAAM,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC,EAAE,IAAI,GAAG,qEAAqE,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,OAAO,8BAA8B,CAAC,IAAI,EAAE,CAAC,CAAC;SAC9N;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,+BAA+B,CAAC,CAAC;QAC7E,0FAA0F;QAC1F,MAAM,SAAS,CAAC,UAAU,CAAC,GAAG,OAAO,QAAQ,QAAQ,WAAW,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,IAAI,CAAC,CAAC;IAChG,CAAC;CACF"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@simplysm/sd-cli",
3
- "version": "7.0.243",
3
+ "version": "7.0.246",
4
4
  "description": "심플리즘 패키지 - CLI",
5
5
  "author": "김석래",
6
6
  "repository": {
@@ -23,16 +23,16 @@
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.243",
27
- "@simplysm/sd-core-node": "7.0.243",
28
- "@simplysm/sd-service-common": "7.0.243",
29
- "@simplysm/sd-service-server": "7.0.243",
30
- "@simplysm/sd-storage": "7.0.243",
26
+ "@simplysm/sd-core-common": "7.0.246",
27
+ "@simplysm/sd-core-node": "7.0.246",
28
+ "@simplysm/sd-service-common": "7.0.246",
29
+ "@simplysm/sd-service-server": "7.0.246",
30
+ "@simplysm/sd-storage": "7.0.246",
31
31
  "browserslist": "^4.19.1",
32
32
  "chokidar": "^3.5.3",
33
33
  "connect": "^3.7.0",
34
34
  "copy-webpack-plugin": "^10.2.4",
35
- "cordova": "^9.0.0",
35
+ "cordova": "^11.0.0",
36
36
  "css-loader": "^6.6.0",
37
37
  "electron": "^18.0.1",
38
38
  "electron-builder": "^22.14.13",
package/src/build-tool/SdCliCordova.ts CHANGED
@@ -1,7 +1,6 @@
1
1
  import { INpmConfig, ISdCliClientBuilderCordovaConfig } from "../commons";
2
2
  import * as path from "path";
3
3
  import { FsUtil, Logger, SdProcess } from "@simplysm/sd-core-node";
4
- import JSZip from "jszip";
5
4
  import xml2js from "xml2js";
6
5
 
7
6
  export class SdCliCordova {
@@ -70,7 +69,7 @@ export class SdCliCordova {
70
69
  ? Object.values(pluginsFetch)
71
70
  .map((item: any) => (item.source.id !== undefined ? item.source.id : item.source.url))
72
71
  : [];
73
- const usePlugins = ["cordova-plugin-ionic-webview", "cordova-plugin-whitelist", ...this._config.plugins ?? []].distinct();
72
+ const usePlugins = ["cordova-plugin-ionic-webview", ...this._config.plugins ?? []].distinct();
74
73
 
75
74
  for (const alreadyPluginId of alreadyPluginIds) {
76
75
  let hasPlugin = false;
@@ -221,12 +220,17 @@ export class SdCliCordova {
221
220
  path.resolve(this.cordovaPath, "platforms/android/app/build/outputs/apk", buildType, apkFileName),
222
221
  path.resolve(targetOutPath, latestDistApkFileName)
223
222
  );
223
+ // 자동업데이트를 위한 파일 쓰기
224
+ await FsUtil.copyAsync(
225
+ path.resolve(this.cordovaPath, "platforms/android/app/build/outputs/apk", buildType, apkFileName),
226
+ path.resolve(path.resolve(targetOutPath, "updates"), this._npmConfig.version + ".apk")
227
+ );
224
228
  }
225
229
 
226
- if (this._config.target?.android) {
230
+ /*if (this._config.target?.android) {
227
231
  // 자동업데이트를 위한 zip 파일 쓰기
228
232
  const zip = new JSZip();
229
- const resultFiles = await FsUtil.globAsync(path.resolve(this.cordovaPath, "platforms", "android", "app", "src", "main", "assets", "www", "**/*"), {
233
+ const resultFiles = await FsUtil.globAsync(path.resolve(this.cordovaPath, "platforms", "android", "app", "src", "main", "assets", "www", "**!/!*"), {
230
234
  dot: true,
231
235
  nodir: true
232
236
  });
@@ -240,7 +244,7 @@ export class SdCliCordova {
240
244
  const resultBuffer = await zip.generateAsync({ type: "nodebuffer" });
241
245
 
242
246
  await FsUtil.writeFileAsync(path.resolve(outPath, "android/updates/", zipFileName), resultBuffer);
243
- }
247
+ }*/
244
248
  }
245
249
 
246
250
  public static async runWebviewOnDeviceAsync(rootPath: string, platform: "browser" | "android", pkgName: string, url?: string): Promise<void> {