Fix Js split style SmallModulesFor in pure JVM (#1394)

Author: lwronski

modules/integration/src/test/scala/scala/cli/integration/PackageTestDefinitions.scala

@@ -267,7 +267,7 @@ abstract class PackageTestDefinitions(val scalaVersionOpt: Option[String])
       expect(output == message)
     }
   }
-  def smallModulesJsTest(): Unit = {
+  def smallModulesJsTest(jvm: Boolean): Unit = {
     val fileName = "Hello.scala"
     val message  = "Hello World from JS"
     val inputs = TestInputs(
@@ -287,14 +287,16 @@ abstract class PackageTestDefinitions(val scalaVersionOpt: Option[String])
     )
     val destDir = fileName.stripSuffix(".scala")
     inputs.fromRoot { root =>
+      val extraArgs = if (jvm) Seq("--js-cli-on-jvm") else Nil
       os.proc(
         TestUtil.cli,
         "package",
         extraOptions,
         fileName,
         "--js",
         "-o",
-        destDir
+        destDir,
+        extraArgs
       ).call(
         cwd = root,
         stdin = os.Inherit,
@@ -347,8 +349,11 @@ abstract class PackageTestDefinitions(val scalaVersionOpt: Option[String])
     test("multi modules js") {
       multiModulesJsTest()
     }
-    test("small modules js") {
-      smallModulesJsTest()
+    test("small modules js with native scalajs-cli") {
+      smallModulesJsTest(jvm = false)
+    }
+    test("small modules js with jvm scalajs-cli") {
+      smallModulesJsTest(jvm = true)
     }
     test("js header in release mode") {
       jsHeaderTest()

modules/options/src/main/scala/scala/build/Artifacts.scala

@@ -1,7 +1,7 @@
 package scala.build
 
 import coursier.cache.FileCache
-import coursier.core.{Classifier, Module}
+import coursier.core.{Classifier, Module, ModuleName, Organization}
 import coursier.parse.RepositoryParser
 import coursier.util.Task
 import coursier.{Dependency => CsDependency, Fetch, Resolution, core => csCore, util => csUtil}
@@ -20,6 +20,7 @@ import scala.build.errors.{
   NoScalaVersionProvidedError,
   RepositoryFormatError
 }
+import scala.build.internal.Constants
 import scala.build.internal.Constants.*
 import scala.build.internal.CsLoggerUtil.*
 import scala.build.internal.Util.PositionedScalaDependencyOps
@@ -71,6 +72,7 @@ object Artifacts {
     compilerPlugins: Seq[Positioned[AnyDependency]],
     addJsTestBridge: Option[String],
     addNativeTestInterface: Option[String],
+    scalaJsVersion: Option[String],
     scalaJsCliVersion: Option[String],
     scalaNativeCliVersion: Option[String],
     addScalapy: Boolean
@@ -176,8 +178,15 @@ object Artifacts {
 
         val scalaJsCliDependency =
           scalaArtifactsParams.scalaJsCliVersion.map { version =>
+            val scalaJsVersion =
+              scalaArtifactsParams.scalaJsVersion.getOrElse(Constants.scalaJsVersion)
             val mod =
-              if (version.contains("-sc")) cmod"io.github.alexarchambault.tmp:scalajs-cli_2.13"
+              if (version.contains("-sc"))
+                Module(
+                  Organization("io.github.alexarchambault.tmp"),
+                  ModuleName(s"scalajscli-${scalaJsVersion}_2.13"),
+                  Map.empty
+                )
               else cmod"org.scala-js:scalajs-cli_2.13"
             Seq(coursier.Dependency(mod, version))
           }

modules/options/src/main/scala/scala/build/options/BuildOptions.scala

@@ -396,8 +396,10 @@ final case class BuildOptions(
           compilerPlugins = value(compilerPlugins),
           addJsTestBridge = addJsTestBridge.filter(_ => isTests),
           addNativeTestInterface = addNativeTestInterface.filter(_ => isTests),
+          scalaJsVersion =
+            if (platform.value == Platform.JS) Some(scalaJsOptions.finalVersion) else None,
           scalaJsCliVersion =
-            if (platform.value == Platform.JS) Some(scalaJsCliVersion) else None,
+            if (platform.value == Platform.JS) Some(Constants.scalaJsCliVersion) else None,
           scalaNativeCliVersion =
             if (platform.value == Platform.Native) Some(scalaNativeOptions.finalVersion) else None,
           addScalapy = notForBloopOptions.doSetupPython.getOrElse(false)

project/deps.sc

@@ -51,7 +51,7 @@ object InternalDeps {
   object Versions {
     def mill          = os.read(os.pwd / ".mill-version").trim
     def lefouMillwRef = "166bcdf5741de8569e0630e18c3b2ef7e252cd96"
-    def scalaJsCli    = "1.1.1-sc5"
+    def scalaJsCli    = "1.1.1-sc6"
   }
 }