Skip to content

Commit 7008dec

Browse files
9aoy9aoy
authored
Merge branch 'main' into nativeWatcher
2 parents d80fe16 + e35dc79 commit 7008dec

Some content is hidden

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

63 files changed

+1448
-1206
lines changed

‎.github/renovate.json5‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@
6969
'node',
7070
// umd tests need to lock this version
7171
'react-aliased',
72+
'vscode',
73+
'@types/vscode',
7274
],
7375
postUpdateOptions: ['pnpmDedupe'],
7476
}

‎.github/workflows/ecosystem-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
7979
- name: Setup Node.js
8080
if: steps.eco_ci.outcome == 'failure'
81-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
81+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
8282
with:
8383
node-version: 22
8484
cache: 'pnpm'

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
corepack enable
2929
3030
- name: Setup Node.js
31-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
31+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
3232
with:
3333
node-version: 22
3434
cache: 'pnpm'

‎.github/workflows/preview.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
4343
- name: Setup Node.js
4444
if: steps.changes.outputs.changed == 'true'
45-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
45+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
4646
with:
4747
node-version: 22.x
4848
cache: 'pnpm'

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
corepack enable
4343
4444
- name: Setup Node.js
45-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
45+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
4646
with:
4747
node-version: 22
4848
cache: 'pnpm'
@@ -114,7 +114,7 @@ jobs:
114114
corepack enable
115115
116116
- name: Setup Node.js
117-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
117+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
118118
with:
119119
node-version: 22
120120
cache: 'pnpm'

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
5151
- name: Setup Node.js
5252
if: steps.changes.outputs.changed == 'true'
53-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
53+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
5454
with:
5555
node-version: 22
5656
cache: 'pnpm'
@@ -102,7 +102,7 @@ jobs:
102102
103103
- name: Setup Node.js ${{ matrix.node-version }}
104104
if: steps.changes.outputs.changed == 'true'
105-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
105+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
106106
with:
107107
node-version: ${{ matrix.node_version }}
108108
cache: 'pnpm'

‎e2e/basic/test/index.test.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ describe('Index', () => {
1515
expect(process.env.RSTEST).toBe('true');
1616
});
1717

18+
it('should get WORKER ID correctly', () => {
19+
expect(process.env.RSTEST_WORKER_ID).toBeDefined();
20+
});
21+
1822
it('should use node API correctly', async () => {
1923
expect(
2024
pathe

‎e2e/dom/fixtures/package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@
88
"test": "rstest run"
99
},
1010
"dependencies": {
11-
"react": "^19.1.1",
12-
"react-dom": "^19.1.1"
11+
"react": "^19.2.0",
12+
"react-dom": "^19.2.0"
1313
},
1414
"devDependencies": {
15-
"@rsbuild/core": "1.6.0-beta.0",
16-
"@rsbuild/plugin-react": "^1.4.0",
17-
"@testing-library/jest-dom": "^6.8.0",
15+
"@rsbuild/core": "1.6.0-beta.1",
16+
"@rsbuild/plugin-react": "^1.4.1",
17+
"@testing-library/jest-dom": "^6.9.1",
1818
"@testing-library/dom": "^10.4.1",
1919
"@testing-library/react": "^16.3.0",
20-
"@types/react": "^19.1.13",
21-
"@types/react-dom": "^19.1.9",
22-
"happy-dom": "^20.0.0",
20+
"@types/react": "^19.2.2",
21+
"@types/react-dom": "^19.2.2",
22+
"happy-dom": "^20.0.8",
2323
"jsdom": "^26.1.0",
24-
"typescript": "^5.9.2"
24+
"typescript": "^5.9.3"
2525
}
2626
}

‎e2e/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@
77
"typecheck": "tsc --noEmit"
88
},
99
"devDependencies": {
10-
"@rsbuild/core": "1.6.0-beta.0",
11-
"@rslib/core": "0.13.3",
10+
"@rsbuild/core": "1.6.0-beta.1",
11+
"@rslib/core": "0.16.1",
1212
"@rstest/core": "workspace:*",
1313
"@rstest/tsconfig": "workspace:*",
1414
"@types/jest-image-snapshot": "^6.4.0",
15-
"axios": "^1.12.2",
15+
"axios": "^1.13.0",
1616
"is-url": "^1.2.4",
1717
"@types/is-url": "^1.2.32",
1818
"jest-image-snapshot": "^6.5.1",
19-
"memfs": "^4.42.0",
19+
"memfs": "^4.49.0",
2020
"pathe": "^2.0.3",
21-
"react": "^19.1.1",
21+
"react": "^19.2.0",
2222
"redux": "^5.0.1",
2323
"strip-ansi": "^7.1.2",
2424
"tinyexec": "^1.0.1",
25-
"typescript": "^5.9.2"
25+
"typescript": "^5.9.3"
2626
},
2727
"dependencies": {
2828
"@types/is-url": "^1.2.32"

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
"preview": "rsbuild preview"
99
},
1010
"dependencies": {
11-
"react": "^19.1.1",
12-
"react-dom": "^19.1.1"
11+
"react": "^19.2.0",
12+
"react-dom": "^19.2.0"
1313
},
1414
"devDependencies": {
15-
"@rsbuild/core": "1.6.0-beta.0",
16-
"@rsbuild/plugin-react": "^1.4.0",
17-
"@testing-library/jest-dom": "^6.8.0",
15+
"@rsbuild/core": "1.6.0-beta.1",
16+
"@rsbuild/plugin-react": "^1.4.1",
17+
"@testing-library/jest-dom": "^6.9.1",
1818
"@testing-library/dom": "^10.4.1",
1919
"@testing-library/react": "^16.3.0",
20-
"@types/react": "^19.1.13",
21-
"@types/react-dom": "^19.1.9",
20+
"@types/react": "^19.2.2",
21+
"@types/react-dom": "^19.2.2",
2222
"jsdom": "^26.1.0",
23-
"typescript": "^5.9.2"
23+
"typescript": "^5.9.3"
2424
}
2525
}

0 commit comments

Comments
 (0)