From cf461990ff35a7a77033d52c9bc64ea718d48eec Mon Sep 17 00:00:00 2001 From: Marcos Defendi Date: Mon, 19 Nov 2018 13:34:05 -0200 Subject: [PATCH] Convert rocketchat-graphql to main module structure --- packages/rocketchat-graphql/package.js | 3 +-- packages/rocketchat-graphql/server/api.js | 1 + packages/rocketchat-graphql/server/index.js | 2 ++ packages/rocketchat-graphql/server/settings.js | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 packages/rocketchat-graphql/server/index.js diff --git a/packages/rocketchat-graphql/package.js b/packages/rocketchat-graphql/package.js index 841148d71f93..62bcf609107c 100644 --- a/packages/rocketchat-graphql/package.js +++ b/packages/rocketchat-graphql/package.js @@ -15,8 +15,7 @@ Package.onUse(function(api) { 'rocketchat:accounts', 'swydo:graphql', ]); - api.addFiles('server/settings.js', 'server'); - api.mainModule('server/api.js', 'server'); + api.mainModule('server/index.js', 'server'); }); Npm.depends({ diff --git a/packages/rocketchat-graphql/server/api.js b/packages/rocketchat-graphql/server/api.js index 0fc074ecc0f8..f0079592d348 100644 --- a/packages/rocketchat-graphql/server/api.js +++ b/packages/rocketchat-graphql/server/api.js @@ -4,6 +4,7 @@ import { SubscriptionServer } from 'subscriptions-transport-ws'; import { execute, subscribe } from 'graphql'; import { Meteor } from 'meteor/meteor'; import { WebApp } from 'meteor/webapp'; +import { RocketChat } from 'meteor/rocketchat:lib'; import bodyParser from 'body-parser'; import express from 'express'; import cors from 'cors'; diff --git a/packages/rocketchat-graphql/server/index.js b/packages/rocketchat-graphql/server/index.js new file mode 100644 index 000000000000..c19d98f29eb5 --- /dev/null +++ b/packages/rocketchat-graphql/server/index.js @@ -0,0 +1,2 @@ +import './settings'; +import './api'; diff --git a/packages/rocketchat-graphql/server/settings.js b/packages/rocketchat-graphql/server/settings.js index f7d06fb80fe4..de2735d15995 100644 --- a/packages/rocketchat-graphql/server/settings.js +++ b/packages/rocketchat-graphql/server/settings.js @@ -1,3 +1,5 @@ +import { RocketChat } from 'meteor/rocketchat:lib'; + RocketChat.settings.addGroup('General', function() { this.section('GraphQL API', function() { this.add('Graphql_Enabled', false, { type: 'boolean', public: false });