diff --git a/.travis.yml b/.travis.yml index 7ed3618..14326f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ scala: jdk: - openjdk8 env: - - JSDOM_VERSION=9.12.0 - JSDOM_VERSION=10.0.0 - JSDOM_VERSION=16.0.0 install: diff --git a/build.sbt b/build.sbt index e552d51..afd9dd9 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,5 @@ inThisBuild(Seq( - version := "1.0.1-SNAPSHOT", + version := "1.1.0-SNAPSHOT", organization := "org.scala-js", crossScalaVersions := Seq("2.12.10", "2.11.12", "2.13.1"), diff --git a/jsdom-nodejs-env/src/main/scala/org/scalajs/jsenv/jsdomnodejs/JSDOMNodeJSEnv.scala b/jsdom-nodejs-env/src/main/scala/org/scalajs/jsenv/jsdomnodejs/JSDOMNodeJSEnv.scala index fcecace..0ef7777 100644 --- a/jsdom-nodejs-env/src/main/scala/org/scalajs/jsenv/jsdomnodejs/JSDOMNodeJSEnv.scala +++ b/jsdom-nodejs-env/src/main/scala/org/scalajs/jsenv/jsdomnodejs/JSDOMNodeJSEnv.scala @@ -78,79 +78,46 @@ class JSDOMNodeJSEnv(config: JSDOMNodeJSEnv.Config) extends JSEnv { val scriptsURIsJSArray = scriptsURIsAsJSStrings.mkString("[", ", ", "]") val jsDOMCode = { s""" - | |(function () { | var jsdom = require("jsdom"); | - | if (typeof jsdom.JSDOM === "function") { - | // jsdom >= 10.0.0 - | var virtualConsole = new jsdom.VirtualConsole() - | .sendTo(console, { omitJSDOMErrors: true }); - | virtualConsole.on("jsdomError", function (error) { - | try { - | // Display as much info about the error as possible - | if (error.detail && error.detail.stack) { - | console.error("" + error.detail); - | console.error(error.detail.stack); - | } else { - | console.error(error); - | } - | } finally { - | // Whatever happens, kill the process so that the run fails - | process.exit(1); + | var virtualConsole = new jsdom.VirtualConsole() + | .sendTo(console, { omitJSDOMErrors: true }); + | virtualConsole.on("jsdomError", function (error) { + | try { + | // Display as much info about the error as possible + | if (error.detail && error.detail.stack) { + | console.error("" + error.detail); + | console.error(error.detail.stack); + | } else { + | console.error(error); | } - | }); - | - | var dom = new jsdom.JSDOM("", { - | virtualConsole: virtualConsole, - | url: "http://localhost/", - | - | /* Allow unrestricted