Skip to content

Commit cfe8030

Browse files
OnlyWickOnlyWick
authored
Merge branch 'main' into optimize-reactive-judgment
2 parents c563318 + 9e8ac0c commit cfe8030

File tree

19 files changed

+317
-267
lines changed

19 files changed

+317
-267
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@v2
17+
uses: pnpm/action-setup@v3.0.0
1818

1919
- name: Set node version to 18
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@v2
20+
uses: pnpm/action-setup@v3.0.0
2121

2222
- name: Set node version to 18
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@v2
18+
uses: pnpm/action-setup@v3.0.0
1919

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

‎.github/workflows/ci.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: actions/checkout@v4
2121

2222
- name: Install pnpm
23-
uses: pnpm/action-setup@v2
23+
uses: pnpm/action-setup@v3.0.0
2424

2525
- name: Install Node.js
2626
uses: actions/setup-node@v4
@@ -42,7 +42,7 @@ jobs:
4242
- uses: actions/checkout@v4
4343

4444
- name: Install pnpm
45-
uses: pnpm/action-setup@v2
45+
uses: pnpm/action-setup@v3.0.0
4646

4747
- name: Install Node.js
4848
uses: actions/setup-node@v4
@@ -71,7 +71,7 @@ jobs:
7171
key: chromium-${{ hashFiles('pnpm-lock.yaml') }}
7272

7373
- name: Install pnpm
74-
uses: pnpm/action-setup@v2
74+
uses: pnpm/action-setup@v3.0.0
7575

7676
- name: Install Node.js
7777
uses: actions/setup-node@v4
@@ -97,7 +97,7 @@ jobs:
9797
- uses: actions/checkout@v4
9898

9999
- name: Install pnpm
100-
uses: pnpm/action-setup@v2
100+
uses: pnpm/action-setup@v3.0.0
101101

102102
- name: Install Node.js
103103
uses: actions/setup-node@v4
@@ -125,7 +125,7 @@ jobs:
125125
# - uses: actions/checkout@v4
126126

127127
# - name: Install pnpm
128-
# uses: pnpm/action-setup@v2
128+
# uses: pnpm/action-setup@v3.0.0
129129

130130
# - name: Install Node.js
131131
# uses: actions/setup-node@v4

‎.github/workflows/size-data.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- uses: actions/checkout@v4
2323

2424
- name: Install pnpm
25-
uses: pnpm/action-setup@v2
25+
uses: pnpm/action-setup@v3.0.0
2626

2727
- name: Install Node.js
2828
uses: actions/setup-node@v4

‎.github/workflows/size-report.yml

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

2626
- name: Install pnpm
27-
uses: pnpm/action-setup@v2
27+
uses: pnpm/action-setup@v3.0.0
2828

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

‎package.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
"node": ">=18.12.0"
6060
},
6161
"devDependencies": {
62-
"@babel/parser": "^7.23.9",
63-
"@babel/types": "^7.23.9",
62+
"@babel/parser": "^7.24.0",
63+
"@babel/types": "^7.24.0",
6464
"@codspeed/vitest-plugin": "^2.3.1",
6565
"@rollup/plugin-alias": "^5.1.0",
6666
"@rollup/plugin-commonjs": "^25.0.7",
@@ -70,10 +70,10 @@
7070
"@rollup/plugin-terser": "^0.4.4",
7171
"@types/hash-sum": "^1.0.2",
7272
"@types/minimist": "^1.2.5",
73-
"@types/node": "^20.11.20",
73+
"@types/node": "^20.11.25",
7474
"@types/semver": "^7.5.8",
75-
"@typescript-eslint/eslint-plugin": "^7.0.2",
76-
"@typescript-eslint/parser": "^7.0.2",
75+
"@typescript-eslint/eslint-plugin": "^7.1.1",
76+
"@typescript-eslint/parser": "^7.1.1",
7777
"@vitest/coverage-istanbul": "^1.3.1",
7878
"@vue/consolidate": "1.0.0",
7979
"conventional-changelog-cli": "^4.1.0",
@@ -89,30 +89,30 @@
8989
"jsdom": "^24.0.0",
9090
"lint-staged": "^15.2.2",
9191
"lodash": "^4.17.21",
92-
"magic-string": "^0.30.7",
92+
"magic-string": "^0.30.8",
9393
"markdown-table": "^3.0.3",
94-
"marked": "^12.0.0",
94+
"marked": "^12.0.1",
9595
"minimist": "^1.2.8",
9696
"npm-run-all2": "^6.1.2",
9797
"picocolors": "^1.0.0",
9898
"prettier": "^3.2.5",
9999
"pretty-bytes": "^6.1.1",
100100
"pug": "^3.0.2",
101-
"puppeteer": "~22.2.0",
101+
"puppeteer": "~22.4.1",
102102
"rimraf": "^5.0.5",
103-
"rollup": "^4.12.0",
103+
"rollup": "^4.12.1",
104104
"rollup-plugin-dts": "^6.1.0",
105105
"rollup-plugin-esbuild": "^6.1.1",
106106
"rollup-plugin-polyfill-node": "^0.13.0",
107107
"semver": "^7.6.0",
108108
"serve": "^14.2.1",
109-
"simple-git-hooks": "^2.9.0",
110-
"terser": "^5.28.1",
109+
"simple-git-hooks": "^2.10.0",
110+
"terser": "^5.29.1",
111111
"todomvc-app-css": "^2.4.3",
112112
"tslib": "^2.6.2",
113113
"tsx": "^4.7.1",
114114
"typescript": "^5.2.2",
115-
"vite": "^5.1.4",
115+
"vite": "^5.1.5",
116116
"vitest": "^1.3.1"
117117
}
118118
}

‎packages/compiler-core/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@
4646
},
4747
"homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-core#readme",
4848
"dependencies": {
49-
"@babel/parser": "^7.23.9",
49+
"@babel/parser": "^7.24.0",
5050
"@vue/shared": "workspace:*",
5151
"entities": "^4.5.0",
5252
"estree-walker": "^2.0.2",
5353
"source-map-js": "^1.0.2"
5454
},
5555
"devDependencies": {
56-
"@babel/types": "^7.23.9"
56+
"@babel/types": "^7.24.0"
5757
}
5858
}

‎packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap

+21
Original file line numberDiff line numberDiff line change
@@ -1362,3 +1362,24 @@ return { get foo() { return foo } }
13621362
13631363
}"
13641364
`;
1365+
1366+
exports[`compileScript > should care about runtimeModuleName 1`] = `
1367+
"import { withAsyncContext as _withAsyncContext } from "npm:vue"
1368+
1369+
export default {
1370+
async setup(__props, { expose: __expose }) {
1371+
__expose();
1372+
1373+
let __temp, __restore
1374+
1375+
;(
1376+
([__temp,__restore] = _withAsyncContext(() => Promise.resolve(1))),
1377+
await __temp,
1378+
__restore()
1379+
)
1380+
1381+
return { }
1382+
}
1383+
1384+
}"
1385+
`;

‎packages/compiler-sfc/__tests__/compileScript.spec.ts

+23
Original file line numberDiff line numberDiff line change
@@ -1472,3 +1472,26 @@ describe('SFC genDefaultAs', () => {
14721472
})
14731473
})
14741474
})
1475+
1476+
describe('compileScript', () => {
1477+
test('should care about runtimeModuleName', () => {
1478+
const { content } = compile(
1479+
`
1480+
<script setup>
1481+
await Promise.resolve(1)
1482+
</script>
1483+
`,
1484+
{
1485+
templateOptions: {
1486+
compilerOptions: {
1487+
runtimeModuleName: 'npm:vue',
1488+
},
1489+
},
1490+
},
1491+
)
1492+
expect(content).toMatch(
1493+
`import { withAsyncContext as _withAsyncContext } from "npm:vue"\n`,
1494+
)
1495+
assertCode(content)
1496+
})
1497+
})

‎packages/compiler-sfc/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,18 @@
4242
},
4343
"homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-sfc#readme",
4444
"dependencies": {
45-
"@babel/parser": "^7.23.9",
45+
"@babel/parser": "^7.24.0",
4646
"@vue/compiler-core": "workspace:*",
4747
"@vue/compiler-dom": "workspace:*",
4848
"@vue/compiler-ssr": "workspace:*",
4949
"@vue/shared": "workspace:*",
5050
"estree-walker": "^2.0.2",
51-
"magic-string": "^0.30.7",
51+
"magic-string": "^0.30.8",
5252
"postcss": "^8.4.35",
5353
"source-map-js": "^1.0.2"
5454
},
5555
"devDependencies": {
56-
"@babel/types": "^7.23.9",
56+
"@babel/types": "^7.24.0",
5757
"@vue/consolidate": "^1.0.0",
5858
"hash-sum": "^2.0.0",
5959
"lru-cache": "10.1.0",

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

+6-1
Original file line numberDiff line numberDiff line change
@@ -989,10 +989,15 @@ export function compileScript(
989989

990990
// 11. finalize Vue helper imports
991991
if (ctx.helperImports.size > 0) {
992+
const runtimeModuleName =
993+
options.templateOptions?.compilerOptions?.runtimeModuleName
994+
const importSrc = runtimeModuleName
995+
? JSON.stringify(runtimeModuleName)
996+
: `'vue'`
992997
ctx.s.prepend(
993998
`import { ${[...ctx.helperImports]
994999
.map(h => `${h} as _${h}`)
995-
.join(', ')} } from 'vue'\n`,
1000+
.join(', ')} } from ${importSrc}\n`,
9961001
)
9971002
}
9981003

‎packages/runtime-dom/src/jsx.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1348,8 +1348,9 @@ export interface Events {
13481348
// selection events
13491349
onSelect: Event
13501350

1351-
// UI events
1352-
onScroll: UIEvent
1351+
// scroll events
1352+
onScroll: Event
1353+
onScrollend: Event
13531354

13541355
// touch events
13551356
onTouchcancel: TouchEvent

‎packages/sfc-playground/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"devDependencies": {
1212
"@vitejs/plugin-vue": "^5.0.4",
13-
"vite": "^5.1.4"
13+
"vite": "^5.1.5"
1414
},
1515
"dependencies": {
1616
"@vue/repl": "^4.1.1",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export async function downloadProject(store: ReplStore) {
2727

2828
const files = store.getFiles()
2929
for (const file in files) {
30-
if (file !== 'import-map.json') {
30+
if (file !== 'import-map.json' && file !== 'tsconfig.json') {
3131
src.file(file, files[file])
3232
} else {
3333
zip.file(file, files[file])

‎packages/sfc-playground/src/download/template/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Vite Vue Starter
22

3-
This is a project template using [Vite](https://vitejs.dev/). It requires [Node.js](https://nodejs.org) v12+.
3+
This is a project template using [Vite](https://vitejs.dev/). It requires [Node.js](https://nodejs.org) version 18+, 20+.
44

55
To start:
66

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
},
1313
"devDependencies": {
1414
"@vitejs/plugin-vue": "^5.0.4",
15-
"vite": "^5.1.4"
15+
"vite": "^5.1.5"
1616
}
1717
}

‎packages/vue-compat/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
},
5353
"homepage": "https://github.com/vuejs/core/tree/main/packages/vue-compat#readme",
5454
"dependencies": {
55-
"@babel/parser": "^7.23.9",
55+
"@babel/parser": "^7.24.0",
5656
"estree-walker": "^2.0.2",
5757
"source-map-js": "^1.0.2"
5858
},

0 commit comments

Comments
 (0)