nseguin/website
1
0
Fork 0
Code Issues Pull requests Projects Releases 20 Packages Wiki Activity Actions

move HeroIcons to separate project

Browse source
This commit is contained in:
Nick Seguin 2024-02-25 17:11:58 -06:00
parent 6a9800bb31
commit 9d2a5539a7
Signed by: nseguin
GPG key ID: 68C99FA84079021D
18 changed files with 192 additions and 153 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
NSeguin.Dev.Web.sln
View file

@ -11,7 +11,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NSeguin.Dev.Web", "src\NSeg
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NSeguin.Dev.Web.Common", "src\NSeguin.Dev.Web.Common\NSeguin.Dev.Web.Common.csproj", "{EC472D1C-8319-4454-BE67-66DDB70C2512}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NSeguin.Dev.Web.HeroIconSourceGenerator", "src\NSeguin.Dev.Web.HeroIconSourceGenerator\NSeguin.Dev.Web.HeroIconSourceGenerator.csproj", "{8F18495F-F6A0-4144-B29F-055E03032A60}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NSeguin.Dev.Web.HeroIcons.SourceGenerator", "src\NSeguin.Dev.Web.HeroIcons.SourceGenerator\NSeguin.Dev.Web.HeroIcons.SourceGenerator.csproj", "{8F18495F-F6A0-4144-B29F-055E03032A60}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeroIcons", "HeroIcons", "{8DE521F9-7C05-4814-80C9-065403B791EC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NSeguin.Dev.Web.HeroIcons", "src\NSeguin.Dev.Web.HeroIcons\NSeguin.Dev.Web.HeroIcons.csproj", "{3EAE461C-8B3D-4A27-9679-5050DA085291}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -38,11 +42,17 @@ Global
{8F18495F-F6A0-4144-B29F-055E03032A60}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8F18495F-F6A0-4144-B29F-055E03032A60}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8F18495F-F6A0-4144-B29F-055E03032A60}.Release|Any CPU.Build.0 = Release|Any CPU
{3EAE461C-8B3D-4A27-9679-5050DA085291}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3EAE461C-8B3D-4A27-9679-5050DA085291}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3EAE461C-8B3D-4A27-9679-5050DA085291}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3EAE461C-8B3D-4A27-9679-5050DA085291}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{17BD1A48-1797-469E-8D83-24A5CCA6B131} = {30B827BB-3B45-4D5C-B989-5471C7DE497B}
{D9AAF405-A6F0-4B92-96C5-825F02E46FCF} = {30B827BB-3B45-4D5C-B989-5471C7DE497B}
{EC472D1C-8319-4454-BE67-66DDB70C2512} = {30B827BB-3B45-4D5C-B989-5471C7DE497B}
{8F18495F-F6A0-4144-B29F-055E03032A60} = {30B827BB-3B45-4D5C-B989-5471C7DE497B}
{8DE521F9-7C05-4814-80C9-065403B791EC} = {30B827BB-3B45-4D5C-B989-5471C7DE497B}
{8F18495F-F6A0-4144-B29F-055E03032A60} = {8DE521F9-7C05-4814-80C9-065403B791EC}
{3EAE461C-8B3D-4A27-9679-5050DA085291} = {8DE521F9-7C05-4814-80C9-065403B791EC}
EndGlobalSection
EndGlobal
EndGlobal

9
src/.config/dotnet-tools.json
View file

@ -1,5 +1,12 @@
{
"version": 1,
"isRoot": true,
"tools": {}
"tools": {
"microsoft.web.librarymanager.cli": {
"version": "2.1.175",
"commands": [
"libman"
]
}
}
}

16
src/NSeguin.Dev.Web.Client/NSeguin.Dev.Web.Client.csproj
View file

@ -17,20 +17,4 @@
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer"/>
<PackageReference Include="Microsoft.Extensions.Http"/>
</ItemGroup>
<ItemGroup>
<_ContentIncludedByDefault Remove="wwwroot\css\app.css"/>
<_ContentIncludedByDefault Remove="wwwroot\css\bootstrap\bootstrap.min.css"/>
<_ContentIncludedByDefault Remove="wwwroot\css\bootstrap\bootstrap.min.css.map"/>
<_ContentIncludedByDefault Remove="Components\Shared\CascadingDarkMode.razor"/>
<_ContentIncludedByDefault Remove="Components\Shared\DarkModeSwitcher.razor"/>
</ItemGroup>
<ItemGroup>
<Content Update="packages.lock.json">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
<CopyToPublishDirectory>Never</CopyToPublishDirectory>
</Content>
</ItemGroup>
</Project>

11
src/NSeguin.Dev.Web.Common/NSeguin.Dev.Web.Common.csproj
View file

@ -4,7 +4,6 @@
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RunAOTCompilation>true</RunAOTCompilation>
<WasmStripILAfterAOT>true</WasmStripILAfterAOT>
<RootNamespace>NSeguin.Dev.Web</RootNamespace>
@ -27,14 +26,4 @@
</PackageReference>
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.Extensions.Configuration.Abstractions">
<HintPath>..\..\..\..\..\.nuget\packages\microsoft.extensions.configuration.abstractions\8.0.0\lib\net8.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Components\" />
</ItemGroup>
</Project>

32
src/NSeguin.Dev.Web.HeroIconSourceGenerator/HeroIconIncrementalSourceGenerator.cs → src/NSeguin.Dev.Web.HeroIcons.SourceGenerator/HeroIconsSourceGenerator.cs
View file

@ -3,12 +3,12 @@ using System.Text;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Text;
namespace NSeguin.Dev.Web.HeroIconSourceGenerator;
namespace NSeguin.Dev.Web.HeroIcons.SourceGenerator;
[Generator]
public class HeroIconIncrementalSourceGenerator : IIncrementalGenerator
public class HeroIconsSourceGenerator : IIncrementalGenerator
{
private const string PathBase = "wwwroot/lib/heroicons/24/solid";
private const string PathBase = "lib/heroicons/24/solid";
public void Initialize(IncrementalGeneratorInitializationContext context)
{
@ -46,19 +46,19 @@ public class HeroIconIncrementalSourceGenerator : IIncrementalGenerator
public string PropertyName { get; }
public string Code =>
$$"""
// <auto-generated/>
namespace NSeguin.Dev.Web.Components.Shared
{
public partial class HeroIcon
{
/// <summary>
/// Gets the <see cref="HeroIconKind"/> for the <c>{{SvgFileName}}</c> icon.
/// </summary>
public static readonly HeroIconKind {{PropertyName}} = new HeroIconKind("{{SvgFileName}}");
}
}
""";
$$"""
// <auto-generated/>
namespace NSeguin.Dev.Web.HeroIcons
{
public partial class HeroIcon
{
/// <summary>
/// Gets the <see cref="HeroIconKind"/> for the <c>{{SvgFileName}}</c> icon.
/// </summary>
public static readonly HeroIconKind {{PropertyName}} = new HeroIconKind("{{SvgFileName}}");
}
}
""";
private static string ToPascalCase(string value)
{

5
src/NSeguin.Dev.Web.HeroIconSourceGenerator/NSeguin.Dev.Web.HeroIconSourceGenerator.csproj → src/NSeguin.Dev.Web.HeroIcons.SourceGenerator/NSeguin.Dev.Web.HeroIcons.SourceGenerator.csproj
View file

@ -5,12 +5,9 @@
<IsPackable>false</IsPackable>
<Nullable>enable</Nullable>
<LangVersion>latest</LangVersion>
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
<IsRoslynComponent>true</IsRoslynComponent>
<RootNamespace>NSeguin.Dev.Web.HeroIconSourceGenerator</RootNamespace>
<PackageId>NSeguin.Dev.Web.HeroIconSourceGenerator</PackageId>
<PackageId>NSeguin.Dev.Web.HeroIcons.SourceGenerator</PackageId>
</PropertyGroup>
<ItemGroup>

0
src/NSeguin.Dev.Web.HeroIconSourceGenerator/Properties/launchSettings.json → src/NSeguin.Dev.Web.HeroIcons.SourceGenerator/Properties/launchSettings.json
View file

62
src/NSeguin.Dev.Web.HeroIcons/HeroIcon.cs Normal file
View file

@ -0,0 +1,62 @@
using System;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Rendering;
namespace NSeguin.Dev.Web.HeroIcons;
public partial class HeroIcon : ComponentBase
{
private Task<string>? _loadSvgTask;
[Parameter]
public HeroIconKind? Kind { get; set; }
[Parameter]
public HeroIconVariant Variant { get; set; }
private string? RawSvg { get; set; }
protected override void BuildRenderTree(RenderTreeBuilder builder)
{
builder.AddMarkupContent(0, RawSvg);
}
protected override void OnParametersSet()
{
if (Kind is not { } kind)
{
throw new InvalidOperationException("Kind cannot be null.");
}
var parameters = new HeroIconParameters(kind, Variant);
_loadSvgTask = parameters.GetSvgAsync();
if (_loadSvgTask.IsCompletedSuccessfully)
{
RawSvg = _loadSvgTask.Result;
}
else
{
_loadSvgTask.ContinueWith(
task =>
{
RawSvg = task.Result;
StateHasChanged();
});
}
}
protected override async Task OnInitializedAsync()
{
if (Kind is null)
{
throw new InvalidOperationException("Kind cannot be null.");
}
if (RawSvg is null && _loadSvgTask is not null)
{
await _loadSvgTask;
}
}
}

3
src/NSeguin.Dev.Web.HeroIcons/HeroIconKind.cs Normal file
View file

@ -0,0 +1,3 @@
namespace NSeguin.Dev.Web.HeroIcons;
public readonly record struct HeroIconKind(string FileName);

47
src/NSeguin.Dev.Web.HeroIcons/HeroIconParameters.cs Normal file
View file

@ -0,0 +1,47 @@
using System;
using System.Collections.Concurrent;
using System.IO;
using System.Threading.Tasks;
namespace NSeguin.Dev.Web.HeroIcons;
internal readonly record struct HeroIconParameters(HeroIconKind Kind, HeroIconVariant Variant)
{
private const string PathBase = "lib/heroicons";
private static readonly ConcurrentDictionary<HeroIconParameters, string> SvgCache = new();
private string GetPath() => GetPath(Variant, Kind);
public Task<string> GetSvgAsync()
{
if (SvgCache.TryGetValue(this, out var svg))
{
return Task.FromResult(svg);
}
return LoadSvgAsync();
}
private async Task<string> LoadSvgAsync()
{
var path = GetPath();
var svg = await File.ReadAllTextAsync(path);
SvgCache.TryAdd(this, svg);
return svg;
}
private static string GetPath(HeroIconVariant variant, HeroIconKind kind)
{
var pathSuffix = variant switch
{
HeroIconVariant.Solid => "24/solid",
HeroIconVariant.Outline => "24/outline",
HeroIconVariant.Small => "20/solid",
HeroIconVariant.ExtraSmall => "16/solid",
_ => throw new ArgumentOutOfRangeException(nameof(variant))
};
return Path.Combine(PathBase, pathSuffix, kind.FileName);
}
}

9
src/NSeguin.Dev.Web.HeroIcons/HeroIconVariant.cs Normal file
View file

@ -0,0 +1,9 @@
namespace NSeguin.Dev.Web.HeroIcons;
public enum HeroIconVariant
{
Solid,
Outline,
Small,
ExtraSmall
}

16
src/NSeguin.Dev.Web.HeroIcons/NSeguin.Dev.Web.HeroIcons.csproj Normal file
View file

@ -0,0 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App"/>
<PackageReference Include="Microsoft.Web.LibraryManager.Build"/>
<ProjectReference Include="..\NSeguin.Dev.Web.HeroIcons.SourceGenerator\NSeguin.Dev.Web.HeroIcons.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
<AdditionalFiles Include="lib/heroicons/**/*" CopyToOutputDirectory="Always" />
</ItemGroup>
</Project>

11
src/NSeguin.Dev.Web.HeroIcons/libman.json Normal file
View file

@ -0,0 +1,11 @@
{
"version": "1.0",
"defaultProvider": "jsdelivr",
"defaultDestination": "lib",
"libraries": [
{
"library": "heroicons@2.1.1",
"destination": "lib/heroicons"
}
]
}

70
src/NSeguin.Dev.Web/Components/Shared/HeroIcon.cs
View file

@ -1,70 +0,0 @@
using System.Collections.Concurrent;
using System.Text.RegularExpressions;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Rendering;
namespace NSeguin.Dev.Web.Components.Shared;
public partial class HeroIcon : ComponentBase
{
private const string PathBase = "wwwroot/lib/heroicons";
private static readonly ConcurrentDictionary<string, string> Cache = new();
private Task<string>? _svgTask;
[Parameter]
public HeroIconKind? Kind { get; set; }
public bool Outline { get; set; }
public bool Small { get; set; }
private string? RawSvg { get; set; }
protected override void BuildRenderTree(RenderTreeBuilder builder)
{
builder.AddMarkupContent(0, RawSvg);
}
protected override void OnParametersSet()
{
if (Small && Outline)
{
throw new InvalidOperationException(
"Small and Outline cannot be true at the same time.");
}
if (Kind is null)
{
throw new InvalidOperationException("Kind cannot be null.");
}
_svgTask = (Outline, Small) switch
{
(true, false) => Kind.Outline,
(false, true) => Kind.Small,
(false, false) => Kind.Solid,
_ => throw new InvalidOperationException("Invalid combination of parameters.")
};
if (_svgTask.IsCompletedSuccessfully)
{
RawSvg = _svgTask.Result;
}
}
protected override async Task OnInitializedAsync()
{
if (Kind is null)
{
throw new InvalidOperationException("Kind cannot be null.");
}
if (RawSvg is null && _svgTask is not null)
{
RawSvg = await _svgTask;
StateHasChanged();
}
}
}

25
src/NSeguin.Dev.Web/Components/Shared/HeroIconKind.cs
View file

@ -1,25 +0,0 @@
namespace NSeguin.Dev.Web.Components.Shared;
public record HeroIconKind(string FileName)
{
private const string PathBase = "wwwroot/lib/heroicons";
private readonly Lazy<Task<string>> _solid = new(
() => File.ReadAllTextAsync(GetPath(FileName, false, false)));
private readonly Lazy<Task<string>> _outline = new(
() => File.ReadAllTextAsync(GetPath(FileName, false, true)));
private readonly Lazy<Task<string>> _small = new(
() => File.ReadAllTextAsync(GetPath(FileName, true, false)));
public string FileName { get; } = FileName;
internal Task<string> Solid => _solid.Value;
internal Task<string> Outline => _outline.Value;
internal Task<string> Small => _small.Value;
private static string GetPath(string fileName, bool small, bool outline)
{
return Path.Combine(PathBase, small ? "20" : "24", outline ? "outline" : "solid", fileName);
}
}

6
src/NSeguin.Dev.Web/NSeguin.Dev.Web.csproj
View file

@ -9,7 +9,7 @@
<ItemGroup>
<ProjectReference Include="..\NSeguin.Dev.Web.Common\NSeguin.Dev.Web.Common.csproj" />
<ProjectReference Include="..\NSeguin.Dev.Web.Client\NSeguin.Dev.Web.Client.csproj" />
<ProjectReference Include="..\NSeguin.Dev.Web.HeroIconSourceGenerator\NSeguin.Dev.Web.HeroIconSourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
<ProjectReference Include="..\NSeguin.Dev.Web.HeroIcons\NSeguin.Dev.Web.HeroIcons.csproj" />
</ItemGroup>
<ItemGroup>
@ -43,6 +43,10 @@
</AdditionalFiles>
</ItemGroup>
<ItemGroup>
<Folder Include="wwwroot\lib\" />
</ItemGroup>
<Target Name="NodeInstall" BeforeTargets="TailwindBuild" Condition="'$(SkipNodeBuild)' != 'true'">
<Exec Command="pnpm install" />
</Target>

5
src/NSeguin.Dev.Web/libman.json
View file

@ -3,10 +3,5 @@
"defaultProvider": "cdnjs",
"defaultDestination": "wwwroot/lib",
"libraries": [
{
"provider": "jsdelivr",
"library": "heroicons@2.0.18",
"destination": "wwwroot/lib/heroicons"
}
]
}

2
src/NSeguin.Dev.Web/wwwroot/css/styles.css
View file

File diff suppressed because one or more lines are too long