rebase fix conflicts

.eslintignore

@@ -5,3 +5,4 @@ bower_components/*
 node_modules/*
 docs/build/*
 testBundle.js
+dist/*

docs/app/Examples/elements/Input/Variations/InputActionExample.js

@@ -3,7 +3,7 @@ import {Button, Dropdown, Input} from 'stardust';
 
 export default class InputActionExample extends Component {
   render() {
-    let options = [
+    const options = [
       {value: 'articles', text: 'Articles'},
       {value: 'products', text: 'Products'},
     ];

gulp/tasks/build.js

@@ -7,7 +7,6 @@ import runSequence from 'run-sequence';
 const g = loadPlugins();
 const gulp = g.help(defaultGulp, helpConfig);
 
-import ENV from '../../ENV';
 import config from '../../webpack.prod.babel';
 import paths from '../../paths';
 import statsConfig from '../../webpack-stats';

karma.conf.js

@@ -1,7 +1,6 @@
 import paths from './paths';
 import statConfig from './webpack-stats';
 import friendlyFormatter from 'eslint-friendly-formatter';
-import pkg from './package.json';
 import exitPlugin from './webpack-exit-plugin';
 
 /**

package.json

@@ -2,7 +2,7 @@
   "name": "stardust",
   "version": "0.5.1",
   "description": "Semantic UI components for React.",
-  "main": "index.js",
+  "main": "dist/stardust.js",
   "files": [
     "src"
   ],
@@ -15,6 +15,7 @@
     "test": "babel-node $(npm bin)/karma start karma.conf.js",
     "test-watch": "webpack-dev-server --config webpack.tests.babel.js"
   },
+  "pre-commit": "lint",
   "repository": {
     "type": "git",
     "url": "git+ssh://github.com/TechnologyAdvice/stardust.git"
@@ -30,8 +31,7 @@
     "classnames": "^2.1.5",
     "jquery": "^2.1.4",
     "lodash": "^3.10.1",
-    "react": "^0.13.3",
-    "react-router": "^0.13.3"
+    "react": "^0.13.3"
   },
   "devDependencies": {
     "babel-core": "^5.8.25",
@@ -65,6 +65,7 @@
     "mocha-loader": "^0.7.1",
     "phantomjs": "^1.9.18",
     "phantomjs-polyfill": "0.0.1",
+    "pre-commit": "^1.1.2",
     "radium": "^0.14.1",
     "raw-loader": "^0.5.1",
     "react-docgen": "^2.2.0",

src/addons/Confirm/Confirm.js

@@ -56,7 +56,7 @@ export default class Confirm extends Component {
   render() {
     const classes = classNames(
       'sd-confirm',
-      this.props.className,
+      this.props.className
     );
     return (
       <Modal {...this.props} className={classes} ref='modal'>

src/collections/Form/Form.js

@@ -42,7 +42,7 @@ export default class Form extends Component {
       'sd-form',
       'ui',
       this.props.className,
-      'form',
+      'form'
     );
     return (
       <form {...this.props} className={classes} ref='form'>

src/collections/Message/Message.js

@@ -26,7 +26,7 @@ export default class Message extends Component {
       'ui',
       this.props.className,
       {icon: this.props.icon},
-      'message',
+      'message'
     );
 
     const iconClasses = classNames(

src/collections/Table/Table.js

@@ -66,7 +66,7 @@ export default class Table extends Component {
       'sd-table',
       'ui',
       this.props.className,
-      'table',
+      'table'
     );
     return (
       <table {...this.props} className={classes}>

src/elements/Image/Image.js

@@ -10,11 +10,11 @@ export default class Image extends Component {
   };
 
   render() {
-    let classes = classNames(
+    const classes = classNames(
       'sd-image',
       'ui',
       this.props.className,
-      'image',
+      'image'
     );
     const props = _.clone(this.props);
     delete props.src;

src/elements/Input/Input.js

@@ -18,9 +18,9 @@ export default class Input extends Component {
 
   render() {
     // TODO: replace with <Icon /> once it is merged
-    let iconClasses = classNames(
+    const iconClasses = classNames(
       this.props.icon,
-      'icon',
+      'icon'
     );
     // Semantic supports actions and labels on either side of an input.
     // The element must be on the same side as the indicated class.

src/elements/List/List.js

@@ -7,7 +7,7 @@ export default class List extends Component {
   };
 
   render() {
-    let classes = classNames('sd-list', 'ui', this.props.className, 'list');
+    const classes = classNames('sd-list', 'ui', this.props.className, 'list');
     return (
       <div {...this.props} className={classes}></div>
     );

src/modules/Dropdown/Dropdown.js

@@ -26,18 +26,17 @@ export default class Dropdown extends Component {
   }
 
   render() {
-    const options = this.props.options.map((opt, i) => {
+    const options = _.map(this.props.options, (opt, i) => {
       return <option key={i} value={opt.value}>{opt.text}</option>;
     });
-    const value = _.isEmpty(this.props.value) ? '' : this.props.value;
     const classes = classNames(
       'sd-dropdown',
       'ui',
       this.props.className,
       'dropdown'
     );
 
-    let props = _.clone(this.props);
+    const props = _.clone(this.props);
     delete props.options;
 
     return (

test/specs/Conformance-test.js

@@ -11,7 +11,9 @@ const getSDClassName = componentName => `sd-${_.kebabCase(componentName)}`;
  * This test ensures all Stardust components conform to our guidelines.
  */
 describe('Conformance', () => {
+  /* eslint-disable no-console */
   console.info('Conformance-test renders all components with no props, warnings may occur.');
+  /* eslint-enable no-console */
   _.each(stardust, (SDComponent, name) => {
     const classes = faker.fake('{{hacker.noun}} {{hacker.noun}} {{hacker.noun}}');
     const sdClass = getSDClassName(name);

webpack.prod.babel.js

@@ -1,6 +1,5 @@
 import friendlyFormatter from 'eslint-friendly-formatter';
 import paths from './paths';
-import pkg from './package.json';
 import webpack from 'webpack';
 
 /**