Convert rocketchat-gitlab to main module structure (#12646)

RocketChat · Nov 16, 2018 · db6cb9d · db6cb9d
1 parent 515a372
commit db6cb9d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 10 deletions.
diff --git a/...rocketchat-gitlab/gitlab-login-button.css → ...hat-gitlab/client/gitlab-login-button.css b/...rocketchat-gitlab/gitlab-login-button.css → ...hat-gitlab/client/gitlab-login-button.css
diff --git a/packages/rocketchat-gitlab/client/index.js 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 → packages/rocketchat-gitlab/lib/common.js b/packages/rocketchat-gitlab/common.js → 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
@@ -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
@@ -0,0 +1,2 @@
+import './startup';
+import '../lib/common';
diff --git a/packages/rocketchat-gitlab/startup.js → packages/rocketchat-gitlab/server/startup.js b/packages/rocketchat-gitlab/startup.js → 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 = {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		import './gitlab-login-button.css';
		import '../lib/common';