Skip to content

Commit d3e4364

Browse files
wallymathieuwallymathieu
committed
Merge branch 'master' into v1.4
2 parents 43eca98 + 5461162 commit d3e4364

Some content is hidden

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

72 files changed

+205
-162
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: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,44 @@ jobs:
3434
run: npm install
3535
- name: Run Fable tests
3636
working-directory: tests/FSharpPlusFable.Tests
37-
run: dotnet fable . --outDir bin --runScript ./bin
38-
37+
run: fable . --outDir bin --runScript ./bin
38+
39+
testfable4:
40+
runs-on: ubuntu-latest
41+
42+
steps:
43+
- uses: actions/checkout@v2
44+
- name: Restore
45+
run: git submodule update --init --recursive
46+
- name: Remove global json
47+
run: rm global.json
48+
- name: Setup .NET Core 7
49+
uses: actions/setup-dotnet@v1
50+
with:
51+
dotnet-version: 7.0.200
52+
- name: Setup .NET Core 6
53+
uses: actions/setup-dotnet@v1
54+
with:
55+
dotnet-version: 6.0.201
56+
- name: Restore tools
57+
run: dotnet tool restore
58+
- name: Install jq
59+
uses: dcarbone/[email protected]
60+
- name: Install fable
61+
run: |
62+
version=`cat ./.config/dotnet-tools.json | jq --raw-output '.tools.fable.version'`
63+
dotnet tool install --global Fable --version $version
64+
- name: Use Node.js
65+
uses: actions/setup-node@v1
66+
with:
67+
node-version: '18.x'
68+
- name: Install npm dependencies
69+
working-directory: tests/FSharpPlusFable.Tests
70+
run: npm install
71+
- name: Run Fable tests
72+
working-directory: tests/FSharpPlusFable.Tests
73+
run: fable . --outDir bin --runScript ./bin
74+
3975
testFable3SubsetOnCore:
4076
runs-on: ubuntu-latest
4177

‎FSharpPlus.sln‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{8E6D
3434
docsrc\content\abstraction-semigroup.fsx = docsrc\content\abstraction-semigroup.fsx
3535
docsrc\content\abstraction-traversable.fsx = docsrc\content\abstraction-traversable.fsx
3636
docsrc\content\abstractions.fsx = docsrc\content\abstractions.fsx
37-
docsrc\content\abstractions.plantuml = docsrc\content\abstractions.plantuml
37+
docsrc\content\abstractions.plantuml = docsrc\tools\templates\abstractions.plantuml
38+
docsrc\content\_template.html = docsrc\content\_template.html
3839
docsrc\content\applicative-functors.fsx = docsrc\content\applicative-functors.fsx
3940
docsrc\content\computation-expressions.fsx = docsrc\content\computation-expressions.fsx
4041
docsrc\content\extension-methods.fsx = docsrc\content\extension-methods.fsx

‎docsrc/content/_template.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@
5757

5858
<!-- Do not use 'fsdocs-list-of-documents' which currently cannot be ordered, and dumps all files in docsrc/ -->
5959
<li class="nav-header" style="padding-top: 10px">Documentation</li>
60-
<li class="nav-item"><a class="nav-link" href="{{root}}/tutorial.html">Tutorial</a></li>
61-
<li class="nav-item"><a class="nav-link" href="{{root}}/extensions.html">Extensions</a></li>
62-
<li class="nav-item"><a class="nav-link" href="{{root}}/generic-doc.html">Functions &amp; Operators</a></li>
63-
<li class="nav-item"><a class="nav-link" href="{{root}}/types.html">Data Types</a></li>
64-
<li class="nav-item"><a class="nav-link" href="{{root}}/abstractions.html">Abstractions</a></li>
65-
<li class="nav-item"><a class="nav-link" href="{{root}}/computation-expressions.html">Computation Expressions</a></li>
66-
<li class="nav-item"><a class="nav-link" href="{{root}}/lens.html">Lens</a></li>
67-
<li class="nav-item"><a class="nav-link" href="{{root}}/parsing.html">Parsing</a></li>
68-
<li class="nav-item"><a class="nav-link" href="{{root}}/numerics.html">Numerics</a></li>
60+
<li class="nav-item"><a class="nav-link" href="{{root}}tutorial.html">Tutorial</a></li>
61+
<li class="nav-item"><a class="nav-link" href="{{root}}extensions.html">Extensions</a></li>
62+
<li class="nav-item"><a class="nav-link" href="{{root}}generic-doc.html">Functions &amp; Operators</a></li>
63+
<li class="nav-item"><a class="nav-link" href="{{root}}types.html">Data Types</a></li>
64+
<li class="nav-item"><a class="nav-link" href="{{root}}abstractions.html">Abstractions</a></li>
65+
<li class="nav-item"><a class="nav-link" href="{{root}}computation-expressions.html">Computation Expressions</a></li>
66+
<li class="nav-item"><a class="nav-link" href="{{root}}lens.html">Lens</a></li>
67+
<li class="nav-item"><a class="nav-link" href="{{root}}parsing.html">Parsing</a></li>
68+
<li class="nav-item"><a class="nav-link" href="{{root}}numerics.html">Numerics</a></li>
6969

7070
{{fsdocs-list-of-namespaces}}
7171
</ul>

‎src/FSharpPlus/Builders.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace FSharpPlus
1212
#nowarn "40"
1313
#nowarn "44"
1414

15-
#if !FABLE_COMPILER || FABLE_COMPILER_3
15+
#if (!FABLE_COMPILER || FABLE_COMPILER_3) && !FABLE_COMPILER_4
1616
open System
1717
open System.ComponentModel
1818

@@ -92,7 +92,7 @@ module Builders =
9292
let monad' = new MonadFxStrictBuilder ()
9393

9494
#endif
95-
#if !FABLE_COMPILER || FABLE_COMPILER_3
95+
#if (!FABLE_COMPILER || FABLE_COMPILER_3) && !FABLE_COMPILER_4
9696

9797
/// Constructs to express generic computations
9898
[<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

0 commit comments

Comments
 (0)