From 2982afe6b498f9d61bd48407c5408299a1cbbc60 Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 21 Jan 2020 18:32:33 +0100 Subject: move jquery and jquery-migrate to npm/webpack (#9813) Currently, this needs to be its own chunk because fomantic depends on jQuery being present. The next step is to move fomantic to webpack too after which we can combine the index,fomantic and jquery files into one. jquery-migrate is still neccessary because our ancient version of Dropzone seems to break without it. I imagine it can be removed after a Dropzone upgrade. --- templates/base/footer.tmpl | 5 +---- templates/pwa/serviceworker_js.tmpl | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'templates') diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 94122e4b23..f59b34a983 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -12,8 +12,7 @@ {{template "base/footer_content" .}} - - + {{if .RequireSimpleMDE}} @@ -115,8 +114,6 @@ - - {{if .EnableHeatmap}} diff --git a/templates/pwa/serviceworker_js.tmpl b/templates/pwa/serviceworker_js.tmpl index 04b4f451c4..0f92270b55 100644 --- a/templates/pwa/serviceworker_js.tmpl +++ b/templates/pwa/serviceworker_js.tmpl @@ -2,12 +2,11 @@ var STATIC_CACHE = 'static-cache-v1'; var urlsToCache = [ // js '{{StaticUrlPrefix}}/vendor/plugins/jquery.areyousure/jquery.are-you-sure.js', - '{{StaticUrlPrefix}}/vendor/plugins/jquery/jquery.min.js?v=3.4.1', - '{{StaticUrlPrefix}}/vendor/plugins/jquery-migrate/jquery-migrate.min.js?v=3.0.1', '{{StaticUrlPrefix}}/fomantic/semantic.min.js?v={{MD5 AppVer}}', '{{StaticUrlPrefix}}/js/index.js?v={{MD5 AppVer}}', '{{StaticUrlPrefix}}/js/swagger.js?v={{MD5 AppVer}}', '{{StaticUrlPrefix}}/js/gitgraph.js?v={{MD5 AppVer}}', + '{{StaticUrlPrefix}}/js/jquery.js?v={{MD5 AppVer}}', '{{StaticUrlPrefix}}/vendor/plugins/clipboard/clipboard.min.js', '{{StaticUrlPrefix}}/vendor/plugins/vue/vue.min.js', '{{StaticUrlPrefix}}/vendor/plugins/emojify/emojify.custom.js', -- cgit v1.2.3