diff --git a/.gitignore b/.gitignore index 22eee4d..f4fa3f6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ .DS_Store node_modules npm-debug.log -dist +build diff --git a/Makefile b/Makefile index 817dee1..7b866d9 100644 --- a/Makefile +++ b/Makefile @@ -2,25 +2,25 @@ PATH := node_modules/.bin:$(PATH) SHELL := /bin/bash source_files := src/ti-auth.js $(wildcard src/lib/*.js) -dist_files := $(source_files:%.js=dist/%.js) -app := dist/ti-auth.js +build_files := $(source_files:%.js=build/%.js) +app := build/ti-auth.js test_source := $(wildcard test/*.js) -test_dist := $(test_source:%.js=dist/%.js) -tests := dist/tests.js +test_build := $(test_source:%.js=build/%.js) +tests := build/tests.js .PHONY: all watch test clean all: $(app) $(tests) -dist/%.js: %.js +build/%.js: %.js mkdir -p $(dir $@) babel $< -o $@ -$(app): $(dist_files) +$(app): $(build_files) browserify $< -o $@ -$(tests): $(test_dist) +$(tests): $(test_build) browserify $< -o $@ watch: $(source_files) $(test_source) @@ -30,4 +30,4 @@ test: all testem clean: - rm -rf dist + rm -rf build diff --git a/testem.json b/testem.json index 2a3a384..f70f575 100644 --- a/testem.json +++ b/testem.json @@ -1,11 +1,11 @@ { "framework": "mocha", "src_files": [ - "dist/tests.js" + "build/tests.js" ], "launchers": { "Mocha": { - "command": "./node_modules/.bin/mocha -R tap dist/tests.js", + "command": "./node_modules/.bin/mocha -R tap build/tests.js", "protocol": "tap" } },