diff --git a/integration-tests/api/package.json b/integration-tests/api/package.json index b2783b7cd0..3234b9c25d 100644 --- a/integration-tests/api/package.json +++ b/integration-tests/api/package.json @@ -28,7 +28,7 @@ "@medusajs/utils": "workspace:^", "@medusajs/workflow-engine-inmemory": "workspace:*", "faker": "^5.5.3", - "pg": "^8.12.0", + "pg": "^8.11.3", "typeorm": "^0.3.16" }, "devDependencies": { diff --git a/integration-tests/http/package.json b/integration-tests/http/package.json index b3c156dcd5..d804112519 100644 --- a/integration-tests/http/package.json +++ b/integration-tests/http/package.json @@ -32,7 +32,7 @@ "@medusajs/workflow-engine-inmemory": "workspace:*", "faker": "^5.5.3", "medusa-test-utils": "workspace:*", - "pg": "^8.12.0" + "pg": "^8.11.3" }, "devDependencies": { "@medusajs/types": "workspace:^", diff --git a/integration-tests/modules/package.json b/integration-tests/modules/package.json index a89bf7bfbd..abe301eb4e 100644 --- a/integration-tests/modules/package.json +++ b/integration-tests/modules/package.json @@ -32,7 +32,7 @@ "@medusajs/workflow-engine-inmemory": "workspace:*", "faker": "^5.5.3", "medusa-test-utils": "workspace:*", - "pg": "^8.12.0", + "pg": "^8.11.3", "typeorm": "^0.3.16" }, "devDependencies": { diff --git a/package.json b/package.json index 480cde320a..0a8a66ed3f 100644 --- a/package.json +++ b/package.json @@ -83,6 +83,6 @@ "resolutions": { "@redocly/cli/react": "^17.0.1", "@redocly/cli/react-dom": "^17.0.1", - "pg": "8.12.0" + "pg": "8.11.3" } } diff --git a/packages/cli/create-medusa-app/package.json b/packages/cli/create-medusa-app/package.json index 297da73c23..cccf473a5e 100644 --- a/packages/cli/create-medusa-app/package.json +++ b/packages/cli/create-medusa-app/package.json @@ -25,7 +25,7 @@ "node-fetch": "^3.3.1", "open": "^9.1.0", "ora": "^6.3.0", - "pg": "^8.12.0", + "pg": "^8.11.3", "slugify": "^1.6.6", "uuid": "^9.0.0", "validator": "^13.9.0", diff --git a/packages/cli/medusa-cli/package.json b/packages/cli/medusa-cli/package.json index 327a7cee44..ceb26ae027 100644 --- a/packages/cli/medusa-cli/package.json +++ b/packages/cli/medusa-cli/package.json @@ -56,7 +56,7 @@ "medusa-telemetry": "^0.0.17", "open": "^8.0.6", "ora": "^5.4.1", - "pg": "^8.12.0", + "pg": "^8.11.3", "pg-god": "^1.0.12", "prompts": "^2.4.2", "regenerator-runtime": "^0.13.11", diff --git a/packages/core/modules-sdk/package.json b/packages/core/modules-sdk/package.json index 781fc4d324..a3f767f699 100644 --- a/packages/core/modules-sdk/package.json +++ b/packages/core/modules-sdk/package.json @@ -35,7 +35,6 @@ "awilix": "^8.0.0", "graphql": "^16.6.0", "knex": "2.4.2", - "pg": "^8.12.0", "resolve-cwd": "^3.0.0" }, "scripts": { diff --git a/packages/core/utils/src/modules-sdk/create-pg-connection.ts b/packages/core/utils/src/modules-sdk/create-pg-connection.ts index 40d75bdb55..09bb3cf9dc 100644 --- a/packages/core/utils/src/modules-sdk/create-pg-connection.ts +++ b/packages/core/utils/src/modules-sdk/create-pg-connection.ts @@ -1,6 +1,5 @@ -import { knex } from "@mikro-orm/knex" import { ModuleServiceInitializeOptions } from "@medusajs/types" -import { isDefined } from "../common" +import { knex } from "@mikro-orm/knex" type Options = ModuleServiceInitializeOptions["database"] diff --git a/packages/medusa/package.json b/packages/medusa/package.json index b4a041329f..adc1d02bf4 100644 --- a/packages/medusa/package.json +++ b/packages/medusa/package.json @@ -80,7 +80,6 @@ "passport-custom": "^1.1.1", "passport-jwt": "^4.0.1", "passport-local": "^1.0.0", - "pg": "^8.12.0", "qs": "^6.11.2", "reflect-metadata": "^0.1.13", "regenerator-runtime": "^0.13.11", diff --git a/yarn.lock b/yarn.lock index 7cd1c9ccc5..2e43741ae7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4803,7 +4803,7 @@ __metadata: medusa-telemetry: ^0.0.17 open: ^8.0.6 ora: ^5.4.1 - pg: ^8.12.0 + pg: ^8.11.3 pg-god: ^1.0.12 prompts: ^2.4.2 regenerator-runtime: ^0.13.11 @@ -4900,7 +4900,6 @@ __metadata: passport-custom: ^1.1.1 passport-jwt: ^4.0.1 passport-local: ^1.0.0 - pg: ^8.12.0 qs: ^6.11.2 reflect-metadata: ^0.1.13 regenerator-runtime: ^0.13.11 @@ -4928,7 +4927,6 @@ __metadata: graphql: ^16.6.0 jest: ^29.7.0 knex: 2.4.2 - pg: ^8.12.0 resolve-cwd: ^3.0.0 rimraf: ^5.0.1 typescript: ^5.1.6 @@ -14202,6 +14200,13 @@ __metadata: languageName: node linkType: hard +"buffer-writer@npm:2.0.0": + version: 2.0.0 + resolution: "buffer-writer@npm:2.0.0" + checksum: c91b2ab09a200cf0862237e5a4dbd5077003b42d26d4f0c596ec7149f82ef83e0751d670bcdf379ed988d1a08c0fac7759a8cb928cf1a4710a1988a7618b1190 + languageName: node + linkType: hard + "buffer@npm:^5.5.0, buffer@npm:^5.6.0": version: 5.7.1 resolution: "buffer@npm:5.7.1" @@ -15490,7 +15495,7 @@ __metadata: node-fetch: ^3.3.1 open: ^9.1.0 ora: ^6.3.0 - pg: ^8.12.0 + pg: ^8.11.3 prettier: ^2.8.8 slugify: ^1.6.6 ts-node: ^10.9.1 @@ -19799,7 +19804,7 @@ __metadata: form-data: ^4.0.0 jest: ^29.7.0 jest-environment-node: ^29.7.0 - pg: ^8.12.0 + pg: ^8.11.3 typeorm: ^0.3.16 typescript: ^5.3.3 languageName: unknown @@ -19836,7 +19841,7 @@ __metadata: jest: ^29.7.0 jest-environment-node: ^29.7.0 medusa-test-utils: "workspace:*" - pg: ^8.12.0 + pg: ^8.11.3 typescript: ^5.3.3 languageName: unknown linkType: soft @@ -19872,7 +19877,7 @@ __metadata: jest: ^29.7.0 jest-environment-node: ^29.7.0 medusa-test-utils: "workspace:*" - pg: ^8.12.0 + pg: ^8.11.3 typeorm: ^0.3.16 typescript: ^5.3.3 languageName: unknown @@ -24346,6 +24351,13 @@ __metadata: languageName: node linkType: hard +"packet-reader@npm:1.0.0": + version: 1.0.0 + resolution: "packet-reader@npm:1.0.0" + checksum: c86c3321bb07e0f03cc2db59f7701184e0bbfcb914f1fdc963993b03262486deb402292adcef39b64e3530ea66b3b2e2163d6da7b3792a730bdd1c6df3175aaa + languageName: node + linkType: hard + "pako@npm:~0.2.0": version: 0.2.9 resolution: "pako@npm:0.2.9" @@ -24654,7 +24666,7 @@ __metadata: languageName: node linkType: hard -"pg-connection-string@npm:^2.6.4": +"pg-connection-string@npm:^2.6.2": version: 2.6.4 resolution: "pg-connection-string@npm:2.6.4" checksum: 0d0b617df0fc6507bf6a94bdcd56c7a305788a1402d69bff9773350947c8f525d6d8136128065370749a3325e99658ae40fbdcce620fb8e60126181f0591a6a6 @@ -24691,7 +24703,7 @@ __metadata: languageName: node linkType: hard -"pg-pool@npm:^3.6.2": +"pg-pool@npm:^3.6.1": version: 3.6.2 resolution: "pg-pool@npm:3.6.2" peerDependencies: @@ -24700,7 +24712,7 @@ __metadata: languageName: node linkType: hard -"pg-protocol@npm:*, pg-protocol@npm:^1.6.1": +"pg-protocol@npm:*, pg-protocol@npm:^1.6.0": version: 1.6.1 resolution: "pg-protocol@npm:1.6.1" checksum: 7eadef4010ac0a3925c460be7332ca4098a5c6d5181725a62193fcfa800000ae6632d98d814f3989b42cf5fdc3b45e34c714a1959d29174e81e30730e140ae5f @@ -24735,14 +24747,16 @@ __metadata: languageName: node linkType: hard -"pg@npm:8.12.0": - version: 8.12.0 - resolution: "pg@npm:8.12.0" +"pg@npm:8.11.3": + version: 8.11.3 + resolution: "pg@npm:8.11.3" dependencies: + buffer-writer: 2.0.0 + packet-reader: 1.0.0 pg-cloudflare: ^1.1.1 - pg-connection-string: ^2.6.4 - pg-pool: ^3.6.2 - pg-protocol: ^1.6.1 + pg-connection-string: ^2.6.2 + pg-pool: ^3.6.1 + pg-protocol: ^1.6.0 pg-types: ^2.1.0 pgpass: 1.x peerDependencies: @@ -24753,7 +24767,7 @@ __metadata: peerDependenciesMeta: pg-native: optional: true - checksum: 973e49b5e7327c42fc62806efa8c824159ab7a0b676cefe6eeb51a59b6e226587911ec27697f36c18d69e58a7f4f0b76d0829364087194d13ed431ab7c9c417a + checksum: 07e6967fc8bd5d72bab9be6620626e8e3ab59128ebf56bf0de83d67f10801a19221d88b3317e90b93339ba48d0498b39967b782ae39686aabda6bc647bceb438 languageName: node linkType: hard