diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 4f9d04e8..3d45dfa1 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"fantomas": {
- "version": "6.3.0-alpha-007",
+ "version": "6.3.0",
"commands": [
"fantomas"
]
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9781c16d..e6b22c39 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -24,7 +24,7 @@ jobs:
- uses: oven-sh/setup-bun@v1
- name: Setup dotnet
- uses: actions/setup-dotnet@v3
+ uses: actions/setup-dotnet@v4
- name: Download Fantomas
run: dotnet fsi build.fsx -p Fantomas-Git
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 58b76c4c..4deda4d0 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -20,7 +20,7 @@ jobs:
- uses: oven-sh/setup-bun@v1
- name: Setup dotnet
- uses: actions/setup-dotnet@v3
+ uses: actions/setup-dotnet@v4
- name: Clone Fantomas
run: dotnet fsi build.fsx -p Fantomas-Git
diff --git a/global.json b/global.json
index d87ab58f..7a11e467 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"sdk": {
- "version": "8.0.100",
+ "version": "8.0.200",
"rollForward": "latestPatch"
}
}
\ No newline at end of file
diff --git a/src/client/bun.lockb b/src/client/bun.lockb
index 027a1d0e..c7c70e29 100755
Binary files a/src/client/bun.lockb and b/src/client/bun.lockb differ
diff --git a/src/client/package.json b/src/client/package.json
index c79f3a96..fe4d59a7 100644
--- a/src/client/package.json
+++ b/src/client/package.json
@@ -1,7 +1,7 @@
{
"scripts": {
"dev": "bunx --bun vite",
- "build": "bunx --bun vite build --base=/fantomas-tools/",
+ "build": "bunx --bun vite build",
"serve": "bunx --bun vite preview",
"format": "prettier --write \"src/**/*.{js,jsx}\" vite.config.js",
"lint": "prettier --check \"src/**/*.{js,jsx}\" vite.config.js"
@@ -21,8 +21,8 @@
"@vitejs/plugin-react": "4.2.1",
"prettier": "3.1.1",
"prop-types": "^15.8.1",
- "vite": "^5.1.1",
- "vite-plugin-fable": "^0.0.10"
+ "vite": "^5.2.0-beta.1",
+ "vite-plugin-fable": "^0.0.26"
},
"trustedDependencies": [
"vite-plugin-fable"
diff --git a/src/server/ASTViewer/packages.lock.json b/src/server/ASTViewer/packages.lock.json
index 1d902f75..44257217 100644
--- a/src/server/ASTViewer/packages.lock.json
+++ b/src/server/ASTViewer/packages.lock.json
@@ -96,6 +96,14 @@
"resolved": "4.5.0",
"contentHash": "pL2ChpaRRWI/p4LXyy4RgeWlYF2sgfj/pnVMvBqwNFr5cXg7CXNnWZWxrOONLg8VGdFB8oB+EG2Qw4MLgTOe+A=="
},
+ "System.Collections.Immutable": {
+ "type": "Transitive",
+ "resolved": "7.0.0",
+ "contentHash": "dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ==",
+ "dependencies": {
+ "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+ }
+ },
"System.Diagnostics.DiagnosticSource": {
"type": "Transitive",
"resolved": "7.0.0",
@@ -134,6 +142,7 @@
"type": "Project",
"dependencies": {
"FSharp.Core": "[6.0.1, )",
+ "System.Collections.Immutable": "[7.0.0, )",
"System.Diagnostics.DiagnosticSource": "[7.0.0, )",
"System.Memory": "[4.5.5, )",
"System.Runtime": "[4.3.1, )"
diff --git a/src/server/FantomasOnlineMain/packages.lock.json b/src/server/FantomasOnlineMain/packages.lock.json
index 1d902f75..44257217 100644
--- a/src/server/FantomasOnlineMain/packages.lock.json
+++ b/src/server/FantomasOnlineMain/packages.lock.json
@@ -96,6 +96,14 @@
"resolved": "4.5.0",
"contentHash": "pL2ChpaRRWI/p4LXyy4RgeWlYF2sgfj/pnVMvBqwNFr5cXg7CXNnWZWxrOONLg8VGdFB8oB+EG2Qw4MLgTOe+A=="
},
+ "System.Collections.Immutable": {
+ "type": "Transitive",
+ "resolved": "7.0.0",
+ "contentHash": "dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ==",
+ "dependencies": {
+ "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+ }
+ },
"System.Diagnostics.DiagnosticSource": {
"type": "Transitive",
"resolved": "7.0.0",
@@ -134,6 +142,7 @@
"type": "Project",
"dependencies": {
"FSharp.Core": "[6.0.1, )",
+ "System.Collections.Immutable": "[7.0.0, )",
"System.Diagnostics.DiagnosticSource": "[7.0.0, )",
"System.Memory": "[4.5.5, )",
"System.Runtime": "[4.3.1, )"
diff --git a/src/server/FantomasOnlinePreview/packages.lock.json b/src/server/FantomasOnlinePreview/packages.lock.json
index 1d902f75..44257217 100644
--- a/src/server/FantomasOnlinePreview/packages.lock.json
+++ b/src/server/FantomasOnlinePreview/packages.lock.json
@@ -96,6 +96,14 @@
"resolved": "4.5.0",
"contentHash": "pL2ChpaRRWI/p4LXyy4RgeWlYF2sgfj/pnVMvBqwNFr5cXg7CXNnWZWxrOONLg8VGdFB8oB+EG2Qw4MLgTOe+A=="
},
+ "System.Collections.Immutable": {
+ "type": "Transitive",
+ "resolved": "7.0.0",
+ "contentHash": "dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ==",
+ "dependencies": {
+ "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+ }
+ },
"System.Diagnostics.DiagnosticSource": {
"type": "Transitive",
"resolved": "7.0.0",
@@ -134,6 +142,7 @@
"type": "Project",
"dependencies": {
"FSharp.Core": "[6.0.1, )",
+ "System.Collections.Immutable": "[7.0.0, )",
"System.Diagnostics.DiagnosticSource": "[7.0.0, )",
"System.Memory": "[4.5.5, )",
"System.Runtime": "[4.3.1, )"
diff --git a/src/server/FantomasOnlineV6/FantomasOnlineV6.fsproj b/src/server/FantomasOnlineV6/FantomasOnlineV6.fsproj
index 72df7a30..f964dd7c 100644
--- a/src/server/FantomasOnlineV6/FantomasOnlineV6.fsproj
+++ b/src/server/FantomasOnlineV6/FantomasOnlineV6.fsproj
@@ -23,7 +23,7 @@
-
+
diff --git a/src/server/FantomasOnlineV6/packages.lock.json b/src/server/FantomasOnlineV6/packages.lock.json
index c153d989..306ddd52 100644
--- a/src/server/FantomasOnlineV6/packages.lock.json
+++ b/src/server/FantomasOnlineV6/packages.lock.json
@@ -25,12 +25,12 @@
},
"Fantomas.Core": {
"type": "Direct",
- "requested": "[6.2.3, )",
- "resolved": "6.2.3",
- "contentHash": "20V4pnIdPCbqUtoizcVEkKmv2k4tUWmCtJXv7KCxtzwHs50vWZdX8IQgrMuF3v5QoXCur6Xj8Yk1sx12VMPA8A==",
+ "requested": "[6.3.0, )",
+ "resolved": "6.3.0",
+ "contentHash": "sJW/mzDBdwybxZ9K6Tqv35r8d3310l8Srp3slZXJRa4g9tzszGBf6qFrSVVSFjG/PM5ksPXrM/z8ROEhQFpMfw==",
"dependencies": {
"FSharp.Core": "6.0.1",
- "Fantomas.FCS": "6.2.3"
+ "Fantomas.FCS": "6.3.0"
}
},
"FSharp.Core": {
@@ -79,10 +79,11 @@
},
"Fantomas.FCS": {
"type": "Transitive",
- "resolved": "6.2.3",
- "contentHash": "4D+nKhkjl+qlsVIdAS3BuNybV0B5m+sj3Me+4ewh9Zvkycjuv6evrTHP97eVTira0lvGCPgG20ic0PzMXHUmKg==",
+ "resolved": "6.3.0",
+ "contentHash": "opGfH46BBIyo4WYTp5lFdbRL6UNNeAbjasbHc6bJ6W6rz71p8qGa7lPhBL/XgNA4CrX1ax8e/91nsnQYBoIpdg==",
"dependencies": {
"FSharp.Core": "6.0.1",
+ "System.Collections.Immutable": "7.0.0",
"System.Diagnostics.DiagnosticSource": "7.0.0",
"System.Memory": "4.5.5",
"System.Runtime": "4.3.1"
@@ -117,6 +118,14 @@
"resolved": "4.5.0",
"contentHash": "pL2ChpaRRWI/p4LXyy4RgeWlYF2sgfj/pnVMvBqwNFr5cXg7CXNnWZWxrOONLg8VGdFB8oB+EG2Qw4MLgTOe+A=="
},
+ "System.Collections.Immutable": {
+ "type": "Transitive",
+ "resolved": "7.0.0",
+ "contentHash": "dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ==",
+ "dependencies": {
+ "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+ }
+ },
"System.Diagnostics.DiagnosticSource": {
"type": "Transitive",
"resolved": "7.0.0",
diff --git a/src/server/OakViewer/packages.lock.json b/src/server/OakViewer/packages.lock.json
index 1d902f75..44257217 100644
--- a/src/server/OakViewer/packages.lock.json
+++ b/src/server/OakViewer/packages.lock.json
@@ -96,6 +96,14 @@
"resolved": "4.5.0",
"contentHash": "pL2ChpaRRWI/p4LXyy4RgeWlYF2sgfj/pnVMvBqwNFr5cXg7CXNnWZWxrOONLg8VGdFB8oB+EG2Qw4MLgTOe+A=="
},
+ "System.Collections.Immutable": {
+ "type": "Transitive",
+ "resolved": "7.0.0",
+ "contentHash": "dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ==",
+ "dependencies": {
+ "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+ }
+ },
"System.Diagnostics.DiagnosticSource": {
"type": "Transitive",
"resolved": "7.0.0",
@@ -134,6 +142,7 @@
"type": "Project",
"dependencies": {
"FSharp.Core": "[6.0.1, )",
+ "System.Collections.Immutable": "[7.0.0, )",
"System.Diagnostics.DiagnosticSource": "[7.0.0, )",
"System.Memory": "[4.5.5, )",
"System.Runtime": "[4.3.1, )"