From 64d72e1e96bf237fbba72c265395929adf13e8c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Sat, 6 Sep 2025 12:01:36 +0200 Subject: [PATCH 1/2] Towards 1.20.2. --- ir/shared/src/main/scala/org/scalajs/ir/ScalaJSVersions.scala | 2 +- project/Build.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ir/shared/src/main/scala/org/scalajs/ir/ScalaJSVersions.scala b/ir/shared/src/main/scala/org/scalajs/ir/ScalaJSVersions.scala index 58809c353f..f12c4e15e2 100644 --- a/ir/shared/src/main/scala/org/scalajs/ir/ScalaJSVersions.scala +++ b/ir/shared/src/main/scala/org/scalajs/ir/ScalaJSVersions.scala @@ -17,7 +17,7 @@ import java.util.concurrent.ConcurrentHashMap import scala.util.matching.Regex object ScalaJSVersions extends VersionChecks( - current = "1.20.1", + current = "1.20.2-SNAPSHOT", binaryEmitted = "1.20" ) diff --git a/project/Build.scala b/project/Build.scala index 2d362b5004..cdbef89fdd 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -387,7 +387,7 @@ object Build { "1.3.0", "1.3.1", "1.4.0", "1.5.0", "1.5.1", "1.6.0", "1.7.0", "1.7.1", "1.8.0", "1.9.0", "1.10.0", "1.10.1", "1.11.0", "1.12.0", "1.13.0", "1.13.1", "1.13.2", "1.14.0", "1.15.0", "1.16.0", "1.17.0", "1.18.0", - "1.18.1", "1.18.2", "1.19.0", "1.20.0") + "1.18.1", "1.18.2", "1.19.0", "1.20.0", "1.20.1") val previousVersion = previousVersions.last val previousBinaryCrossVersion = CrossVersion.binaryWith("sjs1_", "") From c2e9fd3ec0a2a3c4c1b652013ee25ca5f37e103b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Mon, 8 Sep 2025 09:58:16 +0200 Subject: [PATCH 2/2] Wasm: Remove the `--turboshaft-wasm` option for Node.js 24. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Between Node.js 23 and 24, `--turboshaft-wasm` became the default *änd* was removed as a command-line argument. With the upgrade of our CI infrastructure to Node.js 24, we must therefore remove that flag. --- DEVELOPING.md | 2 +- .../src/main/scala/scala/tools/nsc/MainGenericRunner.scala | 5 ----- project/Build.scala | 6 ------ 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/DEVELOPING.md b/DEVELOPING.md index 29dc5d18fa..0f8729683b 100644 --- a/DEVELOPING.md +++ b/DEVELOPING.md @@ -9,7 +9,7 @@ in the [Javalib documentation](./JAVALIB.md)*** . Scala.js is entirely built with [sbt](https://www.scala-sbt.org/), and also requires [Node.js](https://nodejs.org/en/) to be installed. For complete -support, Node.js >= 13.2.0 is required. +support, Node.js >= 24.0.0 is required. The first time, or in the rare events where `package.json` changes ([history](https://github.com/scala-js/scala-js/commits/main/package.json)), diff --git a/partest/src/main/scala/scala/tools/nsc/MainGenericRunner.scala b/partest/src/main/scala/scala/tools/nsc/MainGenericRunner.scala index 7c9f41153d..3bc82a73b1 100644 --- a/partest/src/main/scala/scala/tools/nsc/MainGenericRunner.scala +++ b/partest/src/main/scala/scala/tools/nsc/MainGenericRunner.scala @@ -139,11 +139,6 @@ class MainGenericRunner { NodeJSEnv.Config().withArgs(List( "--experimental-wasm-exnref", "--experimental-wasm-imported-strings", // for JS string builtins - /* Force using the Turboshaft infrastructure for the optimizing compiler. - * It appears to be more stable for the Wasm that we throw at it. - * See also the use of this flag in Build.scala. - */ - "--turboshaft-wasm" )) } diff --git a/project/Build.scala b/project/Build.scala index cdbef89fdd..571747e67f 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -242,12 +242,6 @@ object MyScalaJSPlugin extends AutoPlugin { "--experimental-wasm-exnref", "--experimental-wasm-imported-strings", // for JS string builtins "--experimental-wasm-jspi", // for JSPI, used by async/await - /* Force using the Turboshaft infrastructure for the optimizing compiler. - * It appears to be more stable for the Wasm that we throw at it. - * If you remove it, try running `scalaTestSuite2_13/test` with Wasm. - * See also the use of this flag in MainGenericRunner.scala. - */ - "--turboshaft-wasm", )) } else { baseConfig