Introduced ES2015 Import/Export to resolve dependencies

RocketChat · Mar 9, 2017 · 6b237ee · 6b237ee
1 parent 12923ce
commit 6b237ee
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 18 deletions.
diff --git a/packages/rocketchat-slackbridge/rocket.js → ...s/rocketchat-slackbridge/RocketAdapter.js b/packages/rocketchat-slackbridge/rocket.js → ...s/rocketchat-slackbridge/RocketAdapter.js
@@ -1,7 +1,6 @@
-/* globals logger SB_RocketAdapter */
-/* exported SB_RocketAdapter */
+/* globals logger*/
 
-class RocketAdapter {
+export default class RocketAdapter {
 	constructor(slackBridge) {
 		logger.rocket.debug('constructor');
 		this.slackBridge = slackBridge;
@@ -418,5 +417,3 @@ class RocketAdapter {
 	}
 
 }
-
-SB_RocketAdapter = RocketAdapter;
diff --git a/packages/rocketchat-slackbridge/slack.js → ...es/rocketchat-slackbridge/SlackAdapter.js b/packages/rocketchat-slackbridge/slack.js → ...es/rocketchat-slackbridge/SlackAdapter.js
@@ -1,7 +1,6 @@
-/* globals logger SB_SlackAdapter */
-/* exported SB_SlackAdapter */
+/* globals logger*/
 
-class SlackAdapter {
+export default class SlackAdapter {
 
 	constructor(slackBridge) {
 		logger.slack.debug('constructor');
@@ -1081,5 +1080,3 @@ class SlackAdapter {
 
 }
 
-SB_SlackAdapter = SlackAdapter;
-
diff --git a/packages/rocketchat-slackbridge/package.js b/packages/rocketchat-slackbridge/package.js
@@ -15,13 +15,10 @@ Package.onUse(function(api) {
 
 	api.addFiles('logger.js', 'server');
 	api.addFiles('settings.js', 'server');
-	api.addFiles('rocket.js', 'server');
-	api.addFiles('slack.js', 'server');
+	api.addFiles('RocketAdapter.js', 'server');
+	api.addFiles('SlackAdapter.js', 'server');
 	api.addFiles('slackbridge.js', 'server');
 	api.addFiles('slashcommand/slackbridge_import.server.js', 'server');
-
-	api.export('SB_SlackAdapter', 'server');
-	api.export('SB_RocketAdapter', 'server');
 });
 
 Npm.depends({

diff --git a/packages/rocketchat-slackbridge/slackbridge.js b/packages/rocketchat-slackbridge/slackbridge.js
@@ -1,13 +1,16 @@
-/* globals logger SB_SlackAdapter SB_RocketAdapter*/
+/* globals logger*/
+
+import SlackAdapter from './SlackAdapter.js';
+import RocketAdapter from './RocketAdapter.js';
 
 /**
  * SlackBridge interfaces between this Rocket installation and a remote Slack installation.
  */
 class SlackBridge {
 
 	constructor() {
-		this.slack = new SB_SlackAdapter(this);
-		this.rocket = new SB_RocketAdapter(this);
+		this.slack = new SlackAdapter(this);
+		this.rocket = new RocketAdapter(this);
 		this.reactionsMap = new Map();	//Sync object between rocket and slack
 		this.connected = false;
 		this.rocket.setSlack(this.slack);