Removal of Template, Blaze, BlazeLayout, FlowRouter, DDPRateLimiter, Session, UAParser, Promise, Reload and CryptoJS global variables (#12433)

* 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

* Remove global variable Blaze

* Remove global variables FlowRouter and BlazeLayout

* Add FlowRouter to eslint global in tests file

* Remove global variable DDPRateLimiter

* Remove global variable Session

* Remove global variable UAParser

* Remove global variable Promise

* Remove global variable Reload

* Remove global variable CryptoJS

* Remove global variable Template

* Fix ESLint

.eslintrc

@@ -7,17 +7,12 @@
 		"AgentUsers"                  : false,
 		"Apps"                        : false,
 		"Assets"                      : false,
-		"Blaze"                       : false,
-		"BlazeLayout"                 : false,
 		"browser"                     : false,
 		"ChatMessage"                 : false,
 		"ChatMessages"                : false,
 		"ChatRoom"                    : false,
 		"ChatSubscription"            : false,
-		"CryptoJS"                    : false,
 		"Department"                  : false,
-		"DDPRateLimiter"              : false,
-		"FlowRouter"                  : false,
 		"FileUpload"                  : false,
 		"getNextAgent"                : false,
 		"handleError"                 : false,
@@ -34,25 +29,20 @@
 		"Npm"                         : false,
 		"Package"                     : false,
 		"parentCall"                  : false,
-		"Promise"                     : false,
-		"Reload"                      : false,
 		"RocketChat"                  : true,
 		"RocketChatFile"              : false,
 		"RoomHistoryManager"          : false,
 		"RoomManager"                 : false,
 		"ServiceConfiguration"        : false,
-		"Session"                     : false,
 		"Settings"                    : false,
 		"SideNav"                     : false,
 		"t"                           : false,
 		"TAPi18n"                     : false,
 		"TAPi18next"                  : false,
-		"Template"                    : false,
 		"TimeSync"                    : false,
 		"toastr"                      : false,
 		"Trigger"                     : false,
 		"Triggers"                    : false,
-		"UAParser"                    : false,
 		"visitor"                     : false,
 		"VideoRecorder"               : false,
 		"VRecDialog"                  : false

client/helpers/escapeCssUrl.js

@@ -1 +1,3 @@
+import { Template } from 'meteor/templating';
+
 Template.registerHelper('escapeCssUrl', (url) => url.replace(/(['"])/g, '\\$1'));

client/helpers/log.js

@@ -1,3 +1,5 @@
+import { Template } from 'meteor/templating';
+
 Template.registerHelper('log', (...args) => {
 	console.log.apply(console, args);
 });

client/helpers/not.js

@@ -1 +1,3 @@
+import { Template } from 'meteor/templating';
+
 Template.registerHelper('not', (value) => !value);

client/notifications/notification.js

@@ -1,6 +1,8 @@
 /* globals KonchatNotification, fireGlobalEvent, readMessage, CachedChatSubscription */
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Session } from 'meteor/session';
 
 // 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/adminRouter.js

@@ -1,3 +1,6 @@
+import { FlowRouter } from 'meteor/kadira:flow-router' ;
+import { BlazeLayout } from 'meteor/kadira:blaze-layout';
+
 FlowRouter.route('/admin/users', {
 	name: 'admin-users',
 	action() {

client/routes/roomRoute.js

@@ -1,3 +1,5 @@
+import { FlowRouter } from 'meteor/kadira:flow-router';
+
 FlowRouter.goToRoomById = (roomId) => {
 	const subscription = ChatSubscription.findOne({ rid: roomId });
 	if (subscription) {

client/routes/router.js

@@ -2,6 +2,10 @@
 import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
 import { Tracker } from 'meteor/tracker';
+import { Blaze } from 'meteor/blaze';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { BlazeLayout } from 'meteor/kadira:blaze-layout';
+import { Session } from 'meteor/session';
 import s from 'underscore.string';
 
 Blaze.registerHelper('pathFor', function(path, kw) {

client/startup/emailVerification.js

@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
+import { Session } from 'meteor/session';
 import toastr from 'toastr';
 
 Meteor.startup(function() {

client/startup/loginViaQuery.js

@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+
 Meteor.startup(() => {
 	if (FlowRouter.getQueryParam('resumeToken')) {
 		Meteor.loginWithToken(FlowRouter.getQueryParam('resumeToken'), () => {

client/startup/roomObserve.js

@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { Session } from 'meteor/session';
+
 Meteor.startup(function() {
 	ChatRoom.find().observe({
 		added(data) {

client/startup/startup.js

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

client/startup/unread.js

@@ -1,6 +1,8 @@
 /* globals fireGlobalEvent, readMessage, Favico, favico, menu */
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Session } from 'meteor/session';
 
 Meteor.startup(function() {
 	Tracker.autorun(function() {

client/startup/usersObserve.js

@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { Session } from 'meteor/session';
+
 Meteor.startup(function() {
 	Meteor.users.find({}, { fields: { name: 1, username: 1, pictures: 1, status: 1, emails: 1, phone: 1, services: 1, utcOffset: 1 } }).observe({
 		added(user) {

imports/message-read-receipt/client/main.js

@@ -1,3 +1,5 @@
+import { Template } from 'meteor/templating';
+
 Template.main.helpers({
 	readReceiptsEnabled() {
 		if (RocketChat.settings.get('Message_Read_Receipt_Store_Users')) {

imports/message-read-receipt/client/readReceipts.js

@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { Template } from 'meteor/templating';
 import moment from 'moment';
 
 import './readReceipts.css';

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

@@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { Mongo } from 'meteor/mongo';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
+import { Template } from 'meteor/templating';
 import toastr from 'toastr';
 import moment from 'moment';
 

packages/chatpal-search/client/route.js

@@ -1,3 +1,6 @@
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { BlazeLayout } from 'meteor/kadira:blaze-layout';
+
 FlowRouter.route('/admin/chatpal', {
 	name: 'chatpal-admin',
 	action() {

packages/chatpal-search/client/template/admin.js

@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { Template } from 'meteor/templating';
 import toastr from 'toastr';
 
 Template.ChatpalAdmin.onCreated(function() {

packages/chatpal-search/client/template/result.js

@@ -1,5 +1,7 @@
 import { DateFormat } from 'meteor/rocketchat:lib';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { Session } from 'meteor/session';
+import { Template } from 'meteor/templating';
 
 Template.ChatpalSearchResultTemplate.onCreated(function() {
 	this.badRequest = new ReactiveVar(false);

packages/chatpal-search/client/template/suggestion.js

@@ -1,3 +1,5 @@
+import { Template } from 'meteor/templating';
+
 Template.ChatpalSuggestionItemTemplate.onCreated(function() {
 	if (this.data.type === 'link') {
 		this.data.action = () => {

packages/chatpal-search/package.js

@@ -13,6 +13,7 @@ Package.onUse(function(api) {
 		'rocketchat:logger',
 		'rocketchat:search',
 		'kadira:flow-router',
+		'kadira:blaze-layout',
 		'meteorhacks:inject-initial',
 	]);
 

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

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

packages/meteor-autocomplete/client/templates.js

@@ -1,4 +1,6 @@
 /* globals AutoComplete */
+import { Blaze } from 'meteor/blaze';
+import { Template } from 'meteor/templating';
 import _ from 'underscore';
 
 //  Events on template instances, sent to the autocomplete class

packages/rocketchat-2fa/client/accountSecurity.js

@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { Template } from 'meteor/templating';
 import toastr from 'toastr';
 import qrcode from 'yaqrcode';
 

packages/rocketchat-action-links/client/init.js

@@ -1,4 +1,7 @@
 /* globals fireGlobalEvent */
+import { Blaze } from 'meteor/blaze';
+import { Template } from 'meteor/templating';
+
 Template.room.events({
 	'click .action-link'(event, instance) {
 		event.preventDefault();

packages/rocketchat-analytics/client/loadScript.js

@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
+import { Template } from 'meteor/templating';
 
 Template.body.onRendered(() => {
 	Tracker.autorun((c) => {

packages/rocketchat-analytics/client/trackEvents.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Tracker } from 'meteor/tracker';
 
 function trackEvent(category, action, label) {

packages/rocketchat-apps/client/admin/appInstall.js

@@ -8,6 +8,8 @@
 // then it will be enabled by default for development reasons. The server prefers a url
 // over the passed in body, so if both are found it will only use the url.
 import { ReactiveVar } from 'meteor/reactive-var';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Template } from 'meteor/templating';
 
 Template.appInstall.helpers({
 	appFile() {

packages/rocketchat-apps/client/admin/appLogs.js

@@ -1,4 +1,6 @@
 import { ReactiveVar } from 'meteor/reactive-var';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Template } from 'meteor/templating';
 import moment from 'moment';
 import hljs from 'highlight.js';
 

packages/rocketchat-apps/client/admin/appManage.js

@@ -1,5 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Template } from 'meteor/templating';
 import _ from 'underscore';
 import s from 'underscore.string';
 import toastr from 'toastr';

packages/rocketchat-apps/client/admin/appWhatIsIt.js

@@ -1,5 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Template } from 'meteor/templating';
 
 Template.appWhatIsIt.onCreated(function() {
 	this.isLoading = new ReactiveVar(false);

packages/rocketchat-apps/client/admin/apps.js

@@ -1,5 +1,7 @@
 import toastr from 'toastr';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Template } from 'meteor/templating';
 
 import { AppEvents } from '../communication';
 const ENABLED_STATUS = ['auto_enabled', 'manually_enabled'];

packages/rocketchat-apps/client/orchestrator.js

@@ -1,6 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { AppWebsocketReceiver } from './communication';
 import { Utilities } from '../lib/misc/Utilities';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
 class AppClientOrchestrator {
 	constructor() {

packages/rocketchat-apps/package.js

@@ -11,7 +11,7 @@ Package.onUse(function(api) {
 		'templating',
 	]);
 
-	api.use(['reactive-var', 'kadira:flow-router', 'underscore'], 'client');
+	api.use(['reactive-var', 'kadira:flow-router', 'kadira:blaze-layout', 'underscore'], 'client');
 
 	api.addFiles('lib/Apps.js', ['client', 'server']);
 

packages/rocketchat-authorization/client/hasPermission.js

@@ -1,5 +1,6 @@
 /* globals ChatPermissions */
 import { Meteor } from 'meteor/meteor';
+import { Template } from 'meteor/templating';
 
 function atLeastOne(permissions = [], scope) {
 	return permissions.some((permissionId) => {

packages/rocketchat-authorization/client/route.js

@@ -1,3 +1,6 @@
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { BlazeLayout } from 'meteor/kadira:blaze-layout';
+
 FlowRouter.route('/admin/permissions', {
 	name: 'admin-permissions',
 	action(/* params*/) {

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

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

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

@@ -1,5 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Template } from 'meteor/templating';
 import toastr from 'toastr';
 
 Template.permissionsRole.helpers({

packages/rocketchat-authorization/package.js

@@ -14,6 +14,7 @@ Package.onUse(function(api) {
 
 	api.use('mongo', ['client', 'server']);
 	api.use('kadira:flow-router', 'client');
+	api.use('kadira:blaze-layout', 'client');
 	api.use('tracker', 'client');
 
 	api.use('templating', 'client');

packages/rocketchat-autotranslate/client/views/autoTranslateFlexTab.js

@@ -2,6 +2,7 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Random } from 'meteor/random';
+import { Template } from 'meteor/templating';
 import _ from 'underscore';
 import toastr from 'toastr';
 

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

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { DDPRateLimiter } from 'meteor/ddp-rate-limiter';
 
 Meteor.methods({
 	'autoTranslate.getSupportedLanguages'(targetLanguage) {

packages/rocketchat-channel-settings-mail-messages/client/resetSelection.js

@@ -1,3 +1,5 @@
+import { Blaze } from 'meteor/blaze';
+
 export default function resetSelection(reset) {
 	const [el] = $('.messages-box');
 	if (!el) {

packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.js

@@ -1,6 +1,9 @@
 /* global AutoComplete Deps */
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { Blaze } from 'meteor/blaze';
+import { Session } from 'meteor/session';
+import { Template } from 'meteor/templating';
 import toastr from 'toastr';
 import resetSelection from '../resetSelection';
 

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

@@ -1,5 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Session } from 'meteor/session';
 
 Meteor.startup(function() {
 	const roomSettingsChangedCallback = (msg) => {

packages/rocketchat-channel-settings/client/views/channelSettings.js

@@ -1,6 +1,7 @@
 /* globals popover */
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { Template } from 'meteor/templating';
 import toastr from 'toastr';
 import moment from 'moment';
 import s from 'underscore.string';

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

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

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

@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
 FlowRouter.route('/admin/custom-sounds', {
 	name: 'custom-sounds',

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

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Template } from 'meteor/templating';
 import toastr from 'toastr';
 import s from 'underscore.string';
 

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

@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { Template } from 'meteor/templating';
 
 Template.soundInfo.helpers({
 	name() {

packages/rocketchat-custom-sounds/package.js

@@ -16,6 +16,7 @@ Package.onUse(function(api) {
 	]);
 
 	api.use('kadira:flow-router', 'client');
+	api.use('kadira:blaze-layout', 'client');
 
 	api.addFiles('server/startup/custom-sounds.js', 'server');
 	api.addFiles('server/startup/permissions.js', 'server');

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

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

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

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Template } from 'meteor/templating';
 import toastr from 'toastr';
 import s from 'underscore.string';
 

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

@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { Template } from 'meteor/templating';
 
 Template.emojiInfo.helpers({
 	name() {

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

@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
 FlowRouter.route('/admin/emoji-custom', {
 	name: 'emoji-custom',

packages/rocketchat-emoji-custom/client/lib/emojiCustom.js

@@ -1,5 +1,7 @@
 /* globals getEmojiUrlFromName:true, updateEmojiCustom:true, deleteEmojiCustom:true, isSetNotNull */
 import { Meteor } from 'meteor/meteor';
+import { Blaze } from 'meteor/blaze';
+import { Session } from 'meteor/session';
 
 RocketChat.emoji.packages.emojiCustom = {
 	emojiCategories: { rocket: 'Custom' },

packages/rocketchat-emoji-custom/package.js

@@ -16,6 +16,7 @@ Package.onUse(function(api) {
 	]);
 
 	api.use('kadira:flow-router', 'client');
+	api.use('kadira:blaze-layout', 'client');
 
 	api.addFiles('function-isSet.js');
 

packages/rocketchat-emoji/client/lib/emojiRenderer.js

@@ -1,4 +1,7 @@
 /* globals HTML, isSetNotNull, renderEmoji:true */
+import { Blaze } from 'meteor/blaze';
+import { Template } from 'meteor/templating';
+
 renderEmoji = function(emoji) {
 	if (isSetNotNull(() => RocketChat.emoji.list[emoji].emojiPackage)) {
 		const { emojiPackage } = RocketChat.emoji.list[emoji];

packages/rocketchat-google-natural-language/client/index.js

@@ -1,3 +1,5 @@
+import { Template } from 'meteor/templating';
+
 Template.room.helpers({
 	sentimentSmile() {
 		if (!RocketChat.settings.get('GoogleNaturalLanguage_Enabled')) {

packages/rocketchat-iframe-login/iframe_client.js

@@ -1,4 +1,4 @@
-/* globals Accounts, Tracker, ReactiveVar, FlowRouter, Accounts, HTTP, facebookConnectPlugin, TwitterConnect, OAuth */
+/* globals Accounts, Tracker, ReactiveVar, Accounts, HTTP, facebookConnectPlugin, TwitterConnect, OAuth */
 
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';

packages/rocketchat-importer/client/admin/adminImport.js

@@ -1,5 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Importers } from 'meteor/rocketchat:importer';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Template } from 'meteor/templating';
 
 Template.adminImport.helpers({
 	isAdmin() {

packages/rocketchat-importer/client/admin/adminImportPrepare.js

@@ -1,6 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Importers } from 'meteor/rocketchat:importer';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Template } from 'meteor/templating';
 import toastr from 'toastr';
 
 Template.adminImportPrepare.helpers({

packages/rocketchat-importer/client/admin/adminImportProgress.js

@@ -1,6 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Importers, ImporterWebsocketReceiver, ProgressStep } from 'meteor/rocketchat:importer';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Template } from 'meteor/templating';
 
 import toastr from 'toastr';
 

packages/rocketchat-integrations/client/route.js

@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
 FlowRouter.route('/admin/integrations', {
 	name: 'admin-integrations',

packages/rocketchat-integrations/client/views/integrations.js

@@ -1,4 +1,5 @@
 /* global ChatIntegrations */
+import { Template } from 'meteor/templating';
 import moment from 'moment';
 
 Template.integrations.helpers({

packages/rocketchat-integrations/client/views/integrationsIncoming.js

@@ -3,6 +3,8 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Random } from 'meteor/random';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Template } from 'meteor/templating';
 import hljs from 'highlight.js';
 import toastr from 'toastr';
 

packages/rocketchat-integrations/client/views/integrationsNew.js

@@ -1,3 +1,5 @@
+import { Template } from 'meteor/templating';
+
 Template.integrationsNew.helpers({
 	hasPermission() {
 		return RocketChat.authz.hasAtLeastOnePermission(['manage-integrations', 'manage-own-integrations']);

packages/rocketchat-integrations/client/views/integrationsOutgoing.js

@@ -3,6 +3,8 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Random } from 'meteor/random';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Template } from 'meteor/templating';
 import hljs from 'highlight.js';
 import toastr from 'toastr';
 

packages/rocketchat-integrations/client/views/integrationsOutgoingHistory.js

@@ -2,6 +2,8 @@
 
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Template } from 'meteor/templating';
 import _ from 'underscore';
 import hljs from 'highlight.js';
 import moment from 'moment';

packages/rocketchat-integrations/package.js

@@ -17,6 +17,7 @@ Package.onUse(function(api) {
 	api.use('rocketchat:logger');
 
 	api.use('kadira:flow-router', 'client');
+	api.use('kadira:blaze-layout', 'client');
 	api.use('templating', 'client');
 
 	api.addFiles('lib/rocketchat.js', ['server', 'client']);

packages/rocketchat-katex/katex.js

@@ -4,6 +4,7 @@
  */
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
+import { Blaze } from 'meteor/blaze';
 import _ from 'underscore';
 import s from 'underscore.string';
 

packages/rocketchat-lazy-load/client/index.js

@@ -1,6 +1,8 @@
 import { Meteor } from 'meteor/meteor';
+import { Blaze } from 'meteor/blaze';
 import _ from 'underscore';
 import './lazyloadImage';
+
 export const fixCordova = function(url) {
 	if (url && url.indexOf('data:image') === 0) {
 		return url;

packages/rocketchat-lazy-load/client/lazyloadImage.js

@@ -1,4 +1,5 @@
 import { ReactiveVar } from 'meteor/reactive-var';
+import { Template } from 'meteor/templating';
 import './lazyloadImage.html';
 import { addImage, fixCordova } from './';
 

packages/rocketchat-lib/client/CustomTranslations.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Session } from 'meteor/session';
 import { Tracker } from 'meteor/tracker';
 
 RocketChat.applyCustomTranslations = function applyCustomTranslations() {

packages/rocketchat-lib/client/MessageAction.js

@@ -3,9 +3,11 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
+import { Session } from 'meteor/session';
 import _ from 'underscore';
 import moment from 'moment';
 import toastr from 'toastr';
+
 const call = (method, ...args) => new Promise((resolve, reject) => {
 	Meteor.call(method, ...args, function(err, data) {
 		if (err) {

packages/rocketchat-lib/client/defaultTabBars.js

@@ -1,3 +1,5 @@
+import { Session } from 'meteor/session';
+
 RocketChat.TabBar.addButton({
 	groups: ['channel', 'group', 'direct'],
 	id: 'rocket-search',

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

@@ -1,5 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { call, UiTextContext } from 'meteor/rocketchat:lib';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Session } from 'meteor/session';
 
 export function hide(type, rid, name) {
 	const warnText = RocketChat.roomTypes.roomTypes[type].getUiText(UiTextContext.HIDE_WARNING);

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

@@ -1,4 +1,5 @@
 import { Tracker } from 'meteor/tracker';
+import { FlowRouter } from 'meteor/kadira:flow-router';
 
 RocketChat.Layout = new (class RocketChatLayout {
 	constructor() {

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

@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { Session } from 'meteor/session';
 
 export class RocketChatAnnouncement {
 	constructor(args = {}) {

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

@@ -1,6 +1,9 @@
 /* globals fireGlobalEvent readMessage currentTracker*/
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { BlazeLayout } from 'meteor/kadira:blaze-layout';
+import { Session } from 'meteor/session';
 import _ from 'underscore';
 
 currentTracker = undefined;

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

@@ -1,4 +1,7 @@
 /* globals currentTracker */
+import { Blaze } from 'meteor/blaze';
+import { BlazeLayout } from 'meteor/kadira:blaze-layout';
+
 this.roomExit = function() {
 	// 7370 - Close flex-tab when opening a room on mobile UI
 	if (window.matchMedia('(max-width: 500px)').matches) {

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

@@ -1,6 +1,6 @@
-import _ from 'underscore';
-
+import { FlowRouter } from 'meteor/kadira:flow-router';
 import { RoomTypesCommon } from '../../lib/RoomTypesCommon';
+import _ from 'underscore';
 
 RocketChat.roomTypes = new class RocketChatRoomTypes extends RoomTypesCommon {
 	checkCondition(roomType) {

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

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

packages/rocketchat-lib/lib/RoomTypesCommon.js

@@ -1,6 +1,7 @@
 /* globals roomExit */
 import { Meteor } from 'meteor/meteor';
 import { RoomTypeConfig } from './RoomTypeConfig';
+import { FlowRouter } from 'meteor/kadira:flow-router';
 
 export class RoomTypesCommon {
 	constructor() {

packages/rocketchat-lib/lib/roomTypes/direct.js

@@ -1,5 +1,6 @@
 /* globals openRoom */
 import { Meteor } from 'meteor/meteor';
+import { Session } from 'meteor/session';
 import { RoomTypeConfig, RoomTypeRouteConfig, RoomSettingsEnum, UiTextContext } from '../RoomTypeConfig';
 
 export class DirectMessageRoomRoute extends RoomTypeRouteConfig {

packages/rocketchat-lib/package.js

@@ -35,6 +35,7 @@ Package.onUse(function(api) {
 
 	api.use('templating', 'client');
 	api.use('kadira:flow-router');
+	api.use('kadira:blaze-layout', 'client');
 
 	api.addFiles('lib/core.js');
 

packages/rocketchat-lib/server/lib/RateLimiter.js

@@ -1,5 +1,6 @@
 /* globals RateLimiter */
 import { Meteor } from 'meteor/meteor';
+import { DDPRateLimiter } from 'meteor/ddp-rate-limiter';
 import _ from 'underscore';
 
 RocketChat.RateLimiter = new class {

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

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { DDPRateLimiter } from 'meteor/ddp-rate-limiter';
 import * as Mailer from 'meteor/rocketchat:mailer';
 
 Meteor.methods({

packages/rocketchat-livechat/.app/client/lib/commands.js

@@ -1,5 +1,7 @@
 /* globals LivechatVideoCall, Livechat */
 import { Meteor } from 'meteor/meteor';
+import { Blaze } from 'meteor/blaze';
+import { Template } from 'meteor/templating';
 import swal from 'sweetalert2';
 import visitor from '../../imports/client/visitor';
 

packages/rocketchat-livechat/.app/client/lib/fromApp/RoomHistoryManager.js

@@ -2,6 +2,7 @@
 
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { Blaze } from 'meteor/blaze';
 import visitor from '../../../imports/client/visitor';
 import _ from 'underscore';
 

packages/rocketchat-livechat/.app/client/lib/fromApp/avatar.js

@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Session } from 'meteor/session';
 
 this.getAvatarUrlFromUsername = (username) => {
 	const key = `avatar_random_${ username }`;

packages/rocketchat-livechat/.app/client/lib/triggers.js

@@ -1,6 +1,7 @@
 /* globals Livechat */
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
+import { Session } from 'meteor/session';
 import visitor from '../../imports/client/visitor';
 
 const firedTriggers = JSON.parse(localStorage.getItem('rocketChatFiredTriggers')) || [];

packages/rocketchat-livechat/.app/client/routes/router.js

@@ -1,4 +1,6 @@
 import visitor from '../../imports/client/visitor';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
 BlazeLayout.setRoot('body');
 

packages/rocketchat-livechat/.app/client/views/avatar.js

@@ -1,4 +1,6 @@
 import { Meteor } from 'meteor/meteor';
+import { Session } from 'meteor/session';
+import { Template } from 'meteor/templating';
 import visitor from '../../imports/client/visitor';
 
 Template.avatar.helpers({

packages/rocketchat-livechat/.app/client/views/livechatWindow.js

@@ -1,5 +1,8 @@
 /* globals Department, Livechat, LivechatVideoCall */
 import { Meteor } from 'meteor/meteor';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Session } from 'meteor/session';
+import { Template } from 'meteor/templating';
 import visitor from '../../imports/client/visitor';
 
 function showDepartments() {

packages/rocketchat-livechat/.app/client/views/message.js

@@ -1,4 +1,6 @@
 /* globals Livechat, t, tr, livechatAutolinker */
+import { Blaze } from 'meteor/blaze';
+import { Template } from 'meteor/templating';
 import moment from 'moment';
 import visitor from '../../imports/client/visitor';
 import s from 'underscore.string';

packages/rocketchat-livechat/.app/client/views/messageAttachment.js

@@ -1,3 +1,5 @@
+import { Template } from 'meteor/templating';
+
 Template.messageAttachment.helpers({
 
 	getImageHeight(height = 200) {

packages/rocketchat-livechat/.app/client/views/messages.js

@@ -1,6 +1,7 @@
 /* globals Livechat, LivechatVideoCall, MsgTyping, fileUpload */
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { Template } from 'meteor/templating';
 import visitor from '../../imports/client/visitor';
 import _ from 'underscore';
 import mime from 'mime-type/with-db';

packages/rocketchat-livechat/.app/client/views/offlineForm.js

@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { Template } from 'meteor/templating';
 import _ from 'underscore';
 import s from 'underscore.string';
 

packages/rocketchat-livechat/.app/client/views/options.js

@@ -1,5 +1,6 @@
 /* globals Department, Livechat */
 import { Meteor } from 'meteor/meteor';
+import { Template } from 'meteor/templating';
 import swal from 'sweetalert2';
 import visitor from '../../imports/client/visitor';