Description: use uglify and sassc
Forwarded: not-needed
Reviewed-By: Yadd <yadd@debian.org>
Last-Update: 2022-03-03

--- a/build/include.sh
+++ b/build/include.sh
@@ -57,7 +57,7 @@
 		DIR=$(dirname $1)
 
 		echo_msg "CSS compressing $FILE.css"
-		sass --no-charset --stop-on-error --style compressed $DIR/$FILE.css > $DIR/$FILE.min.css
+		sassc --style compressed $DIR/$FILE.css $DIR/$FILE.min.css
 		
 		echo_msg "  File size: $(ls -l $DIR/$FILE.min.css | awk -F" " '{ print $5 }')"
 	fi
@@ -71,7 +71,7 @@
 	DIR=$(dirname $1)
 
 	echo_msg "SCSS compiling $FILE.scss"
-	sass --no-charset --stop-on-error --style expanded $DIR/$FILE.scss > $DIR/$FILE.css
+	sassc --style expanded $DIR/$FILE.scss $DIR/$FILE.css
 
 	css_compress $DIR/$FILE.css
 }
@@ -123,22 +123,10 @@
 
 		echo_msg "JS compressing $FILE.${COMP_EXTN}"
 
-		# Closure Compiler doesn't support "important" comments so we add a
-		# @license jsdoc comment to the license block to preserve it
 		cp $DIR/$FILE.$COMP_EXTN $TMPDIR/$FILE.$COMP_EXTN
-		perl -i -0pe "s/^\/\*! (.*)$/\/** \@license \$1/s" $TMPDIR/$FILE.$COMP_EXTN
 
 		rm $TMPDIR/closure_error.log
-		java -jar $CLOSURE --charset 'utf-8' --language_out=ES5 --js $TMPDIR/$FILE.$COMP_EXTN > $TMPDIR/$FILE.min.$COMP_EXTN 2> $TMPDIR/closure_error.log
-
-		if [ -e $TMPDIR/closure_error.log ]; then
-			if [ -z "$LOG" -o "$LOG" = "on" ]; then
-				cat $TMPDIR/closure_error.log
-			fi
-		fi
-
-		# And add the important comment back in
-		perl -i -0pe "s/^\/\*/\/*!/s" $TMPDIR/$FILE.min.$COMP_EXTN
+		uglifyjs $TMPDIR/$FILE.js > $TMPDIR/$FILE.min.js
 
 		mv $TMPDIR/$FILE.min.$COMP_EXTN $DIR/$FILE.min.$COMP_EXTN
 		rm $TMPDIR/$FILE.$COMP_EXTN
--- a/build/make.sh
+++ b/build/make.sh
@@ -101,7 +101,7 @@
 
 	for file in $(find $SRC_DIR -name "*.scss"); do
 		filename=$(basename $file .scss)
-		sass --stop-on-error --style expanded $file > $OUT_DIR/$filename.css
+		sassc --style expanded $file > $OUT_DIR/$filename.css
 		css_compress $OUT_DIR/$filename.css
 	done
 }