@simplysm/sd-cli 7.1.10 → 7.1.11

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/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

@@ -9,10 +9,6 @@ packageExtensions:
       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`;