Skip to content

Commit

Permalink
Merge branch 'master' into quotations
Browse files Browse the repository at this point in the history
  • Loading branch information
alfonsogarciacaro committed Apr 27, 2020
2 parents cd1cb8f + 131704c commit d5227d6
Show file tree
Hide file tree
Showing 543 changed files with 73,262 additions and 70,870 deletions.
14 changes: 14 additions & 0 deletions .docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
FROM gitpod/workspace-full:latest

USER root

# Add here the instruction who needs root user


USER gitpod

# Install dotnet core
ENV PATH=$HOME/.dotnet:$PATH
RUN wget https://dotnetwebsite.azurewebsites.net/download/dotnet-core/scripts/v1/dotnet-install.sh && \
bash dotnet-install.sh -v 3.1.201 && \
rm -rf dotnet-install.sh;
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.vscode/
.idea/
.ionide/

node_modules/
temp/
Expand Down
36 changes: 36 additions & 0 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
image:
file: .docker/Dockerfile

tasks:
- before: dotnet restore
- init: npm install && npm run build compiler

github:
prebuilds:
# enable for the master/default branch (defaults to true)
master: true
# enable for all branches in this repo (defaults to false)
branches: false
# enable for pull requests coming from this repo (defaults to true)
pullRequests: true
# enable for pull requests coming from forks (defaults to false)
pullRequestsFromForks: true
# add a check to pull requests (defaults to true)
addCheck: true
# add a "Review in Gitpod" button as a comment to pull requests (defaults to false)
addComment: true
# add a "Review in Gitpod" button to the pull request's description (defaults to false)
addBadge: false
# add a label once the prebuild is ready to pull requests (defaults to false)
addLabel: false

vscode:
extensions:
- [email protected]:QnOrf5fk6KiVaQs4cNEP+w==
- [email protected]:8IqxuxCVol2WnScJc5xVzg==
- [email protected]:/wXbNRm+2kunH5HbQqfnXA==
- [email protected]:xeHlNzPEF04yFqz/xKCD5w==
- [email protected]:0qxXuhq6eO066etkNQrKCQ==
- [email protected]:jGTZwg0ChZg3eEKHC+UO+w==
- [email protected]:zoSeoEOMfrwN0BMBC8VvqQ==
- [email protected]:GNDO73Cmp0fYDiLNxVkbsQ==
19 changes: 14 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,27 @@
language: csharp
os: linux
dist: trusty
sudo: false
dotnet: 2.1.403
dist: xenial
sudo: required
# dotnet: 3.1.201
mono: none

# cache:
# yarn: true

addons:
snaps:
- name: dotnet-sdk
classic: true
channel: latest/stable

before_script:
- nvm install 10.15.0
- nvm use 10.15.0
- sudo snap alias dotnet-sdk.dotnet dotnet
- nvm install node
- nvm use node
# # Update npm
# - npm install -g npm

script:
- dotnet --version
- node --version
- npm install && npm test
16 changes: 8 additions & 8 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
"type": "node",
"request": "launch",
"name": "Launch Quicktest.js",
"program": "${workspaceRoot}/src/tools/temp/QuickTest.js",
"program": "${workspaceRoot}/src/quicktest/bin/QuickTest.js",
"args": ["--help"],
"cwd": "${workspaceRoot}/src/tools/temp",
"cwd": "${workspaceRoot}/src/quicktest",
"stopOnEntry": true
},
{
Expand All @@ -48,19 +48,19 @@
{
"type": "node",
"request": "launch",
"name": "bench-compile tests (Node)",
"name": "bench-compile (Node)",
"program": "${workspaceRoot}/src/fable-standalone/test/bench-compiler/out-node/app.js",
"args": ["${workspaceRoot}/tests/Main/Fable.Tests.fsproj", "out-tests", "--commonjs"],
// "args": ["${workspaceRoot}/../fable-test/fable-test.fsproj", "out-test", "--commonjs", "--optimize-fcs"],
// "args": ["${workspaceRoot}/tests/Main/Fable.Tests.fsproj", "out-tests", "--commonjs"],
"args": ["${workspaceRoot}/../fable-test/fable-test.fsproj", "out-test", "--commonjs", "--optimize-fcs"],
"cwd": "${workspaceRoot}/src/fable-standalone/test/bench-compiler"
},
{
"type": "coreclr",
"request": "launch",
"name": "bench-compile tests (.NET)",
"name": "bench-compile (.NET)",
"program": "${workspaceFolder}/src/fable-standalone/test/bench-compiler/bin/Debug/netcoreapp2.1/bench-compiler.dll",
"args": ["${workspaceRoot}/tests/Main/Fable.Tests.fsproj", "out-tests", "--commonjs"],
// "args": ["${workspaceRoot}/../fable-test/fable-test.fsproj", "out-test", "--commonjs", "--optimize-fcs"],
// "args": ["${workspaceRoot}/tests/Main/Fable.Tests.fsproj", "out-tests", "--commonjs"],
"args": ["${workspaceRoot}/../fable-test/fable-test.fsproj", "out-test", "--commonjs", "--optimize-fcs"],
"cwd": "${workspaceFolder}/src/fable-standalone/test/bench-compiler"
},
{
Expand Down
18 changes: 18 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"files.exclude": {
"**/.git": true,
"**/.svn": true,
"**/.hg": true,
"**/CVS": true,
"**/.DS_Store": true,
"**/bin": true,
"**/obj": true,
"**/.fake": true,
"**/packages": true,
"**/node_modules": true,
"**/bower_components": true
},
"files.trimTrailingWhitespace": true,
"files.trimFinalNewlines": true,
"gitlens.codeLens.enabled": false
}
15 changes: 9 additions & 6 deletions Fable.sln
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@


Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
# Visual Studio 15
VisualStudioVersion = 15.0.26124.0
MinimumVisualStudioVersion = 15.0.26124.0
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Quicktest", "src\quicktest\Quicktest.fsproj", "{661A1972-0D06-46E8-958C-55325E5D520C}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Quicktest", "src\quicktest\QuickTest.fsproj", "{661A1972-0D06-46E8-958C-55325E5D520C}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fable.Transforms", "src\Fable.Transforms\Fable.Transforms.fsproj", "{E55F3DA2-86B7-4E73-9700-EC6490043268}"
EndProject
Expand All @@ -30,9 +30,6 @@ Global
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{661A1972-0D06-46E8-958C-55325E5D520C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{661A1972-0D06-46E8-958C-55325E5D520C}.Debug|Any CPU.Build.0 = Debug|Any CPU
Expand Down Expand Up @@ -143,4 +140,10 @@ Global
{D8C8FBCB-54AF-49C3-93B1-5460668E32EC}.Release|x86.ActiveCfg = Release|Any CPU
{D8C8FBCB-54AF-49C3-93B1-5460668E32EC}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {204581E6-42C5-4EE2-A4A9-713C32A17CF2}
EndGlobalSection
EndGlobal
12 changes: 5 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# F# |> BABEL

### The compiler that emits JavaScript you can be proud of!

[![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)

[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/fable-compiler/Fable/)

[Follow us on Twitter!](https://twitter.com/FableCompiler)

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!
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!

## Getting started

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

## Building

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

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.
For example: `npm run build compiler`.
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`.

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

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


**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).

## Contributing
Expand Down
10 changes: 6 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,24 @@ init:
build:
verbosity: detailed

environment:
nodejs_version: "10.15.0"
# environment:
# nodejs_version: "10.16.3"

# cache:
# - "%LOCALAPPDATA%\\Yarn"

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

os: Visual Studio 2015
os: Visual Studio 2019
# before_build:
# - cmd: set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
build_script:
Expand Down
Loading

0 comments on commit d5227d6

Please sign in to comment.