From a28527482e5c69d94744bcd011a14a398d66dc09 Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Thu, 15 Sep 2022 15:55:43 +0000 Subject: [PATCH] [REF] web: remove useless assets_common sub-assets The "web._assets_common_scripts" and "web._assets_common_styles" sub-assets were useless, confusing and prone to errors. Especially with the refactoring done by the next commit in this PR where common files will be put directly inside the frontend bundle. Indeed, their standard purpose was only to be included in the "web.assets_common"... but making them sub-assets suggests you could reuse them for something else... which you actually could not since most "web.assets_common" extensions by other apps were done in the main bundle directly instead of the correct sub-assets one. Part-of: odoo/odoo#100314 --- addons/web/__manifest__.py | 240 ++++++++++++++++++------------------- 1 file changed, 118 insertions(+), 122 deletions(-) diff --git a/addons/web/__manifest__.py b/addons/web/__manifest__.py index 83004e7f211..83aaf3a0865 100644 --- a/addons/web/__manifest__.py +++ b/addons/web/__manifest__.py @@ -51,9 +51,124 @@ This module provides the core of the Odoo Web Client. 'web/static/src/libs/bootstrap/pre_variables.scss', 'web/static/lib/bootstrap/scss/_variables.scss', - ('include', 'web._assets_common_styles'), + 'web/static/src/legacy/scss/tempusdominus_overridden.scss', + 'web/static/lib/tempusdominus/tempusdominus.scss', + 'web/static/lib/jquery.ui/jquery-ui.css', + 'web/static/src/libs/fontawesome/css/font-awesome.css', + 'web/static/lib/odoo_ui_icons/*', + 'web/static/lib/select2/select2.css', + 'web/static/lib/select2-bootstrap-css/select2-bootstrap.css', + 'web/static/lib/daterangepicker/daterangepicker.css', + 'web/static/fonts/fonts.scss', + 'web/static/src/webclient/navbar/navbar.scss', + 'web/static/src/legacy/scss/ui.scss', + 'web/static/src/legacy/scss/ui_extra.scss', + 'web/static/src/legacy/scss/mimetypes.scss', + 'web/static/src/legacy/scss/modal.scss', + 'web/static/src/legacy/scss/animation.scss', + 'web/static/src/legacy/scss/datepicker.scss', + 'web/static/src/legacy/scss/daterangepicker.scss', + 'web/static/src/legacy/scss/banner.scss', + 'web/static/src/legacy/scss/colorpicker.scss', + 'web/static/src/legacy/scss/popover.scss', + 'web/static/src/legacy/scss/translation_dialog.scss', + 'web/static/src/legacy/scss/keyboard.scss', + 'web/static/src/legacy/scss/name_and_signature.scss', + 'web/static/src/legacy/scss/web.zoomodoo.scss', + 'web/static/src/legacy/scss/fontawesome_overridden.scss', + ('include', 'web.assets_common_minimal'), - ('include', 'web._assets_common_scripts'), + + 'web/static/lib/underscore/underscore.js', + 'web/static/lib/underscore.string/lib/underscore.string.js', + 'web/static/lib/moment/moment.js', + 'web/static/lib/owl/owl.js', + 'web/static/src/owl2_compatibility/*.js', + 'web/static/src/legacy/js/component_extension.js', + 'web/static/src/legacy/legacy_component.js', + 'web/static/lib/jquery/jquery.js', + 'web/static/lib/jquery.ui/jquery-ui.js', + 'web/static/lib/jquery/jquery.browser.js', + 'web/static/lib/jquery.blockUI/jquery.blockUI.js', + 'web/static/lib/jquery.hotkeys/jquery.hotkeys.js', + 'web/static/lib/jquery.placeholder/jquery.placeholder.js', + 'web/static/lib/jquery.form/jquery.form.js', + 'web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js', + 'web/static/lib/jquery.mjs.nestedSortable/jquery.mjs.nestedSortable.js', + 'web/static/lib/popper/popper.js', + 'web/static/lib/bootstrap/js/dist/dom/data.js', + 'web/static/lib/bootstrap/js/dist/dom/event-handler.js', + 'web/static/lib/bootstrap/js/dist/dom/manipulator.js', + 'web/static/lib/bootstrap/js/dist/dom/selector-engine.js', + 'web/static/lib/bootstrap/js/dist/base-component.js', + 'web/static/lib/bootstrap/js/dist/alert.js', + 'web/static/lib/bootstrap/js/dist/button.js', + 'web/static/lib/bootstrap/js/dist/carousel.js', + 'web/static/lib/bootstrap/js/dist/collapse.js', + 'web/static/lib/bootstrap/js/dist/dropdown.js', + 'web/static/lib/bootstrap/js/dist/modal.js', + 'web/static/lib/bootstrap/js/dist/offcanvas.js', + 'web/static/lib/bootstrap/js/dist/tooltip.js', + 'web/static/lib/bootstrap/js/dist/popover.js', + 'web/static/lib/bootstrap/js/dist/scrollspy.js', + 'web/static/lib/bootstrap/js/dist/tab.js', + 'web/static/lib/bootstrap/js/dist/toast.js', + 'web/static/lib/tempusdominus/tempusdominus.js', + 'web/static/lib/select2/select2.js', + 'web/static/lib/clipboard/clipboard.js', + 'web/static/lib/jSignature/jSignatureCustom.js', + 'web/static/lib/qweb/qweb2.js', + 'web/static/src/legacy/js/assets.js', + 'web/static/src/legacy/js/libs/autocomplete.js', + 'web/static/src/legacy/js/libs/bootstrap.js', + 'web/static/src/legacy/js/libs/content-disposition.js', + 'web/static/src/legacy/js/libs/download.js', + 'web/static/src/legacy/js/libs/fullcalendar.js', + 'web/static/src/legacy/js/libs/jquery.js', + 'web/static/src/legacy/js/libs/moment.js', + 'web/static/src/legacy/js/libs/underscore.js', + 'web/static/src/legacy/js/libs/pdfjs.js', + 'web/static/src/legacy/js/libs/zoomodoo.js', + 'web/static/src/legacy/js/libs/jSignatureCustom.js', + 'web/static/src/legacy/js/core/abstract_service.js', + 'web/static/src/legacy/js/core/abstract_storage_service.js', + 'web/static/src/legacy/js/core/ajax.js', + 'web/static/src/legacy/js/core/browser_detection.js', + 'web/static/src/legacy/js/core/bus.js', + 'web/static/src/legacy/js/core/class.js', + 'web/static/src/legacy/js/core/collections.js', + 'web/static/src/legacy/js/core/concurrency.js', + 'web/static/src/legacy/js/core/dialog.js', + 'web/static/src/legacy/xml/dialog.xml', + 'web/static/src/legacy/js/core/owl_dialog.js', + 'web/static/src/legacy/js/core/popover.js', + 'web/static/src/legacy/js/core/dom.js', + 'web/static/src/legacy/js/core/local_storage.js', + 'web/static/src/legacy/js/core/mixins.js', + 'web/static/src/legacy/js/core/qweb.js', + 'web/static/src/legacy/js/core/ram_storage.js', + 'web/static/src/legacy/js/core/registry.js', + 'web/static/src/legacy/js/core/rpc.js', + 'web/static/src/legacy/js/core/service_mixins.js', + 'web/static/src/legacy/js/core/session.js', + 'web/static/src/legacy/js/core/session_storage.js', + 'web/static/src/legacy/js/core/time.js', + 'web/static/src/legacy/js/core/translation.js', + 'web/static/src/legacy/js/core/utils.js', + 'web/static/src/legacy/js/core/widget.js', + 'web/static/src/legacy/js/services/ajax_service.js', + 'web/static/src/legacy/js/services/config.js', + 'web/static/src/legacy/js/services/core.js', + 'web/static/src/legacy/js/services/local_storage_service.js', + 'web/static/src/legacy/js/services/session_storage_service.js', + 'web/static/src/legacy/js/common_env.js', + 'web/static/src/legacy/js/widgets/name_and_signature.js', + 'web/static/src/legacy/xml/name_and_signature.xml', + 'web/static/src/legacy/js/core/smooth_scroll_on_drag.js', + 'web/static/src/legacy/js/widgets/colorpicker.js', + 'web/static/src/legacy/xml/colorpicker.xml', + 'web/static/src/legacy/js/widgets/translation_dialog.js', + 'web/static/src/legacy/xml/translation_dialog.xml', ], 'web.assets_common_lazy': [ ('include', 'web.assets_common'), @@ -82,7 +197,7 @@ This module provides the core of the Odoo Web Client. 'web/static/src/webclient/icons.scss', # variables required in list_controller.scss 'web/static/src/views/**/*', 'web/static/src/webclient/**/*', - ('remove', 'web/static/src/webclient/navbar/navbar.scss'), # already in _assets_common_styles + ('remove', 'web/static/src/webclient/navbar/navbar.scss'), # already in assets_common ('remove', 'web/static/src/webclient/clickbot/clickbot.js'), # lazy loaded ('remove', 'web/static/src/views/form/button_box/*.scss'), @@ -325,125 +440,6 @@ This module provides the core of the Odoo Web Client. 'web._assets_frontend_helpers': [ 'web/static/src/legacy/scss/bootstrap_overridden_frontend.scss', ], - 'web._assets_common_styles': [ - 'web/static/src/legacy/scss/tempusdominus_overridden.scss', - 'web/static/lib/tempusdominus/tempusdominus.scss', - 'web/static/lib/jquery.ui/jquery-ui.css', - 'web/static/src/libs/fontawesome/css/font-awesome.css', - 'web/static/lib/odoo_ui_icons/*', - 'web/static/lib/select2/select2.css', - 'web/static/lib/select2-bootstrap-css/select2-bootstrap.css', - 'web/static/lib/daterangepicker/daterangepicker.css', - 'web/static/fonts/fonts.scss', - 'web/static/src/webclient/navbar/navbar.scss', - 'web/static/src/legacy/scss/ui.scss', - 'web/static/src/legacy/scss/ui_extra.scss', - 'web/static/src/legacy/scss/mimetypes.scss', - 'web/static/src/legacy/scss/modal.scss', - 'web/static/src/legacy/scss/animation.scss', - 'web/static/src/legacy/scss/datepicker.scss', - 'web/static/src/legacy/scss/daterangepicker.scss', - 'web/static/src/legacy/scss/banner.scss', - 'web/static/src/legacy/scss/colorpicker.scss', - 'web/static/src/legacy/scss/popover.scss', - 'web/static/src/legacy/scss/translation_dialog.scss', - 'web/static/src/legacy/scss/keyboard.scss', - 'web/static/src/legacy/scss/name_and_signature.scss', - 'web/static/src/legacy/scss/web.zoomodoo.scss', - 'web/static/src/legacy/scss/fontawesome_overridden.scss', - ], - 'web._assets_common_scripts': [ - 'web/static/lib/underscore/underscore.js', - 'web/static/lib/underscore.string/lib/underscore.string.js', - 'web/static/lib/moment/moment.js', - 'web/static/lib/owl/owl.js', - 'web/static/src/owl2_compatibility/*.js', - 'web/static/src/legacy/js/component_extension.js', - 'web/static/src/legacy/legacy_component.js', - 'web/static/lib/jquery/jquery.js', - 'web/static/lib/jquery.ui/jquery-ui.js', - 'web/static/lib/jquery/jquery.browser.js', - 'web/static/lib/jquery.blockUI/jquery.blockUI.js', - 'web/static/lib/jquery.hotkeys/jquery.hotkeys.js', - 'web/static/lib/jquery.placeholder/jquery.placeholder.js', - 'web/static/lib/jquery.form/jquery.form.js', - 'web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js', - 'web/static/lib/jquery.mjs.nestedSortable/jquery.mjs.nestedSortable.js', - 'web/static/lib/popper/popper.js', - 'web/static/lib/bootstrap/js/dist/dom/data.js', - 'web/static/lib/bootstrap/js/dist/dom/event-handler.js', - 'web/static/lib/bootstrap/js/dist/dom/manipulator.js', - 'web/static/lib/bootstrap/js/dist/dom/selector-engine.js', - 'web/static/lib/bootstrap/js/dist/base-component.js', - 'web/static/lib/bootstrap/js/dist/alert.js', - 'web/static/lib/bootstrap/js/dist/button.js', - 'web/static/lib/bootstrap/js/dist/carousel.js', - 'web/static/lib/bootstrap/js/dist/collapse.js', - 'web/static/lib/bootstrap/js/dist/dropdown.js', - 'web/static/lib/bootstrap/js/dist/modal.js', - 'web/static/lib/bootstrap/js/dist/offcanvas.js', - 'web/static/lib/bootstrap/js/dist/tooltip.js', - 'web/static/lib/bootstrap/js/dist/popover.js', - 'web/static/lib/bootstrap/js/dist/scrollspy.js', - 'web/static/lib/bootstrap/js/dist/tab.js', - 'web/static/lib/bootstrap/js/dist/toast.js', - 'web/static/lib/tempusdominus/tempusdominus.js', - 'web/static/lib/select2/select2.js', - 'web/static/lib/clipboard/clipboard.js', - 'web/static/lib/jSignature/jSignatureCustom.js', - 'web/static/lib/qweb/qweb2.js', - 'web/static/src/legacy/js/assets.js', - 'web/static/src/legacy/js/libs/autocomplete.js', - 'web/static/src/legacy/js/libs/bootstrap.js', - 'web/static/src/legacy/js/libs/content-disposition.js', - 'web/static/src/legacy/js/libs/download.js', - 'web/static/src/legacy/js/libs/fullcalendar.js', - 'web/static/src/legacy/js/libs/jquery.js', - 'web/static/src/legacy/js/libs/moment.js', - 'web/static/src/legacy/js/libs/underscore.js', - 'web/static/src/legacy/js/libs/pdfjs.js', - 'web/static/src/legacy/js/libs/zoomodoo.js', - 'web/static/src/legacy/js/libs/jSignatureCustom.js', - 'web/static/src/legacy/js/core/abstract_service.js', - 'web/static/src/legacy/js/core/abstract_storage_service.js', - 'web/static/src/legacy/js/core/ajax.js', - 'web/static/src/legacy/js/core/browser_detection.js', - 'web/static/src/legacy/js/core/bus.js', - 'web/static/src/legacy/js/core/class.js', - 'web/static/src/legacy/js/core/collections.js', - 'web/static/src/legacy/js/core/concurrency.js', - 'web/static/src/legacy/js/core/dialog.js', - 'web/static/src/legacy/xml/dialog.xml', - 'web/static/src/legacy/js/core/owl_dialog.js', - 'web/static/src/legacy/js/core/popover.js', - 'web/static/src/legacy/js/core/dom.js', - 'web/static/src/legacy/js/core/local_storage.js', - 'web/static/src/legacy/js/core/mixins.js', - 'web/static/src/legacy/js/core/qweb.js', - 'web/static/src/legacy/js/core/ram_storage.js', - 'web/static/src/legacy/js/core/registry.js', - 'web/static/src/legacy/js/core/rpc.js', - 'web/static/src/legacy/js/core/service_mixins.js', - 'web/static/src/legacy/js/core/session.js', - 'web/static/src/legacy/js/core/session_storage.js', - 'web/static/src/legacy/js/core/time.js', - 'web/static/src/legacy/js/core/translation.js', - 'web/static/src/legacy/js/core/utils.js', - 'web/static/src/legacy/js/core/widget.js', - 'web/static/src/legacy/js/services/ajax_service.js', - 'web/static/src/legacy/js/services/config.js', - 'web/static/src/legacy/js/services/core.js', - 'web/static/src/legacy/js/services/local_storage_service.js', - 'web/static/src/legacy/js/services/session_storage_service.js', - 'web/static/src/legacy/js/common_env.js', - 'web/static/src/legacy/js/widgets/name_and_signature.js', - 'web/static/src/legacy/xml/name_and_signature.xml', - 'web/static/src/legacy/js/core/smooth_scroll_on_drag.js', - 'web/static/src/legacy/js/widgets/colorpicker.js', - 'web/static/src/legacy/xml/colorpicker.xml', - 'web/static/src/legacy/js/widgets/translation_dialog.js', - 'web/static/src/legacy/xml/translation_dialog.xml', - ], # Used during the transition of the web architecture 'web.frontend_legacy': [