Skip to content

Commit daa2a58

Browse files
committed
Merge branch 'main' into token_eight_bytes
2 parents 84bc0de + 63eb298 commit daa2a58

863 files changed

Lines changed: 32332 additions & 28025 deletions

File tree

Some content is hidden

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

.cargo/config.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ rule = "run -p rulegen"
1010

1111
# Build oxlint in release mode
1212
oxlint = "build --release --bin oxlint --features allocator"
13+
14+
[resolver]
15+
incompatible-rust-versions = "fallback"

.devcontainer/devcontainer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818
"customizations": {
1919
"vscode": {
2020
"extensions": [
21-
"rust-lang.rust-analyzer"
21+
"rust-lang.rust-analyzer",
22+
"EditorConfig.EditorConfig",
23+
"tamasfe.even-better-toml",
24+
"eamodio.gitlens"
2225
]
2326
}
2427
},

.github/.generated_ast_watch_list.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ src:
2222
- 'crates/oxc_ast/src/generated/derive_content_eq.rs'
2323
- 'crates/oxc_regular_expression/src/generated/derive_content_eq.rs'
2424
- 'crates/oxc_syntax/src/generated/derive_content_eq.rs'
25-
- 'crates/oxc_ast/src/generated/derive_content_hash.rs'
26-
- 'crates/oxc_regular_expression/src/generated/derive_content_hash.rs'
27-
- 'crates/oxc_syntax/src/generated/derive_content_hash.rs'
2825
- 'crates/oxc_ast/src/generated/derive_estree.rs'
2926
- 'crates/oxc_regular_expression/src/generated/derive_estree.rs'
3027
- 'crates/oxc_span/src/generated/derive_estree.rs'

.github/actions/clone-submodules/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ runs:
1717
show-progress: false
1818
repository: babel/babel
1919
path: tasks/coverage/babel
20-
ref: 54a8389fa31ce4fd18b0335b05832dc1ad3cc21f
20+
ref: acbc09a87016778c1551ab5e7162fdd0e70b6663
2121

2222
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
2323
with:

.github/workflows/benchmark.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
run: cargo codspeed run
101101

102102
- name: Upload bench data artefact
103-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
103+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
104104
with:
105105
name: result-${{ matrix.component }}
106106
path: ${{ env.DATA_DIR }} # env.DATA_DIR from `capture.mjs`
@@ -133,7 +133,7 @@ jobs:
133133
rm target/codspeed/oxc_benchmark/*.d
134134
135135
- name: Upload Binary
136-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
136+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
137137
with:
138138
if-no-files-found: error
139139
name: benchmark-linter
@@ -168,7 +168,7 @@ jobs:
168168
chmod +x ./target/codspeed/oxc_benchmark/*
169169
170170
- name: Install codspeed
171-
uses: taiki-e/install-action@8c39981484df4e7ba41af8e8e078ac546d5e1b11 # v2.46.8
171+
uses: taiki-e/install-action@df5dec2a2f73ff6dbace3072df1242669b7bb7d1 # v2.47.9
172172
with:
173173
tool: cargo-codspeed
174174

@@ -193,7 +193,7 @@ jobs:
193193
run: cargo codspeed run
194194

195195
- name: Upload bench data artefact
196-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
196+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
197197
with:
198198
name: result-linter${{ matrix.fixture }}
199199
path: ${{ env.DATA_DIR }} # env.DATA_DIR from `capture.mjs`

.github/workflows/cargo-llvm-lines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: oxc-project/setup-rust@cd82e1efec7fef815e2c23d296756f31c7cdc03d # v1.0.0
2121

2222
- name: Install cargo-llvm-lines
23-
uses: taiki-e/install-action@8c39981484df4e7ba41af8e8e078ac546d5e1b11 # v2.46.8
23+
uses: taiki-e/install-action@df5dec2a2f73ff6dbace3072df1242669b7bb7d1 # v2.47.9
2424
with:
2525
tool: cargo-llvm-lines
2626

.github/workflows/ci.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
# Unsung heros of the internet, who led me here to speed up window's slowness:
5656
# https://github.com/actions/cache/issues/752#issuecomment-1847036770
5757
# https://github.com/astral-sh/uv/blob/502e04200d52de30d3159894833b3db4f0d6644d/.github/workflows/ci.yml#L158
58-
- uses: samypr100/setup-dev-drive@d3f2420389ae9ea6e91dd178779e122c42352047 # v3
58+
- uses: samypr100/setup-dev-drive@c13db539c98b4353ff2bc78fb8f775b94336025b # v3
5959
with:
6060
workspace-copy: true
6161
drive-size: 8GB
@@ -77,7 +77,7 @@ jobs:
7777
rustup show
7878
git restore .
7979
80-
- uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2
80+
- uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2
8181
with:
8282
workspaces: ${{ env.DEV_DRIVE_WORKSPACE }}
8383
save-if: ${{ github.ref_name == 'main' }}
@@ -162,6 +162,7 @@ jobs:
162162
cache-key: clippy
163163
components: clippy
164164
- run: cargo lint -- -D warnings
165+
- run: cargo lint --profile dev-no-debug-assertions -- -D warnings
165166
- name: Check Char and Byte Offset
166167
run: |
167168
npm i @ast-grep/cli -g
@@ -313,9 +314,9 @@ jobs:
313314
cache-key: warm
314315
- uses: ./.github/actions/pnpm
315316
if: steps.filter.outputs.src == 'true'
316-
- run: pnpm run build-dev
317-
if: steps.filter.outputs.src == 'true'
318-
- run: pnpm run test
319-
if: steps.filter.outputs.src == 'true'
320-
- run: git diff --exit-code # Must commit everything
321-
if: steps.filter.outputs.src == 'true'
317+
- if: steps.filter.outputs.src == 'true'
318+
run: |
319+
pnpm run build-dev
320+
pnpm run test
321+
pnpm --filter e2e run test
322+
git diff --exit-code # Must commit everything

.github/workflows/ci_security.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
with:
2626
persist-credentials: false
2727

28-
- uses: taiki-e/install-action@8c39981484df4e7ba41af8e8e078ac546d5e1b11 # v2.46.8
28+
- uses: taiki-e/install-action@df5dec2a2f73ff6dbace3072df1242669b7bb7d1 # v2.47.9
2929
with:
3030
tool: zizmor
3131

@@ -35,7 +35,7 @@ jobs:
3535
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3636

3737
- name: Upload SARIF file
38-
uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3
38+
uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3
3939
with:
4040
sarif_file: results.sarif
4141
category: zizmor

.github/workflows/codecov.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
run: cargo codecov --lcov --output-path lcov.info
4141

4242
- name: Upload Artifact
43-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
43+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
4444
with:
4545
name: codecov
4646
path: lcov.info
@@ -66,7 +66,7 @@ jobs:
6666

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

.github/workflows/link-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
uses: taiki-e/checkout-action@b13d20b7cda4e2f325ef19895128f7ff735c0b3d # v1.3.1
3030

3131
- name: Check Links
32-
uses: lycheeverse/lychee-action@f81112d0d2814ded911bd23e3beaa9dda9093915 # v2.1.0
32+
uses: lycheeverse/lychee-action@f796c8b7d468feb9b8c0a46da3fac0af6874d374 # v2.2.0
3333
with:
3434
# For parameter description, see https://github.com/lycheeverse/lychee#commandline-parameters
3535
# Accept 429 for now due to GitHub rate limit.

0 commit comments

Comments
 (0)