Merge pull request scala-js#5128 from sjrd/deprecate-es5.1-support

sjrd · web-flow · commit 9104f7d98569 · 2025-03-04T11:29:50.000+01:00
Deprecate support for ECMAScript 5.1.
diff --git a/linker-interface/shared/src/main/scala/org/scalajs/linker/interface/ESVersion.scala b/linker-interface/shared/src/main/scala/org/scalajs/linker/interface/ESVersion.scala
@@ -30,7 +30,11 @@ final class ESVersion private (val edition: Int, val name: String)
 }
 
 object ESVersion {
-  /** ECMAScrîpt 5.1. */
+  // !!! When we actually remove this, remove the code mentioning it in ClosureLinkerBackend.scala
+  /** ECMAScript 5.1. */
+  @deprecated(
+      "Support for ECMAScript 5.1 is deprecated and will eventually be removed.",
+      since = "1.19.0")
   val ES5_1: ESVersion = new ESVersion(5, "ECMAScript 5.1")
 
   /** ECMAScript 2015 (6th edition). */
diff --git a/linker-interface/shared/src/test/scala/org/scalajs/linker/interface/StandardConfigFingerprintTest.scala b/linker-interface/shared/src/test/scala/org/scalajs/linker/interface/StandardConfigFingerprintTest.scala
@@ -42,7 +42,7 @@ class StandardConfigFingerprintTest {
   @Test
   def noFingerprintCollisionESFeatures(): Unit = {
     val sc1 = StandardConfig().withESFeatures(_.withESVersion(ESVersion.ES2015))
-    val sc2 = StandardConfig().withESFeatures(_.withESVersion(ESVersion.ES5_1))
+    val sc2 = StandardConfig().withESFeatures(_.withESVersion(ESVersion.ES2016))
     assertFingerprintsNotEquals(sc1, sc2)
   }
 
diff --git a/linker/jvm/src/main/scala/org/scalajs/linker/backend/closure/ClosureLinkerBackend.scala b/linker/jvm/src/main/scala/org/scalajs/linker/backend/closure/ClosureLinkerBackend.scala
@@ -78,7 +78,6 @@ final class ClosureLinkerBackend(config: LinkerBackendImpl.Config)
     import ClosureOptions.LanguageMode._
 
     esFeatures.esVersion match {
-      case ESVersion.ES5_1  => ECMASCRIPT5_STRICT
       case ESVersion.ES2015 => ECMASCRIPT_2015
       case ESVersion.ES2016 => ECMASCRIPT_2016
       case ESVersion.ES2017 => ECMASCRIPT_2017
@@ -87,6 +86,10 @@ final class ClosureLinkerBackend(config: LinkerBackendImpl.Config)
       case ESVersion.ES2020 => ECMASCRIPT_2020
       case ESVersion.ES2021 => ECMASCRIPT_2021
 
+      // Test for ESVersion.ES5_1 without triggering the deprecation warning
+      case esVersion if esVersion.edition == 5 =>
+        ECMASCRIPT5_STRICT
+
       case _ =>
         throw new AssertionError(s"Unknown ES version ${esFeatures.esVersion}")
     }
diff --git a/linker/shared/src/test/scala/org/scalajs/linker/AnalyzerTest.scala b/linker/shared/src/test/scala/org/scalajs/linker/AnalyzerTest.scala
@@ -654,6 +654,7 @@ class AnalyzerTest {
     }
   }
 
+  @deprecated("test deprecated features", "forever")
   @Test
   def newTargetWithoutES2015(): AsyncResult = await {
     val classDefs = Seq(

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class StandardConfigFingerprintTest {`
`42`	`42`	`@Test`
`43`	`43`	`def noFingerprintCollisionESFeatures(): Unit = {`
`44`	`44`	`val sc1 = StandardConfig().withESFeatures(_.withESVersion(ESVersion.ES2015))`
`45`		`- val sc2 = StandardConfig().withESFeatures(_.withESVersion(ESVersion.ES5_1))`
	`45`	`+ val sc2 = StandardConfig().withESFeatures(_.withESVersion(ESVersion.ES2016))`
`46`	`46`	`assertFingerprintsNotEquals(sc1, sc2)`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -654,6 +654,7 @@ class AnalyzerTest {`
`654`	`654`	`}`
`655`	`655`	`}`
`656`	`656`
	`657`	`+ @deprecated("test deprecated features", "forever")`
`657`	`658`	`@Test`
`658`	`659`	`def newTargetWithoutES2015(): AsyncResult = await {`
`659`	`660`	`val classDefs = Seq(`