[Blazor] Fix hot reload for components with collocated JS files (#43199)

Author: MackinnonBuck

src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets

@@ -36,10 +36,14 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <ResolveCoreStaticWebAssetsDependsOn>
       $(ResolveCoreStaticWebAssetsDependsOn);
-      ResolveJSModuleStaticWebAssets;
       ResolveJsInitializerModuleStaticWebAssets;
     </ResolveCoreStaticWebAssetsDependsOn>
 
+    <ResolveCoreStaticWebAssetsDependsOn Condition="'$(UsingMicrosoftNETSdkRazor)' == 'true'">
+      $(ResolveCoreStaticWebAssetsDependsOn);
+      ResolveJSModuleStaticWebAssets;
+    </ResolveCoreStaticWebAssetsDependsOn>
+
   </PropertyGroup>
 
   <PropertyGroup>
@@ -229,7 +233,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   >
     <Output TaskParameter="ResolvedEndpoints" ItemName="_ResolvedJSBuildModuleEndpoints" />
   </ResolveStaticWebAssetEndpointRoutes>
-  
+
     <GenerateJsModuleManifest
       Condition="'@(_ExistingBuildJSModules)' != ''"
       OutputFile="@(_JsModuleBuildManifestCandidate)"
@@ -341,7 +345,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     >
       <Output TaskParameter="ResolvedEndpoints" ItemName="_ResolvedJSPublishModuleEndpoints" />
     </ResolveStaticWebAssetEndpointRoutes>
-  
+
     <GenerateJsModuleManifest
       Condition="'@(_ExistingPublishJSModules)' != ''"
       OutputFile="@(_JsModulePublishManifestCandidate)"

test/Microsoft.NET.Sdk.Razor.Tests/ScopedCssIntegrationTests.cs

@@ -410,15 +410,32 @@ public void RegeneratingScopedCss_ForProject()
 
             // Make an edit
             var scopedCssFile = Path.Combine(ProjectDirectory.TestRoot, "Components", "Pages", "Index.razor.css");
-            File.WriteAllLines(scopedCssFile, File.ReadAllLines(scopedCssFile).Concat(new[] { "body { background-color: orangered; }" }));
+            File.WriteAllLines(scopedCssFile, File.ReadAllLines(scopedCssFile).Concat(["body { background-color: orangered; }"]));
+
+            build = CreateBuildCommand(ProjectDirectory);
+            ExecuteCommand(build, "/t:UpdateStaticWebAssetsDesignTime").Should().Pass();
+
+            // Verify the generated file contains newly added css
+            AssertFileContains(bundlePath, "background-color: orangered");
+
+            // Verify that CSS edits continue to apply after new JS modules are added to the project
+            // https://github.com/dotnet/aspnetcore/issues/57599
+            var collocatedJsFile = Path.Combine(ProjectDirectory.TestRoot, "Components", "Pages", "Index.razor.js");
+            File.WriteAllLines(collocatedJsFile, ["console.log('Hello, world!');"]);
+            File.WriteAllLines(scopedCssFile, File.ReadAllLines(scopedCssFile).Concat(["h1 { color: purple; }"]));
 
             build = CreateBuildCommand(ProjectDirectory);
             ExecuteCommand(build, "/t:UpdateStaticWebAssetsDesignTime").Should().Pass();
 
-            var fileInfo = new FileInfo(bundlePath);
-            fileInfo.Should().Exist();
             // Verify the generated file contains newly added css
-            fileInfo.ReadAllText().Should().Contain("background-color: orangered");
+            AssertFileContains(bundlePath, "color: purple");
+
+            static void AssertFileContains(string fileName, string content)
+            {
+                var fileInfo = new FileInfo(fileName);
+                fileInfo.Should().Exist();
+                fileInfo.ReadAllText().Should().Contain(content);
+            }
         }
     }