Convert rocketchat-message-star to main module structure (#12770)

* Convert rocketchat-message-star to main module structure * Fixed export StarredMessage
RocketChat · Dec 4, 2018 · 15abcf5 · 15abcf5
1 parent 1390d81
commit 15abcf5
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 22 deletions.
diff --git a/packages/rocketchat-message-star/client/actionButton.js b/packages/rocketchat-message-star/client/actionButton.js
@@ -1,6 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
+import { RocketChat, handleError } from 'meteor/rocketchat:lib';
+import { RoomHistoryManager } from 'meteor/rocketchat:ui';
 import toastr from 'toastr';
 
 Meteor.startup(function() {

diff --git a/packages/rocketchat-message-star/client/index.js b/packages/rocketchat-message-star/client/index.js
@@ -0,0 +1,6 @@
+import './views/stylesheets/messagestar.css';
+import './actionButton';
+import './starMessage';
+import './tabBar';
+import './views/starredMessages.html';
+import './views/starredMessages';
diff --git a/packages/rocketchat-message-star/client/lib/StarredMessage.js b/packages/rocketchat-message-star/client/lib/StarredMessage.js
@@ -1,3 +1,3 @@
 import { Mongo } from 'meteor/mongo';
 
-this.StarredMessage = new Mongo.Collection('rocketchat_starred_message');
+export const StarredMessage = new Mongo.Collection('rocketchat_starred_message');
diff --git a/packages/rocketchat-message-star/client/starMessage.js b/packages/rocketchat-message-star/client/starMessage.js
@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { ChatMessage } from 'meteor/rocketchat:ui';
 
 Meteor.methods({
 	starMessage(message) {

diff --git a/packages/rocketchat-message-star/client/tabBar.js b/packages/rocketchat-message-star/client/tabBar.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.startup(function() {
 	RocketChat.TabBar.addButton({

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

diff --git a/packages/rocketchat-message-star/package.js b/packages/rocketchat-message-star/package.js
@@ -10,25 +10,8 @@ Package.onUse(function(api) {
 		'mongo',
 		'ecmascript',
 		'rocketchat:lib',
+		'templating',
 	]);
-
-	api.use('templating', 'client');
-
-	api.addFiles([
-		'client/lib/StarredMessage.js',
-		'client/actionButton.js',
-		'client/starMessage.js',
-		'client/tabBar.js',
-		'client/views/starredMessages.html',
-		'client/views/starredMessages.js',
-		'client/views/stylesheets/messagestar.css',
-	], 'client');
-
-	api.addFiles([
-		'server/models/Rooms.js',
-		'server/settings.js',
-		'server/starMessage.js',
-		'server/publications/starredMessages.js',
-		'server/startup/indexes.js',
-	], 'server');
+	api.mainModule('client/index.js', 'client');
+	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat-message-star/server/index.js b/packages/rocketchat-message-star/server/index.js
@@ -0,0 +1,5 @@
+import './models/Rooms';
+import './settings';
+import './starMessage';
+import './publications/starredMessages';
+import './startup/indexes';
diff --git a/packages/rocketchat-message-star/server/models/Rooms.js b/packages/rocketchat-message-star/server/models/Rooms.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.models.Rooms.updateLastMessageStar = function(roomId, userId, starred) {
 	let update;
 	const query = { _id: roomId };

diff --git a/packages/rocketchat-message-star/server/publications/starredMessages.js b/packages/rocketchat-message-star/server/publications/starredMessages.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.publish('starredMessages', function(rid, limit = 50) {
 	if (!this.userId) {

diff --git a/packages/rocketchat-message-star/server/settings.js b/packages/rocketchat-message-star/server/settings.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.startup(function() {
 	return RocketChat.settings.add('Message_AllowStarring', true, {

diff --git a/packages/rocketchat-message-star/server/starMessage.js b/packages/rocketchat-message-star/server/starMessage.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.methods({
 	starMessage(message) {

diff --git a/packages/rocketchat-message-star/server/startup/indexes.js b/packages/rocketchat-message-star/server/startup/indexes.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.startup(function() {
 	return Meteor.defer(function() {