From cc15d1f86da99a0b6d67618bccf5277bd5d85362 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 12 Jun 2023 12:49:26 +0200
Subject: [PATCH] DEV: Fix subfolder setup in dev env (#21983)

1. ember proxy stuff still isn't in a great shape, live-reload doesn't work yet, uploads made w/o subfolder won't work, custom fonts don't work, service worker doesn't work. But otherwise it's fine :P
2. I don't know why `HTTP_IF_MODIFIED_SINCE` can be an empty string. Don't have time to investigate, and fast_blank makes this fix an easy solution ;)
---
 app/assets/javascripts/bootstrap-json/index.js | 8 ++++----
 app/controllers/stylesheets_controller.rb      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/bootstrap-json/index.js b/app/assets/javascripts/bootstrap-json/index.js
index 323a16816d3..0a091b8407d 100644
--- a/app/assets/javascripts/bootstrap-json/index.js
+++ b/app/assets/javascripts/bootstrap-json/index.js
@@ -343,9 +343,9 @@ async function handleRequest(proxy, baseURL, req, res) {
   const csp = response.headers.get("content-security-policy");
   if (csp) {
     const emberCliAdditions = [
-      `http://${originalHost}/assets/`,
-      `http://${originalHost}/ember-cli-live-reload.js`,
-      `http://${originalHost}/_lr/`,
+      `http://${originalHost}${baseURL}assets/`,
+      `http://${originalHost}${baseURL}ember-cli-live-reload.js`,
+      `http://${originalHost}${baseURL}_lr/`,
     ].join(" ");
 
     const newCSP = csp
@@ -516,7 +516,7 @@ to serve API requests. For example:
       return false;
     }
 
-    if (request.path.startsWith("/_lr/")) {
+    if (request.path.startsWith(`${baseURL}_lr/`)) {
       return false;
     }
 
diff --git a/app/controllers/stylesheets_controller.rb b/app/controllers/stylesheets_controller.rb
index 1d6c77f0a65..24abd4151b2 100644
--- a/app/controllers/stylesheets_controller.rb
+++ b/app/controllers/stylesheets_controller.rb
@@ -39,7 +39,7 @@ class StylesheetsController < ApplicationController
 
     cache_time = request.env["HTTP_IF_MODIFIED_SINCE"]
 
-    if cache_time
+    if cache_time.present?
       begin
         cache_time = Time.rfc2822(cache_time)
       rescue ArgumentError
@@ -63,7 +63,7 @@ class StylesheetsController < ApplicationController
 
     handle_missing_cache(location, target, digest) if !stylesheet_time
 
-    if cache_time && stylesheet_time && stylesheet_time <= cache_time
+    if cache_time.present? && stylesheet_time && stylesheet_time <= cache_time
       return render body: nil, status: 304
     end