Merge pull request #348 from mistic/integrate-prettier

Integrate pretty on the project.

Author: mistic

.eslintrc

@@ -3,7 +3,13 @@
     "env": {
        "node": true
     },
+    "plugins": [
+        "prettier"
+    ],
     "rules": {
-        "no-console": "off"
+        "no-console": "off",
+        "prettier/prettier": [
+            "error"
+        ]
     }
 }

client-overlay.js

@@ -18,7 +18,7 @@ var styles = {
   bottom: 0,
   overflow: 'auto',
   dir: 'ltr',
-  textAlign: 'left'
+  textAlign: 'left',
 };
 
 var ansiHTML = require('ansi-html');
@@ -32,7 +32,7 @@ var colors = {
   magenta: '7FACCA',
   cyan: 'C3C2EF',
   lightgrey: 'EBE7E3',
-  darkgrey: '6D7891'
+  darkgrey: '6D7891',
 };
 
 var Entities = require('html-entities').AllHtmlEntities;
@@ -58,15 +58,17 @@ function clear() {
   }
 }
 
-function problemType (type) {
+function problemType(type) {
   var problemColors = {
     errors: colors.red,
-    warnings: colors.yellow
+    warnings: colors.yellow,
   };
   var color = problemColors[type] || colors.red;
   return (
-    '<span style="background-color:#' + color + '; color:#fff; padding:2px 4px; border-radius: 2px">' +
-      type.slice(0, -1).toUpperCase() +
+    '<span style="background-color:#' +
+    color +
+    '; color:#fff; padding:2px 4px; border-radius: 2px">' +
+    type.slice(0, -1).toUpperCase() +
     '</span>'
   );
 }
@@ -89,8 +91,8 @@ module.exports = function(options) {
 
   return {
     showProblems: showProblems,
-    clear: clear
-  }
+    clear: clear,
+  };
 };
 
 module.exports.clear = clear;

client.js

@@ -2,7 +2,7 @@
 /*global __resourceQuery __webpack_public_path__*/
 
 var options = {
-  path: "/__webpack_hmr",
+  path: '/__webpack_hmr',
   timeout: 20 * 1000,
   overlay: true,
   reload: false,
@@ -12,7 +12,7 @@ var options = {
   autoConnect: true,
   overlayStyles: {},
   overlayWarnings: false,
-  ansiColors: {}
+  ansiColors: {},
 };
 if (__resourceQuery) {
   var querystring = require('querystring');
@@ -25,8 +25,8 @@ if (typeof window === 'undefined') {
 } else if (typeof window.EventSource === 'undefined') {
   console.warn(
     "webpack-hot-middleware's client requires EventSource to work. " +
-    "You should include a polyfill if you want to support this browser: " +
-    "https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events#Tools"
+      'You should include a polyfill if you want to support this browser: ' +
+      'https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events#Tools'
   );
 } else {
   if (options.autoConnect) {
@@ -41,7 +41,8 @@ function setOptionsAndConnect(overrides) {
 }
 
 function setOverrides(overrides) {
-  if (overrides.autoConnect) options.autoConnect = overrides.autoConnect == 'true';
+  if (overrides.autoConnect)
+    options.autoConnect = overrides.autoConnect == 'true';
   if (overrides.path) options.path = overrides.path;
   if (overrides.timeout) options.timeout = overrides.timeout;
   if (overrides.overlay) options.overlay = overrides.overlay !== 'false';
@@ -61,8 +62,10 @@ function setOverrides(overrides) {
     options.path = __webpack_public_path__ + options.path;
   }
 
-  if (overrides.ansiColors) options.ansiColors = JSON.parse(overrides.ansiColors);
-  if (overrides.overlayStyles) options.overlayStyles = JSON.parse(overrides.overlayStyles);
+  if (overrides.ansiColors)
+    options.ansiColors = JSON.parse(overrides.ansiColors);
+  if (overrides.overlayStyles)
+    options.overlayStyles = JSON.parse(overrides.overlayStyles);
 
   if (overrides.overlayWarnings) {
     options.overlayWarnings = overrides.overlayWarnings == 'true';
@@ -76,7 +79,7 @@ function EventSourceWrapper() {
 
   init();
   var timer = setInterval(function() {
-    if ((new Date() - lastActivity) > options.timeout) {
+    if (new Date() - lastActivity > options.timeout) {
       handleDisconnect();
     }
   }, options.timeout / 2);
@@ -89,7 +92,7 @@ function EventSourceWrapper() {
   }
 
   function handleOnline() {
-    if (options.log) console.log("[HMR] connected");
+    if (options.log) console.log('[HMR] connected');
     lastActivity = new Date();
   }
 
@@ -109,7 +112,7 @@ function EventSourceWrapper() {
   return {
     addMessageListener: function(fn) {
       listeners.push(fn);
-    }
+    },
   };
 }
 
@@ -129,14 +132,14 @@ function connect() {
   getEventSourceWrapper().addMessageListener(handleMessage);
 
   function handleMessage(event) {
-    if (event.data == "\uD83D\uDC93") {
+    if (event.data == '\uD83D\uDC93') {
       return;
     }
     try {
       processMessage(JSON.parse(event.data));
     } catch (ex) {
       if (options.warn) {
-        console.warn("Invalid HMR message: " + event.data + "\n" + ex);
+        console.warn('Invalid HMR message: ' + event.data + '\n' + ex);
       }
     }
   }
@@ -162,43 +165,47 @@ function createReporter() {
   if (typeof document !== 'undefined' && options.overlay) {
     overlay = require('./client-overlay')({
       ansiColors: options.ansiColors,
-      overlayStyles: options.overlayStyles
+      overlayStyles: options.overlayStyles,
     });
   }
 
   var styles = {
-    errors: "color: #ff0000;",
-    warnings: "color: #999933;"
+    errors: 'color: #ff0000;',
+    warnings: 'color: #999933;',
   };
   var previousProblems = null;
   function log(type, obj) {
-    var newProblems = obj[type].map(function(msg) { return strip(msg); }).join('\n');
+    var newProblems = obj[type]
+      .map(function(msg) {
+        return strip(msg);
+      })
+      .join('\n');
     if (previousProblems == newProblems) {
       return;
     } else {
       previousProblems = newProblems;
     }
 
     var style = styles[type];
-    var name = obj.name ? "'" + obj.name + "' " : "";
-    var title = "[HMR] bundle " + name + "has " + obj[type].length + " " + type;
+    var name = obj.name ? "'" + obj.name + "' " : '';
+    var title = '[HMR] bundle ' + name + 'has ' + obj[type].length + ' ' + type;
     // NOTE: console.warn or console.error will print the stack trace
     // which isn't helpful here, so using console.log to escape it.
     if (console.group && console.groupEnd) {
-      console.group("%c" + title, style);
-      console.log("%c" + newProblems, style);
+      console.group('%c' + title, style);
+      console.log('%c' + newProblems, style);
       console.groupEnd();
     } else {
       console.log(
-        "%c" + title + "\n\t%c" + newProblems.replace(/\n/g, "\n\t"),
-        style + "font-weight: bold;",
-        style + "font-weight: normal;"
+        '%c' + title + '\n\t%c' + newProblems.replace(/\n/g, '\n\t'),
+        style + 'font-weight: bold;',
+        style + 'font-weight: normal;'
       );
     }
   }
 
   return {
-    cleanProblemsCache: function () {
+    cleanProblemsCache: function() {
       previousProblems = null;
     },
     problems: function(type, obj) {
@@ -219,7 +226,7 @@ function createReporter() {
     },
     useCustomOverlay: function(customOverlay) {
       overlay = customOverlay;
-    }
+    },
   };
 }
 
@@ -228,24 +235,28 @@ var processUpdate = require('./process-update');
 var customHandler;
 var subscribeAllHandler;
 function processMessage(obj) {
-  switch(obj.action) {
-    case "building":
+  switch (obj.action) {
+    case 'building':
       if (options.log) {
         console.log(
-          "[HMR] bundle " + (obj.name ? "'" + obj.name + "' " : "") +
-          "rebuilding"
+          '[HMR] bundle ' +
+            (obj.name ? "'" + obj.name + "' " : '') +
+            'rebuilding'
         );
       }
       break;
-    case "built":
+    case 'built':
       if (options.log) {
         console.log(
-          "[HMR] bundle " + (obj.name ? "'" + obj.name + "' " : "") +
-          "rebuilt in " + obj.time + "ms"
+          '[HMR] bundle ' +
+            (obj.name ? "'" + obj.name + "' " : '') +
+            'rebuilt in ' +
+            obj.time +
+            'ms'
         );
       }
-      // fall through
-    case "sync":
+    // fall through
+    case 'sync':
       if (obj.name && options.name && obj.name !== options.name) {
         return;
       }
@@ -290,6 +301,6 @@ if (module) {
     useCustomOverlay: function useCustomOverlay(customOverlay) {
       if (reporter) reporter.useCustomOverlay(customOverlay);
     },
-    setOptionsAndConnect: setOptionsAndConnect
+    setOptionsAndConnect: setOptionsAndConnect,
   };
 }

helpers.js

@@ -6,4 +6,4 @@ exports.pathMatch = function(url, path) {
   } catch (e) {
     return false;
   }
-}
+};