From ce3da9eac308d286754735eeb4f6b45425adea6f Mon Sep 17 00:00:00 2001 From: Marcos Spessatto Defendi Date: Thu, 20 Dec 2018 10:09:32 -0200 Subject: [PATCH] Remove /* globals */ wave 4 (#12999) * Remove /* globals */ from files wave 1 * Fix lint * Remove /* globals */ wave 2 * remove-globals-wave-3 * Remove /* globals */ wave 4 * Remove some // eslint comments --- .eslintrc | 10 ++++++++++ .scripts/version.js | 2 -- packages/rocketchat-grant/server/providers.js | 5 ++--- .../rocketchat-lib/client/lib/openRoom.js | 6 +++--- .../server/methods/saveSetting.js | 1 - .../server/methods/saveCustomField.js | 1 - .../server/methods/saveInfo.js | 1 - .../server/methods/saveSurveyFeedback.js | 1 - .../server/methods/startVideoCall.js | 1 - .../server/methods/transfer.js | 2 -- .../client/sidebarHeader.js | 4 ++-- .../client/lib/RoomHistoryManager.js | 3 +-- .../rocketchat-ui/client/lib/RoomManager.js | 5 ++--- .../rocketchat-ui/client/lib/accountBox.js | 2 +- packages/rocketchat-ui/client/lib/avatar.js | 3 +-- .../rocketchat-ui/client/lib/chatMessages.js | 4 ++-- .../rocketchat-ui/client/lib/collections.js | 20 +++++++++---------- .../rocketchat-ui/client/lib/fireEvent.js | 2 +- .../rocketchat-ui/client/lib/notification.js | 6 +++--- packages/rocketchat-ui/client/lib/rocket.js | 1 - packages/rocketchat-ui/client/lib/sideNav.js | 2 +- packages/rocketchat-ui/client/lib/tapi18n.js | 2 +- .../rocketchat-ui/client/views/app/alerts.js | 3 +-- .../rocketchat-ui/client/views/app/modal.js | 1 - .../rocketchat-ui/client/views/app/popout.js | 1 - .../rocketchat-ui/client/views/app/popover.js | 3 +-- .../rocketchat-ui/client/views/app/room.js | 6 ++---- .../client/views/app/secretURL.js | 1 - .../views/app/videoCall/videoButtons.js | 2 +- .../client/views/app/videoCall/videoCall.js | 2 +- .../rocketchat-ui/getAvatarUrlFromUsername.js | 2 +- packages/rocketchat-ui/package.js | 1 + .../client/views/videoFlexTab.js | 2 -- .../client/views/videoFlexTabBbb.js | 1 - .../rocketchat-webrtc/client/WebRTCClass.js | 2 +- .../rocketchat-webrtc/client/screenShare.js | 3 +-- packages/tap-i18n/lib/globals.js | 1 - .../tap-i18n/lib/plugin/etc/language_names.js | 1 - .../lib/tap_i18next/tap_i18next_init.js | 3 +-- server/lib/cordova.js | 2 +- server/methods/deleteFileMessage.js | 2 +- server/methods/eraseRoom.js | 2 +- server/methods/getAvatarSuggestion.js | 2 +- server/methods/getUsernameSuggestion.js | 2 +- server/methods/ignoreUser.js | 2 +- server/startup/avatar.js | 2 +- server/startup/cron.js | 3 ++- server/startup/migrations/v002.js | 2 +- server/startup/migrations/v007.js | 2 +- server/startup/presence.js | 4 +++- server/startup/serverRunning.js | 3 +-- server/stream/streamBroadcast.js | 4 ++-- 52 files changed, 68 insertions(+), 83 deletions(-) diff --git a/.eslintrc b/.eslintrc index cc352eef163..7ee543533e7 100644 --- a/.eslintrc +++ b/.eslintrc @@ -8,35 +8,43 @@ "alerts" : false, "Apps" : false, "Assets" : false, + "AudioRecorder" : false, "CachedChatSubscription" : false, "ChatMessage" : false, "ChatMessages" : false, "chatMessages" : false, "ChatRoom" : false, "ChatSubscription" : false, + "chrome" : false, "cordova" : false, "device" : false, "DynamicCss" : false, "facebookConnectPlugin" : false, "FileUpload" : false, + "fileUpload" : false, "fileUploadHandler" : false, "fireGlobalEvent" : false, "handleError" : false, "getAvatarUrlFromUsername" : false, "getAvatarSuggestionForUser" : false, + "globals" : true, "isChrome" : false, "isFirefox" : false, "isRtl" : false, + "JitsiMeetExternalAPI" : false, "jscolor" : false, "KonchatNotification" : false, + "language_names" : true, "msgStream" : false, "MsgTyping" : false, "modal" : false, + "Modernizr" : false, "menu" : false, "Npm" : false, "openRoom" : false, "OnePassword" : false, "Package" : false, + "popout" : false, "popover" : false, "readMessage" : false, "RocketChat" : true, @@ -47,9 +55,11 @@ "Servers" : false, "Settings" : false, "SideNav" : false, + "TAPi18next" : false, "t" : false, "toolbarSearch" : false, "TwitterConnect" : false, + "updateAvatarOfUsername" : false, "UserRoles" : false, "VideoRecorder" : false, "VRecDialog" : false diff --git a/.scripts/version.js b/.scripts/version.js index cd18c671143..79f523ab48d 100644 --- a/.scripts/version.js +++ b/.scripts/version.js @@ -1,5 +1,3 @@ -/* eslint object-shorthand: 0, prefer-template: 0 */ - const path = require('path'); let pkgJson = {}; diff --git a/packages/rocketchat-grant/server/providers.js b/packages/rocketchat-grant/server/providers.js index a4983a5b6df..ba9de5d65fe 100644 --- a/packages/rocketchat-grant/server/providers.js +++ b/packages/rocketchat-grant/server/providers.js @@ -1,4 +1,4 @@ -import { check } from 'meteor/check'; +import { Match, check } from 'meteor/check'; import { Storage } from './storage'; import { routes } from './routes'; @@ -7,8 +7,7 @@ class Providers extends Storage { register(name, options, getUser) { check(name, String); check(options, { - // eslint-disable-next-line - scope: Match.OneOf(String, [String]) + scope: Match.OneOf(String, [String]), }); check(getUser, Function); diff --git a/packages/rocketchat-lib/client/lib/openRoom.js b/packages/rocketchat-lib/client/lib/openRoom.js index 56e766bb150..5a43167f236 100644 --- a/packages/rocketchat-lib/client/lib/openRoom.js +++ b/packages/rocketchat-lib/client/lib/openRoom.js @@ -7,7 +7,7 @@ import _ from 'underscore'; export let currentTracker = undefined; -openRoom = function(type, name) { // eslint-disable-line +openRoom = function(type, name) { Session.set('openedRoom', null); return Meteor.defer(() => @@ -33,7 +33,7 @@ openRoom = function(type, name) { // eslint-disable-line Meteor.call('createDirectMessage', name, function(error) { if (!error) { RoomManager.close(type + name); - return openRoom('d', name); // eslint-disable-line + return openRoom('d', name); } else { Session.set('roomNotFound', { type, name, error }); BlazeLayout.render('main', { center: 'roomNotFound' }); @@ -48,7 +48,7 @@ openRoom = function(type, name) { // eslint-disable-line } else { RocketChat.models.Rooms.upsert({ _id: record._id }, _.omit(record, '_id')); RoomManager.close(type + name); - return openRoom(type, name); // eslint-disable-line + return openRoom(type, name); } }); } diff --git a/packages/rocketchat-lib/server/methods/saveSetting.js b/packages/rocketchat-lib/server/methods/saveSetting.js index ae0817c389e..724e24a494b 100644 --- a/packages/rocketchat-lib/server/methods/saveSetting.js +++ b/packages/rocketchat-lib/server/methods/saveSetting.js @@ -1,4 +1,3 @@ -/* eslint new-cap: 0 */ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; diff --git a/packages/rocketchat-livechat/server/methods/saveCustomField.js b/packages/rocketchat-livechat/server/methods/saveCustomField.js index 58e22a4bde2..567f1d92957 100644 --- a/packages/rocketchat-livechat/server/methods/saveCustomField.js +++ b/packages/rocketchat-livechat/server/methods/saveCustomField.js @@ -1,4 +1,3 @@ -/* eslint new-cap: [2, {"capIsNewExceptions": ["Match.ObjectIncluding", "Match.Optional"]}] */ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; import { RocketChat } from 'meteor/rocketchat:lib'; diff --git a/packages/rocketchat-livechat/server/methods/saveInfo.js b/packages/rocketchat-livechat/server/methods/saveInfo.js index 19f14a9970c..663a8abf56c 100644 --- a/packages/rocketchat-livechat/server/methods/saveInfo.js +++ b/packages/rocketchat-livechat/server/methods/saveInfo.js @@ -1,4 +1,3 @@ -/* eslint new-cap: [2, {"capIsNewExceptions": ["Match.ObjectIncluding", "Match.Optional"]}] */ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; import { RocketChat } from 'meteor/rocketchat:lib'; diff --git a/packages/rocketchat-livechat/server/methods/saveSurveyFeedback.js b/packages/rocketchat-livechat/server/methods/saveSurveyFeedback.js index 9554cf7b358..4636a42a7a4 100644 --- a/packages/rocketchat-livechat/server/methods/saveSurveyFeedback.js +++ b/packages/rocketchat-livechat/server/methods/saveSurveyFeedback.js @@ -1,4 +1,3 @@ -/* eslint new-cap: [2, {"capIsNewExceptions": ["Match.ObjectIncluding"]}] */ import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; import { RocketChat } from 'meteor/rocketchat:lib'; diff --git a/packages/rocketchat-livechat/server/methods/startVideoCall.js b/packages/rocketchat-livechat/server/methods/startVideoCall.js index d7ecb67a0f6..12da5cdd76d 100644 --- a/packages/rocketchat-livechat/server/methods/startVideoCall.js +++ b/packages/rocketchat-livechat/server/methods/startVideoCall.js @@ -1,4 +1,3 @@ -/* eslint new-cap: [2, {"capIsNewExceptions": ["MD5"]}] */ import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; import { RocketChat } from 'meteor/rocketchat:lib'; diff --git a/packages/rocketchat-livechat/server/methods/transfer.js b/packages/rocketchat-livechat/server/methods/transfer.js index aaa857982b0..eabe665348d 100644 --- a/packages/rocketchat-livechat/server/methods/transfer.js +++ b/packages/rocketchat-livechat/server/methods/transfer.js @@ -1,5 +1,3 @@ -/* eslint new-cap: [2, {"capIsNewExceptions": ["Match.Optional"]}] */ - import { Meteor } from 'meteor/meteor'; import { Match, check } from 'meteor/check'; import { RocketChat } from 'meteor/rocketchat:lib'; diff --git a/packages/rocketchat-ui-sidenav/client/sidebarHeader.js b/packages/rocketchat-ui-sidenav/client/sidebarHeader.js index 4c540e7b190..2ca64d93d6c 100644 --- a/packages/rocketchat-ui-sidenav/client/sidebarHeader.js +++ b/packages/rocketchat-ui-sidenav/client/sidebarHeader.js @@ -38,7 +38,7 @@ const extendedViewOption = (user) => { const showToolbar = new ReactiveVar(false); const selectorSearch = '.toolbar__search .rc-input__element'; -toolbarSearch = { //eslint-disable-line +toolbarSearch = { shortcut: false, clear() { const $inputMessage = $('.js-input-message'); @@ -67,7 +67,7 @@ const toolbarButtons = (user) => [{ name: t('Search'), icon: 'magnifier', action: () => { - toolbarSearch.show(false); //eslint-disable-line + toolbarSearch.show(false); }, }, { diff --git a/packages/rocketchat-ui/client/lib/RoomHistoryManager.js b/packages/rocketchat-ui/client/lib/RoomHistoryManager.js index 42bf22cfb42..e36aaa2d86e 100644 --- a/packages/rocketchat-ui/client/lib/RoomHistoryManager.js +++ b/packages/rocketchat-ui/client/lib/RoomHistoryManager.js @@ -1,4 +1,3 @@ -/* globals readMessage UserRoles RoomRoles*/ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Blaze } from 'meteor/blaze'; @@ -22,7 +21,7 @@ export const upsertMessage = ({ msg, subscription }) => { return ChatMessage.upsert({ _id: msg._id }, msg); }; -RoomHistoryManager = new class { //eslint-disable-line +RoomHistoryManager = new class { constructor() { this.defaultLimit = 50; this.histories = {}; diff --git a/packages/rocketchat-ui/client/lib/RoomManager.js b/packages/rocketchat-ui/client/lib/RoomManager.js index 36426ca3391..f5ed7d5f69e 100644 --- a/packages/rocketchat-ui/client/lib/RoomManager.js +++ b/packages/rocketchat-ui/client/lib/RoomManager.js @@ -6,7 +6,7 @@ import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; import _ from 'underscore'; import { upsertMessage } from './RoomHistoryManager'; - +import { CachedChatRoom } from './collections'; const maxRoomsOpen = parseInt(localStorage && localStorage.getItem('rc-maxRoomsOpen')) || 5 ; @@ -22,14 +22,13 @@ const onDeleteMessageBulkStream = ({ rid, ts, excludePinned, users }) => { ChatMessage.remove(query); }; -RoomManager = new function() { //eslint-disable-line +RoomManager = new function() { const openedRooms = {}; const msgStream = new Meteor.Streamer('room-messages'); const onlineUsers = new ReactiveVar({}); const Dep = new Tracker.Dependency(); const Cls = class { static initClass() { - /* globals CachedChatRoom CachedChatSubscription */ this.prototype.openedRooms = openedRooms; this.prototype.onlineUsers = onlineUsers; this.prototype.computation = Tracker.autorun(() => { diff --git a/packages/rocketchat-ui/client/lib/accountBox.js b/packages/rocketchat-ui/client/lib/accountBox.js index f5ead2eed53..3c08a3b34d6 100644 --- a/packages/rocketchat-ui/client/lib/accountBox.js +++ b/packages/rocketchat-ui/client/lib/accountBox.js @@ -6,7 +6,7 @@ import { BlazeLayout } from 'meteor/kadira:blaze-layout'; import { Session } from 'meteor/session'; import _ from 'underscore'; -AccountBox = (function() { //eslint-disable-line +AccountBox = (function() { let status = 0; const items = new ReactiveVar([]); function setStatus(status) { diff --git a/packages/rocketchat-ui/client/lib/avatar.js b/packages/rocketchat-ui/client/lib/avatar.js index 43eaede3db4..b5920a8c1f8 100644 --- a/packages/rocketchat-ui/client/lib/avatar.js +++ b/packages/rocketchat-ui/client/lib/avatar.js @@ -24,8 +24,7 @@ export const getAvatarAsPng = function(username, cb) { }; }; -updateAvatarOfUsername = function(username) { //eslint-disable-line - +updateAvatarOfUsername = function(username) { const key = `avatar_random_${ username }`; Session.set(key, Math.round(Math.random() * 1000)); diff --git a/packages/rocketchat-ui/client/lib/chatMessages.js b/packages/rocketchat-ui/client/lib/chatMessages.js index 629c913d135..e04755f3634 100644 --- a/packages/rocketchat-ui/client/lib/chatMessages.js +++ b/packages/rocketchat-ui/client/lib/chatMessages.js @@ -19,10 +19,10 @@ Meteor.startup(() => { }); }); -ChatMessages = class ChatMessages { //eslint-disable-line +ChatMessages = class ChatMessages { constructor() { - this.saveTextMessageBox = _.debounce((rid, value) => { // eslint + this.saveTextMessageBox = _.debounce((rid, value) => { const key = `messagebox_${ rid }`; return value.length ? localStorage.setItem(key, value) : localStorage.removeItem(key); }, 1000); diff --git a/packages/rocketchat-ui/client/lib/collections.js b/packages/rocketchat-ui/client/lib/collections.js index bcf54ee7111..0b54d4fd1a3 100644 --- a/packages/rocketchat-ui/client/lib/collections.js +++ b/packages/rocketchat-ui/client/lib/collections.js @@ -3,28 +3,28 @@ import { Mongo } from 'meteor/mongo'; import { Tracker } from 'meteor/tracker'; import _ from 'underscore'; -ChatMessage = new Mongo.Collection(null); //eslint-disable-line -this.CachedChatRoom = new RocketChat.CachedCollection({ name: 'rooms' }); -ChatRoom = this.CachedChatRoom.collection; +ChatMessage = new Mongo.Collection(null); +export const CachedChatRoom = new RocketChat.CachedCollection({ name: 'rooms' }); +ChatRoom = CachedChatRoom.collection; -CachedChatSubscription = new RocketChat.CachedCollection({ name: 'subscriptions' }); //eslint-disable-line -ChatSubscription = CachedChatSubscription.collection; //eslint-disable-line -UserRoles = new Mongo.Collection(null); //eslint-disable-line -RoomRoles = new Mongo.Collection(null); //eslint-disable-line +CachedChatSubscription = new RocketChat.CachedCollection({ name: 'subscriptions' }); +ChatSubscription = CachedChatSubscription.collection; +UserRoles = new Mongo.Collection(null); +RoomRoles = new Mongo.Collection(null); this.UserAndRoom = new Mongo.Collection(null); this.CachedChannelList = new Mongo.Collection(null); this.CachedUserList = new Mongo.Collection(null); RocketChat.models.Users = _.extend({}, RocketChat.models.Users, Meteor.users); -RocketChat.models.Subscriptions = _.extend({}, RocketChat.models.Subscriptions, ChatSubscription); //eslint-disable-line +RocketChat.models.Subscriptions = _.extend({}, RocketChat.models.Subscriptions, ChatSubscription); RocketChat.models.Rooms = _.extend({}, RocketChat.models.Rooms, ChatRoom); RocketChat.models.Messages = _.extend({}, RocketChat.models.Messages, ChatMessage); Meteor.startup(() => { Tracker.autorun(() => { if (!Meteor.userId() && RocketChat.settings.get('Accounts_AllowAnonymousRead') === true) { - this.CachedChatRoom.init(); - CachedChatSubscription.ready.set(true); //eslint-disable-line + CachedChatRoom.init(); + CachedChatSubscription.ready.set(true); } }); }); diff --git a/packages/rocketchat-ui/client/lib/fireEvent.js b/packages/rocketchat-ui/client/lib/fireEvent.js index aa3908c7052..c0d50a6b66e 100644 --- a/packages/rocketchat-ui/client/lib/fireEvent.js +++ b/packages/rocketchat-ui/client/lib/fireEvent.js @@ -1,6 +1,6 @@ import { Tracker } from 'meteor/tracker'; -fireGlobalEvent = function _fireGlobalEvent(eventName, params) { //eslint-disable-line +fireGlobalEvent = function _fireGlobalEvent(eventName, params) { window.dispatchEvent(new CustomEvent(eventName, { detail: params })); Tracker.autorun((computation) => { diff --git a/packages/rocketchat-ui/client/lib/notification.js b/packages/rocketchat-ui/client/lib/notification.js index 45bbb61d84c..c8e43ef2087 100644 --- a/packages/rocketchat-ui/client/lib/notification.js +++ b/packages/rocketchat-ui/client/lib/notification.js @@ -10,14 +10,14 @@ import s from 'underscore.string'; import { e2e } from 'meteor/rocketchat:e2e'; import { getAvatarAsPng } from './avatar'; -KonchatNotification = { //eslint-disable-line +KonchatNotification = { notificationStatus: new ReactiveVar, // notificacoes HTML5 getDesktopPermission() { if (window.Notification && (Notification.permission !== 'granted') && !Meteor.settings.public.sandstorm) { return Notification.requestPermission(function(status) { - KonchatNotification.notificationStatus.set(status); //eslint-disable-line + KonchatNotification.notificationStatus.set(status); if (Notification.permission !== status) { return Notification.permission = status; } @@ -88,7 +88,7 @@ KonchatNotification = { //eslint-disable-line return getAvatarAsPng(notification.payload.sender.username, function(avatarAsPng) { notification.icon = avatarAsPng; - return KonchatNotification.notify(notification); //eslint-disable-line + return KonchatNotification.notify(notification); }); }, diff --git a/packages/rocketchat-ui/client/lib/rocket.js b/packages/rocketchat-ui/client/lib/rocket.js index 38321bdfd77..87e2679835b 100644 --- a/packages/rocketchat-ui/client/lib/rocket.js +++ b/packages/rocketchat-ui/client/lib/rocket.js @@ -1,4 +1,3 @@ -/* globals Modernizr */ RocketChat.Login = (function() { function onClick(el) { const $el = $(el); diff --git a/packages/rocketchat-ui/client/lib/sideNav.js b/packages/rocketchat-ui/client/lib/sideNav.js index a7193113f37..3c1a283bae2 100644 --- a/packages/rocketchat-ui/client/lib/sideNav.js +++ b/packages/rocketchat-ui/client/lib/sideNav.js @@ -1,7 +1,7 @@ import { FlowRouter } from 'meteor/kadira:flow-router'; import { Session } from 'meteor/session'; -SideNav = new class { //eslint-disable-line +SideNav = new class { constructor() { this.initiated = false; this.sideNav = {}; diff --git a/packages/rocketchat-ui/client/lib/tapi18n.js b/packages/rocketchat-ui/client/lib/tapi18n.js index 148d3a4cb0d..14ef48497ab 100644 --- a/packages/rocketchat-ui/client/lib/tapi18n.js +++ b/packages/rocketchat-ui/client/lib/tapi18n.js @@ -23,7 +23,7 @@ this.tr = function(key, options, ...replaces) { } }; -isRtl = (lang) => { //eslint-disable-line +isRtl = (lang) => { const language = lang || localStorage.getItem('userLanguage') || 'en-US'; return ['ar', 'dv', 'fa', 'he', 'ku', 'ps', 'sd', 'ug', 'ur', 'yi'].includes(language.split('-').shift().toLowerCase()); }; diff --git a/packages/rocketchat-ui/client/views/app/alerts.js b/packages/rocketchat-ui/client/views/app/alerts.js index 7acb2ed6dd3..1ebe6e6609e 100644 --- a/packages/rocketchat-ui/client/views/app/alerts.js +++ b/packages/rocketchat-ui/client/views/app/alerts.js @@ -1,8 +1,7 @@ -/* globals alerts */ import { Blaze } from 'meteor/blaze'; import { Template } from 'meteor/templating'; -alerts = { //eslint-disable-line +alerts = { renderedAlert: null, open(config) { this.close(false); diff --git a/packages/rocketchat-ui/client/views/app/modal.js b/packages/rocketchat-ui/client/views/app/modal.js index f20bffda3a3..481e8383ffc 100644 --- a/packages/rocketchat-ui/client/views/app/modal.js +++ b/packages/rocketchat-ui/client/views/app/modal.js @@ -1,4 +1,3 @@ -/* globals modal */ import { Meteor } from 'meteor/meteor'; import { Blaze } from 'meteor/blaze'; import { Template } from 'meteor/templating'; diff --git a/packages/rocketchat-ui/client/views/app/popout.js b/packages/rocketchat-ui/client/views/app/popout.js index 2450dd89225..a877a9acad3 100644 --- a/packages/rocketchat-ui/client/views/app/popout.js +++ b/packages/rocketchat-ui/client/views/app/popout.js @@ -1,4 +1,3 @@ -/* eslint-disable */ import { Blaze } from 'meteor/blaze'; import { ReactiveVar } from 'meteor/reactive-var'; import { Template } from 'meteor/templating'; diff --git a/packages/rocketchat-ui/client/views/app/popover.js b/packages/rocketchat-ui/client/views/app/popover.js index 1959125f764..f43104cce60 100644 --- a/packages/rocketchat-ui/client/views/app/popover.js +++ b/packages/rocketchat-ui/client/views/app/popover.js @@ -1,4 +1,3 @@ -/* globals popover isRtl */ import { Meteor } from 'meteor/meteor'; import { Blaze } from 'meteor/blaze'; import { FlowRouter } from 'meteor/kadira:flow-router'; @@ -8,7 +7,7 @@ import _ from 'underscore'; import { hide, leave } from 'meteor/rocketchat:lib'; -popover = { //eslint-disable-line +popover = { renderedPopover: null, open({ currentTarget, ...config }) { // Popover position must be computed as soon as possible, avoiding DOM changes over currentTarget diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js index d56353a7732..b250fe94fcb 100644 --- a/packages/rocketchat-ui/client/views/app/room.js +++ b/packages/rocketchat-ui/client/views/app/room.js @@ -1,4 +1,3 @@ -/* globals chatMessages, fileUpload , fireGlobalEvent , cordova , readMessage , RoomRoles, popover , device */ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Random } from 'meteor/random'; @@ -8,7 +7,7 @@ import { FlowRouter } from 'meteor/kadira:flow-router'; import { RocketChatTabBar } from 'meteor/rocketchat:lib'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; - +import { WebRTC } from 'meteor/rocketchat:webrtc'; import _ from 'underscore'; import moment from 'moment'; import mime from 'mime-type/with-db'; @@ -16,7 +15,7 @@ import Clipboard from 'clipboard'; import { lazyloadtick } from 'meteor/rocketchat:lazy-load'; -chatMessages = {}; // eslint-disable-line +chatMessages = {}; const isSubscribed = (_id) => ChatSubscription.find({ rid: _id }).count() > 0; const favoritesEnabled = () => RocketChat.settings.get('Favorite_Rooms'); @@ -1114,7 +1113,6 @@ Template.room.onRendered(function() { }); wrapper.addEventListener('scroll', () => updateUnreadCount()); - /* globals WebRTC */ // salva a data da renderização para exibir alertas de novas mensagens $.data(this.firstNode, 'renderedAt', new Date); diff --git a/packages/rocketchat-ui/client/views/app/secretURL.js b/packages/rocketchat-ui/client/views/app/secretURL.js index 6a9e7cf8942..f8b1f3fc709 100644 --- a/packages/rocketchat-ui/client/views/app/secretURL.js +++ b/packages/rocketchat-ui/client/views/app/secretURL.js @@ -1,4 +1,3 @@ -/* globals KonchatNotification */ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { FlowRouter } from 'meteor/kadira:flow-router'; diff --git a/packages/rocketchat-ui/client/views/app/videoCall/videoButtons.js b/packages/rocketchat-ui/client/views/app/videoCall/videoButtons.js index f43a0fcad29..6f8ed24b20e 100644 --- a/packages/rocketchat-ui/client/views/app/videoCall/videoButtons.js +++ b/packages/rocketchat-ui/client/views/app/videoCall/videoButtons.js @@ -1,6 +1,6 @@ -/* globals WebRTC */ import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; +import { WebRTC } from 'meteor/rocketchat:webrtc'; Template.videoButtons.helpers({ videoAvaliable() { diff --git a/packages/rocketchat-ui/client/views/app/videoCall/videoCall.js b/packages/rocketchat-ui/client/views/app/videoCall/videoCall.js index 3a76a2176b1..00c4cb2163c 100644 --- a/packages/rocketchat-ui/client/views/app/videoCall/videoCall.js +++ b/packages/rocketchat-ui/client/views/app/videoCall/videoCall.js @@ -1,8 +1,8 @@ -/* globals WebRTC */ import { Meteor } from 'meteor/meteor'; import { ReactiveVar } from 'meteor/reactive-var'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; +import { WebRTC } from 'meteor/rocketchat:webrtc'; Template.videoCall.onCreated(function() { return this.mainVideo = new ReactiveVar('$auto'); diff --git a/packages/rocketchat-ui/getAvatarUrlFromUsername.js b/packages/rocketchat-ui/getAvatarUrlFromUsername.js index 11313a0757b..1f09d9b6e7c 100644 --- a/packages/rocketchat-ui/getAvatarUrlFromUsername.js +++ b/packages/rocketchat-ui/getAvatarUrlFromUsername.js @@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor'; import { Session } from 'meteor/session'; -getAvatarUrlFromUsername = function(username) { //eslint-disable-line +getAvatarUrlFromUsername = function(username) { const key = `avatar_random_${ username }`; const random = typeof Session !== 'undefined' && typeof Session.keys[key] !== 'undefined' ? Session.keys[key] : 0; if (username == null) { diff --git a/packages/rocketchat-ui/package.js b/packages/rocketchat-ui/package.js index 1d7bff405e8..5d224c996dc 100644 --- a/packages/rocketchat-ui/package.js +++ b/packages/rocketchat-ui/package.js @@ -29,6 +29,7 @@ Package.onUse(function(api) { 'mizzao:autocomplete', 'rocketchat:file-upload', 'konecty:user-presence', + 'rocketchat:webrtc', ]); api.use('kadira:flow-router', 'client'); diff --git a/packages/rocketchat-videobridge/client/views/videoFlexTab.js b/packages/rocketchat-videobridge/client/views/videoFlexTab.js index 4be20574d3e..52ed27b4050 100644 --- a/packages/rocketchat-videobridge/client/views/videoFlexTab.js +++ b/packages/rocketchat-videobridge/client/views/videoFlexTab.js @@ -1,5 +1,3 @@ -/* eslint new-cap: [2, {"capIsNewExceptions": ["MD5"]}] */ -/* globals JitsiMeetExternalAPI */ import { Meteor } from 'meteor/meteor'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; diff --git a/packages/rocketchat-videobridge/client/views/videoFlexTabBbb.js b/packages/rocketchat-videobridge/client/views/videoFlexTabBbb.js index fc863862eaf..8d9e9d56e6e 100644 --- a/packages/rocketchat-videobridge/client/views/videoFlexTabBbb.js +++ b/packages/rocketchat-videobridge/client/views/videoFlexTabBbb.js @@ -1,4 +1,3 @@ -/* eslint new-cap: [2, {"capIsNewExceptions": ["MD5"]}] */ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; import { RocketChat } from 'meteor/rocketchat:lib'; diff --git a/packages/rocketchat-webrtc/client/WebRTCClass.js b/packages/rocketchat-webrtc/client/WebRTCClass.js index 604d27cd69e..3bb61d24f4f 100644 --- a/packages/rocketchat-webrtc/client/WebRTCClass.js +++ b/packages/rocketchat-webrtc/client/WebRTCClass.js @@ -1,9 +1,9 @@ -/* globals chrome, ChromeScreenShare */ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; import { ReactiveVar } from 'meteor/reactive-var'; import { FlowRouter } from 'meteor/kadira:flow-router' ; import { TAPi18n } from 'meteor/tap:i18n'; +import { ChromeScreenShare } from './screenShare'; class WebRTCTransportClass { constructor(webrtcInstance) { diff --git a/packages/rocketchat-webrtc/client/screenShare.js b/packages/rocketchat-webrtc/client/screenShare.js index 4167f4dd0bd..742599143db 100644 --- a/packages/rocketchat-webrtc/client/screenShare.js +++ b/packages/rocketchat-webrtc/client/screenShare.js @@ -1,5 +1,4 @@ -/* globals ChromeScreenShare, fireGlobalEvent */ -this.ChromeScreenShare = { +export const ChromeScreenShare = { callbacks: {}, installed: false, init() { diff --git a/packages/tap-i18n/lib/globals.js b/packages/tap-i18n/lib/globals.js index e9c4edbe3a0..637d36c8c3f 100755 --- a/packages/tap-i18n/lib/globals.js +++ b/packages/tap-i18n/lib/globals.js @@ -2,7 +2,6 @@ // the client /* eslint no-unused-vars: 0 */ -/* globals globals: 1 */ globals = { fallback_language: 'en', diff --git a/packages/tap-i18n/lib/plugin/etc/language_names.js b/packages/tap-i18n/lib/plugin/etc/language_names.js index 7dfd07abb1f..c55689742cb 100755 --- a/packages/tap-i18n/lib/plugin/etc/language_names.js +++ b/packages/tap-i18n/lib/plugin/etc/language_names.js @@ -1,5 +1,4 @@ /* eslint no-unused-vars: 0 */ -/* globals language_names: 1 */ language_names = { af: ['Afrikaans', 'Afrikaans'], diff --git a/packages/tap-i18n/lib/tap_i18next/tap_i18next_init.js b/packages/tap-i18n/lib/tap_i18next/tap_i18next_init.js index a3417a2be07..2d9cc458246 100755 --- a/packages/tap-i18n/lib/tap_i18next/tap_i18next_init.js +++ b/packages/tap-i18n/lib/tap_i18next/tap_i18next_init.js @@ -1,2 +1 @@ -/* globals globals: 1 */ -TAPi18next.init({ resStore: {}, fallbackLng: globals.fallback_language, useCookie: false }); // eslint-disable-line +TAPi18next.init({ resStore: {}, fallbackLng: globals.fallback_language, useCookie: false }); diff --git a/server/lib/cordova.js b/server/lib/cordova.js index 3e9ac8b2ec9..2eb5a33a0c0 100644 --- a/server/lib/cordova.js +++ b/server/lib/cordova.js @@ -1,8 +1,8 @@ -/* global Push */ import { Meteor } from 'meteor/meteor'; import { HTTP } from 'meteor/http'; import { TAPi18n } from 'meteor/tap:i18n'; import { SystemLogger } from 'meteor/rocketchat:logger'; +import { Push } from 'meteor/rocketchat:push'; Meteor.methods({ // log() { diff --git a/server/methods/deleteFileMessage.js b/server/methods/deleteFileMessage.js index 3fdc4ca43d9..6f033a29511 100644 --- a/server/methods/deleteFileMessage.js +++ b/server/methods/deleteFileMessage.js @@ -1,6 +1,6 @@ -/* global FileUpload */ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; +import { FileUpload } from 'meteor/rocketchat:file-upload'; Meteor.methods({ deleteFileMessage(fileID) { diff --git a/server/methods/eraseRoom.js b/server/methods/eraseRoom.js index b4f901643d2..bdd9d8491d4 100644 --- a/server/methods/eraseRoom.js +++ b/server/methods/eraseRoom.js @@ -1,6 +1,6 @@ -/* globals RocketChat */ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; +import { RocketChat } from 'meteor/rocketchat:lib'; Meteor.methods({ eraseRoom(rid) { diff --git a/server/methods/getAvatarSuggestion.js b/server/methods/getAvatarSuggestion.js index 12cfcc2337a..7b22428b96d 100644 --- a/server/methods/getAvatarSuggestion.js +++ b/server/methods/getAvatarSuggestion.js @@ -1,7 +1,7 @@ -/* global Gravatar */ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; import { HTTP } from 'meteor/http'; +import { Gravatar } from 'meteor/jparker:gravatar'; function getAvatarSuggestionForUser(user) { check(user, Object); diff --git a/server/methods/getUsernameSuggestion.js b/server/methods/getUsernameSuggestion.js index f7b2a0c5bf1..076bd08e052 100644 --- a/server/methods/getUsernameSuggestion.js +++ b/server/methods/getUsernameSuggestion.js @@ -1,5 +1,5 @@ -/* global slugify */ import { Meteor } from 'meteor/meteor'; +import { slugify } from 'meteor/yasaricli:slugify'; function slug(text) { return slugify(text, '.').replace(/[^0-9a-z-_.]/g, ''); diff --git a/server/methods/ignoreUser.js b/server/methods/ignoreUser.js index ac171cdcbf4..a968b213e4e 100644 --- a/server/methods/ignoreUser.js +++ b/server/methods/ignoreUser.js @@ -1,6 +1,6 @@ -/* globals RocketChat */ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; +import { RocketChat } from 'meteor/rocketchat:lib'; Meteor.methods({ ignoreUser({ rid, userId: ignoredUser, ignore = true }) { diff --git a/server/startup/avatar.js b/server/startup/avatar.js index f1e66b5408d..bb589e9aa38 100644 --- a/server/startup/avatar.js +++ b/server/startup/avatar.js @@ -1,9 +1,9 @@ -/* globals FileUpload */ import { WebApp } from 'meteor/webapp'; import { Meteor } from 'meteor/meteor'; import _ from 'underscore'; import sharp from 'sharp'; import { Cookies } from 'meteor/ostrio:cookies'; +import { FileUpload } from 'meteor/rocketchat:file-upload'; const cookie = new Cookies(); diff --git a/server/startup/cron.js b/server/startup/cron.js index 49e251ffd96..a4b5130d645 100644 --- a/server/startup/cron.js +++ b/server/startup/cron.js @@ -1,7 +1,8 @@ -/* global SyncedCron */ import { Meteor } from 'meteor/meteor'; import { HTTP } from 'meteor/http'; import { Logger } from 'meteor/rocketchat:logger'; +import { SyncedCron } from 'meteor/littledata:synced-cron'; + const logger = new Logger('SyncedCron'); SyncedCron.config({ diff --git a/server/startup/migrations/v002.js b/server/startup/migrations/v002.js index 1da3b03d453..c9d8cdea99f 100644 --- a/server/startup/migrations/v002.js +++ b/server/startup/migrations/v002.js @@ -1,5 +1,5 @@ -/* globals getAvatarSuggestionForUser */ import { RocketChatFile } from 'meteor/rocketchat:file'; + RocketChat.Migrations.add({ version: 2, up() { diff --git a/server/startup/migrations/v007.js b/server/startup/migrations/v007.js index 9e6342cd41c..2a21bc87dfe 100644 --- a/server/startup/migrations/v007.js +++ b/server/startup/migrations/v007.js @@ -1,4 +1,4 @@ -/* globals OEmbed */ +import { OEmbed } from 'meteor/rocketchat:oembed'; import _ from 'underscore'; RocketChat.Migrations.add({ diff --git a/server/startup/presence.js b/server/startup/presence.js index 123aa230962..1337059aa7a 100644 --- a/server/startup/presence.js +++ b/server/startup/presence.js @@ -1,5 +1,7 @@ -/* globals InstanceStatus, UserPresence, UserPresenceMonitor */ import { Meteor } from 'meteor/meteor'; +import { InstanceStatus } from 'meteor/konecty:multiple-instances-status'; +import { UserPresence } from 'meteor/konecty:user-presence'; +import { UserPresenceMonitor } from 'meteor/konecty:user-presence'; Meteor.startup(function() { const instance = { diff --git a/server/startup/serverRunning.js b/server/startup/serverRunning.js index 12444d7d38c..2d73b4985aa 100644 --- a/server/startup/serverRunning.js +++ b/server/startup/serverRunning.js @@ -1,6 +1,5 @@ -/* globals MongoInternals */ - import { Meteor } from 'meteor/meteor'; +import { MongoInternals } from 'meteor/mongo'; import { SystemLogger } from 'meteor/rocketchat:logger'; import fs from 'fs'; import path from 'path'; diff --git a/server/stream/streamBroadcast.js b/server/stream/streamBroadcast.js index b0a8a68aeee..68045b4d91e 100644 --- a/server/stream/streamBroadcast.js +++ b/server/stream/streamBroadcast.js @@ -1,8 +1,8 @@ -/* global InstanceStatus, DDP */ - import { Meteor } from 'meteor/meteor'; +import { InstanceStatus } from 'meteor/konecty:multiple-instances-status'; import { check } from 'meteor/check'; import _ from 'underscore'; +import { DDP } from 'meteor/ddp'; import { DDPCommon } from 'meteor/ddp-common'; import { Logger, LoggerManager } from 'meteor/rocketchat:logger';