From edc48c292c30d7734944c9785cec7fdb83cb29f8 Mon Sep 17 00:00:00 2001
From: Marcos Spessatto Defendi <marcos.defendi@ulbra.inf.br>
Date: Tue, 4 Dec 2018 09:34:14 -0200
Subject: [PATCH] Convert rocketchat-sandstorm to main module structure
 (#12799)

---
 packages/rocketchat-sandstorm/client/index.js        |  2 ++
 .../rocketchat-sandstorm/client/powerboxListener.js  |  1 +
 packages/rocketchat-sandstorm/package.js             | 12 ++++++++----
 packages/rocketchat-sandstorm/server/events.js       |  3 ++-
 packages/rocketchat-sandstorm/server/index.js        |  3 +++
 packages/rocketchat-sandstorm/server/lib.js          |  7 +++++--
 packages/rocketchat-sandstorm/server/powerbox.js     |  5 +++--
 7 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 packages/rocketchat-sandstorm/client/index.js
 create mode 100644 packages/rocketchat-sandstorm/server/index.js

diff --git a/packages/rocketchat-sandstorm/client/index.js b/packages/rocketchat-sandstorm/client/index.js
new file mode 100644
index 00000000000..4747a9261af
--- /dev/null
+++ b/packages/rocketchat-sandstorm/client/index.js
@@ -0,0 +1,2 @@
+import './powerboxListener';
+import './setPath';
diff --git a/packages/rocketchat-sandstorm/client/powerboxListener.js b/packages/rocketchat-sandstorm/client/powerboxListener.js
index 86a67456000..203c392fdde 100644
--- a/packages/rocketchat-sandstorm/client/powerboxListener.js
+++ b/packages/rocketchat-sandstorm/client/powerboxListener.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.Sandstorm = RocketChat.Sandstorm || {};
 
diff --git a/packages/rocketchat-sandstorm/package.js b/packages/rocketchat-sandstorm/package.js
index 8eeac22d2e0..78cf693797c 100644
--- a/packages/rocketchat-sandstorm/package.js
+++ b/packages/rocketchat-sandstorm/package.js
@@ -6,8 +6,12 @@ Package.describe({
 });
 
 Package.onUse(function(api) {
-	api.use(['ecmascript', 'rocketchat:lib', 'jalik:ufs', 'kadira:flow-router']);
-
-	api.addFiles(['server/lib.js', 'server/events.js', 'server/powerbox.js'], 'server');
-	api.addFiles(['client/powerboxListener.js', 'client/setPath.js'], 'client');
+	api.use([
+		'ecmascript',
+		'rocketchat:lib',
+		'jalik:ufs',
+		'kadira:flow-router',
+	]);
+	api.mainModule('client/index.js', 'client');
+	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat-sandstorm/server/events.js b/packages/rocketchat-sandstorm/server/events.js
index 6666d67cce0..5607afdea54 100644
--- a/packages/rocketchat-sandstorm/server/events.js
+++ b/packages/rocketchat-sandstorm/server/events.js
@@ -1,5 +1,6 @@
-/* globals getHttpBridge, waitPromise */
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { getHttpBridge, waitPromise } from './lib';
 import _ from 'underscore';
 
 RocketChat.Sandstorm.notify = function() {};
diff --git a/packages/rocketchat-sandstorm/server/index.js b/packages/rocketchat-sandstorm/server/index.js
new file mode 100644
index 00000000000..a7cb461eb0b
--- /dev/null
+++ b/packages/rocketchat-sandstorm/server/index.js
@@ -0,0 +1,3 @@
+import './lib';
+import './events';
+import './powerbox';
diff --git a/packages/rocketchat-sandstorm/server/lib.js b/packages/rocketchat-sandstorm/server/lib.js
index 9591fd0df0e..b12aac9ca88 100644
--- a/packages/rocketchat-sandstorm/server/lib.js
+++ b/packages/rocketchat-sandstorm/server/lib.js
@@ -1,9 +1,12 @@
-/* globals getHttpBridge, waitPromise, UploadFS */
-/* exported getHttpBridge, waitPromise */
 import Future from 'fibers/future';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { UploadFS } from 'meteor/jalik:ufs';
 
 RocketChat.Sandstorm = {};
 
+export let getHttpBridge;
+export let waitPromise;
+
 if (process.env.SANDSTORM === '1') {
 	const Capnp = require('capnp');
 	const { SandstormHttpBridge } = Capnp.importSystem('sandstorm/sandstorm-http-bridge.capnp');
diff --git a/packages/rocketchat-sandstorm/server/powerbox.js b/packages/rocketchat-sandstorm/server/powerbox.js
index 32a70f532bb..c74f37c766c 100644
--- a/packages/rocketchat-sandstorm/server/powerbox.js
+++ b/packages/rocketchat-sandstorm/server/powerbox.js
@@ -1,6 +1,7 @@
-/* globals getHttpBridge, waitPromise */
-
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { getHttpBridge, waitPromise } from './lib';
+
 RocketChat.Sandstorm.offerUiView = function() {};
 
 if (process.env.SANDSTORM === '1') {