Skip to content

Commit

Permalink
Merge pull request #641 from sjrd/upgrades-in-vite-tutorial
Browse files Browse the repository at this point in the history
Upgrades in the Vite-Laminar-ScalablyTyped tutorial.
  • Loading branch information
sjrd authored Jul 3, 2024
2 parents 0190f33 + 6a7f7d4 commit 0ce9bb1
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,4 @@ versions:
scalaJSBinary: 1
scalaJS06x: 0.6.33
scalaJS06xBinary: 0.6
scalaJSDOM: 2.4.0
scalaJSDOM: 2.8.0
8 changes: 4 additions & 4 deletions doc/tutorial/laminar.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down Expand Up @@ -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 %}

Expand Down
6 changes: 3 additions & 3 deletions doc/tutorial/scalablytyped.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions doc/tutorial/scalajs-vite.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand Down

0 comments on commit 0ce9bb1

Please sign in to comment.