Skip to content

Fix hardcoded yarn and prettier #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
glepretre merged 2 commits into from
May 22, 2026
Merged

Fix hardcoded yarn and prettier #29

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffdd005
Use NPM variable instead of hardcoded yarn
glepretre May 19, 2026
1def907
Make prettier binary configurable
glepretre May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions base.Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ NPM ?= $(shell command -v yarn 2> /dev/null)
NODE_BINDIR ?= $(shell $(NPM) bin)
### Commands (from `NODE_BINDIR` via `PATH` environment variable)
JEST ?= jest
PRETTIER ?= prettier
# Set PATH to node binaries
export PATH := $(NODE_BINDIR):$(PATH)
endif
Expand Down Expand Up @@ -165,7 +166,7 @@ ifneq ($(STAGED_JINJA_FILES),)
@$(DJLINT) $(STAGED_JINJA_FILES) --lint
endif
ifneq (,$(STAGED_NODE_FILES))
@prettier --write $(STAGED_NODE_FILES)
@$(PRETTIER) --write $(STAGED_NODE_FILES)
endif
@FORMATTED_FILES=`git diff --name-only $(STAGED_PYTHON_FILES) $(STAGED_JINJA_FILES) $(STAGED_NODE_FILES)`; if [[ "$$FORMATTED_FILES" ]]; then \
echo; \
Expand All @@ -184,7 +185,11 @@ endif
#
DOT_FILES ?= MakeCitron.Makefile .sass-lint.yml
PYTHON_DOT_FILES ?= pyproject.toml setup.cfg
NODE_DOT_FILES ?= .eslintrc.json .eslintignore .prettierrc .prettierignore jsconfig.json
PRETTIER_DOT_FILES :=
ifeq ($(PRETTIER),prettier)
PRETTIER_DOT_FILES := .prettierrc .prettierignore
endif
NODE_DOT_FILES ?= .eslintrc.json .eslintignore $(PRETTIER_DOT_FILES) jsconfig.json
ifdef _NODE
DOT_FILES += $(NODE_DOT_FILES)
endif
Expand Down Expand Up @@ -228,7 +233,7 @@ endif

install-nod%: ## install-node: Install node dependencies for development
$(LOG)
yarn install --production=false --check-files
$(NPM) install --production=false --check-files
rm -fr .eslintcache

requirements/%.txt: requirements/%.in ## requirements/%.txt: Generate python requirements
Expand Down Expand Up @@ -352,7 +357,7 @@ fix-pytho%: ## fix-python: Fix python source format and lint violations

fix-nod%: ## fix-node: Fix node source format
$(LOG)
prettier --write '{,lib/**/}*.js?(x)'
$(PRETTIER) --write '{,lib/**/}*.js?(x)'

fi%: least-specific-fix ## fix: Fix all source format
$(LOG)
Expand Down