mirror of
https://git.proxmox.com/git/proxmox-widget-toolkit
synced 2025-05-23 11:08:14 +00:00
try using 'pve-eslint' if it exists
but fallback to 'eslint' otherwise Suggested-by: Thomas Lamprecht <t.lamprecht@proxmox.com> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com> [T: move into www/manager Makefile directly] Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
parent
589317b094
commit
efcb34fa21
@ -1,5 +1,7 @@
|
|||||||
include defines.mk
|
include defines.mk
|
||||||
|
|
||||||
|
ESLINT ?= $(if $(shell command -v pve-eslint), pve-eslint, eslint)
|
||||||
|
|
||||||
SUBDIRS= css images proxmox-dark
|
SUBDIRS= css images proxmox-dark
|
||||||
|
|
||||||
# bundle it for now from the libjs-marked debian package to avoid touching our proxies file mapper,
|
# bundle it for now from the libjs-marked debian package to avoid touching our proxies file mapper,
|
||||||
@ -110,14 +112,14 @@ all: $(SUBDIRS)
|
|||||||
set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i; done
|
set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i; done
|
||||||
|
|
||||||
.lint-incremental: $(JSSRC)
|
.lint-incremental: $(JSSRC)
|
||||||
eslint $?
|
$(ESLINT) $?
|
||||||
touch "$@"
|
touch "$@"
|
||||||
|
|
||||||
.PHONY: lint
|
.PHONY: lint
|
||||||
check: lint
|
check: lint
|
||||||
eslint --strict api-viewer/APIViewer.js
|
$(ESLINT) --strict api-viewer/APIViewer.js
|
||||||
lint: $(JSSRC)
|
lint: $(JSSRC)
|
||||||
eslint --strict $(JSSRC)
|
$(ESLINT) --strict $(JSSRC)
|
||||||
touch ".lint-incremental"
|
touch ".lint-incremental"
|
||||||
|
|
||||||
BUILD_TIME=$(or $(SOURCE_DATE_EPOCH),$(shell date '+%s.%N'))
|
BUILD_TIME=$(or $(SOURCE_DATE_EPOCH),$(shell date '+%s.%N'))
|
||||||
|
Loading…
Reference in New Issue
Block a user