Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: fable-compiler/Fable
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4.15.0
Choose a base ref
...
head repository: fable-compiler/Fable
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Loading
Showing 707 changed files with 70,351 additions and 33,980 deletions.
6 changes: 3 additions & 3 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -3,19 +3,19 @@
"isRoot": true,
"tools": {
"fantomas": {
"version": "6.2.3",
"version": "7.0.0",
"commands": [
"fantomas"
]
},
"husky": {
"version": "0.6.4",
"version": "0.7.2",
"commands": [
"husky"
]
},
"fsharp-analyzers": {
"version": "0.24.0",
"version": "0.28.0",
"commands": [
"fsharp-analyzers"
]
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ RUN apt-get update && apt-get install -y xz-utils

# Options
# Let it here to avoid conflicts with Microsoft options !!!
ARG DOTNET_VERSION=8.0.100
ARG DOTNET_VERSION=9.0.101
ARG NODE_VERSION=18.8.0
ARG PYTHON_VERSION=3.10.0
ARG DART_VERSION=3.1.2
6 changes: 5 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@
// Restore the dotnet tools when the container is attached
// This makes fanomas available directly without having the user needing to
// run `dotnet tool restore` or build the project once
"postAttachCommand": "/bin/zsh -c 'source ~/.zshrc && dotnet tool restore'"
"postAttachCommand": "/bin/zsh -c 'source ~/.zshrc && dotnet tool restore'",

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],
@@ -65,4 +65,8 @@
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root",

"remoteEnv": {
"TZ": "Europe/Paris"
}

}
88 changes: 45 additions & 43 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4

- name: Restore tools
run: dotnet tool restore
@@ -56,7 +56,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.x'

- name: Setup Node.js environment
uses: actions/setup-node@v2.4.1
@@ -74,12 +74,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.x'

- name: Setup Node.js environment
uses: actions/setup-node@v2.4.1
@@ -95,12 +95,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.x'

- name: Setup Node.js environment
uses: actions/setup-node@v2.4.1
@@ -113,12 +113,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.x'

- name: Setup Node.js environment
uses: actions/setup-node@v2.4.1
@@ -140,7 +140,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.x'

- name: Setup dotnet tools
run: dotnet tool restore
@@ -181,12 +181,12 @@ jobs:
test: ["default", "no_std", "threaded"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.x'

- name: Setup Node.js environment
uses: actions/setup-node@v2.4.1
@@ -207,12 +207,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.x'

- name: Setup Dart SDK
uses: dart-lang/setup-dart@v1.3
@@ -222,37 +222,39 @@ jobs:

# Separate job to run F# analyzers
analyzers:
runs-on: windows-latest
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
steps:
- uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v4
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: '9.0.x'

- name: Restore tools
run: dotnet tool restore
- name: Restore tools
run: dotnet tool restore

- name: Build solution
run: dotnet build -c Release Fable.sln
- name: Build solution
run: dotnet build -c Release Fable.sln

- name: Run analyzers for Fable.AST
run: dotnet msbuild /t:AnalyzeFSharpProject src/Fable.AST/Fable.AST.fsproj
continue-on-error: true
- name: Run analyzers for Fable.AST
run: dotnet msbuild /t:AnalyzeFSharpProject src/Fable.AST/Fable.AST.fsproj
continue-on-error: true

- name: Run analyzers for Rust.AST
run: dotnet msbuild /t:AnalyzeFSharpProject src/Fable.Transforms/Rust/AST/Rust.AST.fsproj
continue-on-error: true
- name: Run analyzers for Rust.AST
run: dotnet msbuild /t:AnalyzeFSharpProject src/Fable.Transforms/Rust/AST/Rust.AST.fsproj
continue-on-error: true

- name: Run analyzers Fable.Transforms
run: dotnet msbuild /t:AnalyzeFSharpProject src/Fable.Transforms/Fable.Transforms.fsproj
continue-on-error: true
- name: Run analyzers Fable.Transforms
run: dotnet msbuild /t:AnalyzeFSharpProject src/Fable.Transforms/Fable.Transforms.fsproj
continue-on-error: true

- name: Run analyzers Fable.Compiler
run: dotnet msbuild /t:AnalyzeFSharpProject src/Fable.Compiler/Fable.Compiler.fsproj
continue-on-error: true
- name: Run analyzers Fable.Compiler
run: dotnet msbuild /t:AnalyzeFSharpProject src/Fable.Compiler/Fable.Compiler.fsproj
continue-on-error: true

- name: Upload SARIF files
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: src/reports
- name: Upload SARIF files
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: src/reports
8 changes: 6 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -10,8 +10,8 @@ temp*/
*.fs.ts.map
*.fs.php
*.fs.dart
src/fable-library/*.js
src/fable-library/BigInt/*.js
src/fable-library-ts/*.js
src/fable-library-ts/BigInt/*.js
src/quicktest/**/*.js
src/quicktest-py/**/*.py
src/quicktest-rust/**/*.rs
@@ -225,3 +225,7 @@ tests/**/*.actual

# Temp proj file
*.fable-temp.csproj

# Rust
target/
Cargo.lock
Loading