Skip to content

Commit

Permalink
Merge pull request #319 from rubiin/chores
Browse files Browse the repository at this point in the history
  • Loading branch information
rubiin authored Oct 3, 2023
2 parents 7bdb322 + 4da9edb commit e040a6b
Show file tree
Hide file tree
Showing 6 changed files with 177 additions and 203 deletions.
19 changes: 17 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,23 @@ charset = utf-8
indent_size = 2
indent_style = space
trim_trailing_whitespace = true
quote_type = single
quote_type = double

[*.md]
insert_final_newline = false
trim_trailing_whitespace = false

# The JSON files contain newlines inconsistently
[*.json]
indent_size = 2
insert_final_newline = ignore

[Makefile]
indent_size = 8
indent_style = tab
indent_size = 8

[docs/**.txt]
max_line_length = 80

[*.yml]
indent_size = 2
6 changes: 1 addition & 5 deletions .lintstagedrc
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
{
"*.{ts,tsx}": [
"eslint_d '{src,test}/**/*.ts' --cache --fix",
"prettier --cache --write"
],
"*.{json,md,yaml,yml}": [
"prettier --cache --write"
"eslint --cache --fix"
]
}
7 changes: 2 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
"lint": "eslint --cache",
"lint:fix": "eslint --cache --fix",
"orm": "npx mikro-orm",
"prebuild": "rimraf dist",
"sample": "cd env; npx sample-env --env .env.dev",
"start": "nest start",
"start:dev": "nest start --watch",
Expand Down Expand Up @@ -98,7 +97,6 @@
"date-fns": "^2.30.0",
"date-fns-tz": "^2.0.0",
"eta": "^3.1.1",
"express-basic-auth": "^1.2.1",
"firebase-admin": "^11.11.0",
"handlebars": "^4.7.8",
"helmet": "^7.0.0",
Expand All @@ -122,8 +120,8 @@
"passport-jwt": "4.0.1",
"passport-magic-login": "^1.2.2",
"pino-http": "^8.5.0",
"pino-pretty": "^10.2.0",
"poolifier": "^2.7.4",
"pino-pretty": "^10.2.2",
"poolifier": "^2.7.5",
"preview-email": "^3.0.19",
"prom-client": "^14.2.0",
"pug": "^3.0.2",
Expand Down Expand Up @@ -178,7 +176,6 @@
"cross-env": "^7.0.3",
"cz-conventional-changelog": "3.3.0",
"eslint": "^8.50.0",
"eslint_d": "^12.2.1",
"husky": "^8.0.3",
"jest": "29.7.0",
"lint-staged": "^14.0.1",
Expand Down
Loading

0 comments on commit e040a6b

Please sign in to comment.