Skip to content

Commit 75929db

Browse files
authored
Merge branch 'main' into edison/fix/35
2 parents 8204fce + 15c0eb0 commit 75929db

File tree

14 files changed

+1468
-1663
lines changed

14 files changed

+1468
-1663
lines changed

.github/workflows/release-continuous.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ jobs:
99
- name: Checkout code
1010
uses: actions/checkout@v4
1111

12-
- run: corepack enable
12+
- name: Install pnpm
13+
uses: pnpm/[email protected]
14+
1315
- uses: actions/setup-node@v4
1416
with:
1517
node-version: lts/*

package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,34 +36,34 @@
3636
"ci-publish": "tsx scripts/publishCI.ts"
3737
},
3838
"devDependencies": {
39-
"@babel/types": "^7.26.3",
40-
"@eslint/js": "^9.17.0",
39+
"@babel/types": "^7.26.7",
40+
"@eslint/js": "^9.19.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.10.2",
46-
"@vitejs/release-scripts": "^1.3.2",
45+
"@types/node": "^22.13.1",
46+
"@vitejs/release-scripts": "^1.3.3",
4747
"conventional-changelog-cli": "^5.0.0",
48-
"eslint": "^9.17.0",
48+
"eslint": "^9.19.0",
4949
"eslint-plugin-import-x": "^4.6.1",
5050
"eslint-plugin-n": "^17.15.1",
5151
"eslint-plugin-regexp": "^2.7.0",
5252
"execa": "^9.5.2",
53-
"fs-extra": "^11.2.0",
54-
"lint-staged": "^15.3.0",
53+
"fs-extra": "^11.3.0",
54+
"lint-staged": "^15.4.3",
5555
"npm-run-all2": "^7.0.2",
5656
"picocolors": "^1.1.1",
57-
"playwright-chromium": "^1.49.1",
57+
"playwright-chromium": "^1.50.1",
5858
"prettier": "3.4.2",
59-
"rollup": "^4.29.1",
59+
"rollup": "^4.34.4",
6060
"simple-git-hooks": "^2.11.1",
6161
"tsx": "^4.19.2",
62-
"typescript": "^5.7.2",
63-
"typescript-eslint": "^8.18.2",
64-
"unbuild": "2.0.0",
62+
"typescript": "^5.7.3",
63+
"typescript-eslint": "^8.23.0",
64+
"unbuild": "3.3.1",
6565
"vite": "catalog:",
66-
"vitest": "^2.1.8",
66+
"vitest": "^2.1.9",
6767
"vue": "catalog:"
6868
},
6969
"simple-git-hooks": {
@@ -83,7 +83,7 @@
8383
"eslint --cache --fix"
8484
]
8585
},
86-
"packageManager": "[email protected].2",
86+
"packageManager": "[email protected].5",
8787
"pnpm": {
8888
"overrides": {
8989
"@vitejs/plugin-vue": "workspace:*"

packages/plugin-vue-jsx/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
},
3636
"homepage": "https://github.com/vitejs/vite-plugin-vue/tree/main/packages/plugin-vue-jsx#readme",
3737
"dependencies": {
38-
"@babel/core": "^7.26.0",
39-
"@babel/plugin-transform-typescript": "^7.26.3",
38+
"@babel/core": "^7.26.7",
39+
"@babel/plugin-transform-typescript": "^7.26.7",
4040
"@vue/babel-plugin-jsx": "^1.2.5"
4141
},
4242
"devDependencies": {

packages/plugin-vue/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"@jridgewell/gen-mapping": "^0.3.8",
4343
"@jridgewell/trace-mapping": "^0.3.25",
4444
"debug": "^4.4.0",
45-
"rollup": "^4.29.1",
45+
"rollup": "^4.34.4",
4646
"slash": "^5.1.0",
4747
"source-map-js": "^1.2.1",
4848
"vite": "catalog:",

packages/plugin-vue/src/index.ts

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,20 @@ export default function vuePlugin(rawOptions: Options = {}): Plugin<Api> {
279279
!config.isProduction
280280
),
281281
}
282+
// #507 suppress warnings for non-recognized pseudo selectors from lightningcss
283+
const _warn = config.logger.warn
284+
config.logger.warn = (...args) => {
285+
const msg = args[0]
286+
if (
287+
msg.match(
288+
/\[lightningcss\] '(deep|slotted|global)' is not recognized as a valid pseudo-/,
289+
)
290+
) {
291+
return
292+
}
293+
_warn(...args)
294+
}
295+
282296
transformCachedModule =
283297
config.command === 'build' &&
284298
options.value.sourceMap &&
@@ -318,11 +332,12 @@ export default function vuePlugin(rawOptions: Options = {}): Plugin<Api> {
318332
},
319333

320334
load(id, opt) {
321-
const ssr = opt?.ssr === true
322335
if (id === EXPORT_HELPER_ID) {
323336
return helperCode
324337
}
325338

339+
const ssr = opt?.ssr === true
340+
326341
const { filename, query } = parseVueRequest(id)
327342

328343
// select corresponding block for sub-part virtual modules

packages/plugin-vue/src/template.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,8 @@ export function resolveTemplateCompilerOptions(
187187

188188
return {
189189
...options.template,
190+
// @ts-expect-error TODO remove when 3.6 is out
191+
vapor: descriptor.vapor,
190192
id,
191193
ast: canReuseAST(options.compiler.version)
192194
? descriptor.template?.ast

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.10.2",
7+
"@types/node": "^22.13.1",
88
"convert-source-map": "^2.0.0",
99
"css-color-names": "^1.0.1",
1010
"kill-port": "^1.6.1",

playground/ssr-vue/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
},
1717
"dependencies": {
1818
"@vitejs/test-example-external-component": "file:example-external-component",
19-
"pinia": "^2.3.0",
19+
"pinia": "^2.3.1",
2020
"vue": "catalog:",
2121
"vue-router": "catalog:"
2222
},

playground/tailwind/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"vue-router": "catalog:"
1717
},
1818
"devDependencies": {
19-
"@types/node": "^22.10.2",
19+
"@types/node": "^22.13.1",
2020
"@vitejs/plugin-vue": "workspace:*",
2121
"ts-node": "^10.9.2"
2222
}

playground/vue-legacy/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
},
1515
"devDependencies": {
1616
"@vitejs/plugin-vue": "workspace:*",
17-
"@vitejs/plugin-legacy": "^6.0.0"
17+
"@vitejs/plugin-legacy": "^6.0.1"
1818
}
1919
}

0 commit comments

Comments
 (0)