@simplysm/sd-cli 12.4.1 → 12.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simplysm/sd-cli",
-  "version": "12.4.1",
+  "version": "12.5.1",
   "description": "심플리즘 패키지 - CLI",
   "author": "김석래",
   "repository": {
@@ -14,37 +14,38 @@
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "engines": {
-    "node": "18.18.2"
+    "node": "20.16.0"
   },
   "scripts": {
-    "postinstall": "node --experimental-import-meta-resolve lib/postinstall.js"
+    "postinstall": "node lib/postinstall.js"
   },
   "dependencies": {
-    "@angular/build": "^18.2.1",
-    "@angular/compiler": "^18.2.1",
-    "@angular/compiler-cli": "^18.2.1",
+    "@angular/build": "^18.2.3",
+    "@angular/compiler": "^18.2.3",
+    "@angular/compiler-cli": "^18.2.3",
     "@electron/rebuild": "^3.6.0",
-    "@simplysm/sd-core-common": "12.4.1",
-    "@simplysm/sd-core-node": "12.4.1",
-    "@simplysm/sd-service-server": "12.4.1",
-    "@simplysm/sd-storage": "12.4.1",
+    "@simplysm/sd-core-common": "12.5.1",
+    "@simplysm/sd-core-node": "12.5.1",
+    "@simplysm/sd-service-server": "12.5.1",
+    "@simplysm/sd-storage": "12.5.1",
     "browserslist": "^4.23.3",
     "cordova": "^12.0.0",
-    "electron": "^32.0.1",
-    "electron-builder": "^23.6.0",
+    "electron": "^32.0.2",
+    "electron-builder": "^25.0.5",
     "esbuild": "^0.23.1",
-    "eslint": "^8.57.0",
+    "eslint": "^9.9.1",
     "jszip": "^3.10.1",
     "node-stdlib-browser": "^1.2.0",
     "rxjs": "^7.8.1",
-    "sass": "^1.77.8",
+    "sass": "^1.78.0",
     "semver": "^7.6.3",
+    "specifier-resolution-node": "^1.1.4",
     "typescript": "~5.5.4",
     "xml2js": "^0.6.2",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@types/eslint": "^8.56.12",
+    "@types/eslint": "^9.6.1",
     "@types/xml2js": "^0.4.14",
     "@types/yargs": "^17.0.33"
   }

package/src/build-tools/SdCliNgRoutesFileGenerator.ts

@@ -67,7 +67,7 @@ import {Routes} from "@angular/router";
 export const routes: Routes = [
 ${fn(result, 2)}
 ];`.trim();
-    if (content.trim() !== cache?.trim()) {
+    if (content !== cache) {
       await FsUtil.writeFileAsync(routesFilePath, content);
     }
     return content;

package/src/build-tools/SdLinter.ts

@@ -1,56 +1,59 @@
-import {ISdCliPackageBuildResult} from "../commons";
-import {ESLint} from "eslint";
+import { ISdCliPackageBuildResult } from "../commons";
+import { ESLint } from "eslint";
 import ts from "typescript";
-import {FsUtil} from "@simplysm/sd-core-node";
+import { FsUtil } from "@simplysm/sd-core-node";
 
 export abstract class SdLinter {
-  static async lintAsync(fileSet: Iterable<string>, tsProgram: ts.Program | undefined): Promise<ISdCliPackageBuildResult[]> {
-    const lintFilePaths = Array.from(fileSet).filter((item) =>
-      (!item.endsWith(".d.ts") && item.endsWith(".ts")) ||
-      item.endsWith(".js") ||
-      item.endsWith(".cjs") ||
-      item.endsWith(".mjs")
-    ).filter((item) => FsUtil.exists(item));
+  static async lintAsync(
+    fileSet: Iterable<string>,
+    tsProgram: ts.Program | undefined
+  ): Promise<ISdCliPackageBuildResult[]> {
+    const lintFilePaths = Array.from(fileSet)
+      .filter(
+        (item) =>
+          (!item.endsWith(".d.ts") && item.endsWith(".ts")) ||
+          item.endsWith(".js") ||
+          item.endsWith(".cjs") ||
+          item.endsWith(".mjs")
+      )
+      .filter((item) => FsUtil.exists(item));
 
     if (lintFilePaths.length === 0) {
       return [];
     }
 
-    const linter = new ESLint(tsProgram != null ? {
-      cache: false,
-      overrideConfig: {
-        overrides: [
-          {
-            files: ["*.ts"],
-            parserOptions: {
-              programs: [tsProgram],
-              tsconfigRootDir: null,
-              project: null
-            }/*,
-            settings: {
-              "import/resolver": {
-                "typescript": {
+    const linter = new ESLint(
+      tsProgram != null
+        ? {
+          cache: false,
+          overrideConfig: [
+            {
+              files: ["**/*.ts"],
+              languageOptions: {
+                parserOptions: {
                   programs: [tsProgram],
-                  project: null
+                  project: null,
+                  tsconfigRootDir: null
                 }
               }
-            }*/
-          }
-        ]
-      }
-    } : undefined);
-
+            }
+          ]
+        }
+        : undefined
+    );
 
     const lintResults = await linter.lintFiles(lintFilePaths);
 
-    return lintResults.mapMany((lintResult) => lintResult.messages.map((msg) => ({
-      filePath: lintResult.filePath,
-      line: msg.line,
-      char: msg.column,
-      code: msg.messageId,
-      severity: msg.severity === 1 ? "warning" as const : "error" as const,
-      message: msg.message + (msg.ruleId != null ? ` (${msg.ruleId})` : ``),
-      type: "lint" as const
-    })));
+    return lintResults.mapMany((lintResult) =>
+      lintResult.messages.map((msg) => ({
+        filePath: lintResult.filePath,
+        line: msg.line,
+        char: msg.column,
+        code: msg.messageId,
+        severity: msg.severity === 1 ? ("warning" as const) : ("error" as const),
+        message: msg.message + (msg.ruleId != null ? ` (${msg.ruleId})` : ``),
+        type: "lint" as const
+      }))
+    );
   }
 }

package/src/build-tools/SdNgBundler.ts

@@ -10,10 +10,22 @@ import {SdNgBundlerContext} from "./SdNgBundlerContext";
 import {INgPluginResultCache, sdNgPlugin} from "../bundle-plugins/sdNgPlugin";
 import ts from "typescript";
 import {MemoryLoadResultCache} from "@angular/build/src/tools/esbuild/load-result-cache";
-import {convertOutputFile, createOutputFile, transformSupportedBrowsersToTargets} from "@angular/build/src/tools/esbuild/utils";
-import {BuildOutputFile, BuildOutputFileType, InitialFileRecord} from "@angular/build/src/tools/esbuild/bundler-context";
+import {
+  convertOutputFile,
+  createOutputFile,
+  transformSupportedBrowsersToTargets
+} from "@angular/build/src/tools/esbuild/utils";
+import {
+  BuildOutputFile,
+  BuildOutputFileType,
+  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 {
+  HintMode,
+  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";
@@ -62,7 +74,7 @@ export class SdNgBundler {
     this.#mainFilePath = path.resolve(opt.pkgPath, "src/main.ts");
     this.#tsConfigFilePath = path.resolve(opt.pkgPath, "tsconfig.json");
     this.#swConfFilePath = path.resolve(opt.pkgPath, "ngsw-config.json");
-    this.#browserTarget = transformSupportedBrowsersToTargets(browserslist(["last 2 Chrome versions", "last 2 Edge versions"]));
+    this.#browserTarget = transformSupportedBrowsersToTargets(browserslist(opt.browserslist ?? ["last 2 Chrome versions", "last 2 Edge versions"]));
     this.#indexHtmlFilePath = path.resolve(opt.pkgPath, "src/index.html");
     this.#pkgName = path.basename(opt.pkgPath);
     this.#baseHref = opt.builderType === "web" ? `/${this.#pkgName}/` : opt.dev ? `/${this.#pkgName}/${opt.builderType}/` : ``;
@@ -86,7 +98,7 @@ export class SdNgBundler {
 
     if (!this.#contexts) {
       this.#contexts = [
-        await this._getAppContextAsync(),
+        this._getAppContext(),
         this._getStyleContext(),
         ...this.#opt.builderType === "electron" ? [
           this._getElectronMainContext()
@@ -357,7 +369,7 @@ export class SdNgBundler {
     );
   }
 
-  private async _getAppContextAsync(): Promise<SdNgBundlerContext> {
+  private _getAppContext() {
     return new SdNgBundlerContext(this.#opt.pkgPath, {
       absWorkingDir: this.#opt.pkgPath,
       bundle: true,
@@ -435,7 +447,7 @@ export class SdNgBundler {
         ".mp3": "file",
         ".ogg": "file"
       },
-      inject: [PathUtil.posix(fileURLToPath(await import.meta.resolve!("node-stdlib-browser/helpers/esbuild/shim")))],
+      inject: [PathUtil.posix(fileURLToPath(import.meta.resolve("node-stdlib-browser/helpers/esbuild/shim")))],
       plugins: [
         ...this.#opt.builderType === "cordova" && this.#opt.cordovaConfig?.plugins ? [{
           name: "cordova:plugin-empty",
@@ -594,4 +606,5 @@ interface IOptions {
   builderType: string;
   env: Record<string, string> | undefined;
   cordovaConfig: ISdCliClientBuilderCordovaConfig | undefined;
+  browserslist: string[] | undefined;
 }

package/src/builders/SdCliClientBuilder.ts

@@ -142,6 +142,7 @@ export class SdCliClientBuilder extends EventEmitter {
           ...this._pkgConf.env,
           ...this._pkgConf.builder?.[builderType]?.env
         },
+        browserslist: this._pkgConf.builder?.[builderType]?.browserslist,
         cordovaConfig: builderType === "cordova" ? this._pkgConf.builder!.cordova : undefined,
       }));
     }
@@ -187,7 +188,7 @@ export class SdCliClientBuilder extends EventEmitter {
     return {
       watchFileSet: currWatchFileSet,
       affectedFileSet,
-      buildResults: [...results, ...lintResults]
+      buildResults: [...results, ...lintResults].filter(item => item.filePath !== path.resolve(this._pkgPath, "src/routes.ts"))
     };
   }
 

package/src/commons.ts

@@ -122,12 +122,14 @@ export interface ISdCliClientBuilderElectronConfig {
   // devServerPort?: number;
   reinstallDependencies?: string[];
   env?: Record<string, string>;
+  browserslist?: string[];
 }
 
 export interface ISdCliClientBuilderWebConfig {
   // devServerHost?: string;
   // devServerPort?: number;
   env?: Record<string, string>;
+  browserslist?: string[];
 }
 
 export interface ISdCliClientBuilderCordovaConfig {
@@ -153,8 +155,9 @@ export interface ISdCliClientBuilderCordovaConfig {
         maxSdkVersion?: number;
       }[];
     }
-  }
+  };
   env?: Record<string, string>;
+  browserslist?: string[];
 }
 
 export type TSdCliPostPublishConfig = ISdCliPostPublishScriptConfig;