diff --git a/cms/envs/acceptance.py b/cms/envs/acceptance.py index 242463aa07..92e5deca3e 100644 --- a/cms/envs/acceptance.py +++ b/cms/envs/acceptance.py @@ -127,3 +127,7 @@ YOUTUBE['TEXT_API']['url'] = "127.0.0.1:{0}/test_transcripts_youtube/".format(YO # Generate a random UUID so that different runs of acceptance tests don't break each other import uuid SECRET_KEY = uuid.uuid4().hex + +############################### PIPELINE ####################################### + +PIPELINE_ENABLED = False diff --git a/cms/envs/common.py b/cms/envs/common.py index f1d34953a1..4427d551ce 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -455,6 +455,8 @@ EMBARGO_SITE_REDIRECT_URL = None ############################### PIPELINE ####################################### +PIPELINE_ENABLED = True + # Process static files using RequireJS Optimizer STATICFILES_STORAGE = 'openedx.core.lib.django_require.staticstorage.OptimizedCachedRequireJsStorage' diff --git a/cms/envs/devstack.py b/cms/envs/devstack.py index bd00323668..8abcaf1d33 100644 --- a/cms/envs/devstack.py +++ b/cms/envs/devstack.py @@ -34,6 +34,7 @@ FEATURES['PREVIEW_LMS_BASE'] = "preview." + LMS_BASE ########################### PIPELINE ################################# # Skip packaging and optimization in development +PIPELINE_ENABLED = False STATICFILES_STORAGE = 'pipeline.storage.NonPackagingPipelineStorage' # Revert to the default set of finders as we don't want the production pipeline diff --git a/cms/envs/test.py b/cms/envs/test.py index 16133ac8ef..7b18a1d42a 100644 --- a/cms/envs/test.py +++ b/cms/envs/test.py @@ -92,7 +92,6 @@ STATICFILES_DIRS += [ # http://stackoverflow.com/questions/12816941/unit-testing-with-django-pipeline STATICFILES_STORAGE = 'pipeline.storage.NonPackagingPipelineStorage' STATIC_URL = "/static/" -PIPELINE_ENABLED = False TENDER_DOMAIN = "help.edge.edx.org" TENDER_SUBDOMAIN = "edxedge" diff --git a/common/djangoapps/pipeline_mako/__init__.py b/common/djangoapps/pipeline_mako/__init__.py index 97c17b6bf3..c134da9cb1 100644 --- a/common/djangoapps/pipeline_mako/__init__.py +++ b/common/djangoapps/pipeline_mako/__init__.py @@ -14,7 +14,7 @@ def compressed_css(package_name, raw=False): package = packager.package_for('css', package_name) - if settings.PIPELINE: + if settings.PIPELINE_ENABLED: return render_css(package, package.output_filename, raw=raw) else: paths = packager.compile(package.paths) @@ -48,7 +48,7 @@ def compressed_js(package_name): package = packager.package_for('js', package_name) - if settings.PIPELINE: + if settings.PIPELINE_ENABLED: return render_js(package, package.output_filename) else: paths = packager.compile(package.paths) diff --git a/lms/envs/acceptance.py b/lms/envs/acceptance.py index 53fae641c5..75f9cbec41 100644 --- a/lms/envs/acceptance.py +++ b/lms/envs/acceptance.py @@ -190,3 +190,7 @@ if FEATURES.get('ENABLE_COURSEWARE_SEARCH') or \ # Generate a random UUID so that different runs of acceptance tests don't break each other import uuid SECRET_KEY = uuid.uuid4().hex + +############################### PIPELINE ####################################### + +PIPELINE_ENABLED = False diff --git a/lms/envs/aws.py b/lms/envs/aws.py index 9399a79e6c..3566c13970 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -131,9 +131,6 @@ if STATIC_URL_BASE: if not STATIC_URL.endswith("/"): STATIC_URL += "/" -# Enable uglification of JavaScript -PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.uglifyjs.UglifyJSCompressor' - # DEFAULT_COURSE_ABOUT_IMAGE_URL specifies the default image to show for courses that don't provide one DEFAULT_COURSE_ABOUT_IMAGE_URL = ENV_TOKENS.get('DEFAULT_COURSE_ABOUT_IMAGE_URL', DEFAULT_COURSE_ABOUT_IMAGE_URL) diff --git a/lms/envs/bok_choy.py b/lms/envs/bok_choy.py index c4115504e5..ac6a5fef74 100644 --- a/lms/envs/bok_choy.py +++ b/lms/envs/bok_choy.py @@ -74,6 +74,9 @@ DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage' MEDIA_ROOT = TEST_ROOT / "uploads" MEDIA_URL = "/static/uploads/" +# Don't use compression during tests +PIPELINE_JS_COMPRESSOR = None + ################################# CELERY ###################################### CELERY_ALWAYS_EAGER = True diff --git a/lms/envs/common.py b/lms/envs/common.py index 41924c2217..13c0bf213c 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -1207,6 +1207,8 @@ X_FRAME_OPTIONS = 'ALLOW' ############################### PIPELINE ####################################### +PIPELINE_ENABLED = True + # Process static files using RequireJS Optimizer STATICFILES_STORAGE = 'openedx.core.lib.django_require.staticstorage.OptimizedCachedRequireJsStorage' @@ -1218,9 +1220,8 @@ STATICFILES_FINDERS = [ 'pipeline.finders.PipelineFinder', ] -# Don't use compression by default PIPELINE_CSS_COMPRESSOR = None -PIPELINE_JS_COMPRESSOR = None +PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.uglifyjs.UglifyJSCompressor' # Setting that will only affect the edX version of django-pipeline until our changes are merged upstream PIPELINE_COMPILE_INPLACE = True diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py index 34899a8ac7..43fe3704fd 100644 --- a/lms/envs/devstack.py +++ b/lms/envs/devstack.py @@ -86,6 +86,7 @@ def should_show_debug_toolbar(_): ########################### PIPELINE ################################# # Skip packaging and optimization in development +PIPELINE_ENABLED = False STATICFILES_STORAGE = 'pipeline.storage.NonPackagingPipelineStorage' # Revert to the default set of finders as we don't want the production pipeline diff --git a/lms/envs/test.py b/lms/envs/test.py index 1e52d4297c..b9c0f243b7 100644 --- a/lms/envs/test.py +++ b/lms/envs/test.py @@ -129,6 +129,8 @@ XQUEUE_WAITTIME_BETWEEN_REQUESTS = 5 # seconds MOCK_STAFF_GRADING = True MOCK_PEER_GRADING = True +############################ STATIC FILES ############################# + # TODO (cpennington): We need to figure out how envs/test.py can inject things # into common.py so that we don't have to repeat this sort of thing STATICFILES_DIRS = [ @@ -146,7 +148,9 @@ STATICFILES_DIRS += [ # find pipelined assets will raise a ValueError. # http://stackoverflow.com/questions/12816941/unit-testing-with-django-pipeline STATICFILES_STORAGE = 'pipeline.storage.NonPackagingPipelineStorage' -PIPELINE_ENABLED = False + +# Don't use compression during tests +PIPELINE_JS_COMPRESSOR = None update_module_store_settings( MODULESTORE, diff --git a/lms/templates/main_django.html b/lms/templates/main_django.html index 457dd672ed..c8d2aac2d2 100644 --- a/lms/templates/main_django.html +++ b/lms/templates/main_django.html @@ -1,5 +1,5 @@ -{% load compressed %} +{% load pipeline %} {% load sekizai_tags i18n microsite %} {% load url from future %} {% load staticfiles %} @@ -10,13 +10,13 @@ - {% compressed_css 'style-vendor' %} - {% compressed_css 'style-main' %} - {% compressed_css 'style-course-vendor' %} - {% compressed_css 'style-course' %} + {% stylesheet 'style-vendor' %} + {% stylesheet 'style-main' %} + {% stylesheet 'style-course-vendor' %} + {% stylesheet 'style-course' %} {% block main_vendor_js %} - {% compressed_js 'main_vendor' %} + {% javascript 'main_vendor' %} {% endblock %} {% block headextra %}{% endblock %} {% render_block "css" %} @@ -50,8 +50,8 @@ - {% compressed_js 'application' %} - {% compressed_js 'module-js' %} + {% javascript 'application' %} + {% javascript 'module-js' %} {% render_block "js" %} diff --git a/lms/templates/wiki/base.html b/lms/templates/wiki/base.html index 7191443c32..f64206fb6e 100644 --- a/lms/templates/wiki/base.html +++ b/lms/templates/wiki/base.html @@ -1,5 +1,5 @@ {% extends "main_django.html" %} -{% load compressed %}{% load sekizai_tags i18n microsite %}{% load url from future %}{% load staticfiles %} +{% load pipeline %}{% load sekizai_tags i18n microsite %}{% load url from future %}{% load staticfiles %} {% block title %}{% block pagetitle %}{% endblock %} | {% trans "Wiki" %} | {% platform_name %}{% endblock %} @@ -7,7 +7,7 @@ {% block headextra %} - {% compressed_css 'course' %} + {% stylesheet 'course' %}