diff --git a/package.json b/package.json index bd27863835e649a376816761111870c807008e92..9751646a513139bcfef8640678571a572dc86e83 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ , "jwcrypto": "https://github.com/mozilla/jwcrypto/tarball/de57b1891" , "postprocess": "0.0.3" , "urlparse": "0.0.1" + , "uglifycss": "0.0.4" } , "scripts": { "postinstall": "./scripts/generate_ephemeral_keys.sh", diff --git a/scripts/compress.sh b/scripts/compress.sh index c488a5ce741b6b1ddb929245627abc80e72e8024..0b4aeae843cbba45273c9edd42d91f4885cd34e9 100755 --- a/scripts/compress.sh +++ b/scripts/compress.sh @@ -8,13 +8,7 @@ if [ ! -x "$UGLIFY" ]; then exit 1 fi -JAVA=`which java 2> /dev/null` -if [ ! -x "$JAVA" ]; then - echo "java not found in your path. can't create production resources. disaster." - exit 1 -fi - -YUI_LOCATION=`pwd`'/resources/static/steal/build/scripts/yui.jar' +UGLIFYCSS=`pwd`'/node_modules/uglifycss/uglifycss' echo '' echo '****Compressing include.js****' @@ -55,7 +49,7 @@ mv production.min.js production.js cd css cat popup.css m.css > production.css -$JAVA -jar $YUI_LOCATION production.css -o production.min.css +$UGLIFYCSS production.css > production.min.css cd ../../relay cat ../lib/jschannel.js ../shared/browserid.js relay.js > production.js @@ -74,4 +68,4 @@ $UGLIFY < lib.js > lib.min.js cd ../css cat style.css m.css > browserid.css -$JAVA -jar $YUI_LOCATION browserid.css -o browserid.min.css +$UGLIFYCSS browserid.css > browserid.min.css