From 408af25111acbb852016fbb1237e7ff2331735f0 Mon Sep 17 00:00:00 2001 From: Alex Merritt Date: Mon, 22 Mar 2021 15:22:14 -0400 Subject: [PATCH] Bump scalajs converter and bundler plugins --- build.sbt | 5 ++++- project/plugins.sbt | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 5ff23377..d9ad7a75 100755 --- a/build.sbt +++ b/build.sbt @@ -81,9 +81,12 @@ lazy val backends = (crossProject(JVMPlatform, JSPlatform) .jvmSettings( libraryDependencies += ("org.scalatest" %% "scalatest" % scalaTestVersion) % Test, ).jsSettings( - scalaJSUseMainModuleInitializer := true) //, //Testing + scalaJSUseMainModuleInitializer := true, //Testing +npmDependencies in Compile += "onnxjs" -> "0.1.8") //Seems to be a bundling issue, copying things manually seems to work +//TODO NEW: try JS, bundler and converter beta/RC are out // npmDependencies in Compile += "onnxjs" -> "0.1.8") +.jsConfigure { project => project.enablePlugins(ScalaJSBundlerPlugin)} //,ScalablyTypedConverterPlugin) } lazy val core = (crossProject(JSPlatform, JVMPlatform) .crossType(CrossType.Pure) in file("core")) diff --git a/project/plugins.sbt b/project/plugins.sbt index fdb244b8..ead83898 100755 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,9 +8,9 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7") addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.18" ) -addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0") +addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0") // "0.21.0-RC1") resolvers += Resolver.bintrayRepo("oyvindberg", "converter") // for Scala.js 1.x.x -addSbtPlugin("org.scalablytyped.converter" % "sbt-converter" % "1.0.0-beta30") +addSbtPlugin("org.scalablytyped.converter" % "sbt-converter" % "1.0.0-beta31")