Skip to content

Commit bcd5245

Browse files
authored
Merge branch 'main' into renovate/rust-toolchain
2 parents 6944468 + 8797849 commit bcd5245

File tree

1,008 files changed

+15341
-14733
lines changed

Some content is hidden

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

1,008 files changed

+15341
-14733
lines changed

.editorconfig

+8
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
1+
# https://EditorConfig.org
2+
root = true
3+
4+
[*]
5+
charset = utf-8
16
trim_trailing_whitespace = true
7+
end_of_line = lf
28
insert_final_newline = true
9+
indent_style = space
10+
indent_size = 4

.github/CODEOWNERS

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Default to project owner @Boshen
2+
3+
@Boshen
4+
5+
# Ignore lock files
6+
7+
Cargo.lock
8+
pnpm-lock.yaml
9+
10+
# Crates
11+
12+
/crates/oxc_transformer @overlookmotel @dunqing
13+
/crates/oxc_semantic @Boshen @dunqing
14+
/crates/oxc_data_structures @overlookmotel
15+
/crates/oxc_traverse @overlookmotel
16+
/crates/oxc_isolated_declarations @dunqing
17+
/tasks/ast_tools

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
RUSTFLAGS: "--cfg tokio_unstable -C target-feature=+atomics,+bulk-memory,+mutable-globals,+simd128 -C link-args=--max-memory=67108864"
105105
CARGO_TARGET_WASM32_WASIP1_THREADS_RUNNER: "wasmtime run -W bulk-memory=y -W threads=y -S threads=y --dir=${{ github.workspace }}::${{ github.workspace }} --"
106106
# Insta is not able to run on wasmtime, omit the packages that depend on it
107-
TEST_FLAGS: "-p oxc_sourcemap -p oxc_ast -p oxc_cfg -p oxc_index -p oxc_regular_expression -p oxc_module_lexer -- --nocapture"
107+
TEST_FLAGS: "-p oxc_ast -p oxc_cfg -p oxc_index -p oxc_regular_expression -p oxc_module_lexer -- --nocapture"
108108
steps:
109109
- uses: taiki-e/checkout-action@v1
110110
- uses: Boshen/setup-rust@main

.github/workflows/ci_vscode.yml

+69
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
name: CI VSCode
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
types: [opened, synchronize]
7+
paths:
8+
- "pnpm-lock.yaml"
9+
- "crates/oxc_language_server/**"
10+
- "editors/vscode/**"
11+
- ".github/worfkflows/ci_vscode.yml"
12+
push:
13+
branches:
14+
- main
15+
- "renovate/**"
16+
paths:
17+
- "pnpm-lock.yaml"
18+
- "crates/oxc_language_server/**"
19+
- "editors/vscode/**"
20+
- ".github/worfkflows/ci_vscode.yml"
21+
22+
concurrency:
23+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
24+
cancel-in-progress: ${{ github.ref_name != 'main' }}
25+
26+
jobs:
27+
compile:
28+
name: Compile
29+
runs-on: ubuntu-latest
30+
steps:
31+
- uses: taiki-e/checkout-action@v1
32+
- uses: ./.github/actions/pnpm
33+
34+
- name: Compile VSCode
35+
working-directory: editors/vscode
36+
run: pnpm run compile
37+
38+
lint:
39+
name: Lint
40+
runs-on: ubuntu-latest
41+
steps:
42+
- uses: taiki-e/checkout-action@v1
43+
- uses: ./.github/actions/pnpm
44+
45+
- name: Lint VSCode
46+
working-directory: editors/vscode
47+
run: pnpm run lint
48+
49+
type-check:
50+
name: Type-Check
51+
runs-on: ubuntu-latest
52+
steps:
53+
- uses: taiki-e/checkout-action@v1
54+
- uses: ./.github/actions/pnpm
55+
56+
- name: Type-Check VSCode
57+
working-directory: editors/vscode
58+
run: pnpm run type-check
59+
60+
test:
61+
name: Test
62+
runs-on: ubuntu-latest
63+
steps:
64+
- uses: taiki-e/checkout-action@v1
65+
- uses: ./.github/actions/pnpm
66+
67+
- name: Test VSCode
68+
working-directory: editors/vscode
69+
run: xvfb-run -a pnpm run test

.github/workflows/codecov.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666

6767
- name: Upload to codecov.io
6868
if: env.CODECOV_TOKEN
69-
uses: codecov/codecov-action@v4
69+
uses: codecov/codecov-action@v5
7070
with:
7171
token: ${{ secrets.CODECOV_TOKEN }}
7272
fail_ci_if_error: true

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ target/
1111
/tasks/compat_data/node_modules/
1212

1313
# vscode
14+
/editors/vscode/.vscode-test/
1415
/editors/vscode/node_modules/
1516
/editors/vscode/icon.png
1617
/editors/vscode/out/

.vscode/extensions.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"recommendations": [
3+
"rust-lang.rust-analyzer", // official rust extension
4+
"vadimcn.vscode-lldb", // for debugging
5+
"tamasfe.even-better-toml" // toml syntax
6+
]
7+
}

Cargo.lock

+28-26
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)