@simplysm/sd-cli 7.0.77 → 7.0.79

package/dist/build-tool/SdCliCordova.mjs

@@ -2,6 +2,7 @@ import * as path from "path";
 import { FsUtil, Logger, SdProcess } from "@simplysm/sd-core-node";
 import { NotImplementError } from "@simplysm/sd-core-common";
 import JSZip from "jszip";
+import asar from "asar";
 export class SdCliCordova {
     constructor(_rootPath, _config) {
         this._rootPath = _rootPath;
@@ -58,13 +59,6 @@ export class SdCliCordova {
         if (this._config.icon !== undefined) {
             await FsUtil.copyAsync(path.resolve(this._rootPath, this._config.icon), path.resolve(this.cordovaPath, "res", "icon", "icon.png"));
         }
-        // ANDROID GRADLE 오류 강제 수정
-        // if (this._config.targets.includes("android")) {
-        //   const gradleFilePath = path.resolve(this._cordovaPath, "platforms/android/app/build.gradle");
-        //   let gradleFileContent = await FsUtil.readFileAsync(gradleFilePath);
-        //   gradleFileContent = gradleFileContent.replace(/lintOptions {/g, "lintOptions {\r\n      checkReleaseBuilds false;");
-        //   await FsUtil.writeFileAsync(gradleFilePath, gradleFileContent);
-        // }
         // CONFIG
         const configFilePath = path.resolve(this.cordovaPath, "config.xml");
         let configFileContent = await FsUtil.readFileAsync(configFilePath);
@@ -123,7 +117,6 @@ export class SdCliCordova {
         // CONFIG: 접근허용 일단 모두 지우기
         configFileContent = configFileContent.replace(/ {4}<allow-navigation href="[^"]*" \/>\n/g, "");
         // CONFIG: 접근허용 등록
-        // configFileContent = configFileContent.replace("</widget>", `    <allow-navigation href="file://data/user/*" />\n</widget>`);
         configFileContent = configFileContent.replace("</widget>", `    <allow-navigation href="*://*/*" />\n</widget>`);
         // CONFIG: 파일쓰기
         await FsUtil.writeFileAsync(configFilePath, configFileContent);
@@ -143,24 +136,39 @@ export class SdCliCordova {
                 await FsUtil.copyAsync(path.resolve(this.cordovaPath, "platforms/android/app/build/outputs/apk", buildType, apkFileName), path.resolve(targetOutPath, distApkFileName));
                 await FsUtil.copyAsync(path.resolve(this.cordovaPath, "platforms/android/app/build/outputs/apk", buildType, apkFileName), path.resolve(targetOutPath, latestDistApkFileName));
             }
+            else if (platform === "electron") {
+                const targetOutPath = path.resolve(outPath, platform);
+                const outFileName = `${this._config.appName} Setup ${this._npmConfig.version}.exe`;
+                const distFileName = outFileName;
+                const latestDistFileName = `${this._config.appName} Setup latest.exe`;
+                await FsUtil.mkdirsAsync(targetOutPath);
+                await FsUtil.copyAsync(path.resolve(this.cordovaPath, "platforms/electron/build/", buildType, outFileName), path.resolve(targetOutPath, distFileName));
+                await FsUtil.copyAsync(path.resolve(this.cordovaPath, "platforms/electron/build/", buildType, outFileName), path.resolve(targetOutPath, latestDistFileName));
+            }
             else {
                 throw new NotImplementError();
             }
         }
-        // 자동업데이트를 위한 zip 파일 쓰기
-        const zip = new JSZip();
-        const resultFiles = await FsUtil.globAsync(path.resolve(this.cordovaPath, "www", "**/*"), {
-            dot: true,
-            nodir: true
-        });
-        for (const resultFile of resultFiles) {
-            const contentBuffer = await FsUtil.readFileBufferAsync(resultFile);
-            const relativePath = path.relative(path.resolve(this.cordovaPath, "www"), resultFile);
-            zip.file("/" + relativePath, contentBuffer);
+        if (this.platforms.includes("android")) {
+            // 자동업데이트를 위한 zip 파일 쓰기
+            const zip = new JSZip();
+            const resultFiles = await FsUtil.globAsync(path.resolve(this.cordovaPath, "www", "**/*"), {
+                dot: true,
+                nodir: true
+            });
+            for (const resultFile of resultFiles) {
+                const contentBuffer = await FsUtil.readFileBufferAsync(resultFile);
+                const relativePath = path.relative(path.resolve(this.cordovaPath, "www"), resultFile);
+                zip.file("/" + relativePath, contentBuffer);
+            }
+            const zipFileName = path.basename(`${this._config.appName}-v${this._npmConfig.version}.zip`);
+            const resultBuffer = await zip.generateAsync({ type: "nodebuffer" });
+            await FsUtil.writeFileAsync(path.resolve(outPath, "updates/", zipFileName), resultBuffer);
+        }
+        if (this.platforms.includes("electron")) {
+            const distFileName = path.basename(`${this._config.appName}-v${this._npmConfig.version}.asar`);
+            await asar.createPackage(path.resolve(this.cordovaPath, "www"), path.resolve(outPath, "updates/", distFileName));
         }
-        const zipFileName = path.basename(`${this._config.appName}-v${this._npmConfig.version}.zip`);
-        const resultBuffer = await zip.generateAsync({ type: "nodebuffer" });
-        await FsUtil.writeFileAsync(path.resolve(outPath, "updates/", zipFileName), resultBuffer);
     }
     static async runWebviewOnDeviceAsync(cordovaPath, platform, url) {
         await FsUtil.removeAsync(path.resolve(cordovaPath, "www"));
@@ -172,8 +180,6 @@ export class SdCliCordova {
         // CONFIG: 접근허용 일단 모두 지우기
         configFileContent = configFileContent.replace(/ {4}<allow-navigation href="[^"]*" \/>\n/g, "");
         // CONFIG: 접근허용 등록
-        // configFileContent = configFileContent.replace("</widget>", `    <allow-navigation href="${url}" />\n</widget>`);
-        // configFileContent = configFileContent.replace("</widget>", `    <allow-navigation href="${url}/*" />\n</widget>`);
         configFileContent = configFileContent.replace("</widget>", `    <allow-navigation href="*://*/*" />\n</widget>`);
         // CONFIG: 파일쓰기
         await FsUtil.writeFileAsync(configFilePath, configFileContent);
@@ -181,4 +187,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":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simplysm/sd-cli",
-  "version": "7.0.77",
+  "version": "7.0.79",
   "description": "심플리즘 패키지 - CLI",
   "author": "김석래",
   "repository": {
@@ -52,11 +52,12 @@
     "jsdom": "^19.0.0",
     "cordova": "^11.0.0",
     "jszip": "^3.7.1",
-    "@simplysm/sd-core-common": "7.0.77",
-    "@simplysm/sd-core-node": "7.0.77",
-    "@simplysm/sd-service-common": "7.0.77",
-    "@simplysm/sd-service-server": "7.0.77",
-    "@simplysm/sd-storage": "7.0.77"
+    "@simplysm/sd-core-common": "7.0.79",
+    "@simplysm/sd-core-node": "7.0.79",
+    "@simplysm/sd-service-common": "7.0.79",
+    "@simplysm/sd-service-server": "7.0.79",
+    "@simplysm/sd-storage": "7.0.79",
+    "asar": "^3.1.0"
   },
   "devDependencies": {
     "@types/semver": "^7.3.9",

package/src/build-tool/SdCliCordova.ts

@@ -3,6 +3,7 @@ import * as path from "path";
 import { FsUtil, Logger, SdProcess } from "@simplysm/sd-core-node";
 import { NotImplementError } from "@simplysm/sd-core-common";
 import JSZip from "jszip";
+import asar from "asar";
 
 export class SdCliCordova {
   protected readonly _logger: Logger;
@@ -74,14 +75,6 @@ export class SdCliCordova {
       await FsUtil.copyAsync(path.resolve(this._rootPath, this._config.icon), path.resolve(this.cordovaPath, "res", "icon", "icon.png"));
     }
 
-    // ANDROID GRADLE 오류 강제 수정
-    // if (this._config.targets.includes("android")) {
-    //   const gradleFilePath = path.resolve(this._cordovaPath, "platforms/android/app/build.gradle");
-    //   let gradleFileContent = await FsUtil.readFileAsync(gradleFilePath);
-    //   gradleFileContent = gradleFileContent.replace(/lintOptions {/g, "lintOptions {\r\n      checkReleaseBuilds false;");
-    //   await FsUtil.writeFileAsync(gradleFilePath, gradleFileContent);
-    // }
-
     // CONFIG
     const configFilePath = path.resolve(this.cordovaPath, "config.xml");
     let configFileContent = await FsUtil.readFileAsync(configFilePath);
@@ -158,7 +151,6 @@ export class SdCliCordova {
     configFileContent = configFileContent.replace(/ {4}<allow-navigation href="[^"]*" \/>\n/g, "");
 
     // CONFIG: 접근허용 등록
-    // configFileContent = configFileContent.replace("</widget>", `    <allow-navigation href="file://data/user/*" />\n</widget>`);
     configFileContent = configFileContent.replace("</widget>", `    <allow-navigation href="*://*/*" />\n</widget>`);
 
     // CONFIG: 파일쓰기
@@ -187,27 +179,49 @@ export class SdCliCordova {
           path.resolve(targetOutPath, latestDistApkFileName)
         );
       }
+      else if (platform === "electron") {
+        const targetOutPath = path.resolve(outPath, platform);
+        const outFileName = `${this._config.appName} Setup ${this._npmConfig.version}.exe`;
+        const distFileName = outFileName;
+        const latestDistFileName = `${this._config.appName} Setup latest.exe`;
+        await FsUtil.mkdirsAsync(targetOutPath);
+        await FsUtil.copyAsync(
+          path.resolve(this.cordovaPath, "platforms/electron/build/", buildType, outFileName),
+          path.resolve(targetOutPath, distFileName)
+        );
+        await FsUtil.copyAsync(
+          path.resolve(this.cordovaPath, "platforms/electron/build/", buildType, outFileName),
+          path.resolve(targetOutPath, latestDistFileName)
+        );
+      }
       else {
         throw new NotImplementError();
       }
     }
 
-    // 자동업데이트를 위한 zip 파일 쓰기
-    const zip = new JSZip();
-    const resultFiles = await FsUtil.globAsync(path.resolve(this.cordovaPath, "www", "**/*"), {
-      dot: true,
-      nodir: true
-    });
-    for (const resultFile of resultFiles) {
-      const contentBuffer = await FsUtil.readFileBufferAsync(resultFile);
-      const relativePath = path.relative(path.resolve(this.cordovaPath, "www"), resultFile);
-      zip.file("/" + relativePath, contentBuffer);
-    }
+    if (this.platforms.includes("android")) {
+      // 자동업데이트를 위한 zip 파일 쓰기
+      const zip = new JSZip();
+      const resultFiles = await FsUtil.globAsync(path.resolve(this.cordovaPath, "www", "**/*"), {
+        dot: true,
+        nodir: true
+      });
+      for (const resultFile of resultFiles) {
+        const contentBuffer = await FsUtil.readFileBufferAsync(resultFile);
+        const relativePath = path.relative(path.resolve(this.cordovaPath, "www"), resultFile);
+        zip.file("/" + relativePath, contentBuffer);
+      }
 
-    const zipFileName = path.basename(`${this._config.appName}-v${this._npmConfig.version}.zip`);
-    const resultBuffer = await zip.generateAsync({ type: "nodebuffer" });
+      const zipFileName = path.basename(`${this._config.appName}-v${this._npmConfig.version}.zip`);
+      const resultBuffer = await zip.generateAsync({ type: "nodebuffer" });
 
-    await FsUtil.writeFileAsync(path.resolve(outPath, "updates/", zipFileName), resultBuffer);
+      await FsUtil.writeFileAsync(path.resolve(outPath, "updates/", zipFileName), resultBuffer);
+    }
+
+    if (this.platforms.includes("electron")) {
+      const distFileName = path.basename(`${this._config.appName}-v${this._npmConfig.version}.asar`);
+      await asar.createPackage(path.resolve(this.cordovaPath, "www"), path.resolve(outPath, "updates/", distFileName));
+    }
   }
 
   public static async runWebviewOnDeviceAsync(cordovaPath: string, platform: TSdCliCordovaPlatform, url: string): Promise<void> {
@@ -223,8 +237,6 @@ export class SdCliCordova {
     configFileContent = configFileContent.replace(/ {4}<allow-navigation href="[^"]*" \/>\n/g, "");
 
     // CONFIG: 접근허용 등록
-    // configFileContent = configFileContent.replace("</widget>", `    <allow-navigation href="${url}" />\n</widget>`);
-    // configFileContent = configFileContent.replace("</widget>", `    <allow-navigation href="${url}/*" />\n</widget>`);
     configFileContent = configFileContent.replace("</widget>", `    <allow-navigation href="*://*/*" />\n</widget>`);
 
     // CONFIG: 파일쓰기