Remove support for React 17 (#99)

* Remove support for React 17

Author: kerams

.github/workflows/ci.yml

@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Setup .NET
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: '9.0.x'
     - name: Build
       run: ./build.fsx

appveyor.yml

@@ -1,8 +1,5 @@
 image: Visual Studio 2022
 
-install:
-  - ps: Install-Product node 17 x64
-
 build_script:
   - cmd: dotnet fsi build.fsx
 

build.fsx

@@ -5,7 +5,7 @@
 #r "nuget: Fake.Core.Target"
 #r "nuget: Fake.Core.ReleaseNotes"
 #r "nuget: Fake.Tools.Git"
-
+#r "nuget: MSBuild.StructuredLogger, 2.2.441"
 
 open Fake.Core
 open Fake.Core.TargetOperators

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.100",
+    "version": "9.0.100",
     "rollForward": "latestMinor"
   }
 }

src/react.fs

@@ -19,76 +19,46 @@ module Program =
         open Browser
         open Elmish
 
-        // Use the new rendering API in React 18+
-        let useRootApi = try int ReactBindings.React.version.[ .. 1 ] >= 18 with _ -> false
-
         let withReactBatchedUsing lazyView2With placeholderId (program:Program<_,_,_,_>) =
             let setState =
                 let mutable lastRequest = None
+                let root = ReactDomClient.createRoot (document.getElementById placeholderId)
 
-                if useRootApi then
-                    let root = ReactDomClient.createRoot (document.getElementById placeholderId)
-
-                    fun model dispatch ->
-                        match lastRequest with
-                        | Some r -> window.cancelAnimationFrame r
-                        | _ -> ()
-
-                        lastRequest <- Some (window.requestAnimationFrame (fun _ ->
-                            root.render (lazyView2With (fun x y -> obj.ReferenceEquals(x,y)) (Program.view program) model dispatch)))
-                else
-                    fun model dispatch ->
-                        match lastRequest with
-                        | Some r -> window.cancelAnimationFrame r
-                        | _ -> ()
+                fun model dispatch ->
+                    match lastRequest with
+                    | Some r -> window.cancelAnimationFrame r
+                    | _ -> ()
 
-                        lastRequest <- Some (window.requestAnimationFrame (fun _ ->
-                            ReactDom.render(
-                                lazyView2With (fun x y -> obj.ReferenceEquals(x,y)) (Program.view program) model dispatch,
-                                document.getElementById placeholderId
-                            )))
+                    lastRequest <- Some (window.requestAnimationFrame (fun _ ->
+                        root.render (lazyView2With (fun x y -> obj.ReferenceEquals(x,y)) (Program.view program) model dispatch)))
 
             program
             |> Program.withSetState setState
 
         let withReactSynchronousUsing lazyView2With placeholderId (program:Elmish.Program<_,_,_,_>) =
             let setState =
-                if useRootApi then
-                    let root = ReactDomClient.createRoot (document.getElementById placeholderId)
+                let root = ReactDomClient.createRoot (document.getElementById placeholderId)
 
-                    fun model dispatch ->
-                        root.render (lazyView2With (fun x y -> obj.ReferenceEquals(x,y)) (Program.view program) model dispatch)
-                else
-                    fun model dispatch ->
-                        ReactDom.render(
-                            lazyView2With (fun x y -> obj.ReferenceEquals(x,y)) (Program.view program) model dispatch,
-                            document.getElementById placeholderId
-                        )
+                fun model dispatch ->
+                    root.render (lazyView2With (fun x y -> obj.ReferenceEquals(x,y)) (Program.view program) model dispatch)
 
             program
             |> Program.withSetState setState
 
         let withReactHydrateUsing lazyView2With placeholderId (program:Elmish.Program<_,_,_,_>) =
             let setState =
-                if useRootApi then
-                    let mutable root = None
-
-                    fun model dispatch ->
-                        match root with
-                        | None ->
-                            root <-
-                                ReactDomClient.hydrateRoot (
-                                    document.getElementById placeholderId,
-                                    lazyView2With (fun x y -> obj.ReferenceEquals(x,y)) (Program.view program) model dispatch
-                                ) |> Some
-                        | Some root ->
-                            root.render (lazyView2With (fun x y -> obj.ReferenceEquals(x,y)) (Program.view program) model dispatch)
-                else
-                    fun model dispatch ->
-                        ReactDom.hydrate(
-                            lazyView2With (fun x y -> obj.ReferenceEquals(x,y)) (Program.view program) model dispatch,
-                            document.getElementById placeholderId
-                        )
+                let mutable root = None
+
+                fun model dispatch ->
+                    match root with
+                    | None ->
+                        root <-
+                            ReactDomClient.hydrateRoot (
+                                document.getElementById placeholderId,
+                                lazyView2With (fun x y -> obj.ReferenceEquals(x,y)) (Program.view program) model dispatch
+                            ) |> Some
+                    | Some root ->
+                        root.render (lazyView2With (fun x y -> obj.ReferenceEquals(x,y)) (Program.view program) model dispatch)
 
             program
             |> Program.withSetState setState