Skip to content

Commit e379401

Browse files
committed
Publish both npm and js deps in jar
1 parent 7c48457 commit e379401

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

build.sbt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
2-
31
name := "udash-jquery"
42

53
inThisBuild(Seq(
@@ -75,7 +73,7 @@ val commonJSSettings = Seq(
7573
)
7674

7775
lazy val root = project.in(file("."))
78-
.enablePlugins(ScalaJSBundlerPlugin)
76+
.enablePlugins(ScalaJSBundlerPlugin, JSDependenciesPlugin)
7977
.settings(
8078
commonSettings,
8179
commonJSSettings,
@@ -87,5 +85,6 @@ lazy val root = project.in(file("."))
8785
),
8886

8987
Compile / npmDependencies += "jquery" -> "3.3.1",
88+
jsDependencies += "org.webjars" % "jquery" % "3.3.1" / "3.3.1/jquery.js",
9089
Test / requireJsDomEnv := true
9190
)

example/project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import sbt._
33

44
object Dependencies {
55
val udashCoreVersion = "0.8.3"
6-
val udashJQueryVersion = "3.0.2"
6+
val udashJQueryVersion = "3.0.0-SNAPSHOT"
77

88
val deps = Def.setting(Seq[ModuleID](
99
"io.udash" %%% "udash-core" % udashCoreVersion,

project/plugins.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ logLevel := Level.Warn
22

33
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.1")
44
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.17.0")
5+
addSbtPlugin("org.scala-js" % "sbt-jsdependencies" % "1.0.0")
56

67
// Deployment configuration
78
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")

0 commit comments

Comments
 (0)