Skip to content

Commit ecb3339

Browse files
mbostockmbostock
committed
Switch to UglifyJS2.
1 parent 835c3e1 commit ecb3339

5 files changed

Lines changed: 4835 additions & 4812 deletions

File tree

‎Makefile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# See the README for installation instructions.
22

33
NODE_PATH ?= ./node_modules
4-
JS_COMPILER = $(NODE_PATH)/uglify-js/bin/uglifyjs
5-
JS_BEAUTIFIER = $(NODE_PATH)/uglify-js/bin/uglifyjs -b -i 2 -nm -ns
4+
JS_UGLIFY = $(NODE_PATH)/uglify-js2/bin/uglifyjs2
65
JS_TESTER = $(NODE_PATH)/vows/bin/vows
76
LOCALE ?= en_US
87

@@ -236,11 +235,13 @@ test: all
236235

237236
%.min.js: %.js Makefile
238237
@rm -f $@
239-
$(JS_COMPILER) < $< > $@
238+
$(JS_UGLIFY) $< -c -m -o $@
240239

241240
d3%js: Makefile
242241
@rm -f $@
243-
cat $(filter %.js,$^) | $(JS_BEAUTIFIER) > $@
242+
@cat $(filter %.js,$^) > $@.tmp
243+
$(JS_UGLIFY) $@.tmp -b indent-level=2 -o $@
244+
@rm $@.tmp
244245
@chmod a-w $@
245246

246247
component.json: src/component.js

0 commit comments

Comments
 (0)