Skip to content

Commit 07b7d0b

Browse files
committed
Merge remote-tracking branch 'origin/main' into e2e/macos-fresh-fixture-dir-per-call
# Conflicts: # package.json # pnpm-lock.yaml
2 parents ef26921 + df714b4 commit 07b7d0b

63 files changed

Lines changed: 1469 additions & 821 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.

benchmarks/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"bench:memory": "node memorySuiteRun.mjs"
88
},
99
"dependencies": {
10-
"@codspeed/tinybench-plugin": "^5.4.0",
10+
"@codspeed/tinybench-plugin": "^5.5.0",
1111
"@rstest/core": "workspace:*",
1212
"antd": "^6.4.3",
1313
"react": "^19.2.6",

e2e/browser-mode/fixtures/env/tests/env.test.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,11 @@ describe('browser env injection', () => {
3535
it('should expose NODE_ENV via import.meta.env in browser mode', () => {
3636
expect(import.meta.env.NODE_ENV).toBe('test');
3737
});
38+
39+
it('should expose the RSTEST flag in browser mode', () => {
40+
// Matches Node mode, where `prepare.ts` sets `process.env.RSTEST = 'true'`.
41+
// See https://github.com/web-infra-dev/rstest/issues/1351
42+
expect(process.env.RSTEST).toBe('true');
43+
expect(import.meta.env.RSTEST).toBe('true');
44+
});
3845
});

e2e/dom/fixtures/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"react-dom": "^19.2.6"
1313
},
1414
"devDependencies": {
15-
"@rsbuild/core": "~2.0.8",
16-
"@rsbuild/plugin-react": "^2.0.0",
15+
"@rsbuild/core": "~2.0.9",
16+
"@rsbuild/plugin-react": "^2.0.1",
1717
"@testing-library/dom": "^10.4.1",
1818
"@testing-library/jest-dom": "^6.9.1",
1919
"@testing-library/react": "^16.3.2",

e2e/mock/fixtures/reRexports/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"version": "1.0.0",
44
"private": true,
55
"devDependencies": {
6-
"@rsbuild/plugin-react": "^2.0.0",
6+
"@rsbuild/plugin-react": "^2.0.1",
77
"@rstest/core": "workspace:*",
88
"@testing-library/react": "^16.3.2",
99
"@types/react": "^18.3.29",
1010
"@types/react-dom": "^18.3.7",
1111
"react": "^18.3.1",
1212
"react-dom": "^18.3.1",
13-
"react-router": "^6.30.3",
14-
"react-router-dom": "^6.30.3"
13+
"react-router": "^6.30.4",
14+
"react-router-dom": "^6.30.4"
1515
}
1616
}

e2e/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"typecheck": "tsc --noEmit"
1111
},
1212
"devDependencies": {
13-
"@rsbuild/core": "~2.0.8",
14-
"@rsbuild/plugin-react": "^2.0.0",
15-
"@rslib/core": "0.21.5",
13+
"@rsbuild/core": "~2.0.9",
14+
"@rsbuild/plugin-react": "^2.0.1",
15+
"@rslib/core": "0.22.0",
1616
"@rstest/browser": "workspace:*",
1717
"@rstest/browser-react": "workspace:*",
1818
"@rstest/core": "workspace:*",
@@ -32,13 +32,13 @@
3232
"fs-extra": "^11.3.5",
3333
"is-url": "^1.2.4",
3434
"jest-image-snapshot": "^6.5.2",
35-
"memfs": "^4.57.2",
35+
"memfs": "^4.57.3",
3636
"pathe": "^2.0.3",
3737
"react": "^19.2.6",
3838
"react-dom": "^19.2.6",
3939
"redux": "^5.0.1",
4040
"strip-ansi": "^7.2.0",
41-
"tinyexec": "^1.2.2",
41+
"tinyexec": "^1.2.3",
4242
"tree-kill": "^1.2.2",
4343
"typescript": "^6.0.3"
4444
}

e2e/projects/fixtures-shard/packages/client-vue/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
"preview": "rsbuild preview"
99
},
1010
"dependencies": {
11-
"vue": "^3.5.34"
11+
"vue": "^3.5.35"
1212
},
1313
"devDependencies": {
14-
"@rsbuild/core": "~2.0.8",
15-
"@rsbuild/plugin-vue": "^1.2.8",
14+
"@rsbuild/core": "~2.0.9",
15+
"@rsbuild/plugin-vue": "^1.2.9",
1616
"@rstest/core": "workspace:*",
17-
"@vue/compiler-dom": "^3.5.34",
18-
"@vue/server-renderer": "^3.5.34",
17+
"@vue/compiler-dom": "^3.5.35",
18+
"@vue/server-renderer": "^3.5.35",
1919
"@vue/test-utils": "^2.4.10"
2020
}
2121
}

e2e/projects/fixtures-shard/packages/client/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"react-dom": "^19.2.6"
1313
},
1414
"devDependencies": {
15-
"@rsbuild/core": "~2.0.8",
16-
"@rsbuild/plugin-react": "^2.0.0",
15+
"@rsbuild/core": "~2.0.9",
16+
"@rsbuild/plugin-react": "^2.0.1",
1717
"@testing-library/dom": "^10.4.1",
1818
"@testing-library/jest-dom": "^6.9.1",
1919
"@testing-library/react": "^16.3.2",

e2e/projects/fixtures/packages/client-vue/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
"preview": "rsbuild preview"
99
},
1010
"dependencies": {
11-
"vue": "^3.5.34"
11+
"vue": "^3.5.35"
1212
},
1313
"devDependencies": {
14-
"@rsbuild/core": "~2.0.8",
15-
"@rsbuild/plugin-vue": "^1.2.8",
14+
"@rsbuild/core": "~2.0.9",
15+
"@rsbuild/plugin-vue": "^1.2.9",
1616
"@rstest/core": "workspace:*",
17-
"@vue/compiler-dom": "^3.5.34",
18-
"@vue/server-renderer": "^3.5.34",
17+
"@vue/compiler-dom": "^3.5.35",
18+
"@vue/server-renderer": "^3.5.35",
1919
"@vue/test-utils": "^2.4.10"
2020
}
2121
}

e2e/projects/fixtures/packages/client/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"react-dom": "^19.2.6"
1313
},
1414
"devDependencies": {
15-
"@rsbuild/core": "~2.0.8",
16-
"@rsbuild/plugin-react": "^2.0.0",
15+
"@rsbuild/core": "~2.0.9",
16+
"@rsbuild/plugin-react": "^2.0.1",
1717
"@testing-library/dom": "^10.4.1",
1818
"@testing-library/jest-dom": "^6.9.1",
1919
"@testing-library/react": "^16.3.2",

e2e/ssr/fixtures/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"react-dom": "^19.2.6"
88
},
99
"devDependencies": {
10-
"@rsbuild/plugin-react": "^2.0.0",
10+
"@rsbuild/plugin-react": "^2.0.1",
1111
"@types/react": "^19.2.15",
1212
"@types/react-dom": "^19.2.3",
1313
"typescript": "^6.0.3"

0 commit comments

Comments
 (0)