yellow team mailing list archive

[Thiago Veronezi <thiago@xxxxxxxxxxxx>]

Thiago Veronezi has proposed merging lp:~tveronezi/juju-gui/change-requires-param into lp:juju-gui.

Requested reviews:
  Juju GUI Hackers (juju-gui)
Related bugs:
  Bug #1081205 in juju-gui: "minification with bad "requires" param"
  https://bugs.launchpad.net/juju-gui/+bug/1081205

For more details, see:
https://code.launchpad.net/~tveronezi/juju-gui/change-requires-param/+merge/135198

Remove "requires" from modules-debug.js

The minification process does not read the "requires" parameters defined in "modules-debug.js". This parameter should be defined in each custom yui object that uses some kind of internal or external requirement. The sole use of "all-app-debug.js" is to define the fullpath of the file that defines a given module.

This patch removes all the existing "requires" properties from "modules-debug.js" and add then where they are needed.
-- 
https://code.launchpad.net/~tveronezi/juju-gui/change-requires-param/+merge/135198
Your team Juju GUI Hackers is requested to review the proposed merge of lp:~tveronezi/juju-gui/change-requires-param into lp:juju-gui.

=== modified file 'app/app.js'
--- app/app.js	2012-11-20 14:51:46 +0000
+++ app/app.js	2012-11-20 16:59:39 +0000
@@ -746,6 +746,7 @@
     'juju-models',
     'juju-views',
     'juju-controllers',
+    'juju-view-charm-search',
     'io',
     'json-parse',
     'app-base',

=== modified file 'app/models/charm.js'
--- app/models/charm.js	2012-10-29 11:20:31 +0000
+++ app/models/charm.js	2012-11-20 16:59:39 +0000
@@ -226,6 +226,7 @@
 }, '0.1.0', {
   requires: [
     'model',
-    'model-list'
+    'model-list',
+    'juju-charm-id'
   ]
 });

=== modified file 'app/models/models.js'
--- app/models/models.js	2012-11-16 08:25:02 +0000
+++ app/models/models.js	2012-11-20 16:59:39 +0000
@@ -487,6 +487,7 @@
     'datasource-jsonschema',
     'io-base',
     'json-parse',
+    'juju-endpoints',
     'juju-view-utils',
     'juju-charm-models'
   ]

=== modified file 'app/modules-debug.js'
--- app/modules-debug.js	2012-11-15 15:44:00 +0000
+++ app/modules-debug.js	2012-11-20 16:59:39 +0000
@@ -1,6 +1,8 @@
 // This file is used for development only. In order to use it you should call
 // the "make debug" command. This command passes the "debug" argument to the
-// "lib/server.js".
+// "lib/server.js". The sole use of this file is to define the "aliases" ("use"
+// property) and the "fullpath" of the file that implement a given module. The
+// "requires" property should not be used here.
 var GlobalConfig = {
   filter: 'debug',
   // Set "true" for verbose logging of YUI
@@ -93,19 +95,15 @@
         },
 
         'juju-charm-models': {
-          requires: ['juju-charm-id'],
           fullpath: '/juju-ui/models/charm.js'
         },
 
         'juju-models': {
-          requires: [
-            'model', 'model-list', 'juju-endpoints', 'juju-charm-models'],
           fullpath: '/juju-ui/models/models.js'
         },
 
         // Connectivity
         'juju-env': {
-          requires: ['reconnecting-websocket'],
           fullpath: '/juju-ui/store/env.js'
         },
 
@@ -114,7 +112,6 @@
         },
 
         'juju-charm-store': {
-          requires: ['juju-charm-id'],
           fullpath: '/juju-ui/store/charm.js'
         },
 
@@ -125,13 +122,7 @@
 
         // App
         'juju-gui': {
-          fullpath: '/juju-ui/app.js',
-          requires: [
-            'juju-controllers',
-            'juju-views',
-            'juju-models',
-            'juju-view-charm-search'
-          ]
+          fullpath: '/juju-ui/app.js'
         }
       }
     }

=== modified file 'app/store/charm.js'
--- app/store/charm.js	2012-11-05 21:24:42 +0000
+++ app/store/charm.js	2012-11-20 16:59:39 +0000
@@ -114,6 +114,7 @@
 
 }, '0.1.0', {
   requires: [
+    'juju-charm-id',
     'datasource-io',
     'json-parse'
   ]