Merge pull request #4822 from abpframework/Cli-added-Angular-option-to-NpmApplicationType

Cli: added Angular option to NpmApplicationType

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmApplicationType.cs

@@ -5,6 +5,7 @@ namespace Volo.Abp.Cli.ProjectModification
     [Flags]
     public enum NpmApplicationType
     {
-        Mvc = 1
+        Mvc = 1,
+        Angular = 2
     }
-}
+}

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs

@@ -39,7 +39,7 @@ namespace Volo.Abp.Cli.ProjectModification
             EfCoreMigrationAdder efCoreMigrationAdder,
             DerivedClassFinder derivedClassFinder,
             ProjectNpmPackageAdder projectNpmPackageAdder,
-            NpmGlobalPackagesChecker npmGlobalPackagesChecker, 
+            NpmGlobalPackagesChecker npmGlobalPackagesChecker,
             IRemoteServiceExceptionHandler remoteServiceExceptionHandler,
             SourceCodeDownloadService sourceCodeDownloadService,
             SolutionFileModifier solutionFileModifier,
@@ -159,7 +159,7 @@ namespace Volo.Abp.Cli.ProjectModification
             {
                 Directory.Delete(demoFolder, true);
             }
-            
+
             var hostFolder = Path.Combine(targetModuleFolder, "host");
             if (Directory.Exists(hostFolder))
             {
@@ -186,7 +186,9 @@ namespace Volo.Abp.Cli.ProjectModification
                 await ProjectNugetPackageAdder.AddAsync(targetProjectFile, nugetPackage);
             }
 
-            if (!module.NpmPackages.IsNullOrEmpty())
+            var mvcNpmPackages = module.NpmPackages?.Where(p => p.ApplicationType.HasFlag(NpmApplicationType.Mvc)).ToList();
+
+            if (!mvcNpmPackages.IsNullOrEmpty())
             {
                 var targetProjects = ProjectFinder.FindNpmTargetProjectFile(projectFiles);
                 if (targetProjects.Any())
@@ -195,8 +197,7 @@ namespace Volo.Abp.Cli.ProjectModification
 
                     foreach (var targetProject in targetProjects)
                     {
-                        foreach (var npmPackage in module.NpmPackages.Where(p =>
+                        foreach (var npmPackage in mvcNpmPackages)
-                            p.ApplicationType.HasFlag(NpmApplicationType.Mvc)))
                         {
                             await ProjectNpmPackageAdder.AddAsync(Path.GetDirectoryName(targetProject), npmPackage);
                         }
@@ -222,7 +223,7 @@ namespace Volo.Abp.Cli.ProjectModification
             }
 
             var dbMigrationsProject = projectFiles.FirstOrDefault(p => p.EndsWith(".DbMigrations.csproj"));
-            
+
             if (dbMigrationsProject == null)
             {
                 Logger.LogDebug("Solution doesn't have a \".DbMigrations\" project.");
@@ -241,7 +242,7 @@ namespace Volo.Abp.Cli.ProjectModification
 
             if (addedNewBuilder && !skipDbMigrations)
             {
-                EfCoreMigrationAdder.AddMigration(dbMigrationsProject, module.Name, startupProject); 
+                EfCoreMigrationAdder.AddMigration(dbMigrationsProject, module.Name, startupProject);
             }
         }
 
@@ -274,4 +275,4 @@ namespace Volo.Abp.Cli.ProjectModification
                 .Any(p => p.EndsWith(".IdentityServer") || p.EndsWith(".HttpApi.Host"));
         }
     }
-}
+}