From 13e0dde728a806ec282a8510a478d952d8728e02 Mon Sep 17 00:00:00 2001
From: Maksim Eltyshev <meltyshev@gmail.com>
Date: Tue, 22 Oct 2024 21:00:37 +0200
Subject: [PATCH] chore: Bump sails version

---
 server/package-lock.json | 31 +------------------------------
 server/package.json      |  8 +-------
 2 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/server/package-lock.json b/server/package-lock.json
index 0c28b37a..0ae84bfb 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -5,7 +5,6 @@
   "packages": {
     "": {
       "name": "planka-server",
-      "hasInstallScript": true,
       "dependencies": {
         "bcrypt": "^5.1.1",
         "dotenv": "^16.4.5",
@@ -18,7 +17,7 @@
         "nodemailer": "^6.9.15",
         "openid-client": "^5.7.0",
         "rimraf": "^5.0.10",
-        "sails": "^1.5.11",
+        "sails": "^1.5.12",
         "sails-hook-orm": "^4.0.3",
         "sails-hook-sockets": "^3.0.1",
         "sails-postgresql": "^5.0.1",
@@ -755,11 +754,6 @@
         "ms": "2.0.0"
       }
     },
-    "node_modules/@sailshq/router/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
     "node_modules/@sailshq/router/node_modules/parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -1651,11 +1645,6 @@
         "ms": "2.0.0"
       }
     },
-    "node_modules/compression/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
     "node_modules/compression/node_modules/safe-buffer": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
@@ -2686,11 +2675,6 @@
         "ms": "2.0.0"
       }
     },
-    "node_modules/express-session/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
     "node_modules/express-session/node_modules/parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -2765,11 +2749,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/express/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
     "node_modules/express/node_modules/parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -6490,14 +6469,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/send/node_modules/toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
     "node_modules/serialize-javascript": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
diff --git a/server/package.json b/server/package.json
index 3b7b4c27..0b22212c 100644
--- a/server/package.json
+++ b/server/package.json
@@ -8,7 +8,6 @@
     "db:migrate": "knex migrate:latest --cwd db",
     "db:seed": "knex seed:run --cwd db",
     "lint": "eslint . --max-warnings=0 --report-unused-disable-directives && echo '✔  Your .js files look good.'",
-    "preinstall": "npx npm-force-resolutions",
     "start": "nodemon",
     "start:prod": "node app.js --prod",
     "test": "mocha test/lifecycle.test.js test/integration/**/*.test.js test/utils/**/*.test.js"
@@ -39,7 +38,7 @@
     "nodemailer": "^6.9.15",
     "openid-client": "^5.7.0",
     "rimraf": "^5.0.10",
-    "sails": "^1.5.11",
+    "sails": "^1.5.12",
     "sails-hook-orm": "^4.0.3",
     "sails-hook-sockets": "^3.0.1",
     "sails-postgresql": "^5.0.1",
@@ -59,11 +58,6 @@
     "mocha": "^10.7.3",
     "nodemon": "^3.1.4"
   },
-  "resolutions": {
-    "body-parser": "1.20.3",
-    "express": "4.21.0",
-    "send": "0.19.0"
-  },
   "engines": {
     "node": ">=18"
   }