From b797b76abd13beba348415bdb81c7d3593bb01f9 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 21 May 2020 00:33:31 +0200 Subject: [PATCH] Fix webpack chunk loading with STATIC_URL_PREFIX (#11526) Previously, we had only set __webpack_public_path__ to a path which caused webpack chunks to be loaded from the current origin which is incorrect when STATIC_URL_PREFIX points to another origin. This should fix the issue curretnly seen on gitea.com. Co-authored-by: zeripath Co-authored-by: Lauris BH --- web_src/js/publicpath.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/web_src/js/publicpath.js b/web_src/js/publicpath.js index 892bb459aa2c2..38865aa6669e3 100644 --- a/web_src/js/publicpath.js +++ b/web_src/js/publicpath.js @@ -1,5 +1,10 @@ -// This sets up webpack's chunk loading to load resources from the 'public' -// directory. This file must be imported before any lazy-loading is being attempted. +// This sets up the URL prefix used in webpack's chunk loading. +// This file must be imported before any lazy-loading is being attempted. +const {StaticUrlPrefix} = window.config; -const url = new URL(document.currentScript.src); -__webpack_public_path__ = url.pathname.replace(/\/[^/]*?\/[^/]*?$/, '/'); +if (StaticUrlPrefix) { + __webpack_public_path__ = StaticUrlPrefix.endsWith('/') ? StaticUrlPrefix : `${StaticUrlPrefix}/`; +} else { + const url = new URL(document.currentScript.src); + __webpack_public_path__ = url.pathname.replace(/\/[^/]*?\/[^/]*?$/, '/'); +}