From 5165e43b7caf5636c17d85843119a69ea7da6bdf Mon Sep 17 00:00:00 2001 From: Iain Sproat <68657+iainsproat@users.noreply.github.com> Date: Tue, 7 Jan 2025 14:31:09 +0000 Subject: [PATCH] Revert "fix(knex): bump knex from 2.4.1 to 2.5.1 to resolve leaking db connections (#3751)" This reverts commit da6dbb94a61e3f63f07c3582e5329ba1ac0aa8f5. --- packages/fileimport-service/package.json | 2 +- packages/monitor-deployment/package.json | 2 +- packages/preview-service/package.json | 2 +- packages/server/package.json | 2 +- packages/shared/package.json | 2 +- packages/webhook-service/package.json | 2 +- yarn.lock | 47 ++++++++++-------------- 7 files changed, 26 insertions(+), 33 deletions(-) diff --git a/packages/fileimport-service/package.json b/packages/fileimport-service/package.json index 7e2dea43ce..88cd403bf6 100644 --- a/packages/fileimport-service/package.json +++ b/packages/fileimport-service/package.json @@ -26,7 +26,7 @@ "@speckle/shared": "workspace:^", "bcrypt": "^5.0.1", "crypto-random-string": "^3.3.1", - "knex": "^2.5.1", + "knex": "^2.4.1", "pg": "^8.7.3", "pino": "^8.7.0", "pino-http": "^8.0.0", diff --git a/packages/monitor-deployment/package.json b/packages/monitor-deployment/package.json index 2389bae03a..ae6fbc60bc 100644 --- a/packages/monitor-deployment/package.json +++ b/packages/monitor-deployment/package.json @@ -35,7 +35,7 @@ "esm-module-alias": "^2.2.0", "express": "^4.19.2", "http-errors": "~1.6.3", - "knex": "^2.5.1", + "knex": "^2.4.1", "lodash": "^4.17.21", "lodash-es": "^4.17.21", "pg": "^8.7.3", diff --git a/packages/preview-service/package.json b/packages/preview-service/package.json index 4ef10ba680..cd475b923d 100644 --- a/packages/preview-service/package.json +++ b/packages/preview-service/package.json @@ -44,7 +44,7 @@ "file-type": "^16.5.4", "http-errors": "~1.6.3", "join-images": "^1.1.3", - "knex": "^2.5.1", + "knex": "^2.4.1", "lodash": "^4.17.21", "lodash-es": "^4.17.21", "node-fetch": "^2.6.1", diff --git a/packages/server/package.json b/packages/server/package.json index 664730862f..4c74a3f6aa 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -86,7 +86,7 @@ "graphql-tag": "^2.12.6", "ioredis": "^5.2.2", "jose": "^5.6.3", - "knex": "^2.5.1", + "knex": "^2.4.1", "libsodium-wrappers": "^0.7.13", "lodash": "^4.17.21", "lru-cache": "^11.0.1", diff --git a/packages/shared/package.json b/packages/shared/package.json index 3bd18ba5c1..ff47d9be97 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -56,7 +56,7 @@ "@typescript-eslint/parser": "^7.12.0", "eslint": "^9.4.0", "eslint-config-prettier": "^9.1.0", - "knex": "^2.5.1", + "knex": "^2.4.1", "mixpanel": "^0.17.0", "pino": "^8.7.0", "pino-http": "^8.0.0", diff --git a/packages/webhook-service/package.json b/packages/webhook-service/package.json index 75c034f27f..2b96938dd6 100644 --- a/packages/webhook-service/package.json +++ b/packages/webhook-service/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@speckle/shared": "workspace:^", - "knex": "^2.5.1", + "knex": "^2.4.1", "node-fetch": "^2.6.1", "pg": "^8.7.3", "pino": "^8.7.0", diff --git a/yarn.lock b/yarn.lock index 002fa82344..1674115f3a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16817,7 +16817,7 @@ __metadata: crypto-random-string: "npm:^3.3.1" eslint: "npm:^9.4.0" eslint-config-prettier: "npm:^9.1.0" - knex: "npm:^2.5.1" + knex: "npm:^2.4.1" nodemon: "npm:^2.0.20" pg: "npm:^8.7.3" pino: "npm:^8.7.0" @@ -17067,7 +17067,7 @@ __metadata: esm-module-alias: "npm:^2.2.0" express: "npm:^4.19.2" http-errors: "npm:~1.6.3" - knex: "npm:^2.5.1" + knex: "npm:^2.4.1" lodash: "npm:^4.17.21" lodash-es: "npm:^4.17.21" nodemon: "npm:^2.0.20" @@ -17181,7 +17181,7 @@ __metadata: http-errors: "npm:~1.6.3" iconv-lite: "npm:^0.6.3" join-images: "npm:^1.1.3" - knex: "npm:^2.5.1" + knex: "npm:^2.4.1" lodash: "npm:^4.17.21" lodash-es: "npm:^4.17.21" node-fetch: "npm:^2.6.1" @@ -17323,7 +17323,7 @@ __metadata: ioredis: "npm:^5.2.2" ioredis-mock: "npm:^8.9.0" jose: "npm:^5.6.3" - knex: "npm:^2.5.1" + knex: "npm:^2.4.1" libsodium-wrappers: "npm:^0.7.13" lodash: "npm:^4.17.21" lru-cache: "npm:^11.0.1" @@ -17411,7 +17411,7 @@ __metadata: "@typescript-eslint/parser": "npm:^7.12.0" eslint: "npm:^9.4.0" eslint-config-prettier: "npm:^9.1.0" - knex: "npm:^2.5.1" + knex: "npm:^2.4.1" lodash: "npm:^4.17.21" lodash-es: "npm:^4.17.21" mixpanel: "npm:^0.17.0" @@ -17626,7 +17626,7 @@ __metadata: cross-env: "npm:^7.0.3" eslint: "npm:^9.4.0" eslint-config-prettier: "npm:^9.1.0" - knex: "npm:^2.5.1" + knex: "npm:^2.4.1" node-fetch: "npm:^2.6.1" pg: "npm:^8.7.3" pino: "npm:^8.7.0" @@ -27186,13 +27186,6 @@ __metadata: languageName: node linkType: hard -"commander@npm:^10.0.0": - version: 10.0.1 - resolution: "commander@npm:10.0.1" - checksum: 10/8799faa84a30da985802e661cc9856adfaee324d4b138413013ef7f087e8d7924b144c30a1f1405475f0909f467665cd9e1ce13270a2f41b141dab0b7a58f3fb - languageName: node - linkType: hard - "commander@npm:^12.0.0": version: 12.0.0 resolution: "commander@npm:12.0.0" @@ -27249,6 +27242,13 @@ __metadata: languageName: node linkType: hard +"commander@npm:^9.1.0": + version: 9.2.0 + resolution: "commander@npm:9.2.0" + checksum: 10/db4855c6cd7694d4117e17ec353c7fcc678695e008e12dd5cd45ebaf3fd15607a476df690bf658c7a20a661743580fb0150c825087d773847a24392891e7b4bc + languageName: node + linkType: hard + "commander@npm:^9.4.1": version: 9.5.0 resolution: "commander@npm:9.5.0" @@ -37453,12 +37453,12 @@ __metadata: languageName: node linkType: hard -"knex@npm:^2.5.1": - version: 2.5.1 - resolution: "knex@npm:2.5.1" +"knex@npm:^2.4.1": + version: 2.4.1 + resolution: "knex@npm:2.4.1" dependencies: colorette: "npm:2.0.19" - commander: "npm:^10.0.0" + commander: "npm:^9.1.0" debug: "npm:4.3.4" escalade: "npm:^3.1.1" esm: "npm:^3.2.25" @@ -37466,7 +37466,7 @@ __metadata: getopts: "npm:2.3.0" interpret: "npm:^2.2.0" lodash: "npm:^4.17.21" - pg-connection-string: "npm:2.6.1" + pg-connection-string: "npm:2.5.0" rechoir: "npm:^0.8.0" resolve-from: "npm:^5.0.0" tarn: "npm:^3.0.2" @@ -37488,7 +37488,7 @@ __metadata: optional: true bin: knex: bin/cli.js - checksum: 10/7ab53dfdc382633d890355c15cb4d6e501560cdbc2b03c77f7fc098bdb55a85dfd37e5e8a7f5f38d351c82d5ab77e5e924376ec60e4a0f746901c387ce09b397 + checksum: 10/debc35b420745af04ffba4eb24c66e62a384193616e343500e32aede74f055ea5188fe5a3df75d131a9c375025224f057b699430a3eb6088800caa278db673ee languageName: node linkType: hard @@ -43007,14 +43007,7 @@ __metadata: languageName: node linkType: hard -"pg-connection-string@npm:2.6.1": - version: 2.6.1 - resolution: "pg-connection-string@npm:2.6.1" - checksum: 10/882344a47e1ecf3a91383e0809bf2ac48facea97fcec0358d6e060e1cbcb8737acde419b4c86f05da4ce4a16634ee50fff1d2bb787d73b52ccbfde697243ad8a - languageName: node - linkType: hard - -"pg-connection-string@npm:^2.5.0": +"pg-connection-string@npm:2.5.0, pg-connection-string@npm:^2.5.0": version: 2.5.0 resolution: "pg-connection-string@npm:2.5.0" checksum: 10/a6f3a068f7c9416a5b33a326811caf0dfaaee045c225b7c628b4c9b4e9a2b25bdd12a21e4c48940e1000ea223a4e608ca122d2ff3dd08c8b1db0fc9f5705133a