@simplysm/sd-cli 7.0.245 → 7.0.246

package/dist/build-tool/SdCliCordova.mjs

@@ -1,6 +1,5 @@
 import * as path from "path";
 import { FsUtil, Logger, SdProcess } from "@simplysm/sd-core-node";
-import JSZip from "jszip";
 import xml2js from "xml2js";
 export class SdCliCordova {
     constructor(_rootPath, _config) {
@@ -35,6 +34,19 @@ export class SdCliCordova {
         await FsUtil.mkdirsAsync(path.resolve(this.cordovaPath, "platforms"));
         // www 폴더 혹시 없으면 생성
         await FsUtil.mkdirsAsync(path.resolve(this.cordovaPath, "www"));
+        // 미설치 빌드 플랫폼 신규 생성
+        const alreadyPlatforms = await FsUtil.readdirAsync(path.resolve(this.cordovaPath, "platforms"));
+        for (const platform of this.platforms) {
+            if (!alreadyPlatforms.includes(platform)) {
+                await this._execAsync(`${this._binPath} platform add ${platform}`, this.cordovaPath);
+            }
+        }
+        // 설치 미빌드 플랫폼 삭제
+        for (const alreadyPlatform of alreadyPlatforms) {
+            if (this._config.target?.[alreadyPlatform] == null) {
+                await this._execAsync(`${this._binPath} platform remove ${alreadyPlatform}`, this.cordovaPath);
+            }
+        }
         // 설치된 미사용 플러그인 삭제
         const pluginsFetch = FsUtil.exists(path.resolve(this.cordovaPath, "plugins/fetch.json"))
             ? await FsUtil.readJsonAsync(path.resolve(this.cordovaPath, "plugins/fetch.json"))
@@ -64,19 +76,6 @@ export class SdCliCordova {
                 await this._execAsync(`${this._binPath} plugin add ${usePlugin}`, this.cordovaPath);
             }
         }
-        // 미설치 빌드 플랫폼 신규 생성
-        const alreadyPlatforms = await FsUtil.readdirAsync(path.resolve(this.cordovaPath, "platforms"));
-        for (const platform of this.platforms) {
-            if (!alreadyPlatforms.includes(platform)) {
-                await this._execAsync(`${this._binPath} platform add ${platform}`, this.cordovaPath);
-            }
-        }
-        // 설치 미빌드 플랫폼 삭제
-        for (const alreadyPlatform of alreadyPlatforms) {
-            if (this._config.target?.[alreadyPlatform] == null) {
-                await this._execAsync(`${this._binPath} platform remove ${alreadyPlatform}`, this.cordovaPath);
-            }
-        }
         // ANDROID SIGN 파일 복사
         if (this._config.target?.android?.sign) {
             await FsUtil.copyAsync(path.resolve(this._rootPath, this._config.target.android.sign.keystore), path.resolve(this.cordovaPath, "android.keystore"));
@@ -176,23 +175,27 @@ export class SdCliCordova {
             //   path.resolve(targetOutPath, distApkFileName)
             // );
             await FsUtil.copyAsync(path.resolve(this.cordovaPath, "platforms/android/app/build/outputs/apk", buildType, apkFileName), path.resolve(targetOutPath, latestDistApkFileName));
-        }
-        if (this._config.target?.android) {
-            // 자동업데이트를 위한 zip 파일 쓰기
-            const zip = new JSZip();
-            const resultFiles = await FsUtil.globAsync(path.resolve(this.cordovaPath, "platforms", "android", "app", "src", "main", "assets", "www", "**/*"), {
-                dot: true,
-                nodir: true
-            });
-            for (const resultFile of resultFiles) {
-                const contentBuffer = await FsUtil.readFileBufferAsync(resultFile);
-                const relativePath = path.relative(path.resolve(this.cordovaPath, "platforms", "android", "app", "src", "main", "assets", "www"), resultFile);
-                zip.file("/" + relativePath, contentBuffer);
-            }
-            const zipFileName = path.basename(`${this._npmConfig.version}.zip`);
-            const resultBuffer = await zip.generateAsync({ type: "nodebuffer" });
-            await FsUtil.writeFileAsync(path.resolve(outPath, "android/updates/", zipFileName), resultBuffer);
-        }
+            // 자동업데이트를 위한 파일 쓰기
+            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"));
+        }
+        /*if (this._config.target?.android) {
+          // 자동업데이트를 위한 zip 파일 쓰기
+          const zip = new JSZip();
+          const resultFiles = await FsUtil.globAsync(path.resolve(this.cordovaPath, "platforms", "android", "app", "src", "main", "assets", "www", "**!/!*"), {
+            dot: true,
+            nodir: true
+          });
+          for (const resultFile of resultFiles) {
+            const contentBuffer = await FsUtil.readFileBufferAsync(resultFile);
+            const relativePath = path.relative(path.resolve(this.cordovaPath, "platforms", "android", "app", "src", "main", "assets", "www"), resultFile);
+            zip.file("/" + relativePath, contentBuffer);
+          }
+    
+          const zipFileName = path.basename(`${this._npmConfig.version}.zip`);
+          const resultBuffer = await zip.generateAsync({ type: "nodebuffer" });
+    
+          await FsUtil.writeFileAsync(path.resolve(outPath, "android/updates/", zipFileName), resultBuffer);
+        }*/
     }
     static async runWebviewOnDeviceAsync(rootPath, platform, pkgName, url) {
         const cordovaPath = path.resolve(rootPath, `packages/${pkgName}/.cordova/`);
@@ -206,4 +209,4 @@ export class SdCliCordova {
         await SdProcess.spawnAsync(`${binPath} run ${platform} --device`, { cwd: cordovaPath }, true);
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliCordova.js","sourceRoot":"","sources":["../../src/build-tool/SdCliCordova.ts"],"names":[],"mappings":"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"}
+//# 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

@@ -1,6 +1,6 @@
 {
   "name": "@simplysm/sd-cli",
-  "version": "7.0.245",
+  "version": "7.0.246",
   "description": "심플리즘 패키지 - CLI",
   "author": "김석래",
   "repository": {
@@ -23,11 +23,11 @@
     "@babel/parser": "^7.17.0",
     "@babel/types": "^7.17.0",
     "@ngtools/webpack": "^13.2.2",
-    "@simplysm/sd-core-common": "7.0.245",
-    "@simplysm/sd-core-node": "7.0.245",
-    "@simplysm/sd-service-common": "7.0.245",
-    "@simplysm/sd-service-server": "7.0.245",
-    "@simplysm/sd-storage": "7.0.245",
+    "@simplysm/sd-core-common": "7.0.246",
+    "@simplysm/sd-core-node": "7.0.246",
+    "@simplysm/sd-service-common": "7.0.246",
+    "@simplysm/sd-service-server": "7.0.246",
+    "@simplysm/sd-storage": "7.0.246",
     "browserslist": "^4.19.1",
     "chokidar": "^3.5.3",
     "connect": "^3.7.0",

package/src/build-tool/SdCliCordova.ts

@@ -1,7 +1,6 @@
 import { INpmConfig, ISdCliClientBuilderCordovaConfig } from "../commons";
 import * as path from "path";
 import { FsUtil, Logger, SdProcess } from "@simplysm/sd-core-node";
-import JSZip from "jszip";
 import xml2js from "xml2js";
 
 export class SdCliCordova {
@@ -47,6 +46,21 @@ export class SdCliCordova {
     // www 폴더 혹시 없으면 생성
     await FsUtil.mkdirsAsync(path.resolve(this.cordovaPath, "www"));
 
+    // 미설치 빌드 플랫폼 신규 생성
+    const alreadyPlatforms = await FsUtil.readdirAsync(path.resolve(this.cordovaPath, "platforms"));
+    for (const platform of this.platforms) {
+      if (!alreadyPlatforms.includes(platform)) {
+        await this._execAsync(`${this._binPath} platform add ${platform}`, this.cordovaPath);
+      }
+    }
+
+    // 설치 미빌드 플랫폼 삭제
+    for (const alreadyPlatform of alreadyPlatforms) {
+      if (this._config.target?.[alreadyPlatform] == null) {
+        await this._execAsync(`${this._binPath} platform remove ${alreadyPlatform}`, this.cordovaPath);
+      }
+    }
+
     // 설치된 미사용 플러그인 삭제
     const pluginsFetch = FsUtil.exists(path.resolve(this.cordovaPath, "plugins/fetch.json"))
       ? await FsUtil.readJsonAsync(path.resolve(this.cordovaPath, "plugins/fetch.json"))
@@ -84,21 +98,6 @@ export class SdCliCordova {
       }
     }
 
-    // 미설치 빌드 플랫폼 신규 생성
-    const alreadyPlatforms = await FsUtil.readdirAsync(path.resolve(this.cordovaPath, "platforms"));
-    for (const platform of this.platforms) {
-      if (!alreadyPlatforms.includes(platform)) {
-        await this._execAsync(`${this._binPath} platform add ${platform}`, this.cordovaPath);
-      }
-    }
-
-    // 설치 미빌드 플랫폼 삭제
-    for (const alreadyPlatform of alreadyPlatforms) {
-      if (this._config.target?.[alreadyPlatform] == null) {
-        await this._execAsync(`${this._binPath} platform remove ${alreadyPlatform}`, this.cordovaPath);
-      }
-    }
-
     // ANDROID SIGN 파일 복사
     if (this._config.target?.android?.sign) {
       await FsUtil.copyAsync(
@@ -221,12 +220,17 @@ export class SdCliCordova {
         path.resolve(this.cordovaPath, "platforms/android/app/build/outputs/apk", buildType, apkFileName),
         path.resolve(targetOutPath, latestDistApkFileName)
       );
+      // 자동업데이트를 위한 파일 쓰기
+      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")
+      );
     }
 
-    if (this._config.target?.android) {
+    /*if (this._config.target?.android) {
       // 자동업데이트를 위한 zip 파일 쓰기
       const zip = new JSZip();
-      const resultFiles = await FsUtil.globAsync(path.resolve(this.cordovaPath, "platforms", "android", "app", "src", "main", "assets", "www", "**/*"), {
+      const resultFiles = await FsUtil.globAsync(path.resolve(this.cordovaPath, "platforms", "android", "app", "src", "main", "assets", "www", "**!/!*"), {
         dot: true,
         nodir: true
       });
@@ -240,7 +244,7 @@ export class SdCliCordova {
       const resultBuffer = await zip.generateAsync({ type: "nodebuffer" });
 
       await FsUtil.writeFileAsync(path.resolve(outPath, "android/updates/", zipFileName), resultBuffer);
-    }
+    }*/
   }
 
   public static async runWebviewOnDeviceAsync(rootPath: string, platform: "browser" | "android", pkgName: string, url?: string): Promise<void> {