diff --git a/lms/envs/common.py b/lms/envs/common.py index da04358244..f6de15e02c 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -1211,7 +1211,7 @@ if os.path.isdir(DATA_DIR): PIPELINE_CSS_COMPRESSOR = None -PIPELINE_JS_COMPRESSOR = None +PIPELINE_JS_COMPRESSOR = "pipeline.compressors.uglifyjs.UglifyJSCompressor" STATICFILES_IGNORE_PATTERNS = ( "sass/*", @@ -1222,7 +1222,7 @@ STATICFILES_IGNORE_PATTERNS = ( "common_static", ) -PIPELINE_YUI_BINARY = 'yui-compressor' +PIPELINE_UGLIFYJS_BINARY='node_modules/.bin/uglifyjs' # Setting that will only affect the edX version of django-pipeline until our changes are merged upstream PIPELINE_COMPILE_INPLACE = True diff --git a/package.json b/package.json index 33c89730af..bbd0a864d4 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,7 @@ "name": "edx", "version": "0.1.0", "dependencies": { - "coffee-script": "1.6.1" + "coffee-script": "1.6.1", + "uglify-js": "2.4.15" } }