From e5b3bbe587ace5932250ab414f2553a096defbee Mon Sep 17 00:00:00 2001
From: Marcos Defendi <marcos.defendi@ulbra.inf.br>
Date: Fri, 16 Nov 2018 16:54:32 -0200
Subject: [PATCH] Convert rocketchat-gitlab to main module structure

---
 .../{ => client}/gitlab-login-button.css        |  0
 packages/rocketchat-gitlab/client/index.js      |  2 ++
 packages/rocketchat-gitlab/{ => lib}/common.js  |  3 ++-
 packages/rocketchat-gitlab/package.js           | 17 ++++++++---------
 packages/rocketchat-gitlab/server/index.js      |  2 ++
 .../rocketchat-gitlab/{ => server}/startup.js   |  2 ++
 6 files changed, 16 insertions(+), 10 deletions(-)
 rename packages/rocketchat-gitlab/{ => client}/gitlab-login-button.css (100%)
 create mode 100644 packages/rocketchat-gitlab/client/index.js
 rename packages/rocketchat-gitlab/{ => lib}/common.js (87%)
 create mode 100644 packages/rocketchat-gitlab/server/index.js
 rename packages/rocketchat-gitlab/{ => server}/startup.js (92%)

diff --git a/packages/rocketchat-gitlab/gitlab-login-button.css b/packages/rocketchat-gitlab/client/gitlab-login-button.css
similarity index 100%
rename from packages/rocketchat-gitlab/gitlab-login-button.css
rename to packages/rocketchat-gitlab/client/gitlab-login-button.css
diff --git a/packages/rocketchat-gitlab/client/index.js b/packages/rocketchat-gitlab/client/index.js
new file mode 100644
index 0000000000000..1550e37081b59
--- /dev/null
+++ b/packages/rocketchat-gitlab/client/index.js
@@ -0,0 +1,2 @@
+import './gitlab-login-button.css';
+import '../lib/common';
diff --git a/packages/rocketchat-gitlab/common.js b/packages/rocketchat-gitlab/lib/common.js
similarity index 87%
rename from packages/rocketchat-gitlab/common.js
rename to packages/rocketchat-gitlab/lib/common.js
index 56fd0f24ea1a4..e187ef50e7b8d 100644
--- a/packages/rocketchat-gitlab/common.js
+++ b/packages/rocketchat-gitlab/lib/common.js
@@ -1,6 +1,7 @@
-/* global CustomOAuth */
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { CustomOAuth } from 'meteor/rocketchat:custom-oauth';
 
 const config = {
 	serverURL: 'https://gitlab.com',
diff --git a/packages/rocketchat-gitlab/package.js b/packages/rocketchat-gitlab/package.js
index 35af8d43ee8cb..627a7068a8b7a 100644
--- a/packages/rocketchat-gitlab/package.js
+++ b/packages/rocketchat-gitlab/package.js
@@ -5,13 +5,12 @@ Package.describe({
 });
 
 Package.onUse(function(api) {
-	api.use('ecmascript');
-	api.use('rocketchat:lib');
-	api.use('rocketchat:custom-oauth');
-
-	api.use('templating', 'client');
-
-	api.addFiles('common.js');
-	api.addFiles('gitlab-login-button.css', 'client');
-	api.addFiles('startup.js', 'server');
+	api.use([
+		'ecmascript',
+		'rocketchat:lib',
+		'rocketchat:custom-oauth',
+		'templating',
+	]);
+	api.mainModule('client/index.js', 'client');
+	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat-gitlab/server/index.js b/packages/rocketchat-gitlab/server/index.js
new file mode 100644
index 0000000000000..d4fffe60273a4
--- /dev/null
+++ b/packages/rocketchat-gitlab/server/index.js
@@ -0,0 +1,2 @@
+import './startup';
+import '../lib/common';
diff --git a/packages/rocketchat-gitlab/startup.js b/packages/rocketchat-gitlab/server/startup.js
similarity index 92%
rename from packages/rocketchat-gitlab/startup.js
rename to packages/rocketchat-gitlab/server/startup.js
index 4e4f57109d106..843b10015b9e6 100644
--- a/packages/rocketchat-gitlab/startup.js
+++ b/packages/rocketchat-gitlab/server/startup.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.settings.addGroup('OAuth', function() {
 	this.section('GitLab', function() {
 		const enableQuery = {