Skip to content

Commit 8ca0a4b

Browse files
reconstructionsjustin808
authored andcommitted
Updated eslint packages (shakacode#426)
1 parent 380c89a commit 8ca0a4b

File tree

10 files changed

+130
-56
lines changed

10 files changed

+130
-56
lines changed

client/.eslintrc.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@ env:
1717

1818
rules:
1919
import/extensions: [2, { js: "never", jsx: "never" }]
20+
function-paren-newline: ["error", "consistent"]
2021

2122
# Good idea, but let's go to flow before fixing all these
2223
react/forbid-prop-types: 0
23-
jsx-a11y/href-no-hash: 0
24+
jsx-a11y/href-no-hash: 0
25+
26+
jsx-a11y/anchor-is-valid: off
2427

2528
# arrow-parens:
2629
# - 0

client/app/bundles/comments/components/CommentBox/CommentBox.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ class CommentBox extends BaseComponent {
9292
<ul>
9393
<li>
9494
{ (data.get('isFetching') && <br />) ||
95-
<a href="javascript:void(0)" onClick={this.refreshComments}>
95+
<button className={css.anchorButton} onClick={this.refreshComments} >
9696
{formatMessage(defaultMessages.descriptionForceRefrech)}
97-
</a>
97+
</button>
9898
}
9999
</li>
100100
<li>{formatMessage(defaultMessages.descriptionSupportMarkdown)}</li>

client/app/bundles/comments/components/CommentBox/CommentBox.scss

+12
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,15 @@
1515
transition: opacity 0.5s ease-in;
1616
}
1717
}
18+
19+
.anchorButton {
20+
background-color: transparent;
21+
border: 0;
22+
color: #337AB7;
23+
cursor: pointer;
24+
padding: 0;
25+
}
26+
27+
.anchorButton:hover {
28+
text-decoration: underline;
29+
}

client/app/bundles/comments/components/CommentBox/CommentForm/CommentForm.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ class CommentForm extends BaseComponent {
283283
}
284284

285285
errorWarning() {
286-
const error = this.props.error;
286+
const { error } = this.props;
287287

288288
// If there is no error, there is nothing to add to the DOM
289289
if (!error) return null;

client/app/bundles/comments/components/CommentBox/CommentList/CommentList.jsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ export default class CommentList extends BaseComponent {
4545
key={$$comment.get('id') || index}
4646
author={$$comment.get('author')}
4747
text={$$comment.get('text')}
48-
/>),
49-
);
48+
/>));
5049

5150
// For animation with ReactCSSTransitionGroup
5251
// https://facebook.github.io/react/docs/animation.html

client/app/bundles/comments/components/NavigationBar/NavigationBar.jsx

+1-5
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,7 @@ const NavigationBar = (props) => {
5555
</a>
5656
</li>
5757
<li>
58-
<a
59-
href={
60-
'https://forum.shakacode.com/c/reactjs'
61-
}
62-
>Forum</a>
58+
<a href="https://forum.shakacode.com/c/reactjs">Forum</a>
6359
</li>
6460
{_.isNumber(commentsCount) && CommentsCount({ commentsCount })}
6561
</ul>

client/app/bundles/comments/reducers/commentsReducer.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ export const $$initialState = Immutable.fromJS({
1414
});
1515

1616
export default function commentsReducer($$state = $$initialState, action = null) {
17-
const { type, comment, comments, error, locale } = action;
17+
const {
18+
type, comment, comments, error, locale,
19+
} = action;
1820

1921
switch (type) {
2022
case actionTypes.FETCH_COMMENTS_SUCCESS: {

client/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@
105105
"chai": "^4.1.2",
106106
"chai-immutable": "^1.6.0",
107107
"eslint": "^4.11.0",
108-
"eslint-config-shakacode": "^15.0.0",
108+
"eslint-config-shakacode": "^16.0.0",
109109
"eslint-import-resolver-webpack": "^0.8.3",
110110
"eslint-plugin-import": "^2.8.0",
111-
"eslint-plugin-jsx-a11y": "^5.1.1",
111+
"eslint-plugin-jsx-a11y": "^6.0.2",
112112
"eslint-plugin-react": "^7.5.1",
113113
"estraverse-fb": "^1.3.2",
114114
"express": "^4.16.2",

client/server-express.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ server.app.get('/comments.json', (_req, res) => {
3535
});
3636

3737
server.app.post('/comments.json', (req, res) => {
38-
const comment = req.body.comment;
38+
const { comment } = req.body;
3939
comment.id = uuid.v4();
4040

4141
console.log('Processing comment: %j', comment);

client/yarn.lock

+103-41
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,14 @@ babel-cli@^6.26.0:
404404
optionalDependencies:
405405
chokidar "^1.6.1"
406406

407+
408+
version "7.0.0-beta.0"
409+
resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-7.0.0-beta.0.tgz#418a7b5f3f7dc9a4670e61b1158b4c5661bec98d"
410+
dependencies:
411+
chalk "^2.0.0"
412+
esutils "^2.0.2"
413+
js-tokens "^3.0.0"
414+
407415
babel-code-frame@^6.11.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
408416
version "6.26.0"
409417
resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
@@ -436,14 +444,14 @@ babel-core@^6.26.0:
436444
slash "^1.0.0"
437445
source-map "^0.5.6"
438446

439-
babel-eslint@^7.1.1:
440-
version "7.2.3"
441-
resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-7.2.3.tgz#b2fe2d80126470f5c19442dc757253a897710827"
447+
babel-eslint@8.0.1:
448+
version "8.0.1"
449+
resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.0.1.tgz#5d718be7a328625d006022eb293ed3008cbd6346"
442450
dependencies:
443-
babel-code-frame "^6.22.0"
444-
babel-traverse "^6.23.1"
445-
babel-types "^6.23.0"
446-
babylon "^6.17.0"
451+
babel-code-frame "7.0.0-beta.0"
452+
babel-traverse "7.0.0-beta.0"
453+
babel-types "7.0.0-beta.0"
454+
babylon "7.0.0-beta.22"
447455

448456
babel-eslint@^8.0.2:
449457
version "8.0.2"
@@ -526,6 +534,15 @@ babel-helper-explode-class@^6.24.1:
526534
babel-traverse "^6.24.1"
527535
babel-types "^6.24.1"
528536

537+
538+
version "7.0.0-beta.0"
539+
resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-7.0.0-beta.0.tgz#d1b6779b647e5c5c31ebeb05e13b998e4d352d56"
540+
dependencies:
541+
babel-helper-get-function-arity "7.0.0-beta.0"
542+
babel-template "7.0.0-beta.0"
543+
babel-traverse "7.0.0-beta.0"
544+
babel-types "7.0.0-beta.0"
545+
529546
babel-helper-function-name@^6.24.1:
530547
version "6.24.1"
531548
resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
@@ -536,6 +553,12 @@ babel-helper-function-name@^6.24.1:
536553
babel-traverse "^6.24.1"
537554
babel-types "^6.24.1"
538555

556+
557+
version "7.0.0-beta.0"
558+
resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-7.0.0-beta.0.tgz#9d1ab7213bb5efe1ef1638a8ea1489969b5a8b6e"
559+
dependencies:
560+
babel-types "7.0.0-beta.0"
561+
539562
babel-helper-get-function-arity@^6.24.1:
540563
version "6.24.1"
541564
resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
@@ -601,6 +624,10 @@ babel-loader@^7.1.2:
601624
loader-utils "^1.0.2"
602625
mkdirp "^0.5.1"
603626

627+
628+
version "7.0.0-beta.0"
629+
resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-7.0.0-beta.0.tgz#6df01296e49fc8fbd0637394326a167f36da817b"
630+
604631
babel-messages@^6.23.0:
605632
version "6.23.0"
606633
resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
@@ -1017,6 +1044,15 @@ babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runti
10171044
core-js "^2.4.0"
10181045
regenerator-runtime "^0.11.0"
10191046

1047+
1048+
version "7.0.0-beta.0"
1049+
resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-7.0.0-beta.0.tgz#85083cf9e4395d5e48bf5154d7a8d6991cafecfb"
1050+
dependencies:
1051+
babel-traverse "7.0.0-beta.0"
1052+
babel-types "7.0.0-beta.0"
1053+
babylon "7.0.0-beta.22"
1054+
lodash "^4.2.0"
1055+
10201056
babel-template@^6.24.1, babel-template@^6.26.0:
10211057
version "6.26.0"
10221058
resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
@@ -1027,7 +1063,21 @@ babel-template@^6.24.1, babel-template@^6.26.0:
10271063
babylon "^6.18.0"
10281064
lodash "^4.17.4"
10291065

1030-
babel-traverse@^6.23.1, babel-traverse@^6.24.1, babel-traverse@^6.26.0:
1066+
1067+
version "7.0.0-beta.0"
1068+
resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-7.0.0-beta.0.tgz#da14be9b762f62a2f060db464eaafdd8cd072a41"
1069+
dependencies:
1070+
babel-code-frame "7.0.0-beta.0"
1071+
babel-helper-function-name "7.0.0-beta.0"
1072+
babel-messages "7.0.0-beta.0"
1073+
babel-types "7.0.0-beta.0"
1074+
babylon "7.0.0-beta.22"
1075+
debug "^3.0.1"
1076+
globals "^10.0.0"
1077+
invariant "^2.2.0"
1078+
lodash "^4.2.0"
1079+
1080+
babel-traverse@^6.24.1, babel-traverse@^6.26.0:
10311081
version "6.26.0"
10321082
resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
10331083
dependencies:
@@ -1041,7 +1091,15 @@ babel-traverse@^6.23.1, babel-traverse@^6.24.1, babel-traverse@^6.26.0:
10411091
invariant "^2.2.2"
10421092
lodash "^4.17.4"
10431093

1044-
babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1, babel-types@^6.26.0:
1094+
1095+
version "7.0.0-beta.0"
1096+
resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-7.0.0-beta.0.tgz#eb8b6e556470e6dcc4aef982d79ad229469b5169"
1097+
dependencies:
1098+
esutils "^2.0.2"
1099+
lodash "^4.2.0"
1100+
to-fast-properties "^2.0.0"
1101+
1102+
babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
10451103
version "6.26.0"
10461104
resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
10471105
dependencies:
@@ -1050,11 +1108,15 @@ babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1, babel-types@^6.26
10501108
lodash "^4.17.4"
10511109
to-fast-properties "^1.0.3"
10521110

1111+
1112+
version "7.0.0-beta.22"
1113+
resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.22.tgz#74f0ad82ed7c7c3cfeab74cf684f815104161b65"
1114+
10531115
[email protected], babylon@^7.0.0-beta.31:
10541116
version "7.0.0-beta.32"
10551117
resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.32.tgz#e9033cb077f64d6895f4125968b37dc0a8c3bc6e"
10561118

1057-
babylon@^6.17.0, babylon@^6.18.0:
1119+
babylon@^6.18.0:
10581120
version "6.18.0"
10591121
resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
10601122

@@ -1329,12 +1391,12 @@ caniuse-api@^1.5.2:
13291391
lodash.uniq "^4.5.0"
13301392

13311393
caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
1332-
version "1.0.30000772"
1333-
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000772.tgz#51aae891768286eade4a3d8319ea76d6a01b512b"
1394+
version "1.0.30000775"
1395+
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000775.tgz#04bccdd0214edf25b97f61a096609f7ad6904333"
13341396

13351397
caniuse-lite@^1.0.30000748, caniuse-lite@^1.0.30000770:
1336-
version "1.0.30000772"
1337-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000772.tgz#78129622cabfed7af1ff38b64ab680a6a0865420"
1398+
version "1.0.30000775"
1399+
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000775.tgz#74d27feddc47f3c84cfbcb130c3092a35ebc2de2"
13381400

13391401
caseless@~0.11.0:
13401402
version "0.11.0"
@@ -1551,8 +1613,8 @@ [email protected]:
15511613
graceful-readlink ">= 1.0.0"
15521614

15531615
commander@^2.11.0, commander@^2.9.0:
1554-
version "2.12.1"
1555-
resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.1.tgz#468635c4168d06145b9323356d1da84d14ac4a7a"
1616+
version "2.12.2"
1617+
resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
15561618

15571619
commondir@^1.0.1:
15581620
version "1.0.1"
@@ -2216,24 +2278,24 @@ escope@^3.6.0:
22162278
esrecurse "^4.1.0"
22172279
estraverse "^4.1.1"
22182280

2219-
eslint-config-airbnb-base@^11.3.0:
2220-
version "11.3.2"
2221-
resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-11.3.2.tgz#8703b11abe3c88ac7ec2b745b7fdf52e00ae680a"
2281+
eslint-config-airbnb-base@^12.1.0:
2282+
version "12.1.0"
2283+
resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-12.1.0.tgz#386441e54a12ccd957b0a92564a4bafebd747944"
22222284
dependencies:
22232285
eslint-restricted-globals "^0.1.1"
22242286

2225-
eslint-config-airbnb@^15.0.1:
2226-
version "15.1.0"
2227-
resolved "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-15.1.0.tgz#fd432965a906e30139001ba830f58f73aeddae8e"
2287+
eslint-config-airbnb@16.1.0:
2288+
version "16.1.0"
2289+
resolved "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-16.1.0.tgz#2546bfb02cc9fe92284bf1723ccf2e87bc45ca46"
22282290
dependencies:
2229-
eslint-config-airbnb-base "^11.3.0"
2291+
eslint-config-airbnb-base "^12.1.0"
22302292

2231-
eslint-config-shakacode@^15.0.0:
2232-
version "15.0.0"
2233-
resolved "https://registry.yarnpkg.com/eslint-config-shakacode/-/eslint-config-shakacode-15.0.0.tgz#186a6dd3b4e103aa5faaec8e771f865a10a6e55a"
2293+
eslint-config-shakacode@^16.0.0:
2294+
version "16.0.0"
2295+
resolved "https://registry.yarnpkg.com/eslint-config-shakacode/-/eslint-config-shakacode-16.0.0.tgz#6d2ab616dfa0a0427ef8c99944a33bbd6f647fb3"
22342296
dependencies:
2235-
babel-eslint "^7.1.1"
2236-
eslint-config-airbnb "^15.0.1"
2297+
babel-eslint "8.0.1"
2298+
eslint-config-airbnb "16.1.0"
22372299

22382300
eslint-import-resolver-node@^0.3.1:
22392301
version "0.3.1"
@@ -2280,9 +2342,9 @@ eslint-plugin-import@^2.8.0:
22802342
minimatch "^3.0.3"
22812343
read-pkg-up "^2.0.0"
22822344

2283-
eslint-plugin-jsx-a11y@^5.1.1:
2284-
version "5.1.1"
2285-
resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-5.1.1.tgz#5c96bb5186ca14e94db1095ff59b3e2bd94069b1"
2345+
eslint-plugin-jsx-a11y@^6.0.2:
2346+
version "6.0.2"
2347+
resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.0.2.tgz#659277a758b036c305a7e4a13057c301cd3be73f"
22862348
dependencies:
22872349
aria-query "^0.7.0"
22882350
array-includes "^3.0.3"
@@ -2313,8 +2375,8 @@ eslint-scope@^3.7.1:
23132375
estraverse "^4.1.1"
23142376

23152377
eslint@^4.11.0:
2316-
version "4.12.0"
2317-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.12.0.tgz#a7ce78eba8cc8f2443acfbbc870cc31a65135884"
2378+
version "4.12.1"
2379+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.12.1.tgz#5ec1973822b4a066b353770c3c6d69a2a188e880"
23182380
dependencies:
23192381
ajv "^5.3.0"
23202382
babel-code-frame "^6.22.0"
@@ -3237,8 +3299,8 @@ [email protected]:
32373299
meow "^3.3.0"
32383300

32393301
interpret@^1.0.0:
3240-
version "1.0.4"
3241-
resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.4.tgz#820cdd588b868ffb191a809506d6c9c8f212b1b0"
3302+
version "1.1.0"
3303+
resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
32423304

32433305
intl-format-cache@^2.0.5:
32443306
version "2.1.0"
@@ -5215,8 +5277,8 @@ react-deep-force-update@^1.0.0:
52155277
resolved "https://registry.yarnpkg.com/react-deep-force-update/-/react-deep-force-update-1.1.1.tgz#bcd31478027b64b3339f108921ab520b4313dc2c"
52165278

52175279
react-dom@^16.1.1:
5218-
version "16.1.1"
5219-
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.1.1.tgz#b2e331b6d752faf1a2d31399969399a41d8d45f8"
5280+
version "16.2.0"
5281+
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044"
52205282
dependencies:
52215283
fbjs "^0.8.16"
52225284
loose-envify "^1.1.0"
@@ -5309,8 +5371,8 @@ react-transition-group@^1.2.0:
53095371
warning "^3.0.0"
53105372

53115373
react@^16.1.1:
5312-
version "16.1.1"
5313-
resolved "https://registry.yarnpkg.com/react/-/react-16.1.1.tgz#d5c4ef795507e3012282dd51261ff9c0e824fe1f"
5374+
version "16.2.0"
5375+
resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"
53145376
dependencies:
53155377
fbjs "^0.8.16"
53165378
loose-envify "^1.1.0"
@@ -6135,8 +6197,8 @@ svgo@^0.7.0:
61356197
whet.extend "~0.9.9"
61366198

61376199
symbol-observable@^1.0.3:
6138-
version "1.0.4"
6139-
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
6200+
version "1.1.0"
6201+
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.1.0.tgz#5c68fd8d54115d9dfb72a84720549222e8db9b32"
61406202

61416203
symbol-tree@^3.2.1:
61426204
version "3.2.2"

0 commit comments

Comments
 (0)