update makefile

aslilac · aslilac · commit 2b19afc4eeb1 · 2024-08-14T21:26:25.000Z
diff --git a/Makefile b/Makefile
@@ -391,7 +391,7 @@ BOLD := $(shell tput bold 2>/dev/null)
 GREEN := $(shell tput setaf 2 2>/dev/null)
 RESET := $(shell tput sgr0 2>/dev/null)
 
-fmt: fmt/eslint fmt/prettier fmt/terraform fmt/shfmt fmt/go
+fmt: fmt/ts fmt/terraform fmt/shfmt fmt/go
 .PHONY: fmt
 
 fmt/go:
@@ -401,22 +401,18 @@ fmt/go:
 	go run mvdan.cc/gofumpt@v0.4.0 -w -l .
 .PHONY: fmt/go
 
-fmt/eslint:
-	echo "$(GREEN)==>$(RESET) $(BOLD)fmt/eslint$(RESET)"
-	cd site
-	pnpm run lint:fix
-.PHONY: fmt/eslint
-
-fmt/prettier:
-	echo "$(GREEN)==>$(RESET) $(BOLD)fmt/prettier$(RESET)"
+fmt/ts:
+	echo "$(GREEN)==>$(RESET) $(BOLD)fmt/ts$(RESET)"
 	cd site
 # Avoid writing files in CI to reduce file write activity
 ifdef CI
+	pnpm run lint
 	pnpm run format:check
 else
+	pnpm run lint:fix
 	pnpm run format
 endif
-.PHONY: fmt/prettier
+.PHONY: fmt/ts
 
 fmt/terraform: $(wildcard *.tf)
 	echo "$(GREEN)==>$(RESET) $(BOLD)fmt/terraform$(RESET)"
@@ -497,7 +493,6 @@ gen: \
 	provisioner/terraform/testdata/version \
 	site/.prettierrc.yaml \
 	site/.prettierignore \
-	site/.eslintignore \
 	site/e2e/provisionerGenerated.ts \
 	site/src/theme/icons.json \
 	examples/examples.gen.json \
@@ -528,7 +523,6 @@ gen/mark-fresh:
 		.prettierignore \
 		site/.prettierrc.yaml \
 		site/.prettierignore \
-		site/.eslintignore \
 		site/e2e/provisionerGenerated.ts \
 		site/src/theme/icons.json \
 		examples/examples.gen.json \
@@ -737,7 +731,7 @@ site/.prettierrc.yaml: .prettierrc.yaml
 # https://github.com/prettier/prettier/issues/8048
 # https://github.com/prettier/prettier/issues/8506
 # https://github.com/prettier/prettier/issues/8679
-site/.eslintignore site/.prettierignore: .prettierignore Makefile
+site/.prettierignore: .prettierignore Makefile
 	rm -f "$@"
 	touch "$@"
 	# Skip generated by header, inherit `.prettierignore` header as-is.
