Convert rocketchat-analytics to main module structure

packages/rocketchat-analytics/client/index.js

@@ -0,0 +1,2 @@
+import './loadScript';
+import './trackEvents';

packages/rocketchat-analytics/client/loadScript.js

@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { Template } from 'meteor/templating';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Template.body.onRendered(() => {
 	Tracker.autorun((c) => {

packages/rocketchat-analytics/client/trackEvents.js

@@ -1,5 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { FlowRouter } from 'meteor/kadira:flow-router';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { ChatRoom } from 'meteor/rocketchat:ui';
 import { Tracker } from 'meteor/tracker';
 
 function trackEvent(category, action, label) {

packages/rocketchat-analytics/package.js

@@ -8,9 +8,16 @@ Package.describe({
 // Note: Piwik respects Google Chrome's No Track: http://piwik.org/docs/privacy/#step-4-respect-donottrack-preference
 
 Package.onUse(function(api) {
-	api.use(['ecmascript', 'rocketchat:lib', 'tracker']);
-	api.use(['templating', 'kadira:flow-router'], 'client');
+	api.use([
+		'ecmascript',
+		'rocketchat:lib',
+		'tracker',
+	]);
+	api.use([
+		'templating',
+		'kadira:flow-router',
+	], 'client');
 
-	api.addFiles(['client/loadScript.js', 'client/trackEvents.js'], 'client');
-	api.addFiles(['server/settings.js'], 'server');
+	api.mainModule('client/index.js', 'client');
+	api.mainModule('server/index.js', 'server');
 });

packages/rocketchat-analytics/server/index.js

@@ -0,0 +1 @@
+import './settings';

packages/rocketchat-analytics/server/settings.js

@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.settings.addGroup('Analytics', function addSettings() {
 	this.section('Piwik', function() {
 		const enableQuery = { _id: 'PiwikAnalytics_enabled', value: true };

packages/rocketchat-ui/client/lib/collections.js

@@ -5,7 +5,7 @@ import _ from 'underscore';
 
 this.ChatMessage = new Mongo.Collection(null);
 this.CachedChatRoom = new RocketChat.CachedCollection({ name: 'rooms' });
-this.ChatRoom = this.CachedChatRoom.collection;
+ChatRoom = this.CachedChatRoom.collection;
 
 this.CachedChatSubscription = new RocketChat.CachedCollection({ name: 'subscriptions' });
 this.ChatSubscription = this.CachedChatSubscription.collection;
@@ -17,7 +17,7 @@ this.CachedUserList = new Mongo.Collection(null);
 
 RocketChat.models.Users = _.extend({}, RocketChat.models.Users, Meteor.users);
 RocketChat.models.Subscriptions = _.extend({}, RocketChat.models.Subscriptions, this.ChatSubscription);
-RocketChat.models.Rooms = _.extend({}, RocketChat.models.Rooms, this.ChatRoom);
+RocketChat.models.Rooms = _.extend({}, RocketChat.models.Rooms, ChatRoom);
 RocketChat.models.Messages = _.extend({}, RocketChat.models.Messages, this.ChatMessage);
 
 Meteor.startup(() => {

packages/rocketchat-ui/package.js

@@ -149,4 +149,5 @@ Package.onUse(function(api) {
 	api.export('t', 'client');
 	api.export('modal', 'client');
 	api.export('fireGlobalEvent', 'client');
+	api.export('ChatRoom', 'client');
 });