From 42a3a481e5ca7a17134025258053095ce861288b Mon Sep 17 00:00:00 2001
From: Marcos Spessatto Defendi <marcos.defendi@ulbra.inf.br>
Date: Fri, 16 Nov 2018 19:12:12 -0200
Subject: [PATCH] Convert rocketchat-google-vision to main module structure
 (#12649)

---
 packages/rocketchat-google-vision/client/googlevision.js    | 1 +
 packages/rocketchat-google-vision/client/index.js           | 1 +
 packages/rocketchat-google-vision/package.js                | 5 ++---
 packages/rocketchat-google-vision/server/googlevision.js    | 2 ++
 packages/rocketchat-google-vision/server/index.js           | 3 +++
 packages/rocketchat-google-vision/server/models/Messages.js | 2 ++
 packages/rocketchat-google-vision/server/settings.js        | 1 +
 7 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 packages/rocketchat-google-vision/client/index.js
 create mode 100644 packages/rocketchat-google-vision/server/index.js

diff --git a/packages/rocketchat-google-vision/client/googlevision.js b/packages/rocketchat-google-vision/client/googlevision.js
index a8a21b3b8d0d..bcd115b781a4 100644
--- a/packages/rocketchat-google-vision/client/googlevision.js
+++ b/packages/rocketchat-google-vision/client/googlevision.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 RocketChat.GoogleVision = {
 	getVisionAttributes(attachment) {
diff --git a/packages/rocketchat-google-vision/client/index.js b/packages/rocketchat-google-vision/client/index.js
new file mode 100644
index 000000000000..b27b67994b22
--- /dev/null
+++ b/packages/rocketchat-google-vision/client/index.js
@@ -0,0 +1 @@
+import './googlevision';
diff --git a/packages/rocketchat-google-vision/package.js b/packages/rocketchat-google-vision/package.js
index f97242a07266..210bb8a760b4 100644
--- a/packages/rocketchat-google-vision/package.js
+++ b/packages/rocketchat-google-vision/package.js
@@ -10,7 +10,6 @@ Package.onUse(function(api) {
 		'ecmascript',
 		'rocketchat:lib',
 	]);
-
-	api.addFiles('client/googlevision.js', 'client');
-	api.addFiles(['server/settings.js', 'server/googlevision.js', 'server/models/Messages.js'], 'server');
+	api.mainModule('client/index.js', 'client');
+	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat-google-vision/server/googlevision.js b/packages/rocketchat-google-vision/server/googlevision.js
index ae675d924bdf..4b7b047b0d48 100644
--- a/packages/rocketchat-google-vision/server/googlevision.js
+++ b/packages/rocketchat-google-vision/server/googlevision.js
@@ -1,6 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
 import { TAPi18n } from 'meteor/tap:i18n';
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { FileUpload } from 'meteor/rocketchat:file-upload';
 
 class GoogleVision {
 	constructor() {
diff --git a/packages/rocketchat-google-vision/server/index.js b/packages/rocketchat-google-vision/server/index.js
new file mode 100644
index 000000000000..df4e64972a9d
--- /dev/null
+++ b/packages/rocketchat-google-vision/server/index.js
@@ -0,0 +1,3 @@
+import './settings';
+import './googlevision';
+import './models/Messages';
diff --git a/packages/rocketchat-google-vision/server/models/Messages.js b/packages/rocketchat-google-vision/server/models/Messages.js
index 47776984618d..257949dd213b 100644
--- a/packages/rocketchat-google-vision/server/models/Messages.js
+++ b/packages/rocketchat-google-vision/server/models/Messages.js
@@ -1,3 +1,5 @@
+import { RocketChat } from 'meteor/rocketchat:lib';
+
 RocketChat.models.Messages.setGoogleVisionData = function(messageId, visionData) {
 	const updateObj = {};
 	for (const index in visionData) {
diff --git a/packages/rocketchat-google-vision/server/settings.js b/packages/rocketchat-google-vision/server/settings.js
index 242ed9037773..e3934ed9a60d 100644
--- a/packages/rocketchat-google-vision/server/settings.js
+++ b/packages/rocketchat-google-vision/server/settings.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Meteor.startup(function() {
 	RocketChat.settings.add('GoogleVision_Enable', false, {