From eb3093d03a4c4577a04ce37b381ba42c59230fda Mon Sep 17 00:00:00 2001
From: Lucian Mocanu <alumni@users.noreply.github.com>
Date: Thu, 5 Jun 2025 22:42:27 +0200
Subject: [PATCH] chore: improve linting (fixup) (#11511)

---
 .lintstagedrc.json      | 2 +-
 .vscode/extensions.json | 7 +++++++
 .vscode/settings.json   | 4 ++++
 package-lock.json       | 4 ++--
 4 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 .vscode/extensions.json

diff --git a/.lintstagedrc.json b/.lintstagedrc.json
index 9868bd073..fe71ca02a 100644
--- a/.lintstagedrc.json
+++ b/.lintstagedrc.json
@@ -1,5 +1,5 @@
 {
   "*.ts": ["eslint", "prettier --write"],
   "*/**/*.json": ["prettier --write"],
-  "./*.json": ["sort-package-json", "prettier --write"]
+  "./!(package-lock).json": ["sort-package-json", "prettier --write"]
 }
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 000000000..17fab0c02
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,7 @@
+{
+  "recommendations": [
+    "dbaeumer.vscode-eslint",
+    "editorconfig.editorconfig",
+    "esbenp.prettier-vscode"
+  ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 3a19d2f71..82dc47067 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,8 @@
 {
+  "[json][jsonc][javascript][markdown][typescript][yaml]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
   "editor.formatOnSave": true,
+  "git.branchProtection": ["master"],
   "typescript.tsdk": "node_modules/typescript/lib"
 }
diff --git a/package-lock.json b/package-lock.json
index f31b3a3f7..af624eb5d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2,6 +2,7 @@
   "name": "typeorm",
   "version": "0.3.24",
   "lockfileVersion": 3,
+  "requires": true,
   "packages": {
     "": {
       "name": "typeorm",
@@ -16268,6 +16269,5 @@
         "node": ">=20"
       }
     }
-  },
-  "requires": true
+  }
 }