Skip to content

Commit 55ad238

Browse files
hajushhajush
committed
ES6 and react react-router version updates
1 parent 9b1580f commit 55ad238

File tree

12 files changed

+142
-40
lines changed

12 files changed

+142
-40
lines changed

‎lessons/11-productionish-server/.babelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"presets": ["react", "es2015"]
3+
}

‎lessons/11-productionish-server/.editorconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# editorconfig.org
2+
root = true
3+
4+
[*]
5+
indent_style = space
6+
indent_size = 2
7+
end_of_line = lf
8+
charset = utf-8
9+
trim_trailing_whitespace = true
10+
insert_final_newline = true
11+
12+
[*.md]
13+
trim_trailing_whitespace = false

‎lessons/11-productionish-server/.eslintrc

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
{
2+
"extends": [
3+
"eslint:recommended",
4+
"plugin:import/errors",
5+
"plugin:import/warnings"
6+
],
7+
"plugins": [
8+
"react"
9+
],
10+
"parserOptions": {
11+
"ecmaVersion": 6,
12+
"sourceType": "module",
13+
"ecmaFeatures": {
14+
"jsx": true
15+
}
16+
},
17+
"env": {
18+
"es6": true,
19+
"browser": true,
20+
"node": true,
21+
"jquery": true,
22+
"mocha": true
23+
},
24+
"rules": {
25+
"quotes": 0,
26+
"no-console": 1,
27+
"no-debugger": 1,
28+
"no-var": 1,
29+
"indent": ["error", 2],
30+
"semi": [1, "always"],
31+
"no-trailing-spaces": 0,
32+
"eol-last": 0,
33+
"no-unused-vars": 0,
34+
"no-underscore-dangle": 0,
35+
"no-alert": 0,
36+
"no-lone-blocks": 0,
37+
"jsx-quotes": 1,
38+
"react/display-name": [ 1, {"ignoreTranspilerName": false }],
39+
"react/forbid-prop-types": [1, {"forbid": ["any"]}],
40+
"react/jsx-boolean-value": 1,
41+
"react/jsx-closing-bracket-location": 0,
42+
"react/jsx-curly-spacing": 1,
43+
"react/jsx-indent-props": 0,
44+
"react/jsx-key": 1,
45+
"react/jsx-max-props-per-line": 0,
46+
"react/jsx-no-bind": 1,
47+
"react/jsx-no-duplicate-props": 1,
48+
"react/jsx-no-literals": 0,
49+
"react/jsx-no-undef": 1,
50+
"react/jsx-pascal-case": 1,
51+
"react/jsx-sort-prop-types": 0,
52+
"react/jsx-sort-props": 0,
53+
"react/jsx-uses-react": 1,
54+
"react/jsx-uses-vars": 1,
55+
"react/no-danger": 1,
56+
"react/no-did-mount-set-state": 1,
57+
"react/no-did-update-set-state": 1,
58+
"react/no-direct-mutation-state": 1,
59+
"react/no-multi-comp": 1,
60+
"react/no-set-state": 0,
61+
"react/no-unknown-property": 1,
62+
"react/prefer-es6-class": 1,
63+
"react/prop-types": 1,
64+
"react/react-in-jsx-scope": 1,
65+
"react/require-extension": 1,
66+
"react/self-closing-comp": 1,
67+
"react/sort-comp": 1,
68+
"react/wrap-multilines": 1
69+
}
70+
}

‎lessons/11-productionish-server/index.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import React from 'react'
2-
import { render } from 'react-dom'
3-
import { Router, Route, browserHistory, IndexRoute } from 'react-router'
4-
import App from './modules/App'
5-
import About from './modules/About'
6-
import Repos from './modules/Repos'
7-
import Repo from './modules/Repo'
8-
import Home from './modules/Home'
1+
import React from 'react';
2+
import { render } from 'react-dom';
3+
import { Router, Route, browserHistory, IndexRoute } from 'react-router';
4+
import App from './modules/App';
5+
import About from './modules/About';
6+
import Repos from './modules/Repos';
7+
import Repo from './modules/Repo';
8+
import Home from './modules/Home';
99

1010
render((
1111
<Router history={browserHistory}>
@@ -17,4 +17,4 @@ render((
1717
<Route path="/about" component={About}/>
1818
</Route>
1919
</Router>
20-
), document.getElementById('app'))
20+
), document.getElementById('app'));

‎lessons/11-productionish-server/modules/About.js

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

3-
export default React.createClass({
3+
export default class About extends React.Component{
44
render() {
5-
return <div>About</div>
5+
return <div>About</div>;
66
}
7-
})
7+
}

‎lessons/11-productionish-server/modules/App.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import React from 'react'
2-
import NavLink from './NavLink'
1+
import React from 'react';
2+
import NavLink from './NavLink';
33

4-
export default React.createClass({
4+
class App extends React.Component {
55
render() {
66
return (
77
<div>
@@ -13,6 +13,10 @@ export default React.createClass({
1313
</ul>
1414
{this.props.children}
1515
</div>
16-
)
16+
);
1717
}
18-
})
18+
}
19+
20+
App.propTypes = {children: React.PropTypes.object};
21+
22+
export default App;

‎lessons/11-productionish-server/modules/Home.js

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

3-
export default React.createClass({
3+
export default class Home extends React.Component {
44
render() {
5-
return <div>Home</div>
5+
return <div>Home</div>;
66
}
7-
})
7+
}

‎lessons/11-productionish-server/modules/NavLink.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// modules/NavLink.js
2-
import React from 'react'
3-
import { Link } from 'react-router'
2+
import React from 'react';
3+
import { Link } from 'react-router';
44

5-
export default React.createClass({
5+
export default class NavLink extends React.Component {
66
render() {
7-
return <Link {...this.props} activeClassName="active"/>
7+
return <Link {...this.props} activeClassName="active"/>;
88
}
9-
})
9+
}

‎lessons/11-productionish-server/modules/Repo.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
import React from 'react'
1+
import React from 'react';
22

3-
export default React.createClass({
3+
class Repo extends React.Component {
44
render() {
55
return (
66
<div>
77
<h2>{this.props.params.repoName}</h2>
88
</div>
9-
)
9+
);
1010
}
11-
})
11+
}
12+
13+
Repo.propTypes = {params: React.PropTypes.object};
14+
15+
export default Repo;

‎lessons/11-productionish-server/modules/Repos.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import React from 'react'
2-
import NavLink from './NavLink'
1+
import React from 'react';
2+
import NavLink from './NavLink';
33

4-
export default React.createClass({
4+
class Repos extends React.Component{
55
render() {
66
return (
77
<div>
@@ -12,6 +12,10 @@ export default React.createClass({
1212
</ul>
1313
{this.props.children}
1414
</div>
15-
)
15+
);
1616
}
17-
})
17+
}
18+
19+
Repos.propTypes = {children: React.PropTypes.object};
20+
21+
export default Repos;

‎lessons/11-productionish-server/package.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,19 @@
99
"author": "",
1010
"license": "ISC",
1111
"dependencies": {
12-
"react": "^0.14.7",
13-
"react-dom": "^0.14.7",
14-
"react-router": "^2.0.0"
12+
"react": "^15.4.2",
13+
"react-dom": "^15.4.2",
14+
"react-router": "^3.0.2"
1515
},
1616
"devDependencies": {
17+
"babel-cli": "^6.23.0",
1718
"babel-core": "^6.5.1",
1819
"babel-loader": "^6.2.2",
1920
"babel-preset-es2015": "^6.5.0",
2021
"babel-preset-react": "^6.5.0",
22+
"eslint": "^3.17.1",
23+
"eslint-plugin-import": "^2.2.0",
24+
"eslint-plugin-react": "^6.10.0",
2125
"http-server": "^0.8.5",
2226
"webpack": "^1.12.13",
2327
"webpack-dev-server": "^1.14.1"

‎lessons/11-productionish-server/webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ module.exports = {
1111
{ test: /\.js$/, exclude: /node_modules/, loader: 'babel-loader?presets[]=es2015&presets[]=react' }
1212
]
1313
}
14-
}
14+
};

0 commit comments

Comments
 (0)