wonderful
/
gitea-1156
forked from Gitlink/gitea-1156
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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 <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
This commit is contained in:
silverwind 2020-05-21 00:33:31 +02:00 committed by GitHub
parent c7c61778bc
commit b797b76abd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
web_src/js/publicpath.js
View File

@ -1,5 +1,10 @@
// This sets up webpack's chunk loading to load resources from the 'public' // This sets up the URL prefix used in webpack's chunk loading.
// directory. This file must be imported before any lazy-loading is being attempted. // This file must be imported before any lazy-loading is being attempted.
const {StaticUrlPrefix} = window.config;
const url = new URL(document.currentScript.src); if (StaticUrlPrefix) {
__webpack_public_path__ = url.pathname.replace(/\/[^/]*?\/[^/]*?$/, '/'); __webpack_public_path__ = StaticUrlPrefix.endsWith('/') ? StaticUrlPrefix : `${StaticUrlPrefix}/`;
} else {
const url = new URL(document.currentScript.src);
__webpack_public_path__ = url.pathname.replace(/\/[^/]*?\/[^/]*?$/, '/');
}