From 22df8d9d4922162904dcbc762143d0c2c829d82a Mon Sep 17 00:00:00 2001
From: kenji yoshida <6b656e6a69@gmail.com>
Date: Sat, 27 Jun 2026 13:11:46 +0900
Subject: [PATCH] [2.x] test: Enable scala-js tests (#9387)

---
 .../sbt-test/plugins/doc-scala3-js/project/plugins.sbt   | 2 +-
 .../sbt-test/plugins/doc-scala3-js/{disabled => test}    | 0
 .../src/sbt-test/plugins/dotty-sandwich-sjs/build.sbt    | 6 +++---
 .../plugins/dotty-sandwich-sjs/project/plugins.sbt       | 2 +-
 .../plugins/dotty-sandwich-sjs/{disabled => test}        | 0
 sbt-app/src/sbt-test/plugins/dotty-sandwich/build.sbt    | 4 ++--
 sbt-app/src/sbt-test/plugins/scala-js-macro/build.sbt    | 2 +-
 .../sbt-test/plugins/scala-js-macro/project/plugins.sbt  | 2 +-
 .../sbt-test/plugins/scala-js-macro/{disabled => test}   | 3 ---
 .../sbt-test/plugins/scala-js-scala3-sandwich/build.sbt  | 6 +++---
 .../plugins/scala-js-scala3-sandwich/project/plugins.sbt | 2 +-
 .../plugins/scala-js-scala3-sandwich/{disabled => test}  | 0
 sbt-app/src/sbt-test/plugins/scala-js/build.sbt          | 4 ++--
 .../src/sbt-test/plugins/scala-js/project/plugins.sbt    | 2 +-
 sbt-app/src/sbt-test/plugins/scala-js/{disabled => test} | 0
 sbt-app/src/sbt-test/project-matrix/finder/build.sbt     | 4 ++--
 .../sbt-test/project-matrix/finder/project/plugins.sbt   | 2 +-
 .../src/sbt-test/project-matrix/finder/{pending => test} | 0
 sbt-app/src/sbt-test/project-matrix/js/build.sbt         | 9 ++-------
 sbt-app/src/sbt-test/project-matrix/js/pending           | 5 -----
 .../src/sbt-test/project-matrix/js/project/plugins.sbt   | 2 +-
 sbt-app/src/sbt-test/project-matrix/js/test              | 5 +++++
 .../project-matrix/projectAxes/project/plugins.sbt       | 2 +-
 .../project-matrix/projectAxes/{pending => test}         | 0
 24 files changed, 28 insertions(+), 36 deletions(-)
 rename sbt-app/src/sbt-test/plugins/doc-scala3-js/{disabled => test} (100%)
 rename sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/{disabled => test} (100%)
 rename sbt-app/src/sbt-test/plugins/scala-js-macro/{disabled => test} (66%)
 rename sbt-app/src/sbt-test/plugins/scala-js-scala3-sandwich/{disabled => test} (100%)
 rename sbt-app/src/sbt-test/plugins/scala-js/{disabled => test} (100%)
 rename sbt-app/src/sbt-test/project-matrix/finder/{pending => test} (100%)
 delete mode 100644 sbt-app/src/sbt-test/project-matrix/js/pending
 create mode 100644 sbt-app/src/sbt-test/project-matrix/js/test
 rename sbt-app/src/sbt-test/project-matrix/projectAxes/{pending => test} (100%)

diff --git a/sbt-app/src/sbt-test/plugins/doc-scala3-js/project/plugins.sbt b/sbt-app/src/sbt-test/plugins/doc-scala3-js/project/plugins.sbt
index a42ace5f7..fdcd4e64d 100644
--- a/sbt-app/src/sbt-test/plugins/doc-scala3-js/project/plugins.sbt
+++ b/sbt-app/src/sbt-test/plugins/doc-scala3-js/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
\ No newline at end of file
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.22.0")
diff --git a/sbt-app/src/sbt-test/plugins/doc-scala3-js/disabled b/sbt-app/src/sbt-test/plugins/doc-scala3-js/test
similarity index 100%
rename from sbt-app/src/sbt-test/plugins/doc-scala3-js/disabled
rename to sbt-app/src/sbt-test/plugins/doc-scala3-js/test
diff --git a/sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/build.sbt b/sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/build.sbt
index aa25b680e..601828f99 100644
--- a/sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/build.sbt
+++ b/sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/build.sbt
@@ -1,15 +1,15 @@
-ThisBuild / scalaVersion := "2.13.15"
+ThisBuild / scalaVersion := "2.13.18"
 ThisBuild / scalacOptions += "-Ytasty-reader"
 
 lazy val scala3code = project
   .enablePlugins(ScalaJSPlugin)
-  .settings(scalaVersion := "3.3.4")
+  .settings(scalaVersion := "3.3.8")
 
 lazy val app = project
   .enablePlugins(ScalaJSPlugin)
   .dependsOn(scala3code)
   .settings(
     libraryDependencies ~= (_.filterNot(_.name.contains("scalajs-compiler"))),
-    addCompilerPlugin("org.scala-js" % "scalajs-compiler_2.13.15" % scalaJSVersion),
+    addCompilerPlugin("org.scala-js" % "scalajs-compiler_2.13.18" % scalaJSVersion),
     scalaJSUseMainModuleInitializer := true,
   )
diff --git a/sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/project/plugins.sbt b/sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/project/plugins.sbt
index b3f269753..fdcd4e64d 100644
--- a/sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/project/plugins.sbt
+++ b/sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.22.0")
diff --git a/sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/disabled b/sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/test
similarity index 100%
rename from sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/disabled
rename to sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/test
diff --git a/sbt-app/src/sbt-test/plugins/dotty-sandwich/build.sbt b/sbt-app/src/sbt-test/plugins/dotty-sandwich/build.sbt
index f3ee7e93e..0f29dbb25 100644
--- a/sbt-app/src/sbt-test/plugins/dotty-sandwich/build.sbt
+++ b/sbt-app/src/sbt-test/plugins/dotty-sandwich/build.sbt
@@ -1,7 +1,7 @@
-ThisBuild / scalaVersion := "3.3.4"
+ThisBuild / scalaVersion := "3.3.8"
 ThisBuild / scalacOptions += "-Ytasty-reader"
 
-lazy val scala213 = "2.13.15"
+lazy val scala213 = "2.13.18"
 
 lazy val root = (project in file("."))
   .aggregate(fooApp, fooCore, barApp, barCore)
diff --git a/sbt-app/src/sbt-test/plugins/scala-js-macro/build.sbt b/sbt-app/src/sbt-test/plugins/scala-js-macro/build.sbt
index 1039576e3..16278d28a 100644
--- a/sbt-app/src/sbt-test/plugins/scala-js-macro/build.sbt
+++ b/sbt-app/src/sbt-test/plugins/scala-js-macro/build.sbt
@@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "2.13.15"
+ThisBuild / scalaVersion := "2.13.18"
 
 lazy val root = (project in file("."))
   .aggregate(macroProvider, macroClient)
diff --git a/sbt-app/src/sbt-test/plugins/scala-js-macro/project/plugins.sbt b/sbt-app/src/sbt-test/plugins/scala-js-macro/project/plugins.sbt
index b3f269753..fdcd4e64d 100644
--- a/sbt-app/src/sbt-test/plugins/scala-js-macro/project/plugins.sbt
+++ b/sbt-app/src/sbt-test/plugins/scala-js-macro/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.22.0")
diff --git a/sbt-app/src/sbt-test/plugins/scala-js-macro/disabled b/sbt-app/src/sbt-test/plugins/scala-js-macro/test
similarity index 66%
rename from sbt-app/src/sbt-test/plugins/scala-js-macro/disabled
rename to sbt-app/src/sbt-test/plugins/scala-js-macro/test
index 7a3d278a8..778640cab 100644
--- a/sbt-app/src/sbt-test/plugins/scala-js-macro/disabled
+++ b/sbt-app/src/sbt-test/plugins/scala-js-macro/test
@@ -1,6 +1,3 @@
-# Marked as pending due to StackOverflow error, see
-# https://github.com/sbt/sbt/issues/1544 for details
-
 > compile
 
 # replace macro with one that throws an error
diff --git a/sbt-app/src/sbt-test/plugins/scala-js-scala3-sandwich/build.sbt b/sbt-app/src/sbt-test/plugins/scala-js-scala3-sandwich/build.sbt
index 88ccf3d59..75968e48a 100644
--- a/sbt-app/src/sbt-test/plugins/scala-js-scala3-sandwich/build.sbt
+++ b/sbt-app/src/sbt-test/plugins/scala-js-scala3-sandwich/build.sbt
@@ -1,15 +1,15 @@
-ThisBuild / scalaVersion := "2.13.15"
+ThisBuild / scalaVersion := "2.13.18"
 ThisBuild / scalacOptions += "-Ytasty-reader"
 
 lazy val scala3code = project
   .enablePlugins(ScalaJSPlugin)
-  .settings(scalaVersion := "3.3.4")
+  .settings(scalaVersion := "3.3.8")
 
 lazy val app = project
   .enablePlugins(ScalaJSPlugin)
   .dependsOn(scala3code)
   .settings(
-    scalaVersion := "2.13.15",
+    scalaVersion := "2.13.18",
     scalacOptions += "-Ytasty-reader",
     scalaJSUseMainModuleInitializer := true
   )
diff --git a/sbt-app/src/sbt-test/plugins/scala-js-scala3-sandwich/project/plugins.sbt b/sbt-app/src/sbt-test/plugins/scala-js-scala3-sandwich/project/plugins.sbt
index b3f269753..fdcd4e64d 100644
--- a/sbt-app/src/sbt-test/plugins/scala-js-scala3-sandwich/project/plugins.sbt
+++ b/sbt-app/src/sbt-test/plugins/scala-js-scala3-sandwich/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.22.0")
diff --git a/sbt-app/src/sbt-test/plugins/scala-js-scala3-sandwich/disabled b/sbt-app/src/sbt-test/plugins/scala-js-scala3-sandwich/test
similarity index 100%
rename from sbt-app/src/sbt-test/plugins/scala-js-scala3-sandwich/disabled
rename to sbt-app/src/sbt-test/plugins/scala-js-scala3-sandwich/test
diff --git a/sbt-app/src/sbt-test/plugins/scala-js/build.sbt b/sbt-app/src/sbt-test/plugins/scala-js/build.sbt
index f8c7a3109..3912b87fe 100644
--- a/sbt-app/src/sbt-test/plugins/scala-js/build.sbt
+++ b/sbt-app/src/sbt-test/plugins/scala-js/build.sbt
@@ -1,7 +1,7 @@
-ThisBuild / scalaVersion := "2.13.1"
+ThisBuild / scalaVersion := "2.13.18"
 
 lazy val root = (project in file("."))
   .enablePlugins(ScalaJSPlugin)
   .settings(
-    libraryDependencies += "org.scala-js" %%% "scalajs-java-time" % "1.0.0"
+    libraryDependencies += "org.scala-js" %% "scalajs-java-time" % "1.0.0"
   )
diff --git a/sbt-app/src/sbt-test/plugins/scala-js/project/plugins.sbt b/sbt-app/src/sbt-test/plugins/scala-js/project/plugins.sbt
index 8365c11cc..fdcd4e64d 100644
--- a/sbt-app/src/sbt-test/plugins/scala-js/project/plugins.sbt
+++ b/sbt-app/src/sbt-test/plugins/scala-js/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.22.0")
diff --git a/sbt-app/src/sbt-test/plugins/scala-js/disabled b/sbt-app/src/sbt-test/plugins/scala-js/test
similarity index 100%
rename from sbt-app/src/sbt-test/plugins/scala-js/disabled
rename to sbt-app/src/sbt-test/plugins/scala-js/test
diff --git a/sbt-app/src/sbt-test/project-matrix/finder/build.sbt b/sbt-app/src/sbt-test/project-matrix/finder/build.sbt
index cb05b2b5f..5c25d6bec 100644
--- a/sbt-app/src/sbt-test/project-matrix/finder/build.sbt
+++ b/sbt-app/src/sbt-test/project-matrix/finder/build.sbt
@@ -22,8 +22,8 @@ lazy val custom =
   )
 
 check := {
-  val coreResults: Map[Project, Set[VirtualAxis]] = core.allProjects().toMap.mapValues(_.toSet)
-  val customResults: Map[Project, Set[VirtualAxis]] = custom.allProjects().toMap.mapValues(_.toSet)
+  val coreResults: Map[Project, Set[VirtualAxis]] = core.allProjects().toMap.view.mapValues(_.toSet).toMap
+  val customResults: Map[Project, Set[VirtualAxis]] = custom.allProjects().toMap.view.mapValues(_.toSet).toMap
 
   val isJvm = VirtualAxis.jvm
   val isJs = VirtualAxis.js
diff --git a/sbt-app/src/sbt-test/project-matrix/finder/project/plugins.sbt b/sbt-app/src/sbt-test/project-matrix/finder/project/plugins.sbt
index 1a1034041..fdcd4e64d 100644
--- a/sbt-app/src/sbt-test/project-matrix/finder/project/plugins.sbt
+++ b/sbt-app/src/sbt-test/project-matrix/finder/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.22.0")
diff --git a/sbt-app/src/sbt-test/project-matrix/finder/pending b/sbt-app/src/sbt-test/project-matrix/finder/test
similarity index 100%
rename from sbt-app/src/sbt-test/project-matrix/finder/pending
rename to sbt-app/src/sbt-test/project-matrix/finder/test
diff --git a/sbt-app/src/sbt-test/project-matrix/js/build.sbt b/sbt-app/src/sbt-test/project-matrix/js/build.sbt
index 9300a02ef..3477937f5 100644
--- a/sbt-app/src/sbt-test/project-matrix/js/build.sbt
+++ b/sbt-app/src/sbt-test/project-matrix/js/build.sbt
@@ -1,17 +1,12 @@
-// lazy val root = (project in file("."))
-//   .aggregate(core.projectRefs ++ app.projectRefs: _*)
-//   .settings(
-//   )
-
 lazy val core = (projectMatrix in file("core"))
   .settings(
     name := "core"
   )
-  .jsPlatform(scalaVersions = Seq("2.12.8", "2.11.12"))
+  .jsPlatform(scalaVersions = Seq("2.12.21", "2.13.18"))
 
 lazy val app = (projectMatrix in file("app"))
   .dependsOn(core)
   .settings(
     name := "app"
   )
-  .jsPlatform(scalaVersions = Seq("2.12.8"))
+  .jsPlatform(scalaVersions = Seq("2.12.21"))
diff --git a/sbt-app/src/sbt-test/project-matrix/js/pending b/sbt-app/src/sbt-test/project-matrix/js/pending
deleted file mode 100644
index 553c6bf3a..000000000
--- a/sbt-app/src/sbt-test/project-matrix/js/pending
+++ /dev/null
@@ -1,5 +0,0 @@
-> fastOptJS
-
-$ exists app/target/js-2.12/app-fastopt.js
-$ exists core/target/js-2.12/core-fastopt.js
-$ exists core/target/js-2.11/core-fastopt.js
diff --git a/sbt-app/src/sbt-test/project-matrix/js/project/plugins.sbt b/sbt-app/src/sbt-test/project-matrix/js/project/plugins.sbt
index e598c338c..fdcd4e64d 100644
--- a/sbt-app/src/sbt-test/project-matrix/js/project/plugins.sbt
+++ b/sbt-app/src/sbt-test/project-matrix/js/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.27")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.22.0")
diff --git a/sbt-app/src/sbt-test/project-matrix/js/test b/sbt-app/src/sbt-test/project-matrix/js/test
new file mode 100644
index 000000000..2940e94c3
--- /dev/null
+++ b/sbt-app/src/sbt-test/project-matrix/js/test
@@ -0,0 +1,5 @@
+> fastOptJS
+
+$ exists target/out/sjs1/scala-2.12.21/core/core-fastopt.js
+$ exists target/out/sjs1/scala-2.12.21/app/app-fastopt.js
+$ exists target/out/sjs1/scala-2.13.18/core/core-fastopt.js
diff --git a/sbt-app/src/sbt-test/project-matrix/projectAxes/project/plugins.sbt b/sbt-app/src/sbt-test/project-matrix/projectAxes/project/plugins.sbt
index 1a1034041..fdcd4e64d 100644
--- a/sbt-app/src/sbt-test/project-matrix/projectAxes/project/plugins.sbt
+++ b/sbt-app/src/sbt-test/project-matrix/projectAxes/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.22.0")
diff --git a/sbt-app/src/sbt-test/project-matrix/projectAxes/pending b/sbt-app/src/sbt-test/project-matrix/projectAxes/test
similarity index 100%
rename from sbt-app/src/sbt-test/project-matrix/projectAxes/pending
rename to sbt-app/src/sbt-test/project-matrix/projectAxes/test