Build: Use Scala 3 by default, switch website examples to Scala 3

raquo · Mar 20, 2023 · 014511f · 014511f
1 parent 07d6dd4
commit 014511f
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 15 deletions.
diff --git a/build.sbt b/build.sbt
@@ -17,7 +17,7 @@ ThisBuild / dynver := {
     .mkVersion(out => versionFmt(out, dynverSonatypeSnapshots.value), fallbackVersion(d))
 }
 
-ThisBuild / scalaVersion := Versions.Scala_2_13
+ThisBuild / scalaVersion := Versions.Scala_3
 
 ThisBuild / crossScalaVersions := Seq(Versions.Scala_2_12, Versions.Scala_2_13, Versions.Scala_3)
 
@@ -33,6 +33,9 @@ lazy val websiteJS = project
     libraryDependencies += "org.scala-js" %%% "scalajs-dom" % Versions.ScalaJsDom,
     (publish / skip) := true,
     webpackBundlingMode := BundlingMode.LibraryOnly(),
+    (installJsdom / version) := Versions.JsDom,
+    (webpack / version) := Versions.Webpack,
+    (startWebpackDevServer / version) := Versions.WebpackDevServer,
     //webpackBundlingMode := BundlingMode.LibraryAndApplication(),
     scalaJSLinkerConfig ~= {
       _.withModuleKind(ModuleKind.CommonJSModule)

diff --git a/website/docs/examples/ajax.md b/website/docs/examples/ajax.md
@@ -7,7 +7,7 @@ title: Ajax
 ```scala mdoc:js
 import com.raquo.airstream.web.AjaxStream
 import com.raquo.airstream.web.AjaxStream.AjaxStreamError
-import com.raquo.laminar.api.L._
+import com.raquo.laminar.api.L.{*, given}
 import org.scalajs.dom
 
 // Example based on plain JS version: http://plnkr.co/edit/ycQbBr0vr7ceUP2p6PHy?preview

diff --git a/website/docs/examples/controlled-inputs.md b/website/docs/examples/controlled-inputs.md
@@ -11,7 +11,7 @@ In this example, we prevent user input that isn't all digits (try pasting "12ab"
 <div class = "mdoc-example">
 
 ```scala mdoc:js
-import com.raquo.laminar.api.L._
+import com.raquo.laminar.api.L.{*, given}
 import org.scalajs.dom
 
 val zipVar = Var("")

diff --git a/website/docs/examples/counter.md b/website/docs/examples/counter.md
@@ -5,7 +5,7 @@ title: Counter
 <div class = "mdoc-example">
 
 ```scala mdoc:js
-import com.raquo.laminar.api.L._
+import com.raquo.laminar.api.L.{*, given}
 import org.scalajs.dom
 
 def Counter(label: String, initialStep: Int): HtmlElement = {

diff --git a/website/docs/examples/form-state.md b/website/docs/examples/form-state.md
@@ -7,7 +7,7 @@ Here is one of many ways you could model form state and validation in Laminar.
 <div class = "mdoc-example">
 
 ```scala mdoc:js
-import com.raquo.laminar.api.L._
+import com.raquo.laminar.api.L.{*, given}
 import org.scalajs.dom
 
 case class FormState(

diff --git a/website/docs/examples/hello-world.md b/website/docs/examples/hello-world.md
@@ -8,7 +8,7 @@ Simplest example from the [video](https://www.youtube.com/watch?v=L_AHCkl6L-Q).
 
 ```scala mdoc:js
 import org.scalajs.dom
-import com.raquo.laminar.api.L._
+import com.raquo.laminar.api.L.{*, given}
 
 val nameVar = Var(initial = "world")
 

diff --git a/website/docs/examples/time.md b/website/docs/examples/time.md
@@ -7,7 +7,7 @@ title: Time
 <div class = "mdoc-example">
 
 ```scala mdoc:js
-import com.raquo.laminar.api.L._
+import com.raquo.laminar.api.L.{*, given}
 import org.scalajs.dom
 
 val tickStream = EventStream.periodic(1000)
@@ -37,7 +37,7 @@ Asynchrony works naturally with observables. In this example, on every click, we
 <div class = "mdoc-example">
 
 ```scala mdoc:js
-import com.raquo.laminar.api.L._
+import com.raquo.laminar.api.L.{*, given}
 import org.scalajs.dom
 
 val clickBus = new EventBus[Unit]
@@ -66,7 +66,7 @@ render(containerNode, app)
 <div class = "mdoc-example">
 
 ```scala mdoc:js
-import com.raquo.laminar.api.L._
+import com.raquo.laminar.api.L.{*, given}
 import org.scalajs.dom
 
 def emailError(email: String): Option[String] =

diff --git a/website/docs/examples/todomvc.md b/website/docs/examples/todomvc.md
@@ -7,7 +7,7 @@ In addition to the code presented below, this example uses a fairly standard Tod
 <div class = "mdoc-example mdoc-example-todomvc">
 
 ```scala mdoc:js
-import com.raquo.laminar.api.L._
+import com.raquo.laminar.api.L.{*, given}
 import org.scalajs.dom
 
 object TodoMvcApp {

diff --git a/website/docs/examples/uncontrolled-inputs.md b/website/docs/examples/uncontrolled-inputs.md
@@ -7,7 +7,7 @@ title: Uncontrolled Inputs
 <div class = "mdoc-example">
 
 ```scala mdoc:js
-import com.raquo.laminar.api.L._
+import com.raquo.laminar.api.L.{*, given}
 import org.scalajs.dom
 
 val inputTextVar = Var("")
@@ -56,7 +56,7 @@ If you want to **filter** user input, for example if you want to **prevent** any
 <div class = "mdoc-example">
 
 ```scala mdoc:js
-import com.raquo.laminar.api.L._
+import com.raquo.laminar.api.L.{*, given}
 import org.scalajs.dom
 
 val zipVar = Var("")
@@ -98,7 +98,7 @@ You don't need to keep track of state in Vars. It is often useful, and more comp
 <div class = "mdoc-example">
 
 ```scala mdoc:js
-import com.raquo.laminar.api.L._
+import com.raquo.laminar.api.L.{*, given}
 import org.scalajs.dom
 
 val inputEl = input(

diff --git a/website/docs/examples/web-components.md b/website/docs/examples/web-components.md
@@ -9,7 +9,7 @@ In addition to the code presented, for these examples we use Scala.js / Laminar
 <div class = "mdoc-example">
 
 ```scala mdoc:js
-import com.raquo.laminar.api.L._
+import com.raquo.laminar.api.L.{*, given}
 import website.webcomponents.material.Button
 import org.scalajs.dom
 
@@ -62,7 +62,7 @@ This web component is available as part of the **[Laminar Web Components](https:
 <h2>Material UI Slider & ProgressBar</h2>
 
 ```scala mdoc:js
-import com.raquo.laminar.api.L._
+import com.raquo.laminar.api.L.{*, given}
 import website.webcomponents.material.{LinearProgressBar, Slider}
 import org.scalajs.dom
 import scala.scalajs.js