Fixing lint styles

atomicjolt · Feb 6, 2017 · 089e891 · 089e891
1 parent 2549e85
commit 089e891
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 25 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1,5 @@
+# /node_modules/* and /bower_components/* ignored by default
+
+# Ignore built files except build/index.js
+build/*
+!build/index.js
diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -41,9 +41,4 @@ rules:
     - devDependencies: true
   padded-blocks: 0
   key-spacing:
-    - 2
-    - align:
-        afterColon: true
-        beforeColon: true
-        "on": colon
-        mode: minimum
+    - 0
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-7.4.0
+7.5.0
diff --git a/client/config/webpack.config.js b/client/config/webpack.config.js
@@ -75,13 +75,13 @@ module.exports = function webpackConfig(stage) {
       new webpack.optimize.OccurrenceOrderPlugin(),
       new webpack.optimize.AggressiveMergingPlugin(),
       new ChunkManifestPlugin({
-        filename         : 'webpack-common-manifest.json',
-        manfiestVariable : 'webpackBundleManifest'
+        filename: 'webpack-common-manifest.json',
+        manfiestVariable: 'webpackBundleManifest'
       }),
       extractCSS
 
       // Use to extract common code from multiple entry points into a single init.js
-      //new webpack.optimize.CommonsChunkPlugin('init.js');
+      // new webpack.optimize.CommonsChunkPlugin('init.js');
     ];
   } else if (stage === 'hot') {
     plugins = [
@@ -98,13 +98,13 @@ module.exports = function webpackConfig(stage) {
   }
 
   const loaders = [
-    { test: /\.js$/,    loaders: jsLoaders, exclude: /node_modules/ },
-    { test: /\.jsx?$/,  loaders: jsLoaders, exclude: /node_modules/ },
+    { test: /\.js$/, loaders: jsLoaders, exclude: /node_modules/ },
+    { test: /\.jsx?$/, loaders: jsLoaders, exclude: /node_modules/ },
     { test: /\.scss$/i, loader: extractCSS.extract(scssLoaders) },
-    { test: /\.css$/i,  loader: extractCSS.extract(cssLoaders) },
+    { test: /\.css$/i, loader: extractCSS.extract(cssLoaders) },
     { test: /\.less$/i, loader: extractCSS.extract(lessLoaders) },
     { test: /.*\.(gif|png|jpg|jpeg|svg)$/, loaders: ['url?limit=5000&hash=sha512&digest=hex&size=16&name=[name]-[hash].[ext]'] },
-    { test: /.*\.(eot|woff2|woff|ttf)$/,   loaders: ['url?limit=5000&hash=sha512&digest=hex&size=16&name=[name]-[hash].[ext]'] }
+    { test: /.*\.(eot|woff2|woff|ttf)$/, loaders: ['url?limit=5000&hash=sha512&digest=hex&size=16&name=[name]-[hash].[ext]'] }
   ];
 
   return {
@@ -136,7 +136,7 @@ module.exports = function webpackConfig(stage) {
     devServer      : {
       stats: {
         cached  : false,
-        exclude : [/node_modules[\\\/]react(-router)?[\\\/]/]
+        exclude : [/node_modules[\\/]react(-router)?[\\/]/]
       }
     }
   };

diff --git a/client/js/constants/error.js b/client/js/constants/error.js
@@ -1,5 +1,5 @@
 export default {
-  TIMEOUT        : 'NETWORK_TIMEOUT',
-  ERROR          : 'NETWORK_ERROR',
-  NOT_AUTHORIZED : 'NETWORK_NOT_AUTHORIZED',
+  TIMEOUT:        'NETWORK_TIMEOUT',
+  ERROR:          'NETWORK_ERROR',
+  NOT_AUTHORIZED: 'NETWORK_NOT_AUTHORIZED',
 };
diff --git a/client/js/constants/network.js b/client/js/constants/network.js
@@ -1,7 +1,7 @@
 export default {
-  GET     : 'get',
-  POST    : 'post',
-  PUT     : 'put',
-  DEL     : 'delete',
-  TIMEOUT : 20000,
+  GET:     'get',
+  POST:    'post',
+  PUT:     'put',
+  DEL:     'delete',
+  TIMEOUT: 20000,
 };
diff --git a/client/js/constants/wrapper.js b/client/js/constants/wrapper.js
@@ -11,8 +11,8 @@ export default function (actionTypes, asyncActionTypes) {
 
   types = _.reduce(asyncActionTypes, (result, key) => ({
     ...result,
-    [key]             : key,
-    [`${key}${DONE}`] : `${key}${DONE}`
+    [key]: key,
+    [`${key}${DONE}`]: `${key}${DONE}`
   }), types);
 
   types.DONE = DONE;