Merge pull request #26 from gzm0/rc1

Upgrade to Scala.js 1.0.0-RC1

Author: gzm0

.travis.yml

@@ -1,9 +1,9 @@
 sudo: false
 language: scala
 scala:
-  - 2.10.7
   - 2.11.12
-  - 2.12.8
+  - 2.12.10
+  - 2.13.1
 jdk:
   - openjdk8
 env:

build.sbt

@@ -2,7 +2,7 @@ inThisBuild(Seq(
   version := "1.0.0-SNAPSHOT",
   organization := "org.scala-js",
 
-  crossScalaVersions := Seq("2.12.8", "2.10.7", "2.11.12"),
+  crossScalaVersions := Seq("2.12.10", "2.11.12", "2.13.1"),
   scalaVersion := crossScalaVersions.value.head,
   scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"),
 

jsdom-nodejs-env/src/main/scala/org/scalajs/jsenv/jsdomnodejs/JSDOMNodeJSEnv.scala

@@ -30,7 +30,7 @@ class JSDOMNodeJSEnv(config: JSDOMNodeJSEnv.Config) extends JSEnv {
 
   val name: String = "Node.js with JSDOM"
 
-  def start(input: Input, runConfig: RunConfig): JSRun = {
+  def start(input: Seq[Input], runConfig: RunConfig): JSRun = {
     JSDOMNodeJSEnv.validator.validate(runConfig)
     val scripts = validateInput(input)
     try {
@@ -41,7 +41,7 @@ class JSDOMNodeJSEnv(config: JSDOMNodeJSEnv.Config) extends JSEnv {
     }
   }
 
-  def startWithCom(input: Input, runConfig: RunConfig,
+  def startWithCom(input: Seq[Input], runConfig: RunConfig,
       onMessage: String => Unit): JSComRun = {
     JSDOMNodeJSEnv.validator.validate(runConfig)
     val scripts = validateInput(input)
@@ -50,13 +50,14 @@ class JSDOMNodeJSEnv(config: JSDOMNodeJSEnv.Config) extends JSEnv {
     }
   }
 
-  private def validateInput(input: Input): List[Path] = {
-    input match {
-      case Input.ScriptsToLoad(scripts) =>
-        scripts
+  private def validateInput(input: Seq[Input]): List[Path] = {
+    input.map {
+      case Input.Script(script) =>
+        script
+
       case _ =>
         throw new UnsupportedInputException(input)
-    }
+    }.toList
   }
 
   private def internalStart(files: List[Path], runConfig: RunConfig): JSRun = {
@@ -73,7 +74,7 @@ class JSDOMNodeJSEnv(config: JSDOMNodeJSEnv.Config) extends JSEnv {
   private def codeWithJSDOMContext(scripts: List[Path]): List[Path] = {
     val scriptsURIs = scripts.map(JSDOMNodeJSEnv.materialize(_))
     val scriptsURIsAsJSStrings =
-      scriptsURIs.map(uri => '"' + escapeJS(uri.toASCIIString) + '"')
+      scriptsURIs.map(uri => "\"" + escapeJS(uri.toASCIIString) + "\"")
     val jsDOMCode = {
       s"""
          |(function () {

project/plugins.sbt

@@ -1,6 +1,6 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M8")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-RC1")
 
-libraryDependencies += "org.scala-js" %% "scalajs-env-nodejs" % "1.0.0-M8"
+libraryDependencies += "org.scala-js" %% "scalajs-env-nodejs" % "1.0.0-RC1"
 
 unmanagedSourceDirectories in Compile +=
   baseDirectory.value.getParentFile / "jsdom-nodejs-env/src/main/scala"