strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

browser: simplify 'prettier' call

Browse source 
Change-Id: I0e2af38d70e30dea42187fa2fb960da5328af857
Signed-off-by: Henry Castro <hcastro@collabora.com>
This commit is contained in:
Henry Castro 2024-03-12 08:27:57 -04:00
parent e2103b241a
commit 71023d9ba7
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
browser/Makefile.am
View file

@ -479,6 +479,13 @@ define run_eslint_check
--no-eslintrc $(1) --no-eslintrc $(1)
endef endef
define run_prettier_check
@$(NODE) node_modules/.bin/prettier \
--ignore-path $(srcdir)/browser/.prettierignore \
--ignore-path $(srcdir)/browser/.beforeprettier \
$(1)
endef
.PHONY: build-cool .PHONY: build-cool
all-local: build-cool all-local: build-cool
@ -552,11 +559,7 @@ $(INTERMEDIATE_DIR)/admin-src.js: $(COOL_ADMIN_TS_JS) $(COOL_ADMIN_JS)
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@echo "Checking for admin JS errors..." @echo "Checking for admin JS errors..."
$(call run_eslint_check,--ignore-pattern $(COOL_ADMIN_TS_JS) $(srcdir)/admin/src) $(call run_eslint_check,--ignore-pattern $(COOL_ADMIN_TS_JS) $(srcdir)/admin/src)
@$(NODE) node_modules/.bin/prettier \ $(call run_prettier_check,--debug-check $(srcdir)/admin/src)
--ignore-path $(srcdir)/browser/.prettierignore \
--ignore-path $(srcdir)/browser/.beforeprettier \
--debug-check \
$(srcdir)/admin/src
@awk 'FNR == 1 {print ""} 1' $(COOL_ADMIN_TS_JS) $(patsubst %.js,$(srcdir)/%.js,$(COOL_ADMIN_JS)) > $@ @awk 'FNR == 1 {print ""} 1' $(COOL_ADMIN_TS_JS) $(patsubst %.js,$(srcdir)/%.js,$(COOL_ADMIN_JS)) > $@
$(INTERMEDIATE_DIR)/cool-src.js: tscompile.done $(call prereq_cool) $(COOL_JS_DST) $(abs_top_srcdir)/scripts/unocommands.py $(INTERMEDIATE_DIR)/cool-src.js: tscompile.done $(call prereq_cool) $(COOL_JS_DST) $(abs_top_srcdir)/scripts/unocommands.py
@ -566,11 +569,7 @@ $(INTERMEDIATE_DIR)/cool-src.js: tscompile.done $(call prereq_cool) $(COOL_JS_DS
@if ! test "z$(COOL_ASSERT_INTERSECT)" == "z"; then echo; echo "Error: please remove obsolete files:"; echo "$(COOL_ASSERT_INTERSECT)"; exit 1; else echo "clean"; fi @if ! test "z$(COOL_ASSERT_INTERSECT)" == "z"; then echo; echo "Error: please remove obsolete files:"; echo "$(COOL_ASSERT_INTERSECT)"; exit 1; else echo "clean"; fi
@echo "Checking for cool JS errors..." @echo "Checking for cool JS errors..."
$(call run_eslint_check,$(srcdir)/src $(srcdir)/js) $(call run_eslint_check,$(srcdir)/src $(srcdir)/js)
@$(NODE) node_modules/.bin/prettier \ $(call run_prettier_check,--debug-check $(srcdir)/src $(srcdir)/js/global.js)
--ignore-path $(srcdir)/browser/.prettierignore \
--ignore-path $(srcdir)/browser/.beforeprettier \
--debug-check \
$(srcdir)/src
@echo "Bundling cool..." @echo "Bundling cool..."
$(call bundle_cool) $(call bundle_cool)