Merge pull request #2974 from sjrd/remove-jsdependencies-in-build

Remove the JSDependencies plugin from our own build.

Author: gzm0

ci/matrix.xml

@@ -15,6 +15,7 @@
 
   <task id="main"><![CDATA[
     setJavaVersion $java
+    npm install &&
     sbtretry ++$scala helloworld/run &&
     sbtretry 'set scalaJSStage in Global := FullOptStage' \
         ++$scala helloworld/run \
@@ -58,6 +59,7 @@
 
   <task id="test-suite-ecma-script5"><![CDATA[
     setJavaVersion $java
+    npm install &&
     sbtretry ++$scala jUnitTestOutputsJVM/test jUnitTestOutputsJS/test \
         'set scalaJSStage in Global := FullOptStage' jUnitTestOutputsJS/test &&
     sbtretry ++$scala $testSuite/test &&
@@ -97,6 +99,7 @@
 
   <task id="test-suite-ecma-script6"><![CDATA[
     setJavaVersion $java
+    npm install &&
     sbtretry 'set scalaJSOutputMode in $testSuite := org.scalajs.core.tools.linker.backend.OutputMode.ECMAScript6' \
         'set jsEnv in $testSuite := new org.scalajs.jsenv.nodejs.NodeJSEnv().withSourceMap(false)' \
         ++$scala $testSuite/test \
@@ -141,15 +144,15 @@
 
   <task id="bootstrap"><![CDATA[
     setJavaVersion $java
-    sbt 'set jsEnv in toolsJS := new org.scalajs.jsenv.nodejs.NodeJSEnv(args = Seq("--max_old_space_size=3072")).withSourceMap(false)' \
-        ++$scala irJS/test toolsJS/test &&
-    sbt 'set jsEnv in toolsJS := new org.scalajs.jsenv.nodejs.NodeJSEnv(args = Seq("--max_old_space_size=3072")).withSourceMap(false)' \
-        'set scalaJSStage in Global := FullOptStage' \
+    npm install &&
+    sbt ++$scala irJS/test toolsJS/test &&
+    sbt 'set scalaJSStage in Global := FullOptStage' \
         ++$scala irJS/test toolsJS/test
   ]]></task>
 
   <task id="tools-cli-stubs"><![CDATA[
     setJavaVersion $java
+    npm install &&
     sbt ++$scala tools/package ir/test tools/test cli/package cli/assembly \
         stubs/package jsEnvsTestSuite/test jsDependenciesCore/test \
         ir/mimaReportBinaryIssues tools/mimaReportBinaryIssues \
@@ -163,6 +166,7 @@
 
   <task id="tools-cli-stubs-sbtplugin"><![CDATA[
     setJavaVersion $java
+    npm install &&
     sbt ++$scala tools/package ir/test tools/test cli/package cli/assembly \
         stubs/package jsEnvsTestSuite/test jsDependenciesCore/test \
         sbtPlugin/package jsDependenciesPlugin/package \
@@ -193,12 +197,14 @@
 
   <task id="partestc"><![CDATA[
     setJavaVersion $java
+    npm install &&
     sbt ++$scala partest/compile
   ]]></task>
 
   <task id="sbtplugin-test"><![CDATA[
     # Publish Scala.js artifacts locally
     # Then go into standalone project and test
+    npm install &&
     sbt ++2.11.11 compiler/publishLocal library/publishLocal \
                   testInterface/publishLocal stubs/publishLocal \
                   jUnitPlugin/publishLocal jUnitRuntime/publishLocal &&
@@ -220,16 +226,19 @@
 
   <task id="partest-noopt"><![CDATA[
     setJavaVersion $java
+    npm install &&
     sbt ++$scala package "partestSuite/testOnly -- --showDiff"
   ]]></task>
 
   <task id="partest-fastopt"><![CDATA[
     setJavaVersion $java
+    npm install &&
     sbt ++$scala package "partestSuite/testOnly -- --fastOpt --showDiff"
   ]]></task>
 
   <task id="partest-fullopt"><![CDATA[
     setJavaVersion $java
+    npm install &&
     sbt ++$scala package "partestSuite/testOnly -- --fullOpt --showDiff"
   ]]></task>
 

package.json

@@ -0,0 +1,8 @@
+{
+  "private": true,
+  "devDependencies": {
+    "source-map-support": "0.4.15",
+    "jszip": "2.4.0",
+    "jsdom": "9.12.0"
+  }
+}

project/Build.scala

@@ -23,14 +23,11 @@ import org.scalajs.sbtplugin._
 import org.scalajs.jsenv.JSEnv
 import org.scalajs.jsenv.nodejs.{NodeJSEnv, JSDOMNodeJSEnv}
 
-import org.scalajs.jsdependencies.sbtplugin.JSDependenciesPlugin
-import org.scalajs.jsdependencies.sbtplugin.JSDependenciesPlugin.autoImport._
-
 import ScalaJSPlugin.autoImport._
 import ExternalCompile.scalaJSExternalCompileSettings
 import Loggers._
 
-import org.scalajs.core.tools.io.MemVirtualJSFile
+import org.scalajs.core.tools.io.{FileVirtualJSFile, MemVirtualJSFile}
 import org.scalajs.core.tools.sem._
 import org.scalajs.core.tools.json._
 import org.scalajs.core.tools.linker.ModuleInitializer
@@ -619,41 +616,52 @@ object Build {
   ).dependsOn(irProject)
 
   lazy val toolsJS: Project = (project in file("tools/js")).enablePlugins(
-      MyScalaJSPlugin,
-      JSDependenciesPlugin
+      MyScalaJSPlugin
   ).settings(
       commonToolsSettings,
       crossVersion := ScalaJSCrossVersion.binary,
-      resourceGenerators in Test += Def.task {
-        val base = (resourceManaged in Compile).value
-        IO.createDirectory(base)
-        val outFile = base / "js-test-definitions.js"
 
+      scalaJSModuleKind in Test :=
+        org.scalajs.core.tools.linker.backend.ModuleKind.CommonJSModule,
+
+      jsExecutionFiles in Test := {
         val testDefinitions = {
           org.scalajs.build.HTMLRunnerTemplateAccess.renderTestDefinitions(
               (loadedTestFrameworks in testSuite in Test).value,
               (definedTests in testSuite in Test).value)
         }
 
-        IO.write(outFile, testDefinitions)
-        Seq(outFile)
-      }.taskValue,
+        val testDefinitionsFile = {
+          new MemVirtualJSFile("js-test-definitions.js")
+            .withContent(testDefinitions)
+        }
+
+        testDefinitionsFile +: (jsExecutionFiles in Test).value
+      },
 
-      jsDependencies += ProvidedJS / "js-test-definitions.js" % "test",
-      jsDependencies +=
-        "org.webjars" % "jszip" % "2.4.0" % "test" / "jszip.min.js" commonJSName "JSZip",
+      testSuiteJSExecutionFilesSetting,
+
+      // Give more memory to Node.js, and deactivate source maps
+      jsEnv := new NodeJSEnv(args = Seq("--max_old_space_size=3072")).withSourceMap(false),
 
       inConfig(Test) {
-        // Redefine test to run Node.js and link HelloWorld
+        // Redefine test to perform the bootstrap test
         test := {
           if (!jsEnv.value.isInstanceOf[NodeJSEnv])
             throw new MessageOnlyException("toolsJS/test must be run with Node.js")
 
-          /* Collect IR relevant files from the classpath
+          /* We'll explicitly `require` our linked file. Find its module, and
+           * remove it from the `jsExecutionFiles` to give to the runner.
+           */
+          val toolsTestModule = scalaJSLinkedFile.value
+          val executionFiles =
+            jsExecutionFiles.value.filter(_ ne toolsTestModule)
+
+          /* Collect relevant IR files from the classpath of the test suite.
            * We assume here that the classpath is valid. This is checked by the
            * the scalaJSIR task.
            */
-          val cp = Attributed.data(fullClasspath.value)
+          val cp = Attributed.data((fullClasspath in (testSuite, Test)).value)
 
           // Files must be Jars, non-files must be dirs
           val (jars, dirs) = cp.filter(_.exists).partition(_.isFile)
@@ -681,38 +689,43 @@ object Build {
             seqOfStringsToJSArrayCode(unescapedMainMethods)
           }
 
-          val scalaJSEnv = {
+          val scalaJSEnvForTestSuite = {
             s"""
             {"javaSystemProperties": {
-              "scalajs.scalaVersion": "${scalaVersion.value}"
+              "scalajs.scalaVersion": "${scalaVersion.value}",
+              "scalajs.testsuite.testtag": "testtag.value",
+              "scalajs.nodejs": "true",
+              "scalajs.typedarray": "true",
+              "scalajs.fastopt-stage": "true",
+              "scalajs.modulekind-nomodule": "true"
             }}
             """
           }
 
           val code = {
             s"""
-            var linker = scalajs.QuickLinker;
+            var toolsTestModule = require("${escapeJS(toolsTestModule.path)}");
+            var linker = toolsTestModule.scalajs.QuickLinker;
             var lib = linker.linkTestSuiteNode($irPaths, $mainMethods);
 
-            var __ScalaJSEnv = $scalaJSEnv;
-
+            var __ScalaJSEnv = $scalaJSEnvForTestSuite;
             eval("(function() { 'use strict'; " +
               lib + ";" +
-              "scalajs.TestRunner.runTests();" +
+              "scalajs.ConsoleTestRunner.runTests();" +
             "}).call(this);");
             """
           }
 
           val launcher = new MemVirtualJSFile("Generated launcher file")
             .withContent(code)
 
-          val runner = jsEnv.value.jsRunner(jsExecutionFiles.value :+ launcher)
+          val runner = jsEnv.value.jsRunner(executionFiles :+ launcher)
 
           runner.run(sbtLogger2ToolsLogger(streams.value.log), scalaJSConsole.value)
         }
       }
   ).withScalaJSCompiler.dependsOn(
-      library, irProjectJS, testSuite % "test->test"
+      library, irProjectJS, jUnitRuntime % "test"
   )
 
   lazy val jsEnvs: Project = (project in file("js-envs")).settings(
@@ -1435,9 +1448,17 @@ object Build {
       }).value
   )
 
+  def testSuiteJSExecutionFilesSetting: Setting[_] = {
+    jsExecutionFiles in Test := {
+      val resourceDir =
+        (resourceDirectory in (LocalProject("testSuite"), Test)).value
+      val f = FileVirtualJSFile(resourceDir / "ScalaJSDefinedTestNatives.js")
+      f +: (jsExecutionFiles in Test).value
+    }
+  }
+
   lazy val testSuite: Project = (project in file("test-suite/js")).enablePlugins(
-      MyScalaJSPlugin,
-      JSDependenciesPlugin
+      MyScalaJSPlugin
   ).settings(
       commonSettings,
       testTagSettings,
@@ -1453,8 +1474,7 @@ object Build {
             scalaJSModuleKind.value != ModuleKind.NoModule)
       },
 
-      jsDependencies += ProvidedJS / "ScalaJSDefinedTestNatives.js" % "test",
-      skip in packageJSDependencies in Test := false,
+      testSuiteJSExecutionFilesSetting,
 
       scalaJSSemantics ~= (_.withRuntimeClassName(_.fullName match {
         case "org.scalajs.testsuite.compiler.ReflectionTest$RenamedTestClass" =>

test-suite/js/src/main/scala/org/scalajs/testsuite/utils/ConsoleTestRunner.scala

@@ -0,0 +1,72 @@
+package org.scalajs.testsuite.utils
+
+import scala.collection.mutable
+
+import scala.scalajs.js
+import scala.scalajs.js.annotation._
+
+import org.scalajs.testinterface.{ScalaJSClassLoader, TestDetector}
+
+import sbt.testing._
+
+@JSExportTopLevel("scalajs.ConsoleTestRunner")
+object ConsoleTestRunner {
+
+  @JSExport
+  def runTests(): Unit = {
+    try {
+      val eventHandler = new SimpleEventHandler
+      val loggers = Array[Logger](new SimpleLogger)
+
+      def taskLoop(tasks: Iterable[Task]): Unit = {
+        if (tasks.nonEmpty)
+          tasks.head.execute(eventHandler, loggers,
+              newTasks => taskLoop(tasks.tail ++ newTasks))
+      }
+
+      for {
+        (framework, taskDefs) <- TestDetector.detectTests()
+      } {
+        val runner = framework.runner(Array(), Array(), new ScalaJSClassLoader())
+        val tasks = runner.tasks(taskDefs.toArray)
+        taskLoop(tasks)
+      }
+
+      val failedEvents = eventHandler.failedEvents
+      if (failedEvents.nonEmpty) {
+        System.err.println("The following tests failed:")
+        for (event <- failedEvents) {
+          System.err.println("* " + event.fullyQualifiedName())
+          if (event.throwable().isDefined())
+            event.throwable().get().printStackTrace()
+        }
+        throw new AssertionError("Some tests have failed")
+      }
+    } catch {
+      case th: Throwable =>
+        th.printStackTrace()
+        throw th
+    }
+  }
+
+  private class SimpleEventHandler extends EventHandler {
+    private[this] val _failedEvents = new mutable.ListBuffer[Event]
+
+    def failedEvents: List[Event] = _failedEvents.toList
+
+    def handle(ev: Event) = {
+      if (ev.status == Status.Error || ev.status == Status.Failure)
+        _failedEvents += ev
+    }
+  }
+
+  private class SimpleLogger extends Logger {
+    def ansiCodesSupported(): Boolean = false
+    def error(msg: String): Unit = println(msg)
+    def warn(msg: String): Unit = println(msg)
+    def info(msg: String): Unit = println(msg)
+    def debug(msg: String): Unit = println(msg)
+    def trace(t: Throwable): Unit = t.printStackTrace
+  }
+
+}

tools/js/src/test/scala/org/scalajs/core/tools/test/js/QuickLinker.scala

@@ -118,7 +118,7 @@ object QuickLinker {
   }
 
   @js.native
-  @JSGlobal("JSZip")
+  @JSImport("jszip", JSImport.Default)
   private class JSZip(data: Uint8Array) extends js.Object {
     def files: js.Dictionary[JSZipEntry] = js.native
   }