@simplysm/sd-cli 7.0.236 → 7.0.239

package/src/builder/SdCliClientBuilder.ts

@@ -31,6 +31,8 @@ import { SdCliCordova } from "../build-tool/SdCliCordova";
 import { SdCliNpmConfigUtil } from "../utils/SdCliNpmConfigUtil";
 import electronBuilder from "electron-builder";
 import LintResult = ESLint.LintResult;
+import { fileURLToPath } from "url";
+import { Entrypoint } from "@angular-devkit/build-angular/src/utils/index-file/augment-index-html";
 
 export class SdCliClientBuilder extends EventEmitter {
   private readonly _logger: Logger;
@@ -165,13 +167,17 @@ export class SdCliClientBuilder extends EventEmitter {
 
   public async buildAsync(): Promise<ISdCliPackageBuildResult[]> {
     // DIST 비우기
+    this._logger.debug("removeAsync:1");
     await FsUtil.removeAsync(path.resolve(this._rootPath, ".electron"));
+    this._logger.debug("removeAsync:2");
     await FsUtil.removeAsync(this._parsedTsconfig.options.outDir!);
 
     // NgModule 생성
+    this._logger.debug("ngModule");
     await this._ngModuleGenerator.runAsync();
 
     // CORDOVA 초기화
+    this._logger.debug("Cordova");
     if (this._cordova) {
       this._logger.debug("CORDOVA 구성...");
       await this._cordova.initializeAsync();
@@ -213,7 +219,7 @@ export class SdCliClientBuilder extends EventEmitter {
     // CORDOVA 빌드
     if (this._cordova) {
       this._logger.debug("CORDOVA 빌드...");
-      await this._cordova.buildAsync(path.resolve(this._parsedTsconfig.options.outDir!, "cordova"));
+      await this._cordova.buildAsync(this._parsedTsconfig.options.outDir!);
     }
 
     // ELECTRON
@@ -356,7 +362,8 @@ export class SdCliClientBuilder extends EventEmitter {
       entry: {
         main: [mainFilePath],
         ...FsUtil.exists(polyfillsFilePath) ? { polyfills: [polyfillsFilePath] } : {},
-        ...FsUtil.exists(stylesFilePath) ? { styles: [stylesFilePath] } : {}
+        ...FsUtil.exists(stylesFilePath) ? { styles: [stylesFilePath] } : {},
+        ...builderType === "cordova" ? { "cordova-entry": path.resolve(path.dirname(fileURLToPath(import.meta.url)), `../../lib/cordova-entry.js`) } : {}
       },
       output: {
         uniqueName: pkgKey,
@@ -385,19 +392,19 @@ export class SdCliClientBuilder extends EventEmitter {
       experiments: { backCompat: false, syncWebAssembly: true, asyncWebAssembly: true },
       infrastructureLogging: { level: "error" },
       stats: "errors-warnings",
-      cache: {
-        type: "filesystem",
-        profile: watch ? undefined : false,
-        cacheDirectory: path.resolve(cacheBasePath, "angular-webpack"),
-        maxMemoryGenerations: 1,
-        name: createHash("sha1")
-          .update(workspacePkgLockContent)
-          .update(JSON.stringify(this._parsedTsconfig.options))
-          .update(JSON.stringify(this._config))
-          .update(watch.toString())
-          .digest("hex")
-      },
       ...watch ? {
+        cache: {
+          type: "filesystem",
+          profile: undefined,
+          cacheDirectory: path.resolve(cacheBasePath, "angular-webpack"),
+          maxMemoryGenerations: 1,
+          name: createHash("sha1")
+            .update(workspacePkgLockContent)
+            .update(JSON.stringify(this._parsedTsconfig.options))
+            .update(JSON.stringify(this._config))
+            .update(watch.toString())
+            .digest("hex")
+        },
         snapshot: {
           immutablePaths: internalModuleCachePaths,
           managedPaths: internalModuleCachePaths
@@ -477,7 +484,9 @@ export class SdCliClientBuilder extends EventEmitter {
               {
                 loader: "@angular-devkit/build-angular/src/babel/webpack-loader",
                 options: {
-                  cacheDirectory: path.resolve(cacheBasePath, "babel-webpack"),
+                  ...watch ? {
+                    cacheDirectory: path.resolve(cacheBasePath, "babel-webpack"),
+                  } : {},
                   scriptTarget: ts.ScriptTarget.ES2017,
                   aot: true,
                   optimize: !watch,
@@ -675,15 +684,20 @@ export class SdCliClientBuilder extends EventEmitter {
             ["polyfills", true],
             ["styles", false],
             ["vendor", true],
-            ["main", true]
+            ["main", true],
+            ...builderType === "cordova" ? [
+              ["cordova-entry", false] as Entrypoint
+            ] : []
           ],
           deployUrl: undefined,
           sri: false,
-          cache: {
-            enabled: true,
-            basePath: cacheBasePath,
-            path: path.resolve(cacheBasePath, "index-webpack")
-          },
+          ...watch ? {
+            cache: {
+              enabled: true,
+              basePath: cacheBasePath,
+              path: path.resolve(cacheBasePath, "index-webpack")
+            }
+          } : {},
           postTransform: undefined,
           optimization: {
             scripts: !watch,

package/src/entry-points/SdCliLocalUpdate.ts

@@ -1,121 +1,121 @@
-import { SdCliConfigUtil } from "../utils/SdCliConfigUtil";
-import { FsUtil, Logger, PathUtil, SdFsWatcher } from "@simplysm/sd-core-node";
-import path from "path";
-
-export class SdCliLocalUpdate {
-  private readonly _logger = Logger.get(["simplysm", "sd-cli", this.constructor.name]);
-
-  public constructor(private readonly _rootPath: string) {
-  }
-
-  public async runAsync(opt: { confFileRelPath: string }): Promise<void> {
-    this._logger.debug("프로젝트 설정 가져오기...");
-    const conf = await SdCliConfigUtil.loadConfigAsync(path.resolve(this._rootPath, opt.confFileRelPath), false);
-    if (!conf.localUpdates) return;
-
-    const updatePathInfos = await this._getUpdatePathInfosAsync(conf.localUpdates);
-    this._logger.debug("로컬 업데이트 구성");
-
-    this._logger.log("로컬 라이브러리 업데이트 시작...");
-    for (const updatePathInfo of updatePathInfos) {
-      if (!FsUtil.exists(updatePathInfo.source)) {
-        this._logger.warn(`소스경로를 찾을 수 없어 무시됩니다(${updatePathInfo.source})`);
-        return;
-      }
-
-      // 소스경로에서 대상경로로 파일 복사
-      await FsUtil.copyAsync(updatePathInfo.source, updatePathInfo.target, (src) => {
-        return !src.includes("node_modules") && !src.endsWith("package.json");
-      });
-    }
-    this._logger.info("로컬 라이브러리 업데이트 완료");
-  }
-
-  public async watchAsync(opt: { confFileRelPath: string }): Promise<void> {
-    this._logger.debug("프로젝트 설정 가져오기...");
-    const conf = await SdCliConfigUtil.loadConfigAsync(path.resolve(this._rootPath, opt.confFileRelPath), false);
-    if (!conf.localUpdates) return;
-
-    const updatePathInfos = await this._getUpdatePathInfosAsync(conf.localUpdates);
-    this._logger.debug("로컬 업데이트 구성");
-
-    const watchPaths = (await updatePathInfos.mapManyAsync(async (item) => await this._getWatchPathsAsync(item.source))).distinct();
-
-    const watcher = SdFsWatcher.watch(watchPaths);
-    watcher.onChange({ delay: 1000 }, async (changedInfos) => {
-      const changeFilePaths = changedInfos.filter((item) => ["add", "change", "unlink"].includes(item.event)).map((item) => item.path);
-      if (changeFilePaths.length === 0) return;
-
-      this._logger.log("로컬 라이브러리 변경감지...");
-      for (const changedFilePath of changeFilePaths) {
-        if (!FsUtil.exists(changedFilePath)) continue;
-
-        for (const updatePathInfo of updatePathInfos) {
-          if (!PathUtil.isChildPath(changedFilePath, updatePathInfo.source)) continue;
-
-          const sourceRelPath = path.relative(updatePathInfo.source, changedFilePath);
-          if (sourceRelPath.includes("node_modules")) continue;
-          if (sourceRelPath.includes("package.json")) continue;
-
-          const targetFilePath = path.resolve(updatePathInfo.target, sourceRelPath);
-
-          this._logger.debug(`변경파일감지(복사): ${changedFilePath} => ${targetFilePath}`);
-          await FsUtil.copyAsync(changedFilePath, targetFilePath);
-        }
-      }
-
-      const watchWatchPaths = (await updatePathInfos.mapManyAsync(async (item) => await this._getWatchPathsAsync(item.source))).distinct();
-      watcher.add(watchWatchPaths);
-
-      this._logger.info("로컬 라이브러리 복사 완료");
-    });
-  }
-
-  private async _getUpdatePathInfosAsync(record: Record<string, string>): Promise<IUpdatePathInfo[]> {
-    const result: IUpdatePathInfo[] = [];
-    for (const pkgGlobPath of Object.keys(record)) {
-      // "node_modules'에서 로컬업데이트 설정에 맞는 패키지를 "glob"하여 대상 패키지경로 목록 가져오기
-      const targetPaths = [
-        ...await FsUtil.globAsync(path.resolve(this._rootPath, "node_modules", pkgGlobPath)),
-        ...await FsUtil.globAsync(path.resolve(this._rootPath, "packages", "*", "node_modules", pkgGlobPath))
-      ];
-
-      result.push(
-        ...targetPaths
-          .map((targetPath) => {
-            // 대상의 명칭 추출
-            const regexpText = pkgGlobPath.replace(/[\\/.*]/g, (item) => (
-              item === "/" ? "[\\\\\\/]"
-                : item === "." ? "\\."
-                  : item === "*" ? "(.*)"
-                    : item
-            ));
-            const targetNameMatch = new RegExp(regexpText).exec(targetPath);
-            if (!targetNameMatch || typeof targetNameMatch[1] === "undefined") return undefined;
-            const targetName = targetNameMatch[1];
-
-            // 가져올 소스 경로 추출
-            const sourcePath = path.resolve(record[pkgGlobPath].replace(/\*/g, targetName));
-            return { source: sourcePath, target: targetPath };
-          })
-          .filterExists()
-      );
-    }
-
-    return result;
-  }
-
-  protected async _getWatchPathsAsync(sourcePath: string): Promise<string[]> {
-    return await FsUtil.globAsync(path.resolve(sourcePath, "**"), {
-      ignore: [
-        "**/node_modules/**",
-        "**/package.json"
-      ]
-    });
-  }
-}
-
-interface IUpdatePathInfo {
-  source: string;
-  target: string;
-}
+import { SdCliConfigUtil } from "../utils/SdCliConfigUtil";
+import { FsUtil, Logger, PathUtil, SdFsWatcher } from "@simplysm/sd-core-node";
+import path from "path";
+
+export class SdCliLocalUpdate {
+  private readonly _logger = Logger.get(["simplysm", "sd-cli", this.constructor.name]);
+
+  public constructor(private readonly _rootPath: string) {
+  }
+
+  public async runAsync(opt: { confFileRelPath: string }): Promise<void> {
+    this._logger.debug("프로젝트 설정 가져오기...");
+    const conf = await SdCliConfigUtil.loadConfigAsync(path.resolve(this._rootPath, opt.confFileRelPath), false);
+    if (!conf.localUpdates) return;
+
+    const updatePathInfos = await this._getUpdatePathInfosAsync(conf.localUpdates);
+    this._logger.debug("로컬 업데이트 구성", updatePathInfos);
+
+    this._logger.log("로컬 라이브러리 업데이트 시작...");
+    for (const updatePathInfo of updatePathInfos) {
+      if (!FsUtil.exists(updatePathInfo.source)) {
+        this._logger.warn(`소스경로를 찾을 수 없어 무시됩니다(${updatePathInfo.source})`);
+        return;
+      }
+
+      // 소스경로에서 대상경로로 파일 복사
+      await FsUtil.copyAsync(updatePathInfo.source, updatePathInfo.target, (src) => {
+        return !src.includes("node_modules") && !src.endsWith("package.json");
+      });
+    }
+    this._logger.info("로컬 라이브러리 업데이트 완료");
+  }
+
+  public async watchAsync(opt: { confFileRelPath: string }): Promise<void> {
+    this._logger.debug("프로젝트 설정 가져오기...");
+    const conf = await SdCliConfigUtil.loadConfigAsync(path.resolve(this._rootPath, opt.confFileRelPath), false);
+    if (!conf.localUpdates) return;
+
+    const updatePathInfos = await this._getUpdatePathInfosAsync(conf.localUpdates);
+    this._logger.debug("로컬 업데이트 구성");
+
+    const watchPaths = (await updatePathInfos.mapManyAsync(async (item) => await this._getWatchPathsAsync(item.source))).distinct();
+
+    const watcher = SdFsWatcher.watch(watchPaths);
+    watcher.onChange({ delay: 1000 }, async (changedInfos) => {
+      const changeFilePaths = changedInfos.filter((item) => ["add", "change", "unlink"].includes(item.event)).map((item) => item.path);
+      if (changeFilePaths.length === 0) return;
+
+      this._logger.log("로컬 라이브러리 변경감지...");
+      for (const changedFilePath of changeFilePaths) {
+        if (!FsUtil.exists(changedFilePath)) continue;
+
+        for (const updatePathInfo of updatePathInfos) {
+          if (!PathUtil.isChildPath(changedFilePath, updatePathInfo.source)) continue;
+
+          const sourceRelPath = path.relative(updatePathInfo.source, changedFilePath);
+          if (sourceRelPath.includes("node_modules")) continue;
+          if (sourceRelPath.includes("package.json")) continue;
+
+          const targetFilePath = path.resolve(updatePathInfo.target, sourceRelPath);
+
+          this._logger.debug(`변경파일감지(복사): ${changedFilePath} => ${targetFilePath}`);
+          await FsUtil.copyAsync(changedFilePath, targetFilePath);
+        }
+      }
+
+      const watchWatchPaths = (await updatePathInfos.mapManyAsync(async (item) => await this._getWatchPathsAsync(item.source))).distinct();
+      watcher.add(watchWatchPaths);
+
+      this._logger.info("로컬 라이브러리 복사 완료");
+    });
+  }
+
+  private async _getUpdatePathInfosAsync(record: Record<string, string>): Promise<IUpdatePathInfo[]> {
+    const result: IUpdatePathInfo[] = [];
+    for (const pkgGlobPath of Object.keys(record)) {
+      // "node_modules'에서 로컬업데이트 설정에 맞는 패키지를 "glob"하여 대상 패키지경로 목록 가져오기
+      const targetPaths = [
+        ...await FsUtil.globAsync(path.resolve(this._rootPath, "node_modules", pkgGlobPath)),
+        ...await FsUtil.globAsync(path.resolve(this._rootPath, "packages", "*", "node_modules", pkgGlobPath))
+      ];
+
+      result.push(
+        ...targetPaths
+          .map((targetPath) => {
+            // 대상의 명칭 추출
+            const regexpText = pkgGlobPath.replace(/[\\/.*]/g, (item) => (
+              item === "/" ? "[\\\\\\/]"
+                : item === "." ? "\\."
+                  : item === "*" ? "(.*)"
+                    : item
+            ));
+            const targetNameMatch = new RegExp(regexpText).exec(targetPath);
+            if (!targetNameMatch || typeof targetNameMatch[1] === "undefined") return undefined;
+            const targetName = targetNameMatch[1];
+
+            // 가져올 소스 경로 추출
+            const sourcePath = path.resolve(record[pkgGlobPath].replace(/\*/g, targetName));
+            return { source: sourcePath, target: targetPath };
+          })
+          .filterExists()
+      );
+    }
+
+    return result;
+  }
+
+  protected async _getWatchPathsAsync(sourcePath: string): Promise<string[]> {
+    return await FsUtil.globAsync(path.resolve(sourcePath, "**"), {
+      ignore: [
+        "**/node_modules/**",
+        "**/package.json"
+      ]
+    });
+  }
+}
+
+interface IUpdatePathInfo {
+  source: string;
+  target: string;
+}