Merge '0.6.x' into 'master'.

Author: sjrd

js-envs-test-suite/src/test/scala/org/scalajs/jsenv/test/JSDOMNodeJSEnvTest.scala

@@ -1,6 +1,6 @@
 package org.scalajs.jsenv.test
 
-import org.scalajs.jsenv.nodejs.JSDOMNodeJSEnv
+import org.scalajs.jsenv.jsdomnodejs.JSDOMNodeJSEnv
 
 import org.junit.Test
 import org.junit.Assert._

js-envs/src/main/scala/org/scalajs/jsenv/jsdomnodejs/JSDOMNodeJSEnv.scala

@@ -0,0 +1,61 @@
+/*                     __                                               *\
+**     ________ ___   / /  ___      __ ____  Scala.js JS envs           **
+**    / __/ __// _ | / /  / _ | __ / // __/  (c) 2013-2017, LAMP/EPFL   **
+**  __\ \/ /__/ __ |/ /__/ __ |/_// /_\ \    http://scala-js.org/       **
+** /____/\___/_/ |_/____/_/ | |__/ /____/                               **
+**                          |/____/                                     **
+\*                                                                      */
+
+package org.scalajs.jsenv.jsdomnodejs
+
+class JSDOMNodeJSEnv(config: JSDOMNodeJSEnv.Config)
+    extends org.scalajs.jsenv.nodejs.JSDOMNodeJSEnv(config.executable,
+        config.args, config.env, internal = ()) {
+
+  def this() = this(JSDOMNodeJSEnv.Config())
+}
+
+object JSDOMNodeJSEnv {
+  final class Config private (
+      val executable: String,
+      val args: List[String],
+      val env: Map[String, String]
+  ) {
+    private def this() = {
+      this(
+          executable = "node",
+          args = Nil,
+          env = Map.empty
+      )
+    }
+
+    def withExecutable(executable: String): Config =
+      copy(executable = executable)
+
+    def withArgs(args: List[String]): Config =
+      copy(args = args)
+
+    def withEnv(env: Map[String, String]): Config =
+      copy(env = env)
+
+    private def copy(
+        executable: String = executable,
+        args: List[String] = args,
+        env: Map[String, String] = env
+    ): Config = {
+      new Config(executable, args, env)
+    }
+  }
+
+  object Config {
+    /** Returns a default configuration for a [[JSDOMNodeJSEnv]].
+     *
+     *  The defaults are:
+     *
+     *  - `executable`: `"node"`
+     *  - `args`: `Nil`
+     *  - `env`: `Map.empty`
+     */
+    def apply(): Config = new Config()
+  }
+}

js-envs/src/main/scala/org/scalajs/jsenv/nodejs/JSDOMNodeJSEnv.scala

@@ -16,14 +16,24 @@ import org.scalajs.jsenv._
 
 import org.scalajs.core.ir.Utils.escapeJS
 
-class JSDOMNodeJSEnv(
-    @deprecatedName('nodejsPath)
-    executable: String = "node",
-    @deprecatedName('addArgs)
-    args: Seq[String] = Seq.empty,
-    @deprecatedName('addEnv)
-    env: Map[String, String] = Map.empty)
-    extends AbstractNodeJSEnv(executable, args, env, sourceMap = false) {
+class JSDOMNodeJSEnv private[jsenv] (
+    executable: String,
+    args: Seq[String],
+    env: Map[String, String],
+    internal: Unit
+) extends AbstractNodeJSEnv(executable, args, env, sourceMap = false) {
+
+  @deprecated("Use org.scalajs.jsenv.jsdomnodejs.JSDOMNodeJSEnv.", "0.6.18")
+  def this(
+      @deprecatedName('nodejsPath)
+      executable: String = "node",
+      @deprecatedName('addArgs)
+      args: Seq[String] = Seq.empty,
+      @deprecatedName('addEnv)
+      env: Map[String, String] = Map.empty
+  ) = {
+    this(executable, args, env, internal = ())
+  }
 
   protected def vmName: String = "Node.js with JSDOM"
 

sbt-plugin-test/withDOM/src/main/scala/sbttest/withDOM/TestApp.scala

@@ -1,10 +1,8 @@
 package sbttest.withDOM
 
-import scala.scalajs.js
+object TestApp {
 
-object TestApp extends js.JSApp {
-
-  def main(): Unit = {
+  def main(args: Array[String]): Unit = {
     Lib.appendDocument("Hello World")
     Lib.appendDocument("Still Here!")