Skip to content

Commit

Permalink
fix: editorconfig for jsutfile and other defaults
Browse files Browse the repository at this point in the history
  • Loading branch information
rubiin committed Oct 4, 2023
1 parent 5941ee4 commit 30fa935
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 25 deletions.
11 changes: 6 additions & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,25 @@ root = true

# Unix-style newlines with a newline ending every file
[*]
indent_size = 2
indent_style = space
end_of_line = lf
insert_final_newline = true
charset = utf-8
indent_size = 2
indent_style = space
trim_trailing_whitespace = true
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

[justfile]
indent_style = tab
indent_size = 8

Expand Down
2 changes: 1 addition & 1 deletion justfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ test-e2e env="dev":

# will drop the database, run all migrations
seed-fresh env="dev":
NODE_ENV={{env}} npm run orm migration:fresh --seed
NODE_ENV={{env}} npm run orm migration:fresh --seed


# clean all auto generated files and generate initial migration file
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ultimate-nest",
"version": "1.26.0",
"version": "1.28.0",
"description": "NestJS + MikroORM blog example with batteries included",
"author": {
"email": "[email protected]",
Expand Down Expand Up @@ -78,7 +78,7 @@
"@nestjs/platform-socket.io": "^10.2.6",
"@nestjs/schedule": "^3.0.4",
"@nestjs/serve-static": "^4.0.0",
"@nestjs/swagger": "^7.1.12",
"@nestjs/swagger": "^7.1.13",
"@nestjs/terminus": "^10.1.1",
"@nestjs/throttler": "^5.0.0",
"@nestjs/websockets": "^10.2.6",
Expand Down Expand Up @@ -108,7 +108,7 @@
"mime-types": "^2.1.35",
"nestjs-cloudinary": "^2.0.7",
"nestjs-fastjwt": "^0.0.1",
"nestjs-i18n": "^10.3.5",
"nestjs-i18n": "^10.3.6",
"nestjs-minio": "^2.5.1",
"nestjs-pino": "^3.5.0",
"nestjs-throttler-storage-redis": "^0.4.1",
Expand Down Expand Up @@ -147,7 +147,7 @@
"@nestjs/cli": "10.1.18",
"@nestjs/schematics": "10.0.2",
"@nestjs/testing": "10.2.6",
"@rubiin/eslint-config": "^1.8.7",
"@rubiin/eslint-config": "^1.8.8",
"@rubiin/tsconfig": "^1.1.0",
"@sentry/types": "^7.73.0",
"@side/jest-runtime": "^1.1.0",
Expand Down
31 changes: 16 additions & 15 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 30fa935

Please sign in to comment.