Merge pull request #13 from nojaf/upgrade-fable

Update Fable and build sample
fable-compiler · Jan 28, 2025 · 3ce566e · 3ce566e
2 parents 131f610 + 431f25f
commit 3ce566e
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 11 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -30,5 +30,9 @@ jobs:
       - name: Build daemon
         run : bun run postinstall
 
+      - name: Build sample
+        run: bun i && bun run build
+        working-directory: ./sample-project
+
       - name: Build docs
         run: dotnet fsdocs build --noapidocs --projects "$(pwd)/Fable.Daemon/Fable.Daemon.fsproj"
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -8,12 +8,12 @@
     <PackageVersion Include="FSharp.Core" Version="8.0.200" />
     <PackageVersion Include="FSharp.SystemTextJson" Version="1.3.13" />
     <PackageVersion Include="StreamJsonRpc" Version="2.20.17" />
-    <PackageVersion Include="Fable.Compiler" Version="5.0.0-alpha.2" />
+    <PackageVersion Include="Fable.Compiler" Version="5.0.0-alpha.9" />
     <PackageVersion Include="Suave" Version="2.6.2" />
     <PackageVersion Include="Thoth.Json.Core" Version="0.1.0" />
     <PackageVersion Include="protobuf-net" Version="3.2.30" />
     <!-- lock transitive dependencies -->
-    <PackageVersion Include="Fable.AST" Version="4.5.0" />
+    <PackageVersion Include="Fable.AST" Version="4.6.0-beta.1" />
     <PackageVersion Include="System.Collections" Version="4.3.0" />
     <PackageVersion Include="System.Diagnostics.Debug" Version="4.3.0" />
     <PackageVersion Include="System.IO.FileSystem.Primitives" Version="4.3.0" />

diff --git a/Fable.Daemon/MSBuild.fs b/Fable.Daemon/MSBuild.fs
@@ -22,7 +22,7 @@ let dotnet_msbuild_with_defines
         psi.RedirectStandardOutput <- true
         psi.RedirectStandardError <- true
         psi.UseShellExecute <- false
-        psi.EnvironmentVariables.Add ("DOTNET_NOLOGO", "1")
+        psi.EnvironmentVariables.["DOTNET_NOLOGO"] <- "1"
 
         if not (List.isEmpty defines) then
             let definesValue = defines |> String.concat ";"

diff --git a/bun.lock b/bun.lock
@@ -1,11 +1,11 @@
 {
-  "lockfileVersion": 0,
+  "lockfileVersion": 1,
   "workspaces": {
     "": {
       "name": "vite-plugin-fable",
       "dependencies": {
         "@babel/code-frame": "^7.26.2",
-        "@fable-org/fable-library-js": "^1.9.0",
+        "@fable-org/fable-library-js": "^1.10.0",
         "promise.withresolvers": "^1.0.3",
         "rxjs": "^7.8.1",
         "ts-lsp-client": "^1.0.3",
@@ -76,7 +76,7 @@
 
     "@esbuild/win32-x64": ["@esbuild/[email protected]", "", { "os": "win32", "cpu": "x64" }, "sha512-7IAFPrjSQIJrGsK6flwg7NFmwBoSTyF3rl7If0hNUFQU4ilTsEPL6GuMuU9BfIWVVGuRnuIidkSMC+c0Otu8IA=="],
 
-    "@fable-org/fable-library-js": ["@fable-org/fable-library-js@1.9.0", "", {}, "sha512-zrV9iuAd/EfIqiMaq6JVXh3ONpNi2VNVF3PQyMYXXQG3aNfwXh6TAJ6dU0KCSKuqmiLNpG7vZ2GdDZg0apPBRw=="],
+    "@fable-org/fable-library-js": ["@fable-org/fable-library-js@1.10.0", "", {}, "sha512-kAaHOGtUbgErHFpIgpJmXbu3f/BejCUCgeYqdjQObrSn5EzJHb8/abcq7aFBp4sJ+fgKUq4j8KGcTSwdtMK55A=="],
 
     "@hapi/bourne": ["@hapi/[email protected]", "", {}, "sha512-i1BpaNDVLJdRBEKeJWkVO6tYX6DMFBuwMhSuWqLsY4ufeTKGVuV5rBsUhxPayXqnnWHgXUAmWK16H/ykO5Wj4Q=="],
 

diff --git a/global.json b/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "9.0.102"
+  }
+}
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
   "fundinding": "https://nojaf.com/",
   "dependencies": {
     "@babel/code-frame": "^7.26.2",
-    "@fable-org/fable-library-js": "^1.9.0",
+    "@fable-org/fable-library-js": "^1.10.0",
     "promise.withresolvers": "^1.0.3",
     "rxjs": "^7.8.1",
     "ts-lsp-client": "^1.0.3"

diff --git a/sample-project/bun.lock b/sample-project/bun.lock
@@ -1,10 +1,10 @@
 {
-  "lockfileVersion": 0,
+  "lockfileVersion": 1,
   "workspaces": {
     "": {
       "name": "sample-project",
       "dependencies": {
-        "@fable-org/fable-library-js": "^1.7.0",
+        "@fable-org/fable-library-js": "^1.10.0",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
       },
@@ -106,7 +106,7 @@
 
     "@esbuild/win32-x64": ["@esbuild/[email protected]", "", { "os": "win32", "cpu": "x64" }, "sha512-7IAFPrjSQIJrGsK6flwg7NFmwBoSTyF3rl7If0hNUFQU4ilTsEPL6GuMuU9BfIWVVGuRnuIidkSMC+c0Otu8IA=="],
 
-    "@fable-org/fable-library-js": ["@fable-org/fable-library-js@1.7.0", "", {}, "sha512-rm20PXnHi++zTGBSsJYW20ZldcfBBuZa2n6F+f5tq9G2qh4ARfU2vWcwYTqRnkO4tsZefpY+yPfNwmYOvmXHVw=="],
+    "@fable-org/fable-library-js": ["@fable-org/fable-library-js@1.10.0", "", {}, "sha512-kAaHOGtUbgErHFpIgpJmXbu3f/BejCUCgeYqdjQObrSn5EzJHb8/abcq7aFBp4sJ+fgKUq4j8KGcTSwdtMK55A=="],
 
     "@jridgewell/gen-mapping": ["@jridgewell/[email protected]", "", { "dependencies": { "@jridgewell/set-array": "^1.2.1", "@jridgewell/sourcemap-codec": "^1.4.10", "@jridgewell/trace-mapping": "^0.3.24" } }, "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg=="],
 

diff --git a/sample-project/package.json b/sample-project/package.json
@@ -9,7 +9,7 @@
     "preview": "bunx --bun vite preview"
   },
   "dependencies": {
-    "@fable-org/fable-library-js": "^1.7.0",
+    "@fable-org/fable-library-js": "^1.10.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   },