Skip to content

Commit 735f891

Browse files
edison1105edison1105
committed
chore: Merge branch 'main' into minor
2 parents 6c50e20 + 5cf0097 commit 735f891

File tree

44 files changed

+1191
-635
lines changed

Some content is hidden

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

44 files changed

+1191
-635
lines changed

‎.github/workflows/autofix.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
- uses: actions/checkout@v5
1515

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

1919
- name: Install Node.js
20-
uses: actions/setup-node@v5
20+
uses: actions/setup-node@v6
2121
with:
2222
node-version-file: '.node-version'
2323
registry-url: 'https://registry.npmjs.org'

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: pnpm/action-setup@v4
2828

2929
- name: Install Node.js
30-
uses: actions/setup-node@v5
30+
uses: actions/setup-node@v6
3131
with:
3232
node-version-file: '.node-version'
3333
registry-url: 'https://registry.npmjs.org'

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: pnpm/action-setup@v4
2828

2929
- name: Install Node.js
30-
uses: actions/setup-node@v5
30+
uses: actions/setup-node@v6
3131
with:
3232
node-version-file: '.node-version'
3333
registry-url: 'https://registry.npmjs.org'

‎.github/workflows/size-data.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
- uses: actions/checkout@v5
2626

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

3030
- name: Install Node.js
31-
uses: actions/setup-node@v5
31+
uses: actions/setup-node@v6
3232
with:
3333
node-version-file: '.node-version'
3434
cache: pnpm
@@ -45,7 +45,7 @@ jobs:
4545
echo ${{ github.base_ref }} > ./temp/size/base.txt
4646
4747
- name: Upload Size Data
48-
uses: actions/upload-artifact@v4
48+
uses: actions/upload-artifact@v5
4949
with:
5050
name: size-data
5151
path: temp/size

‎.github/workflows/size-report.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
- uses: actions/checkout@v5
2626

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

3030
- name: Install Node.js
31-
uses: actions/setup-node@v5
31+
uses: actions/setup-node@v6
3232
with:
3333
node-version-file: '.node-version'
3434
cache: pnpm

‎.github/workflows/test.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
- uses: actions/checkout@v5
1515

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

1919
- name: Install Node.js
20-
uses: actions/setup-node@v5
20+
uses: actions/setup-node@v6
2121
with:
2222
node-version-file: '.node-version'
2323
cache: 'pnpm'
@@ -35,10 +35,10 @@ jobs:
3535
- uses: actions/checkout@v5
3636

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

4040
- name: Install Node.js
41-
uses: actions/setup-node@v5
41+
uses: actions/setup-node@v6
4242
with:
4343
node-version-file: '.node-version'
4444
cache: 'pnpm'
@@ -63,10 +63,10 @@ jobs:
6363
key: chromium-${{ hashFiles('pnpm-lock.yaml') }}
6464

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

6868
- name: Install Node.js
69-
uses: actions/setup-node@v5
69+
uses: actions/setup-node@v6
7070
with:
7171
node-version-file: '.node-version'
7272
cache: 'pnpm'
@@ -114,10 +114,10 @@ jobs:
114114
- uses: actions/checkout@v5
115115

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

119119
- name: Install Node.js
120-
uses: actions/setup-node@v5
120+
uses: actions/setup-node@v6
121121
with:
122122
node-version-file: '.node-version'
123123
cache: 'pnpm'

‎changelogs/CHANGELOG-3.5.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
## [3.5.23](https://github.com/vuejs/core/compare/v3.5.22...v3.5.23) (2025-11-06)
2+
3+
4+
### Bug Fixes
5+
6+
* **compiler-core:** correctly handle ts type assertions in expressions ([#13397](https://github.com/vuejs/core/issues/13397)) ([e6544ac](https://github.com/vuejs/core/commit/e6544ac292b5b473274f87cdb83ebeac3e7e61a4)), closes [#13395](https://github.com/vuejs/core/issues/13395)
7+
* **compiler-core:** fix v-bind shorthand handling for in-DOM templates ([#13933](https://github.com/vuejs/core/issues/13933)) ([b3cca26](https://github.com/vuejs/core/commit/b3cca2611c656b85f0c4e737b9ec248d2627dded)), closes [#13930](https://github.com/vuejs/core/issues/13930)
8+
* **compiler-sfc:** resolve numeric literals and template literals without expressions as static property key ([#13998](https://github.com/vuejs/core/issues/13998)) ([75d44c7](https://github.com/vuejs/core/commit/75d44c718981f91843e197265cc68e82fe2532dd))
9+
* **compiler-ssr:** textarea with v-text directive SSR ([#13975](https://github.com/vuejs/core/issues/13975)) ([006a0c1](https://github.com/vuejs/core/commit/006a0c1011a224bcbf21195c6df76812c3a7e757))
10+
* **compiler:** using guard instead of non-nullish assertion ([#13982](https://github.com/vuejs/core/issues/13982)) ([dcc6f36](https://github.com/vuejs/core/commit/dcc6f362577ed86ccad31c2623c6cf75137dd27a))
11+
* **custom-element:** batch custom element prop patching ([#13478](https://github.com/vuejs/core/issues/13478)) ([c13e674](https://github.com/vuejs/core/commit/c13e674fb9f92ab9339d28a862d18de460faf56e)), closes [#12619](https://github.com/vuejs/core/issues/12619)
12+
* **custom-element:** optimize slot retrieval to avoid duplicates ([#13961](https://github.com/vuejs/core/issues/13961)) ([84ca349](https://github.com/vuejs/core/commit/84ca349fef73f6f55fc98299fcfa5c1eeef721db)), closes [#13955](https://github.com/vuejs/core/issues/13955)
13+
* **hydration:** avoid mismatch during hydrate text with newlines in interpolation ([#9232](https://github.com/vuejs/core/issues/9232)) ([6cbdf78](https://github.com/vuejs/core/commit/6cbdf7823b0c961190bee5b7c117b7f2bbeb832f)), closes [#9229](https://github.com/vuejs/core/issues/9229)
14+
* **runtime-core:** pass props and children to loadingComponent ([#13997](https://github.com/vuejs/core/issues/13997)) ([40c4b2a](https://github.com/vuejs/core/commit/40c4b2a876ce606973521dfc3024e26bfc10953a))
15+
* **runtime-dom:** ensure iframe sandbox is handled as an attribute to prevent unintended behavior ([#13950](https://github.com/vuejs/core/issues/13950)) ([5689884](https://github.com/vuejs/core/commit/5689884c8e32cda6a802ac36b4d23218f67b38ed)), closes [#13946](https://github.com/vuejs/core/issues/13946)
16+
* **suspense:** clear placeholder and fallback el after resolve to enable GC ([#13928](https://github.com/vuejs/core/issues/13928)) ([f411c66](https://github.com/vuejs/core/commit/f411c6604c12c531883aa0d30b81a7f69092f8a6))
17+
* **transition-group:** use offsetLeft and offsetTop instead of getBoundingClientRect to avoid transform scale affect animation ([#6108](https://github.com/vuejs/core/issues/6108)) ([dc4dd59](https://github.com/vuejs/core/commit/dc4dd594fbecce6ed7f44ffa69dc8b5d022287b6)), closes [#6105](https://github.com/vuejs/core/issues/6105)
18+
* **v-model:** handle number modifier on change ([#13959](https://github.com/vuejs/core/issues/13959)) ([8fbe48f](https://github.com/vuejs/core/commit/8fbe48fe396d830999afd07f9413d899157d5f5e)), closes [#13958](https://github.com/vuejs/core/issues/13958)
19+
20+
21+
122
## [3.5.22](https://github.com/vuejs/core/compare/v3.5.21...v3.5.22) (2025-09-25)
223

324

‎eslint.config.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import importX from 'eslint-plugin-import-x'
22
import tseslint from 'typescript-eslint'
3+
import { defineConfig } from 'eslint/config'
34
import vitest from '@vitest/eslint-plugin'
45
import { builtinModules } from 'node:module'
56

@@ -12,7 +13,7 @@ const banConstEnum = {
1213
'Please use non-const enums. This project automatically inlines enums.',
1314
}
1415

15-
export default tseslint.config(
16+
export default defineConfig(
1617
{
1718
files: ['**/*.js', '**/*.ts', '**/*.tsx'],
1819
extends: [tseslint.configs.base],
@@ -60,7 +61,10 @@ export default tseslint.config(
6061
],
6162
// This rule enforces the preference for using '@ts-expect-error' comments in TypeScript
6263
// code to indicate intentional type errors, improving code clarity and maintainability.
63-
'@typescript-eslint/prefer-ts-expect-error': 'error',
64+
'@typescript-eslint/ban-ts-comment': [
65+
'error',
66+
{ minimumDescriptionLength: 0 },
67+
],
6468
// Enforce the use of 'import type' for importing types
6569
'@typescript-eslint/consistent-type-imports': [
6670
'error',

‎package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,44 +65,44 @@
6565
"@babel/parser": "catalog:",
6666
"@babel/types": "catalog:",
6767
"@rollup/plugin-alias": "^5.1.1",
68-
"@rollup/plugin-commonjs": "^28.0.6",
68+
"@rollup/plugin-commonjs": "^28.0.9",
6969
"@rollup/plugin-json": "^6.1.0",
70-
"@rollup/plugin-node-resolve": "^16.0.1",
70+
"@rollup/plugin-node-resolve": "^16.0.3",
7171
"@rollup/plugin-replace": "5.0.4",
72-
"@swc/core": "^1.13.5",
72+
"@swc/core": "^1.14.0",
7373
"@types/hash-sum": "^1.0.2",
74-
"@types/node": "^22.18.6",
74+
"@types/node": "^22.19.0",
7575
"@types/semver": "^7.7.1",
7676
"@types/serve-handler": "^6.1.4",
7777
"@vitest/ui": "^3.0.2",
7878
"@vitest/coverage-v8": "^3.2.4",
79-
"@vitest/eslint-plugin": "^1.3.12",
79+
"@vitest/eslint-plugin": "^1.4.0",
8080
"@vue/consolidate": "1.0.0",
8181
"conventional-changelog-cli": "^5.0.0",
8282
"enquirer": "^2.4.1",
83-
"esbuild": "^0.25.10",
83+
"esbuild": "^0.25.12",
8484
"esbuild-plugin-polyfill-node": "^0.3.0",
8585
"eslint": "^9.27.0",
8686
"eslint-plugin-import-x": "^4.13.1",
8787
"estree-walker": "catalog:",
88-
"jsdom": "^27.0.0",
88+
"jsdom": "^27.1.0",
8989
"lint-staged": "^16.0.0",
9090
"lodash": "^4.17.21",
91-
"magic-string": "^0.30.19",
91+
"magic-string": "^0.30.21",
9292
"markdown-table": "^3.0.4",
9393
"marked": "13.0.3",
9494
"npm-run-all2": "^8.0.4",
9595
"picocolors": "^1.1.1",
9696
"prettier": "^3.5.3",
97-
"pretty-bytes": "^6.1.1",
97+
"pretty-bytes": "^7.1.0",
9898
"pug": "^3.0.3",
99-
"puppeteer": "~24.22.2",
100-
"rimraf": "^6.0.1",
99+
"puppeteer": "~24.28.0",
100+
"rimraf": "^6.1.0",
101101
"rollup": "^4.52.5",
102102
"rollup-plugin-dts": "^6.2.3",
103103
"rollup-plugin-esbuild": "^6.2.1",
104104
"rollup-plugin-polyfill-node": "^0.13.0",
105-
"semver": "^7.7.2",
105+
"semver": "^7.7.3",
106106
"serve": "^14.2.5",
107107
"serve-handler": "^6.1.6",
108108
"simple-git-hooks": "^2.13.0",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
},
1313
"devDependencies": {
1414
"@vitejs/plugin-vue": "^6.0.1",
15-
"vite": "^7.1.7"
15+
"vite": "^7.1.12"
1616
}
1717
}

0 commit comments

Comments
 (0)