Skip to content

Commit af021a7

Browse files
authored
Merge pull request #588 from scala-js/topic/great-migration
The great migration to `dom`
2 parents e0260d1 + ab1dec6 commit af021a7

File tree

226 files changed

+4277
-3088
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

226 files changed

+4277
-3088
lines changed

api-reports/2_12.txt

+1,478-1,273
Large diffs are not rendered by default.

api-reports/2_13.txt

+1,478-1,273
Large diffs are not rendered by default.

project/Lib.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ object Lib {
1414
"-deprecation",
1515
"-feature",
1616
),
17-
scalacOptions ++= (if (!inCI) Seq.empty else Seq(
17+
scalacOptions ++= (if (!inCI || CrossVersion.partialVersion(scalaVersion.value).contains(2, 11)) Seq.empty else Seq(
1818
"-Xfatal-warnings",
1919
)),
2020
scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package org.scalajs.dom
2+
3+
import scala.scalajs.js
4+
5+
@js.native
6+
sealed trait AppendMode extends js.Any
7+
8+
object AppendMode {
9+
val segments: AppendMode = "segments".asInstanceOf[AppendMode]
10+
val sequence: AppendMode = "sequence".asInstanceOf[AppendMode]
11+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package org.scalajs.dom
2+
3+
import scala.scalajs.js
4+
5+
@js.native
6+
sealed trait EndOfStreamError extends js.Any
7+
8+
object EndOfStreamError {
9+
val decode: EndOfStreamError = "decode".asInstanceOf[EndOfStreamError]
10+
val network: EndOfStreamError = "network".asInstanceOf[EndOfStreamError]
11+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package org.scalajs.dom
2+
3+
import scala.scalajs.js
4+
5+
@js.native
6+
sealed trait ReadyState extends js.Any
7+
8+
object ReadyState {
9+
val closed: ReadyState = "closed".asInstanceOf[ReadyState]
10+
val ended: ReadyState = "ended".asInstanceOf[ReadyState]
11+
val open: ReadyState = "open".asInstanceOf[ReadyState]
12+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package org.scalajs.dom
2+
3+
import scala.scalajs.js
4+
5+
@js.native
6+
sealed trait TextTrackMode extends js.Any
7+
8+
object TextTrackMode {
9+
val disabled: TextTrackMode = "disabled".asInstanceOf[TextTrackMode]
10+
val hidden: TextTrackMode = "hidden".asInstanceOf[TextTrackMode]
11+
val showing: TextTrackMode = "showing".asInstanceOf[TextTrackMode]
12+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package org.scalajs.dom
2+
3+
opaque type AppendMode = String
4+
5+
object AppendMode {
6+
val segments: AppendMode = "segments"
7+
val sequence: AppendMode = "sequence"
8+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package org.scalajs.dom
2+
3+
opaque type EndOfStreamError = String
4+
5+
object EndOfStreamError {
6+
val decode: EndOfStreamError = "decode"
7+
val network: EndOfStreamError = "network"
8+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package org.scalajs.dom
2+
3+
opaque type ReadyState = String
4+
5+
object ReadyState {
6+
val closed: ReadyState = "closed"
7+
val ended: ReadyState = "ended"
8+
val open: ReadyState = "open"
9+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package org.scalajs.dom
2+
3+
opaque type TextTrackMode = String
4+
5+
object TextTrackMode {
6+
val disabled: TextTrackMode = "disabled"
7+
val hidden: TextTrackMode = "hidden"
8+
val showing: TextTrackMode = "showing"
9+
}

src/main/scala/org/scalajs/dom/crypto/AesCbcParams.scala renamed to src/main/scala/org/scalajs/dom/AesCbcParams.scala

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
package org.scalajs.dom.crypto
2-
3-
import org.scalajs.dom.BufferSource
1+
package org.scalajs.dom
42

53
// AES-CBC
64

src/main/scala/org/scalajs/dom/crypto/AesCfbParams.scala renamed to src/main/scala/org/scalajs/dom/AesCfbParams.scala

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
package org.scalajs.dom.crypto
2-
3-
import org.scalajs.dom.BufferSource
1+
package org.scalajs.dom
42

53
// AES-CFB
64

src/main/scala/org/scalajs/dom/crypto/AesCmacParams.scala renamed to src/main/scala/org/scalajs/dom/AesCmacParams.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.crypto
1+
package org.scalajs.dom
22

33
// AES-CMAC
44

src/main/scala/org/scalajs/dom/crypto/AesCtrParams.scala renamed to src/main/scala/org/scalajs/dom/AesCtrParams.scala

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
package org.scalajs.dom.crypto
2-
3-
import org.scalajs.dom.BufferSource
1+
package org.scalajs.dom
42

53
// AES-CTR
64

src/main/scala/org/scalajs/dom/crypto/AesDerivedKeyParams.scala renamed to src/main/scala/org/scalajs/dom/AesDerivedKeyParams.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.crypto
1+
package org.scalajs.dom
22

33
trait AesDerivedKeyParams extends KeyAlgorithm {
44
val length: Int

src/main/scala/org/scalajs/dom/crypto/AesGcmParams.scala renamed to src/main/scala/org/scalajs/dom/AesGcmParams.scala

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
package org.scalajs.dom.crypto
2-
3-
import org.scalajs.dom.BufferSource
1+
package org.scalajs.dom
42

53
// AES-GCM
64

src/main/scala/org/scalajs/dom/crypto/AesKeyAlgorithm.scala renamed to src/main/scala/org/scalajs/dom/AesKeyAlgorithm.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.crypto
1+
package org.scalajs.dom
22

33
trait AesKeyAlgorithm extends KeyAlgorithm {
44
val length: Int

src/main/scala/org/scalajs/dom/crypto/AesKeyGenParams.scala renamed to src/main/scala/org/scalajs/dom/AesKeyGenParams.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.crypto
1+
package org.scalajs.dom
22

33
trait AesKeyGenParams extends KeyAlgorithm {
44
val length: Int

src/main/scala/org/scalajs/dom/crypto/Algorithm.scala renamed to src/main/scala/org/scalajs/dom/Algorithm.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.crypto
1+
package org.scalajs.dom
22

33
import scala.scalajs.js
44

src/main/scala/org/scalajs/dom/AudioContext.scala

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
package org.scalajs.dom
77

8-
import org.scalajs.dom.experimental.mediastream.MediaStream
98
import scala.scalajs.js
109
import scala.scalajs.js.annotation._
1110

src/main/scala/org/scalajs/dom/AudioTrackList.scala

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ import scala.scalajs.js
1111
@js.native
1212
trait AudioTrackList extends EventTarget with DOMList[AudioTrack] {
1313

14-
var onchange: js.Function1[js.Any, _] = js.native
15-
var onaddtrack: js.Function1[TrackEvent, _] = js.native
14+
var onchange: js.Function1[Event, Any] = js.native
15+
var onaddtrack: js.Function1[TrackEvent, Any] = js.native
16+
var onremovetrack: js.Function1[TrackEvent, Any] = js.native
1617

1718
def getTrackById(id: String): AudioTrack = js.native
1819
}
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.experimental.serviceworkers
1+
package org.scalajs.dom
22

33
import org.scalajs.dom.webgl.RenderingContext
44
import scala.scalajs.js

src/main/scala/org/scalajs/dom/experimental/serviceworkers/Client.scala renamed to src/main/scala/org/scalajs/dom/Client.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.experimental.serviceworkers
1+
package org.scalajs.dom
22

33
import scala.scalajs.js
44

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.experimental.serviceworkers
1+
package org.scalajs.dom
22

33
import scala.scalajs.js
44

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.experimental.serviceworkers
1+
package org.scalajs.dom
22

33
import scala.scalajs.js
44

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.experimental.serviceworkers
1+
package org.scalajs.dom
22

33
import scala.scalajs.js
44

src/main/scala/org/scalajs/dom/crypto/ConcatParams.scala renamed to src/main/scala/org/scalajs/dom/ConcatParams.scala

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
package org.scalajs.dom.crypto
2-
3-
import org.scalajs.dom.BufferSource
1+
package org.scalajs.dom
42

53
// CONCAT
64

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.crypto
1+
package org.scalajs.dom
22

33
import scala.scalajs.js
44
import scala.scalajs.js.typedarray.ArrayBufferView

src/main/scala/org/scalajs/dom/crypto/CryptoKey.scala renamed to src/main/scala/org/scalajs/dom/CryptoKey.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.crypto
1+
package org.scalajs.dom
22

33
import scala.scalajs.js
44
import scala.scalajs.js.annotation._

src/main/scala/org/scalajs/dom/crypto/CryptoKeyPair.scala renamed to src/main/scala/org/scalajs/dom/CryptoKeyPair.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.crypto
1+
package org.scalajs.dom
22

33
import scala.scalajs.js
44

src/main/scala/org/scalajs/dom/crypto/DhImportKeyParams.scala renamed to src/main/scala/org/scalajs/dom/DhImportKeyParams.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.crypto
1+
package org.scalajs.dom
22

33
trait DhImportKeyParams extends Algorithm {
44
val prime: BigInteger

src/main/scala/org/scalajs/dom/crypto/DhKeyAlgorithm.scala renamed to src/main/scala/org/scalajs/dom/DhKeyAlgorithm.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.crypto
1+
package org.scalajs.dom
22

33
trait DhKeyAlgorithm extends KeyAlgorithm {
44
val prime: BigInteger

src/main/scala/org/scalajs/dom/crypto/DhKeyDeriveParams.scala renamed to src/main/scala/org/scalajs/dom/DhKeyDeriveParams.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.crypto
1+
package org.scalajs.dom
22

33
trait DhKeyDeriveParams extends Algorithm {
44
val public: CryptoKey

src/main/scala/org/scalajs/dom/crypto/DhKeyGenParams.scala renamed to src/main/scala/org/scalajs/dom/DhKeyGenParams.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.crypto
1+
package org.scalajs.dom
22

33
// Diffie-Hellman
44

src/main/scala/org/scalajs/dom/crypto/EcKeyAlgorithm.scala renamed to src/main/scala/org/scalajs/dom/EcKeyAlgorithm.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.crypto
1+
package org.scalajs.dom
22

33
trait EcKeyAlgorithm extends KeyAlgorithm {
44
val namedCurve: String

src/main/scala/org/scalajs/dom/crypto/EcKeyGenParams.scala renamed to src/main/scala/org/scalajs/dom/EcKeyGenParams.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.crypto
1+
package org.scalajs.dom
22

33
trait EcKeyGenParams extends Algorithm {
44
val namedCurve: String

src/main/scala/org/scalajs/dom/crypto/EcKeyImportParams.scala renamed to src/main/scala/org/scalajs/dom/EcKeyImportParams.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.crypto
1+
package org.scalajs.dom
22

33
trait EcKeyImportParams extends KeyAlgorithm {
44
val namedCurve: String

src/main/scala/org/scalajs/dom/crypto/EcdhKeyDeriveParams.scala renamed to src/main/scala/org/scalajs/dom/EcdhKeyDeriveParams.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.crypto
1+
package org.scalajs.dom
22

33
// ECDH
44

src/main/scala/org/scalajs/dom/crypto/EcdsaParams.scala renamed to src/main/scala/org/scalajs/dom/EcdsaParams.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.crypto
1+
package org.scalajs.dom
22

33
// ECDSA
44

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package org.scalajs.dom.experimental.serviceworkers
1+
package org.scalajs.dom
22

3-
import org.scalajs.dom._
43
import scala.scalajs.js
54
import scala.scalajs.js.annotation._
65

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package org.scalajs.dom
2+
3+
trait ExtendableEventInit extends EventInit {}
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package org.scalajs.dom.experimental.serviceworkers
1+
package org.scalajs.dom
22

3-
import org.scalajs.dom._
43
import scala.scalajs.js
54
import scala.scalajs.js.annotation._
65
import scala.scalajs.js.|
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package org.scalajs.dom.experimental.serviceworkers
1+
package org.scalajs.dom
22

3-
import org.scalajs.dom._
43
import scala.scalajs.js
54
import scala.scalajs.js.|
65

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package org.scalajs.dom.experimental.serviceworkers
1+
package org.scalajs.dom
22

3-
import org.scalajs.dom._
43
import scala.scalajs.js
54
import scala.scalajs.js.annotation._
65
import scala.scalajs.js.|
+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package org.scalajs.dom.experimental.serviceworkers
1+
package org.scalajs.dom
22

3-
import org.scalajs.dom._
43
import scala.scalajs.js
54

65
trait FetchEventInit extends ExtendableEventInit {
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.experimental.serviceworkers
1+
package org.scalajs.dom
22

33
import scala.scalajs.js
44

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.experimental.serviceworkers
1+
package org.scalajs.dom
22

33
import scala.scalajs.js
44

src/main/scala/org/scalajs/dom/HTMLMediaElement.scala

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77
package org.scalajs.dom
88

9-
import org.scalajs.dom.experimental.mediastream.{MediaSource, MediaStream}
109
import scala.scalajs.js
1110
import scala.scalajs.js.annotation._
1211
import scala.scalajs.js.|

src/main/scala/org/scalajs/dom/crypto/HashAlgorithm.scala renamed to src/main/scala/org/scalajs/dom/HashAlgorithm.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.crypto
1+
package org.scalajs.dom
22

33
/** A HashAlgorithm type is not defined in the [[http://www.w3.org/TR/WebCryptoAPI/ W3C Web Crypto API]], even though a
44
* [[http://www.w3.org/TR/WebCryptoAPI/#key-algorithm-dictionary KeyAlgorithm dictionary]] type is. There are

src/main/scala/org/scalajs/dom/crypto/HkdfCtrParams.scala renamed to src/main/scala/org/scalajs/dom/HkdfCtrParams.scala

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
package org.scalajs.dom.crypto
2-
3-
import org.scalajs.dom.BufferSource
1+
package org.scalajs.dom
42

53
// HKDF-CTR
64

src/main/scala/org/scalajs/dom/crypto/HmacImportParams.scala renamed to src/main/scala/org/scalajs/dom/HmacImportParams.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.crypto
1+
package org.scalajs.dom
22

33
// AES-KW
44

src/main/scala/org/scalajs/dom/crypto/HmacKeyAlgorithm.scala renamed to src/main/scala/org/scalajs/dom/HmacKeyAlgorithm.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.crypto
1+
package org.scalajs.dom
22

33
trait HmacKeyAlgorithm extends KeyAlgorithm {
44
val hash: HashAlgorithmIdentifier

src/main/scala/org/scalajs/dom/crypto/HmacKeyGenParams.scala renamed to src/main/scala/org/scalajs/dom/HmacKeyGenParams.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.crypto
1+
package org.scalajs.dom
22

33
trait HmacKeyGenParams extends KeyAlgorithm {
44
val hash: HashAlgorithmIdentifier

src/main/scala/org/scalajs/dom/experimental/mediastream/ImageCapture.scala renamed to src/main/scala/org/scalajs/dom/ImageCapture.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/** https://www.w3.org/TR/2016/CR-mediacapture-streams-20160519/ */
2-
package org.scalajs.dom.experimental.mediastream
2+
package org.scalajs.dom
33

4-
import org.scalajs.dom._
54
import scala.scalajs.js
65
import scala.scalajs.js.annotation._
76

src/main/scala/org/scalajs/dom/crypto/JsonWebKey.scala renamed to src/main/scala/org/scalajs/dom/JsonWebKey.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.crypto
1+
package org.scalajs.dom
22

33
import scala.scalajs.js
44

0 commit comments

Comments
 (0)