From fb40d721217c9c4ec11590f879f3c6ba3a9ddc16 Mon Sep 17 00:00:00 2001
From: Marcos Defendi <marcos.defendi@ulbra.inf.br>
Date: Tue, 13 Nov 2018 09:37:52 -0200
Subject: [PATCH] Convert rocketchat-error-handler to main module structure

---
 packages/rocketchat-error-handler/package.js                   | 3 +--
 packages/rocketchat-error-handler/server/index.js              | 2 ++
 .../server/lib/RocketChat.ErrorHandler.js                      | 1 +
 packages/rocketchat-error-handler/server/startup/settings.js   | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 packages/rocketchat-error-handler/server/index.js

diff --git a/packages/rocketchat-error-handler/package.js b/packages/rocketchat-error-handler/package.js
index 424f081152df..77dada968925 100644
--- a/packages/rocketchat-error-handler/package.js
+++ b/packages/rocketchat-error-handler/package.js
@@ -12,6 +12,5 @@ Package.onUse(function(api) {
 		'templating',
 	]);
 
-	api.addFiles('server/lib/RocketChat.ErrorHandler.js', 'server');
-	api.addFiles('server/startup/settings.js', 'server');
+	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat-error-handler/server/index.js b/packages/rocketchat-error-handler/server/index.js
new file mode 100644
index 000000000000..183513dd2b60
--- /dev/null
+++ b/packages/rocketchat-error-handler/server/index.js
@@ -0,0 +1,2 @@
+import './lib/RocketChat.ErrorHandler';
+import './startup/settings';
diff --git a/packages/rocketchat-error-handler/server/lib/RocketChat.ErrorHandler.js b/packages/rocketchat-error-handler/server/lib/RocketChat.ErrorHandler.js
index d6d5b5fb24c4..10443e051adb 100644
--- a/packages/rocketchat-error-handler/server/lib/RocketChat.ErrorHandler.js
+++ b/packages/rocketchat-error-handler/server/lib/RocketChat.ErrorHandler.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 class ErrorHandler {
 	constructor() {
diff --git a/packages/rocketchat-error-handler/server/startup/settings.js b/packages/rocketchat-error-handler/server/startup/settings.js
index d815d6a20eb5..558340c60a8b 100644
--- a/packages/rocketchat-error-handler/server/startup/settings.js
+++ b/packages/rocketchat-error-handler/server/startup/settings.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.settings.addGroup('Logs', function() {
 	this.add('Log_Exceptions_to_Channel', '', { type: 'string' });
 });