From 441788a10192be65c8cdef6a2e35db2cf5213987 Mon Sep 17 00:00:00 2001 From: Marcos Defendi Date: Tue, 4 Dec 2018 10:36:30 -0200 Subject: [PATCH] Convert rocketchat-sms to main module structure --- packages/rocketchat-sms/package.js | 11 +++++------ packages/rocketchat-sms/{ => server}/SMS.js | 2 +- packages/rocketchat-sms/server/index.js | 3 +++ .../rocketchat-sms/{ => server}/services/twilio.js | 2 +- packages/rocketchat-sms/{ => server}/settings.js | 1 + 5 files changed, 11 insertions(+), 8 deletions(-) rename packages/rocketchat-sms/{ => server}/SMS.js (91%) create mode 100644 packages/rocketchat-sms/server/index.js rename packages/rocketchat-sms/{ => server}/services/twilio.js (97%) rename packages/rocketchat-sms/{ => server}/settings.js (93%) diff --git a/packages/rocketchat-sms/package.js b/packages/rocketchat-sms/package.js index c16d4f2fa0cb..bbd775c1b9c2 100644 --- a/packages/rocketchat-sms/package.js +++ b/packages/rocketchat-sms/package.js @@ -7,10 +7,9 @@ Package.describe({ }); Package.onUse(function(api) { - api.use('ecmascript'); - api.use('rocketchat:lib'); - - api.addFiles('settings.js', 'server'); - api.addFiles('SMS.js', 'server'); - api.addFiles('services/twilio.js', 'server'); + api.use([ + 'ecmascript', + 'rocketchat:lib', + ]); + api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-sms/SMS.js b/packages/rocketchat-sms/server/SMS.js similarity index 91% rename from packages/rocketchat-sms/SMS.js rename to packages/rocketchat-sms/server/SMS.js index 42021bee8005..1829756e68ee 100644 --- a/packages/rocketchat-sms/SMS.js +++ b/packages/rocketchat-sms/server/SMS.js @@ -1,5 +1,5 @@ -/* globals RocketChat */ import { Meteor } from 'meteor/meteor'; +import { RocketChat } from 'meteor/rocketchat:lib'; RocketChat.SMS = { enabled: false, diff --git a/packages/rocketchat-sms/server/index.js b/packages/rocketchat-sms/server/index.js new file mode 100644 index 000000000000..e46413334273 --- /dev/null +++ b/packages/rocketchat-sms/server/index.js @@ -0,0 +1,3 @@ +import './settings'; +import './SMS'; +import './services/twilio'; diff --git a/packages/rocketchat-sms/services/twilio.js b/packages/rocketchat-sms/server/services/twilio.js similarity index 97% rename from packages/rocketchat-sms/services/twilio.js rename to packages/rocketchat-sms/server/services/twilio.js index 23faf37bd0e7..615df3ea13e4 100644 --- a/packages/rocketchat-sms/services/twilio.js +++ b/packages/rocketchat-sms/server/services/twilio.js @@ -1,4 +1,4 @@ -/* globals RocketChat */ +import { RocketChat } from 'meteor/rocketchat:lib'; import twilio from 'twilio'; class Twilio { diff --git a/packages/rocketchat-sms/settings.js b/packages/rocketchat-sms/server/settings.js similarity index 93% rename from packages/rocketchat-sms/settings.js rename to packages/rocketchat-sms/server/settings.js index e91f6e8e6178..040eb21aa9ee 100644 --- a/packages/rocketchat-sms/settings.js +++ b/packages/rocketchat-sms/server/settings.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { RocketChat } from 'meteor/rocketchat:lib'; Meteor.startup(function() { RocketChat.settings.addGroup('SMS', function() {