From 23373984ec4ed8b07c8744a26f58195f4368f0a1 Mon Sep 17 00:00:00 2001 From: Pedro Ferreira Date: Fri, 2 Mar 2018 11:28:42 +0100 Subject: [PATCH] Search: move search and search_invenio to webpack --- .../{static/js/importer.js => client/index.js} | 2 ++ .../{static/css/importer.css => client/main.css} | 0 importer/indico_importer/plugin.py | 8 ++------ importer/webpack-bundles.json | 5 +++++ .../{static/js/search.js => client/index.js} | 2 ++ .../{static/css/search.scss => client/main.scss} | 0 search/indico_search/plugin.py | 8 ++------ search/webpack-bundles.json | 5 +++++ .../{static/js/search_invenio.js => client/index.js} | 2 ++ .../{static/css/search_invenio.scss => client/main.scss} | 0 search_invenio/indico_search_invenio/plugin.py | 8 ++------ 11 files changed, 22 insertions(+), 18 deletions(-) rename importer/indico_importer/{static/js/importer.js => client/index.js} (99%) rename importer/indico_importer/{static/css/importer.css => client/main.css} (100%) create mode 100644 importer/webpack-bundles.json rename search/indico_search/{static/js/search.js => client/index.js} (99%) rename search/indico_search/{static/css/search.scss => client/main.scss} (100%) create mode 100644 search/webpack-bundles.json rename search_invenio/indico_search_invenio/{static/js/search_invenio.js => client/index.js} (99%) rename search_invenio/indico_search_invenio/{static/css/search_invenio.scss => client/main.scss} (100%) diff --git a/importer/indico_importer/static/js/importer.js b/importer/indico_importer/client/index.js similarity index 99% rename from importer/indico_importer/static/js/importer.js rename to importer/indico_importer/client/index.js index aa366e5..bb62581 100644 --- a/importer/indico_importer/static/js/importer.js +++ b/importer/indico_importer/client/index.js @@ -15,6 +15,8 @@ * along with Indico; if not, see . */ +import './main.css'; + (function() { var $t = $T.domain('importer'); diff --git a/importer/indico_importer/static/css/importer.css b/importer/indico_importer/client/main.css similarity index 100% rename from importer/indico_importer/static/css/importer.css rename to importer/indico_importer/client/main.css diff --git a/importer/indico_importer/plugin.py b/importer/indico_importer/plugin.py index 832b6e2..0538fde 100644 --- a/importer/indico_importer/plugin.py +++ b/importer/indico_importer/plugin.py @@ -35,8 +35,8 @@ class ImporterPlugin(IndicoPlugin): def init(self): super(ImporterPlugin, self).init() - self.inject_js('importer_js', WPManageTimetable) - self.inject_css('importer_css', WPManageTimetable) + self.inject_bundle('main.js', WPManageTimetable) + self.inject_bundle('main.css', WPManageTimetable) self.connect(signals.event.timetable_buttons, self.get_timetable_buttons) self.importer_engines = {} @@ -59,10 +59,6 @@ class ImporterPlugin(IndicoPlugin): '.create_subcontrib_reference_rest'), 'add_link': url_rule_to_js('attachments.add_link')}} - def register_assets(self): - self.register_js_bundle('importer_js', 'js/importer.js') - self.register_css_bundle('importer_css', 'css/importer.css') - def register_importer_engine(self, importer_engine, plugin): self.importer_engines[importer_engine._id] = (importer_engine, plugin) diff --git a/importer/webpack-bundles.json b/importer/webpack-bundles.json new file mode 100644 index 0000000..5f28835 --- /dev/null +++ b/importer/webpack-bundles.json @@ -0,0 +1,5 @@ +{ + "entry": { + "main": "./index.js" + } +} diff --git a/search/indico_search/static/js/search.js b/search/indico_search/client/index.js similarity index 99% rename from search/indico_search/static/js/search.js rename to search/indico_search/client/index.js index 0e93497..e9e3f61 100644 --- a/search/indico_search/static/js/search.js +++ b/search/indico_search/client/index.js @@ -15,6 +15,8 @@ * along with Indico; if not, see . */ +import './main.scss'; + (function(global) { var $t = $T.domain('search'); diff --git a/search/indico_search/static/css/search.scss b/search/indico_search/client/main.scss similarity index 100% rename from search/indico_search/static/css/search.scss rename to search/indico_search/client/main.scss diff --git a/search/indico_search/plugin.py b/search/indico_search/plugin.py index 961d0e0..76780ce 100644 --- a/search/indico_search/plugin.py +++ b/search/indico_search/plugin.py @@ -39,12 +39,8 @@ class SearchPlugin(IndicoPlugin): self.connect(plugins_loaded, self._plugins_loaded, sender=self.app) self.template_hook('conference-header-right-column', self._add_conference_search_box) self.template_hook('page-header', self._add_category_search_box) - self.inject_js('search_js') - self.inject_css('search_css') - - def register_assets(self): - self.register_js_bundle('search_js', 'js/search.js') - self.register_css_bundle('search_css', 'css/search.scss') + self.inject_bundle('main.js') + self.inject_bundle('main.css') def _plugins_loaded(self, sender, **kwargs): if not self.engine_plugin: diff --git a/search/webpack-bundles.json b/search/webpack-bundles.json new file mode 100644 index 0000000..5f28835 --- /dev/null +++ b/search/webpack-bundles.json @@ -0,0 +1,5 @@ +{ + "entry": { + "main": "./index.js" + } +} diff --git a/search_invenio/indico_search_invenio/static/js/search_invenio.js b/search_invenio/indico_search_invenio/client/index.js similarity index 99% rename from search_invenio/indico_search_invenio/static/js/search_invenio.js rename to search_invenio/indico_search_invenio/client/index.js index b3dbae9..f051dcb 100644 --- a/search_invenio/indico_search_invenio/static/js/search_invenio.js +++ b/search_invenio/indico_search_invenio/client/index.js @@ -15,6 +15,8 @@ * along with Indico; if not, see . */ +import './main.scss'; + (function(global) { 'use strict'; diff --git a/search_invenio/indico_search_invenio/static/css/search_invenio.scss b/search_invenio/indico_search_invenio/client/main.scss similarity index 100% rename from search_invenio/indico_search_invenio/static/css/search_invenio.scss rename to search_invenio/indico_search_invenio/client/main.scss diff --git a/search_invenio/indico_search_invenio/plugin.py b/search_invenio/indico_search_invenio/plugin.py index d7ffd54..2fc3861 100644 --- a/search_invenio/indico_search_invenio/plugin.py +++ b/search_invenio/indico_search_invenio/plugin.py @@ -57,12 +57,8 @@ class InvenioSearchPlugin(SearchPluginBase): def init(self): super(InvenioSearchPlugin, self).init() for wp in (WPSearchCategory, WPSearchConference): - self.inject_css('search_invenio_css', wp) - self.inject_js('search_invenio_js', wp) - - def register_assets(self): - self.register_css_bundle('search_invenio_css', 'css/search_invenio.scss') - self.register_js_bundle('search_invenio_js', 'js/search_invenio.js') + self.inject_bundle('main.js', wp) + self.inject_bundle('main.css', wp) def get_blueprints(self): return IndicoPluginBlueprint('search_invenio', 'indico_search_invenio')