Skip to content

Commit f3ec81a

Browse files
Switch to Scala.JS 1.0 (alexarchambault#180)
1 parent a9ea8c3 commit f3ec81a

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ lazy val renderJvm = render.jvm
9595
lazy val renderJs = render.js
9696

9797
lazy val demo = project
98-
.enablePlugins(ScalaJSPlugin)
98+
.enablePlugins(JSDependenciesPlugin, ScalaJSPlugin)
9999
.dependsOn(renderJs)
100100
.settings(
101101
shared,

demo/src/main/resources/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<script src="../plotly-demo-fastopt.js"></script>
3333

3434
<script>
35-
plotly.demo.Demo().main();
35+
Demo.main();
3636
</script>
3737

3838
</body>

demo/src/main/scala/plotly/demo/Demo.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package plotly.demo
22

3-
import scala.scalajs.js.annotation.JSExport
3+
import scala.scalajs.js.annotation.{JSExport, JSExportTopLevel}
44

55
import plotly.Plotly
66

77
import org.scalajs.dom
88

99
import scalatags.JsDom.all.{area => _, _}
1010

11-
@JSExport object Demo {
11+
@JSExportTopLevel("Demo") object Demo {
1212

1313
val demos = Seq(
1414
"Line Charts" -> Seq(

project/plugins.sbt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.2")
2-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.32")
2+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.1")
33
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
4+
addSbtPlugin("org.scala-js" % "sbt-jsdependencies" % "1.0.0")
45
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.7.0")
56
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "2.0.0-RC5-3")
67
addSbtPlugin("io.get-coursier" % "sbt-shading" % "2.0.0-RC5-3")

0 commit comments

Comments
 (0)