Skip to content

Commit eb476fc

Browse files
Merge branch 'master' into quotations
2 parents cd1cb8f + 131704c commit eb476fc

File tree

543 files changed

+73303
-70910
lines changed

Some content is hidden

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

543 files changed

+73303
-70910
lines changed

.docker/Dockerfile

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
FROM gitpod/workspace-full:latest
2+
3+
USER root
4+
5+
# Add here the instruction who needs root user
6+
7+
8+
USER gitpod
9+
10+
# Install dotnet core
11+
ENV PATH=$HOME/.dotnet:$PATH
12+
RUN wget https://dotnetwebsite.azurewebsites.net/download/dotnet-core/scripts/v1/dotnet-install.sh && \
13+
bash dotnet-install.sh -v 3.1.201 && \
14+
rm -rf dotnet-install.sh;

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
.vscode/
21
.idea/
2+
.ionide/
33

44
node_modules/
55
temp/

.gitpod.yml

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
image:
2+
file: .docker/Dockerfile
3+
4+
tasks:
5+
- before: dotnet restore
6+
- init: npm install && npm run build compiler
7+
8+
github:
9+
prebuilds:
10+
# enable for the master/default branch (defaults to true)
11+
master: true
12+
# enable for all branches in this repo (defaults to false)
13+
branches: false
14+
# enable for pull requests coming from this repo (defaults to true)
15+
pullRequests: true
16+
# enable for pull requests coming from forks (defaults to false)
17+
pullRequestsFromForks: true
18+
# add a check to pull requests (defaults to true)
19+
addCheck: true
20+
# add a "Review in Gitpod" button as a comment to pull requests (defaults to false)
21+
addComment: true
22+
# add a "Review in Gitpod" button to the pull request's description (defaults to false)
23+
addBadge: false
24+
# add a label once the prebuild is ready to pull requests (defaults to false)
25+
addLabel: false
26+
27+
vscode:
28+
extensions:
29+
- [email protected]:QnOrf5fk6KiVaQs4cNEP+w==
30+
- [email protected]:8IqxuxCVol2WnScJc5xVzg==
31+
- [email protected]:/wXbNRm+2kunH5HbQqfnXA==
32+
- [email protected]:xeHlNzPEF04yFqz/xKCD5w==
33+
- [email protected]:0qxXuhq6eO066etkNQrKCQ==
34+
- [email protected]:jGTZwg0ChZg3eEKHC+UO+w==
35+
- [email protected]:zoSeoEOMfrwN0BMBC8VvqQ==
36+
- [email protected]:GNDO73Cmp0fYDiLNxVkbsQ==

.travis.yml

+14-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,27 @@
11
language: csharp
22
os: linux
3-
dist: trusty
4-
sudo: false
5-
dotnet: 2.1.403
3+
dist: xenial
4+
sudo: required
5+
# dotnet: 3.1.201
66
mono: none
77

88
# cache:
99
# yarn: true
1010

11+
addons:
12+
snaps:
13+
- name: dotnet-sdk
14+
classic: true
15+
channel: latest/stable
16+
1117
before_script:
12-
- nvm install 10.15.0
13-
- nvm use 10.15.0
18+
- sudo snap alias dotnet-sdk.dotnet dotnet
19+
- nvm install node
20+
- nvm use node
1421
# # Update npm
1522
# - npm install -g npm
1623

1724
script:
25+
- dotnet --version
26+
- node --version
1827
- npm install && npm test

.vscode/launch.json

+9-8
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
"type": "node",
3232
"request": "launch",
3333
"name": "Launch Quicktest.js",
34-
"program": "${workspaceRoot}/src/tools/temp/QuickTest.js",
34+
"program": "${workspaceRoot}/src/quicktest/bin/QuickTest.js",
3535
"args": ["--help"],
36-
"cwd": "${workspaceRoot}/src/tools/temp",
36+
"cwd": "${workspaceRoot}/src/quicktest",
3737
"stopOnEntry": true
3838
},
3939
{
@@ -48,19 +48,19 @@
4848
{
4949
"type": "node",
5050
"request": "launch",
51-
"name": "bench-compile tests (Node)",
51+
"name": "bench-compile (Node)",
5252
"program": "${workspaceRoot}/src/fable-standalone/test/bench-compiler/out-node/app.js",
53-
"args": ["${workspaceRoot}/tests/Main/Fable.Tests.fsproj", "out-tests", "--commonjs"],
54-
// "args": ["${workspaceRoot}/../fable-test/fable-test.fsproj", "out-test", "--commonjs", "--optimize-fcs"],
53+
// "args": ["${workspaceRoot}/tests/Main/Fable.Tests.fsproj", "out-tests", "--commonjs"],
54+
"args": ["${workspaceRoot}/../fable-test/fable-test.fsproj", "out-test", "--commonjs", "--optimize-fcs"],
5555
"cwd": "${workspaceRoot}/src/fable-standalone/test/bench-compiler"
5656
},
5757
{
5858
"type": "coreclr",
5959
"request": "launch",
60-
"name": "bench-compile tests (.NET)",
60+
"name": "bench-compile (.NET)",
6161
"program": "${workspaceFolder}/src/fable-standalone/test/bench-compiler/bin/Debug/netcoreapp2.1/bench-compiler.dll",
62-
"args": ["${workspaceRoot}/tests/Main/Fable.Tests.fsproj", "out-tests", "--commonjs"],
63-
// "args": ["${workspaceRoot}/../fable-test/fable-test.fsproj", "out-test", "--commonjs", "--optimize-fcs"],
62+
// "args": ["${workspaceRoot}/tests/Main/Fable.Tests.fsproj", "out-tests", "--commonjs"],
63+
"args": ["${workspaceRoot}/../fable-test/fable-test.fsproj", "out-test", "--commonjs", "--optimize-fcs"],
6464
"cwd": "${workspaceFolder}/src/fable-standalone/test/bench-compiler"
6565
},
6666
{
@@ -82,6 +82,7 @@
8282
"request": "launch",
8383
"name": "Run Mocha Tests",
8484
"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
85+
"sourceMaps": false,
8586
"args": [
8687
"--no-timeouts",
8788
"--colors",

.vscode/settings.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"files.exclude": {
3+
"**/.git": true,
4+
"**/.svn": true,
5+
"**/.hg": true,
6+
"**/CVS": true,
7+
"**/.DS_Store": true,
8+
"**/bin": true,
9+
"**/obj": true,
10+
"**/.fake": true,
11+
"**/packages": true,
12+
"**/node_modules": true,
13+
"**/bower_components": true
14+
},
15+
"files.trimTrailingWhitespace": true,
16+
"files.trimFinalNewlines": true,
17+
"gitlens.codeLens.enabled": false
18+
}

Fable.sln

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
1+
22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
3+
# Visual Studio 15
44
VisualStudioVersion = 15.0.26124.0
55
MinimumVisualStudioVersion = 15.0.26124.0
6-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Quicktest", "src\quicktest\Quicktest.fsproj", "{661A1972-0D06-46E8-958C-55325E5D520C}"
6+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Quicktest", "src\quicktest\QuickTest.fsproj", "{661A1972-0D06-46E8-958C-55325E5D520C}"
77
EndProject
88
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fable.Transforms", "src\Fable.Transforms\Fable.Transforms.fsproj", "{E55F3DA2-86B7-4E73-9700-EC6490043268}"
99
EndProject
@@ -30,9 +30,6 @@ Global
3030
Release|x64 = Release|x64
3131
Release|x86 = Release|x86
3232
EndGlobalSection
33-
GlobalSection(SolutionProperties) = preSolution
34-
HideSolutionNode = FALSE
35-
EndGlobalSection
3633
GlobalSection(ProjectConfigurationPlatforms) = postSolution
3734
{661A1972-0D06-46E8-958C-55325E5D520C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3835
{661A1972-0D06-46E8-958C-55325E5D520C}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -143,4 +140,10 @@ Global
143140
{D8C8FBCB-54AF-49C3-93B1-5460668E32EC}.Release|x86.ActiveCfg = Release|Any CPU
144141
{D8C8FBCB-54AF-49C3-93B1-5460668E32EC}.Release|x86.Build.0 = Release|Any CPU
145142
EndGlobalSection
143+
GlobalSection(SolutionProperties) = preSolution
144+
HideSolutionNode = FALSE
145+
EndGlobalSection
146+
GlobalSection(ExtensibilityGlobals) = postSolution
147+
SolutionGuid = {204581E6-42C5-4EE2-A4A9-713C32A17CF2}
148+
EndGlobalSection
146149
EndGlobal

README.md

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# F# |> BABEL
22

3-
### The compiler that emits JavaScript you can be proud of!
4-
53
[![Mono Build Status](https://travis-ci.org/fable-compiler/Fable.svg?branch=master "Mono Build Status")](https://travis-ci.org/fable-compiler/Fable) [![.NET Build Status](https://ci.appveyor.com/api/projects/status/vlmyxg64my74sik5/branch/master?svg=true ".NET Build Status")](https://ci.appveyor.com/project/alfonsogarciacaro/fable) [![npm version](https://badge.fury.io/js/fable-compiler.svg)](https://www.npmjs.com/package/fable-compiler) [![Join the chat at https://gitter.im/fable-compiler/Fable](https://badges.gitter.im/fable-compiler/Fable.svg)](https://gitter.im/fable-compiler/Fable?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
64

5+
[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/fable-compiler/Fable/)
6+
77
[Follow us on Twitter!](https://twitter.com/FableCompiler)
88

9-
Fable is an F# to JavaScript compiler powered by [Babel](https://babeljs.io/), designed to produce readable and standard code. [Check the website](http://fable.io) for more information and if you find the project useful, don't forget to give us a star!
9+
Fable is an F# to JavaScript compiler powered by [Babel](https://babeljs.io/), designed to make F# a first-class citizen of the JavaScript ecosystem. [Check the website](http://fable.io) for more information and if you find the project useful, don't forget to give us a star!
1010

1111
## Getting started
1212

13-
Check [this page](https://fable.io/docs/getting_started.html).
13+
Check [this page](https://fable.io/docs/2-steps/setup.html).
1414

1515
## Building
1616

@@ -19,8 +19,7 @@ Make sure the following **requirements** are installed in your system:
1919
- [dotnet SDK](https://www.microsoft.com/net/download/core)
2020
- [node.js](https://nodejs.org) with npm
2121

22-
Then run `npm install` to install dependencies and `npm run build` to start the build. Check [build.fsx](https://github.com/fable-compiler/Fable/blob/4839311afe4cfc3fd0849915c7cdf831ca1ab74c/build.fsx#L218) for other build targets.
23-
For example: `npm run build compiler`.
22+
Then run `npm install` to install dependencies and `npm run build` at the root folder to start the build. Check [build.fsx](https://github.com/fable-compiler/Fable/blob/4839311afe4cfc3fd0849915c7cdf831ca1ab74c/build.fsx#L218) for other build targets. For example: `npm run build compiler`.
2423

2524
After that, if you want to quickly try changes to Fable source, please check `src/quicktest/QuickTest.fs`.
2625

@@ -47,7 +46,6 @@ Many of you are making really useful contributions that you also need for your o
4746
}
4847
```
4948

50-
5149
**ATTENTION**: Remember to **build fable-library files beforehand**. This can be done just by building the whole project (see "Building" above) or running the `FableLibrary` FAKE target (after this, if you edit one of the src/js/fable-library JS or TS files, you can run the `FableLibraryTypescriptOnly` which is faster).
5250

5351
## Contributing

appveyor.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,24 @@ init:
44
build:
55
verbosity: detailed
66

7-
environment:
8-
nodejs_version: "10.15.0"
7+
# environment:
8+
# nodejs_version: "10.16.3"
99

1010
# cache:
1111
# - "%LOCALAPPDATA%\\Yarn"
1212

1313
# Install scripts. (runs after repo cloning)
1414
install:
15+
# Get the latest stable version of .NET Core
16+
- cmd: choco install dotnetcore-sdk --no-progress
1517
# Get the latest stable version of Node.js
16-
- ps: Install-Product node $env:nodejs_version
18+
- ps: choco install nodejs --no-progress
1719
# # Update npm
1820
# # There seems to be issues with npm 5.4 in Windows
1921
# # See https://github.com/npm/npm/issues/18380
2022
# - npm install -g [email protected]
2123

22-
os: Visual Studio 2015
24+
os: Visual Studio 2019
2325
# before_build:
2426
# - cmd: set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
2527
build_script:

0 commit comments

Comments
 (0)