Skip to content

Commit

Permalink
Tweak build
Browse files Browse the repository at this point in the history
  • Loading branch information
malliina committed Nov 29, 2023
1 parent 1ae2868 commit 6d4a324
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
3 changes: 2 additions & 1 deletion build.sbt
Expand Up @@ -140,7 +140,8 @@ val revolverRollupPlugin = Project("sbt-revolver-rollup", file("rollup"))
Seq(
"com.malliina" % "live-reload" % "0.6.0",
"org.scala-js" % "sbt-scalajs" % "1.14.0",
"com.eed3si9n" % "sbt-buildinfo" % "0.11.0"
"com.eed3si9n" % "sbt-buildinfo" % "0.11.0",
"org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2"
) map addSbtPlugin
)

Expand Down
14 changes: 6 additions & 8 deletions rollup/src/main/scala/com/malliina/rollup/RollupPlugin.scala
Expand Up @@ -9,7 +9,7 @@ import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport.*
import org.scalajs.sbtplugin.{ScalaJSPlugin, Stage}
import sbt.Keys.*
import sbt.nio.Keys.fileInputs
import sbt.{IO as _, *}
import sbt.{IO => _, *}

import java.nio.charset.StandardCharsets
import java.nio.file.{Files, Path}
Expand Down Expand Up @@ -41,14 +41,12 @@ object RollupPlugin extends AutoPlugin {
scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.CommonJSModule) },
assetsRoot := target.value.toPath / "assets",
assetsPrefix := "assets",
build := {
Def.settingDyn {
val stageTask = scalaJSStage.value match {
case Stage.FastOpt => fastLinkJS
case Stage.FullOpt => fullLinkJS
}
stageTask / build
build := Def.settingDyn {
val stageTask = scalaJSStage.value match {
case Stage.FastOpt => fastLinkJS
case Stage.FullOpt => fullLinkJS
}
stageTask / build
}.value
)

Expand Down

0 comments on commit 6d4a324

Please sign in to comment.