Skip to content

Commit af4730e

Browse files
author
Bernabé González
authored
Merge pull request #1 from bernabe9/add_linter
Add linter
2 parents 1fab9b3 + 1115075 commit af4730e

File tree

4 files changed

+80
-14
lines changed

4 files changed

+80
-14
lines changed

.babelrc

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,32 @@
11
{
22
"presets": [
3-
"latest",
43
"react",
54
"stage-1"
65
],
76
"env": {
87
"development": {
98
"presets": [
9+
"latest",
1010
"react-hmre"
1111
]
1212
},
1313
"production": {
14+
"presets": [
15+
["latest", {
16+
"es2015": {
17+
"modules": false
18+
}
19+
}],
20+
],
1421
"plugins": [
1522
"transform-react-constant-elements",
1623
"transform-react-remove-prop-types"
1724
]
25+
},
26+
"test": {
27+
"presets": [
28+
"latest"
29+
]
1830
}
1931
}
2032
}

.eslintrc

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{
2+
"extends": [
3+
"eslint:recommended",
4+
"plugin:import/errors",
5+
"plugin:import/warnings"
6+
],
7+
"plugins": [],
8+
"parser": "babel-eslint",
9+
"parserOptions": {
10+
"ecmaVersion": 6,
11+
"sourceType": "module",
12+
"ecmaFeatures": {
13+
"jsx": true,
14+
"experimentalObjectRestSpread": 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+
"semi": [1, "always"],
30+
"no-trailing-spaces": 1,
31+
"eol-last": 1,
32+
"no-underscore-dangle": 0,
33+
"no-alert": 0,
34+
"no-lone-blocks": 0,
35+
"jsx-quotes": 1,
36+
"no-multi-spaces": 1,
37+
"block-spacing": 1,
38+
"brace-style": 1,
39+
"comma-spacing": [1, { "before": false, "after": true }],
40+
"comma-style": 1,
41+
"key-spacing": 1,
42+
"no-multiple-empty-lines": [1, { "max": 1 }],
43+
"arrow-spacing": 1,
44+
"no-const-assign": 1,
45+
"object-curly-spacing": [1, "always"],
46+
"space-before-blocks" : [1, "always"],
47+
"keyword-spacing": 1,
48+
"indent": [1, 2, { "SwitchCase": 1 }]
49+
},
50+
"globals": {}
51+
}

package.json

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
{
22
"name": "redux-react-session",
3-
"version": "1.0.3",
3+
"version": "1.0.4",
44
"description": "",
55
"main": "dist/index.js",
66
"scripts": {
7-
"build": "babel src --out-dir dist",
8-
"test": "echo \"Error: no test specified\" && exit 1"
7+
"build": "rm -r dist && babel src --out-dir dist",
8+
"test": "echo \"Error: no test specified\" && exit 1",
9+
"lint": "eslint src"
910
},
1011
"repository": {
1112
"type": "git",
@@ -26,24 +27,26 @@
2627
},
2728
"homepage": "https://github.com/bernabe9/redux-react-session#readme",
2829
"devDependencies": {
29-
"babel-cli": "6.16.0",
30-
"babel-core": "6.17.0",
31-
"babel-eslint": "7.0.0",
32-
"babel-loader": "6.2.5",
30+
"babel-cli": "6.18.0",
31+
"babel-core": "6.20.0",
32+
"babel-eslint": "7.1.1",
33+
"babel-loader": "6.2.10",
3334
"babel-plugin-react-display-name": "2.0.0",
3435
"babel-plugin-transform-react-constant-elements": "6.9.1",
35-
"babel-plugin-transform-react-remove-prop-types": "0.2.10",
36+
"babel-plugin-transform-react-remove-prop-types": "0.2.11",
3637
"babel-preset-latest": "6.16.0",
3738
"babel-preset-react": "6.16.0",
3839
"babel-preset-react-hmre": "1.1.1",
3940
"babel-preset-stage-1": "6.16.0",
4041
"babel-register": "6.16.3",
41-
"react": "15.4.0",
42-
"react-dom": "15.4.0",
43-
"webpack": "1.13.2"
42+
"eslint": "3.15.0",
43+
"eslint-plugin-import": "2.2.0",
44+
"react": "15.4.2",
45+
"react-dom": "15.4.2",
46+
"webpack": "2.2.1"
4447
},
4548
"dependencies": {
4649
"localforage": "1.4.3",
47-
"react-router": "2.8.1"
50+
"react-router": "3.0.1"
4851
}
4952
}

src/reducer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const reducer = (state = initialState, action) => {
1515
return { user: { ...state.user }, authenticated: true };
1616
}
1717
case GET_SESSION_ERROR: {
18-
return { user: { ...state.user }, authenticated: true };
18+
return { user: { ...state.user }, authenticated: true };
1919
}
2020
case GET_USER_SESSION_SUCCESS: {
2121
return { ...state, user: action.user };

0 commit comments

Comments
 (0)