Skip to content

Commit 0455f81

Browse files
committed
Fix and unify eslint
1 parent 75a693c commit 0455f81

File tree

8 files changed

+6
-115
lines changed

8 files changed

+6
-115
lines changed

.eslintignore

-5
This file was deleted.

.eslintrc

-53
This file was deleted.

examples/.eslintrc

-25
This file was deleted.

examples/package.json

-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"description": "React-Json-Tree example",
55
"scripts": {
66
"start": "node server.js",
7-
"lint": "eslint src",
87
"stats": "NODE_ENV=production webpack --json > dist/stats.json"
98
},
109
"repository": {
@@ -29,16 +28,10 @@
2928
"homepage": "https://github.com/gaearon/react-hot-boilerplate",
3029
"devDependencies": {
3130
"babel-core": "^6.26.0",
32-
"babel-eslint": "^8.0.1",
3331
"babel-loader": "^7.1.2",
3432
"babel-plugin-transform-class-properties": "^6.24.1",
3533
"babel-plugin-transform-object-rest-spread": "^6.26.0",
3634
"babel-preset-react": "^6.5.0",
37-
"eslint": "^4.10.0",
38-
"eslint-plugin-babel": "^4.1.2",
39-
"eslint-plugin-import": "^2.8.0",
40-
"eslint-plugin-jsx-a11y": "^6.0.2",
41-
"eslint-plugin-react": "^7.4.0",
4235
"webpack": "^3.8.1",
4336
"webpack-dev-server": "^2.4.1"
4437
},

examples/server.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable no-console */
12
var webpack = require('webpack');
23
var WebpackDevServer = require('webpack-dev-server');
34
var config = require('./webpack.config');
@@ -6,7 +7,7 @@ new WebpackDevServer(webpack(config), {
67
publicPath: config.output.publicPath,
78
hot: true,
89
historyApiFallback: true
9-
}).listen(3000, 'localhost', function (err, result) {
10+
}).listen(3000, 'localhost', function (err) {
1011
if (err) {
1112
console.log(err);
1213
}

examples/src/App.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ const getValueLabelStyle = ({ style }, nodeType, keyPath) => ({
3434
}
3535
});
3636

37-
// eslint-disable-next-line max-len
3837
const longString =
39-
'Loremipsumdolorsitamet,consecteturadipiscingelit.Namtempusipsumutfelisdignissimauctor.Maecenasodiolectus,finibusegetultricesvel,aliquamutelit.Loremipsumdolorsitamet,consecteturadipiscingelit.Namtempusipsumutfelisdignissimauctor.Maecenasodiolectus,finibusegetultricesvel,aliquamutelit.Loremipsumdolorsitamet,consecteturadipiscingelit.Namtempusipsumutfelisdignissimauctor.Maecenasodiolectus,finibusegetultricesvel,aliquamutelit.';
38+
'Loremipsumdolorsitamet,consecteturadipiscingelit.Namtempusipsumutfelisdignissimauctor.Maecenasodiolectus,finibusegetultricesvel,aliquamutelit.Loremipsumdolorsitamet,consecteturadipiscingelit.Namtempusipsumutfelisdignissimauctor.Maecenasodiolectus,finibusegetultricesvel,aliquamutelit.Loremipsumdolorsitamet,consecteturadipiscingelit.Namtempusipsumutfelisdignissimauctor.Maecenasodiolectus,finibusegetultricesvel,aliquamutelit.'; // eslint-disable-line max-len
4039

4140
const Custom = function(value) {
4241
this.value = value;

package.json

+2-21
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,10 @@
88
"build": "babel src --out-dir lib",
99
"build:umd": "rimraf ./umd && webpack --progress --config webpack.config.umd.js",
1010
"build:umd:min": "webpack --env.minimize --progress --config webpack.config.umd.js",
11-
"lint": "eslint --max-warnings=0 src test examples/src",
1211
"test": "jest",
1312
"prepare": "npm run build",
14-
"prepublishOnly":
15-
"npm run lint && npm run test && npm run clean && npm run build && npm run build:umd && npm run build:umd:min",
16-
"start": "cd examples && npm start",
17-
"precommit": "lint-staged"
13+
"prepublishOnly": "npm run test && npm run clean && npm run build && npm run build:umd && npm run build:umd:min",
14+
"start": "cd examples && npm start"
1815
},
1916
"files": [
2017
"lib",
@@ -41,7 +38,6 @@
4138
"devDependencies": {
4239
"babel-cli": "^6.26.0",
4340
"babel-core": "^6.26.0",
44-
"babel-eslint": "^8.0.1",
4541
"babel-loader": "^7.1.5",
4642
"babel-plugin-transform-class-properties": "^6.24.1",
4743
"babel-plugin-transform-es3-member-expression-literals": "^6.22.0",
@@ -50,20 +46,8 @@
5046
"babel-plugin-transform-runtime": "^6.23.0",
5147
"babel-preset-env": "^1.6.1",
5248
"babel-preset-react": "^6.5.0",
53-
"eslint": "^4.10",
54-
"eslint-config-prettier": "^2.6.0",
55-
"eslint-config-standard": "^10.2.1",
56-
"eslint-plugin-babel": "^4.1.2",
57-
"eslint-plugin-import": "^2.8.0",
58-
"eslint-plugin-node": "^5.2.1",
59-
"eslint-plugin-prettier": "^2.3.1",
60-
"eslint-plugin-promise": "^3.6.0",
61-
"eslint-plugin-react": "7.4.0",
62-
"eslint-plugin-standard": "^3.0.1",
6349
"husky": "^0.14.3",
6450
"jest": "^23.6.0",
65-
"lint-staged": "^4.3.0",
66-
"prettier": "^1.7.4",
6751
"react": "^16.0.0",
6852
"react-dom": "^16.0.0",
6953
"react-test-renderer": "^16.0.0",
@@ -80,8 +64,5 @@
8064
"babel-runtime": "^6.6.1",
8165
"prop-types": "^15.5.8",
8266
"react-base16-styling": "^0.5.1"
83-
},
84-
"lint-staged": {
85-
"*.{js,json,css}": ["prettier --single-quote --write", "git add"]
8667
}
8768
}

src/JSONNode.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ const JSONNode = ({
8686
return <JSONValueNode {...simpleNodeProps} />;
8787
default:
8888
return (
89-
<JSONValueNode {...simpleNodeProps} valueGetter={raw => `<${nodeType}>`} />
89+
<JSONValueNode {...simpleNodeProps} valueGetter={() => `<${nodeType}>`} />
9090
);
9191
}
9292
};

0 commit comments

Comments
 (0)