@simplysm/sd-cli 10.0.40 → 10.0.47

package/src/index.ts

@@ -1 +1,19 @@
-export { TSdCliConfigFn, ISdCliConfig } from "./commons";
+export * from "./build-tools/SdCliIndexFileGenerator";
+export * from "./build-tools/SdLinter";
+export * from "./build-tools/SdTsIncrementalBuilder";
+export * from "./builders/SdCliClientBuilder";
+export * from "./builders/SdCliJsLibLinter";
+export * from "./builders/SdCliServerBuilder";
+export * from "./builders/SdCliTsLibBuilder";
+export * from "./commons";
+export * from "./entry/SdCliElectron";
+export * from "./entry/SdCliProject";
+export * from "./utils/getElectronReactExternals";
+export * from "./utils/SdCliBuildResultUtil";
+export * from "./utils/sdCliTsDefineTransformer";
+export * from "./utils/SdCliViteElectronMainPlugin";
+export * from "./utils/SdCliViteExternalPlugin";
+export * from "./utils/SdCliViteLoggerPlugin";
+export * from "./utils/SdCliViteNodeGlobalPlugin";
+export * from "./utils/SdCliViteReactSwcPlugin";
+export * from "./utils/SdCliViteWatchWithResolutionsPlugin";

package/src/sd-cli.ts

@@ -6,196 +6,207 @@ import {SdCliProject} from "./entry/SdCliProject";
 import {Logger, LoggerSeverity} from "@simplysm/sd-core-node";
 import {EventEmitter} from "events";
 import {SdCliElectron} from "./entry/SdCliElectron";
-import {SdCliLocalUpdate} from "./entry/SdCliLocalUpdate";
 
 Error.stackTraceLimit = Infinity;
 EventEmitter.defaultMaxListeners = 0;
 
 const argv = (
-    await yargs(hideBin(process.argv))
-        .help("help", "도움말")
-        .alias("help", "h")
+  await yargs(hideBin(process.argv))
+    .help("help", "도움말")
+    .alias("help", "h")
+    .options({
+      debug: {
+        type: "boolean",
+        describe: "디버그 로그를 표시할 것인지 여부",
+        default: false
+      }
+    })
+    .command(
+      "watch",
+      "프로젝트의 각 패키지에 대한 변경감지 빌드를 수행합니다.",
+      (cmd) => cmd.version(false).hide("help").hide("debug")
         .options({
-            debug: {
-                type: "boolean",
-                describe: "디버그 로그를 표시할 것인지 여부",
-                default: false
-            }
+          config: {
+            string: true,
+            describe: "simplysm.cjs 파일 경로"
+          },
+          options: {
+            string: true,
+            array: true,
+            describe: "옵션 설정"
+          },
+          packages: {
+            string: true,
+            array: true,
+            describe: "수행할 패키지 설정"
+          },
+          withoutLint: {
+            type: "boolean",
+            default: false,
+            describe: "린트 수행 여부"
+          }
         })
-        .command(
-            "local-update",
-            "로컬 라이브러리 업데이트를 수행합니다.",
-            (cmd) => cmd.version(false).hide("help").hide("debug")
-                .options({
-                    config: {
-                        string: true,
-                        describe: "simplysm.cjs 파일 경로"
-                    },
-                    options: {
-                        string: true,
-                        array: true,
-                        describe: "옵션 설정 (설정파일에서 @로 시작하는 부분)"
-                    },
-                })
-        )
-        .command(
-            "watch",
-            "프로젝트의 각 패키지에 대한 변경감지 빌드를 수행합니다.",
-            (cmd) => cmd.version(false).hide("help").hide("debug")
-                .options({
-                    config: {
-                        string: true,
-                        describe: "simplysm.cjs 파일 경로"
-                    },
-                    options: {
-                        string: true,
-                        array: true,
-                        describe: "옵션 설정 (설정파일에서 @로 시작하는 부분)"
-                    },
-                    packages: {
-                        string: true,
-                        array: true,
-                        describe: "수행할 패키지 설정"
-                    },
-                    withoutLint: {
-                        type: "boolean",
-                        default: false,
-                        describe: "린트 수행 여부"
-                    }
-                })
-        )
-        .command(
-            "build",
-            "프로젝트의 각 패키지에 대한 빌드를 수행합니다.",
-            (cmd) => cmd.version(false).hide("help").hide("debug")
-                .options({
-                    config: {
-                        string: true,
-                        describe: "simplysm.cjs 파일 경로"
-                    },
-                    options: {
-                        string: true,
-                        array: true,
-                        describe: "옵션 설정 (설정파일에서 @로 시작하는 부분)"
-                    },
-                    packages: {
-                        string: true,
-                        array: true,
-                        describe: "수행할 패키지 설정"
-                    },
-                    withoutLint: {
-                        type: "boolean",
-                        default: false,
-                        describe: "린트 수행 여부"
-                    }
-                })
-        )
-        .command(
-            "publish",
-            "프로젝트의 각 패키지를 배포합니다.",
-            (cmd) => cmd.version(false).hide("help").hide("debug")
-                .options({
-                    noBuild: {
-                        type: "boolean",
-                        describe: "빌드를 하지않고 배포합니다.",
-                        default: false
-                    },
-                    config: {
-                        type: "string",
-                        describe: "simplysm.cjs 파일 경로"
-                    },
-                    options: {
-                        type: "string",
-                        array: true,
-                        describe: "옵션 설정 (설정파일에서 @로 시작하는 부분)"
-                    },
-                    packages: {
-                        type: "string",
-                        array: true,
-                        describe: "수행할 패키지 설정"
-                    },
-                    withoutLint: {
-                        type: "boolean",
-                        default: false,
-                        describe: "린트 수행 여부"
-                    }
-                })
-        )
-        .command(
-            "run-electron <package>",
-            "변경감지중인 플랫폼을 ELECTRON 앱 형태로 띄웁니다.",
-            (cmd) => cmd
-                .positional("package", {
-                    type: "string",
-                    describe: "패키지명",
-                    demandOption: true
-                })
-                .options({
-                    config: {
-                        type: "string",
-                        describe: "simplysm.json 파일 경로"
-                    },
-                    options: {
-                        type: "string",
-                        array: true,
-                        describe: "옵션 설정 (설정파일에서 @로 시작하는 부분)"
-                    }
-                })
-        )
-        .parseAsync()
+    )
+    .command(
+      "build",
+      "프로젝트의 각 패키지에 대한 빌드를 수행합니다.",
+      (cmd) => cmd.version(false).hide("help").hide("debug")
+        .options({
+          config: {
+            string: true,
+            describe: "simplysm.cjs 파일 경로"
+          },
+          options: {
+            string: true,
+            array: true,
+            describe: "옵션 설정"
+          },
+          packages: {
+            string: true,
+            array: true,
+            describe: "수행할 패키지 설정"
+          },
+          withoutLint: {
+            type: "boolean",
+            default: false,
+            describe: "린트 수행 여부"
+          }
+        })
+    )
+    .command(
+      "publish",
+      "프로젝트의 각 패키지를 배포합니다.",
+      (cmd) => cmd.version(false).hide("help").hide("debug")
+        .options({
+          noBuild: {
+            type: "boolean",
+            describe: "빌드를 하지않고 배포합니다.",
+            default: false
+          },
+          config: {
+            type: "string",
+            describe: "simplysm.cjs 파일 경로"
+          },
+          options: {
+            type: "string",
+            array: true,
+            describe: "옵션 설정"
+          },
+          packages: {
+            type: "string",
+            array: true,
+            describe: "수행할 패키지 설정"
+          },
+          withoutLint: {
+            type: "boolean",
+            default: false,
+            describe: "린트 수행 여부"
+          }
+        })
+    )
+    .command(
+      "run-electron <package>",
+      "변경감지중인 플랫폼을 ELECTRON 앱 형태로 띄웁니다.",
+      (cmd) => cmd
+        .positional("package", {
+          type: "string",
+          describe: "패키지명",
+          demandOption: true
+        })
+        .options({
+          config: {
+            type: "string",
+            describe: "simplysm.json 파일 경로"
+          },
+          options: {
+            type: "string",
+            array: true,
+            describe: "옵션 설정"
+          }
+        })
+    )
+    .command(
+      "build-electron-for-dev <package>",
+      "변경감지중인 플랫폼을 ELECTRON 앱 형태로 띄웁니다.",
+      (cmd) => cmd
+        .positional("package", {
+          type: "string",
+          describe: "패키지명",
+          demandOption: true
+        })
+        .options({
+          config: {
+            type: "string",
+            describe: "simplysm.json 파일 경로"
+          },
+          options: {
+            type: "string",
+            array: true,
+            describe: "옵션 설정"
+          }
+        })
+    )
+    .parseAsync()
 ) as any;
 
 if (Boolean(argv.debug)) {
-    process.env["SD_DEBUG"] = "true";
-    Logger.setConfig({
-        console: {
-            level: LoggerSeverity.debug
-        }
-    });
-} else {
-    Logger.setConfig({
-        dot: true
-    });
+  process.env["SD_DEBUG"] = "true";
+  Logger.setConfig({
+    console: {
+      level: LoggerSeverity.debug
+    }
+  });
+}
+else {
+  Logger.setConfig({
+    dot: true
+  });
 }
 
 if (argv._[0] === "watch") {
-    await SdCliProject
-        .watchAsync({
-            confFileRelPath: argv.config ?? "simplysm.cjs",
-            optNames: argv.options ?? [],
-            pkgNames: argv.packages ?? [],
-            withLint: argv.withoutLint !== true
-        });
-} else if (argv._[0] === "build") {
-    await SdCliProject
-        .buildAsync({
-            confFileRelPath: argv.config ?? "simplysm.cjs",
-            optNames: argv.options ?? [],
-            pkgNames: argv.packages ?? [],
-            withLint: argv.withoutLint !== true
-        });
-} else if (argv._[0] === "publish") {
-    await SdCliProject
-        .publishAsync({
-            noBuild: argv.noBuild,
-            confFileRelPath: argv.config ?? "simplysm.cjs",
-            optNames: argv.options ?? [],
-            pkgNames: argv.packages ?? [],
-            withLint: argv.withoutLint !== true
-        });
-} else if (argv._[0] === "run-electron") {
-    await SdCliElectron
-        .runAsync({
-            confFileRelPath: argv.config ?? "simplysm.cjs",
-            optNames: argv.options ?? [],
-            pkgName: argv.package
-        });
-} else if (argv._[0] === "local-update") {
-    await SdCliLocalUpdate
-        .runAsync({
-            confFileRelPath: argv.config ?? "simplysm.cjs",
-            optNames: argv.options ?? []
-        });
-} else {
-    throw new Error(`명령어가 잘못 되었습니다.\n\t${argv._[0]}\n`);
+  await SdCliProject
+    .watchAsync({
+      confFileRelPath: argv.config ?? "simplysm.cjs",
+      optNames: argv.options ?? [],
+      pkgNames: argv.packages ?? [],
+      withLint: argv.withoutLint !== true
+    });
+}
+else if (argv._[0] === "build") {
+  await SdCliProject
+    .buildAsync({
+      confFileRelPath: argv.config ?? "simplysm.cjs",
+      optNames: argv.options ?? [],
+      pkgNames: argv.packages ?? [],
+      withLint: argv.withoutLint !== true
+    });
+}
+else if (argv._[0] === "publish") {
+  await SdCliProject
+    .publishAsync({
+      noBuild: argv.noBuild,
+      confFileRelPath: argv.config ?? "simplysm.cjs",
+      optNames: argv.options ?? [],
+      pkgNames: argv.packages ?? [],
+      withLint: argv.withoutLint !== true
+    });
+}
+else if (argv._[0] === "run-electron") {
+  await SdCliElectron
+    .runAsync({
+      confFileRelPath: argv.config ?? "simplysm.cjs",
+      optNames: argv.options ?? [],
+      pkgName: argv.package
+    });
+}
+else if (argv._[0] === "build-electron-for-dev") {
+  await SdCliElectron
+    .buildForDevAsync({
+      confFileRelPath: argv.config ?? "simplysm.cjs",
+      optNames: argv.options ?? [],
+      pkgName: argv.package
+    });
+}
+else {
+  throw new Error(`명령어가 잘못 되었습니다.\n\t${argv._[0]}\n`);
 }

package/src/utils/SdCliBuildResultUtil.ts

@@ -1,7 +1,7 @@
 import ts from "typescript";
 import os from "os";
 import path from "path";
-import { ISdCliPackageBuildResult } from "../commons";
+import {ISdCliPackageBuildResult} from "../commons";
 
 export class SdCliBuildResultUtil {
   public static convertFromTsDiag(diag: ts.Diagnostic): ISdCliPackageBuildResult {
@@ -24,7 +24,8 @@ export class SdCliBuildResultUtil {
       char,
       code,
       severity,
-      message
+      message,
+      type: "build" as const
     };
   }
 
@@ -36,7 +37,7 @@ export class SdCliBuildResultUtil {
     if (result.code !== undefined) {
       str += `${result.code}: `;
     }
-    str += `${result.severity} ${result.message}`;
+    str += `(${result.type}) ${result.severity} ${result.message}`;
 
     return str;
   }

package/src/utils/SdCliViteElectronMainPlugin.ts

@@ -1,12 +1,16 @@
 import {build, defineConfig, PluginOption, UserConfig} 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: {
     entry: string;
     distPath: string;
     cachePath: string;
 }): PluginOption[] => {
+    const logger = Logger.get(["simplysm", "sd-cli", "SdCliViteElectronMainPlugin"]);
+
     let mainConfig: UserConfig;
 
     return [
@@ -30,11 +34,16 @@ export const SdCliViteElectronMainPlugin = (opt: {
                                 entry: opt.entry,
                                 formats: ["cjs"],
                                 fileName: () => "[name].js"
-                            }
+                            },
+                            emptyOutDir: false
                         },
-                        customLogger: server.config.customLogger,
                         plugins: [
+                            SdCliViteLoggerPlugin({
+                                logger,
+                                name: path.basename(opt.entry)
+                            }),
                             SdCliViteExternalPlugin({
+                                target: "node",
                                 cachePath: path.resolve(opt.cachePath, "externals"),
                                 nodeBuiltinModules: true,
                                 includes: ["electron"]
@@ -59,9 +68,6 @@ export const SdCliViteElectronMainPlugin = (opt: {
                     mode: config.mode,
                     define: config.define,
                     root: config.root,
-                    resolve: {
-                        alias: config.resolve?.alias
-                    },
                     optimizeDeps: {
                         force: config.optimizeDeps?.force
                     },
@@ -73,9 +79,21 @@ export const SdCliViteElectronMainPlugin = (opt: {
                             entry: opt.entry,
                             formats: ["cjs"],
                             fileName: () => "[name].js"
-                        }
+                        },
+                        emptyOutDir: false
                     },
-                    customLogger: config.customLogger
+                    plugins: [
+                        SdCliViteLoggerPlugin({
+                            logger,
+                            name: path.basename(opt.entry)
+                        }),
+                        SdCliViteExternalPlugin({
+                            target: "node",
+                            cachePath: path.resolve(opt.cachePath, "externals"),
+                            nodeBuiltinModules: true,
+                            includes: ["electron"]
+                        }),
+                    ]
                 });
             },
             closeBundle: async () => {

package/src/utils/SdCliViteExternalPlugin.ts

@@ -8,6 +8,7 @@ import libEsm from "lib-esm";
 import esbuild from "esbuild";
 
 export const SdCliViteExternalPlugin = (opt: {
+    target: "browser" | "node";
     cachePath: string;
     nodeBuiltinModules?: boolean;
     dependencies?: boolean;
@@ -15,16 +16,15 @@ export const SdCliViteExternalPlugin = (opt: {
 }): PluginOption[] => {
     const externals = opt.includes ?? [];
 
-    const builtins =[
+    const builtins = [
         ...builtinModules,
         ...builtinModules.map((item) => `node:${item}`)
     ];
 
     return [
-        {
+        opt.target === "node" ? {
             name: "sd-cli:vite:external",
             enforce: "pre",
-            apply: "build",
             config: (conf) => {
                 if (opt.dependencies) {
                     const npmConfigPath = FsUtil.findAllParentChildPaths("package.json", conf.root ?? opt.cachePath).first()!;
@@ -37,20 +37,25 @@ export const SdCliViteExternalPlugin = (opt: {
             resolveId: (source, importer) => {
                 if (importer === undefined) return;
 
-                if ([...externals, ...builtins].includes(source)) {
+                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",
-            apply: "serve",
             config: (conf) => {
                 if (opt.dependencies) {
                     const npmConfigPath = FsUtil.findAllParentChildPaths("package.json", conf.root ?? opt.cachePath).first()!;

package/src/utils/SdCliViteReactSwcPlugin.ts

@@ -1,7 +1,7 @@
-import { PluginOption } from "vite";
-import { FsUtil } from "@simplysm/sd-core-node";
-import { SourceMapPayload } from "module";
-import { Output, ParserConfig, transform, } from "@swc/core";
+import {PluginOption} from "vite";
+import {FsUtil} from "@simplysm/sd-core-node";
+import {SourceMapPayload} from "module";
+import {Output, ParserConfig, transform,} from "@swc/core";
 import path from "path";
 
 const runtimePublicPath = "/@react-refresh";
@@ -127,10 +127,8 @@ const transformWithOptions = async (
           react: {
             runtime: "automatic",
             importSource: "react",
-            ...dev ? {
-              refresh: true,
-              development: true,
-            } : {}
+            refresh: dev,
+            development: dev,
           },
           decoratorMetadata: true
         },

package/src/utils/sdCliTsDefineTransformer.ts

@@ -1,31 +1,31 @@
 import ts from "typescript";
 
 export function sdCliTsDefineTransformer(_: ts.Program, args: { replace: Record<string, string> }): ts.TransformerFactory<ts.SourceFile> {
-    return (context) => {
-        return (sourceFile) => {
-            const visitor = (node: ts.Node): ts.Node => {
-                if (
-                    ts.isCallExpression(node) ||
-                    ts.isIdentifier(node) ||
-                    ts.isExpressionStatement(node) ||
-                    ts.isPropertyAccessExpression(node) ||
-                    ts.isTypeOfExpression(node) ||
-                    ts.isElementAccessExpression(node)
-                ) {
-                    const regex = /\[["'`](.*)["'`]]/;
-                    const replaceKey = node.getText().replace(new RegExp(regex, "g"), str => `.${str.match(regex)![1]}`);
-                    const replaceValue = args.replace[replaceKey];
-                    if (replaceValue !== undefined) {
-                        return ts.factory.createIdentifier(replaceValue);
-                    }
+  return (context: ts.TransformationContext) => {
+    return (sourceFile: ts.SourceFile): ts.SourceFile => {
+      const visitor = (node: ts.Node): ts.Node => {
+        if (
+          ts.isCallExpression(node) ||
+          ts.isIdentifier(node) ||
+          ts.isExpressionStatement(node) ||
+          ts.isPropertyAccessExpression(node) ||
+          ts.isTypeOfExpression(node) ||
+          ts.isElementAccessExpression(node)
+        ) {
+          const regex = /\[["'`](.*)["'`]]/;
+          const replaceKey = node.getText().replace(new RegExp(regex, "g"), str => `.${str.match(regex)![1]}`);
+          const replaceValue = args.replace[replaceKey];
+          if (replaceValue !== undefined) {
+            return ts.factory.createIdentifier(replaceValue);
+          }
 
-                    return node;
-                }
+          return node;
+        }
 
-                return ts.visitEachChild(node, visitor, context);
-            };
+        return ts.visitEachChild(node, visitor, context);
+      };
 
-            return ts.visitNode(sourceFile, visitor);
-        };
+      return ts.visitNode(sourceFile, visitor) as ts.SourceFile;
     };
+  };
 }

package/tsconfig.json

@@ -5,5 +5,11 @@
       "ES2021"
     ],
     "outDir": "./dist"
-  }
+  },
+  "files": [
+    "src/index.ts",
+    "src/sd-cli.ts",
+    "src/build-cluster.ts",
+    "src/server-worker.ts"
+  ]
 }