From 01f6de94c4098ba4e443d27119da5f797e73fa8c Mon Sep 17 00:00:00 2001 From: Martin Bryant Date: Wed, 3 Jan 2024 15:00:10 +0000 Subject: [PATCH 1/8] upgrade Feliz related packages/remove Fable.React --- demo/package-lock.json | 14 +++++++------- demo/package.json | 2 +- demo/src/Demo.fsproj | 6 +++--- paket.dependencies | 3 +-- paket.lock | 24 +++++++++++++++--------- 5 files changed, 27 insertions(+), 22 deletions(-) diff --git a/demo/package-lock.json b/demo/package-lock.json index 4fc3c81..5182cbf 100644 --- a/demo/package-lock.json +++ b/demo/package-lock.json @@ -7,7 +7,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", @@ -2688,9 +2688,9 @@ "dev": true }, "node_modules/bulma": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.9.1.tgz", - "integrity": "sha512-LSF69OumXg2HSKl2+rN0/OEXJy7WFEb681wtBlNS/ulJYR27J3rORHibdXZ6GVb/vyUzzYK/Arjyh56wjbFedA==" + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.9.4.tgz", + "integrity": "sha512-86FlT5+1GrsgKbPLRRY7cGDg8fsJiP/jzTqXXVqiUZZ2aZT8uemEOHlU1CDU+TxklPEZ11HZNNWclRBBecP4CQ==" }, "node_modules/bytes": { "version": "3.0.0", @@ -14369,9 +14369,9 @@ "dev": true }, "bulma": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.9.1.tgz", - "integrity": "sha512-LSF69OumXg2HSKl2+rN0/OEXJy7WFEb681wtBlNS/ulJYR27J3rORHibdXZ6GVb/vyUzzYK/Arjyh56wjbFedA==" + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.9.4.tgz", + "integrity": "sha512-86FlT5+1GrsgKbPLRRY7cGDg8fsJiP/jzTqXXVqiUZZ2aZT8uemEOHlU1CDU+TxklPEZ11HZNNWclRBBecP4CQ==" }, "bytes": { "version": "3.0.0", diff --git a/demo/package.json b/demo/package.json index 9ea4440..cd2b008 100644 --- 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 index 1ec3bb8..b95a1c2 100644 --- a/demo/src/Demo.fsproj +++ b/demo/src/Demo.fsproj @@ -13,9 +13,9 @@ - - - + + + diff --git a/paket.dependencies b/paket.dependencies index 96d0f4d..0bc839b 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -12,8 +12,7 @@ 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 diff --git a/paket.lock b/paket.lock index 319ff3c..f42f1b0 100644 --- 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) @@ -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) From cf84f1a39fe5faca798cb2a8ac8ec0a28e1e029c Mon Sep 17 00:00:00 2001 From: Martin Bryant Date: Wed, 3 Jan 2024 15:00:44 +0000 Subject: [PATCH 2/8] update root of app to use create root/React 18 style --- demo/src/Main.fs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/demo/src/Main.fs b/demo/src/Main.fs index a72f8ed..2d17f0d 100644 --- 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() ) \ No newline at end of file From 1a1492564e31370bcadd457322f3534aa294654c Mon Sep 17 00:00:00 2001 From: Joost Date: Thu, 4 Jan 2024 16:33:39 +0000 Subject: [PATCH 3/8] Upgrade to fable 4 --- .config/dotnet-tools.json | 2 +- demo/.config/dotnet-tools.json | 2 +- demo/.gitignore | 2 +- demo/src/Demo.fsproj | 4 ++-- paket.dependencies | 4 ++-- paket.lock | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 9436e35..8e01b65 100644 --- 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/demo/.config/dotnet-tools.json b/demo/.config/dotnet-tools.json index 40d9ad5..2a60168 100644 --- 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 index 2952c1e..96d896c 100644 --- 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/src/Demo.fsproj b/demo/src/Demo.fsproj index b95a1c2..0c7eaf6 100644 --- a/demo/src/Demo.fsproj +++ b/demo/src/Demo.fsproj @@ -17,6 +17,6 @@ - + - + \ No newline at end of file diff --git a/paket.dependencies b/paket.dependencies index 0bc839b..397de23 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -5,7 +5,7 @@ storage: none nuget Fable.Remoting.Giraffe prerelease nuget Saturn prerelease nuget Expecto -nuget Fable.Core +nuget Fable.Core ~ 4 nuget Fable.Elmish nuget Fable.Elmish.React nuget Fable.Elmish.Debugger @@ -20,4 +20,4 @@ nuget Fulma nuget Fake.Core.Target nuget Fake.IO.FileSystem -nuget Farmer +nuget Farmer \ No newline at end of file diff --git a/paket.lock b/paket.lock index f42f1b0..8ee1490 100644 --- a/paket.lock +++ b/paket.lock @@ -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) From eae233e483576ebfa1d5342d3a4fa9cb9b4ba251 Mon Sep 17 00:00:00 2001 From: Joost Date: Thu, 4 Jan 2024 16:36:58 +0000 Subject: [PATCH 4/8] v. 0.0.8 --- src/Feliz.AgGrid.fsproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Feliz.AgGrid.fsproj b/src/Feliz.AgGrid.fsproj index bcc02fe..5a9566c 100644 --- a/src/Feliz.AgGrid.fsproj +++ b/src/Feliz.AgGrid.fsproj @@ -5,7 +5,7 @@ net6.0 true Compositional IT - 0.0.7 + 0.0.8 https://github.com/CompositionalIT/feliz-ag-grid https://github.com/CompositionalIT/feliz-ag-grid @@ -36,4 +36,4 @@ - + \ No newline at end of file From a2f7f57c0c9d76572905b427e29ebb028b47c86a Mon Sep 17 00:00:00 2001 From: Joost Date: Thu, 4 Jan 2024 16:50:34 +0000 Subject: [PATCH 5/8] remove broken pin --- paket.dependencies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paket.dependencies b/paket.dependencies index 397de23..107359d 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -5,7 +5,7 @@ storage: none nuget Fable.Remoting.Giraffe prerelease nuget Saturn prerelease nuget Expecto -nuget Fable.Core ~ 4 +nuget Fable.Core nuget Fable.Elmish nuget Fable.Elmish.React nuget Fable.Elmish.Debugger From a370751e60edf4b975dff1861c7e1f49553e2ac9 Mon Sep 17 00:00:00 2001 From: Martin Bryant Date: Fri, 5 Jan 2024 10:56:39 +0000 Subject: [PATCH 6/8] update package to v1 --- src/Feliz.AgGrid.fsproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Feliz.AgGrid.fsproj b/src/Feliz.AgGrid.fsproj index 5a9566c..fd53b33 100644 --- a/src/Feliz.AgGrid.fsproj +++ b/src/Feliz.AgGrid.fsproj @@ -5,7 +5,7 @@ net6.0 true Compositional IT - 0.0.8 + 1.0.0 https://github.com/CompositionalIT/feliz-ag-grid https://github.com/CompositionalIT/feliz-ag-grid From 6853d63900814d04a7a3ef425d6bbbd0d72e15fe Mon Sep 17 00:00:00 2001 From: Martin Bryant Date: Fri, 5 Jan 2024 10:58:28 +0000 Subject: [PATCH 7/8] include version compatibility in readme --- README.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 85b4a45..9d96a4b 100644 --- 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. From 502ba034ab9aa225d5e282d6a2c8625d9dc24c56 Mon Sep 17 00:00:00 2001 From: Martin Bryant Date: Fri, 5 Jan 2024 11:03:04 +0000 Subject: [PATCH 8/8] correctly format readme table --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9d96a4b..c3e1bf0 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Feliz-style bindings for [ag-grid-react](https://www.npmjs.com/package/ag-grid-r ### 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 |