Skip to content

Fix/font preload static path #775

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

Merged
merged 7 commits into from
Mar 19, 2025
Merged

Fix/font preload static path #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
75dd9c8
Preload fonts in use as per CSS definitions
cotti Mar 18, 2025
e315a22
Adjust FontUriCache typing and stricten Regex
cotti Mar 18, 2025
109190e
Readjust link header ordering.
cotti Mar 18, 2025
ffd6740
Fix accessor to private.
cotti Mar 18, 2025
dfcd30d
Acquire static prefix from the Model.
cotti Mar 19, 2025
9cfdf4a
Merge remote-tracking branch 'origin/main' into fix/font_preload_stat…
cotti Mar 19, 2025
3680911
Use Model.UrlPathPrefix instead.
cotti Mar 19, 2025
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
6 changes: 3 additions & 3 deletions src/Elastic.Markdown/Helpers/Preloader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ public static partial class FontPreloader
{
private static IReadOnlyCollection<string>? FontUriCache = null!;

public static async Task<IReadOnlyCollection<string>> GetFontUrisAsync() => FontUriCache ??= await LoadFontUrisAsync();
private static async Task<IReadOnlyCollection<string>> LoadFontUrisAsync()
public static async Task<IReadOnlyCollection<string>> GetFontUrisAsync(string? urlPrefix) => FontUriCache ??= await LoadFontUrisAsync(urlPrefix);
private static async Task<IReadOnlyCollection<string>> LoadFontUrisAsync(string? urlPrefix)
{
var cachedFontUris = new List<string>();
var assembly = Assembly.GetExecutingAssembly();
Expand All @@ -28,7 +28,7 @@ private static async Task<IReadOnlyCollection<string>> LoadFontUrisAsync()
foreach (Match match in matches)
{
if (match.Success)
cachedFontUris.Add($"/_static/{match.Groups[1].Value}");
cachedFontUris.Add($"{urlPrefix}/_static/{match.Groups[1].Value}");
}
FontUriCache = cachedFontUris;
return FontUriCache;
Expand Down
2 changes: 1 addition & 1 deletion src/Elastic.Markdown/Slices/Layout/_Head.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@using Elastic.Markdown.Helpers
<head>
<title>@Model.Title</title>
@foreach (var fontFile in await FontPreloader.GetFontUrisAsync())
@foreach (var fontFile in await FontPreloader.GetFontUrisAsync(@Model.UrlPathPrefix))
{
<link rel="preload" href="@fontFile" as="font" type="font/woff2" crossorigin>
}
Expand Down
Loading