Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 7 commits into from
Sep 10, 2024
Merged

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

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d1dd5df
Update `Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets`
MackinnonBuck Sep 3, 2024
d0d4403
Fix for vanilla wasm
MackinnonBuck Sep 4, 2024
7b09a07
Update tests
MackinnonBuck Sep 4, 2024
c54f00b
Merge branch 'main' into mbuck/fix-collocated-js-hot-reload
MackinnonBuck Sep 5, 2024
2bdb94c
Merge branch 'main' into mbuck/fix-collocated-js-hot-reload
MackinnonBuck Sep 9, 2024
4bdf078
PR feedback
MackinnonBuck Sep 9, 2024
1c086fc
Merge branch 'mbuck/fix-collocated-js-hot-reload' of https://github.c…
MackinnonBuck Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
MackinnonBuck marked this conversation as resolved.
Show resolved Hide resolved

</PropertyGroup>

<PropertyGroup>
Expand Down Expand Up @@ -229,7 +240,7 @@ Copyright (c) .NET Foundation. All rights reserved.
>
<Output TaskParameter="ResolvedEndpoints" ItemName="_ResolvedJSBuildModuleEndpoints" />
</ResolveStaticWebAssetEndpointRoutes>

<GenerateJsModuleManifest
Condition="'@(_ExistingBuildJSModules)' != ''"
OutputFile="@(_JsModuleBuildManifestCandidate)"
Expand Down Expand Up @@ -341,7 +352,7 @@ Copyright (c) .NET Foundation. All rights reserved.
>
<Output TaskParameter="ResolvedEndpoints" ItemName="_ResolvedJSPublishModuleEndpoints" />
</ResolveStaticWebAssetEndpointRoutes>

<GenerateJsModuleManifest
Condition="'@(_ExistingPublishJSModules)' != ''"
OutputFile="@(_JsModulePublishManifestCandidate)"
Expand Down Expand Up @@ -389,7 +400,7 @@ Copyright (c) .NET Foundation. All rights reserved.
</Target>

<!-- JS file modules -->
<Target Name="ResolveJSModuleStaticWebAssets" DependsOnTargets="ResolveProjectStaticWebAssets">
<Target Name="ResolveJSModuleStaticWebAssets" DependsOnTargets="$(ResolveJSModuleStaticWebAssetsDependsOn)">

<ItemGroup>
<!-- To avoid situations where the content is defined twice, if the user defines the JS module explicitly as
Expand Down
25 changes: 21 additions & 4 deletions test/Microsoft.NET.Sdk.Razor.Tests/ScopedCssIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}

Expand Down
Loading