Skip to content

Commit 3ce566e

Browse files
authored
Merge pull request #13 from nojaf/upgrade-fable
Update Fable and build sample
2 parents 131f610 + 431f25f commit 3ce566e

File tree

8 files changed

+20
-11
lines changed

8 files changed

+20
-11
lines changed

.github/workflows/pr.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,9 @@ jobs:
3030
- name: Build daemon
3131
run : bun run postinstall
3232

33+
- name: Build sample
34+
run: bun i && bun run build
35+
working-directory: ./sample-project
36+
3337
- name: Build docs
3438
run: dotnet fsdocs build --noapidocs --projects "$(pwd)/Fable.Daemon/Fable.Daemon.fsproj"

Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
<PackageVersion Include="FSharp.Core" Version="8.0.200" />
99
<PackageVersion Include="FSharp.SystemTextJson" Version="1.3.13" />
1010
<PackageVersion Include="StreamJsonRpc" Version="2.20.17" />
11-
<PackageVersion Include="Fable.Compiler" Version="5.0.0-alpha.2" />
11+
<PackageVersion Include="Fable.Compiler" Version="5.0.0-alpha.9" />
1212
<PackageVersion Include="Suave" Version="2.6.2" />
1313
<PackageVersion Include="Thoth.Json.Core" Version="0.1.0" />
1414
<PackageVersion Include="protobuf-net" Version="3.2.30" />
1515
<!-- lock transitive dependencies -->
16-
<PackageVersion Include="Fable.AST" Version="4.5.0" />
16+
<PackageVersion Include="Fable.AST" Version="4.6.0-beta.1" />
1717
<PackageVersion Include="System.Collections" Version="4.3.0" />
1818
<PackageVersion Include="System.Diagnostics.Debug" Version="4.3.0" />
1919
<PackageVersion Include="System.IO.FileSystem.Primitives" Version="4.3.0" />

Fable.Daemon/MSBuild.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ let dotnet_msbuild_with_defines
2222
psi.RedirectStandardOutput <- true
2323
psi.RedirectStandardError <- true
2424
psi.UseShellExecute <- false
25-
psi.EnvironmentVariables.Add ("DOTNET_NOLOGO", "1")
25+
psi.EnvironmentVariables.["DOTNET_NOLOGO"] <- "1"
2626

2727
if not (List.isEmpty defines) then
2828
let definesValue = defines |> String.concat ";"

bun.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

global.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"sdk": {
3+
"version": "9.0.102"
4+
}
5+
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"fundinding": "https://nojaf.com/",
2929
"dependencies": {
3030
"@babel/code-frame": "^7.26.2",
31-
"@fable-org/fable-library-js": "^1.9.0",
31+
"@fable-org/fable-library-js": "^1.10.0",
3232
"promise.withresolvers": "^1.0.3",
3333
"rxjs": "^7.8.1",
3434
"ts-lsp-client": "^1.0.3"

sample-project/bun.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sample-project/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"preview": "bunx --bun vite preview"
1010
},
1111
"dependencies": {
12-
"@fable-org/fable-library-js": "^1.7.0",
12+
"@fable-org/fable-library-js": "^1.10.0",
1313
"react": "^18.3.1",
1414
"react-dom": "^18.3.1"
1515
},

0 commit comments

Comments
 (0)