Convert rocketchat-file to main module structure (#12644)

* Convert rocketchat-file to main module structure * Import RocketChatFile in packages that use it
RocketChat · Nov 16, 2018 · 515a372 · 515a372
1 parent bda3f7a
commit 515a372
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 12 deletions.
diff --git a/packages/rocketchat-file/package.js b/packages/rocketchat-file/package.js
@@ -6,11 +6,8 @@ Package.describe({
 });
 
 Package.onUse(function(api) {
-	api.use('rocketchat:lib');
-	api.use('rocketchat:version');
-	api.use('ecmascript');
-
-	api.addFiles('file.server.js', 'server');
-
-	api.export('RocketChatFile', 'server');
+	api.use([
+		'ecmascript',
+	]);
+	api.mainModule('server/index.js', 'server');
 });
diff --git a/packages/rocketchat-file/file.server.js → ...ges/rocketchat-file/server/file.server.js b/packages/rocketchat-file/file.server.js → ...ges/rocketchat-file/server/file.server.js
@@ -9,8 +9,8 @@ import mkdirp from 'mkdirp';
 Grid.prototype.tryParseObjectId = function() {
 	return false;
 };
-// TODO: REMOVE RocketChatFile from globals
-RocketChatFile = {};
+
+const RocketChatFile = {};
 
 RocketChatFile.bufferToStream = function(buffer) {
 	const bufferStream = new stream.PassThrough();
@@ -229,3 +229,5 @@ RocketChatFile.FileSystem = class {
 		}
 	}
 };
+
+export { RocketChatFile };
diff --git a/packages/rocketchat-file/server/index.js b/packages/rocketchat-file/server/index.js
@@ -0,0 +1,3 @@
+import { RocketChatFile } from './file.server';
+
+export { RocketChatFile };
diff --git a/packages/rocketchat-importer-csv/server/importer.js b/packages/rocketchat-importer-csv/server/importer.js
@@ -7,6 +7,7 @@ import {
 	SelectionChannel,
 	SelectionUser,
 } from 'meteor/rocketchat:importer';
+import { RocketChatFile } from 'meteor/rocketchat:file';
 
 export class CsvImporter extends Base {
 	constructor(info) {

diff --git a/packages/rocketchat-importer-hipchat/server/importer.js b/packages/rocketchat-importer-hipchat/server/importer.js
@@ -7,7 +7,7 @@ import {
 	SelectionChannel,
 	SelectionUser,
 } from 'meteor/rocketchat:importer';
-
+import { RocketChatFile } from 'meteor/rocketchat:file';
 import _ from 'underscore';
 import s from 'underscore.string';
 import moment from 'moment';

diff --git a/packages/rocketchat-importer-slack-users/server/importer.js b/packages/rocketchat-importer-slack-users/server/importer.js
@@ -7,6 +7,7 @@ import {
 	Selection,
 	SelectionUser,
 } from 'meteor/rocketchat:importer';
+import { RocketChatFile } from 'meteor/rocketchat:file';
 
 export class SlackUsersImporter extends Base {
 	constructor(info) {

diff --git a/packages/rocketchat-importer-slack/server/importer.js b/packages/rocketchat-importer-slack/server/importer.js
@@ -7,6 +7,7 @@ import {
 	SelectionChannel,
 	SelectionUser,
 } from 'meteor/rocketchat:importer';
+import { RocketChatFile } from 'meteor/rocketchat:file';
 
 import _ from 'underscore';
 

diff --git a/packages/rocketchat-ldap/server/sync.js b/packages/rocketchat-ldap/server/sync.js
@@ -2,6 +2,7 @@
 
 import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
+import { RocketChatFile } from 'meteor/rocketchat:file';
 import _ from 'underscore';
 import LDAP from './ldap';
 

diff --git a/packages/rocketchat-lib/package.js b/packages/rocketchat-lib/package.js
@@ -31,6 +31,7 @@ Package.onUse(function(api) {
 	api.use('rocketchat:mailer');
 	api.use('mizzao:timesync');
 	api.use('rocketchat:custom-oauth');
+	api.use('rocketchat:file');
 	api.use('rocketchat:authorization', { unordered: true });
 	api.use('rocketchat:push-notifications', { unordered: true });
 

diff --git a/packages/rocketchat-lib/server/functions/setUserAvatar.js b/packages/rocketchat-lib/server/functions/setUserAvatar.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { HTTP } from 'meteor/http';
-
+import { RocketChatFile } from 'meteor/rocketchat:file';
 RocketChat.setUserAvatar = function(user, dataURI, contentType, service) {
 	let encoding;
 	let image;

diff --git a/server/startup/initialData.js b/server/startup/initialData.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
+import { RocketChatFile } from 'meteor/rocketchat:file';
 import _ from 'underscore';
 
 Meteor.startup(function() {

diff --git a/server/startup/migrations/v002.js b/server/startup/migrations/v002.js
@@ -1,5 +1,5 @@
 /* globals getAvatarSuggestionForUser */
-
+import { RocketChatFile } from 'meteor/rocketchat:file';
 RocketChat.Migrations.add({
 	version: 2,
 	up() {

diff --git a/server/startup/migrations/v099.js b/server/startup/migrations/v099.js
@@ -3,6 +3,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
 import { Mongo } from 'meteor/mongo';
+import { RocketChatFile } from 'meteor/rocketchat:file';
 import fs from 'fs';
 import path from 'path';
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import { RocketChatFile } from './file.server';

		export { RocketChatFile };