Update fun-stack, outwatch, colibri (#482)

fun-stack · Feb 13, 2024 · a5bd98c · a5bd98c
1 parent c9c4d85
commit a5bd98c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/build.sbt b/build.sbt
@@ -6,9 +6,9 @@ ThisBuild / scalaVersion := "2.13.12"
 Global / excludeLintKeys += webpackDevServerPort // TODO:
 
 val versions = new {
-  val outwatch = "1.0.0-RC17"
-  val colibri  = "0.7.8"
-  val funStack = "0.8.9"
+  val outwatch = "1.0.0"
+  val colibri  = "0.8.3"
+  val funStack = "0.9.23"
   val tapir    = "1.9.8"
   val pprint   = "0.8.1"
 }
@@ -70,10 +70,9 @@ lazy val webapp = project
   .settings(
     Test / test := {}, // skip tests, since we don't have any in this subproject. Remove this line, once there are tests
     libraryDependencies ++= Seq(
-      "io.github.outwatch"   %%% "outwatch"            % versions.outwatch,
-      "io.github.fun-stack"  %%% "fun-stack-web"       % versions.funStack,
-      "io.github.fun-stack"  %%% "fun-stack-web-tapir" % versions.funStack, // this pulls in scala-java-time, which will drastically increase the javascript bundle size. Remove if not needed.
-      "com.github.cornerman" %%% "colibri-router"      % versions.colibri,
+      "io.github.outwatch"   %%% "outwatch"             % versions.outwatch,
+      "io.github.fun-stack"  %%% "fun-stack-client-web" % versions.funStack,
+      "com.github.cornerman" %%% "colibri-router"       % versions.colibri,
     ),
     Compile / npmDependencies ++= readJsDependencies(baseDirectory.value, "dependencies") ++ Seq(
       "snabbdom"               -> "github:outwatch/snabbdom.git#semver:0.7.5", // for outwatch, workaround for: https://github.com/ScalablyTyped/Converter/issues/293

diff --git a/webapp/src/main/scala/example/webapp/App.scala b/webapp/src/main/scala/example/webapp/App.scala
@@ -2,7 +2,7 @@ package example.webapp
 
 import outwatch._
 import outwatch.dsl._
-import funstack.web.Fun
+import funstack.client.web.Fun
 
 object App {
 

diff --git a/webapp/src/main/scala/example/webapp/Components.scala b/webapp/src/main/scala/example/webapp/Components.scala
@@ -4,7 +4,7 @@ import colibri.Subject
 import example.api
 import outwatch._
 import outwatch.dsl._
-import funstack.web.tapir
+import funstack.client.web.Fun
 
 object Components {
   import example.api.HttpApi
@@ -16,7 +16,7 @@ object Components {
       b("My books: "),
       span(
         cls := "tapir-result",
-        tapir.Fun.http
+        Fun.httpApi
           .client(HttpApi.booksListing)((HttpApi.BooksFromYear("drama", 2011), 10))
           .map(_.toString),
       ),

diff --git a/webapp/src/main/scala/example/webapp/Main.scala b/webapp/src/main/scala/example/webapp/Main.scala
@@ -3,11 +3,11 @@ package example.webapp
 import cats.effect.{IO, IOApp}
 import outwatch.Outwatch
 
-import funstack.web.Fun
+import funstack.client.web.Fun
 
 object Main extends IOApp.Simple {
   LoadCss()
 
   override def run =
-    Fun.ws.start &> Outwatch.renderInto[IO]("#app", App.layout)
+    Fun.wsRpc.start &> Outwatch.renderInto[IO]("#app", App.layout)
 }
diff --git a/webapp/src/main/scala/example/webapp/RpcApiClient.scala b/webapp/src/main/scala/example/webapp/RpcApiClient.scala
@@ -4,19 +4,19 @@ import cats.effect.IO
 import example.api.{EventApi, RpcApi}
 import colibri.Observable
 import sloth.Client
-import funstack.web.Fun
+import funstack.client.web.Fun
 
 import chameleon.ext.circe._
 
 object WsRpcClient {
-  val client          = Client(Fun.ws.transport[String])
+  val client          = Client(Fun.wsRpc.transport[String])
   val api: RpcApi[IO] = client.wire[RpcApi[IO]]
 
-  val eventClient                    = Client(Fun.ws.streamsTransport[String])
+  val eventClient                    = Client(Fun.wsRpc.streamsTransport[String])
   val eventApi: EventApi[Observable] = eventClient.wire[EventApi[Observable]]
 }
 
 object HttpRpcClient {
-  val client          = Client(Fun.http.transport[String])
+  val client          = Client(Fun.httpRpc.transport[String])
   val api: RpcApi[IO] = client.wire[RpcApi[IO]]
 }