Skip to content

Commit a28dfda

Browse files
notrabnotrab
committed
Upgrade deps
1 parent a7a23c6 commit a28dfda

File tree

15 files changed

+507
-1556
lines changed

15 files changed

+507
-1556
lines changed

‎.gitignore‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
1-
# See http://help.github.com/ignore-files/ for more about ignoring files.
1+
# See https://help.github.com/ignore-files/ for more about ignoring files.
22

33
# dependencies
4-
node_modules
4+
/node_modules
55

66
# testing
7-
coverage
7+
/coverage
88

99
# production
10-
build
10+
/build
1111

1212
# misc
1313
.DS_Store
14-
.env
15-
npm-debug.log
14+
.env.local
15+
.env.development.local
16+
.env.test.local
17+
.env.production.local
18+
19+
npm-debug.log*
20+
yarn-debug.log*
21+
yarn-error.log*
22+
package-lock.json

‎.prettierignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package.json

‎.prettierrc‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
{
2-
"printWidth": 80,
3-
"bracketSpacing": true,
42
"singleQuote": true,
5-
"trailingComma": "none",
6-
"semi": true,
7-
"arrowParens": "avoid",
3+
"semi": false,
84
"jsxBracketSameLine": true
9-
}
5+
}

‎package.json‎

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,29 @@
11
{
2-
"name": "create-react-app-redux",
3-
"version": "0.1.0",
42
"private": true,
5-
"devDependencies": {
6-
"husky": "^0.14.3",
7-
"lint-staged": "^7.0.0",
8-
"prettier": "^1.11.0",
9-
"react-scripts": "^1.0.17"
10-
},
11-
"dependencies": {
12-
"react": "^16.2.0",
13-
"react-dom": "^16.2.0",
14-
"react-redux": "^5.0.6",
15-
"react-router": "^4.2.0",
16-
"react-router-dom": "^4.2.2",
17-
"react-router-redux": "next",
18-
"redux": "^3.7.2",
19-
"redux-devtools-extension": "^2.13.2",
20-
"redux-thunk": "^2.2.0",
21-
"sanitize.css": "^5.0.0"
22-
},
3+
"homepage": "https://notrab.github.io/create-react-app-redux",
234
"scripts": {
5+
"predeploy": "npm run build",
6+
"deploy": "gh-pages -d build",
247
"start": "react-scripts start",
258
"build": "react-scripts build",
269
"test": "react-scripts test --env=jsdom",
2710
"eject": "react-scripts eject",
28-
"precommit": "lint-staged"
11+
"precommit": "pretty-quick --staged"
2912
},
30-
"homepage": "https://cra-redux-router-thunk.herokuapp.com",
31-
"lint-staged": {
32-
"*.{js,json,css,md}": [
33-
"prettier --write",
34-
"git add"
35-
]
13+
"devDependencies": {
14+
"prettier": "1.13.7",
15+
"react-scripts": "1.1.4"
16+
},
17+
"dependencies": {
18+
"gh-pages": "1.2.0",
19+
"react": "16.4.1",
20+
"react-dom": "16.4.1",
21+
"react-redux": "5.0.7",
22+
"react-router": "4.3.1",
23+
"react-router-dom": "4.3.1",
24+
"react-router-redux": "5.0.0-alpha.6",
25+
"redux": "4.0.0",
26+
"redux-thunk": "2.3.0",
27+
"sanitize.css": "6.0.0"
3628
}
3729
}

‎public/index.html‎

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,43 @@
1-
<!doctype html>
1+
<!DOCTYPE html>
22
<html lang="en">
3-
<head>
4-
<meta charset="utf-8">
5-
<meta name="viewport" content="width=device-width, initial-scale=1">
6-
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
7-
<!--
8-
Notice the use of %PUBLIC_URL% in the tag above.
3+
4+
<head>
5+
<meta charset="utf-8">
6+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
7+
<meta name="theme-color" content="#000000">
8+
<!--
9+
manifest.json provides metadata used when your web app is added to the
10+
homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
11+
-->
12+
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
13+
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
14+
<!--
15+
Notice the use of %PUBLIC_URL% in the tags above.
916
It will be replaced with the URL of the `public` folder during the build.
1017
Only files inside the `public` folder can be referenced from the HTML.
1118
1219
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
1320
work correctly both with client-side routing and a non-root public URL.
1421
Learn how to configure a non-root public URL by running `npm run build`.
1522
-->
16-
<title>React App</title>
17-
</head>
18-
<body>
19-
<div id="root"></div>
20-
<!--
23+
<title>React App</title>
24+
</head>
25+
26+
<body>
27+
<noscript>
28+
You need to enable JavaScript to run this app.
29+
</noscript>
30+
<div id="root"></div>
31+
<!--
2132
This HTML file is a template.
2233
If you open it directly in the browser, you will see an empty page.
2334
2435
You can add webfonts, meta tags, or analytics to this file.
2536
The build step will place the bundled scripts into the <body> tag.
2637
27-
To begin the development, run `npm start`.
28-
To create a production bundle, use `npm run build`.
38+
To begin the development, run `npm start` or `yarn start`.
39+
To create a production bundle, use `npm run build` or `yarn build`.
2940
-->
30-
</body>
31-
</html>
41+
</body>
42+
43+
</html>

‎public/manifest.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"short_name": "React + Redux App",
3+
"name": "Create React App Redux",
4+
"icons": [
5+
{
6+
"src": "favicon.ico",
7+
"sizes": "64x64 32x32 24x24 16x16",
8+
"type": "image/x-icon"
9+
}
10+
],
11+
"start_url": "./index.html",
12+
"display": "standalone",
13+
"theme_color": "#000000",
14+
"background_color": "#ffffff"
15+
}

‎renovate.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"extends": ["config:base"],
3+
"automerge": true,
4+
"major": {
5+
"automerge": false
6+
},
7+
"reviewers": ["notrab"]
8+
}

‎src/containers/about/index.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import React from 'react';
1+
import React from 'react'
22

33
const About = () => (
44
<div>
55
<h1>About Page</h1>
66
<p>Did you get here via Redux?</p>
77
</div>
8-
);
8+
)
99

10-
export default About;
10+
export default About

‎src/containers/app/index.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import React from 'react';
2-
import { Route, Link } from 'react-router-dom';
3-
import Home from '../home';
4-
import About from '../about';
1+
import React from 'react'
2+
import { Route, Link } from 'react-router-dom'
3+
import Home from '../home'
4+
import About from '../about'
55

66
const App = () => (
77
<div>
@@ -15,6 +15,6 @@ const App = () => (
1515
<Route exact path="/about-us" component={About} />
1616
</main>
1717
</div>
18-
);
18+
)
1919

20-
export default App;
20+
export default App

‎src/containers/home/index.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import React from 'react';
2-
import { push } from 'react-router-redux';
3-
import { bindActionCreators } from 'redux';
4-
import { connect } from 'react-redux';
1+
import React from 'react'
2+
import { push } from 'react-router-redux'
3+
import { bindActionCreators } from 'redux'
4+
import { connect } from 'react-redux'
55
import {
66
increment,
77
incrementAsync,
88
decrement,
99
decrementAsync
10-
} from '../../modules/counter';
10+
} from '../../modules/counter'
1111

1212
const Home = props => (
1313
<div>
@@ -38,13 +38,13 @@ const Home = props => (
3838
</button>
3939
</p>
4040
</div>
41-
);
41+
)
4242

4343
const mapStateToProps = state => ({
4444
count: state.counter.count,
4545
isIncrementing: state.counter.isIncrementing,
4646
isDecrementing: state.counter.isDecrementing
47-
});
47+
})
4848

4949
const mapDispatchToProps = dispatch =>
5050
bindActionCreators(
@@ -56,6 +56,6 @@ const mapDispatchToProps = dispatch =>
5656
changePage: () => push('/about-us')
5757
},
5858
dispatch
59-
);
59+
)
6060

61-
export default connect(mapStateToProps, mapDispatchToProps)(Home);
61+
export default connect(mapStateToProps, mapDispatchToProps)(Home)

0 commit comments

Comments
 (0)