@simplysm/sd-cli 7.1.10 → 7.1.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simplysm/sd-cli",
-  "version": "7.1.10",
+  "version": "7.1.14",
   "description": "심플리즘 패키지 - CLI",
   "author": "김석래",
   "repository": {
@@ -20,31 +20,30 @@
     "**/*"
   ],
   "dependencies": {
-    "@angular-architects/module-federation": "^14.3.10",
-    "@angular-devkit/build-angular": "^14.1.2",
-    "@angular/common": "^14.1.2",
-    "@angular/compiler": "^14.1.2",
-    "@angular/compiler-cli": "^14.1.2",
-    "@angular/core": "^14.1.2",
+    "@angular-devkit/build-angular": "^14.1.3",
+    "@angular/common": "^14.1.3",
+    "@angular/compiler": "^14.1.3",
+    "@angular/compiler-cli": "^14.1.3",
+    "@angular/core": "^14.1.3",
     "@babel/parser": "^7.18.11",
     "@babel/types": "^7.18.10",
     "@compodoc/compodoc": "^1.1.19",
-    "@ngtools/webpack": "^14.1.2",
-    "@simplysm/sd-core-common": "7.1.10",
-    "@simplysm/sd-core-node": "7.1.10",
-    "@simplysm/sd-service-common": "7.1.10",
-    "@simplysm/sd-service-server": "7.1.10",
-    "@simplysm/sd-storage": "7.1.10",
+    "@ngtools/webpack": "^14.1.3",
+    "@simplysm/sd-core-common": "7.1.14",
+    "@simplysm/sd-core-node": "7.1.14",
+    "@simplysm/sd-service-common": "7.1.14",
+    "@simplysm/sd-service-server": "7.1.14",
+    "@simplysm/sd-storage": "7.1.14",
     "browserslist": "^4.21.3",
     "chokidar": "^3.5.3",
     "connect": "^3.7.0",
     "copy-webpack-plugin": "^11.0.0",
     "cordova": "^11.0.0",
     "css-loader": "^6.7.1",
-    "electron": "^20.0.2",
+    "electron": "^20.0.3",
     "electron-builder": "^23.3.3",
     "electron-rebuild": "^3.2.9",
-    "eslint": "^8.21.0",
+    "eslint": "^8.22.0",
     "eslint-webpack-plugin": "^3.2.0",
     "jsdom": "^20.0.0",
     "jszip": "^3.10.1",
@@ -59,20 +58,20 @@
     "semver": "^7.3.7",
     "source-map-loader": "^4.0.0",
     "source-map-support": "^0.5.21",
-    "terser-webpack-plugin": "^5.3.3",
+    "terser-webpack-plugin": "^5.3.5",
     "ts-loader": "^9.3.1",
     "typedoc": "^0.23.10",
     "typescript": "~4.7.4",
     "webpack": "^5.74.0",
     "xml2js": "^0.4.23",
     "yargs": "^17.5.1",
-    "zone.js": "~0.11.4"
+    "zone.js": "~0.11.8"
   },
   "devDependencies": {
     "@types/connect": "^3.4.35",
     "@types/jsdom": "^20.0.0",
     "@types/mime": "^3.0.1",
-    "@types/semver": "^7.3.11",
+    "@types/semver": "^7.3.12",
     "@types/source-map-support": "^0.5.4",
     "@types/xml2js": "^0.4.11",
     "@types/yargs": "^17.0.11"

package/src/bin/sd-cli.ts

@@ -1,4 +1,4 @@
-#!/usr/bin/env node --experimental-specifier-resolution=node --experimental-import-meta-resolve
+#!/usr/bin/env node --no-warnings --experimental-specifier-resolution=node --experimental-import-meta-resolve
 
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";

package/src/builder/SdCliClientBuilder.ts

@@ -33,7 +33,6 @@ import electronBuilder from "electron-builder";
 import { fileURLToPath } from "url";
 import { Entrypoint } from "@angular-devkit/build-angular/src/utils/index-file/augment-index-html";
 import { StringUtil } from "@simplysm/sd-core-common";
-import mf from "@angular-architects/module-federation/webpack";
 import LintResult = ESLint.LintResult;
 
 export class SdCliClientBuilder extends EventEmitter {
@@ -97,7 +96,7 @@ export class SdCliClientBuilder extends EventEmitter {
   }
 
   private async _checkCacheAsync(watch: boolean): Promise<void> {
-    const projPkgLockContent = await FsUtil.readFileAsync(path.resolve(this._projRootPath, "package-lock.json"));
+    const projPkgLockContent = await FsUtil.readFileAsync(path.resolve(this._projRootPath, "yarn.lock"));
 
     // const cachePath = path.resolve(cacheBasePath, pkgVersion);
 
@@ -140,8 +139,8 @@ export class SdCliClientBuilder extends EventEmitter {
 
     // 빌드 준비
     const extModules = this._config.builder?.electron ? this._getExternalModules() : [];
-    const webpackConfigs = (Object.keys(this._config.builder ?? { web: {} }) as ("web" | "cordova" | "electron")[])
-      .map((builderType) => this._getWebpackConfig(true, builderType, extModules));
+    const webpackConfigs = await (Object.keys(this._config.builder ?? { web: {} }) as ("web" | "cordova" | "electron")[])
+      .mapAsync(async (builderType) => await this._getWebpackConfigAsync(true, builderType, extModules));
     const multiCompiler = webpack(webpackConfigs);
     await new Promise<void>((resolve, reject) => {
       // const invalidFiles: string[] = [];
@@ -227,7 +226,7 @@ export class SdCliClientBuilder extends EventEmitter {
     this._logger.debug("Webpack 빌드 수행...");
     const extModules = this._config.builder?.electron ? this._getExternalModules() : [];
     const builderTypes = (Object.keys(this._config.builder ?? { web: {} }) as ("web" | "cordova" | "electron")[]);
-    const webpackConfigs = builderTypes.map((builderType) => this._getWebpackConfig(false, builderType, extModules));
+    const webpackConfigs = await builderTypes.mapAsync(async (builderType) => await this._getWebpackConfigAsync(false, builderType, extModules));
     const multipleCompiler = webpack(webpackConfigs);
     const buildResults = await new Promise<ISdCliPackageBuildResult[]>((resolve, reject) => {
       multipleCompiler.run((err, multiStats) => {
@@ -302,7 +301,7 @@ export class SdCliClientBuilder extends EventEmitter {
             .toObject((item) => item, () => "*")
         }
       }, { space: 2 });
-      await FsUtil.writeFileAsync(path.resolve(electronSrcPath, "package-lock.json"), "");
+      await FsUtil.writeFileAsync(path.resolve(electronSrcPath, "yarn.lock"), "");
 
       await FsUtil.writeFileAsync(path.resolve(electronSrcPath, `.env`), [
         "NODE_ENV=production",
@@ -360,7 +359,7 @@ export class SdCliClientBuilder extends EventEmitter {
     ].map((p) => path.dirname(p));
   }
 
-  private _getWebpackConfig(watch: boolean, builderType: "web" | "cordova" | "electron", extModules: { name: string; exists: boolean }[]): webpack.Configuration {
+  private async _getWebpackConfigAsync(watch: boolean, builderType: "web" | "cordova" | "electron", extModules: { name: string; exists: boolean }[]): Promise<webpack.Configuration> {
     const projNpmConfig = this._getNpmConfig(this._projRootPath)!;
     const projName = projNpmConfig.name;
 
@@ -368,7 +367,7 @@ export class SdCliClientBuilder extends EventEmitter {
 
     const npmConfig = this._getNpmConfig(this._rootPath)!;
 
-    const projPkgLockContent = FsUtil.readFile(path.resolve(this._projRootPath, "package-lock.json"));
+    const projPkgLockContent = FsUtil.readFile(path.resolve(this._projRootPath, "yarn.lock"));
 
     const pkgKey = npmConfig.name.split("/").last()!;
     const publicPath = builderType === "web" ? `/${pkgKey}/` : watch ? `/${pkgKey}/${builderType}/` : ``;
@@ -403,16 +402,6 @@ export class SdCliClientBuilder extends EventEmitter {
     // 버전쓰기
     FsUtil.writeFile(path.resolve(this._cacheBasePath, "version"), versionHash);
 
-    // ModuleFederation 관련
-    const sharedMappings = new mf.SharedMappings();
-    sharedMappings.register(this._tsconfigFilePath, []);
-
-    const deps = SdCliNpmConfigUtil.getDependencies(npmConfig);
-    const shared = deps.defaults
-      .concat(deps.optionals)
-      .distinct()
-      .toObject((item) => item, () => ({ singleton: true, strictVersion: true, requiredVersion: "auto" }));
-
     let prevProgressMessage = "";
     return {
       mode: watch ? "development" : "production",
@@ -425,11 +414,7 @@ export class SdCliClientBuilder extends EventEmitter {
         symlinks: true,
         modules: [this._projRootPath, "node_modules"],
         mainFields: ["es2020", "es2015", "browser", "module", "main"],
-        conditionNames: ["es2020", "es2015", "..."],
-
-        ...this._config.moduleFederation ? {
-          alias: sharedMappings.getAliases()
-        } : {}
+        conditionNames: ["es2020", "es2015", "..."]
       },
       resolveLoader: {
         symlinks: true
@@ -452,11 +437,7 @@ export class SdCliClientBuilder extends EventEmitter {
         libraryTarget: undefined,
         crossOriginLoading: false,
         trustedTypes: "angular#bundler",
-        scriptType: "module",
-
-        ...this._config.moduleFederation ? {
-          publicPath: "auto"
-        } : {}
+        scriptType: "module"
       },
       watch: false,
       watchOptions: {
@@ -472,8 +453,7 @@ export class SdCliClientBuilder extends EventEmitter {
       experiments: {
         backCompat: false,
         syncWebAssembly: true,
-        asyncWebAssembly: true,
-        ...this._config.moduleFederation ? { outputModule: true } : {}
+        asyncWebAssembly: true
       },
       infrastructureLogging: { level: "error" },
       stats: "errors-warnings",
@@ -541,11 +521,7 @@ export class SdCliClientBuilder extends EventEmitter {
               test: /[\\/]node_modules[\\/]/
             } : false
           }
-        },
-
-        ...this._config.moduleFederation ? {
-          runtimeChunk: false
-        } : {}
+        }
       },
       module: {
         strictExportPresence: true,
@@ -566,7 +542,7 @@ export class SdCliClientBuilder extends EventEmitter {
             exclude: [/[/\\](?:core-js|@babel|tslib|web-animations-js|web-streams-polyfill)[/\\]/],
             use: [
               {
-                loader: "@angular-devkit/build-angular/src/babel/webpack-loader",
+                loader: fileURLToPath(await import.meta.resolve!("@angular-devkit/build-angular/src/babel/webpack-loader")),
                 options: {
                   cacheDirectory: path.resolve(this._cacheBasePath, "webpack-babel"),
                   scriptTarget: ts.ScriptTarget.ES2017,
@@ -581,7 +557,7 @@ export class SdCliClientBuilder extends EventEmitter {
             {
               test: /\.[cm]?jsx?$/,
               enforce: "pre" as const,
-              loader: "source-map-loader",
+              loader: fileURLToPath(await import.meta.resolve!("source-map-loader")),
               options: {
                 filterSourceMappingUrl: (mapUri: string, resourcePath: string) => {
                   const projRegex = new RegExp(`node_modules[\\\\/]@${projName}[\\\\/]`);
@@ -594,7 +570,7 @@ export class SdCliClientBuilder extends EventEmitter {
           ] : [],
           {
             test: /\.[cm]?tsx?$/,
-            loader: "@ngtools/webpack",
+            loader: fileURLToPath(await import.meta.resolve!("@ngtools/webpack")),
             exclude: [/[/\\](?:css-loader|mini-css-extract-plugin|webpack)[/\\]/]
           },
           {
@@ -612,7 +588,7 @@ export class SdCliClientBuilder extends EventEmitter {
                         loader: MiniCssExtractPlugin.loader
                       },
                       {
-                        loader: "css-loader",
+                        loader: fileURLToPath(await import.meta.resolve!("css-loader")),
                         options: { url: false, sourceMap: watch }
                       }
                     ],
@@ -628,11 +604,11 @@ export class SdCliClientBuilder extends EventEmitter {
               {
                 use: [
                   {
-                    loader: "resolve-url-loader",
+                    loader: fileURLToPath(await import.meta.resolve!("resolve-url-loader")),
                     options: { sourceMap: watch }
                   },
                   {
-                    loader: "sass-loader",
+                    loader: fileURLToPath(await import.meta.resolve!("sass-loader")),
                     options: {
                       implementation: sassImplementation,
                       sourceMap: true,
@@ -818,44 +794,7 @@ export class SdCliClientBuilder extends EventEmitter {
             }
             return resultMessages.join(os.EOL);
           }
-        }),
-        ...this._config.moduleFederation === "remote" ? [
-          new webpack.container.ModuleFederationPlugin({
-            library: { type: "module" },
-            name: npmConfig.name.replace(/[^0-9A-z]/g, "_"),
-            filename: "remoteEntry.js",
-            exposes: {
-              "./AppMfeModule": path.resolve(this._rootPath, "src/AppMfeModule")
-            },
-            shared: mf.share({
-              /*"@angular/core": { singleton: true, strictVersion: true, requiredVersion: "auto" },
-              "@angular/common": { singleton: true, strictVersion: true, requiredVersion: "auto" },
-              "@angular/common/http": { singleton: true, strictVersion: true, requiredVersion: "auto" },
-              "@angular/router": { singleton: true, strictVersion: true, requiredVersion: "auto" },
-              "@simplysm/sd-angular": { singleton: true, strictVersion: true, requiredVersion: "auto" },*/
-
-              ...shared,
-              ...sharedMappings.getDescriptors()
-            } as any, path.resolve(this._rootPath, "package.json"))
-          }),
-          sharedMappings.getPlugin()
-        ] : this._config.moduleFederation === "host" ? [
-          new webpack.container.ModuleFederationPlugin({
-            library: { type: "module" },
-            remotes: {},
-            shared: mf.share({
-              /*"@angular/core": { singleton: true, strictVersion: true, requiredVersion: "auto" },
-              "@angular/common": { singleton: true, strictVersion: true, requiredVersion: "auto" },
-              "@angular/common/http": { singleton: true, strictVersion: true, requiredVersion: "auto" },
-              "@angular/router": { singleton: true, strictVersion: true, requiredVersion: "auto" },
-              "@simplysm/sd-angular": { singleton: true, strictVersion: true, requiredVersion: "auto" },*/
-
-              ...shared,
-              ...sharedMappings.getDescriptors()
-            } as any, path.resolve(this._rootPath, "package.json"))
-          }),
-          sharedMappings.getPlugin()
-        ] : []
+        })
       ] as any[]
     };
   }

package/src/builder/SdCliServerBuilder.ts

@@ -15,6 +15,7 @@ import CopyWebpackPlugin from "copy-webpack-plugin";
 import { LicenseWebpackPlugin } from "license-webpack-plugin";
 import { SdCliNpmConfigUtil } from "../utils/SdCliNpmConfigUtil";
 import { createHash } from "crypto";
+import { fileURLToPath } from "url";
 import LintResult = ESLint.LintResult;
 
 export class SdCliServerBuilder extends EventEmitter {
@@ -44,7 +45,7 @@ export class SdCliServerBuilder extends EventEmitter {
   }
 
   private async _checkCacheAsync(watch: boolean): Promise<void> {
-    const projPkgLockContent = await FsUtil.readFileAsync(path.resolve(this._projRootPath, "package-lock.json"));
+    const projPkgLockContent = await FsUtil.readFileAsync(path.resolve(this._projRootPath, "yarn.lock"));
 
     // const cachePath = path.resolve(cacheBasePath, pkgVersion);
 
@@ -77,7 +78,7 @@ export class SdCliServerBuilder extends EventEmitter {
 
     // 빌드 준비
     const extModules = this._getExternalModules();
-    const webpackConfig = this._getWebpackConfig(true, extModules);
+    const webpackConfig = await this._getWebpackConfigAsync(true, extModules);
     const compiler = webpack(webpackConfig);
     await new Promise<void>((resolve, reject) => {
       compiler.hooks.watchRun.tapAsync(this.constructor.name, (args, callback) => {
@@ -119,7 +120,7 @@ export class SdCliServerBuilder extends EventEmitter {
     // 빌드
     this._logger.debug("Webpack 빌드 수행...");
     const extModules = this._getExternalModules();
-    const webpackConfig = this._getWebpackConfig(false, extModules);
+    const webpackConfig = await this._getWebpackConfigAsync(false, extModules);
     const compiler = webpack(webpackConfig);
     const buildResults = await new Promise<ISdCliPackageBuildResult[]>((resolve, reject) => {
       compiler.run((err, stats) => {
@@ -254,7 +255,7 @@ export class SdCliServerBuilder extends EventEmitter {
     ].map((p) => path.dirname(p));
   }
 
-  private _getWebpackConfig(watch: boolean, extModules: { name: string; exists: boolean }[]): webpack.Configuration {
+  private async _getWebpackConfigAsync(watch: boolean, extModules: { name: string; exists: boolean }[]): Promise<webpack.Configuration> {
     const projNpmConfig = this._getNpmConfig(this._projRootPath)!;
     const projName = projNpmConfig.name;
 
@@ -367,7 +368,7 @@ export class SdCliServerBuilder extends EventEmitter {
             {
               test: /\.[cm]?jsx?$/,
               enforce: "pre" as const,
-              loader: "source-map-loader",
+              loader: fileURLToPath(await import.meta.resolve!("source-map-loader")),
               options: {
                 filterSourceMappingUrl: (mapUri: string, resourcePath: string) => {
                   const projRegex = new RegExp(`node_modules[\\\\/]@${projName}[\\\\/]`);
@@ -381,7 +382,7 @@ export class SdCliServerBuilder extends EventEmitter {
           {
             test: /\.[cm]?tsx?$/,
             exclude: /node_modules/,
-            loader: "ts-loader",
+            loader: fileURLToPath(await import.meta.resolve!("ts-loader")),
             options: {
               configFile: this._tsconfigFilePath,
               errorFormatter: (msg: ErrorInfo) => {

package/src/commons.ts

@@ -75,7 +75,6 @@ export interface ISdCliServerPackageConfig {
 
 export interface ISdCliClientPackageConfig {
   type: "client";
-  moduleFederation?: "host" | "remote";
   builder?: {
     web?: ISdCliClientBuilderWebConfig;
     cordova?: ISdCliClientBuilderCordovaConfig;

package/src/entry-points/SdCliProjectGenerator.ts

@@ -35,8 +35,8 @@ export class SdCliProjectGenerator {
   }
 
   public async initAsync(opt: { name?: string; description: string; author: string; gitUrl: string }): Promise<void> {
-    if ((await FsUtil.readdirAsync(this._rootPath)).filter((item) => ![".idea", "yarn.lock", "package.json", ".yarn"].includes(path.basename(item))).length > 0) {
-      throw new Error("빈 디렉토리가 아닙니다. (.idea, yarn.lock, package.json, .yarn 외의 파일/폴더가 존재하는 경우, 초기화할 수 없습니다.)");
+    if ((await FsUtil.readdirAsync(this._rootPath)).filter((item) => ![".idea", "yarn.lock", "package.json", ".yarn", ".yarnrc.yml", "node_modules"].includes(path.basename(item))).length > 0) {
+      throw new Error("빈 디렉토리가 아닙니다. (.idea, yarn.lock, package.json, .yarn, .yarnrc.yml, node_modules 외의 파일/폴더가 존재하는 경우, 초기화할 수 없습니다.)");
     }
 
     const projName = opt.name ?? path.basename(this._rootPath);
@@ -54,7 +54,7 @@ export class SdCliProjectGenerator {
     await FsUtil.writeFileAsync(path.resolve(this._rootPath, ".gitignore"), fc_project_gitignore());
 
     this._logger.log(`[${projName}] '.yarnrc.yml' 파일 생성`);
-    await FsUtil.writeFileAsync(path.resolve(this._rootPath, ".gitignore"), fc_project_yarnrc());
+    await FsUtil.writeFileAsync(path.resolve(this._rootPath, ".yarnrc.yml"), fc_project_yarnrc());
 
     this._logger.log(`[${projName}] 'package.json' 파일 생성`);
     let cliVersion: string | undefined;
@@ -87,6 +87,9 @@ export class SdCliProjectGenerator {
     this._logger.log(`[${projName}] 'packages' 디렉토리 생성`);
     await FsUtil.mkdirsAsync(path.resolve(this._rootPath, "packages"));
 
+    this._logger.log(`[${projName}] yarn plugin import interactive-tools`);
+    await SdProcess.spawnAsync("yarn plugin import interactive-tools", { cwd: this._rootPath }, true);
+
     this._logger.log(`[${projName}] yarn install`);
     await SdProcess.spawnAsync("yarn install", { cwd: this._rootPath }, true);
   }
@@ -262,7 +265,8 @@ export class SdCliProjectGenerator {
       isForAngular: true,
       dependencies: {
         "@angular/platform-browser": "^14.1.1",
-        "@angular/platform-browser-dynamic": "^14.1.1"
+        "@angular/platform-browser-dynamic": "^14.1.1",
+        "@angular/compiler": "^14.1.1"
       },
       tsconfigOptions: {
         angularCompilerOptions: {

package/src/entry-points/file/project/fc_project_npmconfig.ts

@@ -19,11 +19,11 @@ export const fc_project_npmconfig = (opt: { name: string; description: string; a
     "test"
   ],
   scripts: {
-    "watch": "sd-cli watch",
-    "build": "sd-cli build",
-    "publish": "sd-cli publish",
+    "watch": "npx sd-cli watch",
+    "build": "npx sd-cli build",
+    "publish": "npx sd-cli publish",
     "----- utils": "",
-    "postinstall": "sd-cli prepare"
+    "postinstall": "npx sd-cli prepare"
   },
   devDependencies: {
     "@simplysm/eslint-plugin": "~7.1.0",

package/src/entry-points/file/project/fc_project_tsconfig.ts

@@ -13,7 +13,7 @@ export const fc_project_tsconfig = (): string => JSON.stringify({
     noImplicitAny: false,
     useUnknownInCatchVariables: false,
     noFallthroughCasesInSwitch: true,
-    inlineSourceMap: true,
+    sourceMap: true,
     skipDefaultLibCheck: true,
     skipLibCheck: true,
     forceConsistentCasingInFileNames: true,

package/src/entry-points/file/project/fc_project_yarnrc.ts

@@ -1,18 +1,5 @@
 export const fc_project_yarnrc = (): string => /* language=yml */ `
 nodeLinker: node-modules
-
-packageExtensions:
-  "@angular-architects/module-federation-runtime@*":
-    dependencies:
-      "@angular/common": ^14.0.0
-      "@angular/core": ^14.0.0
-      rxjs: ^7.4.0
-      zone.js: ~0.11.4
-
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: "@yarnpkg/plugin-interactive-tools"
-
 yarnPath: .yarn/releases/yarn-3.2.2.cjs
 
 `.trim();

package/src/ng-tools/SdCliNgModuleGenerator.ts

@@ -502,7 +502,7 @@ export class SdCliNgModuleGenerator {
           fnResult += "  {\n";
           fnResult += `    path: "${child.path}",\n`;
           if ("target" in child) {
-            fnResult += `    loadChildren: async () => await import("${this._getFileImportModuleName(def.filePath, child.target.filePath)}").then((m) => m.${child.target.name})\n`;
+            fnResult += `    loadChildren: () => import("${this._getFileImportModuleName(def.filePath, child.target.filePath)}").then((m) => m.${child.target.name})\n`;
           }
           else {
             fnResult += `    children: ${fn(child.children).replace(/\n/g, "\n  ")}\n`;