Merge branch 'master' into window-move-to-and-move-by

Author: armanbilge

.github/workflows/ci.yml

@@ -0,0 +1,39 @@
+name: CI
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        scalaversion: ["2.11.12", "2.12.12", "2.13.4", "3.0.1"]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: olafurpg/setup-scala@v10
+        with:
+          java-version: "[email protected]"
+      - uses: coursier/cache-action@v5
+      - name: Build
+        run: sbt "++${{ matrix.scalaversion }}" package
+      - name: Test generate documentation
+        run: sbt "++${{ matrix.scalaversion }}" doc
+      - name: Build examples
+        run: sbt "++${{ matrix.scalaversion }}" example/compile
+      - name: scalafmt
+        run: sbt "++${{ matrix.scalaversion }}" scalafmtCheck
+  readme:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: olafurpg/setup-scala@v10
+        with:
+          java-version: "[email protected]"
+      - uses: coursier/cache-action@v5
+      - name: Readme generation
+        run: sbt readme/run

.github/workflows/ghpages.yml

@@ -0,0 +1,27 @@
+
+name: Build and Deploy GhPages docs
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: olafurpg/setup-scala@v10
+        with:
+          java-version: "[email protected]"
+      - uses: coursier/cache-action@v5
+
+      - name: Build
+        run: sbt readme/run
+
+      - name: Deploy
+        uses: JamesIves/[email protected]
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          BRANCH: gh-pages
+          FOLDER: readme/target/scalatex

.scalafmt.conf

@@ -1,4 +1,6 @@
+version = 2.0.0-RC5
 project.git = true
 style = Scala.js
 project.includeFilters = ["src/main/scala/org/scalajs/.*\\.scala"]
-bestEffortInDeeplyNestedCode = true
+maxColumn = 79
+docstrings = JavaDoc

.travis.yml

@@ -5,14 +5,11 @@ lazy val root = project.in(file(".")).
 
 name := "Scala.js DOM"
 
-crossScalaVersions in ThisBuild := {
-  if (scalaJSVersion.startsWith("1.")) Seq("2.12.6", "2.11.12", "2.13.0-M3")
-  else Seq("2.12.6", "2.11.12", "2.10.7", "2.13.0-M3", "2.13.0-M4")
-}
-scalaVersion in ThisBuild := crossScalaVersions.value.head
+ThisBuild / crossScalaVersions := Seq("2.12.12", "2.11.12", "2.13.4", "3.0.1")
+ThisBuild / scalaVersion := crossScalaVersions.value.head
 
 val commonSettings = Seq(
-  version := "0.9.7-SNAPSHOT",
+  version := "2.0.0-SNAPSHOT",
   organization := "org.scala-js",
   scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings")
 )
@@ -36,14 +33,12 @@ scalacOptions ++= {
 }
 
 def hasNewCollections(version: String): Boolean = {
-  !version.startsWith("2.10.") &&
   !version.startsWith("2.11.") &&
-  !version.startsWith("2.12.") &&
-  version != "2.13.0-M3"
+  !version.startsWith("2.12.")
 }
 
 /** Returns the appropriate subdirectory of `sourceDir` depending on whether
- *  the `scalaV` uses the new collections (introduced in 2.13.0-M4) or not.
+ *  the `scalaV` uses the new collections (introduced in 2.13) or not.
  */
 def collectionsEraDependentDirectory(scalaV: String, sourceDir: File): File =
   if (hasNewCollections(scalaV)) sourceDir / "scala-new-collections"
@@ -97,14 +92,15 @@ pomExtra := (
 pomIncludeRepository := { _ => false }
 
 lazy val readme = ScalatexReadme(
-  folder = "readme",
+  projectId = "readme",
+  wd = file(""),
   url = "https://github.com/scala-js/scala-js-dom/tree/master",
   source = "Index",
-  targetFolder = "target/site",
   autoResources = Seq("example-opt.js")
 ).settings(
-  scalaVersion := "2.11.12",
-  (resources in Compile) += (fullOptJS in (example, Compile)).value.data
+  scalaVersion := "2.12.10",
+  scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"),
+  (Compile / resources) += (example / Compile / fullOptJS).value.data
 )
 
 lazy val example = project.

build.sbt

@@ -5,7 +5,7 @@ import scala.scalajs.js.annotation._
 import org.scalajs.dom
 import dom.html
 
-@JSExportTopLevel("example.Alert")
+@JSExportTopLevel("ExampleAlert")
 object Alert {
   @JSExport
   def main() = {
@@ -14,7 +14,7 @@ object Alert {
   }
 }
 
-@JSExportTopLevel("example.NodeAppendChild")
+@JSExportTopLevel("ExampleNodeAppendChild")
 object NodeAppendChild {
   @JSExport
   def main(div: html.Div) = {
@@ -28,7 +28,7 @@ object NodeAppendChild {
   }
 }
 
-@JSExportTopLevel("example.ElementStyle")
+@JSExportTopLevel("ExampleElementStyle")
 object ElementStyle {
   @JSExport
   def main(div: html.Div) = {
@@ -43,7 +43,7 @@ object ElementStyle {
   }
 }
 
-@JSExportTopLevel("example.LocalStorage")
+@JSExportTopLevel("ExampleLocalStorage")
 object LocalStorage {
   @JSExport
   def main(in: html.Input, box: html.Div) = {
@@ -62,7 +62,7 @@ object LocalStorage {
   }
 }
 
-@JSExportTopLevel("example.Canvas")
+@JSExportTopLevel("ExampleCanvas")
 object Canvas {
   @JSExport
   def main(c: html.Canvas) = {
@@ -88,7 +88,7 @@ object Canvas {
   }
 }
 
-@JSExportTopLevel("example.Base64")
+@JSExportTopLevel("ExampleBase64")
 object Base64 {
   @JSExport
   def main(in: html.Input,
@@ -100,7 +100,7 @@ object Base64 {
   }
 }
 
-@JSExportTopLevel("example.EventHandler")
+@JSExportTopLevel("ExampleEventHandler")
 object EventHandler{
   @JSExport
   def main(pre: html.Pre) = {
@@ -118,14 +118,13 @@ object EventHandler{
   }
 }
 
-@JSExportTopLevel("example.XMLHttpRequest")
+@JSExportTopLevel("ExampleXMLHttpRequest")
 object XMLHttpRequest{
   @JSExport
   def main(pre: html.Pre) = {
     val xhr = new dom.XMLHttpRequest()
-    xhr.open("GET",
-      "http://api.openweathermap.org/" +
-      "data/2.5/weather?q=Singapore"
+    xhr.open("GET", 
+      "https://www.boredapi.com/api/activity"
     )
     xhr.onload = { (e: dom.Event) =>
       if (xhr.status == 200) {
@@ -137,12 +136,12 @@ object XMLHttpRequest{
   }
 }
 
-@JSExportTopLevel("example.Websocket")
+@JSExportTopLevel("ExampleWebsocket")
 object Websocket {
   @JSExport
   def main(in: html.Input,
            pre: html.Pre) = {
-    val echo = "ws://echo.websocket.org"
+    val echo = "wss://echo.websocket.org"
     val socket = new dom.WebSocket(echo)
     socket.onmessage = {
       (e: dom.MessageEvent) =>
@@ -157,7 +156,7 @@ object Websocket {
   }
 }
 
-@JSExportTopLevel("example.AjaxExtension")
+@JSExportTopLevel("ExampleAjaxExtension")
 object AjaxExtension {
   @JSExport
   def main(pre: html.Pre) = {
@@ -167,8 +166,7 @@ object AjaxExtension {
                 .Implicits
                 .global
     val url =
-      "http://api.openweathermap.org/" +
-      "data/2.5/weather?q=Singapore"
+      "https://www.boredapi.com/api/activity"
     Ajax.get(url).foreach { case xhr =>
       pre.textContent = xhr.responseText
     }

example/src/main/scala/example/Example.scala

@@ -1 +1 @@
-sbt.version=0.13.17
+sbt.version=1.5.5

project/build.properties

@@ -1,8 +1,8 @@
 val scalaJSVersion =
-  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.23")
+  Option(System.getenv("SCALAJS_VERSION")).filter(_ != "").getOrElse("1.5.0")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
 
-addSbtPlugin("com.lihaoyi" % "scalatex-sbt-plugin" % "0.2.1")
+addSbtPlugin("com.lihaoyi" % "scalatex-sbt-plugin" % "0.3.11")
 
-addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "0.5.1")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.0")

project/build.sbt

@@ -17,18 +17,18 @@
   div(
     div(width:="50%", float.left)(
       hl.ref(
-        cwd/'example/'src/'main/'scala/'example/"Example.scala",
+        pwd/'example/'src/'main/'scala/'example/"Example.scala",
         Seq(s"object $example", "main")
       )
     ),
     div(width:="50%", float.left, padding:="8px", boxSizing.`border-box`)(
       if (!autorun)
-        a(cls:="pure-button", onclick:=s"example.$example.main($queries)", "Run"),
+        a(cls:="pure-button", onclick:=s"Example$example.main($queries)", "Run"),
       div(
         frags.zip(ids).map{case (f, i) => f(id:=i, backgroundColor:="#fafafa")}
       ),
       if (autorun)
-        script(s"example.$example.main($queries)")
+        script(s"Example$example.main($queries)")
     ),
     div(clear.both)
   )
@@ -48,17 +48,17 @@
   @pair("Alert", Nil)
 
   @p
-    Will cause a javascript alert box saying `HAI` to appear. Other javascript classes and objects can be similarly accessed e.g. @hl.scala{new dom.XMLHttpRequest()} to perform a new Ajax request, @hl.scala{dom.document} to access the global @hl.scala{document} object, or @hl.scala{html.Div} to to refer to the type of a @hl.scala{<div>} element.
+    Will cause a javascript alert box saying `Hi from Scala-js-dom` to appear. Other javascript classes and objects can be similarly accessed e.g. @hl.scala{new dom.XMLHttpRequest()} to perform a new Ajax request, @hl.scala{dom.document} to access the global @hl.scala{document} object, or @hl.scala{html.Div} to to refer to the type of a @hl.scala{<div>} element.
 
   @sect{Usage}
     @p
       Add the following to your sbt build definition:
 
     @hl.scala
-      libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "0.9.6"
+      libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "1.1.0"
 
     @p
-      then enjoy the types available in @hl.scala{org.scalajs.dom}. scalajs-dom 0.9.6 is built and published for Scala.js 0.6.17 and later, Scala.js 1.0.0-M3, with Scala 2.10, 2.11, 2.12, 2.13.0-M3 and 2.13.0-M4.
+      then enjoy the types available in @hl.scala{org.scalajs.dom}. scalajs-dom 1.1.0 is built and published for Scala.js 0.6.17+ and Scala.js 1.0.0+, with Scala 2.10, 2.11, 2.12 and 2.13.
 
     @p
       To begin with, @code{scala-js-dom} organizes the full-list of DOM APIs into a number of buckets:
@@ -90,7 +90,7 @@
     @sect{Node.onmousemove}
       @pair(
        "EventHandler",
-        Seq(pre("pre")),
+        Seq(pre("Hover this box!")),
         autorun=true
       )
 

readme/Index.scalatex

@@ -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
 }