From 6bd40edf64ee0bfe7bef851662e54d555dd4763e Mon Sep 17 00:00:00 2001 From: Marcos Defendi Date: Mon, 3 Dec 2018 10:23:59 -0200 Subject: [PATCH] Convert rocketchat-retention-policy to main module structure --- packages/rocketchat-retention-policy/package.js | 6 +----- .../rocketchat-retention-policy/server/cronPruneMessages.js | 3 ++- packages/rocketchat-retention-policy/server/index.js | 2 ++ .../rocketchat-retention-policy/server/startup/settings.js | 2 ++ 4 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 packages/rocketchat-retention-policy/server/index.js diff --git a/packages/rocketchat-retention-policy/package.js b/packages/rocketchat-retention-policy/package.js index baff40e031ae..252f57cb66c3 100644 --- a/packages/rocketchat-retention-policy/package.js +++ b/packages/rocketchat-retention-policy/package.js @@ -17,9 +17,5 @@ Package.onUse(function(api) { 'templating', 'rocketchat:lib', ]); - - api.addFiles([ - 'server/startup/settings.js', - 'server/cronPruneMessages.js', - ], 'server'); + api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-retention-policy/server/cronPruneMessages.js b/packages/rocketchat-retention-policy/server/cronPruneMessages.js index 10688adcc2e7..e570806e7b8d 100644 --- a/packages/rocketchat-retention-policy/server/cronPruneMessages.js +++ b/packages/rocketchat-retention-policy/server/cronPruneMessages.js @@ -1,5 +1,6 @@ -/* globals SyncedCron */ import { Meteor } from 'meteor/meteor'; +import { RocketChat } from 'meteor/rocketchat:lib'; +import { SyncedCron } from 'meteor/littledata:synced-cron'; let types = []; diff --git a/packages/rocketchat-retention-policy/server/index.js b/packages/rocketchat-retention-policy/server/index.js new file mode 100644 index 000000000000..5c4c2c8ee2a1 --- /dev/null +++ b/packages/rocketchat-retention-policy/server/index.js @@ -0,0 +1,2 @@ +import './startup/settings'; +import './cronPruneMessages'; diff --git a/packages/rocketchat-retention-policy/server/startup/settings.js b/packages/rocketchat-retention-policy/server/startup/settings.js index 73feb6b50e16..de3155527adc 100644 --- a/packages/rocketchat-retention-policy/server/startup/settings.js +++ b/packages/rocketchat-retention-policy/server/startup/settings.js @@ -1,3 +1,5 @@ +import { RocketChat } from 'meteor/rocketchat:lib'; + RocketChat.settings.addGroup('RetentionPolicy', function() { this.add('RetentionPolicy_Enabled', false, {