Merge branch 'master' into merge-1.x

Author: armanbilge

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        scalaversion: ["2.11.12", "2.12.10", "2.13.1", "3.0.1"]
+        scalaversion: ["2.11.12", "2.12.12", "2.13.4", "3.0.1"]
     steps:
 
       - uses: actions/checkout@v2

build.sbt

@@ -9,11 +9,28 @@ lazy val scalafixRules = project
     libraryDependencies += "ch.epfl.scala" %% "scalafix-core" % scalafixVersion,
   )
 
+def sourceMapsToGithub: Project => Project =
+  p => p.settings(
+    scalacOptions ++= {
+      val isDotty = scalaVersion.value startsWith "3"
+      val ver     = version.value
+      if (isSnapshot.value)
+        Nil
+      else {
+        val a = p.base.toURI.toString.replaceFirst("[^/]+/?$", "")
+        val g = s"https://raw.githubusercontent.com/scala-js/scala-js-dom"
+        val flag = if (isDotty) "-scalajs-mapSourceURI" else "-P:scalajs:mapSourceURI"
+        s"$flag:$a->$g/v$ver/" :: Nil
+      }
+    }
+  )
+
 lazy val root = project
   .in(file("."))
   .enablePlugins(ScalaJSPlugin)
   .enablePlugins(ScalafixPlugin)
   .dependsOn(scalafixRules % ScalafixConfig)
+  .configure(sourceMapsToGithub)
 
 name := "Scala.js DOM"
 
@@ -37,16 +54,6 @@ homepage := Some(url("http://scala-js.org/"))
 
 licenses += ("MIT", url("http://opensource.org/licenses/mit-license.php"))
 
-scalacOptions ++= {
-  if (isSnapshot.value)
-    Seq.empty
-  else {
-    val a = baseDirectory.value.toURI
-    val g = "https://raw.githubusercontent.com/scala-js/scala-js-dom"
-    Seq(s"-P:scalajs:mapSourceURI:$a->$g/v${version.value}/")
-  }
-}
-
 def hasNewCollections(version: String): Boolean = {
   !version.startsWith("2.11.") &&
   !version.startsWith("2.12.")

src/main/scala/org/scalajs/dom/crypto/Crypto.scala

@@ -930,10 +930,8 @@ object KeyFormat {
 trait RSAPublicKey extends js.Object {
 
   /* modulus, as a base64 URL encoded String */
-  @js.native
   def n: String = js.native
 
   /* exponent, as a base64 URL encoded String */
-  @js.native
   def e: String = js.native
 }

src/main/scala/org/scalajs/dom/experimental/intl/Intl.scala

@@ -123,12 +123,12 @@ object CollatorOptions {
   ): CollatorOptions = {
     js.Dynamic
       .literal(
-          localeMatcher = localeMatcher,
-          usage = usage,
-          sensitivity = sensitivity,
-          ignorePunctuation = ignorePunctuation,
-          numeric = numeric,
-          caseFirst = caseFirst
+          localeMatcher = localeMatcher.asInstanceOf[js.Any],
+          usage = usage.asInstanceOf[js.Any],
+          sensitivity = sensitivity.asInstanceOf[js.Any],
+          ignorePunctuation = ignorePunctuation.asInstanceOf[js.Any],
+          numeric = numeric.asInstanceOf[js.Any],
+          caseFirst = caseFirst.asInstanceOf[js.Any]
       )
       .asInstanceOf[CollatorOptions]
   }
@@ -200,19 +200,19 @@ object DateTimeFormatOptions {
     // format: off
     js.Dynamic
       .literal(
-          localeMatcher = localeMatcher,
-          timeZone = timeZone,
-          hour12 = hour12,
-          formatMatcher = formatMatcher,
-          weekday = weekday,
-          era = era,
-          year = year,
-          month = month,
-          day = day,
-          hour = hour,
-          minute = minute,
-          second = second,
-          timeZoneName = timeZoneName
+          localeMatcher = localeMatcher.asInstanceOf[js.Any],
+          timeZone = timeZone.asInstanceOf[js.Any],
+          hour12 = hour12.asInstanceOf[js.Any],
+          formatMatcher = formatMatcher.asInstanceOf[js.Any],
+          weekday = weekday.asInstanceOf[js.Any],
+          era = era.asInstanceOf[js.Any],
+          year = year.asInstanceOf[js.Any],
+          month = month.asInstanceOf[js.Any],
+          day = day.asInstanceOf[js.Any],
+          hour = hour.asInstanceOf[js.Any],
+          minute = minute.asInstanceOf[js.Any],
+          second = second.asInstanceOf[js.Any],
+          timeZoneName = timeZoneName.asInstanceOf[js.Any]
       )
       .asInstanceOf[DateTimeFormatOptions]
     // format: on
@@ -300,16 +300,16 @@ object NumberFormatOptions {
   ): NumberFormatOptions = {
     js.Dynamic
       .literal(
-          localeMatcher = localeMatcher,
-          style = style,
-          currency = currency,
-          currencyDisplay = currencyDisplay,
-          useGrouping = useGrouping,
-          minimumIntegerDigits = minimumIntegerDigits,
-          minimumFractionDigits = minimumFractionDigits,
-          maximumFractionDigits = maximumFractionDigits,
-          minimumSignificantDigits = minimumSignificantDigits,
-          maximumSignificantDigits = maximumSignificantDigits
+          localeMatcher = localeMatcher.asInstanceOf[js.Any],
+          style = style.asInstanceOf[js.Any],
+          currency = currency.asInstanceOf[js.Any],
+          currencyDisplay = currencyDisplay.asInstanceOf[js.Any],
+          useGrouping = useGrouping.asInstanceOf[js.Any],
+          minimumIntegerDigits = minimumIntegerDigits.asInstanceOf[js.Any],
+          minimumFractionDigits = minimumFractionDigits.asInstanceOf[js.Any],
+          maximumFractionDigits = maximumFractionDigits.asInstanceOf[js.Any],
+          minimumSignificantDigits = minimumSignificantDigits.asInstanceOf[js.Any],
+          maximumSignificantDigits = maximumSignificantDigits.asInstanceOf[js.Any]
       )
       .asInstanceOf[NumberFormatOptions]
   }

src/main/scala/org/scalajs/dom/ext/package.scala

@@ -22,17 +22,20 @@ package object ext {
     def cast[T] = x.asInstanceOf[T]
   }
 
-  implicit def pimpAnimatedNumber(x: svg.AnimatedNumber) = x.baseVal
+  implicit def pimpAnimatedNumber(x: svg.AnimatedNumber): Double = x.baseVal
 
-  implicit def pimpRichAnimatedNumber(x: svg.AnimatedNumber) =
+  implicit def pimpRichAnimatedNumber(
+      x: svg.AnimatedNumber): runtime.RichDouble =
     x.baseVal: runtime.RichDouble
 
-  implicit def pimpAnimatedLength(x: svg.AnimatedLength) = x.baseVal.value
+  implicit def pimpAnimatedLength(x: svg.AnimatedLength): Double =
+    x.baseVal.value
 
-  implicit def pimpRichAnimatedLength(x: svg.AnimatedLength) =
+  implicit def pimpRichAnimatedLength(
+      x: svg.AnimatedLength): runtime.RichDouble =
     x.baseVal.value: runtime.RichDouble
 
-  implicit def color2String(c: Color) = c.toString
+  implicit def color2String(c: Color): String = c.toString
   implicit class pimpedContext(val ctx: CanvasRenderingContext2D) {
     def prepCircle(x: Double, y: Double, r: Double) = {
       ctx.beginPath()

src/main/scala/org/scalajs/dom/raw/lib.scala

@@ -2593,6 +2593,8 @@ class Window
    */
   def close(): Unit = js.native
 
+  def closed: Boolean = js.native
+
   /**
    * The window.postMessage method safely enables cross-origin communication.
    * Normally, scripts on different pages are allowed to access each other if and only if