Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 28 commits into from
Nov 1, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
ad2cd8c
First wave of removal of Meteor global
rodrigok Oct 19, 2018
51095cb
Second wave of removal of Meteor global
rodrigok Oct 19, 2018
3f0c9f7
Third wave of removal of Meteor global
rodrigok Oct 19, 2018
e6dfe65
Fix tests
rodrigok Oct 19, 2018
6c46cd2
Merge remote-tracking branch 'origin/develop' into imports/meteor-1
rodrigok Oct 19, 2018
2ac4a38
Remove global variable SHA256
rodrigok Oct 19, 2018
0ebaa95
Remove global variable WebApp
rodrigok Oct 19, 2018
7db5aa9
Remove global variable EJSON
rodrigok Oct 19, 2018
bff9b31
Remove global variable Email
rodrigok Oct 19, 2018
4aafc1b
Remove global variable HTTP
rodrigok Oct 19, 2018
4551e92
Remove global variable Random
rodrigok Oct 19, 2018
501fec5
Remove global variable ReactiveDict
rodrigok Oct 19, 2018
963b5af
Remove global variable ReactiveVar
rodrigok Oct 19, 2018
103d8c5
Remove global variable Accounts
rodrigok Oct 19, 2018
7c99760
Remove globals variables Match and check
MarcosSpessatto Oct 24, 2018
b4dc88d
Remove global variable Mongo
MarcosSpessatto Oct 24, 2018
c813f5e
Remove global variable moment
MarcosSpessatto Oct 24, 2018
c3b9886
Remove global variable Tracker
MarcosSpessatto Oct 24, 2018
8fbd297
Merge branch 'develop' into imports/meteor-1
rodrigok Oct 30, 2018
9f53fab
Merge remote-tracking branch 'origin/imports/meteor-1' into imports/w…
rodrigok Oct 30, 2018
b844ba1
Fix ESLint
rodrigok Oct 30, 2018
a6b81b2
Merge remote-tracking branch 'origin/imports/meteor-1' into imports/w…
rodrigok Oct 30, 2018
d7a0eeb
Merge remote-tracking branch 'origin/imports/wave-2' into imports/wave-3
rodrigok Oct 30, 2018
05b9956
Merge remote-tracking branch 'origin/develop' into imports/meteor-1
rodrigok Nov 1, 2018
827f366
Merge remote-tracking branch 'origin/imports/meteor-1' into imports/w…
rodrigok Nov 1, 2018
8933394
Merge remote-tracking branch 'origin/develop' into imports/wave-2
rodrigok Nov 1, 2018
5d83610
Merge remote-tracking branch 'origin/imports/wave-2' into imports/wave-3
rodrigok Nov 1, 2018
4d5c855
Merge remote-tracking branch 'origin/develop' into imports/wave-3
rodrigok Nov 1, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"ChatMessages" : false,
"ChatRoom" : false,
"ChatSubscription" : false,
"check" : false,
"CryptoJS" : false,
"Department" : false,
"DDPRateLimiter" : false,
Expand All @@ -31,10 +30,7 @@
"LivechatPageVisited" : false,
"LivechatTrigger" : false,
"Logger" : false,
"Match" : false,
"modal" : false,
"moment" : false,
"Mongo" : false,
"Npm" : false,
"Package" : false,
"parentCall" : false,
Expand All @@ -54,7 +50,6 @@
"Template" : false,
"TimeSync" : false,
"toastr" : false,
"Tracker" : false,
"Trigger" : false,
"Triggers" : false,
"UAParser" : false,
Expand Down
1 change: 1 addition & 0 deletions client/methods/deleteMessage.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';
import _ from 'underscore';
import moment from 'moment';

Expand Down
1 change: 1 addition & 0 deletions client/methods/updateMessage.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
1 change: 1 addition & 0 deletions client/notifications/notification.js
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions client/routes/router.js
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
2 changes: 2 additions & 0 deletions client/startup/emailVerification.js
Original file line number Diff line number Diff line change
@@ -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();
Expand Down
1 change: 1 addition & 0 deletions client/startup/i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
1 change: 1 addition & 0 deletions client/startup/startup.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 2 additions & 0 deletions client/startup/unread.js
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions client/startup/userSetUtcOffset.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';
import moment from 'moment';

Meteor.startup(function() {
Expand Down
2 changes: 2 additions & 0 deletions imports/personal-access-tokens/client/personalAccessTokens.js
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
1 change: 1 addition & 0 deletions packages/meteor-autocomplete/client/autocomplete-client.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* globals Deps, getCaretCoordinates*/
import { Meteor } from 'meteor/meteor';
import { Match } from 'meteor/check';
import _ from 'underscore';
import AutoCompleteRecords from './collection';

Expand Down
2 changes: 2 additions & 0 deletions packages/meteor-autocomplete/client/collection.js
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
import { Mongo } from 'meteor/mongo';

export default new Mongo.Collection('autocompleteRecords');
1 change: 1 addition & 0 deletions packages/meteor-autocomplete/server/autocomplete-server.js
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions packages/rocketchat-analytics/client/loadScript.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
2 changes: 2 additions & 0 deletions packages/rocketchat-analytics/client/trackEvents.js
Original file line number Diff line number Diff line change
@@ -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]);
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-api/server/v1/chat.js
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-api/server/v1/integrations.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { Match, check } from 'meteor/check';

RocketChat.API.v1.addRoute('integrations.create', { authRequired: true }, {
post() {
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-api/server/v1/misc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { check } from 'meteor/check';

RocketChat.API.v1.addRoute('info', { authRequired: false }, {
get() {
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-api/server/v1/permissions.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { Match, check } from 'meteor/check';

/**
This API returns all permissions that exists
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-api/server/v1/roles.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { Match, check } from 'meteor/check';

RocketChat.API.v1.addRoute('roles.list', { authRequired: true }, {
get() {
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-api/server/v1/settings.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { Match, check } from 'meteor/check';
import _ from 'underscore';

// settings endpoints
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-api/server/v1/subscriptions.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { check } from 'meteor/check';

RocketChat.API.v1.addRoute('subscriptions.get', { authRequired: true }, {
get() {
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-api/server/v1/users.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { Match, check } from 'meteor/check';
import _ from 'underscore';
import Busboy from 'busboy';

Expand Down
2 changes: 2 additions & 0 deletions packages/rocketchat-authorization/client/lib/models/Roles.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { Mongo } from 'meteor/mongo';

RocketChat.models.Roles = new Mongo.Collection('rocketchat_roles');

Object.assign(RocketChat.models.Roles, {
Expand Down
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';

Meteor.startup(function() {
Tracker.autorun(function() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';
import _ from 'underscore';

RocketChat.AutoTranslate = {
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-autotranslate/client/lib/tabBar.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';

Meteor.startup(function() {
Tracker.autorun(function() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { check } from 'meteor/check';

Meteor.methods({
'autoTranslate.saveSettings'(rid, field, value, options) {
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { ReactiveVar } from 'meteor/reactive-var';
import { Tracker } from 'meteor/tracker';
import _ from 'underscore';

RocketChat.ChannelSettings = new class {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';

Meteor.startup(function() {
const roomSettingsChangedCallback = (msg) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { Match } from 'meteor/check';

RocketChat.saveReactWhenReadOnly = function(rid, allowReact) {
if (!Match.test(rid, String)) {
Expand Down
Original file line number Diff line number Diff line change
@@ -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)) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { Match } from 'meteor/check';

RocketChat.saveRoomCustomFields = function(rid, roomCustomFields) {
if (!Match.test(rid, String)) {
Expand Down
Original file line number Diff line number Diff line change
@@ -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)) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { Match } from 'meteor/check';

RocketChat.saveRoomReadOnly = function(rid, readOnly) {
if (!Match.test(rid, String)) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { Match } from 'meteor/check';

RocketChat.saveRoomSystemMessages = function(rid, systemMessages) {
if (!Match.test(rid, String)) {
Expand Down
Original file line number Diff line number Diff line change
@@ -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)) {
Expand Down
Original file line number Diff line number Diff line change
@@ -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)) {
Expand Down
Original file line number Diff line number Diff line change
@@ -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({
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-dolphin/common.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Dolphin OAuth2
/* globals CustomOAuth */
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';

const config = {
serverURL: '',
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-drupal/common.js
Original file line number Diff line number Diff line change
@@ -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}/
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-emoji-custom/admin/adminEmoji.js
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-emoji-emojione/rocketchat.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-file-upload/lib/FileUpload.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/* exported FileUpload */

import { Meteor } from 'meteor/meteor';
import { Match } from 'meteor/check';
import filesize from 'filesize';

let maxFileSize = 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { Match, check } from 'meteor/check';
import { Random } from 'meteor/random';
import _ from 'underscore';

Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-file-upload/ufs/AmazonS3/server.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { check } from 'meteor/check';
import { UploadFS } from 'meteor/jalik:ufs';
import { Random } from 'meteor/random';
import _ from 'underscore';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-file-upload/ufs/Webdav/server.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { check } from 'meteor/check';
import { UploadFS } from 'meteor/jalik:ufs';
import { Random } from 'meteor/random';
import Webdav from 'webdav';
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-github-enterprise/common.js
Original file line number Diff line number Diff line change
@@ -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}/
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-gitlab/common.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* global CustomOAuth */
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';

const config = {
serverURL: 'https://gitlab.com',
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-google-vision/client/googlevision.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';

RocketChat.GoogleVision = {
getVisionAttributes(attachment) {
Expand Down
Loading