Convert rocketchat-statistics to main module structure (#12833)

RocketChat · Dec 4, 2018 · d11daee · d11daee
1 parent 97632a8
commit d11daee
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 10 deletions.
diff --git a/packages/rocketchat-statistics/client/index.js b/packages/rocketchat-statistics/client/index.js
@@ -0,0 +1 @@
+import '../lib/rocketchat';
diff --git a/packages/rocketchat-statistics/lib/rocketchat.js b/packages/rocketchat-statistics/lib/rocketchat.js
@@ -1 +1,3 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.statistics = {};
diff --git a/packages/rocketchat-statistics/package.js b/packages/rocketchat-statistics/package.js
@@ -10,14 +10,8 @@ Package.onUse(function(api) {
 		'mongo',
 		'ecmascript',
 		'rocketchat:lib',
+		'konecty:multiple-instances-status',
 	]);
-
-	// Statistics
-	api.addFiles('lib/rocketchat.js', ['client', 'server']);
-	api.addFiles([
-		'server/models/Statistics.js',
-		'server/functions/get.js',
-		'server/functions/save.js',
-		'server/methods/getStatistics.js',
-	], 'server');
+	api.mainModule('client/index.js', 'client');
+	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat-statistics/server/functions/get.js b/packages/rocketchat-statistics/server/functions/get.js
@@ -1,8 +1,10 @@
-/* global InstanceStatus, MongoInternals */
 import { Meteor } from 'meteor/meteor';
+import { MongoInternals } from 'meteor/mongo';
 import _ from 'underscore';
 import os from 'os';
 import LivechatVisitors from 'meteor/rocketchat:livechat/server/models/LivechatVisitors';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { InstanceStatus } from 'meteor/konecty:multiple-instances-status';
 
 const wizardFields = [
 	'Organization_Type',

diff --git a/packages/rocketchat-statistics/server/functions/save.js b/packages/rocketchat-statistics/server/functions/save.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.statistics.save = function() {
 	const statistics = RocketChat.statistics.get();
 	statistics.createdAt = new Date;

diff --git a/packages/rocketchat-statistics/server/index.js b/packages/rocketchat-statistics/server/index.js
@@ -0,0 +1,5 @@
+import '../lib/rocketchat';
+import './models/Statistics';
+import './functions/get';
+import './functions/save';
+import './methods/getStatistics';
diff --git a/packages/rocketchat-statistics/server/methods/getStatistics.js b/packages/rocketchat-statistics/server/methods/getStatistics.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.methods({
 	getStatistics(refresh) {

diff --git a/packages/rocketchat-statistics/server/models/Statistics.js b/packages/rocketchat-statistics/server/models/Statistics.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.models.Statistics = new class extends RocketChat.models._Base {
 	constructor() {
 		super('statistics');