Skip to content

Commit f7d95ce

Browse files
committed
Merge remote-tracking branch 'origin/main' into minor
2 parents ccd3f3f + 11f7674 commit f7d95ce

File tree

5 files changed

+600
-569
lines changed

5 files changed

+600
-569
lines changed

package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"version": "3.5.13",
4-
"packageManager": "pnpm@9.12.3",
4+
"packageManager": "pnpm@9.14.4",
55
"type": "module",
66
"scripts": {
77
"dev": "node scripts/dev.js",
@@ -69,25 +69,25 @@
6969
"@rollup/plugin-json": "^6.1.0",
7070
"@rollup/plugin-node-resolve": "^15.3.0",
7171
"@rollup/plugin-replace": "5.0.4",
72-
"@swc/core": "^1.9.1",
72+
"@swc/core": "^1.9.3",
7373
"@types/hash-sum": "^1.0.2",
74-
"@types/node": "^22.8.7",
74+
"@types/node": "^22.10.1",
7575
"@types/semver": "^7.5.8",
7676
"@types/serve-handler": "^6.1.4",
77-
"@vitest/coverage-v8": "^2.1.1",
77+
"@vitest/coverage-v8": "^2.1.5",
7878
"@vue/consolidate": "1.0.0",
7979
"conventional-changelog-cli": "^5.0.0",
8080
"enquirer": "^2.4.1",
8181
"esbuild": "^0.24.0",
8282
"esbuild-plugin-polyfill-node": "^0.3.0",
83-
"eslint": "^9.14.0",
84-
"eslint-plugin-import-x": "^4.4.0",
85-
"@vitest/eslint-plugin": "^1.0.1",
83+
"eslint": "^9.15.0",
84+
"eslint-plugin-import-x": "^4.4.2",
85+
"@vitest/eslint-plugin": "^1.1.10",
8686
"estree-walker": "catalog:",
87-
"jsdom": "^25.0.0",
87+
"jsdom": "^25.0.1",
8888
"lint-staged": "^15.2.10",
8989
"lodash": "^4.17.21",
90-
"magic-string": "^0.30.12",
90+
"magic-string": "^0.30.14",
9191
"markdown-table": "^3.0.4",
9292
"marked": "13.0.3",
9393
"npm-run-all2": "^7.0.1",
@@ -97,7 +97,7 @@
9797
"pug": "^3.0.3",
9898
"puppeteer": "~23.3.0",
9999
"rimraf": "^6.0.1",
100-
"rollup": "^4.25.0",
100+
"rollup": "^4.27.4",
101101
"rollup-plugin-dts": "^6.1.1",
102102
"rollup-plugin-esbuild": "^6.1.1",
103103
"rollup-plugin-polyfill-node": "^0.13.0",
@@ -108,9 +108,9 @@
108108
"todomvc-app-css": "^2.4.3",
109109
"tslib": "^2.8.1",
110110
"typescript": "~5.6.2",
111-
"typescript-eslint": "^8.12.2",
111+
"typescript-eslint": "^8.14.0",
112112
"vite": "catalog:",
113-
"vitest": "^2.1.1"
113+
"vitest": "^2.1.5"
114114
},
115115
"pnpm": {
116116
"peerDependencyRules": {

packages-private/sfc-playground/src/download/template/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"vue": "^3.4.0"
1212
},
1313
"devDependencies": {
14-
"@vitejs/plugin-vue": "^5.1.5",
15-
"vite": "^5.4.10"
14+
"@vitejs/plugin-vue": "^5.2.1",
15+
"vite": "^5.4.11"
1616
}
1717
}

packages/compiler-sfc/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"@vue/shared": "workspace:*",
5050
"estree-walker": "catalog:",
5151
"magic-string": "catalog:",
52-
"postcss": "^8.4.48",
52+
"postcss": "^8.4.49",
5353
"source-map-js": "catalog:"
5454
},
5555
"devDependencies": {
@@ -59,9 +59,9 @@
5959
"lru-cache": "10.1.0",
6060
"merge-source-map": "^1.1.0",
6161
"minimatch": "~9.0.5",
62-
"postcss-modules": "^6.0.0",
62+
"postcss-modules": "^6.0.1",
6363
"postcss-selector-parser": "^7.0.0",
6464
"pug": "^3.0.3",
65-
"sass": "^1.80.6"
65+
"sass": "^1.82.0"
6666
}
6767
}

packages/runtime-core/src/componentOptions.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -416,20 +416,20 @@ interface LegacyOptions<
416416
extends?: Extends
417417

418418
// lifecycle
419-
beforeCreate?(): void
420-
created?(): void
421-
beforeMount?(): void
422-
mounted?(): void
423-
beforeUpdate?(): void
424-
updated?(): void
425-
activated?(): void
426-
deactivated?(): void
419+
beforeCreate?(): any
420+
created?(): any
421+
beforeMount?(): any
422+
mounted?(): any
423+
beforeUpdate?(): any
424+
updated?(): any
425+
activated?(): any
426+
deactivated?(): any
427427
/** @deprecated use `beforeUnmount` instead */
428-
beforeDestroy?(): void
429-
beforeUnmount?(): void
428+
beforeDestroy?(): any
429+
beforeUnmount?(): any
430430
/** @deprecated use `unmounted` instead */
431-
destroyed?(): void
432-
unmounted?(): void
431+
destroyed?(): any
432+
unmounted?(): any
433433
renderTracked?: DebuggerHook
434434
renderTriggered?: DebuggerHook
435435
errorCaptured?: ErrorCapturedHook

0 commit comments

Comments
 (0)