Skip to content

Commit 192ec9b

Browse files
committed
replaced every instead of some
1 parent edd8812 commit 192ec9b

File tree

2 files changed

+15
-30
lines changed

2 files changed

+15
-30
lines changed

lib/rules/jsx-no-target-blank.js

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,7 @@ function hasDynamicLink(node, linkAttribute) {
6666
}
6767

6868
function attributeValuePossiblyRel(value) {
69-
if (
70-
typeof value === 'string'
71-
// && (
72-
// (value && value.toLowerCase() === 'noreferrer')
73-
// || (value && value.toLowerCase() === 'noopener noreferrer')
74-
// || (value && value.toLowerCase() === 'noreferrer noopener')
75-
// )
76-
) {
69+
if (typeof value === 'string') {
7770
return true;
7871
}
7972
}
@@ -110,23 +103,15 @@ function hasSecureRel(node, allowReferrer, warnOnSpreadAttributes, spreadAttribu
110103

111104
const relAttribute = node.attributes[relIndex];
112105
const value = getStringFromValue(relAttribute.value);
113-
if (Array.isArray(value)) {
114-
return [].concat(value).filter(Boolean).some((item) => {
115-
const tags = typeof item === 'string' && item.toLowerCase().split(' ');
116-
const noreferrer = tags && tags.indexOf('noreferrer') >= 0;
117-
const noopener = tags && tags.indexOf('noopener') >= 0;
118-
if (!noreferrer) {
119-
return allowReferrer && noopener;
120-
}
121-
return false;
122-
});
123-
}
124-
const tags = value && typeof value === 'string' && value.toLowerCase().split(' ');
125-
const noreferrer = tags && tags.indexOf('noreferrer') >= 0;
126-
if (noreferrer) {
127-
return true;
128-
}
129-
return allowReferrer && tags && tags.indexOf('noopener') >= 0;
106+
return [].concat(value).filter(Boolean).every((item) => {
107+
const tags = typeof item === 'string' && item.toLowerCase().split(' ');
108+
const noreferrer = tags && tags.indexOf('noreferrer') >= 0;
109+
const noopener = tags && tags.indexOf('noopener') >= 0;
110+
if (noreferrer) {
111+
return true;
112+
}
113+
return allowReferrer && noopener;
114+
});
130115
}
131116

132117
const messages = {

tests/lib/rules/jsx-no-target-blank.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -393,10 +393,10 @@ ruleTester.run('jsx-no-target-blank', rule, {
393393
code: '<a href={href} target="_blank" rel={isExternal ? "noopener noreferrer" : "3"} />',
394394
errors: defaultErrors,
395395
},
396-
// {
397-
// code: '<a href={href} target="_blank" rel={isExternal ? "noopener" : "2"} />',
398-
// options: [{ allowReferrer: true }],
399-
// errors: defaultErrors,
400-
// },
396+
{
397+
code: '<a href={href} target="_blank" rel={isExternal ? "noopener" : "2"} />',
398+
options: [{ allowReferrer: true }],
399+
errors: defaultErrors,
400+
},
401401
]),
402402
});

0 commit comments

Comments
 (0)