Separate emission expectations by Scala version

Author: japgolly

library/project/Build.scala

@@ -223,12 +223,14 @@ object ScalaJsReact {
       Test / fork := true,
       Test / javaOptions ++= {
         val jsOutputDir = (testEmissionsJS / Compile / fastLinkJS / scalaJSLinkerOutputDirectory).value
+        val scalaVer    = scalaVersion.value
         val tempDir     = (Test / classDirectory).value
         val testResDir  = (Test / resourceDirectory).value
         val testRootDir = (Test / sourceDirectory).value
         Seq(
           s"-DCI=${if (inCI) "1" else "0"}",
           s"-DjsOutputDir=${jsOutputDir.absolutePath}",
+          s"-DscalaVer=$scalaVer",
           s"-DtempDir=${tempDir.absolutePath}",
           s"-DtestResDir=${testResDir.absolutePath}",
           s"-DtestRootDir=${testRootDir.absolutePath}",

library/testEmissions/jvm/src/test/resources/sjr/UseState-out2.js

@@ -0,0 +1,37 @@
+function $c_Lsjr_test_emissions_UseState$() {
+  this.Lsjr_test_emissions_UseState$__f_Component = null;
+  $n_Lsjr_test_emissions_UseState$ = this;
+  $j_sjr_package$.$m_Lsjr_package$();
+  var this$4 = $j_sjr_hooks_HookComponentBuilder$.$m_Lsjr_hooks_HookComponentBuilder$().apply__Lsjr_hooks_HookComponentBuilder$ComponentP$First();
+  var initialState = new $j_AnonFunction0.$c_sjsr_AnonFunction0(() => 123);
+  var step = new $j_sjr_hooks_HookComponentBuilder$ComponentP$FirstStep.$c_Lsjr_hooks_HookComponentBuilder$ComponentP$FirstStep();
+  var this$18 = $j_sjr_hooks_Api$SecondaryWithRender.$as_Lsjr_hooks_Api$SecondaryWithRender($j_sjr_hooks_Api$Primary.$f_Lsjr_hooks_Api$Primary__useState__F0__Lsjr_hooks_Api$AbstractStep__O(this$4, initialState, step));
+  var f = new $j_AnonFunction2.$c_sjsr_AnonFunction2((x$1$2, s$2) => {
+    $j_java_lang_Object.$as_jl_Void(x$1$2);
+    var s = $j_sjr_hooks_Hooks$UseStateF.$as_Lsjr_hooks_Hooks$UseStateF(s$2);
+    var $$x2 = $j_sjr_vdom_HtmlTagOf$.$m_Lsjr_vdom_HtmlTagOf$();
+    $j_sjr_vdom_html_$.$m_Lsjr_vdom_html＿$();
+    $j_sjr_vdom_Exports$.$m_Lsjr_vdom_Exports$();
+    $j_sjr_vdom_html_$.$m_Lsjr_vdom_html＿$();
+    $j_sjr_vdom_VdomNode$.$m_Lsjr_vdom_VdomNode$();
+    var $$x1 = new $j_sjr_vdom_VdomNode$$anon$1.$c_Lsjr_vdom_VdomNode$$anon$1("Count is ");
+    $j_sjr_vdom_html_$.$m_Lsjr_vdom_html＿$();
+    var v = $j_java_lang_Object.$uI(s.Lsjr_hooks_Hooks$UseStateF$$anon$2__f_raw[0]);
+    $j_sjr_vdom_VdomNode$.$m_Lsjr_vdom_VdomNode$();
+    var array = [$$x1, new $j_sjr_vdom_VdomNode$$anon$1.$c_Lsjr_vdom_VdomNode$$anon$1(v), $j_sjr_vdom_html_$.$m_Lsjr_vdom_html＿$().Lsjr_vdom_html＿$__f_$up.Lsjr_vdom_HtmlAttrAndStyles$__f_onClick.$minus$minus$greater__F0__F1__Lsjr_vdom_TagMod(new $j_AnonFunction0.$c_sjsr_AnonFunction0((s$1 => () => {
+      $j_sjr_Reusable$.$m_Lsjr_Reusable$();
+      var r = $j_sjr_hooks_Hooks$UseStateF.$f_Lsjr_hooks_Hooks$UseStateF__modState__Lsjr_Reusable(s$1);
+      return new $j_sjr_callback_CallbackTo.$c_Lsjr_callback_CallbackTo($j_sjr_callback_CallbackTo.$as_Lsjr_callback_CallbackTo($j_scala_Function1.$as_F1(r.value__O()).apply__O__O(new $j_scala_Function1.$c_sjsr_AnonFunction1(x$2$2 => {
+        var x$2 = $j_java_lang_Object.$uI(x$2$2);
+        return 1 + x$2 | 0;
+      }))).Lsjr_callback_CallbackTo__f_japgolly$scalajs$react$callback$CallbackTo$$trampoline);
+    })(s)), $j_sjr_vdom_Attr$EventCallback$.$m_Lsjr_vdom_Attr$EventCallback$().Lsjr_vdom_Attr$EventCallback$__f_defaultSync)];
+    return $$x2.apply$extension__T__sci_Seq__Lsjr_vdom_TagOf("button", new $j_WrappedVarArgs.$c_sjsr_WrappedVarArgs(array));
+  });
+  var this$17 = $j_sjr_hooks_HookComponentBuilder$ComponentP$SubsequentStep$.$m_Lsjr_hooks_HookComponentBuilder$ComponentP$SubsequentStep$();
+  var step$1 = new $j_sjr_hooks_ComponentP_SubsequentSteps$$anon$1.$c_Lsjr_hooks_ComponentP＿SubsequentSteps$$anon$1(this$17);
+  var s$3 = $j_sjr_CtorType$Summoner$.$m_Lsjr_CtorType$Summoner$().summonN__Lsjr_internal_Singleton__Lsjr_CtorType$Summoner($j_sjr_internal_Singleton$.$m_Lsjr_internal_Singleton$().Lsjr_internal_Singleton$__f_BoxUnit);
+  this.Lsjr_test_emissions_UseState$__f_Component = $j_sjr_hooks_Api$SecondaryWithRender.$f_Lsjr_hooks_Api$SecondaryWithRender__render__O__Lsjr_hooks_Api$SubsequentStep__Lsjr_CtorType$Summoner__Lsjr_component_JsBaseComponentTemplate$ComponentWithRoot(this$18, f, step$1, s$3);
+}
+
+export { $c_Lsjr_test_emissions_UseState$ };

library/testEmissions/jvm/src/test/resources/sjr/UseState-out.js renamed to library/testEmissions/jvm/src/test/resources/sjr/UseState-out3.js

@@ -29,7 +29,7 @@ object EmissionTest extends TestSuite {
     val name           = tp.value.last
     val actualFilename = s"${Props.jsOutputDir}/$pkg.$name" + "$.js"
     val tempFilename   = s"${Props.tempDir}/$name.js"
-    val expectFilename = s"${Props.testResDir}/${Props.resSubdirScala}/$name-out.js"
+    val expectFilename = s"${Props.testResDir}/${Props.resSubdirScala}/$name-out${Props.scalaMajorVer}.js"
     var utestOutput    = () : Any
 
     val actual = {

library/testEmissions/jvm/src/test/scala/japgolly/scalajs/react/test/emissions/EmissionTest.scala

@@ -51,7 +51,7 @@ object ReactRefreshTest extends TestSuite {
     val name           = tp.value.last
     val actualFilename = s"${Props.jsOutputDir}/$pkg.$name" + "$.js"
     val tempFilename   = s"${Props.tempDir}/$name.js"
-    val expectFilename = s"${Props.testResDir}/${Props.resSubdirScalaRR}/$name-out.js"
+    val expectFilename = s"${Props.testResDir}/${Props.resSubdirScalaRR}/$name-out${Props.scalaMajorVer}.js"
     var utestOutput    = () : Any
 
     Babel.normaliseToFile(actualFilename, tempFilename)

library/testEmissions/jvm/src/test/scala/japgolly/scalajs/react/test/emissions/ReactRefreshTest.scala

@@ -10,10 +10,13 @@ object Props {
 
   val CI          = Prop.get("CI").contains("1")
   val jsOutputDir = Prop.need("jsOutputDir")
+  val scalaVer    = Prop.need("scalaVer")
   val tempDir     = Prop.need("tempDir")
   val testResDir  = Prop.need("testResDir")
   val testRootDir = Prop.need("testRootDir")
 
+  val scalaMajorVer = scalaVer.takeWhile(_.isDigit).toInt
+
   // -------------------------------------------------------------------------------------------------------------------
 
   private object Prop {