diff --git a/.travis.yml b/.travis.yml index c160e8d3..24682db3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,4 +11,5 @@ install: - npm install script: - - make all + - npm run lint + - npm test diff --git a/Makefile b/Makefile deleted file mode 100644 index 5d91c19c..00000000 --- a/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# http://stackoverflow.com/a/5982798/376773 -THIS_MAKEFILE_PATH:=$(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)) -THIS_DIR:=$(shell cd $(dir $(THIS_MAKEFILE_PATH));pwd) -export PATH := $(THIS_DIR)/node_modules/.bin:$(PATH) -SHELL := /bin/bash - -all: lint test - -dist: dist/debug.js dist/test.js - -.INTERMEDIATE: dist/debug.es6.js -dist/debug.es6.js: src/*.js - @mkdir -p dist - browserify --standalone debug . > $@ - -dist/debug.js: dist/debug.es6.js - @mkdir -p dist - babel $< > $@ - -dist/test.js: test.js - @mkdir -p dist - babel $< > $@ - -lint: - xo - -test-node: - istanbul cover node_modules/mocha/bin/_mocha -- test.js - @cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js - -test-browser: dist - karma start --single-run - -test: test-node test-browser - -clean: - rm -rf dist coverage - -.PHONY: all dist clean lint test test-node test-browser diff --git a/package.json b/package.json index cecd5ac5..0c8aa48e 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,19 @@ "Andrew Rhyne " ], "license": "MIT", + "scripts": { + "lint": "xo", + "test": "npm run test:node && npm run test:browser", + "test:node": "istanbul cover _mocha -- test.js", + "posttest:node": "cat ./coverage/lcov.info | coveralls", + "pretest:browser": "npm run build", + "test:browser": "karma start --single-run", + "prebuild:debug": "mkdir -p dist && browserify --standalone debug -o dist/debug.es6.js .", + "build:debug": "babel -o dist/debug.js dist/debug.es6.js > dist/debug.js", + "build:test": "babel -d dist test.js", + "build": "npm run build:debug && npm run build:test", + "clean": "rimraf dist coverage" + }, "dependencies": { "ms": "^2.1.1" },