Merge pull request #293 from manosim/eslint-prettier

Re-Setup eslint & Prettier

Author: manosim

.eslintrc

@@ -1,70 +1,29 @@
 {
-  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",
+    "prettier"
   ],
   "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,
+    "prettier/prettier": ["error", {
+      "singleQuote": true,
+      "trailingComma": "es5",
+      "bracketSpacing": true,
+    }],
+    quotes: ["error", "single", { "avoidEscape": true }]
   }
 }

main.js

@@ -7,9 +7,9 @@ const appMenuTemplate = require('./electron/app-menu-template');
 const iconIdle = path.join(__dirname, 'images', 'tray-idleTemplate.png');
 const iconActive = path.join(__dirname, 'images', 'tray-active.png');
 
-const isDarwin = (process.platform === 'darwin');
-const isLinux = (process.platform === 'linux');
-const isWindows = (process.platform === 'win32');
+const isDarwin = process.platform === 'darwin';
+const isLinux = process.platform === 'linux';
+const isWindows = process.platform === 'win32';
 
 let appWindow;
 let appIcon = null;
@@ -18,7 +18,7 @@ let isQuitting = false;
 const autoStart = new AutoLaunch({
   name: 'Gitify',
   path: process.execPath.match(/.*?\.app/)[0],
-  isHidden: true
+  isHidden: true,
 });
 
 app.on('ready', function() {
@@ -28,16 +28,18 @@ app.on('ready', function() {
     const trayMenu = Menu.buildFromTemplate([
       {
         label: 'Show Gitify',
-        click () { appWindow.show(); }
+        click() {
+          appWindow.show();
+        },
       },
       {
-        type: 'separator'
+        type: 'separator',
       },
       {
         label: 'Quit',
         accelerator: isDarwin ? 'Command+Q' : 'Alt+F4',
-        role: 'quit'
-      }
+        role: 'quit',
+      },
     ]);
 
     trayIcon.setToolTip('GitHub Notifications on your menu bar.');
@@ -46,37 +48,45 @@ app.on('ready', function() {
   }
 
   function confirmAutoUpdate(updater) {
-    dialog.showMessageBox({
-      type: 'question',
-      buttons: ['Update & Restart', 'Cancel'],
-      title: 'Update Available',
-      cancelId: 99,
-      message: 'There is an update available. Would you like to update Gitify now?'
-    }, function (response) {
-      console.log('Exit: ' + response);
-      if (response === 0) {
-        updater.install();
+    dialog.showMessageBox(
+      {
+        type: 'question',
+        buttons: ['Update & Restart', 'Cancel'],
+        title: 'Update Available',
+        cancelId: 99,
+        message:
+          'There is an update available. Would you like to update Gitify now?',
+      },
+      response => {
+        console.log('Exit: ' + response); // eslint-disable-line no-console
+
+        if (response === 0) {
+          updater.install();
+        }
       }
-    } );
+    );
   }
 
   function checkAutoUpdate(showAlert) {
-
-    if (isWindows || isLinux) { return; }
+    if (isWindows || isLinux) {
+      return;
+    }
 
     let autoUpdateOptions = {
       repo: 'manosim/gitify',
-      currentVersion: app.getVersion()
+      currentVersion: app.getVersion(),
     };
 
     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);
     });
@@ -89,7 +99,7 @@ app.on('ready', function() {
             type: 'info',
             buttons: ['Close'],
             title: 'No update available',
-            message: 'You are currently running the latest version of Gitify.'
+            message: 'You are currently running the latest version of Gitify.',
           });
         }
       }
@@ -100,8 +110,8 @@ app.on('ready', function() {
     });
   }
 
-  function initWindow () {
-    var defaults = {
+  function initWindow() {
+    let defaults = {
       width: 500,
       height: 600,
       minHeight: 300,
@@ -111,15 +121,15 @@ app.on('ready', function() {
       fullscreenable: false,
       titleBarStyle: 'hidden-inset',
       webPreferences: {
-        overlayScrollbars: true
-      }
+        overlayScrollbars: true,
+      },
     };
 
     appWindow = new BrowserWindow(defaults);
     appWindow.loadURL('file://' + __dirname + '/index.html');
     appWindow.show();
 
-    appWindow.on('close', function (event) {
+    appWindow.on('close', function(event) {
       if (!isQuitting) {
         event.preventDefault();
         appWindow.hide();
@@ -134,12 +144,12 @@ app.on('ready', function() {
   appIcon = createAppIcon();
   initWindow();
 
-  ipcMain.on('reopen-window', () => appWindow.show() );
-  ipcMain.on('startup-enable', () => autoStart.enable() );
-  ipcMain.on('startup-disable', () => autoStart.disable() );
-  ipcMain.on('check-update', () => checkAutoUpdate(true) );
+  ipcMain.on('reopen-window', () => appWindow.show());
+  ipcMain.on('startup-enable', () => autoStart.enable());
+  ipcMain.on('startup-disable', () => autoStart.disable());
+  ipcMain.on('check-update', () => checkAutoUpdate(true));
   ipcMain.on('set-badge', (event, count) => app.setBadgeCount(count));
-  ipcMain.on('app-quit', () => app.quit() );
+  ipcMain.on('app-quit', () => app.quit());
 
   ipcMain.on('update-icon', (event, arg) => {
     if (!appIcon.isDestroyed()) {
@@ -177,14 +187,14 @@ app.on('ready', function() {
   });
 });
 
-app.on('activate', () => appWindow.show() );
+app.on('activate', () => appWindow.show());
 
 app.on('window-all-closed', () => {
   if (!isDarwin) {
     app.quit();
   }
 });
 
-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,8 +1,8 @@
-window.Notification = function (title, options) {
+window.Notification = function(title) {
   this.title = title;
 
   return {
-    onclick: jest.fn()
+    onclick: jest.fn(),
   };
 };
 
@@ -16,11 +16,13 @@ window.Audio = class Audio {
 
 window.localStorage = {
   store: {},
-  getItem: function (key) { return this.store[key]; },
-  setItem: function (key, item) {
+  getItem: function(key) {
+    return this.store[key];
+  },
+  setItem: function(key, item) {
     this.store[key] = item;
   },
-  removeItem: jest.fn()
+  removeItem: jest.fn(),
 };
 
 window.alert = jest.fn();
@@ -32,7 +34,7 @@ const browserWindow = {
   },
   on: () => {},
   close: jest.fn(),
-  destroy: jest.fn()
+  destroy: jest.fn(),
 };
 
 const dialog = {
@@ -44,14 +46,14 @@ module.exports = {
     BrowserWindow: () => browserWindow,
     dialog: dialog,
     app: {
-      getVersion: () => '0.0.1'
-    }
+      getVersion: () => '0.0.1',
+    },
   },
   ipcRenderer: {
     send: jest.fn(),
     on: jest.fn(),
   },
   shell: {
-    openExternal: jest.fn()
+    openExternal: jest.fn(),
   },
 };