From d11daee41722c56dbbcedfd035d26b41518fd53b Mon Sep 17 00:00:00 2001
From: Marcos Spessatto Defendi <marcos.defendi@ulbra.inf.br>
Date: Tue, 4 Dec 2018 11:35:48 -0200
Subject: [PATCH] Convert rocketchat-statistics to main module structure
 (#12833)

---
 packages/rocketchat-statistics/client/index.js       |  1 +
 packages/rocketchat-statistics/lib/rocketchat.js     |  2 ++
 packages/rocketchat-statistics/package.js            | 12 +++---------
 .../rocketchat-statistics/server/functions/get.js    |  4 +++-
 .../rocketchat-statistics/server/functions/save.js   |  2 ++
 packages/rocketchat-statistics/server/index.js       |  5 +++++
 .../server/methods/getStatistics.js                  |  1 +
 .../server/models/Statistics.js                      |  2 ++
 8 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 packages/rocketchat-statistics/client/index.js
 create mode 100644 packages/rocketchat-statistics/server/index.js

diff --git a/packages/rocketchat-statistics/client/index.js b/packages/rocketchat-statistics/client/index.js
new file mode 100644
index 00000000000..8e716d1f414
--- /dev/null
+++ 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
index 6a4543fd8c9..0da35b5c679 100644
--- 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
index 640c3c244b4..0ab1fd37317 100644
--- 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
index c9dd5d2f590..df0be96e356 100644
--- 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
index fcaf7854d4b..b960a99cca9 100644
--- 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
new file mode 100644
index 00000000000..91b887ae52a
--- /dev/null
+++ 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
index 9694eac257c..b31792e4441 100644
--- 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
index 6eb7ccf4c98..cb52ecef674 100644
--- 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');