Skip to content

Commit

Permalink
upgrade jQuery to 3.6.4 (#33)
Browse files Browse the repository at this point in the history
* upgrade jQuery to 3.6.4 due to CVE-2020-11022, CVE-2020-23064, CVE-2020-11023 vulnerabilities

* upgrade scalaJs, add jQuery methods

* upgrade webpack to 5.75.0

* move webpack version declaration

* add "even/odd matching element" test case

* refactor test

* refactor test
  • Loading branch information
halotukozak authored Oct 4, 2023
1 parent 6d8ee18 commit ad6342a
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Static types for the jQuery API for [Scala.js](http://www.scala-js.org/) program
Add the following dependency to your SBT build:

```scala
libraryDependencies += "io.udash" %%% "udash-jquery" % "3.0.4"
libraryDependencies += "io.udash" %%% "udash-jquery" % "3.2.0"
```

then import the jQuery package:
Expand Down
7 changes: 4 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ val commonJSSettings = Seq(
val githubDir = "https://raw.githubusercontent.com/UdashFramework/scala-js-jquery"
s"-P:scalajs:mapSourceURI:$localDir->$githubDir/v${version.value}/"
},
webpack / version := "5.75.0", // TODO: can be removed when sbt-scalajs-bundler > 0.21.1
)

val deploymentConfiguration = Seq(
Expand Down Expand Up @@ -80,11 +81,11 @@ lazy val root = project.in(file("."))
deploymentConfiguration,

libraryDependencies ++= Seq(
"org.scala-js" %%% "scalajs-dom" % "2.0.0",
"org.scala-js" %%% "scalajs-dom" % "2.7.0",
"org.scalatest" %%% "scalatest" % "3.2.9" % Test,
"com.lihaoyi" %%% "scalatags" % "0.10.0" % Test
),

Compile / npmDependencies += "jquery" -> "3.4.1",
jsDependencies += "org.webjars" % "jquery" % "3.4.1" / "3.4.1/jquery.js" minified s"3.4.1/jquery.min.js",
Compile / npmDependencies += "jquery" -> "3.6.4",
jsDependencies += "org.webjars" % "jquery" % "3.6.4" / "3.6.4/jquery.js" minified s"3.6.4/jquery.min.js",
)
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# suppress inspection "UnusedProperty"
sbt.version=1.5.5
sbt.version=1.9.2
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
logLevel := Level.Warn

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.0")
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.21.1")
addSbtPlugin("org.scala-js" % "sbt-jsdependencies" % "1.0.2")

// Deployment configuration
Expand Down
8 changes: 8 additions & 0 deletions src/main/scala/io/udash/wrappers/jquery/JQuery.scala
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,10 @@ trait JQuery extends js.Object {
@JSName("eq")
def at(index: Int): JQuery = js.native

/** Reduce the set of matched elements to the even ones in the set, numbered from zero. <br/>
* See: <a href="http://api.jquery.com/even/">jQuery Docs</a> */
def even(): JQuery = js.native

/** Display the matched elements by fading them to opaque. <br/>
* See: <a href="http://api.jquery.com/fadeIn/">jQuery Docs</a> */
def fadeIn(duration: Int = js.native, easing: EasingFunction = js.native): JQuery = js.native
Expand Down Expand Up @@ -381,6 +385,10 @@ trait JQuery extends js.Object {
* See: <a href="http://api.jquery.com/not/">jQuery Docs</a> */
def not(el: Element*): JQuery = js.native

/** Reduce the set of matched elements to the odd ones in the set, numbered from zero. <br/>
* See: <a href="http://api.jquery.com/odd/">jQuery Docs</a> */
def odd(): JQuery = js.native

/** Remove an event handler. <br/>
* See: <a href="http://api.jquery.com/off/">jQuery Docs</a> */
def off(): JQuery = js.native
Expand Down
16 changes: 16 additions & 0 deletions src/test/scala/io/udash/wrappers/jquery_test/TraversingTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -166,5 +166,21 @@ class TraversingTest extends AnyWordSpec with Matchers {
root.children("a").first().length should be(0)
root.children("a").last().length should be(0)
}

"even/odd matching element" in {
val dom = div(
span("0"),
span("1"),
span("2"),
span("3"),
span("4"),
span("5"),
).render

val root = jQ(dom)
root.children("span").even().text() shouldBe "024"
root.children("span").odd().text() shouldBe "135"
}

}
}

0 comments on commit ad6342a

Please sign in to comment.