From b7c4dbd2246b439117f37c0a17e9fae23ea00d20 Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Fri, 7 Jul 2017 17:27:05 +0700 Subject: [PATCH] Remove CommonJS style exports in framework --- client/coral-embed-stream/src/actions/stream.js | 2 +- client/coral-embed-stream/src/containers/Embed.js | 4 +++- client/coral-embed-stream/src/containers/Stream.js | 3 ++- client/coral-embed-stream/src/index.js | 2 +- client/coral-framework/actions/auth.js | 2 +- client/coral-framework/actions/index.js | 9 --------- client/coral-framework/actions/notification.js | 2 +- client/coral-framework/components/ClickOutside.js | 2 +- client/coral-framework/index.js | 10 ---------- client/coral-framework/reducers/auth.js | 2 +- .../services/{PymConnection.js => pym.js} | 2 +- client/coral-settings/containers/ProfileContainer.js | 2 +- 12 files changed, 13 insertions(+), 29 deletions(-) delete mode 100644 client/coral-framework/actions/index.js delete mode 100644 client/coral-framework/index.js rename client/coral-framework/services/{PymConnection.js => pym.js} (77%) diff --git a/client/coral-embed-stream/src/actions/stream.js b/client/coral-embed-stream/src/actions/stream.js index 9b5d94a9b..75c665315 100644 --- a/client/coral-embed-stream/src/actions/stream.js +++ b/client/coral-embed-stream/src/actions/stream.js @@ -1,4 +1,4 @@ -import {pym} from 'coral-framework'; +import pym from 'coral-framework/services/pym'; import * as actions from '../constants/stream'; export const setActiveReplyBox = (id) => ({type: actions.SET_ACTIVE_REPLY_BOX, id}); diff --git a/client/coral-embed-stream/src/containers/Embed.js b/client/coral-embed-stream/src/containers/Embed.js index bf05caf29..da7ca48fa 100644 --- a/client/coral-embed-stream/src/containers/Embed.js +++ b/client/coral-embed-stream/src/containers/Embed.js @@ -7,7 +7,9 @@ import branch from 'recompose/branch'; import renderComponent from 'recompose/renderComponent'; import {Spinner} from 'coral-ui'; -import {authActions, assetActions, pym} from 'coral-framework'; +import * as authActions from 'coral-framework/actions/auth'; +import * as assetActions from 'coral-framework/actions/asset'; +import pym from 'coral-framework/services/pym'; import {getDefinitionName} from 'coral-framework/utils'; import {withQuery} from 'coral-framework/hocs'; import Embed from '../components/Embed'; diff --git a/client/coral-embed-stream/src/containers/Stream.js b/client/coral-embed-stream/src/containers/Stream.js index 28947b77e..126c443ff 100644 --- a/client/coral-embed-stream/src/containers/Stream.js +++ b/client/coral-embed-stream/src/containers/Stream.js @@ -8,7 +8,8 @@ import { withAddTag, withRemoveTag, withIgnoreUser, withEditComment, } from 'coral-framework/graphql/mutations'; -import {notificationActions, authActions} from 'coral-framework'; +import * as authActions from 'coral-framework/actions/auth'; +import * as notificationActions from 'coral-framework/actions/notification'; import {editName} from 'coral-framework/actions/user'; import {setActiveReplyBox} from '../actions/stream'; import Stream from '../components/Stream'; diff --git a/client/coral-embed-stream/src/index.js b/client/coral-embed-stream/src/index.js index 16c510c29..f5be3922d 100644 --- a/client/coral-embed-stream/src/index.js +++ b/client/coral-embed-stream/src/index.js @@ -7,8 +7,8 @@ import './graphql'; import {addExternalConfig} from 'coral-embed-stream/src/actions/config'; import {getStore, injectReducers} from 'coral-framework/services/store'; import {getClient} from 'coral-framework/services/client'; +import pym from 'coral-framework/services/pym'; import AppRouter from './AppRouter'; -import {pym} from 'coral-framework'; import {loadPluginsTranslations, injectPluginsReducers} from 'coral-framework/helpers/plugins'; import reducers from './reducers'; diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js index 53d0f1212..732a11ebe 100644 --- a/client/coral-framework/actions/auth.js +++ b/client/coral-framework/actions/auth.js @@ -3,7 +3,7 @@ import bowser from 'bowser'; import * as actions from '../constants/auth'; import * as Storage from '../helpers/storage'; import coralApi, {base} from '../helpers/request'; -import pym from '../services/PymConnection'; +import pym from '../services/pym'; import {resetWebsocket} from 'coral-framework/services/client'; import t from 'coral-framework/services/i18n'; diff --git a/client/coral-framework/actions/index.js b/client/coral-framework/actions/index.js deleted file mode 100644 index 65f7b87d3..000000000 --- a/client/coral-framework/actions/index.js +++ /dev/null @@ -1,9 +0,0 @@ -import * as authActions from './auth'; -import * as assetActions from './asset'; -import * as notificationActions from './notification'; - -export default { - authActions, - assetActions, - notificationActions, -}; diff --git a/client/coral-framework/actions/notification.js b/client/coral-framework/actions/notification.js index d77a3a16c..57a7950f5 100644 --- a/client/coral-framework/actions/notification.js +++ b/client/coral-framework/actions/notification.js @@ -1,4 +1,4 @@ -import pym from '../services/PymConnection'; +import pym from '../services/pym'; import * as actions from '../constants/notification'; export const addNotification = (notifType, text) => { diff --git a/client/coral-framework/components/ClickOutside.js b/client/coral-framework/components/ClickOutside.js index e13ef4472..5348a9af7 100644 --- a/client/coral-framework/components/ClickOutside.js +++ b/client/coral-framework/components/ClickOutside.js @@ -1,7 +1,7 @@ import {Component, cloneElement, Children} from 'react'; import PropTypes from 'prop-types'; import {findDOMNode} from 'react-dom'; -import {pym} from 'coral-framework'; +import pym from 'coral-framework/services/pym'; export default class ClickOutside extends Component { static propTypes = { diff --git a/client/coral-framework/index.js b/client/coral-framework/index.js deleted file mode 100644 index 5cd9d6174..000000000 --- a/client/coral-framework/index.js +++ /dev/null @@ -1,10 +0,0 @@ -import pym from './services/PymConnection'; -import actions from './actions'; - -// TODO (bc): Deprecate old actions. Spreading actions is now needed. - -export default { - pym, - actions, - ...actions -}; diff --git a/client/coral-framework/reducers/auth.js b/client/coral-framework/reducers/auth.js index 7ab12cf53..92d676abe 100644 --- a/client/coral-framework/reducers/auth.js +++ b/client/coral-framework/reducers/auth.js @@ -1,6 +1,6 @@ import {Map, fromJS} from 'immutable'; import * as actions from '../constants/auth'; -import {pym} from 'coral-framework'; +import pym from 'coral-framework/services/pym'; const initialState = Map({ isLoading: false, diff --git a/client/coral-framework/services/PymConnection.js b/client/coral-framework/services/pym.js similarity index 77% rename from client/coral-framework/services/PymConnection.js rename to client/coral-framework/services/pym.js index 6c492f2b8..bb5d90a0e 100644 --- a/client/coral-framework/services/PymConnection.js +++ b/client/coral-framework/services/pym.js @@ -1,4 +1,4 @@ -import Pym from '../../../node_modules/pym.js'; +import Pym from 'pym.js'; const pym = new Pym.Child({polling: 100}); export default pym; diff --git a/client/coral-settings/containers/ProfileContainer.js b/client/coral-settings/containers/ProfileContainer.js index 5e343e72f..a4cb9459f 100644 --- a/client/coral-settings/containers/ProfileContainer.js +++ b/client/coral-settings/containers/ProfileContainer.js @@ -5,7 +5,7 @@ import {bindActionCreators} from 'redux'; import {withStopIgnoringUser} from 'coral-framework/graphql/mutations'; -import {link} from 'coral-framework/services/PymConnection'; +import {link} from 'coral-framework/services/pym'; import NotLoggedIn from '../components/NotLoggedIn'; import IgnoredUsers from '../components/IgnoredUsers'; import {Spinner} from 'coral-ui';