Fix #17: Fail run in NodeJSEnv if ESModule fails

gzm0 · gzm0 · commit 82089d8e478b · 2022-01-18T21:45:49.000+01:00
diff --git a/nodejs-env/src/main/scala/org/scalajs/jsenv/nodejs/NodeJSEnv.scala b/nodejs-env/src/main/scala/org/scalajs/jsenv/nodejs/NodeJSEnv.scala
@@ -146,7 +146,7 @@ object NodeJSEnv {
          * `import()` cannot be used from the standard input).
          */
         val importChain = input.foldLeft("Promise.resolve()") { (prev, item) =>
-          s"$prev.\n  then(${execInputExpr(item)})"
+          s"$prev.\n  then(() => ${execInputExpr(item)})"
         }
         val importerFileContent = {
           s"""
diff --git a/nodejs-env/src/test/scala/org/scalajs/jsenv/nodejs/NodeJSSuite.scala b/nodejs-env/src/test/scala/org/scalajs/jsenv/nodejs/NodeJSSuite.scala
@@ -19,6 +19,5 @@ import org.junit.runner.RunWith
 @RunWith(classOf[JSEnvSuiteRunner])
 class NodeJSSuite extends JSEnvSuite(
   JSEnvSuiteConfig(new NodeJSEnv)
-    .withSupportsESModules(false)  // #17
     .withExitJSStatement("process.exit(0);")
 )

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ object NodeJSEnv {`
`146`	`146`	* `import()` cannot be used from the standard input).
`147`	`147`	`*/`
`148`	`148`	`val importChain = input.foldLeft("Promise.resolve()") { (prev, item) =>`
`149`		`- s"$prev.\n then(${execInputExpr(item)})"`
	`149`	`+ s"$prev.\n then(() => ${execInputExpr(item)})"`
`150`	`150`	`}`
`151`	`151`	`val importerFileContent = {`
`152`	`152`	`s"""`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,5 @@ import org.junit.runner.RunWith`
`19`	`19`	`@RunWith(classOf[JSEnvSuiteRunner])`
`20`	`20`	`class NodeJSSuite extends JSEnvSuite(`
`21`	`21`	`JSEnvSuiteConfig(new NodeJSEnv)`
`22`		`- .withSupportsESModules(false) // #17`
`23`	`22`	`.withExitJSStatement("process.exit(0);")`
`24`	`23`	`)`