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

Convert rocketchat-channel-settings-mail-messages to main module structure #12537

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import './lib/startup';
import './views/mailMessagesInstructions.html';
import './views/mailMessagesInstructions';
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// import resetSelection from '../resetSelection';
import { Meteor } from 'meteor/meteor';
import { RocketChat } from 'meteor/rocketchat:lib';

Meteor.startup(() => {
RocketChat.TabBar.addButton({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
/* global 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 { AutoComplete } from 'meteor/mizzao:autocomplete';
import { RocketChat, handleError } from 'meteor/rocketchat:lib';
import { t, ChatRoom } from 'meteor/rocketchat:ui';
import { Deps } from 'meteor/deps';
import toastr from 'toastr';
import resetSelection from '../resetSelection';

Expand Down
14 changes: 2 additions & 12 deletions packages/rocketchat-channel-settings-mail-messages/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,6 @@ Package.onUse(function(api) {
'mizzao:autocomplete',
'mongo',
]);

api.addFiles([
'client/lib/startup.js',
'client/views/mailMessagesInstructions.html',
'client/views/mailMessagesInstructions.js',
], 'client');


api.addFiles([
'server/lib/startup.js',
'server/methods/mailMessages.js',
], 'server');
api.mainModule('client/index.js', 'client');
api.mainModule('server/index.js', 'server');
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import './lib/startup';
import './methods/mailMessages';
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { RocketChat } from 'meteor/rocketchat:lib';

Meteor.startup(function() {
const permission = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { Match, check } from 'meteor/check';
import { RocketChat } from 'meteor/rocketchat:lib';
import _ from 'underscore';
import moment from 'moment';
import * as Mailer from 'meteor/rocketchat:mailer';
Expand Down