Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-03-13 15:20:14 +01:00
Code Issues Projects Releases Wiki Activity

Skip javascript translation on React bundle files

Browse Source 
Affects issues:
- Fixed #2799
This commit is contained in:
Aurora Lahtela 2023-01-22 14:50:42 +02:00
parent 63350a4fea
commit 8dccb060c0
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/ResponseFactory.java
View File

@ -67,6 +67,8 @@ import java.util.function.Function;
@Singleton @Singleton
public class ResponseFactory { public class ResponseFactory {
private static final String STATIC_BUNDLE_FOLDER = "static";
private final PlanFiles files; private final PlanFiles files;
private final PageFactory pageFactory; private final PageFactory pageFactory;
private final Locale locale; private final Locale locale;
@ -220,10 +222,13 @@ public class ResponseFactory {
.chain(this::replaceMainAddressPlaceholder) .chain(this::replaceMainAddressPlaceholder)
.chain(theme::replaceThemeColors) .chain(theme::replaceThemeColors)
.chain(contents -> { .chain(contents -> {
if (fileName.startsWith("vendor/") || fileName.startsWith("/vendor/")) {return contents;} if (fileName.contains(STATIC_BUNDLE_FOLDER) || fileName.startsWith("vendor/") || fileName.startsWith("/vendor/")) {
return contents;
}
return locale.replaceLanguageInJavascript(contents); return locale.replaceLanguageInJavascript(contents);
}) })
.chain(contents -> StringUtils.replace(contents, "n.p=\"/\"", .chain(contents -> StringUtils.replace(contents,
"n.p=\"/\"",
"n.p=\"" + getBasePath() + "/\"")) "n.p=\"" + getBasePath() + "/\""))
.apply(); .apply();
ResponseBuilder responseBuilder = Response.builder() ResponseBuilder responseBuilder = Response.builder()
@ -231,7 +236,7 @@ public class ResponseFactory {
.setContent(content) .setContent(content)
.setStatus(200); .setStatus(200);
if (fileName.contains("static")) { if (fileName.contains(STATIC_BUNDLE_FOLDER)) {
resource.getLastModified().ifPresent(lastModified -> responseBuilder resource.getLastModified().ifPresent(lastModified -> responseBuilder
// Can't cache main bundle in browser since base path might change // Can't cache main bundle in browser since base path might change
.setHeader(HttpHeader.CACHE_CONTROL.asString(), fileName.contains("main") ? CacheStrategy.CHECK_ETAG : CacheStrategy.CACHE_IN_BROWSER) .setHeader(HttpHeader.CACHE_CONTROL.asString(), fileName.contains("main") ? CacheStrategy.CHECK_ETAG : CacheStrategy.CACHE_IN_BROWSER)
@ -273,7 +278,7 @@ public class ResponseFactory {
.setContent(content) .setContent(content)
.setStatus(200); .setStatus(200);
if (fileName.contains("static")) { if (fileName.contains(STATIC_BUNDLE_FOLDER)) {
resource.getLastModified().ifPresent(lastModified -> responseBuilder resource.getLastModified().ifPresent(lastModified -> responseBuilder
// Can't cache css bundles in browser since base path might change // Can't cache css bundles in browser since base path might change
.setHeader(HttpHeader.CACHE_CONTROL.asString(), CacheStrategy.CHECK_ETAG) .setHeader(HttpHeader.CACHE_CONTROL.asString(), CacheStrategy.CHECK_ETAG)
@ -298,7 +303,7 @@ public class ResponseFactory {
.setContent(resource) .setContent(resource)
.setStatus(200); .setStatus(200);
if (fileName.contains("static")) { if (fileName.contains(STATIC_BUNDLE_FOLDER)) {
resource.getLastModified().ifPresent(lastModified -> responseBuilder resource.getLastModified().ifPresent(lastModified -> responseBuilder
.setHeader(HttpHeader.CACHE_CONTROL.asString(), CacheStrategy.CACHE_IN_BROWSER) .setHeader(HttpHeader.CACHE_CONTROL.asString(), CacheStrategy.CACHE_IN_BROWSER)
.setHeader(HttpHeader.LAST_MODIFIED.asString(), httpLastModifiedFormatter.apply(lastModified)) .setHeader(HttpHeader.LAST_MODIFIED.asString(), httpLastModifiedFormatter.apply(lastModified))
@ -333,7 +338,7 @@ public class ResponseFactory {
.setMimeType(type) .setMimeType(type)
.setContent(resource); .setContent(resource);
if (fileName.contains("static")) { if (fileName.contains(STATIC_BUNDLE_FOLDER)) {
resource.getLastModified().ifPresent(lastModified -> responseBuilder resource.getLastModified().ifPresent(lastModified -> responseBuilder
.setHeader(HttpHeader.CACHE_CONTROL.asString(), CacheStrategy.CACHE_IN_BROWSER) .setHeader(HttpHeader.CACHE_CONTROL.asString(), CacheStrategy.CACHE_IN_BROWSER)
.setHeader(HttpHeader.LAST_MODIFIED.asString(), httpLastModifiedFormatter.apply(lastModified)) .setHeader(HttpHeader.LAST_MODIFIED.asString(), httpLastModifiedFormatter.apply(lastModified))