From b794ed8aff542bf0cc8b8e022bfcd94f70e8f062 Mon Sep 17 00:00:00 2001
From: Marcos Defendi <marcos.defendi@ulbra.inf.br>
Date: Tue, 19 Feb 2019 17:09:35 -0300
Subject: [PATCH] Remove Package references

---
 packages/rocketchat-api/server/v1/settings.js   | 2 --
 packages/rocketchat-file/package.js             | 1 +
 packages/rocketchat-file/server/file.server.js  | 5 +++--
 packages/rocketchat-livechat/server/livechat.js | 3 +--
 packages/rocketchat-logger/client/logger.js     | 3 +--
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/rocketchat-api/server/v1/settings.js b/packages/rocketchat-api/server/v1/settings.js
index 5069a2278dd2..7b320c5431fc 100644
--- a/packages/rocketchat-api/server/v1/settings.js
+++ b/packages/rocketchat-api/server/v1/settings.js
@@ -134,8 +134,6 @@ API.v1.addRoute('settings/:_id', { authRequired: true }, {
 
 API.v1.addRoute('service.configurations', { authRequired: false }, {
 	get() {
-		const { ServiceConfiguration } = Package['service-configuration'];
-
 		return API.v1.success({
 			configurations: ServiceConfiguration.configurations.find({}, { fields: { secret: 0 } }).fetch(),
 		});
diff --git a/packages/rocketchat-file/package.js b/packages/rocketchat-file/package.js
index 6ca7b8df2426..57fd066a0f2f 100644
--- a/packages/rocketchat-file/package.js
+++ b/packages/rocketchat-file/package.js
@@ -8,6 +8,7 @@ Package.describe({
 Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
+		'mongo',
 	]);
 	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat-file/server/file.server.js b/packages/rocketchat-file/server/file.server.js
index a2548ad63d20..2484f4d7965d 100644
--- a/packages/rocketchat-file/server/file.server.js
+++ b/packages/rocketchat-file/server/file.server.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { MongoInternals } from 'meteor/mongo';
 import Grid from 'gridfs-stream';
 import stream from 'stream';
 import fs from 'fs';
@@ -38,8 +39,8 @@ RocketChatFile.GridFS = class {
 
 		this.name = name;
 		this.transformWrite = transformWrite;
-		const mongo = Package.mongo.MongoInternals.NpmModule;
-		const { db } = Package.mongo.MongoInternals.defaultRemoteCollectionDriver().mongo;
+		const mongo = MongoInternals.NpmModule;
+		const { db } = MongoInternals.defaultRemoteCollectionDriver().mongo;
 		this.store = new Grid(db, mongo);
 		this.findOneSync = Meteor.wrapAsync(this.store.collection(this.name).findOne.bind(this.store.collection(this.name)));
 		this.removeSync = Meteor.wrapAsync(this.store.remove.bind(this.store));
diff --git a/packages/rocketchat-livechat/server/livechat.js b/packages/rocketchat-livechat/server/livechat.js
index 2f2f51969f1a..714b34621a7a 100644
--- a/packages/rocketchat-livechat/server/livechat.js
+++ b/packages/rocketchat-livechat/server/livechat.js
@@ -1,11 +1,10 @@
 import { Meteor } from 'meteor/meteor';
 import { WebApp } from 'meteor/webapp';
 import { settings } from 'meteor/rocketchat:settings';
+import { Autoupdate } from 'meteor/autoupdate';
 import _ from 'underscore';
 import url from 'url';
 
-const { Autoupdate } = Package.autoupdate;
-
 WebApp.connectHandlers.use('/livechat', Meteor.bindEnvironment((req, res, next) => {
 	const reqUrl = url.parse(req.url);
 	if (reqUrl.pathname !== '/') {
diff --git a/packages/rocketchat-logger/client/logger.js b/packages/rocketchat-logger/client/logger.js
index 52aae560559b..4ca8ffce787c 100644
--- a/packages/rocketchat-logger/client/logger.js
+++ b/packages/rocketchat-logger/client/logger.js
@@ -1,7 +1,6 @@
+import { Template } from 'meteor/templating';
 import _ from 'underscore';
 
-const { Template } = Package.templating;
-
 Template.log = false;
 
 Template.logMatch = /.*/;