Merge pull request #25991 from abpframework/auto-merge/rel-10-7/4772

Merge branch dev with rel-10.7

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

@@ -33,6 +33,8 @@ public class PackageJsonFileFinder : ITransientDependency
 
         return
             Directory.GetFiles(directory, "*.csproj", searchOption: SearchOption.TopDirectoryOnly).Any() ||
-            File.Exists(Path.Combine(directory, "angular.json"));
+            File.Exists(Path.Combine(directory, "angular.json")) ||
+            File.Exists(Path.Combine(directory, "vite.config.ts")) ||
+            File.Exists(Path.Combine(directory, "next.config.ts"));
     }
 }

framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectModification/PackageJsonFileFinder_Tests.cs

@@ -0,0 +1,41 @@
+using System;
+using System.IO;
+using Shouldly;
+using Volo.Abp.Cli.ProjectModification;
+using Xunit;
+
+namespace Volo.Abp.Cli;
+
+public class PackageJsonFileFinder_Tests
+{
+    [Theory]
+    [InlineData("Test.csproj", true)]
+    [InlineData("angular.json", true)]
+    [InlineData("vite.config.ts", true)]
+    [InlineData("next.config.ts", true)]
+    [InlineData("", false)]
+    public void Should_Find_Package_Json_For_Supported_Project_Types(string projectFileName, bool expected)
+    {
+        var testDirectory = Path.Combine(Path.GetTempPath(), "abp-cli-tests", Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(testDirectory);
+
+        try
+        {
+            var packageJsonPath = Path.Combine(testDirectory, "package.json");
+            File.WriteAllText(packageJsonPath, "{}");
+
+            if (!projectFileName.IsNullOrEmpty())
+            {
+                File.WriteAllText(Path.Combine(testDirectory, projectFileName), string.Empty);
+            }
+
+            var result = new PackageJsonFileFinder().Find(testDirectory);
+
+            result.Contains(packageJsonPath).ShouldBe(expected);
+        }
+        finally
+        {
+            Directory.Delete(testDirectory, recursive: true);
+        }
+    }
+}