@simplysm/sd-cli 11.1.59 → 11.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simplysm/sd-cli",
-  "version": "11.1.59",
+  "version": "11.2.3",
   "description": "심플리즘 패키지 - CLI",
   "author": "김석래",
   "repository": {
@@ -18,18 +18,18 @@
   },
   "dependencies": {
     "@angular-devkit/build-angular": "^17.3.8",
-    "@angular/common": "^17.3.10",
-    "@angular/compiler": "^17.3.10",
-    "@angular/compiler-cli": "^17.3.10",
-    "@angular/core": "^17.3.10",
+    "@angular/common": "^17.3.11",
+    "@angular/compiler": "^17.3.11",
+    "@angular/compiler-cli": "^17.3.11",
+    "@angular/core": "^17.3.11",
     "@electron/rebuild": "^3.6.0",
-    "@simplysm/sd-core-common": "11.1.59",
-    "@simplysm/sd-core-node": "11.1.59",
-    "@simplysm/sd-service-server": "11.1.59",
-    "@simplysm/sd-storage": "11.1.59",
+    "@simplysm/sd-core-common": "11.2.3",
+    "@simplysm/sd-core-node": "11.2.3",
+    "@simplysm/sd-service-server": "11.2.3",
+    "@simplysm/sd-storage": "11.2.3",
     "browserslist": "^4.23.0",
     "cordova": "^12.0.0",
-    "electron": "^29.4.1",
+    "electron": "^29.4.2",
     "electron-builder": "^24.13.3",
     "esbuild": "^0.20.2",
     "esbuild-plugin-tsc": "^0.4.0",
@@ -38,7 +38,7 @@
     "node-stdlib-browser": "^1.2.0",
     "piscina": "^4.5.1",
     "rxjs": "^7.8.1",
-    "sass": "^1.77.2",
+    "sass": "^1.77.4",
     "semver": "^7.6.2",
     "xml2js": "^0.6.2",
     "yargs": "^17.7.2",

package/src/entry/SdCliElectron.ts

@@ -1,197 +1,197 @@
-import {FsUtil, Logger, SdProcess} from "@simplysm/sd-core-node";
-import {pathToFileURL} from "url";
-import path from "path";
-import {INpmConfig, ISdCliClientBuilderElectronConfig, ISdCliConfig} from "../commons";
-import electronBuilder from "electron-builder";
-
-export class SdCliElectron {
-  public static async runAsync(opt: {
-    confFileRelPath: string;
-    optNames: string[];
-    pkgName: string;
-  }): Promise<void> {
-    const logger = Logger.get(["simplysm", "sd-cli", "SdCliElectron", "runAsync"]);
-
-    const pkgPath = path.resolve(process.cwd(), `packages/${opt.pkgName}`);
-    const electronPath = path.resolve(pkgPath, "dist/electron");
-
-    logger.log("설정 가져오기...");
-    const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(true, opt.optNames) as ISdCliConfig;
-    const pkgConf = projConf.packages[opt.pkgName];
-    if (pkgConf?.type !== "client" || pkgConf.builder?.electron === undefined) {
-      throw new Error();
-    }
-
-    logger.log("package.json 파일 쓰기...");
-    const npmConfig = (await FsUtil.readJsonAsync(path.resolve(pkgPath, `package.json`))) as INpmConfig;
-
-    const externalPkgNames = pkgConf.builder.electron.reinstallDependencies ?? [];
-
-    await FsUtil.writeJsonAsync(path.resolve(electronPath, `package.json`), {
-      name: npmConfig.name,
-      version: npmConfig.version,
-      description: npmConfig.description,
-      main: "electron-main.js",
-      ...pkgConf.builder.electron.postInstallScript !== undefined ? {
-        scripts: {
-          "postinstall": pkgConf.builder.electron.postInstallScript
-        },
-      } : {},
-      dependencies: externalPkgNames.toObject((item) => item, (item) => npmConfig.dependencies![item])
-    });
-
-    logger.log("npm install...");
-    await SdProcess.spawnAsync(`npm install`, {cwd: electronPath}, true);
-
-    for (const externalPkgName of externalPkgNames) {
-      if (FsUtil.exists(path.resolve(electronPath, "node_modules", externalPkgName, "binding.gyp"))) {
-        logger.log(`electron rebuild (${externalPkgName})...`);
-        await SdProcess.spawnAsync(`electron-rebuild -m ./node_modules/${externalPkgName}`, {cwd: electronPath}, true);
-      }
-    }
-
-    logger.log("electron...");
-    await SdProcess.spawnAsync(`electron .`, {cwd: electronPath}, true);
-  }
-
-  public static async buildForDevAsync(opt: {
-    confFileRelPath: string;
-    optNames: string[];
-    pkgName: string;
-  }): Promise<void> {
-    const logger = Logger.get(["simplysm", "sd-cli", "SdCliElectron", "buildForDevAsync"]);
-
-    const pkgPath = path.resolve(process.cwd(), `packages/${opt.pkgName}`);
-    const electronPath = path.resolve(pkgPath, "dist/electron");
-    const electronDistPath = path.resolve(pkgPath, ".electron/dist");
-
-    logger.log("설정 가져오기...");
-    const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(true, opt.optNames) as ISdCliConfig;
-    const pkgConf = projConf.packages[opt.pkgName];
-    if (pkgConf?.type !== "client" || pkgConf.builder?.electron === undefined) {
-      throw new Error();
-    }
-
-    logger.log("package.json 파일 쓰기...");
-    const npmConfig = (await FsUtil.readJsonAsync(path.resolve(pkgPath, `package.json`))) as INpmConfig;
-
-    const externalPkgNames = pkgConf.builder.electron.reinstallDependencies ?? [];
-
-    await FsUtil.writeJsonAsync(path.resolve(electronPath, `package.json`), {
-      name: npmConfig.name,
-      version: npmConfig.version,
-      description: npmConfig.description,
-      main: "electron-main.js",
-      ...pkgConf.builder.electron.postInstallScript !== undefined ? {
-        scripts: {
-          "postinstall": pkgConf.builder.electron.postInstallScript
-        },
-      } : {},
-      dependencies: externalPkgNames.toObject((item) => item, (item) => npmConfig.dependencies![item])
-    });
-
-    logger.log("npm install...");
-    await SdProcess.spawnAsync(`npm install`, {cwd: electronPath}, true);
-
-    for (const externalPkgName of externalPkgNames) {
-      if (FsUtil.exists(path.resolve(electronPath, "node_modules", externalPkgName, "binding.gyp"))) {
-        logger.log(`electron rebuild (${externalPkgName})...`);
-        await SdProcess.spawnAsync(`electron-rebuild -m ./node_modules/${externalPkgName}`, {cwd: electronPath}, true);
-      }
-    }
-
-    logger.log("build...");
-
-    await electronBuilder.build({
-      targets: electronBuilder.Platform.WINDOWS.createTarget(),
-      config: {
-        appId: pkgConf.builder.electron.appId,
-        productName: npmConfig.description,
-        // asar: false,
-        win: {
-          target: "nsis"
-        },
-        nsis: {},
-        directories: {
-          app: electronPath,
-          output: electronDistPath
-        },
-        ...pkgConf.builder.electron.installerIcon !== undefined ? {
-          icon: path.resolve(pkgPath, "src", pkgConf.builder.electron.installerIcon)
-        } : {},
-        removePackageScripts: false
-      }
-    });
-
-    await FsUtil.copyAsync(
-      path.resolve(electronDistPath, `${npmConfig.description} Setup ${npmConfig.version}.exe`),
-      path.resolve(pkgPath, `dist/electron/${npmConfig.description}-dev.exe`)
-    );
-  }
-
-  public static async buildAsync(opt: {
-    pkgPath: string;
-    config: ISdCliClientBuilderElectronConfig;
-  }): Promise<void> {
-    const logger = Logger.get(["simplysm", "sd-cli", "SdCliElectron", "buildAsync"]);
-
-    const electronSrcPath = path.resolve(opt.pkgPath, ".electron/src");
-    const electronDistPath = path.resolve(opt.pkgPath, ".electron/dist");
-
-    logger.log("package.json 파일 쓰기...");
-    const npmConfig = (await FsUtil.readJsonAsync(path.resolve(opt.pkgPath, `package.json`))) as INpmConfig;
-
-    const externalPkgNames = opt.config.reinstallDependencies ?? [];
-
-    await FsUtil.writeJsonAsync(path.resolve(electronSrcPath, `package.json`), {
-      name: npmConfig.name,
-      version: npmConfig.version,
-      description: npmConfig.description,
-      main: "electron-main.js",
-      ...opt.config.postInstallScript !== undefined ? {
-        scripts: {
-          "postinstall": opt.config.postInstallScript
-        },
-      } : {},
-      dependencies: externalPkgNames.toObject((item) => item, (item) => npmConfig.dependencies![item])
-    });
-
-    logger.log("npm install...");
-    await SdProcess.spawnAsync(`npm install`, {cwd: electronSrcPath}, true);
-
-    for (const externalPkgName of externalPkgNames) {
-      if (FsUtil.exists(path.resolve(electronSrcPath, "node_modules", externalPkgName, "binding.gyp"))) {
-        logger.log(`electron rebuild (${externalPkgName})...`);
-        await SdProcess.spawnAsync(`electron-rebuild -m ./node_modules/${externalPkgName}`, {cwd: electronSrcPath}, true);
-      }
-    }
-
-    logger.log("build...");
-
-    await electronBuilder.build({
-      targets: electronBuilder.Platform.WINDOWS.createTarget(),
-      config: {
-        appId: opt.config.appId,
-        productName: npmConfig.description,
-        // asar: false,
-        win: {
-          target: "nsis"
-        },
-        nsis: {},
-        directories: {
-          app: electronSrcPath,
-          output: electronDistPath
-        },
-        ...opt.config.installerIcon !== undefined ? {
-          icon: path.resolve(opt.pkgPath, "src", opt.config.installerIcon)
-        } : {},
-        removePackageScripts: false
-      }
-    });
-
-    await FsUtil.copyAsync(
-      path.resolve(electronDistPath, `${npmConfig.description} Setup ${npmConfig.version}.exe`),
-      path.resolve(opt.pkgPath, `dist/electron/${npmConfig.description}-latest.exe`)
-    );
-  }
+import {FsUtil, Logger, SdProcess} from "@simplysm/sd-core-node";
+import {pathToFileURL} from "url";
+import path from "path";
+import {INpmConfig, ISdCliClientBuilderElectronConfig, ISdCliConfig} from "../commons";
+import electronBuilder from "electron-builder";
+
+export class SdCliElectron {
+  public static async runAsync(opt: {
+    confFileRelPath: string;
+    optNames: string[];
+    pkgName: string;
+  }): Promise<void> {
+    const logger = Logger.get(["simplysm", "sd-cli", "SdCliElectron", "runAsync"]);
+
+    const pkgPath = path.resolve(process.cwd(), `packages/${opt.pkgName}`);
+    const electronPath = path.resolve(pkgPath, "dist/electron");
+
+    logger.log("설정 가져오기...");
+    const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(true, opt.optNames) as ISdCliConfig;
+    const pkgConf = projConf.packages[opt.pkgName];
+    if (pkgConf?.type !== "client" || pkgConf.builder?.electron === undefined) {
+      throw new Error();
+    }
+
+    logger.log("package.json 파일 쓰기...");
+    const npmConfig = (await FsUtil.readJsonAsync(path.resolve(pkgPath, `package.json`))) as INpmConfig;
+
+    const externalPkgNames = pkgConf.builder.electron.reinstallDependencies ?? [];
+
+    await FsUtil.writeJsonAsync(path.resolve(electronPath, `package.json`), {
+      name: npmConfig.name,
+      version: npmConfig.version,
+      description: npmConfig.description,
+      main: "electron-main.js",
+      ...pkgConf.builder.electron.postInstallScript !== undefined ? {
+        scripts: {
+          "postinstall": pkgConf.builder.electron.postInstallScript
+        },
+      } : {},
+      dependencies: externalPkgNames.toObject((item) => item, (item) => npmConfig.dependencies![item])
+    });
+
+    logger.log("npm install...");
+    await SdProcess.spawnAsync(`npm install`, {cwd: electronPath}, true);
+
+    for (const externalPkgName of externalPkgNames) {
+      if (FsUtil.exists(path.resolve(electronPath, "node_modules", externalPkgName, "binding.gyp"))) {
+        logger.log(`electron rebuild (${externalPkgName})...`);
+        await SdProcess.spawnAsync(`electron-rebuild -m ./node_modules/${externalPkgName}`, {cwd: electronPath}, true);
+      }
+    }
+
+    logger.log("electron...");
+    await SdProcess.spawnAsync(`electron .`, {cwd: electronPath}, true);
+  }
+
+  public static async buildForDevAsync(opt: {
+    confFileRelPath: string;
+    optNames: string[];
+    pkgName: string;
+  }): Promise<void> {
+    const logger = Logger.get(["simplysm", "sd-cli", "SdCliElectron", "buildForDevAsync"]);
+
+    const pkgPath = path.resolve(process.cwd(), `packages/${opt.pkgName}`);
+    const electronPath = path.resolve(pkgPath, "dist/electron");
+    const electronDistPath = path.resolve(pkgPath, ".electron/dist");
+
+    logger.log("설정 가져오기...");
+    const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(true, opt.optNames) as ISdCliConfig;
+    const pkgConf = projConf.packages[opt.pkgName];
+    if (pkgConf?.type !== "client" || pkgConf.builder?.electron === undefined) {
+      throw new Error();
+    }
+
+    logger.log("package.json 파일 쓰기...");
+    const npmConfig = (await FsUtil.readJsonAsync(path.resolve(pkgPath, `package.json`))) as INpmConfig;
+
+    const externalPkgNames = pkgConf.builder.electron.reinstallDependencies ?? [];
+
+    await FsUtil.writeJsonAsync(path.resolve(electronPath, `package.json`), {
+      name: npmConfig.name,
+      version: npmConfig.version,
+      description: npmConfig.description,
+      main: "electron-main.js",
+      ...pkgConf.builder.electron.postInstallScript !== undefined ? {
+        scripts: {
+          "postinstall": pkgConf.builder.electron.postInstallScript
+        },
+      } : {},
+      dependencies: externalPkgNames.toObject((item) => item, (item) => npmConfig.dependencies![item])
+    });
+
+    logger.log("npm install...");
+    await SdProcess.spawnAsync(`npm install`, {cwd: electronPath}, true);
+
+    for (const externalPkgName of externalPkgNames) {
+      if (FsUtil.exists(path.resolve(electronPath, "node_modules", externalPkgName, "binding.gyp"))) {
+        logger.log(`electron rebuild (${externalPkgName})...`);
+        await SdProcess.spawnAsync(`electron-rebuild -m ./node_modules/${externalPkgName}`, {cwd: electronPath}, true);
+      }
+    }
+
+    logger.log("build...");
+
+    await electronBuilder.build({
+      targets: electronBuilder.Platform.WINDOWS.createTarget(),
+      config: {
+        appId: pkgConf.builder.electron.appId,
+        productName: npmConfig.description,
+        // asar: false,
+        win: {
+          target: "nsis"
+        },
+        nsis: {},
+        directories: {
+          app: electronPath,
+          output: electronDistPath
+        },
+        ...pkgConf.builder.electron.installerIcon !== undefined ? {
+          icon: path.resolve(pkgPath, "src", pkgConf.builder.electron.installerIcon)
+        } : {},
+        removePackageScripts: false
+      }
+    });
+
+    await FsUtil.copyAsync(
+      path.resolve(electronDistPath, `${npmConfig.description} Setup ${npmConfig.version}.exe`),
+      path.resolve(pkgPath, `dist/electron/${npmConfig.description}-dev.exe`)
+    );
+  }
+
+  public static async buildAsync(opt: {
+    pkgPath: string;
+    config: ISdCliClientBuilderElectronConfig;
+  }): Promise<void> {
+    const logger = Logger.get(["simplysm", "sd-cli", "SdCliElectron", "buildAsync"]);
+
+    const electronSrcPath = path.resolve(opt.pkgPath, ".electron/src");
+    const electronDistPath = path.resolve(opt.pkgPath, ".electron/dist");
+
+    logger.log("package.json 파일 쓰기...");
+    const npmConfig = (await FsUtil.readJsonAsync(path.resolve(opt.pkgPath, `package.json`))) as INpmConfig;
+
+    const externalPkgNames = opt.config.reinstallDependencies ?? [];
+
+    await FsUtil.writeJsonAsync(path.resolve(electronSrcPath, `package.json`), {
+      name: npmConfig.name,
+      version: npmConfig.version,
+      description: npmConfig.description,
+      main: "electron-main.js",
+      ...opt.config.postInstallScript !== undefined ? {
+        scripts: {
+          "postinstall": opt.config.postInstallScript
+        },
+      } : {},
+      dependencies: externalPkgNames.toObject((item) => item, (item) => npmConfig.dependencies![item])
+    });
+
+    logger.log("npm install...");
+    await SdProcess.spawnAsync(`npm install`, {cwd: electronSrcPath}, true);
+
+    for (const externalPkgName of externalPkgNames) {
+      if (FsUtil.exists(path.resolve(electronSrcPath, "node_modules", externalPkgName, "binding.gyp"))) {
+        logger.log(`electron rebuild (${externalPkgName})...`);
+        await SdProcess.spawnAsync(`electron-rebuild -m ./node_modules/${externalPkgName}`, {cwd: electronSrcPath}, true);
+      }
+    }
+
+    logger.log("build...");
+
+    await electronBuilder.build({
+      targets: electronBuilder.Platform.WINDOWS.createTarget(),
+      config: {
+        appId: opt.config.appId,
+        productName: npmConfig.description,
+        // asar: false,
+        win: {
+          target: "nsis"
+        },
+        nsis: {},
+        directories: {
+          app: electronSrcPath,
+          output: electronDistPath
+        },
+        ...opt.config.installerIcon !== undefined ? {
+          icon: path.resolve(opt.pkgPath, "src", opt.config.installerIcon)
+        } : {},
+        removePackageScripts: false
+      }
+    });
+
+    await FsUtil.copyAsync(
+      path.resolve(electronDistPath, `${npmConfig.description} Setup ${npmConfig.version}.exe`),
+      path.resolve(opt.pkgPath, `dist/electron/${npmConfig.description}-latest.exe`)
+    );
+  }
 }