@simplysm/sd-cli 12.13.36 → 12.13.38

package/dist/workers/build-runner.worker.js

@@ -22,15 +22,14 @@ else {
 let buildRunner;
 createSdWorker({
     initialize(req) {
-        const pkgConf = req.projConf.packages[path.basename(req.pkgPath)];
-        const buildRunnerType = pkgConf.type === "server"
+        const buildRunnerType = req.pkgConf.type === "server"
             ? SdServerBuildRunner
-            : pkgConf.type === "client"
+            : req.pkgConf.type === "client"
                 ? SdClientBuildRunner
-                : FsUtils.exists(path.resolve(req.pkgPath, "tsconfig.json"))
+                : FsUtils.exists(path.resolve(req.options.pkgPath, "tsconfig.json"))
                     ? SdTsLibBuildRunner
                     : SdJsLibBuildRunner;
-        buildRunner = new buildRunnerType(req.pkgPath, req.projConf, req.scopePathSet, req.watch ?? false, req.watch ? !pkgConf.forceProductionMode : false, req.emitOnly, req.noEmit);
+        buildRunner = new buildRunnerType(req.options, req.pkgConf);
     },
     async rebuild(modifiedFileSet) {
         return await buildRunner.rebuildAsync(modifiedFileSet);

package/dist/workers/build-runner.worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-runner.worker.js","sourceRoot":"","sources":["../../src/workers/build-runner.worker.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,OAAO,EACP,QAAQ,EACR,gBAAgB,GAEjB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,IAAI,MAAM,MAAM,CAAC;AAMxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAE5E,KAAK,CAAC,eAAe,GAAG,QAAQ,CAAC;AACjC,YAAY,CAAC,mBAAmB,GAAG,CAAC,CAAC;AAErC,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,IAAI,EAAE,CAAC;IACpC,QAAQ,CAAC,SAAS,CAAC;QACjB,OAAO,EAAE;YACP,KAAK,EAAE,gBAAgB,CAAC,KAAK;SAC9B;KACF,CAAC,CAAC;AACL,CAAC;KAAM,CAAC;IACN,QAAQ,CAAC,SAAS,CAAC;QACjB,GAAG,EAAE,IAAI;KACV,CAAC,CAAC;AACL,CAAC;AAED,IAAI,WAAmC,CAAC;AAExC,cAAc,CAA2B;IACvC,UAAU,CAAC,GAAoC;QAC7C,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAE,CAAC;QAEnE,MAAM,eAAe,GACnB,OAAO,CAAC,IAAI,KAAK,QAAQ;YACvB,CAAC,CAAC,mBAAmB;YACrB,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ;gBACzB,CAAC,CAAC,mBAAmB;gBACrB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;oBAC1D,CAAC,CAAC,kBAAkB;oBACpB,CAAC,CAAC,kBAAkB,CAAC;QAE7B,WAAW,GAAG,IAAI,eAAe,CAC/B,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,QAAQ,EACZ,GAAG,CAAC,YAAY,EAChB,GAAG,CAAC,KAAK,IAAI,KAAK,EAClB,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,KAAK,EAChD,GAAG,CAAC,QAAQ,EACZ,GAAG,CAAC,MAAM,CACX,CAAC;IACJ,CAAC;IACD,KAAK,CAAC,OAAO,CAAC,eAAgC;QAC5C,OAAO,MAAM,WAAW,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IACzD,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"build-runner.worker.js","sourceRoot":"","sources":["../../src/workers/build-runner.worker.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,OAAO,EACP,QAAQ,EACR,gBAAgB,GAEjB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,IAAI,MAAM,MAAM,CAAC;AAMxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAG5E,KAAK,CAAC,eAAe,GAAG,QAAQ,CAAC;AACjC,YAAY,CAAC,mBAAmB,GAAG,CAAC,CAAC;AAErC,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,IAAI,EAAE,CAAC;IACpC,QAAQ,CAAC,SAAS,CAAC;QACjB,OAAO,EAAE;YACP,KAAK,EAAE,gBAAgB,CAAC,KAAK;SAC9B;KACF,CAAC,CAAC;AACL,CAAC;KAAM,CAAC;IACN,QAAQ,CAAC,SAAS,CAAC;QACjB,GAAG,EAAE,IAAI;KACV,CAAC,CAAC;AACL,CAAC;AAED,IAAI,WAAmC,CAAC;AAExC,cAAc,CAA2B;IACvC,UAAU,CAAC,GAAoC;QAC7C,MAAM,eAAe,GACnB,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ;YAC3B,CAAC,CAAC,mBAAmB;YACrB,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ;gBAC7B,CAAC,CAAC,mBAAmB;gBACrB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;oBAClE,CAAC,CAAC,kBAAkB;oBACpB,CAAC,CAAC,kBAAkB,CAAC;QAE7B,WAAW,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IAC9D,CAAC;IACD,KAAK,CAAC,OAAO,CAAC,eAAgC;QAC5C,OAAO,MAAM,WAAW,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IACzD,CAAC;CACF,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simplysm/sd-cli",
-  "version": "12.13.36",
+  "version": "12.13.38",
   "description": "심플리즘 패키지 - CLI",
   "author": "김석래",
   "repository": {
@@ -17,10 +17,10 @@
     "@angular/compiler-cli": "^20.2.4",
     "@anthropic-ai/sdk": "^0.61.0",
     "@electron/rebuild": "^4.0.1",
-    "@simplysm/sd-core-common": "12.13.36",
-    "@simplysm/sd-core-node": "12.13.36",
-    "@simplysm/sd-service-server": "12.13.36",
-    "@simplysm/sd-storage": "12.13.36",
+    "@simplysm/sd-core-common": "12.13.38",
+    "@simplysm/sd-core-node": "12.13.38",
+    "@simplysm/sd-service-server": "12.13.38",
+    "@simplysm/sd-storage": "12.13.38",
     "browserslist": "^4.25.4",
     "cordova": "^12.0.0",
     "electron": "^38.0.0",

package/src/entry/SdCliLocalUpdate.ts

@@ -14,17 +14,17 @@ export class SdCliLocalUpdate {
     logger.debug("로컬 업데이트 구성");
 
     logger.log("로컬 라이브러리 업데이트 시작...");
-    for (const updatePathInfo of updatePathInfos) {
+    await updatePathInfos.parallelAsync(async (updatePathInfo) => {
       if (!FsUtils.exists(updatePathInfo.source)) {
         logger.warn(`소스경로를 찾을 수 없어 무시됩니다(${updatePathInfo.source})`);
         return;
       }
 
       // 소스경로에서 대상경로로 파일 복사
-      FsUtils.copy(updatePathInfo.source, updatePathInfo.target, (src) => {
+      await FsUtils.copyAsync(updatePathInfo.source, updatePathInfo.target, (src) => {
         return !src.includes("node_modules") && !src.endsWith("package.json");
       });
-    }
+    });
     logger.info("로컬 라이브러리 업데이트 완료");
   }
 
@@ -38,8 +38,8 @@ export class SdCliLocalUpdate {
     const updatePathInfos = this.#getUpdatePathInfos(projConf.localUpdates);
     logger.debug("로컬 업데이트 구성");
 
-    const watcher = SdFsWatcher.watch(updatePathInfos.map((item) => item.source));
-    watcher.onChange({ delay: 1000 }, (changedInfos) => {
+    const watcher = await SdFsWatcher.watchAsync(updatePathInfos.map((item) => item.source));
+    watcher.onChange({ delay: 300 }, async (changedInfos) => {
       const changedFileInfos = changedInfos.filter((item) =>
         ["add", "change", "unlink"].includes(item.event),
       );
@@ -47,22 +47,22 @@ export class SdCliLocalUpdate {
 
       logger.log("로컬 라이브러리 변경감지...");
 
-      for (const changedFileInfo of changedFileInfos) {
-        for (const updatePathInfo of updatePathInfos) {
-          if (!PathUtils.isChildPath(changedFileInfo.path, updatePathInfo.source)) continue;
+      await changedFileInfos.parallelAsync(async (changedFileInfo) => {
+        await updatePathInfos.parallelAsync(async (updatePathInfo) => {
+          if (!PathUtils.isChildPath(changedFileInfo.path, updatePathInfo.source)) return;
 
           const sourceRelPath = path.relative(updatePathInfo.source, changedFileInfo.path);
           const targetFilePath = path.resolve(updatePathInfo.target, sourceRelPath);
 
           if (changedFileInfo.event === "unlink") {
             logger.debug(`변경파일감지(삭제): ${targetFilePath}`);
-            FsUtils.remove(targetFilePath);
+            await FsUtils.removeAsync(targetFilePath);
           } else {
             logger.debug(`변경파일감지(복사): ${changedFileInfo.path} => ${targetFilePath}`);
-            FsUtils.copy(changedFileInfo.path, targetFilePath);
+            await FsUtils.copyAsync(changedFileInfo.path, targetFilePath);
           }
-        }
-      }
+        });
+      });
 
       logger.info("로컬 라이브러리 복사 완료");
     });

package/src/entry/SdCliProject.ts

@@ -273,11 +273,11 @@ export class SdCliProject {
         nodir: true,
       });
 
-      for (const filePath of filePaths) {
+      await filePaths.parallelAsync(async (filePath) => {
         const relativeFilePath = path.relative(path.resolve(pkgPath, "dist"), filePath);
         const targetPath = PathUtils.posix(targetRootPath, relativeFilePath);
-        FsUtils.copy(filePath, targetPath);
-      }
+        await FsUtils.copyAsync(filePath, targetPath);
+      });
     } else if (
       pkgPubConf?.type === "ftp" ||
       pkgPubConf?.type === "ftps" ||

package/src/pkg-builders/SdBuildRunnerBase.ts

@@ -0,0 +1,36 @@
+import { FsUtils, SdLogger, TNormPath } from "@simplysm/sd-core-node";
+import path from "path";
+import { TSdPackageConfig } from "../types/config/ISdProjectConfig";
+import { ISdBuildResult } from "../types/build/ISdBuildResult";
+import { ISdTsCompilerOptions } from "../types/build/ISdTsCompilerOptions";
+
+export abstract class SdBuildRunnerBase<T extends "server" | "library" | "client"> {
+  protected abstract _logger: SdLogger;
+
+  protected _pkgName: string;
+
+  constructor(
+    protected _opt: ISdTsCompilerOptions,
+    protected _pkgConf: TSdPackageConfig<T>,
+  ) {
+    this._pkgName = path.basename(_opt.pkgPath);
+  }
+
+  async rebuildAsync(modifiedFileSet?: Set<TNormPath>): Promise<ISdBuildResult> {
+    if (!modifiedFileSet && !this._opt.watch?.noEmit) {
+      const distPath = path.resolve(this._opt.pkgPath, "dist");
+      if (FsUtils.exists(distPath)) {
+        this._debug("dist 초기화...");
+        FsUtils.remove(distPath);
+      }
+    }
+
+    return await this._runAsync(modifiedFileSet);
+  }
+
+  protected abstract _runAsync(modifiedFileSet?: Set<TNormPath>): Promise<ISdBuildResult>;
+
+  protected _debug(msg: string): void {
+    this._logger.debug(`[${path.basename(this._opt.pkgPath)}] ${msg}`);
+  }
+}

package/src/pkg-builders/SdProjectBuildRunner.ts

@@ -54,19 +54,24 @@ export class SdProjectBuildRunner {
       Object.keys(opt.projConf.localUpdates ?? {}),
     );
 
-    const watcher = SdFsWatcher.watch(Array.from(scopePathSet), {
+    const watcher = await SdFsWatcher.watchAsync(Array.from(scopePathSet), {
       ignoreInitial: false,
     });
     watcher.onChange({ delay: 300 }, async (changeInfos) => {
       // 변경된 패키지 정보 구성
       const changeFiles = changeInfos.map((item) => PathUtils.norm(item.path));
+
       const changedPkgInfos = opt.pkgPaths
         .map((pkgPath) => {
           let buildInfo = this.#buildInfoMap.get(pkgPath);
           if (!buildInfo) return { pkgPath };
 
           const modifiedFileSet = new Set(
-            changeFiles.filter((item) => buildInfo.watchFileSet.has(item)),
+            changeFiles.filter(
+              (item) =>
+                buildInfo.watchFileSet.has(item) ||
+                PathUtils.isChildPath(item, path.resolve(pkgPath, "src")),
+            ),
           );
 
           if (modifiedFileSet.size < 1) return;
@@ -81,18 +86,23 @@ export class SdProjectBuildRunner {
       const buildResults = await changedPkgInfos.parallelAsync(async (changedPkgInfo) => {
         // 처음
         if (!changedPkgInfo.buildInfo) {
+          const pkgConf = opt.projConf.packages[path.basename(changedPkgInfo.pkgPath)]!;
+
           const buildWorker = new SdWorker<ISdBuildRunnerWorkerType>(
             import.meta.resolve("../workers/build-runner.worker"),
           );
           await buildWorker.run("initialize", [
             {
-              pkgPath: changedPkgInfo.pkgPath,
-              projConf: opt.projConf,
-              scopePathSet: scopePathSet,
-
-              watch: true,
-              emitOnly: opt.emitOnly,
-              noEmit: opt.noEmit,
+              options: {
+                pkgPath: changedPkgInfo.pkgPath,
+                scopePathSet,
+                watch: {
+                  dev: !pkgConf.forceProductionMode,
+                  emitOnly: opt.emitOnly,
+                  noEmit: opt.noEmit,
+                },
+              },
+              pkgConf,
             },
           ]);
 
@@ -279,15 +289,16 @@ export class SdProjectBuildRunner {
     );
 
     const buildResults = await opt.pkgPaths.parallelAsync(async (pkgPath) => {
+      const pkgConf = opt.projConf.packages[path.basename(pkgPath)]!;
+
       const worker = new SdWorker<ISdBuildRunnerWorkerType>(
         import.meta.resolve("../workers/build-runner.worker"),
       );
 
       await worker.run("initialize", [
         {
-          pkgPath,
-          projConf: opt.projConf,
-          scopePathSet: scopePathSet,
+          options: { pkgPath, scopePathSet },
+          pkgConf,
         },
       ]);
 
@@ -306,15 +317,13 @@ export class SdProjectBuildRunner {
       path.resolve(item, "src"),
       path.resolve(item, "public"),
       path.resolve(item, "public-dev"),
+      path.resolve(item, "scss"),
     ]);
     const localUpdatePaths = (
       await localUpdateGlobs.mapManyAsync(
-        async (key) => await FsUtils.globAsync(path.resolve(process.cwd(), "node_modules", key)),
+        async (glob) => await FsUtils.globAsync(path.resolve(process.cwd(), "node_modules", glob)),
       )
-    ).mapMany((key) => [
-      path.resolve(process.cwd(), "node_modules", key, "dist"),
-      path.resolve(process.cwd(), "node_modules", key, "src/**/*.scss"),
-    ]);
+    ).mapMany((dir) => [path.resolve(dir, "dist"), path.resolve(dir, "scss")]);
 
     return new Set([...workspacePaths, ...localUpdatePaths].map((item) => PathUtils.norm(item)));
   }

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

@@ -5,15 +5,16 @@ import { StringUtils } from "@simplysm/sd-core-common";
 export class SdCliNgRoutesFileGenerator {
   cachedHash?: string;
 
-  watch(pkgPath: string, noLazyRoute?: boolean) {
+  async watchAsync(pkgPath: string, noLazyRoute?: boolean) {
     const routesFilePath = path.resolve(pkgPath, "src/routes.ts");
     this.cachedHash = FsUtils.exists(routesFilePath)
-      ? HashUtils.get(FsUtils.readFile(routesFilePath))
+      ? HashUtils.get(await FsUtils.readFileAsync(routesFilePath))
       : undefined;
 
-    SdFsWatcher.watch([path.resolve(pkgPath, "src")], {
+    const watcher = await SdFsWatcher.watchAsync([path.resolve(pkgPath, "src")], {
       ignored: [routesFilePath],
-    }).onChange({ delay: 50 }, (changeInfos) => {
+    });
+    watcher.onChange({ delay: 50 }, (changeInfos) => {
       if (changeInfos.some((item) => ["add", "addDir", "unlink", "unlinkDir"].includes(item.event)))
         this.run(pkgPath, noLazyRoute);
     });

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

@@ -1,12 +1,13 @@
-import { FsUtils, PathUtils, SdLogger, TNormPath } from "@simplysm/sd-core-node";
+import { FsUtils, SdLogger, TNormPath } from "@simplysm/sd-core-node";
 import path from "path";
-import { SdBuildRunnerBase } from "../commons/SdBuildRunnerBase";
+import { SdBuildRunnerBase } from "../SdBuildRunnerBase";
 import { SdNgBundler } from "./SdNgBundler";
 import { SdCliCordova } from "../../entry/SdCliCordova";
 import { ISdBuildResult } from "../../types/build/ISdBuildResult";
 import { INpmConfig } from "../../types/common-config/INpmConfig";
 import { SdCliNgRoutesFileGenerator } from "./SdCliNgRoutesFileGenerator";
 import { SdCliElectron } from "../../entry/SdCliElectron";
+import { ISdClientPackageConfig } from "../../types/config/ISdProjectConfig";
 
 export class SdClientBuildRunner extends SdBuildRunnerBase<"client"> {
   protected override _logger = SdLogger.get(["simplysm", "sd-cli", "SdClientBuildRunner"]);
@@ -17,67 +18,48 @@ export class SdClientBuildRunner extends SdBuildRunnerBase<"client"> {
   protected override async _runAsync(modifiedFileSet?: Set<TNormPath>): Promise<ISdBuildResult> {
     // 최초 한번
     if (!modifiedFileSet) {
-      if (!this._noEmit) {
+      if (!this._opt.watch?.noEmit) {
         // config
         this._debug("GEN .config...");
-        const confDistPath = path.resolve(this._pkgPath, "dist/.config.json");
+        const confDistPath = path.resolve(this._opt.pkgPath, "dist/.config.json");
         FsUtils.writeFile(confDistPath, JSON.stringify(this._pkgConf.configs ?? {}, undefined, 2));
 
         // cordova
         if (this._pkgConf.builder?.cordova) {
           this._debug("CORDOVA 준비...");
           this.#cordova = new SdCliCordova({
-            pkgPath: this._pkgPath,
+            pkgPath: this._opt.pkgPath,
             config: this._pkgConf.builder.cordova,
           });
           await this.#cordova.initializeAsync();
         }
 
         // routes
-        const npmConf = FsUtils.readJson(path.resolve(this._pkgPath, "package.json")) as INpmConfig;
+        const npmConf = FsUtils.readJson(
+          path.resolve(this._opt.pkgPath, "package.json"),
+        ) as INpmConfig;
         if ("@angular/router" in (npmConf.dependencies ?? {})) {
           this._debug(`GEN routes.ts...`);
-          new SdCliNgRoutesFileGenerator().watch(this._pkgPath, this._pkgConf.noLazyRoute);
+          await new SdCliNgRoutesFileGenerator().watchAsync(
+            this._opt.pkgPath,
+            this._pkgConf.noLazyRoute,
+          );
         }
       }
 
       // ng
       this._debug(`BUILD 준비...`);
 
-      const ngBundlerBuilderTypes = Object.keys(this._pkgConf.builder ?? { web: {} }) as (
-        | "web"
-        | "electron"
-        | "cordova"
-      )[];
-
-      this.#ngBundlers = ngBundlerBuilderTypes.map(
-        (ngBundlerBuilderType) =>
-          new SdNgBundler({
-            watch: this._watch,
-            dev: this._dev,
-            emitOnly: this._emitOnly ?? false,
-            noEmit: this._noEmit ?? false,
-            builderType: ngBundlerBuilderType,
-            pkgPath: this._pkgPath,
-            outputPath:
-              ngBundlerBuilderType === "web"
-                ? PathUtils.norm(this._pkgPath, "dist")
-                : ngBundlerBuilderType === "electron" && !this._dev
-                  ? PathUtils.norm(this._pkgPath, ".electron/src")
-                  : ngBundlerBuilderType === "cordova" && !this._dev
-                    ? PathUtils.norm(this._pkgPath, ".cordova/www")
-                    : PathUtils.norm(this._pkgPath, "dist", ngBundlerBuilderType),
-            env: {
-              ...this._pkgConf.env,
-              ...this._pkgConf.builder?.[ngBundlerBuilderType]?.env,
-            },
-            external:
-              ngBundlerBuilderType === "electron"
-                ? (this._pkgConf.builder?.electron?.reinstallDependencies ?? [])
-                : [],
-            cordovaConfig:
-              ngBundlerBuilderType === "cordova" ? this._pkgConf.builder!.cordova : undefined,
-            scopePathSet: this._scopePathSet,
+      const builderTypes = Object.keys(this._pkgConf.builder ?? { web: {} }) as (keyof NonNullable<
+        ISdClientPackageConfig["builder"]
+      >)[];
+
+      this.#ngBundlers = builderTypes.map(
+        (builderType) =>
+          new SdNgBundler(this._opt, {
+            builderType: builderType,
+            builderConfig: this._pkgConf.builder?.[builderType],
+            env: this._pkgConf.env,
           }),
       );
     }
@@ -88,7 +70,7 @@ export class SdClientBuildRunner extends SdBuildRunnerBase<"client"> {
       }
     }
 
-    if (this._noEmit) {
+    if (this._opt.watch?.noEmit) {
       this._debug(`BUILD...`);
       const buildResults = await Promise.all(
         this.#ngBundlers!.map((builder) => builder.bundleAsync()),
@@ -121,15 +103,15 @@ export class SdClientBuildRunner extends SdBuildRunnerBase<"client"> {
       const emitFileSet = new Set(buildResults.mapMany((item) => Array.from(item.emitFileSet)));
       const buildMessages = buildResults.mapMany((item) => item.buildMessages).distinct();
 
-      if (!this._dev && this.#cordova) {
+      if (!this._opt.watch?.dev && this.#cordova) {
         this._debug("CORDOVA BUILD...");
-        await this.#cordova.buildAsync(path.resolve(this._pkgPath, "dist"));
+        await this.#cordova.buildAsync(path.resolve(this._opt.pkgPath, "dist"));
       }
 
-      if (!this._dev && this._pkgConf.builder?.electron) {
+      if (!this._opt.watch?.dev && this._pkgConf.builder?.electron) {
         this._debug("ELECTRON BUILD...");
         await SdCliElectron.buildAsync({
-          pkgPath: this._pkgPath,
+          pkgPath: this._opt.pkgPath,
           electronConfig: this._pkgConf.builder.electron,
         });
       }