Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ out/
.vscode
.bloop
.scala-build
.cursor
generate.sh
11 changes: 1 addition & 10 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,7 @@ newlines.beforeMultiline = keep
newlines.afterCurlyLambdaParams = keep
newlines.alwaysBeforeElseAfterCurlyIf = true

runner.dialect = scala213

fileOverride {
"glob:**/*.mill" {
runner.dialect = scala3
}
"glob:**/*.sc" {
runner.dialect = scala3
}
}
runner.dialect = scala3

rewrite.rules = [
RedundantBraces
Expand Down
12 changes: 7 additions & 5 deletions build.mill
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import com.goyeau.mill.scalafix.ScalafixModule
import mill.javalib.publish.{PublishingType, SonatypeCredentials}

object Versions {
def scala213 = "2.13.18"
def scala3 = "3.3.8"
def scalaJsVersion = "1.22.0"
def jsoniterVersion = "2.38.16"
def scalaJsImportMapVersion = "0.1.1"
Expand All @@ -36,9 +36,9 @@ object Versions {

trait ScalaJsCliModule extends ScalaModule with ScalafixModule {
override def scalacOptions: T[Seq[String]] =
super.scalacOptions() ++ Seq("-Wunused", "-deprecation")
super.scalacOptions() ++ Seq("-Wunused:all", "-deprecation")

def scalaVersion: T[String] = Versions.scala213
def scalaVersion: T[String] = Versions.scala3
}

object cli extends Cli
Expand All @@ -47,12 +47,14 @@ trait Cli extends ScalaJsCliModule with ScalaJsCliPublishModule {
def artifactName: T[String] = "scalajs" + super.artifactName()

def mvnDeps: T[Seq[Dep]] = super.mvnDeps() ++ Seq(
mvn"org.scala-js::scalajs-linker:${Versions.scalaJsVersion}",
mvn"org.scala-js::scalajs-linker:${Versions.scalaJsVersion}".withDottyCompat(scalaVersion()),
mvn"com.github.scopt::scopt:${Versions.scoptVersion}",
mvn"com.lihaoyi::os-lib:${Versions.osLibVersion}",
mvn"com.github.plokhotnyuk.jsoniter-scala::jsoniter-scala-core:${Versions.jsoniterVersion}", // This is the java8 version of jsoniter, according to scala-cli build
mvn"com.github.plokhotnyuk.jsoniter-scala::jsoniter-scala-macros:${Versions.jsoniterVersion}", // This is the java8 version of jsoniter, according to scala-cli build
mvn"com.armanbilge::scalajs-importmap:${Versions.scalaJsImportMapVersion}"
mvn"com.armanbilge::scalajs-importmap:${Versions.scalaJsImportMapVersion}".withDottyCompat(
scalaVersion()
)
)

def mainClass: T[Option[String]] = Some("org.scalajs.cli.Scalajsld")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
{
"name":"scopt.OptionParser",
"fields":[{"name":"0bitmap$1"}]
}
]
2 changes: 1 addition & 1 deletion cli/src/org/scalajs/cli/Scalajsld.scala
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ object Scalajsld {
val result = PathIRContainer
.fromClasspath(classpath)
.flatMap(containers => cache.cached(containers._1))
.flatMap { irFiles: Seq[IRFile] =>
.flatMap { (irFiles: Seq[IRFile]) =>

val irImportMappedFiles = options.importMap match {
case None => irFiles
Expand Down
Loading