Convert rocketchat-mentions-flextab to main module structure (#12757)

* Exposing RoomHistoryManager * Convert rocketchat-mentions-flextab to main module structure
RocketChat · Dec 3, 2018 · 23f771d · 23f771d
1 parent 28a9eb2
commit 23f771d
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 19 deletions.
diff --git a/packages/rocketchat-mentions-flextab/client/actionButton.js b/packages/rocketchat-mentions-flextab/client/actionButton.js
@@ -1,5 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { RoomHistoryManager } from 'meteor/rocketchat:ui';
 
 Meteor.startup(function() {
 	RocketChat.MessageAction.addButton({

diff --git a/packages/rocketchat-mentions-flextab/client/index.js b/packages/rocketchat-mentions-flextab/client/index.js
@@ -0,0 +1,5 @@
+import './views/stylesheets/mentionsFlexTab.less';
+import './views/mentionsFlexTab.html';
+import './views/mentionsFlexTab';
+import './actionButton';
+import './tabBar';
diff --git a/packages/rocketchat-mentions-flextab/client/lib/MentionedMessage.js b/packages/rocketchat-mentions-flextab/client/lib/MentionedMessage.js
@@ -1,3 +1,3 @@
 import { Mongo } from 'meteor/mongo';
 
-this.MentionedMessage = new Mongo.Collection('rocketchat_mentioned_message');
+export const MentionedMessage = new Mongo.Collection('rocketchat_mentioned_message');
diff --git a/packages/rocketchat-mentions-flextab/client/tabBar.js b/packages/rocketchat-mentions-flextab/client/tabBar.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.startup(function() {
 	return RocketChat.TabBar.addButton({

diff --git a/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.js b/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.js
@@ -1,7 +1,7 @@
-/* globals MentionedMessage */
 import _ from 'underscore';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
+import { MentionedMessage } from '../lib/MentionedMessage';
 
 Template.mentionsFlexTab.helpers({
 	hasMessages() {

diff --git a/packages/rocketchat-mentions-flextab/package.js b/packages/rocketchat-mentions-flextab/package.js
@@ -11,20 +11,8 @@ Package.onUse(function(api) {
 		'ecmascript',
 		'less',
 		'rocketchat:lib',
+		'templating',
 	]);
-
-	api.use('templating', 'client');
-
-	api.addFiles([
-		'client/lib/MentionedMessage.js',
-		'client/views/stylesheets/mentionsFlexTab.less',
-		'client/views/mentionsFlexTab.html',
-		'client/views/mentionsFlexTab.js',
-		'client/actionButton.js',
-		'client/tabBar.js',
-	], 'client');
-
-	api.addFiles([
-		'server/publications/mentionedMessages.js',
-	], 'server');
+	api.mainModule('client/index.js', 'client');
+	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat-mentions-flextab/server/index.js b/packages/rocketchat-mentions-flextab/server/index.js
@@ -0,0 +1 @@
+import './publications/mentionedMessages';
diff --git a/packages/rocketchat-mentions-flextab/server/publications/mentionedMessages.js b/packages/rocketchat-mentions-flextab/server/publications/mentionedMessages.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.publish('mentionedMessages', function(rid, limit = 50) {
 	if (!this.userId) {

diff --git a/packages/rocketchat-ui/client/lib/RoomHistoryManager.js b/packages/rocketchat-ui/client/lib/RoomHistoryManager.js
@@ -22,7 +22,7 @@ export const upsertMessage = ({ msg, subscription }) => {
 	return ChatMessage.upsert({ _id: msg._id }, msg);
 };
 
-export const RoomHistoryManager = new class {
+RoomHistoryManager = new class { //eslint-disable-line
 	constructor() {
 		this.defaultLimit = 50;
 		this.histories = {};
@@ -273,4 +273,3 @@ export const RoomHistoryManager = new class {
 		}
 	}
 };
-this.RoomHistoryManager = RoomHistoryManager;
diff --git a/packages/rocketchat-ui/package.js b/packages/rocketchat-ui/package.js
@@ -157,4 +157,5 @@ Package.onUse(function(api) {
 	api.export('RoomManager', 'client');
 	api.export('getAvatarUrlFromUsername');
 	api.export('popout', 'client');
+	api.export('RoomHistoryManager', 'client');
 });