optimize makefile

Makefile

@@ -3,31 +3,39 @@ WATCH      = ./node_modules/.bin/watch
 LESS       = ./node_modules/.bin/lessc
 BROWSERIFY = ./node_modules/.bin/browserify
 UGLIFY     = ./node_modules/.bin/uglifyjs
+CLEANCSS   = ./node_modules/.bin/cleancss
 MOCHA      = ./node_modules/.bin/mocha
-NAME       = $(shell node -e "console.log(require('./package.json').name)")
+SERVER     = ./node_modules/.bin/superstatic
 
-watch-js:
+MOCHA-OPTS = --compilers js:babel-register --ui exports --timeout 5000 --bail
-	${MAKE} build-js
-	${WATCHIFY} -e -s $(NAME) ./src/js/index.jsx -t babelify -o public/js/bundle.js -d -v
 
-watch-css:
+serve:
-	${MAKE} build-css
+	${SERVER} --port 8080
+
+watch-js: build-js
+	${WATCHIFY} -e -s burnchart ./src/js/index.jsx -t babelify -o public/js/bundle.js -d -v
+
+watch-css: build-css
 	${WATCH} "${MAKE} build-css" src/less
 
 watch:
 	${MAKE} watch-js & ${MAKE} watch-css
 
 build-js:
-	${BROWSERIFY} -e -s $(NAME) ./src/js/index.jsx -t babelify | ${UGLIFY} - > public/js/bundle.js
+	${BROWSERIFY} -e -s burnchart ./src/js/index.jsx -t babelify > public/js/bundle.js
 
 build-css:
 	${LESS} src/less/burnchart.less > public/css/bundle.css
 
-build:
+build: build-js build-css
-	${MAKE} build-js
+
-	${MAKE} build-css
+minify-js:
+	${UGLIFY} public/js/bundle.js > public/js/bundle.min.js
+
+minify-css:
+	${CLEANCSS} public/css/bundle.css > public/css/bundle.min.css
 
 test:
-	${MOCHA} --compilers js:babel-register --ui exports --timeout 5000 --bail --reporter spec
+	${MOCHA} ${MOCHA-OPTS} --reporter spec
 
 .PHONY: test

package.json

@@ -1,10 +1,6 @@
 {
   "name": "burnchart",
   "version": "3.0.0-alpha",
-  "scripts": {
-    "start": "./node_modules/.bin/superstatic public --port 8080",
-    "test": "make test"
-  },
   "dependencies": {
     "async": "^1.5.2",
     "classnames": "^2.2.3",
@@ -35,6 +31,7 @@
     "babelify": "^7.2.0",
     "browserify": "^13.0.0",
     "chai": "^3.4.1",
+    "clean-css": "^3.4.9",
     "coffeeify": "^2.0.1",
     "less": "^2.5.3",
     "mocha": "^2.3.4",