Skip to content

Commit 796d971

Browse files
committed
Merge '0.6.x' into 'master'.
Only trivial merge conflicts. Additionally, the partest `run/t1430` and `run/t4729` are moved to the blacklist in 2.12.2 and 2.13.0-M1. This brings those two versions up to par with 2.12.0 and 2.12.1, for which they had been blacklisted in 497e46351ae264e8b5ce8ee650515971733f9ec7.
2 parents 703ec63 + f582d26 commit 796d971

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,12 @@ class JSDOMNodeJSEnv(
5858
val jsDOMCode = {
5959
s"""
6060
|(function () {
61-
| const jsdom = require("jsdom");
61+
| var jsdom;
62+
| try {
63+
| jsdom = require("jsdom/lib/old-api.js"); // jsdom >= 10.x
64+
| } catch (e) {
65+
| jsdom = require("jsdom"); // jsdom <= 9.x
66+
| }
6267
|
6368
| var virtualConsole = jsdom.createVirtualConsole()
6469
| .sendTo(console, { omitJsdomErrors: true });

0 commit comments

Comments
 (0)