mirror of
https://github.com/prymitive/karma
synced 2026-05-05 03:16:51 +00:00
Drop jshint, use eslint in es6 mode
This commit is contained in:
@@ -1,5 +1,8 @@
|
||||
env:
|
||||
browser: true
|
||||
commonjs: true
|
||||
es6: true
|
||||
jest: true
|
||||
jquery: true
|
||||
extends:
|
||||
- eslint:recommended
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
assets/static/lru.js
|
||||
11
.jshintrc
11
.jshintrc
@@ -1,11 +0,0 @@
|
||||
{
|
||||
"browser": true,
|
||||
"jquery": true,
|
||||
"devel": true,
|
||||
|
||||
"undef": true,
|
||||
"unused": true,
|
||||
|
||||
|
||||
"quotmark": "double"
|
||||
}
|
||||
6
Makefile
6
Makefile
@@ -19,8 +19,7 @@ ifdef DEBUG
|
||||
DOCKER_ARGS = -v $(CURDIR)/assets:$(CURDIR)/assets:ro
|
||||
endif
|
||||
|
||||
# detect if jshint and/or eslint is installed
|
||||
JSHINT := $(shell which jshint)
|
||||
# detect if eslint is installed
|
||||
ESLINT := $(shell which eslint)
|
||||
|
||||
.DEFAULT_GOAL := $(NAME)
|
||||
@@ -91,9 +90,6 @@ run-docker: docker-image
|
||||
.PHONY: lint
|
||||
lint: .build/deps.ok
|
||||
@golint ./... | (egrep -v "^vendor/|^bindata_assetfs.go" || true)
|
||||
ifneq ($(JSHINT),)
|
||||
$(JSHINT) assets/static/*.js
|
||||
endif
|
||||
ifneq ($(ESLINT),)
|
||||
$(ESLINT) --quiet assets/static/*.js
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user