From 417350f28c3dd27d66817652d530143875114478 Mon Sep 17 00:00:00 2001
From: Marcos Defendi <marcos.defendi@ulbra.inf.br>
Date: Fri, 7 Dec 2018 21:00:44 -0200
Subject: [PATCH] Convert rocketchat-wordpress to main module structure

---
 packages/rocketchat-wordpress/client/index.js    |  1 +
 .../rocketchat-wordpress/{ => lib}/common.js     |  4 +++-
 packages/rocketchat-wordpress/package.js         | 16 ++++++++--------
 packages/rocketchat-wordpress/server/index.js    |  2 ++
 .../rocketchat-wordpress/{ => server}/startup.js |  2 ++
 5 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 packages/rocketchat-wordpress/client/index.js
 rename packages/rocketchat-wordpress/{ => lib}/common.js (93%)
 create mode 100644 packages/rocketchat-wordpress/server/index.js
 rename packages/rocketchat-wordpress/{ => server}/startup.js (97%)

diff --git a/packages/rocketchat-wordpress/client/index.js b/packages/rocketchat-wordpress/client/index.js
new file mode 100644
index 000000000000..e44dbe195eff
--- /dev/null
+++ b/packages/rocketchat-wordpress/client/index.js
@@ -0,0 +1 @@
+import '../lib/common';
diff --git a/packages/rocketchat-wordpress/common.js b/packages/rocketchat-wordpress/lib/common.js
similarity index 93%
rename from packages/rocketchat-wordpress/common.js
rename to packages/rocketchat-wordpress/lib/common.js
index 7bd8bf3090bd..d2c4dd52c651 100644
--- a/packages/rocketchat-wordpress/common.js
+++ b/packages/rocketchat-wordpress/lib/common.js
@@ -1,6 +1,8 @@
-/* globals CustomOAuth */
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { ServiceConfiguration } from 'meteor/service-configuration';
+import { CustomOAuth } from 'meteor/rocketchat:custom-oauth';
 import _ from 'underscore';
 
 const config = {
diff --git a/packages/rocketchat-wordpress/package.js b/packages/rocketchat-wordpress/package.js
index 0b4680ebd20d..710d0fd7a1dc 100644
--- a/packages/rocketchat-wordpress/package.js
+++ b/packages/rocketchat-wordpress/package.js
@@ -5,13 +5,13 @@ 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.use([
+		'ecmascript',
+		'rocketchat:lib',
+		'rocketchat:custom-oauth',
+		'templating',
+	]);
 	api.addFiles('client/wordpress-login-button.css', 'client');
-	api.addFiles('startup.js', 'server');
+	api.mainModule('client/index.js', 'client');
+	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat-wordpress/server/index.js b/packages/rocketchat-wordpress/server/index.js
new file mode 100644
index 000000000000..086f6cc5d704
--- /dev/null
+++ b/packages/rocketchat-wordpress/server/index.js
@@ -0,0 +1,2 @@
+import '../lib/common';
+import './startup';
diff --git a/packages/rocketchat-wordpress/startup.js b/packages/rocketchat-wordpress/server/startup.js
similarity index 97%
rename from packages/rocketchat-wordpress/startup.js
rename to packages/rocketchat-wordpress/server/startup.js
index 028a914c8dfc..3dd8d5391bf1 100644
--- a/packages/rocketchat-wordpress/startup.js
+++ b/packages/rocketchat-wordpress/server/startup.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.settings.addGroup('OAuth', function() {
 	return this.section('WordPress', function() {