Skip to content

Commit

Permalink
replaced every instead of some
Browse files Browse the repository at this point in the history
  • Loading branch information
V2dha committed Jul 22, 2022
1 parent edd8812 commit 192ec9b
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 30 deletions.
35 changes: 10 additions & 25 deletions lib/rules/jsx-no-target-blank.js
Expand Up @@ -66,14 +66,7 @@ function hasDynamicLink(node, linkAttribute) {
}

function attributeValuePossiblyRel(value) {
if (
typeof value === 'string'
// && (
// (value && value.toLowerCase() === 'noreferrer')
// || (value && value.toLowerCase() === 'noopener noreferrer')
// || (value && value.toLowerCase() === 'noreferrer noopener')
// )
) {
if (typeof value === 'string') {
return true;
}
}
Expand Down Expand Up @@ -110,23 +103,15 @@ function hasSecureRel(node, allowReferrer, warnOnSpreadAttributes, spreadAttribu

const relAttribute = node.attributes[relIndex];
const value = getStringFromValue(relAttribute.value);
if (Array.isArray(value)) {
return [].concat(value).filter(Boolean).some((item) => {
const tags = typeof item === 'string' && item.toLowerCase().split(' ');
const noreferrer = tags && tags.indexOf('noreferrer') >= 0;
const noopener = tags && tags.indexOf('noopener') >= 0;
if (!noreferrer) {
return allowReferrer && noopener;
}
return false;
});
}
const tags = value && typeof value === 'string' && value.toLowerCase().split(' ');
const noreferrer = tags && tags.indexOf('noreferrer') >= 0;
if (noreferrer) {
return true;
}
return allowReferrer && tags && tags.indexOf('noopener') >= 0;
return [].concat(value).filter(Boolean).every((item) => {
const tags = typeof item === 'string' && item.toLowerCase().split(' ');
const noreferrer = tags && tags.indexOf('noreferrer') >= 0;
const noopener = tags && tags.indexOf('noopener') >= 0;
if (noreferrer) {
return true;
}
return allowReferrer && noopener;
});
}

const messages = {
Expand Down
10 changes: 5 additions & 5 deletions tests/lib/rules/jsx-no-target-blank.js
Expand Up @@ -393,10 +393,10 @@ ruleTester.run('jsx-no-target-blank', rule, {
code: '<a href={href} target="_blank" rel={isExternal ? "noopener noreferrer" : "3"} />',
errors: defaultErrors,
},
// {
// code: '<a href={href} target="_blank" rel={isExternal ? "noopener" : "2"} />',
// options: [{ allowReferrer: true }],
// errors: defaultErrors,
// },
{
code: '<a href={href} target="_blank" rel={isExternal ? "noopener" : "2"} />',
options: [{ allowReferrer: true }],
errors: defaultErrors,
},
]),
});

0 comments on commit 192ec9b

Please sign in to comment.