Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit f87f34f

Browse filesBrowse files
edison1105edison1105
authored
Merge branch 'main' into fix/prod-transition
2 parents 732c398 + 4f6ef92 commit f87f34f
Copy full SHA for f87f34f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

52 files changed

+1515
-1468
lines changed

‎.github/workflows/autofix.yml

Copy file name to clipboardExpand all lines: .github/workflows/autofix.yml
+2-2Lines changed: 2 additions & 2 deletions
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
@@ -31,4 +31,4 @@ jobs:
3131
- name: Run prettier
3232
run: pnpm run format
3333

34-
- uses: autofix-ci/action@ff86a557419858bb967097bfc916833f5647fa8c
34+
- uses: autofix-ci/action@551dded8c6cc8a1054039c8bc0b8b48c51dfc6ef

‎.github/workflows/canary-minor.yml

Copy file name to clipboardExpand all lines: .github/workflows/canary-minor.yml
+1-1Lines changed: 1 addition & 1 deletion
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

Copy file name to clipboardExpand all lines: .github/workflows/canary.yml
+1-1Lines changed: 1 addition & 1 deletion
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

Copy file name to clipboardExpand all lines: .github/workflows/size-data.yml
+1-1Lines changed: 1 addition & 1 deletion
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

Copy file name to clipboardExpand all lines: .github/workflows/size-report.yml
+3-3Lines changed: 3 additions & 3 deletions
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@v6
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@v6
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

Copy file name to clipboardExpand all lines: .github/workflows/test.yml
+4-4Lines changed: 4 additions & 4 deletions
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
@@ -88,7 +88,7 @@ jobs:
8888
- uses: actions/checkout@v4
8989

9090
- name: Install pnpm
91-
uses: pnpm/action-setup@v4.0.0
91+
uses: pnpm/action-setup@v4.1.0
9292

9393
- name: Install Node.js
9494
uses: actions/setup-node@v4

‎.node-version

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20
1+
22.14.0

‎README.md

Copy file name to clipboardExpand all lines: README.md
+5-2Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ Please make sure to respect issue requirements and use [the new issue helper](ht
3434

3535
## Stay In Touch
3636

37-
- [Twitter](https://twitter.com/vuejs)
37+
- [X](https://x.com/vuejs)
38+
- [Bluesky](https://bsky.app/profile/vuejs.org)
3839
- [Blog](https://blog.vuejs.org/)
3940
- [Job Board](https://vuejobs.com/?ref=vuejs)
4041

@@ -44,7 +45,9 @@ Please make sure to read the [Contributing Guide](https://github.com/vuejs/core/
4445

4546
Thank you to all the people who already contributed to Vue!
4647

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

4952
## License
5053

‎changelogs/CHANGELOG-3.4.md

Copy file name to clipboardExpand all lines: changelogs/CHANGELOG-3.4.md
-120Lines changed: 0 additions & 120 deletions
Large diffs are not rendered by default.

‎netlify.toml

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
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

Copy file name to clipboardExpand all lines: package.json
+31-25Lines changed: 31 additions & 25 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.14.2",
4+
"packageManager": "pnpm@10.8.0",
55
"type": "module",
66
"scripts": {
77
"dev": "node scripts/dev.js",
@@ -65,52 +65,52 @@
6565
"@babel/parser": "catalog:",
6666
"@babel/types": "catalog:",
6767
"@rollup/plugin-alias": "^5.1.1",
68-
"@rollup/plugin-commonjs": "^28.0.1",
68+
"@rollup/plugin-commonjs": "^28.0.3",
6969
"@rollup/plugin-json": "^6.1.0",
70-
"@rollup/plugin-node-resolve": "^15.3.0",
70+
"@rollup/plugin-node-resolve": "^16.0.1",
7171
"@rollup/plugin-replace": "5.0.4",
72-
"@swc/core": "^1.9.3",
72+
"@swc/core": "^1.11.13",
7373
"@types/hash-sum": "^1.0.2",
74-
"@types/node": "^22.10.0",
75-
"@types/semver": "^7.5.8",
74+
"@types/node": "^22.14.0",
75+
"@types/semver": "^7.7.0",
7676
"@types/serve-handler": "^6.1.4",
77-
"@vitest/coverage-v8": "^2.1.5",
77+
"@vitest/coverage-v8": "^3.0.9",
78+
"@vitest/eslint-plugin": "^1.1.38",
7879
"@vue/consolidate": "1.0.0",
7980
"conventional-changelog-cli": "^5.0.0",
8081
"enquirer": "^2.4.1",
81-
"esbuild": "^0.24.0",
82+
"esbuild": "^0.25.2",
8283
"esbuild-plugin-polyfill-node": "^0.3.0",
83-
"eslint": "^9.15.0",
84-
"eslint-plugin-import-x": "^4.4.2",
85-
"@vitest/eslint-plugin": "^1.1.10",
84+
"eslint": "^9.23.0",
85+
"eslint-plugin-import-x": "^4.9.4",
8686
"estree-walker": "catalog:",
87-
"jsdom": "^25.0.1",
88-
"lint-staged": "^15.2.10",
87+
"jsdom": "^26.0.0",
88+
"lint-staged": "^15.5.0",
8989
"lodash": "^4.17.21",
90-
"magic-string": "^0.30.12",
90+
"magic-string": "^0.30.17",
9191
"markdown-table": "^3.0.4",
9292
"marked": "13.0.3",
93-
"npm-run-all2": "^7.0.1",
93+
"npm-run-all2": "^7.0.2",
9494
"picocolors": "^1.1.1",
95-
"prettier": "^3.3.3",
95+
"prettier": "^3.5.3",
9696
"pretty-bytes": "^6.1.1",
9797
"pug": "^3.0.3",
98-
"puppeteer": "~23.3.0",
98+
"puppeteer": "~24.4.0",
9999
"rimraf": "^6.0.1",
100-
"rollup": "^4.27.4",
101-
"rollup-plugin-dts": "^6.1.1",
102-
"rollup-plugin-esbuild": "^6.1.1",
100+
"rollup": "^4.38.0",
101+
"rollup-plugin-dts": "^6.2.1",
102+
"rollup-plugin-esbuild": "^6.2.1",
103103
"rollup-plugin-polyfill-node": "^0.13.0",
104-
"semver": "^7.6.3",
104+
"semver": "^7.7.1",
105105
"serve": "^14.2.4",
106106
"serve-handler": "^6.1.6",
107-
"simple-git-hooks": "^2.11.1",
107+
"simple-git-hooks": "^2.12.1",
108108
"todomvc-app-css": "^2.4.3",
109109
"tslib": "^2.8.1",
110110
"typescript": "~5.6.2",
111-
"typescript-eslint": "^8.14.0",
111+
"typescript-eslint": "^8.28.0",
112112
"vite": "catalog:",
113-
"vitest": "^2.1.5"
113+
"vitest": "^3.0.9"
114114
},
115115
"pnpm": {
116116
"peerDependencyRules": {
@@ -121,6 +121,12 @@
121121
"@typescript-eslint/type-utils>eslint": "^9.0.0",
122122
"@typescript-eslint/utils>eslint": "^9.0.0"
123123
}
124-
}
124+
},
125+
"onlyBuiltDependencies": [
126+
"@swc/core",
127+
"esbuild",
128+
"puppeteer",
129+
"simple-git-hooks"
130+
]
125131
}
126132
}

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

Copy file name to clipboardExpand all lines: packages-private/dts-test/appDirective.test-d.ts
+1-1Lines changed: 1 addition & 1 deletion
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

Copy file name to clipboardExpand all lines: packages-private/dts-test/appUse.test-d.ts
+38-1Lines changed: 38 additions & 1 deletion
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

Copy file name to clipboardExpand all lines: packages-private/dts-test/directives.test-d.ts
+1-1Lines changed: 1 addition & 1 deletion
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

Copy file name to clipboardExpand all lines: packages-private/dts-test/ref.test-d.ts
+3-2Lines changed: 3 additions & 2 deletions
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/package.json

Copy file name to clipboardExpand all lines: packages-private/sfc-playground/package.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"vite": "catalog:"
1414
},
1515
"dependencies": {
16-
"@vue/repl": "^4.4.2",
16+
"@vue/repl": "^4.5.1",
1717
"file-saver": "^2.0.5",
1818
"jszip": "^3.10.1",
1919
"vue": "workspace:*"

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

Copy file name to clipboardExpand all lines: packages-private/sfc-playground/src/App.vue
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,9 @@ onMounted(() => {
165165
166166
body {
167167
font-size: 13px;
168-
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen,
169-
Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
168+
font-family:
169+
-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu,
170+
Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
170171
margin: 0;
171172
--base: #444;
172173
--nav-height: 50px;

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

Copy file name to clipboardExpand all lines: packages-private/sfc-playground/src/download/download.ts
+4-1Lines changed: 4 additions & 1 deletion
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

Copy file name to clipboardExpand all lines: packages-private/sfc-playground/src/download/template/package.json
+3-3Lines changed: 3 additions & 3 deletions
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": "^5.4.11"
14+
"@vitejs/plugin-vue": "^5.2.3",
15+
"vite": "^6.2.3"
1616
}
1717
}

‎packages-private/template-explorer/package.json

Copy file name to clipboardExpand all lines: packages-private/template-explorer/package.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"enableNonBrowserBranches": true
1212
},
1313
"dependencies": {
14-
"monaco-editor": "^0.52.0",
14+
"monaco-editor": "^0.52.2",
1515
"source-map-js": "^1.2.1"
1616
}
1717
}

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

Copy file name to clipboardExpand all lines: packages-private/template-explorer/style.css
+3-2Lines changed: 3 additions & 2 deletions
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
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.