Skip to content

Commit

Permalink
Convert rocketchat-drupal to main module structure (#12601)
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcosSpessatto authored and rodrigok committed Nov 16, 2018
1 parent 12caa07 commit ff513c4
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 13 deletions.
2 changes: 2 additions & 0 deletions packages/rocketchat-drupal/client/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import './login-button.css';
import '../lib/common';
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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';

// Drupal Server CallBack URL needs to be http(s)://{rocketchat.server}[:port]/_oauth/drupal
// In RocketChat -> Administration the URL needs to be http(s)://{drupal.server}/
Expand Down
21 changes: 9 additions & 12 deletions packages/rocketchat-drupal/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,14 @@ Package.describe({

Package.onUse(function(api) {
api.versionsFrom('1.0');
api.use('ecmascript');
api.use('service-configuration');
api.use('rocketchat:lib@0.0.1');
api.use('rocketchat:custom-oauth');

// api.use('templating', 'client');

api.addFiles('common.js');
api.addFiles('login-button.css', 'client');
api.addFiles('startup.js', 'server');

api.use('templating', 'client');
api.use([
'ecmascript',
'service-configuration',
'rocketchat:lib@0.0.1',
'rocketchat:custom-oauth',
'templating',
]);
api.mainModule('client/index.js', 'client');
api.mainModule('server/index.js', 'server');
});

2 changes: 2 additions & 0 deletions packages/rocketchat-drupal/server/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import './startup';
import '../lib/common';
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { RocketChat } from 'meteor/rocketchat:lib';

RocketChat.settings.addGroup('OAuth', function() {
this.section('Drupal', function() {
const enableQuery = {
Expand Down

0 comments on commit ff513c4

Please sign in to comment.