Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(no-deprecated-slot-attribute): no fix for dynamic components #2530

Merged
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions lib/rules/syntaxes/slot-attribute.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,8 @@ module.exports = {
// parse error or empty expression
return false
}
const slotName = sourceCode.getText(slotAttr.value.expression).trim()
// If non-Latin characters are included it can not be converted.
// It does not check the space only because `a>b?c:d` should be rejected.
return !/[^a-z]/i.test(slotName)

return slotAttr.value.expression.type === 'Identifier'
}

/**
Expand Down Expand Up @@ -102,7 +100,18 @@ module.exports = {
yield fixer.remove(scopeAttr)
}

yield fixer.insertTextBefore(element, `<template ${replaceText}>\n`)
const vFor = startTag.attributes.find(
(attr) => attr.directive && attr.key.name.name === 'for'
)
const vForText = vFor ? `${sourceCode.getText(vFor)} ` : ''
if (vFor) {
yield fixer.remove(vFor)
}

yield fixer.insertTextBefore(
element,
`<template ${vForText}${replaceText}>\n`
)
yield fixer.insertTextAfter(element, `\n</template>`)
}
}
Expand Down
3 changes: 2 additions & 1 deletion lib/rules/syntaxes/utils/can-convert-to-v-slot.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ module.exports = function canConvertToVSlot(element, sourceCode, tokenStore) {
const ownerElement = element.parent
if (
ownerElement.type === 'VDocumentFragment' ||
!utils.isCustomComponent(ownerElement)
!utils.isCustomComponent(ownerElement) ||
ownerElement.name === 'component'
) {
return false
}
Expand Down
38 changes: 38 additions & 0 deletions tests/lib/rules/no-deprecated-slot-attribute.js
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,44 @@ tester.run('no-deprecated-slot-attribute', rule, {
}
],
errors: ['`slot` attributes are deprecated.']
},
{
code: `
<template>
<my-component>
<slot
v-for="slot in Object.keys($slots)"
:slot="slot"
:name="slot"
></slot>
</my-component>
</template>`,
output: `
<template>
<my-component>
<template v-for="slot in Object.keys($slots)" v-slot:[slot]>
<slot


:name="slot"
></slot>
</template>
</my-component>
</template>`,
errors: ['`slot` attributes are deprecated.']
},
{
code: `
<template>
<component :is="toggle ? 'my-component' : 'div'">
<div slot="named">
Passing in a named slot to a div worked with old syntax
But not with new syntax
</div>
</component>
</template>`,
output: null,
errors: ['`slot` attributes are deprecated.']
}
]
})
Loading