diff options
author | silverwind <me@silverwind.io> | 2020-05-22 03:45:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-21 21:45:34 -0400 |
commit | 88fe7b5a720365e5c8f0a347730f895263465311 (patch) | |
tree | 7d9de5b5c7d78878787dbe12c40ebe97791b2b52 /modules/templates | |
parent | f6f49700cc0f5d66b0c1ff5dc3e310c777583e85 (diff) | |
download | gitea-88fe7b5a720365e5c8f0a347730f895263465311.tar.gz gitea-88fe7b5a720365e5c8f0a347730f895263465311.zip |
Move serviceworker to workbox and fix SSE interference (#11538)
* Move serviceworker to workbox and fix SSE interference
Instead of statically hardcoding every frontend asset, this uses a
type-based approach to cache all js,css and manifest.json requests.
This also fixes the issue that the service worker was interfering with
EventSource because it was unconditionally handling all requests which
this new implementation doesn't.
Fixes: https://github.com/go-gitea/gitea/issues/11092
Fixes: https://github.com/go-gitea/gitea/issues/7372
* rethrow error instead of logging
* await .register
* Revert "rethrow error instead of logging"
This reverts commit 043162ba1f18b98a4bf9635959fd28d16e839fc5.
* improve comment
* remove JSRenderer
* add version-based cache invalidation
* refactor
* more refactor
* remove comment
* rename item to fit cache name
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
Diffstat (limited to 'modules/templates')
-rw-r--r-- | modules/templates/dynamic.go | 12 | ||||
-rw-r--r-- | modules/templates/static.go | 9 |
2 files changed, 0 insertions, 21 deletions
diff --git a/modules/templates/dynamic.go b/modules/templates/dynamic.go index 6153e8d027..bd1c4d06c5 100644 --- a/modules/templates/dynamic.go +++ b/modules/templates/dynamic.go @@ -48,18 +48,6 @@ func JSONRenderer() macaron.Handler { }) } -// JSRenderer implements the macaron handler for serving JS templates. -func JSRenderer() macaron.Handler { - return macaron.Renderer(macaron.RenderOptions{ - Funcs: NewFuncMap(), - Directory: path.Join(setting.StaticRootPath, "templates"), - AppendDirectories: []string{ - path.Join(setting.CustomPath, "templates"), - }, - HTMLContentType: "application/javascript", - }) -} - // Mailer provides the templates required for sending notification mails. func Mailer() (*texttmpl.Template, *template.Template) { for _, funcs := range NewTextFuncMap() { diff --git a/modules/templates/static.go b/modules/templates/static.go index 5bc4e33e1c..a3aff5e567 100644 --- a/modules/templates/static.go +++ b/modules/templates/static.go @@ -132,15 +132,6 @@ func JSONRenderer() macaron.Handler { }) } -// JSRenderer implements the macaron handler for serving JS templates. -func JSRenderer() macaron.Handler { - return macaron.Renderer(macaron.RenderOptions{ - Funcs: NewFuncMap(), - TemplateFileSystem: NewTemplateFileSystem(), - HTMLContentType: "application/javascript", - }) -} - // Mailer provides the templates required for sending notification mails. func Mailer() (*texttmpl.Template, *template.Template) { for _, funcs := range NewTextFuncMap() { |