Removal of Match, check, moment, Tracker and Mongo global variables (#12410)

* First wave of removal of Meteor global

* Second wave of removal of Meteor global

* Third wave of removal of Meteor global

* Fix tests

* Remove global variable SHA256

* Remove global variable WebApp

* Remove global variable EJSON

* Remove global variable Email

* Remove global variable HTTP

* Remove global variable Random

* Remove global variable ReactiveDict

* Remove global variable ReactiveVar

* Remove global variable Accounts

* Remove globals variables Match and check

* Remove global variable Mongo

* Remove global variable moment

* Remove global variable Tracker

* Fix ESLint

.eslintrc

@@ -14,7 +14,6 @@
 		"ChatMessages"                : false,
 		"ChatRoom"                    : false,
 		"ChatSubscription"            : false,
-		"check"                       : false,
 		"CryptoJS"                    : false,
 		"Department"                  : false,
 		"DDPRateLimiter"              : false,
@@ -31,10 +30,7 @@
 		"LivechatPageVisited"         : false,
 		"LivechatTrigger"             : false,
 		"Logger"                      : false,
-		"Match"                       : false,
 		"modal"                       : false,
-		"moment"                      : false,
-		"Mongo"                       : false,
 		"Npm"                         : false,
 		"Package"                     : false,
 		"parentCall"                  : false,
@@ -54,7 +50,6 @@
 		"Template"                    : false,
 		"TimeSync"                    : false,
 		"toastr"                      : false,
-		"Tracker"                     : false,
 		"Trigger"                     : false,
 		"Triggers"                    : false,
 		"UAParser"                    : false,

client/methods/deleteMessage.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 import _ from 'underscore';
 import moment from 'moment';
 

client/methods/updateMessage.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 import _ from 'underscore';
 import moment from 'moment';
 import toastr from 'toastr';

client/notifications/notification.js

@@ -1,5 +1,6 @@
 /* globals KonchatNotification, fireGlobalEvent, readMessage, CachedChatSubscription */
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 
 // Show notifications and play a sound for new messages.
 // We trust the server to only send notifications for interesting messages, e.g. direct messages or

client/routes/router.js

@@ -1,6 +1,7 @@
 /* globals KonchatNotification */
 import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
+import { Tracker } from 'meteor/tracker';
 import s from 'underscore.string';
 
 Blaze.registerHelper('pathFor', function(path, kw) {

client/startup/emailVerification.js

@@ -1,5 +1,7 @@
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 import toastr from 'toastr';
+
 Meteor.startup(function() {
 	Tracker.autorun(function() {
 		const user = Meteor.user();

client/startup/i18n.js

@@ -2,6 +2,7 @@
 
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { Tracker } from 'meteor/tracker';
 import moment from 'moment';
 
 const currentLanguage = new ReactiveVar();

client/startup/startup.js

@@ -1,5 +1,6 @@
 /* globals UserPresence, fireGlobalEvent */
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 import toastr from 'toastr';
 import hljs from 'highlight.js';
 import 'highlight.js/styles/github.css';

client/startup/unread.js

@@ -1,5 +1,7 @@
 /* globals fireGlobalEvent, readMessage, Favico, favico, menu */
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
+
 Meteor.startup(function() {
 	Tracker.autorun(function() {
 		let unreadCount = 0;

client/startup/userSetUtcOffset.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 import moment from 'moment';
 
 Meteor.startup(function() {

imports/personal-access-tokens/client/personalAccessTokens.js

@@ -1,5 +1,7 @@
 import { Meteor } from 'meteor/meteor';
+import { Mongo } from 'meteor/mongo';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { Tracker } from 'meteor/tracker';
 import toastr from 'toastr';
 import moment from 'moment';
 

packages/meteor-autocomplete/client/autocomplete-client.js

@@ -1,5 +1,6 @@
 /* globals Deps, getCaretCoordinates*/
 import { Meteor } from 'meteor/meteor';
+import { Match } from 'meteor/check';
 import _ from 'underscore';
 import AutoCompleteRecords from './collection';
 

packages/meteor-autocomplete/client/collection.js

@@ -1 +1,3 @@
+import { Mongo } from 'meteor/mongo';
+
 export default new Mongo.Collection('autocompleteRecords');

packages/meteor-autocomplete/server/autocomplete-server.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Mongo } from 'meteor/mongo';
 // This also attaches an onStop callback to sub, so we don't need to worry about that.
 // https://github.com/meteor/meteor/blob/devel/packages/mongo/collection.js
 const Autocomplete = class {

packages/rocketchat-analytics/client/loadScript.js

@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
+
 Template.body.onRendered(() => {
 	Tracker.autorun((c) => {
 		const piwikUrl = RocketChat.settings.get('PiwikAnalytics_enabled') && RocketChat.settings.get('PiwikAnalytics_url');

packages/rocketchat-analytics/client/trackEvents.js

@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
+
 function trackEvent(category, action, label) {
 	if (window._paq) {
 		window._paq.push(['trackEvent', category, action, label]);

packages/rocketchat-api/server/v1/chat.js

@@ -1,5 +1,6 @@
 /* global processWebhookMessage */
 import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
 
 RocketChat.API.v1.addRoute('chat.delete', { authRequired: true }, {
 	post() {

packages/rocketchat-api/server/v1/integrations.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
 
 RocketChat.API.v1.addRoute('integrations.create', { authRequired: true }, {
 	post() {

packages/rocketchat-api/server/v1/misc.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
 
 RocketChat.API.v1.addRoute('info', { authRequired: false }, {
 	get() {

packages/rocketchat-api/server/v1/permissions.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
 
 /**
 	This API returns all permissions that exists

packages/rocketchat-api/server/v1/roles.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
 
 RocketChat.API.v1.addRoute('roles.list', { authRequired: true }, {
 	get() {

packages/rocketchat-api/server/v1/settings.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
 import _ from 'underscore';
 
 // settings endpoints

packages/rocketchat-api/server/v1/subscriptions.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
 
 RocketChat.API.v1.addRoute('subscriptions.get', { authRequired: true }, {
 	get() {

packages/rocketchat-api/server/v1/users.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
 import _ from 'underscore';
 import Busboy from 'busboy';
 

packages/rocketchat-authorization/client/lib/models/Roles.js

@@ -1,3 +1,5 @@
+import { Mongo } from 'meteor/mongo';
+
 RocketChat.models.Roles = new Mongo.Collection('rocketchat_roles');
 
 Object.assign(RocketChat.models.Roles, {

packages/rocketchat-authorization/client/views/permissions.js

@@ -1,6 +1,7 @@
 /* globals ChatPermissions */
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { Tracker } from 'meteor/tracker';
 
 Template.permissions.helpers({
 	role() {

packages/rocketchat-autotranslate/client/lib/actionButton.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 
 Meteor.startup(function() {
 	Tracker.autorun(function() {

packages/rocketchat-autotranslate/client/lib/autotranslate.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 import _ from 'underscore';
 
 RocketChat.AutoTranslate = {

packages/rocketchat-autotranslate/client/lib/tabBar.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 
 Meteor.startup(function() {
 	Tracker.autorun(function() {

packages/rocketchat-autotranslate/server/methods/saveSettings.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
 
 Meteor.methods({
 	'autoTranslate.saveSettings'(rid, field, value, options) {

packages/rocketchat-channel-settings-mail-messages/server/methods/mailMessages.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
 import _ from 'underscore';
 import moment from 'moment';
 import * as Mailer from 'meteor/rocketchat:mailer';

packages/rocketchat-channel-settings/client/lib/ChannelSettings.js

@@ -1,4 +1,5 @@
 import { ReactiveVar } from 'meteor/reactive-var';
+import { Tracker } from 'meteor/tracker';
 import _ from 'underscore';
 
 RocketChat.ChannelSettings = new class {

packages/rocketchat-channel-settings/client/startup/trackSettingsChange.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 
 Meteor.startup(function() {
 	const roomSettingsChangedCallback = (msg) => {

packages/rocketchat-channel-settings/server/functions/saveReactWhenReadOnly.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Match } from 'meteor/check';
 
 RocketChat.saveReactWhenReadOnly = function(rid, allowReact) {
 	if (!Match.test(rid, String)) {

packages/rocketchat-channel-settings/server/functions/saveRoomAnnouncement.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Match } from 'meteor/check';
 
 RocketChat.saveRoomAnnouncement = function(rid, roomAnnouncement, user, sendMessage = true) {
 	if (!Match.test(rid, String)) {

packages/rocketchat-channel-settings/server/functions/saveRoomCustomFields.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Match } from 'meteor/check';
 
 RocketChat.saveRoomCustomFields = function(rid, roomCustomFields) {
 	if (!Match.test(rid, String)) {

packages/rocketchat-channel-settings/server/functions/saveRoomDescription.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Match } from 'meteor/check';
 
 RocketChat.saveRoomDescription = function(rid, roomDescription, user) {
 	if (!Match.test(rid, String)) {

packages/rocketchat-channel-settings/server/functions/saveRoomReadOnly.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Match } from 'meteor/check';
 
 RocketChat.saveRoomReadOnly = function(rid, readOnly) {
 	if (!Match.test(rid, String)) {

packages/rocketchat-channel-settings/server/functions/saveRoomSystemMessages.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Match } from 'meteor/check';
 
 RocketChat.saveRoomSystemMessages = function(rid, systemMessages) {
 	if (!Match.test(rid, String)) {

packages/rocketchat-channel-settings/server/functions/saveRoomTopic.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Match } from 'meteor/check';
 
 RocketChat.saveRoomTopic = function(rid, roomTopic, user, sendMessage = true) {
 	if (!Match.test(rid, String)) {

packages/rocketchat-channel-settings/server/functions/saveRoomType.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Match } from 'meteor/check';
 
 RocketChat.saveRoomType = function(rid, roomType, user, sendMessage = true) {
 	if (!Match.test(rid, String)) {

packages/rocketchat-channel-settings/server/methods/saveRoomSettings.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
 
 const fields = ['roomName', 'roomTopic', 'roomAnnouncement', 'roomCustomFields', 'roomDescription', 'roomType', 'readOnly', 'reactWhenReadOnly', 'systemMessages', 'default', 'joinCode', 'tokenpass', 'streamingOptions', 'retentionEnabled', 'retentionMaxAge', 'retentionExcludePinned', 'retentionFilesOnly', 'retentionOverrideGlobal', 'encrypted'];
 Meteor.methods({

packages/rocketchat-custom-oauth/client/custom_oauth_client.js

@@ -1,5 +1,6 @@
 /* globals OAuth*/
 import { Meteor } from 'meteor/meteor';
+import { Match } from 'meteor/check';
 import { Accounts } from 'meteor/accounts-base';
 import { Random } from 'meteor/random';
 import s from 'underscore.string';

packages/rocketchat-custom-oauth/server/custom_oauth_server.js

@@ -1,5 +1,6 @@
 /* globals OAuth*/
 import { Meteor } from 'meteor/meteor';
+import { Match } from 'meteor/check';
 import { Accounts } from 'meteor/accounts-base';
 import { HTTP } from 'meteor/http';
 import _ from 'underscore';

packages/rocketchat-custom-sounds/client/admin/adminSounds.js

@@ -1,7 +1,7 @@
 import s from 'underscore.string';
 import { ReactiveVar } from 'meteor/reactive-var';
-
 import { RocketChatTabBar } from 'meteor/rocketchat:lib';
+import { Tracker } from 'meteor/tracker';
 
 Template.adminSounds.helpers({
 	isReady() {

packages/rocketchat-dolphin/common.js

@@ -1,6 +1,7 @@
 // Dolphin OAuth2
 /* globals CustomOAuth */
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 
 const config = {
 	serverURL: '',

packages/rocketchat-drupal/common.js

@@ -1,5 +1,6 @@
 /* global CustomOAuth */
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 
 // Drupal Server CallBack URL needs to be http(s)://{rocketchat.server}[:port]/_oauth/drupal
 // In RocketChat -> Administration the URL needs to be http(s)://{drupal.server}/

packages/rocketchat-emoji-custom/admin/adminEmoji.js

@@ -1,6 +1,7 @@
 import s from 'underscore.string';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { RocketChatTabBar } from 'meteor/rocketchat:lib';
+import { Tracker } from 'meteor/tracker';
 
 Template.adminEmoji.helpers({
 	isReady() {

packages/rocketchat-emoji-emojione/rocketchat.js

@@ -1,5 +1,6 @@
 /* globals emojione, emojisByCategory, emojiCategories, toneList */
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 
 RocketChat.emoji.packages.emojione = emojione;
 RocketChat.emoji.packages.emojione.imageType = 'png';

packages/rocketchat-file-upload/client/lib/fileUploadHandler.js

@@ -2,6 +2,7 @@
 /* exported fileUploadHandler */
 import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
+import { Tracker } from 'meteor/tracker';
 
 new UploadFS.Store({
 	collection: RocketChat.models.Uploads.model,

packages/rocketchat-file-upload/lib/FileUpload.js

@@ -2,6 +2,7 @@
 /* exported FileUpload */
 
 import { Meteor } from 'meteor/meteor';
+import { Match } from 'meteor/check';
 import filesize from 'filesize';
 
 let maxFileSize = 0;

packages/rocketchat-file-upload/server/methods/sendFileMessage.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
 import { Random } from 'meteor/random';
 import _ from 'underscore';
 

packages/rocketchat-file-upload/ufs/AmazonS3/server.js

@@ -1,3 +1,4 @@
+import { check } from 'meteor/check';
 import { UploadFS } from 'meteor/jalik:ufs';
 import { Random } from 'meteor/random';
 import _ from 'underscore';

packages/rocketchat-file-upload/ufs/GoogleStorage/server.js

@@ -1,3 +1,4 @@
+import { check } from 'meteor/check';
 import { UploadFS } from 'meteor/jalik:ufs';
 import { Random } from 'meteor/random';
 import gcStorage from '@google-cloud/storage';

packages/rocketchat-file-upload/ufs/Webdav/server.js

@@ -1,3 +1,4 @@
+import { check } from 'meteor/check';
 import { UploadFS } from 'meteor/jalik:ufs';
 import { Random } from 'meteor/random';
 import Webdav from 'webdav';

packages/rocketchat-github-enterprise/common.js

@@ -1,5 +1,6 @@
 /* global CustomOAuth */
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 
 // GitHub Enterprise Server CallBack URL needs to be http(s)://{rocketchat.server}[:port]/_oauth/github_enterprise
 // In RocketChat -> Administration the URL needs to be http(s)://{github.enterprise.server}/

packages/rocketchat-gitlab/common.js

@@ -1,5 +1,6 @@
 /* global CustomOAuth */
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 
 const config = {
 	serverURL: 'https://gitlab.com',

packages/rocketchat-google-vision/client/googlevision.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 
 RocketChat.GoogleVision = {
 	getVisionAttributes(attachment) {

packages/rocketchat-grant/server/settings.js

@@ -1,4 +1,4 @@
-import { check } from 'meteor/check';
+import { Match, check } from 'meteor/check';
 
 import { Storage } from './storage';
 

packages/rocketchat-iframe-login/iframe_client.js

@@ -1,6 +1,7 @@
 /* globals Accounts, Tracker, ReactiveVar, FlowRouter, Accounts, HTTP, facebookConnectPlugin, TwitterConnect, OAuth */
 
 import { Meteor } from 'meteor/meteor';
+import { Match } from 'meteor/check';
 import _ from 'underscore';
 
 const { _unstoreLoginToken } = Accounts;

packages/rocketchat-iframe-login/iframe_server.js

@@ -1,5 +1,6 @@
 /* globals Accounts, OAuth */
 import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
 
 Accounts.registerLoginHandler('iframe', function(result) {
 	if (!result.iframe) {

packages/rocketchat-importer/server/methods/prepareImport.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
 import { Importers } from 'meteor/rocketchat:importer';
 
 Meteor.methods({

packages/rocketchat-integrations/client/collections.js

@@ -1,2 +1,4 @@
+import { Mongo } from 'meteor/mongo';
+
 this.ChatIntegrations = new Mongo.Collection('rocketchat_integrations');
 this.ChatIntegrationHistory = new Mongo.Collection('rocketchat_integration_history');

packages/rocketchat-integrations/server/lib/validation.js

@@ -1,5 +1,6 @@
 /* global Babel */
 import { Meteor } from 'meteor/meteor';
+import { Match } from 'meteor/check';
 import _ from 'underscore';
 import s from 'underscore.string';
 const scopedChannels = ['all_public_channels', 'all_private_groups', 'all_direct_messages'];

packages/rocketchat-lib/client/AdminBox.js

@@ -1,4 +1,5 @@
 import { ReactiveVar } from 'meteor/reactive-var';
+import { Tracker } from 'meteor/tracker';
 import _ from 'underscore';
 
 RocketChat.AdminBox = new class {

packages/rocketchat-lib/client/CustomTranslations.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 
 RocketChat.applyCustomTranslations = function applyCustomTranslations() {
 	let CustomTranslations = RocketChat.settings.get('Custom_Translations');

packages/rocketchat-lib/client/MessageAction.js

@@ -2,6 +2,7 @@
 
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { Tracker } from 'meteor/tracker';
 import _ from 'underscore';
 import moment from 'moment';
 import toastr from 'toastr';

packages/rocketchat-lib/client/Notifications.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 
 RocketChat.Notifications = new class {
 	constructor(...args) {

packages/rocketchat-lib/client/lib/Layout.js

@@ -1,3 +1,5 @@
+import { Tracker } from 'meteor/tracker';
+
 RocketChat.Layout = new (class RocketChatLayout {
 	constructor() {
 		Tracker.autorun(() => {

packages/rocketchat-lib/client/lib/RocketChatTabBar.js

@@ -1,4 +1,5 @@
 import { ReactiveVar } from 'meteor/reactive-var';
+import { Tracker } from 'meteor/tracker';
 
 export class RocketChatTabBar {
 	constructor() {

packages/rocketchat-lib/client/lib/cachedCollection.js

@@ -1,6 +1,9 @@
 import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
+import { Mongo } from 'meteor/mongo';
 import { Accounts } from 'meteor/accounts-base';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { Tracker } from 'meteor/tracker';
 import localforage from 'localforage';
 import _ from 'underscore';
 

packages/rocketchat-lib/client/lib/openRoom.js

@@ -1,5 +1,6 @@
 /* globals fireGlobalEvent readMessage currentTracker*/
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 import _ from 'underscore';
 
 currentTracker = undefined;

packages/rocketchat-lib/client/lib/settings.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 
 /*
 * RocketChat.settings holds all packages settings

packages/rocketchat-lib/client/lib/startup/commands.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 
 // Track logins and when they login, get the commands
 (() => {

packages/rocketchat-lib/client/lib/userRoles.js

@@ -1,5 +1,6 @@
 /* globals UserRoles, RoomRoles */
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 
 Meteor.startup(function() {
 	Tracker.autorun(function() {

packages/rocketchat-lib/client/models/_Base.js

@@ -1,3 +1,6 @@
+import { check } from 'meteor/check';
+import { Mongo } from 'meteor/mongo';
+
 RocketChat.models._Base = class {
 
 	_baseName() {

packages/rocketchat-lib/client/views/customFieldsForm.js

@@ -1,4 +1,5 @@
 import { ReactiveVar } from 'meteor/reactive-var';
+import { Tracker } from 'meteor/tracker';
 
 Template.customFieldsForm.helpers({
 	new() {

packages/rocketchat-lib/server/functions/sendMessage.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
 
 const objectMaybeIncluding = (types) => Match.Where((value) => {
 	Object.keys(types).forEach((field) => {

packages/rocketchat-lib/server/methods/addOAuthService.js

@@ -1,6 +1,7 @@
 /* eslint no-multi-spaces: 0 */
 /* eslint comma-spacing: 0 */
 import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
 import s from 'underscore.string';
 
 Meteor.methods({

packages/rocketchat-lib/server/methods/addUsersToRoom.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Match } from 'meteor/check';
 
 Meteor.methods({
 	addUsersToRoom(data = {}) {

packages/rocketchat-lib/server/methods/archiveRoom.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
 
 Meteor.methods({
 	archiveRoom(rid) {

packages/rocketchat-lib/server/methods/blockUser.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
 
 Meteor.methods({
 	blockUser({ rid, blocked }) {

packages/rocketchat-lib/server/methods/checkRegistrationSecretURL.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
 
 Meteor.methods({
 	checkRegistrationSecretURL(hash) {

packages/rocketchat-lib/server/methods/checkUsernameAvailability.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
 
 Meteor.methods({
 	checkUsernameAvailability(username) {

packages/rocketchat-lib/server/methods/cleanRoomHistory.js

@@ -1,5 +1,6 @@
 /* globals FileUpload */
 import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
 
 Meteor.methods({
 	cleanRoomHistory({ roomId, latest, oldest, inclusive = true, limit, excludePinned = false, filesOnly = false, fromUsers = [] }) {

packages/rocketchat-lib/server/methods/createChannel.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
 
 Meteor.methods({
 	createChannel(name, members, readOnly = false, customFields = {}, extraData = {}) {

packages/rocketchat-lib/server/methods/createPrivateGroup.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
 
 Meteor.methods({
 	createPrivateGroup(name, members, readOnly = false, customFields = {}, extraData = {}) {

packages/rocketchat-lib/server/methods/deleteMessage.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
 import moment from 'moment';
 
 Meteor.methods({

packages/rocketchat-lib/server/methods/deleteUserOwnAccount.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
 import { Accounts } from 'meteor/accounts-base';
 import s from 'underscore.string';
 

packages/rocketchat-lib/server/methods/getChannelHistory.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
 import _ from 'underscore';
 
 Meteor.methods({

packages/rocketchat-lib/server/methods/getRoomJoinCode.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
 
 Meteor.methods({
 	getRoomJoinCode(rid) {

packages/rocketchat-lib/server/methods/getRoomRoles.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
 import _ from 'underscore';
 
 Meteor.methods({

packages/rocketchat-lib/server/methods/getSingleMessage.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
 
 Meteor.methods({
 	getSingleMessage(msgId) {

packages/rocketchat-lib/server/methods/insertOrUpdateUser.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
 
 Meteor.methods({
 	insertOrUpdateUser(userData) {

packages/rocketchat-lib/server/methods/joinDefaultChannels.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
 
 Meteor.methods({
 	joinDefaultChannels(silenced) {

packages/rocketchat-lib/server/methods/joinRoom.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
 
 Meteor.methods({
 	joinRoom(rid, code) {

packages/rocketchat-lib/server/methods/leaveRoom.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
 
 Meteor.methods({
 	leaveRoom(rid) {

packages/rocketchat-lib/server/methods/removeOAuthService.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
 import s from 'underscore.string';
 
 Meteor.methods({

packages/rocketchat-lib/server/methods/robotMethods.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
 import _ from 'underscore';
 
 Meteor.methods({

packages/rocketchat-lib/server/methods/saveSetting.js

@@ -1,5 +1,6 @@
 /* eslint new-cap: 0 */
 import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
 
 Meteor.methods({
 	saveSetting(_id, value, editor) {