Migrate serviceworkers to dom

armanbilge · armanbilge · commit 6b118bdb2070 · 2021-09-28T00:30:25.000Z
diff --git a/api-reports/2_12.txt b/api-reports/2_12.txt
diff --git a/api-reports/2_13.txt b/api-reports/2_13.txt
diff --git a/src/main/scala/org/scalajs/dom/CanvasProxy.scala b/src/main/scala/org/scalajs/dom/CanvasProxy.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.experimental.serviceworkers
+package org.scalajs.dom
 
 import org.scalajs.dom.webgl.RenderingContext
 import scala.scalajs.js
diff --git a/src/main/scala/org/scalajs/dom/Client.scala b/src/main/scala/org/scalajs/dom/Client.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.experimental.serviceworkers
+package org.scalajs.dom
 
 import scala.scalajs.js
 
diff --git a/src/main/scala/org/scalajs/dom/ClientQueryOptions.scala b/src/main/scala/org/scalajs/dom/ClientQueryOptions.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.experimental.serviceworkers
+package org.scalajs.dom
 
 import scala.scalajs.js
 
diff --git a/src/main/scala/org/scalajs/dom/ClientType.scala b/src/main/scala/org/scalajs/dom/ClientType.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.experimental.serviceworkers
+package org.scalajs.dom
 
 import scala.scalajs.js
 
diff --git a/src/main/scala/org/scalajs/dom/Clients.scala b/src/main/scala/org/scalajs/dom/Clients.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.experimental.serviceworkers
+package org.scalajs.dom
 
 import scala.scalajs.js
 
diff --git a/src/main/scala/org/scalajs/dom/ExtendableEvent.scala b/src/main/scala/org/scalajs/dom/ExtendableEvent.scala
@@ -1,6 +1,5 @@
-package org.scalajs.dom.experimental.serviceworkers
+package org.scalajs.dom
 
-import org.scalajs.dom._
 import scala.scalajs.js
 import scala.scalajs.js.annotation._
 
diff --git a/src/main/scala/org/scalajs/dom/ExtendableEventInit.scala b/src/main/scala/org/scalajs/dom/ExtendableEventInit.scala
@@ -0,0 +1,3 @@
+package org.scalajs.dom
+
+trait ExtendableEventInit extends EventInit {}
diff --git a/src/main/scala/org/scalajs/dom/ExtendableMessageEvent.scala b/src/main/scala/org/scalajs/dom/ExtendableMessageEvent.scala
@@ -1,6 +1,5 @@
-package org.scalajs.dom.experimental.serviceworkers
+package org.scalajs.dom
 
-import org.scalajs.dom._
 import scala.scalajs.js
 import scala.scalajs.js.annotation._
 import scala.scalajs.js.|
diff --git a/src/main/scala/org/scalajs/dom/ExtendableMessageEventInit.scala b/src/main/scala/org/scalajs/dom/ExtendableMessageEventInit.scala
@@ -1,6 +1,5 @@
-package org.scalajs.dom.experimental.serviceworkers
+package org.scalajs.dom
 
-import org.scalajs.dom._
 import scala.scalajs.js
 import scala.scalajs.js.|
 
diff --git a/src/main/scala/org/scalajs/dom/FetchEvent.scala b/src/main/scala/org/scalajs/dom/FetchEvent.scala
@@ -1,6 +1,5 @@
-package org.scalajs.dom.experimental.serviceworkers
+package org.scalajs.dom
 
-import org.scalajs.dom._
 import scala.scalajs.js
 import scala.scalajs.js.annotation._
 import scala.scalajs.js.|
diff --git a/src/main/scala/org/scalajs/dom/FetchEventInit.scala b/src/main/scala/org/scalajs/dom/FetchEventInit.scala
@@ -1,6 +1,5 @@
-package org.scalajs.dom.experimental.serviceworkers
+package org.scalajs.dom
 
-import org.scalajs.dom._
 import scala.scalajs.js
 
 trait FetchEventInit extends ExtendableEventInit {
diff --git a/src/main/scala/org/scalajs/dom/FrameType.scala b/src/main/scala/org/scalajs/dom/FrameType.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.experimental.serviceworkers
+package org.scalajs.dom
 
 import scala.scalajs.js
 
diff --git a/src/main/scala/org/scalajs/dom/GetNotificationOptions.scala b/src/main/scala/org/scalajs/dom/GetNotificationOptions.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.experimental.serviceworkers
+package org.scalajs.dom
 
 import scala.scalajs.js
 
diff --git a/src/main/scala/org/scalajs/dom/Navigator.scala b/src/main/scala/org/scalajs/dom/Navigator.scala
@@ -56,4 +56,9 @@ class Navigator
     *   [[https://developer.mozilla.org/en-US/docs/Web/API/Navigator/mediaDevices]]
     */
   def mediaDevices: MediaDevices = js.native
+
+  /** The Navigator.serviceWorker read-only property returns a ServiceWorkerContainer object, which provides access to
+    * registration, removal, upgrade, and communication with the ServiceWorker objects for the associated document.
+    */
+  val serviceWorker: ServiceWorkerContainer = js.native
 }
diff --git a/src/main/scala/org/scalajs/dom/ServiceWorker.scala b/src/main/scala/org/scalajs/dom/ServiceWorker.scala
@@ -1,6 +1,5 @@
-package org.scalajs.dom.experimental.serviceworkers
+package org.scalajs.dom
 
-import org.scalajs.dom._
 import scala.scalajs.js
 
 /** The ServiceWorker interface of the ServiceWorker API provides a reference to a service worker. Multiple browsing
diff --git a/src/main/scala/org/scalajs/dom/ServiceWorkerContainer.scala b/src/main/scala/org/scalajs/dom/ServiceWorkerContainer.scala
@@ -1,6 +1,5 @@
-package org.scalajs.dom.experimental.serviceworkers
+package org.scalajs.dom
 
-import org.scalajs.dom._
 import scala.scalajs.js
 
 /** The ServiceWorkerContainer interface of the ServiceWorker API exposes the ServiceWorkerContainer.
diff --git a/src/main/scala/org/scalajs/dom/ServiceWorkerGlobalScope.scala b/src/main/scala/org/scalajs/dom/ServiceWorkerGlobalScope.scala
@@ -1,6 +1,5 @@
-package org.scalajs.dom.experimental.serviceworkers
+package org.scalajs.dom
 
-import org.scalajs.dom._
 import scala.scalajs.js
 import scala.scalajs.js.annotation._
 
diff --git a/src/main/scala/org/scalajs/dom/ServiceWorkerMessageEventInit.scala b/src/main/scala/org/scalajs/dom/ServiceWorkerMessageEventInit.scala
@@ -1,6 +1,5 @@
-package org.scalajs.dom.experimental.serviceworkers
+package org.scalajs.dom
 
-import org.scalajs.dom._
 import scala.scalajs.js
 import scala.scalajs.js.|
 
diff --git a/src/main/scala/org/scalajs/dom/ServiceWorkerRegistration.scala b/src/main/scala/org/scalajs/dom/ServiceWorkerRegistration.scala
@@ -1,6 +1,5 @@
-package org.scalajs.dom.experimental.serviceworkers
+package org.scalajs.dom
 
-import org.scalajs.dom._
 import scala.scalajs.js
 
 /** The ServiceWorkerRegistion interface of the ServiceWorker API represents the service worker registration. You
diff --git a/src/main/scala/org/scalajs/dom/ServiceWorkerState.scala b/src/main/scala/org/scalajs/dom/ServiceWorkerState.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.experimental.serviceworkers
+package org.scalajs.dom
 
 import scala.scalajs.js
 
diff --git a/src/main/scala/org/scalajs/dom/SharedWorkerGlobalScope.scala b/src/main/scala/org/scalajs/dom/SharedWorkerGlobalScope.scala
@@ -1,6 +1,5 @@
 package org.scalajs.dom
 
-import org.scalajs.dom.experimental.serviceworkers.ExtendableMessageEvent
 import scala.scalajs.js
 import scala.scalajs.js.annotation._
 
diff --git a/src/main/scala/org/scalajs/dom/WindowClient.scala b/src/main/scala/org/scalajs/dom/WindowClient.scala
@@ -1,4 +1,4 @@
-package org.scalajs.dom.experimental.serviceworkers
+package org.scalajs.dom
 
 import scala.scalajs.js
 
diff --git a/src/main/scala/org/scalajs/dom/experimental/push/PushEvent.scala b/src/main/scala/org/scalajs/dom/experimental/push/PushEvent.scala
@@ -1,6 +1,6 @@
-package org.scalajs.dom.experimental.push
+package org.scalajs.dom
+package experimental.push
 
-import org.scalajs.dom.experimental.serviceworkers.ExtendableEvent
 import scala.scalajs.js
 
 /** The PushEvent interface of the Push API represents a push message that has been received. This event is sent to the
diff --git a/src/main/scala/org/scalajs/dom/experimental/push/package.scala b/src/main/scala/org/scalajs/dom/experimental/push/package.scala
@@ -1,6 +1,6 @@
-package org.scalajs.dom.experimental
+package org.scalajs.dom
+package experimental
 
-import org.scalajs.dom.experimental.serviceworkers.{ServiceWorkerGlobalScope, ServiceWorkerRegistration}
 import scala.language.implicitConversions
 import scala.scalajs.js
 
diff --git a/src/main/scala/org/scalajs/dom/experimental/serviceworkers/Cache.scala b/src/main/scala/org/scalajs/dom/experimental/serviceworkers/Cache.scala
diff --git a/src/main/scala/org/scalajs/dom/experimental/serviceworkers/CacheQueryOptions.scala b/src/main/scala/org/scalajs/dom/experimental/serviceworkers/CacheQueryOptions.scala
diff --git a/src/main/scala/org/scalajs/dom/experimental/serviceworkers/CacheStorage.scala b/src/main/scala/org/scalajs/dom/experimental/serviceworkers/CacheStorage.scala
diff --git a/src/main/scala/org/scalajs/dom/experimental/serviceworkers/ExtendableEventInit.scala b/src/main/scala/org/scalajs/dom/experimental/serviceworkers/ExtendableEventInit.scala
diff --git a/src/main/scala/org/scalajs/dom/experimental/serviceworkers/package.scala b/src/main/scala/org/scalajs/dom/experimental/serviceworkers/package.scala
@@ -1,9 +1,8 @@
-package org.scalajs.dom.experimental
+package org.scalajs.dom
+package experimental
 
-import org.scalajs.dom.Navigator
+import org.scalajs.dom
 import scala.language.implicitConversions
-import scala.scalajs.js
-import scala.scalajs.js.|
 
 /** Service Workers
   *
@@ -15,17 +14,91 @@ package object serviceworkers {
   /** [[https://html.spec.whatwg.org/multipage/infrastructure.html#transferable ¶2.7.4 Transferable Objects]] in whatwg
     * html spec.
     */
-  type Transferable = org.scalajs.dom.Transferable | CanvasProxy
+  @deprecated("use dom.Transferable instead", "2.0.0")
+  type Transferable = dom.Transferable
 
+  @deprecated("use dom.Navigator directly instead", "2.0.0")
   implicit def toServiceWorkerNavigator(n: Navigator): ServiceWorkerNavigator =
-    n.asInstanceOf[ServiceWorkerNavigator]
+    n
 
-  @js.native
-  trait ServiceWorkerNavigator extends js.Any {
+  @deprecated("use dom.Navigator instead", "2.0.0")
+  type ServiceWorkerNavigator = dom.Navigator
 
-    /** The Navigator.serviceWorker read-only property returns a ServiceWorkerContainer object, which provides access to
-      * registration, removal, upgrade, and communication with the ServiceWorker objects for the associated document.
-      */
-    val serviceWorker: ServiceWorkerContainer = js.native
-  }
+  @deprecated("use dom.CacheQueryOptions instead", "2.0.0")
+  type CacheQueryOptions = dom.CacheQueryOptions
+
+  @deprecated("use dom.Cache instead", "2.0.0")
+  type Cache = dom.Cache
+
+  @deprecated("use dom.CacheStorage instead", "2.0.0")
+  type CacheStorage = dom.CacheStorage
+
+  @deprecated("use dom.CanvasProxy instead", "2.0.0")
+  type CanvasProxy = dom.CanvasProxy
+
+  @deprecated("use dom.ClientQueryOptions instead", "2.0.0")
+  type ClientQueryOptions = dom.ClientQueryOptions
+
+  @deprecated("use dom.Client instead", "2.0.0")
+  type Client = dom.Client
+
+  @deprecated("use dom.Clients instead", "2.0.0")
+  type Clients = dom.Clients
+
+  @deprecated("use dom.ClientType instead", "2.0.0")
+  type ClientType = dom.ClientType
+
+  @deprecated("use dom.ClientType instead", "2.0.0")
+  val ClientType = dom.ClientType
+
+  @deprecated("use dom.ExtendableEventInit instead", "2.0.0")
+  type ExtendableEventInit = dom.ExtendableEventInit
+
+  @deprecated("use dom.ExtendableEvent instead", "2.0.0")
+  type ExtendableEvent = dom.ExtendableEvent
+
+  @deprecated("use dom.ExtendableMessageEventInit instead", "2.0.0")
+  type ExtendableMessageEventInit = dom.ExtendableMessageEventInit
+
+  @deprecated("use dom.ExtendableMessageEvent instead", "2.0.0")
+  type ExtendableMessageEvent = dom.ExtendableMessageEvent
+
+  @deprecated("use dom.FetchEventInit instead", "2.0.0")
+  type FetchEventInit = dom.FetchEventInit
+
+  @deprecated("use dom.FetchEvent instead", "2.0.0")
+  type FetchEvent = dom.FetchEvent
+
+  @deprecated("use dom.FrameType instead", "2.0.0")
+  type FrameType = dom.FrameType
+
+  @deprecated("use dom.FrameType instead", "2.0.0")
+  val FrameType = dom.FrameType
+
+  @deprecated("use dom.GetNotificationOptions instead", "2.0.0")
+  type GetNotificationOptions = dom.GetNotificationOptions
+
+  @deprecated("use dom.ServiceWorkerContainer instead", "2.0.0")
+  type ServiceWorkerContainer = dom.ServiceWorkerContainer
+
+  @deprecated("use dom.ServiceWorkerGlobalScope instead", "2.0.0")
+  type ServiceWorkerGlobalScope = dom.ServiceWorkerGlobalScope
+
+  @deprecated("use dom.ServiceWorkerMessageEventInit instead", "2.0.0")
+  type ServiceWorkerMessageEventInit = dom.ServiceWorkerMessageEventInit
+
+  @deprecated("use dom.ServiceWorkerRegistration instead", "2.0.0")
+  type ServiceWorkerRegistration = dom.ServiceWorkerRegistration
+
+  @deprecated("use dom.ServiceWorker instead", "2.0.0")
+  type ServiceWorker = dom.ServiceWorker
+
+  @deprecated("use dom.ServiceWorkerState instead", "2.0.0")
+  type ServiceWorkerState = dom.ServiceWorkerState
+
+  @deprecated("use dom.ServiceWorkerState instead", "2.0.0")
+  val ServiceWorkerState = dom.ServiceWorkerState
+
+  @deprecated("use dom.WindowClient instead", "2.0.0")
+  type WindowClient = dom.WindowClient
 }
diff --git a/src/main/scala/org/scalajs/dom/package.scala b/src/main/scala/org/scalajs/dom/package.scala
@@ -14,7 +14,7 @@ package object dom {
     * property: it is merely a tag indicating objects that can be used in specific conditions, like to be transfered to
     * a Worker using the Worker.postMessage() method.
     */
-  type Transferable = ArrayBuffer | MessagePort
+  type Transferable = ArrayBuffer | MessagePort | CanvasProxy
 
   type BufferSource = ArrayBufferView | ArrayBuffer
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.scalajs.dom.experimental.serviceworkers`
	`1`	`+package org.scalajs.dom`
`2`	`2`
`3`	`3`	`import org.scalajs.dom.webgl.RenderingContext`
`4`	`4`	`import scala.scalajs.js`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package org.scalajs.dom`
	`2`	`+`
	`3`	`+trait ExtendableEventInit extends EventInit {}`