@simplysm/sd-cli 12.5.22 → 12.5.24

package/src/pkg-builders/SdMultiBuildRunner.ts

@@ -1,14 +1,11 @@
 import { FsUtil, Logger, PathUtil, SdWorker, TNormPath } from "@simplysm/sd-core-node";
 import path from "path";
 import { EventEmitter } from "events";
-import { SdServerBuildRunner } from "./server/SdServerBuildRunner";
-import { SdClientBuildRunner } from "./client/SdClientBuildRunner";
-import { SdTsLibBuildRunner } from "./lib/SdTsLibBuildRunner";
-import { SdJsLibBuildRunner } from "./lib/SdJsLibBuildRunner";
-import { ISdProjectConfig, ISdServerPackageConfig } from "../types/sd-configs.type";
+import { ISdServerPackageConfig } from "../types/sd-configs.type";
 import { ISdBuildMessage, ISdBuildRunnerResult } from "../types/build.type";
-import { TServerWorkerType } from "../types/workers.type";
+import { TSdBuildRunnerWorkerType, TServerWorkerType } from "../types/workers.type";
 import { INpmConfig } from "../types/common-configs.type";
+import { ISdBuildRunnerWorkerRequest } from "../types/build-runner.type";
 
 export class SdMultiBuildRunner extends EventEmitter {
   #logger = Logger.get(["simplysm", "sd-cli", "SdMultiBuildRunner"]);
@@ -43,10 +40,20 @@ export class SdMultiBuildRunner extends EventEmitter {
     return this;
   }
 
-  async runAsync(req: IRequest & { cmd: "watch" }): Promise<void>;
-  async runAsync(req: IRequest & { cmd: "build" }): Promise<ISdBuildMessage[]>;
-  async runAsync(req: IRequest): Promise<ISdBuildMessage[] | void> {
-    const pkgConf = req.projConf.packages[path.basename(req.pkgPath)]!;
+  async runAsync(req: ISdBuildRunnerWorkerRequest & { cmd: "watch" }): Promise<void>;
+  async runAsync(req: ISdBuildRunnerWorkerRequest & { cmd: "build" }): Promise<ISdBuildMessage[]>;
+  async runAsync(req: ISdBuildRunnerWorkerRequest): Promise<ISdBuildMessage[] | void> {
+    const worker = new SdWorker<TSdBuildRunnerWorkerType>(import.meta.resolve("../workers/build-runner-worker"))
+      .on("change", () => {
+        if (this.#busyCount === 0) {
+          this.emit("change");
+        }
+        this.#busyCount++;
+      })
+      .on("complete", (result) => this.#onComplete(req, result));
+
+    return await worker.run("run", [req]);
+    /*const pkgConf = req.projConf.packages[path.basename(req.pkgPath)]!;
 
     const buildRunnerType =
       pkgConf.type === "server"
@@ -67,140 +74,133 @@ export class SdMultiBuildRunner extends EventEmitter {
     } else {
       await builder.watchAsync();
       return;
-    }
+    }*/
   }
 
-  #onMessage(req: IRequest, res: TResponse) {
-    if (res.type === "change") {
-      if (this.#busyCount === 0) {
-        this.emit("change");
-      }
-      this.#busyCount++;
-    } else {
-      this.#resultCache.delete(req.pkgPath);
-      for (const affectedFilePath of res.result.affectedFilePathSet) {
-        if (PathUtil.isChildPath(affectedFilePath, req.pkgPath)) {
-          this.#resultCache.delete(affectedFilePath);
-        }
+  #onComplete(req: ISdBuildRunnerWorkerRequest, result: ISdBuildRunnerResult) {
+    this.#resultCache.delete(req.pkgPath);
+    for (const affectedFilePath of result.affectedFilePathSet) {
+      if (PathUtil.isChildPath(affectedFilePath, req.pkgPath)) {
+        this.#resultCache.delete(affectedFilePath);
       }
+    }
 
-      for (const buildMessage of res.result.buildMessages) {
-        const cacheItem = this.#resultCache.getOrCreate(buildMessage.filePath ?? req.pkgPath, []);
-        cacheItem.push(buildMessage);
-      }
+    for (const buildMessage of result.buildMessages) {
+      const cacheItem = this.#resultCache.getOrCreate(buildMessage.filePath ?? req.pkgPath, []);
+      cacheItem.push(buildMessage);
+    }
+
+    const pkgConf = req.projConf.packages[path.basename(req.pkgPath)]!;
 
-      const pkgConf = req.projConf.packages[path.basename(req.pkgPath)]!;
+    if (pkgConf.type === "server") {
+      const pkgName = path.basename(req.pkgPath);
+      const serverInfo = this.#serverInfoMap.getOrCreate(pkgName, {
+        hasChanges: true,
+        clientChangedFileSet: new Set(),
+        clients: {},
+      });
+
+      const serverPkgConf = req.projConf.packages[pkgName] as ISdServerPackageConfig;
+      serverInfo.pkgInfo = {
+        path: req.pkgPath,
+        conf: serverPkgConf,
+      };
+
+      serverInfo.hasChanges = true;
+    } else if (pkgConf.type === "client") {
+      const pkgName = path.basename(req.pkgPath);
+
+      if (pkgConf.server !== undefined) {
+        const serverInfo = this.#serverInfoMap.getOrCreate(
+          typeof pkgConf.server === "string" ? pkgConf.server : pkgConf.server.port.toString(),
+          {
+            hasChanges: true,
+            clientChangedFileSet: new Set(),
+            clients: {},
+          },
+        );
 
-      if (pkgConf.type === "server") {
-        const pkgName = path.basename(req.pkgPath);
+        if (typeof pkgConf.server !== "string") {
+          serverInfo.pkgInfo = pkgConf.server;
+        }
+
+        serverInfo.clients[pkgName] = {
+          path: path.resolve(req.pkgPath, "dist"),
+          buildTypes: (pkgConf.builder ? Object.keys(pkgConf.builder) : ["web"]) as any,
+        };
+
+        serverInfo.clientChangedFileSet.adds(...result.emitFileSet);
+      } else {
         const serverInfo = this.#serverInfoMap.getOrCreate(pkgName, {
           hasChanges: true,
           clientChangedFileSet: new Set(),
           clients: {},
         });
 
-        const serverPkgConf = req.projConf.packages[pkgName] as ISdServerPackageConfig;
-        serverInfo.pkgInfo = {
-          path: req.pkgPath,
-          conf: serverPkgConf,
-        };
-
-        serverInfo.hasChanges = true;
-      } else if (pkgConf.type === "client") {
-        const pkgName = path.basename(req.pkgPath);
-
-        if (pkgConf.server !== undefined) {
-          const serverInfo = this.#serverInfoMap.getOrCreate(
-            typeof pkgConf.server === "string" ? pkgConf.server : pkgConf.server.port.toString(),
-            {
-              hasChanges: true,
-              clientChangedFileSet: new Set(),
-              clients: {},
-            },
-          );
-
-          if (typeof pkgConf.server !== "string") {
-            serverInfo.pkgInfo = pkgConf.server;
-          }
-
-          serverInfo.clients[pkgName] = {
-            path: path.resolve(req.pkgPath, "dist"),
-            buildTypes: (pkgConf.builder ? Object.keys(pkgConf.builder) : ["web"]) as any,
-          };
-
-          serverInfo.clientChangedFileSet.adds(...res.result.emitFileSet);
-        } else {
-          const serverInfo = this.#serverInfoMap.getOrCreate(pkgName, {
-            hasChanges: true,
-            clientChangedFileSet: new Set(),
-            clients: {},
-          });
-
-          serverInfo.clientChangedFileSet.adds(...res.result.emitFileSet);
-        }
+        serverInfo.clientChangedFileSet.adds(...result.emitFileSet);
       }
+    }
 
-      setTimeout(async () => {
-        this.#busyCount--;
-        if (this.#busyCount === 0) {
-          for (const serverPkgNameOrPort of this.#serverInfoMap.keys()) {
-            const serverInfo = this.#serverInfoMap.get(serverPkgNameOrPort)!;
-            if (serverInfo.pkgInfo && serverInfo.hasChanges) {
-              this.#logger.debug("서버 재시작...");
-              try {
-                const restartServerResult = await this.#restartServerAsync(serverInfo.pkgInfo, serverInfo.worker);
-                serverInfo.worker = restartServerResult.worker;
-                serverInfo.port = restartServerResult.port;
-                serverInfo.hasChanges = false;
-              } catch (err) {
-                this.#logger.error(err);
-              }
+    setTimeout(async () => {
+      this.#busyCount--;
+      if (this.#busyCount === 0) {
+        for (const serverPkgNameOrPort of this.#serverInfoMap.keys()) {
+          const serverInfo = this.#serverInfoMap.get(serverPkgNameOrPort)!;
+          if (serverInfo.pkgInfo && serverInfo.hasChanges) {
+            this.#logger.debug("서버 재시작...");
+            try {
+              const restartServerResult = await this.#restartServerAsync(serverInfo.pkgInfo, serverInfo.worker);
+              serverInfo.worker = restartServerResult.worker;
+              serverInfo.port = restartServerResult.port;
+              serverInfo.hasChanges = false;
+            } catch (err) {
+              this.#logger.error(err);
             }
+          }
 
-            if (serverInfo.worker) {
-              this.#logger.debug("클라이언트 설정...");
-              await serverInfo.worker.run("setPathProxy", [
-                {
-                  ...Object.keys(serverInfo.clients).toObject(
-                    (key) => key,
-                    (key) => serverInfo.clients[key].path,
-                  ),
-                  node_modules: path.resolve(process.cwd(), "node_modules"),
-                },
-              ]);
-
-              if (serverInfo.clientChangedFileSet.size > 0) {
-                this.#logger.debug("클라이언트 새로고침...");
-                await serverInfo.worker.run("broadcastReload", [serverInfo.clientChangedFileSet]);
-              }
+          if (serverInfo.worker) {
+            this.#logger.debug("클라이언트 설정...");
+            await serverInfo.worker.run("setPathProxy", [
+              {
+                ...Object.keys(serverInfo.clients).toObject(
+                  (key) => key,
+                  (key) => serverInfo.clients[key].path,
+                ),
+                node_modules: path.resolve(process.cwd(), "node_modules"),
+              },
+            ]);
+
+            if (serverInfo.clientChangedFileSet.size > 0) {
+              this.#logger.debug("클라이언트 새로고침...");
+              await serverInfo.worker.run("broadcastReload", [serverInfo.clientChangedFileSet]);
             }
           }
+        }
 
-          const clientPaths: string[] = [];
-          for (const serverInfo of this.#serverInfoMap.values()) {
-            if (Object.keys(serverInfo.clients).length > 0) {
-              for (const clientPkgName of Object.keys(serverInfo.clients)) {
-                for (const buildType of serverInfo.clients[clientPkgName].buildTypes) {
-                  if (buildType === "web") {
-                    clientPaths.push(`http://localhost:${serverInfo.port}/${clientPkgName}/`);
-                  } else {
-                    clientPaths.push(`http://localhost:${serverInfo.port}/${clientPkgName}/${buildType}/`);
-                  }
+        const clientPaths: string[] = [];
+        for (const serverInfo of this.#serverInfoMap.values()) {
+          if (Object.keys(serverInfo.clients).length > 0) {
+            for (const clientPkgName of Object.keys(serverInfo.clients)) {
+              for (const buildType of serverInfo.clients[clientPkgName].buildTypes) {
+                if (buildType === "web") {
+                  clientPaths.push(`http://localhost:${serverInfo.port}/${clientPkgName}/`);
+                } else {
+                  clientPaths.push(`http://localhost:${serverInfo.port}/${clientPkgName}/${buildType}/`);
                 }
               }
-            } else {
-              clientPaths.push(`http://localhost:${serverInfo.port}/`);
             }
+          } else {
+            clientPaths.push(`http://localhost:${serverInfo.port}/`);
           }
-          if (clientPaths.length > 0) {
-            this.#logger.info("클라이언트 개발 서버 접속 주소\n" + clientPaths.join("\n"));
-          }
-
-          const messages = Array.from(this.#resultCache.values()).mapMany();
-          this.emit("complete", messages);
         }
-      }, 300);
-    }
+        if (clientPaths.length > 0) {
+          this.#logger.info("클라이언트 개발 서버 접속 주소\n" + clientPaths.join("\n"));
+        }
+
+        const messages = Array.from(this.#resultCache.values()).mapMany();
+        this.emit("complete", messages);
+      }
+    }, 300);
   }
 
   async #restartServerAsync(
@@ -213,7 +213,7 @@ export class SdMultiBuildRunner extends EventEmitter {
     const logger = Logger.get(["simplysm", "sd-cli", "SdMultiBuildRunner", "#restartServerAsync"]);
 
     if (prevWorker) {
-      prevWorker.kill();
+      await prevWorker.killAsync();
     }
 
     const npmConf =
@@ -234,6 +234,7 @@ export class SdMultiBuildRunner extends EventEmitter {
   }
 }
 
+/*
 interface IRequest {
   cmd: "watch" | "build";
   pkgPath: TNormPath;
@@ -248,3 +249,4 @@ type TResponse =
       type: "complete";
       result: ISdBuildRunnerResult;
     };
+*/

package/src/pkg-builders/client/SdCliNgRoutesFileGenerator.ts

@@ -7,7 +7,7 @@ export class SdCliNgRoutesFileGenerator {
     const routesFilePath = path.resolve(pkgPath, "src/routes.ts");
     let cache = FsUtil.exists(routesFilePath) ? FsUtil.readFile(routesFilePath) : undefined;
 
-    SdFsWatcher.watch([path.resolve(pkgPath, "src")]).onChange({ delay: 100 }, () => {
+    SdFsWatcher.watch([path.resolve(pkgPath, "src")]).onChange({ delay: 50 }, () => {
       cache = this.run(pkgPath, cache, noLazyRoute);
     });
 

package/src/pkg-builders/client/SdClientBuildRunner.ts

@@ -10,19 +10,27 @@ import { INpmConfig } from "../../types/common-configs.type";
 import { ISdBuildMessage, ISdBuildRunnerResult } from "../../types/build.type";
 
 export class SdClientBuildRunner extends EventEmitter {
-  private readonly _logger = Logger.get(["simplysm", "sd-cli", "SdClientBuildRunner"]);
-  private readonly _pkgConf: ISdClientPackageConfig;
-  private readonly _npmConf: INpmConfig;
+  private _logger = Logger.get(["simplysm", "sd-cli", "SdClientBuildRunner"]);
+  private _pkgConf: ISdClientPackageConfig;
+  private _npmConf: INpmConfig;
   private _ngBundlers?: SdNgBundler[];
   private _cordova?: SdCliCordova;
+  private _watchScopePathSet: Set<TNormPath>;
 
   public constructor(
-    private readonly _projConf: ISdProjectConfig,
-    private readonly _pkgPath: TNormPath,
+    private _projConf: ISdProjectConfig,
+    private _pkgPath: TNormPath,
   ) {
     super();
     this._pkgConf = this._projConf.packages[path.basename(_pkgPath)] as ISdClientPackageConfig;
     this._npmConf = FsUtil.readJson(path.resolve(_pkgPath, "package.json")) as INpmConfig;
+
+    const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {}).mapMany((key) =>
+      FsUtil.glob(path.resolve(this._pkgPath, "../../node_modules", key)),
+    );
+    this._watchScopePathSet = new Set(
+      [path.resolve(this._pkgPath, "../"), ...localUpdatePaths].map((item) => PathUtil.norm(item)),
+    );
   }
 
   public override on(event: "change", listener: () => void): this;
@@ -77,11 +85,15 @@ export class SdClientBuildRunner extends EventEmitter {
     this.emit("complete", res);
 
     this._debug("WATCH...");
-    const watcher = SdFsWatcher.watch(Array.from(result.watchFileSet)).onChange({ delay: 300 }, async (changeInfos) => {
+    let lastWatchFileSet = result.watchFileSet;
+    SdFsWatcher.watch(Array.from(this._watchScopePathSet)).onChange({ delay: 100 }, async (changeInfos) => {
+      const currentChangeInfos = changeInfos.filter((item) => lastWatchFileSet.has(item.path));
+      if (currentChangeInfos.length < 1) return;
+
       this.emit("change");
 
       for (const ngBundler of this._ngBundlers!) {
-        ngBundler.markForChanges(changeInfos.map((item) => item.path));
+        ngBundler.markForChanges(currentChangeInfos.map((item) => item.path));
       }
 
       const watchResult = await this._runAsync({ dev: !this._pkgConf.forceProductionMode });
@@ -92,7 +104,7 @@ export class SdClientBuildRunner extends EventEmitter {
       };
       this.emit("complete", watchRes);
 
-      watcher.replaceWatchPaths(watchResult.watchFileSet);
+      lastWatchFileSet = watchResult.watchFileSet;
     });
   }
 
@@ -102,10 +114,6 @@ export class SdClientBuildRunner extends EventEmitter {
     buildMessages: ISdBuildMessage[];
     emitFileSet: Set<TNormPath>;
   }> {
-    const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {}).mapMany((key) =>
-      FsUtil.glob(path.resolve(this._pkgPath, "../../node_modules", key)),
-    );
-
     const ngBundlerBuilderTypes = Object.keys(this._pkgConf.builder ?? { web: {} }) as (
       | "web"
       | "electron"
@@ -142,9 +150,7 @@ export class SdClientBuildRunner extends EventEmitter {
               ...this._pkgConf.builder?.[ngBundlerBuilderType]?.env,
             },
             cordovaConfig: ngBundlerBuilderType === "cordova" ? this._pkgConf.builder!.cordova : undefined,
-            watchScopePaths: [path.resolve(this._pkgPath, "../"), ...localUpdatePaths].map((item) =>
-              PathUtil.norm(item),
-            ),
+            watchScopePaths: Array.from(this._watchScopePathSet),
           }),
       );
     }
@@ -170,15 +176,13 @@ export class SdClientBuildRunner extends EventEmitter {
     }
 
     this._debug(`빌드 완료`);
-    const currWatchFileSet = new Set(
-      Array.from(watchFileSet).filter(
-        (item) =>
-          PathUtil.isChildPath(item, path.resolve(this._pkgPath, "../")) ||
-          localUpdatePaths.some((lu) => PathUtil.isChildPath(item, lu)),
+    /*const currWatchFileSet = new Set(
+      Array.from(watchFileSet).filter((item) =>
+        Array.from(this._watchScopePathSet).some((scope) => PathUtil.isChildPath(item, scope)),
       ),
-    );
+    );*/
     return {
-      watchFileSet: currWatchFileSet,
+      watchFileSet,
       affectedFileSet,
       buildMessages: results, //.filter((item) => item.filePath !== path.resolve(this._pkgPath, "src/routes.ts")),
       emitFileSet,

package/src/pkg-builders/client/SdNgBundler.ts

@@ -18,14 +18,9 @@ import {
   InitialFileRecord,
 } from "@angular/build/src/tools/esbuild/bundler-context";
 import { extractLicenses } from "@angular/build/src/tools/esbuild/license-extractor";
-import {
-  HintMode,
-  IndexHtmlGenerator,
-  IndexHtmlProcessResult,
-} from "@angular/build/src/utils/index-file/index-html-generator";
+import { IndexHtmlGenerator, IndexHtmlProcessResult } from "@angular/build/src/utils/index-file/index-html-generator";
 import { Entrypoint } from "@angular/build/src/utils/index-file/augment-index-html";
 import { CrossOrigin } from "@angular/build/src/builders/application/schema";
-import { InlineCriticalCssProcessor } from "@angular/build/src/utils/index-file/inline-critical-css";
 import { augmentAppWithServiceWorkerEsbuild } from "@angular/build/src/utils/service-worker";
 import { createSourcemapIgnorelistPlugin } from "@angular/build/src/tools/esbuild/sourcemap-ignorelist-plugin";
 import { StylesheetPluginFactory } from "@angular/build/src/tools/esbuild/stylesheets/stylesheet-plugin-factory";
@@ -43,10 +38,6 @@ import { ISdBuildMessage } from "../../types/build.type";
 export class SdNgBundler {
   readonly #logger = Logger.get(["simplysm", "sd-cli", "SdNgBundler"]);
 
-  // private readonly _sourceFileCache = new SourceFileCache(
-  //   path.resolve(this._opt.pkgPath, ".cache")
-  // );
-
   readonly #modifiedFileSet = new Set<TNormPath>();
   readonly #ngResultCache: ISdCliNgPluginResultCache = {
     affectedFileSet: new Set<TNormPath>(),
@@ -155,7 +146,7 @@ export class SdNgBundler {
 
     this.#debug(`create index.html...`);
     await perf.run("create index.html", async () => {
-      const genIndexHtmlResult = await this._genIndexHtmlAsync(outputFiles, initialFiles);
+      const genIndexHtmlResult = await this._genIndexHtmlAsync(initialFiles);
       for (const warning of genIndexHtmlResult.warnings) {
         results.push({
           filePath: undefined,
@@ -251,6 +242,7 @@ export class SdNgBundler {
       watchFileSet: new Set([
         ...this.#ngResultCache.watchFileSet!,
         ...this.#styleLoadResultCache.watchFiles.map((item) => PathUtil.norm(item)),
+        ...assetFiles.map((item) => PathUtil.norm(item.source)),
         PathUtil.norm(this.#indexHtmlFilePath),
       ]),
       affectedFileSet: this.#ngResultCache.affectedFileSet!,
@@ -259,60 +251,30 @@ export class SdNgBundler {
     };
   }
 
-  private async _genIndexHtmlAsync(
-    outputFiles: esbuild.OutputFile[],
-    initialFiles: Map<string, InitialFileRecord>,
-  ): Promise<IndexHtmlProcessResult> {
-    const readAsset = (filePath: string): Promise<string> => {
-      const relFilePath = path.relative("/", filePath);
-      const currFile = outputFiles.find((outputFile) => outputFile.path === relFilePath);
-      if (currFile) {
-        return Promise.resolve(currFile.text);
-      }
-
-      throw new Error(`Output file does not exist: ${relFilePath}`);
-    };
-
+  private async _genIndexHtmlAsync(initialFiles: Map<string, InitialFileRecord>): Promise<IndexHtmlProcessResult> {
     const indexHtmlGenerator = new IndexHtmlGenerator({
       indexPath: this.#indexHtmlFilePath,
       entrypoints: [
-        ["runtime", true],
         ["polyfills", true],
         ["styles", false],
-        ["vendor", true],
         ["main", true],
         ...(this._opt.builderType === "cordova" ? [["cordova-entry", true] as Entrypoint] : []),
       ],
+      sri: false,
       optimization: {
         scripts: !this._opt.dev,
-        fonts: { inline: !this._opt.dev },
         styles: {
           minify: !this._opt.dev,
-          inlineCritical: false,
+          inlineCritical: !this._opt.dev,
+          removeSpecialComments: !this._opt.dev,
         },
+        fonts: { inline: !this._opt.dev },
       },
       crossOrigin: CrossOrigin.None,
+      generateDedicatedSSRContent: false,
     });
-    indexHtmlGenerator.readAsset = readAsset;
-
-    const hints: { url: string; mode: HintMode; as?: string }[] = [];
-    if (!this._opt.dev) {
-      for (const [key, value] of initialFiles) {
-        if (value.entrypoint) {
-          continue;
-        }
 
-        if (value.type === "script") {
-          hints.push({ url: key, mode: "modulepreload" as const });
-        }
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        else if (value.type === "style") {
-          hints.push({ url: key, mode: "preload" as const, as: "style" });
-        }
-      }
-    }
-
-    const transformResult = await indexHtmlGenerator.process({
+    return await indexHtmlGenerator.process({
       baseHref: this.#baseHref,
       lang: undefined,
       outputPath: "/",
@@ -321,29 +283,9 @@ export class SdNgBundler {
         file,
         extension: path.extname(file),
       })),
-      hints,
     });
-
-    if (this._opt.dev) {
-      return transformResult;
-    } else {
-      const inlineCriticalCssProcessor = new InlineCriticalCssProcessor({
-        minify: false,
-        readAsset,
-      });
-      const { content, errors, warnings } = await inlineCriticalCssProcessor.process(transformResult.csrContent, {
-        outputPath: "/",
-      });
-
-      return {
-        warnings: [...transformResult.warnings, ...warnings],
-        errors: [...transformResult.errors, ...errors],
-        csrContent: content,
-      };
-    }
   }
 
-  //TODO: index.html  파일에 manifest.json 정보 추가? manifest.webmanifest ? PWA?
   private async _copyAssetsAsync(): Promise<
     {
       source: string;
@@ -352,11 +294,8 @@ export class SdNgBundler {
   > {
     return await resolveAssets(
       [
-        { input: "src", glob: "favicon.ico", output: "" },
-        { input: "src", glob: "manifest.webmanifest", output: "" },
-        { input: "src", glob: "manifest.json", output: "" },
-        { input: "src/assets", glob: "**/*", output: "assets" },
-        ...(this._opt.dev ? [{ input: "src/assets-dev", glob: "**/*", output: "assets-dev" }] : []),
+        { input: "public", glob: "**/*", output: "." },
+        ...(this._opt.dev ? [{ input: "public-dev", glob: "**/*", output: "." }] : []),
         ...(this._opt.dev && this._opt.builderType === "cordova"
           ? Object.keys(this._opt.cordovaConfig?.platform ?? { browser: {} }).mapMany((platform) => [
               {
@@ -461,7 +400,10 @@ export class SdNgBundler {
         polyfills: path.resolve(this._opt.pkgPath, "src/polyfills.ts"),
         ...(this._opt.builderType === "cordova"
           ? {
-              "cordova-entry": path.resolve(path.dirname(fileURLToPath(import.meta.url)), `../../lib/cordova-entry.js`),
+              "cordova-entry": path.resolve(
+                path.dirname(fileURLToPath(import.meta.url)),
+                `../../../lib/cordova-entry.js`,
+              ),
             }
           : {}),
         ...workerEntries,

package/src/pkg-builders/client/createSdNgPlugin.ts

@@ -7,7 +7,7 @@ import { SdCliPerformanceTimer } from "../../utils/SdCliPerformanceTime";
 import { SdCliConvertMessageUtil } from "../../utils/SdCliConvertMessageUtil";
 import { ISdCliNgPluginResultCache } from "../../types/build-plugin.type";
 import { ISdTsCompilerResult } from "../../types/ts-compiler.type";
-import { SdTsCompileWorker } from "../../ts-builder/SdTsCompileWorker";
+import { SdTsCompiler } from "../../ts-builder/SdTsCompiler";
 
 export function createSdNgPlugin(conf: {
   pkgPath: TNormPath;
@@ -25,8 +25,8 @@ export function createSdNgPlugin(conf: {
 
   return {
     name: "sd-ng-compile",
-    setup: async (build: esbuild.PluginBuild) => {
-      const tsCompiler = await SdTsCompileWorker.new({
+    setup: (build: esbuild.PluginBuild) => {
+      const tsCompiler = new SdTsCompiler({
         pkgPath: conf.pkgPath,
         additionalOptions: { declaration: false },
         isDevMode: conf.dev,

package/src/pkg-builders/lib/SdCliIndexFileGenerator.ts

@@ -6,7 +6,7 @@ export class SdCliIndexFileGenerator {
     const indexFilePath = path.resolve(pkgPath, "src/index.ts");
     let cache = FsUtil.exists(indexFilePath) ? FsUtil.readFile(indexFilePath) : undefined;
 
-    SdFsWatcher.watch([path.resolve(pkgPath, "src")]).onChange({ delay: 100 }, () => {
+    SdFsWatcher.watch([path.resolve(pkgPath, "src")]).onChange({ delay: 50 }, () => {
       cache = this.run(pkgPath, polyfills, cache);
     });
 

package/src/pkg-builders/lib/SdJsLibBuildRunner.ts

@@ -71,7 +71,7 @@ export class SdJsLibBuildRunner extends EventEmitter {
     };
     this.emit("complete", res);
 
-    SdFsWatcher.watch([srcGlobPath]).onChange({ delay: 300 }, async (changeInfos) => {
+    SdFsWatcher.watch([srcGlobPath]).onChange({ delay: 100 }, async (changeInfos) => {
       const watchFilePaths = changeInfos.filter((item) => FsUtil.exists(item.path)).map((item) => item.path);
       if (watchFilePaths.length < 1) return;