Add ESModule support

mushtaq · mushtaq · commit d9e8104947ce · 2020-09-19T14:11:26.000+05:30
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.idea
 *.class
 *.log
 
diff --git a/seleniumJSEnv/src/main/scala/org/scalajs/jsenv/selenium/SeleniumRun.scala b/seleniumJSEnv/src/main/scala/org/scalajs/jsenv/selenium/SeleniumRun.scala
@@ -10,6 +10,7 @@ import scala.util.control.NonFatal
 
 import java.util.concurrent.{ConcurrentLinkedQueue, Executors}
 import java.util.function.Consumer
+import java.nio.file.Path
 
 private sealed class SeleniumRun(
     driver: WebDriver with JavascriptExecutor,
@@ -129,9 +130,13 @@ private[selenium] object SeleniumRun {
       newRun: Ctor[T], failed: Throwable => T): T = {
     validator.validate(runConfig)
 
-    val scripts = input.map {
-      case Input.Script(s) => s
-      case _               => throw new UnsupportedInputException(input)
+    var scripts: Seq[Path] = Seq.empty
+    var modules: Seq[Path] = Seq.empty
+
+    input.foreach {
+      case Input.Script(s) => scripts :+= s
+      case Input.ESModule(s) => modules :+= s
+      case _ => throw new UnsupportedInputException(input)
     }
 
     try {
@@ -141,7 +146,9 @@ private[selenium] object SeleniumRun {
             scripts.map(m.materialize)
         )
 
-        val page = m.materialize("scalajsRun.html", htmlPage(allScriptURLs))
+        val allModuleURLs = modules.map(m.materialize)
+
+        val page = m.materialize("scalajsRun.html", htmlPage(allScriptURLs, allModuleURLs))
 
         withCleanup(newDriver())(maybeCleanupDriver(_, config)) { driver =>
           driver.navigate().to(page)
@@ -171,13 +178,14 @@ private[selenium] object SeleniumRun {
   private def maybeCleanupDriver(d: WebDriver, config: SeleniumJSEnv.Config) =
     if (!config.keepAlive) d.close()
 
-  private def htmlPage(scripts: Seq[java.net.URL]): String = {
-    val scriptTags =
-      scripts.map(path => s"<script src='${path.toString}'></script>")
+  private def htmlPage(scripts: Seq[java.net.URL], modules: Seq[java.net.URL]): String = {
+    val scriptTags = scripts.map(path => s"<script src='${path.toString}'></script>")
+    val moduleTags = modules.map(path => s"<script type='module' src='${path.toString}'></script>")
+    val allTags = scriptTags ++ moduleTags
     s"""<html>
        |  <meta charset="UTF-8">
        |  <body>
-       |    ${scriptTags.mkString("\n    ")}
+       |    ${allTags.mkString("\n    ")}
        |  </body>
        |</html>
     """.stripMargin

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+.idea`
`1`	`2`	`*.class`
`2`	`3`	`*.log`
`3`	`4`