Merge pull request #20 from martinbryant/update-feliz

Update feliz
CompositionalIT · Jan 5, 2024 · d2d8839 · d2d8839
2 parents 99821e8 + 502ba03
commit d2d8839
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 35 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -9,7 +9,7 @@
       ]
     },
     "fable": {
-      "version": "3.7.16",
+      "version": "4.9.0",
       "commands": [
         "fable"
       ]

diff --git a/README.md b/README.md
@@ -2,7 +2,16 @@
 
 Feliz-style bindings for [ag-grid-react](https://www.npmjs.com/package/ag-grid-react)
 
-## Installation 
+## Version Compatibility
+
+### The table below gives the ranges of compatible versions of Feliz AgGrid with its dependent packages.
+
+| Feliz.AgGrid  | ag-grid-react/community | React | Fable | Feliz |
+|-              |-                        |-      |-      |-      |
+| 0.0.6         | 25.x                    | 17.x  | 3.x   | 1.x   |
+| 1.x           | 31.x                    | 18.x  | 4.x   | 2.x   |
+
+## Installation
 
 Run `femto install Feliz.AgGrid` from inside your project directory.
 

diff --git a/demo/.config/dotnet-tools.json b/demo/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "fable": {
-      "version": "3.1.11",
+      "version": "4.9.0",
       "commands": [
         "fable"
       ]

diff --git a/demo/.gitignore b/demo/.gitignore
@@ -199,7 +199,7 @@ deploy/
 obj
 bin
 out
-.fable
+fable_modules
 .vs
 .ionide
 *.fs.js

diff --git a/demo/package-lock.json b/demo/package-lock.json
diff --git a/demo/package.json b/demo/package.json
@@ -10,7 +10,7 @@
     "dependencies": {
         "ag-grid-community": "^31.0.1",
         "ag-grid-react": "^31.0.1",
-        "bulma": "^0.9.1",
+        "bulma": "^0.9.4",
         "date-fns": "^2.16.1",
         "gh-pages": "^3.1.0",
         "react": "^18.2.0",

diff --git a/demo/src/Demo.fsproj b/demo/src/Demo.fsproj
@@ -13,10 +13,10 @@
         <ProjectReference Include="..\..\src\Feliz.AgGrid.fsproj" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Feliz" Version="1.65.0" />
-        <PackageReference Include="Feliz.Bulma" Version="2.18.0" />
-        <PackageReference Include="Feliz.Router" Version="3.8.0" />
+        <PackageReference Include="Feliz" Version="2.7.0" />
+        <PackageReference Include="Feliz.Bulma" Version="3.0.0" />
+        <PackageReference Include="Feliz.Router" Version="4.0.0" />
         <PackageReference Include="Fable.DateFunctions" Version="3.7.0" />
-        <PackageReference Include="Thoth.Fetch" Version="2.0.0" />
+        <PackageReference Include="Thoth.Fetch" Version="3.0.0" />
     </ItemGroup>
-</Project>
+</Project>
diff --git a/demo/src/Main.fs b/demo/src/Main.fs
@@ -6,7 +6,8 @@ open Fable.Core.JsInterop
 
 importSideEffects "./styles/global.scss"
 
-ReactDOM.render(
-    App.Documentation(),
-    document.getElementById "feliz-app"
+let root = ReactDOM.createRoot(document.getElementById "feliz-app")
+
+root.render(
+    App.Documentation()
 )
diff --git a/paket.dependencies b/paket.dependencies
@@ -12,13 +12,12 @@ nuget Fable.Elmish.Debugger
 nuget Fable.Elmish.HMR
 nuget Fable.FontAwesome.Free
 nuget Fable.Mocha
-// Fable.React 8 requires React 18; this lib is only tested on React 17.
-nuget Fable.React ~> 7
+
 nuget Fable.Remoting.Client
 nuget Feliz
 nuget Feliz.Bulma
 nuget Fulma
 
 nuget Fake.Core.Target
 nuget Fake.IO.FileSystem
-nuget Farmer
+nuget Farmer
diff --git a/paket.lock b/paket.lock
@@ -5,7 +5,7 @@ NUGET
     Expecto (9.0.4)
       FSharp.Core (>= 4.6)
       Mono.Cecil (>= 0.11.3)
-    Fable.AST (3.0)
+    Fable.AST (4.3)
     Fable.Browser.Blob (1.2)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.7.2)
@@ -31,7 +31,7 @@ NUGET
       Fable.Browser.Event (>= 1.2.1)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.7)
-    Fable.Core (3.7.1)
+    Fable.Core (4.2)
     Fable.Elmish (3.1)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.6.2)
@@ -72,6 +72,13 @@ NUGET
       Fable.Browser.Dom (>= 2.4.4)
       Fable.Core (>= 3.2.7)
       FSharp.Core (>= 4.7.2)
+    Fable.React.Types (18.3)
+      Fable.Browser.Dom (>= 2.4.4)
+      Fable.Core (>= 3.2.7)
+      FSharp.Core (>= 4.7.2)
+    Fable.ReactDom.Types (18.2)
+      Fable.React.Types (>= 18.3)
+      FSharp.Core (>= 4.7.2)
     Fable.Remoting.Client (7.19)
       Fable.Browser.XMLHttpRequest (>= 1.0)
       Fable.Core (>= 3.1.5)
@@ -137,16 +144,15 @@ NUGET
     Farmer (1.7.5)
       FSharp.Core (>= 5.0)
       System.Text.Json (>= 5.0)
-    Feliz (1.65)
-      Fable.Core (>= 3.1.5)
-      Fable.React (>= 7.4)
-      Feliz.CompilerPlugins (>= 1.10)
+    Feliz (2.7)
+      Fable.ReactDom.Types (>= 18.2)
+      Feliz.CompilerPlugins (>= 2.2)
       FSharp.Core (>= 4.7.2)
-    Feliz.Bulma (2.18)
-      Feliz (>= 1.32)
+    Feliz.Bulma (3.0)
+      Feliz (>= 2.4)
       FSharp.Core (>= 4.7.2)
-    Feliz.CompilerPlugins (1.10)
-      Fable.AST (>= 3.0)
+    Feliz.CompilerPlugins (2.2)
+      Fable.AST (>= 4.2.1)
       FSharp.Core (>= 4.7.2)
     FParsec (1.1.1)
       FSharp.Core (>= 4.3.4)

diff --git a/src/Feliz.AgGrid.fsproj b/src/Feliz.AgGrid.fsproj
@@ -5,7 +5,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Compositional IT</Authors>
-    <Version>0.0.7</Version>
+    <Version>1.0.0</Version>
     <PackageProjectUrl>https://github.com/CompositionalIT/feliz-ag-grid</PackageProjectUrl>
     <RepositoryUrl>https://github.com/CompositionalIT/feliz-ag-grid</RepositoryUrl>
   </PropertyGroup>
@@ -36,4 +36,4 @@
     <Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
   </ItemGroup>
   <Import Project="..\.paket\Paket.Restore.targets" />
-</Project>
+</Project>
-Original file line number
+Diff line change
@@ Expand Up / @@ -199,7 +199,7 @@ deploy/ @@
     obj
     bin
     out
-    .fable
+    fable_modules
     .vs
     .ionide
     *.fs.js
@@ Expand Down @@