From 5c2ca0bcea74c541aa14033d1c33a92ca6411d4c Mon Sep 17 00:00:00 2001
From: Marcos Defendi <marcos.defendi@ulbra.inf.br>
Date: Wed, 19 Dec 2018 12:20:00 -0200
Subject: [PATCH 1/3] Remove Logger from eslintrc

---
 .eslintrc                                        |  1 -
 packages/rocketchat-custom-oauth/package.js      |  1 +
 .../server/custom_oauth_server.js                |  1 +
 .../server/config/GridFS.js                      |  2 +-
 .../rocketchat-file-upload/server/lib/proxy.js   |  1 +
 .../rocketchat-lib/lib/templateVarHandler.js     |  1 +
 .../server/functions/getFullUserData.js          |  1 +
 packages/rocketchat-lib/server/lib/debug.js      |  1 +
 .../server/startup/oAuthServicesUpdate.js        |  1 +
 packages/rocketchat-logger/client/ansispan.js    |  4 +---
 packages/rocketchat-logger/client/viewLogs.js    |  2 +-
 .../rocketchat-logger/client/views/viewLogs.js   |  4 ++--
 packages/rocketchat-logger/package.js            |  5 +----
 packages/rocketchat-logger/server/index.js       |  7 +++++++
 packages/rocketchat-logger/server/server.js      | 16 ++++++++--------
 server/lib/cordova.js                            |  3 ++-
 server/startup/cron.js                           |  2 +-
 server/startup/migrations/v099.js                |  3 +--
 server/startup/serverRunning.js                  |  3 ++-
 server/stream/streamBroadcast.js                 |  3 ++-
 20 files changed, 36 insertions(+), 26 deletions(-)
 create mode 100644 packages/rocketchat-logger/server/index.js

diff --git a/.eslintrc b/.eslintrc
index 5e8d3610d37c..67a68dc6fd54 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -13,7 +13,6 @@
 		"FileUpload"                  : false,
 		"handleError"                 : false,
 		"getAvatarUrlFromUsername"    : false,
-		"Logger"                      : false,
 		"modal"                       : false,
 		"Npm"                         : false,
 		"Package"                     : false,
diff --git a/packages/rocketchat-custom-oauth/package.js b/packages/rocketchat-custom-oauth/package.js
index 61959f683b9d..2bc7cb80ca7a 100644
--- a/packages/rocketchat-custom-oauth/package.js
+++ b/packages/rocketchat-custom-oauth/package.js
@@ -12,6 +12,7 @@ Package.onUse(function(api) {
 	api.use('ecmascript');
 	api.use('accounts-oauth');
 	api.use('service-configuration');
+	api.use('rocketchat:logger');
 
 	api.use('templating', 'client');
 
diff --git a/packages/rocketchat-custom-oauth/server/custom_oauth_server.js b/packages/rocketchat-custom-oauth/server/custom_oauth_server.js
index 2e24142156ac..4e8c0ce3ce2b 100644
--- a/packages/rocketchat-custom-oauth/server/custom_oauth_server.js
+++ b/packages/rocketchat-custom-oauth/server/custom_oauth_server.js
@@ -4,6 +4,7 @@ import { Match } from 'meteor/check';
 import { Accounts } from 'meteor/accounts-base';
 import { HTTP } from 'meteor/http';
 import { ServiceConfiguration } from 'meteor/service-configuration';
+import { Logger } from 'meteor/rocketchat:logger';
 import _ from 'underscore';
 
 const logger = new Logger('CustomOAuth');
diff --git a/packages/rocketchat-file-upload/server/config/GridFS.js b/packages/rocketchat-file-upload/server/config/GridFS.js
index cb001e0737af..6bb55574ca73 100644
--- a/packages/rocketchat-file-upload/server/config/GridFS.js
+++ b/packages/rocketchat-file-upload/server/config/GridFS.js
@@ -2,7 +2,7 @@
 import stream from 'stream';
 import zlib from 'zlib';
 import util from 'util';
-
+import { Logger } from 'meteor/rocketchat:logger';
 import { FileUploadClass } from '../lib/FileUpload';
 
 const logger = new Logger('FileUpload');
diff --git a/packages/rocketchat-file-upload/server/lib/proxy.js b/packages/rocketchat-file-upload/server/lib/proxy.js
index 83653bd43a24..db66b56c4ba3 100644
--- a/packages/rocketchat-file-upload/server/lib/proxy.js
+++ b/packages/rocketchat-file-upload/server/lib/proxy.js
@@ -2,6 +2,7 @@
 
 import { Meteor } from 'meteor/meteor';
 import { WebApp } from 'meteor/webapp';
+import { Logger } from 'meteor/rocketchat:logger';
 import http from 'http';
 import URL from 'url';
 
diff --git a/packages/rocketchat-lib/lib/templateVarHandler.js b/packages/rocketchat-lib/lib/templateVarHandler.js
index f13bd9233a71..d823e4841f36 100644
--- a/packages/rocketchat-lib/lib/templateVarHandler.js
+++ b/packages/rocketchat-lib/lib/templateVarHandler.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Logger } from 'meteor/rocketchat:logger';
 
 let logger;
 
diff --git a/packages/rocketchat-lib/server/functions/getFullUserData.js b/packages/rocketchat-lib/server/functions/getFullUserData.js
index 352ca6e24e7f..c4c171cd6e20 100644
--- a/packages/rocketchat-lib/server/functions/getFullUserData.js
+++ b/packages/rocketchat-lib/server/functions/getFullUserData.js
@@ -1,5 +1,6 @@
 /* globals RocketChat */
 import s from 'underscore.string';
+import { Logger } from 'meteor/rocketchat:logger';
 
 const logger = new Logger('getFullUserData');
 
diff --git a/packages/rocketchat-lib/server/lib/debug.js b/packages/rocketchat-lib/server/lib/debug.js
index 35e8a92989d3..7e9438a8cc4e 100644
--- a/packages/rocketchat-lib/server/lib/debug.js
+++ b/packages/rocketchat-lib/server/lib/debug.js
@@ -2,6 +2,7 @@
 import { Meteor } from 'meteor/meteor';
 import { WebApp } from 'meteor/webapp';
 import _ from 'underscore';
+import { Logger } from 'meteor/rocketchat:logger';
 
 const logger = new Logger('Meteor', {
 	methods: {
diff --git a/packages/rocketchat-lib/server/startup/oAuthServicesUpdate.js b/packages/rocketchat-lib/server/startup/oAuthServicesUpdate.js
index cc375ffffee0..330159e31a43 100644
--- a/packages/rocketchat-lib/server/startup/oAuthServicesUpdate.js
+++ b/packages/rocketchat-lib/server/startup/oAuthServicesUpdate.js
@@ -1,6 +1,7 @@
 /* globals CustomOAuth */
 import { Meteor } from 'meteor/meteor';
 import { ServiceConfiguration } from 'meteor/service-configuration';
+import { Logger } from 'meteor/rocketchat:logger';
 import _ from 'underscore';
 
 const logger = new Logger('rocketchat:lib', {
diff --git a/packages/rocketchat-logger/client/ansispan.js b/packages/rocketchat-logger/client/ansispan.js
index b0a1d7e6948e..2f3c2b554a83 100644
--- a/packages/rocketchat-logger/client/ansispan.js
+++ b/packages/rocketchat-logger/client/ansispan.js
@@ -1,6 +1,4 @@
-/* globals ansispan:true */
-
-ansispan = function(str) {
+export const ansispan = function(str) {
 	str = str.replace(/>/g, '&gt;');
 	str = str.replace(/</g, '&lt;');
 
diff --git a/packages/rocketchat-logger/client/viewLogs.js b/packages/rocketchat-logger/client/viewLogs.js
index 81df547fa397..26a73bd5986c 100644
--- a/packages/rocketchat-logger/client/viewLogs.js
+++ b/packages/rocketchat-logger/client/viewLogs.js
@@ -3,7 +3,7 @@ import { Mongo } from 'meteor/mongo';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
-this.stdout = new Mongo.Collection('stdout');
+export const stdout = new Mongo.Collection('stdout');
 
 Meteor.startup(function() {
 	RocketChat.AdminBox.addOption({
diff --git a/packages/rocketchat-logger/client/views/viewLogs.js b/packages/rocketchat-logger/client/views/viewLogs.js
index 72a62d105a9a..b53b5446bbc6 100644
--- a/packages/rocketchat-logger/client/views/viewLogs.js
+++ b/packages/rocketchat-logger/client/views/viewLogs.js
@@ -1,9 +1,9 @@
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
+import { ansispan } from '../ansispan';
+import { stdout } from '../viewLogs';
 import _ from 'underscore';
 import moment from 'moment';
-// TODO: remove this globals
-/* globals ansispan stdout readMessage*/
 
 Template.viewLogs.onCreated(function() {
 	this.subscribe('stdout');
diff --git a/packages/rocketchat-logger/package.js b/packages/rocketchat-logger/package.js
index 8362406f63fb..78394efa46fe 100644
--- a/packages/rocketchat-logger/package.js
+++ b/packages/rocketchat-logger/package.js
@@ -21,8 +21,5 @@ Package.onUse(function(api) {
 	api.addFiles('client/views/viewLogs.js', 'client');
 
 	api.addFiles('server/server.js', 'server');
-
-	api.export('Logger');
-	api.export('SystemLogger');
-	api.export('LoggerManager');
+	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat-logger/server/index.js b/packages/rocketchat-logger/server/index.js
new file mode 100644
index 000000000000..b101a98d37cf
--- /dev/null
+++ b/packages/rocketchat-logger/server/index.js
@@ -0,0 +1,7 @@
+import { LoggerManager, Logger, SystemLogger } from './server';
+
+export {
+	LoggerManager,
+	Logger,
+	SystemLogger,
+};
diff --git a/packages/rocketchat-logger/server/server.js b/packages/rocketchat-logger/server/server.js
index 06a938dbec5a..ba4eab2dceb9 100644
--- a/packages/rocketchat-logger/server/server.js
+++ b/packages/rocketchat-logger/server/server.js
@@ -1,12 +1,13 @@
-/* globals EventEmitter LoggerManager SystemLogger Log*/
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
 import { EJSON } from 'meteor/ejson';
+import { Log } from 'meteor/logging';
 import _ from 'underscore';
 import s from 'underscore.string';
 
-// TODO: change this global to import
-LoggerManager = new class extends EventEmitter { // eslint-disable-line no-undef
+let Logger;
+
+const LoggerManager = new class extends EventEmitter {
 	constructor() {
 		super();
 		this.enabled = false;
@@ -46,7 +47,6 @@ LoggerManager = new class extends EventEmitter { // eslint-disable-line no-undef
 	}
 };
 
-
 const defaultTypes = {
 	debug: {
 		name: 'debug',
@@ -297,8 +297,8 @@ class _Logger {
 		}
 	}
 }
-// TODO: change this global to import
-Logger = global.Logger = _Logger;
+
+Logger = _Logger;
 const processString = function(string, date) {
 	let obj;
 	try {
@@ -316,8 +316,8 @@ const processString = function(string, date) {
 		return string;
 	}
 };
-// TODO: change this global to import
-SystemLogger = new Logger('System', { // eslint-disable-line no-undef
+
+const SystemLogger = new Logger('System', {
 	methods: {
 		startup: {
 			type: 'success',
diff --git a/server/lib/cordova.js b/server/lib/cordova.js
index b74bb87daab5..3e9ac8b2ec90 100644
--- a/server/lib/cordova.js
+++ b/server/lib/cordova.js
@@ -1,7 +1,8 @@
-/* global Push, SystemLogger */
+/* global Push */
 import { Meteor } from 'meteor/meteor';
 import { HTTP } from 'meteor/http';
 import { TAPi18n } from 'meteor/tap:i18n';
+import { SystemLogger } from 'meteor/rocketchat:logger';
 
 Meteor.methods({
 	// log() {
diff --git a/server/startup/cron.js b/server/startup/cron.js
index 1c68fcf4df64..49e251ffd965 100644
--- a/server/startup/cron.js
+++ b/server/startup/cron.js
@@ -1,7 +1,7 @@
 /* global SyncedCron */
 import { Meteor } from 'meteor/meteor';
 import { HTTP } from 'meteor/http';
-
+import { Logger } from 'meteor/rocketchat:logger';
 const logger = new Logger('SyncedCron');
 
 SyncedCron.config({
diff --git a/server/startup/migrations/v099.js b/server/startup/migrations/v099.js
index c1e121154cbc..001739053fa1 100644
--- a/server/startup/migrations/v099.js
+++ b/server/startup/migrations/v099.js
@@ -1,9 +1,8 @@
-/* globals SystemLogger */
-
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
 import { Mongo } from 'meteor/mongo';
 import { RocketChatFile } from 'meteor/rocketchat:file';
+import { SystemLogger } from 'meteor/rocketchat:logger';
 import fs from 'fs';
 import path from 'path';
 
diff --git a/server/startup/serverRunning.js b/server/startup/serverRunning.js
index da1e5c5dcd38..12444d7d38c9 100644
--- a/server/startup/serverRunning.js
+++ b/server/startup/serverRunning.js
@@ -1,6 +1,7 @@
-/* globals MongoInternals, SystemLogger */
+/* globals MongoInternals */
 
 import { Meteor } from 'meteor/meteor';
+import { SystemLogger } from 'meteor/rocketchat:logger';
 import fs from 'fs';
 import path from 'path';
 import semver from 'semver';
diff --git a/server/stream/streamBroadcast.js b/server/stream/streamBroadcast.js
index 1cc32a45eca9..b0a8a68aeee1 100644
--- a/server/stream/streamBroadcast.js
+++ b/server/stream/streamBroadcast.js
@@ -1,9 +1,10 @@
-/* global InstanceStatus, DDP, LoggerManager */
+/* global InstanceStatus, DDP */
 
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 import _ from 'underscore';
 import { DDPCommon } from 'meteor/ddp-common';
+import { Logger, LoggerManager } from 'meteor/rocketchat:logger';
 
 process.env.PORT = String(process.env.PORT).trim();
 process.env.INSTANCE_IP = String(process.env.INSTANCE_IP).trim();

From be5d82cd6a5bcf7dfcbd442984b3b3941f0fbe6d Mon Sep 17 00:00:00 2001
From: Marcos Defendi <marcos.defendi@ulbra.inf.br>
Date: Wed, 19 Dec 2018 12:44:28 -0200
Subject: [PATCH 2/3] Add global variables to eslintrc

---
 .eslintrc                                          | 2 ++
 packages/rocketchat-lib/server/lib/configLogger.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.eslintrc b/.eslintrc
index 67a68dc6fd54..0a89c2ecefad 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -10,12 +10,14 @@
 		"ChatMessages"                : false,
 		"ChatRoom"                    : false,
 		"ChatSubscription"            : false,
+		"EventEmitter"	              : false,
 		"FileUpload"                  : false,
 		"handleError"                 : false,
 		"getAvatarUrlFromUsername"    : false,
 		"modal"                       : false,
 		"Npm"                         : false,
 		"Package"                     : false,
+		"readMessage"                 : false,
 		"RocketChat"                  : true,
 		"RoomHistoryManager"          : false,
 		"RoomManager"                 : false,
diff --git a/packages/rocketchat-lib/server/lib/configLogger.js b/packages/rocketchat-lib/server/lib/configLogger.js
index b0d2fef6170c..e8d79ffe7b25 100644
--- a/packages/rocketchat-lib/server/lib/configLogger.js
+++ b/packages/rocketchat-lib/server/lib/configLogger.js
@@ -1,5 +1,5 @@
-/* globals LoggerManager */
 import { Meteor } from 'meteor/meteor';
+import { LoggerManager } from 'meteor/rocketchat:logger';
 
 RocketChat.settings.get('Log_Package', function(key, value) {
 	return LoggerManager.showPackage = value;

From e06d54782cd7e681a149b86b77d56e409281da5b Mon Sep 17 00:00:00 2001
From: Marcos Defendi <marcos.defendi@ulbra.inf.br>
Date: Wed, 19 Dec 2018 14:58:00 -0200
Subject: [PATCH 3/3] Convert rocketchat-logger to main module structure

---
 .eslintrc                                   |  1 -
 packages/rocketchat-logger/client/index.js  |  4 +++
 packages/rocketchat-logger/package.js       | 28 +++++++++------------
 packages/rocketchat-logger/server/server.js |  1 +
 4 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100644 packages/rocketchat-logger/client/index.js

diff --git a/.eslintrc b/.eslintrc
index 0a89c2ecefad..e2bfdf38213d 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -10,7 +10,6 @@
 		"ChatMessages"                : false,
 		"ChatRoom"                    : false,
 		"ChatSubscription"            : false,
-		"EventEmitter"	              : false,
 		"FileUpload"                  : false,
 		"handleError"                 : false,
 		"getAvatarUrlFromUsername"    : false,
diff --git a/packages/rocketchat-logger/client/index.js b/packages/rocketchat-logger/client/index.js
new file mode 100644
index 000000000000..62df0fde5ac3
--- /dev/null
+++ b/packages/rocketchat-logger/client/index.js
@@ -0,0 +1,4 @@
+import './logger';
+import './viewLogs';
+import './views/viewLogs.html';
+import './views/viewLogs';
diff --git a/packages/rocketchat-logger/package.js b/packages/rocketchat-logger/package.js
index 78394efa46fe..35307ded6940 100644
--- a/packages/rocketchat-logger/package.js
+++ b/packages/rocketchat-logger/package.js
@@ -5,21 +5,17 @@ Package.describe({
 });
 
 Package.onUse(function(api) {
-	api.use('mongo');
-	api.use('ecmascript');
-	api.use('random');
-	api.use('logging');
-	api.use('nooitaf:colors');
-	api.use('raix:eventemitter');
-	api.use('templating', 'client');
-	api.use('kadira:flow-router', 'client');
-	api.use('kadira:blaze-layout', 'client');
-	api.addFiles('client/ansispan.js', 'client');
-	api.addFiles('client/logger.js', 'client');
-	api.addFiles('client/viewLogs.js', 'client');
-	api.addFiles('client/views/viewLogs.html', 'client');
-	api.addFiles('client/views/viewLogs.js', 'client');
-
-	api.addFiles('server/server.js', 'server');
+	api.use([
+		'ecmascript',
+		'mongo',
+		'random',
+		'logging',
+		'nooitaf:colors',
+		'raix:eventemitter',
+		'templating',
+		'kadira:flow-router',
+		'kadira:blaze-layout',
+	]);
+	api.mainModule('client/index.js', 'client');
 	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat-logger/server/server.js b/packages/rocketchat-logger/server/server.js
index ba4eab2dceb9..e04cf3ad7425 100644
--- a/packages/rocketchat-logger/server/server.js
+++ b/packages/rocketchat-logger/server/server.js
@@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
 import { EJSON } from 'meteor/ejson';
 import { Log } from 'meteor/logging';
+import { EventEmitter } from 'events';
 import _ from 'underscore';
 import s from 'underscore.string';