Upgrade examples to Tyrian 0.7.0

PurpleKingdomGames · May 20, 2023 · a0d8c26 · a0d8c26
1 parent fec2bab
commit a0d8c26
Show file tree

Hide file tree

Showing 37 changed files with 1,101 additions and 101 deletions.
diff --git a/examples/.tyrian-version b/examples/.tyrian-version
@@ -1 +1 @@
-0.6.2
+0.7.0
diff --git a/examples/bootstrap/src/main/scala/example/Main.scala b/examples/bootstrap/src/main/scala/example/Main.scala
@@ -9,11 +9,14 @@ import scala.scalajs.js.annotation.*
 @JSExportTopLevel("TyrianApp")
 object Main extends TyrianApp[Msg, Model]:
 
+  def router: Location => Msg = Routing.none(Msg.NoOp)
+
   def init(flags: Map[String, String]): (Model, Cmd[IO, Msg]) = (0, Cmd.None)
 
   def update(model: Model): Msg => (Model, Cmd[IO, Msg]) =
     case Msg.Increment => (model + 1, Cmd.None)
     case Msg.Decrement => (model - 1, Cmd.None)
+    case Msg.NoOp      => (model, Cmd.None)
 
   def view(model: Model): Html[Msg] =
     div(`class` := "container")(
@@ -36,4 +39,4 @@ object Main extends TyrianApp[Msg, Model]:
 type Model = Int
 
 enum Msg:
-  case Increment, Decrement
+  case Increment, Decrement, NoOp
diff --git a/examples/bootstrap/yarn.lock b/examples/bootstrap/yarn.lock
@@ -4031,11 +4031,6 @@ slice-ansi@^4.0.0:
     astral-regex "^2.0.0"
     is-fullwidth-code-point "^3.0.0"
 
-snabbdom@^3.0.1:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/snabbdom/-/snabbdom-3.2.0.tgz#8ea6b2517739a7d9ca82df3f181d052adf1ca5ad"
-  integrity sha512-UWyfm8WbaFmbmYLC33pe5fawBfExhynkMDoZqQ8ehlHDwkxrgIOpWhKf5PaacLUW1n+Uwu5N5HND6mESU7cMlw==
-
 "source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf"

diff --git a/examples/build.sbt b/examples/build.sbt
@@ -201,8 +201,7 @@ lazy val zio =
     .settings(
       name := "zio",
       libraryDependencies ++= Seq(
-        "dev.zio" %%% "zio"              % "2.0.10",
-        "dev.zio" %%% "zio-interop-cats" % "23.0.03"
+        "dev.zio" %%% "zio-interop-cats" % "23.0.0.5"
       )
     )
 

diff --git a/examples/bundler/README.md b/examples/bundler/README.md
@@ -4,10 +4,11 @@ This is a minimal working project setup to run the counter example.
 
 To compile, follow the instructions in the parent directories README.md file.
 
-To serve the site, you will need a static web server. A simple one is `http-server` (install: `npm install -g http-server`) which you can launch in the same directory as your `index.html` page as follows
+To serve the site, you will need a static web server. A simple one is `http-server` which you can launch in the same directory as your `index.html` page as follows
 
 ```sh
-http-server -c-1
+npm install http-server
+npx http-server -c-1
 ```
 
 The arguments disable the servers cache.

diff --git a/examples/bundler/index.html b/examples/bundler/index.html
@@ -8,5 +8,5 @@
 
 <body>
   <div id="myapp"></div>
-  <script type="module" src="./target/scala-3.2.2/scalajs-bundler/main/bundler-fastopt-bundle.js"></script>
+  <script type="module" src="./target/scala-3.2.2/scalajs-bundler/main/bundler-fastopt.js"></script>
 </body>
diff --git a/examples/bundler/src/main/scala/example/Main.scala b/examples/bundler/src/main/scala/example/Main.scala
@@ -9,11 +9,14 @@ import scala.scalajs.js.annotation.*
 @JSExportTopLevel("TyrianApp")
 object Main extends TyrianApp[Msg, Model]:
 
+  def router: Location => Msg = Routing.none(Msg.NoOp)
+
   def init(flags: Map[String, String]): (Model, Cmd[IO, Msg]) = (0, Cmd.None)
 
   def update(model: Model): Msg => (Model, Cmd[IO, Msg]) =
     case Msg.Increment => (model + 1, Cmd.None)
     case Msg.Decrement => (model - 1, Cmd.None)
+    case Msg.NoOp      => (model, Cmd.None)
 
   def view(model: Model): Html[Msg] =
     div()(
@@ -31,4 +34,4 @@ object Main extends TyrianApp[Msg, Model]:
 type Model = Int
 
 enum Msg:
-  case Increment, Decrement
+  case Increment, Decrement, NoOp
diff --git a/examples/clock/src/main/scala/example/Main.scala b/examples/clock/src/main/scala/example/Main.scala
@@ -13,11 +13,14 @@ import concurrent.duration.DurationInt
 @JSExportTopLevel("TyrianApp")
 object Main extends TyrianApp[Msg, Model]:
 
+  def router: Location => Msg = Routing.none(Msg.NoOp)
+
   def init(flags: Map[String, String]): (Model, Cmd[IO, Msg]) =
     (new js.Date(), Cmd.None)
 
   def update(model: Model): Msg => (Model, Cmd[IO, Msg]) =
-    msg => (msg.newTime, Cmd.None)
+    case Msg.Tick(newTime) => (newTime, Cmd.None)
+    case Msg.NoOp          => (model, Cmd.None)
 
   def view(model: Model): Html[Msg] =
     val angle = model.getSeconds() * 2 * math.Pi / 60 - math.Pi / 2
@@ -40,8 +43,10 @@ object Main extends TyrianApp[Msg, Model]:
     )
 
   def subscriptions(model: Model): Sub[IO, Msg] =
-    Sub.every[IO](1.second, "clock-ticks").map(Msg.apply)
+    Sub.every[IO](1.second, "clock-ticks").map(Msg.Tick.apply)
 
 type Model = js.Date
 
-final case class Msg(newTime: js.Date)
+enum Msg:
+  case Tick(newTime: js.Date)
+  case NoOp
diff --git a/examples/clock/yarn.lock b/examples/clock/yarn.lock
@@ -4057,11 +4057,6 @@ slice-ansi@^4.0.0:
     astral-regex "^2.0.0"
     is-fullwidth-code-point "^3.0.0"
 
-snabbdom@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/snabbdom/-/snabbdom-3.0.1.tgz#9355339e7c970be7fcd54128ccde9ee57301f222"
-  integrity sha512-H4gKokDT1HPe3dlGyTihNw0NtEH9FxZy55MXp3ODM4O30NBRe+11veox1wf/CP9NfGcbStDM3BmO1DFC9/5wRw==
-
 source-map-js@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf"

diff --git a/examples/counter/src/main/scala/example/Main.scala b/examples/counter/src/main/scala/example/Main.scala
@@ -9,12 +9,15 @@ import scala.scalajs.js.annotation.*
 @JSExportTopLevel("TyrianApp")
 object Main extends TyrianApp[Msg, Model]:
 
+  def router: Location => Msg = Routing.none(Msg.NoOp)
+
   def init(flags: Map[String, String]): (Model, Cmd[IO, Msg]) =
     (Model.init, Cmd.None)
 
   def update(model: Model): Msg => (Model, Cmd[IO, Msg]) =
     case Msg.Increment => (model + 1, Cmd.None)
     case Msg.Decrement => (model - 1, Cmd.None)
+    case Msg.NoOp      => (model, Cmd.None)
 
   def view(model: Model): Html[Msg] =
     div(
@@ -35,4 +38,4 @@ object Model:
     def -(other: Int): Model = i - other
 
 enum Msg:
-  case Increment, Decrement
+  case Increment, Decrement, NoOp
diff --git a/examples/counter/yarn.lock b/examples/counter/yarn.lock
@@ -4057,11 +4057,6 @@ slice-ansi@^4.0.0:
     astral-regex "^2.0.0"
     is-fullwidth-code-point "^3.0.0"
 
-snabbdom@^3.0.1:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/snabbdom/-/snabbdom-3.2.0.tgz#8ea6b2517739a7d9ca82df3f181d052adf1ca5ad"
-  integrity sha512-UWyfm8WbaFmbmYLC33pe5fawBfExhynkMDoZqQ8ehlHDwkxrgIOpWhKf5PaacLUW1n+Uwu5N5HND6mESU7cMlw==
-
 source-map-js@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf"

diff --git a/examples/electron/src/main/scala/example/Main.scala b/examples/electron/src/main/scala/example/Main.scala
@@ -9,12 +9,15 @@ import scala.scalajs.js.annotation.*
 @JSExportTopLevel("TyrianApp")
 object Main extends TyrianApp[Msg, Model]:
 
+  def router: Location => Msg = Routing.none(Msg.NoOp)
+
   def init(flags: Map[String, String]): (Model, Cmd[IO, Msg]) =
     (Model.init, Cmd.None)
 
   def update(model: Model): Msg => (Model, Cmd[IO, Msg]) =
     case Msg.Increment => (model + 1, Cmd.None)
     case Msg.Decrement => (model - 1, Cmd.None)
+    case Msg.NoOp      => (model, Cmd.None)
 
   def view(model: Model): Html[Msg] =
     div(
@@ -35,4 +38,4 @@ object Model:
     def -(other: Int): Model = i - other
 
 enum Msg:
-  case Increment, Decrement
+  case Increment, Decrement, NoOp
diff --git a/examples/field/src/main/scala/example/Main.scala b/examples/field/src/main/scala/example/Main.scala
@@ -9,10 +9,13 @@ import scala.scalajs.js.annotation.*
 @JSExportTopLevel("TyrianApp")
 object Main extends TyrianApp[Msg, Model]:
 
+  def router: Location => Msg = Routing.none(Msg.NoOp)
+
   def init(flags: Map[String, String]): (Model, Cmd[IO, Msg]) = ("", Cmd.None)
 
   def update(model: Model): Msg => (Model, Cmd[IO, Msg]) =
     case Msg.NewContent(content) => (content, Cmd.None)
+    case Msg.NoOp                => (model, Cmd.None)
 
   def view(model: Model): Html[Msg] =
     div()(
@@ -39,4 +42,5 @@ object Main extends TyrianApp[Msg, Model]:
 type Model = String
 
 enum Msg:
-  case NewContent(content: String) extends Msg
+  case NewContent(content: String)
+  case NoOp
diff --git a/examples/field/yarn.lock b/examples/field/yarn.lock
@@ -4057,11 +4057,6 @@ slice-ansi@^4.0.0:
     astral-regex "^2.0.0"
     is-fullwidth-code-point "^3.0.0"
 
-snabbdom@^3.0.1:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/snabbdom/-/snabbdom-3.2.0.tgz#8ea6b2517739a7d9ca82df3f181d052adf1ca5ad"
-  integrity sha512-UWyfm8WbaFmbmYLC33pe5fawBfExhynkMDoZqQ8ehlHDwkxrgIOpWhKf5PaacLUW1n+Uwu5N5HND6mESU7cMlw==
-
 source-map-js@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf"

diff --git a/examples/fs2/src/main/scala/example/Main.scala b/examples/fs2/src/main/scala/example/Main.scala
@@ -11,12 +11,14 @@ import scala.scalajs.js.annotation.*
 @JSExportTopLevel("TyrianApp")
 object Main extends TyrianApp[Msg, Model]:
 
+  def router: Location => Msg = Routing.none(Msg.NoOp)
+
   def init(flags: Map[String, String]): (Model, Cmd[IO, Msg]) =
     (List("A message will appear here every 5 seconds."), Cmd.None)
 
   def update(model: Model): Msg => (Model, Cmd[IO, Msg]) =
-    case Msg.Tick(msg) =>
-      (model :+ msg, Cmd.None)
+    case Msg.Tick(msg) => (model :+ msg, Cmd.None)
+    case Msg.NoOp      => (model, Cmd.None)
 
   def view(model: Model): Html[Msg] =
     div(
@@ -37,3 +39,4 @@ type Model = List[String]
 
 enum Msg:
   case Tick(msg: String)
+  case NoOp
diff --git a/examples/http/src/main/scala/example/Main.scala b/examples/http/src/main/scala/example/Main.scala
@@ -12,13 +12,16 @@ import scala.scalajs.js.annotation.*
 @JSExportTopLevel("TyrianApp")
 object Main extends TyrianApp[Msg, Model]:
 
+  def router: Location => Msg = Routing.none(Msg.NoOp)
+
   def init(flags: Map[String, String]): (Model, Cmd[IO, Msg]) =
     (Model("cats", "waiting.gif"), HttpHelper.getRandomGif("cats"))
 
   def update(model: Model): Msg => (Model, Cmd[IO, Msg]) =
     case Msg.MorePlease     => (model, HttpHelper.getRandomGif(model.topic))
     case Msg.NewGif(newUrl) => (model.copy(gifUrl = newUrl), Cmd.None)
     case Msg.GifError(_)    => (model, Cmd.None)
+    case Msg.NoOp           => (model, Cmd.None)
 
   def view(model: Model): Html[Msg] =
     div()(
@@ -32,9 +35,10 @@ object Main extends TyrianApp[Msg, Model]:
     Sub.None
 
 enum Msg:
-  case MorePlease              extends Msg
-  case NewGif(result: String)  extends Msg
-  case GifError(error: String) extends Msg
+  case MorePlease
+  case NewGif(result: String)
+  case GifError(error: String)
+  case NoOp
 
 object Msg:
   private val onResponse: Response => Msg = { response =>

diff --git a/examples/http/yarn.lock b/examples/http/yarn.lock
@@ -4057,11 +4057,6 @@ slice-ansi@^4.0.0:
     astral-regex "^2.0.0"
     is-fullwidth-code-point "^3.0.0"
 
-snabbdom@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/snabbdom/-/snabbdom-3.0.1.tgz#9355339e7c970be7fcd54128ccde9ee57301f222"
-  integrity sha512-H4gKokDT1HPe3dlGyTihNw0NtEH9FxZy55MXp3ODM4O30NBRe+11veox1wf/CP9NfGcbStDM3BmO1DFC9/5wRw==
-
 source-map-js@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf"

diff --git a/examples/http4s-dom/src/main/scala/example/Main.scala b/examples/http4s-dom/src/main/scala/example/Main.scala
@@ -12,6 +12,8 @@ import scala.scalajs.js.annotation.*
 @JSExportTopLevel("TyrianApp")
 object Main extends TyrianApp[Msg, Model]:
 
+  def router: Location => Msg = Routing.none(Msg.NoOp)
+
   def init(flags: Map[String, String]): (Model, Cmd[IO, Msg]) =
     (Model.init, Cmd.None)
 
@@ -28,6 +30,9 @@ object Main extends TyrianApp[Msg, Model]:
     case Msg.Stars(res) =>
       (model.copy(stargazersResult = res), Cmd.None)
 
+    case Msg.NoOp =>
+      (model, Cmd.None)
+
   def view(model: Model): Html[Msg] =
     div(
       div(
@@ -54,6 +59,7 @@ enum Msg:
   case FetchStars
   case UpdateRepo(repo: String)
   case Stars(result: String)
+  case NoOp
 
 object Http4sHelper: