diff --git a/build.fsx b/build.fsx
index ceafc6d524..8a5a707223 100644
--- a/build.fsx
+++ b/build.fsx
@@ -420,8 +420,8 @@ let testStandalone(minify) =
runInDir fableDir "npm unlink ../fable-standalone && cd ../fable-standalone && npm unlink"
let testReact() =
- runFableWithArgs "tests/Js/React" ["--noCache"]
- runInDir "tests/Js/React" "npm i && npm test"
+ runFableWithArgs "tests/React" ["--noCache"]
+ runInDir "tests/React" "npm i && npm test"
let compileAndRunTestsWithMocha clean projectName =
let projectDir = "tests/Js/" + projectName
@@ -474,8 +474,7 @@ let testJs() =
// Adaptive tests must go in a different project to avoid conflicts with Queue shim, see #2559
compileAndRunTestsWithMocha true "Adaptive"
- // TODO: Re-enable React tests after updating Feliz ReactComponent plugin
- // testReact()
+ testReact()
if envVarOrNone "CI" |> Option.isSome then
testStandaloneFast()
diff --git a/lib/fcs/FSharp.Compiler.Service.dll b/lib/fcs/FSharp.Compiler.Service.dll
index 4b309d3e90..d23bd72c6a 100644
Binary files a/lib/fcs/FSharp.Compiler.Service.dll and b/lib/fcs/FSharp.Compiler.Service.dll differ
diff --git a/lib/fcs/FSharp.Compiler.Service.xml b/lib/fcs/FSharp.Compiler.Service.xml
index ddbcf25e4c..4a513857bc 100644
--- a/lib/fcs/FSharp.Compiler.Service.xml
+++ b/lib/fcs/FSharp.Compiler.Service.xml
@@ -4965,7 +4965,7 @@
- Invalid value '%s' for --interfacedata, valid value are: none, file, compress."
+ Invalid value '%s' for --interfacedata, valid value are: none, file, compress.
(Originally from FSComp.txt:933)
diff --git a/src/Fable.Transforms/OverloadSuffix.fs b/src/Fable.Transforms/OverloadSuffix.fs
index 67f9086633..6516ff2bde 100644
--- a/src/Fable.Transforms/OverloadSuffix.fs
+++ b/src/Fable.Transforms/OverloadSuffix.fs
@@ -49,8 +49,13 @@ let rec private getTypeFastFullName (genParams: IDictionary<_,_>) (t: Fable.Type
let genArgs = genArgs |> Seq.map (getTypeFastFullName genParams) |> String.concat " * "
if isStruct then "struct " + genArgs
else genArgs
- | Fable.Array(genArg, _) -> // TODO: check kind
- getTypeFastFullName genParams genArg + "[]"
+ | Fable.Array(genArg, kind) ->
+ let name =
+ match kind with
+ | Fable.ResizeArray -> "array"
+ | Fable.MutableArray -> "resizearray"
+ | Fable.ImmutableArray -> "immutablearray"
+ getTypeFastFullName genParams genArg + " " + name
| Fable.List genArg ->
getTypeFastFullName genParams genArg + " list"
| Fable.Option(genArg, isStruct) ->
diff --git a/tests/React/Fable.Tests.React.fsproj b/tests/React/Fable.Tests.React.fsproj
index b8d4fe8805..e75c7a4aad 100644
--- a/tests/React/Fable.Tests.React.fsproj
+++ b/tests/React/Fable.Tests.React.fsproj
@@ -8,9 +8,11 @@
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file