Skip to content

Commit 2ae7bc9

Browse files
committed
Make dom.crypto.crypto a native JS val.
Instead of a Scala val delegating to a val in a JS global scope object.
1 parent c2d18a8 commit 2ae7bc9

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

api-reports/2_12.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23081,7 +23081,7 @@ crypto/EcdhKeyDeriveParams[SO] def apply(name: String, public: CryptoKey): EcdhK
2308123081
crypto/EcdsaParams[JT] var hash: HashAlgorithmIdentifier
2308223082
crypto/EcdsaParams[JT] var name: String
2308323083
crypto/EcdsaParams[SO] def apply(name: String, hash: HashAlgorithmIdentifier): EcdsaParams
23084-
crypto/GlobalCrypto[JO] val crypto: Crypto
23084+
crypto/GlobalCrypto[JO] val crypto: Crypto (@deprecated in 2.0.0)
2308523085
crypto/HashAlgorithm[JT] var name: String
2308623086
crypto/HashAlgorithm[SO] val `SHA-1` = named("SHA-1")
2308723087
crypto/HashAlgorithm[SO] val `SHA-256` = named("SHA-256")
@@ -23200,7 +23200,7 @@ crypto/package[SO] type HashAlgorithmIdentifier = HashAlgorithm | String
2320023200
crypto/package[SO] type KeyAlgorithmIdentifier = KeyAlgorithm | String
2320123201
crypto/package[SO] implicit def arrayBuffer2BufferSource(b: ArrayBuffer): BufferSource
2320223202
crypto/package[SO] implicit def arrayBufferView2BufferSource(b: ArrayBufferView): BufferSource
23203-
crypto/package[SO] def crypto = GlobalCrypto.crypto
23203+
crypto/package[SO] @js.native @JSGlobal("crypto") val crypto: Crypto
2320423204
crypto/package.BufferSource[JT]
2320523205
experimental/AbortController[JC] def abort(): Unit
2320623206
experimental/AbortController[JC] val signal: AbortSignal

api-reports/2_13.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23081,7 +23081,7 @@ crypto/EcdhKeyDeriveParams[SO] def apply(name: String, public: CryptoKey): EcdhK
2308123081
crypto/EcdsaParams[JT] var hash: HashAlgorithmIdentifier
2308223082
crypto/EcdsaParams[JT] var name: String
2308323083
crypto/EcdsaParams[SO] def apply(name: String, hash: HashAlgorithmIdentifier): EcdsaParams
23084-
crypto/GlobalCrypto[JO] val crypto: Crypto
23084+
crypto/GlobalCrypto[JO] val crypto: Crypto (@deprecated in 2.0.0)
2308523085
crypto/HashAlgorithm[JT] var name: String
2308623086
crypto/HashAlgorithm[SO] val `SHA-1` = named("SHA-1")
2308723087
crypto/HashAlgorithm[SO] val `SHA-256` = named("SHA-256")
@@ -23200,7 +23200,7 @@ crypto/package[SO] type HashAlgorithmIdentifier = HashAlgorithm | String
2320023200
crypto/package[SO] type KeyAlgorithmIdentifier = KeyAlgorithm | String
2320123201
crypto/package[SO] implicit def arrayBuffer2BufferSource(b: ArrayBuffer): BufferSource
2320223202
crypto/package[SO] implicit def arrayBufferView2BufferSource(b: ArrayBufferView): BufferSource
23203-
crypto/package[SO] def crypto = GlobalCrypto.crypto
23203+
crypto/package[SO] @js.native @JSGlobal("crypto") val crypto: Crypto
2320423204
crypto/package.BufferSource[JT]
2320523205
experimental/AbortController[JC] def abort(): Unit
2320623206
experimental/AbortController[JC] val signal: AbortSignal

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import scala.scalajs.js
44
import scala.scalajs.js.annotation._
55
import scala.scalajs.js.typedarray.ArrayBufferView
66

7+
@deprecated("use dom.crypto.crypto instead", "2.0.0")
78
@js.native
89
@JSGlobalScope
910
object GlobalCrypto extends js.Object {

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@ package org.scalajs.dom
22

33
import scala.language.implicitConversions
44
import scala.scalajs.js
5+
import scala.scalajs.js.annotation._
56
import scala.scalajs.js.typedarray.{ArrayBuffer, ArrayBufferView, Uint8Array}
67
import scala.scalajs.js.|
78

89
package object crypto {
9-
@inline def crypto = GlobalCrypto.crypto
10+
@js.native
11+
@JSGlobal("crypto")
12+
val crypto: Crypto = js.native
1013

1114
type BigInteger = Uint8Array
1215

0 commit comments

Comments
 (0)