Skip to content

Commit d02e2e6

Browse files
committed
Merge branch 'main' into copilot/setup-oxfmt-configuration
2 parents ec6ff45 + 3b87f5a commit d02e2e6

File tree

76 files changed

+1952
-1294
lines changed

Some content is hidden

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

76 files changed

+1952
-1294
lines changed

.github/workflows/ci-rsc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
shell: bash
8989
env:
9090
BROWSER_NAME: ${{ matrix.browser }}
91-
- uses: actions/upload-artifact@v5
91+
- uses: actions/upload-artifact@v6
9292
if: always()
9393
with:
9494
name: test-results-${{ matrix.os }}-${{ matrix.browser }}${{ matrix.rolldown == true && '-rolldown' || '' }}${{ matrix.react_version && format('-react-{0}', matrix.react_version) || '' }}

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
echo "PLAYWRIGHT_VERSION=$env:PLAYWRIGHT_VERSION" >> $env:GITHUB_ENV
7070
7171
- name: Cache Playwright's binary
72-
uses: actions/cache@v4
72+
uses: actions/cache@v5
7373
with:
7474
key: ${{ runner.os }}-playwright-bin-v1-${{ env.PLAYWRIGHT_VERSION }}
7575
path: ${{ env.PLAYWRIGHT_BROWSERS_PATH }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
pull-requests: write # for actions-cool/issues-helper to update PRs
1414
steps:
1515
- name: need reproduction
16-
uses: actions-cool/issues-helper@9861779a695cf1898bd984c727f685f351cfc372 # v3
16+
uses: actions-cool/issues-helper@e2ff99831a4f13625d35064e2b3dfe65c07a0396 # v3
1717
with:
1818
actions: "close-issues"
1919
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/issue-labeled.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- name: contribution welcome
1616
if: github.event.label.name == 'contribution welcome' || github.event.label.name == 'help wanted'
17-
uses: actions-cool/issues-helper@9861779a695cf1898bd984c727f685f351cfc372 # v3
17+
uses: actions-cool/issues-helper@e2ff99831a4f13625d35064e2b3dfe65c07a0396 # v3
1818
with:
1919
actions: "create-comment, remove-labels"
2020
token: ${{ secrets.GITHUB_TOKEN }}
@@ -25,7 +25,7 @@ jobs:
2525

2626
- name: remove pending
2727
if: (github.event.label.name == 'enhancement' || contains(github.event.label.description, '(priority)')) && contains(github.event.issue.labels.*.name, 'pending triage')
28-
uses: actions-cool/issues-helper@9861779a695cf1898bd984c727f685f351cfc372 # v3
28+
uses: actions-cool/issues-helper@e2ff99831a4f13625d35064e2b3dfe65c07a0396 # v3
2929
with:
3030
actions: "remove-labels"
3131
token: ${{ secrets.GITHUB_TOKEN }}
@@ -34,7 +34,7 @@ jobs:
3434

3535
- name: need reproduction
3636
if: github.event.label.name == 'need reproduction'
37-
uses: actions-cool/issues-helper@9861779a695cf1898bd984c727f685f351cfc372 # v3
37+
uses: actions-cool/issues-helper@e2ff99831a4f13625d35064e2b3dfe65c07a0396 # v3
3838
with:
3939
actions: "create-comment, remove-labels"
4040
token: ${{ secrets.GITHUB_TOKEN }}

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"engines": {
66
"node": "^20.19.0 || >=22.12.0"
77
},
8-
"packageManager": "pnpm@10.24.0",
8+
"packageManager": "pnpm@10.27.0",
99
"homepage": "https://github.com/vitejs/vite-plugin-react/",
1010
"keywords": [
1111
"frontend",
@@ -33,27 +33,27 @@
3333
"ci-publish": "node scripts/publishCI.ts"
3434
},
3535
"devDependencies": {
36-
"@eslint/js": "^9.39.1",
36+
"@eslint/js": "^9.39.2",
3737
"@types/fs-extra": "^11.0.4",
38-
"@types/node": "^24.10.1",
38+
"@types/node": "^24.10.4",
3939
"@vitejs/release-scripts": "^1.6.0",
40-
"eslint": "^9.39.1",
40+
"eslint": "^9.39.2",
4141
"eslint-plugin-import-x": "^4.16.1",
4242
"eslint-plugin-n": "^17.23.1",
4343
"eslint-plugin-regexp": "^2.10.0",
44-
"fs-extra": "^11.3.2",
45-
"globals": "^16.5.0",
44+
"fs-extra": "^11.3.3",
45+
"globals": "^17.0.0",
4646
"lint-staged": "^16.2.7",
4747
"oxfmt": "^0.16.0",
4848
"picocolors": "^1.1.1",
4949
"playwright-chromium": "^1.57.0",
5050
"prettier": "^3.6.2",
5151
"simple-git-hooks": "^2.13.1",
5252
"typescript": "^5.9.3",
53-
"typescript-eslint": "^8.48.0",
54-
"vite": "^7.2.4",
53+
"typescript-eslint": "^8.51.0",
54+
"vite": "^7.3.0",
5555
"vite-plugin-inspect": "^11.3.3",
56-
"vitest": "^4.0.14"
56+
"vitest": "^4.0.16"
5757
},
5858
"simple-git-hooks": {
5959
"pre-commit": "pnpm exec lint-staged --concurrent false"

packages/common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"./refresh-runtime": "./refresh-runtime.js"
99
},
1010
"dependencies": {
11-
"@rolldown/pluginutils": "1.0.0-beta.52"
11+
"@rolldown/pluginutils": "1.0.0-beta.58"
1212
},
1313
"peerDependencies": {
1414
"vite": "^4.2.0 || ^5.0.0 || ^6.0.0"

packages/plugin-react-oxc/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
},
4444
"devDependencies": {
4545
"@vitejs/react-common": "workspace:*",
46-
"tsdown": "^0.16.8",
46+
"tsdown": "^0.18.4",
4747
"vite": "catalog:rolldown-vite"
4848
},
4949
"dependencies": {
50-
"@rolldown/pluginutils": "1.0.0-beta.52"
50+
"@rolldown/pluginutils": "1.0.0-beta.58"
5151
}
5252
}

packages/plugin-react-oxc/tsdown.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default defineConfig({
77
copy: [
88
{
99
from: 'node_modules/@vitejs/react-common/refresh-runtime.js',
10-
to: 'dist/refresh-runtime.js',
10+
to: 'dist',
1111
},
1212
],
1313
})

packages/plugin-react-swc/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,20 @@
3232
},
3333
"homepage": "https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-react-swc#readme",
3434
"dependencies": {
35-
"@rolldown/pluginutils": "1.0.0-beta.52",
36-
"@swc/core": "^1.15.3"
35+
"@rolldown/pluginutils": "1.0.0-beta.58",
36+
"@swc/core": "^1.15.8"
3737
},
3838
"peerDependencies": {
3939
"vite": "^4 || ^5 || ^6 || ^7"
4040
},
4141
"devDependencies": {
4242
"@playwright/test": "^1.57.0",
4343
"@types/fs-extra": "^11.0.4",
44-
"@types/node": "^24.10.1",
44+
"@types/node": "^24.10.4",
4545
"@vitejs/react-common": "workspace:*",
46-
"fs-extra": "^11.3.2",
46+
"fs-extra": "^11.3.3",
4747
"prettier": "^3.0.3",
48-
"tsdown": "^0.16.8",
48+
"tsdown": "^0.18.4",
4949
"typescript": "^5.9.3"
5050
}
5151
}

packages/plugin-react-swc/playground/base-path/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"preview": "vite preview"
99
},
1010
"dependencies": {
11-
"react": "^19.2.0",
12-
"react-dom": "^19.2.0"
11+
"react": "^19.2.3",
12+
"react-dom": "^19.2.3"
1313
},
1414
"devDependencies": {
1515
"@types/react": "^19.2.7",

0 commit comments

Comments
 (0)