diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 1766ef1..0000000 --- a/.editorconfig +++ /dev/null @@ -1,12 +0,0 @@ -root = true - -[*] -charset = utf-8 -indent_size = 4 -end_of_line = lf -indent_style = space -insert_final_newline = true -trim_trailing_whitespace = true - -[*.{json,yml,yaml,md}] -indent_size = 2 diff --git a/.prettierrc b/.prettierrc index c522042..40d9f61 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,5 +1,15 @@ { "semi": false, "singleQuote": true, - "trailingComma": "none" -} \ No newline at end of file + "trailingComma": "none", + "tabWidth": 4, + "endOfLine": "lf", + "overrides": [ + { + "files": ["*.{json,yml,yaml,md}"], + "options": { + "tabWidth": 2 + } + } + ] +} diff --git a/docker-compose.yml b/docker-compose.yml index 14e4cea..d2a1ee8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,6 @@ version: '3.4' services: - client: build: context: ./client @@ -21,4 +20,3 @@ services: dockerfile: ./Dockerfile ports: - 4000:4000 -