Skip to content

Commit 78466fb

Browse files
Judahmeekjustin808
authored andcommitted
Bump dependencies (#421) to RoR v10
1 parent 00a1b4c commit 78466fb

File tree

21 files changed

+1330
-645
lines changed

21 files changed

+1330
-645
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source "https://rubygems.org"
22
ruby "2.4.1"
33

4-
gem "react_on_rails", "9.0.0.rc.0"
4+
gem "react_on_rails", "10.0.0"
55
gem "webpacker"
66

77
# Bundle edge Rails instead: gem "rails", github: "rails/rails"

Gemfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ GEM
5050
bindex (0.5.0)
5151
binding_of_caller (0.7.2)
5252
debug_inspector (>= 0.0.1)
53-
brakeman (3.6.1)
53+
brakeman (4.0.1)
5454
builder (3.2.3)
5555
bundler-audit (0.5.0)
5656
bundler (~> 1.2)
@@ -203,13 +203,13 @@ GEM
203203
rb-inotify (0.9.8)
204204
ffi (>= 0.5.0)
205205
rdoc (4.3.0)
206-
react_on_rails (9.0.0.rc.0)
206+
react_on_rails (10.0.0)
207207
addressable
208208
connection_pool
209209
execjs (~> 2.5)
210210
rails (>= 3.2)
211211
rainbow (~> 2.2)
212-
redis (3.3.3)
212+
redis (4.0.1)
213213
rspec-core (3.6.0)
214214
rspec-support (~> 3.6.0)
215215
rspec-expectations (3.6.0)
@@ -337,7 +337,7 @@ DEPENDENCIES
337337
rails (~> 5)
338338
rails-html-sanitizer
339339
rainbow
340-
react_on_rails (= 9.0.0.rc.0)
340+
react_on_rails (= 10.0.0)
341341
redis
342342
rspec-rails (~> 3.6)
343343
rspec-retry

client/.eslintrc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ rules:
2020

2121
# Good idea, but let's go to flow before fixing all these
2222
react/forbid-prop-types: 0
23+
jsx-a11y/href-no-hash: 0
2324

2425
# arrow-parens:
2526
# - 0

client/.postcssrc

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"plugins": {
3+
"autoprefixer": {
4+
"browsers": [
5+
">1%",
6+
"last 5 versions",
7+
"safari >= 7",
8+
"Firefox ESR",
9+
"not ie < 9"
10+
]
11+
}
12+
}
13+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ export default class CommentList extends BaseComponent {
4141
// `key` is a React-specific concept and is not mandatory for the
4242
// purpose of this tutorial. if you're curious, see more here:
4343
// http://facebook.github.io/react/docs/multiple-components.html#dynamic-children
44-
<Comment
44+
(<Comment
4545
key={$$comment.get('id') || index}
4646
author={$$comment.get('author')}
4747
text={$$comment.get('text')}
48-
/>,
48+
/>),
4949
);
5050

5151
// For animation with ReactCSSTransitionGroup

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ describe('CommentList', () => {
4747
it('renders an alert if errors', () => {
4848
const component = renderIntoDocument(
4949
<CommentList
50-
$$comments={comments} error="zomg"
50+
$$comments={comments}
51+
error="zomg"
5152
cssTransitionGroupClassNames={cssTransitionGroupClassNames}
5253
/>,
5354
);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import CommentBox from '../CommentBox/CommentBox';
77
import css from './CommentScreen.scss';
88

99
export default class CommentScreen extends BaseComponent {
10-
1110
static propTypes = {
1211
actions: PropTypes.object.isRequired,
1312
data: PropTypes.object.isRequired,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const NavigationBar = (props) => {
1414

1515
/* eslint-disable new-cap */
1616
return (
17-
<nav className="navbar navbar-default" role="navigation">
17+
<nav className="navbar navbar-default">
1818
<div className="container">
1919
<div className="navbar-header">
2020
<button
@@ -49,7 +49,7 @@ const NavigationBar = (props) => {
4949
href={
5050
'https://github.com/' +
5151
'shakacode/react-webpack-rails-tutorial'
52-
}
52+
}
5353
>
5454
Source
5555
</a>
@@ -58,7 +58,7 @@ const NavigationBar = (props) => {
5858
<a
5959
href={
6060
'https://forum.shakacode.com/c/reactjs'
61-
}
61+
}
6262
>Forum</a>
6363
</li>
6464
{_.isNumber(commentsCount) && CommentsCount({ commentsCount })}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,4 @@ export default class TestReactRouter extends BaseComponent {
1313
</div>
1414
);
1515
}
16-
1716
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { Redirect } from 'react-router-dom';
44
import BaseComponent from 'libs/components/BaseComponent';
55

66
export default class TestReactRouterRedirect extends BaseComponent {
7-
87
static checkAuth() {
98
// Hard code this to demonstrate the effect
109
const notAuthorized = true;

0 commit comments

Comments
 (0)