Merge pull request #18351 from abpframework/ProjectNpmPackageAdder-re…

…movemvcpackage-2

Adjust ProjectNpmPackageAdder & Add npm package info to web projects

common.props

@@ -29,6 +29,8 @@
 		<Pack>true</Pack>
 		<PackagePath>content\</PackagePath>
 	</Content>
+  </ItemGroup>
+  <ItemGroup>
     <None Remove="*.abppkg" />
     <Content Include="*.abppkg">
 		<Pack>true</Pack>

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

@@ -147,6 +147,34 @@ public class ProjectNpmPackageAdder : ITransientDependency
         }
     }
 
+    public async Task RemoveMvcPackageAsync(string directory, NpmPackageInfo npmPackage,
+        bool skipInstallingLibs = false)
+    {
+        var packageJsonFilePath = Path.Combine(directory, "package.json");
+        if (!File.Exists(packageJsonFilePath) ||
+            !File.ReadAllText(packageJsonFilePath).Contains($"\"{npmPackage.Name}\""))
+        {
+            return;
+        }
+
+        Logger.LogInformation($"Removing '{npmPackage.Name}' package from the project '{packageJsonFilePath}'...");
+
+
+        using (DirectoryHelper.ChangeCurrentDirectory(directory))
+        {
+            Logger.LogInformation("yarn remove " + npmPackage.Name);
+            CmdHelper.RunCmd("yarn remove " + npmPackage.Name);
+
+            if (skipInstallingLibs)
+            {
+                return;
+            }
+
+            Logger.LogInformation("Installing client-side packages...");
+            await InstallLibsService.InstallLibsAsync(directory);
+        }
+    }
+
     private string DetectAbpVersionOrNull(string packageJsonFile)
     {
         if (string.IsNullOrEmpty(packageJsonFile) ||

modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.abppkg

@@ -1,3 +1,8 @@
 {
-  "role": "lib.mvc"
+  "role": "lib.mvc",
+  "npmDependencies": {
+    "@abp/blogging": {
+        "version": ""
+    }
+  }
 }

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.abppkg

@@ -1,3 +1,8 @@
 {
-  "role": "lib.mvc"
+  "role": "lib.mvc",
+  "npmDependencies": {
+    "@abp/cms-kit.admin": {
+        "version": ""
+    }
+  }
 }

modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.abppkg

@@ -1,3 +1,8 @@
 {
-  "role": "lib.mvc"
+  "role": "lib.mvc",
+  "npmDependencies": {
+    "@abp/cms-kit.public": {
+        "version": ""
+    }
+  }
 }

modules/cms-kit/src/Volo.CmsKit.Web/Volo.CmsKit.Web.abppkg

@@ -1,3 +1,8 @@
 {
-  "role": "lib.mvc"
+  "role": "lib.mvc",
+  "npmDependencies": {
+    "@abp/cms-kit": {
+        "version": ""
+    }
+  }
 }

modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.abppkg

@@ -1,3 +1,8 @@
 {
-  "role": "lib.mvc"
+  "role": "lib.mvc",
+  "npmDependencies": {
+    "@abp/docs": {
+        "version": ""
+    }
+  }
 }