Merge branch 'master' into switch-to-monorepo

# Conflicts:
#	packages/react-storybook/src/server/config/defaults/webpack.config.js
#	packages/react-storybook/src/server/middleware.js

.eslintrc.js

@@ -0,0 +1,28 @@
+module.exports = {
+  extends: [
+    './node_modules/eslint-config-airbnb-base/rules/es6.js',
+  ],
+  plugins: [
+    'prettier',
+  ],
+  parser: 'babel-eslint',
+  parserOptions: {
+    sourceType: 'module',
+  },
+  env: {
+    es6: true,
+    node: true,
+  },
+  rules: {
+    strict: 0,
+    'prettier/prettier': ['warn', {
+      printWidth: 100,
+      tabWidth: 2,
+      bracketSpacing: true,
+      trailingComma: 'all',
+      singleQuote: true,
+    }],
+    quotes: ['warn', 'single'],
+    'arrow-parens': ['warn', 'as-needed'],
+  },
+}

package.json

@@ -1,13 +1,13 @@
 {
   "name": "storybook",
   "devDependencies": {
-    "babel-eslint": "^7.2.1",
+    "babel-eslint": "^7.2.2",
     "eslint": "^3.19.0",
-    "eslint-config-airbnb-base": "^11.1.2",
+    "eslint-config-airbnb-base": "^11.1.3",
     "eslint-plugin-import": "^2.2.0",
     "eslint-plugin-prettier": "^2.0.1",
-    "lerna": "2.0.0-rc.1",
-    "prettier": "^0.22.0"
+    "lerna": "2.0.0-rc.2",
+    "prettier": "^1.1.0"
   },
   "scripts": {
     "postinstall": "lerna bootstrap",

packages/addon-actions/src/components/ActionLogger/index.js

@@ -9,12 +9,9 @@ class ActionLogger extends Component {
     if (latest) {
       const borderLeft = style.action.borderLeft;
       latest.style.borderLeft = 'solid 5px #aaa';
-      setTimeout(
-        () => {
-          latest.style.borderLeft = borderLeft;
-        },
-        300
-      );
+      setTimeout(() => {
+        latest.style.borderLeft = borderLeft;
+      }, 300);
     }
   }
 
@@ -53,7 +50,7 @@ class ActionLogger extends Component {
 
 ActionLogger.propTypes = {
   onClear: PropTypes.func,
-  actions: PropTypes.array
+  actions: PropTypes.array,
 };
 
 export default ActionLogger;

packages/addon-actions/src/components/ActionLogger/style.js

@@ -2,36 +2,36 @@ export default {
   wrapper: {
     flex: 1,
     display: 'flex',
-    position: 'relative'
+    position: 'relative',
   },
   actions: {
     flex: 1,
     margin: 0,
     padding: '8px 2px 20px 0',
     overflowY: 'auto',
-    color: '#666'
+    color: '#666',
   },
   action: {
     display: 'flex',
     padding: '3px 3px 3px 0',
     borderLeft: '5px solid white',
     borderBottom: '1px solid #fafafa',
     transition: 'all 0.1s',
-    alignItems: 'center'
+    alignItems: 'center',
   },
   countwrap: {
-    paddingBottom: 2
+    paddingBottom: 2,
   },
   counter: {
     margin: '0 5px 0 5px',
     backgroundColor: '#777777',
     color: '#ffffff',
     padding: '1px 5px',
-    borderRadius: '20px'
+    borderRadius: '20px',
   },
   inspector: {
     flex: 1,
-    padding: '0 0 0 5px'
+    padding: '0 0 0 5px',
   },
   button: {
     position: 'absolute',
@@ -44,6 +44,6 @@ export default {
     padding: '5px 10px',
     borderRadius: '4px 0 0 0',
     color: 'rgba(0, 0, 0, 0.5)',
-    outline: 'none'
-  }
+    outline: 'none',
+  },
 };

packages/addon-actions/src/containers/ActionLogger/index.js

@@ -38,7 +38,7 @@ export default class ActionLogger extends React.Component {
   render() {
     const props = {
       actions: this.state.actions,
-      onClear: () => this.clearActions()
+      onClear: () => this.clearActions(),
     };
     return <ActionLoggerComponent {...props} />;
   }

packages/addon-actions/src/manager.js

@@ -8,7 +8,7 @@ export function register() {
     const channel = addons.getChannel();
     addons.addPanel(PANEL_ID, {
       title: 'Action Logger',
-      render: () => <ActionLogger channel={channel} />
+      render: () => <ActionLogger channel={channel} />,
     });
   });
 }

packages/addon-actions/src/preview.js

@@ -16,7 +16,7 @@ export function action(name) {
     const randomId = Math.random().toString(16).slice(2);
     channel.emit(EVENT_ID, {
       id: randomId,
-      data: { name, args }
+      data: { name, args },
     });
   };
 

packages/addon-comments/src/index.js

@@ -7,7 +7,7 @@ const buttonStyles = {
   backgroundColor: '#FFFFFF',
   cursor: 'pointer',
   fontSize: 15,
-  padding: '3px 10px'
+  padding: '3px 10px',
 };
 
 const Button = ({ children, onClick, style = {} }) => (
@@ -19,7 +19,7 @@ const Button = ({ children, onClick, style = {} }) => (
 Button.propTypes = {
   children: PropTypes.string.isRequired,
   onClick: PropTypes.func,
-  style: PropTypes.object
+  style: PropTypes.object,
 };
 
 export default Button;

packages/addon-comments/src/manager/components/CommentForm/index.js

@@ -17,7 +17,7 @@ marked.setOptions({
   pedantic: false,
   sanitize: true,
   smartLists: true,
-  smartypants: false
+  smartypants: false,
 });
 
 export default class CommentForm extends Component {
@@ -85,5 +85,5 @@ export default class CommentForm extends Component {
 }
 
 CommentForm.propTypes = {
-  addComment: PropTypes.func
+  addComment: PropTypes.func,
 };

packages/addon-comments/src/manager/components/CommentForm/style.js

@@ -7,19 +7,19 @@ const button = {
   padding: '7px 15px',
   fontSize: 12,
   lineHeight: 1,
-  color: 'rgba(0, 0, 0, 0.5)'
+  color: 'rgba(0, 0, 0, 0.5)',
 };
 
 export default {
   wrapper: {
     display: 'flex',
     alignItems: 'center',
-    borderTop: '1px solid rgb(234, 234, 234)'
+    borderTop: '1px solid rgb(234, 234, 234)',
   },
   submitButton: {
     ...button,
     cursor: 'pointer',
-    borderRadius: '0 0 4px 0'
+    borderRadius: '0 0 4px 0',
   },
   input: {
     flex: 1,
@@ -34,6 +34,6 @@ export default {
     lineHeight: 1.6,
     color: 'rgba(0, 0, 0, 0.8)',
     fontFamily: 'sans-serif',
-    resize: 'none'
-  }
+    resize: 'none',
+  },
 };

packages/addon-comments/src/manager/components/CommentItem/index.js

@@ -74,5 +74,5 @@ export default class CommentItem extends Component {
 CommentItem.propTypes = {
   deleteComment: PropTypes.func,
   comment: PropTypes.object,
-  ownComment: PropTypes.bool
+  ownComment: PropTypes.bool,
 };

packages/addon-comments/src/manager/components/CommentItem/style.js

@@ -2,28 +2,28 @@ const commentItem = {
   display: 'flex',
   paddingBottom: '5px',
   WebkitFontSmoothing: 'antialiased',
-  transition: 'opacity 0.5s'
+  transition: 'opacity 0.5s',
 };
 
 export default {
   commentItem: {
-    ...commentItem
+    ...commentItem,
   },
   commentItemloading: {
     ...commentItem,
-    opacity: 0.25
+    opacity: 0.25,
   },
   commentAside: {
-    margin: '5px 10px 0 0'
+    margin: '5px 10px 0 0',
   },
   commentAvatar: {
     width: 32,
     height: 32,
-    borderRadius: 5
+    borderRadius: 5,
   },
   commentContent: {
     position: 'relative',
-    flex: 1
+    flex: 1,
   },
   commentHead: {
     //
@@ -33,26 +33,26 @@ export default {
     fontSize: 13,
     lineHeight: 1,
     fontWeight: 'bold',
-    marginRight: 5
+    marginRight: 5,
   },
   commentTime: {
     fontFamily: 'sans-serif',
     fontSize: 11,
     lineHeight: 1,
-    color: 'rgb(150, 150, 150)'
+    color: 'rgb(150, 150, 150)',
   },
   commentText: {
     fontFamily: 'sans-serif',
     fontSize: 13,
     lineHeight: 1.7,
-    maxWidth: 650
+    maxWidth: 650,
   },
   commentDelete: {
     fontFamily: 'sans-serif',
     position: 'absolute',
     top: 2,
     right: 0,
     fontSize: 11,
-    color: 'rgb(200, 200, 200)'
-  }
+    color: 'rgb(200, 200, 200)',
+  },
 };

packages/addon-comments/src/manager/components/CommentList/index.js

@@ -53,5 +53,5 @@ export default class CommentList extends Component {
 CommentList.propTypes = {
   comments: PropTypes.array,
   user: PropTypes.object,
-  deleteComment: PropTypes.func
+  deleteComment: PropTypes.func,
 };

packages/addon-comments/src/manager/components/CommentList/style.js

@@ -2,11 +2,11 @@ export default {
   wrapper: {
     flex: 1,
     overflow: 'auto',
-    padding: '7px 15px'
+    padding: '7px 15px',
   },
   noComments: {
     fontFamily: 'sans-serif',
     fontSize: 13,
-    padding: '10px 0'
-  }
+    padding: '10px 0',
+  },
 };

packages/addon-comments/src/manager/components/CommentsPanel/index.js

@@ -39,5 +39,5 @@ export default class CommentsPanel extends Component {
 CommentsPanel.propTypes = {
   loading: PropTypes.bool,
   user: PropTypes.object,
-  appNotAvailable: PropTypes.bool
+  appNotAvailable: PropTypes.bool,
 };

packages/addon-comments/src/manager/components/CommentsPanel/style.js

@@ -3,7 +3,7 @@ export default {
     flex: 1,
     display: 'flex',
     flexDirection: 'column',
-    position: 'relative'
+    position: 'relative',
   },
   message: {
     flex: 1,
@@ -15,7 +15,7 @@ export default {
     fontSize: 11,
     letterSpacing: 1,
     textDecoration: 'none',
-    textTransform: 'uppercase'
+    textTransform: 'uppercase',
   },
   button: {
     textDecoration: 'none',
@@ -24,6 +24,6 @@ export default {
     background: 'rgb(240, 240, 240)',
     borderRadius: 5,
     textTransform: 'none',
-    fontSize: 12
-  }
+    fontSize: 12,
+  },
 };