From 97e70dea153fa8c69baab9ef01c1709e11cc52f2 Mon Sep 17 00:00:00 2001
From: Maxime Mangel <maxime.shadaen@protonmail.com>
Date: Thu, 28 Sep 2023 21:31:31 +0200
Subject: [PATCH] Fix TypeScript tests target + try fix Rust

---
 .github/workflows/build.yml      | 7 +++++--
 build/FableLibrary/TypeScript.fs | 3 +++
 build/Test/TypeScript.fs         | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b44a02ec0f..693c4a718e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -107,7 +107,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        test: ["default"]  # "no_std", "threaded"]
+        test: ["default", "no_std", "threaded"]
 
     steps:
     - uses: actions/checkout@v2
@@ -125,8 +125,11 @@ jobs:
       with:
         toolchain: stable
 
+    - name: Fable Library - Rust
+      run: ./build.sh fable-library --rust
+
     - name: Fable Tests - Rust
-      run: ./build.sh test rust --${{ matrix.test }}
+      run: ./build.sh test rust --skip-fable-library --${{ matrix.test }}
 
   build-dart:
     runs-on: ubuntu-latest
diff --git a/build/FableLibrary/TypeScript.fs b/build/FableLibrary/TypeScript.fs
index e7ca15518c..dfdcbeb924 100644
--- a/build/FableLibrary/TypeScript.fs
+++ b/build/FableLibrary/TypeScript.fs
@@ -3,6 +3,7 @@ namespace Build.FableLibrary
 open System.IO
 open Fake.IO
 open BlackFox.CommandLine
+open SimpleExec
 
 type BuildFableLibraryTypeScript() =
     inherit
@@ -20,6 +21,8 @@ type BuildFableLibraryTypeScript() =
         >> CmdLine.appendPrefix "--define" "FX_NO_BIGINT"
 
     override this.CopyStage() =
+        Command.Run("npm", "install", workingDirectory = Build.Workspace.root)
+
         // Copy all *.ts files to the build directory from source directory
         Directory.GetFiles(this.SourceDir, "*.ts")
         |> Shell.copyFiles this.OutDir
diff --git a/build/Test/TypeScript.fs b/build/Test/TypeScript.fs
index ac0ce4acb9..15f9b7bc7a 100644
--- a/build/Test/TypeScript.fs
+++ b/build/Test/TypeScript.fs
@@ -16,7 +16,7 @@ let handle (args: string list) =
     let isWatch = args |> List.contains "--watch"
     let noDotnet = args |> List.contains "--no-dotnet"
 
-    BuildFableLibraryPython().Run(skipFableLibrary)
+    BuildFableLibraryTypeScript().Run(skipFableLibrary)
 
     Directory.clean fableDest
     Directory.clean tscDest