Skip to content

Commit 84b2b5a

Browse files
committed
Merge branch 'main' into 10-18-fix_rsc_fix_false_detecting_import.meta.vitersc_api_inside_comment
2 parents 991b015 + 62044c8 commit 84b2b5a

File tree

38 files changed

+322
-484
lines changed

38 files changed

+322
-484
lines changed

.github/workflows/ci-rsc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
steps:
2727
- uses: actions/checkout@v5
2828
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
29-
- uses: actions/setup-node@v5
29+
- uses: actions/setup-node@v6
3030
with:
3131
node-version: 22
3232
- run: pnpm i
@@ -61,7 +61,7 @@ jobs:
6161
steps:
6262
- uses: actions/checkout@v5
6363
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
64-
- uses: actions/setup-node@v5
64+
- uses: actions/setup-node@v6
6565
with:
6666
node-version: 22
6767
- run: pnpm i

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
4848

4949
- name: Set node version to ${{ matrix.node_version }}
50-
uses: actions/setup-node@v5
50+
uses: actions/setup-node@v6
5151
with:
5252
node-version: ${{ matrix.node_version }}
5353

@@ -117,7 +117,7 @@ jobs:
117117
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
118118

119119
- name: Set node version to 20
120-
uses: actions/setup-node@v5
120+
uses: actions/setup-node@v6
121121
with:
122122
node-version: 20
123123

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
steps:
2222
- uses: actions/checkout@v5
2323
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
24-
- uses: actions/setup-node@v5
24+
- uses: actions/setup-node@v6
2525
with:
2626
node-version: 22
2727
- run: pnpm i

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
2121

2222
- name: Set node version
23-
uses: actions/setup-node@v5
23+
uses: actions/setup-node@v6
2424
with:
2525
node-version: 22
2626
registry-url: https://registry.npmjs.org/

.github/workflows/release-continuous.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Install pnpm
2424
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
2525

26-
- uses: actions/setup-node@v5
26+
- uses: actions/setup-node@v6
2727
with:
2828
node-version: lts/*
2929
# disable cache, to avoid cache poisoning (https://docs.zizmor.sh/audits/#cache-poisoning)

package.json

Lines changed: 6 additions & 6 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": "[email protected].2",
8+
"packageManager": "[email protected].3",
99
"homepage": "https://github.com/vitejs/vite-plugin-react/",
1010
"keywords": [
1111
"frontend",
@@ -33,24 +33,24 @@
3333
"ci-publish": "node scripts/publishCI.ts"
3434
},
3535
"devDependencies": {
36-
"@eslint/js": "^9.37.0",
36+
"@eslint/js": "^9.38.0",
3737
"@types/fs-extra": "^11.0.4",
38-
"@types/node": "^22.18.10",
38+
"@types/node": "^22.18.11",
3939
"@vitejs/release-scripts": "^1.6.0",
40-
"eslint": "^9.37.0",
40+
"eslint": "^9.38.0",
4141
"eslint-plugin-import-x": "^4.16.1",
4242
"eslint-plugin-n": "^17.23.1",
4343
"eslint-plugin-regexp": "^2.10.0",
4444
"fs-extra": "^11.3.2",
4545
"globals": "^16.4.0",
4646
"lint-staged": "^16.2.4",
4747
"picocolors": "^1.1.1",
48-
"playwright-chromium": "^1.56.0",
48+
"playwright-chromium": "^1.56.1",
4949
"prettier": "^3.6.2",
5050
"simple-git-hooks": "^2.13.1",
5151
"typescript": "^5.9.3",
5252
"typescript-eslint": "^8.46.1",
53-
"vite": "^7.1.9",
53+
"vite": "^7.1.10",
5454
"vite-plugin-inspect": "^11.3.3",
5555
"vitest": "^3.2.4"
5656
},

packages/plugin-react-oxc/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
},
4444
"devDependencies": {
4545
"@vitejs/react-common": "workspace:*",
46-
"tsdown": "^0.15.7",
46+
"tsdown": "^0.15.8",
4747
"vite": "catalog:rolldown-vite"
4848
},
4949
"dependencies": {

packages/plugin-react-swc/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
"vite": "^4 || ^5 || ^6 || ^7"
4040
},
4141
"devDependencies": {
42-
"@playwright/test": "^1.56.0",
42+
"@playwright/test": "^1.56.1",
4343
"@types/fs-extra": "^11.0.4",
44-
"@types/node": "^22.18.10",
44+
"@types/node": "^22.18.11",
4545
"@vitejs/react-common": "workspace:*",
4646
"fs-extra": "^11.3.2",
4747
"prettier": "^3.0.3",
48-
"tsdown": "^0.15.7",
48+
"tsdown": "^0.15.8",
4949
"typescript": "^5.9.3"
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
@@ -13,7 +13,7 @@
1313
},
1414
"devDependencies": {
1515
"@types/react": "^19.2.2",
16-
"@types/react-dom": "^19.2.1",
16+
"@types/react-dom": "^19.2.2",
1717
"@vitejs/plugin-react-swc": "../../dist"
1818
}
1919
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"devDependencies": {
1515
"@types/react": "^19.2.2",
16-
"@types/react-dom": "^19.2.1",
16+
"@types/react-dom": "^19.2.2",
1717
"@vitejs/plugin-react-swc": "../../dist"
1818
}
1919
}

0 commit comments

Comments
 (0)