From 4a5f5756195325067e4fc1b2780a8bb5f67c2aa8 Mon Sep 17 00:00:00 2001
From: Laura Hausmann <laura@hausmann.dev>
Date: Thu, 17 Oct 2024 20:38:16 +0200
Subject: [PATCH] [backend/razor] Add CSS/JS versioning to razor pages & blazor
 ssr

---
 .../Components/Admin/AdminHead.razor              |  5 +++--
 .../Components/Helpers/VersionedLink.razor        | 15 +++++++++++++++
 .../Components/Helpers/VersionedScript.razor      | 15 +++++++++++++++
 Iceshrimp.Backend/Pages/NotePreview.razor         |  2 +-
 Iceshrimp.Backend/Pages/Queue.cshtml              |  7 ++++---
 Iceshrimp.Backend/Pages/QueueJob.cshtml           |  4 ++--
 Iceshrimp.Backend/Pages/Shared/ErrorPage.cshtml   |  6 +++---
 Iceshrimp.Backend/Pages/Shared/FrontendSPA.cshtml | 12 ++++++------
 .../Pages/Shared/RootComponent.razor              |  6 +++---
 Iceshrimp.Backend/Pages/Shared/_Layout.cshtml     |  6 +++---
 Iceshrimp.Backend/Pages/UserPreview.razor         |  2 +-
 11 files changed, 56 insertions(+), 24 deletions(-)
 create mode 100644 Iceshrimp.Backend/Components/Helpers/VersionedLink.razor
 create mode 100644 Iceshrimp.Backend/Components/Helpers/VersionedScript.razor

diff --git a/Iceshrimp.Backend/Components/Admin/AdminHead.razor b/Iceshrimp.Backend/Components/Admin/AdminHead.razor
index a3e8caab..dc1e25b3 100644
--- a/Iceshrimp.Backend/Components/Admin/AdminHead.razor
+++ b/Iceshrimp.Backend/Components/Admin/AdminHead.razor
@@ -1,5 +1,6 @@
 @using Microsoft.AspNetCore.Components.Web
+@using Iceshrimp.Backend.Components.Helpers
 <HeadContent>
-    <link rel="stylesheet" href="/css/admin.css"/>
-    <script src="/js/admin.js"></script>
+    <VersionedLink rel="stylesheet" href="/css/admin.css"/>
+    <VersionedScript src="/js/admin.js"/>
 </HeadContent>
\ No newline at end of file
diff --git a/Iceshrimp.Backend/Components/Helpers/VersionedLink.razor b/Iceshrimp.Backend/Components/Helpers/VersionedLink.razor
new file mode 100644
index 00000000..8ce8e3af
--- /dev/null
+++ b/Iceshrimp.Backend/Components/Helpers/VersionedLink.razor
@@ -0,0 +1,15 @@
+@using Microsoft.AspNetCore.Mvc.ViewFeatures
+<link @attributes="AdditionalAttributes" href="@VersionedHref"/>
+
+@code {
+    [Inject] public required IFileVersionProvider FileVersionProvider { get; set; }
+
+    @* ReSharper disable InconsistentNaming *@
+    [Parameter, EditorRequired] public required string href { get; set; }
+    @* ReSharper restore InconsistentNaming *@
+
+    [Parameter(CaptureUnmatchedValues = true)]
+    public IDictionary<string, object>? AdditionalAttributes { get; set; }
+
+    private string VersionedHref => FileVersionProvider.AddFileVersionToPath("", href);
+}
\ No newline at end of file
diff --git a/Iceshrimp.Backend/Components/Helpers/VersionedScript.razor b/Iceshrimp.Backend/Components/Helpers/VersionedScript.razor
new file mode 100644
index 00000000..6135fa0b
--- /dev/null
+++ b/Iceshrimp.Backend/Components/Helpers/VersionedScript.razor
@@ -0,0 +1,15 @@
+@using Microsoft.AspNetCore.Mvc.ViewFeatures
+<script src="@VersionedSrc" @attributes="AdditionalAttributes"></script>
+
+@code {
+    [Inject] public required IFileVersionProvider FileVersionProvider { get; set; }
+
+    @* ReSharper disable InconsistentNaming *@
+    [Parameter, EditorRequired] public required string src { get; set; }
+    @* ReSharper restore InconsistentNaming *@
+
+    [Parameter(CaptureUnmatchedValues = true)]
+    public IDictionary<string, object>? AdditionalAttributes { get; set; }
+
+    private string VersionedSrc => FileVersionProvider.AddFileVersionToPath("", src);
+}
\ No newline at end of file
diff --git a/Iceshrimp.Backend/Pages/NotePreview.razor b/Iceshrimp.Backend/Pages/NotePreview.razor
index 3d69080c..ab60acab 100644
--- a/Iceshrimp.Backend/Pages/NotePreview.razor
+++ b/Iceshrimp.Backend/Pages/NotePreview.razor
@@ -101,7 +101,7 @@ else
         <meta name="og:image" content="@previewImageUrl">
         <meta name="og:description" content="@description">
 
-        <link rel="stylesheet" href="/css/public-preview.css"/>
+        <VersionedLink rel="stylesheet" href="/css/public-preview.css"/>
     </HeadContent>
 
     if (!ShowRemoteReplies)
diff --git a/Iceshrimp.Backend/Pages/Queue.cshtml b/Iceshrimp.Backend/Pages/Queue.cshtml
index c755f0f4..72b75644 100644
--- a/Iceshrimp.Backend/Pages/Queue.cshtml
+++ b/Iceshrimp.Backend/Pages/Queue.cshtml
@@ -10,14 +10,14 @@
 }
 
 @section head {
-    <link rel="stylesheet" href="~/css/queue.css"/>
+    <link rel="stylesheet" href="~/css/queue.css" asp-append-version="true"/>
 }
 
 @section scripts {
-    <script src="~/js/queue.js"></script>
+    <script src="~/js/queue.js" asp-append-version="true"></script>
     @if (Model.Queue == null)
     {
-        <script src="~/js/queue-index.js"></script>
+        <script src="~/js/queue-index.js" asp-append-version="true"></script>
     }
 }
 
@@ -25,6 +25,7 @@
 <button role="link" data-target="/queue" onclick="navigate(event)">overview</button>
 @foreach (var queue in QueueSvc.QueueNames)
 {
+    //asd
     <button role="link" data-target="/queue/@queue" onclick="navigate(event)">@queue</button>
 }
 <br/>
diff --git a/Iceshrimp.Backend/Pages/QueueJob.cshtml b/Iceshrimp.Backend/Pages/QueueJob.cshtml
index b89cdf48..a581dd12 100644
--- a/Iceshrimp.Backend/Pages/QueueJob.cshtml
+++ b/Iceshrimp.Backend/Pages/QueueJob.cshtml
@@ -11,11 +11,11 @@
 }
 
 @section head {
-    <link rel="stylesheet" href="~/css/queue.css"/>
+    <link rel="stylesheet" href="~/css/queue.css" asp-append-version="true"/>
 }
 
 @section scripts {
-    <script src="~/js/queue.js"></script>
+    <script src="~/js/queue.js" asp-append-version="true"></script>
 }
 
 <h1>Queue Dashboard</h1>
diff --git a/Iceshrimp.Backend/Pages/Shared/ErrorPage.cshtml b/Iceshrimp.Backend/Pages/Shared/ErrorPage.cshtml
index fda8a1e5..6534d594 100644
--- a/Iceshrimp.Backend/Pages/Shared/ErrorPage.cshtml
+++ b/Iceshrimp.Backend/Pages/Shared/ErrorPage.cshtml
@@ -15,10 +15,10 @@
     <meta charset="utf-8"/>
     <title>@("Error - Iceshrimp.NET")</title>
     @* ReSharper disable once Html.PathError *@
-    <link rel="stylesheet" href="~/Iceshrimp.Backend.styles.css"/>
-    <link rel="stylesheet" href="~/css/default.css"/>
+    <link rel="stylesheet" href="~/Iceshrimp.Backend.styles.css" asp-append-version="true"/>
+    <link rel="stylesheet" href="~/css/default.css" asp-append-version="true"/>
     @* ReSharper disable once Html.PathError *@
-    <link rel="icon" type="image/png" href="~/favicon.png"/>
+    <link rel="icon" type="image/png" href="~/favicon.png" asp-append-version="true"/>
     <style>
         .float-right {
             float: right;
diff --git a/Iceshrimp.Backend/Pages/Shared/FrontendSPA.cshtml b/Iceshrimp.Backend/Pages/Shared/FrontendSPA.cshtml
index 293f0bd7..a36f2419 100644
--- a/Iceshrimp.Backend/Pages/Shared/FrontendSPA.cshtml
+++ b/Iceshrimp.Backend/Pages/Shared/FrontendSPA.cshtml
@@ -11,11 +11,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
     <title>Iceshrimp.Frontend</title>
     <base href="/"/>
-    <link rel="stylesheet" href="~/css/app.css"/>
-    <link rel="stylesheet" href="~/_content/Iceshrimp.Assets.PhosphorIcons/css/ph-regular.css"/>
-    <link rel="stylesheet" href="~/_content/Iceshrimp.Assets.PhosphorIcons/css/ph-fill.css"/>
-    <link rel="icon" type="image/png" href="~/favicon.png"/>
-    <link href="~/Iceshrimp.Frontend.styles.css" rel="stylesheet"/>
+    <link rel="stylesheet" href="~/css/app.css" asp-append-version="true"/>
+    <link rel="stylesheet" href="~/_content/Iceshrimp.Assets.PhosphorIcons/css/ph-regular.css" asp-append-version="true"/>
+    <link rel="stylesheet" href="~/_content/Iceshrimp.Assets.PhosphorIcons/css/ph-fill.css" asp-append-version="true"/>
+    <link rel="icon" type="image/png" href="~/favicon.png" asp-append-version="true"/>
+    <link rel="stylesheet" href="~/Iceshrimp.Frontend.styles.css" asp-append-version="true"/>
 </head>
 
 <body>
@@ -37,7 +37,7 @@
     <a class="dismiss">🗙</a>
 </div>
 
-<script src="~/_framework/blazor.webassembly.js"></script>
+<script src="~/_framework/blazor.webassembly.js" asp-append-version="true"></script>
 </body>
 
 </html>
diff --git a/Iceshrimp.Backend/Pages/Shared/RootComponent.razor b/Iceshrimp.Backend/Pages/Shared/RootComponent.razor
index 42212578..26d31796 100644
--- a/Iceshrimp.Backend/Pages/Shared/RootComponent.razor
+++ b/Iceshrimp.Backend/Pages/Shared/RootComponent.razor
@@ -14,9 +14,9 @@
 <!--suppress HtmlRequiredTitleElement, Justification: HeadOutlet -->
 <head>
     <meta charset="utf-8"/>
-    <link rel="stylesheet" href="/Iceshrimp.Backend.styles.css"/>
-    <link rel="stylesheet" href="/css/default.css"/>
-    <link rel="icon" type="image/png" href="/favicon.png"/>
+    <VersionedLink rel="stylesheet" href="/Iceshrimp.Backend.styles.css"/>
+    <VersionedLink rel="stylesheet" href="/css/default.css"/>
+    <VersionedLink rel="icon" type="image/png" href="/favicon.png"/>
     <HeadOutlet/>
     <PageTitle>@(_instanceName ?? "Iceshrimp.NET")</PageTitle>
 </head>
diff --git a/Iceshrimp.Backend/Pages/Shared/_Layout.cshtml b/Iceshrimp.Backend/Pages/Shared/_Layout.cshtml
index ca6306ed..ef390ea6 100644
--- a/Iceshrimp.Backend/Pages/Shared/_Layout.cshtml
+++ b/Iceshrimp.Backend/Pages/Shared/_Layout.cshtml
@@ -9,10 +9,10 @@
     <meta charset="utf-8"/>
     <title>@(ViewData["title"] ?? "Iceshrimp.NET")</title>
     @* ReSharper disable once Html.PathError *@
-    <link rel="stylesheet" href="~/Iceshrimp.Backend.styles.css"/>
-    <link rel="stylesheet" href="~/css/default.css"/>
+    <link rel="stylesheet" href="~/Iceshrimp.Backend.styles.css" asp-append-version="true"/>
+    <link rel="stylesheet" href="~/css/default.css" asp-append-version="true"/>
     @* ReSharper disable once Html.PathError *@
-    <link rel="icon" type="image/png" href="~/favicon.png"/>
+    <link rel="icon" type="image/png" href="~/favicon.png" asp-append-version="true"/>
     @await RenderSectionAsync("styles", false)
     @await RenderSectionAsync("head", false)
 </head>
diff --git a/Iceshrimp.Backend/Pages/UserPreview.razor b/Iceshrimp.Backend/Pages/UserPreview.razor
index b8de3f9f..912733cc 100644
--- a/Iceshrimp.Backend/Pages/UserPreview.razor
+++ b/Iceshrimp.Backend/Pages/UserPreview.razor
@@ -36,6 +36,6 @@ else
             <meta name="og:description" content="@bio">
         }
         <meta name="og:image" content="@_user.AvatarUrl">
-        <link rel="stylesheet" href="/css/public-preview.css"/>
+        <VersionedLink rel="stylesheet" href="/css/public-preview.css"/>
     </HeadContent>
 }
\ No newline at end of file