Merge pull request #641 from sjrd/upgrades-in-vite-tutorial

sjrd · web-flow · commit 0ce9bb1569e0 · 2024-07-03T11:41:48.000+02:00
Upgrades in the Vite-Laminar-ScalablyTyped tutorial.
diff --git a/_config.yml b/_config.yml
@@ -68,4 +68,4 @@ versions:
   scalaJSBinary: 1
   scalaJS06x: 0.6.33
   scalaJS06xBinary: 0.6
-  scalaJSDOM: 2.4.0
+  scalaJSDOM: 2.8.0
diff --git a/doc/tutorial/laminar.md b/doc/tutorial/laminar.md
@@ -26,10 +26,10 @@ We will elaborate on this point later.
 To start off, we add a dependency on Laminar in our `build.sbt`:
 
 {% highlight diff %}
-     libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "2.4.0",
+     libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "{{ site.versions.scalaJSDOM }}",
 +
 +    // Depend on Laminar
-+    libraryDependencies += "com.raquo" %%% "laminar" % "15.0.1",
++    libraryDependencies += "com.raquo" %%% "laminar" % "17.0.0",
    )
 {% endhighlight %}
 
@@ -263,10 +263,10 @@ We first add the following dependency on [MUnit](https://scalameta.org/munit/),
 
 {% highlight diff %}
      // Depend on Laminar
-     libraryDependencies += "com.raquo" %%% "laminar" % "15.0.1",
+     libraryDependencies += "com.raquo" %%% "laminar" % "17.0.0",
 +
 +    // Testing framework
-+    libraryDependencies += "org.scalameta" %%% "munit" % "0.7.29" % Test,
++    libraryDependencies += "org.scalameta" %%% "munit" % "1.0.0" % Test,
    )
 {% endhighlight %}
 
diff --git a/doc/tutorial/scalablytyped.md b/doc/tutorial/scalablytyped.md
@@ -37,7 +37,7 @@ $ npm install -D @types/chart.js@2.9.29 typescript@4.9.5
 In `project/plugins.sbt`, we add a dependency on ScalablyTyped:
 
 {% highlight scala %}
-addSbtPlugin("org.scalablytyped.converter" % "sbt-converter" % "1.0.0-beta41")
+addSbtPlugin("org.scalablytyped.converter" % "sbt-converter" % "1.0.0-beta44")
 {% endhighlight %}
 
 Finally, in `build.sbt`, we configure ScalablyTyped on our project:
@@ -47,10 +47,10 @@ Finally, in `build.sbt`, we configure ScalablyTyped on our project:
    .enablePlugins(ScalaJSPlugin) // Enable the Scala.js plugin in this project
 +  .enablePlugins(ScalablyTypedConverterExternalNpmPlugin)
    .settings(
-     scalaVersion := "3.2.2",
+     scalaVersion := "3.3.3",
      [...]
      // Testing framework
-     libraryDependencies += "org.scalameta" %%% "munit" % "0.7.29" % Test,
+     libraryDependencies += "org.scalameta" %%% "munit" % "1.0.0" % Test,
 +
 +    // Tell ScalablyTyped that we manage `npm install` ourselves
 +    externalNpm := baseDirectory.value,
diff --git a/doc/tutorial/scalajs-vite.md b/doc/tutorial/scalajs-vite.md
@@ -104,7 +104,7 @@ In the subdirectory `livechart/project/`, we add two files: `build.properties` a
 * `project/build.properties`: set the version of sbt
 
 {% highlight plaintext %}
-sbt.version=1.8.2
+sbt.version=1.10.0
 {% endhighlight %}
 
 * `project/plugins.sbt`: declare sbt plugins; in this case, only sbt-scalajs
@@ -123,7 +123,7 @@ import org.scalajs.linker.interface.ModuleSplitStyle
 lazy val livechart = project.in(file("."))
   .enablePlugins(ScalaJSPlugin) // Enable the Scala.js plugin in this project
   .settings(
-    scalaVersion := "3.2.2",
+    scalaVersion := "3.3.3",
 
     // Tell Scala.js that this is an application with a main method
     scalaJSUseMainModuleInitializer := true,

Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,10 @@ We will elaborate on this point later.`
`26`	`26`	To start off, we add a dependency on Laminar in our `build.sbt`:
`27`	`27`
`28`	`28`	`{% highlight diff %}`
`29`		`- libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "2.4.0",`
	`29`	`+ libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "{{ site.versions.scalaJSDOM }}",`
`30`	`30`	`+`
`31`	`31`	`+ // Depend on Laminar`
`32`		`-+ libraryDependencies += "com.raquo" %%% "laminar" % "15.0.1",`
	`32`	`++ libraryDependencies += "com.raquo" %%% "laminar" % "17.0.0",`
`33`	`33`	`)`
`34`	`34`	`{% endhighlight %}`
`35`	`35`
`@@ -263,10 +263,10 @@ We first add the following dependency on [MUnit](https://scalameta.org/munit/),`
`263`	`263`
`264`	`264`	`{% highlight diff %}`
`265`	`265`	`// Depend on Laminar`
`266`		`- libraryDependencies += "com.raquo" %%% "laminar" % "15.0.1",`
	`266`	`+ libraryDependencies += "com.raquo" %%% "laminar" % "17.0.0",`
`267`	`267`	`+`
`268`	`268`	`+ // Testing framework`
`269`		`-+ libraryDependencies += "org.scalameta" %%% "munit" % "0.7.29" % Test,`
	`269`	`++ libraryDependencies += "org.scalameta" %%% "munit" % "1.0.0" % Test,`
`270`	`270`	`)`
`271`	`271`	`{% endhighlight %}`
`272`	`272`