Skip to content

Commit 2c21aa1

Browse files
authored
Merge branch 'main' into 08-18-test_rsc_test_assets
2 parents 74108a9 + ba0323c commit 2c21aa1

File tree

36 files changed

+627
-722
lines changed

36 files changed

+627
-722
lines changed

.github/workflows/ci-rsc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
test:
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v5
2525
- uses: actions/setup-node@v4
2626
with:
2727
node-version: 22
@@ -56,7 +56,7 @@ jobs:
5656
react_version: experimental
5757
fail-fast: false
5858
steps:
59-
- uses: actions/checkout@v4
59+
- uses: actions/checkout@v5
6060
- uses: actions/setup-node@v4
6161
with:
6262
node-version: 22

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
name: "Build&Test: node-${{ matrix.node_version }}, ${{ matrix.os }}"
4242
steps:
4343
- name: Checkout
44-
uses: actions/checkout@v4
44+
uses: actions/checkout@v5
4545

4646
- name: Install pnpm
4747
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
@@ -110,7 +110,7 @@ jobs:
110110
runs-on: ubuntu-latest
111111
name: "Lint: node-20, ubuntu-latest"
112112
steps:
113-
- uses: actions/checkout@v4
113+
- uses: actions/checkout@v5
114114
with:
115115
fetch-depth: 0
116116

.github/workflows/copilot-setup-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
contents: read
2020

2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v5
2323
- uses: actions/setup-node@v4
2424
with:
2525
node-version: 22

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
environment: Release
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818

1919
- name: Install pnpm
2020
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0

.github/workflows/release-continuous.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Checkout code
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v5
2222

2323
- name: Install pnpm
2424
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"devDependencies": {
3636
"@eslint/js": "^9.33.0",
3737
"@types/fs-extra": "^11.0.4",
38-
"@types/node": "^22.17.1",
38+
"@types/node": "^22.17.2",
3939
"@vitejs/release-scripts": "^1.6.0",
4040
"eslint": "^9.33.0",
4141
"eslint-plugin-import-x": "^4.16.1",
@@ -48,10 +48,10 @@
4848
"playwright-chromium": "^1.54.2",
4949
"prettier": "^3.6.2",
5050
"simple-git-hooks": "^2.13.1",
51-
"tsx": "^4.20.3",
51+
"tsx": "^4.20.4",
5252
"typescript": "^5.9.2",
53-
"typescript-eslint": "^8.39.0",
54-
"vite": "^7.1.1",
53+
"typescript-eslint": "^8.39.1",
54+
"vite": "^7.1.2",
5555
"vite-plugin-inspect": "^11.3.2",
5656
"vitest": "^3.2.4"
5757
},

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.14.0",
46+
"tsdown": "^0.14.1",
4747
"vite": "catalog:rolldown-vite"
4848
},
4949
"dependencies": {
50-
"@rolldown/pluginutils": "1.0.0-beta.31"
50+
"@rolldown/pluginutils": "1.0.0-beta.32"
5151
}
5252
}

packages/plugin-react-swc/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
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.31",
35+
"@rolldown/pluginutils": "1.0.0-beta.32",
3636
"@swc/core": "^1.13.2"
3737
},
3838
"peerDependencies": {
@@ -41,11 +41,11 @@
4141
"devDependencies": {
4242
"@playwright/test": "^1.54.2",
4343
"@types/fs-extra": "^11.0.4",
44-
"@types/node": "^22.17.1",
44+
"@types/node": "^22.17.2",
4545
"@vitejs/react-common": "workspace:*",
4646
"fs-extra": "^11.3.1",
4747
"prettier": "^3.0.3",
48-
"tsdown": "^0.14.0",
48+
"tsdown": "^0.14.1",
4949
"typescript": "^5.9.2"
5050
}
5151
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"react-dom": "^19.1.1"
1313
},
1414
"devDependencies": {
15-
"@types/react": "^19.1.9",
15+
"@types/react": "^19.1.10",
1616
"@types/react-dom": "^19.1.7",
1717
"@vitejs/plugin-react-swc": "../../dist"
1818
}

packages/plugin-react-swc/playground/class-components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"react-dom": "^19.1.1"
1313
},
1414
"devDependencies": {
15-
"@types/react": "^19.1.9",
15+
"@types/react": "^19.1.10",
1616
"@types/react-dom": "^19.1.7",
1717
"@vitejs/plugin-react-swc": "../../dist"
1818
}

0 commit comments

Comments
 (0)