Fix silly preload

Author: Quafadas

sjsls/src/buildSpaRoute.scala

@@ -36,7 +36,7 @@ def buildSpaRoute(
       StaticHtmlMiddleware(
         HttpRoutes.of[IO] {
           case req @ GET -> _ =>
-            vanillaTemplate(false, modules).map: html =>
+            vanillaTemplate(false, modules, injectPreloads).map: html =>
               Response[IO]().withEntity(html)
 
         },
@@ -48,7 +48,7 @@ def buildSpaRoute(
       StaticHtmlMiddleware(
         HttpRoutes.of[IO] {
           case GET -> _ =>
-            vanillaTemplate(true, modules).map: html =>
+            vanillaTemplate(true, modules, injectPreloads).map: html =>
               Response[IO]().withEntity(html)
         },
         true,

sjsls/src/htmlGen.scala

@@ -18,14 +18,19 @@ import cats.effect.IO
 import cats.effect.kernel.Ref
 import cats.syntax.all.*
 
-def generatedIndexHtml(injectStyles: Boolean, modules: Ref[IO, Map[String, String]], zdt: ZonedDateTime)(
+def generatedIndexHtml(
+    injectStyles: Boolean,
+    modules: Ref[IO, Map[String, String]],
+    zdt: ZonedDateTime,
+    attemptPreload: Boolean
+)(
     logger: Scribe[IO]
 ) =
   StaticHtmlMiddleware(
     HttpRoutes.of[IO] {
       case req @ GET -> Root =>
         logger.trace("Generated index.html") >>
-          vanillaTemplate(injectStyles, modules).flatMap: html =>
+          vanillaTemplate(injectStyles, modules, attemptPreload).flatMap: html =>
             userBrowserCacheHeaders(Response[IO]().withEntity(html).withStatus(Status.Ok), zdt, injectStyles)
 
     },
@@ -35,7 +40,7 @@ def generatedIndexHtml(injectStyles: Boolean, modules: Ref[IO, Map[String, Strin
     StaticHtmlMiddleware(
       HttpRoutes.of[IO] {
         case GET -> Root / "index.html" =>
-          vanillaTemplate(injectStyles, modules).flatMap: html =>
+          vanillaTemplate(injectStyles, modules, attemptPreload).flatMap: html =>
             userBrowserCacheHeaders(Response[IO]().withEntity(html).withStatus(Status.Ok), zdt, injectStyles)
 
       },
@@ -105,20 +110,23 @@ def injectModulePreloads(ref: Ref[IO, Map[String, String]], template: String) =
 
 end injectModulePreloads
 
-def makeHeader(modules: Seq[(Path, String)], withStyles: Boolean) =
+def makeHeader(modules: Seq[(Path, String)], withStyles: Boolean, attemptPreload: Boolean = false) =
   val scripts =
     for
       m <- modules
       if m._1.toString.endsWith(".js")
-    yield link(rel := "modulepreload", href := s"${m._1}?hash=${m._2}")
+    yield link(
+      rel := "modulepreload",
+      href := s"${m._1}?hash=${m._2}"
+    )
 
   html(
     head(
       meta(
         httpEquiv := "Cache-control",
         content := "no-cache, no-store, must-revalidate"
       ),
-      scripts
+      if attemptPreload then scripts else ()
     ),
     body(
       lessStyle(withStyles),
@@ -143,16 +151,17 @@ def makeInternalPreloads(ref: Ref[IO, Map[String, String]]) =
 
 end makeInternalPreloads
 
-def vanillaTemplate(withStyles: Boolean, ref: Ref[IO, Map[String, String]]) =
+def vanillaTemplate(withStyles: Boolean, ref: Ref[IO, Map[String, String]], attemptPreload: Boolean) =
+
   val preloads = makeInternalPreloads(ref)
   preloads.map: modules =>
     html(
       head(
         meta(
           httpEquiv := "Cache-control",
-          content := "no-cache, no-store, must-revalidate",
-          modules
-        )
+          content := "no-cache, no-store, must-revalidate"
+        ),
+        if attemptPreload then modules else ()
       ),
       body(
         lessStyle(withStyles),

sjsls/src/static.routes.scala

@@ -28,7 +28,7 @@ def staticAssetRoutes(
     injectPreloads: Boolean
 )(logger: Scribe[IO]): HttpRoutes[IO] =
   indexOpts match
-    case None => generatedIndexHtml(injectStyles = false, modules, zdt)(logger)
+    case None => generatedIndexHtml(injectStyles = false, modules, zdt, injectPreloads)(logger)
 
     case Some(IndexHtmlConfig.IndexHtmlPath(path)) =>
       HttpRoutes
@@ -50,7 +50,7 @@ def staticAssetRoutes(
         Router(
           "" -> fileService[IO](FileService.Config(stylesPath.toString()))
         )
-      )(logger).combineK(generatedIndexHtml(injectStyles = true, modules, zdt)(logger))
+      )(logger).combineK(generatedIndexHtml(injectStyles = true, modules, zdt, injectPreloads)(logger))
 
 def serveIndexHtml(from: fs2.io.file.Path, modules: Ref[IO, Map[String, String]], injectPreloads: Boolean) = StaticFile
   .fromPath[IO](from / "index.html")

sjsls/test/src/UtilityFcts.scala

@@ -13,7 +13,8 @@ class UtilityFcs extends CatsEffectSuite:
       modules = Seq(
         (fs2.io.file.Path("main.js"), "hash")
       ),
-      withStyles = false
+      withStyles = false,
+      attemptPreload = true
     )
 
     assert(html.render.contains("modulepreload"))