ESLint: Add more import rules (#14226)

* ESLint: Add more import rules

* Install npm dependecies of livechat before lint

.circleci/config.yml

@@ -136,6 +136,9 @@ jobs:
             # rm -rf node_modules
             # rm -f package-lock.json
             meteor npm install
+            cd packages/rocketchat-livechat/.app
+            meteor npm install
+            cd -
 
       - run:
           name: Lint

.eslintrc

@@ -1,6 +1,24 @@
 {
 	"extends": ["@rocket.chat/eslint-config"],
 	"parser": "babel-eslint",
+	"rules": {
+		"import/no-unresolved": [2, {
+			"commonjs": true,
+			"amd": true,
+			"ignore": [
+				"^meteor\/.+$"
+			]
+		}],
+		"import/named": 0,
+		"import/namespace": 0,
+		"import/default": 0,
+		"import/export": 2,
+		"import/no-cycle": 0,
+		"import/no-useless-path-segments": 2,
+		"import/no-duplicates": 2,
+		"import/no-named-as-default": 0,
+		"import/no-named-as-default-member": 0
+	},
 	"globals": {
 		"__meteor_bootstrap__"        : false,
 		"__meteor_runtime_config__"   : false,

app/api/server/api.js

@@ -6,9 +6,9 @@ import { Restivus } from 'meteor/nimble:restivus';
 import { Logger } from '../../logger';
 import { settings } from '../../settings';
 import { metrics } from '../../metrics';
-import { hasPermission } from '../../authorization';
+import { hasPermission, hasAllPermission } from '../../authorization';
 import { RateLimiter } from 'meteor/rate-limit';
-import { hasAllPermission } from '../../authorization';
+
 import _ from 'underscore';
 
 const logger = new Logger('API', {});

app/apps/client/admin/appManage.js

@@ -2,8 +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 { TAPi18n } from 'meteor/tap:i18n';
-import { TAPi18next } from 'meteor/tap:i18n';
+import { TAPi18n, TAPi18next } from 'meteor/tap:i18n';
+
 import { isEmail, APIClient } from '../../../utils';
 import { settings } from '../../../settings';
 import { Markdown } from '../../../markdown/client';

app/assets/server/assets.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { WebApp } from 'meteor/webapp';
+import { WebApp, WebAppInternals } from 'meteor/webapp';
 import { settings } from '../../settings';
 import { Settings } from '../../models';
 import { getURL } from '../../utils/lib/getURL';
@@ -7,7 +7,7 @@ import { mime } from '../../utils/lib/mimeTypes';
 import { hasPermission } from '../../authorization';
 import { RocketChatFile } from '../../file';
 import { WebAppHashing } from 'meteor/webapp-hashing';
-import { WebAppInternals } from 'meteor/webapp';
+
 import _ from 'underscore';
 import sizeOf from 'image-size';
 import crypto from 'crypto';

app/bigbluebutton/index.js

@@ -1 +1 @@
-export * from './server/bigbluebutton-api';
+export { default } from './server/bigbluebutton-api';

app/bot-helpers/index.js

@@ -1 +1 @@
-export * from './server/index';
+import './server/index';

app/emoji-custom/client/lib/emojiCustom.js

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Blaze } from 'meteor/blaze';
 import { Session } from 'meteor/session';
-import { isSetNotNull } from '../lib/function-isSet';
+import { isSetNotNull } from './function-isSet';
 import { RoomManager, call } from '../../../ui-utils';
 import { emoji, EmojiPicker } from '../../../emoji';
 import { CachedCollectionManager } from '../../../ui-cached-collection';

app/federation/server/PeerClient.js

@@ -7,7 +7,7 @@ import { FederationEvents, FederationKeys, Messages, Rooms, Subscriptions, Users
 import { updateStatus } from './settingsUpdater';
 import { logger } from './logger';
 import { FederatedMessage, FederatedRoom, FederatedUser } from './federatedResources';
-import { Federation } from './';
+import { Federation } from '.';
 
 export class PeerClient {
 	constructor() {

app/federation/server/PeerDNS.js

@@ -4,7 +4,7 @@ import { FederationDNSCache } from '../../models';
 
 import { logger } from './logger';
 import { updateStatus } from './settingsUpdater';
-import { Federation } from './';
+import { Federation } from '.';
 
 const dnsResolveSRV = Meteor.wrapAsync(dns.resolveSrv);
 const dnsResolveTXT = Meteor.wrapAsync(dns.resolveTxt);

app/federation/server/PeerHTTP/PeerHTTP.js

@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { HTTP } from 'meteor/http';
 
 import { logger } from '../logger';
-import { Federation } from '../';
+import { Federation } from '..';
 
 import { skipRetryOnSpecificError, delay } from './utils';
 

app/federation/server/PeerServer/PeerServer.js

@@ -5,7 +5,7 @@ import { Rooms, Subscriptions } from '../../../models';
 
 import { FederatedMessage, FederatedRoom, FederatedUser } from '../federatedResources';
 import { logger } from '../logger.js';
-import { Federation } from '../';
+import { Federation } from '..';
 
 export class PeerServer {
 	constructor() {

app/federation/server/PeerServer/routes/uploads.js

@@ -3,7 +3,7 @@ import { API } from '../../../../api';
 import { Uploads } from '../../../../models';
 import { FileUpload } from '../../../../file-upload';
 
-import { Federation } from '../../';
+import { Federation } from '../..';
 
 API.v1.addRoute('federation.uploads', { authRequired: false }, {
 	get() {

app/federation/server/PeerServer/routes/users.js

@@ -2,7 +2,7 @@ import { API } from '../../../../api';
 import { Users } from '../../../../models';
 
 import { FederatedUser } from '../../federatedResources';
-import { Federation } from '../../';
+import { Federation } from '../..';
 
 API.v1.addRoute('federation.users', { authRequired: false }, {
 	get() {

app/federation/server/federatedResources/FederatedMessage.js

@@ -6,7 +6,7 @@ import { FileUpload } from '../../../file-upload';
 import { FederatedResource } from './FederatedResource';
 import { FederatedRoom } from './FederatedRoom';
 import { FederatedUser } from './FederatedUser';
-import { Federation } from '../';
+import { Federation } from '..';
 
 export class FederatedMessage extends FederatedResource {
 	constructor(localPeerIdentifier, message) {

app/federation/server/methods/addUser.js

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Users } from '../../../models';
 
-import { Federation } from '../';
+import { Federation } from '..';
 import { logger } from '../logger';
 
 export function addUser(identifier) {

app/federation/server/methods/searchUsers.js

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 
-import { Federation } from '../';
+import { Federation } from '..';
 
 export function searchUsers(identifier) {
 	if (!Meteor.userId()) {

app/file-upload/server/config/AmazonS3.js

@@ -1,7 +1,7 @@
 import _ from 'underscore';
 import { settings } from '../../../settings';
-import { FileUploadClass } from '../lib/FileUpload';
-import { FileUpload } from '../lib/FileUpload';
+import { FileUploadClass, FileUpload } from '../lib/FileUpload';
+
 import '../../ufs/AmazonS3/server.js';
 import http from 'http';
 import https from 'https';

app/lazy-load/client/lazyloadImage.js

@@ -1,7 +1,7 @@
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
 import './lazyloadImage.html';
-import { addImage } from './';
+import { addImage } from '.';
 
 const emptyImageEncoded =
 	'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8+/u3PQAJJAM0dIyWdgAAAABJRU5ErkJggg==';

app/lib/lib/roomTypes/private.js

@@ -3,10 +3,10 @@ import { ChatRoom, ChatSubscription } from '../../../models';
 import { openRoom } from '../../../ui-utils';
 import { settings } from '../../../settings';
 import { hasAtLeastOnePermission, hasPermission } from '../../../authorization';
-import { getUserPreference, RoomSettingsEnum, RoomTypeConfig, RoomTypeRouteConfig, UiTextContext } from '../../../utils';
+import { getUserPreference, RoomSettingsEnum, RoomTypeConfig, RoomTypeRouteConfig, UiTextContext, roomTypes } from '../../../utils';
 import { getRoomAvatarURL } from '../../../utils/lib/getRoomAvatarURL';
 import { getAvatarURL } from '../../../utils/lib/getAvatarURL';
-import { roomTypes } from '../../../utils';
+
 
 export class PrivateRoomRoute extends RoomTypeRouteConfig {
 	constructor() {

app/lib/server/index.js

@@ -1,4 +1,3 @@
-export { hostname } from '../lib/startup/settingsOnLoadSiteUrl';
 export * from './lib';
 export * from './functions';
 import './startup/email';

app/lib/server/lib/sendNotificationsOnMessage.js

@@ -5,7 +5,7 @@ import { settings } from '../../../settings';
 import { callbacks } from '../../../callbacks';
 import { Subscriptions } from '../../../models';
 import { roomTypes } from '../../../utils';
-import { callJoinRoom, messageContainsHighlight, parseMessageTextPerUser, replaceMentionedUsernamesWithFullNames } from '../functions/notifications/';
+import { callJoinRoom, messageContainsHighlight, parseMessageTextPerUser, replaceMentionedUsernamesWithFullNames } from '../functions/notifications';
 import { sendEmail, shouldNotifyEmail } from '../functions/notifications/email';
 import { sendSinglePush, shouldNotifyMobile } from '../functions/notifications/mobile';
 import { notifyDesktopUser, shouldNotifyDesktop } from '../functions/notifications/desktop';

app/lib/server/startup/settingsOnLoadDirectReply.js

@@ -1,8 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { settings } from '../../../settings';
 import _ from 'underscore';
-import { IMAPIntercepter, POP3Helper } from '../lib/interceptDirectReplyEmails.js';
-import { POP3 } from '../lib/interceptDirectReplyEmails';
+import { IMAPIntercepter, POP3Helper, POP3 } from '../lib/interceptDirectReplyEmails.js';
+
 
 let IMAP;
 let _POP3Helper;

app/livechat/client/views/sideNav/livechat.js

@@ -3,12 +3,12 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
-import { ChatSubscription } from '../../../../models';
+import { ChatSubscription, Users } from '../../../../models';
 import { KonchatNotification } from '../../../../ui';
 import { settings } from '../../../../settings';
 import { hasRole } from '../../../../authorization';
 import { modal } from '../../../../ui-utils';
-import { Users } from '../../../../models';
+
 import { t, handleError, getUserPreference, roomTypes } from '../../../../utils';
 import { LivechatInquiry } from '../../../lib/LivechatInquiry';
 

app/livechat/server/roomType.js

@@ -1,7 +1,7 @@
-import { Rooms } from '../../models';
+import { Rooms, LivechatVisitors } from '../../models';
 import { roomTypes } from '../../utils';
 import LivechatRoomType from '../lib/LivechatRoomType';
-import { LivechatVisitors } from '../../models';
+
 
 class LivechatRoomTypeServer extends LivechatRoomType {
 	getMsgSender(senderId) {

app/message-attachments/client/index.js

@@ -1,10 +1,10 @@
 import './messageAttachment.html';
 import './messageAttachment';
 import './renderField.html';
-import './renderField';
-
 import { registerFieldTemplate } from './renderField';
 
+
+
 export {
 	registerFieldTemplate,
 };

app/search/server/index.js

@@ -1,10 +1,10 @@
 import SearchProvider from './model/provider';
-import './service/providerService.js';
+import { searchProviderService } from './service/providerService.js';
 import './service/validationService.js';
 import './events/events.js';
 import './provider/defaultProvider.js';
 
-import { searchProviderService } from './service/providerService';
+
 
 export {
 	searchProviderService,

app/search/server/service/providerService.js

@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { settings } from '../../../settings';
 import _ from 'underscore';
-import { validationService } from '../service/validationService';
+import { validationService } from './validationService';
 import SearchLogger from '../logger/logger';
 
 class SearchProviderService {

app/ui-message/client/messageBoxNotSubscribed.js

@@ -2,9 +2,9 @@ import { Meteor } from 'meteor/meteor';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
 import { settings } from '../../settings';
-import { call } from '../../ui-utils';
+import { call, RoomManager, RoomHistoryManager } from '../../ui-utils';
 import { roomTypes } from '../../utils';
-import { RoomManager, RoomHistoryManager } from '../../ui-utils';
+
 import { hasAllPermission } from '../../authorization';
 import './messageBoxNotSubscribed.html';
 

app/ui-sidenav/client/chatRoomItem.js

@@ -2,9 +2,9 @@ import { Tracker } from 'meteor/tracker';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
 
-import { t } from '../../utils/client';
+import { t, roomTypes } from '../../utils/client';
 import { settings } from '../../settings/client';
-import { roomTypes } from '../../utils/client';
+
 import { Rooms } from '../../models/client';
 import { callbacks } from '../../callbacks/client';
 

app/ui-sidenav/client/sidebarHeader.js

@@ -2,13 +2,13 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { popover } from '../../ui-utils';
+import { popover, AccountBox, menu, SideNav, modal } from '../../ui-utils';
 import { t, getUserPreference, handleError } from '../../utils';
-import { AccountBox, menu, SideNav } from '../../ui-utils';
+
 import { callbacks } from '../../callbacks';
 import { settings } from '../../settings';
 import { hasAtLeastOnePermission } from '../../authorization';
-import { modal } from '../../ui-utils';
+
 const setStatus = (status) => {
 	AccountBox.setStatus(status);
 	callbacks.run('userStatusManuallySet', status);

app/ui-sidenav/client/sidebarItem.js

@@ -3,11 +3,11 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
 import { t, getUserPreference, roomTypes } from '../../utils';
-import { popover, renderMessageBody } from '../../ui-utils';
+import { popover, renderMessageBody, menu } from '../../ui-utils';
 import { Users, ChatSubscription } from '../../models';
 import { settings } from '../../settings';
 import { hasAtLeastOnePermission } from '../../authorization';
-import { menu } from '../../ui-utils';
+
 import { timeAgo } from '../../lib/client/lib/formatDate';
 
 Template.sidebarItem.helpers({

app/ui-utils/client/lib/MessageAction.js

@@ -10,7 +10,7 @@ import { Tracker } from 'meteor/tracker';
 import { Session } from 'meteor/session';
 
 import { t, handleError, roomTypes, canDeleteMessage } from '../../../utils/client';
-import { messageArgs } from '../../../ui-utils/client/lib/messageArgs';
+import { messageArgs } from './messageArgs';
 import { Messages, Rooms, Subscriptions } from '../../../models/client';
 import { hasAtLeastOnePermission } from '../../../authorization/client';
 import { settings } from '../../../settings/client';

app/ui-utils/client/lib/popover.js

@@ -5,7 +5,7 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
 import { isRtl, handleError } from '../../../utils';
-import { messageArgs } from '../../../ui-utils/client/lib/messageArgs';
+import { messageArgs } from './messageArgs';
 import { ChatSubscription } from '../../../models';
 import _ from 'underscore';
 import { hide, leave } from './ChannelActions';

app/ui/client/components/header/headerRoom.js

@@ -4,14 +4,14 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
 import { t, roomTypes, handleError } from '../../../../utils';
-import { TabBar, fireGlobalEvent } from '../../../../ui-utils';
+import { TabBar, fireGlobalEvent, call } from '../../../../ui-utils';
 import { ChatSubscription, Rooms, ChatRoom } from '../../../../models';
 import { settings } from '../../../../settings';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { emoji } from '../../../../emoji';
 import { Markdown } from '../../../../markdown/client';
 import { hasAllPermission } from '../../../../authorization';
-import { call } from '../../../../ui-utils';
+
 
 const isSubscribed = (_id) => ChatSubscription.find({ rid: _id }).count() > 0;
 

private/node_scripts/auto-translate.js

@@ -1,3 +1,5 @@
+/* eslint import/no-unresolved: 0 */
+
 const async = require('async');
 const fs = require('fs');
 const _ = require('underscore');

private/node_scripts/unsubscribe_csv/unsubscribe.js

@@ -1,3 +1,5 @@
+/* eslint import/no-unresolved: 0 */
+
 import lineReader from 'line-reader';
 import program from 'commander';
 import wait from 'wait.for';

server/startup/presence.js

@@ -1,7 +1,7 @@
 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';
+import { UserPresence, UserPresenceMonitor } from 'meteor/konecty:user-presence';
+
 
 Meteor.startup(function() {
 	const instance = {

tests/data/api-data.js

@@ -1,6 +1,6 @@
-import { publicChannelName, privateChannelName } from '../data/channel.js';
-import { roleNameUsers, roleNameSubscriptions, roleScopeUsers, roleScopeSubscriptions, roleDescription } from '../data/role.js';
-import { username, email, adminUsername, adminPassword } from '../data/user.js';
+import { publicChannelName, privateChannelName } from './channel.js';
+import { roleNameUsers, roleNameSubscriptions, roleScopeUsers, roleScopeSubscriptions, roleDescription } from './role.js';
+import { username, email, adminUsername, adminPassword } from './user.js';
 import supertest from 'supertest';
 export const request = supertest('http://localhost:3000');
 const prefix = '/api/v1/';

tests/end-to-end/api/04-direct-message.js

@@ -7,8 +7,8 @@ import {
 	apiUsername,
 	apiEmail,
 } from '../../data/api-data.js';
-import { password } from '../../data/user.js';
-import { adminUsername } from '../../data/user';
+import { password, adminUsername } from '../../data/user.js';
+
 
 describe('[Direct Messages]', function() {
 	this.retries(0);