Skip to content

Commit b3ed72e

Browse files
authored
Merge pull request scala-js#2 from exoego/jsdom-and-nodejs
Jsdom and nodejs
2 parents 124cf12 + 5b4a842 commit b3ed72e

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ class JSDOMNodeJSEnv(config: JSDOMNodeJSEnv.Config) extends JSEnv {
111111
});
112112
113113
var window = dom.window;
114-
window["scalajsCom"] = global.scalajsCom;
114+
["scalajsCom", "require"].forEach(name => {
115+
window[name] = global[name];
116+
});
115117
116118
var scriptsSrcs = $scriptsURIsJSArray;
117119
for (var i = 0; i < scriptsSrcs.length; i++) {

jsdom-nodejs-env/src/test/scala/org/scalajs/jsenv/jsdomnodejs/JSDOMNodeJSEnvTest.scala

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,17 @@ class JSDOMNodeJSEnvTest {
2222
.expectOut("http://localhost/foo\n")
2323
}
2424
}
25+
26+
@Test
27+
def nodejsRequire: Unit = {
28+
kit.withRun(
29+
// language=JavaScript
30+
"""
31+
const fs = require("fs");
32+
console.log(fs != null);
33+
console.log(typeof fs.write === "function");
34+
""") { run =>
35+
run.expectOut("true\n")
36+
}
37+
}
2538
}

0 commit comments

Comments
 (0)