Convert chatpal search package to modular structure

.eslintrc

@@ -4,26 +4,16 @@
 	"globals": {
 		"__meteor_runtime_config__"   : false,
 		"AccountBox"                  : false,
-		"Accounts"                    : false,
 		"AgentUsers"                  : false,
 		"Apps"                        : false,
 		"Assets"                      : false,
-		"Blaze"                       : false,
-		"BlazeLayout"                 : false,
 		"browser"                     : false,
 		"ChatMessage"                 : false,
 		"ChatMessages"                : false,
 		"ChatRoom"                    : false,
 		"ChatSubscription"            : false,
-		"check"                       : false,
-		"CryptoJS"                    : false,
 		"Department"                  : false,
-		"DDPRateLimiter"              : false,
-		"EJSON"                       : false,
-		"Email"                       : false,
-		"FlowRouter"                  : false,
 		"FileUpload"                  : false,
-		"HTTP"                        : false,
 		"getNextAgent"                : false,
 		"handleError"                 : false,
 		"getAvatarUrlFromUsername"    : false,
@@ -35,40 +25,23 @@
 		"LivechatPageVisited"         : false,
 		"LivechatTrigger"             : false,
 		"Logger"                      : false,
-		"Match"                       : false,
-		"Meteor"                      : false,
 		"modal"                       : false,
-		"moment"                      : false,
-		"Mongo"                       : false,
 		"Npm"                         : false,
 		"Package"                     : false,
 		"parentCall"                  : false,
-		"Promise"                     : false,
-		"Random"                      : false,
-		"ReactiveDict"                : false,
-		"ReactiveVar"                 : false,
-		"Reload"                      : false,
 		"RocketChat"                  : true,
 		"RocketChatFile"              : false,
 		"RoomHistoryManager"          : false,
 		"RoomManager"                 : false,
 		"ServiceConfiguration"        : false,
-		"Session"                     : false,
 		"Settings"                    : false,
-		"SHA256"                      : false,
 		"SideNav"                     : false,
 		"t"                           : false,
-		"TAPi18n"                     : false,
-		"TAPi18next"                  : false,
-		"Template"                    : false,
 		"TimeSync"                    : false,
 		"toastr"                      : false,
-		"Tracker"                     : false,
 		"Trigger"                     : false,
 		"Triggers"                    : false,
-		"UAParser"                    : false,
 		"visitor"                     : false,
-		"WebApp"                      : 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/lib/handleError.js

@@ -1,3 +1,4 @@
+import { TAPi18n } from 'meteor/tap:i18n';
 import _ from 'underscore';
 import s from 'underscore.string';
 import toastr from 'toastr';

client/methods/deleteMessage.js

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

client/methods/hideRoom.js

@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 Meteor.methods({
 	hideRoom(rid) {
 		if (!Meteor.userId()) {

client/methods/openRoom.js

@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 Meteor.methods({
 	openRoom(rid) {
 		if (!Meteor.userId()) {

client/methods/setUserActiveStatus.js

@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 Meteor.methods({
 	setUserActiveStatus(userId, active) {
 		Meteor.users.update(userId, { $set: { active } });

client/methods/toggleFavorite.js

@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 Meteor.methods({
 	toggleFavorite(rid, f) {
 		if (!Meteor.userId()) {

client/methods/updateMessage.js

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

client/notifications/UsersNameChanged.js

@@ -1,3 +1,5 @@
+import { Meteor } from 'meteor/meteor';
+
 Meteor.startup(function() {
 	RocketChat.Notifications.onLogged('Users:NameChanged', function({ _id, name, username }) {
 		RocketChat.models.Messages.update({

client/notifications/notification.js

@@ -1,4 +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/notifications/updateAvatar.js

@@ -1,4 +1,5 @@
 /* globals updateAvatarOfUsername */
+import { Meteor } from 'meteor/meteor';
 
 Meteor.startup(function() {
 	RocketChat.Notifications.onLogged('updateAvatar', function(data) {

client/notifications/updateUserState.js

@@ -1,4 +1,5 @@
 /* globals fireGlobalEvent */
+import { Meteor } from 'meteor/meteor';
 
 /* fire user state change globally, to listen on desktop electron client */
 Meteor.startup(function() {

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

@@ -1,4 +1,11 @@
 /* globals KonchatNotification */
+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,4 +1,9 @@
+import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
+import { Session } from 'meteor/session';
+import { TAPi18n } from 'meteor/tap:i18n';
 import toastr from 'toastr';
+
 Meteor.startup(function() {
 	Tracker.autorun(function() {
 		const user = Meteor.user();

client/startup/i18n.js

@@ -1,5 +1,8 @@
 /* globals isRtl */
-
+import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { Tracker } from 'meteor/tracker';
+import { TAPi18n } from 'meteor/tap:i18n';
 import moment from 'moment';
 
 const currentLanguage = new ReactiveVar();

client/startup/loginViaQuery.js

@@ -1,3 +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,3 +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,5 +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,4 +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/userSetUtcOffset.js

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

client/startup/usersObserve.js

@@ -1,3 +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,4 +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/message-read-receipt/server/lib/ReadReceipt.js

@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
 import ModelReadReceipts from '../models/ReadReceipts';
 

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

@@ -1,4 +1,8 @@
+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';
 

lib/francocatena_fix.js

@@ -1,3 +1,5 @@
+import { TAPi18n } from 'meteor/tap:i18n';
+
 this.i18n_status_func = function(key, options) {
 	return TAPi18n.__(key, options);
 };

packages/chatpal-search/client/index.js

@@ -0,0 +1,8 @@
+import './style.css';
+import './template/admin.html';
+import './template/result.html';
+import './template/suggestion.html';
+import './template/admin';
+import './template/result';
+import './template/suggestion';
+import './route';

packages/chatpal-search/client/route.js

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

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

@@ -1,3 +1,8 @@
+import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { Template } from 'meteor/templating';
+import { TAPi18n } from 'meteor/tap:i18n';
+import { RocketChat } from 'meteor/rocketchat:lib';
 import toastr from 'toastr';
 
 Template.ChatpalAdmin.onCreated(function() {

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

@@ -1,4 +1,9 @@
 import { DateFormat } from 'meteor/rocketchat:lib';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { Session } from 'meteor/session';
+import { Template } from 'meteor/templating';
+import { TAPi18n } from 'meteor/tap:i18n';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 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

@@ -9,32 +9,13 @@ Package.onUse(function(api) {
 	api.use([
 		'ecmascript',
 		'templating',
-		'rocketchat:lib',
-		'rocketchat:logger',
-		'rocketchat:search',
-		'kadira:flow-router',
-		'meteorhacks:inject-initial',
 	]);
 
-	api.addFiles('server/asset/chatpal-enter.svg', 'server', { isAsset:true });
-	api.addFiles('server/asset/chatpal-logo-icon-darkblue.svg', 'server', { isAsset:true });
-
-	api.addFiles([
-		'server/provider/provider.js',
-		'server/provider/index.js',
-		'server/utils/logger.js',
-		'server/utils/utils.js',
-		'server/asset/config.js',
+	api.addAssets([
+		'server/asset/chatpal-enter.svg',
+		'server/asset/chatpal-logo-icon-darkblue.svg',
 	], 'server');
 
-	api.addFiles([
-		'client/template/suggestion.html',
-		'client/template/suggestion.js',
-		'client/template/result.html',
-		'client/template/result.js',
-		'client/template/admin.html',
-		'client/template/admin.js',
-		'client/style.css',
-		'client/route.js',
-	], 'client');
+	api.mainModule('client/index.js', 'client');
+	api.mainModule('server/index.js', 'server');
 });

packages/chatpal-search/server/asset/config.js

@@ -1,4 +1,4 @@
-/* globals Inject */
+import { Inject } from 'meteor/meteorhacks:inject-initial';
 
 Inject.rawBody('chatpal-enter', Assets.getText('server/asset/chatpal-enter.svg'));
 Inject.rawBody('chatpal-logo-icon-darkblue', Assets.getText('server/asset/chatpal-logo-icon-darkblue.svg'));

packages/chatpal-search/server/index.js

@@ -0,0 +1,3 @@
+import './asset/config';
+import './provider/provider';
+import './utils/utils';

packages/chatpal-search/server/provider/index.js

@@ -1,5 +1,8 @@
+import { Meteor } from 'meteor/meteor';
+import { HTTP } from 'meteor/http';
 import ChatpalLogger from '../utils/logger';
 import { Random } from 'meteor/random';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 /**
  * Enables HTTP functions on Chatpal Backend

packages/chatpal-search/server/provider/provider.js

@@ -1,6 +1,8 @@
+import { Meteor } from 'meteor/meteor';
 import { searchProviderService, SearchProvider } from 'meteor/rocketchat:search';
 import Index from './index';
 import ChatpalLogger from '../utils/logger';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 /**
  * The chatpal search provider enables chatpal search. An appropriate backedn has to be specified by settings.

packages/chatpal-search/server/utils/logger.js

@@ -1,2 +1,4 @@
+import { Logger } from 'meteor/rocketchat:logger';
+
 const ChatpalLogger = new Logger('Chatpal Logger', {});
 export default ChatpalLogger;

packages/chatpal-search/server/utils/utils.js

@@ -1,3 +1,6 @@
+import { Meteor } from 'meteor/meteor';
+import { HTTP } from 'meteor/http';
+
 Meteor.methods({
 	'chatpalUtilsCreateKey'(email) {
 		try {

packages/meteor-accounts-saml/saml_client.js

@@ -1,4 +1,7 @@
 /* globals cordova */
+import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
+import { Random } from 'meteor/random';
 
 if (!Accounts.saml) {
 	Accounts.saml = {};