Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update feliz #20

Merged
merged 8 commits into from
Jan 5, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
]
},
"fable": {
"version": "3.7.16",
"version": "4.9.0",
"commands": [
"fable"
]
Expand Down
2 changes: 1 addition & 1 deletion demo/.config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"fable": {
"version": "3.1.11",
"version": "4.9.0",
"commands": [
"fable"
]
Expand Down
2 changes: 1 addition & 1 deletion demo/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ deploy/
obj
bin
out
.fable
fable_modules
.vs
.ionide
*.fs.js
Expand Down
14 changes: 7 additions & 7 deletions demo/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions demo/src/Demo.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
7 changes: 4 additions & 3 deletions demo/src/Main.fs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
)
5 changes: 2 additions & 3 deletions paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -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
26 changes: 16 additions & 10 deletions paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/Feliz.AgGrid.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<TargetFramework>net6.0</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>Compositional IT</Authors>
<Version>0.0.7</Version>
<Version>0.0.8</Version>
<PackageProjectUrl>https://github.com/CompositionalIT/feliz-ag-grid</PackageProjectUrl>
<RepositoryUrl>https://github.com/CompositionalIT/feliz-ag-grid</RepositoryUrl>
</PropertyGroup>
Expand Down Expand Up @@ -36,4 +36,4 @@
<Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
</ItemGroup>
<Import Project="..\.paket\Paket.Restore.targets" />
</Project>
</Project>
Loading