diff options
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | web/react/package.json | 5 |
2 files changed, 7 insertions, 9 deletions
@@ -5,7 +5,7 @@ GOFLAGS ?= $(GOFLAGS:) BUILD_NUMBER ?= $(BUILD_NUMBER:) GO=$(GOPATH)/bin/godep go -ESLINT=web/react/node_modules/eslint/bin/eslint.js +ESLINT=node_modules/eslint/bin/eslint.js ifeq ($(BUILD_NUMBER),) BUILD_NUMBER := dev @@ -37,6 +37,9 @@ travis: @cd web/react/ && npm install + @echo Checking for style guide compliance + cd web/react && $(ESLINT) components/* dispatcher/* pages/* stores/* utils/* + @$(GO) build $(GOFLAGS) ./... @$(GO) install $(GOFLAGS) -a ./... @@ -103,11 +106,7 @@ install: check: install @echo Running ESLint... - @$(ESLINT) web/react/components/* - @$(ESLINT) web/react/dispatcher/* - @$(ESLINT) web/react/pages/* - @$(ESLINT) web/react/stores/* - @$(ESLINT) web/react/utils/* + -cd web/react && $(ESLINT) components/* dispatcher/* pages/* stores/* utils/* test: install @mkdir -p logs diff --git a/web/react/package.json b/web/react/package.json index c930c4db6..5c33e2186 100644 --- a/web/react/package.json +++ b/web/react/package.json @@ -21,13 +21,12 @@ }, "scripts": { "start": "watchify --extension=jsx -o ../static/js/bundle.js -v -d ./**/*.jsx", - "build": "NODE_ENV=production browserify ./**/*.jsx | uglifyjs > ../static/js/bundle.min.js", - "build_old": "NODE_ENV=production browserify ./**/*.jsx | uglifyjs -cm > ../static/js/bundle.min.js", + "build": "NODE_ENV=production browserify ./**/*.jsx | uglifyjs > ../static/js/bundle.min.js", "test": "jest" }, "browserify": { "transform": [ - ["babelify", {"blacklist": ["strict"]}], + "babelify", "envify" ] }, |