@simplysm/sd-cli 12.5.19 → 12.5.21

package/src/build-tools/SdTsLibBundler.ts

@@ -10,7 +10,7 @@ export class SdTsLibBundler {
 
   readonly #pkgPath: string;
 
-  public constructor(pkgPath: string, dev: boolean) {
+  public constructor(pkgPath: string, dev: boolean, watchScopePaths: string[]) {
     this.#pkgPath = pkgPath;
     this.#compiler = new SdTsCompiler({
       pkgPath,
@@ -18,6 +18,7 @@ export class SdTsLibBundler {
       isDevMode: dev,
       globalStyleFilePath: path.resolve(pkgPath, "src/styles.scss"),
       isForBundle: false,
+      watchScopePaths: watchScopePaths,
     });
   }
 

package/src/builders/SdCliClientBuilder.ts

@@ -14,18 +14,15 @@ import { SdCliCordova } from "../build-tools/SdCliCordova";
 import { SdCliNgRoutesFileGenerator } from "../build-tools/SdCliNgRoutesFileGenerator";
 import { SdLinter } from "../build-tools/SdLinter";
 import { SdCliElectron } from "../entry/SdCliElectron";
-
-// import ts from "typescript";
+import { SdReactBundler } from "../build-tools/SdReactBundler";
 
 export class SdCliClientBuilder extends EventEmitter {
   private readonly _logger = Logger.get(["simplysm", "sd-cli", "SdCliClientBuilder"]);
   private readonly _pkgConf: ISdCliClientPackageConfig;
   private readonly _npmConf: INpmConfig;
-  private _builders?: SdNgBundler[];
+  private _builders?: (SdNgBundler | SdReactBundler)[];
   private _cordova?: SdCliCordova;
 
-  // #program?: ts.Program;
-
   public constructor(
     private readonly _projConf: ISdCliConfig,
     private readonly _pkgPath: string,
@@ -116,6 +113,10 @@ export class SdCliClientBuilder extends EventEmitter {
     affectedFileSet: Set<string>;
     buildResults: ISdCliPackageBuildResult[];
   }> {
+    const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {}).mapMany((key) =>
+      FsUtil.glob(path.resolve(this._pkgPath, "../../node_modules", key)),
+    );
+
     const builderTypes = Object.keys(this._pkgConf.builder ?? { web: {} }) as ("web" | "electron" | "cordova")[];
     if (this._pkgConf.builder?.cordova && !this._cordova) {
       this._debug("CORDOVA 준비...");
@@ -129,27 +130,53 @@ export class SdCliClientBuilder extends EventEmitter {
     if (!this._builders) {
       this._debug(`BUILD 준비...`);
 
-      this._builders = builderTypes.map(
-        (builderType) =>
-          new SdNgBundler({
-            dev: opt.dev,
-            builderType: builderType,
-            pkgPath: this._pkgPath,
-            outputPath:
-              builderType === "web"
-                ? path.resolve(this._pkgPath, "dist")
-                : builderType === "electron" && !opt.dev
-                  ? path.resolve(this._pkgPath, ".electron/src")
-                  : builderType === "cordova" && !opt.dev
-                    ? path.resolve(this._pkgPath, ".cordova/www")
-                    : path.resolve(this._pkgPath, "dist", builderType),
-            env: {
-              ...this._pkgConf.env,
-              ...this._pkgConf.builder?.[builderType]?.env,
-            },
-            cordovaConfig: builderType === "cordova" ? this._pkgConf.builder!.cordova : undefined,
-          }),
-      );
+      if (this._npmConf.dependencies && Object.keys(this._npmConf.dependencies).includes("react")) {
+        this._builders = builderTypes.map(
+          (builderType) =>
+            new SdReactBundler({
+              dev: opt.dev,
+              builderType: builderType,
+              pkgPath: this._pkgPath,
+              outputPath:
+                builderType === "web"
+                  ? path.resolve(this._pkgPath, "dist")
+                  : builderType === "electron" && !opt.dev
+                    ? path.resolve(this._pkgPath, ".electron/src")
+                    : builderType === "cordova" && !opt.dev
+                      ? path.resolve(this._pkgPath, ".cordova/www")
+                      : path.resolve(this._pkgPath, "dist", builderType),
+              env: {
+                ...this._pkgConf.env,
+                ...this._pkgConf.builder?.[builderType]?.env,
+              },
+              cordovaConfig: builderType === "cordova" ? this._pkgConf.builder!.cordova : undefined,
+              watchScopePaths: [path.resolve(this._pkgPath, "../"), ...localUpdatePaths],
+            }),
+        );
+      } else {
+        this._builders = builderTypes.map(
+          (builderType) =>
+            new SdNgBundler({
+              dev: opt.dev,
+              builderType: builderType,
+              pkgPath: this._pkgPath,
+              outputPath:
+                builderType === "web"
+                  ? path.resolve(this._pkgPath, "dist")
+                  : builderType === "electron" && !opt.dev
+                    ? path.resolve(this._pkgPath, ".electron/src")
+                    : builderType === "cordova" && !opt.dev
+                      ? path.resolve(this._pkgPath, ".cordova/www")
+                      : path.resolve(this._pkgPath, "dist", builderType),
+              env: {
+                ...this._pkgConf.env,
+                ...this._pkgConf.builder?.[builderType]?.env,
+              },
+              cordovaConfig: builderType === "cordova" ? this._pkgConf.builder!.cordova : undefined,
+              watchScopePaths: [path.resolve(this._pkgPath, "../"), ...localUpdatePaths],
+            }),
+        );
+      }
     }
 
     this._debug(`BUILD & CHECK...`);
@@ -184,9 +211,6 @@ export class SdCliClientBuilder extends EventEmitter {
     }
 
     this._debug(`빌드 완료`);
-    const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {}).mapMany((key) =>
-      FsUtil.glob(path.resolve(this._pkgPath, "../../node_modules", key)),
-    );
     const currWatchFileSet = new Set(
       Array.from(watchFileSet).filter(
         (item) =>

package/src/builders/SdCliServerBuilder.ts

@@ -219,6 +219,10 @@ Options = UnsafeLegacyRenegotiation`.trim(),
     affectedFileSet: Set<string>;
     buildResults: ISdCliPackageBuildResult[];
   }> {
+    const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {}).mapMany((key) =>
+      FsUtil.glob(path.resolve(this._pkgPath, "../../node_modules", key)),
+    );
+
     this._debug(`BUILD 준비...`);
     const tsConfig = FsUtil.readJson(path.resolve(this._pkgPath, "tsconfig.json")) as ITsConfig;
     this.#extModules = this.#extModules ?? (await this._getExternalModulesAsync());
@@ -231,16 +235,13 @@ Options = UnsafeLegacyRenegotiation`.trim(),
           ? tsConfig.files.map((item) => path.resolve(this._pkgPath, item))
           : [path.resolve(this._pkgPath, "src/main.ts")],
         external: this.#extModules.map((item) => item.name),
+        watchScopePaths: [path.resolve(this._pkgPath, "../"), ...localUpdatePaths],
       });
 
     this._debug(`BUILD & CHECK...`);
     const buildResult = await this.#builder.bundleAsync();
 
     //-- filePaths
-
-    const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {}).mapMany((key) =>
-      FsUtil.glob(path.resolve(this._pkgPath, "../../node_modules", key)),
-    );
     const watchFileSet = new Set(
       Array.from(buildResult.watchFileSet).filter(
         (item) =>

package/src/builders/SdCliTsLibBuilder.ts

@@ -88,8 +88,14 @@ export class SdCliTsLibBuilder extends EventEmitter {
     affectedFileSet: Set<string>;
     buildResults: ISdCliPackageBuildResult[];
   }> {
+    const localUpdatePaths = Object.keys(this.#projConf.localUpdates ?? {}).mapMany((key) =>
+      FsUtil.glob(path.resolve(this.#pkgPath, "../../node_modules", key)),
+    );
+
     this._debug(`BUILD...`);
-    this.#bundler = this.#bundler ?? new SdTsLibBundler(this.#pkgPath, dev);
+    this.#bundler =
+      this.#bundler ??
+      new SdTsLibBundler(this.#pkgPath, dev, [path.resolve(this.#pkgPath, "../"), ...localUpdatePaths]);
     const buildResult = await this.#bundler.buildAsync();
 
     this._debug("LINT...");
@@ -99,9 +105,6 @@ export class SdCliTsLibBuilder extends EventEmitter {
     const lintResults = await SdLinter.lintAsync(this.#pkgPath, buildResult.affectedFileSet, buildResult.program);
 
     this._debug(`빌드 완료`);
-    const localUpdatePaths = Object.keys(this.#projConf.localUpdates ?? {}).mapMany((key) =>
-      FsUtil.glob(path.resolve(this.#pkgPath, "../../node_modules", key)),
-    );
     const watchFileSet = new Set(
       Array.from(buildResult.watchFileSet).filter(
         (item) =>

package/src/bundle-plugins/sdNgPlugin.ts

@@ -5,13 +5,23 @@ import os from "os";
 import { ISdTsCompilerResult, SdTsCompiler } from "../build-tools/SdTsCompiler";
 import { JavaScriptTransformer } from "@angular/build/src/tools/esbuild/javascript-transformer";
 import { convertTypeScriptDiagnostic } from "@angular/build/src/tools/esbuild/angular/diagnostics";
+import { SdCliPerformanceTimer } from "../utils/SdCliPerformanceTime";
+import { Logger } from "@simplysm/sd-core-node";
 
 export function sdNgPlugin(conf: {
   pkgPath: string;
   dev: boolean;
   modifiedFileSet: Set<string>;
   result: INgPluginResultCache;
+  watchScopePaths: string[];
 }): esbuild.Plugin {
+  let perf: SdCliPerformanceTimer;
+  const logger = Logger.get(["simplysm", "sd-cli", "sdNgPlugin"]);
+
+  function debug(...msg: any[]): void {
+    logger.debug(`[${path.basename(conf.pkgPath)}]`, ...msg);
+  }
+
   return {
     name: "sd-ng-compiler",
     setup: (build: esbuild.PluginBuild) => {
@@ -20,6 +30,7 @@ export function sdNgPlugin(conf: {
         additionalOptions: { declaration: false },
         isDevMode: conf.dev,
         isForBundle: true,
+        watchScopePaths: conf.watchScopePaths,
       });
 
       let buildResult: ISdTsCompilerResult;
@@ -39,32 +50,39 @@ export function sdNgPlugin(conf: {
       //---------------------------
 
       build.onStart(async () => {
-        compiler.invalidate(conf.modifiedFileSet);
-        for (const modifiedFile of conf.modifiedFileSet) {
-          outputContentsCacheMap.delete(modifiedFile);
-        }
+        perf = new SdCliPerformanceTimer("esbuild");
 
-        buildResult = await compiler.buildAsync();
+        const res = await perf.run("typescript build", async () => {
+          compiler.invalidate(conf.modifiedFileSet);
+          for (const modifiedFile of conf.modifiedFileSet) {
+            outputContentsCacheMap.delete(modifiedFile);
+          }
 
-        conf.result.watchFileSet = buildResult.watchFileSet;
-        conf.result.affectedFileSet = buildResult.affectedFileSet;
-        conf.result.program = buildResult.program;
+          buildResult = await compiler.buildAsync();
+
+          conf.result.watchFileSet = buildResult.watchFileSet;
+          conf.result.affectedFileSet = buildResult.affectedFileSet;
+          conf.result.program = buildResult.program;
+
+          //-- return err/warn
+          return {
+            errors: [
+              ...buildResult.typescriptDiagnostics
+                .filter((item) => item.category === ts.DiagnosticCategory.Error)
+                .map((item) => convertTypeScriptDiagnostic(ts, item)),
+              ...Array.from(buildResult.stylesheetBundlingResultMap.values()).flatMap((item) => item.errors),
+            ].filterExists(),
+            warnings: [
+              ...buildResult.typescriptDiagnostics
+                .filter((item) => item.category !== ts.DiagnosticCategory.Error)
+                .map((item) => convertTypeScriptDiagnostic(ts, item)),
+              // ...Array.from(buildResult.stylesheetResultMap.values()).flatMap(item => item.warnings)
+            ],
+          };
+        });
 
-        //-- return err/warn
-        return {
-          errors: [
-            ...buildResult.typescriptDiagnostics
-              .filter((item) => item.category === ts.DiagnosticCategory.Error)
-              .map((item) => convertTypeScriptDiagnostic(ts, item)),
-            ...Array.from(buildResult.stylesheetBundlingResultMap.values()).flatMap((item) => item.errors),
-          ].filterExists(),
-          warnings: [
-            ...buildResult.typescriptDiagnostics
-              .filter((item) => item.category !== ts.DiagnosticCategory.Error)
-              .map((item) => convertTypeScriptDiagnostic(ts, item)),
-            // ...Array.from(buildResult.stylesheetResultMap.values()).flatMap(item => item.warnings)
-          ],
-        };
+        perf.start("transform & bundling");
+        return res;
       });
 
       build.onLoad({ filter: /\.ts$/ }, async (args) => {
@@ -132,6 +150,9 @@ export function sdNgPlugin(conf: {
       );
 
       build.onEnd((result) => {
+        perf.end("transform & bundling");
+        debug(perf.toString());
+
         for (const { outputFiles, metafile } of buildResult.stylesheetBundlingResultMap.values()) {
           result.outputFiles = result.outputFiles ?? [];
           result.outputFiles.push(...outputFiles);

package/src/bundle-plugins/sdReactPlugin.ts

@@ -0,0 +1,164 @@
+import esbuild from "esbuild";
+import ts from "typescript";
+import path from "path";
+import { ISdTsCompilerResult, SdTsCompiler } from "../build-tools/SdTsCompiler";
+import { convertTypeScriptDiagnostic } from "@angular/build/src/tools/esbuild/angular/diagnostics";
+import postcss from "postcss";
+import { FsUtil } from "@simplysm/sd-core-node";
+import postcssUrl from "postcss-url";
+import postcssHas from "css-has-pseudo";
+import autoprefixer from "autoprefixer";
+
+export function sdReactPlugin(conf: {
+  pkgPath: string;
+  dev: boolean;
+  modifiedFileSet: Set<string>;
+  result: IReactPluginResultCache;
+  watchScopePaths: string[];
+}): esbuild.Plugin {
+  return {
+    name: "sd-ng-compiler",
+    setup: (build: esbuild.PluginBuild) => {
+      const compiler = new SdTsCompiler({
+        pkgPath: conf.pkgPath,
+        additionalOptions: { declaration: false },
+        isDevMode: conf.dev,
+        isForBundle: true,
+        watchScopePaths: conf.watchScopePaths
+      });
+
+      let buildResult: ISdTsCompilerResult;
+      const outputContentsCacheMap = new Map<string, string | Uint8Array | undefined>();
+
+      //---------------------------
+
+      build.onStart(async () => {
+        compiler.invalidate(conf.modifiedFileSet);
+        for (const modifiedFile of conf.modifiedFileSet) {
+          outputContentsCacheMap.delete(modifiedFile);
+        }
+
+        buildResult = await compiler.buildAsync();
+
+        conf.result.watchFileSet = buildResult.watchFileSet;
+        conf.result.affectedFileSet = buildResult.affectedFileSet;
+        conf.result.program = buildResult.program;
+
+        //-- return err/warn
+        return {
+          errors: [
+            ...buildResult.typescriptDiagnostics
+              .filter((item) => item.category === ts.DiagnosticCategory.Error)
+              .map((item) => convertTypeScriptDiagnostic(ts, item)),
+            ...Array.from(buildResult.stylesheetBundlingResultMap.values()).flatMap((item) => item.errors),
+          ].filterExists(),
+          warnings: [
+            ...buildResult.typescriptDiagnostics
+              .filter((item) => item.category !== ts.DiagnosticCategory.Error)
+              .map((item) => convertTypeScriptDiagnostic(ts, item)),
+            // ...Array.from(buildResult.stylesheetResultMap.values()).flatMap(item => item.warnings)
+          ],
+        };
+      });
+
+      build.onLoad({ filter: /\.tsx?$/ }, (args) => {
+        const output = outputContentsCacheMap.get(path.normalize(args.path));
+        if (output != null) {
+          return { contents: output, loader: "js" };
+        }
+
+        const emittedJsFile = buildResult.emittedFilesCacheMap.get(path.normalize(args.path))?.last();
+        if (!emittedJsFile) {
+          throw new Error(`ts 빌더 결과 emit 파일이 존재하지 않습니다. ${args.path}`);
+        }
+
+        const contents = emittedJsFile.text;
+
+        outputContentsCacheMap.set(path.normalize(args.path), contents);
+
+        return { contents, loader: "js" };
+      });
+
+      build.onLoad({ filter: /\.[cm]?jsx?$/ }, (args) => {
+        conf.result.watchFileSet!.add(path.normalize(args.path));
+        return null;
+      });
+
+      build.onLoad({ filter: /\.css$/ }, async (args) => {
+        conf.result.watchFileSet!.add(path.normalize(args.path));
+        const output = outputContentsCacheMap.get(path.normalize(args.path));
+        if (output != null) {
+          return {
+            contents: output,
+            loader: "file",
+          };
+        }
+
+        const css = await FsUtil.readFileAsync(path.normalize(args.path));
+        const result = await postcss()
+          .use(
+            autoprefixer({
+              overrideBrowserslist: ["Chrome > 78"]
+            })
+          )
+          .use(
+            postcssUrl({
+              url: "copy",
+            }),
+          )
+          .use(
+            postcssHas()
+          )
+          .process(css, {
+            from: path.normalize(args.path),
+            to: path.resolve(conf.pkgPath, "dist", "media", path.basename(args.path)),
+          });
+
+        outputContentsCacheMap.set(path.normalize(args.path), result.css);
+
+        return { contents: result.css, loader: "file" };
+      });
+
+      build.onLoad(
+        {
+          filter: new RegExp(
+            "(" +
+              Object.keys(build.initialOptions.loader!)
+                .map((item) => "\\" + item)
+                .join("|") +
+              ")$",
+          ),
+        },
+        (args) => {
+          conf.result.watchFileSet!.add(path.normalize(args.path));
+          return null;
+        },
+      );
+
+      build.onEnd((result) => {
+        for (const { outputFiles, metafile } of buildResult.stylesheetBundlingResultMap.values()) {
+          result.outputFiles = result.outputFiles ?? [];
+          result.outputFiles.push(...outputFiles);
+
+          if (result.metafile && metafile) {
+            result.metafile.inputs = { ...result.metafile.inputs, ...metafile.inputs };
+            result.metafile.outputs = { ...result.metafile.outputs, ...metafile.outputs };
+          }
+        }
+
+        conf.result.outputFiles = result.outputFiles;
+        conf.result.metafile = result.metafile;
+
+        conf.modifiedFileSet.clear();
+      });
+    },
+  };
+}
+
+export interface IReactPluginResultCache {
+  watchFileSet?: Set<string>;
+  affectedFileSet?: Set<string>;
+  program?: ts.Program;
+  outputFiles?: esbuild.OutputFile[];
+  metafile?: esbuild.Metafile;
+}

package/src/bundle-plugins/sdServerPlugin.ts

@@ -9,6 +9,7 @@ export function sdServerPlugin(conf: {
   dev: boolean;
   modifiedFileSet: Set<string>;
   result: IServerPluginResultCache;
+  watchScopePaths: string[];
 }): esbuild.Plugin {
   return {
     name: "sd-server-compiler",
@@ -18,6 +19,7 @@ export function sdServerPlugin(conf: {
         additionalOptions: { declaration: false },
         isDevMode: conf.dev,
         isForBundle: true,
+        watchScopePaths: conf.watchScopePaths
       });
 
       let buildResult: ISdTsCompilerResult;

package/src/entry/SdCliProject.ts

@@ -102,10 +102,10 @@ export class SdCliProject {
         }
 
         for (const buildResult of message.result!.buildResults) {
-          if (buildResult.filePath == null || PathUtil.isChildPath(buildResult.filePath, message.req.pkgPath)) {
-            const cacheItem = resultCache.getOrCreate(buildResult.filePath ?? "none", []);
-            cacheItem.push(buildResult);
-          }
+          // if (buildResult.filePath == null || PathUtil.isChildPath(buildResult.filePath, message.req.pkgPath)) {
+          const cacheItem = resultCache.getOrCreate(buildResult.filePath ?? "none", []);
+          cacheItem.push(buildResult);
+          // }
         }
 
         const pkgConf = message.req.projConf.packages[path.basename(message.req.pkgPath)]!;
@@ -147,6 +147,7 @@ export class SdCliProject {
             }
 
             serverInfo.pathProxy[pkgName] = path.resolve(message.req.pkgPath, "dist");
+            serverInfo.pathProxy["node_modules"] = path.resolve(process.cwd(), "node_modules");
             // serverInfo.changeFilePaths.push(...message.result!.affectedFilePaths);
 
             serverInfo.hasClientChanges = true;
@@ -205,6 +206,7 @@ export class SdCliProject {
             for (const serverInfo of serverInfoMap.values()) {
               if (Object.keys(serverInfo.pathProxy).length > 0) {
                 for (const proxyPath of Object.keys(serverInfo.pathProxy)) {
+                  if (proxyPath === "node_modules") continue;
                   clientPaths.push(`http://localhost:${serverInfo.port}/${proxyPath}/`);
                 }
               } else {

package/src/index.ts

@@ -4,6 +4,8 @@ export * from "./build-tools/SdCliNgRoutesFileGenerator";
 export * from "./build-tools/SdLinter";
 export * from "./build-tools/SdNgBundler";
 export * from "./build-tools/SdNgBundlerContext";
+export * from "./build-tools/SdReactBundler";
+export * from "./build-tools/SdReactBundlerContext";
 export * from "./build-tools/SdServerBundler";
 export * from "./build-tools/SdTsCompiler";
 export * from "./build-tools/SdTsLibBundler";
@@ -12,9 +14,11 @@ export * from "./builders/SdCliJsLibLinter";
 export * from "./builders/SdCliServerBuilder";
 export * from "./builders/SdCliTsLibBuilder";
 export * from "./bundle-plugins/sdNgPlugin";
+export * from "./bundle-plugins/sdReactPlugin";
 export * from "./bundle-plugins/sdServerPlugin";
 export * from "./commons";
 export * from "./entry/SdCliElectron";
 export * from "./entry/SdCliLocalUpdate";
 export * from "./entry/SdCliProject";
 export * from "./utils/SdCliBuildResultUtil";
+export * from "./utils/SdCliPerformanceTime";

package/src/utils/SdCliPerformanceTime.ts

@@ -0,0 +1,42 @@
+export class SdCliPerformanceTimer {
+  #startingMap = new Map<string, number>();
+  #resultMap = new Map<string, number>();
+
+  constructor(private _name: string) {}
+
+  start(name: string) {
+    this.#startingMap.set(name, new Date().getTime());
+  }
+
+  end(name: string) {
+    const val = this.#startingMap.get(name);
+    if (val == null) throw new Error();
+    this.#resultMap.set(name, new Date().getTime() - val);
+    this.#startingMap.delete(name);
+  }
+
+  run<R>(name: string, fn: () => R): R {
+    const startTime = new Date().getTime();
+    let res = fn();
+    if (res instanceof Promise) {
+      return res.then((realRes) => {
+        const duration = new Date().getTime() - startTime;
+        this.#resultMap.update(name, (v) => (v ?? 0) + duration);
+        return realRes;
+      }) as R;
+    }
+
+    const duration = new Date().getTime() - startTime;
+    this.#resultMap.update(name, (v) => (v ?? 0) + duration);
+    return res;
+  }
+
+  toString() {
+    return `${this._name} performance report
+------------------------------------
+${Array.from(this.#resultMap.entries())
+  .map((en) => `${en[0]}: ${en[1].toLocaleString()}ms`)
+  .join("\n")}
+------------------------------------`;
+  }
+}

package/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "lib": ["ES2021"],
     "outDir": "./dist",