Skip to content

Commit a43b9fe

Browse files
SyMindSyMind
committed
chore: merge origin main
2 parents f3ca17f + cae95f1 commit a43b9fe

File tree

253 files changed

+3510
-2434
lines changed

Some content is hidden

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

253 files changed

+3510
-2434
lines changed

‎.github/workflows/ci-lint.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: CI-Lint
22

33
on:
44
pull_request:
5-
types: [ opened, synchronize ]
5+
types: [opened, synchronize]
66
merge_group:
7-
types: [ checks_requested ]
7+
types: [checks_requested]
88
workflow_dispatch:
99
push:
1010
branches:
@@ -38,7 +38,7 @@ jobs:
3838
lint:
3939
name: Lint and format code
4040
runs-on: ubuntu-latest
41-
needs: [ check-changed ]
41+
needs: [check-changed]
4242
if: ${{ needs.check-changed.outputs.code_changed == 'true' }}
4343
steps:
4444
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -81,7 +81,7 @@ jobs:
8181
lint-website:
8282
name: Lint and format website
8383
runs-on: ubuntu-latest
84-
needs: [ check-changed ]
84+
needs: [check-changed]
8585
if: ${{ needs.check-changed.outputs.document_changed == 'true' }}
8686
steps:
8787
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -125,7 +125,7 @@ jobs:
125125
# When code changed, it will check if any of the test jobs failed.
126126
# When *only* doc changed, it will run as success directly
127127
name: Lint Required Check
128-
needs: [ lint, lint-website, check-changed, spell, pnpm_lockfile_check ]
128+
needs: [lint, lint-website, check-changed, spell, pnpm_lockfile_check]
129129
if: ${{ always() && !cancelled() }}
130130
runs-on: ubuntu-latest
131131
steps:
@@ -137,6 +137,6 @@ jobs:
137137
}}
138138
run: echo "Code Lint Failed" && exit 1
139139
- name: Doc Lint Check
140-
if: ${{ needs.check-changed.outputs.document_changed == 'true'
140+
if: ${{ needs.check-changed.outputs.document_changed == 'true'
141141
&& needs.lint-website.result != 'success'}}
142142
run: echo "Website Lint Failed" && exit 1

‎.github/workflows/ci-rust.yaml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@ name: CI-Rust
22

33
on:
44
pull_request:
5-
types: [ opened, synchronize ]
5+
types: [opened, synchronize]
66
merge_group:
7-
types: [ checks_requested ]
7+
types: [checks_requested]
88
workflow_dispatch:
99
push:
1010
branches:
1111
- main
1212
paths:
13-
- '.github/workflows/**'
14-
- 'crates/**'
15-
- 'Cargo.lock'
16-
- 'Cargo.toml'
17-
- 'rust-toolchain.toml'
13+
- ".github/workflows/**"
14+
- "crates/**"
15+
- "Cargo.lock"
16+
- "Cargo.toml"
17+
- "rust-toolchain.toml"
1818
tags-ignore:
1919
- "**"
2020
jobs:
@@ -39,7 +39,7 @@ jobs:
3939
- "website/**"
4040
rust_check:
4141
name: Rust check
42-
needs: [ check-changed ]
42+
needs: [check-changed]
4343
if: ${{ needs.check-changed.outputs.code_changed == 'true' }}
4444
runs-on: ${{ fromJSON(vars.LINUX_SELF_HOSTED_RUNNER_LABELS || '"ubuntu-22.04"') }}
4545
steps:
@@ -72,7 +72,7 @@ jobs:
7272
run: taplo format --check '.cargo/*.toml' './crates/**/Cargo.toml' './Cargo.toml'
7373

7474
rust_unused_dependencies:
75-
needs: [ check-changed ]
75+
needs: [check-changed]
7676
if: ${{ needs.check-changed.outputs.code_changed == 'true' }}
7777
name: Check Rust Dependencies
7878
runs-on: ${{ fromJSON(vars.LINUX_SELF_HOSTED_RUNNER_LABELS || '"ubuntu-22.04"') }}
@@ -87,7 +87,7 @@ jobs:
8787
with:
8888
tool: [email protected]
8989
- name: Check licenses
90-
run: cargo deny check license
90+
run: cargo deny check license bans
9191

9292
- uses: cargo-bins/cargo-binstall@5cbf019d8cb9b9d5b086218c41458ea35d817691 # v1.12.5
9393
- run: cargo binstall --no-confirm [email protected] --force
@@ -96,7 +96,7 @@ jobs:
9696
rust_test:
9797
name: Rust test
9898
runs-on: ${{ fromJSON(vars.LINUX_SELF_HOSTED_RUNNER_LABELS || '"ubuntu-22.04"') }}
99-
needs: [ check-changed ]
99+
needs: [check-changed]
100100
if: ${{ needs.check-changed.outputs.code_changed == 'true' }}
101101
steps:
102102
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -149,7 +149,7 @@ jobs:
149149
# When code changed, it will check if any of the test jobs failed.
150150
# When *only* doc changed, it will run as success directly
151151
name: Rust Test Required Check
152-
needs: [ rust_test, rust_check, check-changed ]
152+
needs: [rust_test, rust_check, check-changed]
153153
if: ${{ always() && !cancelled() }}
154154
runs-on: ubuntu-latest
155155
steps:
@@ -160,4 +160,3 @@ jobs:
160160
run: echo "Tess Failed" && exit 1
161161
- name: No check to Run test
162162
run: echo "Success"
163-

‎.github/workflows/ci.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI
22

33
on:
44
merge_group:
5-
types: [ checks_requested ]
5+
types: [checks_requested]
66
workflow_dispatch:
77
inputs:
88
debug_enabled:
@@ -11,7 +11,7 @@ on:
1111
required: false
1212
default: false
1313
pull_request:
14-
types: [ opened, synchronize ]
14+
types: [opened, synchronize]
1515
push:
1616
branches:
1717
- main
@@ -30,7 +30,6 @@ permissions:
3030
issues: write
3131

3232
jobs:
33-
3433
check-changed:
3534
runs-on: ubuntu-latest
3635
name: Check Source Changed
@@ -53,7 +52,7 @@ jobs:
5352
5453
test-linux:
5554
name: Test Linux
56-
needs: [ check-changed ]
55+
needs: [check-changed]
5756
if: ${{ needs.check-changed.outputs.code_changed == 'true' }}
5857
uses: ./.github/workflows/reusable-build.yml
5958
with:
@@ -64,7 +63,7 @@ jobs:
6463

6564
test-windows:
6665
name: Test Windows
67-
needs: [ check-changed ]
66+
needs: [check-changed]
6867
if: ${{ needs.check-changed.outputs.code_changed == 'true' }}
6968
uses: ./.github/workflows/reusable-build.yml
7069
with:
@@ -75,7 +74,7 @@ jobs:
7574

7675
test-mac:
7776
name: Test Mac ARM64
78-
needs: [ check-changed ]
77+
needs: [check-changed]
7978
if: ${{ needs.check-changed.outputs.code_changed == 'true' }}
8079
uses: ./.github/workflows/reusable-build.yml
8180
with:
@@ -86,7 +85,7 @@ jobs:
8685

8786
test-wasm:
8887
name: Test WASM
89-
needs: [ check-changed ]
88+
needs: [check-changed]
9089
if: ${{ needs.check-changed.outputs.code_changed == 'true' }}
9190
uses: ./.github/workflows/reusable-build.yml
9291
with:
@@ -97,7 +96,7 @@ jobs:
9796

9897
failure_notification:
9998
name: Failure Notification
100-
needs: [ test-linux, test-windows, test-mac ]
99+
needs: [test-linux, test-windows, test-mac]
101100
if: ${{ failure() && !cancelled() && github.ref_name == 'main' && github.repository_owner == 'web-infra-dev' }}
102101
runs-on: ubuntu-latest
103102
steps:
@@ -119,7 +118,7 @@ jobs:
119118
# When code changed, it will check if any of the test jobs failed.
120119
# When *only* doc changed, it will run as success directly
121120
name: Test Required Check
122-
needs: [ test-linux, test-windows, test-mac, check-changed ]
121+
needs: [test-linux, test-windows, test-mac, check-changed]
123122
if: ${{ always() && !cancelled() }}
124123
runs-on: ubuntu-latest
125124
steps:

‎.github/workflows/issue-close-require.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,3 @@ jobs:
4040
inactive-day: 14
4141
body: |
4242
Since the issue was labeled with `awaiting more feedback`, but no response in 14 days. This issue will be closed. Feel free to comment and reopen it if you have any further questions.
43-

‎.github/workflows/release-otp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
force-use-github-runner: true
4545

4646
build:
47-
needs: [ get-runner-labels ]
47+
needs: [get-runner-labels]
4848
strategy:
4949
fail-fast: false # Build and test everything so we can look at all the errors
5050
matrix:

‎.github/workflows/reusable-build-build.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -170,13 +170,9 @@ jobs:
170170
# WASM
171171
- name: Build wasm32-wasip1-threads with linux in Docker
172172
if: ${{ inputs.target == 'wasm32-wasip1-threads' }}
173-
uses: ./.github/actions/docker/linux-build
174-
with:
175-
image: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian
176-
target: ${{ inputs.target }}
177-
profile: ${{ inputs.profile }}
178-
plugin: false
179-
pre: unset CC_x86_64_unknown_linux_gnu && unset CC # for jemallocator to compile
173+
run: |
174+
unset CC_x86_64_unknown_linux_gnu && unset CC # for jemallocator to compile
175+
DISABLE_PLUGIN=1 RUST_TARGET=wasm32-wasip1-threads pnpm --filter @rspack/binding build:release --profile ${{ inputs.profile }}
180176
181177
- name: Upload artifact
182178
uses: ./.github/actions/artifact/upload

‎.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ package.json
44
dist/
55
packages/rspack/src/config/schema.check.js
66

7+
# Ignore lock files
8+
pnpm-lock.yaml
9+
710
# Ignore example fixtures
811

912
# Ignore test related

‎.vscode/settings.json

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,9 @@
1818
"cSpell.caseSensitive": true,
1919
"rust-analyzer.procMacro.enable": true,
2020
"rust-analyzer.procMacro.attributes.enable": true,
21-
"rust-analyzer.linkedProjects": [
22-
"Cargo.toml"
23-
],
21+
"rust-analyzer.linkedProjects": ["Cargo.toml"],
2422
"rust-analyzer.cargo.targetDir": true, // Don't let RA blocking cargo build
25-
"rust-analyzer.cargo.features": [
26-
"rspack_cacheable/noop"
27-
],
23+
"rust-analyzer.cargo.features": ["rspack_cacheable/noop"],
2824
"files.associations": {
2925
"*.snap": "markdown",
3026
"*.snap.txt": "markdown",
@@ -41,9 +37,10 @@
4137
"rslib",
4238
"Rslib",
4339
"rspack",
40+
"rstack",
4441
"threejs",
4542
"tokio",
4643
"ukey",
4744
"Ukey"
4845
]
49-
}
46+
}

‎Cargo.lock

Lines changed: 31 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)