Use separate asset path for different build

modules/public/public.go

@@ -23,8 +23,9 @@ type Options struct {
 	CorsHandler func(http.Handler) http.Handler
 }
 
-// AssetsURLPathPrefix is the path prefix for static asset files
-const AssetsURLPathPrefix = "/assets/"
+// WebPublicDirName is the directory name for public(static) asset files. It may be set to the build time by `static.go`
+// the char `~` is not valid for user/repo names, so we do not need to reserve the names anymore.
+var WebPublicDirName = "public~dynamic"
 
 // AssetsHandlerFunc implements the static handler for serving custom or original assets.
 func AssetsHandlerFunc(opts *Options) http.HandlerFunc {

modules/public/static.go

@@ -10,6 +10,7 @@ package public
 import (
 	"bytes"
 	"compress/gzip"
+	"fmt"
 	"io"
 	"mime"
 	"net/http"
@@ -18,12 +19,13 @@ import (
 	"time"
 
 	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/timeutil"
 )
 
+var assetModTime time.Time
+
 // GlobalModTime provide a global mod time for embedded asset files
 func GlobalModTime(filename string) time.Time {
-	return timeutil.GetExecutableModTime()
+	return assetModTime
 }
 
 func fileSystem(dir string) http.FileSystem {
@@ -91,3 +93,8 @@ func serveContent(w http.ResponseWriter, req *http.Request, fi os.FileInfo, modt
 	http.ServeContent(w, req, fi.Name(), modtime, content)
 	return
 }
+
+func init() {
+	assetModTime = timeutil.GetExecutableModTime()
+	WebPublicDirName = fmt.Sprintf("public~%x", assetModTime.UnixMilli())
+}

modules/templates/helper.go

@@ -33,6 +33,7 @@ import (
 	"code.gitea.io/gitea/modules/json"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/markup"
+	"code.gitea.io/gitea/modules/public"
 	"code.gitea.io/gitea/modules/repository"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/svg"
@@ -62,7 +63,7 @@ func NewFuncMap() []template.FuncMap {
 			return setting.AppSubURL
 		},
 		"AssetUrlPrefix": func() string {
-			return setting.StaticURLPrefix + "/assets"
+			return setting.StaticURLPrefix + "/" + public.WebPublicDirName
 		},
 		"AppUrl": func() string {
 			return setting.AppURL
@@ -146,7 +147,6 @@ func NewFuncMap() []template.FuncMap {
 		"DiffLineTypeToStr":              DiffLineTypeToStr,
 		"Sha1":                           Sha1,
 		"ShortSha":                       base.ShortSha,
-		"MD5":                            base.EncodeMD5,
 		"ActionContent2Commits":          ActionContent2Commits,
 		"PathEscape":                     url.PathEscape,
 		"PathEscapeSegments":             util.PathEscapeSegments,

routers/install/routes.go

@@ -85,9 +85,9 @@ func Routes() *web.Route {
 		r.Use(middle)
 	}
 
-	r.Use(web.WrapWithPrefix(public.AssetsURLPathPrefix, public.AssetsHandlerFunc(&public.Options{
+	r.Use(web.WrapWithPrefix("/"+public.WebPublicDirName, public.AssetsHandlerFunc(&public.Options{
 		Directory: path.Join(setting.StaticRootPath, "public"),
-		Prefix:    public.AssetsURLPathPrefix,
+		Prefix:    "/" + public.WebPublicDirName,
 	}), "InstallAssetsHandler"))
 
 	r.Use(session.Sessioner(session.Options{

routers/web/web.go

@@ -74,9 +74,9 @@ func CorsHandler() func(next http.Handler) http.Handler {
 func Routes(sessioner func(http.Handler) http.Handler) *web.Route {
 	routes := web.NewRoute()
 
-	routes.Use(web.WrapWithPrefix(public.AssetsURLPathPrefix, public.AssetsHandlerFunc(&public.Options{
+	routes.Use(web.WrapWithPrefix("/"+public.WebPublicDirName, public.AssetsHandlerFunc(&public.Options{
 		Directory:   path.Join(setting.StaticRootPath, "public"),
-		Prefix:      public.AssetsURLPathPrefix,
+		Prefix:      "/" + public.WebPublicDirName,
 		CorsHandler: CorsHandler(),
 	}), "AssetsHandler"))
 

templates/base/footer.tmpl

@@ -22,7 +22,7 @@
 		<script src='https://hcaptcha.com/1/api.js' async></script>
 	{{end}}
 {{end}}
-	<script src="{{AssetUrlPrefix}}/js/index.js?v={{MD5 AppVer}}"></script>
+	<script src="{{AssetUrlPrefix}}/js/index.js"></script>
 {{template "custom/footer" .}}
 </body>
 </html>

templates/base/head.tmpl

@@ -59,7 +59,7 @@
 	</script>
 	<link rel="icon" href="{{AssetUrlPrefix}}/img/logo.svg" type="image/svg+xml">
 	<link rel="alternate icon" href="{{AssetUrlPrefix}}/img/favicon.png" type="image/png">
-	<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/index.css?v={{MD5 AppVer}}">
+	<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/index.css">
 	<noscript>
 		<style>
 			.dropdown:hover > .menu { display: block; }
@@ -104,10 +104,10 @@
 <meta property="og:site_name" content="{{AppName}}" />
 {{if .IsSigned }}
 	{{ if ne .SignedUser.Theme "gitea" }}
-		<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/theme-{{.SignedUser.Theme | PathEscape}}.css?v={{MD5 AppVer}}">
+		<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/theme-{{.SignedUser.Theme | PathEscape}}.css">
 	{{end}}
 {{else if ne DefaultTheme "gitea"}}
-	<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/theme-{{DefaultTheme | PathEscape}}.css?v={{MD5 AppVer}}">
+	<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/theme-{{DefaultTheme | PathEscape}}.css">
 {{end}}
 {{template "custom/header" .}}
 </head>

templates/swagger/ui.tmpl

@@ -3,11 +3,11 @@
 	<head>
 		<meta charset="UTF-8">
 		<title>Gitea API</title>
-		<link href="{{AssetUrlPrefix}}/css/swagger.css?v={{MD5 AppVer}}" rel="stylesheet">
+		<link href="{{AssetUrlPrefix}}/css/swagger.css" rel="stylesheet">
 	</head>
 	<body>
 		<a class="swagger-back-link" href="{{AppUrl}}">{{svg "octicon-reply"}}{{.i18n.Tr "return_to_gitea"}}</a>
 		<div id="swagger-ui" data-source="{{AppUrl}}swagger.{{.APIJSONVersion}}.json"></div>
-		<script src="{{AssetUrlPrefix}}/js/swagger.js?v={{MD5 AppVer}}"></script>
+		<script src="{{AssetUrlPrefix}}/js/swagger.js"></script>
 	</body>
 </html>