From d1dd5dfa856505837aa77eae7fb5905e89179287 Mon Sep 17 00:00:00 2001
From: Mackinnon Buck <mackinnon.buck@gmail.com>
Date: Tue, 3 Sep 2024 16:45:56 -0700
Subject: [PATCH 1/4] Update
 `Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets`

---
 .../Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets
index 99a291988b32..956ea0cf9830 100644
--- a/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets
+++ b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets
@@ -229,7 +229,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   >
     <Output TaskParameter="ResolvedEndpoints" ItemName="_ResolvedJSBuildModuleEndpoints" />
   </ResolveStaticWebAssetEndpointRoutes>
-  
+
     <GenerateJsModuleManifest
       Condition="'@(_ExistingBuildJSModules)' != ''"
       OutputFile="@(_JsModuleBuildManifestCandidate)"
@@ -341,7 +341,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     >
       <Output TaskParameter="ResolvedEndpoints" ItemName="_ResolvedJSPublishModuleEndpoints" />
     </ResolveStaticWebAssetEndpointRoutes>
-  
+
     <GenerateJsModuleManifest
       Condition="'@(_ExistingPublishJSModules)' != ''"
       OutputFile="@(_JsModulePublishManifestCandidate)"
@@ -389,7 +389,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   </Target>
 
   <!-- JS file modules -->
-  <Target Name="ResolveJSModuleStaticWebAssets" DependsOnTargets="ResolveProjectStaticWebAssets">
+  <Target Name="ResolveJSModuleStaticWebAssets" DependsOnTargets="ResolveProjectStaticWebAssets;ResolveRazorComponentInputs;ResolveRazorGenerateInputs">
 
     <ItemGroup>
       <!-- To avoid situations where the content is defined twice, if the user defines the JS module explicitly as

From d0d4403ee981abf5d46b1dde260d5b1577cf241f Mon Sep 17 00:00:00 2001
From: Mackinnon Buck <mackinnon.buck@gmail.com>
Date: Wed, 4 Sep 2024 13:34:47 -0700
Subject: [PATCH 2/4] Fix for vanilla wasm

---
 ...rosoft.NET.Sdk.StaticWebAssets.JSModules.targets | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets
index 956ea0cf9830..5f0c819fe81f 100644
--- a/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets
+++ b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets
@@ -40,6 +40,17 @@ Copyright (c) .NET Foundation. All rights reserved.
       ResolveJsInitializerModuleStaticWebAssets;
     </ResolveCoreStaticWebAssetsDependsOn>
 
+    <ResolveJSModuleStaticWebAssetsDependsOn>
+      $(ResolveJSModuleStaticWebAssetsDependsOn);
+      ResolveProjectStaticWebAssets;
+    </ResolveJSModuleStaticWebAssetsDependsOn>
+
+    <ResolveJSModuleStaticWebAssetsDependsOn Condition="'$(UsingMicrosoftNETSdkRazor)' == 'true'">
+      $(ResolveJSModuleStaticWebAssetsDependsOn);
+      ResolveRazorComponentInputs;
+      ResolveRazorGenerateInputs;
+    </ResolveJSModuleStaticWebAssetsDependsOn>
+
   </PropertyGroup>
 
   <PropertyGroup>
@@ -389,7 +400,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   </Target>
 
   <!-- JS file modules -->
-  <Target Name="ResolveJSModuleStaticWebAssets" DependsOnTargets="ResolveProjectStaticWebAssets;ResolveRazorComponentInputs;ResolveRazorGenerateInputs">
+  <Target Name="ResolveJSModuleStaticWebAssets" DependsOnTargets="$(ResolveJSModuleStaticWebAssetsDependsOn)">
 
     <ItemGroup>
       <!-- To avoid situations where the content is defined twice, if the user defines the JS module explicitly as

From 7b09a072f3c6a5ee0fb6f86609df623294f52b6a Mon Sep 17 00:00:00 2001
From: Mackinnon Buck <mackinnon.buck@gmail.com>
Date: Wed, 4 Sep 2024 14:02:18 -0700
Subject: [PATCH 3/4] Update tests

---
 .../ScopedCssIntegrationTests.cs              | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/test/Microsoft.NET.Sdk.Razor.Tests/ScopedCssIntegrationTests.cs b/test/Microsoft.NET.Sdk.Razor.Tests/ScopedCssIntegrationTests.cs
index a27b7dec8a65..e1a82929352c 100644
--- a/test/Microsoft.NET.Sdk.Razor.Tests/ScopedCssIntegrationTests.cs
+++ b/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);
+            }
         }
     }
 

From 4bdf078b3a2da7f9d6dbcf493e6a90c0ce24d45f Mon Sep 17 00:00:00 2001
From: Mackinnon Buck <mackinnon.buck@gmail.com>
Date: Mon, 9 Sep 2024 14:18:27 -0700
Subject: [PATCH 4/4] PR feedback

---
 ...ft.NET.Sdk.StaticWebAssets.JSModules.targets | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets
index 5f0c819fe81f..cd8464387c51 100644
--- a/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets
+++ b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets
@@ -36,20 +36,13 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <ResolveCoreStaticWebAssetsDependsOn>
       $(ResolveCoreStaticWebAssetsDependsOn);
-      ResolveJSModuleStaticWebAssets;
       ResolveJsInitializerModuleStaticWebAssets;
     </ResolveCoreStaticWebAssetsDependsOn>
 
-    <ResolveJSModuleStaticWebAssetsDependsOn>
-      $(ResolveJSModuleStaticWebAssetsDependsOn);
-      ResolveProjectStaticWebAssets;
-    </ResolveJSModuleStaticWebAssetsDependsOn>
-
-    <ResolveJSModuleStaticWebAssetsDependsOn Condition="'$(UsingMicrosoftNETSdkRazor)' == 'true'">
-      $(ResolveJSModuleStaticWebAssetsDependsOn);
-      ResolveRazorComponentInputs;
-      ResolveRazorGenerateInputs;
-    </ResolveJSModuleStaticWebAssetsDependsOn>
+    <ResolveCoreStaticWebAssetsDependsOn Condition="'$(UsingMicrosoftNETSdkRazor)' == 'true'">
+      $(ResolveCoreStaticWebAssetsDependsOn);
+      ResolveJSModuleStaticWebAssets;
+    </ResolveCoreStaticWebAssetsDependsOn>
 
   </PropertyGroup>
 
@@ -400,7 +393,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   </Target>
 
   <!-- JS file modules -->
-  <Target Name="ResolveJSModuleStaticWebAssets" DependsOnTargets="$(ResolveJSModuleStaticWebAssetsDependsOn)">
+  <Target Name="ResolveJSModuleStaticWebAssets" DependsOnTargets="ResolveProjectStaticWebAssets">
 
     <ItemGroup>
       <!-- To avoid situations where the content is defined twice, if the user defines the JS module explicitly as