Skip to content

Commit acdfc02

Browse files
committed
Merge branch 'main' into fix/unocss-vue-scoped
# Conflicts: # pnpm-lock.yaml
2 parents 770cc9e + dbcd1d0 commit acdfc02

File tree

14 files changed

+827
-1232
lines changed

14 files changed

+827
-1232
lines changed

.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@50068f49b7b2b3857270ead65e2d02e4459b022c # v3
16+
uses: actions-cool/issues-helper@45d75b6cf72bf4f254be6230cb887ad002702491 # 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@50068f49b7b2b3857270ead65e2d02e4459b022c # v3
17+
uses: actions-cool/issues-helper@45d75b6cf72bf4f254be6230cb887ad002702491 # 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@50068f49b7b2b3857270ead65e2d02e4459b022c # v3
28+
uses: actions-cool/issues-helper@45d75b6cf72bf4f254be6230cb887ad002702491 # 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@50068f49b7b2b3857270ead65e2d02e4459b022c # v3
37+
uses: actions-cool/issues-helper@45d75b6cf72bf4f254be6230cb887ad002702491 # v3
3838
with:
3939
actions: "create-comment, remove-labels"
4040
token: ${{ secrets.GITHUB_TOKEN }}

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,30 +36,30 @@
3636
"ci-publish": "tsx scripts/publishCI.ts"
3737
},
3838
"devDependencies": {
39-
"@babel/types": "^7.28.2",
40-
"@eslint/js": "^9.34.0",
39+
"@babel/types": "^7.28.4",
40+
"@eslint/js": "^9.35.0",
4141
"@types/babel__core": "^7.20.5",
4242
"@types/convert-source-map": "^2.0.3",
4343
"@types/debug": "^4.1.12",
4444
"@types/fs-extra": "^11.0.4",
45-
"@types/node": "^22.18.0",
45+
"@types/node": "^22.18.1",
4646
"@vitejs/release-scripts": "^1.6.0",
47-
"eslint": "^9.34.0",
47+
"eslint": "^9.35.0",
4848
"eslint-import-resolver-typescript": "^4.4.4",
4949
"eslint-plugin-import-x": "^4.16.1",
5050
"eslint-plugin-n": "^17.21.3",
5151
"eslint-plugin-regexp": "^2.10.0",
5252
"execa": "^9.6.0",
5353
"fs-extra": "^11.3.1",
54-
"lint-staged": "^16.1.5",
54+
"lint-staged": "^16.1.6",
5555
"picocolors": "^1.1.1",
5656
"playwright-chromium": "^1.55.0",
5757
"prettier": "3.6.2",
5858
"rollup": "^4.48.1",
5959
"simple-git-hooks": "^2.13.1",
6060
"tsx": "^4.20.5",
6161
"typescript": "^5.9.2",
62-
"typescript-eslint": "^8.40.0",
62+
"typescript-eslint": "^8.43.0",
6363
"vite": "catalog:",
6464
"vitest": "^3.2.4",
6565
"vue": "catalog:"
@@ -81,7 +81,7 @@
8181
"eslint --cache --fix"
8282
]
8383
},
84-
"packageManager": "[email protected].0",
84+
"packageManager": "[email protected].1",
8585
"pnpm": {
8686
"overrides": {
8787
"@vitejs/plugin-vue": "workspace:*"

packages/plugin-vue-jsx/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## <small>[5.1.1](https://github.com/vitejs/vite-plugin-vue/compare/[email protected]@5.1.1) (2025-08-28)</small>
2+
### Bug Fixes
3+
4+
* **jsx:** vite 5 / 6 compat ([#657](https://github.com/vitejs/vite-plugin-vue/issues/657)) ([98dd753](https://github.com/vitejs/vite-plugin-vue/commit/98dd753e00d88e4e20875fb8704f5da11430bbb4))
5+
16
## [5.1.0](https://github.com/vitejs/vite-plugin-vue/compare/[email protected]@5.1.0) (2025-08-25)
27
### Features
38

packages/plugin-vue-jsx/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vitejs/plugin-vue-jsx",
3-
"version": "5.1.0",
3+
"version": "5.1.1",
44
"type": "module",
55
"license": "MIT",
66
"author": "Evan You",
@@ -35,10 +35,10 @@
3535
},
3636
"homepage": "https://github.com/vitejs/vite-plugin-vue/tree/main/packages/plugin-vue-jsx#readme",
3737
"dependencies": {
38-
"@babel/core": "^7.28.3",
38+
"@babel/core": "^7.28.4",
3939
"@babel/plugin-syntax-typescript": "^7.27.1",
4040
"@babel/plugin-transform-typescript": "^7.28.0",
41-
"@rolldown/pluginutils": "^1.0.0-beta.34",
41+
"@rolldown/pluginutils": "^1.0.0-beta.36",
4242
"@vue/babel-plugin-jsx": "^1.5.0"
4343
},
4444
"devDependencies": {

packages/plugin-vue-jsx/src/index.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,12 @@ function vueJsxPlugin(options: Options = {}): Plugin {
8989
config.define?.__VUE_PROD_HYDRATION_MISMATCH_DETAILS__,
9090
) ?? false,
9191
},
92-
optimizeDeps: this.meta.rolldownVersion
93-
? {
94-
rolldownOptions: { transform: { jsx: 'preserve' } },
95-
}
96-
: {},
92+
optimizeDeps:
93+
this && 'rolldownVersion' in this.meta
94+
? {
95+
rolldownOptions: { transform: { jsx: 'preserve' } },
96+
}
97+
: {},
9798
}
9899
},
99100

packages/plugin-vue/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@
5050
"vue": "catalog:"
5151
},
5252
"dependencies": {
53-
"@rolldown/pluginutils": "1.0.0-beta.34"
53+
"@rolldown/pluginutils": "1.0.0-beta.36"
5454
}
5555
}

playground/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"version": "1.0.0",
55
"type": "module",
66
"devDependencies": {
7-
"@types/node": "^22.18.0",
7+
"@types/node": "^22.18.1",
88
"convert-source-map": "^2.0.0",
99
"css-color-names": "^1.0.1",
1010
"kill-port": "^1.6.1"

playground/tailwind-v3/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"vue": "catalog:"
1616
},
1717
"devDependencies": {
18-
"@types/node": "^22.18.0",
18+
"@types/node": "^22.18.1",
1919
"@vitejs/plugin-vue": "workspace:*",
2020
"ts-node": "^10.9.2"
2121
}

playground/tailwind/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
"preview": "vite preview"
1111
},
1212
"dependencies": {
13-
"@tailwindcss/vite": "^4.1.12",
14-
"tailwindcss": "^4.1.12",
13+
"@tailwindcss/vite": "^4.1.13",
14+
"tailwindcss": "^4.1.13",
1515
"vue": "catalog:"
1616
},
1717
"devDependencies": {
18-
"@types/node": "^22.18.0",
18+
"@types/node": "^22.18.1",
1919
"@vitejs/plugin-vue": "workspace:*"
2020
}
2121
}

0 commit comments

Comments
 (0)