Skip to content

Commit 5bfda8c

Browse files
committed
chore: Merge branch 'main' into minor
2 parents 171f3f5 + e9c676f commit 5bfda8c

File tree

6 files changed

+6
-32
lines changed

6 files changed

+6
-32
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"version": "3.6.0-alpha.3",
4-
"packageManager": "pnpm@10.12.4",
4+
"packageManager": "pnpm@10.20.0",
55
"type": "module",
66
"scripts": {
77
"dev": "node scripts/dev.js",

packages/compiler-core/__tests__/transforms/__snapshots__/transformExpressions.spec.ts.snap

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,6 @@ return function render(_ctx, _cache, $props, $setup, $data, $options) {
1414
}"
1515
`;
1616

17-
exports[`compiler: expression transform > expression with type 1`] = `
18-
"const { openBlock: _openBlock, createElementBlock: _createElementBlock } = Vue
19-
20-
return function render(_ctx, _cache) {
21-
return (_openBlock(), _createElementBlock("div", {
22-
onClick: _ctx.handleClick
23-
}, null, 8 /* PROPS */, ["onClick"]))
24-
}"
25-
`;
26-
2717
exports[`compiler: expression transform > should allow leak of var declarations in for loop 1`] = `
2818
"const { openBlock: _openBlock, createElementBlock: _createElementBlock } = Vue
2919

packages/compiler-core/__tests__/transforms/transformExpressions.spec.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -754,12 +754,4 @@ describe('compiler: expression transform', () => {
754754
expect(code).toMatch(`_ctx.bar`)
755755
})
756756
})
757-
758-
test('expression with type', () => {
759-
const { code } = compile(
760-
`<div @click="(<number>handleClick as any)"></div>`,
761-
)
762-
expect(code).toMatch(`onClick: _ctx.handleClick`)
763-
expect(code).toMatchSnapshot()
764-
})
765757
})

packages/compiler-core/src/transforms/transformExpression.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import {
1818
createSimpleExpression,
1919
} from '../ast'
2020
import {
21-
TS_NODE_TYPES,
2221
isInDestructureAssignment,
2322
isInNewExpression,
2423
isStaticProperty,
@@ -349,18 +348,15 @@ export function processExpression(
349348
// an ExpressionNode has the `.children` property, it will be used instead of
350349
// `.content`.
351350
const children: CompoundExpressionNode['children'] = []
352-
const isTSNode = TS_NODE_TYPES.includes(ast.type)
353351
ids.sort((a, b) => a.start - b.start)
354352
ids.forEach((id, i) => {
355353
// range is offset by -1 due to the wrapping parens when parsed
356354
const start = id.start - 1
357355
const end = id.end - 1
358356
const last = ids[i - 1]
359-
if (!(isTSNode && i === 0)) {
360-
const leadingText = rawExp.slice(last ? last.end - 1 : 0, start)
361-
if (leadingText.length || id.prefix) {
362-
children.push(leadingText + (id.prefix || ``))
363-
}
357+
const leadingText = rawExp.slice(last ? last.end - 1 : 0, start)
358+
if (leadingText.length || id.prefix) {
359+
children.push(leadingText + (id.prefix || ``))
364360
}
365361
const source = rawExp.slice(start, end)
366362
children.push(
@@ -377,7 +373,7 @@ export function processExpression(
377373
: ConstantTypes.NOT_CONSTANT,
378374
),
379375
)
380-
if (i === ids.length - 1 && end < rawExp.length && !isTSNode) {
376+
if (i === ids.length - 1 && end < rawExp.length) {
381377
children.push(rawExp.slice(end))
382378
}
383379
})

packages/reactivity/src/effect.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,6 @@ if (__DEV__) {
169169
setupOnTrigger(ReactiveEffect)
170170
}
171171

172-
export interface ReactiveEffectRunner<T = any> {
173-
(): T
174-
effect: ReactiveEffect
175-
}
176-
177172
export function effect<T = any>(
178173
fn: () => T,
179174
options?: ReactiveEffectOptions,

packages/runtime-dom/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import {
1919
} from '@vue/runtime-core'
2020
import { nodeOps } from './nodeOps'
2121
import { patchProp } from './patchProp'
22+
export { nodeOps, patchProp }
2223
// Importing from the compiler, will be tree-shaken in prod
2324
import {
2425
NOOP,

0 commit comments

Comments
 (0)