From e5c797bbb0ed0e827367a106a5f5b22ec0f8a3bc Mon Sep 17 00:00:00 2001 From: Marcos Spessatto Defendi Date: Mon, 3 Dec 2018 11:14:55 -0200 Subject: [PATCH] Convert rocketchat-oembed to main module structure (#12775) --- packages/rocketchat-oembed/client/index.js | 16 +++++++++ .../client/oembedAudioWidget.js | 1 + .../client/oembedFrameWidget.js | 1 + .../client/oembedImageWidget.js | 1 + .../client/oembedUrlWidget.js | 1 + .../client/oembedVideoWidget.js | 1 + .../client/oembedYoutubeWidget.js | 1 + packages/rocketchat-oembed/package.js | 33 ++----------------- packages/rocketchat-oembed/server/index.js | 8 +++++ .../rocketchat-oembed/server/jumpToMessage.js | 3 +- .../server/models/OEmbedCache.js | 1 + .../rocketchat-oembed/server/providers.js | 3 +- packages/rocketchat-oembed/server/server.js | 6 +++- 13 files changed, 42 insertions(+), 34 deletions(-) create mode 100644 packages/rocketchat-oembed/client/index.js create mode 100644 packages/rocketchat-oembed/server/index.js diff --git a/packages/rocketchat-oembed/client/index.js b/packages/rocketchat-oembed/client/index.js new file mode 100644 index 000000000000..5d5a3248c526 --- /dev/null +++ b/packages/rocketchat-oembed/client/index.js @@ -0,0 +1,16 @@ +import './baseWidget.html'; +import './baseWidget'; +import './oembedImageWidget.html'; +import './oembedImageWidget'; +import './oembedAudioWidget.html'; +import './oembedAudioWidget'; +import './oembedVideoWidget.html'; +import './oembedVideoWidget'; +import './oembedYoutubeWidget.html'; +import './oembedYoutubeWidget'; +import './oembedUrlWidget.html'; +import './oembedUrlWidget'; +import './oembedFrameWidget.html'; +import './oembedFrameWidget'; +import './oembedSandstormGrain.html'; +import './oembedSandstormGrain'; diff --git a/packages/rocketchat-oembed/client/oembedAudioWidget.js b/packages/rocketchat-oembed/client/oembedAudioWidget.js index 194b00ae3b81..85a5c7ceb947 100644 --- a/packages/rocketchat-oembed/client/oembedAudioWidget.js +++ b/packages/rocketchat-oembed/client/oembedAudioWidget.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; +import { RocketChat } from 'meteor/rocketchat:lib'; Template.oembedAudioWidget.helpers({ collapsed() { diff --git a/packages/rocketchat-oembed/client/oembedFrameWidget.js b/packages/rocketchat-oembed/client/oembedFrameWidget.js index 3f5c69792c39..9a8d529fcf24 100644 --- a/packages/rocketchat-oembed/client/oembedFrameWidget.js +++ b/packages/rocketchat-oembed/client/oembedFrameWidget.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; +import { RocketChat } from 'meteor/rocketchat:lib'; Template.oembedFrameWidget.helpers({ collapsed() { diff --git a/packages/rocketchat-oembed/client/oembedImageWidget.js b/packages/rocketchat-oembed/client/oembedImageWidget.js index cf80d8087a19..5b321caa97ce 100644 --- a/packages/rocketchat-oembed/client/oembedImageWidget.js +++ b/packages/rocketchat-oembed/client/oembedImageWidget.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; +import { RocketChat } from 'meteor/rocketchat:lib'; Template.oembedImageWidget.helpers({ loadImage() { diff --git a/packages/rocketchat-oembed/client/oembedUrlWidget.js b/packages/rocketchat-oembed/client/oembedUrlWidget.js index e486a97c5293..d231f6a35e80 100644 --- a/packages/rocketchat-oembed/client/oembedUrlWidget.js +++ b/packages/rocketchat-oembed/client/oembedUrlWidget.js @@ -1,6 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { Blaze } from 'meteor/blaze'; import { Template } from 'meteor/templating'; +import { RocketChat } from 'meteor/rocketchat:lib'; import _ from 'underscore'; const getTitle = function(self) { diff --git a/packages/rocketchat-oembed/client/oembedVideoWidget.js b/packages/rocketchat-oembed/client/oembedVideoWidget.js index e12ddd2790d6..0c0d21d40d89 100644 --- a/packages/rocketchat-oembed/client/oembedVideoWidget.js +++ b/packages/rocketchat-oembed/client/oembedVideoWidget.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; +import { RocketChat } from 'meteor/rocketchat:lib'; const getTitle = function(self) { if (self.meta == null) { diff --git a/packages/rocketchat-oembed/client/oembedYoutubeWidget.js b/packages/rocketchat-oembed/client/oembedYoutubeWidget.js index 2312f2bf0445..848e89e2f219 100644 --- a/packages/rocketchat-oembed/client/oembedYoutubeWidget.js +++ b/packages/rocketchat-oembed/client/oembedYoutubeWidget.js @@ -1,5 +1,6 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; +import { RocketChat } from 'meteor/rocketchat:lib'; Template.oembedYoutubeWidget.helpers({ collapsed() { diff --git a/packages/rocketchat-oembed/package.js b/packages/rocketchat-oembed/package.js index 7e19ada673ee..20439ad2e5e3 100644 --- a/packages/rocketchat-oembed/package.js +++ b/packages/rocketchat-oembed/package.js @@ -13,35 +13,6 @@ Package.onUse(function(api) { 'konecty:change-case', 'rocketchat:lib', ]); - - api.addFiles('client/baseWidget.html', 'client'); - api.addFiles('client/baseWidget.js', 'client'); - - api.addFiles('client/oembedImageWidget.html', 'client'); - api.addFiles('client/oembedImageWidget.js', 'client'); - - api.addFiles('client/oembedAudioWidget.html', 'client'); - api.addFiles('client/oembedAudioWidget.js', 'client'); - - api.addFiles('client/oembedVideoWidget.html', 'client'); - api.addFiles('client/oembedVideoWidget.js', 'client'); - - api.addFiles('client/oembedYoutubeWidget.html', 'client'); - api.addFiles('client/oembedYoutubeWidget.js', 'client'); - - api.addFiles('client/oembedUrlWidget.html', 'client'); - api.addFiles('client/oembedUrlWidget.js', 'client'); - - api.addFiles('client/oembedFrameWidget.html', 'client'); - api.addFiles('client/oembedFrameWidget.js', 'client'); - - api.addFiles('client/oembedSandstormGrain.html', 'client'); - api.addFiles('client/oembedSandstormGrain.js', 'client'); - - api.addFiles('server/server.js', 'server'); - api.addFiles('server/providers.js', 'server'); - api.addFiles('server/jumpToMessage.js', 'server'); - api.addFiles('server/models/OEmbedCache.js', 'server'); - - api.export('OEmbed', 'server'); + api.mainModule('client/index.js', 'client'); + api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-oembed/server/index.js b/packages/rocketchat-oembed/server/index.js new file mode 100644 index 000000000000..a16eab3a866a --- /dev/null +++ b/packages/rocketchat-oembed/server/index.js @@ -0,0 +1,8 @@ +import './models/OEmbedCache'; +import './jumpToMessage'; +import './providers'; +import { OEmbed } from './server'; + +export { + OEmbed, +}; diff --git a/packages/rocketchat-oembed/server/jumpToMessage.js b/packages/rocketchat-oembed/server/jumpToMessage.js index 3dda81d070ce..6d35bdda8480 100644 --- a/packages/rocketchat-oembed/server/jumpToMessage.js +++ b/packages/rocketchat-oembed/server/jumpToMessage.js @@ -1,5 +1,6 @@ -/* globals getAvatarUrlFromUsername */ import { Meteor } from 'meteor/meteor'; +import { RocketChat } from 'meteor/rocketchat:lib'; +import { getAvatarUrlFromUsername } from 'meteor/rocketchat:ui'; import _ from 'underscore'; import URL from 'url'; import QueryString from 'querystring'; diff --git a/packages/rocketchat-oembed/server/models/OEmbedCache.js b/packages/rocketchat-oembed/server/models/OEmbedCache.js index cfe915f0cc59..7f83342b51b2 100644 --- a/packages/rocketchat-oembed/server/models/OEmbedCache.js +++ b/packages/rocketchat-oembed/server/models/OEmbedCache.js @@ -1,3 +1,4 @@ +import { RocketChat } from 'meteor/rocketchat:lib'; RocketChat.models.OEmbedCache = new class extends RocketChat.models._Base { constructor() { diff --git a/packages/rocketchat-oembed/server/providers.js b/packages/rocketchat-oembed/server/providers.js index 0bc7dd192cef..60e18cc8144b 100644 --- a/packages/rocketchat-oembed/server/providers.js +++ b/packages/rocketchat-oembed/server/providers.js @@ -1,4 +1,5 @@ -/* globals changeCase */ +import { changeCase } from 'meteor/konecty:change-case'; +import { RocketChat } from 'meteor/rocketchat:lib'; import _ from 'underscore'; import URL from 'url'; import QueryString from 'querystring'; diff --git a/packages/rocketchat-oembed/server/server.js b/packages/rocketchat-oembed/server/server.js index b54b2a5ab754..d323649e6e1e 100644 --- a/packages/rocketchat-oembed/server/server.js +++ b/packages/rocketchat-oembed/server/server.js @@ -1,5 +1,7 @@ -/* globals HTTPInternals, changeCase */ import { Meteor } from 'meteor/meteor'; +import { HTTPInternals } from 'meteor/http'; +import { changeCase } from 'meteor/konecty:change-case'; +import { RocketChat } from 'meteor/rocketchat:lib'; import _ from 'underscore'; import URL from 'url'; import querystring from 'querystring'; @@ -294,3 +296,5 @@ RocketChat.settings.get('API_Embed', function(key, value) { return RocketChat.callbacks.remove('afterSaveMessage', 'API_Embed'); } }); + +export { OEmbed };