Update eslint-config

Author: manosim

.eslintrc

@@ -1,70 +1,22 @@
 {
-  env: {
+  "parser": "babel-eslint",
+  "env": {
     browser: true,
-    es6: true,
     node: true,
+    es6: true,
     jest: true,
-    jasmine: true,
+    jasmine: true
   },
-  "parserOptions": {
-    "ecmaVersion": 6,
-    "sourceType": "module",
-      "ecmaFeatures": {
-      "jsx": true
-    }
-  },
-  "parser": "babel-eslint",
+  "extends": [
+    "dabapps/react",
+    "dabapps/es6",
+    "dabapps/browser"
+  ],
   "plugins": [
-    "react"
+    "import",
   ],
   "rules": {
-    "strict": [2, "global"],
-    "indent": [2, 2, {"SwitchCase": 1}],
-    "quotes": [2, "single"],
-    "linebreak-style": [2, "unix"],
-    "semi": [2, "always"],
-    "comma-style": [2, "last"],
-    "comma-spacing": [2, {"before": false, "after": true}],
-    "no-multiple-empty-lines": [2, {"max": 2}],
-    "max-len": [2, 120, 2, {"ignoreComments": true}],
-    "no-trailing-spaces": [2, {"skipBlankLines": false}],
-    "dot-location": [2, "property"],
-    "keyword-spacing": 2,
-    "space-before-blocks": 2,
-    "space-before-function-paren": 0,
-    "space-infix-ops": 2,
-    "space-unary-ops": 2,
-    "no-lone-blocks": 2,
-    "eqeqeq": 2,
-    "block-scoped-var": 2,
-    "no-constant-condition": 2,
-    "no-nested-ternary": 2,
-    "no-mixed-spaces-and-tabs": 2,
-    "no-undef": 2,
-    "no-unreachable": 2,
-    "no-dupe-keys": 2,
-    "no-extra-boolean-cast": 2,
-    "no-irregular-whitespace": 2,
-    "no-multi-spaces": 2,
-    "no-else-return": 0,
-    "no-eval": 2,
-    "no-multi-str": 2,
-    "no-self-compare": 2,
-    "no-useless-call": 2,
-    "no-shadow-restricted-names": 2,
-    "no-shadow": 2,
-    "no-undef-init": 2,
-    "no-use-before-define": 2,
-    "radix": 2,
-    "curly": 2,
-    "no-fallthrough": 0,
-    "default-case": 0,
-    "no-plusplus": 0,
-    "dot-notation": 0,
-    "jsx-quotes": [2, "prefer-double"],
-    "eol-last": 2,
-    "no-unused-vars": [2, {"vars": "all", "args": "none"}],
-
-    "react/jsx-uses-vars": 2,
+    import/no-unresolved: 2,
+    "react/jsx-indent-props": 0,
   }
 }

main.js

@@ -52,8 +52,9 @@ app.on('ready', function() {
       title: 'Update Available',
       cancelId: 99,
       message: 'There is an update available. Would you like to update Gitify now?'
-    }, function (response) {
-      console.log('Exit: ' + response);
+    }, (response) => {
+      console.log('Exit: ' + response); // eslint-disable-line no-console
+
       if (response === 0) {
         updater.install();
       }
@@ -72,11 +73,13 @@ app.on('ready', function() {
     const updater = new GhReleases(autoUpdateOptions);
 
     updater.on('error', (event, message) => {
+      /* eslint-disable no-console */
       console.log('ERRORED.');
       console.log('Event: ' + JSON.stringify(event) + '. MESSAGE: ' + message);
+      /* eslint-enable no-console */
     });
 
-    updater.on('update-downloaded', (info) => {
+    updater.on('update-downloaded', () => {
       // Restart the app(ask) and install the update
       confirmAutoUpdate(updater);
     });
@@ -101,7 +104,7 @@ app.on('ready', function() {
   }
 
   function initWindow () {
-    var defaults = {
+    let defaults = {
       width: 500,
       height: 600,
       minHeight: 300,
@@ -185,6 +188,6 @@ app.on('window-all-closed', () => {
   }
 });
 
-app.on('before-quit', (event) => {
+app.on('before-quit', () => {
   isQuitting = true;
 });

package.json

@@ -16,6 +16,7 @@
     "dist": "npm run build && npm run package && npm run codesign",
     "lint-js": "eslint 'src/js/' 'src/js/app.js' 'main.js'",
     "lint-sass": "sass-lint -c .sass-lint.yml -v -q",
+    "prettier": "prettier --single-quote --trailing-comma es5 --write 'src/js/**/*.js'",
     "jest": "jest",
     "test": "npm run lint-js && npm run lint-sass && npm run jest -- --coverage",
     "start": "electron . –enable-logging"
@@ -102,10 +103,13 @@
     "electron-packager": "=8.7.0",
     "enzyme": "=2.8.2",
     "eslint": "=3.19.0",
-    "eslint-plugin-react": "=7.0.1",
+    "eslint-config-dabapps": "github:dabapps/eslint-config-dabapps#v3.1.1",
+    "eslint-plugin-import": "=2.3.0",
+    "eslint-plugin-prettier": "=2.1.1",
     "jest": "=20.0.4",
     "nock": "=9.0.13",
     "node-sass": "=4.5.3",
+    "prettier": "=1.4.4",
     "react-test-renderer": "=15.5.4",
     "redux-logger": "=3.0.6",
     "redux-mock-store": "=1.2.3",

src/js/__mocks__/electron.js

@@ -1,4 +1,4 @@
-window.Notification = function (title, options) {
+window.Notification = function (title) {
   this.title = title;
 
   return {

src/js/__mocks__/react-icheck.js

@@ -1,20 +1,34 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 
 export class Checkbox extends React.PureComponent {
+  static propTypes = {
+    label: PropTypes.string.isRequired,
+    onChange: PropTypes.func.isRequired,
+    defaultChecked: PropTypes.bool,
+  }
+
   render() {
     return (
       <div>
         <strong>{this.props.label}</strong>
         <input
           type="checkbox"
           checked={this.props.defaultChecked}
-          onChange={(evt) => this.props.onChange(evt)} />
+          onChange={(evt) => this.props.onChange(evt)}
+        />
       </div>
     );
-  };
+  }
 }
 
 export class Radio extends React.PureComponent {
+  static propTypes = {
+    label: PropTypes.string.isRequired,
+    value: PropTypes.string.isRequired,
+    defaultChecked: PropTypes.bool,
+  }
+
   render() {
     return (
       <div>
@@ -23,18 +37,23 @@ export class Radio extends React.PureComponent {
           type="radio"
           value={this.props.value}
           checked={this.props.defaultChecked}
-          onChange={(evt) => this.props.onChange(evt)} />
+        />
       </div>
     );
-  };
+  }
 }
 
 export class RadioGroup extends React.PureComponent {
+  static propTypes = {
+    children: PropTypes.node.isRequired,
+    onChange: PropTypes.func.isRequired,
+  }
+
   render() {
     return (
       <div>
         {this.props.children}
       </div>
     );
-  };
+  }
 }

src/js/__mocks__/react-modal.js

@@ -1,9 +1,15 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 
 export default class Modal extends React.PureComponent {
+  static propTypes = {
+    isOpen: PropTypes.bool.isRequired,
+    children: PropTypes.node,
+  }
+
   render() {
     return this.props.isOpen ? (
       <div>{this.props.children}</div>
     ) : null;
-  };
+  }
 }

src/js/__mocks__/redux-logger.js

@@ -1,5 +1,5 @@
 export function createLogger () {
-  return ({ getState }) => (next) => (action) => {
+  return () => (next) => (action) => {
     return next(action);
   };
-};
+}

src/js/__mocks__/redux-storage.js

@@ -1,12 +1,12 @@
 import { Map } from 'immutable';
 
-export function createMiddleware(engine, actionBlacklist = [], actionWhitelist = []) {
-  return ({ dispatch, getState }) => {
+export function createMiddleware() {
+  return () => {
     return (next) => (action) => {
       return next(action);
     };
   };
-};
+}
 
 export function createLoader() {
   const state = {
@@ -20,4 +20,4 @@ export function createLoader() {
 
 export function reducer (clb) {
   return (state, action) => clb(state, action);
-};
+}

src/js/__tests__/components/__snapshots__/settings-modal.js.snap

@@ -107,7 +107,6 @@ exports[`components/settings-modal.js should render itself & its children (open
           </strong>
           <input
             checked={undefined}
-            onChange={[Function]}
             type="radio"
             value="both"
           />
@@ -118,7 +117,6 @@ exports[`components/settings-modal.js should render itself & its children (open
           </strong>
           <input
             checked={undefined}
-            onChange={[Function]}
             type="radio"
             value="tray"
           />
@@ -129,7 +127,6 @@ exports[`components/settings-modal.js should render itself & its children (open
           </strong>
           <input
             checked={undefined}
-            onChange={[Function]}
             type="radio"
             value="dock"
           />

src/js/__tests__/components/loading.js

@@ -6,10 +6,6 @@ import NProgress from 'nprogress';
 import { Loading, mapStateToProps } from '../../components/loading';
 
 describe('components/loading.js', function () {
-  const props = {
-
-  };
-
   beforeEach(() => {
     NProgress.start = jest.fn();
     NProgress.done = jest.fn();
@@ -35,7 +31,9 @@ describe('components/loading.js', function () {
   });
 
   it('should render itself & its children', function () {
-    const wrapper = shallow(<Loading {...props} />);
+    const isLoading = false;
+    const caseProps = { isLoading };
+    const wrapper = shallow(<Loading {...caseProps} />);
 
     expect(wrapper).toBeDefined();
     expect(wrapper.children().length).toBe(0);
@@ -56,7 +54,7 @@ describe('components/loading.js', function () {
   });
 
   it('should receive props', function () {
-    spyOn(Loading.prototype, 'componentDidMount').and.callThrough();;
+    spyOn(Loading.prototype, 'componentDidMount').and.callThrough();
 
     const isLoading = true;
     const caseProps = { isLoading };
@@ -67,24 +65,22 @@ describe('components/loading.js', function () {
     expect(NProgress.start).toHaveBeenCalledTimes(1);
 
     wrapper.setProps({
-      ...props,
       isLoading: false
     });
     expect(NProgress.done).toHaveBeenCalledTimes(1);
 
     wrapper.setProps({
-      ...props,
       isLoading: true
     });
     expect(NProgress.start).toHaveBeenCalledTimes(2);
   });
 
   it('should unmount the component', function () {
-    spyOn(Loading.prototype, 'componentWillUnmount').and.callThrough();;
+    spyOn(Loading.prototype, 'componentWillUnmount').and.callThrough();
 
     const isLoading = true;
-    const caseProps = { isLoading };
-    const wrapper = mount(<Loading {...caseProps} />);
+    const props = { isLoading };
+    const wrapper = mount(<Loading {...props} />);
 
     expect(wrapper).toBeDefined();
     expect(wrapper.children().length).toEqual(0);