diff --git a/packages/rocketchat-livestream/client/index.js b/packages/rocketchat-livestream/client/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..b118255a4cb3117197989b610f2421c9c2c62658
--- /dev/null
+++ b/packages/rocketchat-livestream/client/index.js
@@ -0,0 +1,10 @@
+import './styles/liveStreamTab.css';
+import './views/liveStreamTab.html';
+import './views/liveStreamTab';
+import './views/livestreamBroadcast.html';
+import './views/livestreamBroadcast';
+import './views/broadcastView.html';
+import './views/broadcastView';
+import './views/liveStreamView.html';
+import './views/liveStreamView';
+import './tabBar';
diff --git a/packages/rocketchat-livestream/client/oauth.js b/packages/rocketchat-livestream/client/oauth.js
index acc674a30b819a15650f19239b1d15376dedd98a..eb9b5358be4d6ebe1734b5f348506cb60de56e59 100644
--- a/packages/rocketchat-livestream/client/oauth.js
+++ b/packages/rocketchat-livestream/client/oauth.js
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
export const close = (popup) => new Promise(function(resolve) {
const checkInterval = setInterval(() => {
diff --git a/packages/rocketchat-livestream/client/tabBar.js b/packages/rocketchat-livestream/client/tabBar.js
index 4832c439b1623367387fc7a9dbb4098eba8d24db..7741f96a3e36fe0edbeb6d7e64c219e9ab0eaf0a 100644
--- a/packages/rocketchat-livestream/client/tabBar.js
+++ b/packages/rocketchat-livestream/client/tabBar.js
@@ -1,6 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';
import { Session } from 'meteor/session';
+import { RocketChat } from 'meteor/rocketchat:lib';
Meteor.startup(function() {
Tracker.autorun(function() {
diff --git a/packages/rocketchat-livestream/client/views/broadcastView.js b/packages/rocketchat-livestream/client/views/broadcastView.js
index 578e041f3f05b61e817eeb4b550439acfaa7ffdc..e2feea2e05f8edc471e39a82dd74f425acf21019 100644
--- a/packages/rocketchat-livestream/client/views/broadcastView.js
+++ b/packages/rocketchat-livestream/client/views/broadcastView.js
@@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor';
import { ReactiveVar } from 'meteor/reactive-var';
import { Session } from 'meteor/session';
import { Template } from 'meteor/templating';
+import { RocketChat, handleError } from 'meteor/rocketchat:lib';
const getMedia = () => navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
const createAndConnect = (url) => {
diff --git a/packages/rocketchat-livestream/client/views/liveStreamTab.js b/packages/rocketchat-livestream/client/views/liveStreamTab.js
index 80af0ee2b75354160dcce6dec4e2da3f47eb519a..ebd843664b08098db4a73a727a147950dd733407 100644
--- a/packages/rocketchat-livestream/client/views/liveStreamTab.js
+++ b/packages/rocketchat-livestream/client/views/liveStreamTab.js
@@ -1,4 +1,3 @@
-/* globals popout */
import { Meteor } from 'meteor/meteor';
import { ReactiveVar } from 'meteor/reactive-var';
import { Blaze } from 'meteor/blaze';
@@ -7,8 +6,8 @@ import { Template } from 'meteor/templating';
import { TAPi18n } from 'meteor/tap:i18n';
import toastr from 'toastr';
import { auth } from '../oauth.js';
-import { RocketChatAnnouncement } from 'meteor/rocketchat:lib';
-
+import { RocketChatAnnouncement, RocketChat, handleError } from 'meteor/rocketchat:lib';
+import { popout, t } from 'meteor/rocketchat:ui';
export const call = (...args) => new Promise(function(resolve, reject) {
Meteor.call(...args, function(err, result) {
diff --git a/packages/rocketchat-livestream/package.js b/packages/rocketchat-livestream/package.js
index dc0ba5a76b7ed8e7a16d805a2e72c14a96a1cd99..6e2c55f39a06297edca8adcccc83c067026b08ea 100644
--- a/packages/rocketchat-livestream/package.js
+++ b/packages/rocketchat-livestream/package.js
@@ -6,31 +6,14 @@ Package.describe({
});
Package.onUse(function(api) {
- api.use('templating', 'client');
api.use([
'ecmascript',
'rocketchat:lib',
+ 'rocketchat:ui',
+ 'templating',
]);
- api.addFiles([
- 'client/views/liveStreamTab.html',
- 'client/views/livestreamBroadcast.html',
- 'client/views/livestreamBroadcast.js',
- 'client/views/liveStreamTab.js',
- 'client/views/broadcastView.html',
- 'client/views/broadcastView.js',
- 'client/styles/liveStreamTab.css',
- 'client/views/liveStreamView.html',
- 'client/views/liveStreamView.js',
- 'client/tabBar.js',
- ], 'client');
-
- api.addFiles([
- 'server/index.js',
- 'server/models/Rooms.js',
- 'server/functions/saveStreamingOptions.js',
- 'server/settings.js',
- ], 'server');
-
+ api.mainModule('client/index.js', 'client');
+ api.mainModule('server/index.js', 'server');
Npm.depends({
googleapis: '25.0.0',
});
diff --git a/packages/rocketchat-livestream/server/functions/saveStreamingOptions.js b/packages/rocketchat-livestream/server/functions/saveStreamingOptions.js
index f215d28309ee97a5a0677aab84cd443ec4d47f7a..f0a2d013a4d4afad78118a11a696ea00c26eb387 100644
--- a/packages/rocketchat-livestream/server/functions/saveStreamingOptions.js
+++ b/packages/rocketchat-livestream/server/functions/saveStreamingOptions.js
@@ -1,5 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { Match, check } from 'meteor/check';
+import { RocketChat } from 'meteor/rocketchat:lib';
RocketChat.saveStreamingOptions = function(rid, options) {
if (!Match.test(rid, String)) {
diff --git a/packages/rocketchat-livestream/server/index.js b/packages/rocketchat-livestream/server/index.js
index 63ea14561bf5506ef186b520c62330f2e1f01b6b..0f5c850442a4d4bebad8c5dfe26bde8c791d6084 100644
--- a/packages/rocketchat-livestream/server/index.js
+++ b/packages/rocketchat-livestream/server/index.js
@@ -1,2 +1,5 @@
+import './models/Rooms';
+import './functions/saveStreamingOptions';
import './routes.js';
import './methods.js';
+import './settings';
diff --git a/packages/rocketchat-livestream/server/methods.js b/packages/rocketchat-livestream/server/methods.js
index 66e9be9c090801d51e4258fc2d806d7eaf6695af..3625c74ceb56e3a0e036a4cbdbc84faf37f5ff4d 100644
--- a/packages/rocketchat-livestream/server/methods.js
+++ b/packages/rocketchat-livestream/server/methods.js
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
import { createLiveStream, statusLiveStream, statusStreamLiveStream, getBroadcastStatus, setBroadcastStatus } from './functions/livestream';
const selectLivestreamSettings = (user) => user && user.settings && user.settings.livestream;
diff --git a/packages/rocketchat-livestream/server/models/Rooms.js b/packages/rocketchat-livestream/server/models/Rooms.js
index b0b7a3be67277f7b902bf28e1fb0c63a04204f19..24857be9004c110593eafd59715096a1ec354733 100644
--- a/packages/rocketchat-livestream/server/models/Rooms.js
+++ b/packages/rocketchat-livestream/server/models/Rooms.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
RocketChat.models.Rooms.setStreamingOptionsById = function(_id, streamingOptions) {
const update = {
$set: {
diff --git a/packages/rocketchat-livestream/server/routes.js b/packages/rocketchat-livestream/server/routes.js
index 07c43972fa7f1acbaf746bd0b196cf9771533d7b..5806dc03174a74d22fa86b8f750a6d473175a7c7 100644
--- a/packages/rocketchat-livestream/server/routes.js
+++ b/packages/rocketchat-livestream/server/routes.js
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
import google from 'googleapis';
const { OAuth2 } = google.auth;
diff --git a/packages/rocketchat-livestream/server/settings.js b/packages/rocketchat-livestream/server/settings.js
index 9fc05da95eb1c374977560cdef9861935f9cb7df..f5ba52b6343ee5b635753b0ca70ee711f07be6f7 100644
--- a/packages/rocketchat-livestream/server/settings.js
+++ b/packages/rocketchat-livestream/server/settings.js
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
Meteor.startup(function() {
RocketChat.settings.addGroup('LiveStream & Broadcasting', function() {
diff --git a/packages/rocketchat-ui/client/views/app/popout.js b/packages/rocketchat-ui/client/views/app/popout.js
index 7c51e0421947465892780c1ef4299f9e666beec5..2450dd89225b7786483d1745236fa421743c6e35 100644
--- a/packages/rocketchat-ui/client/views/app/popout.js
+++ b/packages/rocketchat-ui/client/views/app/popout.js
@@ -1,9 +1,9 @@
-/* globals popout */
+/* eslint-disable */
import { Blaze } from 'meteor/blaze';
import { ReactiveVar } from 'meteor/reactive-var';
import { Template } from 'meteor/templating';
-this.popout = {
+popout = {
context: null,
isAudioOnly: false,
showVideoControls: true,
diff --git a/packages/rocketchat-ui/package.js b/packages/rocketchat-ui/package.js
index 48ca16184bc795ba5ef819c6fef506d4cf76d4eb..0ac4021d77b003daf1167d390cf69851752e3a24 100644
--- a/packages/rocketchat-ui/package.js
+++ b/packages/rocketchat-ui/package.js
@@ -156,4 +156,5 @@ Package.onUse(function(api) {
api.export('ChatMessages', 'client');
api.export('RoomManager', 'client');
api.export('getAvatarUrlFromUsername');
+ api.export('popout', 'client');
});