injectr preloads into templates too

Author: Quafadas

justfile

@@ -33,7 +33,14 @@ jvmLinker:
   mill project.run --build-tool scala-cli --project-dir /Users/simon/Code/helloScalaJs --out-dir /Users/simon/Code/helloScalaJs/out --extra-build-args --js-cli-on-jvm --port 3007
 
 serveMill:
-  mill project.run --build-tool mill --project-dir /Users/simon/Code/mill-full-stack/mill-full-stack --styles-dir /Users/simon/Code/mill-full-stack/mill-full-stack/frontend/ui/assets  --out-dir /Users/simon/Code/mill-full-stack/mill-full-stack/out/frontend/fastLinkJS.dest --log-level info --proxy-target-port 8080 --proxy-prefix-path /api --port 3007 --mill-module-name frontend
+  mill -j 0 project.run --build-tool mill --project-dir /Users/simon/Code/mill-full-stack/mill-full-stack \
+    --path-to-index-html /Users/simon/Code/mill-full-stack/mill-full-stack/frontend/ui \
+    --out-dir /Users/simon/Code/mill-full-stack/mill-full-stack/out/frontend/fastLinkJS.dest \
+    --log-level info \
+    --port 3007 \
+    --mill-module-name frontend \
+    --proxy-prefix-path /api \
+    --proxy-target-port 8080
 
 setupPlaywright:
   cs launch com.microsoft.playwright:playwright:1.41.1 -M "com.microsoft.playwright.CLI" -- install --with-deps

project/src/htmlGen.scala

@@ -97,7 +97,7 @@ def makeInternalPreloads(ref: Ref[IO, Map[String, String]]) =
       for
         m <- modules
         if m._1.toString.endsWith(".js") && m._1.toString.startsWith("internal")
-      yield link(rel := "modulepreload", src := s"${m._1}")
+      yield link(rel := "modulepreload", href := s"${m._1}?h=${m._2}")
       end for
   }
 

project/src/routes.scala

@@ -37,6 +37,7 @@ import cats.effect.kernel.Resource
 import cats.syntax.all.*
 
 import _root_.io.circe.syntax.EncoderOps
+import org.http4s.Http
 
 def routes[F[_]: Files: MonadThrow](
     stringPath: String,
@@ -143,12 +144,41 @@ def routes[F[_]: Files: MonadThrow](
     case None => generatedIndexHtml(injectStyles = false, modules)
 
     case Some(IndexHtmlConfig.IndexHtmlPath(path)) =>
-      StaticMiddleware(
-        Router(
-          "" -> fileService[IO](FileService.Config(path.toString()))
-        ),
-        fs2.io.file.Path(path.toString())
-      )(logger)
+      // StaticMiddleware(
+      // Router(
+      //   "" ->
+      HttpRoutes
+        .of[IO] {
+          case req @ GET -> Root =>
+            StaticFile
+              .fromPath[IO](path / "index.html")
+              .getOrElseF(NotFound())
+              .flatMap {
+                f =>
+                  f.body
+                    .through(text.utf8.decode)
+                    .compile
+                    .string
+                    .flatMap {
+                      body =>
+                        for str <- injectModulePreloads(modules, body)
+                        yield
+                          val bytes = str.getBytes()
+                          f.withEntity(bytes)
+                          Response[IO]().withEntity(bytes).putHeaders("Content-Type" -> "text/html")
+
+                    }
+              }
+
+        }
+        .combineK(
+          StaticMiddleware(
+            Router(
+              "" -> fileService[IO](FileService.Config(path.toString()))
+            ),
+            fs2.io.file.Path(path.toString())
+          )(logger)
+        )
 
     case Some(IndexHtmlConfig.StylesOnly(stylesPath)) =>
       NoCacheMiddlware(

project/test/src/liveServer.test.scala

@@ -248,12 +248,12 @@ trait PlaywrightTest extends CatsEffectSuite:
           Ok
         ) >>
         assertIO(
-          client.expect[String](s"http://localhost:$port"),
-          vanilla.render
+          client.expect[String](s"http://localhost:$port").map(_.filterNot(_.isWhitespace)),
+          vanilla.render.filterNot(_.isWhitespace)
         ) >>
         assertIO(
-          client.expect[String](s"http://localhost:$port/app/spaRoute"),
-          vanilla.render
+          client.expect[String](s"http://localhost:$port/app/spaRoute").map(_.filterNot(_.isWhitespace)),
+          vanilla.render.filterNot(_.isWhitespace)
         )
 
   }