3 files changed, 9 insertions, 47 deletions
diff --git a/scalajslib/src/mill/scalajslib/NodeJSConfig.scala b/scalajslib/src/mill/scalajslib/NodeJSConfig.scala
deleted file mode 100644
index de39308c..00000000
--- a/scalajslib/src/mill/scalajslib/NodeJSConfig.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-package mill.scalajslib
-
-object NodeJSConfig {
-  import upickle.default.{ReadWriter => RW, macroRW}
-  implicit def rw: RW[NodeJSConfig] = macroRW
-}
-
-final case class NodeJSConfig(executable: String = "node",
-                              args: List[String] = Nil,
-                              env: Map[String, String] = Map.empty,
-                              sourceMap: Boolean = true)
diff --git a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
index 37537a85..8568c39b 100644
--- a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
+++ b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
@@ -4,11 +4,11 @@ package scalajslib
 import coursier.Cache
 import coursier.maven.MavenRepository
 import mill.eval.{PathRef, Result}
-import mill.eval.Result.Success
+import mill.api.Result.Success
 import mill.scalalib.Lib.resolveDependencies
 import mill.scalalib.{DepSyntax, Lib, TestModule, TestRunner}
 import mill.util.{Ctx, Loose}
-
+import mill.scalajslib.api._
 trait ScalaJSModule extends scalalib.ScalaModule { outer =>
 
   def scalaJSVersion: T[String]
@@ -21,7 +21,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
     override def moduleDeps = Seq(outer)
   }
 
-  def scalaJSBinaryVersion = T { Lib.scalaBinaryVersion(scalaJSVersion()) }
+  def scalaJSBinaryVersion = T { mill.scalalib.api.Util.scalaBinaryVersion(scalaJSVersion()) }
 
   def scalaJSWorkerVersion = T{ scalaJSVersion().split('.').dropRight(1).mkString(".") }
 
@@ -92,11 +92,11 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
   }
 
   override def runMainLocal(mainClass: String, args: String*) = T.command[Unit] {
-    mill.eval.Result.Failure("runMain is not supported in Scala.js")
+    mill.api.Result.Failure("runMain is not supported in Scala.js")
   }
 
   override def runMain(mainClass: String, args: String*) = T.command[Unit] {
-    mill.eval.Result.Failure("runMain is not supported in Scala.js")
+    mill.api.Result.Failure("runMain is not supported in Scala.js")
   }
 
   def link(worker: ScalaJSWorker,
diff --git a/scalajslib/src/mill/scalajslib/ScalaJSWorkerApi.scala b/scalajslib/src/mill/scalajslib/ScalaJSWorkerApi.scala
index 881a65b9..bcaeb2d3 100644
--- a/scalajslib/src/mill/scalajslib/ScalaJSWorkerApi.scala
+++ b/scalajslib/src/mill/scalajslib/ScalaJSWorkerApi.scala
@@ -4,21 +4,10 @@ import java.io.File
 import java.net.URLClassLoader
 
 import mill.define.Discover
-import mill.eval.Result
-import mill.util.Ctx
+import mill.api.Result
+import mill.api.Ctx
 import mill.{Agg, T}
-
-sealed trait OptimizeMode
-
-object FastOpt extends OptimizeMode
-object FullOpt extends OptimizeMode
-
-sealed trait ModuleKind
-object ModuleKind{
-  object NoModule extends ModuleKind
-  object CommonJSModule extends ModuleKind
-}
-
+import mill.scalajslib.api._
 class ScalaJSWorker {
   private var scalaInstanceCache = Option.empty[(Long, ScalaJSWorkerApi)]
 
@@ -29,7 +18,7 @@ class ScalaJSWorker {
     scalaInstanceCache match {
       case Some((sig, bridge)) if sig == classloaderSig => bridge
       case _ =>
-        val cl = mill.util.ClassLoader.create(
+        val cl = mill.api.ClassLoader.create(
           toolsClasspath.map(_.toIO.toURI.toURL).toVector,
           getClass.getClassLoader
         )
@@ -76,22 +65,6 @@ class ScalaJSWorker {
 
 }
 
-trait ScalaJSWorkerApi {
-  def link(sources: Array[File],
-           libraries: Array[File],
-           dest: File,
-           main: String,
-           fullOpt: Boolean,
-           moduleKind: ModuleKind): Result[File]
-
-  def run(config: NodeJSConfig, linkedFile: File): Unit
-
-  def getFramework(config: NodeJSConfig,
-                   frameworkName: String,
-                   linkedFile: File): (() => Unit, sbt.testing.Framework)
-
-}
-
 object ScalaJSWorkerApi extends mill.define.ExternalModule {
 
   def scalaJSWorker = T.worker { new ScalaJSWorker() }