Convert rocketchat-importer to main module structure (#12662)

RocketChat · Nov 20, 2018 · fa0ca0c · fa0ca0c
1 parent 2ca9658
commit fa0ca0c
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 41 deletions.
diff --git a/packages/rocketchat-importer/client/ImporterWebsocketReceiver.js b/packages/rocketchat-importer/client/ImporterWebsocketReceiver.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 class ImporterWebsocketReceiverDef {
 	constructor() {

diff --git a/packages/rocketchat-importer/client/admin/adminImport.js b/packages/rocketchat-importer/client/admin/adminImport.js
@@ -3,6 +3,8 @@ import { Importers } from 'meteor/rocketchat:importer';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
+import { RocketChat, handleError } from 'meteor/rocketchat:lib';
+import { t } from 'meteor/rocketchat:ui';
 
 Template.adminImport.helpers({
 	isAdmin() {

diff --git a/packages/rocketchat-importer/client/admin/adminImportPrepare.js b/packages/rocketchat-importer/client/admin/adminImportPrepare.js
@@ -3,6 +3,8 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { Importers } from 'meteor/rocketchat:importer';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
+import { RocketChat, handleError } from 'meteor/rocketchat:lib';
+import { t } from 'meteor/rocketchat:ui';
 import toastr from 'toastr';
 
 Template.adminImportPrepare.helpers({

diff --git a/packages/rocketchat-importer/client/admin/adminImportProgress.js b/packages/rocketchat-importer/client/admin/adminImportProgress.js
@@ -3,7 +3,8 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { Importers, ImporterWebsocketReceiver, ProgressStep } from 'meteor/rocketchat:importer';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-
+import { t } from 'meteor/rocketchat:ui';
+import { handleError } from 'meteor/rocketchat:lib';
 import toastr from 'toastr';
 
 Template.adminImportProgress.helpers({

diff --git a/packages/rocketchat-importer/client/index.js b/packages/rocketchat-importer/client/index.js
@@ -2,6 +2,12 @@ import { Importers } from '../lib/Importers';
 import { ImporterInfo } from '../lib/ImporterInfo';
 import { ImporterWebsocketReceiver } from './ImporterWebsocketReceiver';
 import { ProgressStep } from '../lib/ImporterProgressStep';
+import './admin/adminImport.html';
+import './admin/adminImport';
+import './admin/adminImportPrepare.html';
+import './admin/adminImportPrepare';
+import './admin/adminImportProgress.html';
+import './admin/adminImportProgress';
 
 export {
 	Importers,

diff --git a/packages/rocketchat-importer/package.js b/packages/rocketchat-importer/package.js
@@ -11,46 +11,8 @@ Package.onUse(function(api) {
 		'templating',
 		'check',
 		'rocketchat:lib',
+		'rocketchat:logger',
 	]);
-
-	api.use('rocketchat:logger', 'server');
-	api.use('templating', 'client');
-
-	// Import Framework
-	api.addFiles('server/classes/ImporterBase.js', 'server');
-	api.addFiles('server/classes/ImporterProgress.js', 'server');
-	api.addFiles('server/classes/ImporterSelection.js', 'server');
-	api.addFiles('server/classes/ImporterSelectionChannel.js', 'server');
-	api.addFiles('server/classes/ImporterSelectionUser.js', 'server');
-	api.addFiles('server/classes/ImporterWebsocket.js', 'server');
-
-	api.addFiles('lib/ImporterInfo.js');
-	api.addFiles('lib/ImporterProgressStep.js');
-	api.addFiles('lib/Importers.js');
-
-	// Database models
-	api.addFiles('server/models/Imports.js', 'server');
-	api.addFiles('server/models/RawImports.js', 'server');
-
-	// Server methods
-	api.addFiles('server/methods/getImportProgress.js', 'server');
-	api.addFiles('server/methods/getSelectionData.js', 'server');
-	api.addFiles('server/methods/prepareImport.js', 'server');
-	api.addFiles('server/methods/restartImport.js', 'server');
-	api.addFiles('server/methods/setupImporter.js', 'server');
-	api.addFiles('server/methods/startImport.js', 'server');
-
-	// Client
-	api.addFiles('client/admin/adminImport.html', 'client');
-	api.addFiles('client/admin/adminImport.js', 'client');
-	api.addFiles('client/admin/adminImportPrepare.html', 'client');
-	api.addFiles('client/admin/adminImportPrepare.js', 'client');
-	api.addFiles('client/admin/adminImportProgress.html', 'client');
-	api.addFiles('client/admin/adminImportProgress.js', 'client');
-
-	// Imports database records cleanup, mark all as not valid.
-	api.addFiles('server/startup/setImportsToInvalid.js', 'server');
-
 	api.mainModule('client/index.js', 'client');
 	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat-importer/server/classes/ImporterBase.js b/packages/rocketchat-importer/server/classes/ImporterBase.js
@@ -6,7 +6,9 @@ import { Imports } from '../models/Imports';
 import { ImporterInfo } from '../../lib/ImporterInfo';
 import { RawImports } from '../models/RawImports';
 import { ImporterWebsocket } from './ImporterWebsocket';
-
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { Logger } from 'meteor/rocketchat:logger';
+import { FileUpload } from 'meteor/rocketchat:file-upload';
 import http from 'http';
 import https from 'https';
 import AdmZip from 'adm-zip';

diff --git a/packages/rocketchat-importer/server/index.js b/packages/rocketchat-importer/server/index.js
@@ -9,6 +9,13 @@ import { RawImports } from './models/RawImports';
 import { Selection } from './classes/ImporterSelection';
 import { SelectionChannel } from './classes/ImporterSelectionChannel';
 import { SelectionUser } from './classes/ImporterSelectionUser';
+import './methods/getImportProgress';
+import './methods/getSelectionData';
+import './methods/prepareImport';
+import './methods/restartImport';
+import './methods/setupImporter';
+import './methods/startImport';
+import './startup/setImportsToInvalid';
 
 export {
 	Base,

diff --git a/packages/rocketchat-importer/server/methods/getImportProgress.js b/packages/rocketchat-importer/server/methods/getImportProgress.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Importers } from 'meteor/rocketchat:importer';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.methods({
 	getImportProgress(key) {

diff --git a/packages/rocketchat-importer/server/methods/getSelectionData.js b/packages/rocketchat-importer/server/methods/getSelectionData.js
@@ -3,6 +3,7 @@ import {
 	Importers,
 	ProgressStep,
 } from 'meteor/rocketchat:importer';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.methods({
 	getSelectionData(key) {

diff --git a/packages/rocketchat-importer/server/methods/prepareImport.js b/packages/rocketchat-importer/server/methods/prepareImport.js
@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 import { Importers } from 'meteor/rocketchat:importer';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.methods({
 	prepareImport(key, dataURI, contentType, fileName) {

diff --git a/packages/rocketchat-importer/server/methods/restartImport.js b/packages/rocketchat-importer/server/methods/restartImport.js
@@ -3,6 +3,7 @@ import {
 	Importers,
 	ProgressStep,
 } from 'meteor/rocketchat:importer';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.methods({
 	restartImport(key) {

diff --git a/packages/rocketchat-importer/server/methods/setupImporter.js b/packages/rocketchat-importer/server/methods/setupImporter.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Importers } from 'meteor/rocketchat:importer';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.methods({
 	setupImporter(key) {

diff --git a/packages/rocketchat-importer/server/methods/startImport.js b/packages/rocketchat-importer/server/methods/startImport.js
@@ -5,6 +5,7 @@ import {
 	SelectionChannel,
 	SelectionUser,
 } from 'meteor/rocketchat:importer';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.methods({
 	startImport(key, input) {

diff --git a/packages/rocketchat-importer/server/models/Imports.js b/packages/rocketchat-importer/server/models/Imports.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 class ImportsModel extends RocketChat.models._Base {
 	constructor() {
 		super('import');

diff --git a/packages/rocketchat-importer/server/models/RawImports.js b/packages/rocketchat-importer/server/models/RawImports.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 class RawImportsModel extends RocketChat.models._Base {
 	constructor() {
 		super('raw_imports');