diff options
author | Alexander Early <alexander.early@gmail.com> | 2018-06-02 22:06:01 -0700 |
---|---|---|
committer | Alexander Early <alexander.early@gmail.com> | 2018-06-02 22:06:01 -0700 |
commit | b69a330e3e3edd14fcbcca7b55817cbf7c47c4e1 (patch) | |
tree | c52468c40c5a8c60d6563b1c513bf4488d09d62a | |
parent | a97b1830149cf310f480312543411a79e8bddcfa (diff) | |
download | async-b69a330e3e3edd14fcbcca7b55817cbf7c47c4e1.tar.gz |
optimize makefile, fix tests
-rw-r--r-- | Makefile | 22 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | support/list-aliases.js | 0 |
3 files changed, 12 insertions, 12 deletions
@@ -15,17 +15,17 @@ BUILD_ES = build-es DIST = dist JS_INDEX = lib/index.js SCRIPTS = ./support -JS_SRC = $(shell find lib/ -type f -name '*.js') lib/index.js -INDEX_SRC = $(shell find lib/ -type f -name '*.js' | grep -v 'index') $(SCRIPTS)/index-template.js $(SCRIPTS)/aliases.json ${SCRIPTS}/generate-index.js -LINT_FILES = lib/ test/ $(shell find perf/ -maxdepth 2 -type f) $(shell find support/ -maxdepth 2 -type f -name "*.js") karma.conf.js - -UMD_BUNDLE = $(BUILDDIR)/dist/async.js -UMD_BUNDLE_MIN = $(BUILDDIR)/dist/async.min.js -UMD_BUNDLE_MAP = $(BUILDDIR)/dist/async.min.map -ALIAS_ES = $(shell node $(SCRIPTS)/list-aliases.js build-es/) -ES_MODULES = $(patsubst lib/%.js, build-es/%.js, $(JS_SRC)) $(ALIAS_ES) -ALIAS_CJS = $(shell node $(SCRIPTS)/list-aliases.js build/) -CJS_MODULES = $(patsubst lib/%.js, build/%.js, $(JS_SRC)) $(ALIAS_CJS) +JS_SRC := $(shell find lib/ -type f -name '*.js') lib/index.js +INDEX_SRC := $(filter-out $(JS_SRC),$(JS_INDEX)) $(SCRIPTS)/index-template.js $(SCRIPTS)/aliases.json ${SCRIPTS}/generate-index.js +LINT_FILES := lib/ test/ $(shell find perf/ -maxdepth 2 -type f) $(shell find support/ -maxdepth 2 -type f -name "*.js") karma.conf.js + +UMD_BUNDLE := $(BUILDDIR)/dist/async.js +UMD_BUNDLE_MIN := $(BUILDDIR)/dist/async.min.js +UMD_BUNDLE_MAP := $(BUILDDIR)/dist/async.min.map +ALIAS_ES := $(shell $(SCRIPTS)/list-aliases.js build-es/) +ALIAS_CJS := $(patsubst build-es/%, build/%, $(ALIAS_ES)) +ES_MODULES := $(patsubst lib/%.js, build-es/%.js, $(JS_SRC)) $(ALIAS_ES) +CJS_MODULES := $(patsubst lib/%.js, build/%.js, $(JS_SRC)) $(ALIAS_CJS) all: clean lint build test diff --git a/package.json b/package.json index 8b6c274..159e257 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "jsdoc": "jsdoc -c ./support/jsdoc/jsdoc.json && node support/jsdoc/jsdoc-fix-html.js", "lint": "eslint lib/ test/ perf/memory.js perf/suites.js perf/benchmark.js support/build/ support/*.js karma.conf.js", "mocha-browser-test": "karma start", - "mocha-node-test": "mocha", + "mocha-node-test": "mocha test/", "mocha-test": "npm run mocha-node-test && npm run mocha-browser-test", "test": "npm run lint && npm run mocha-node-test" }, diff --git a/support/list-aliases.js b/support/list-aliases.js index d1eeed5..d1eeed5 100644..100755 --- a/support/list-aliases.js +++ b/support/list-aliases.js |