Merge branch 'master' into featured-comments

Conflicts:
	client/coral-embed-stream/src/components/Stream.js

plugin-api/beta/client/hocs/index.js

@@ -1,3 +1,5 @@
 export {default as withReaction} from './withReaction';
 export {default as withTags} from './withTags';
 export {default as withFragments} from 'coral-framework/hocs/withFragments';
+export {default as excludeIf} from 'coral-framework/hocs/excludeIf';
+export {default as connect} from 'coral-framework/hocs/connect';

plugin-api/beta/client/hocs/withReaction.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import get from 'lodash/get';
 import uuid from 'uuid/v4';
-import {connect} from 'react-redux';
+import {connect} from 'plugin-api/beta/client/hocs';
 import {bindActionCreators} from 'redux';
 import {getDisplayName} from 'coral-framework/helpers/hoc';
 import {compose, gql} from 'react-apollo';

plugin-api/beta/client/selectors/index.js

@@ -0,0 +1 @@
+export const pluginConfigSelector = (state) => state.config.pluginConfig;

plugin-api/beta/client/services/index.js

@@ -1,3 +1,9 @@
 export {t, timeago} from 'coral-framework/services/i18n';
 export {can} from 'coral-framework/services/perms';
-export {isSlotEmpty} from 'coral-framework/helpers/plugins';
+import {isSlotEmpty as ise} from 'coral-framework/helpers/plugins';
+
+// @TODO: Deprecated.
+export function isSlotEmpty(...args) {
+  console.warn('A plugin is using `isSlotEmpty` which has been deprecated, please port to the new API using the `IfSlotIsEmpty` and `IfSlotIsNotEmpty` components.');
+  return ise(...args);
+}