Skip to content

Commit f78a9d0

Browse files
edison1105edison1105
authored
Merge branch 'minor' into vapor
2 parents 2696f14 + 826550c commit f78a9d0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1406
-1257
lines changed

‎.github/workflows/autofix.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v4
1515

1616
- name: Install pnpm
17-
uses: pnpm/action-setup@v4.0.0
17+
uses: pnpm/action-setup@v4.1.0
1818

1919
- name: Install Node.js
2020
uses: actions/setup-node@v4

‎.github/workflows/canary-minor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
ref: minor
1818

1919
- name: Install pnpm
20-
uses: pnpm/action-setup@v4.0.0
20+
uses: pnpm/action-setup@v4.1.0
2121

2222
- name: Install Node.js
2323
uses: actions/setup-node@v4

‎.github/workflows/canary.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: actions/checkout@v4
1616

1717
- name: Install pnpm
18-
uses: pnpm/action-setup@v4.0.0
18+
uses: pnpm/action-setup@v4.1.0
1919

2020
- name: Install Node.js
2121
uses: actions/setup-node@v4

‎.github/workflows/size-data.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/checkout@v4
2626

2727
- name: Install pnpm
28-
uses: pnpm/action-setup@v4.0.0
28+
uses: pnpm/action-setup@v4.1.0
2929

3030
- name: Install Node.js
3131
uses: actions/setup-node@v4

‎.github/workflows/size-report.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/checkout@v4
2626

2727
- name: Install pnpm
28-
uses: pnpm/action-setup@v4.0.0
28+
uses: pnpm/action-setup@v4.1.0
2929

3030
- name: Install Node.js
3131
uses: actions/setup-node@v4
@@ -37,7 +37,7 @@ jobs:
3737
run: pnpm install
3838

3939
- name: Download Size Data
40-
uses: dawidd6/action-download-artifact@v7
40+
uses: dawidd6/action-download-artifact@v9
4141
with:
4242
name: size-data
4343
run_id: ${{ github.event.workflow_run.id }}
@@ -56,7 +56,7 @@ jobs:
5656
path: temp/size/base.txt
5757

5858
- name: Download Previous Size Data
59-
uses: dawidd6/action-download-artifact@v7
59+
uses: dawidd6/action-download-artifact@v9
6060
with:
6161
branch: ${{ steps.pr-base.outputs.content }}
6262
workflow: size-data.yml

‎.github/workflows/test.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v4
1515

1616
- name: Install pnpm
17-
uses: pnpm/action-setup@v4.0.0
17+
uses: pnpm/action-setup@v4.1.0
1818

1919
- name: Install Node.js
2020
uses: actions/setup-node@v4
@@ -35,7 +35,7 @@ jobs:
3535
- uses: actions/checkout@v4
3636

3737
- name: Install pnpm
38-
uses: pnpm/action-setup@v4.0.0
38+
uses: pnpm/action-setup@v4.1.0
3939

4040
- name: Install Node.js
4141
uses: actions/setup-node@v4
@@ -63,7 +63,7 @@ jobs:
6363
key: chromium-${{ hashFiles('pnpm-lock.yaml') }}
6464

6565
- name: Install pnpm
66-
uses: pnpm/action-setup@v4.0.0
66+
uses: pnpm/action-setup@v4.1.0
6767

6868
- name: Install Node.js
6969
uses: actions/setup-node@v4
@@ -114,7 +114,7 @@ jobs:
114114
- uses: actions/checkout@v4
115115

116116
- name: Install pnpm
117-
uses: pnpm/action-setup@v4.0.0
117+
uses: pnpm/action-setup@v4.1.0
118118

119119
- name: Install Node.js
120120
uses: actions/setup-node@v4

‎.node-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20
1+
22.14.0

‎README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ Please make sure to read the [Contributing Guide](https://github.com/vuejs/core/
4444

4545
Thank you to all the people who already contributed to Vue!
4646

47-
<a href="https://github.com/vuejs/core/graphs/contributors"><img src="https://opencollective.com/vuejs/contributors.svg?width=890" /></a>
47+
<a href="https://github.com/vuejs/core/graphs/contributors"><img src="https://opencollective.com/vuejs/contributors.svg?width=890&limit=500" /></a>
48+
49+
<sub>_Note: Showing the first 500 contributors only due to GitHub image size limitations_</sub>
4850

4951
## License
5052

‎netlify.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[build.environment]
2-
NODE_VERSION = "18"
2+
NODE_VERSION = "22"
33
NPM_FLAGS = "--version" # prevent Netlify npm install

‎package.json

+27-21
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.15.4",
4+
"packageManager": "pnpm@10.6.5",
55
"type": "module",
66
"scripts": {
77
"dev": "node scripts/dev.js",
@@ -65,53 +65,53 @@
6565
"@babel/parser": "catalog:",
6666
"@babel/types": "catalog:",
6767
"@rollup/plugin-alias": "^5.1.1",
68-
"@rollup/plugin-commonjs": "^28.0.2",
68+
"@rollup/plugin-commonjs": "^28.0.3",
6969
"@rollup/plugin-json": "^6.1.0",
70-
"@rollup/plugin-node-resolve": "^16.0.0",
70+
"@rollup/plugin-node-resolve": "^16.0.1",
7171
"@rollup/plugin-replace": "5.0.4",
72-
"@swc/core": "^1.10.8",
72+
"@swc/core": "^1.11.12",
7373
"@types/hash-sum": "^1.0.2",
74-
"@types/node": "^22.10.7",
74+
"@types/node": "^22.13.13",
7575
"@types/semver": "^7.5.8",
7676
"@types/serve-handler": "^6.1.4",
77-
"@vitest/coverage-v8": "^3.0.2",
7877
"@vitest/ui": "^3.0.2",
78+
"@vitest/coverage-v8": "^3.0.9",
79+
"@vitest/eslint-plugin": "^1.1.38",
7980
"@vue/consolidate": "1.0.0",
8081
"conventional-changelog-cli": "^5.0.0",
8182
"enquirer": "^2.4.1",
82-
"esbuild": "^0.24.2",
83+
"esbuild": "^0.25.1",
8384
"esbuild-plugin-polyfill-node": "^0.3.0",
84-
"eslint": "^9.18.0",
85-
"eslint-plugin-import-x": "^4.6.1",
86-
"@vitest/eslint-plugin": "^1.1.25",
85+
"eslint": "^9.23.0",
86+
"eslint-plugin-import-x": "^4.9.1",
8787
"estree-walker": "catalog:",
8888
"jsdom": "^26.0.0",
89-
"lint-staged": "^15.4.1",
89+
"lint-staged": "^15.5.0",
9090
"lodash": "^4.17.21",
9191
"magic-string": "^0.30.17",
9292
"markdown-table": "^3.0.4",
9393
"marked": "13.0.3",
9494
"npm-run-all2": "^7.0.2",
9595
"picocolors": "^1.1.1",
96-
"prettier": "^3.4.2",
96+
"prettier": "^3.5.3",
9797
"pretty-bytes": "^6.1.1",
9898
"pug": "^3.0.3",
99-
"puppeteer": "~24.1.0",
99+
"puppeteer": "~24.4.0",
100100
"rimraf": "^6.0.1",
101-
"rollup": "^4.31.0",
102-
"rollup-plugin-dts": "^6.1.1",
103-
"rollup-plugin-esbuild": "^6.1.1",
101+
"rollup": "^4.37.0",
102+
"rollup-plugin-dts": "^6.2.1",
103+
"rollup-plugin-esbuild": "^6.2.1",
104104
"rollup-plugin-polyfill-node": "^0.13.0",
105-
"semver": "^7.6.3",
105+
"semver": "^7.7.1",
106106
"serve": "^14.2.4",
107107
"serve-handler": "^6.1.6",
108-
"simple-git-hooks": "^2.11.1",
108+
"simple-git-hooks": "^2.12.1",
109109
"todomvc-app-css": "^2.4.3",
110110
"tslib": "^2.8.1",
111111
"typescript": "~5.6.2",
112-
"typescript-eslint": "^8.20.0",
112+
"typescript-eslint": "^8.27.0",
113113
"vite": "catalog:",
114-
"vitest": "^3.0.2"
114+
"vitest": "^3.0.9"
115115
},
116116
"pnpm": {
117117
"peerDependencyRules": {
@@ -122,6 +122,12 @@
122122
"@typescript-eslint/type-utils>eslint": "^9.0.0",
123123
"@typescript-eslint/utils>eslint": "^9.0.0"
124124
}
125-
}
125+
},
126+
"onlyBuiltDependencies": [
127+
"@swc/core",
128+
"esbuild",
129+
"puppeteer",
130+
"simple-git-hooks"
131+
]
126132
}
127133
}

‎packages-private/dts-test/appDirective.test-d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ app.directive<HTMLElement, string, 'prevent' | 'stop', 'arg1' | 'arg2'>(
99
mounted(el, binding) {
1010
expectType<HTMLElement>(el)
1111
expectType<string>(binding.value)
12-
expectType<{ prevent: boolean; stop: boolean }>(binding.modifiers)
12+
expectType<{ prevent?: boolean; stop?: boolean }>(binding.modifiers)
1313
expectType<'arg1' | 'arg2'>(binding.arg!)
1414

1515
// @ts-expect-error not any

‎packages-private/dts-test/appUse.test-d.ts

+38-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@ app.use(PluginWithoutType, 2)
1212
app.use(PluginWithoutType, { anything: 'goes' }, true)
1313

1414
type PluginOptions = {
15+
/** option1 */
1516
option1?: string
17+
/** option2 */
1618
option2: number
19+
/** option3 */
1720
option3: boolean
1821
}
1922

@@ -25,6 +28,20 @@ const PluginWithObjectOptions = {
2528
},
2629
}
2730

31+
const objectPluginOptional = {
32+
install(app: App, options?: PluginOptions) {},
33+
}
34+
app.use(objectPluginOptional)
35+
app.use(
36+
objectPluginOptional,
37+
// Test JSDoc and `go to definition` for options
38+
{
39+
option1: 'foo',
40+
option2: 1,
41+
option3: true,
42+
},
43+
)
44+
2845
for (const Plugin of [
2946
PluginWithObjectOptions,
3047
PluginWithObjectOptions.install,
@@ -92,7 +109,27 @@ const PluginTyped: Plugin<PluginOptions> = (app, options) => {}
92109

93110
// @ts-expect-error: needs options
94111
app.use(PluginTyped)
95-
app.use(PluginTyped, { option2: 2, option3: true })
112+
app.use(
113+
PluginTyped,
114+
// Test autocomplete for options
115+
{
116+
option1: '',
117+
option2: 2,
118+
option3: true,
119+
},
120+
)
121+
122+
const functionPluginOptional = (app: App, options?: PluginOptions) => {}
123+
app.use(functionPluginOptional)
124+
app.use(functionPluginOptional, { option2: 2, option3: true })
125+
126+
// type optional params
127+
const functionPluginOptional2: Plugin<[options?: PluginOptions]> = (
128+
app,
129+
options,
130+
) => {}
131+
app.use(functionPluginOptional2)
132+
app.use(functionPluginOptional2, { option2: 2, option3: true })
96133

97134
// vuetify usage
98135
const key: string = ''

‎packages-private/dts-test/directives.test-d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ describe('custom', () => {
2929
value: number
3030
oldValue: number | null
3131
arg?: 'Arg'
32-
modifiers: Record<'a' | 'b', boolean>
32+
modifiers: Partial<Record<'a' | 'b', boolean>>
3333
}>(testDirective<number, 'a' | 'b', 'Arg'>())
3434

3535
expectType<{

‎packages-private/dts-test/ref.test-d.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {
44
type MaybeRefOrGetter,
55
type Ref,
66
type ShallowRef,
7+
type TemplateRef,
78
type ToRefs,
89
type WritableComputedRef,
910
computed,
@@ -535,7 +536,7 @@ expectType<string>(toValue(unref2))
535536

536537
// useTemplateRef
537538
const tRef = useTemplateRef('foo')
538-
expectType<Readonly<ShallowRef<unknown>>>(tRef)
539+
expectType<TemplateRef>(tRef)
539540

540541
const tRef2 = useTemplateRef<HTMLElement>('bar')
541-
expectType<Readonly<ShallowRef<HTMLElement | null>>>(tRef2)
542+
expectType<TemplateRef<HTMLElement>>(tRef2)

‎packages-private/sfc-playground/src/App.vue

+3-2
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,9 @@ onMounted(() => {
182182
183183
body {
184184
font-size: 13px;
185-
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen,
186-
Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
185+
font-family:
186+
-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu,
187+
Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
187188
margin: 0;
188189
--base: #444;
189190
--nav-height: 50px;

‎packages-private/sfc-playground/src/download/download.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ export async function downloadProject(store: ReplStore) {
1717

1818
// basic structure
1919
zip.file('index.html', index)
20-
zip.file('package.json', pkg)
20+
zip.file(
21+
'package.json',
22+
pkg.replace(`"vue": "latest"`, `"vue": "${store.vueVersion || 'latest'}"`),
23+
)
2124
zip.file('vite.config.js', config)
2225
zip.file('README.md', readme)
2326

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
"serve": "vite preview"
99
},
1010
"dependencies": {
11-
"vue": "^3.4.0"
11+
"vue": "latest"
1212
},
1313
"devDependencies": {
14-
"@vitejs/plugin-vue": "^5.2.1",
15-
"vite": "^6.0.7"
14+
"@vitejs/plugin-vue": "^5.2.3",
15+
"vite": "^6.2.2"
1616
}
1717
}

‎packages-private/template-explorer/style.css

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
body {
22
margin: 0;
33
overflow: hidden;
4-
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen,
5-
Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
4+
font-family:
5+
-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu,
6+
Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
67
--bg: #1d1f21;
78
--border: #333;
89
}

‎packages/compiler-sfc/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@vue/shared": "workspace:*",
5151
"estree-walker": "catalog:",
5252
"magic-string": "catalog:",
53-
"postcss": "^8.5.1",
53+
"postcss": "^8.5.3",
5454
"source-map-js": "catalog:"
5555
},
5656
"devDependencies": {
@@ -61,8 +61,8 @@
6161
"merge-source-map": "^1.1.0",
6262
"minimatch": "~10.0.1",
6363
"postcss-modules": "^6.0.1",
64-
"postcss-selector-parser": "^7.0.0",
64+
"postcss-selector-parser": "^7.1.0",
6565
"pug": "^3.0.3",
66-
"sass": "^1.83.4"
66+
"sass": "^1.86.0"
6767
}
6868
}

‎packages/compiler-sfc/src/rewriteDefault.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export function rewriteDefaultAST(
3939
ast.forEach(node => {
4040
if (node.type === 'ExportDefaultDeclaration') {
4141
if (node.declaration.type === 'ClassDeclaration' && node.declaration.id) {
42-
let start: number =
42+
const start: number =
4343
node.declaration.decorators && node.declaration.decorators.length > 0
4444
? node.declaration.decorators[
4545
node.declaration.decorators.length - 1

0 commit comments

Comments
 (0)