Skip to content

Updated js-bridge with newest configuration #2359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 26, 2024
Merged

Updated js-bridge with newest configuration #2359

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c142f73
Updated js-bridge with newest configuration
Jun 25, 2024
7d709e0
Merge branch 'main' into update-js-bridge
Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions bridges/scalajs-1/src/main/scala/bloop/scalajs/JsBridge.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ import org.scalajs.jsenv.jsdomnodejs.JSDOMNodeJSEnv
import org.scalajs.jsenv.nodejs.NodeJSEnv
import org.scalajs.linker.PathIRContainer
import org.scalajs.linker.PathOutputDirectory
import org.scalajs.linker.PathOutputFile
import org.scalajs.linker.StandardImpl
import org.scalajs.linker.interface.{ModuleKind => ScalaJSModuleKind, _}
import org.scalajs.linker.interface.{ModuleKind => ScalaJSModuleKind}
import org.scalajs.linker.interface.{ModuleSplitStyle => ScalaJSModuleKindSplitStyle, _}
import org.scalajs.logging.Level
import org.scalajs.logging.{Logger => JsLogger}
import org.scalajs.testing.adapter.TestAdapter
import org.scalajs.testing.adapter.TestAdapterInitializer
import java.nio.file.Files
import bloop.config.Config.ModuleSplitStyleJS

/**
* Defines operations provided by the Scala.JS 1.x toolchain.
Expand Down Expand Up @@ -66,6 +66,14 @@ object JsBridge {
case ModuleKindJS.ESModule => ScalaJSModuleKind.ESModule
}

val scalaJSModuleKindSplitStyle: Option[ScalaJSModuleKindSplitStyle] =
config.moduleSplitStyle.map {
case ModuleSplitStyleJS.FewestModules => ScalaJSModuleKindSplitStyle.FewestModules
case ModuleSplitStyleJS.SmallestModules => ScalaJSModuleKindSplitStyle.SmallestModules
case ModuleSplitStyleJS.SmallModulesFor(packages) =>
ScalaJSModuleKindSplitStyle.SmallModulesFor(packages)
}

val useClosure = isFullLinkJS && config.kind != ModuleKindJS.ESModule

val linkerConfig = StandardConfig()
Expand All @@ -74,7 +82,13 @@ object JsBridge {
.withModuleKind(scalaJSModuleKind)
.withSourceMap(config.emitSourceMaps)

StandardImpl.clearableLinker(linkerConfig)
(config.kind, scalaJSModuleKindSplitStyle) match {
case (ModuleKindJS.ESModule, Some(value)) =>
StandardImpl.clearableLinker(
linkerConfig.withModuleSplitStyle(value)
)
case (_, _) => StandardImpl.clearableLinker(linkerConfig)
}
}
}

Expand All @@ -98,15 +112,15 @@ object JsBridge {

val moduleInitializers = mainClass match {
case Some(mainClass) if runMain =>
logger.debug(s"Setting up main module initializers for ${project}")
logger.debug(s"Setting up main module initializers for $project")
List(ModuleInitializer.mainMethodWithArgs(mainClass, "main"))
case _ =>
if (runMain) {
logger.debug(s"Setting up no module initializers, commonjs module detected ${project}")
logger.debug(s"Setting up no module initializers, commonjs module detected $project")
Nil // If run is disabled, it's a commonjs module and we link with exports
} else {
// There is no main class, install the test module initializers
logger.debug(s"Setting up test module initializers for ${project}")
logger.debug(s"Setting up test module initializers for $project")
List(
ModuleInitializer.mainMethod(
TestAdapterInitializer.ModuleClassName,
Expand Down
Loading