[IMP] web+addons: improvement to module system

The module system needs to know the dependencies of a given module
before executing the function.  This is why the dependencies were
defined once in an array, and then were described one more times in the
call to require.

But a trick can simplify this: the boot function can parse the string
representation of the module and extract the calls to require from it.
It is more work for the processor, but it leads to simpler module
definitions.

addons/account/static/src/js/move_line_quickadd.js

@@ -1,4 +1,4 @@
-odoo.define('account.move_line_quickadd', ['web.core', 'web.data', 'web.ListView', 'web.Model'], function (require) {
+odoo.define('account.move_line_quickadd', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/account/static/src/js/tour_bank_statement_reconciliation.js

@@ -1,4 +1,4 @@
-odoo.define('account.tour_bank_statement_reconciliation', ['web.core', 'web.Tour'], function(require) {
+odoo.define('account.tour_bank_statement_reconciliation', function(require) {
 'use strict';
 
 var core = require('web.core');

addons/account/static/src/js/widgets.js

@@ -1,4 +1,4 @@
-odoo.define('account.widgets', ['web.ActionManager', 'web.core', 'web.CrashManager', 'web.data', 'web.Dialog', 'web.formats', 'web.FormView', 'web.ListView', 'web.Model', 'web.pyeval', 'web.web_client', 'web.Widget'], function (require) {
+odoo.define('account.widgets', function (require) {
 "use strict";
 
 var ActionManager = require('web.ActionManager');

addons/account_analytic_plans/static/src/js/account_bank_reconciliation.js

@@ -1,4 +1,4 @@
-odoo.define('account_analytic_plans.custom', ['account.widgets', 'web.core'], function (require) {
+odoo.define('account_analytic_plans.custom', function (require) {
 "use strict";
 
 var widgets = require('account.widgets');

addons/barcodes/static/src/js/barcode_parser.js

@@ -1,4 +1,4 @@
-odoo.define('barcodes.BarcodeParser', ['web.Class', 'web.Model'], function (require) {
+odoo.define('barcodes.BarcodeParser', function (require) {
 "use strict";
 
 var Class = require('web.Class');

addons/base_import/static/src/js/import.js

@@ -1,4 +1,4 @@
-odoo.define('base_import.import', ['web.core', 'web.ListView', 'web.Model', 'web.session', 'web.Widget'], function (require) {
+odoo.define('base_import.import', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/board/static/src/js/dashboard.js

@@ -1,4 +1,4 @@
-odoo.define('board.dashboard', ['web.ActionManager', 'web.core', 'web.data', 'web.Dialog', 'web.FavoriteMenu', 'web.form_common', 'web.Model', 'web.pyeval', 'web.ViewManager'], function (require) {
+odoo.define('board.dashboard', function (require) {
 "use strict";
 
 var ActionManager = require('web.ActionManager');

addons/bus/static/src/js/bus.js

@@ -1,4 +1,4 @@
-odoo.define('bus.bus', ['web.session', 'web.Widget'], function (require) {
+odoo.define('bus.bus', function (require) {
 
 var session = require('web.session');
 var Widget = require('web.Widget');

addons/calendar/static/src/js/base_calendar.js

@@ -1,4 +1,4 @@
-odoo.define('base_calendar.base_calendar', ['web.core', 'web.data', 'web.form_common', 'web.Model', 'web.WebClient', 'web_calendar.CalendarView', 'web_calendar.widgets'], function (require) {
+odoo.define('base_calendar.base_calendar', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/document/static/src/js/document.js

@@ -1,4 +1,4 @@
-odoo.define('document.document', ['web.core', 'web.Sidebar'], function(require) {
+odoo.define('document.document', function(require) {
 "use strict";
 
 var core = require('web.core');

addons/edi/static/src/js/edi.js

@@ -1,4 +1,4 @@
-odoo.define('edi.EdiImport', ['web.core', 'web.Dialog', 'web.framework', 'web.Widget'], function (require) {
+odoo.define('edi.EdiImport', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/gamification/static/src/js/gamification.js

@@ -1,4 +1,4 @@
-odoo.define('gamification.gamification', ['mail.mail', 'web.core', 'web.form_common', 'web.Model', 'web.session', 'web.Widget'], function(require) {
+odoo.define('gamification.gamification', function(require) {
 "use strict";
 
 var mail = require('mail.mail');

addons/google_calendar/static/src/js/calendar_sync.js

@@ -1,4 +1,4 @@
-odoo.define('google_calendar.google_calendar', ['web.core', 'web.framework', 'web.pyeval', 'web_calendar.CalendarView'], function (require) {
+odoo.define('google_calendar.google_calendar', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/google_drive/static/src/js/gdrive.js

@@ -1,4 +1,4 @@
-odoo.define('google_drive.google_drive', ['web.data', 'web.Model', 'web.Sidebar'], function (require) {
+odoo.define('google_drive.google_drive', function (require) {
 "use strict";
 
 var data = require('web.data');

addons/google_spreadsheet/static/src/js/search.js

@@ -1,4 +1,4 @@
-odoo.define('google_spreadsheet.google.spreadsheet', ['web.core', 'web.data', 'web.FavoriteMenu', 'web.FormView', 'web.pyeval'], function (require) {
+odoo.define('google_spreadsheet.google.spreadsheet', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/hr/static/src/js/hr.js

@@ -1,4 +1,4 @@
-odoo.define('hr.hr', ['web_kanban.common'], function(require) {
+odoo.define('hr.hr', function(require) {
 "use strict";
 
 var common = require('web_kanban.common');

addons/hr/static/src/js/suggestions.js

@@ -1,4 +1,4 @@
-odoo.define('hr.suggestions', ['mail.mail', 'web.core', 'web.data', 'web.Widget'], function (require) {
+odoo.define('hr.suggestions', function (require) {
 "use strict";
 
 var mail = require('mail.mail');

addons/hr_attendance/static/src/js/attendance.js

@@ -1,4 +1,4 @@
-odoo.define('hr_attendance.hr_attendance', ['web.core', 'web.data', 'web.formats', 'web.Model', 'web.SystrayMenu', 'web.time', 'web.Widget'], function(require) {
+odoo.define('hr_attendance.hr_attendance', function(require) {
 "use strict";
 
 var core = require('web.core');

addons/hr_gamification/static/src/js/gamification.js

@@ -1,4 +1,4 @@
-odoo.define('hr_gamification.hr_gamification', ['web_kanban.common'], function(require) {
+odoo.define('hr_gamification.hr_gamification', function(require) {
 "use strict";
 
 var common = require('web_kanban.common');

addons/hr_recruitment/static/src/js/job_position.js

@@ -1,4 +1,4 @@
-odoo.define('hr_recruitment.hr_recruitment', ['web_kanban.common'], function(require) {
+odoo.define('hr_recruitment.hr_recruitment', function(require) {
 "use strict";
 
 var common = require('web_kanban.common');

addons/hr_timesheet_sheet/static/src/js/timesheet.js

@@ -1,4 +1,4 @@
-odoo.define('hr_timesheet_sheet.sheet', ['web.core', 'web.data', 'web.form_common', 'web.formats', 'web.Model', 'web.time', 'web.utils'], function (require) {
+odoo.define('hr_timesheet_sheet.sheet', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/im_chat/static/src/js/im_chat.js

@@ -1,4 +1,4 @@
-odoo.define('im_chat.im_chat', ['bus.bus', 'web.core', 'web.data', 'web.Model', 'web.session', 'web.SystrayMenu', 'web.time', 'web.utils', 'web.web_client', 'web.Widget'], function (require) {
+odoo.define('im_chat.im_chat', function (require) {
 "use strict";
 
 // to do: make this work in website

addons/im_livechat/static/src/js/im_livechat.js

@@ -1,4 +1,4 @@
-odoo.define('im_livechat.im_livechat', ['bus.bus', 'im_chat.im_chat', 'web.core', 'web.session', 'web.utils', 'web.time', 'web.Widget'], function (require) {
+odoo.define('im_livechat.im_livechat', function (require) {
 "use strict";
 
 var bus = require('bus.bus');

addons/im_livechat/views/im_livechat.xml

@@ -118,7 +118,7 @@
 
         <!-- the js code to initialize the LiveSupport object -->
         <template id="loader" name="Javascript initializing the LiveSupport">
-            odoo.define('im_livechat.livesupport', ['im_livechat.im_livechat'], function (require) {
+            odoo.define('im_livechat.livesupport', function (require) {
                 var im_livechat = require('im_livechat.im_livechat');
                 window.livesupport = new im_livechat.LiveSupport(
                     "<t t-esc="url"/>",

addons/im_odoo_support/static/src/js/im_odoo_support.js

@@ -1,4 +1,4 @@
-odoo.define('im_odoo_support.OdooSupport', ['im_livechat.im_livechat', 'web.core', 'web.UserMenu', 'web.utils', 'web.web_client', 'web.Widget'], function (require) {
+odoo.define('im_odoo_support.OdooSupport', function (require) {
 "use strict";
 
 var im_livechat = require('im_livechat.im_livechat');
@@ -117,7 +117,7 @@ return OdooSupport;
 
 });
 
-odoo.define('im_odoo_support.config_im_chat', ['im_chat.im_chat', 'web.core'], function (require) {
+odoo.define('im_odoo_support.config_im_chat', function (require) {
 "use strict";
 
 var im_chat = require('im_chat.im_chat');

addons/im_odoo_support/views/im_odoo_support.xml

@@ -6,7 +6,7 @@
             <xpath expr="." position="inside">
                <script type="text/javascript" src="/im_odoo_support/static/src/js/im_odoo_support.js"></script>
                 <script type="text/javascript">
-                    odoo.define(['im_odoo_support.OdooSupport'], function (require) {
+                    odoo.define(function (require) {
                         var OdooSupport = require('im_odoo_support.OdooSupport');
                         new OdooSupport(
                             "<t t-esc="request.session.login"/>",

addons/mail/static/src/js/announcement.js

@@ -1,4 +1,4 @@
-odoo.define(['web.core', 'web.Model', 'web.session', 'web.WebClient'], function (require) {
+odoo.define('mail.announcement', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/mail/static/src/js/mail.js

@@ -1,4 +1,4 @@
-odoo.define('mail.mail', ['mail.utils', 'web.core', 'web.data', 'web.form_common', 'web.pyeval', 'web.SearchView', 'web.session', 'web.SystrayMenu', 'web.time', 'web.utils', 'web.web_client', 'web.Widget'], function (require) {
+odoo.define('mail.mail', function (require) {
 "use strict";
 
 var mail_utils = require('mail.utils');

addons/mail/static/src/js/mail_followers.js

@@ -1,4 +1,4 @@
-odoo.define('mail.mail_followers', ['mail.utils', 'web.core', 'web.data', 'web.Dialog', 'web.form_common', 'web.session', 'web.web_client'], function (require) {
+odoo.define('mail.mail_followers', function (require) {
 "use strict";
 
 var mail_utils = require('mail.utils');

addons/mail/static/src/js/many2many_tags_email.js

@@ -1,4 +1,4 @@
-odoo.define('mail.many2manytags', ['web.core', 'web.form_common', 'web.form_relational', 'web.Model'], function (require) {
+odoo.define('mail.many2manytags', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/mail/static/src/js/suggestions.js

@@ -1,4 +1,4 @@
-odoo.define(['mail.mail', 'web.core', 'web.data', 'web.session', 'web.Widget'], function (require) {
+odoo.define('mail.suggestion', function (require) {
 
 var mail = require('mail.mail');
 var core = require('web.core');

addons/mail_tip/static/src/js/mail_tip.js

@@ -1,4 +1,4 @@
-odoo.define(['mail.mail', 'web.core'], function (require) {
+odoo.define('mail_tip.mail_tip', function (require) {
 "use strict";
 
 var mail = require('mail.mail');

addons/mass_mailing/static/src/js/mass_mailing.js

@@ -1,4 +1,4 @@
-odoo.define('mass_mailing.mass_mailing', ['web.core', 'web_kanban.common', 'web_kanban.KanbanView'], function (require) {
+odoo.define('mass_mailing.mass_mailing', function (require) {
 
 var core = require('web.core');
 var common = require('web_kanban.common');

addons/mass_mailing/static/src/js/website_mass_mailing.editor.js

@@ -1,4 +1,4 @@
-odoo.define('website_mass_mailing.editor', ['web.core', 'website.editor', 'website.snippet.editor', 'website.website'], function (require) {
+odoo.define('website_mass_mailing.editor', function (require) {
 'use strict';
 
 var core = require('web.core');

addons/mass_mailing/static/src/js/website_mass_mailing.js

@@ -1,4 +1,4 @@
-odoo.define('mass_mailing.website_integration', ['web.ajax', 'web.utils', 'website.snippets.animation', 'website.website'], function (require) {
+odoo.define('mass_mailing.website_integration', function (require) {
 "use strict";
 
 var ajax = require('web.ajax');

addons/pad/static/src/js/pad.js

@@ -1,4 +1,4 @@
-odoo.define('pad.pad', ['web.core', 'web.form_common'], function (require) {
+odoo.define('pad.pad', function (require) {
 
 var core = require('web.core');
 var form_common = require('web.form_common');

addons/planner/static/src/js/planner.js

@@ -1,4 +1,4 @@
-odoo.define('planner.planner', ['web.core', 'web.Model', 'web.session', 'web.SystrayMenu', 'web.Widget'], function (require) {
+odoo.define('planner.planner', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/planner_crm/static/src/js/planner_crm.js

@@ -1,4 +1,4 @@
-odoo.define('planner_crm.planner', ['planner.planner'], function (require) {
+odoo.define('planner_crm.planner', function (require) {
 "use strict";
 
 var planner = require('planner.planner');

addons/point_of_sale/static/src/js/chrome.js

@@ -1,4 +1,4 @@
-odoo.define('point_of_sale.chrome', ['point_of_sale.BaseWidget', 'point_of_sale.gui', 'point_of_sale.keyboard', 'point_of_sale.models', 'web.core'], function (require) {
+odoo.define('point_of_sale.chrome', function (require) {
 "use strict";
 
 var PosBaseWidget = require('point_of_sale.BaseWidget');

addons/point_of_sale/static/src/js/db.js

@@ -1,4 +1,4 @@
-odoo.define('point_of_sale.DB', ['web.core'], function (require) {
+odoo.define('point_of_sale.DB', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/point_of_sale/static/src/js/devices.js

@@ -1,4 +1,4 @@
-odoo.define('point_of_sale.devices', ['web.core', 'web.Session'], function (require) {
+odoo.define('point_of_sale.devices', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/point_of_sale/static/src/js/gui.js

@@ -1,4 +1,4 @@
-odoo.define('point_of_sale.gui', ['web.core', 'web.Model'], function (require) {
+odoo.define('point_of_sale.gui', function (require) {
 "use strict";
 // this file contains the Gui, which is the pos 'controller'. 
 // It contains high level methods to manipulate the interface

addons/point_of_sale/static/src/js/keyboard.js

@@ -1,4 +1,4 @@
-odoo.define('point_of_sale.keyboard', ['web.Widget'], function (require) {
+odoo.define('point_of_sale.keyboard', function (require) {
 "use strict";
 
 var Widget = require('web.Widget');

addons/point_of_sale/static/src/js/main.js

@@ -1,5 +1,5 @@
 
-odoo.define('point_of_sale.main', ['point_of_sale.chrome', 'web.core'], function (require) {
+odoo.define('point_of_sale.main', function (require) {
 "use strict";
 
 var chrome = require('point_of_sale.chrome');

addons/point_of_sale/static/src/js/models.js

@@ -1,4 +1,4 @@
-odoo.define('point_of_sale.models', ['barcodes.BarcodeParser', 'point_of_sale.DB', 'point_of_sale.devices', 'web.core', 'web.Model', 'web.session', 'web.time', 'web.utils'], function (require) {
+odoo.define('point_of_sale.models', function (require) {
 "use strict";
 
 var BarcodeParser = require('barcodes.BarcodeParser');

addons/point_of_sale/static/src/js/popups.js

@@ -1,4 +1,4 @@
-odoo.define('point_of_sale.popups', ['point_of_sale.BaseWidget', 'point_of_sale.gui'], function (require) {
+odoo.define('point_of_sale.popups', function (require) {
 "use strict";
 
 // This file contains the Popups.

addons/point_of_sale/static/src/js/screens.js

@@ -1,4 +1,4 @@
-odoo.define('point_of_sale.screens', ['point_of_sale.BaseWidget', 'point_of_sale.gui', 'point_of_sale.models', 'web.core', 'web.Model', 'web.utils'], function (require) {
+odoo.define('point_of_sale.screens', function (require) {
 "use strict";
 // This file contains the Screens definitions. Screens are the
 // content of the right pane of the pos, containing the main functionalities. 

addons/point_of_sale/static/src/js/tests.js

@@ -1,4 +1,4 @@
-odoo.define('point_of_sale.Tour', ['web.Tour'], function (require) {
+odoo.define('point_of_sale.Tour', function (require) {
 "use strict";
 
 var Tour = require('web.Tour');

addons/point_of_sale/static/src/js/widget_base.js

@@ -1,4 +1,4 @@
-odoo.define('point_of_sale.BaseWidget', ['web.utils', 'web.Widget'], function (require) {
+odoo.define('point_of_sale.BaseWidget', function (require) {
 "use strict";
 
 var utils = require('web.utils');

addons/point_of_sale/views/templates.xml

@@ -31,7 +31,7 @@
         <t t-call-assets="point_of_sale.assets"/>
 
         <script type="text/javascript" id="loading-script" t-raw="init">
-            odoo.define('web.web_client', ['point_of_sale.main', 'web.WebClient'], function (require) {
+            odoo.define('web.web_client', function (require) {
                 var WebClient = require('web.WebClient');
                 var web_client = new WebClient();
 

addons/pos_discount/static/src/js/discount.js

@@ -1,4 +1,4 @@
-odoo.define('pos_discount.pos_discount', ['point_of_sale.screens'], function (require) {
+odoo.define('pos_discount.pos_discount', function (require) {
 "use strict";
 
 var screens = require('point_of_sale.screens');

addons/pos_loyalty/static/src/js/loyalty.js

@@ -1,4 +1,4 @@
-odoo.define('pos_loyalty.pos_loyalty', ['point_of_sale.models', 'point_of_sale.screens', 'web.core', 'web.utils'], function (require) {
+odoo.define('pos_loyalty.pos_loyalty', function (require) {
 "use strict";
 
 var models = require('point_of_sale.models');

addons/pos_reprint/static/src/js/reprint.js

@@ -1,4 +1,4 @@
-odoo.define('pos_reprint.pos_reprint', ['point_of_sale.devices', 'point_of_sale.screens', 'web.core'], function (require) {
+odoo.define('pos_reprint.pos_reprint', function (require) {
 "use strict";
 
 var devices = require('point_of_sale.devices');

addons/pos_restaurant/static/src/js/floors.js

@@ -1,4 +1,4 @@
-odoo.define('pos_restaurant.floors', ['point_of_sale.BaseWidget', 'point_of_sale.chrome', 'point_of_sale.gui', 'point_of_sale.models', 'point_of_sale.screens', 'web.core', 'web.Model'], function (require) {
+odoo.define('pos_restaurant.floors', function (require) {
 "use strict";
 
 var PosBaseWidget = require('point_of_sale.BaseWidget');

addons/pos_restaurant/static/src/js/multiprint.js

@@ -1,4 +1,4 @@
-odoo.define('pos_restaurant.multiprint', ['point_of_sale.models', 'point_of_sale.screens', 'web.core', 'web.Session'], function (require) {
+odoo.define('pos_restaurant.multiprint', function (require) {
 "use strict";
 
 var models = require('point_of_sale.models');

addons/pos_restaurant/static/src/js/notes.js

@@ -1,4 +1,4 @@
-odoo.define('pos_restaurant.notes', ['point_of_sale.models', 'point_of_sale.screens', 'web.core'], function (require) {
+odoo.define('pos_restaurant.notes', function (require) {
 "use strict";
 
 console.log("notes");

addons/pos_restaurant/static/src/js/printbill.js

@@ -1,4 +1,4 @@
-odoo.define('pos_restaurant.printbill', ['point_of_sale.screens', 'web.core'], function (require) {
+odoo.define('pos_restaurant.printbill', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/pos_restaurant/static/src/js/splitbill.js

@@ -1,4 +1,4 @@
-odoo.define('pos_restaurant.splitbill', ['point_of_sale.gui', 'point_of_sale.models', 'point_of_sale.screens', 'web.core'], function (require) {
+odoo.define('pos_restaurant.splitbill', function (require) {
 "use strict";
 
 var gui = require('point_of_sale.gui');

addons/project/static/src/js/project.js

@@ -1,4 +1,4 @@
-odoo.define('project.update_kanban', ['web_kanban.common', 'web_kanban.KanbanView', 'web.data', 'web.session'], function (require) {
+odoo.define('project.update_kanban', function (require) {
 
 var kanban_common = require('web_kanban.common');
 var KanbanView = require('web_kanban.KanbanView');

addons/purchase_requisition/static/src/js/web_addons.js

@@ -1,4 +1,4 @@
-odoo.define('purchase_requisition.purchase_requisition', ['web.core', 'web.ListView', 'web.Model'], function (require) {
+odoo.define('purchase_requisition.purchase_requisition', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/report/static/src/js/qwebactionmanager.js

@@ -1,4 +1,4 @@
-odoo.define('report.report', ['web.ActionManager', 'web.core', 'web.crash_manager', 'web.framework', 'web.session'], function (require) {
+odoo.define('report.report', function (require) {
 
 var ActionManager = require('web.ActionManager');
 var core = require('web.core');

addons/sales_team/static/src/js/sales_team.js

@@ -1,4 +1,4 @@
-odoo.define('sales_team.update_kanban', ['web_kanban.KanbanView', 'web_kanban.common', 'web.data', 'web.session'], function (require) {
+odoo.define('sales_team.update_kanban', function (require) {
 "use strict";
 
 var KanbanView = require('web_kanban.KanbanView');

addons/share/static/src/js/share.js

@@ -1,4 +1,4 @@
-odoo.define(['mail.mail', 'web.core', 'web.data', 'web.Model', 'web.pyeval', 'web.session', 'web.Sidebar', 'web.ViewManager'], function (require) {
+odoo.define('share.share', function (require) {
 
 var mail = require('mail.mail');
 var core = require('web.core');

addons/stock/static/src/js/widgets.js

@@ -1,4 +1,4 @@
-odoo.define(['web.core', 'web.data', 'web.Dialog', 'web.Model', 'web.session', 'web.web_client', 'web.Widget', 'web_kanban.kanban_common'], function (require) {
+odoo.define('stock.widgets', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/stock/views/stock.xml

@@ -33,7 +33,7 @@
         <t t-call-assets="web.assets_backend" t-css="false" />
 
         <script type="text/javascript" id="loading-script" t-raw="init">
-            odoo.define('web.web_client', ['web.WebClient'], function (require) {
+            odoo.define('web.web_client', function (require) {
                 var WebClient = require('web.WebClient');
                 var web_client = new WebClient();
                 web_client.do_push_state = function (){};

addons/survey/static/src/js/survey.js

@@ -1,4 +1,4 @@
-odoo.define('survey.survey', ['website.website'], function (require) {
+odoo.define('survey.survey', function (require) {
 'use strict';
 
 var website = require('website.website');

addons/survey/static/src/js/survey_result.js

@@ -1,4 +1,4 @@
-odoo.define('survey.result', ['website.website'], function (require) {
+odoo.define('survey.result', function (require) {
 'use strict';
 
 var website = require('website.website');

addons/web/static/src/js/action_manager.js

@@ -1,4 +1,4 @@
-odoo.define('web.ActionManager', ['web.core', 'web.crash_manager', 'web.data', 'web.Dialog', 'web.framework', 'web.pyeval', 'web.session', 'web.ViewManager', 'web.Widget'], function (require) {
+odoo.define('web.ActionManager', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/web/static/src/js/boot.js

@@ -21,6 +21,9 @@
         _: _,
     });
 
+    var commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg;
+    var cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g;
+
     var debug = ($.deparam($.param.querystring()).debug !== undefined);
 
     var odoo = window.odoo = {
@@ -49,10 +52,20 @@
             services: services,
         },
         define: function () {
-            var args = Array.prototype.slice.call(arguments),
-                name = typeof args[0] === 'string' ? args.shift() : _.uniqueId('__job'),
-                deps = args[0] instanceof Array ? args.shift() : [],
-                factory = args[0];
+            var args = Array.prototype.slice.call(arguments);
+            var name = typeof args[0] === 'string' ? args.shift() : _.uniqueId('__job');
+            var factory = args[args.length - 1];
+            var deps;
+            if (args[0] instanceof Array) {
+                deps = args[0];
+            } else {
+                deps = [];
+                factory.toString()
+                    .replace(commentRegExp, '')
+                    .replace(cjsRequireRegExp, function (match, dep) {
+                        deps.push(dep);
+                    });
+            }
 
             if (odoo.debug) {
                 if (!(deps instanceof Array)) {

addons/web/static/src/js/compatibility.js

@@ -7,36 +7,7 @@
 // facilitate migration.  Odoo addons should not use the 'openerp' variable at 
 // all.
 // ------------------------------------------------------------------------------
-odoo.define('web.compatibility', [
-    'web.ActionManager',
-    'web.core', 
-    'web.data',
-    'web.Dialog', 
-    'web.FavoriteMenu',
-    'web.form_common', 
-    'web.form_relational',
-    'web.form_widgets',
-    'web.formats',
-    'web.FormView',
-    'web.framework',
-    'web.ListView',
-    'web.Menu', 
-    'web.Model', 
-    'web.pyeval',
-    'web.Registry',
-    'web.SearchView',
-    'web.session',
-    'web.Sidebar',
-    'web.SystrayMenu', 
-    'web.time',
-    'web.UserMenu', 
-    'web.utils',
-    'web.View',
-    'web.ViewManager',
-    'web.WebClient', 
-    'web.Widget', 
-    ], 
-    function (require) {
+odoo.define('web.compatibility', function (require) {
 "use strict";
 
 var ActionManager = require('web.ActionManager');
@@ -215,9 +186,9 @@ function start_modules (modules) {
 
 });
 
-odoo.define('mail.compatibility', ['mail.mail'], function (require) {
+odoo.define('mail.compatibility', function (require) {
 var mail = require('mail.mail');
-return;
+
 window.openerp = window.openerp || {};
 openerp.mail = {};
 openerp.mail.Wall = mail.Wall;

addons/web/static/src/js/framework/ajax.js

@@ -1,4 +1,4 @@
-odoo.define('web.ajax', ['web.time'], function (require) {
+odoo.define('web.ajax', function (require) {
 "use strict";
 
 var time = require('web.time');

addons/web/static/src/js/framework/core.js

@@ -1,4 +1,4 @@
-odoo.define('web.core', ['web.Class', 'web.mixins', 'web.Registry', 'web.translation', 'qweb', '_', '$'], function (require) {
+odoo.define('web.core', function (require) {
 "use strict";
 
 var Class = require('web.Class');

addons/web/static/src/js/framework/crash_manager.js

@@ -1,9 +1,9 @@
-odoo.define('web.crash_manager', ['web.CrashManager'], function (require) {
+odoo.define('web.crash_manager', function (require) {
     var CrashManager = require('web.CrashManager');
     return new CrashManager();
 });
 
-odoo.define('web.CrashManager', ['web.ajax', 'web.core', 'web.Dialog', 'web.session'], function (require) {
+odoo.define('web.CrashManager', function (require) {
 "use strict";
 
 var ajax = require('web.ajax');

addons/web/static/src/js/framework/data.js

@@ -1,4 +1,4 @@
-odoo.define('web.data', ['web.core', 'web.Model', 'web.session', 'web.pyeval'], function (require) {
+odoo.define('web.data', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/web/static/src/js/framework/dialog.js

@@ -1,4 +1,4 @@
-odoo.define('web.Dialog', ['web.core', 'web.Widget'], function (require) {
+odoo.define('web.Dialog', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/web/static/src/js/framework/formats.js

@@ -1,4 +1,4 @@
-odoo.define('web.formats', ['web.core', 'web.time', 'web.utils'], function (require) {
+odoo.define('web.formats', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/web/static/src/js/framework/misc.js

@@ -1,4 +1,4 @@
-odoo.define('web.framework', ['web.core', 'web.crash_manager', 'web.session', 'web.utils', 'web.Widget'], function (require) {
+odoo.define('web.framework', function (require) {
 "use strict";
 
 var core = require('web.core');
@@ -331,7 +331,7 @@ return {
 
 });
 
-odoo.define('web.session', ['web.Session'], function (require) {
+odoo.define('web.session', function (require) {
     var Session = require('web.Session');
     var modules = odoo._modules;
     return new Session(undefined, undefined, {modules:modules});

addons/web/static/src/js/framework/mixins.js

@@ -1,4 +1,4 @@
-odoo.define('web.mixins', ['web.Class', 'web.utils'], function (require) {
+odoo.define('web.mixins', function (require) {
 "use strict";
 
 var Class = require('web.Class');

addons/web/static/src/js/framework/model.js

@@ -1,4 +1,4 @@
-odoo.define('web.Model', ['web.Class', 'web.session', 'web.utils'], function (require) {
+odoo.define('web.Model', function (require) {
 "use strict";
 
 var Class = require('web.Class');
@@ -110,7 +110,7 @@ var Model = Class.extend({
 return Model;
 });
 
-odoo.define('web.DataModel', ['web.data', 'web.Model', 'web.pyeval', 'web.session'], function (require) {
+odoo.define('web.DataModel', function (require) {
 "use strict";
 
 var data = require('web.data');

addons/web/static/src/js/framework/pyeval.js

@@ -1,4 +1,4 @@
-odoo.define('web.pyeval', ['web.core', 'web.session', 'web.utils'], function (require) {
+odoo.define('web.pyeval', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/web/static/src/js/framework/registry.js

@@ -1,4 +1,4 @@
-odoo.define('web.Registry', ['web.Class'], function (require) {
+odoo.define('web.Registry', function (require) {
 "use strict";
 
 var Class = require('web.Class');

addons/web/static/src/js/framework/session.js

@@ -1,4 +1,4 @@
-odoo.define('web.Session', ['web.ajax', 'web.core', 'web.utils'], function (require) {
+odoo.define('web.Session', function (require) {
 "use strict";
 
 var ajax = require('web.ajax');

addons/web/static/src/js/framework/time.js

@@ -1,4 +1,4 @@
-odoo.define('web.time', ['web.translation', 'web.utils'], function (require) {
+odoo.define('web.time', function (require) {
 "use strict";
 
 var translation = require('web.translation');

addons/web/static/src/js/framework/translation.js

@@ -1,9 +1,8 @@
 
-odoo.define('web.translation', ['web.Class', 'qweb'], function (require) {
+odoo.define('web.translation', function (require) {
 "use strict";
 
 var Class = require('web.Class');
-
 var qweb = require('qweb');
 
 

addons/web/static/src/js/framework/utils.js

@@ -1,4 +1,4 @@
-odoo.define('web.utils', ['web.Class', 'web.translation'], function (require) {
+odoo.define('web.utils', function (require) {
 "use strict";
 
 var Class = require('web.Class');

addons/web/static/src/js/framework/view.js

@@ -1,4 +1,4 @@
-odoo.define('web.View', ['web.core', 'web.data', 'web.pyeval', 'web.Widget'], function (require) {
+odoo.define('web.View', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/web/static/src/js/framework/widget.js

@@ -1,4 +1,4 @@
-odoo.define('web.Widget', ['web.core', 'web.session'], function (require) {
+odoo.define('web.Widget', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/web/static/src/js/menu.js

@@ -1,4 +1,4 @@
-odoo.define('web.Menu', ['web.core', 'web.session', 'web.Widget'], function (require) {
+odoo.define('web.Menu', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/web/static/src/js/tour.js

@@ -1,4 +1,4 @@
-odoo.define('web.Tour', ['web.core'], function (require) {
+odoo.define('web.Tour', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/web/static/src/js/view_manager.js

@@ -1,4 +1,4 @@
-odoo.define('web.ViewManager', ['web.core', 'web.data', 'web.Dialog', 'web.formats', 'web.framework', 'web.Model', 'web.pyeval', 'web.utils', 'web.SearchView', 'web.session', 'web.Widget'], function (require) {
+odoo.define('web.ViewManager', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/web/static/src/js/views/form_common.js

@@ -1,4 +1,4 @@
-odoo.define('web.form_common', ['web.core', 'web.data', 'web.Dialog', 'web.ListView', 'web.pyeval', 'web.SearchView', 'web.session', 'web.utils', 'web.Widget'], function (require) {
+odoo.define('web.form_common', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/web/static/src/js/views/form_relational_widgets.js

@@ -1,4 +1,4 @@
-odoo.define('web.form_relational', ['web.core', 'web.data', 'web.Dialog', 'web.form_common', 'web.FormView', 'web.ListView', 'web.Model', 'web.session', 'web.utils', 'web.ViewManager'], function (require) {
+odoo.define('web.form_relational', function (require) {
 "use strict";
 
 var core = require('web.core');
@@ -1935,7 +1935,7 @@ return {
 
 });
 
-odoo.define('web_kanban.Many2ManyKanbanView', ['web.core', 'web_kanban.KanbanView', 'web.Widget'], function (require) {
+odoo.define('web_kanban.Many2ManyKanbanView', function (require) {
     "use strict";
     // This code has a dependency on the addon web_kanban.  This is a weird dependency issue.  To fix it,
     // we should either move this code into web_kanban, or move web_kanban into the web client.

addons/web/static/src/js/views/form_view.js

@@ -1,4 +1,4 @@
-odoo.define('web.FormView', ['web.core', 'web.crash_manager', 'web.data', 'web.Dialog', 'web.form_common', 'web.Model', 'web.Sidebar', 'web.utils', 'web.View'], function (require) {
+odoo.define('web.FormView', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/web/static/src/js/views/form_widgets.js

@@ -1,4 +1,4 @@
-odoo.define('web.form_widgets', ['web.core', 'web.crash_manager', 'web.data', 'web.datepicker', 'web.Dialog', 'web.form_common', 'web.formats', 'web.framework', 'web.Model', 'web.pyeval', 'web.session', 'web.utils'], function (require) {
+odoo.define('web.form_widgets', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/web/static/src/js/views/graph_view.js

@@ -1,4 +1,4 @@
-odoo.define('web.GraphView', ['web.core', 'web.GraphWidget', 'web.Model', 'web.View'], function (require) {
+odoo.define('web.GraphView', function (require) {
 "use strict";
 /*---------------------------------------------------------
  * Odoo Graph view

addons/web/static/src/js/views/graph_widget.js

@@ -1,4 +1,4 @@
-odoo.define('web.GraphWidget', ['web.core', 'web.Model', 'web.Widget'], function (require) {
+odoo.define('web.GraphWidget', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/web/static/src/js/views/list_common.js

@@ -1,4 +1,4 @@
-odoo.define('web.list_common', ['web.core'], function (require) {
+odoo.define('web.list_common', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/web/static/src/js/views/list_view.js

@@ -1,5 +1,5 @@
 
-odoo.define('web.ListView', ['web.core', 'web.data', 'web.DataExport', 'web.formats', 'web.list_common', 'web.Model', 'web.pyeval', 'web.session', 'web.Sidebar', 'web.utils', 'web.View'], function (require) {
+odoo.define('web.ListView', function (require) {
 "use strict";
 
 var core = require('web.core');

addons/web/static/src/js/views/list_view_editable.js

@@ -1,4 +1,4 @@
-odoo.define('web.ListEditor', ['web.core', 'web.FormView', 'web.list_common', 'web.ListView', 'web.utils', 'web.Widget'], function (require) {
+odoo.define('web.ListEditor', function (require) {
 "use strict";    
 /*---------------------------------------------------------
  * Odoo Editable List view

addons/web/static/src/js/views/pivot_view.js

@@ -1,4 +1,4 @@
-odoo.define('web.PivotView', ['web.core', 'web.crash_manager', 'web.formats', 'web.framework', 'web.Model', 'web.session', 'web.Sidebar', 'web.utils', 'web.View'], function (require) {
+odoo.define('web.PivotView', function (require) {
 "use strict";
 /*---------------------------------------------------------
  * Odoo Pivot Table view