@simplysm/sd-cli 12.7.7 → 12.7.9

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

@@ -1,11 +1,11 @@
 import { EventEmitter } from "events";
-import { FsUtils, SdLogger, PathUtils, SdFsWatcher, type TNormPath } from "@simplysm/sd-core-node";
+import { FsUtils, PathUtils, SdFsWatcher, SdLogger, TNormPath } from "@simplysm/sd-core-node";
 import path from "path";
 import { StringUtils } from "@simplysm/sd-core-common";
 import { SdServerBundler } from "./sd-server.bundler";
-import { type ISdProjectConfig, type ISdServerPackageConfig } from "../../types/config.types";
-import { type ISdBuildMessage, type ISdBuildRunnerResult } from "../../types/build.types";
-import { type INpmConfig, type ITsConfig } from "../../types/common-configs.types";
+import { ISdProjectConfig, ISdServerPackageConfig } from "../../types/config.types";
+import { ISdBuildMessage, ISdBuildRunnerResult } from "../../types/build.types";
+import { INpmConfig, ITsConfig } from "../../types/common-configs.types";
 
 export class SdServerBuildRunner extends EventEmitter {
   private _logger = SdLogger.get(["simplysm", "sd-cli", "SdCliServerBuildRunner"]);
@@ -56,30 +56,34 @@ export class SdServerBuildRunner extends EventEmitter {
 
     this._debug("WATCH...");
     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");
-
-      const watchResult = await this._runAsync(
-        true,
-        new Set(currentChangeInfos.map((item) => PathUtils.norm(item.path))),
-      );
-      const watchRes: ISdBuildRunnerResult = {
-        affectedFilePathSet: watchResult.affectedFileSet,
-        buildMessages: watchResult.buildMessages,
-        emitFileSet: watchResult.emitFileSet,
-      };
-
-      this.emit("complete", watchRes);
-
-      lastWatchFileSet = watchResult.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");
+
+        const watchResult = await this._runAsync(
+          true,
+          new Set(currentChangeInfos.map((item) => PathUtils.norm(item.path))),
+        );
+        const watchRes: ISdBuildRunnerResult = {
+          affectedFilePathSet: watchResult.affectedFileSet,
+          buildMessages: watchResult.buildMessages,
+          emitFileSet: watchResult.emitFileSet,
+        };
+
+        this.emit("complete", watchRes);
+
+        lastWatchFileSet = watchResult.watchFileSet;
+      });
   }
 
   public async buildAsync(): Promise<ISdBuildRunnerResult> {
-    const projNpmConfig = FsUtils.readJson(path.resolve(process.cwd(), "package.json")) as INpmConfig;
+    const projNpmConfig = FsUtils.readJson(path.resolve(
+      process.cwd(),
+      "package.json",
+    )) as INpmConfig;
     const npmConfig = FsUtils.readJson(path.resolve(this._pkgPath, "package.json")) as INpmConfig;
     const extModules = await this._getExternalModulesAsync();
 
@@ -113,12 +117,19 @@ export class SdServerBuildRunner extends EventEmitter {
 
       distNpmConfig.volta = projNpmConfig.volta;
 
-      FsUtils.writeJson(path.resolve(this._pkgPath, "dist/package.json"), distNpmConfig, { space: 2 });
+      FsUtils.writeJson(
+        path.resolve(this._pkgPath, "dist/package.json"),
+        distNpmConfig,
+        { space: 2 },
+      );
     }
 
     this._debug("GEN .yarnrc.yml...");
     {
-      FsUtils.writeFile(path.resolve(this._pkgPath, "dist/.yarnrc.yml"), "nodeLinker: node-modules");
+      FsUtils.writeFile(
+        path.resolve(this._pkgPath, "dist/.yarnrc.yml"),
+        "nodeLinker: node-modules",
+      );
     }
 
     this._debug("GEN openssl.cnf...");
@@ -194,18 +205,19 @@ Options = UnsafeLegacyRenegotiation`.trim(),
       this._debug("GEN web.config...");
 
       const iisDistPath = path.resolve(this._pkgPath, "dist/web.config");
-      const serverExeFilePath = this._pkgConf.iis.nodeExeFilePath ?? "C:\\Program Files\\nodejs\\node.exe";
-      FsUtils.writeFile(
-        iisDistPath,
-        `
+      const nodeVersion = process.versions.node.substring(1);
+      const serverExeFilePath = this._pkgConf.iis.nodeExeFilePath
+        ?? `%HOMEDRIVE%%HOMEPATH%\\AppData\\Local\\Volta\\tools\\image\\node\\${nodeVersion}\\node.exe`;
+
+      FsUtils.writeFile(iisDistPath, `
 <configuration>
   <appSettings>
     <add key="NODE_ENV" value="production" />
     <add key="TZ" value="Asia/Seoul" />
     <add key="SD_VERSION" value="${npmConfig.version}" />
     ${Object.keys(this._pkgConf.env ?? {})
-          .map((key) => `<add key="${key}" value="${this._pkgConf.env![key]}"/>`)
-          .join("\n    ")}
+        .map((key) => `<add key="${key}" value="${this._pkgConf.env![key]}"/>`)
+        .join("\n    ")}
   </appSettings>
   <system.webServer>
     <handlers>
@@ -225,9 +237,7 @@ Options = UnsafeLegacyRenegotiation`.trim(),
     <httpErrors errorMode="Detailed" />
   </system.webServer>
 </configuration>
-
-`.trim(),
-      );
+`.trim());
     }
 
     const result = await this._runAsync(false);
@@ -266,7 +276,10 @@ Options = UnsafeLegacyRenegotiation`.trim(),
             ...FsUtils.glob(path.resolve(this._pkgPath, "src/workers/*.ts")),
           ],
         external: this._extModules.map((item) => item.name),
-        watchScopePaths: [path.resolve(this._pkgPath, "../"), ...localUpdatePaths].map((item) => PathUtils.norm(item)),
+        watchScopePaths: [
+          path.resolve(this._pkgPath, "../"),
+          ...localUpdatePaths,
+        ].map((item) => PathUtils.norm(item)),
       });
 
     this._debug(`BUILD...`);
@@ -305,7 +318,10 @@ Options = UnsafeLegacyRenegotiation`.trim(),
     const npmConfigMap = new Map<string, INpmConfig>();
 
     const fn = async (currPath: string): Promise<void> => {
-      const npmConfig = npmConfigMap.getOrCreate(currPath, FsUtils.readJson(path.resolve(currPath, "package.json")));
+      const npmConfig = npmConfigMap.getOrCreate(
+        currPath,
+        FsUtils.readJson(path.resolve(currPath, "package.json")),
+      );
 
       const deps = {
         defaults: [

package/src/pkg-builders/server/sd-server.bundler.ts

@@ -1,11 +1,11 @@
 import esbuild from "esbuild";
 import path from "path";
-import { FsUtils, SdLogger, PathUtils, type TNormPath } from "@simplysm/sd-core-node";
+import { FsUtils, SdLogger, PathUtils, TNormPath } from "@simplysm/sd-core-node";
 import { SdCliConvertMessageUtils } from "../../utils/sd-cli-convert-message.utils";
-import { type ISdCliServerPluginResultCache } from "../../types/build-plugin.types";
-import { type ISdBuildMessage } from "../../types/build.types";
+import { ISdCliServerPluginResultCache } from "../../types/build-plugin.types";
+import { ISdBuildMessage } from "../../types/build.types";
 import { createSdServerPlugin } from "./sd-server.plugin-creator";
-import { type BuildOutputFile, BuildOutputFileType } from "@angular/build/src/tools/esbuild/bundler-context";
+import { BuildOutputFile, BuildOutputFileType } from "@angular/build/src/tools/esbuild/bundler-context";
 import { convertOutputFile } from "@angular/build/src/tools/esbuild/utils";
 import { resolveAssets } from "@angular/build/src/utils/resolve-assets";
 

package/src/pkg-builders/server/sd-server.plugin-creator.ts

@@ -1,8 +1,8 @@
 import esbuild from "esbuild";
 import { SdCliConvertMessageUtils } from "../../utils/sd-cli-convert-message.utils";
-import { type ISdCliServerPluginResultCache } from "../../types/build-plugin.types";
-import { PathUtils, type TNormPath } from "@simplysm/sd-core-node";
-import { type ISdTsCompilerResult } from "../../types/ts-compiler.types";
+import { ISdCliServerPluginResultCache } from "../../types/build-plugin.types";
+import { PathUtils, TNormPath } from "@simplysm/sd-core-node";
+import { ISdTsCompilerResult } from "../../types/ts-compiler.types";
 import { SdTsCompiler } from "../../ts-compiler/sd-ts-compiler";
 
 export function createSdServerPlugin(conf: {

package/src/ts-compiler/sd-ts-compiler.ts

@@ -1,12 +1,12 @@
 import ts from "typescript";
 import path from "path";
-import { FsUtils, SdLogger, PathUtils, type TNormPath } from "@simplysm/sd-core-node";
+import { FsUtils, SdLogger, PathUtils, TNormPath } from "@simplysm/sd-core-node";
 import { StringUtils } from "@simplysm/sd-core-common";
 import { NgtscProgram, OptimizeFor } from "@angular/compiler-cli";
 import {
   ComponentStylesheetBundler,
 } from "@angular/build/src/tools/esbuild/angular/component-stylesheets";
-import { type AngularCompilerHost } from "@angular/build/src/tools/angular/angular-host";
+import { AngularCompilerHost } from "@angular/build/src/tools/angular/angular-host";
 import { transformSupportedBrowsersToTargets } from "@angular/build/src/tools/esbuild/utils";
 import browserslist from "browserslist";
 import {
@@ -15,11 +15,11 @@ import {
 import { SdCliPerformanceTimer } from "../utils/sd-cli-performance-time";
 import { SdCliConvertMessageUtils } from "../utils/sd-cli-convert-message.utils";
 import {
-  type ISdTsCompilerResult,
-  type IStylesheetBundlingResult,
-  type SdTsCompilerOptions,
+  ISdTsCompilerResult,
+  IStylesheetBundlingResult,
+  SdTsCompilerOptions,
 } from "../types/ts-compiler.types";
-import { type ISdBuildMessage } from "../types/build.types";
+import { ISdBuildMessage } from "../types/build.types";
 import {
   createWorkerTransformer,
 } from "@angular/build/src/tools/angular/transformers/web-worker-transformer";

package/src/types/build-plugin.types.ts

@@ -1,5 +1,5 @@
 import esbuild from "esbuild";
-import { type TNormPath } from "@simplysm/sd-core-node";
+import { TNormPath } from "@simplysm/sd-core-node";
 
 export interface ISdCliServerPluginResultCache {
   watchFileSet?: Set<TNormPath>;

package/src/types/build-runner.types.ts

@@ -1,5 +1,5 @@
-import { type TNormPath } from "@simplysm/sd-core-node";
-import { type ISdProjectConfig } from "./config.types";
+import { TNormPath } from "@simplysm/sd-core-node";
+import { ISdProjectConfig } from "./config.types";
 
 export interface ISdBuildRunnerWorkerRequest {
   cmd: "watch" | "build";

package/src/types/build.types.ts

@@ -1,4 +1,4 @@
-import { type TNormPath } from "@simplysm/sd-core-node";
+import { TNormPath } from "@simplysm/sd-core-node";
 
 export interface ISdBuildRunnerResult {
   affectedFilePathSet: Set<TNormPath>;

package/src/types/ts-compiler.types.ts

@@ -1,7 +1,7 @@
-import { type CompilerOptions } from "typescript";
+import { CompilerOptions } from "typescript";
 import esbuild from "esbuild";
-import { type ISdBuildMessage } from "./build.types";
-import { type TNormPath } from "@simplysm/sd-core-node";
+import { ISdBuildMessage } from "./build.types";
+import { TNormPath } from "@simplysm/sd-core-node";
 
 export interface SdTsCompilerOptions {
   pkgPath: TNormPath;

package/src/types/worker.types.ts

@@ -1,5 +1,5 @@
-import { type ISdBuildRunnerWorkerRequest } from "./build-runner.types";
-import { type ISdBuildMessage, type ISdBuildRunnerResult } from "./build.types";
+import { ISdBuildRunnerWorkerRequest } from "./build-runner.types";
+import { ISdBuildMessage, ISdBuildRunnerResult } from "./build.types";
 
 export interface TServerWorkerType {
   methods: {

package/src/utils/sd-cli-convert-message.utils.ts

@@ -1,9 +1,9 @@
 import ts from "typescript";
 import os from "os";
 import path from "path";
-import { type PartialMessage } from "esbuild";
+import { PartialMessage } from "esbuild";
 import { ESLint } from "eslint";
-import { type ISdBuildMessage } from "../types/build.types";
+import { ISdBuildMessage } from "../types/build.types";
 import { PathUtils } from "@simplysm/sd-core-node";
 
 export class SdCliConvertMessageUtils {

package/src/workers/build-runner.worker.ts

@@ -1,12 +1,12 @@
 import { createSdWorker, FsUtils, SdLogger, SdLoggerSeverity } from "@simplysm/sd-core-node";
-import { type ISdBuildMessage } from "../types/build.types";
+import { ISdBuildMessage } from "../types/build.types";
 import path from "path";
 import { SdServerBuildRunner } from "../pkg-builders/server/sd-server.build-runner";
 import { SdClientBuildRunner } from "../pkg-builders/client/sd-client.build-runner";
 import { SdTsLibBuildRunner } from "../pkg-builders/lib/sd-ts-lib.build-runner";
 import { SdJsLibBuildRunner } from "../pkg-builders/lib/sd-js-lib.build-runner";
-import { type TSdBuildRunnerWorkerType } from "../types/worker.types";
-import { type ISdBuildRunnerWorkerRequest } from "../types/build-runner.types";
+import { TSdBuildRunnerWorkerType } from "../types/worker.types";
+import { ISdBuildRunnerWorkerRequest } from "../types/build-runner.types";
 import { EventEmitter } from "events";
 
 Error.stackTraceLimit = Infinity;

package/src/workers/server.worker.ts

@@ -3,7 +3,7 @@ import { pathToFileURL } from "url";
 import { SdServiceServer } from "@simplysm/sd-service-server";
 import { createSdWorker, SdLogger, SdLoggerSeverity } from "@simplysm/sd-core-node";
 import { EventEmitter } from "events";
-import { type TServerWorkerType } from "../types/worker.types";
+import { TServerWorkerType } from "../types/worker.types";
 
 Error.stackTraceLimit = Infinity;
 EventEmitter.defaultMaxListeners = 0;