Skip to content

Commit 6b118bd

Browse files
armanbilgearmanbilge
committed
Migrate serviceworkers to dom
1 parent c670d81 commit 6b118bd

32 files changed

+566
-513
lines changed

‎api-reports/2_12.txt

Lines changed: 224 additions & 214 deletions
Large diffs are not rendered by default.

‎api-reports/2_13.txt

Lines changed: 224 additions & 214 deletions
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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/experimental/serviceworkers/ClientQueryOptions.scala renamed to ‎src/main/scala/org/scalajs/dom/ClientQueryOptions.scala

Lines changed: 1 addition & 1 deletion
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/experimental/serviceworkers/ClientType.scala renamed to ‎src/main/scala/org/scalajs/dom/ClientType.scala

Lines changed: 1 addition & 1 deletion
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/experimental/serviceworkers/Clients.scala renamed to ‎src/main/scala/org/scalajs/dom/Clients.scala

Lines changed: 1 addition & 1 deletion
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/experimental/serviceworkers/ExtendableEvent.scala renamed to ‎src/main/scala/org/scalajs/dom/ExtendableEvent.scala

Lines changed: 1 addition & 2 deletions
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

‎src/main/scala/org/scalajs/dom/ExtendableEventInit.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package org.scalajs.dom
2+
3+
trait ExtendableEventInit extends EventInit {}

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

Lines changed: 1 addition & 2 deletions
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.|

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

Lines changed: 1 addition & 2 deletions
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

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

Lines changed: 1 addition & 2 deletions
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.|

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

Lines changed: 1 addition & 2 deletions
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 {

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

Lines changed: 1 addition & 1 deletion
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/experimental/serviceworkers/GetNotificationOptions.scala renamed to ‎src/main/scala/org/scalajs/dom/GetNotificationOptions.scala

Lines changed: 1 addition & 1 deletion
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/Navigator.scala

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,9 @@ class Navigator
5656
* [[https://developer.mozilla.org/en-US/docs/Web/API/Navigator/mediaDevices]]
5757
*/
5858
def mediaDevices: MediaDevices = js.native
59+
60+
/** The Navigator.serviceWorker read-only property returns a ServiceWorkerContainer object, which provides access to
61+
* registration, removal, upgrade, and communication with the ServiceWorker objects for the associated document.
62+
*/
63+
val serviceWorker: ServiceWorkerContainer = js.native
5964
}

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

Lines changed: 1 addition & 2 deletions
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
/** The ServiceWorker interface of the ServiceWorker API provides a reference to a service worker. Multiple browsing

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

Lines changed: 1 addition & 2 deletions
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
/** The ServiceWorkerContainer interface of the ServiceWorker API exposes the ServiceWorkerContainer.

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

Lines changed: 1 addition & 2 deletions
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

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

Lines changed: 1 addition & 2 deletions
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

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

Lines changed: 1 addition & 2 deletions
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
/** The ServiceWorkerRegistion interface of the ServiceWorker API represents the service worker registration. You

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

Lines changed: 1 addition & 1 deletion
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/SharedWorkerGlobalScope.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.scalajs.dom
22

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

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

Lines changed: 1 addition & 1 deletion
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/experimental/push/PushEvent.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package org.scalajs.dom.experimental.push
1+
package org.scalajs.dom
2+
package experimental.push
23

3-
import org.scalajs.dom.experimental.serviceworkers.ExtendableEvent
44
import scala.scalajs.js
55

66
/** The PushEvent interface of the Push API represents a push message that has been received. This event is sent to the

‎src/main/scala/org/scalajs/dom/experimental/push/package.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package org.scalajs.dom.experimental
1+
package org.scalajs.dom
2+
package experimental
23

3-
import org.scalajs.dom.experimental.serviceworkers.{ServiceWorkerGlobalScope, ServiceWorkerRegistration}
44
import scala.language.implicitConversions
55
import scala.scalajs.js
66

‎src/main/scala/org/scalajs/dom/experimental/serviceworkers/Cache.scala

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/main/scala/org/scalajs/dom/experimental/serviceworkers/CacheQueryOptions.scala

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎src/main/scala/org/scalajs/dom/experimental/serviceworkers/CacheStorage.scala

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎src/main/scala/org/scalajs/dom/experimental/serviceworkers/ExtendableEventInit.scala

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/main/scala/org/scalajs/dom/experimental/serviceworkers/package.scala

Lines changed: 86 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
package org.scalajs.dom.experimental
1+
package org.scalajs.dom
2+
package experimental
23

3-
import org.scalajs.dom.Navigator
4+
import org.scalajs.dom
45
import scala.language.implicitConversions
5-
import scala.scalajs.js
6-
import scala.scalajs.js.|
76

87
/** Service Workers
98
*
@@ -15,17 +14,91 @@ package object serviceworkers {
1514
/** [[https://html.spec.whatwg.org/multipage/infrastructure.html#transferable ¶2.7.4 Transferable Objects]] in whatwg
1615
* html spec.
1716
*/
18-
type Transferable = org.scalajs.dom.Transferable | CanvasProxy
17+
@deprecated("use dom.Transferable instead", "2.0.0")
18+
type Transferable = dom.Transferable
1919

20+
@deprecated("use dom.Navigator directly instead", "2.0.0")
2021
implicit def toServiceWorkerNavigator(n: Navigator): ServiceWorkerNavigator =
21-
n.asInstanceOf[ServiceWorkerNavigator]
22+
n
2223

23-
@js.native
24-
trait ServiceWorkerNavigator extends js.Any {
24+
@deprecated("use dom.Navigator instead", "2.0.0")
25+
type ServiceWorkerNavigator = dom.Navigator
2526

26-
/** The Navigator.serviceWorker read-only property returns a ServiceWorkerContainer object, which provides access to
27-
* registration, removal, upgrade, and communication with the ServiceWorker objects for the associated document.
28-
*/
29-
val serviceWorker: ServiceWorkerContainer = js.native
30-
}
27+
@deprecated("use dom.CacheQueryOptions instead", "2.0.0")
28+
type CacheQueryOptions = dom.CacheQueryOptions
29+
30+
@deprecated("use dom.Cache instead", "2.0.0")
31+
type Cache = dom.Cache
32+
33+
@deprecated("use dom.CacheStorage instead", "2.0.0")
34+
type CacheStorage = dom.CacheStorage
35+
36+
@deprecated("use dom.CanvasProxy instead", "2.0.0")
37+
type CanvasProxy = dom.CanvasProxy
38+
39+
@deprecated("use dom.ClientQueryOptions instead", "2.0.0")
40+
type ClientQueryOptions = dom.ClientQueryOptions
41+
42+
@deprecated("use dom.Client instead", "2.0.0")
43+
type Client = dom.Client
44+
45+
@deprecated("use dom.Clients instead", "2.0.0")
46+
type Clients = dom.Clients
47+
48+
@deprecated("use dom.ClientType instead", "2.0.0")
49+
type ClientType = dom.ClientType
50+
51+
@deprecated("use dom.ClientType instead", "2.0.0")
52+
val ClientType = dom.ClientType
53+
54+
@deprecated("use dom.ExtendableEventInit instead", "2.0.0")
55+
type ExtendableEventInit = dom.ExtendableEventInit
56+
57+
@deprecated("use dom.ExtendableEvent instead", "2.0.0")
58+
type ExtendableEvent = dom.ExtendableEvent
59+
60+
@deprecated("use dom.ExtendableMessageEventInit instead", "2.0.0")
61+
type ExtendableMessageEventInit = dom.ExtendableMessageEventInit
62+
63+
@deprecated("use dom.ExtendableMessageEvent instead", "2.0.0")
64+
type ExtendableMessageEvent = dom.ExtendableMessageEvent
65+
66+
@deprecated("use dom.FetchEventInit instead", "2.0.0")
67+
type FetchEventInit = dom.FetchEventInit
68+
69+
@deprecated("use dom.FetchEvent instead", "2.0.0")
70+
type FetchEvent = dom.FetchEvent
71+
72+
@deprecated("use dom.FrameType instead", "2.0.0")
73+
type FrameType = dom.FrameType
74+
75+
@deprecated("use dom.FrameType instead", "2.0.0")
76+
val FrameType = dom.FrameType
77+
78+
@deprecated("use dom.GetNotificationOptions instead", "2.0.0")
79+
type GetNotificationOptions = dom.GetNotificationOptions
80+
81+
@deprecated("use dom.ServiceWorkerContainer instead", "2.0.0")
82+
type ServiceWorkerContainer = dom.ServiceWorkerContainer
83+
84+
@deprecated("use dom.ServiceWorkerGlobalScope instead", "2.0.0")
85+
type ServiceWorkerGlobalScope = dom.ServiceWorkerGlobalScope
86+
87+
@deprecated("use dom.ServiceWorkerMessageEventInit instead", "2.0.0")
88+
type ServiceWorkerMessageEventInit = dom.ServiceWorkerMessageEventInit
89+
90+
@deprecated("use dom.ServiceWorkerRegistration instead", "2.0.0")
91+
type ServiceWorkerRegistration = dom.ServiceWorkerRegistration
92+
93+
@deprecated("use dom.ServiceWorker instead", "2.0.0")
94+
type ServiceWorker = dom.ServiceWorker
95+
96+
@deprecated("use dom.ServiceWorkerState instead", "2.0.0")
97+
type ServiceWorkerState = dom.ServiceWorkerState
98+
99+
@deprecated("use dom.ServiceWorkerState instead", "2.0.0")
100+
val ServiceWorkerState = dom.ServiceWorkerState
101+
102+
@deprecated("use dom.WindowClient instead", "2.0.0")
103+
type WindowClient = dom.WindowClient
31104
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ package object dom {
1414
* property: it is merely a tag indicating objects that can be used in specific conditions, like to be transfered to
1515
* a Worker using the Worker.postMessage() method.
1616
*/
17-
type Transferable = ArrayBuffer | MessagePort
17+
type Transferable = ArrayBuffer | MessagePort | CanvasProxy
1818

1919
type BufferSource = ArrayBufferView | ArrayBuffer
2020

0 commit comments

Comments
 (0)