From 14409761e61bd38d6fbfe59d4009b16033a222c1 Mon Sep 17 00:00:00 2001 From: Marcos Defendi Date: Wed, 12 Dec 2018 17:40:54 -0200 Subject: [PATCH] Revert imports of css, reAdd them to the addFiles function --- packages/chatpal-search/client/index.js | 1 - packages/chatpal-search/package.js | 3 +-- packages/meteor-autocomplete/client/index.js | 1 - packages/meteor-autocomplete/package.js | 3 +-- packages/rocketchat-action-links/client/index.js | 1 - packages/rocketchat-action-links/package.js | 1 + packages/rocketchat-authorization/client/index.js | 1 - packages/rocketchat-authorization/package.js | 2 +- packages/rocketchat-autotranslate/client/index.js | 1 - packages/rocketchat-autotranslate/package.js | 1 + packages/rocketchat-channel-settings/client/index.js | 1 - packages/rocketchat-channel-settings/package.js | 1 + packages/rocketchat-colors/client/index.js | 1 - packages/rocketchat-colors/package.js | 1 + packages/rocketchat-custom-sounds/client/index.js | 1 - packages/rocketchat-custom-sounds/package.js | 2 +- packages/rocketchat-dolphin/client/index.js | 1 - packages/rocketchat-dolphin/package.js | 1 + packages/rocketchat-drupal/client/index.js | 1 - packages/rocketchat-drupal/package.js | 1 + packages/rocketchat-e2e/client/rocketchat.e2e.js | 3 --- packages/rocketchat-e2e/package.js | 2 +- packages/rocketchat-emoji-custom/client/index.js | 1 - packages/rocketchat-emoji-custom/package.js | 2 +- packages/rocketchat-emoji-emojione/client/index.js | 1 - packages/rocketchat-emoji-emojione/package.js | 2 +- packages/rocketchat-github-enterprise/client/index.js | 1 - packages/rocketchat-github-enterprise/package.js | 1 + packages/rocketchat-gitlab/client/index.js | 1 - packages/rocketchat-gitlab/package.js | 1 + packages/rocketchat-integrations/client/index.js | 1 - packages/rocketchat-integrations/package.js | 1 + packages/rocketchat-livestream/client/index.js | 1 - packages/rocketchat-livestream/package.js | 1 + packages/rocketchat-mentions-flextab/client/index.js | 1 - packages/rocketchat-mentions-flextab/package.js | 1 + packages/rocketchat-message-action/client/index.js | 1 - packages/rocketchat-message-action/package.js | 1 + packages/rocketchat-message-pin/client/index.js | 1 - packages/rocketchat-message-pin/package.js | 1 + packages/rocketchat-message-snippet/client/index.js | 1 - packages/rocketchat-message-snippet/package.js | 1 + packages/rocketchat-message-star/client/index.js | 1 - packages/rocketchat-message-star/package.js | 1 + packages/rocketchat-oauth2-server-config/client/index.js | 1 - packages/rocketchat-oauth2-server-config/package.js | 1 + packages/rocketchat-otr/client/index.js | 1 - packages/rocketchat-otr/package.js | 1 + packages/rocketchat-push-notifications/client/index.js | 1 - packages/rocketchat-push-notifications/package.js | 1 + packages/rocketchat-search/client/index.js | 1 - packages/rocketchat-search/package.js | 1 + packages/rocketchat-tokenpass/client/index.js | 3 --- packages/rocketchat-tokenpass/package.js | 3 +++ packages/rocketchat-tooltip/client/index.js | 1 - packages/rocketchat-tooltip/package.js | 1 + packages/rocketchat-ui-clean-history/client/index.js | 1 - packages/rocketchat-ui-clean-history/package.js | 1 + 58 files changed, 31 insertions(+), 42 deletions(-) diff --git a/packages/chatpal-search/client/index.js b/packages/chatpal-search/client/index.js index 1b4cd56f4199..6c169229e05a 100644 --- a/packages/chatpal-search/client/index.js +++ b/packages/chatpal-search/client/index.js @@ -1,4 +1,3 @@ -import './style.css'; import './template/admin.html'; import './template/result.html'; import './template/suggestion.html'; diff --git a/packages/chatpal-search/package.js b/packages/chatpal-search/package.js index f55bfeb282d6..987a519f53c3 100644 --- a/packages/chatpal-search/package.js +++ b/packages/chatpal-search/package.js @@ -10,12 +10,11 @@ Package.onUse(function(api) { 'ecmascript', 'templating', ]); - api.addAssets([ 'server/asset/chatpal-enter.svg', 'server/asset/chatpal-logo-icon-darkblue.svg', ], 'server'); - + api.addFiles('client/style.css', 'client'); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); }); diff --git a/packages/meteor-autocomplete/client/index.js b/packages/meteor-autocomplete/client/index.js index d77150ea4f49..8c3fc7abc2b6 100644 --- a/packages/meteor-autocomplete/client/index.js +++ b/packages/meteor-autocomplete/client/index.js @@ -1,4 +1,3 @@ -import './autocomplete.css'; import './inputs.html'; import './templates'; import AutoComplete from './autocomplete-client'; diff --git a/packages/meteor-autocomplete/package.js b/packages/meteor-autocomplete/package.js index 763da8c1ddb3..26d5d3bded18 100755 --- a/packages/meteor-autocomplete/package.js +++ b/packages/meteor-autocomplete/package.js @@ -11,14 +11,13 @@ Package.onUse(function(api) { 'mongo', 'ddp', ]); - api.use([ 'blaze', 'templating', 'jquery', 'dandv:caret-position@2.1.0-3', ], 'client'); - + api.addFiles('client/autocomplete.css', 'client'); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-action-links/client/index.js b/packages/rocketchat-action-links/client/index.js index fa97e5534dc5..940c2db77dcc 100644 --- a/packages/rocketchat-action-links/client/index.js +++ b/packages/rocketchat-action-links/client/index.js @@ -1,4 +1,3 @@ import '../both/lib/actionLinks'; -import './stylesheets/actionLinks.css'; import './lib/actionLinks'; import './init'; diff --git a/packages/rocketchat-action-links/package.js b/packages/rocketchat-action-links/package.js index 04a37d6dff19..87870adc7f60 100644 --- a/packages/rocketchat-action-links/package.js +++ b/packages/rocketchat-action-links/package.js @@ -13,6 +13,7 @@ Package.onUse(function(api) { 'rocketchat:theme', 'rocketchat:ui', ]); + api.addFiles('client/stylesheets/actionLinks.css', 'client'); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-authorization/client/index.js b/packages/rocketchat-authorization/client/index.js index 0b25a1de8336..c48b4ca7d074 100644 --- a/packages/rocketchat-authorization/client/index.js +++ b/packages/rocketchat-authorization/client/index.js @@ -1,4 +1,3 @@ -import './stylesheets/permissions.css'; import '../lib/rocketchat'; import './lib/models/Roles'; import './lib/models/Users'; diff --git a/packages/rocketchat-authorization/package.js b/packages/rocketchat-authorization/package.js index 99875f5452a8..87fad95e2311 100644 --- a/packages/rocketchat-authorization/package.js +++ b/packages/rocketchat-authorization/package.js @@ -18,7 +18,7 @@ Package.onUse(function(api) { 'kadira:flow-router', 'kadira:blaze-layout', ], 'client'); - + api.addFiles('client/stylesheets/permissions.css', 'client'); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-autotranslate/client/index.js b/packages/rocketchat-autotranslate/client/index.js index 7c18917f528f..e09da56abcf4 100644 --- a/packages/rocketchat-autotranslate/client/index.js +++ b/packages/rocketchat-autotranslate/client/index.js @@ -1,4 +1,3 @@ -import './stylesheets/autotranslate.css'; import './lib/actionButton'; import './lib/autotranslate'; import './lib/tabBar'; diff --git a/packages/rocketchat-autotranslate/package.js b/packages/rocketchat-autotranslate/package.js index 88b075776e5c..49c42dcc3a55 100644 --- a/packages/rocketchat-autotranslate/package.js +++ b/packages/rocketchat-autotranslate/package.js @@ -12,6 +12,7 @@ Package.onUse(function(api) { 'rocketchat:lib', 'templating', ]); + api.addFiles('client/stylesheets/autotranslate.css', 'client'); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-channel-settings/client/index.js b/packages/rocketchat-channel-settings/client/index.js index dfe421664c87..78bfbc38ef21 100644 --- a/packages/rocketchat-channel-settings/client/index.js +++ b/packages/rocketchat-channel-settings/client/index.js @@ -1,4 +1,3 @@ -import './stylesheets/channel-settings.css'; import './startup/messageTypes'; import './startup/tabBar'; import './startup/trackSettingsChange'; diff --git a/packages/rocketchat-channel-settings/package.js b/packages/rocketchat-channel-settings/package.js index ef857658f769..24d436c97e47 100644 --- a/packages/rocketchat-channel-settings/package.js +++ b/packages/rocketchat-channel-settings/package.js @@ -13,6 +13,7 @@ Package.onUse(function(api) { 'templating', 'rocketchat:lib', ]); + api.addFiles('client/stylesheets/channel-settings.css', 'client'); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-colors/client/index.js b/packages/rocketchat-colors/client/index.js index 0c35236206a4..d99e4ed77352 100644 --- a/packages/rocketchat-colors/client/index.js +++ b/packages/rocketchat-colors/client/index.js @@ -1,2 +1 @@ -import './style.css'; import './client'; diff --git a/packages/rocketchat-colors/package.js b/packages/rocketchat-colors/package.js index 7006b3c0da7a..e7513c0b5114 100644 --- a/packages/rocketchat-colors/package.js +++ b/packages/rocketchat-colors/package.js @@ -10,6 +10,7 @@ Package.onUse(function(api) { 'ecmascript', 'rocketchat:lib', ]); + api.addFiles('client/style.css', 'client'); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-custom-sounds/client/index.js b/packages/rocketchat-custom-sounds/client/index.js index 204f894d7b3a..4199d882e842 100644 --- a/packages/rocketchat-custom-sounds/client/index.js +++ b/packages/rocketchat-custom-sounds/client/index.js @@ -1,4 +1,3 @@ -import '../assets/stylesheets/customSoundsAdmin.css'; import './lib/CustomSounds'; import './models/CustomSounds'; import './notifications/deleteCustomSound'; diff --git a/packages/rocketchat-custom-sounds/package.js b/packages/rocketchat-custom-sounds/package.js index afd358d9bf4e..dc9e37d5d4d1 100644 --- a/packages/rocketchat-custom-sounds/package.js +++ b/packages/rocketchat-custom-sounds/package.js @@ -16,7 +16,7 @@ Package.onUse(function(api) { 'kadira:flow-router', 'kadira:blaze-layout', ]); - + api.addFiles('assets/stylesheets/customSoundsAdmin.css', 'client'); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-dolphin/client/index.js b/packages/rocketchat-dolphin/client/index.js index f463af1d622d..e44dbe195eff 100644 --- a/packages/rocketchat-dolphin/client/index.js +++ b/packages/rocketchat-dolphin/client/index.js @@ -1,2 +1 @@ -import './login-button.css'; import '../lib/common'; diff --git a/packages/rocketchat-dolphin/package.js b/packages/rocketchat-dolphin/package.js index cab894f54ded..751718742c4e 100644 --- a/packages/rocketchat-dolphin/package.js +++ b/packages/rocketchat-dolphin/package.js @@ -14,6 +14,7 @@ Package.onUse(function(api) { 'rocketchat:custom-oauth', 'templating', ]); + api.addFiles('client/login-button.css', 'client'); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-drupal/client/index.js b/packages/rocketchat-drupal/client/index.js index f463af1d622d..e44dbe195eff 100644 --- a/packages/rocketchat-drupal/client/index.js +++ b/packages/rocketchat-drupal/client/index.js @@ -1,2 +1 @@ -import './login-button.css'; import '../lib/common'; diff --git a/packages/rocketchat-drupal/package.js b/packages/rocketchat-drupal/package.js index bd9e2d51ee3b..5841812c23e7 100644 --- a/packages/rocketchat-drupal/package.js +++ b/packages/rocketchat-drupal/package.js @@ -13,6 +13,7 @@ Package.onUse(function(api) { 'rocketchat:custom-oauth', 'templating', ]); + api.addFiles('client/login-button.css', 'client'); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-e2e/client/rocketchat.e2e.js b/packages/rocketchat-e2e/client/rocketchat.e2e.js index 2aec83f981fe..ae8059af9401 100644 --- a/packages/rocketchat-e2e/client/rocketchat.e2e.js +++ b/packages/rocketchat-e2e/client/rocketchat.e2e.js @@ -1,7 +1,4 @@ /* globals alerts, modal */ - -import './stylesheets/e2e'; - import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; import { ReactiveVar } from 'meteor/reactive-var'; diff --git a/packages/rocketchat-e2e/package.js b/packages/rocketchat-e2e/package.js index 2122c143727d..f3f89020c5be 100644 --- a/packages/rocketchat-e2e/package.js +++ b/packages/rocketchat-e2e/package.js @@ -16,7 +16,7 @@ Package.onUse(function(api) { 'templating', 'sha', ]); - + api.addFiles('client/stylesheets/e2e.less', 'client'); api.mainModule('client/rocketchat.e2e.js', 'client'); api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-emoji-custom/client/index.js b/packages/rocketchat-emoji-custom/client/index.js index 5cd9dc55dd4c..9688848698dd 100644 --- a/packages/rocketchat-emoji-custom/client/index.js +++ b/packages/rocketchat-emoji-custom/client/index.js @@ -1,4 +1,3 @@ -import '../assets/stylesheets/emojiCustomAdmin.css'; import './models/EmojiCustom'; import './lib/emojiCustom'; import './notifications/deleteEmojiCustom'; diff --git a/packages/rocketchat-emoji-custom/package.js b/packages/rocketchat-emoji-custom/package.js index abf831b6dbb7..775afc1bcec2 100644 --- a/packages/rocketchat-emoji-custom/package.js +++ b/packages/rocketchat-emoji-custom/package.js @@ -16,7 +16,7 @@ Package.onUse(function(api) { 'kadira:flow-router', 'kadira:blaze-layout', ]); - + api.addFiles('assets/stylesheets/emojiCustomAdmin.css', 'client'); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-emoji-emojione/client/index.js b/packages/rocketchat-emoji-emojione/client/index.js index f7ece04fae69..8e716d1f414f 100644 --- a/packages/rocketchat-emoji-emojione/client/index.js +++ b/packages/rocketchat-emoji-emojione/client/index.js @@ -1,2 +1 @@ -import './sprites.css'; import '../lib/rocketchat'; diff --git a/packages/rocketchat-emoji-emojione/package.js b/packages/rocketchat-emoji-emojione/package.js index 7c6d7a111b84..2314d203164d 100644 --- a/packages/rocketchat-emoji-emojione/package.js +++ b/packages/rocketchat-emoji-emojione/package.js @@ -12,7 +12,7 @@ Package.onUse(function(api) { 'rocketchat:emoji', 'rocketchat:lib', ]); - + api.addFiles('client/sprites.css', 'client'); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-github-enterprise/client/index.js b/packages/rocketchat-github-enterprise/client/index.js index 7f2b10ba6e3d..e44dbe195eff 100644 --- a/packages/rocketchat-github-enterprise/client/index.js +++ b/packages/rocketchat-github-enterprise/client/index.js @@ -1,2 +1 @@ -import './github-enterprise-login-button.css'; import '../lib/common'; diff --git a/packages/rocketchat-github-enterprise/package.js b/packages/rocketchat-github-enterprise/package.js index 1d6fab4926de..f4b1a620dd06 100644 --- a/packages/rocketchat-github-enterprise/package.js +++ b/packages/rocketchat-github-enterprise/package.js @@ -11,6 +11,7 @@ Package.onUse(function(api) { 'rocketchat:custom-oauth', 'templating', ]); + api.addFiles('client/github-enterprise-login-button.css', 'client'); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-gitlab/client/index.js b/packages/rocketchat-gitlab/client/index.js index 1550e37081b5..e44dbe195eff 100644 --- a/packages/rocketchat-gitlab/client/index.js +++ b/packages/rocketchat-gitlab/client/index.js @@ -1,2 +1 @@ -import './gitlab-login-button.css'; import '../lib/common'; diff --git a/packages/rocketchat-gitlab/package.js b/packages/rocketchat-gitlab/package.js index 627a7068a8b7..2afca082d079 100644 --- a/packages/rocketchat-gitlab/package.js +++ b/packages/rocketchat-gitlab/package.js @@ -11,6 +11,7 @@ Package.onUse(function(api) { 'rocketchat:custom-oauth', 'templating', ]); + api.addFiles('client/gitlab-login-button.css', 'client'); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-integrations/client/index.js b/packages/rocketchat-integrations/client/index.js index 5bec72061d43..2da38377a2f0 100644 --- a/packages/rocketchat-integrations/client/index.js +++ b/packages/rocketchat-integrations/client/index.js @@ -1,4 +1,3 @@ -import './stylesheets/integrations.css'; import '../lib/rocketchat'; import './collections'; import './startup'; diff --git a/packages/rocketchat-integrations/package.js b/packages/rocketchat-integrations/package.js index b5c33f8278f5..ff6f91617268 100644 --- a/packages/rocketchat-integrations/package.js +++ b/packages/rocketchat-integrations/package.js @@ -20,6 +20,7 @@ Package.onUse(function(api) { 'nimble:restivus', 'templating', ]); + api.addFiles('client/stylesheets/integrations.css', 'client'); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-livestream/client/index.js b/packages/rocketchat-livestream/client/index.js index b118255a4cb3..4221702c7ee0 100644 --- a/packages/rocketchat-livestream/client/index.js +++ b/packages/rocketchat-livestream/client/index.js @@ -1,4 +1,3 @@ -import './styles/liveStreamTab.css'; import './views/liveStreamTab.html'; import './views/liveStreamTab'; import './views/livestreamBroadcast.html'; diff --git a/packages/rocketchat-livestream/package.js b/packages/rocketchat-livestream/package.js index 6e2c55f39a06..e8fcf830f75e 100644 --- a/packages/rocketchat-livestream/package.js +++ b/packages/rocketchat-livestream/package.js @@ -12,6 +12,7 @@ Package.onUse(function(api) { 'rocketchat:ui', 'templating', ]); + api.addFiles('client/styles/liveStreamTab.css', 'client'); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); Npm.depends({ diff --git a/packages/rocketchat-mentions-flextab/client/index.js b/packages/rocketchat-mentions-flextab/client/index.js index db84017d4888..f1443a980322 100644 --- a/packages/rocketchat-mentions-flextab/client/index.js +++ b/packages/rocketchat-mentions-flextab/client/index.js @@ -1,4 +1,3 @@ -import './views/stylesheets/mentionsFlexTab.less'; import './views/mentionsFlexTab.html'; import './views/mentionsFlexTab'; import './actionButton'; diff --git a/packages/rocketchat-mentions-flextab/package.js b/packages/rocketchat-mentions-flextab/package.js index d1c0d708edd5..726ce88376b1 100644 --- a/packages/rocketchat-mentions-flextab/package.js +++ b/packages/rocketchat-mentions-flextab/package.js @@ -13,6 +13,7 @@ Package.onUse(function(api) { 'rocketchat:lib', 'templating', ]); + api.addFiles('client/views/stylesheets/mentionsFlexTab.less', 'client'); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-message-action/client/index.js b/packages/rocketchat-message-action/client/index.js index c61b2cb43691..7268ce420878 100644 --- a/packages/rocketchat-message-action/client/index.js +++ b/packages/rocketchat-message-action/client/index.js @@ -1,3 +1,2 @@ -import './stylesheets/messageAction.css'; import './messageAction.html'; import './messageAction'; diff --git a/packages/rocketchat-message-action/package.js b/packages/rocketchat-message-action/package.js index d10161c7a21f..2ff31877235e 100644 --- a/packages/rocketchat-message-action/package.js +++ b/packages/rocketchat-message-action/package.js @@ -11,5 +11,6 @@ Package.onUse(function(api) { 'ecmascript', 'rocketchat:lib', ]); + api.addFiles('client/stylesheets/messageAction.css', 'client'); api.mainModule('client/index.js', 'client'); }); diff --git a/packages/rocketchat-message-pin/client/index.js b/packages/rocketchat-message-pin/client/index.js index 9a90a5cc9c15..9d154e9efedb 100644 --- a/packages/rocketchat-message-pin/client/index.js +++ b/packages/rocketchat-message-pin/client/index.js @@ -1,4 +1,3 @@ -import './views/stylesheets/messagepin.css'; import './actionButton'; import './messageType'; import './pinMessage'; diff --git a/packages/rocketchat-message-pin/package.js b/packages/rocketchat-message-pin/package.js index 5bc0ff41b88c..4d3f4f9bf67e 100644 --- a/packages/rocketchat-message-pin/package.js +++ b/packages/rocketchat-message-pin/package.js @@ -11,6 +11,7 @@ Package.onUse(function(api) { 'rocketchat:lib', 'templating', ]); + api.addFiles('client/views/stylesheets/messagepin.css', 'client'); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-message-snippet/client/index.js b/packages/rocketchat-message-snippet/client/index.js index fdf7c7938384..5da7893284ea 100644 --- a/packages/rocketchat-message-snippet/client/index.js +++ b/packages/rocketchat-message-snippet/client/index.js @@ -1,4 +1,3 @@ -import './page/stylesheets/snippetPage.css'; import './actionButton'; import './messageType'; import './snippetMessage'; diff --git a/packages/rocketchat-message-snippet/package.js b/packages/rocketchat-message-snippet/package.js index 22e2b6e1f882..4de3d9a55861 100644 --- a/packages/rocketchat-message-snippet/package.js +++ b/packages/rocketchat-message-snippet/package.js @@ -21,6 +21,7 @@ Package.onUse(function(api) { 'kadira:flow-router', 'kadira:blaze-layout', ]); + api.addFiles('client/page/stylesheets/snippetPage.css', 'client'); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-message-star/client/index.js b/packages/rocketchat-message-star/client/index.js index 0bd6d93a1d0a..80ae3d282bdc 100644 --- a/packages/rocketchat-message-star/client/index.js +++ b/packages/rocketchat-message-star/client/index.js @@ -1,4 +1,3 @@ -import './views/stylesheets/messagestar.css'; import './actionButton'; import './starMessage'; import './tabBar'; diff --git a/packages/rocketchat-message-star/package.js b/packages/rocketchat-message-star/package.js index 21a8c106756b..cf7bb6d3c53d 100644 --- a/packages/rocketchat-message-star/package.js +++ b/packages/rocketchat-message-star/package.js @@ -12,6 +12,7 @@ Package.onUse(function(api) { 'rocketchat:lib', 'templating', ]); + api.addFiles('client/views/stylesheets/messagestar.css', 'client'); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-oauth2-server-config/client/index.js b/packages/rocketchat-oauth2-server-config/client/index.js index 2d7b53348a21..27d8d4052ce8 100644 --- a/packages/rocketchat-oauth2-server-config/client/index.js +++ b/packages/rocketchat-oauth2-server-config/client/index.js @@ -1,4 +1,3 @@ -import './oauth/stylesheets/oauth2.css'; import './oauth/oauth2-client.html'; import './oauth/oauth2-client'; import './admin/startup'; diff --git a/packages/rocketchat-oauth2-server-config/package.js b/packages/rocketchat-oauth2-server-config/package.js index 385315692e58..ebea4568a12b 100644 --- a/packages/rocketchat-oauth2-server-config/package.js +++ b/packages/rocketchat-oauth2-server-config/package.js @@ -17,6 +17,7 @@ Package.onUse(function(api) { 'kadira:flow-router', 'kadira:blaze-layout', ]); + api.addFiles('client/oauth/stylesheets/oauth2.css', 'client'); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-otr/client/index.js b/packages/rocketchat-otr/client/index.js index 10af4ea73fda..fb0bd1078d0c 100644 --- a/packages/rocketchat-otr/client/index.js +++ b/packages/rocketchat-otr/client/index.js @@ -1,4 +1,3 @@ -import './stylesheets/otr.css'; import './rocketchat.otr'; import './rocketchat.otr.room'; import './views/otrFlexTab.html'; diff --git a/packages/rocketchat-otr/package.js b/packages/rocketchat-otr/package.js index 99e0cc5727ba..b291530c86dd 100644 --- a/packages/rocketchat-otr/package.js +++ b/packages/rocketchat-otr/package.js @@ -13,6 +13,7 @@ Package.onUse(function(api) { 'reactive-var', 'templating', ]); + api.addFiles('client/stylesheets/otr.css', 'client'); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-push-notifications/client/index.js b/packages/rocketchat-push-notifications/client/index.js index 656b57b07c62..63b2cb703a3f 100644 --- a/packages/rocketchat-push-notifications/client/index.js +++ b/packages/rocketchat-push-notifications/client/index.js @@ -1,4 +1,3 @@ -import './stylesheets/pushNotifications.css'; import './views/pushNotificationsFlexTab.html'; import './views/pushNotificationsFlexTab'; import './tabBar'; diff --git a/packages/rocketchat-push-notifications/package.js b/packages/rocketchat-push-notifications/package.js index b0c95e72dfc9..7a0d71beb406 100644 --- a/packages/rocketchat-push-notifications/package.js +++ b/packages/rocketchat-push-notifications/package.js @@ -11,6 +11,7 @@ Package.onUse(function(api) { 'rocketchat:lib', 'templating', ]); + api.addFiles('client/stylesheets/pushNotifications.css', 'client'); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-search/client/index.js b/packages/rocketchat-search/client/index.js index 06267cf55837..f154b683b0ba 100644 --- a/packages/rocketchat-search/client/index.js +++ b/packages/rocketchat-search/client/index.js @@ -1,4 +1,3 @@ -import './style/style.css'; import './search/search.html'; import './search/search'; import './provider/suggestion.html'; diff --git a/packages/rocketchat-search/package.js b/packages/rocketchat-search/package.js index 892265d19128..d5004dfd2607 100644 --- a/packages/rocketchat-search/package.js +++ b/packages/rocketchat-search/package.js @@ -13,6 +13,7 @@ Package.onUse(function(api) { 'rocketchat:logger', 'kadira:flow-router', ]); + api.addFiles('client/style/style.css', 'client'); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-tokenpass/client/index.js b/packages/rocketchat-tokenpass/client/index.js index 471878739c60..86b6ea83c954 100644 --- a/packages/rocketchat-tokenpass/client/index.js +++ b/packages/rocketchat-tokenpass/client/index.js @@ -1,7 +1,4 @@ import '../lib/common'; -import './login-button.css'; -import './channelSettings.css'; -import './styles.css'; import './startup'; import './roomType'; import './tokenChannelsList.html'; diff --git a/packages/rocketchat-tokenpass/package.js b/packages/rocketchat-tokenpass/package.js index 2b396a5032e7..fe12256ab828 100644 --- a/packages/rocketchat-tokenpass/package.js +++ b/packages/rocketchat-tokenpass/package.js @@ -17,6 +17,9 @@ Package.onUse(function(api) { 'rocketchat:custom-oauth', 'rocketchat:channel-settings', ]); + api.addFiles('client/login-button.css', 'client'); + api.addFiles('client/channelSettings.css', 'client'); + api.addFiles('client/styles.css', 'client'); api.mainModule('client/index.js', 'client'); api.mainModule('server/index.js', 'server'); }); diff --git a/packages/rocketchat-tooltip/client/index.js b/packages/rocketchat-tooltip/client/index.js index 796193b59df0..e0a2d2f0e404 100644 --- a/packages/rocketchat-tooltip/client/index.js +++ b/packages/rocketchat-tooltip/client/index.js @@ -1,4 +1,3 @@ -import './tooltip.css'; import './rocketchat-tooltip.html'; import './rocketchat-tooltip'; import './init'; diff --git a/packages/rocketchat-tooltip/package.js b/packages/rocketchat-tooltip/package.js index bbbf41567060..3e83c9549772 100644 --- a/packages/rocketchat-tooltip/package.js +++ b/packages/rocketchat-tooltip/package.js @@ -14,5 +14,6 @@ Package.onUse(function(api) { 'rocketchat:theme', 'rocketchat:ui-master', ]); + api.addFiles('client/tooltip.css', 'client'); api.mainModule('client/index.js', 'client'); }); diff --git a/packages/rocketchat-ui-clean-history/client/index.js b/packages/rocketchat-ui-clean-history/client/index.js index 678ec8d39902..a28b913f41ad 100644 --- a/packages/rocketchat-ui-clean-history/client/index.js +++ b/packages/rocketchat-ui-clean-history/client/index.js @@ -1,4 +1,3 @@ import './lib/startup'; import './views/cleanHistory.html'; import './views/cleanHistory'; -import './views/stylesheets/cleanHistory.css'; diff --git a/packages/rocketchat-ui-clean-history/package.js b/packages/rocketchat-ui-clean-history/package.js index ea04f5a11a57..dd29496d1eb0 100644 --- a/packages/rocketchat-ui-clean-history/package.js +++ b/packages/rocketchat-ui-clean-history/package.js @@ -17,5 +17,6 @@ Package.onUse(function(api) { 'templating', 'rocketchat:lib', ]); + api.addFiles('client/views/stylesheets/cleanHistory.css', 'client'); api.mainModule('client/index.js', 'client'); });