Skip to content

Commit

Permalink
Merge pull request #321 from chentsulin/eslint3
Browse files Browse the repository at this point in the history
Install eslint v3 and plugins
  • Loading branch information
chentsulin authored Aug 4, 2016
2 parents fb4ed80 + 4f0b453 commit ca4f94f
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
"comma-dangle": 0,
"no-use-before-define": 0,
"import/no-unresolved": [2, { "ignore": ["electron"] }],
"import/no-extraneous-dependencies": 0,
"react/jsx-no-bind": 0,
'react/jsx-filename-extension': [2, { extensions: ['.js', '.jsx'] }],
"react/prefer-stateless-function": 0
},
"plugins": [
Expand Down
4 changes: 2 additions & 2 deletions app/components/Counter.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ class Counter extends Component {
</div>
<div className={styles.btnGroup}>
<button className={styles.btn} onClick={increment}>
<i className="fa fa-plus"></i>
<i className="fa fa-plus" />
</button>
<button className={styles.btn} onClick={decrement}>
<i className="fa fa-minus"></i>
<i className="fa fa-minus" />
</button>
<button className={styles.btn} onClick={incrementIfOdd}>odd</button>
<button className={styles.btn} onClick={() => incrementAsync()}>async</button>
Expand Down
1 change: 1 addition & 0 deletions main.development.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ app.on('window-all-closed', () => {
const installExtensions = async () => {
if (process.env.NODE_ENV === 'development') {
const installer = require('electron-devtools-installer'); // eslint-disable-line global-require

const extensions = [
'REACT_DEVELOPER_TOOLS',
'REDUX_DEVTOOLS'
Expand Down
5 changes: 3 additions & 2 deletions package.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
require('babel-polyfill');
const os = require('os');
const webpack = require('webpack');
const electronCfg = require('./webpack.config.electron.js');
const cfg = require('./webpack.config.production.js');
const electronCfg = require('./webpack.config.electron');
const cfg = require('./webpack.config.production');
const packager = require('electron-packager');
const del = require('del');
const exec = require('child_process').exec;
const argv = require('minimist')(process.argv.slice(2));
const pkg = require('./package.json');

const deps = Object.keys(pkg.dependencies);
const devDeps = Object.keys(pkg.devDependencies);

Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@
"electron-packager": "^7.3.0",
"electron-prebuilt": "^1.2.8",
"electron-rebuild": "^1.1.5",
"eslint": "^2.13.1",
"eslint-config-airbnb": "^9.0.1",
"eslint": "^3.2.2",
"eslint-config-airbnb": "^10.0.0",
"eslint-import-resolver-webpack": "^0.4.0",
"eslint-plugin-import": "^1.11.1",
"eslint-plugin-jsx-a11y": "^1.5.5",
"eslint-plugin-react": "^5.2.2",
"eslint-plugin-import": "^1.12.0",
"eslint-plugin-jsx-a11y": "^2.0.1",
"eslint-plugin-react": "^6.0.0",
"express": "^4.14.0",
"extract-text-webpack-plugin": "^1.0.1",
"fbjs-scripts": "^0.7.1",
Expand Down

0 comments on commit ca4f94f

Please sign in to comment.