diff --git a/.eslintrc b/.eslintrc index cce120c59cf4..80ceb7407f73 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,57 +4,30 @@ "globals": { "__meteor_bootstrap__" : false, "__meteor_runtime_config__" : false, - "AccountBox" : false, - "alerts" : false, "Apps" : false, "Assets" : false, - "AudioRecorder" : false, - "CachedChatSubscription" : false, - "ChatMessage" : false, - "ChatMessages" : false, - "chatMessages" : false, - "ChatRoom" : false, - "ChatSubscription" : false, "chrome" : false, "cordova" : false, "device" : false, "DynamicCss" : false, "facebookConnectPlugin" : false, - "fileUpload" : false, - "fireGlobalEvent" : false, "handleError" : false, - "getAvatarUrlFromUsername" : false, "getAvatarSuggestionForUser" : false, "globals" : true, "JitsiMeetExternalAPI" : false, "jscolor" : false, - "KonchatNotification" : false, "language_names" : true, "msgStream" : false, - "MsgTyping" : false, - "modal" : false, - "Modernizr" : false, - "menu" : false, "Npm" : false, "openRoom" : false, "OnePassword" : false, "Package" : false, - "popout" : false, - "popover" : false, - "readMessage" : false, "RocketChat" : true, "roomExit" : true, - "RoomHistoryManager" : false, - "RoomManager" : false, - "RoomRoles" : false, "Servers" : false, "Settings" : false, - "SideNav" : false, "TAPi18next" : false, "TwitterConnect" : false, - "updateAvatarOfUsername" : false, - "UserRoles" : false, - "VideoRecorder" : false, "VRecDialog" : false } } diff --git a/client/methods/deleteMessage.js b/client/methods/deleteMessage.js index 3988d0cccf21..d69dfd5be604 100644 --- a/client/methods/deleteMessage.js +++ b/client/methods/deleteMessage.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; +import { ChatMessage } from 'meteor/rocketchat:models'; import _ from 'underscore'; import moment from 'moment'; diff --git a/client/methods/hideRoom.js b/client/methods/hideRoom.js index 195235ce802b..078ed20bead7 100644 --- a/client/methods/hideRoom.js +++ b/client/methods/hideRoom.js @@ -1,4 +1,6 @@ import { Meteor } from 'meteor/meteor'; +import { ChatSubscription } from 'meteor/rocketchat:models'; + Meteor.methods({ hideRoom(rid) { if (!Meteor.userId()) { diff --git a/client/methods/openRoom.js b/client/methods/openRoom.js index ac7ce40c32f3..ab5e4a92342d 100644 --- a/client/methods/openRoom.js +++ b/client/methods/openRoom.js @@ -1,4 +1,6 @@ import { Meteor } from 'meteor/meteor'; +import { ChatSubscription } from 'meteor/rocketchat:models'; + Meteor.methods({ openRoom(rid) { if (!Meteor.userId()) { diff --git a/client/methods/toggleFavorite.js b/client/methods/toggleFavorite.js index 63309fe05e0b..5ccccf1e1c3a 100644 --- a/client/methods/toggleFavorite.js +++ b/client/methods/toggleFavorite.js @@ -1,4 +1,6 @@ import { Meteor } from 'meteor/meteor'; +import { ChatSubscription } from 'meteor/rocketchat:models'; + Meteor.methods({ toggleFavorite(rid, f) { if (!Meteor.userId()) { diff --git a/client/methods/updateMessage.js b/client/methods/updateMessage.js index c329ad762afa..407180051397 100644 --- a/client/methods/updateMessage.js +++ b/client/methods/updateMessage.js @@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; import { TimeSync } from 'meteor/mizzao:timesync'; import { t } from 'meteor/rocketchat:utils'; +import { ChatMessage } from 'meteor/rocketchat:models'; import _ from 'underscore'; import moment from 'moment'; import toastr from 'toastr'; diff --git a/client/routes/roomRoute.js b/client/routes/roomRoute.js index e9782bd6f460..e9d3a606b607 100644 --- a/client/routes/roomRoute.js +++ b/client/routes/roomRoute.js @@ -1,4 +1,5 @@ import { FlowRouter } from 'meteor/kadira:flow-router'; +import { ChatSubscription } from 'meteor/rocketchat:models'; FlowRouter.goToRoomById = (roomId) => { const subscription = ChatSubscription.findOne({ rid: roomId }); diff --git a/client/startup/roomObserve.js b/client/startup/roomObserve.js index 4fcfedb26e3a..ca1ea934b8be 100644 --- a/client/startup/roomObserve.js +++ b/client/startup/roomObserve.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Session } from 'meteor/session'; +import { ChatRoom } from 'meteor/rocketchat:models'; Meteor.startup(function() { ChatRoom.find().observe({ diff --git a/client/startup/unread.js b/client/startup/unread.js index 03bae2b49253..b261ba9199b8 100644 --- a/client/startup/unread.js +++ b/client/startup/unread.js @@ -3,7 +3,8 @@ import { Tracker } from 'meteor/tracker'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Session } from 'meteor/session'; import { Favico } from 'meteor/rocketchat:favico'; -import { fireGlobalEvent, readMessage } from 'meteor/rocketchat:ui'; +import { ChatSubscription } from 'meteor/rocketchat:models'; +import { RoomManager, menu, fireGlobalEvent, readMessage } from 'meteor/rocketchat:ui-utils'; Meteor.startup(function() { Tracker.autorun(function() { diff --git a/client/startup/usersObserve.js b/client/startup/usersObserve.js index 0bbc53102b52..9bf5914d8536 100644 --- a/client/startup/usersObserve.js +++ b/client/startup/usersObserve.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Session } from 'meteor/session'; +import { RoomManager } from 'meteor/rocketchat:ui-utils'; Meteor.startup(function() { Meteor.users.find({}, { fields: { name: 1, username: 1, pictures: 1, status: 1, emails: 1, phone: 1, services: 1, utcOffset: 1 } }).observe({ diff --git a/imports/message-read-receipt/client/room.js b/imports/message-read-receipt/client/room.js index 4a28ed022b02..78a75fa74aad 100644 --- a/imports/message-read-receipt/client/room.js +++ b/imports/message-read-receipt/client/room.js @@ -1,4 +1,5 @@ import { t } from 'meteor/rocketchat:utils'; +import { modal } from 'meteor/rocketchat:ui-utils'; RocketChat.MessageAction.addButton({ id: 'receipt-detail', diff --git a/imports/personal-access-tokens/client/personalAccessTokens.js b/imports/personal-access-tokens/client/personalAccessTokens.js index 1a5841d555bd..d06c67b4b35e 100644 --- a/imports/personal-access-tokens/client/personalAccessTokens.js +++ b/imports/personal-access-tokens/client/personalAccessTokens.js @@ -4,6 +4,7 @@ import { ReactiveVar } from 'meteor/reactive-var'; import { Tracker } from 'meteor/tracker'; import { Template } from 'meteor/templating'; import { t } from 'meteor/rocketchat:utils'; +import { modal, SideNav } from 'meteor/rocketchat:ui-utils'; import toastr from 'toastr'; import moment from 'moment'; diff --git a/packages/rocketchat-channel-settings/client/startup/trackSettingsChange.js b/packages/rocketchat-channel-settings/client/startup/trackSettingsChange.js index 5827d5c16f42..b87a0ecee8ce 100644 --- a/packages/rocketchat-channel-settings/client/startup/trackSettingsChange.js +++ b/packages/rocketchat-channel-settings/client/startup/trackSettingsChange.js @@ -3,7 +3,8 @@ import { Tracker } from 'meteor/tracker'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Session } from 'meteor/session'; import { RocketChat } from 'meteor/rocketchat:lib'; -import { ChatRoom, RoomManager } from 'meteor/rocketchat:ui'; +import { RoomManager } from 'meteor/rocketchat:ui-utils'; +import { ChatRoom, ChatSubscription } from 'meteor/rocketchat:models'; Meteor.startup(function() { const roomSettingsChangedCallback = (msg) => { diff --git a/packages/rocketchat-channel-settings/package.js b/packages/rocketchat-channel-settings/package.js index 786b5a6839e9..a64ec9158090 100644 --- a/packages/rocketchat-channel-settings/package.js +++ b/packages/rocketchat-channel-settings/package.js @@ -14,7 +14,9 @@ Package.onUse(function(api) { 'rocketchat:lib', 'rocketchat:authorization', 'rocketchat:ui', + 'rocketchat:ui-utils', 'rocketchat:utils', + 'rocketchat:models', ]); api.addFiles('client/stylesheets/channel-settings.css', 'client'); api.mainModule('client/index.js', 'client'); diff --git a/packages/rocketchat-e2e/client/rocketchat.e2e.js b/packages/rocketchat-e2e/client/rocketchat.e2e.js index 9889766c87fa..0b3c8654f445 100644 --- a/packages/rocketchat-e2e/client/rocketchat.e2e.js +++ b/packages/rocketchat-e2e/client/rocketchat.e2e.js @@ -8,7 +8,7 @@ import { Rooms, Subscriptions, Messages } from 'meteor/rocketchat:models'; import { promises } from 'meteor/rocketchat:promises'; import { settings } from 'meteor/rocketchat:settings'; import { Notifications } from 'meteor/rocketchat:notifications'; -import { Layout, call } from 'meteor/rocketchat:ui-utils'; +import { Layout, call, modal, alerts } from 'meteor/rocketchat:ui-utils'; import { TAPi18n } from 'meteor/tap:i18n'; import { E2ERoom } from './rocketchat.e2e.room'; import { diff --git a/packages/rocketchat-lib/client/UserDeleted.js b/packages/rocketchat-lib/client/UserDeleted.js index 5468241d847f..28eab20ce97f 100644 --- a/packages/rocketchat-lib/client/UserDeleted.js +++ b/packages/rocketchat-lib/client/UserDeleted.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { ChatMessage } from 'meteor/rocketchat:models'; Meteor.startup(function() { RocketChat.Notifications.onLogged('Users:Deleted', ({ userId }) => diff --git a/packages/rocketchat-lib/client/lib/openRoom.js b/packages/rocketchat-lib/client/lib/openRoom.js index 7c3b219316ee..9be03e45dfcc 100644 --- a/packages/rocketchat-lib/client/lib/openRoom.js +++ b/packages/rocketchat-lib/client/lib/openRoom.js @@ -3,7 +3,8 @@ import { Tracker } from 'meteor/tracker'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { BlazeLayout } from 'meteor/kadira:blaze-layout'; import { Session } from 'meteor/session'; -import { RoomManager } from 'meteor/rocketchat:ui-utils'; +import { RoomManager, fireGlobalEvent, readMessage, RoomHistoryManager } from 'meteor/rocketchat:ui-utils'; +import { ChatSubscription } from 'meteor/rocketchat:models'; import _ from 'underscore'; export let currentTracker = undefined; diff --git a/packages/rocketchat-lib/client/lib/settings.js b/packages/rocketchat-lib/client/lib/settings.js index 99b7e2a65ab9..ea7fceeb923c 100644 --- a/packages/rocketchat-lib/client/lib/settings.js +++ b/packages/rocketchat-lib/client/lib/settings.js @@ -1,6 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; import { t } from 'meteor/rocketchat:utils'; +import { modal } from 'meteor/rocketchat:ui-utils'; Meteor.startup(function() { if (Meteor.isCordova === true) { diff --git a/packages/rocketchat-lib/client/lib/userRoles.js b/packages/rocketchat-lib/client/lib/userRoles.js index e9af46a219d2..ac95cb914a3b 100644 --- a/packages/rocketchat-lib/client/lib/userRoles.js +++ b/packages/rocketchat-lib/client/lib/userRoles.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; +import { UserRoles, RoomRoles, ChatMessage } from 'meteor/rocketchat:models'; Meteor.startup(function() { Tracker.autorun(function() { diff --git a/packages/rocketchat-lib/client/methods/sendMessage.js b/packages/rocketchat-lib/client/methods/sendMessage.js index de8a3814411a..bf34d84c72b8 100644 --- a/packages/rocketchat-lib/client/methods/sendMessage.js +++ b/packages/rocketchat-lib/client/methods/sendMessage.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { TimeSync } from 'meteor/mizzao:timesync'; +import { ChatMessage } from 'meteor/rocketchat:models'; import s from 'underscore.string'; Meteor.methods({ diff --git a/packages/rocketchat-lib/lib/roomTypes/direct.js b/packages/rocketchat-lib/lib/roomTypes/direct.js index be171722811c..a259f09db136 100644 --- a/packages/rocketchat-lib/lib/roomTypes/direct.js +++ b/packages/rocketchat-lib/lib/roomTypes/direct.js @@ -1,6 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Session } from 'meteor/session'; import { RoomTypeConfig, RoomTypeRouteConfig, RoomSettingsEnum, UiTextContext } from '../RoomTypeConfig'; +import { ChatRoom } from 'meteor/rocketchat:models'; export class DirectMessageRoomRoute extends RoomTypeRouteConfig { constructor() { diff --git a/packages/rocketchat-lib/lib/roomTypes/private.js b/packages/rocketchat-lib/lib/roomTypes/private.js index c41443215004..9a2eabc7c4ea 100644 --- a/packages/rocketchat-lib/lib/roomTypes/private.js +++ b/packages/rocketchat-lib/lib/roomTypes/private.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { RoomSettingsEnum, RoomTypeConfig, RoomTypeRouteConfig, UiTextContext } from '../RoomTypeConfig'; +import { ChatRoom } from 'meteor/rocketchat:models'; export class PrivateRoomRoute extends RoomTypeRouteConfig { constructor() { diff --git a/packages/rocketchat-lib/lib/roomTypes/public.js b/packages/rocketchat-lib/lib/roomTypes/public.js index 493496dfd7ee..6ccc7cd1176a 100644 --- a/packages/rocketchat-lib/lib/roomTypes/public.js +++ b/packages/rocketchat-lib/lib/roomTypes/public.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { RoomTypeConfig, RoomTypeRouteConfig, RoomSettingsEnum, UiTextContext } from '../RoomTypeConfig'; +import { ChatRoom } from 'meteor/rocketchat:models'; export class PublicRoomRoute extends RoomTypeRouteConfig { constructor() { diff --git a/packages/rocketchat-lib/package.js b/packages/rocketchat-lib/package.js index 9784e41bedd6..b7ebecbd8118 100644 --- a/packages/rocketchat-lib/package.js +++ b/packages/rocketchat-lib/package.js @@ -36,6 +36,7 @@ Package.onUse(function(api) { api.use('rocketchat:emoji'); api.use('rocketchat:ui'); api.use('rocketchat:accounts'); + api.use('rocketchat:ui'); api.use('modules'); api.use('rocketchat:i18n'); api.use('rocketchat:streamer'); diff --git a/packages/rocketchat-livechat/.app/.eslintrc b/packages/rocketchat-livechat/.app/.eslintrc index 8a444e628832..15ba40bd3974 100644 --- a/packages/rocketchat-livechat/.app/.eslintrc +++ b/packages/rocketchat-livechat/.app/.eslintrc @@ -3,7 +3,14 @@ "parser": "babel-eslint", "globals": { "AgentUsers" : false, + "CachedChatSubscription" : false, + "ChatMessage" : false, + "ChatMessages" : false, + "chatMessages" : false, + "ChatRoom" : false, + "ChatSubscription" : false, "Department" : false, + "getAvatarUrlFromUsername" : false, "getNextAgent" : false, "LivechatCustomField" : false, "LivechatDepartment" : false, @@ -13,6 +20,8 @@ "LivechatPageVisited" : false, "LivechatTrigger" : false, "parentCall" : false, + "RoomHistoryManager" : false, + "RoomManager" : false, "t" : false, "Trigger" : false, "Triggers" : false, diff --git a/packages/rocketchat-logger/client/views/viewLogs.js b/packages/rocketchat-logger/client/views/viewLogs.js index b53b5446bbc6..12591538e13e 100644 --- a/packages/rocketchat-logger/client/views/viewLogs.js +++ b/packages/rocketchat-logger/client/views/viewLogs.js @@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; import { ansispan } from '../ansispan'; import { stdout } from '../viewLogs'; +import { readMessage } from 'meteor/rocketchat:ui-utils'; import _ from 'underscore'; import moment from 'moment'; diff --git a/packages/rocketchat-logger/package.js b/packages/rocketchat-logger/package.js index e279d1428e83..8d61f1615de2 100644 --- a/packages/rocketchat-logger/package.js +++ b/packages/rocketchat-logger/package.js @@ -14,6 +14,7 @@ Package.onUse(function(api) { 'raix:eventemitter', 'templating', 'rocketchat:utils', + 'rocketchat:ui-utils', 'kadira:flow-router', 'kadira:blaze-layout', ]); diff --git a/packages/rocketchat-message-pin/package.js b/packages/rocketchat-message-pin/package.js index 4d3f4f9bf67e..9f04d6f2d87b 100644 --- a/packages/rocketchat-message-pin/package.js +++ b/packages/rocketchat-message-pin/package.js @@ -9,6 +9,7 @@ Package.onUse(function(api) { 'mongo', 'ecmascript', 'rocketchat:lib', + 'rocketchat:utils', 'templating', ]); api.addFiles('client/views/stylesheets/messagepin.css', 'client'); diff --git a/packages/rocketchat-message-pin/server/pinMessage.js b/packages/rocketchat-message-pin/server/pinMessage.js index f5d64328c039..2458ed2b5377 100644 --- a/packages/rocketchat-message-pin/server/pinMessage.js +++ b/packages/rocketchat-message-pin/server/pinMessage.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { RocketChat } from 'meteor/rocketchat:lib'; -import { getAvatarUrlFromUsername } from 'meteor/rocketchat:ui'; +import { getAvatarUrlFromUsername } from 'meteor/rocketchat:utils'; const recursiveRemove = (msg, deep = 1) => { if (!msg) { diff --git a/packages/rocketchat-oembed/package.js b/packages/rocketchat-oembed/package.js index 20439ad2e5e3..9d8196c7610d 100644 --- a/packages/rocketchat-oembed/package.js +++ b/packages/rocketchat-oembed/package.js @@ -12,6 +12,7 @@ Package.onUse(function(api) { 'ecmascript', 'konecty:change-case', 'rocketchat:lib', + 'rocketchat:utils', ]); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); diff --git a/packages/rocketchat-oembed/server/jumpToMessage.js b/packages/rocketchat-oembed/server/jumpToMessage.js index 6d35bdda8480..ca84b1026a0d 100644 --- a/packages/rocketchat-oembed/server/jumpToMessage.js +++ b/packages/rocketchat-oembed/server/jumpToMessage.js @@ -1,6 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { RocketChat } from 'meteor/rocketchat:lib'; -import { getAvatarUrlFromUsername } from 'meteor/rocketchat:ui'; +import { getAvatarUrlFromUsername } from 'meteor/rocketchat:utils'; import _ from 'underscore'; import URL from 'url'; import QueryString from 'querystring'; diff --git a/packages/rocketchat-slackbridge/package.js b/packages/rocketchat-slackbridge/package.js index 3faed900b643..027bd3ff65b0 100644 --- a/packages/rocketchat-slackbridge/package.js +++ b/packages/rocketchat-slackbridge/package.js @@ -10,6 +10,7 @@ Package.onUse(function(api) { api.use([ 'ecmascript', 'rocketchat:lib', + 'rocketchat:utils', 'rocketchat:logger', 'rocketchat:file-upload', ]); diff --git a/packages/rocketchat-slackbridge/server/SlackAdapter.js b/packages/rocketchat-slackbridge/server/SlackAdapter.js index fad1fcfb6cae..7889b8277926 100644 --- a/packages/rocketchat-slackbridge/server/SlackAdapter.js +++ b/packages/rocketchat-slackbridge/server/SlackAdapter.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { HTTP } from 'meteor/http'; import { RocketChat } from 'meteor/rocketchat:lib'; -import { getAvatarUrlFromUsername } from 'meteor/rocketchat:ui'; +import { getAvatarUrlFromUsername } from 'meteor/rocketchat:utils'; import { FileUpload } from 'meteor/rocketchat:file-upload'; import { logger } from './logger'; import _ from 'underscore'; diff --git a/packages/rocketchat-ui-account/client/avatar/avatar.js b/packages/rocketchat-ui-account/client/avatar/avatar.js index 82bab9c9089b..b0c0e1d9414e 100644 --- a/packages/rocketchat-ui-account/client/avatar/avatar.js +++ b/packages/rocketchat-ui-account/client/avatar/avatar.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; -import { getAvatarUrlFromUsername } from 'meteor/rocketchat:ui'; +import { getAvatarUrlFromUsername } from 'meteor/rocketchat:utils'; Template.avatar.helpers({ src() { diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js index e29d2be94463..a1912e680d09 100644 --- a/packages/rocketchat-ui-message/client/messageBox.js +++ b/packages/rocketchat-ui-message/client/messageBox.js @@ -6,7 +6,7 @@ import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; import { RocketChat } from 'meteor/rocketchat:lib'; import { fileUploadHandler } from 'meteor/rocketchat:file-upload'; -import { ChatSubscription, RoomHistoryManager, RoomManager, KonchatNotification, popover, ChatMessages, fileUpload, AudioRecorder, chatMessages } from 'meteor/rocketchat:ui'; +import { ChatSubscription, RoomHistoryManager, RoomManager, KonchatNotification, popover, ChatMessages, fileUpload, AudioRecorder, chatMessages, MsgTyping } from 'meteor/rocketchat:ui'; import { t } from 'meteor/rocketchat:utils'; import toastr from 'toastr'; import moment from 'moment'; diff --git a/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js b/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js index 364d75a737e4..7b3184eb0a01 100644 --- a/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js +++ b/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js @@ -6,6 +6,7 @@ import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; import { RocketChat } from 'meteor/rocketchat:lib'; +import { RoomManager } from 'meteor/rocketchat:ui-utils'; import { t } from 'meteor/rocketchat:utils'; import _ from 'underscore'; diff --git a/packages/rocketchat-ui-message/package.js b/packages/rocketchat-ui-message/package.js index b3cf53ee3e9c..bc563d9e2f19 100644 --- a/packages/rocketchat-ui-message/package.js +++ b/packages/rocketchat-ui-message/package.js @@ -21,6 +21,7 @@ Package.onUse(function(api) { 'rocketchat:ui-utils', 'rocketchat:emoji', 'rocketchat:lib', + 'rocketchat:ui', 'rocketchat:ui-account', 'rocketchat:ui-vrecord', 'rocketchat:ui-sidenav', diff --git a/packages/rocketchat-ui-utils/client/lib/openedRoom.js b/packages/rocketchat-ui-utils/client/lib/openedRoom.js new file mode 100644 index 000000000000..469e8f59523f --- /dev/null +++ b/packages/rocketchat-ui-utils/client/lib/openedRoom.js @@ -0,0 +1 @@ +export let openedRoom; //eslint-disable-line diff --git a/packages/rocketchat-ui/client/index.js b/packages/rocketchat-ui/client/index.js index 0ad4e65c1a3a..2bdce0a60025 100644 --- a/packages/rocketchat-ui/client/index.js +++ b/packages/rocketchat-ui/client/index.js @@ -1 +1,96 @@ -export { Button, Login, animationSupport, animeBack, preLoadImgs } from './lib/rocket'; +export { AccountBox } from './lib/accountBox'; +import './lib/accounts'; +export { getAvatarAsPng, updateAvatarOfUsername } from './lib/avatar'; +export { ChatMessages } from './lib/chatMessages'; +export { RoomManager } from './lib/RoomManager'; +export { RoomHistoryManager } from './lib/RoomHistoryManager'; +export { + ChatMessage, + CachedChatRoom, + ChatRoom, + CachedChatSubscription, + ChatSubscription, + UserRoles, + RoomRoles, + UserAndRoom, + CachedChannelList, + CachedUserList, +} from './lib/collections'; +import './lib/customEventPolyfill'; +export { fileUpload } from './lib/fileUpload'; +export { fireGlobalEvent } from './lib/fireEvent'; +import './lib/iframeCommands'; +export { menu } from './lib/menu'; +import './lib/Modernizr'; +export { MsgTyping } from './lib/msgTyping'; +export { KonchatNotification } from './lib/notification'; +import './lib/parentTemplate'; +export { readMessage } from './lib/readMessages'; +export { Login, animationSupport, animeBack, Button, preLoadImgs } from './lib/rocket'; +export { SideNav } from './lib/sideNav'; +import './lib/textarea-autogrow'; +import './lib/codeMirror/codeMirror'; +import './lib/cordova/facebook-login'; +import './lib/cordova/keyboard-fix'; +import './lib/cordova/push'; +import './lib/cordova/urls'; +import './lib/cordova/user-state'; +export { AudioRecorder } from './lib/recorderjs/audioRecorder'; +export { VideoRecorder } from './lib/recorderjs/videoRecorder'; +import './lib/recorderjs/recorder'; +import './lib/textarea-cursor/set-cursor-position'; +import './views/cmsPage.html'; +import './views/fxos.html'; +import './views/modal.html'; +import './views/404/roomNotFound.html'; +import './views/404/invalidSecretURL.html'; +import './views/app/audioNotification.html'; +import './views/app/burger.html'; +import './views/app/createChannel.html'; +import './views/app/fullModal.html'; +import './views/app/home.html'; +import './views/app/directory.html'; +import './views/app/notAuthorized.html'; +import './views/app/pageContainer.html'; +import './views/app/pageSettingsContainer.html'; +import './views/app/room.html'; +import './views/app/roomSearch.html'; +import './views/app/secretURL.html'; +import './views/app/userSearch.html'; +import './views/app/videoCall/videoButtons.html'; +import './views/app/videoCall/videoCall.html'; +import './views/app/photoswipe.html'; +import './views/cmsPage'; +import './views/fxos'; +import './views/modal'; +import './views/404/roomNotFound'; +import './views/app/burger'; +import './views/app/createChannel'; +import './views/app/fullModal'; +import './views/app/home'; +import './views/app/directory'; +export { chatMessages } from './views/app/room'; +import './views/app/roomSearch'; +import './views/app/secretURL'; +import './views/app/videoCall/videoButtons'; +import './views/app/videoCall/videoCall'; +export { alerts } from './views/app/alerts'; +export { popover } from './views/app/popover'; +export { popout } from './views/app/popout'; +export { modal } from './views/app/modal'; +import './views/app/photoswipe'; +import './components/icon.html'; +import './components/icon'; +import './components/table.html'; +import './components/table'; +import './components/tabs.html'; +import './components/tabs'; +import './components/popupList.html'; +import './components/popupList'; +import './components/selectDropdown.html'; +import './components/selectDropdown'; +import './components/header/header.html'; +import './components/header/header'; +import './components/contextualBar.html'; +import './components/contextualBar'; +export { getAvatarUrFromUsername } from 'meteor/rocketchat:utils'; diff --git a/packages/rocketchat-ui/client/lib/RoomHistoryManager.js b/packages/rocketchat-ui/client/lib/RoomHistoryManager.js index 767167f86ad7..7348be7186ea 100644 --- a/packages/rocketchat-ui/client/lib/RoomHistoryManager.js +++ b/packages/rocketchat-ui/client/lib/RoomHistoryManager.js @@ -1,7 +1 @@ -import { upsertMessage, RoomHistoryManager as _RoomHistoryManager } from 'meteor/rocketchat:ui-utils'; - -export { - upsertMessage, -}; - -RoomHistoryManager = _RoomHistoryManager; +export { upsertMessage, RoomHistoryManager } from 'meteor/rocketchat:ui-utils'; diff --git a/packages/rocketchat-ui/client/lib/RoomManager.js b/packages/rocketchat-ui/client/lib/RoomManager.js index 7b0f8dbd584d..8152955d13e1 100644 --- a/packages/rocketchat-ui/client/lib/RoomManager.js +++ b/packages/rocketchat-ui/client/lib/RoomManager.js @@ -1,3 +1 @@ -import { RoomManager as _RoomManager } from 'meteor/rocketchat:ui-utils'; - -RoomManager = _RoomManager; +export { RoomManager } from 'meteor/rocketchat:ui-utils'; diff --git a/packages/rocketchat-ui/client/lib/accountBox.js b/packages/rocketchat-ui/client/lib/accountBox.js index aa511de3b8d5..d8f9c9bf1adb 100644 --- a/packages/rocketchat-ui/client/lib/accountBox.js +++ b/packages/rocketchat-ui/client/lib/accountBox.js @@ -1,3 +1 @@ -import { AccountBox as accountBox } from 'meteor/rocketchat:ui-utils'; - -AccountBox = accountBox; +export { AccountBox } from 'meteor/rocketchat:ui-utils'; diff --git a/packages/rocketchat-ui/client/lib/avatar.js b/packages/rocketchat-ui/client/lib/avatar.js index ce85dbff5d15..2f4274f503c1 100644 --- a/packages/rocketchat-ui/client/lib/avatar.js +++ b/packages/rocketchat-ui/client/lib/avatar.js @@ -1,7 +1 @@ -import { getAvatarAsPng, updateAvatarOfUsername as _updateAvatarOfUsername } from 'meteor/rocketchat:ui-utils'; - -export { - getAvatarAsPng, -}; - -updateAvatarOfUsername = _updateAvatarOfUsername; +export { getAvatarAsPng, updateAvatarOfUsername } from 'meteor/rocketchat:ui-utils'; diff --git a/packages/rocketchat-ui/client/lib/chatMessages.js b/packages/rocketchat-ui/client/lib/chatMessages.js index 94d53e427410..5018387dbcee 100644 --- a/packages/rocketchat-ui/client/lib/chatMessages.js +++ b/packages/rocketchat-ui/client/lib/chatMessages.js @@ -13,6 +13,8 @@ import { promises } from 'meteor/rocketchat:promises'; import { hasAtLeastOnePermission } from 'meteor/rocketchat:authorization'; import { Messages, Rooms, ChatMessage } from 'meteor/rocketchat:models'; import { emoji } from 'meteor/rocketchat:emoji'; +import { KonchatNotification } from './notification'; +import { MsgTyping } from './msgTyping'; import _ from 'underscore'; import s from 'underscore.string'; import moment from 'moment'; @@ -27,7 +29,7 @@ Meteor.startup(() => { }); }); -ChatMessages = class ChatMessages { +export const ChatMessages = class ChatMessages { constructor() { this.saveTextMessageBox = _.debounce((rid, value) => { diff --git a/packages/rocketchat-ui/client/lib/collections.js b/packages/rocketchat-ui/client/lib/collections.js index d6313d1ae677..c02cffd5539d 100644 --- a/packages/rocketchat-ui/client/lib/collections.js +++ b/packages/rocketchat-ui/client/lib/collections.js @@ -2,29 +2,30 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; import { settings } from 'meteor/rocketchat:settings'; import { - ChatMessage as chatMessage, - CachedChatRoom as cachedChatRoom, - ChatRoom as chatRoom, - CachedChatSubscription as cachedChatSubscription, - ChatSubscription as chatSubscription, - UserRoles as userRoles, - RoomRoles as roomRoles, - UserAndRoom as userAndRoom, - CachedChannelList as cachedChannelList, - CachedUserList as cachedUserList, + ChatMessage, + CachedChatRoom, + ChatRoom, + CachedChatSubscription, + ChatSubscription, + UserRoles, + RoomRoles, + UserAndRoom, + CachedChannelList, + CachedUserList, } from 'meteor/rocketchat:models'; -ChatMessage = chatMessage; -export const CachedChatRoom = cachedChatRoom; -ChatRoom = chatRoom; - -CachedChatSubscription = cachedChatSubscription; -ChatSubscription = chatSubscription; -UserRoles = userRoles; -RoomRoles = roomRoles; -this.UserAndRoom = userAndRoom; -this.CachedChannelList = cachedChannelList; -this.CachedUserList = cachedUserList; +export { + ChatMessage, + CachedChatRoom, + ChatRoom, + CachedChatSubscription, + ChatSubscription, + UserRoles, + RoomRoles, + UserAndRoom, + CachedChannelList, + CachedUserList, +}; Meteor.startup(() => { Tracker.autorun(() => { diff --git a/packages/rocketchat-ui/client/lib/fileUpload.js b/packages/rocketchat-ui/client/lib/fileUpload.js index 13cd13724239..57c79aef8fb0 100644 --- a/packages/rocketchat-ui/client/lib/fileUpload.js +++ b/packages/rocketchat-ui/client/lib/fileUpload.js @@ -136,7 +136,7 @@ const getUploadPreview = async(file, preview) => { return getGenericUploadPreview(file, preview); }; -fileUpload = async(files) => { +export const fileUpload = async(files) => { files = [].concat(files); const roomId = Session.get('openedRoom'); diff --git a/packages/rocketchat-ui/client/lib/fireEvent.js b/packages/rocketchat-ui/client/lib/fireEvent.js index b68fac27a93f..871da01c317a 100644 --- a/packages/rocketchat-ui/client/lib/fireEvent.js +++ b/packages/rocketchat-ui/client/lib/fireEvent.js @@ -1,3 +1 @@ -import { fireGlobalEvent as _fireGlobalEvent } from 'meteor/rocketchat:ui-utils'; - -fireGlobalEvent = _fireGlobalEvent; +export { fireGlobalEvent } from 'meteor/rocketchat:ui-utils'; diff --git a/packages/rocketchat-ui/client/lib/menu.js b/packages/rocketchat-ui/client/lib/menu.js index 8217a5c80f81..60a6af4c1e1e 100644 --- a/packages/rocketchat-ui/client/lib/menu.js +++ b/packages/rocketchat-ui/client/lib/menu.js @@ -1,5 +1,5 @@ import _ from 'underscore'; -import { menu as _menu } from 'meteor/rocketchat:ui-utils'; +import { menu } from 'meteor/rocketchat:ui-utils'; import EventEmitter from 'wolfy87-eventemitter'; const emitter = new EventEmitter(); @@ -16,8 +16,10 @@ window.addEventListener('resize', _.debounce((() => { }; })(), 100)); -this.menu = _menu; +export { + menu, +}; emitter.on('grid', () => { - _menu.close(); + menu.close(); }); diff --git a/packages/rocketchat-ui/client/lib/msgTyping.js b/packages/rocketchat-ui/client/lib/msgTyping.js index a79e0b8a7d8f..80fa63747a8f 100644 --- a/packages/rocketchat-ui/client/lib/msgTyping.js +++ b/packages/rocketchat-ui/client/lib/msgTyping.js @@ -86,5 +86,3 @@ export const MsgTyping = (function() { return { start, stop, get, selfTyping }; }()); - -this.MsgTyping = MsgTyping; diff --git a/packages/rocketchat-ui/client/lib/notification.js b/packages/rocketchat-ui/client/lib/notification.js index 6a2428fdc6eb..4e9b7f576761 100644 --- a/packages/rocketchat-ui/client/lib/notification.js +++ b/packages/rocketchat-ui/client/lib/notification.js @@ -14,7 +14,7 @@ import { getAvatarUrlFromUsername } from 'meteor/rocketchat:ui-utils'; import { promises } from 'meteor/rocketchat:promises'; import { getAvatarAsPng } from './avatar'; -KonchatNotification = { +export const KonchatNotification = { notificationStatus: new ReactiveVar, // notificacoes HTML5 diff --git a/packages/rocketchat-ui/client/lib/readMessages.js b/packages/rocketchat-ui/client/lib/readMessages.js index 7479b935cd3e..f56c55cacaab 100644 --- a/packages/rocketchat-ui/client/lib/readMessages.js +++ b/packages/rocketchat-ui/client/lib/readMessages.js @@ -1,15 +1 @@ -import { readMessage as _readMessage } from 'meteor/rocketchat:ui-utils'; -/* DEFINITIONS -- If window loses focus user needs to scroll or click/touch some place -- On hit ESC enable read, force read of current room and remove unread mark -- When user change room disable read until user interaction -- Only read if mark of *first-unread* is visible for user or if flag *force* was passed -- Always read the opened room -- The default method *read* has a delay of 2000ms to prevent multiple reads and to user be able to see the mark -*/ - -// Meteor.startup -> -// window.addEventListener 'focus', -> -// readMessage.refreshUnreadMark(undefined, true) - -readMessage = _readMessage; +export { readMessage } from 'meteor/rocketchat:ui-utils'; diff --git a/packages/rocketchat-ui/client/lib/recorderjs/videoRecorder.js b/packages/rocketchat-ui/client/lib/recorderjs/videoRecorder.js index 9005b905cbb9..0726d8458f97 100644 --- a/packages/rocketchat-ui/client/lib/recorderjs/videoRecorder.js +++ b/packages/rocketchat-ui/client/lib/recorderjs/videoRecorder.js @@ -1,6 +1,6 @@ import { ReactiveVar } from 'meteor/reactive-var'; -VideoRecorder = new (class VideoRecorder { +export const VideoRecorder = new (class VideoRecorder { constructor() { this.started = false; this.cameraStarted = new ReactiveVar(false); diff --git a/packages/rocketchat-ui/client/lib/sideNav.js b/packages/rocketchat-ui/client/lib/sideNav.js index 62de09f000a9..09dcc1eba484 100644 --- a/packages/rocketchat-ui/client/lib/sideNav.js +++ b/packages/rocketchat-ui/client/lib/sideNav.js @@ -1,3 +1 @@ -import { SideNav as _SideNav } from 'meteor/rocketchat:ui-utils'; - -SideNav = _SideNav; +export { SideNav } from 'meteor/rocketchat:ui-utils'; diff --git a/packages/rocketchat-ui/client/views/app/alerts.js b/packages/rocketchat-ui/client/views/app/alerts.js index d4d43c5f8c87..e99ee5fec017 100644 --- a/packages/rocketchat-ui/client/views/app/alerts.js +++ b/packages/rocketchat-ui/client/views/app/alerts.js @@ -1,3 +1 @@ -import { alerts as _alerts } from 'meteor/rocketchat:ui-utils'; - -alerts = _alerts; +export { alerts } from 'meteor/rocketchat:ui-utils'; diff --git a/packages/rocketchat-ui/client/views/app/modal.js b/packages/rocketchat-ui/client/views/app/modal.js index 4a055bda4731..544966355fe8 100644 --- a/packages/rocketchat-ui/client/views/app/modal.js +++ b/packages/rocketchat-ui/client/views/app/modal.js @@ -1,3 +1 @@ -import { modal as _modal } from 'meteor/rocketchat:ui-utils'; - -modal = _modal; +export { modal } from 'meteor/rocketchat:ui-utils'; diff --git a/packages/rocketchat-ui/client/views/app/popout.js b/packages/rocketchat-ui/client/views/app/popout.js index fadd5bbbe959..ac2d40fac50d 100644 --- a/packages/rocketchat-ui/client/views/app/popout.js +++ b/packages/rocketchat-ui/client/views/app/popout.js @@ -1,3 +1 @@ -import { popout as _popout } from 'meteor/rocketchat:ui-utils'; - -popout = _popout; +export { popout } from 'meteor/rocketchat:ui-utils'; diff --git a/packages/rocketchat-ui/client/views/app/popover.js b/packages/rocketchat-ui/client/views/app/popover.js index fb60060cc107..911c8da13e1b 100644 --- a/packages/rocketchat-ui/client/views/app/popover.js +++ b/packages/rocketchat-ui/client/views/app/popover.js @@ -1,3 +1 @@ -import { popover as _popover } from 'meteor/rocketchat:ui-utils'; - -popover = _popover; +export { popover } from 'meteor/rocketchat:ui-utils'; diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js index f77116f93093..5eb0197e151d 100644 --- a/packages/rocketchat-ui/client/views/app/room.js +++ b/packages/rocketchat-ui/client/views/app/room.js @@ -32,7 +32,7 @@ import { lazyloadtick } from 'meteor/rocketchat:lazy-load'; import { ChatMessages } from '../../lib/chatMessages'; import { fileUpload } from '../../lib/fileUpload'; -chatMessages = {}; +export const chatMessages = {}; const isSubscribed = (_id) => ChatSubscription.find({ rid: _id }).count() > 0; const favoritesEnabled = () => settings.get('Favorite_Rooms'); diff --git a/packages/rocketchat-ui/client/views/app/secretURL.js b/packages/rocketchat-ui/client/views/app/secretURL.js index cc85227ba271..de43c1d0da9a 100644 --- a/packages/rocketchat-ui/client/views/app/secretURL.js +++ b/packages/rocketchat-ui/client/views/app/secretURL.js @@ -4,6 +4,7 @@ import { FlowRouter } from 'meteor/kadira:flow-router'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; import { settings } from 'meteor/rocketchat:settings'; +import { KonchatNotification } from '../../lib/notification'; Template.secretURL.helpers({ registrationAllowed() { diff --git a/packages/rocketchat-ui/getAvatarUrlFromUsername.js b/packages/rocketchat-ui/getAvatarUrlFromUsername.js deleted file mode 100644 index 0ff10ee8518b..000000000000 --- a/packages/rocketchat-ui/getAvatarUrlFromUsername.js +++ /dev/null @@ -1,3 +0,0 @@ -import { getAvatarUrlFromUsername as _getAvatarUrlFromUsername } from 'meteor/rocketchat:utils'; - -getAvatarUrlFromUsername = _getAvatarUrlFromUsername; diff --git a/packages/rocketchat-ui/package.js b/packages/rocketchat-ui/package.js index 74339d3006bb..7f3ad27a60e2 100644 --- a/packages/rocketchat-ui/package.js +++ b/packages/rocketchat-ui/package.js @@ -20,10 +20,13 @@ Package.onUse(function(api) { 'reactive-var', 'ecmascript', 'templating', + 'kadira:flow-router', + 'kadira:blaze-layout', 'rocketchat:ui-master', 'rocketchat:push', 'rocketchat:utils', 'rocketchat:emoji', + 'rocketchat:notifications', 'rocketchat:ui-utils', 'rocketchat:models', 'raix:ui-dropped-event', @@ -34,141 +37,6 @@ Package.onUse(function(api) { 'konecty:user-presence', 'rocketchat:webrtc', ]); - - api.use('kadira:flow-router', 'client'); - api.use('kadira:blaze-layout', 'client'); - - api.addFiles('getAvatarUrlFromUsername.js'); - - // LIB FILES - api.addFiles('client/lib/accountBox.js', 'client'); - api.addFiles('client/lib/accounts.js', 'client'); - api.addFiles('client/lib/avatar.js', 'client'); - api.addFiles('client/lib/chatMessages.js', 'client'); - api.addFiles('client/lib/collections.js', 'client'); - api.addFiles('client/lib/customEventPolyfill.js', 'client'); - api.addFiles('client/lib/fileUpload.js', 'client'); - api.addFiles('client/lib/fireEvent.js', 'client'); - api.addFiles('client/lib/iframeCommands.js', 'client'); - api.addFiles('client/lib/menu.js', 'client'); - api.addFiles('client/lib/Modernizr.js', 'client'); - api.addFiles('client/lib/msgTyping.js', 'client'); - api.addFiles('client/lib/notification.js', 'client'); - api.addFiles('client/lib/parentTemplate.js', 'client'); - api.addFiles('client/lib/readMessages.js', 'client'); - api.addFiles('client/lib/rocket.js', 'client'); - api.addFiles('client/lib/RoomHistoryManager.js', 'client'); - api.addFiles('client/lib/RoomManager.js', 'client'); - api.addFiles('client/lib/sideNav.js', 'client'); - api.addFiles('client/lib/textarea-autogrow.js', 'client'); - - api.addFiles('client/lib/codeMirror/codeMirror.js', 'client'); - - // LIB CORDOVA - api.addFiles('client/lib/cordova/facebook-login.js', 'client'); - api.addFiles('client/lib/cordova/keyboard-fix.js', 'client'); - api.addFiles('client/lib/cordova/push.js', 'client'); - api.addFiles('client/lib/cordova/urls.js', 'client'); - api.addFiles('client/lib/cordova/user-state.js', 'client'); - - // LIB RECORDERJS - api.addFiles('client/lib/recorderjs/audioRecorder.js', 'client'); - api.addFiles('client/lib/recorderjs/videoRecorder.js', 'client'); - api.addFiles('client/lib/recorderjs/recorder.js', 'client'); - - // TEXTAREA CURSOR MANAGEMENT - api.addFiles('client/lib/textarea-cursor/set-cursor-position.js', 'client'); - api.addFiles('client/lib/esc.js', 'client'); - - // TEMPLATE FILES - api.addFiles('client/views/cmsPage.html', 'client'); - api.addFiles('client/views/fxos.html', 'client'); - api.addFiles('client/views/modal.html', 'client'); - api.addFiles('client/views/404/roomNotFound.html', 'client'); - api.addFiles('client/views/404/invalidSecretURL.html', 'client'); - api.addFiles('client/views/app/audioNotification.html', 'client'); - api.addFiles('client/views/app/burger.html', 'client'); - api.addFiles('client/views/app/createChannel.html', 'client'); - api.addFiles('client/views/app/fullModal.html', 'client'); - api.addFiles('client/views/app/home.html', 'client'); - api.addFiles('client/views/app/directory.html', 'client'); - api.addFiles('client/views/app/notAuthorized.html', 'client'); - api.addFiles('client/views/app/pageContainer.html', 'client'); - api.addFiles('client/views/app/pageSettingsContainer.html', 'client'); - - api.addFiles('client/views/app/room.html', 'client'); - api.addFiles('client/views/app/roomSearch.html', 'client'); - api.addFiles('client/views/app/secretURL.html', 'client'); - api.addFiles('client/views/app/userSearch.html', 'client'); - api.addFiles('client/views/app/videoCall/videoButtons.html', 'client'); - api.addFiles('client/views/app/videoCall/videoCall.html', 'client'); - api.addFiles('client/views/app/photoswipe.html', 'client'); - - api.addFiles('client/views/cmsPage.js', 'client'); - api.addFiles('client/views/fxos.js', 'client'); - api.addFiles('client/views/modal.js', 'client'); - api.addFiles('client/views/404/roomNotFound.js', 'client'); - api.addFiles('client/views/app/burger.js', 'client'); - api.addFiles('client/views/app/createChannel.js', 'client'); - api.addFiles('client/views/app/fullModal.js', 'client'); - api.addFiles('client/views/app/home.js', 'client'); - api.addFiles('client/views/app/directory.js', 'client'); - api.addFiles('client/views/app/room.js', 'client'); - api.addFiles('client/views/app/roomSearch.js', 'client'); - api.addFiles('client/views/app/secretURL.js', 'client'); - api.addFiles('client/views/app/videoCall/videoButtons.js', 'client'); - api.addFiles('client/views/app/videoCall/videoCall.js', 'client'); - api.addFiles('client/views/app/alerts.js', 'client'); - api.addFiles('client/views/app/popover.js', 'client'); - api.addFiles('client/views/app/popout.js', 'client'); - api.addFiles('client/views/app/modal.js', 'client'); - api.addFiles('client/views/app/photoswipe.js', 'client'); - - api.addFiles('client/components/icon.html', 'client'); - api.addFiles('client/components/icon.js', 'client'); - - api.addFiles('client/components/table.html', 'client'); - api.addFiles('client/components/table.js', 'client'); - - api.addFiles('client/components/tabs.html', 'client'); - api.addFiles('client/components/tabs.js', 'client'); - - api.addFiles('client/components/popupList.html', 'client'); - api.addFiles('client/components/popupList.js', 'client'); - - api.addFiles('client/components/selectDropdown.html', 'client'); - api.addFiles('client/components/selectDropdown.js', 'client'); - - api.addFiles('client/components/header/header.html', 'client'); - api.addFiles('client/components/header/header.js', 'client'); - - api.addFiles('client/components/contextualBar.html', 'client'); - api.addFiles('client/components/contextualBar.js', 'client'); - api.mainModule('client/index.js', 'client'); - - api.export('fileUpload'); - api.export('modal', 'client'); - api.export('popover', 'client'); - api.export('fireGlobalEvent', 'client'); - api.export('ChatRoom', 'client'); - api.export('ChatSubscription', 'client'); - api.export('RoomRoles', 'client'); - api.export('SideNav', 'client'); - api.export('ChatMessages', 'client'); - api.export('RoomManager', 'client'); - api.export('getAvatarUrlFromUsername'); - api.export('popout', 'client'); - api.export('ChatMessage', 'client'); - api.export('RoomHistoryManager', 'client'); - api.export('KonchatNotification', 'client'); - api.export('AudioRecorder', 'client'); - api.export('VideoRecorder', 'client'); - api.export('UserRoles', 'client'); - api.export('alerts', 'client'); - api.export('AccountBox', 'client'); - api.export('chatMessages', 'client'); - api.export('CachedChatSubscription', 'client'); - api.export('readMessage', 'client'); - api.export('updateAvatarOfUsername', 'client'); + api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-ui/server/index.js b/packages/rocketchat-ui/server/index.js new file mode 100644 index 000000000000..3a06366ac021 --- /dev/null +++ b/packages/rocketchat-ui/server/index.js @@ -0,0 +1 @@ +export { getAvatarUrlFromUsername } from 'meteor/rocketchat:utils'; diff --git a/packages/rocketchat-webrtc/client/WebRTCClass.js b/packages/rocketchat-webrtc/client/WebRTCClass.js index d8ea11827fa3..0b2331e3e5c6 100644 --- a/packages/rocketchat-webrtc/client/WebRTCClass.js +++ b/packages/rocketchat-webrtc/client/WebRTCClass.js @@ -7,6 +7,8 @@ import { t } from 'meteor/rocketchat:utils'; import { ChromeScreenShare } from './screenShare'; import { Notifications } from 'meteor/rocketchat:notifications'; import { settings } from 'meteor/rocketchat:settings'; +import { modal } from 'meteor/rocketchat:ui-utils'; +import { ChatSubscription } from 'meteor/rocketchat:models'; class WebRTCTransportClass { constructor(webrtcInstance) { diff --git a/packages/rocketchat-webrtc/client/screenShare.js b/packages/rocketchat-webrtc/client/screenShare.js index 742599143db4..015e4bf2bd88 100644 --- a/packages/rocketchat-webrtc/client/screenShare.js +++ b/packages/rocketchat-webrtc/client/screenShare.js @@ -1,3 +1,5 @@ +import { fireGlobalEvent } from 'meteor/rocketchat:ui-utils'; + export const ChromeScreenShare = { callbacks: {}, installed: false, diff --git a/packages/rocketchat-webrtc/package.js b/packages/rocketchat-webrtc/package.js index 611e7ca315a3..b2bea9b75a49 100644 --- a/packages/rocketchat-webrtc/package.js +++ b/packages/rocketchat-webrtc/package.js @@ -9,8 +9,10 @@ Package.onUse(function(api) { api.use([ 'ecmascript', 'rocketchat:utils', + 'rocketchat:ui-utils', 'rocketchat:notifications', 'rocketchat:settings', + 'rocketchat:models', 'templating', ]); api.mainModule('client/index.js', 'client');