Skip to content

Commit 61c5afe

Browse files
dsymedsyme
authored
Merge pull request #114 from Shmew/fable-support
Fable support
2 parents 399b274 + 63b0da8 commit 61c5afe

19 files changed

Lines changed: 7917 additions & 49 deletions

‎.editorconfig‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,7 @@ indent_size = 2
1111
[*.{cs,csx,fs,fsx,vb,vbx,xml}]
1212
indent_size = 4
1313
charset = utf-8-bom
14+
# YAML files
15+
[*.yml]
16+
indent_size = 2
17+
indent_style = space

‎.gitignore‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,4 +194,9 @@ docs/tools/FSharp.Formatting.svclog
194194
xunit*.html
195195

196196
# exclude artifacts folder
197-
artifacts/
197+
artifacts/
198+
199+
# jest/fable directories
200+
tests/fable/dist/
201+
tests/fable/node_modules/
202+

‎.travis.yml‎

Lines changed: 64 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,71 @@
1-
language: csharp
1+
language: generic
22

33
matrix:
44
include:
5-
- os: linux
5+
- language: csharp
6+
os: osx
7+
osx_image: xcode9.3 # OSX 10.13 https://docs.travis-ci.com/user/reference/osx/#using-macos
8+
dotnet: 3.1.301
9+
mono: latest
10+
install:
11+
# workaround for missing .net 4.5 targing pack
12+
- export FrameworkPathOverride=$(dirname $(which mono))/../lib/mono/4.5/
13+
script:
14+
- dotnet --info
15+
- ./build.sh All
16+
branches:
17+
except:
18+
- gh-pages
19+
- language: csharp
20+
os: linux
621
dist: xenial # Ubuntu 16.04 https://docs.travis-ci.com/user/reference/linux/
7-
sudo: false
822
mono: latest
9-
dotnet: 3.0.100
10-
- os: osx
23+
dotnet: 3.1.301
24+
install:
25+
# workaround for missing .net 4.5 targing pack
26+
- export FrameworkPathOverride=$(dirname $(which mono))/../lib/mono/4.5/
27+
script:
28+
- dotnet --info
29+
- ./build.sh All
30+
branches:
31+
except:
32+
- gh-pages
33+
34+
- language: node_js
35+
os: osx
1136
osx_image: xcode9.3 # OSX 10.13 https://docs.travis-ci.com/user/reference/osx/#using-macos
12-
dotnet: 3.0.100
37+
dotnet: 3.1.301
1338
mono: latest
14-
sudo: false
15-
16-
install:
17-
# workaround for missing .net 4.5 targing pack
18-
- export FrameworkPathOverride=$(dirname $(which mono))/../lib/mono/4.5/
19-
20-
script:
21-
- dotnet --info
22-
- ./build.sh All
23-
24-
branches:
25-
except:
26-
- gh-pages
39+
node_js: 14
40+
cache: yarn
41+
install:
42+
# workaround for missing .net 4.5 targing pack
43+
- export FrameworkPathOverride=$(dirname $(which mono))/../lib/mono/4.5/
44+
before_script:
45+
- cd tests/fable
46+
script:
47+
- dotnet --info
48+
- ./build.sh Build
49+
- yarn test
50+
branches:
51+
except:
52+
- gh-pages
53+
- language: node_js
54+
os: linux
55+
dist: xenial # Ubuntu 16.04 https://docs.travis-ci.com/user/reference/linux/
56+
mono: latest
57+
dotnet: 3.1.301
58+
node_js: 14
59+
cache: yarn
60+
install:
61+
# workaround for missing .net 4.5 targing pack
62+
- export FrameworkPathOverride=$(dirname $(which mono))/../lib/mono/4.5/
63+
before_script:
64+
- dotnet --info
65+
- ./build.sh Build
66+
- cd tests/fable
67+
script:
68+
- yarn test
69+
branches:
70+
except:
71+
- gh-pages

‎FSharp.Control.AsyncSeq.sln‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{561B2DD4
5050
EndProject
5151
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Control.AsyncSeq.Tests", "tests\FSharp.Control.AsyncSeq.Tests\FSharp.Control.AsyncSeq.Tests.fsproj", "{F2404B35-0DAD-483D-9406-7C763CDDC029}"
5252
EndProject
53+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fable", "fable", "{3B98A3B9-F103-45B5-BA79-AAF7970E9E00}"
54+
ProjectSection(SolutionItems) = preProject
55+
tests\fable\package.json = tests\fable\package.json
56+
EndProjectSection
57+
EndProject
58+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Control.AsyncSeq.Tests", "tests\fable\FSharp.Control.AsyncSeq.Tests\FSharp.Control.AsyncSeq.Tests.fsproj", "{6F4404E9-B054-4EDD-80DD-105AF4A4720C}"
59+
EndProject
5360
Global
5461
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5562
Debug|Any CPU = Debug|Any CPU
@@ -84,13 +91,27 @@ Global
8491
{F2404B35-0DAD-483D-9406-7C763CDDC029}.Release|x64.Build.0 = Release|Any CPU
8592
{F2404B35-0DAD-483D-9406-7C763CDDC029}.Release|x86.ActiveCfg = Release|Any CPU
8693
{F2404B35-0DAD-483D-9406-7C763CDDC029}.Release|x86.Build.0 = Release|Any CPU
94+
{6F4404E9-B054-4EDD-80DD-105AF4A4720C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
95+
{6F4404E9-B054-4EDD-80DD-105AF4A4720C}.Debug|Any CPU.Build.0 = Debug|Any CPU
96+
{6F4404E9-B054-4EDD-80DD-105AF4A4720C}.Debug|x64.ActiveCfg = Debug|Any CPU
97+
{6F4404E9-B054-4EDD-80DD-105AF4A4720C}.Debug|x64.Build.0 = Debug|Any CPU
98+
{6F4404E9-B054-4EDD-80DD-105AF4A4720C}.Debug|x86.ActiveCfg = Debug|Any CPU
99+
{6F4404E9-B054-4EDD-80DD-105AF4A4720C}.Debug|x86.Build.0 = Debug|Any CPU
100+
{6F4404E9-B054-4EDD-80DD-105AF4A4720C}.Release|Any CPU.ActiveCfg = Release|Any CPU
101+
{6F4404E9-B054-4EDD-80DD-105AF4A4720C}.Release|Any CPU.Build.0 = Release|Any CPU
102+
{6F4404E9-B054-4EDD-80DD-105AF4A4720C}.Release|x64.ActiveCfg = Release|Any CPU
103+
{6F4404E9-B054-4EDD-80DD-105AF4A4720C}.Release|x64.Build.0 = Release|Any CPU
104+
{6F4404E9-B054-4EDD-80DD-105AF4A4720C}.Release|x86.ActiveCfg = Release|Any CPU
105+
{6F4404E9-B054-4EDD-80DD-105AF4A4720C}.Release|x86.Build.0 = Release|Any CPU
87106
EndGlobalSection
88107
GlobalSection(SolutionProperties) = preSolution
89108
HideSolutionNode = FALSE
90109
EndGlobalSection
91110
GlobalSection(NestedProjects) = preSolution
92111
{DBDF64C3-BE92-4272-8737-5001C469D9AA} = {86625A13-D7E2-4EAD-B13A-4F37BD89DE2A}
93112
{F2404B35-0DAD-483D-9406-7C763CDDC029} = {561B2DD4-BBFB-4E0D-BF73-C10A3E42507C}
113+
{3B98A3B9-F103-45B5-BA79-AAF7970E9E00} = {561B2DD4-BBFB-4E0D-BF73-C10A3E42507C}
114+
{6F4404E9-B054-4EDD-80DD-105AF4A4720C} = {3B98A3B9-F103-45B5-BA79-AAF7970E9E00}
94115
EndGlobalSection
95116
GlobalSection(ExtensibilityGlobals) = postSolution
96117
SolutionGuid = {C565CD17-B9B2-4A58-8F33-07C65FE2D9C3}

‎appveyor.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
environment:
2-
CLI_VERSION: 3.0.100
2+
CLI_VERSION: 3.1.301
33
image: Visual Studio 2019
44
init:
55
- git config --global core.autocrlf input
6+
install:
7+
- ps: Install-Product node 14
8+
- yarn --cwd tests/fable --cache-folder=.cache/yarn --no-progress --pure-lockfile
9+
cache:
10+
- tests/fable/.cache/yarn
611
build_script:
712
- cmd: build.cmd
813
test: off
14+
test_script:
15+
- yarn --cwd tests/fable test
916
version: 0.0.1.{build}
1017
artifacts:
1118
- path: bin

‎build.fsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ Target "RunTests" (fun _ ->
111111
try
112112
DotNetCli.Test(fun p ->
113113
{ p with
114+
Framework = "netcoreapp3.1"
114115
Project = "tests/FSharp.Control.AsyncSeq.Tests"
115116
TimeOut = TimeSpan.FromMinutes 20. })
116117
finally

‎global.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"sdk": {
3-
"version": "3.0.100"
3+
"version": "3.1.202",
4+
"rollForward": "minor"
45
}
5-
}
6+
}

‎paket.dependencies‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,13 @@ group Test
3030
nuget NUnit
3131
nuget NUnit.Runners
3232
nuget NUnit3TestAdapter
33+
34+
group Test.Fable
35+
source https://api.nuget.org/v3/index.json
36+
storage: none
37+
38+
nuget Fable.Core
39+
nuget Fable.FastCheck
40+
nuget Fable.FastCheck.Jest
41+
nuget Fable.Jester
42+
nuget FSharp.Core

‎paket.lock‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -889,3 +889,62 @@ NUGET
889889
System.Xml.ReaderWriter (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
890890
System.Xml.XmlDocument (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (>= net46)
891891
System.Xml.XPath (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (>= net46)
892+
893+
GROUP Test.Fable
894+
STORAGE: NONE
895+
NUGET
896+
remote: https://api.nuget.org/v3/index.json
897+
Fable.Browser.Blob (1.1) - restriction: >= netstandard2.0
898+
Fable.Core (>= 3.0) - restriction: >= netstandard2.0
899+
FSharp.Core (>= 4.6.2) - restriction: >= netstandard2.0
900+
Fable.Browser.Dom (1.2)
901+
Fable.Browser.Blob (>= 1.1) - restriction: >= netstandard2.0
902+
Fable.Browser.Event (>= 1.0) - restriction: >= netstandard2.0
903+
Fable.Browser.WebStorage (>= 1.0) - restriction: >= netstandard2.0
904+
Fable.Core (>= 3.0) - restriction: >= netstandard2.0
905+
FSharp.Core (>= 4.7) - restriction: >= netstandard2.0
906+
Fable.Browser.Event (1.0) - restriction: >= netstandard2.0
907+
Fable.Core (>= 3.0) - restriction: >= netstandard2.0
908+
FSharp.Core (>= 4.5.2) - restriction: >= netstandard2.0
909+
Fable.Browser.WebStorage (1.0) - restriction: >= netstandard2.0
910+
Fable.Browser.Event (>= 1.0) - restriction: >= netstandard2.0
911+
Fable.Core (>= 3.0) - restriction: >= netstandard2.0
912+
FSharp.Core (>= 4.5.2) - restriction: >= netstandard2.0
913+
Fable.Core (3.1.5)
914+
FSharp.Core (>= 4.7) - restriction: >= netstandard2.0
915+
Fable.Elmish (3.0.6)
916+
Fable.Core (>= 3.0) - restriction: >= netstandard2.0
917+
FSharp.Core (>= 4.6.2) - restriction: >= netstandard2.0
918+
Fable.FastCheck (0.21.1)
919+
Fable.Core (>= 3.1.5 < 4.0)
920+
Fable.Elmish (>= 3.0.6 < 4.0)
921+
Fable.Promise (>= 2.1 < 3.0)
922+
FSharp.Core (>= 4.7 < 5.0)
923+
Fable.FastCheck.Jest (0.21.1)
924+
Fable.Core (>= 3.1.5 < 4.0)
925+
Fable.FastCheck (>= 0.21.1)
926+
Fable.Jester (>= 0.21.1)
927+
Fable.Promise (>= 2.1 < 3.0)
928+
FSharp.Core (>= 4.7 < 5.0)
929+
Fable.Jester (0.21.1)
930+
Fable.Browser.Dom (>= 1.2 < 2.0)
931+
Fable.Core (>= 3.1.5 < 4.0)
932+
Fable.Node (>= 1.0.2 < 2.0)
933+
Fable.Promise (>= 2.1 < 3.0)
934+
Feliz (>= 1.3 < 2.0)
935+
FSharp.Core (>= 4.7 < 5.0)
936+
Fable.Node (1.0.2)
937+
Fable.Core (>= 3.1.2) - restriction: >= netstandard2.0
938+
FSharp.Core (>= 4.7) - restriction: >= netstandard2.0
939+
Fable.Promise (2.1)
940+
Fable.Core (>= 3.1.5) - restriction: >= netstandard2.0
941+
FSharp.Core (>= 4.7) - restriction: >= netstandard2.0
942+
Fable.React (6.2) - restriction: >= netstandard2.0
943+
Fable.Browser.Dom (>= 1.0) - restriction: >= netstandard2.0
944+
Fable.Core (>= 3.1.5) - restriction: >= netstandard2.0
945+
FSharp.Core (>= 4.7) - restriction: >= netstandard2.0
946+
Feliz (1.3)
947+
Fable.Core (>= 3.1.5) - restriction: >= netstandard2.0
948+
Fable.React (>= 6.0) - restriction: >= netstandard2.0
949+
FSharp.Core (>= 4.7) - restriction: >= netstandard2.0
950+
FSharp.Core (4.7.2)

0 commit comments

Comments
 (0)