Skip to content

Commit cca1d53

Browse files
authored
Merge branch 'main' into test-isReactive
2 parents 012fa64 + 22f359b commit cca1d53

File tree

11 files changed

+643
-776
lines changed

11 files changed

+643
-776
lines changed

.github/workflows/autofix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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/size-report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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@v7
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@v7
6060
with:
6161
branch: ${{ steps.pr-base.outputs.content }}
6262
workflow: size-data.yml

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": "[email protected].2",
4+
"packageManager": "[email protected].4",
55
"type": "module",
66
"scripts": {
77
"dev": "node scripts/dev.js",
@@ -69,23 +69,23 @@
6969
"@rollup/plugin-json": "^6.1.0",
7070
"@rollup/plugin-node-resolve": "^16.0.0",
7171
"@rollup/plugin-replace": "5.0.4",
72-
"@swc/core": "^1.10.3",
72+
"@swc/core": "^1.10.11",
7373
"@types/hash-sum": "^1.0.2",
74-
"@types/node": "^22.10.2",
74+
"@types/node": "^22.12.0",
7575
"@types/semver": "^7.5.8",
7676
"@types/serve-handler": "^6.1.4",
77-
"@vitest/coverage-v8": "^2.1.8",
77+
"@vitest/coverage-v8": "^3.0.2",
7878
"@vue/consolidate": "1.0.0",
7979
"conventional-changelog-cli": "^5.0.0",
8080
"enquirer": "^2.4.1",
8181
"esbuild": "^0.24.2",
8282
"esbuild-plugin-polyfill-node": "^0.3.0",
83-
"eslint": "^9.17.0",
83+
"eslint": "^9.18.0",
8484
"eslint-plugin-import-x": "^4.6.1",
85-
"@vitest/eslint-plugin": "^1.1.20",
85+
"@vitest/eslint-plugin": "^1.1.25",
8686
"estree-walker": "catalog:",
87-
"jsdom": "^25.0.1",
88-
"lint-staged": "^15.2.11",
87+
"jsdom": "^26.0.0",
88+
"lint-staged": "^15.4.1",
8989
"lodash": "^4.17.21",
9090
"magic-string": "^0.30.17",
9191
"markdown-table": "^3.0.4",
@@ -95,9 +95,9 @@
9595
"prettier": "^3.4.2",
9696
"pretty-bytes": "^6.1.1",
9797
"pug": "^3.0.3",
98-
"puppeteer": "~23.3.0",
98+
"puppeteer": "~24.1.0",
9999
"rimraf": "^6.0.1",
100-
"rollup": "^4.29.1",
100+
"rollup": "^4.32.1",
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.18.1",
111+
"typescript-eslint": "^8.20.0",
112112
"vite": "catalog:",
113-
"vitest": "^2.1.8"
113+
"vitest": "^3.0.2"
114114
},
115115
"pnpm": {
116116
"peerDependencyRules": {

packages-private/sfc-playground/package.json

Lines 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.4.3",
1717
"file-saver": "^2.0.5",
1818
"jszip": "^3.10.1",
1919
"vue": "workspace:*"

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": "^5.2.1",
15-
"vite": "^6.0.6"
15+
"vite": "^6.0.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.49",
52+
"postcss": "^8.5.1",
5353
"source-map-js": "catalog:"
5454
},
5555
"devDependencies": {
@@ -58,10 +58,10 @@
5858
"hash-sum": "^2.0.0",
5959
"lru-cache": "10.1.0",
6060
"merge-source-map": "^1.1.0",
61-
"minimatch": "~9.0.5",
61+
"minimatch": "~10.0.1",
6262
"postcss-modules": "^6.0.1",
6363
"postcss-selector-parser": "^7.0.0",
6464
"pug": "^3.0.3",
65-
"sass": "^1.83.0"
65+
"sass": "^1.83.4"
6666
}
6767
}

packages/compiler-sfc/src/compileScript.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,6 @@ export function compileScript(
170170
const scriptLang = script && script.lang
171171
const scriptSetupLang = scriptSetup && scriptSetup.lang
172172

173-
let refBindings: string[] | undefined
174-
175173
if (!scriptSetup) {
176174
if (!script) {
177175
throw new Error(`[@vue/compiler-sfc] SFC contains no <script> tags.`)
@@ -740,12 +738,6 @@ export function compileScript(
740738
for (const key in setupBindings) {
741739
ctx.bindingMetadata[key] = setupBindings[key]
742740
}
743-
// known ref bindings
744-
if (refBindings) {
745-
for (const key of refBindings) {
746-
ctx.bindingMetadata[key] = BindingTypes.SETUP_REF
747-
}
748-
}
749741

750742
// 7. inject `useCssVars` calls
751743
if (

packages/vue/__tests__/e2e/e2eUtils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import puppeteer, {
22
type Browser,
33
type ClickOptions,
4+
type LaunchOptions,
45
type Page,
5-
type PuppeteerLaunchOptions,
66
} from 'puppeteer'
77

88
export const E2E_TIMEOUT: number = 30 * 1000
99

10-
const puppeteerOptions: PuppeteerLaunchOptions = {
10+
const puppeteerOptions: LaunchOptions = {
1111
args: process.env.CI ? ['--no-sandbox', '--disable-setuid-sandbox'] : [],
1212
headless: true,
1313
}

packages/vue/__tests__/e2e/todomvc.spec.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ describe('e2e: todomvc', () => {
1414
classList,
1515
enterValue,
1616
clearValue,
17+
timeout,
1718
} = setupPuppeteer()
1819

1920
async function removeItemAt(n: number) {
@@ -101,6 +102,7 @@ describe('e2e: todomvc', () => {
101102

102103
// active filter
103104
await click('.filters li:nth-child(2) a')
105+
await timeout(1)
104106
expect(await count('.todo')).toBe(1)
105107
expect(await count('.todo.completed')).toBe(0)
106108
// add item with filter active
@@ -109,6 +111,7 @@ describe('e2e: todomvc', () => {
109111

110112
// completed filter
111113
await click('.filters li:nth-child(3) a')
114+
await timeout(1)
112115
expect(await count('.todo')).toBe(2)
113116
expect(await count('.todo.completed')).toBe(2)
114117

@@ -128,13 +131,15 @@ describe('e2e: todomvc', () => {
128131
await click('.todo .toggle')
129132
expect(await count('.todo')).toBe(1)
130133
await click('.filters li:nth-child(2) a')
134+
await timeout(1)
131135
expect(await count('.todo')).toBe(3)
132136
await click('.todo .toggle')
133137
expect(await count('.todo')).toBe(2)
134138

135139
// editing triggered by blur
136140
await click('.filters li:nth-child(1) a')
137-
await click('.todo:nth-child(1) label', { clickCount: 2 })
141+
await timeout(1)
142+
await click('.todo:nth-child(1) label', { count: 2 })
138143
expect(await count('.todo.editing')).toBe(1)
139144
expect(await isFocused('.todo:nth-child(1) .edit')).toBe(true)
140145
await clearValue('.todo:nth-child(1) .edit')
@@ -144,21 +149,21 @@ describe('e2e: todomvc', () => {
144149
expect(await text('.todo:nth-child(1) label')).toBe('edited!')
145150

146151
// editing triggered by enter
147-
await click('.todo label', { clickCount: 2 })
152+
await click('.todo label', { count: 2 })
148153
await enterValue('.todo:nth-child(1) .edit', 'edited again!')
149154
expect(await count('.todo.editing')).toBe(0)
150155
expect(await text('.todo:nth-child(1) label')).toBe('edited again!')
151156

152157
// cancel
153-
await click('.todo label', { clickCount: 2 })
158+
await click('.todo label', { count: 2 })
154159
await clearValue('.todo:nth-child(1) .edit')
155160
await page().type('.todo:nth-child(1) .edit', 'edited!')
156161
await page().keyboard.press('Escape')
157162
expect(await count('.todo.editing')).toBe(0)
158163
expect(await text('.todo:nth-child(1) label')).toBe('edited again!')
159164

160165
// empty value should remove
161-
await click('.todo label', { clickCount: 2 })
166+
await click('.todo label', { count: 2 })
162167
await enterValue('.todo:nth-child(1) .edit', ' ')
163168
expect(await count('.todo')).toBe(3)
164169

packages/vue/__tests__/e2e/tree.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ describe('e2e: tree', () => {
8888
expect(await isVisible('#demo ul')).toBe(true)
8989
expect(await text('#demo li div span')).toContain('[-]')
9090

91-
await click('#demo ul > .item div', { clickCount: 2 })
91+
await click('#demo ul > .item div', { count: 2 })
9292
expect(await count('.item')).toBe(15)
9393
expect(await count('.item > ul')).toBe(5)
9494
expect(await text('#demo ul > .item:nth-child(1)')).toContain('[-]')

0 commit comments

Comments
 (0)