Skip to content

Commit c0569a4

Browse files
author
nyqykk
committed
chore: sync main code
2 parents e0e6fa3 + 93d150d commit c0569a4

File tree

365 files changed

+2360
-1279
lines changed

Some content is hidden

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

365 files changed

+2360
-1279
lines changed

.github/renovate.json5

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,40 +5,40 @@
55
packageRules: [
66
// Use chore as semantic commit type for commit messages
77
{
8-
matchPackagePatterns: ['*'],
8+
matchPackageNames: ['**'],
99
semanticCommitType: 'chore',
1010
// always bump package.json
1111
rangeStrategy: 'bump',
1212
},
1313
{
1414
groupName: 'babel',
15-
packagePatterns: ['babel'],
15+
matchPackageNames: ['**babel**'],
1616
groupSlug: 'babel',
1717
},
1818
{
1919
groupName: 'rsbuild',
20-
packagePatterns: ['rsbuild'],
20+
matchPackageNames: ['@rsbuild/**'],
2121
groupSlug: 'rsbuild',
2222
},
2323
{
2424
groupName: 'rspress',
25-
packagePatterns: ['rspress'],
25+
matchPackageNames: ['@rspress/**'],
2626
groupSlug: 'rspress',
2727
},
2828
{
2929
groupName: 'modern-js',
30-
packagePatterns: ['modern-js'],
30+
matchPackageNames: ['@modern-js/**'],
3131
groupSlug: 'modern-js',
3232
},
3333
{
3434
groupName: 'types',
35-
packagePatterns: ['^@types/'],
35+
matchPackageNames: ['@types/**'],
3636
groupSlug: 'types',
3737
},
3838
{
3939
groupName: 'all patch dependencies',
4040
groupSlug: 'all-patch',
41-
matchPackagePatterns: ['*'],
41+
matchPackageNames: ['**'],
4242
matchUpdateTypes: ['patch'],
4343
},
4444
// manually update peer dependencies

.github/workflows/test-ubuntu.yml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@ on:
1717
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1818
jobs:
1919
# ======== ut ========
20-
ut-mac:
21-
# run ut in MacOS, as SWC cases will fail in Ubuntu CI
22-
runs-on: macos-14
20+
ut-ubuntu:
21+
runs-on: ubuntu-latest
2322
strategy:
2423
matrix:
2524
node-version: [18.x]
@@ -60,8 +59,8 @@ jobs:
6059
if: steps.changes.outputs.changed == 'true'
6160
run: pnpm run test:unit
6261

63-
# ======== e2e ========
64-
e2e-ubuntu:
62+
# ======== integration && e2e ========
63+
integration-e2e-ubuntu:
6564
runs-on: ubuntu-latest
6665
strategy:
6766
matrix:
@@ -97,17 +96,21 @@ jobs:
9796

9897
- name: Install Dependencies
9998
if: steps.changes.outputs.changed == 'true'
100-
run: pnpm install && cd ./e2e && pnpx playwright install
99+
run: pnpm install && cd ./tests && npx playwright install
101100

102-
- name: E2E Artifact Test (Vitest)
101+
- name: Integration Test (Vitest)
103102
if: steps.changes.outputs.changed == 'true'
104-
run: pnpm run test:artifact
103+
run: pnpm run test:integration
105104

106105
- name: E2E Test (Playwright)
107106
if: steps.changes.outputs.changed == 'true'
108107
run: pnpm run test:e2e
109108

110-
- name: Examples Test
109+
# only run benchmark in Ubuntu
110+
- name: Benchmarks (Vitest)
111+
uses: CodSpeedHQ/action@v3
111112
if: steps.changes.outputs.changed == 'true'
112-
run: |
113-
pnpm run build:examples
113+
with:
114+
run: pnpm run test:benchmark
115+
# token retrieved from the CodSpeed app at the previous step
116+
token: ${{ secrets.CODSPEED_TOKEN }}

.github/workflows/test-windows.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ jobs:
6464
if: steps.changes.outputs.changed == 'true'
6565
run: pnpm run test:unit
6666

67-
# # ======== e2e ========
68-
e2e-windows:
67+
# # ======== integration && e2e ========
68+
integration-e2e-windows:
6969
runs-on: windows-latest
7070
strategy:
7171
matrix:
@@ -103,19 +103,14 @@ jobs:
103103
with:
104104
node-version: ${{ matrix.node-version }}
105105
cache: 'pnpm'
106-
107106
- name: Install Dependencies
108107
if: steps.changes.outputs.changed == 'true'
109-
run: pnpm install && cd ./e2e && npx playwright install
108+
run: pnpm install && cd ./tests && npx playwright install
110109

111-
- name: E2E Artifact Test (Vitest)
110+
- name: Integration Test (Vitest)
112111
if: steps.changes.outputs.changed == 'true'
113-
run: pnpm run test:artifact
112+
run: pnpm run test:integration
114113

115114
- name: E2E Test (Playwright)
116115
if: steps.changes.outputs.changed == 'true'
117116
run: pnpm run test:e2e
118-
119-
- name: Examples Test
120-
if: steps.changes.outputs.changed == 'true'
121-
run: pnpm run build:examples

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ doc_build/
1212
playwright-report/
1313
tsconfig.tsbuildinfo
1414
test-temp-*
15+
test-results
1516

1617
.vscode/**/*
1718
!.vscode/settings.json

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,6 @@ Here are the steps to publish (we generally use CI for releases and avoid publis
138138

139139
The project is still in its early stages and under active development, so it possible dependents on Rsbuild or Rspack canary versions to test the latest features. The current versions are:
140140

141-
| Package | Link |
142-
| ------------ | --------------------------------------------------------------------------------------- |
143-
| @rspack/core | https://github.com/web-infra-dev/rspack/commit/bb0219fd3eaee45d9957b4c29a176f2ac67a84ee |
141+
| Package | Link |
142+
| ------------ | ------------------------------------------------- |
143+
| @rspack/core | https://github.com/web-infra-dev/rspack/pull/7939 |

biome.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
},
3737
"linter": {
3838
"enabled": true,
39-
"ignore": ["./e2e/cases/**/*/src/*"],
39+
"ignore": ["./tests/integration/**/*/src/*"],
4040
"rules": {
4141
"recommended": true,
4242
"style": {

e2e/cases/copy/index.test.ts

Lines changed: 0 additions & 34 deletions
This file was deleted.

e2e/cases/dts/__snapshots__/index.test.ts.snap

Lines changed: 0 additions & 44 deletions
This file was deleted.

e2e/cases/sourcemap/index.test.ts

Lines changed: 0 additions & 62 deletions
This file was deleted.

e2e/vitest.config.ts

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)