Merge pull request #290 from realityking/eslint

Switch eslint to use airbnb config

.eslintrc.js

@@ -1,7 +1,18 @@
 module.exports = {
-  'extends': 'eslint-config-brigade/react',
+  'extends': 'eslint-config-airbnb',
   'parserOptions': {
-    'ecmaVersion': 6,
-    'sourceType': 'module'
+    'ecmaVersion': 2018,
+    'sourceType': 'module',
+    'ecmaFeatures': {
+      'jsx': true,
+    },
+  },
+  'rules': {
+    'no-restricted-globals': 'off',
+    'no-plusplus': 'off',
+    'no-underscore-dangle': 'off'
+  },
+  'env': {
+    'browser': true,
   },
 };

karma.conf.js

@@ -1,7 +1,7 @@
 /* global process */
 // Karma configuration
 
-module.exports = function(config) {
+module.exports = (config) => {
   config.set({
 
     // base path that will be used to resolve all patterns (eg. files, exclude)
@@ -13,7 +13,7 @@ module.exports = function(config) {
 
     // list of files / patterns to load in the browser
     files: [
-      'tests.webpack.js'
+      'tests.webpack.js',
     ],
 
     // list of files to exclude
@@ -24,7 +24,7 @@ module.exports = function(config) {
     // available preprocessors:
     // https://npmjs.org/browse/keyword/karma-preprocessor
     preprocessors: {
-      'tests.webpack.js': ['webpack']
+      'tests.webpack.js': ['webpack'],
     },
 
     webpack: {
@@ -33,14 +33,17 @@ module.exports = function(config) {
           {
             test: /\.jsx?$/,
             loaders: ['babel-loader?cacheDirectory=true'],
-            exclude: /node_modules/
-          }
-        ]
-      }
+            exclude: /node_modules/,
+          },
+        ],
+      },
+      resolve: {
+        extensions: ['.js', '.jsx', '.json'],
+      },
     },
 
     webpackMiddleware: {
-      noInfo: true
+      noInfo: true,
     },
 
     // test results reporter to use
@@ -66,8 +69,8 @@ module.exports = function(config) {
     // start these browsers
     // available browser launchers:
     // https://npmjs.org/browse/keyword/karma-launcher
-    browsers: process.env.CONTINUOUS_INTEGRATION === 'true' ?
-      ['Firefox'] : ['Chrome'],
+    browsers: process.env.CONTINUOUS_INTEGRATION === 'true'
+      ? ['Firefox'] : ['Chrome'],
 
     // if true, Karma captures browsers, runs the tests and exits
     singleRun: true,

package.json

@@ -43,9 +43,11 @@
     "babel-core": "^6.26.3",
     "babel-loader": "^6.4.0",
     "babel-preset-airbnb": "^2.5.1",
-    "eslint": "^3.17.1",
-    "eslint-config-brigade": "^3.2.1",
-    "eslint-plugin-react": "^6.10.0",
+    "eslint": "^4.19.1",
+    "eslint-config-airbnb": "^17.1.0",
+    "eslint-plugin-import": "^2.15.0",
+    "eslint-plugin-jsx-a11y": "^6.1.2",
+    "eslint-plugin-react": "^7.12.4",
     "in-publish": "^2.0.0",
     "jasmine-core": "2.6.4",
     "karma": "^1.5.0",

rollup.config.js

@@ -10,12 +10,12 @@ export default [
     ],
     output: [
       { file: pkg.main, format: 'cjs' },
-      { file: pkg.module, format: 'es' }
+      { file: pkg.module, format: 'es' },
     ],
     plugins: [
       babel({
-        exclude: ['node_modules/**']
-      })
-    ]
-  }
+        exclude: ['node_modules/**'],
+      }),
+    ],
+  },
 ];

src/computeOffsetPixels.js

@@ -17,4 +17,6 @@ export default function computeOffsetPixels(offset, contextHeight) {
   if (typeof percentOffset === 'number') {
     return percentOffset * contextHeight;
   }
+
+  return undefined;
 }

src/debugLog.js

@@ -1,5 +1,5 @@
-export default function debugLog() {
+export default function debugLog(...args) {
   if (process.env.NODE_ENV !== 'production') {
-    console.log(arguments); // eslint-disable-line no-console
+    console.log(...args); // eslint-disable-line no-console
   }
 }

src/ensureChildrenIsValid.js

@@ -1,8 +1,7 @@
 import React from 'react';
 
-export const errorMessage =
-  '<Waypoint> expected to receive a single React element child.\n\n' +
-  'See https://goo.gl/LrBNgw for more info.';
+export const errorMessage = '<Waypoint> expected to receive a single React element child.\n\n'
+  + 'See https://goo.gl/LrBNgw for more info.';
 
 /**
  * Raise an error if more that one child was provided to "children"

src/ensureRefIsUsedByChild.js

@@ -1,9 +1,8 @@
 import isDOMElement from './isDOMElement';
 
-export const errorMessage =
-  '<Waypoint> needs a DOM element to compute boundaries. The child you passed is neither a ' +
-  'DOM element (e.g. <div>) nor does it use the innerRef prop.\n\n' +
-  'See https://goo.gl/LrBNgw for more info.';
+export const errorMessage = '<Waypoint> needs a DOM element to compute boundaries. The child you passed is neither a '
+  + 'DOM element (e.g. <div>) nor does it use the innerRef prop.\n\n'
+  + 'See https://goo.gl/LrBNgw for more info.';
 
 /**
  * Raise an error if "children" is not a DOM Element and there is no ref provided to Waypoint

src/getCurrentPosition.js

@@ -1,4 +1,6 @@
-import { INVISIBLE, INSIDE, BELOW, ABOVE } from './constants';
+import {
+  INVISIBLE, INSIDE, BELOW, ABOVE,
+} from './constants';
 
 /**
  * @param {object} bounds An object with bounds data for the waypoint and
@@ -13,20 +15,20 @@ export default function getCurrentPosition(bounds) {
   }
 
   // top is within the viewport
-  if (bounds.viewportTop <= bounds.waypointTop &&
-      bounds.waypointTop <= bounds.viewportBottom) {
+  if (bounds.viewportTop <= bounds.waypointTop
+      && bounds.waypointTop <= bounds.viewportBottom) {
     return INSIDE;
   }
 
   // bottom is within the viewport
-  if (bounds.viewportTop <= bounds.waypointBottom &&
-      bounds.waypointBottom <= bounds.viewportBottom) {
+  if (bounds.viewportTop <= bounds.waypointBottom
+      && bounds.waypointBottom <= bounds.viewportBottom) {
     return INSIDE;
   }
 
   // top is above the viewport and bottom is below the viewport
-  if (bounds.waypointTop <= bounds.viewportTop &&
-      bounds.viewportBottom <= bounds.waypointBottom) {
+  if (bounds.waypointTop <= bounds.viewportTop
+      && bounds.viewportBottom <= bounds.waypointBottom) {
     return INSIDE;
   }
 

src/parseOffsetAsPercentage.js

@@ -14,4 +14,6 @@ export default function parseOffsetAsPercentage(str) {
   if (str.slice(-1) === '%') {
     return parseFloat(str.slice(0, -1)) / 100;
   }
+
+  return undefined;
 }

src/parseOffsetAsPixels.js

@@ -14,7 +14,9 @@
 export default function parseOffsetAsPixels(str) {
   if (!isNaN(parseFloat(str)) && isFinite(str)) {
     return parseFloat(str);
-  } else if (str.slice(-2) === 'px') {
+  } if (str.slice(-2) === 'px') {
     return parseFloat(str.slice(0, -2));
   }
+
+  return undefined;
 }