mirror of
https://github.com/vuejs/babel-plugin-jsx.git
synced 2025-03-13 14:14:40 +08:00
feat: don't resolve directives in scope
This commit is contained in:
parent
2f75d2f872
commit
e6cee1ab58
@ -184,6 +184,11 @@ const resolveDirective = (
|
|||||||
}
|
}
|
||||||
return modelToUse;
|
return modelToUse;
|
||||||
}
|
}
|
||||||
|
const referenceName =
|
||||||
|
'v' + directiveName[0].toUpperCase() + directiveName.slice(1);
|
||||||
|
if (path.scope.references[referenceName]) {
|
||||||
|
return t.identifier(referenceName);
|
||||||
|
}
|
||||||
return t.callExpression(createIdentifier(state, 'resolveDirective'), [
|
return t.callExpression(createIdentifier(state, 'resolveDirective'), [
|
||||||
t.stringLiteral(directiveName),
|
t.stringLiteral(directiveName),
|
||||||
]);
|
]);
|
||||||
|
@ -407,7 +407,15 @@ const transformJSXElement = (
|
|||||||
|
|
||||||
// #541 - directives can't be resolved in optimized slots
|
// #541 - directives can't be resolved in optimized slots
|
||||||
// all parents should be deoptimized
|
// all parents should be deoptimized
|
||||||
if (directives.length) {
|
if (
|
||||||
|
directives.length &&
|
||||||
|
directives.some(
|
||||||
|
(d) =>
|
||||||
|
d.elements?.[0]?.type === 'CallExpression' &&
|
||||||
|
d.elements[0].callee.type === 'Identifier' &&
|
||||||
|
d.elements[0].callee.name === '_resolveDirective'
|
||||||
|
)
|
||||||
|
) {
|
||||||
let currentPath = path;
|
let currentPath = path;
|
||||||
while (currentPath.parentPath?.isJSXElement()) {
|
while (currentPath.parentPath?.isJSXElement()) {
|
||||||
currentPath = currentPath.parentPath;
|
currentPath = currentPath.parentPath;
|
||||||
|
@ -63,6 +63,12 @@ _createVNode(_Fragment, null, [_withDirectives(_createVNode(_resolveComponent("A
|
|||||||
}]])]);"
|
}]])]);"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
exports[`directive in scope > directive in scope 1`] = `
|
||||||
|
"import { resolveComponent as _resolveComponent, createVNode as _createVNode, withDirectives as _withDirectives } from "vue";
|
||||||
|
const vXxx = {};
|
||||||
|
_withDirectives(_createVNode(_resolveComponent("A"), null, null, 512), [[vXxx]]);"
|
||||||
|
`;
|
||||||
|
|
||||||
exports[`disable object slot syntax with defaultSlot > defaultSlot 1`] = `
|
exports[`disable object slot syntax with defaultSlot > defaultSlot 1`] = `
|
||||||
"import { resolveComponent as _resolveComponent, createVNode as _createVNode } from "vue";
|
"import { resolveComponent as _resolveComponent, createVNode as _createVNode } from "vue";
|
||||||
_createVNode(_resolveComponent("Badge"), null, {
|
_createVNode(_resolveComponent("Badge"), null, {
|
||||||
@ -164,6 +170,20 @@ _createVNode(_Fragment, null, [_createVNode(_resolveComponent("A"), null, {
|
|||||||
})]);"
|
})]);"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
exports[`passing object slots via JSX children directive in slot, in scope > directive in slot, in scope 1`] = `
|
||||||
|
"import { Fragment as _Fragment, createVNode as _createVNode, withDirectives as _withDirectives, resolveComponent as _resolveComponent } from "vue";
|
||||||
|
const vXxx = {};
|
||||||
|
_createVNode(_Fragment, null, [_createVNode(_resolveComponent("A"), null, {
|
||||||
|
default: () => [_withDirectives(_createVNode("div", null, null, 512), [[vXxx]]), foo],
|
||||||
|
_: 1
|
||||||
|
}), _createVNode(_resolveComponent("A"), null, {
|
||||||
|
default: () => [_createVNode(_resolveComponent("B"), null, {
|
||||||
|
default: () => [_withDirectives(_createVNode("div", null, null, 512), [[vXxx]]), foo],
|
||||||
|
_: 1
|
||||||
|
})]
|
||||||
|
})]);"
|
||||||
|
`;
|
||||||
|
|
||||||
exports[`passing object slots via JSX children multiple expressions > multiple expressions 1`] = `
|
exports[`passing object slots via JSX children multiple expressions > multiple expressions 1`] = `
|
||||||
"import { resolveComponent as _resolveComponent, createVNode as _createVNode } from "vue";
|
"import { resolveComponent as _resolveComponent, createVNode as _createVNode } from "vue";
|
||||||
_createVNode(_resolveComponent("A"), null, {
|
_createVNode(_resolveComponent("A"), null, {
|
||||||
|
@ -155,6 +155,13 @@ const transpile = (source: string, options: VueJSXPluginOptions = {}) =>
|
|||||||
</>
|
</>
|
||||||
`,
|
`,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: 'directive in scope',
|
||||||
|
from: `
|
||||||
|
const vXxx = {};
|
||||||
|
<A v-xxx />
|
||||||
|
`,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: 'vModels',
|
name: 'vModels',
|
||||||
from: '<C v-models={[[foo, ["modifier"]], [bar, "bar", ["modifier1", "modifier2"]]]} />',
|
from: '<C v-models={[[foo, ["modifier"]], [bar, "bar", ["modifier1", "modifier2"]]]} />',
|
||||||
@ -277,6 +284,18 @@ const slotsTests: Test[] = [
|
|||||||
</>
|
</>
|
||||||
`,
|
`,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: 'directive in slot, in scope',
|
||||||
|
from: `
|
||||||
|
const vXxx = {};
|
||||||
|
<>
|
||||||
|
<A><div v-xxx />{foo}</A>
|
||||||
|
<A>
|
||||||
|
<B><div v-xxx />{foo}</B>
|
||||||
|
</A>
|
||||||
|
</>
|
||||||
|
`,
|
||||||
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
slotsTests.forEach(({ name, from }) => {
|
slotsTests.forEach(({ name, from }) => {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user