diff --git a/endpoints/common.py b/endpoints/common.py index 1693c5762..7e1625c71 100644 --- a/endpoints/common.py +++ b/endpoints/common.py @@ -24,6 +24,9 @@ from _init import __version__ logger = logging.getLogger(__name__) +JS_BUNDLE_NAME = 'bundle' + + def common_login(user_uuid, permanent_session=True): """ Performs login of the given user, with optional non-permanence on the session. """ user = model.get_user(user_uuid) @@ -71,10 +74,7 @@ def _list_files(path, extension, contains=""): def render_page_template(name, route_data=None, **kwargs): """ Renders the page template with the given name as the response and returns its contents. """ - library_styles = [] - main_styles = [] - library_scripts = [] - main_scripts = _list_files('build', 'js', "bundle") + main_scripts = _list_files('build', 'js', JS_BUNDLE_NAME) use_cdn = app.config.get('USE_CDN', True) if request.args.get('use_cdn') is not None: @@ -118,10 +118,7 @@ def render_page_template(name, route_data=None, **kwargs): route_data=route_data, external_styles=external_styles, external_scripts=external_scripts, - main_styles=main_styles, - library_styles=library_styles, main_scripts=main_scripts, - library_scripts=library_scripts, feature_set=features.get_features(), config_set=frontend_visible_config(app.config), oauth_set=get_oauth_config(), diff --git a/static/js/quay-config.module.ts b/static/js/quay-config.module.ts index 171f2e0b9..7ef10b3cb 100644 --- a/static/js/quay-config.module.ts +++ b/static/js/quay-config.module.ts @@ -4,6 +4,7 @@ import { NAME_PATTERNS } from "./constants/name-patterns.constant"; import * as Raven from "raven-js"; + var quayDependencies: string[] = [ 'chieffancypants.loadingBar', 'cfp.hotkeys', diff --git a/static/js/services/user-service.js b/static/js/services/user-service.js index d9bc0f9a0..faaebcea0 100644 --- a/static/js/services/user-service.js +++ b/static/js/services/user-service.js @@ -1,3 +1,6 @@ +import * as Raven from 'raven-js'; + + /** * Service which monitors the current user session and provides methods for returning information * about the user. diff --git a/templates/base.html b/templates/base.html index 213725d92..5cb29deed 100644 --- a/templates/base.html +++ b/templates/base.html @@ -22,14 +22,6 @@ - {% for style_path in main_styles %} - - {% endfor %} - - {% for style_path in library_styles %} - - {% endfor %} - {% block added_stylesheets %} {% endblock %} @@ -57,10 +49,6 @@ {% endfor %} - {% for script_path in library_scripts %} - - {% endfor %} - {% block added_dependencies %} {% endblock %} diff --git a/test/data/test.db b/test/data/test.db index 15c7fad71..e109172d6 100644 Binary files a/test/data/test.db and b/test/data/test.db differ diff --git a/webpack.config.js b/webpack.config.js index 35fd72fa0..6944a3a64 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -17,6 +17,8 @@ let config = { externals: { angular: "angular", jquery: "$", + moment: "moment", + "raven-js": "Raven", }, module: { rules: [ @@ -47,7 +49,10 @@ let config = { FileSaver: 'file-saver', angular: "angular", $: "jquery", + moment: "moment", }), + // Restrict the extra locales that moment.js can load; en is always included + new webpack.ContextReplacementPlugin(/moment[\/\\]locale$/, /en/), ], devtool: "cheap-module-source-map", };