From 897cd7cb34d5751c728cb39a2d5cbfb52b85642a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= <f@miniflux.net>
Date: Wed, 2 Jun 2021 19:02:38 -0700
Subject: [PATCH] Use unique file names for cache busting instead of query
string
---
template/templates/common/layout.html | 6 +++---
ui/ui.go | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/template/templates/common/layout.html b/template/templates/common/layout.html
index 281a59d9..b5750386 100644
--- a/template/templates/common/layout.html
+++ b/template/templates/common/layout.html
@@ -30,7 +30,7 @@
<link rel="apple-touch-icon" sizes="180x180" href="{{ route "appIcon" "filename" "icon-180.png" }}">
<meta name="theme-color" content="{{ theme_color .theme }}">
- <link rel="stylesheet" type="text/css" href="{{ route "stylesheet" "name" .theme }}?{{ .theme_checksum }}">
+ <link rel="stylesheet" type="text/css" href="{{ route "stylesheet" "name" .theme "checksum" .theme_checksum }}">
{{ if and .user .user.Stylesheet }}
{{ $stylesheetNonce := nonce }}
@@ -40,8 +40,8 @@
<meta http-equiv="Content-Security-Policy" content="default-src 'self'; img-src * data:; media-src *; frame-src *">
{{ end }}
- <script src="{{ route "javascript" "name" "app" }}?{{ .app_js_checksum }}" defer></script>
- <script src="{{ route "javascript" "name" "service-worker" }}?{{ .sw_js_checksum }}" defer id="service-worker-script"></script>
+ <script src="{{ route "javascript" "name" "app" "checksum" .app_js_checksum }}" defer></script>
+ <script src="{{ route "javascript" "name" "service-worker" "checksum" .sw_js_checksum }}" defer id="service-worker-script"></script>
</head>
<body
{{ if .csrf }}data-csrf-token="{{ .csrf }}"{{ end }}
diff --git a/ui/ui.go b/ui/ui.go
index a5af4910..5775427e 100644
--- a/ui/ui.go
+++ b/ui/ui.go
@@ -37,8 +37,8 @@ func Serve(router *mux.Router, store *storage.Storage, pool *worker.Pool) {
uiRouter.StrictSlash(true)
// Static assets.
- uiRouter.HandleFunc("/stylesheets/{name}.css", handler.showStylesheet).Name("stylesheet").Methods(http.MethodGet)
- uiRouter.HandleFunc("/{name}.js", handler.showJavascript).Name("javascript").Methods(http.MethodGet)
+ uiRouter.HandleFunc("/stylesheets/{name}.{checksum}.css", handler.showStylesheet).Name("stylesheet").Methods(http.MethodGet)
+ uiRouter.HandleFunc("/{name}.{checksum}.js", handler.showJavascript).Name("javascript").Methods(http.MethodGet)
uiRouter.HandleFunc("/favicon.ico", handler.showFavicon).Name("favicon").Methods(http.MethodGet)
uiRouter.HandleFunc("/icon/{filename}", handler.showAppIcon).Name("appIcon").Methods(http.MethodGet)
uiRouter.HandleFunc("/manifest.json", handler.showWebManifest).Name("webManifest").Methods(http.MethodGet)
--
GitLab