|
|
@@ -39,8 +39,8 @@ help:
|
|
|
@echo " make web-deps - Install web app dependencies (npm install the universe)"
|
|
|
@echo " make web-build - Actually build the web app"
|
|
|
@echo " make web-lint - Run eslint on the web app"
|
|
|
- @echo " make web-format - Run prettier on the web app"
|
|
|
- @echo " make web-format-check - Run prettier on the web app, but don't change anything"
|
|
|
+ @echo " make web-fmt - Run prettier on the web app"
|
|
|
+ @echo " make web-fmt-check - Run prettier on the web app, but don't change anything"
|
|
|
@echo
|
|
|
@echo "Build documentation:"
|
|
|
@echo " make docs - Build the documentation"
|
|
|
@@ -151,10 +151,10 @@ web-deps:
|
|
|
web-deps-update:
|
|
|
cd web && npm update
|
|
|
|
|
|
-web-format:
|
|
|
+web-fmt:
|
|
|
cd web && npm run format
|
|
|
|
|
|
-web-format-check:
|
|
|
+web-fmt-check:
|
|
|
cd web && npm run format:check
|
|
|
|
|
|
web-lint:
|
|
|
@@ -248,7 +248,7 @@ cli-build-results:
|
|
|
|
|
|
# Test/check targets
|
|
|
|
|
|
-check: test web-format-check fmt-check vet web-lint lint staticcheck
|
|
|
+check: test web-fmt-check fmt-check vet web-lint lint staticcheck
|
|
|
|
|
|
test: .PHONY
|
|
|
go test $(shell go list ./... | grep -vE 'ntfy/(test|examples|tools)')
|
|
|
@@ -275,7 +275,7 @@ coverage-upload:
|
|
|
|
|
|
# Lint/formatting targets
|
|
|
|
|
|
-fmt:
|
|
|
+fmt: web-fmt
|
|
|
gofmt -s -w .
|
|
|
|
|
|
fmt-check:
|
binwiederhier