Merge remote-tracking branch 'origin/peon'

Conflicts:
	Dockerfile

endpoints/common.py

@@ -115,14 +115,49 @@ def random_string():
   random = SystemRandom()
   return ''.join([random.choice(string.ascii_uppercase + string.digits) for _ in range(8)])
 
+def list_files(path, extension):
+  import os
+  def matches(f):
+    return os.path.splitext(f)[1] == '.' + extension
+
+  def join_path(dp, f):
+    # Remove the static/ prefix. It is added in the template.
+    return os.path.join(dp, f)[len('static/'):]
+
+  filepath = 'static/' + path
+  return [join_path(dp, f) for dp, dn, files in os.walk(filepath) for f in files if matches(f)]
+
 def render_page_template(name, **kwargs):
+  if app.config.get('DEBUGGING', False):
+    # If DEBUGGING is enabled, then we load the full set of individual JS and CSS files
+    # from the file system.
+    library_styles = list_files('lib', 'css')
+    main_styles = list_files('css', 'css')
+    library_scripts = list_files('lib', 'js')
+    main_scripts = list_files('js', 'js')
+    cache_buster = 'debugging'
+
+    file_lists = [library_styles, main_styles, library_scripts, main_scripts]
+    for file_list in file_lists:
+      file_list.sort()
+  else:
+    library_styles = []
+    main_styles = ['dist/quay-frontend.css']
+    library_scripts = []
+    main_scripts = ['dist/quay-frontend.min.js']
+    cache_buster = random_string()
+
   resp = make_response(render_template(name, route_data=json.dumps(get_route_data()),
+                                       main_styles=main_styles,
+                                       library_styles=library_styles,
+                                       main_scripts=main_scripts,
+                                       library_scripts=library_scripts,
                                        feature_set=json.dumps(features.get_features()),
                                        config_set=json.dumps(getFrontendVisibleConfig(app.config)),
                                        mixpanel_key=app.config.get('MIXPANEL_KEY', ''),
                                        is_debug=str(app.config.get('DEBUGGING', False)).lower(),
                                        show_chat=features.OLARK_CHAT,
-                                       cache_buster=random_string(),
+                                       cache_buster=cache_buster,
                                        **kwargs))
 
   resp.headers['X-FRAME-OPTIONS'] = 'DENY'