Merge pull request react-bootstrap#1360 from AlexKVal/deps

Update dev.dependencies

.eslintrc

@@ -16,15 +16,13 @@
     "constructor-super": 2,
     "comma-dangle": 0,
     "eqeqeq": [2, "allow-null"],
+    "id-length": 0,
     "one-var": [2, { "initialized": "never" }],
     "prefer-const": 0,
-    "key-spacing": 0,
-    "no-eq-null": 0,
     "no-param-reassign": 0,
     "no-this-before-super": 2,
-    "no-undef": 2,
     "babel/object-shorthand": 2,
-    "react/jsx-boolean-value": [2, "never"],
+    "react/jsx-boolean-value": 2,
     "react/jsx-no-duplicate-props": 2,
     "react/prop-types": [2, { "ignore": [ "children", "className", "style" ] }],
     "react/sort-comp": 0

docs/src/Samples.js

@@ -1,4 +1,4 @@
-/* eslint no-path-concat: 0, no-var: 0 */
+/* eslint no-path-concat: 0, no-var: 0, key-spacing: 0 */
 
 export default {
   Collapse:                      require('fs').readFileSync(__dirname + '/../examples/Collapse.js', 'utf8'),

package.json

@@ -53,14 +53,14 @@
     "child-process-promise": "^1.1.0",
     "codemirror": "^5.5.0",
     "colors": "^1.1.2",
-    "css-loader": "^0.18.0",
+    "css-loader": "^0.19.0",
     "es5-shim": "^4.1.10",
-    "eslint": "1.4.3",
-    "eslint-config-airbnb": "0.0.8",
+    "eslint": "^1.5.1",
+    "eslint-config-airbnb": "^0.1.0",
     "eslint-plugin-babel": "^2.0.0",
     "eslint-plugin-lodash": "^0.1.3",
-    "eslint-plugin-mocha": "^0.5.1",
-    "eslint-plugin-react": "3.3.2",
+    "eslint-plugin-mocha": "^1.0.0",
+    "eslint-plugin-react": "^3.4.2",
     "express": "^4.13.1",
     "extract-text-webpack-plugin": "^0.8.2",
     "file-loader": "^0.8.4",
@@ -69,11 +69,11 @@
     "glob": "^5.0.14",
     "http-proxy": "^1.11.1",
     "ip": "^1.0.1",
-    "isparta-loader": "^0.2.0",
+    "isparta-loader": "^1.0.0",
     "json-loader": "^0.5.2",
     "karma": "~0.13.3",
     "karma-chrome-launcher": "~0.2.0",
-    "karma-cli": "0.1.0",
+    "karma-cli": "0.1.1",
     "karma-coverage": "^0.5.0",
     "karma-coveralls": "^1.1.2",
     "karma-firefox-launcher": "~0.1.6",

src/ButtonGroup.js

@@ -7,7 +7,7 @@ const ButtonGroup = React.createClass({
   mixins: [BootstrapMixin],
 
   propTypes: {
-    vertical:  React.PropTypes.bool,
+    vertical: React.PropTypes.bool,
     justified: React.PropTypes.bool,
     /**
      * Display block buttons, only useful when used with the "vertical" prop.

src/Collapse.js

@@ -13,7 +13,7 @@ let triggerBrowserReflow = node => node.offsetHeight;
 
 const MARGINS = {
   height: ['marginTop', 'marginBottom'],
-  width:  ['marginLeft', 'marginRight']
+  width: ['marginLeft', 'marginRight']
 };
 
 function getDimensionValue(dimension, elem) {

src/CollapsibleMixin.js

@@ -100,7 +100,7 @@ const CollapsibleMixin = {
       // in dimension after initial display (such as an image loading)
       node.style[dimension] = '';
       this.setState({
-        collapsing:false
+        collapsing: false
       });
     };
 

src/DropdownMenu.js

@@ -83,7 +83,7 @@ class DropdownMenu extends React.Component {
     let {children, onSelect, pullRight, className, labelledBy, open, onClose, ...props} = this.props;
 
     const items = ValidComponentChildren.map(children, child => {
-      let childProps  = child.props || {};
+      let childProps = child.props || {};
 
       return React.cloneElement(child, {
         onKeyDown: createChainedFunction(childProps.onKeyDown, this.handleKeyDown),

src/Image.js

@@ -44,7 +44,7 @@ const Image = React.createClass({
     };
 
     return (
-      <img {...this.props}  className={classNames(this.props.className, classes)} />
+      <img {...this.props} className={classNames(this.props.className, classes)} />
     );
   }
 });

src/Modal.js

@@ -424,7 +424,7 @@ const Modal = React.createClass({
     return {
       dialogStyles: {
         paddingRight: containerIsOverflowing && !modalIsOverflowing ? getScrollbarSize() : void 0,
-        paddingLeft:  !containerIsOverflowing && modalIsOverflowing ? getScrollbarSize() : void 0
+        paddingLeft: !containerIsOverflowing && modalIsOverflowing ? getScrollbarSize() : void 0
       }
     };
   }

src/Tab.js

@@ -7,15 +7,15 @@ const Tab = React.createClass({
     /**
      * @private
      */
-    active:          React.PropTypes.bool,
-    animation:       React.PropTypes.bool,
+    active: React.PropTypes.bool,
+    animation: React.PropTypes.bool,
     /**
      * It is used by 'Tabs' - parent component
      * @private
      */
     onAnimateOutEnd: React.PropTypes.func,
-    disabled:        React.PropTypes.bool,
-    title:           React.PropTypes.node
+    disabled: React.PropTypes.bool,
+    title: React.PropTypes.node
   },
 
   getDefaultProps() {

test/.eslintrc

@@ -11,15 +11,14 @@
     "mocha"
   ],
   "rules": {
+    "jsx-quotes": 0,
     "no-console": 0,
     "no-script-url": 0,
     "no-unused-expressions": 0,
     "padded-blocks": 0,
     "react/jsx-boolean-value": 0,
-    "react/jsx-quotes": 0,
     "react/no-multi-comp": 0,
     "react/prop-types": 0,
-    "space-before-function-paren": 0,
     "mocha/no-exclusive-tests": 2
   }
 }

test/CollapsibleMixinSpec.js

@@ -73,7 +73,7 @@ describe('CollapsibleMixin', () => {
     });
 
     it('Should have collapsing class', () => {
-      instance.setProps({expanded:true});
+      instance.setProps({expanded: true});
       let node = instance.getCollapsibleDOMNode();
       assert.equal(node.className, 'collapsing');
     });
@@ -86,14 +86,14 @@ describe('CollapsibleMixin', () => {
         assert.equal(node.style.height, '0px');
       };
 
-      instance.setProps({expanded:true});
+      instance.setProps({expanded: true});
     });
 
     it('Should set transition to height', () => {
       let node = instance.getCollapsibleDOMNode();
       assert.equal(node.styled, undefined);
 
-      instance.setProps({expanded:true});
+      instance.setProps({expanded: true});
       assert.equal(node.style.height, '15px');
     });
 
@@ -105,7 +105,7 @@ describe('CollapsibleMixin', () => {
           done();
         }, 100);
       };
-      instance.setProps({expanded:true});
+      instance.setProps({expanded: true});
       assert.ok(instance.state.collapsing);
     });
 
@@ -121,7 +121,7 @@ describe('CollapsibleMixin', () => {
       };
 
       assert.equal(node.style.height, '');
-      instance.setProps({expanded:true});
+      instance.setProps({expanded: true});
       assert.equal(node.style.height, '15px');
     });
   });
@@ -134,7 +134,7 @@ describe('CollapsibleMixin', () => {
     });
 
     it('Should have collapsing class', () => {
-      instance.setProps({expanded:false});
+      instance.setProps({expanded: false});
       let node = instance.getCollapsibleDOMNode();
       assert.equal(node.className, 'collapsing');
     });
@@ -147,14 +147,14 @@ describe('CollapsibleMixin', () => {
       };
 
       assert.equal(node.style.height, '');
-      instance.setProps({expanded:false});
+      instance.setProps({expanded: false});
     });
 
     it('Should set transition to height', () => {
       let node = instance.getCollapsibleDOMNode();
       assert.equal(node.style.height, '');
 
-      instance.setProps({expanded:false});
+      instance.setProps({expanded: false});
       assert.equal(node.style.height, '0px');
     });
 
@@ -166,7 +166,7 @@ describe('CollapsibleMixin', () => {
           done();
         }, 100);
       };
-      instance.setProps({expanded:false});
+      instance.setProps({expanded: false});
       assert.ok(instance.state.collapsing);
     });
 
@@ -182,7 +182,7 @@ describe('CollapsibleMixin', () => {
       };
 
       assert.equal(node.style.height, '');
-      instance.setProps({expanded:false});
+      instance.setProps({expanded: false});
       assert.equal(node.style.height, '0px');
     });
   });

test/DropdownSpec.js

@@ -269,7 +269,7 @@ describe('Dropdown', () => {
         };
       }
 
-      render () {
+      render() {
         return (
           <div>
             <button className='outer-button'

test/FormGroupSpec.js

@@ -97,8 +97,7 @@ describe('FormGroup', () => {
   }, {
     className: 'custom-group',
     props: { groupClassName: 'custom-group' }
-  }
-].forEach( testCase => {
+  }].forEach( testCase => {
     it(`does not render ${testCase.className} class`, () => {
       let instance = ReactTestUtils.renderIntoDocument(
         <FormGroup>

test/NavDropdownSpec.js

@@ -33,7 +33,7 @@ describe('NavDropdown', () => {
         };
       }
 
-      render () {
+      render() {
         return (
           <div>
             <button className='outer-button'

test/PanelSpec.js

@@ -124,7 +124,7 @@ describe('Panel', () => {
   });
 
   it('Should call onSelect handler', (done) => {
-    function handleSelect (e, key) {
+    function handleSelect(e, key) {
       assert.equal(key, '1');
       done();
     }