Skip to content

Commit 5461162

Browse files
wallymathieuwallymathieu
authored
Fable4
1 parent 3da5779 commit 5461162

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+191
-150
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"fable": {
6-
"version": "3.7.20",
6+
"version": "4.1.4",
77
"commands": [
88
"fable"
99
]

‎.github/workflows/fable.yml‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,43 @@ jobs:
3939
- name: Run Fable tests
4040
working-directory: tests/FSharpPlusFable.Tests
4141
run: fable . --outDir bin --runScript ./bin
42-
42+
43+
testfable4:
44+
runs-on: ubuntu-latest
45+
46+
steps:
47+
- uses: actions/checkout@v2
48+
- name: Restore
49+
run: git submodule update --init --recursive
50+
- name: Remove global json
51+
run: rm global.json
52+
- name: Setup .NET Core 7
53+
uses: actions/setup-dotnet@v1
54+
with:
55+
dotnet-version: 7.0.200
56+
- name: Setup .NET Core 6
57+
uses: actions/setup-dotnet@v1
58+
with:
59+
dotnet-version: 6.0.201
60+
- name: Restore tools
61+
run: dotnet tool restore
62+
- name: Install jq
63+
uses: dcarbone/install-jq-action@v1.0.1
64+
- name: Install fable
65+
run: |
66+
version=`cat ./.config/dotnet-tools.json | jq --raw-output '.tools.fable.version'`
67+
dotnet tool install --global Fable --version $version
68+
- name: Use Node.js
69+
uses: actions/setup-node@v1
70+
with:
71+
node-version: '18.x'
72+
- name: Install npm dependencies
73+
working-directory: tests/FSharpPlusFable.Tests
74+
run: npm install
75+
- name: Run Fable tests
76+
working-directory: tests/FSharpPlusFable.Tests
77+
run: fable . --outDir bin --runScript ./bin
78+
4379
testFable3SubsetOnCore:
4480
runs-on: ubuntu-latest
4581

‎src/FSharpPlus/Builders.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace FSharpPlus
1111
1212
#nowarn "40"
1313

14-
#if !FABLE_COMPILER || FABLE_COMPILER_3
14+
#if (!FABLE_COMPILER || FABLE_COMPILER_3) && !FABLE_COMPILER_4
1515

1616
/// Constructs to express generic computations
1717
[<AutoOpenAttribute>]

‎src/FSharpPlus/Control/Alternative.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace FSharpPlus.Control
66
/// </summary>
77
/// </namespacedoc>
88
9-
#if !FABLE_COMPILER || FABLE_COMPILER_3
9+
#if (!FABLE_COMPILER || FABLE_COMPILER_3) && !FABLE_COMPILER_4
1010

1111
open System.Runtime.InteropServices
1212
open FSharpPlus

‎src/FSharpPlus/Control/Applicative.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ open FSharpPlus.Data
1414
type Apply =
1515
inherit Default1
1616

17-
#if !FABLE_COMPILER || FABLE_COMPILER_3
17+
#if (!FABLE_COMPILER || FABLE_COMPILER_3) && !FABLE_COMPILER_4
1818

1919
static member inline ``<*>`` (f: '``Monad<'T->'U>`` , x: '``Monad<'T>`` , [<Optional>]_output: '``Monad<'U>`` , [<Optional>]_mthd:Default2) : '``Monad<'U>`` = Bind.InvokeOnInstance f (fun (x1: 'T->'U) -> Bind.InvokeOnInstance x (fun x2 -> Return.InvokeOnInstance (x1 x2)))
2020
static member inline ``<*>`` (f: '``Applicative<'T->'U>``, x: '``Applicative<'T>``, [<Optional>]_output: '``Applicative<'U>``, [<Optional>]_mthd:Default1) : '``Applicative<'U>`` = ((^``Applicative<'T->'U>`` or ^``Applicative<'T>`` or ^``Applicative<'U>``) : (static member (<*>) : _*_ -> _) f, x)
@@ -87,7 +87,7 @@ type Apply =
8787
static member inline InvokeOnInstance (f: '``Applicative<'T->'U>``) (x: '``Applicative<'T>``) : '``Applicative<'U>`` =
8888
((^``Applicative<'T->'U>`` or ^``Applicative<'T>`` or ^``Applicative<'U>``) : (static member (<*>) : _*_ -> _) (f, x))
8989

90-
#if !FABLE_COMPILER || FABLE_COMPILER_3
90+
#if (!FABLE_COMPILER || FABLE_COMPILER_3) && !FABLE_COMPILER_4
9191

9292
type Lift2 =
9393
inherit Default1

‎src/FSharpPlus/Control/Arrow.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
namespace FSharpPlus.Control
22

33
#nowarn "0077"
4-
#if !FABLE_COMPILER || FABLE_COMPILER_3
4+
#if (!FABLE_COMPILER || FABLE_COMPILER_3) && !FABLE_COMPILER_4
55

66
open System
77
open System.Runtime.InteropServices

‎src/FSharpPlus/Control/ArrowApply.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ open System
44
open System.Runtime.InteropServices
55
open FSharpPlus.Internals
66

7-
#if !FABLE_COMPILER || FABLE_COMPILER_3
7+
#if (!FABLE_COMPILER || FABLE_COMPILER_3) && !FABLE_COMPILER_4
88

99
// ArrowApply class -------------------------------------------------------
1010

‎src/FSharpPlus/Control/ArrowChoice.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
namespace FSharpPlus.Control
22

33
#nowarn "0077"
4-
#if !FABLE_COMPILER || FABLE_COMPILER_3
4+
#if (!FABLE_COMPILER || FABLE_COMPILER_3) && !FABLE_COMPILER_4
55

66
open System
77
open System.Runtime.InteropServices

‎src/FSharpPlus/Control/Bifoldable.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace FSharpPlus.Control
22

3-
#if !FABLE_COMPILER || FABLE_COMPILER_3
3+
#if (!FABLE_COMPILER || FABLE_COMPILER_3) && !FABLE_COMPILER_4
44

55
open System.Runtime.InteropServices
66
open FSharpPlus.Internals

‎src/FSharpPlus/Control/Bitraversable.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace FSharpPlus.Control
22

3-
#if !FABLE_COMPILER || FABLE_COMPILER_3
3+
#if (!FABLE_COMPILER || FABLE_COMPILER_3) && !FABLE_COMPILER_4
44

55
// open System.Runtime.InteropServices
66
open FSharpPlus.Internals

0 commit comments

Comments
 (0)