@simplysm/sd-cli 12.7.7 → 12.7.9

package/src/entry/sd-cli-cordova.ts

@@ -2,10 +2,10 @@ import * as path from "path";
 import { FsUtils, SdLogger, SdProcess } from "@simplysm/sd-core-node";
 import xml2js from "xml2js";
 import JSZip from "jszip";
-import { type INpmConfig } from "../types/common-configs.types";
-import { type ISdClientBuilderCordovaConfig } from "../types/config.types";
+import { INpmConfig } from "../types/common-configs.types";
+import { ISdClientBuilderCordovaConfig } from "../types/config.types";
 
-const BIN_PATH = path.resolve(process.cwd(), "node_modules/.bin/cordova.cmd");
+// const BIN_PATH = path.resolve(process.cwd(), "node_modules/.bin/cordova.cmd");
 
 export class SdCliCordova {
   private _logger = SdLogger.get(["simplysm", "sd-cli", "SdCliCordova"]);
@@ -30,12 +30,13 @@ export class SdCliCordova {
 
     if (FsUtils.exists(cordovaPath)) {
       this._logger.log("이미 생성되어있는 '.cordova'를 사용합니다.");
-    } else {
-      await this._execAsync(`${BIN_PATH} telemetry on`, this._opt.pkgPath);
+    }
+    else {
+      await this._execAsync(`npx cordova telemetry on`, this._opt.pkgPath);
 
       // 프로젝트 생성
       await this._execAsync(
-        `${BIN_PATH} create "${cordovaPath}" "${this._opt.config.appId}" "${this._opt.config.appName}"`,
+        `npx cordova create "${cordovaPath}" "${this._opt.config.appId}" "${this._opt.config.appName}"`,
         process.cwd(),
       );
 
@@ -62,9 +63,10 @@ export class SdCliCordova {
       if (!alreadyPlatforms.includes(platform)) {
         // await this._execAsync(`${BIN_PATH} platform add ${platform}`, cordovaPath);
         if (platform === "android") {
-          await this._execAsync(`${BIN_PATH} platform add ${platform}@12.0.0`, cordovaPath);
-        } else {
-          await this._execAsync(`${BIN_PATH} platform add ${platform}`, cordovaPath);
+          await this._execAsync(`npx cordova platform add ${platform}@12.0.0`, cordovaPath);
+        }
+        else {
+          await this._execAsync(`npx cordova platform add ${platform}`, cordovaPath);
         }
       }
     }
@@ -112,7 +114,7 @@ export class SdCliCordova {
     // 미설치 플러그인들 설치
     for (const usePlugin of usePlugins) {
       if (!alreadyPlugins.some((item) => usePlugin === item.id || usePlugin === item.name)) {
-        await this._execAsync(`${BIN_PATH} plugin add ${usePlugin}`, cordovaPath);
+        await this._execAsync(`npx cordova plugin add ${usePlugin}`, cordovaPath);
       }
     }
 
@@ -122,7 +124,8 @@ export class SdCliCordova {
         path.resolve(this._opt.pkgPath, this._opt.config.platform.android.sign.keystore),
         path.resolve(cordovaPath, "android.keystore"),
       );
-    } else {
+    }
+    else {
       FsUtils.remove(path.resolve(cordovaPath, "android.keystore"));
       // SIGN을 안쓸경우 아래 파일이 생성되어 있으면 오류남
       FsUtils.remove(path.resolve(cordovaPath, "platforms/android/release-signing.properties"));
@@ -132,21 +135,21 @@ export class SdCliCordova {
     FsUtils.writeJson(path.resolve(cordovaPath, "build.json"), {
       ...(this._opt.config.platform?.android
         ? {
-            android: {
-              release: {
-                packageType: this._opt.config.platform.android.bundle ? "bundle" : "apk",
-                ...(this._opt.config.platform.android.sign
-                  ? {
-                      keystore: path.resolve(cordovaPath, "android.keystore"),
-                      storePassword: this._opt.config.platform.android.sign.storePassword,
-                      alias: this._opt.config.platform.android.sign.alias,
-                      password: this._opt.config.platform.android.sign.password,
-                      keystoreType: this._opt.config.platform.android.sign.keystoreType,
-                    }
-                  : {}),
-              },
+          android: {
+            release: {
+              packageType: this._opt.config.platform.android.bundle ? "bundle" : "apk",
+              ...(this._opt.config.platform.android.sign
+                ? {
+                  keystore: path.resolve(cordovaPath, "android.keystore"),
+                  storePassword: this._opt.config.platform.android.sign.storePassword,
+                  alias: this._opt.config.platform.android.sign.alias,
+                  password: this._opt.config.platform.android.sign.password,
+                  keystoreType: this._opt.config.platform.android.sign.keystoreType,
+                }
+                : {}),
             },
-          }
+          },
+        }
         : {}),
     });
 
@@ -156,7 +159,8 @@ export class SdCliCordova {
         path.resolve(this._opt.pkgPath, this._opt.config.icon),
         path.resolve(cordovaPath, "res/icons", path.basename(this._opt.config.icon)),
       );
-    } else {
+    }
+    else {
       FsUtils.remove(path.resolve(cordovaPath, "res/icons"));
     }
 
@@ -192,7 +196,14 @@ export class SdCliCordova {
 
     // CONFIG: ICON 설정
     if (this._opt.config.icon != null) {
-      configXml["widget"]["icon"] = [{ $: { src: "res/icons/" + path.basename(this._opt.config.icon) } }];
+      configXml["widget"]["icon"] = [
+        {
+          $: {
+            src: "res/icons/"
+              + path.basename(this._opt.config.icon),
+          },
+        },
+      ];
     }
 
     // CONFIG: 접근허용 세팅
@@ -280,8 +291,8 @@ export class SdCliCordova {
               "android:name": `android.permission.${perm.name}`,
               ...(perm.maxSdkVersion != null
                 ? {
-                    "android:maxSdkVersion": `${perm.maxSdkVersion}`,
-                  }
+                  "android:maxSdkVersion": `${perm.maxSdkVersion}`,
+                }
                 : {}),
             },
           })),
@@ -306,7 +317,7 @@ export class SdCliCordova {
     }*/
 
     // 각 플랫폼 www 준비
-    await this._execAsync(`${BIN_PATH} prepare`, cordovaPath);
+    await this._execAsync(`npx cordova prepare`, cordovaPath);
   }
 
   public async buildAsync(outPath: string): Promise<void> {
@@ -315,7 +326,7 @@ export class SdCliCordova {
     // 실행
     const buildType = this._opt.config.debug ? "debug" : "release";
     for (const platform of this._platforms) {
-      await this._execAsync(`${BIN_PATH} build ${platform} --${buildType}`, cordovaPath);
+      await this._execAsync(`npx cordova build ${platform} --${buildType}`, cordovaPath);
     }
 
     for (const platform of Object.keys(this._opt.config.platform ?? {})) {
@@ -327,11 +338,18 @@ export class SdCliCordova {
           ? `app-${buildType}.apk`
           : `app-${buildType}-unsigned.apk`;
         const latestDistApkFileName = path.basename(
-          `${this._opt.config.appName}${this._opt.config.platform!.android!.sign ? "" : "-unsigned"}-latest.apk`,
+          `${this._opt.config.appName}${this._opt.config.platform!.android!.sign
+            ? ""
+            : "-unsigned"}-latest.apk`,
         );
         FsUtils.mkdirs(targetOutPath);
         FsUtils.copy(
-          path.resolve(cordovaPath, "platforms/android/app/build/outputs/apk", buildType, apkFileName),
+          path.resolve(
+            cordovaPath,
+            "platforms/android/app/build/outputs/apk",
+            buildType,
+            apkFileName,
+          ),
           path.resolve(targetOutPath, latestDistApkFileName),
         );
       }
@@ -344,7 +362,12 @@ export class SdCliCordova {
         const fileBuffer = FsUtils.readFileBuffer(wwwFile);
         zip.file(relFilePath, fileBuffer);
       }
-      const platformWwwFiles = FsUtils.glob(path.resolve(cordovaPath, "platforms", platform, "platform_www/**/*"), {
+      const platformWwwFiles = FsUtils.glob(path.resolve(
+        cordovaPath,
+        "platforms",
+        platform,
+        "platform_www/**/*",
+      ), {
         nodir: true,
       });
       for (const platformWwwFile of platformWwwFiles) {
@@ -363,7 +386,11 @@ export class SdCliCordova {
     }
   }
 
-  public static async runWebviewOnDeviceAsync(opt: { platform: string; pkgName: string; url?: string }): Promise<void> {
+  public static async runWebviewOnDeviceAsync(opt: {
+    platform: string;
+    pkgName: string;
+    url?: string
+  }): Promise<void> {
     const cordovaPath = path.resolve(process.cwd(), `packages/${opt.pkgName}/.cordova/`);
 
     if (opt.url !== undefined) {
@@ -371,11 +398,13 @@ export class SdCliCordova {
       FsUtils.mkdirs(path.resolve(cordovaPath, "www"));
       FsUtils.writeFile(
         path.resolve(cordovaPath, "www/index.html"),
-        `'${opt.url}'로 이동중... <script>setTimeout(function () {window.location.href = "${opt.url.replace(/\/$/, "")}/${opt.pkgName}/cordova/"}, 3000);</script>`.trim(),
+        `'${opt.url}'로 이동중... <script>setTimeout(function () {window.location.href = "${opt.url.replace(
+          /\/$/,
+          "",
+        )}/${opt.pkgName}/cordova/"}, 3000);</script>`.trim(),
       );
     }
 
-    const binPath = path.resolve(process.cwd(), "node_modules/.bin/cordova.cmd");
-    await SdProcess.spawnAsync(`${binPath} run ${opt.platform} --device`, { cwd: cordovaPath }, true);
+    await SdProcess.spawnAsync(`npx cordova run ${opt.platform} --device`, { cwd: cordovaPath });
   }
 }

package/src/entry/sd-cli-electron.ts

@@ -2,8 +2,8 @@ import { FsUtils, SdLogger, SdProcess } from "@simplysm/sd-core-node";
 import { pathToFileURL } from "url";
 import path from "path";
 import electronBuilder from "electron-builder";
-import { type ISdClientBuilderElectronConfig, type ISdProjectConfig } from "../types/config.types";
-import { type INpmConfig } from "../types/common-configs.types";
+import { ISdClientBuilderElectronConfig, ISdProjectConfig } from "../types/config.types";
+import { INpmConfig } from "../types/common-configs.types";
 
 export class SdCliElectron {
   static async runAsync(opt: { confFileRelPath: string; optNames: string[]; pkgName: string }): Promise<void> {
@@ -49,7 +49,7 @@ export class SdCliElectron {
     await SdProcess.spawnAsync(`npm install`, { cwd: electronPath }, true);
 
     logger.log(`electron rebuild`);
-    await SdProcess.spawnAsync(`electron-rebuild`, { cwd: electronPath }, true);
+    await SdProcess.spawnAsync(`npx electron-rebuild`, { cwd: electronPath }, true);
 
     /*for (const reinstallPkgName of reinstallPkgNames) {
       if (FsUtil.exists(path.resolve(electronPath, "node_modules", reinstallPkgName, "binding.gyp"))) {
@@ -63,7 +63,7 @@ export class SdCliElectron {
     }*/
 
     logger.log("electron...");
-    await SdProcess.spawnAsync(`electron .`, { cwd: electronPath }, true);
+    await SdProcess.spawnAsync(`npx electron .`, { cwd: electronPath }, true);
   }
 
   static async buildForDevAsync(opt: { confFileRelPath: string; optNames: string[]; pkgName: string }): Promise<void> {

package/src/entry/sd-cli-local-update.ts

@@ -1,7 +1,7 @@
 import { FsUtils, SdLogger, PathUtils, SdFsWatcher } from "@simplysm/sd-core-node";
 import path from "path";
 import { pathToFileURL } from "url";
-import { type ISdProjectConfig } from "../types/config.types";
+import { ISdProjectConfig } from "../types/config.types";
 
 export class SdCliLocalUpdate {
   static async runAsync(opt: { confFileRelPath: string; optNames: string[] }): Promise<void> {

package/src/entry/sd-cli-project.ts

@@ -1,5 +1,5 @@
 import path from "path";
-import { FsUtils, SdLogger, PathUtils, SdProcess } from "@simplysm/sd-core-node";
+import { FsUtils, PathUtils, SdLogger, SdProcess } from "@simplysm/sd-core-node";
 import { pathToFileURL } from "url";
 import semver from "semver";
 import { NeverEntryError, StringUtils, Wait } from "@simplysm/sd-core-common";
@@ -8,9 +8,9 @@ import { SdCliLocalUpdate } from "./sd-cli-local-update";
 import xml2js from "xml2js";
 import { SdMultiBuildRunner } from "../pkg-builders/sd-multi.build-runner";
 import { SdCliConvertMessageUtils } from "../utils/sd-cli-convert-message.utils";
-import { type ISdProjectConfig, type TSdPackageConfig } from "../types/config.types";
-import { type INpmConfig } from "../types/common-configs.types";
-import { type ISdBuildMessage } from "../types/build.types";
+import { ISdProjectConfig, TSdPackageConfig } from "../types/config.types";
+import { INpmConfig } from "../types/common-configs.types";
+import { ISdBuildMessage } from "../types/build.types";
 
 export class SdCliProject {
   static async watchAsync(opt: {
@@ -22,7 +22,10 @@ export class SdCliProject {
     const logger = SdLogger.get(["simplysm", "sd-cli", "SdCliProject", "watchAsync"]);
 
     logger.debug("프로젝트 설정 가져오기...");
-    const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(
+    const projConf = (await import(pathToFileURL(path.resolve(
+      process.cwd(),
+      opt.confFileRelPath,
+    )).href)).default(
       true,
       opt.optNames,
     ) as ISdProjectConfig;
@@ -77,11 +80,18 @@ export class SdCliProject {
     });
   }
 
-  static async buildAsync(opt: { confFileRelPath: string; optNames: string[]; pkgNames: string[] }): Promise<void> {
+  static async buildAsync(opt: {
+    confFileRelPath: string;
+    optNames: string[];
+    pkgNames: string[]
+  }): Promise<void> {
     const logger = SdLogger.get(["simplysm", "sd-cli", "SdCliProject", "buildAsync"]);
 
     logger.debug("프로젝트 설정 가져오기...");
-    const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(
+    const projConf = (await import(pathToFileURL(path.resolve(
+      process.cwd(),
+      opt.confFileRelPath,
+    )).href)).default(
       false,
       opt.optNames,
     ) as ISdProjectConfig;
@@ -93,7 +103,8 @@ export class SdCliProject {
     if (!projNpmConf.workspaces) {
       throw new Error("프로젝트 package.json에 workspaces가 설정되어있지 않습니다.");
     }
-    const allPkgPaths = projNpmConf.workspaces.mapMany((item) => FsUtils.glob(item)).map((item) => PathUtils.norm(item));
+    const allPkgPaths = projNpmConf.workspaces.mapMany((item) => FsUtils.glob(item))
+      .map((item) => PathUtils.norm(item));
     let pkgPaths = allPkgPaths.filter((pkgPath) => path.basename(pkgPath) in projConf.packages);
     if (opt.pkgNames.length !== 0) {
       pkgPaths = pkgPaths.filter((pkgPath) => opt.pkgNames.includes(path.basename(pkgPath)));
@@ -124,7 +135,10 @@ export class SdCliProject {
     const logger = SdLogger.get(["simplysm", "sd-cli", "SdCliProject", "publishAsync"]);
 
     logger.debug("프로젝트 설정 가져오기...");
-    const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(
+    const projConf = (await import(pathToFileURL(path.resolve(
+      process.cwd(),
+      opt.confFileRelPath,
+    )).href)).default(
       false,
       opt.optNames,
     ) as ISdProjectConfig;
@@ -163,19 +177,25 @@ export class SdCliProject {
     await this._upgradeVersionAsync(projNpmConf, allPkgPaths);
 
     // 빌드
-    if (!opt.noBuild) {
-      logger.debug("빌드 프로세스 시작...");
-      const multiBuildRunner = new SdMultiBuildRunner();
-
-      const messages = await pkgPaths.parallelAsync(async (pkgPath) => {
-        return await multiBuildRunner.runAsync({
-          cmd: "build",
-          pkgPath,
-          projConf: projConf,
+    try {
+      if (!opt.noBuild) {
+        logger.debug("빌드 프로세스 시작...");
+        const multiBuildRunner = new SdMultiBuildRunner();
+
+        const messages = await pkgPaths.parallelAsync(async (pkgPath) => {
+          return await multiBuildRunner.runAsync({
+            cmd: "build",
+            pkgPath,
+            projConf: projConf,
+          });
         });
-      });
 
-      this.#logging(messages.mapMany(), logger);
+        this.#logging(messages.mapMany(), logger);
+      }
+    }
+    catch (err) {
+      await SdProcess.spawnAsync("git checkout .");
+      throw err;
     }
 
     // GIT 사용중일경우, 새 버전 커밋 및 TAG 생성
@@ -217,7 +237,8 @@ export class SdCliProject {
             return process.env[envName] ?? item;
           });
           await SdProcess.spawnAsync(script);
-        } else {
+        }
+        else {
           throw new NeverEntryError();
         }
       }
@@ -226,10 +247,14 @@ export class SdCliProject {
     logger.info(`모든 배포가 완료되었습니다. (v${projNpmConf.version})`);
   }
 
-  private static async _publishPkgAsync(pkgPath: string, pkgPubConf: TSdPackageConfig["publish"]): Promise<void> {
+  private static async _publishPkgAsync(
+    pkgPath: string,
+    pkgPubConf: TSdPackageConfig["publish"],
+  ): Promise<void> {
     if (pkgPubConf === "npm") {
       await SdProcess.spawnAsync("yarn npm publish --access public", { cwd: pkgPath });
-    } else if (pkgPubConf?.type === "local-directory") {
+    }
+    else if (pkgPubConf?.type === "local-directory") {
       const pkgNpmConf = FsUtils.readJson(path.resolve(pkgPath, "package.json")) as INpmConfig;
 
       const targetRootPath = pkgPubConf.path.replace(/%([^%]*)%/g, (item) => {
@@ -253,7 +278,13 @@ export class SdCliProject {
         const targetPath = PathUtils.posix(targetRootPath, relativeFilePath);
         FsUtils.copy(filePath, targetPath);
       }
-    } else if (pkgPubConf?.type === "ftp" || pkgPubConf?.type === "ftps" || pkgPubConf?.type === "sftp") {
+    }
+    else if (pkgPubConf?.type
+      === "ftp"
+      || pkgPubConf?.type
+      === "ftps"
+      || pkgPubConf?.type
+      === "sftp") {
       const ftp = await SdStorage.connectAsync(pkgPubConf.type, {
         host: pkgPubConf.host,
         port: pkgPubConf.port,
@@ -262,7 +293,8 @@ export class SdCliProject {
       });
       await ftp.uploadDirAsync(path.resolve(pkgPath, "dist"), pkgPubConf.path ?? "/");
       await ftp.closeAsync();
-    } else {
+    }
+    else {
       throw new NeverEntryError();
     }
   }
@@ -280,7 +312,10 @@ export class SdCliProject {
     process.stdout.clearLine(0);
   }
 
-  private static async _upgradeVersionAsync(projNpmConf: INpmConfig, allPkgPaths: string[]): Promise<void> {
+  private static async _upgradeVersionAsync(
+    projNpmConf: INpmConfig,
+    allPkgPaths: string[],
+  ): Promise<void> {
     // 작업공간 package.json 버전 설정
     const newVersion = semver.inc(projNpmConf.version, "patch")!;
     projNpmConf.version = newVersion;
@@ -321,10 +356,14 @@ export class SdCliProject {
 
       if (FsUtils.exists(path.resolve(pkgPath, "plugin.xml"))) {
         const cordovaPluginConfFilePath = path.resolve(pkgPath, "plugin.xml");
-        const cordovaPluginConfXml = await xml2js.parseStringPromise(FsUtils.readFile(cordovaPluginConfFilePath));
+        const cordovaPluginConfXml = await xml2js.parseStringPromise(FsUtils.readFile(
+          cordovaPluginConfFilePath));
         cordovaPluginConfXml.plugin.$.version = newVersion;
 
-        FsUtils.writeFile(cordovaPluginConfFilePath, new xml2js.Builder().buildObject(cordovaPluginConfXml));
+        FsUtils.writeFile(
+          cordovaPluginConfFilePath,
+          new xml2js.Builder().buildObject(cordovaPluginConfXml),
+        );
       }
     });
   }

package/src/pkg-builders/client/sd-cli-ng-routes.file-generator.ts

@@ -77,7 +77,7 @@ export class SdCliNgRoutesFileGenerator {
     const routes = fn(result, 2);
 
     const content = `
-import type { Routes } from "@angular/router";
+import { Routes } from "@angular/router";
 ${imports.join("\n")}
 export const routes: Routes = [
 ${routes}

package/src/pkg-builders/client/sd-client.build-runner.ts

@@ -1,13 +1,13 @@
 import { EventEmitter } from "events";
-import { FsUtils, SdLogger, PathUtils, SdFsWatcher, type TNormPath } from "@simplysm/sd-core-node";
+import { FsUtils, SdLogger, PathUtils, SdFsWatcher, TNormPath } from "@simplysm/sd-core-node";
 import path from "path";
 import { SdNgBundler } from "./sd-ng.bundler";
 import { SdCliNgRoutesFileGenerator } from "./sd-cli-ng-routes.file-generator";
 import { SdCliCordova } from "../../entry/sd-cli-cordova";
 import { SdCliElectron } from "../../entry/sd-cli-electron";
-import { type ISdClientPackageConfig, type ISdProjectConfig } from "../../types/config.types";
-import { type INpmConfig } from "../../types/common-configs.types";
-import { type ISdBuildMessage, type ISdBuildRunnerResult } from "../../types/build.types";
+import { ISdClientPackageConfig, ISdProjectConfig } from "../../types/config.types";
+import { INpmConfig } from "../../types/common-configs.types";
+import { ISdBuildMessage, ISdBuildRunnerResult } from "../../types/build.types";
 
 export class SdClientBuildRunner extends EventEmitter {
   private _logger = SdLogger.get(["simplysm", "sd-cli", "SdClientBuildRunner"]);

package/src/pkg-builders/client/sd-ng.bundler.ts

@@ -1,6 +1,6 @@
 import path from "path";
-import esbuild, { type Metafile } from "esbuild";
-import { FsUtils, PathUtils, SdLogger, type TNormPath } from "@simplysm/sd-core-node";
+import esbuild, { Metafile } from "esbuild";
+import { FsUtils, PathUtils, SdLogger, TNormPath } from "@simplysm/sd-core-node";
 import { fileURLToPath } from "url";
 import nodeStdLibBrowser from "node-stdlib-browser";
 import nodeStdLibBrowserPlugin from "node-stdlib-browser/helpers/esbuild/plugin";
@@ -13,17 +13,17 @@ import {
   transformSupportedBrowsersToTargets,
 } from "@angular/build/src/tools/esbuild/utils";
 import {
-  type BuildOutputFile,
+  BuildOutputFile,
   BuildOutputFileType,
-  type InitialFileRecord,
+  InitialFileRecord,
 } from "@angular/build/src/tools/esbuild/bundler-context";
 import { extractLicenses } from "@angular/build/src/tools/esbuild/license-extractor";
 import {
-  type HintMode,
+  HintMode,
   IndexHtmlGenerator,
-  type IndexHtmlProcessResult,
+  IndexHtmlProcessResult,
 } from "@angular/build/src/utils/index-file/index-html-generator";
-import { type Entrypoint } from "@angular/build/src/utils/index-file/augment-index-html";
+import { Entrypoint } from "@angular/build/src/utils/index-file/augment-index-html";
 import { CrossOrigin } from "@angular/build/src/builders/application/schema";
 import { augmentAppWithServiceWorkerEsbuild } from "@angular/build/src/utils/service-worker";
 import {
@@ -40,10 +40,10 @@ import {
 import { resolveAssets } from "@angular/build/src/utils/resolve-assets";
 import { createSdNgPlugin } from "./sd-ng.plugin-creator";
 import { SdCliPerformanceTimer } from "../../utils/sd-cli-performance-time";
-import { type INpmConfig } from "../../types/common-configs.types";
-import { type ISdClientBuilderCordovaConfig } from "../../types/config.types";
-import { type ISdCliNgPluginResultCache } from "../../types/build-plugin.types";
-import { type ISdBuildMessage } from "../../types/build.types";
+import { INpmConfig } from "../../types/common-configs.types";
+import { ISdClientBuilderCordovaConfig } from "../../types/config.types";
+import { ISdCliNgPluginResultCache } from "../../types/build-plugin.types";
+import { ISdBuildMessage } from "../../types/build.types";
 import nodeModule from "node:module";
 
 export class SdNgBundler {
@@ -428,7 +428,7 @@ export class SdNgBundler {
       pure: ["forwardRef"],
       outdir: this._opt.pkgPath,
       outExtension: undefined,
-      sourcemap: false, //this._opt.dev,
+      sourcemap: this._opt.dev,
       chunkNames: "[name]-[hash]",
       tsconfig: this.#tsConfigFilePath,
       write: false,
@@ -540,7 +540,7 @@ export class SdNgBundler {
   private _getStyleContext(): SdNgBundlerContext {
     const pluginFactory = new StylesheetPluginFactory(
       {
-        sourcemap: false,//this._opt.dev,
+        sourcemap: this._opt.dev,
         includePaths: [],
       },
       this.#styleLoadResultCache,
@@ -554,7 +554,7 @@ export class SdNgBundler {
       logLevel: "silent",
       minify: !this._opt.dev,
       metafile: true,
-      sourcemap: false,//this._opt.dev,
+      sourcemap: this._opt.dev,
       outdir: this._opt.pkgPath,
       write: false,
       platform: "browser",
@@ -588,7 +588,7 @@ export class SdNgBundler {
       logLevel: "silent",
       minify: !this._opt.dev,
       outdir: this._opt.pkgPath,
-      sourcemap: false,//this._opt.dev,
+      sourcemap: this._opt.dev,
       tsconfig: this.#tsConfigFilePath,
       write: false,
       preserveSymlinks: false,

package/src/pkg-builders/client/sd-ng.plugin-creator.ts

@@ -2,11 +2,11 @@ import esbuild from "esbuild";
 import path from "path";
 import os from "os";
 import { JavaScriptTransformer } from "@angular/build/src/tools/esbuild/javascript-transformer";
-import { SdLogger, PathUtils, type TNormPath } from "@simplysm/sd-core-node";
+import { SdLogger, PathUtils, TNormPath } from "@simplysm/sd-core-node";
 import { SdCliPerformanceTimer } from "../../utils/sd-cli-performance-time";
 import { SdCliConvertMessageUtils } from "../../utils/sd-cli-convert-message.utils";
-import { type ISdCliNgPluginResultCache } from "../../types/build-plugin.types";
-import { type ISdTsCompilerResult } from "../../types/ts-compiler.types";
+import { ISdCliNgPluginResultCache } from "../../types/build-plugin.types";
+import { ISdTsCompilerResult } from "../../types/ts-compiler.types";
 import { SdTsCompiler } from "../../ts-compiler/sd-ts-compiler";
 
 export function createSdNgPlugin(conf: {
@@ -106,7 +106,7 @@ export function createSdNgPlugin(conf: {
       const javascriptTransformer = new JavaScriptTransformer(
         {
           thirdPartySourcemaps: conf.dev,
-          sourcemap: false,//conf.dev,
+          sourcemap: conf.dev,
           jit: false,
           advancedOptimizations: true,
         },

package/src/pkg-builders/lib/sd-js-lib.build-runner.ts

@@ -3,8 +3,8 @@ import path from "path";
 import { EventEmitter } from "events";
 import { SdCliConvertMessageUtils } from "../../utils/sd-cli-convert-message.utils";
 // import { TSdLintWorkerType } from "../../types/workers.type";
-import { type ISdProjectConfig } from "../../types/config.types";
-import { type ISdBuildRunnerResult } from "../../types/build.types";
+import { ISdProjectConfig } from "../../types/config.types";
+import { ISdBuildRunnerResult } from "../../types/build.types";
 import { ESLint } from "eslint";
 
 export class SdJsLibBuildRunner extends EventEmitter {

package/src/pkg-builders/lib/sd-ts-lib.build-runner.ts

@@ -1,10 +1,10 @@
-import { FsUtils, SdLogger, PathUtils, SdFsWatcher, type TNormPath } from "@simplysm/sd-core-node";
+import { FsUtils, SdLogger, PathUtils, SdFsWatcher, TNormPath } from "@simplysm/sd-core-node";
 import path from "path";
 import { EventEmitter } from "events";
 import { SdCliIndexFileGenerator } from "./sd-cli-index.file-generator";
 import { SdTsLibBuilder } from "./sd-ts-lib.builder";
-import { type ISdLibPackageConfig, type ISdProjectConfig } from "../../types/config.types";
-import { type ISdBuildMessage, type ISdBuildRunnerResult } from "../../types/build.types";
+import { ISdLibPackageConfig, ISdProjectConfig } from "../../types/config.types";
+import { ISdBuildMessage, ISdBuildRunnerResult } from "../../types/build.types";
 
 export class SdTsLibBuildRunner extends EventEmitter {
   private _logger = SdLogger.get(["simplysm", "sd-cli", "SdCliTsLibBuilder"]);

package/src/pkg-builders/lib/sd-ts-lib.builder.ts

@@ -1,7 +1,7 @@
 import path from "path";
 import { SdCliConvertMessageUtils } from "../../utils/sd-cli-convert-message.utils";
-import { FsUtils, PathUtils, type TNormPath } from "@simplysm/sd-core-node";
-import { type ISdBuildMessage } from "../../types/build.types";
+import { FsUtils, PathUtils, TNormPath } from "@simplysm/sd-core-node";
+import { ISdBuildMessage } from "../../types/build.types";
 import { SdTsCompiler } from "../../ts-compiler/sd-ts-compiler";
 
 export class SdTsLibBuilder {

package/src/pkg-builders/sd-multi.build-runner.ts

@@ -1,11 +1,11 @@
-import { FsUtils, SdLogger, PathUtils, SdWorker, type TNormPath } from "@simplysm/sd-core-node";
+import { FsUtils, SdLogger, PathUtils, SdWorker, TNormPath } from "@simplysm/sd-core-node";
 import path from "path";
 import { EventEmitter } from "events";
-import { type ISdServerPackageConfig } from "../types/config.types";
-import { type ISdBuildMessage, type ISdBuildRunnerResult } from "../types/build.types";
-import { type TSdBuildRunnerWorkerType, type TServerWorkerType } from "../types/worker.types";
-import { type INpmConfig } from "../types/common-configs.types";
-import { type ISdBuildRunnerWorkerRequest } from "../types/build-runner.types";
+import { ISdServerPackageConfig } from "../types/config.types";
+import { ISdBuildMessage, ISdBuildRunnerResult } from "../types/build.types";
+import { TSdBuildRunnerWorkerType, TServerWorkerType } from "../types/worker.types";
+import { INpmConfig } from "../types/common-configs.types";
+import { ISdBuildRunnerWorkerRequest } from "../types/build-runner.types";
 
 export class SdMultiBuildRunner extends EventEmitter {
   #logger = SdLogger.get(["simplysm", "sd-cli", "SdMultiBuildRunner"]);