Convert rocketchat-importer-csv to main module structure (#12663)

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

Hide file tree

Showing 7 changed files with 8 additions and 13 deletions.
diff --git a/packages/rocketchat-importer-csv/client/adder.js b/packages/rocketchat-importer-csv/client/adder.js
@@ -1,4 +1,4 @@
 import { Importers } from 'meteor/rocketchat:importer';
-import { CsvImporterInfo } from '../info';
+import { CsvImporterInfo } from '../lib/info';
 
 Importers.add(new CsvImporterInfo());
diff --git a/packages/rocketchat-importer-csv/client/index.js b/packages/rocketchat-importer-csv/client/index.js
@@ -0,0 +1 @@
+import './adder';
diff --git a/packages/rocketchat-importer-csv/info.js → packages/rocketchat-importer-csv/lib/info.js b/packages/rocketchat-importer-csv/info.js → packages/rocketchat-importer-csv/lib/info.js
diff --git a/packages/rocketchat-importer-csv/package.js b/packages/rocketchat-importer-csv/package.js
@@ -10,16 +10,8 @@ Package.onUse(function(api) {
 		'ecmascript',
 		'rocketchat:lib',
 		'rocketchat:importer',
+		'rocketchat:logger',
 	]);
-
-	api.use('rocketchat:logger', 'server');
-
-	// Importer information to both server and client
-	api.addFiles('info.js');
-
-	// Server files
-	api.addFiles(['server/importer.js', 'server/adder.js'], 'server');
-
-	// Client files
-	api.addFiles('client/adder.js', 'client');
+	api.mainModule('client/index.js', 'client');
+	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat-importer-csv/server/adder.js b/packages/rocketchat-importer-csv/server/adder.js
@@ -1,5 +1,5 @@
 import { Importers } from 'meteor/rocketchat:importer';
-import { CsvImporterInfo } from '../info';
+import { CsvImporterInfo } from '../lib/info';
 import { CsvImporter } from './importer';
 
 Importers.add(new CsvImporterInfo(), CsvImporter);
diff --git a/packages/rocketchat-importer-csv/server/importer.js b/packages/rocketchat-importer-csv/server/importer.js
@@ -8,6 +8,7 @@ import {
 	SelectionUser,
 } from 'meteor/rocketchat:importer';
 import { RocketChatFile } from 'meteor/rocketchat:file';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 export class CsvImporter extends Base {
 	constructor(info) {

diff --git a/packages/rocketchat-importer-csv/server/index.js b/packages/rocketchat-importer-csv/server/index.js
@@ -0,0 +1 @@
+import './adder';