Upstream
/
Plan
mirror of https://github.com/plan-player-analytics/Plan.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix preload in subdirectory due to extra starting slash in basePath

This commit is contained in:
Aurora Lahtela 2023-12-10 09:11:52 +02:00
parent de00e733f2
commit 16b6a2a930
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/BundleAddressCorrection.java
View File

@ -77,7 +77,7 @@ public class BundleAddressCorrection {
return correctAddressInCss(content, basePath);
} else if (fileName.endsWith(".js")) {
return correctAddressInJavascript(content, basePath);
} else if (fileName.equals("index.html")) {
} else if ("index.html".equals(fileName)) {
return correctAddressInHtml(content, basePath);
}
return content;
@ -111,7 +111,8 @@ public class BundleAddressCorrection {
boolean atUrlRoot = basePath.isEmpty();
// This handles /static and static representation
String startingSlash = addressStart.startsWith("/") ? "/" : "";
boolean startsWithSlash = addressStart.startsWith("/");
String startingSlash = startsWithSlash ? "/" : "";
// This handles basePath containing a slash after subdirectory, such as /plan/ instead of /plan
String endingSlash = basePath.endsWith("/") ? "" : "/";
@ -124,6 +125,11 @@ public class BundleAddressCorrection {
? "./"
: basePath + endingSlash + "static/";
// Replaces basePath starting slash if the replaced thing does not start with slash
if (!startsWithSlash && staticReplacement.startsWith("/")) {
staticReplacement = staticReplacement.substring(1);
}
// Replacement examples when basepath is empty, "/plan" or "/plan/"
// "./Filename-hash.js" -> "./Filename-hash.js" or "/plan/static/Filename-hash.js"
// "/static/Filename-hash.js" -> "/static/Filename-hash.js" or "/plan/static/Filename-hash.js"