Update to .NET 8 and rmv ISADotNet

nfdi4plants · Dec 5, 2023 · e2b32af · e2b32af
1 parent 9e266e9
commit e2b32af
Show file tree

Hide file tree

Showing 50 changed files with 2,634 additions and 2,156 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,13 +3,13 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "7.2.1",
+      "version": "8.0.0",
       "commands": [
         "paket"
       ]
     },
     "fable": {
-      "version": "4.1.4",
+      "version": "4.6.0",
       "commands": [
         "fable"
       ]
@@ -19,6 +19,12 @@
       "commands": [
         "femto"
       ]
+    },
+    "fantomas": {
+      "version": "6.2.3",
+      "commands": [
+        "fantomas"
+      ]
     }
   }
 }
diff --git a/.editorconfig b/.editorconfig
@@ -1,12 +1 @@
-root = true
-
-[*]
-indent_style = space
-indent_size = 4
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = false
-
-[src/Client/*.fs]
-# Feliz style
-fsharp_single_argument_web_mode=true
+
diff --git a/build/Build.fs b/build/Build.fs
@@ -231,7 +231,7 @@ Target.create "bundle" (fun _ ->
 Target.create "Run" (fun _ ->
     run dotnet [ "build" ] sharedPath
     [ "server", dotnet [ "watch"; "run" ] serverPath
-      "client", dotnet [ "fable"; "watch"; "-o"; "output"; "-s"; "--run"; "npx"; "vite" ] clientPath
+      "client", dotnet [ "fable"; "watch"; "-o"; "output"; "-s"; "-e"; "fs.js"; "--run"; "npx"; "vite" ] clientPath
       "database", dockerCompose ["-f"; dockerComposePath; "up"] __SOURCE_DIRECTORY__
     ] |> runParallel
 )

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.0",
+    "version": "8.0.0",
     "rollForward": "latestMinor"
   }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,30 +4,31 @@
     ],
     "private": true,
     "engines": {
-        "node": "~16 || ~18",
-        "npm": ">8"
+        "node": "~18 || ~20",
+        "npm": "~9 || ~10"
     },
     "scripts": {},
     "devDependencies": {
-        "@types/node": "^20.4.9",
-        "@vitejs/plugin-basic-ssl": "^1.0.1",
-        "@vitejs/plugin-react": "^4.0.4",
-        "autoprefixer": "^10.4.14",
-        "core-js": "^3.32.0",
-        "postcss": "^8.4.27",
-        "remotedev": "^0.2.7",
-        "sass": "^1.64.2",
-        "selfsigned": "^2.1.1",
-        "vite": "^4.4.9"
+        "@types/node": "^20.10.3",
+        "@vitejs/plugin-basic-ssl": "^1.0.2",
+        "@vitejs/plugin-react": "^4.2.1",
+        "autoprefixer": "^10.4.16",
+        "core-js": "^3.33.3",
+        "postcss": "^8.4.32",
+        "remotedev": "^0.2.9",
+        "sass": "^1.69.5",
+        "selfsigned": "^2.4.1",
+        "tailwindcss": "^3.3.6",
+        "vite": "^5.0.5"
     },
     "dependencies": {
         "@creativebulma/bulma-tooltip": "^1.2.0",
         "@nfdi4plants/exceljs": "^0.3.0",
         "bulma": "^0.9.4",
-        "bulma-checkradio": "^1.1.1",
+        "bulma-checkradio": "^2.1.3",
         "bulma-slider": "^2.0.5",
         "bulma-switch": "^2.0.4",
-        "cytoscape": "^3.26.0",
+        "cytoscape": "^3.27.0",
         "human-readable-ids": "^1.0.4",
         "jsonschema": "^1.4.1",
         "react": "^18.2.0",

diff --git a/paket.dependencies b/paket.dependencies
@@ -1,18 +1,18 @@
 source https://api.nuget.org/v3/index.json
-framework: net6.0
+framework: net8.0
 storage: none
 
-nuget ARCtrl 1.0.0-beta.2
+nuget ARCtrl 1.0.0-beta.9
 nuget Feliz.Bulma.Checkradio
 nuget Feliz.Bulma.Switch
-nuget Fsharp.Core
+nuget Fsharp.Core ~> 8
 nuget Fable.Remoting.Giraffe ~> 5
-nuget FsSpreadsheet.Exceljs
+nuget FsSpreadsheet.Exceljs ~> 5.0.2
 nuget Saturn ~> 0
 
-nuget Fable.Core
+nuget Fable.Core ~> 4
 nuget Fable.Elmish ~> 4
-nuget Fable.Elmish.React
+nuget Fable.Elmish.React ~> 4
 nuget Fable.Elmish.Debugger ~> 4
 nuget Fable.Elmish.HMR ~> 7
 nuget Fable.Remoting.Client ~> 7

diff --git a/paket.lock b/paket.lock
@@ -1,38 +1,38 @@
 STORAGE: NONE
-RESTRICTION: == net6.0
+RESTRICTION: == net8.0
 NUGET
   remote: https://api.nuget.org/v3/index.json
-    ARCtrl (1.0.0-beta.2)
-      ARCtrl.Contract (>= 1.0.0-beta.2)
-      ARCtrl.CWL (>= 1.0.0-beta.2)
-      ARCtrl.FileSystem (>= 1.0.0-beta.2)
-      ARCtrl.ISA (>= 1.0.0-beta.2)
-      ARCtrl.ISA.Json (>= 1.0.0-beta.2)
-      ARCtrl.ISA.Spreadsheet (>= 1.0.0-beta.2)
+    ARCtrl (1.0.0-beta.9)
+      ARCtrl.Contract (>= 1.0.0-beta.9)
+      ARCtrl.CWL (>= 1.0.0-beta.9)
+      ARCtrl.FileSystem (>= 1.0.0-beta.9)
+      ARCtrl.ISA (>= 1.0.0-beta.9)
+      ARCtrl.ISA.Json (>= 1.0.0-beta.9)
+      ARCtrl.ISA.Spreadsheet (>= 1.0.0-beta.9)
       Fable.Fetch (>= 2.6)
       Fable.SimpleHttp (>= 3.5)
-      FSharp.Core (>= 6.0.7)
-    ARCtrl.Contract (1.0.0-beta.2)
-      ARCtrl.ISA (>= 1.0.0-beta.2)
-      FSharp.Core (>= 6.0.7)
-    ARCtrl.CWL (1.0.0-beta.2)
-      FSharp.Core (>= 6.0.7)
-    ARCtrl.FileSystem (1.0.0-beta.2)
+      FSharp.Core (>= 6.0.6)
+    ARCtrl.Contract (1.0.0-beta.9)
+      ARCtrl.ISA (>= 1.0.0-beta.9)
+      FSharp.Core (>= 6.0.6)
+    ARCtrl.CWL (1.0.0-beta.9)
+      FSharp.Core (>= 6.0.6)
+    ARCtrl.FileSystem (1.0.0-beta.9)
       Fable.Core (>= 4.2)
-      FSharp.Core (>= 6.0.7)
-    ARCtrl.ISA (1.0.0-beta.2)
-      ARCtrl.FileSystem (>= 1.0.0-beta.2)
-      FSharp.Core (>= 6.0.7)
-    ARCtrl.ISA.Json (1.0.0-beta.2)
-      ARCtrl.ISA (>= 1.0.0-beta.2)
-      FSharp.Core (>= 6.0.7)
+      FSharp.Core (>= 6.0.6)
+    ARCtrl.ISA (1.0.0-beta.9)
+      ARCtrl.FileSystem (>= 1.0.0-beta.9)
+      FSharp.Core (>= 6.0.6)
+    ARCtrl.ISA.Json (1.0.0-beta.9)
+      ARCtrl.ISA (>= 1.0.0-beta.9)
+      FSharp.Core (>= 6.0.6)
       NJsonSchema (>= 10.8)
       Thoth.Json (>= 10.1)
       Thoth.Json.Net (>= 11.0)
-    ARCtrl.ISA.Spreadsheet (1.0.0-beta.2)
-      ARCtrl.FileSystem (>= 1.0.0-beta.2)
-      ARCtrl.ISA (>= 1.0.0-beta.2)
-      FSharp.Core (>= 6.0.7)
+    ARCtrl.ISA.Spreadsheet (1.0.0-beta.9)
+      ARCtrl.FileSystem (>= 1.0.0-beta.9)
+      ARCtrl.ISA (>= 1.0.0-beta.9)
+      FSharp.Core (>= 6.0.6)
       FsSpreadsheet (>= 5.0.1)
     ExcelJS.Fable (0.3)
       Fable.Core (>= 3.2.8)
@@ -45,7 +45,7 @@ NUGET
     Fable.Browser.Blob (1.3)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.7.2)
-    Fable.Browser.Dom (2.14)
+    Fable.Browser.Dom (2.15)
       Fable.Browser.Blob (>= 1.3)
       Fable.Browser.Event (>= 1.5)
       Fable.Browser.WebStorage (>= 1.2)
@@ -145,7 +145,7 @@ NUGET
       Fable.Remoting.MsgPack (>= 1.21)
       FSharp.Core (>= 6.0)
       Microsoft.IO.RecyclableMemoryStream (>= 2.2)
-    Fable.SimpleHttp (3.5)
+    Fable.SimpleHttp (3.6)
       Fable.Browser.Dom (>= 1.0)
       Fable.Browser.XMLHttpRequest (>= 1.1)
       Fable.Core (>= 3.0)
@@ -179,21 +179,21 @@ NUGET
     Feliz.ElmishComponents (1.2)
       Feliz.UseElmish (>= 1.2.1)
       FSharp.Core (>= 4.7)
-    Feliz.UseElmish (2.4)
+    Feliz.UseElmish (2.5)
       Fable.Elmish (>= 4.0)
       FSharp.Core (>= 4.7.2)
     FSharp.Control.Websockets (0.2.3)
       FSharp.Core (>= 6.0)
       Microsoft.IO.RecyclableMemoryStream (>= 2.2.1)
-    FSharp.Core (7.0.401)
-    FsSpreadsheet (5.0.1)
+    FSharp.Core (8.0.100)
+    FsSpreadsheet (5.0.2)
       Fable.Core (>= 4.0)
-      FSharp.Core (>= 6.0.6)
-    FsSpreadsheet.Exceljs (5.0.1)
+      FSharp.Core (>= 6.0.7)
+    FsSpreadsheet.Exceljs (5.0.2)
       Fable.Exceljs (>= 1.6)
       Fable.Promise (>= 3.2)
-      FSharp.Core (>= 6.0.6)
-      FsSpreadsheet (>= 5.0.1)
+      FSharp.Core (>= 6.0.7)
+      FsSpreadsheet (>= 5.0.2)
     Giraffe (6.2)
       FSharp.Core (>= 6.0)
       Giraffe.ViewEngine (>= 1.4)
@@ -202,41 +202,40 @@ NUGET
       System.Text.Json (>= 7.0.3)
     Giraffe.ViewEngine (1.4)
       FSharp.Core (>= 5.0)
-    Microsoft.AspNetCore.Authentication.JwtBearer (6.0.24)
+    Microsoft.AspNetCore.Authentication.JwtBearer (6.0.25)
       Microsoft.IdentityModel.Protocols.OpenIdConnect (>= 6.10)
-    Microsoft.Bcl.AsyncInterfaces (7.0)
+    Microsoft.Bcl.AsyncInterfaces (8.0)
     Microsoft.CSharp (4.7)
-    Microsoft.Extensions.Configuration (7.0)
-      Microsoft.Extensions.Configuration.Abstractions (>= 7.0)
-      Microsoft.Extensions.Primitives (>= 7.0)
-    Microsoft.Extensions.Configuration.Abstractions (7.0)
-      Microsoft.Extensions.Primitives (>= 7.0)
-    Microsoft.Extensions.Configuration.FileExtensions (7.0)
-      Microsoft.Extensions.Configuration (>= 7.0)
-      Microsoft.Extensions.Configuration.Abstractions (>= 7.0)
-      Microsoft.Extensions.FileProviders.Abstractions (>= 7.0)
-      Microsoft.Extensions.FileProviders.Physical (>= 7.0)
-      Microsoft.Extensions.Primitives (>= 7.0)
-    Microsoft.Extensions.Configuration.Json (7.0)
-      Microsoft.Extensions.Configuration (>= 7.0)
-      Microsoft.Extensions.Configuration.Abstractions (>= 7.0)
-      Microsoft.Extensions.Configuration.FileExtensions (>= 7.0)
-      Microsoft.Extensions.FileProviders.Abstractions (>= 7.0)
-      System.Text.Json (>= 7.0)
-    Microsoft.Extensions.Configuration.UserSecrets (7.0)
-      Microsoft.Extensions.Configuration.Abstractions (>= 7.0)
-      Microsoft.Extensions.Configuration.Json (>= 7.0)
-      Microsoft.Extensions.FileProviders.Abstractions (>= 7.0)
-      Microsoft.Extensions.FileProviders.Physical (>= 7.0)
-    Microsoft.Extensions.FileProviders.Abstractions (7.0)
-      Microsoft.Extensions.Primitives (>= 7.0)
-    Microsoft.Extensions.FileProviders.Physical (7.0)
-      Microsoft.Extensions.FileProviders.Abstractions (>= 7.0)
-      Microsoft.Extensions.FileSystemGlobbing (>= 7.0)
-      Microsoft.Extensions.Primitives (>= 7.0)
-    Microsoft.Extensions.FileSystemGlobbing (7.0)
-    Microsoft.Extensions.Primitives (7.0)
-      System.Runtime.CompilerServices.Unsafe (>= 6.0)
+    Microsoft.Extensions.Configuration (8.0)
+      Microsoft.Extensions.Configuration.Abstractions (>= 8.0)
+      Microsoft.Extensions.Primitives (>= 8.0)
+    Microsoft.Extensions.Configuration.Abstractions (8.0)
+      Microsoft.Extensions.Primitives (>= 8.0)
+    Microsoft.Extensions.Configuration.FileExtensions (8.0)
+      Microsoft.Extensions.Configuration (>= 8.0)
+      Microsoft.Extensions.Configuration.Abstractions (>= 8.0)
+      Microsoft.Extensions.FileProviders.Abstractions (>= 8.0)
+      Microsoft.Extensions.FileProviders.Physical (>= 8.0)
+      Microsoft.Extensions.Primitives (>= 8.0)
+    Microsoft.Extensions.Configuration.Json (8.0)
+      Microsoft.Extensions.Configuration (>= 8.0)
+      Microsoft.Extensions.Configuration.Abstractions (>= 8.0)
+      Microsoft.Extensions.Configuration.FileExtensions (>= 8.0)
+      Microsoft.Extensions.FileProviders.Abstractions (>= 8.0)
+      System.Text.Json (>= 8.0)
+    Microsoft.Extensions.Configuration.UserSecrets (8.0)
+      Microsoft.Extensions.Configuration.Abstractions (>= 8.0)
+      Microsoft.Extensions.Configuration.Json (>= 8.0)
+      Microsoft.Extensions.FileProviders.Abstractions (>= 8.0)
+      Microsoft.Extensions.FileProviders.Physical (>= 8.0)
+    Microsoft.Extensions.FileProviders.Abstractions (8.0)
+      Microsoft.Extensions.Primitives (>= 8.0)
+    Microsoft.Extensions.FileProviders.Physical (8.0)
+      Microsoft.Extensions.FileProviders.Abstractions (>= 8.0)
+      Microsoft.Extensions.FileSystemGlobbing (>= 8.0)
+      Microsoft.Extensions.Primitives (>= 8.0)
+    Microsoft.Extensions.FileSystemGlobbing (8.0)
+    Microsoft.Extensions.Primitives (8.0)
     Microsoft.IdentityModel.Abstractions (7.0.3)
     Microsoft.IdentityModel.JsonWebTokens (7.0.3)
       Microsoft.IdentityModel.Tokens (>= 7.0.3)
@@ -252,9 +251,9 @@ NUGET
       Microsoft.IdentityModel.Logging (>= 7.0.3)
     Microsoft.IO.RecyclableMemoryStream (2.3.2)
     Mono.Cecil (0.11.5)
-    Namotion.Reflection (3.0.1)
+    Namotion.Reflection (3.1)
       Microsoft.CSharp (>= 4.3)
-    Neo4j.Driver (5.14)
+    Neo4j.Driver (5.15)
       Microsoft.Bcl.AsyncInterfaces (>= 5.0)
       System.ValueTuple (>= 4.5)
     Newtonsoft.Json (13.0.3)
@@ -268,12 +267,9 @@ NUGET
     System.IdentityModel.Tokens.Jwt (7.0.3)
       Microsoft.IdentityModel.JsonWebTokens (>= 7.0.3)
       Microsoft.IdentityModel.Tokens (>= 7.0.3)
-    System.Runtime.CompilerServices.Unsafe (6.0)
-    System.Text.Encodings.Web (7.0)
-      System.Runtime.CompilerServices.Unsafe (>= 6.0)
-    System.Text.Json (7.0.3)
-      System.Runtime.CompilerServices.Unsafe (>= 6.0)
-      System.Text.Encodings.Web (>= 7.0)
+    System.Text.Encodings.Web (8.0)
+    System.Text.Json (8.0)
+      System.Text.Encodings.Web (>= 8.0)
     System.ValueTuple (4.5)
     Thoth.Elmish.Debouncer (2.0)
       Fable.Core (>= 4.0)

diff --git a/src/Client/Client.fsproj b/src/Client/Client.fsproj
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <DefineConstants>FABLE_COMPILER</DefineConstants>
     </PropertyGroup>
     <ItemGroup>
-        <Compile Include="LocalStorage\Darkmode.fs" />
-        <None Include="vite.config.ts" />
+        <None Include="..\..\.editorconfig" Link=".editorconfig" />
+        <None Include="vite.config.mts" />
         <None Include="paket.references" />
         <None Include="docs\IOntologyAPIv2.yaml" />
         <Content Include="docs\IOntologyAPIv2.html" />
         <None Include="index.html" />
         <None Include="style.scss" />
+        <Compile Include="LocalStorage\Darkmode.fs" />
         <Compile Include="Colors\NFDIColors.fs" />
         <Compile Include="Colors\ExcelColors.fs" />
         <Compile Include="JsBindings\Cytoscape.fs" />
@@ -29,7 +30,6 @@
         <Compile Include="OfficeInterop\OfficeInterop.fs" />
         <Compile Include="OfficeInterop\OfficeInteropState.fs" />
         <Compile Include="States\SpreadsheetInterface.fs" />
-        <Compile Include="States\SpreadsheetUITypes.fs" />
         <Compile Include="States\Spreadsheet.fs" />
         <Compile Include="States\CytoscapeState.fs" />
         <Compile Include="States\DagState.fs" />
@@ -47,12 +47,11 @@
         <Compile Include="Modals\TermModal.fs" />
         <Compile Include="Modals\BuildingBlockDetailsModal.fs" />
         <Compile Include="Modals\CytoscapeView.fs" />
+        <Compile Include="Spreadsheet\IO.fs" />
         <Compile Include="Spreadsheet\LocalStorage.fs" />
         <Compile Include="Spreadsheet\Types.fs" />
-        <Compile Include="Spreadsheet\TypeConverter.fs" />
-        <Compile Include="Spreadsheet\Helper.fs" />
+        <Compile Include="Spreadsheet\Clipboard.Controller.fs" />
         <Compile Include="Spreadsheet\Table.Controller.fs" />
-        <Compile Include="Spreadsheet\Export.Controller.fs" />
         <Compile Include="Spreadsheet\Sidebar.Controller.fs" />
         <Compile Include="SharedComponents\QuickAccessButton.fs" />
         <Compile Include="MainComponents\NoTablesElement.fs" />