From 6a62d5223fbefdb746479c53fec6c60f9fba39c1 Mon Sep 17 00:00:00 2001 From: Marcos Defendi Date: Mon, 3 Dec 2018 14:59:43 -0200 Subject: [PATCH] Convert rocketchat-setup-wizard to main module structure --- .../rocketchat-setup-wizard/client/final.js | 1 + .../rocketchat-setup-wizard/client/index.js | 4 ++++ .../client/setupWizard.js | 3 +++ packages/rocketchat-setup-wizard/package.js | 17 +++++++---------- .../server/getSetupWizardParameters.js | 1 + .../rocketchat-setup-wizard/server/index.js | 1 + 6 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 packages/rocketchat-setup-wizard/client/index.js create mode 100644 packages/rocketchat-setup-wizard/server/index.js diff --git a/packages/rocketchat-setup-wizard/client/final.js b/packages/rocketchat-setup-wizard/client/final.js index 20c7b7ebc40d..05b0b3d791a6 100644 --- a/packages/rocketchat-setup-wizard/client/final.js +++ b/packages/rocketchat-setup-wizard/client/final.js @@ -1,6 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { FlowRouter } from 'meteor/kadira:flow-router'; import { Template } from 'meteor/templating'; +import { RocketChat } from 'meteor/rocketchat:lib'; Template.setupWizardFinal.onCreated(function() { const isSetupWizardDone = localStorage.getItem('wizardFinal'); diff --git a/packages/rocketchat-setup-wizard/client/index.js b/packages/rocketchat-setup-wizard/client/index.js new file mode 100644 index 000000000000..2b99b89e3ed0 --- /dev/null +++ b/packages/rocketchat-setup-wizard/client/index.js @@ -0,0 +1,4 @@ +import './setupWizard.html'; +import './setupWizard'; +import './final.html'; +import './final'; diff --git a/packages/rocketchat-setup-wizard/client/setupWizard.js b/packages/rocketchat-setup-wizard/client/setupWizard.js index 0bac5d0e394a..50b4a693e621 100644 --- a/packages/rocketchat-setup-wizard/client/setupWizard.js +++ b/packages/rocketchat-setup-wizard/client/setupWizard.js @@ -5,6 +5,9 @@ import { FlowRouter } from 'meteor/kadira:flow-router'; import { Session } from 'meteor/session'; import { Template } from 'meteor/templating'; import { TAPi18n } from 'meteor/tap:i18n'; +import { RocketChat, handleError } from 'meteor/rocketchat:lib'; +import { t } from 'meteor/rocketchat:ui'; +import toastr from 'toastr'; const cannotSetup = () => { const showSetupWizard = RocketChat.settings.get('Show_Setup_Wizard'); diff --git a/packages/rocketchat-setup-wizard/package.js b/packages/rocketchat-setup-wizard/package.js index 738c49e0ce0a..ee5e86f0d706 100644 --- a/packages/rocketchat-setup-wizard/package.js +++ b/packages/rocketchat-setup-wizard/package.js @@ -6,14 +6,11 @@ Package.describe({ }); Package.onUse(function(api) { - api.use('ecmascript'); - api.use('templating', 'client'); - api.use('rocketchat:theme'); - - api.addFiles('client/setupWizard.html', 'client'); - api.addFiles('client/setupWizard.js', 'client'); - api.addFiles('client/final.html', 'client'); - api.addFiles('client/final.js', 'client'); - - api.addFiles('server/getSetupWizardParameters.js', 'server'); + api.use([ + 'ecmascript', + 'templating', + 'rocketchat:theme', + ]); + api.mainModule('client/index.js', 'client'); + api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-setup-wizard/server/getSetupWizardParameters.js b/packages/rocketchat-setup-wizard/server/getSetupWizardParameters.js index 664e00bbeca1..78a66c00c433 100644 --- a/packages/rocketchat-setup-wizard/server/getSetupWizardParameters.js +++ b/packages/rocketchat-setup-wizard/server/getSetupWizardParameters.js @@ -1,4 +1,5 @@ import { Meteor } from 'meteor/meteor'; +import { RocketChat } from 'meteor/rocketchat:lib'; Meteor.methods({ getSetupWizardParameters() { diff --git a/packages/rocketchat-setup-wizard/server/index.js b/packages/rocketchat-setup-wizard/server/index.js new file mode 100644 index 000000000000..43e790a126bb --- /dev/null +++ b/packages/rocketchat-setup-wizard/server/index.js @@ -0,0 +1 @@ +import './getSetupWizardParameters';