@simplysm/sd-cli 10.0.66 → 11.0.4

package/src/entry/SdCliLocalUpdate.ts

@@ -1,7 +1,7 @@
 import {FsUtil, Logger, PathUtil, SdFsWatcher} from "@simplysm/sd-core-node";
 import path from "path";
 import {pathToFileURL} from "url";
-import {TSdCliConfig} from "../commons";
+import {ISdCliConfig} from "../commons";
 
 export class SdCliLocalUpdate {
   public static async runAsync(opt: {
@@ -11,7 +11,7 @@ export class SdCliLocalUpdate {
     const logger = Logger.get(["simplysm", "sd-cli", "SdCliLocalUpdate", "runAsync"]);
 
     logger.debug("프로젝트 설정 가져오기...");
-    const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(true, opt.optNames) as TSdCliConfig;
+    const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(true, opt.optNames) as ISdCliConfig;
     if (!projConf.localUpdates) return;
 
     const updatePathInfos = await this._getUpdatePathInfosAsync(projConf.localUpdates);
@@ -39,7 +39,7 @@ export class SdCliLocalUpdate {
     const logger = Logger.get(["simplysm", "sd-cli", "SdCliLocalUpdate", "watchAsync"]);
 
     logger.debug("프로젝트 설정 가져오기...");
-    const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(true, opt.optNames) as TSdCliConfig;
+    const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(true, opt.optNames) as ISdCliConfig;
     if (!projConf.localUpdates) return;
 
     const updatePathInfos = await this._getUpdatePathInfosAsync(projConf.localUpdates);

package/src/entry/SdCliProject.ts

@@ -4,9 +4,9 @@ import {
   INpmConfig,
   ISdCliBuildClusterReqMessage,
   ISdCliBuildClusterResMessage,
+  ISdCliConfig,
   ISdCliPackageBuildResult,
   ISdCliServerPackageConfig,
-  TSdCliConfig,
   TSdCliPackageConfig
 } from "../commons";
 import cp from "child_process";
@@ -28,7 +28,7 @@ export class SdCliProject {
     const logger = Logger.get(["simplysm", "sd-cli", "SdCliProject", "watchAsync"]);
 
     logger.debug("프로젝트 설정 가져오기...");
-    const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(true, opt.optNames) as TSdCliConfig;
+    const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(true, opt.optNames) as ISdCliConfig;
 
     if (projConf.localUpdates) {
       logger.debug("로컬 라이브러리 업데이트 변경감지 시작...");
@@ -79,8 +79,8 @@ export class SdCliProject {
       hasChanges: boolean;
 
       //client
-      pathProxy: Record<string, number | undefined>; // persist
-      changeFilePaths: string[];
+      pathProxy: Record<string, string | number | undefined>; // persist
+      // changeFilePaths: string[];
     }>();
     cluster.on("message", (message: ISdCliBuildClusterResMessage) => {
       if (message.type === "change") {
@@ -99,37 +99,44 @@ export class SdCliProject {
           cacheItem.push(buildResult);
         }
 
-        if (message.req.pkgConf.type === "server") {
+        const pkgConf = message.req.projConf.packages[path.basename(message.req.pkgPath)]!;
+
+        if (pkgConf.type === "server") {
           const pkgName = path.basename(message.req.pkgPath);
           const serverInfo = serverInfoMap.getOrCreate(pkgName, {
             hasChanges: false,
             pathProxy: {},
-            changeFilePaths: []
+            // changeFilePaths: []
           });
           serverInfo.pkgPath = message.req.pkgPath;
           serverInfo.hasChanges = true;
         }
 
-        if (message.req.pkgConf.type === "client") {
+        if (pkgConf.type === "client") {
           const pkgName = path.basename(message.req.pkgPath);
 
-          if (message.req.pkgConf.server !== undefined) {
-            const serverInfo = serverInfoMap.getOrCreate(message.req.pkgConf.server, {
+          if (pkgConf.server !== undefined) {
+            const serverInfo = serverInfoMap.getOrCreate(pkgConf.server, {
               hasChanges: false,
               pathProxy: {},
-              changeFilePaths: []
+              // changeFilePaths: []
             });
-            serverInfo.pathProxy[pkgName] = message.result!.port;
-            serverInfo.changeFilePaths.push(...message.result!.affectedFilePaths);
+            serverInfo.pathProxy[pkgName] = path.resolve(message.req.pkgPath, "dist");
+            //message.result!.port;
+            // serverInfo.changeFilePaths.push(...message.result!.affectedFilePaths);
+
+            serverInfo.worker?.send({type: "broadcastReload"});
           }
           else {
             const serverInfo = serverInfoMap.getOrCreate(pkgName, {
               hasChanges: false,
               pathProxy: {},
-              changeFilePaths: []
+              // changeFilePaths: []
             });
             serverInfo.port = message.result!.port;
-            serverInfo.changeFilePaths.push(...message.result!.affectedFilePaths);
+            // serverInfo.changeFilePaths.push(...message.result!.affectedFilePaths);
+
+            serverInfo.worker?.send({type: "broadcastReload"});
           }
         }
 
@@ -195,11 +202,11 @@ export class SdCliProject {
       if (pkgConf.type === "client") {
         const builderKeys = Object.keys(pkgConf.builder ?? {web: {}});
         await builderKeys.parallelAsync(async (builderKey) => {
-          await this._runCommandAsync(cluster, "watch", pkgPath, projConf.packages[path.basename(pkgPath)]!, opt.withLint, builderKey);
+          await this._runCommandAsync(cluster, "watch", projConf, pkgPath, opt.withLint, builderKey);
         });
       }
       else {
-        await this._runCommandAsync(cluster, "watch", pkgPath, projConf.packages[path.basename(pkgPath)]!, opt.withLint);
+        await this._runCommandAsync(cluster, "watch", projConf, pkgPath, opt.withLint);
       }
     });
 
@@ -219,7 +226,7 @@ export class SdCliProject {
     const logger = Logger.get(["simplysm", "sd-cli", "SdCliProject", "buildAsync"]);
 
     logger.debug("프로젝트 설정 가져오기...");
-    const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(false, opt.optNames) as TSdCliConfig;
+    const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(false, opt.optNames) as ISdCliConfig;
 
     logger.debug("프로젝트 package.json 가져오기...");
     const projNpmConf = (await FsUtil.readJsonAsync(path.resolve(process.cwd(), "package.json"))) as INpmConfig;
@@ -255,11 +262,11 @@ export class SdCliProject {
         if (pkgConf.type === "client") {
           const builderKeys = Object.keys(pkgConf.builder ?? {web: {}});
           return (await builderKeys.parallelAsync(async (builderKey) => {
-            return await this._runCommandAsync(cluster, "build", pkgPath, projConf.packages[path.basename(pkgPath)]!, opt.withLint, builderKey);
+            return await this._runCommandAsync(cluster, "build", projConf, pkgPath, opt.withLint, builderKey);
           })).mapMany();
         }
         else {
-          return await this._runCommandAsync(cluster, "build", pkgPath, projConf.packages[path.basename(pkgPath)]!, opt.withLint);
+          return await this._runCommandAsync(cluster, "build", projConf, pkgPath, opt.withLint);
         }
       })
     ).mapMany();
@@ -280,7 +287,7 @@ export class SdCliProject {
     const logger = Logger.get(["simplysm", "sd-cli", "SdCliProject", "publishAsync"]);
 
     logger.debug("프로젝트 설정 가져오기...");
-    const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(false, opt.optNames) as TSdCliConfig;
+    const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(false, opt.optNames) as ISdCliConfig;
 
     logger.debug("프로젝트 package.json 가져오기...");
     const projNpmConf = (await FsUtil.readJsonAsync(path.resolve(process.cwd(), "package.json"))) as INpmConfig;
@@ -332,11 +339,11 @@ export class SdCliProject {
           if (pkgConf.type === "client") {
             const builderKeys = Object.keys(pkgConf.builder ?? {web: {}});
             return (await builderKeys.parallelAsync(async (builderKey) => {
-              return await this._runCommandAsync(cluster, "build", pkgPath, projConf.packages[path.basename(pkgPath)]!, opt.withLint, builderKey);
+              return await this._runCommandAsync(cluster, "build", projConf, pkgPath, opt.withLint, builderKey);
             })).mapMany();
           }
           else {
-            return await this._runCommandAsync(cluster, "build", pkgPath, projConf.packages[path.basename(pkgPath)]!, opt.withLint);
+            return await this._runCommandAsync(cluster, "build", projConf, pkgPath, opt.withLint);
           }
         })
       ).mapMany();
@@ -529,9 +536,9 @@ export class SdCliProject {
     });
   }
 
-  private static async _runCommandAsync(cluster: cp.ChildProcess, cmd: "watch", pkgPath: string, pkgConf: TSdCliPackageConfig, withLint: boolean, builderKey?: string): Promise<void>;
-  private static async _runCommandAsync(cluster: cp.ChildProcess, cmd: "build", pkgPath: string, pkgConf: TSdCliPackageConfig, withLint: boolean, builderKey?: string): Promise<ISdCliPackageBuildResult[]>;
-  private static async _runCommandAsync(cluster: cp.ChildProcess, cmd: "watch" | "build", pkgPath: string, pkgConf: TSdCliPackageConfig, withLint: boolean, builderKey?: string): Promise<ISdCliPackageBuildResult[] | void> {
+  private static async _runCommandAsync(cluster: cp.ChildProcess, cmd: "watch", projConf: ISdCliConfig, pkgPath: string, withLint: boolean, builderKey?: string): Promise<void>;
+  private static async _runCommandAsync(cluster: cp.ChildProcess, cmd: "build", projConf: ISdCliConfig, pkgPath: string, withLint: boolean, builderKey?: string): Promise<ISdCliPackageBuildResult[]>;
+  private static async _runCommandAsync(cluster: cp.ChildProcess, cmd: "watch" | "build", projConf: ISdCliConfig, pkgPath: string, withLint: boolean, builderKey?: string): Promise<ISdCliPackageBuildResult[] | void> {
     return await new Promise<ISdCliPackageBuildResult[] | void>((resolve) => {
       const cb = (message: ISdCliBuildClusterResMessage): void => {
         if (cmd === "watch" && message.type === "ready" && message.req.cmd === cmd && message.req.pkgPath === pkgPath) {
@@ -547,8 +554,8 @@ export class SdCliProject {
 
       cluster.send({
         cmd,
+        projConf,
         pkgPath,
-        pkgConf,
         builderKey,
         withLint
       } as ISdCliBuildClusterReqMessage);

package/src/index.ts

@@ -1,6 +1,8 @@
 export * from "./build-tools/SdCliIndexFileGenerator";
 export * from "./build-tools/SdLinter";
-export * from "./build-tools/SdTsIncrementalBuilder";
+export * from "./build-tools/SdNgBundler";
+export * from "./build-tools/SdTsBundler";
+export * from "./build-tools/SdTsCompiler";
 export * from "./builders/SdCliClientBuilder";
 export * from "./builders/SdCliJsLibLinter";
 export * from "./builders/SdCliServerBuilder";
@@ -9,14 +11,4 @@ export * from "./commons";
 export * from "./entry/SdCliElectron";
 export * from "./entry/SdCliLocalUpdate";
 export * from "./entry/SdCliProject";
-export * from "./entry/SdCliPwaAssets";
-export * from "./utils/getElectronReactExternals";
 export * from "./utils/SdCliBuildResultUtil";
-export * from "./utils/sdCliTsDefineTransformer";
-export * from "./utils/SdCliViteElectronMainPlugin";
-export * from "./utils/SdCliViteExternalPlugin";
-export * from "./utils/SdCliViteLazyImportPlugin";
-export * from "./utils/SdCliViteLoggerPlugin";
-export * from "./utils/SdCliViteNodeGlobalPlugin";
-export * from "./utils/SdCliViteReactSwcPlugin";
-export * from "./utils/SdCliViteServeOptimizeExcludePlugin";

package/src/sd-cli.ts

@@ -7,7 +7,6 @@ import {Logger, LoggerSeverity} from "@simplysm/sd-core-node";
 import {EventEmitter} from "events";
 import {SdCliElectron} from "./entry/SdCliElectron";
 import {SdCliLocalUpdate} from "./entry/SdCliLocalUpdate";
-import {SdCliPwaAssets} from "./entry/SdCliPwaAssets";
 
 Error.stackTraceLimit = Infinity;
 EventEmitter.defaultMaxListeners = 0;
@@ -164,21 +163,6 @@ const argv = (
           }
         })
     )
-    .command(
-      "gen-pwa-assets <fileName> <package>",
-      "PWA Asset 파일들을 생성합니다.",
-      (cmd) => cmd
-        .positional("fileName", {
-          type: "string",
-          describe: "이미지 파일",
-          demandOption: true
-        })
-        .positional("package", {
-          type: "string",
-          describe: "패키지명",
-          demandOption: true
-        })
-    )
     .parseAsync()
 ) as any;
 
@@ -246,13 +230,6 @@ else if (argv._[0] === "build-electron-for-dev") {
       pkgName: argv.package
     });
 }
-else if (argv._[0] === "gen-pwa-assets") {
-  await SdCliPwaAssets
-    .genAsync({
-      relFilePath: argv.fileName!,
-      pkgName: argv.package
-    });
-}
 else {
   throw new Error(`명령어가 잘못 되었습니다.\n\t${argv._[0]}\n`);
 }

package/src/server-worker.ts

@@ -42,4 +42,7 @@ process.on("message", (message: any) => {
   if (message.type === "setPathProxy") {
     server.pathProxy = message.pathProxy;
   }
+  if (message.type === "broadcastReload") {
+    server.broadcastReload();
+  }
 });

package/dist/build-tools/SdTsIncrementalBuilder.d.ts

@@ -1,29 +0,0 @@
-import ts from "typescript";
-import { ISdCliPackageBuildResult } from "../commons";
-interface IOptTransform<T> {
-    fn: (_: ts.Program, arg: T) => ts.TransformerFactory<ts.SourceFile>;
-    args: T;
-}
-export declare class SdTsIncrementalBuilder {
-    private readonly _pkgPath;
-    private readonly _compilerOptions;
-    private readonly _host;
-    private readonly _opt;
-    builderProgram?: ts.SemanticDiagnosticsBuilderProgram;
-    private readonly _writeFileCache;
-    constructor(_pkgPath: string, _compilerOptions: ts.CompilerOptions, _host: ts.CompilerHost, _opt: {
-        emitJs: boolean | string[];
-        compilerOptions?: ts.CompilerOptions;
-        transforms?: IOptTransform<any>[];
-    });
-    static createAsync(pkgPath: string, optFn: (compilerOptions: ts.CompilerOptions) => {
-        emitJs: boolean | string[];
-        compilerOptions?: ts.CompilerOptions;
-        transforms?: IOptTransform<any>[];
-    }): Promise<SdTsIncrementalBuilder>;
-    buildAsync(): Promise<{
-        affectedFilePaths: string[];
-        results: ISdCliPackageBuildResult[];
-    }>;
-}
-export {};

package/dist/build-tools/SdTsIncrementalBuilder.js

@@ -1,75 +0,0 @@
-import path from "path";
-import ts from "typescript";
-import { SdCliBuildResultUtil } from "../utils/SdCliBuildResultUtil";
-import { FsUtil, Logger, PathUtil } from "@simplysm/sd-core-node";
-export class SdTsIncrementalBuilder {
-    constructor(_pkgPath, _compilerOptions, _host, _opt) {
-        this._pkgPath = _pkgPath;
-        this._compilerOptions = _compilerOptions;
-        this._host = _host;
-        this._opt = _opt;
-        this._writeFileCache = new Map();
-    }
-    static async createAsync(pkgPath, optFn) {
-        const tsConfigFilePath = path.resolve(pkgPath, "tsconfig.json");
-        const parsedTsConfig = ts.parseJsonConfigFileContent(await FsUtil.readJsonAsync(tsConfigFilePath), ts.sys, pkgPath);
-        const opt = optFn(parsedTsConfig.options);
-        const compilerOptions = {
-            ...parsedTsConfig.options,
-            ...opt?.compilerOptions
-        };
-        const host = ts.createIncrementalCompilerHost(compilerOptions);
-        return new SdTsIncrementalBuilder(pkgPath, compilerOptions, host, opt);
-    }
-    async buildAsync() {
-        const logger = Logger.get(["simplysm", "sd-cli", "SdTsIncrementalBuilder", "buildAsync"]);
-        const distPath = this._compilerOptions.outDir ?? path.resolve(this._pkgPath, "dist");
-        const srcGlobPath = path.resolve(this._pkgPath, "src/**/*.{ts,tsx}");
-        const srcFilePaths = await FsUtil.globAsync(srcGlobPath);
-        this.builderProgram = ts.createSemanticDiagnosticsBuilderProgram(srcFilePaths, this._compilerOptions, this._host, this.builderProgram);
-        const diagnostics = [];
-        const affectedFilePaths = [];
-        diagnostics.push(...this.builderProgram.getOptionsDiagnostics(), ...this.builderProgram.getGlobalDiagnostics());
-        const program = this.builderProgram.getProgram();
-        logger.debug(`[${path.basename(this._pkgPath)}] 영향받는 파일 확인 및 처리중...`);
-        const srcFilePathSet = new Set(srcFilePaths);
-        while (true) {
-            const semanticResult = this.builderProgram.getSemanticDiagnosticsOfNextAffectedFile(undefined, (sourceFile) => {
-                return !srcFilePathSet.has(path.resolve(sourceFile.fileName));
-            });
-            if (!semanticResult)
-                break;
-            diagnostics.push(...semanticResult.result);
-            if ("fileName" in semanticResult.affected) {
-                const emitResult = this.builderProgram.emit(semanticResult.affected, (filePath, data, writeByteOrderMark) => {
-                    let realFilePath = filePath;
-                    let realData = data;
-                    if (PathUtil.isChildPath(realFilePath, path.resolve(distPath, path.basename(this._pkgPath), "src"))) {
-                        realFilePath = path.resolve(distPath, path.relative(path.resolve(distPath, path.basename(this._pkgPath), "src"), realFilePath));
-                        if (filePath.endsWith(".js.map")) {
-                            const sourceMapContents = JSON.parse(realData);
-                            sourceMapContents.sources[0] = sourceMapContents.sources[0].slice(6);
-                            realData = JSON.stringify(sourceMapContents);
-                        }
-                    }
-                    if (this._writeFileCache.get(realFilePath) !== realData) {
-                        this._host.writeFile(realFilePath, realData, writeByteOrderMark);
-                    }
-                    this._writeFileCache.set(realFilePath, realData);
-                }, undefined, Array.isArray(this._opt.emitJs) ? !this._opt.emitJs.includes(path.resolve(semanticResult.affected.fileName)) : !this._opt.emitJs, this._opt.transforms ? {
-                    before: this._opt.transforms.map((item) => typeof item.fn === "function" ? item.fn(program, item.args) : item.fn["default"](program, item.args))
-                } : undefined);
-                diagnostics.push(...emitResult.diagnostics);
-                diagnostics.push(...this.builderProgram.getSyntacticDiagnostics(semanticResult.affected));
-                affectedFilePaths.push(path.resolve(semanticResult.affected.fileName));
-            }
-        }
-        logger.debug(`[${path.basename(this._pkgPath)}] 영향받는 파일 확인 및 처리 완료`, affectedFilePaths);
-        const buildResults = diagnostics.map((item) => SdCliBuildResultUtil.convertFromTsDiag(item));
-        return {
-            affectedFilePaths,
-            results: buildResults
-        };
-    }
-}
-//# sourceMappingURL=SdTsIncrementalBuilder.js.map

package/dist/build-tools/SdTsIncrementalBuilder.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"SdTsIncrementalBuilder.js","sourceRoot":"","sources":["../../src/build-tools/SdTsIncrementalBuilder.ts"],"names":[],"mappings":"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"}

package/dist/entry/SdCliPwaAssets.d.ts

@@ -1,6 +0,0 @@
-export declare abstract class SdCliPwaAssets {
-    static genAsync(opt: {
-        pkgName: string;
-        relFilePath: string;
-    }): Promise<void>;
-}

package/dist/entry/SdCliPwaAssets.js

@@ -1,39 +0,0 @@
-import { defaultPngCompressionOptions, generatePWAAssets, toResolvedAsset, } from "@vite-pwa/assets-generator";
-import path from "path";
-import { PathUtil } from "@simplysm/sd-core-node";
-export class SdCliPwaAssets {
-    static async genAsync(opt) {
-        const pkgSrcPath = PathUtil.posix(path.resolve(), "packages", opt.pkgName, "src");
-        const assets = {
-            assets: {
-                transparent: toResolvedAsset('transparent', {
-                    sizes: [64, 192, 512],
-                    favicons: [[64, PathUtil.posix(pkgSrcPath, "favicon.ico")]]
-                }),
-                maskable: toResolvedAsset('maskable', {
-                    sizes: [512]
-                }),
-                apple: toResolvedAsset('apple', {
-                    sizes: [180]
-                }),
-            },
-            png: defaultPngCompressionOptions,
-            assetName: (type, size) => {
-                switch (type) {
-                    case 'transparent':
-                        return PathUtil.posix(pkgSrcPath, `public/icons/icon-${size.width}x${size.height}.png`);
-                    case 'maskable':
-                        return PathUtil.posix(pkgSrcPath, `assets/icons/maskable-icon-${size.width}x${size.height}.png`);
-                    case 'apple':
-                        return PathUtil.posix(pkgSrcPath, `assets/icons/apple-touch-icon-${size.width}x${size.height}.png`);
-                }
-            },
-        };
-        await generatePWAAssets([opt.relFilePath], assets, {
-            root: process.cwd(),
-            logLevel: "info",
-            overrideAssets: true
-        });
-    }
-}
-//# sourceMappingURL=SdCliPwaAssets.js.map

package/dist/entry/SdCliPwaAssets.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"SdCliPwaAssets.js","sourceRoot":"","sources":["../../src/entry/SdCliPwaAssets.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAC5B,iBAAiB,EAEjB,eAAe,GAChB,MAAM,4BAA4B,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAC,QAAQ,EAAC,MAAM,wBAAwB,CAAC;AAEhD,MAAM,OAAgB,cAAc;IAC3B,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAA6C;QACxE,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAElF,MAAM,MAAM,GAAmB;YAC7B,MAAM,EAAE;gBACN,WAAW,EAAE,eAAe,CAAC,aAAa,EAAE;oBAC1C,KAAK,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC;oBACrB,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,QAAQ,CAAC,KAAK,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC;iBAC5D,CAAC;gBACF,QAAQ,EAAE,eAAe,CAAC,UAAU,EAAE;oBACpC,KAAK,EAAE,CAAC,GAAG,CAAC;iBACb,CAAC;gBACF,KAAK,EAAE,eAAe,CAAC,OAAO,EAAE;oBAC9B,KAAK,EAAE,CAAC,GAAG,CAAC;iBACb,CAAC;aACH;YACD,GAAG,EAAE,4BAA4B;YACjC,SAAS,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;gBACxB,QAAQ,IAAI,EAAE;oBACZ,KAAK,aAAa;wBAChB,OAAO,QAAQ,CAAC,KAAK,CAAC,UAAU,EAAE,qBAAqB,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,MAAM,CAAC,CAAC;oBAC1F,KAAK,UAAU;wBACb,OAAO,QAAQ,CAAC,KAAK,CAAC,UAAU,EAAE,8BAA8B,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,MAAM,CAAC,CAAC;oBACnG,KAAK,OAAO;wBACV,OAAO,QAAQ,CAAC,KAAK,CAAC,UAAU,EAAE,iCAAiC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,MAAM,CAAC,CAAC;iBACvG;YACH,CAAC;SACF,CAAC;QAEF,MAAM,iBAAiB,CACrB,CAAC,GAAG,CAAC,WAAW,CAAC,EACjB,MAAM,EACN;YACE,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE;YACnB,QAAQ,EAAE,MAAM;YAChB,cAAc,EAAE,IAAI;SACrB,CACF,CAAC;IACJ,CAAC;CACF"}

package/dist/utils/SdCliViteElectronMainPlugin.d.ts

@@ -1,6 +0,0 @@
-import { PluginOption } from "vite";
-export declare const SdCliViteElectronMainPlugin: (opt: {
-    entry: string;
-    distPath: string;
-    cachePath: string;
-}) => PluginOption[];

package/dist/utils/SdCliViteElectronMainPlugin.js

@@ -1,96 +0,0 @@
-import { build, defineConfig } from "vite";
-import { SdCliViteExternalPlugin } from "./SdCliViteExternalPlugin";
-import path from "path";
-import { SdCliViteLoggerPlugin } from "./SdCliViteLoggerPlugin";
-import { Logger } from "@simplysm/sd-core-node";
-export const SdCliViteElectronMainPlugin = (opt) => {
-    const logger = Logger.get(["simplysm", "sd-cli", "SdCliViteElectronMainPlugin"]);
-    let mainConfig;
-    return [
-        {
-            name: "sd-cli:vite:electron-main",
-            apply: "serve",
-            configureServer: (server) => {
-                server.httpServer?.on("listening", async () => {
-                    mainConfig = defineConfig({
-                        mode: server.config.mode,
-                        define: server.config.define,
-                        root: server.config.root,
-                        optimizeDeps: {
-                            force: server.config.optimizeDeps?.force
-                        },
-                        build: {
-                            sourcemap: true,
-                            minify: false,
-                            outDir: opt.distPath,
-                            lib: {
-                                entry: opt.entry,
-                                formats: ["cjs"],
-                                fileName: () => "[name].js"
-                            },
-                            emptyOutDir: false
-                        },
-                        plugins: [
-                            SdCliViteLoggerPlugin({
-                                logger,
-                                name: path.basename(opt.entry)
-                            }),
-                            SdCliViteExternalPlugin({
-                                target: "node",
-                                cachePath: path.resolve(opt.cachePath, "externals"),
-                                includes: ["electron"]
-                            }),
-                            {
-                                name: ":startup",
-                                closeBundle: () => {
-                                    server.ws.send({ type: "full-reload" });
-                                }
-                            }
-                        ]
-                    });
-                    await build(mainConfig);
-                });
-            },
-        },
-        {
-            name: "sd-cli:vite:electron-main",
-            apply: "build",
-            config: (config) => {
-                mainConfig = defineConfig({
-                    mode: config.mode,
-                    define: config.define,
-                    root: config.root,
-                    optimizeDeps: {
-                        force: config.optimizeDeps?.force
-                    },
-                    build: {
-                        sourcemap: false,
-                        minify: true,
-                        outDir: opt.distPath,
-                        lib: {
-                            entry: opt.entry,
-                            formats: ["cjs"],
-                            fileName: () => "[name].js"
-                        },
-                        emptyOutDir: false
-                    },
-                    plugins: [
-                        SdCliViteLoggerPlugin({
-                            logger,
-                            name: path.basename(opt.entry)
-                        }),
-                        SdCliViteExternalPlugin({
-                            target: "node",
-                            cachePath: path.resolve(opt.cachePath, "externals"),
-                            includes: ["electron"]
-                        }),
-                    ]
-                });
-            },
-            closeBundle: async () => {
-                await build(mainConfig);
-            }
-        }
-    ];
-};
-//# sourceMappingURL=SdCliViteElectronMainPlugin.js.map

package/dist/utils/SdCliViteElectronMainPlugin.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"SdCliViteElectronMainPlugin.js","sourceRoot":"","sources":["../../src/utils/SdCliViteElectronMainPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAE,YAAY,EAA2B,MAAM,MAAM,CAAC;AACnE,OAAO,EAAC,uBAAuB,EAAC,MAAM,2BAA2B,CAAC;AAClE,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAC,qBAAqB,EAAC,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAC,MAAM,EAAC,MAAM,wBAAwB,CAAC;AAE9C,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,GAI3C,EAAkB,EAAE;IACnB,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,6BAA6B,CAAC,CAAC,CAAC;IAEjF,IAAI,UAAsB,CAAC;IAE3B,OAAO;QACL;YACE,IAAI,EAAE,2BAA2B;YACjC,KAAK,EAAE,OAAO;YACd,eAAe,EAAE,CAAC,MAAM,EAAE,EAAE;gBAC1B,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC,WAAW,EAAE,KAAK,IAAI,EAAE;oBAC5C,UAAU,GAAG,YAAY,CAAC;wBACxB,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI;wBACxB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM;wBAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI;wBACxB,YAAY,EAAE;4BACZ,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,KAAK;yBACzC;wBACD,KAAK,EAAE;4BACL,SAAS,EAAE,IAAI;4BACf,MAAM,EAAE,KAAK;4BACb,MAAM,EAAE,GAAG,CAAC,QAAQ;4BACpB,GAAG,EAAE;gCACH,KAAK,EAAE,GAAG,CAAC,KAAK;gCAChB,OAAO,EAAE,CAAC,KAAK,CAAC;gCAChB,QAAQ,EAAE,GAAG,EAAE,CAAC,WAAW;6BAC5B;4BACD,WAAW,EAAE,KAAK;yBACnB;wBACD,OAAO,EAAE;4BACP,qBAAqB,CAAC;gCACpB,MAAM;gCACN,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC;6BAC/B,CAAC;4BACF,uBAAuB,CAAC;gCACtB,MAAM,EAAE,MAAM;gCACd,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC;gCACnD,QAAQ,EAAE,CAAC,UAAU,CAAC;6BACvB,CAAC;4BACF;gCACE,IAAI,EAAE,UAAU;gCAChB,WAAW,EAAE,GAAG,EAAE;oCAChB,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,aAAa,EAAC,CAAC,CAAC;gCACxC,CAAC;6BACF;yBACF;qBACF,CAAC,CAAC;oBACH,MAAM,KAAK,CAAC,UAAU,CAAC,CAAC;gBAC1B,CAAC,CAAC,CAAC;YACL,CAAC;SACF;QACD;YACE,IAAI,EAAE,2BAA2B;YACjC,KAAK,EAAE,OAAO;YACd,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE;gBACjB,UAAU,GAAG,YAAY,CAAC;oBACxB,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,MAAM,EAAE,MAAM,CAAC,MAAM;oBACrB,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,YAAY,EAAE;wBACZ,KAAK,EAAE,MAAM,CAAC,YAAY,EAAE,KAAK;qBAClC;oBACD,KAAK,EAAE;wBACL,SAAS,EAAE,KAAK;wBAChB,MAAM,EAAE,IAAI;wBACZ,MAAM,EAAE,GAAG,CAAC,QAAQ;wBACpB,GAAG,EAAE;4BACH,KAAK,EAAE,GAAG,CAAC,KAAK;4BAChB,OAAO,EAAE,CAAC,KAAK,CAAC;4BAChB,QAAQ,EAAE,GAAG,EAAE,CAAC,WAAW;yBAC5B;wBACD,WAAW,EAAE,KAAK;qBACnB;oBACD,OAAO,EAAE;wBACP,qBAAqB,CAAC;4BACpB,MAAM;4BACN,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC;yBAC/B,CAAC;wBACF,uBAAuB,CAAC;4BACtB,MAAM,EAAE,MAAM;4BACd,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC;4BACnD,QAAQ,EAAE,CAAC,UAAU,CAAC;yBACvB,CAAC;qBACH;iBACF,CAAC,CAAC;YACL,CAAC;YACD,WAAW,EAAE,KAAK,IAAI,EAAE;gBACtB,MAAM,KAAK,CAAC,UAAU,CAAC,CAAC;YAC1B,CAAC;SACF;KACF,CAAC;AACJ,CAAC,CAAC"}

package/dist/utils/SdCliViteExternalPlugin.d.ts

@@ -1,6 +0,0 @@
-import { PluginOption } from "vite";
-export declare const SdCliViteExternalPlugin: (opt: {
-    target: "browser" | "node";
-    cachePath: string;
-    includes?: string[];
-}) => PluginOption[];

package/dist/utils/SdCliViteExternalPlugin.js

@@ -1,85 +0,0 @@
-import { builtinModules, createRequire } from "node:module";
-import { FsUtil, PathUtil } from "@simplysm/sd-core-node";
-import path from "path";
-import { pathToFileURL } from "url";
-import libEsm from "lib-esm";
-import esbuild from "esbuild";
-export const SdCliViteExternalPlugin = (opt) => {
-    const externals = opt.includes ?? [];
-    const builtins = [
-        ...builtinModules,
-        ...builtinModules.map((item) => `node:${item}`)
-    ];
-    return [
-        opt.target === "node" ? {
-            name: "sd-cli:vite:external",
-            enforce: "pre",
-            resolveId: (source, importer) => {
-                if (importer === undefined)
-                    return;
-                if (externals.includes(source)) {
-                    return {
-                        id: source,
-                        external: true
-                    };
-                }
-                if (builtins.includes(source)) {
-                    return {
-                        id: `node:${source}`,
-                        external: true
-                    };
-                }
-                return;
-            }
-        } : {
-            name: "sd-cli:vite:external",
-            enforce: "pre",
-            config: () => {
-                async function _getSnippetsAsync(moduleName, importer) {
-                    const myRequire = createRequire(pathToFileURL(importer ?? process.cwd()).toString());
-                    let realModuleName;
-                    try {
-                        realModuleName = moduleName;
-                    }
-                    catch {
-                        realModuleName = await _getPreBundleAsync(moduleName);
-                    }
-                    const module = myRequire(realModuleName);
-                    const members = Object.getOwnPropertyNames(module);
-                    const { exports } = libEsm({ exports: members });
-                    return `const avoid_parse_require = require; const _M_ = avoid_parse_require("${PathUtil.posix(realModuleName)}"); ${exports}`;
-                }
-                async function _getPreBundleAsync(moduleName) {
-                    const outfile = path.posix.join(opt.cachePath, moduleName) + ".cjs";
-                    await esbuild.build({
-                        entryPoints: [moduleName],
-                        outfile,
-                        target: 'node18',
-                        format: 'cjs',
-                        bundle: true,
-                        sourcemap: 'inline',
-                        platform: 'node',
-                        external: builtins
-                    });
-                    return outfile;
-                }
-                return {
-                    resolve: {
-                        alias: [{
-                                find: new RegExp(`^(${[...externals, ...builtins].join("|")})$`),
-                                replacement: "$1",
-                                customResolver: async (source, importer) => {
-                                    const id = path.posix.join(opt.cachePath, source) + ".mjs";
-                                    if (!FsUtil.exists(id)) {
-                                        await FsUtil.writeFileAsync(id, await _getSnippetsAsync(source, importer));
-                                    }
-                                    return { id };
-                                }
-                            }],
-                    }
-                };
-            }
-        }
-    ];
-};
-//# sourceMappingURL=SdCliViteExternalPlugin.js.map