@simplysm/sd-cli 7.0.266 → 7.0.269

package/src/builder/SdCliServerBuilder.ts

@@ -28,7 +28,7 @@ export class SdCliServerBuilder extends EventEmitter {
 
   public constructor(private readonly _rootPath: string,
                      private readonly _config: ISdCliServerPackageConfig,
-                     private readonly _workspaceRootPath: string) {
+                     private readonly _projRootPath: string) {
     super();
 
     // tsconfig
@@ -44,12 +44,12 @@ export class SdCliServerBuilder extends EventEmitter {
   }
 
   private async _checkCacheAsync(watch: boolean): Promise<void> {
-    const workspacePkgLockContent = await FsUtil.readFileAsync(path.resolve(this._workspaceRootPath, "package-lock.json"));
+    const projPkgLockContent = await FsUtil.readFileAsync(path.resolve(this._projRootPath, "package-lock.json"));
 
     // const cachePath = path.resolve(cacheBasePath, pkgVersion);
 
     const versionHash = createHash("sha1")
-      .update(workspacePkgLockContent)
+      .update(projPkgLockContent)
       .update(JSON.stringify(this._parsedTsconfig.options))
       .update(JSON.stringify(this._config))
       .update(watch.toString())
@@ -246,18 +246,18 @@ export class SdCliServerBuilder extends EventEmitter {
     );
   }
 
-  private _getInternalModuleCachePaths(workspaceName: string): string[] {
+  private _getInternalModuleCachePaths(projName: string): string[] {
     return [
-      ...FsUtil.findAllParentChildDirPaths("node_modules/*/package.json", this._rootPath, this._workspaceRootPath),
-      ...FsUtil.findAllParentChildDirPaths(`node_modules/!(@simplysm|@${workspaceName})/*/package.json`, this._rootPath, this._workspaceRootPath),
+      ...FsUtil.findAllParentChildDirPaths("node_modules/*/package.json", this._rootPath, this._projRootPath),
+      ...FsUtil.findAllParentChildDirPaths(`node_modules/!(@simplysm|@${projName})/*/package.json`, this._rootPath, this._projRootPath),
     ].map((p) => path.dirname(p));
   }
 
   private _getWebpackConfig(watch: boolean, extModules: { name: string; exists: boolean }[]): webpack.Configuration {
-    const workspaceNpmConfig = this._getNpmConfig(this._workspaceRootPath)!;
-    const workspaceName = workspaceNpmConfig.name;
+    const projNpmConfig = this._getNpmConfig(this._projRootPath)!;
+    const projName = projNpmConfig.name;
 
-    const internalModuleCachePaths = watch ? this._getInternalModuleCachePaths(workspaceName) : undefined;
+    const internalModuleCachePaths = watch ? this._getInternalModuleCachePaths(projName) : undefined;
 
     const npmConfig = this._getNpmConfig(this._rootPath)!;
     const pkgKey = npmConfig.name.split("/").last()!;
@@ -274,14 +274,14 @@ export class SdCliServerBuilder extends EventEmitter {
         roots: [this._rootPath],
         extensions: [".ts", ".js", ".mjs", ".cjs"],
         symlinks: true,
-        modules: [this._workspaceRootPath, "node_modules"],
+        modules: [this._projRootPath, "node_modules"],
         mainFields: ["es2020", "default", "module", "main"],
         conditionNames: ["es2020", "..."]
       },
       resolveLoader: {
         symlinks: true
       },
-      context: this._workspaceRootPath,
+      context: this._projRootPath,
       entry: {
         main: [
           path.resolve(this._rootPath, "src/main.ts")
@@ -369,10 +369,10 @@ export class SdCliServerBuilder extends EventEmitter {
               loader: "source-map-loader",
               options: {
                 filterSourceMappingUrl: (mapUri: string, resourcePath: string) => {
-                  const workspaceRegex = new RegExp(`node_modules[\\\\/]@${workspaceName}[\\\\/]`);
+                  const projRegex = new RegExp(`node_modules[\\\\/]@${projName}[\\\\/]`);
                   return !resourcePath.includes("node_modules")
                     || (/node_modules[\\/]@simplysm[\\/]/).test(resourcePath)
-                    || workspaceRegex.test(resourcePath);
+                    || projRegex.test(resourcePath);
                 }
               }
             }
@@ -435,7 +435,7 @@ export class SdCliServerBuilder extends EventEmitter {
         }),
         new ESLintWebpackPlugin({
           context: this._rootPath,
-          eslintPath: path.resolve(this._workspaceRootPath, "node_modules", "eslint"),
+          eslintPath: path.resolve(this._projRootPath, "node_modules", "eslint"),
           exclude: ["node_modules"],
           extensions: ["ts", "js", "mjs", "cjs"],
           fix: false,
@@ -489,7 +489,7 @@ export class SdCliServerBuilder extends EventEmitter {
         if (loadedModuleNames.includes(moduleName)) continue;
         loadedModuleNames.push(moduleName);
 
-        const modulePath = FsUtil.findAllParentChildDirPaths("node_modules/" + moduleName, currPath, this._workspaceRootPath).first();
+        const modulePath = FsUtil.findAllParentChildDirPaths("node_modules/" + moduleName, currPath, this._projRootPath).first();
         if (StringUtil.isNullOrEmpty(modulePath)) {
           continue;
         }
@@ -509,7 +509,7 @@ export class SdCliServerBuilder extends EventEmitter {
         if (loadedModuleNames.includes(optModuleName)) continue;
         loadedModuleNames.push(optModuleName);
 
-        const optModulePath = FsUtil.findAllParentChildDirPaths("node_modules/" + optModuleName, currPath, this._workspaceRootPath).first();
+        const optModulePath = FsUtil.findAllParentChildDirPaths("node_modules/" + optModuleName, currPath, this._projRootPath).first();
         if (StringUtil.isNullOrEmpty(optModulePath)) {
           results.push({ name: optModuleName, exists: false });
           continue;

package/src/builder/SdCliTsLibBuilder.ts

@@ -41,7 +41,7 @@ export class SdCliTsLibBuilder extends EventEmitter {
 
   public constructor(private readonly _rootPath: string,
                      private readonly _config: ISdCliLibPackageConfig,
-                     private readonly _workspaceRootPath: string) {
+                     private readonly _projRootPath: string) {
     super();
     const npmConfig = this._getNpmConfig(this._rootPath)!;
 
@@ -212,15 +212,15 @@ export class SdCliTsLibBuilder extends EventEmitter {
   }
 
   private async getAllRelatedPathsAsync(): Promise<string[]> {
-    const workspaceNpmConfig = this._getNpmConfig(this._workspaceRootPath)!;
-    const workspaceName = workspaceNpmConfig.name;
+    const projNpmConfig = this._getNpmConfig(this._projRootPath)!;
+    const projName = projNpmConfig.name;
 
     const fileCachePaths = Array.from(this._fileCache.keys())
       .filter((filePath) => {
-        const workspaceRegex = new RegExp(`node_modules[\\\\/]@${workspaceName}[\\\\/]`);
+        const projRegex = new RegExp(`node_modules[\\\\/]@${projName}[\\\\/]`);
         return !filePath.includes("node_modules")
           || (/node_modules[\\/]@simplysm[\\/]/).test(filePath)
-          || workspaceRegex.test(filePath);
+          || projRegex.test(filePath);
       });
     const mySourceGlobPath = path.resolve(this._rootPath, "**", "+(*.js|*.cjs|*.mjs|*.ts|*.scss)");
     const mySourceFilePaths = await FsUtil.globAsync(mySourceGlobPath, {

package/src/entry-points/{SdCliWorkspace.ts → SdCliProject.ts}

@@ -11,7 +11,7 @@ import { SdCliLocalUpdate } from "./SdCliLocalUpdate";
 import { fileURLToPath } from "url";
 import cp from "child_process";
 
-export class SdCliWorkspace {
+export class SdCliProject {
   private readonly _logger = Logger.get(["simplysm", "sd-cli", this.constructor.name]);
 
   private readonly _npmConfig: INpmConfig;
@@ -225,6 +225,8 @@ export class SdCliWorkspace {
 
     this._logger.debug("배포 시작...");
     await pkgs.parallelAsync(async (pkg) => {
+      if (pkg.config.publish == null) return;
+
       this._logger.debug(`[${pkg.name}] 배포를 시작합니다...`);
       await pkg.publishAsync();
       this._logger.debug(`[${pkg.name}] 배포가 완료되었습니다.`);

package/src/entry-points/SdCliProjectGenerator.ts

@@ -275,7 +275,7 @@ export class SdCliProjectGenerator {
 
     this._logger.log(`[${pkgName}] 'src/index.html' 파일 등록`);
     await FsUtil.writeFileAsync(path.resolve(pkgPath, "src/index.html"), fc_package_index({
-      description: opt.description
+      description: projNpmConfig.description + " - " + opt.description
     }));
 
     this._logger.log(`[${pkgName}] 'src/main.ts' 파일 등록`);
@@ -283,7 +283,7 @@ export class SdCliProjectGenerator {
 
     this._logger.log(`[${pkgName}] 'src/manifest.json' 파일 등록`);
     await FsUtil.writeFileAsync(path.resolve(pkgPath, "src/manifest.json"), fc_package_manifest({
-      description: projNpmConfig.description,
+      description: projNpmConfig.description + " - " + opt.description,
       author: projNpmConfig.author,
       version: projNpmConfig.version
     }));

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

@@ -9,7 +9,6 @@ export const fc_project_tsconfig = (): string => JSON.stringify({
     strict: true,
     moduleResolution: "node",
     esModuleInterop: true,
-    noImplicitOverride: true,
     noImplicitReturns: true,
     noImplicitAny: false,
     useUnknownInCatchVariables: false,

package/src/index.ts

@@ -36,8 +36,8 @@ export * from "./entry-points/SdCliFileCrypto";
 export * from "./entry-points/SdCliLocalUpdate";
 export * from "./entry-points/SdCliNpm";
 export * from "./entry-points/SdCliPrepare";
+export * from "./entry-points/SdCliProject";
 export * from "./entry-points/SdCliProjectGenerator";
-export * from "./entry-points/SdCliWorkspace";
 export * from "./ng-tools/babel/SdCliBbFileMetadata";
 export * from "./ng-tools/babel/SdCliBbRootMetadata";
 export * from "./ng-tools/babel/SdCliBbUtil";

package/src/packages/SdCliPackage.ts

@@ -14,7 +14,7 @@ export class SdCliPackage extends EventEmitter {
   private readonly _npmConfig: INpmConfig;
 
   public get basename(): string {
-    return path.basename(this._workspaceRootPath);
+    return path.basename(this._projRootPath);
   }
 
   public get name(): string {
@@ -32,7 +32,7 @@ export class SdCliPackage extends EventEmitter {
     ].distinct();
   }
 
-  public constructor(private readonly _workspaceRootPath: string,
+  public constructor(private readonly _projRootPath: string,
                      public readonly rootPath: string,
                      public readonly config: TSdCliPackageConfig) {
     super();
@@ -216,7 +216,7 @@ export class SdCliPackage extends EventEmitter {
           cmd,
           this.rootPath,
           JsonConvert.stringify(this.config),
-          this._workspaceRootPath
+          this._projRootPath
         ],
         {
           stdio: ["pipe", "pipe", "pipe", "ipc"],

package/src/worker/build-worker.ts

@@ -23,19 +23,19 @@ else {
 const type = process.argv[2] as ("build" | "watch");
 const rootPath = process.argv[3];
 const config = JsonConvert.parse(process.argv[4]) as TSdCliPackageConfig;
-const workspaceRootPath = process.argv[5];
+const projRootPath = process.argv[5];
 
 function createBuilder(): SdCliJsLibBuilder | SdCliTsLibBuilder | SdCliServerBuilder | SdCliClientBuilder {
   const isTs = FsUtil.exists(path.resolve(rootPath, "tsconfig.json"));
 
   if (config.type === "library") {
-    return isTs ? new SdCliTsLibBuilder(rootPath, config, workspaceRootPath) : new SdCliJsLibBuilder(rootPath);
+    return isTs ? new SdCliTsLibBuilder(rootPath, config, projRootPath) : new SdCliJsLibBuilder(rootPath);
   }
   else if (config.type === "server") {
-    return new SdCliServerBuilder(rootPath, config, workspaceRootPath);
+    return new SdCliServerBuilder(rootPath, config, projRootPath);
   }
   else {
-    return new SdCliClientBuilder(rootPath, config, workspaceRootPath);
+    return new SdCliClientBuilder(rootPath, config, projRootPath);
   }
 }