Towards Calico 0.2

.github/workflows/ci.yml

@@ -94,11 +94,11 @@ jobs:
 
       - name: Make target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/series/0.1')
-        run: mkdir -p frp/.js/target todo-mvc/target target unidocs/target .js/target site/target widget/target jsdocs/target .jvm/target .native/target example/target frp/.jvm/target router/target calico/target project/target
+        run: mkdir -p frp/.js/target todo-mvc/target target unidocs/target .js/target site/target jsdocs/target .jvm/target .native/target example/target frp/.jvm/target router/target calico/target project/target
 
       - name: Compress target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/series/0.1')
-        run: tar cf targets.tar frp/.js/target todo-mvc/target target unidocs/target .js/target site/target widget/target jsdocs/target .jvm/target .native/target example/target frp/.jvm/target router/target calico/target project/target
+        run: tar cf targets.tar frp/.js/target todo-mvc/target target unidocs/target .js/target site/target jsdocs/target .jvm/target .native/target example/target frp/.jvm/target router/target calico/target project/target
 
       - name: Upload target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/series/0.1')

build.sbt

@@ -17,14 +17,16 @@ ThisBuild / scalacOptions ++= Seq("-new-syntax", "-indent", "-source:future")
 ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17"))
 ThisBuild / tlJdkRelease := Some(8)
 
+ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+
 val CatsVersion = "2.9.0"
 val CatsEffectVersion = "3.4.4"
 val Fs2Version = "3.4.0"
-val Fs2DomVersion = "0.1.0"
+val Fs2DomVersion = "0.1-d92ea1c-SNAPSHOT"
 val MonocleVersion = "3.2.0"
 
 lazy val root =
-  tlCrossRootProject.aggregate(frp, calico, router, widget, example, todoMvc, unidocs)
+  tlCrossRootProject.aggregate(frp, calico, router, example, todoMvc, unidocs)
 
 lazy val frp = crossProject(JVMPlatform, JSPlatform)
   .crossType(CrossType.Pure)
@@ -70,18 +72,10 @@ lazy val router = project
     )
   )
 
-lazy val widget = project
-  .in(file("widget"))
-  .enablePlugins(ScalaJSPlugin)
-  .settings(
-    name := "calico-widget"
-  )
-  .dependsOn(calico)
-
 lazy val example = project
   .in(file("example"))
   .enablePlugins(ScalaJSPlugin, NoPublishPlugin)
-  .dependsOn(calico, widget, router)
+  .dependsOn(calico, router)
   .settings(
     scalaJSUseMainModuleInitializer := true,
     Compile / fastLinkJS / scalaJSLinkerConfig ~= {
@@ -128,7 +122,7 @@ lazy val unidocs = project
     ScalaUnidoc / unidoc / unidocProjectFilter := inProjects(frp.js, calico, router)
   )
 
-lazy val jsdocs = project.dependsOn(calico, router, widget).enablePlugins(ScalaJSPlugin)
+lazy val jsdocs = project.dependsOn(calico, router).enablePlugins(ScalaJSPlugin)
 lazy val docs = project
   .in(file("site"))
   .enablePlugins(TypelevelSitePlugin)

calico/src/main/scala/calico/IOWebApp.scala

@@ -26,9 +26,9 @@ trait IOWebApp:
 
   def rootElementId: String = "app"
 
-  def render: Resource[IO, dom.HTMLElement]
+  def render: Resource[IO, fs2.dom.HtmlElement[IO]]
 
   def main(args: Array[String]): Unit =
-    IO.delay(Option(dom.document.getElementById(rootElementId)).get)
-      .flatMap { e => render.renderInto(e).useForever }
-      .unsafeRunAndForget()
+    val document = fs2.dom.Document[IO]
+    val rootElement = document.getElementById(rootElementId).map(_.get)
+    rootElement.flatMap(render.renderInto(_).useForever).unsafeRunAndForget()