Merge pull request #584 from mattermost/mm-1909

MM-1909 Enabling checking of style guide on travis and turning on strict mode

Makefile

@@ -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

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"
     ]
   },