Skip to content

Commit af8ea27

Browse files
committed
.
1 parent d6c4ebb commit af8ea27

7 files changed

Lines changed: 29 additions & 22 deletions

File tree

plugin/integration/src/wasmInMem.test.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ object MemWasmTests extends TestSuite:
3838
assert(memFiles.contains("__loader.js"))
3939
assert(memFiles.contains("main.js"))
4040

41-
4241
// The WASM binary must be preserved (not renamed).
4342
if !memFiles.exists(_.endsWith(".wasm")) then
4443
throw new java.lang.AssertionError(s"no .wasm file found in: $memFiles")
@@ -111,4 +110,4 @@ object MemWasmTests extends TestSuite:
111110
}
112111
}
113112

114-
end MemWasmTests
113+
end MemWasmTests

routes/src/appRoute.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ def appRouteInMemory[F[_]](lookup: String => Option[Array[Byte]])(using
5454
logger.debug(
5555
s"[appRouteInMemory] MISS ext=$ext key='$key'"
5656
) >> f.pure(Response[F](Status.NotFound))
57+
end match
58+
end serve
5759

5860
HttpRoutes.of[F] {
5961
case req @ GET -> Root / fName ~ "js" => serve(req, "js")

routes/test/src/build.routes.test.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,7 @@ class BuildRoutesSuite extends CatsEffectSuite:
6969

7070
val found = route(makeReq("/main.abc12345.js")).map(_.status).getOrElse(Status.NotFound)
7171
val notFound = route(makeReq("/missing.js")).map(_.status).getOrElse(Status.NotFound)
72-
val body = route(makeReq("/main.abc12345.js"))
73-
.semiflatMap(_.body.compile.to(Array))
74-
.getOrElse(Array.empty[Byte])
72+
val body = route(makeReq("/main.abc12345.js")).semiflatMap(_.body.compile.to(Array)).getOrElse(Array.empty[Byte])
7573

7674
assertIO(found, Status.Ok) >>
7775
assertIO(notFound, Status.NotFound) >>
@@ -82,7 +80,7 @@ class BuildRoutesSuite extends CatsEffectSuite:
8280
val wasmContent = Array[Byte](0, 97, 115, 109) // fake wasm magic bytes
8381
val lookup: String => Option[Array[Byte]] = {
8482
case "module.abc12345.wasm" => Some(wasmContent)
85-
case _ => None
83+
case _ => None
8684
}
8785
val route = appRouteInMemory[IO](lookup)
8886

sjsls/src/liveServer.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,12 @@ object LiveServer extends IOApp:
180180

181181
_ <- lsc.inMemoryFiles match
182182
case Some(files) =>
183-
logger.debug(
184-
s"[liveServer] Seeding hash ref from IN-MEMORY files. count=${files.size()} keys=${scala.jdk.CollectionConverters.SetHasAsScala(files.keySet()).asScala.mkString(", ")}"
185-
).toResource >>
183+
logger
184+
.debug(
185+
s"[liveServer] Seeding hash ref from IN-MEMORY files. count=${files
186+
.size()} keys=${scala.jdk.CollectionConverters.SetHasAsScala(files.keySet()).asScala.mkString(", ")}"
187+
)
188+
.toResource >>
186189
updateMapRefFromMemory(files, fileToHashRef)(logger).toResource
187190
case None =>
188191
logger.debug(s"[liveServer] Seeding hash ref from DISK. outDirPath=$outDirPath").toResource >>

sjsls/src/refreshRoute.scala

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ def refreshRoutes(
3030
val refresh = refreshTopic
3131
.subscribe(10)
3232
.evalTap(_ => logger.debug("[refreshRoute] raw event received from refreshTopic (pre-debounce)"))
33-
// .debounce(0.1.second)
34-
// .evalTap(_ => logger.debug("[refreshRoute] event passed debounce — will send SSE PageRefresh to client"))
33+
// .debounce(0.1.second)
34+
// .evalTap(_ => logger.debug("[refreshRoute] event passed debounce — will send SSE PageRefresh to client"))
3535

3636
buildTool match
3737
case _: NoBuildTool =>
@@ -48,10 +48,14 @@ def refreshRoutes(
4848
(inMemoryFiles match
4949
case Some(files) =>
5050
logger.debug(
51-
s"[refreshRoute] Updating from IN-MEMORY files. count=${files.size()} keys=${scala.jdk.CollectionConverters.SetHasAsScala(files.keySet()).asScala.mkString(", ")}"
51+
s"[refreshRoute] Updating from IN-MEMORY files. count=${files.size()} keys=${scala
52+
.jdk
53+
.CollectionConverters
54+
.SetHasAsScala(files.keySet())
55+
.asScala
56+
.mkString(", ")}"
5257
) >> updateMapRefFromMemory(files, mr)(logger)
53-
case None => updateMapRef(stringPath, mr)(logger)
54-
)
58+
case None => updateMapRef(stringPath, mr)(logger))
5559
)
5660
.as(PageRefresh())
5761
)

sjsls/src/routes.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ def routes[F[_]: Files: MonadThrow](
7979
case Some(files) =>
8080
logger
8181
.debug(
82-
s"[routes] Using IN-MEMORY appRoute. inMemoryFiles.size=${files.size()} keys=${scala.jdk.CollectionConverters.SetHasAsScala(files.keySet()).asScala.mkString(", ")}"
82+
s"[routes] Using IN-MEMORY appRoute. inMemoryFiles.size=${files
83+
.size()} keys=${scala.jdk.CollectionConverters.SetHasAsScala(files.keySet()).asScala.mkString(", ")}"
8384
)
8485
.toResource
8586
case None =>
86-
logger.debug(s"[routes] Using DISK appRoute. path=$stringPath").toResource
87-
) >>
87+
logger.debug(s"[routes] Using DISK appRoute. path=$stringPath").toResource) >>
8888
IO(refreshableApp).toResource
8989

9090
end routes

sjsls/src/staticWatcher.scala

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,10 @@ def updateMapRefFromMemory(
146146
name -> hash
147147
}
148148
.toMap
149-
}.flatMap(newMap =>
150-
logger.debug(
151-
s"[updateMapRefFromMemory] keys=${newMap.keys.mkString(", ")} hashes=${newMap.mkString(", ")}"
152-
) *>
153-
logger.debug(s"Updated in-memory hashes $newMap") *> mr.set(newMap)
149+
}.flatMap(
150+
newMap =>
151+
logger.debug(
152+
s"[updateMapRefFromMemory] keys=${newMap.keys.mkString(", ")} hashes=${newMap.mkString(", ")}"
153+
) *>
154+
logger.debug(s"Updated in-memory hashes $newMap") *> mr.set(newMap)
154155
)

0 commit comments

Comments
 (0)