From c0fb31d4ad2353a84272fb7ea0bab3b4cd13a04f Mon Sep 17 00:00:00 2001 From: Pedro Ferreira Date: Fri, 2 Mar 2018 09:19:29 +0100 Subject: [PATCH] Chat: move to webpack --- chat/indico_chat/{static/js/chat.js => client/index.js} | 2 ++ .../{static/css/chat.scss => client/main.scss} | 0 chat/indico_chat/plugin.py | 8 ++------ chat/webpack-bundles.json | 5 +++++ 4 files changed, 9 insertions(+), 6 deletions(-) rename chat/indico_chat/{static/js/chat.js => client/index.js} (99%) rename chat/indico_chat/{static/css/chat.scss => client/main.scss} (100%) create mode 100644 chat/webpack-bundles.json diff --git a/chat/indico_chat/static/js/chat.js b/chat/indico_chat/client/index.js similarity index 99% rename from chat/indico_chat/static/js/chat.js rename to chat/indico_chat/client/index.js index beb9477..7362a2b 100644 --- a/chat/indico_chat/static/js/chat.js +++ b/chat/indico_chat/client/index.js @@ -15,6 +15,8 @@ * along with Indico; if not, see . */ +import './main.scss'; + (function(global) { 'use strict'; var $t = $T.domain('chat'); diff --git a/chat/indico_chat/static/css/chat.scss b/chat/indico_chat/client/main.scss similarity index 100% rename from chat/indico_chat/static/css/chat.scss rename to chat/indico_chat/client/main.scss diff --git a/chat/indico_chat/plugin.py b/chat/indico_chat/plugin.py index d1c13f4..78c9b03 100644 --- a/chat/indico_chat/plugin.py +++ b/chat/indico_chat/plugin.py @@ -110,16 +110,12 @@ class ChatPlugin(IndicoPlugin): self.connect(signals.event_management.management_url, self.get_event_management_url) self.connect(signals.users.merged, self._merge_users) self.template_hook('event-header', self.inject_event_header) - self.inject_css('chat_css', WPChatEventMgmt) - self.inject_js('chat_js', WPChatEventMgmt) + self.inject_bundle('main.css', WPChatEventMgmt) + self.inject_bundle('main.js', WPChatEventMgmt) def get_blueprints(self): return blueprint - def register_assets(self): - self.register_css_bundle('chat_css', 'css/chat.scss') - self.register_js_bundle('chat_js', 'js/chat.js') - def inject_event_header(self, event, **kwargs): chatrooms = ChatroomEventAssociation.find_for_event(event).all() if not chatrooms: diff --git a/chat/webpack-bundles.json b/chat/webpack-bundles.json new file mode 100644 index 0000000..5f28835 --- /dev/null +++ b/chat/webpack-bundles.json @@ -0,0 +1,5 @@ +{ + "entry": { + "main": "./index.js" + } +}