Skip to content

Commit

Permalink
update packages
Browse files Browse the repository at this point in the history
  • Loading branch information
Tim Forkmann committed Nov 20, 2022
1 parent 15f2a98 commit 34b1be9
Show file tree
Hide file tree
Showing 14 changed files with 416 additions and 533 deletions.
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.20",
"version": "4.0.0-theta-018",
"commands": [
"fable"
]
Expand Down
9 changes: 2 additions & 7 deletions Build.fs
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ open Fake.Tools
open Helpers
let execContext = Context.FakeExecutionContext.Create false "build.fsx" [ ]
Context.setExecutionContext (Context.RuntimeContext.Fake execContext)

let sharedPath = Path.getFullName "src/Shared"
let serverPath = Path.getFullName "src/Server"
let clientPath = Path.getFullName "src/Client"
let deployDir = Path.getFullName "deploy"
let sharedTestsPath = Path.getFullName "tests/Shared"
Expand Down Expand Up @@ -56,7 +53,7 @@ let description = """Feliz binding for ReactFlow."""
let authors = [ "Tim Forkmann; Isaac Abraham"]
let owner = "Tim Forkmann"
// Tags for your project (for NuGet package)
let tags = "Feliz binding for ReactFlow"
let tags = "fsharp;fable;ReactFlow;feliz;react;FlowElements"


Target.create "Clean" (fun _ ->
Expand All @@ -81,9 +78,7 @@ Target.create
Target.create "InstallClient" (fun _ -> run npm "install" ".")

Target.create "Run" (fun _ ->
run dotnet "build" sharedPath
[ "server", dotnet "watch run" serverPath
"client", dotnet "fable watch --run webpack-dev-server" clientPath ]
[ "client", dotnet "fable watch --run webpack-dev-server" clientPath ]
|> runParallel

)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dotnet paket add Feliz.ReactFlow
and install the npm package

```
npm install --save react-flow-renderer
npm install --save reactflow
```

or use Femto:
Expand Down
4 changes: 4 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#### 0.2.8 - 2022-11-19
* Add tags for Fable.Packages
#### 0.2.7 - 2022-05-12
* Add Source and Target Handle in Edge
#### 0.2.7 - 2022-05-12
* Add Source and Target Handle in Edge
#### 0.2.6 - 2022-02-23
Expand Down
831 changes: 396 additions & 435 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"file-loader": "^4.2.0",
"html-webpack-plugin": "^3.2.0",
"mini-css-extract-plugin": "^0.10.0",
"react": "^16.10.2",
"react-dom": "^16.10.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"remotedev": "^0.2.9",
"resolve-url-loader": "^3.1.2",
"sass": "^1.26.10",
Expand All @@ -32,6 +32,6 @@
"webpack-dev-server": "^3.8.2"
},
"dependencies": {
"react-flow-renderer": "^9.4.4"
"reactflow": "^11.2.0"
}
}
1 change: 1 addition & 0 deletions paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ nuget Fulma
nuget Feliz.Router
nuget Zanaptak.TypedCssClasses
nuget Feliz.Markdown
nuget Feliz prerelease

nuget Fake.Core.Target
nuget Fake.DotNet.Cli
Expand Down
3 changes: 0 additions & 3 deletions src/Client/Client.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,5 @@
<ItemGroup>
<ProjectReference Include="..\Feliz.ReactFlow\Feliz.ReactFlow.fsproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Shared\Shared.fsproj" />
</ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
</Project>
1 change: 0 additions & 1 deletion src/Client/paket.references
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@ Fable.Elmish.React
Fable.Elmish.Debugger
Fable.FontAwesome.Free
Fable.Remoting.Client
Feliz.Bulma
Fulma
2 changes: 1 addition & 1 deletion src/Feliz.ReactFlow/Feliz.ReactFlow.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</ItemGroup>
<PropertyGroup>
<NpmDependencies>
<NpmPackage Name="react-flow-renderer" Version="gt 9.0.0 lt 9.9.9" ResolutionStrategy="Max" DevDependency="true" />
<NpmPackage Name="reactflow" Version="gt 11.0.0 lt 11.9.9" ResolutionStrategy="Max" DevDependency="true" />
</NpmDependencies>
</PropertyGroup>
<ItemGroup>
Expand Down
14 changes: 7 additions & 7 deletions src/Feliz.ReactFlow/Interop.fs
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ module Interop =
let inline mkMiniMapProp (key: string) (value: obj) : IMiniMapProp = unbox (key, value)
let inline mkControlsProp (key: string) (value: obj) : IControlsProp = unbox (key, value)

let reactFlow : obj = importDefault "react-flow-renderer"
let handle : obj = import "Handle" "react-flow-renderer"
let background : obj = import "Background" "react-flow-renderer"
let miniMap : obj = import "MiniMap" "react-flow-renderer"
let controls : obj = import "Controls" "react-flow-renderer"
let reactFlow : obj = importDefault "reactflow"
let handle : obj = import "Handle" "reactflow"
let background : obj = import "Background" "reactflow"
let miniMap : obj = import "MiniMap" "reactflow"
let controls : obj = import "Controls" "reactflow"

[<Erase; RequireQualifiedAccess>]
module Helpers =
let isEdge : Element -> bool = import "isEdge" "react-flow-renderer"
let isNode : Element -> bool = import "isNode" "react-flow-renderer"
let isEdge : Element -> bool = import "isEdge" "reactflow"
let isNode : Element -> bool = import "isNode" "reactflow"

// TODO
// let removeElements : obj = import "removeElements" "react-flow-renderer"
Expand Down
57 changes: 0 additions & 57 deletions src/Server/Server.fs

This file was deleted.

15 changes: 0 additions & 15 deletions src/Server/Server.fsproj

This file was deleted.

2 changes: 0 additions & 2 deletions src/Server/paket.references

This file was deleted.

0 comments on commit 34b1be9

Please sign in to comment.