diff --git a/Gemfile b/Gemfile index 6200af75..aa3643f3 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" ruby "2.4.1" -gem "react_on_rails", "9.0.0.rc.0" +gem "react_on_rails", "10.0.0" gem "webpacker" # Bundle edge Rails instead: gem "rails", github: "rails/rails" diff --git a/Gemfile.lock b/Gemfile.lock index 1eb47977..2bece4f8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,7 +50,7 @@ GEM bindex (0.5.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - brakeman (3.6.1) + brakeman (4.0.1) builder (3.2.3) bundler-audit (0.5.0) bundler (~> 1.2) @@ -203,13 +203,13 @@ GEM rb-inotify (0.9.8) ffi (>= 0.5.0) rdoc (4.3.0) - react_on_rails (9.0.0.rc.0) + react_on_rails (10.0.0) addressable connection_pool execjs (~> 2.5) rails (>= 3.2) rainbow (~> 2.2) - redis (3.3.3) + redis (4.0.1) rspec-core (3.6.0) rspec-support (~> 3.6.0) rspec-expectations (3.6.0) @@ -337,7 +337,7 @@ DEPENDENCIES rails (~> 5) rails-html-sanitizer rainbow - react_on_rails (= 9.0.0.rc.0) + react_on_rails (= 10.0.0) redis rspec-rails (~> 3.6) rspec-retry diff --git a/client/.eslintrc.yml b/client/.eslintrc.yml index b76a4d79..2ca9c851 100644 --- a/client/.eslintrc.yml +++ b/client/.eslintrc.yml @@ -20,6 +20,7 @@ rules: # Good idea, but let's go to flow before fixing all these react/forbid-prop-types: 0 + jsx-a11y/href-no-hash: 0 # arrow-parens: # - 0 diff --git a/client/.postcssrc b/client/.postcssrc new file mode 100644 index 00000000..d2e4d68d --- /dev/null +++ b/client/.postcssrc @@ -0,0 +1,13 @@ +{ + "plugins": { + "autoprefixer": { + "browsers": [ + ">1%", + "last 5 versions", + "safari >= 7", + "Firefox ESR", + "not ie < 9" + ] + } + } +} diff --git a/client/app/bundles/comments/components/CommentBox/CommentList/CommentList.jsx b/client/app/bundles/comments/components/CommentBox/CommentList/CommentList.jsx index 6ccdc857..399328c2 100644 --- a/client/app/bundles/comments/components/CommentBox/CommentList/CommentList.jsx +++ b/client/app/bundles/comments/components/CommentBox/CommentList/CommentList.jsx @@ -41,11 +41,11 @@ export default class CommentList extends BaseComponent { // `key` is a React-specific concept and is not mandatory for the // purpose of this tutorial. if you're curious, see more here: // http://facebook.github.io/react/docs/multiple-components.html#dynamic-children - , + />), ); // For animation with ReactCSSTransitionGroup diff --git a/client/app/bundles/comments/components/CommentBox/CommentList/CommentList.spec.jsx b/client/app/bundles/comments/components/CommentBox/CommentList/CommentList.spec.jsx index 23318888..4ddf4125 100644 --- a/client/app/bundles/comments/components/CommentBox/CommentList/CommentList.spec.jsx +++ b/client/app/bundles/comments/components/CommentBox/CommentList/CommentList.spec.jsx @@ -47,7 +47,8 @@ describe('CommentList', () => { it('renders an alert if errors', () => { const component = renderIntoDocument( , ); diff --git a/client/app/bundles/comments/components/CommentScreen/CommentScreen.jsx b/client/app/bundles/comments/components/CommentScreen/CommentScreen.jsx index 2c6e9b27..151532d4 100644 --- a/client/app/bundles/comments/components/CommentScreen/CommentScreen.jsx +++ b/client/app/bundles/comments/components/CommentScreen/CommentScreen.jsx @@ -7,7 +7,6 @@ import CommentBox from '../CommentBox/CommentBox'; import css from './CommentScreen.scss'; export default class CommentScreen extends BaseComponent { - static propTypes = { actions: PropTypes.object.isRequired, data: PropTypes.object.isRequired, diff --git a/client/app/bundles/comments/components/NavigationBar/NavigationBar.jsx b/client/app/bundles/comments/components/NavigationBar/NavigationBar.jsx index 6d496f70..4e22ed33 100644 --- a/client/app/bundles/comments/components/NavigationBar/NavigationBar.jsx +++ b/client/app/bundles/comments/components/NavigationBar/NavigationBar.jsx @@ -14,7 +14,7 @@ const NavigationBar = (props) => { /* eslint-disable new-cap */ return ( -