From c80dcd87e9405bb6d89058e2b741447dfcfdefaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alvaro=20Cabrera=20Dur=C3=A1n?= <pateketrueke@gmail.com>
Date: Wed, 23 Oct 2019 09:44:07 -0500
Subject: [PATCH] Update .editorconfig
---
.editorconfig | 17 +++++++++++++++--
Makefile | 32 ++++++++++++++++----------------
2 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/.editorconfig b/.editorconfig
index a4a259a3..2288216b 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,8 +1,21 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
root = true
-[*]
+[*.md]
+trim_trailing_whitespace = false
+
+[*.js]
trim_trailing_whitespace = true
-insert_final_newline = true
+
+# Unix-style newlines with a newline ending every file
+[*]
indent_style = space
indent_size = 2
end_of_line = lf
+charset = utf-8
+insert_final_newline = true
+
+[{Makefile,todo}]
+indent_style = tab
diff --git a/Makefile b/Makefile
index 2e0e044f..a8334028 100644
--- a/Makefile
+++ b/Makefile
@@ -18,33 +18,33 @@ export NODE_ENV
# utils
define iif
- @(($(1) > /dev/null 2>&1) && printf "\r* $(2)\n") || printf "\r* $(3)\n"
+ @(($(1) > /dev/null 2>&1) && printf "\r* $(2)\n") || printf "\r* $(3)\n"
endef
# display all targets-with-help in this file
?: Makefile
- @awk -F':.*?##' '/^[a-z\\%!:-]+:.*##/{gsub("%","*",$$1);gsub("\\\\",":*",$$1);printf "\033[36m%8s\033[0m %s\n",$$1,$$2}' $<
+ @awk -F':.*?##' '/^[a-z\\%!:-]+:.*##/{gsub("%","*",$$1);gsub("\\\\",":*",$$1);printf "\033[36m%8s\033[0m %s\n",$$1,$$2}' $<
dist: deps ## Build artifact for production
- @(git worktree remove $(src) --force > /dev/null 2>&1) || true
- @git worktree add $(src) $(target)
- @cd $(src) && rm -rf *
- @cp -r public/* build
- @npm run build
+ @(git worktree remove $(src) --force > /dev/null 2>&1) || true
+ @git worktree add $(src) $(target)
+ @cd $(src) && rm -rf *
+ @cp -r public/* build
+ @npm run build
clean: ## Remove cache and generated artifacts
- @$(call iif,rm -r $(src) dist,Built artifacts were deleted,Artifacts already deleted)
- @$(call iif,unlink .tarima,Cache file was deleted,Cache file already deleted)
+ @$(call iif,rm -r $(src) dist,Built artifacts were deleted,Artifacts already deleted)
+ @$(call iif,unlink .tarima,Cache file was deleted,Cache file already deleted)
deploy: $(src) ## Push built artifacts to github!
- @cd $(src) && git add . && git commit -m "$(message)"
- @git push origin $(target) -f
+ @cd $(src) && git add . && git commit -m "$(message)"
+ @git push origin $(target) -f
deps: ## Check for installed dependencies
- @(((ls node_modules | grep .) > /dev/null 2>&1) || npm i) || true
+ @(((ls node_modules | grep .) > /dev/null 2>&1) || npm i) || true
purge: clean ## Remove all from node_modules/*
- @printf "\r* Removing all dependencies... "
- @rm -rf node_modules/.{bin,cache}
- @rm -rf node_modules/*
- @echo "OK"
+ @printf "\r* Removing all dependencies... "
+ @rm -rf node_modules/.{bin,cache}
+ @rm -rf node_modules/*
+ @echo "OK"
--
GitLab