@simplysm/sd-cli 10.0.39 → 10.0.45

package/src/builders/SdCliClientBuilder.ts

@@ -1,13 +1,13 @@
 import {EventEmitter} from "events";
-import {FsUtil, Logger, SdFsWatcher} from "@simplysm/sd-core-node";
+import {FsUtil, Logger, SdFsWatcher, SdProcess} from "@simplysm/sd-core-node";
 import {INpmConfig, ISdCliBuilderResult, ISdCliClientPackageConfig, ISdCliPackageBuildResult} from "../commons";
 import {FunctionQueue, MathUtil} from "@simplysm/sd-core-common";
 import * as vite from "vite";
 import {defineConfig, InlineConfig} from "vite";
 import vitePluginPaths from "vite-tsconfig-paths";
 import path from "path";
-import {SdTsIncrementalBuilder} from "../SdTsIncrementalBuilder";
-import {SdLinter} from "../SdLinter";
+import {SdTsIncrementalBuilder} from "../build-tools/SdTsIncrementalBuilder";
+import {SdLinter} from "../build-tools/SdLinter";
 import {VitePWA} from 'vite-plugin-pwa';
 import {SdCliViteNodeGlobalPlugin} from "../utils/SdCliViteNodeGlobalPlugin";
 import {SdCliViteServeWithResolutionsPlugin} from "../utils/SdCliViteWatchWithResolutionsPlugin";
@@ -15,225 +15,320 @@ import {SdCliViteLoggerPlugin} from "../utils/SdCliViteLoggerPlugin";
 import {SdCliViteReactSwcPlugin} from "../utils/SdCliViteReactSwcPlugin";
 import {SdCliViteExternalPlugin} from "../utils/SdCliViteExternalPlugin";
 import {SdCliViteElectronMainPlugin} from "../utils/SdCliViteElectronMainPlugin";
+import electronBuilder from "electron-builder";
 
 export class SdCliClientBuilder extends EventEmitter {
-    private readonly _logger = Logger.get(["simplysm", "sd-cli", "SdCliClientBuilder"]);
+  private readonly _logger = Logger.get(["simplysm", "sd-cli", "SdCliClientBuilder"]);
 
-    public constructor(private readonly _pkgPath: string,
-                       private readonly _pkgConf: ISdCliClientPackageConfig,
-                       private readonly _builderKey: "web" | "electron",
-                       private readonly _withLint: boolean) {
-        super();
-    }
+  public constructor(private readonly _pkgPath: string,
+                     private readonly _pkgConf: ISdCliClientPackageConfig,
+                     private readonly _builderKey: "web" | "electron",
+                     private readonly _withLint: boolean) {
+    super();
+  }
 
-    public override on(event: "change", listener: () => void): this;
-    public override on(event: "complete", listener: (result: ISdCliBuilderResult) => void): this;
-    public override on(event: string | symbol, listener: (...args: any[]) => void): this {
-        super.on(event, listener);
-        return this;
-    }
+  public override on(event: "change", listener: () => void): this;
+  public override on(event: "complete", listener: (result: ISdCliBuilderResult) => void): this;
+  public override on(event: string | symbol, listener: (...args: any[]) => void): this {
+    super.on(event, listener);
+    return this;
+  }
 
-    public async watchAsync(): Promise<number> {
-        const cachePath = path.resolve(this._pkgPath, ".cache", "dev", ...this._builderKey !== "web" ? [this._builderKey] : []);
+  public async watchAsync(): Promise<number> {
+    const cachePath = path.resolve(this._pkgPath, ".cache", "dev", ...this._builderKey !== "web" ? [this._builderKey] : []);
 
-        this.emit("change");
+    this.emit("change");
 
-        this._debug("BUILD...");
-        const viteServerPort = this._pkgConf.builder?.[this._builderKey]?.["devServerPort"] ?? MathUtil.getRandomInt(60000, 65535);
-        const viteServer = await vite.createServer(this._getViteConfig({
-            dev: true,
-            pkgConf: this._pkgConf,
-            cachePath: cachePath,
-            port: viteServerPort,
-        }));
-        await viteServer.listen(viteServerPort);
-
-        this._debug("CHECK...");
-        const sdTsProgram = await SdTsIncrementalBuilder.createAsync(this._pkgPath, () => ({emitJs: false}));
-        const checkResult = await sdTsProgram.buildAsync();
-
-        this._debug("LINT...");
-        const lintResults = !this._withLint ? [] : await SdLinter.lintAsync(checkResult.affectedFilePaths, sdTsProgram.builderProgram!.getProgram());
-
-        this._debug("WATCH...");
-        const fnQ = new FunctionQueue();
-        SdFsWatcher
-            .watch([
-                ...sdTsProgram.builderProgram!.getSourceFiles().map((item) => item.fileName),
-                path.resolve(this._pkgPath, "src/**/*.{ts,tsx}")
-            ])
-            .onChange({
-                delay: 100
-            }, () => {
-                fnQ.runLast(async () => {
-                    this.emit("change");
-
-                    this._debug(`CHECK...`);
-                    const watchCheckResult = await sdTsProgram.buildAsync();
-
-                    this._debug(`LINT...`);
-                    const watchLintResults = !this._withLint ? [] : await SdLinter.lintAsync(watchCheckResult.affectedFilePaths, sdTsProgram.builderProgram!.getProgram());
-
-                    this._debug(`빌드 완료`);
-                    this.emit("complete", {
-                        port: viteServerPort,
-                        affectedFilePaths: watchCheckResult.affectedFilePaths,
-                        buildResults: [...watchCheckResult.results, ...watchLintResults]
-                    });
-                });
-            });
-
-        if (this._pkgConf.server !== undefined) {
-            this._debug("GEN .config...");
-            const confDistPath = path.resolve(this._pkgPath, "../../packages", this._pkgConf.server, "dist/www", path.basename(this._pkgPath), ".config.json");
-            await FsUtil.writeFileAsync(confDistPath, JSON.stringify(this._pkgConf.configs ?? {}, undefined, 2));
-        }
+    this._debug("BUILD...");
+    const viteServerPort = this._pkgConf.builder?.[this._builderKey]?.["devServerPort"] ?? MathUtil.getRandomInt(60000, 65535);
+    const viteServer = await vite.createServer(this._getViteConfig({
+      dev: true,
+      pkgConf: this._pkgConf,
+      cachePath: cachePath,
+      port: viteServerPort,
+    }));
+    await viteServer.listen(viteServerPort);
+
+    this._debug("CHECK...");
+    const sdTsProgram = await SdTsIncrementalBuilder.createAsync(this._pkgPath, () => ({emitJs: false}));
+    const checkResult = await sdTsProgram.buildAsync();
+
+    this._debug("LINT...");
+    const lintResults = !this._withLint ? [] : await SdLinter.lintAsync(checkResult.affectedFilePaths, sdTsProgram.builderProgram!.getProgram());
+
+    this._debug("WATCH...");
+    const fnQ = new FunctionQueue();
+    SdFsWatcher
+      .watch([
+        ...sdTsProgram.builderProgram!.getSourceFiles().map((item) => item.fileName),
+        path.resolve(this._pkgPath, "src/**/*.{ts,tsx}")
+      ])
+      .onChange({
+        delay: 100
+      }, () => {
+        fnQ.runLast(async () => {
+          this.emit("change");
+
+          this._debug(`CHECK...`);
+          const watchCheckResult = await sdTsProgram.buildAsync();
+
+          this._debug(`LINT...`);
+          const watchLintResults = !this._withLint ? [] : await SdLinter.lintAsync(watchCheckResult.affectedFilePaths, sdTsProgram.builderProgram!.getProgram());
 
-        this._debug(`빌드 완료`);
-        this.emit("complete", {
+          this._debug(`빌드 완료`);
+          this.emit("complete", {
             port: viteServerPort,
-            affectedFilePaths: checkResult.affectedFilePaths,
-            buildResults: [...checkResult.results, ...lintResults]
+            affectedFilePaths: watchCheckResult.affectedFilePaths,
+            buildResults: [...watchCheckResult.results, ...watchLintResults]
+          });
         });
+      });
 
-        return viteServerPort;
+    if (this._pkgConf.server !== undefined) {
+      this._debug("GEN .config...");
+      const confDistPath = path.resolve(this._pkgPath, "../../packages", this._pkgConf.server, "dist/www", path.basename(this._pkgPath), ".config.json");
+      await FsUtil.writeFileAsync(confDistPath, JSON.stringify(this._pkgConf.configs ?? {}, undefined, 2));
     }
 
-    public async buildAsync(): Promise<ISdCliBuilderResult> {
-        this._debug("dist 초기화...");
-        const cachePath = path.resolve(this._pkgPath, ".cache", "prod", ...this._builderKey !== "web" ? [this._builderKey] : []);
-        const distPath = path.resolve(this._pkgPath, "dist", ...this._builderKey !== "web" ? [this._builderKey] : []);
-        await FsUtil.removeAsync(cachePath);
-        await FsUtil.removeAsync(distPath);
-
-        this._debug("BUILD...");
-        const buildResults: ISdCliPackageBuildResult[] = [];
-        try {
-            await vite.build(this._getViteConfig({
-                dev: false,
-                pkgConf: this._pkgConf,
-                cachePath: cachePath,
-                distPath: distPath,
-            }));
-        } catch (err) {
-            if ("errors" in err && err.errors instanceof Array) {
-                buildResults.push(...err.errors.map((item: any) => ({
-                    filePath: item.location.file,
-                    line: item.location.line,
-                    char: item.location.column,
-                    code: undefined,
-                    severity: "error" as const,
-                    message: item.text
-                })));
-            }
-            if ("warnings" in err && err.warnings instanceof Array) {
-                buildResults.push(...err.warnings.map((item: any) => ({
-                    filePath: item.location.file,
-                    line: item.location.line,
-                    char: item.location.column,
-                    code: undefined,
-                    severity: "warning" as const,
-                    message: item.text
-                })));
-            }
-        }
-
-        this._debug("CHECK...");
-        const sdTsProgram = await SdTsIncrementalBuilder.createAsync(this._pkgPath, () => ({emitJs: false}));
-        const checkResult = await sdTsProgram.buildAsync();
+    this._debug(`빌드 완료`);
+    this.emit("complete", {
+      port: viteServerPort,
+      affectedFilePaths: checkResult.affectedFilePaths,
+      buildResults: [...checkResult.results, ...lintResults]
+    });
 
-        this._debug("LINT...");
-        const lintResults = !this._withLint ? [] : await SdLinter.lintAsync(checkResult.affectedFilePaths, sdTsProgram.builderProgram!.getProgram());
+    return viteServerPort;
+  }
 
-        if (this._pkgConf.server !== undefined) {
-            this._debug("GEN .config...");
-            const confDistPath = path.resolve(this._pkgPath, "dist/.config.json");
-            await FsUtil.writeFileAsync(confDistPath, JSON.stringify(this._pkgConf.configs ?? {}, undefined, 2));
-        }
+  public async buildAsync(): Promise<ISdCliBuilderResult> {
+    this._debug("dist 초기화...");
+    const cachePath = path.resolve(this._pkgPath, ".cache", "prod", ...this._builderKey !== "web" ? [this._builderKey] : []);
+    const distPath = path.resolve(this._pkgPath, "dist", ...this._builderKey !== "web" ? [this._builderKey] : []);
+    await FsUtil.removeAsync(cachePath);
+    await FsUtil.removeAsync(distPath);
 
-        this._debug(`빌드 완료`);
-        return {
-            affectedFilePaths: checkResult.affectedFilePaths,
-            buildResults: [...buildResults, ...checkResult.results, ...lintResults]
-        };
+    this._debug("BUILD...");
+    const buildResults: ISdCliPackageBuildResult[] = [];
+    try {
+      await vite.build(this._getViteConfig({
+        dev: false,
+        pkgConf: this._pkgConf,
+        cachePath: cachePath,
+        distPath: distPath,
+      }));
+    } catch (err) {
+      if ("errors" in err && err.errors instanceof Array) {
+        buildResults.push(...err.errors.map((item: any) => ({
+          filePath: item.location.file,
+          line: item.location.line,
+          char: item.location.column,
+          code: undefined,
+          severity: "error" as const,
+          message: item.text
+        })));
+      }
+      if ("warnings" in err && err.warnings instanceof Array) {
+        buildResults.push(...err.warnings.map((item: any) => ({
+          filePath: item.location.file,
+          line: item.location.line,
+          char: item.location.column,
+          code: undefined,
+          severity: "warning" as const,
+          message: item.text
+        })));
+      }
     }
 
-    private _getViteConfig(opt: {
-        dev: boolean,
-        cachePath: string,
-        distPath?: string,
-        port?: number,
-        pkgConf: ISdCliClientPackageConfig
-    }): InlineConfig {
-        const pkgNpmConfig: INpmConfig = FsUtil.readJson(path.resolve(this._pkgPath, "package.json"));
-
-        const basePath = (!opt.dev || this._pkgConf.server !== undefined) ? ("/" + path.basename(this._pkgPath) + "/") : "/";
-
-        const define = {
-            "import.meta.env.SD_ELECTRON_SERVER_URL": JSON.stringify(opt.dev ? `http://localhost:${opt.port}/` : "./index.html"),
-            "import.meta.env.SD_VERSION": JSON.stringify(pkgNpmConfig.version),
-            ...this._pkgConf.env
-                ? Object.keys(this._pkgConf.env)
-                    .toObject(
-                        (key) => "import.meta.env." + key,
-                        (key) => JSON.stringify(this._pkgConf.env![key])
-                    )
-                : {}
-        };
-
-        return defineConfig({
-            mode: opt.dev ? "development" : "production",
-            root: path.resolve(this._pkgPath, "src"),
-            cacheDir: path.resolve(opt.cachePath, "vite"),
-            base: basePath,
-            define: define,
-            publicDir: false,
-            ...opt.dev ? {
-                server: {
-                    port: opt.port,
-                    hmr: {
-                        port: opt.port
-                    }
-                }
-            } : {},
-            ...!opt.dev ? {
-                build: {
-                    outDir: this._builderKey === "electron" ? path.resolve(opt.cachePath, "src") : opt.distPath,
-                },
-            } : {},
-            plugins: [
-                SdCliViteReactSwcPlugin(),
-                SdCliViteLoggerPlugin({
-                    logger: this._logger,
-                    name: path.basename(this._pkgPath)
-                }),
-                vitePluginPaths(),
-                ...opt.dev ? [
-                    SdCliViteServeWithResolutionsPlugin(),
-                ] : [],
-                ...!opt.dev ? [
-                    VitePWA({registerType: 'autoUpdate'}),
-                ] : [],
-                ...this._builderKey === "web" ? [
-                    SdCliViteNodeGlobalPlugin()
-                ] : [],
-                ...this._builderKey === "electron" ? [
-                    SdCliViteElectronMainPlugin({
-                        entry: path.resolve(this._pkgPath, "src/electron-main.ts"),
-                        distPath: path.resolve(opt.cachePath, "src"),
-                        cachePath: path.resolve(opt.cachePath, "electron-main")
-                    }),
-                    SdCliViteExternalPlugin({
-                        cachePath: path.resolve(opt.cachePath, "external"),
-                        nodeBuiltinModules: true,
-                        includes: opt.pkgConf.builder?.electron?.reinstallDependencies
-                    })
-                ] : [],
-            ],
-        });
+    this._debug("CHECK...");
+    const sdTsProgram = await SdTsIncrementalBuilder.createAsync(this._pkgPath, () => ({emitJs: false}));
+    const checkResult = await sdTsProgram.buildAsync();
+
+    this._debug("LINT...");
+    const lintResults = !this._withLint ? [] : await SdLinter.lintAsync(checkResult.affectedFilePaths, sdTsProgram.builderProgram!.getProgram());
+
+    if (this._pkgConf.server !== undefined) {
+      const confDistPath = path.resolve(this._pkgPath, "dist/.config.json");
+      this._debug("GEN .config...");
+      await FsUtil.writeFileAsync(confDistPath, JSON.stringify(this._pkgConf.configs ?? {}, undefined, 2));
     }
 
-    private _debug(msg: string): void {
-        this._logger.debug(`[${path.basename(this._pkgPath)}] ${msg}`);
+    if (this._builderKey === "electron") {
+      const electronSrcPath = path.resolve(this._pkgPath, ".cache/prod/electron/src");
+      const electronDistPath = path.resolve(this._pkgPath, ".cache/prod/electron/dist");
+      const pkgNpmConfig = (await FsUtil.readJsonAsync(path.resolve(this._pkgPath, `package.json`))) as INpmConfig;
+
+      this._debug("package.json 파일 쓰기...");
+      const externalPkgNames = this._pkgConf.builder!.electron!.reinstallDependencies ?? [];
+
+      await FsUtil.writeJsonAsync(path.resolve(electronSrcPath, `package.json`), {
+        name: pkgNpmConfig.name,
+        version: pkgNpmConfig.version,
+        description: pkgNpmConfig.description,
+        main: "electron-main.js",
+        ...this._pkgConf.builder!.electron!.postInstallScript !== undefined ? {
+          scripts: {
+            "postinstall": this._pkgConf.builder!.electron!.postInstallScript
+          },
+        } : {},
+        dependencies: externalPkgNames.toObject((item) => item, (item) => pkgNpmConfig.dependencies![item] ?? "*")
+      });
+
+      this._debug("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"))) {
+          this._debug(`electron rebuild (${externalPkgName})...`);
+          await SdProcess.spawnAsync(`electron-rebuild -m ./node_modules/${externalPkgName}`, {cwd: electronSrcPath}, true);
+        }
+      }
+
+      await electronBuilder.build({
+        targets: electronBuilder.Platform.WINDOWS.createTarget(),
+        config: {
+          appId: this._pkgConf.builder!.electron!.appId,
+          productName: pkgNpmConfig.description,
+          // asar: false,
+          win: {
+            target: "nsis"
+          },
+          nsis: {},
+          directories: {
+            app: electronSrcPath,
+            output: electronDistPath
+          },
+          ...this._pkgConf.builder!.electron!.installerIcon !== undefined ? {
+            icon: path.resolve(this._pkgPath, "src", this._pkgConf.builder!.electron!.installerIcon)
+          } : {},
+          removePackageScripts: false
+        }
+      });
+
+      await FsUtil.copyAsync(
+        path.resolve(electronDistPath, `${pkgNpmConfig.description} Setup ${pkgNpmConfig.version}.exe`),
+        path.resolve(distPath, `electron/${pkgNpmConfig.description}-latest.exe`)
+      );
+
+      await FsUtil.copyAsync(
+        path.resolve(electronDistPath, `${pkgNpmConfig.description} Setup ${pkgNpmConfig.version}.exe`),
+        path.resolve(distPath, `electron/updates/${pkgNpmConfig.version}.exe`)
+      );
     }
+
+
+    this._debug(`빌드 완료`);
+    return {
+      affectedFilePaths: checkResult.affectedFilePaths,
+      buildResults: [...buildResults, ...checkResult.results, ...lintResults]
+    };
+  }
+
+  private _getViteConfig(opt: {
+    dev: boolean,
+    cachePath: string,
+    distPath?: string,
+    port?: number,
+    pkgConf: ISdCliClientPackageConfig
+  }): InlineConfig {
+    const pkgNpmConfig: INpmConfig = FsUtil.readJson(path.resolve(this._pkgPath, "package.json"));
+
+    const basePath = this._builderKey === "electron" ? "" : (!opt.dev || this._pkgConf.server !== undefined) ? ("/" + path.basename(this._pkgPath) + "/") : "/";
+
+    const serverHost = this._pkgConf.builder?.[this._builderKey]?.devServerHost ?? "localhost";
+
+    const define = {
+      ...opt.dev ? {
+        "import.meta.env.SD_SERVER_URL": JSON.stringify(`http://${serverHost}:${opt.port}` + basePath)
+      } : {},
+      "import.meta.env.SD_VERSION": JSON.stringify(pkgNpmConfig.version),
+      ...this._pkgConf.env
+        ? Object.keys(this._pkgConf.env)
+          .toObject(
+            (key) => "import.meta.env." + key,
+            (key) => JSON.stringify(this._pkgConf.env![key])
+          )
+        : {},
+      ...this._pkgConf.builder?.[this._builderKey]?.env
+        ? Object.keys(this._pkgConf.builder[this._builderKey]!.env!)
+          .toObject(
+            (key) => "import.meta.env." + key,
+            (key) => JSON.stringify(this._pkgConf.builder![this._builderKey]!.env![key])
+          )
+        : {}
+    };
+
+    return defineConfig({
+      mode: opt.dev ? "development" : "production",
+      root: path.resolve(this._pkgPath, "src"),
+      cacheDir: path.resolve(opt.cachePath, "vite"),
+      base: basePath,
+      assetsInclude: [
+        "**/*.xlsx",
+        "**/*.xls",
+        "**/*.docx",
+        "**/*.doc",
+        "**/*.pptx",
+        "**/*.ppt",
+        "**/*.woff",
+        "**/*.woff2",
+        "**/*.ttf",
+        "**/*.eot",
+        "**/*.otf",
+        "**/*.csv",
+        "**/*.zip",
+        "**/*.pfx",
+        "**/*.pkl"
+      ],
+      define: define,
+      ...opt.dev ? {
+        server: {
+          host: serverHost,
+          port: opt.port,
+          hmr: {
+            host: serverHost,
+            port: opt.port
+          }
+        }
+      } : {},
+      ...!opt.dev ? {
+        build: {
+          outDir: this._builderKey === "electron" ? path.resolve(opt.cachePath, "src") : opt.distPath,
+        },
+      } : {},
+      plugins: [
+        SdCliViteReactSwcPlugin(),
+        SdCliViteLoggerPlugin({
+          logger: this._logger,
+          name: path.basename(this._pkgPath)
+        }),
+        vitePluginPaths(),
+        ...opt.dev ? [
+          SdCliViteServeWithResolutionsPlugin(),
+        ] : [],
+        ...!opt.dev && this._builderKey === "web" ? [
+          VitePWA({registerType: 'autoUpdate'}),
+        ] : [],
+        ...this._builderKey === "web" ? [
+          SdCliViteNodeGlobalPlugin()
+        ] : [],
+        ...this._builderKey === "electron" ? [
+          SdCliViteElectronMainPlugin({
+            entry: path.resolve(this._pkgPath, "src/electron-main.ts"),
+            distPath: path.resolve(opt.cachePath, "src"),
+            cachePath: path.resolve(opt.cachePath, "electron-main")
+          }),
+          SdCliViteExternalPlugin({
+            target: "browser",
+            cachePath: path.resolve(opt.cachePath, "external"),
+            nodeBuiltinModules: true,
+            includes: opt.pkgConf.builder?.electron?.reinstallDependencies
+          })
+        ] : [],
+      ],
+    });
+  }
+
+  private _debug(msg: string): void {
+    this._logger.debug(`[${path.basename(this._pkgPath)}] ${msg}`);
+  }
 }

package/src/builders/SdCliJsLibLinter.ts

@@ -2,7 +2,7 @@ import { FsUtil, Logger, SdFsWatcher } from "@simplysm/sd-core-node";
 import path from "path";
 import { ISdCliBuilderResult } from "../commons";
 import { EventEmitter } from "events";
-import { SdLinter } from "../SdLinter";
+import { SdLinter } from "../build-tools/SdLinter";
 
 export class SdCliJsLibLinter extends EventEmitter {
   private readonly _logger = Logger.get(["simplysm", "sd-cli", "SdCliJsLibLinter"]);