Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update all dependencies 🌴 #9

Closed
wants to merge 4 commits into from
Closed

Update all dependencies 🌴 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
657769e
chore(package): update dependencies
greenkeeperio-bot Jul 1, 2016
9d2b3de
chore(package): update eslint to version 3.1.1
greenkeeperio-bot Jul 26, 2016
bf913f1
fix eslint issues
jdonisvitch Jul 27, 2016
520ffb2
resolve issues with history, react-router and merge prior updates
jdonisvitch Jul 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
"file-loader": "^0.9.0",
"fs-extra": "^0.30.0",
"hapi": "^13.5.0",
"history": "^2.0.0",
"history": "^3.0.0",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't make this upgrade til react-router makes it to v3. That's the reason for the build error.

"html-webpack-plugin": "^2.7.1",
"imports-loader": "^0.6.5",
"inert": "^4.0.0",
Expand All @@ -110,7 +110,7 @@
"react": "^15.0.0",
"react-dom": "^15.0.0",
"react-redux": "^4.0.0",
"react-router": "^2.2.0",
"react-router": "^2.6.0",
"react-router-redux": "^4.0.0",
"redbox-react": "^1.2.2",
"redux": "^3.0.0",
Expand All @@ -132,9 +132,10 @@
"cheerio": "^0.20.0",
"codecov": "^1.0.1",
"enzyme": "^2.0.0",
"eslint": "^2.4.0",
"eslint": "^3.1.1",
"eslint-config-hapi": "^9.1.0",
"eslint-config-standard-react": "^2.2.0",
"eslint-config-standard-react": "^3.0.0",
"eslint-config-standard-jsx": "^2.0.0",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you introduce this? I believe it's already a dep of eslint-config-standard-react.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess I must have or it was that damn robot ;)

"eslint-plugin-babel": "^3.2.0",
"eslint-plugin-hapi": "^4.0.0",
"eslint-plugin-react": "^5.0.0",
Expand Down
4 changes: 2 additions & 2 deletions src/components/Counter/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ const Counter = (props) => (
{props.counter}
</span>
</h2>
<button className='btn btn-default' onClick={props.increment}>
<button className="btn btn-default" onClick={props.increment}>
Increment
</button>
{' '}
<button className='btn btn-default' onClick={props.doubleAsync}>
<button className="btn btn-default" onClick={props.doubleAsync}>
Double (Async)
</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Header/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ module.exports = () => (

<div>
<h1>Strangeluv</h1>
<Router.IndexLink to='/' activeClassName={Classes.activeRoute}>
<Router.IndexLink to="/" activeClassName={Classes.activeRoute}>
Home
</Router.IndexLink>
{' · '}
<Router.Link to='/counter' activeClassName={Classes.activeRoute}>
<Router.Link to="/counter" activeClassName={Classes.activeRoute}>
Counter
</Router.Link>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/CoreLayout/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require('../../styles/core.scss');

const CoreLayout = ({ children }) => (

<div className='container text-center'>
<div className="container text-center">
<Header />
<div className={Classes.mainContainer}>
{children}
Expand Down
2 changes: 1 addition & 1 deletion src/routes/home/components/HomeView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module.exports = () => (
<div>
<h4>Welcome!</h4>
<img
alt='This is a duck, because Redux!'
alt="This is a duck, because Redux!"
className={Classes.duck}
src={DuckImage}
/>
Expand Down
4 changes: 2 additions & 2 deletions tests/components/Header/Header.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ describe('(Component) Header', () => {
it('Should render a Link to Home route', () => {

expect(_wrapper.contains(
<ReactRouter.IndexLink activeClassName={Classes.activeRoute} to='/'>
<ReactRouter.IndexLink activeClassName={Classes.activeRoute} to="/">
Home
</ReactRouter.IndexLink>
)).to.be.true;
Expand All @@ -34,7 +34,7 @@ describe('(Component) Header', () => {
it('Should render a Link to Counter route', () => {

expect(_wrapper.contains(
<ReactRouter.Link activeClassName={Classes.activeRoute} to='/counter'>
<ReactRouter.Link activeClassName={Classes.activeRoute} to="/counter">
Counter
</ReactRouter.Link>
)).to.be.true;
Expand Down
4 changes: 2 additions & 2 deletions tests/framework.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ class Fixture extends React.Component {

return (
<div>
<input id='checked' defaultChecked />
<input id='not' defaultChecked={false} />
<input id="checked" defaultChecked />
<input id="not" defaultChecked={false} />
</div>
);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/layouts/CoreLayout.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ describe('(Layout) Core', () => {

beforeEach(() => {

_child = <h1 className='child'>Child</h1>;
_child = <h1 className="child">Child</h1>;
_props = {
children: _child
};
Expand Down