From a095245d71f6b330a28dba7514356e12d12317da Mon Sep 17 00:00:00 2001 From: Adrien de Peretti Date: Mon, 8 Sep 2025 21:10:44 +0200 Subject: [PATCH] chore(): Upgrade mikro orm (#13390) * chore(): Upgrade mikro orm * handle 'null' value for big number props * 6.5.2 * remove only * fix pricing module rule value * switch select in strategy for balances * revert to select in strategy for order module * fix defining DML ManyToOne * fix define relationship * test fix * more fixes * change order strategy to balanced * change order strategy to balanced * prevent unnecessary manager fork * revert generated www changes * remove unnecessary changes * Create real-cobras-deny.md * address feedback --------- Co-authored-by: Oli Juhl <59018053+olivermrbl@users.noreply.github.com> --- .changeset/real-cobras-deny.md | 23 + package.json | 2 +- packages/cli/create-medusa-app/package.json | 2 +- packages/cli/medusa-cli/package.json | 22 +- packages/core/core-flows/package.json | 10 +- packages/core/framework/package.json | 22 +- packages/core/modules-sdk/package.json | 20 +- .../src/remote-query/to-remote-query.ts | 2 +- packages/core/orchestration/package.json | 20 +- packages/core/types/src/dal/index.ts | 2 +- .../remote-query-object-from-string.ts | 4 +- packages/core/utils/package.json | 20 +- .../src/dal/mikro-orm/big-number-field.ts | 51 +- .../src/dal/mikro-orm/mikro-orm-repository.ts | 12 +- .../src/dml/__tests__/entity-builder.spec.ts | 37 +- .../dml/helpers/create-mikro-orm-entity.ts | 16 +- .../entity-builder/define-relationship.ts | 3 + .../__tests__/medusa-internal-service.ts | 2 + .../__tests__/medusa-service.spec.ts | 1 + .../modules-sdk/decorators/inject-manager.ts | 3 +- packages/core/workflows-sdk/package.json | 20 +- packages/medusa-test-utils/package.json | 12 +- packages/medusa/package.json | 8 +- packages/modules/api-key/package.json | 8 +- packages/modules/auth/package.json | 14 +- packages/modules/cart/package.json | 14 +- packages/modules/currency/package.json | 14 +- packages/modules/customer/package.json | 14 +- packages/modules/file/package.json | 8 +- packages/modules/fulfillment/package.json | 14 +- packages/modules/index/package.json | 18 +- packages/modules/inventory/package.json | 14 +- packages/modules/link-modules/package.json | 12 +- packages/modules/locking/package.json | 14 +- packages/modules/notification/package.json | 14 +- packages/modules/order/package.json | 16 +- .../order/src/utils/base-repository-find.ts | 8 +- packages/modules/payment/package.json | 14 +- .../payment/src/services/payment-module.ts | 2 +- packages/modules/pricing/package.json | 14 +- .../pricing/src/services/pricing-module.ts | 3 +- .../product-module-service/products.spec.ts | 7 +- packages/modules/product/package.json | 14 +- .../src/repositories/product-category.ts | 2 +- .../src/services/product-module-service.ts | 15 + .../__fixtures__/campaigns/index.ts | 2 +- packages/modules/promotion/package.json | 14 +- .../src/services/promotion-module.ts | 101 ++- .../providers/locking-postgres/package.json | 8 +- packages/modules/region/package.json | 14 +- packages/modules/sales-channel/package.json | 14 +- packages/modules/settings/package.json | 14 +- packages/modules/stock-location/package.json | 14 +- packages/modules/store/package.json | 14 +- packages/modules/tax/package.json | 14 +- packages/modules/user/package.json | 14 +- .../workflow-engine-inmemory/package.json | 14 +- .../workflow-engine-redis/package.json | 14 +- packages/plugins/draft-order/package.json | 24 +- yarn.lock | 733 +++++++++--------- 60 files changed, 863 insertions(+), 712 deletions(-) create mode 100644 .changeset/real-cobras-deny.md diff --git a/.changeset/real-cobras-deny.md b/.changeset/real-cobras-deny.md new file mode 100644 index 0000000000..aba03cfeca --- /dev/null +++ b/.changeset/real-cobras-deny.md @@ -0,0 +1,23 @@ +--- +"@medusajs/medusa": patch +"@medusajs/test-utils": patch +"@medusajs/api-key": patch +"@medusajs/auth": patch +"@medusajs/cart": patch +"@medusajs/currency": patch +"@medusajs/customer": patch +"@medusajs/file": patch +"@medusajs/fulfillment": patch +"@medusajs/index": patch +"@medusajs/core-flows": patch +"@medusajs/framework": patch +"@medusajs/modules-sdk": patch +"@medusajs/orchestration": patch +"@medusajs/types": patch +"@medusajs/utils": patch +"@medusajs/workflows-sdk": patch +"create-medusa-app": patch +"@medusajs/cli": patch +--- + +chore(): Upgrade mikro orm 6.5.2 diff --git a/package.json b/package.json index 7eacae9a9b..a6e65bffbd 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "resolutions": { "@redocly/cli/react": "^17.0.1", "@redocly/cli/react-dom": "^17.0.1", - "pg": "8.11.3", + "pg": "8.16.3", "@changesets/assemble-release-plan@^6.0.0": "patch:@changesets/assemble-release-plan@npm:^6.0.0#.yarn/patches/changesets.patch" } } diff --git a/packages/cli/create-medusa-app/package.json b/packages/cli/create-medusa-app/package.json index 52baa32e31..29acf97738 100644 --- a/packages/cli/create-medusa-app/package.json +++ b/packages/cli/create-medusa-app/package.json @@ -23,7 +23,7 @@ "node-fetch": "^3.3.1", "open": "^9.1.0", "ora": "^6.3.0", - "pg": "^8.11.3", + "pg": "^8.16.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 14a08465d5..de51177eaa 100644 --- a/packages/cli/medusa-cli/package.json +++ b/packages/cli/medusa-cli/package.json @@ -32,16 +32,16 @@ "author": "Sebastian Rindom", "license": "MIT", "devDependencies": { - "@mikro-orm/core": "6.4.3", - "@mikro-orm/knex": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/knex": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "@types/yargs": "^15.0.15", "awilix": "^8.0.1", "jest": "^29.7.0", - "pg": "^8.13.0", + "pg": "^8.16.3", "rimraf": "^5.0.1", "typescript": "^5.6.2" }, @@ -62,7 +62,7 @@ "is-valid-path": "^0.1.1", "meant": "^1.0.3", "ora": "^5.4.1", - "pg": "^8.11.3", + "pg": "^8.16.3", "pg-god": "^1.0.12", "prompts": "^2.4.2", "resolve-cwd": "^3.0.0", @@ -72,12 +72,12 @@ "yargs": "^15.3.1" }, "peerDependencies": { - "@mikro-orm/core": "6.4.3", - "@mikro-orm/knex": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/knex": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1", - "pg": "^8.13.0" + "pg": "^8.16.3" }, "gitHead": "81a7ff73d012fda722f6e9ef0bd9ba0232d37808" } diff --git a/packages/core/core-flows/package.json b/packages/core/core-flows/package.json index 22a6d8b60e..e9b4bcd23a 100644 --- a/packages/core/core-flows/package.json +++ b/packages/core/core-flows/package.json @@ -27,16 +27,16 @@ "license": "MIT", "devDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/knex": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/knex": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "awilix": "^8.0.1", "expect-type": "^0.20.0", "jest": "^29.7.0", - "pg": "^8.13.0", + "pg": "^8.16.3", "rimraf": "^5.0.1", "typescript": "^5.6.2" }, diff --git a/packages/core/framework/package.json b/packages/core/framework/package.json index fa7de6f00a..58b9d755c5 100644 --- a/packages/core/framework/package.json +++ b/packages/core/framework/package.json @@ -56,10 +56,10 @@ "devDependencies": { "@aws-sdk/client-dynamodb": "^3.218.0", "@medusajs/cli": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/knex": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/knex": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "@types/cors": "^2.8.17", @@ -68,7 +68,7 @@ "connect-dynamodb": "^3.0.5", "ioredis": "^5.4.1", "jest": "^29.7.0", - "pg": "^8.13.0", + "pg": "^8.16.3", "rimraf": "^3.0.2", "supertest": "^4.0.2", "typescript": "^5.6.2", @@ -103,15 +103,15 @@ "peerDependencies": { "@aws-sdk/client-dynamodb": "^3.218.0", "@medusajs/cli": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/knex": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/knex": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1", "connect-dynamodb": "^3.0.5", "ioredis": "^5.4.1", - "pg": "^8.13.0", + "pg": "^8.16.3", "vite": "^5.4.14" }, "peerDependenciesMeta": { diff --git a/packages/core/modules-sdk/package.json b/packages/core/modules-sdk/package.json index 2b1e8ff9c2..74f08bc5a8 100644 --- a/packages/core/modules-sdk/package.json +++ b/packages/core/modules-sdk/package.json @@ -31,16 +31,16 @@ "watch": "tsc --build --watch" }, "devDependencies": { - "@mikro-orm/core": "6.4.3", - "@mikro-orm/knex": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/knex": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "awilix": "^8.0.1", "cross-env": "^5.2.1", "jest": "^29.7.0", - "pg": "^8.13.0", + "pg": "^8.16.3", "rimraf": "^5.0.1", "typescript": "^5.6.2" }, @@ -50,12 +50,12 @@ "@medusajs/utils": "2.10.1" }, "peerDependencies": { - "@mikro-orm/core": "6.4.3", - "@mikro-orm/knex": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/knex": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1", "express": "^4.21.0", - "pg": "^8.13.0" + "pg": "^8.16.3" } } diff --git a/packages/core/modules-sdk/src/remote-query/to-remote-query.ts b/packages/core/modules-sdk/src/remote-query/to-remote-query.ts index 7ce9108e66..4877ce07f4 100644 --- a/packages/core/modules-sdk/src/remote-query/to-remote-query.ts +++ b/packages/core/modules-sdk/src/remote-query/to-remote-query.ts @@ -36,7 +36,7 @@ export function toRemoteQuery( pagination?: Partial["pagination"]> context?: Record withDeleted?: boolean - strategy?: "joined" | "select-in" + strategy?: "joined" | "select-in" | "balanced" }, entitiesMap: Map ): RemoteQueryGraph { diff --git a/packages/core/orchestration/package.json b/packages/core/orchestration/package.json index 8f2c0a8fb0..9ae20c2c2f 100644 --- a/packages/core/orchestration/package.json +++ b/packages/core/orchestration/package.json @@ -26,15 +26,15 @@ "author": "Medusa", "license": "MIT", "devDependencies": { - "@mikro-orm/core": "6.4.3", - "@mikro-orm/knex": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/knex": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "awilix": "^8.0.1", "jest": "^29.7.0", - "pg": "^8.13.0", + "pg": "^8.16.3", "rimraf": "^5.0.1", "typescript": "^5.6.2" }, @@ -44,13 +44,13 @@ "ulid": "^2.3.0" }, "peerDependencies": { - "@mikro-orm/core": "6.4.3", - "@mikro-orm/knex": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/knex": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1", "express": "^4.21.0", - "pg": "^8.13.0" + "pg": "^8.16.3" }, "scripts": { "build": "rimraf dist && tsc --build", diff --git a/packages/core/types/src/dal/index.ts b/packages/core/types/src/dal/index.ts index ab99c2b130..3f1878d595 100644 --- a/packages/core/types/src/dal/index.ts +++ b/packages/core/types/src/dal/index.ts @@ -55,7 +55,7 @@ export interface OptionsQuery { /** * Load strategy (e.g for mikro orm it accept select-in or joined) */ - strategy?: "select-in" | "joined" | (string & {}) + strategy?: "select-in" | "joined" | "balanced" | (string & {}) } /** diff --git a/packages/core/types/src/modules-sdk/remote-query-object-from-string.ts b/packages/core/types/src/modules-sdk/remote-query-object-from-string.ts index 4263a5d664..2c5d9f5a28 100644 --- a/packages/core/types/src/modules-sdk/remote-query-object-from-string.ts +++ b/packages/core/types/src/modules-sdk/remote-query-object-from-string.ts @@ -74,7 +74,7 @@ export type RemoteQueryInput = /** * Strategy will be send to the entry module called method */ - strategy?: "joined" | "select-in" + strategy?: "joined" | "select-in" | "balanced" } : { /** @@ -119,7 +119,7 @@ export type RemoteQueryInput = /** * Strategy will be send to the entry module called method */ - strategy?: "joined" | "select-in" + strategy?: "joined" | "select-in" | "balanced" } export type RemoteQueryGraph = { diff --git a/packages/core/utils/package.json b/packages/core/utils/package.json index f9a6532ce9..6a0b659134 100644 --- a/packages/core/utils/package.json +++ b/packages/core/utils/package.json @@ -26,10 +26,10 @@ "author": "Medusa", "license": "MIT", "devDependencies": { - "@mikro-orm/core": "6.4.3", - "@mikro-orm/knex": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/knex": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "@types/express": "^4.17.21", @@ -37,7 +37,7 @@ "expect-type": "^0.20.0", "express": "^4.21.0", "jest": "^29.7.0", - "pg": "^8.13.0", + "pg": "^8.16.3", "pg-god": "^1.0.12", "rimraf": "^5.0.1", "typescript": "^5.6.2" @@ -60,13 +60,13 @@ "zod": "3.25.76" }, "peerDependencies": { - "@mikro-orm/core": "6.4.3", - "@mikro-orm/knex": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/knex": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1", "express": "^4.21.0", - "pg": "^8.13.0" + "pg": "^8.16.3" }, "scripts": { "build": "rimraf dist && tsc --build", diff --git a/packages/core/utils/src/dal/mikro-orm/big-number-field.ts b/packages/core/utils/src/dal/mikro-orm/big-number-field.ts index 70e534c339..5ec2e68c01 100644 --- a/packages/core/utils/src/dal/mikro-orm/big-number-field.ts +++ b/packages/core/utils/src/dal/mikro-orm/big-number-field.ts @@ -1,6 +1,6 @@ import { BigNumberInput } from "@medusajs/types" -import { Property } from "@mikro-orm/core" -import { isDefined, isPresent, trimZeros } from "../../common" +import { EntityProperty, Platform, Property, Type } from "@mikro-orm/core" +import { isDefined, isObject, isPresent, trimZeros } from "../../common" import { BigNumber } from "../../totals/big-number" export function MikroOrmBigNumberProperty( @@ -24,6 +24,11 @@ export function MikroOrmBigNumberProperty( return value }, set(value: BigNumberInput) { + // convert 'null' to null + if (value === "null") { + value = null as unknown as BigNumberInput + } + if (options?.nullable && !isPresent(value)) { this.__helper.__data[columnName] = null this.__helper.__data[rawColumnName] = null @@ -89,7 +94,7 @@ export function MikroOrmBigNumberProperty( }) Property({ - type: "any", + type: BigNumberNumeric, columnType: "numeric", trackChanges: false, runtimeType: "any", @@ -97,3 +102,43 @@ export function MikroOrmBigNumberProperty( })(target, columnName) } } + +class BigNumberNumeric extends Type { + constructor(public mode?: "number" | "string") { + super() + } + + override convertToJSValue(value: string): number | string { + if ((this.mode ?? this.prop?.runtimeType) === "number") { + return +value + } + + if (isObject(value)) { + return value // Special case for BigNumberRawValue because the setter will manage the dispatch automatically at a later stage + } + + return String(value) + } + + override compareValues(a: string, b: string): boolean { + return this.format(a) === this.format(b) + } + + private format(val: string | number) { + /* istanbul ignore next */ + if (this.prop?.scale == null) { + return +val + } + + const base = Math.pow(10, this.prop.scale) + return Math.round((+val + Number.EPSILON) * base) / base + } + + override getColumnType(prop: EntityProperty, platform: Platform) { + return platform.getDecimalTypeDeclarationSQL(prop) + } + + override compareAsType(): string { + return this.mode ?? this.prop?.runtimeType ?? "string" + } +} diff --git a/packages/core/utils/src/dal/mikro-orm/mikro-orm-repository.ts b/packages/core/utils/src/dal/mikro-orm/mikro-orm-repository.ts index 63e30b14e0..67b8ca6bc5 100644 --- a/packages/core/utils/src/dal/mikro-orm/mikro-orm-repository.ts +++ b/packages/core/utils/src/dal/mikro-orm/mikro-orm-repository.ts @@ -64,11 +64,9 @@ export class MikroOrmBase { transaction?: TManager } = {} ): Promise { - const freshManager = this.getFreshManager - ? this.getFreshManager() - : this.manager_ + this.manager_.global = true // this prevent mikro orm from synchronising the transaction manager entity map back to the manager. Also, it will save us from always forking the manager for each transaction while the transacation manager will fork it again for transaction purpose - return await transactionWrapper(freshManager, task, options).catch( + return await transactionWrapper(this.manager_, task, options).catch( dbErrorMapper ) } @@ -467,11 +465,7 @@ export function mikroOrmBaseRepositoryFactory( if (!("strategy" in findOptions_.options)) { if (findOptions_.options.limit != null || findOptions_.options.offset) { Object.assign(findOptions_.options, { - strategy: LoadStrategy.SELECT_IN, - }) - } else { - Object.assign(findOptions_.options, { - strategy: LoadStrategy.JOINED, + strategy: LoadStrategy.BALANCED, }) } } diff --git a/packages/core/utils/src/dml/__tests__/entity-builder.spec.ts b/packages/core/utils/src/dml/__tests__/entity-builder.spec.ts index 305e2cecbf..0c964ca964 100644 --- a/packages/core/utils/src/dml/__tests__/entity-builder.spec.ts +++ b/packages/core/utils/src/dml/__tests__/entity-builder.spec.ts @@ -162,7 +162,7 @@ describe("Entity builder", () => { kind: "scalar", setter: true, trackChanges: false, - type: "any", + type: expect.any(Function), runtimeType: "any", }, raw_spend_limit: { @@ -306,7 +306,7 @@ describe("Entity builder", () => { kind: "scalar", setter: true, trackChanges: false, - type: "any", + type: expect.any(Function), runtimeType: "any", }, raw_spend_limit: { @@ -441,7 +441,7 @@ describe("Entity builder", () => { kind: "scalar", setter: true, trackChanges: false, - type: "any", + type: expect.any(Function), runtimeType: "any", }, raw_spend_limit: { @@ -555,7 +555,7 @@ describe("Entity builder", () => { kind: "scalar", setter: true, trackChanges: false, - type: "any", + type: expect.any(Function), runtimeType: "any", }, raw_spend_limit: { @@ -701,7 +701,7 @@ describe("Entity builder", () => { kind: "scalar", setter: true, trackChanges: false, - type: "any", + type: expect.any(Function), runtimeType: "any", }, raw_spend_limit: { @@ -858,7 +858,7 @@ describe("Entity builder", () => { kind: "scalar", setter: true, trackChanges: false, - type: "any", + type: expect.any(Function), runtimeType: "any", }, created_at: { @@ -3916,6 +3916,7 @@ describe("Entity builder", () => { type: "string", }, group: { + defaultRaw: "", entity: "Group", fieldName: "group_id", name: "group", @@ -4536,6 +4537,7 @@ describe("Entity builder", () => { setter: false, }, user: { + defaultRaw: "", entity: "User", fieldName: "user_id", name: "user", @@ -5147,6 +5149,7 @@ describe("Entity builder", () => { setter: false, }, user: { + defaultRaw: "", name: "user", kind: "m:1", entity: "User", @@ -5336,6 +5339,7 @@ describe("Entity builder", () => { setter: false, }, user: { + defaultRaw: "", name: "user", kind: "m:1", fieldName: "user_id", @@ -5884,6 +5888,7 @@ describe("Entity builder", () => { setter: false, }, parent: { + defaultRaw: "", name: "parent", fieldName: "parent_id", kind: "m:1", @@ -6135,6 +6140,7 @@ describe("Entity builder", () => { setter: false, }, teams: { + defaultRaw: "", kind: "m:n", name: "teams", entity: "Team", @@ -6204,6 +6210,7 @@ describe("Entity builder", () => { setter: false, }, users: { + defaultRaw: "", kind: "m:n", name: "users", inversedBy: "teams", @@ -6316,6 +6323,7 @@ describe("Entity builder", () => { setter: false, }, teams: { + defaultRaw: "", kind: "m:n", name: "teams", entity: "Team", @@ -6385,6 +6393,7 @@ describe("Entity builder", () => { setter: false, }, users: { + defaultRaw: "", kind: "m:n", name: "users", entity: "User", @@ -6611,6 +6620,7 @@ describe("Entity builder", () => { setter: false, }, teams: { + defaultRaw: "", kind: "m:n", name: "teams", entity: "Team", @@ -6680,6 +6690,7 @@ describe("Entity builder", () => { setter: false, }, users: { + defaultRaw: "", kind: "m:n", name: "users", entity: "User", @@ -6792,6 +6803,7 @@ describe("Entity builder", () => { setter: false, }, teams: { + defaultRaw: "", kind: "m:n", name: "teams", entity: "Team", @@ -6861,6 +6873,7 @@ describe("Entity builder", () => { setter: false, }, users: { + defaultRaw: "", kind: "m:n", name: "users", entity: "User", @@ -6991,6 +7004,7 @@ describe("Entity builder", () => { setter: false, }, teams: { + defaultRaw: "", kind: "m:n", name: "teams", entity: "Team", @@ -6999,6 +7013,7 @@ describe("Entity builder", () => { mappedBy: "users", }, activeTeams: { + defaultRaw: "", kind: "m:n", name: "activeTeams", entity: "Team", @@ -7068,6 +7083,7 @@ describe("Entity builder", () => { setter: false, }, users: { + defaultRaw: "", kind: "m:n", name: "users", entity: "User", @@ -7076,6 +7092,7 @@ describe("Entity builder", () => { inversedBy: "teams", }, activeTeamsUsers: { + defaultRaw: "", kind: "m:n", name: "activeTeamsUsers", entity: "User", @@ -7191,6 +7208,7 @@ describe("Entity builder", () => { setter: false, }, teams: { + defaultRaw: "", kind: "m:n", name: "teams", entity: "Team", @@ -7261,6 +7279,7 @@ describe("Entity builder", () => { setter: false, }, users: { + defaultRaw: "", kind: "m:n", name: "users", entity: "User", @@ -7349,6 +7368,7 @@ describe("Entity builder", () => { setter: false, }, teams: { + defaultRaw: "", kind: "m:n", name: "teams", entity: "TeamSquad", @@ -7418,6 +7438,7 @@ describe("Entity builder", () => { setter: false, }, users: { + defaultRaw: "", kind: "m:n", name: "users", entity: "RandomUser", @@ -7533,6 +7554,7 @@ describe("Entity builder", () => { setter: false, }, teams: { + defaultRaw: "", kind: "m:n", name: "teams", entity: "Team", @@ -7602,6 +7624,7 @@ describe("Entity builder", () => { setter: false, }, users: { + defaultRaw: "", kind: "m:n", name: "users", owner: false, @@ -7811,6 +7834,7 @@ describe("Entity builder", () => { setter: false, }, users: { + defaultRaw: "", kind: "m:n", name: "users", entity: "User", @@ -7880,6 +7904,7 @@ describe("Entity builder", () => { setter: false, }, teams: { + defaultRaw: "", kind: "m:n", name: "teams", entity: "Team", diff --git a/packages/core/utils/src/dml/helpers/create-mikro-orm-entity.ts b/packages/core/utils/src/dml/helpers/create-mikro-orm-entity.ts index d5ed8f85d9..139c371d5f 100644 --- a/packages/core/utils/src/dml/helpers/create-mikro-orm-entity.ts +++ b/packages/core/utils/src/dml/helpers/create-mikro-orm-entity.ts @@ -6,7 +6,7 @@ import type { Infer, PropertyType, } from "@medusajs/types" -import { Entity, Filter } from "@mikro-orm/core" +import { Entity, Filter, MetadataStorage } from "@mikro-orm/core" import { mikroOrmFreeTextSearchFilterOptionsFactory, @@ -116,12 +116,16 @@ function createMikrORMEntity() { Filter(mikroOrmFreeTextSearchFilterOptionsFactory(modelName))( MikroORMEntity ) - const RegisteredEntity = Entity({ tableName })( - Filter(mikroOrmSoftDeletableFilterOptions)(MikroORMEntity) - ) as Infer - ENTITIES[modelName] = RegisteredEntity - return RegisteredEntity + Entity({ tableName })( + Filter(mikroOrmSoftDeletableFilterOptions)(MikroORMEntity) + ) as any + + const entityMetadata = + MetadataStorage.getMetadataFromDecorator(MikroORMEntity) + + ENTITIES[modelName] = entityMetadata.class as Constructor + return entityMetadata.class as Infer } /** diff --git a/packages/core/utils/src/dml/helpers/entity-builder/define-relationship.ts b/packages/core/utils/src/dml/helpers/entity-builder/define-relationship.ts index 1ff04a0810..e2968f32fd 100644 --- a/packages/core/utils/src/dml/helpers/entity-builder/define-relationship.ts +++ b/packages/core/utils/src/dml/helpers/entity-builder/define-relationship.ts @@ -294,6 +294,7 @@ export function defineHasManyRelationship( } OneToMany(options)(MikroORMEntity.prototype, relationship.name) + // MikroORMEntity.prototype[relationship.name] = new Collection(MikroORMEntity) } /** @@ -466,6 +467,7 @@ export function defineBelongsToRelationship( ManyToOne({ entity: relatedModelName, + defaultRaw: "", // This is a workaround since we are hacking mikro orm default behavior. The default value here is [Object object] which pass the check here and in turns is returned as a returning field -> @mikro-orm/knex/AbstractSqlDriver.js:462 fieldName: foreignKeyName, persist: false, nullable: relationship.nullable, @@ -741,6 +743,7 @@ export function defineManyToManyRelationship( const manytoManyOptions = { owner: isOwner, entity: relatedModelName, + defaultRaw: "", // This is a workaround since we are hacking mikro orm default behavior. The default value here is [Object object] which pass the check here and in turns is returned as a returning field -> @mikro-orm/knex/AbstractSqlDriver.js:462 ...(pivotTableName ? { pivotTable: pgSchema diff --git a/packages/core/utils/src/modules-sdk/__tests__/medusa-internal-service.ts b/packages/core/utils/src/modules-sdk/__tests__/medusa-internal-service.ts index eb7eeef4e0..f9ac14726c 100644 --- a/packages/core/utils/src/modules-sdk/__tests__/medusa-internal-service.ts +++ b/packages/core/utils/src/modules-sdk/__tests__/medusa-internal-service.ts @@ -16,6 +16,7 @@ describe("Internal Module Service Factory", () => { [modelRepositoryName]: { transaction: (task) => task(), getFreshManager: jest.fn().mockReturnThis(), + getActiveManager: jest.fn().mockReturnThis(), find: jest.fn(), findAndCount: jest.fn(), create: jest.fn(), @@ -28,6 +29,7 @@ describe("Internal Module Service Factory", () => { [`composite${Model.name}Repository`]: { transaction: (task) => task(), getFreshManager: jest.fn().mockReturnThis(), + getActiveManager: jest.fn().mockReturnThis(), find: jest.fn(), findAndCount: jest.fn(), create: jest.fn(), diff --git a/packages/core/utils/src/modules-sdk/__tests__/medusa-service.spec.ts b/packages/core/utils/src/modules-sdk/__tests__/medusa-service.spec.ts index 79deea214a..b9303450ec 100644 --- a/packages/core/utils/src/modules-sdk/__tests__/medusa-service.spec.ts +++ b/packages/core/utils/src/modules-sdk/__tests__/medusa-service.spec.ts @@ -7,6 +7,7 @@ const baseRepoMock = { serialize: jest.fn().mockImplementation((item) => item), transaction: (task) => task("transactionManager"), getFreshManager: jest.fn().mockReturnThis(), + getActiveManager: jest.fn().mockReturnThis(), } const defaultContext = { diff --git a/packages/core/utils/src/modules-sdk/decorators/inject-manager.ts b/packages/core/utils/src/modules-sdk/decorators/inject-manager.ts index e3bc4fe47f..74286c68db 100644 --- a/packages/core/utils/src/modules-sdk/decorators/inject-manager.ts +++ b/packages/core/utils/src/modules-sdk/decorators/inject-manager.ts @@ -52,7 +52,8 @@ export function InjectManager(managerProperty?: string): MethodDecorator { } copiedContext.manager = - originalContext.manager ?? resourceWithManager.getFreshManager() + originalContext.manager ?? + resourceWithManager.getActiveManager(originalContext) if (originalContext?.transactionManager) { copiedContext.transactionManager = originalContext?.transactionManager diff --git a/packages/core/workflows-sdk/package.json b/packages/core/workflows-sdk/package.json index b474ce7fb2..569a56cfeb 100644 --- a/packages/core/workflows-sdk/package.json +++ b/packages/core/workflows-sdk/package.json @@ -27,16 +27,16 @@ "author": "Medusa", "license": "MIT", "devDependencies": { - "@mikro-orm/core": "6.4.3", - "@mikro-orm/knex": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/knex": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "awilix": "^8.0.1", "expect-type": "^0.20.0", "jest": "^29.7.0", - "pg": "^8.13.0", + "pg": "^8.16.3", "rimraf": "^5.0.1", "typescript": "^5.6.2", "zod": "3.25.76" @@ -49,13 +49,13 @@ "ulid": "^2.3.0" }, "peerDependencies": { - "@mikro-orm/core": "6.4.3", - "@mikro-orm/knex": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/knex": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1", "express": "^4.21.0", - "pg": "^8.13.0" + "pg": "^8.16.3" }, "scripts": { "build": "rimraf dist && tsc --build", diff --git a/packages/medusa-test-utils/package.json b/packages/medusa-test-utils/package.json index bb75015bd6..5e9bd9c134 100644 --- a/packages/medusa-test-utils/package.json +++ b/packages/medusa-test-utils/package.json @@ -26,13 +26,13 @@ "license": "MIT", "devDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/knex": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/knex": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1", "jest": "^29.7.0", - "pg": "^8.13.0", + "pg": "^8.16.3", "pg-god": "^1.0.12", "rimraf": "^3.0.2", "typescript": "^5.6.2" @@ -47,7 +47,7 @@ "peerDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/medusa": "2.10.1", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1" }, "peerDependenciesMeta": { diff --git a/packages/medusa/package.json b/packages/medusa/package.json index f2780806ef..be42a2d9ef 100644 --- a/packages/medusa/package.json +++ b/packages/medusa/package.json @@ -136,10 +136,10 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/knex": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/knex": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@opentelemetry/instrumentation-pg": "^0.52.0", "@opentelemetry/resources": "^2.0.0", "@opentelemetry/sdk-node": "^0.200.0", diff --git a/packages/modules/api-key/package.json b/packages/modules/api-key/package.json index eadab24e61..290c1542f8 100644 --- a/packages/modules/api-key/package.json +++ b/packages/modules/api-key/package.json @@ -38,7 +38,7 @@ "devDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/test-utils": "2.10.1", - "@mikro-orm/cli": "6.4.3", + "@mikro-orm/cli": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "jest": "^29.7.0", @@ -48,9 +48,9 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1" } } diff --git a/packages/modules/auth/package.json b/packages/modules/auth/package.json index 61e7611b00..781157f7b0 100644 --- a/packages/modules/auth/package.json +++ b/packages/modules/auth/package.json @@ -38,10 +38,10 @@ "devDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/test-utils": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "jest": "^29.7.0", @@ -51,9 +51,9 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1" } } diff --git a/packages/modules/cart/package.json b/packages/modules/cart/package.json index 2ca00361da..8a00d511eb 100644 --- a/packages/modules/cart/package.json +++ b/packages/modules/cart/package.json @@ -38,10 +38,10 @@ "devDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/test-utils": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "jest": "^29.7.0", @@ -51,9 +51,9 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1" } } diff --git a/packages/modules/currency/package.json b/packages/modules/currency/package.json index 4970e54e6c..f6e8080f4f 100644 --- a/packages/modules/currency/package.json +++ b/packages/modules/currency/package.json @@ -38,10 +38,10 @@ "devDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/test-utils": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "jest": "^29.7.0", @@ -51,9 +51,9 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1" } } diff --git a/packages/modules/customer/package.json b/packages/modules/customer/package.json index 45d485cc2d..70e40a85fe 100644 --- a/packages/modules/customer/package.json +++ b/packages/modules/customer/package.json @@ -39,10 +39,10 @@ "devDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/test-utils": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "jest": "^29.7.0", @@ -52,9 +52,9 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1" } } diff --git a/packages/modules/file/package.json b/packages/modules/file/package.json index 4fcf2f7d1f..d7469941bf 100644 --- a/packages/modules/file/package.json +++ b/packages/modules/file/package.json @@ -38,10 +38,10 @@ "devDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/test-utils": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "jest": "^29.7.0", diff --git a/packages/modules/fulfillment/package.json b/packages/modules/fulfillment/package.json index d5d3876abe..b31407d052 100644 --- a/packages/modules/fulfillment/package.json +++ b/packages/modules/fulfillment/package.json @@ -38,10 +38,10 @@ "devDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/test-utils": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "jest": "^29.7.0", @@ -51,9 +51,9 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1" } } diff --git a/packages/modules/index/package.json b/packages/modules/index/package.json index 1cbf22a591..3d3c3fbcec 100644 --- a/packages/modules/index/package.json +++ b/packages/modules/index/package.json @@ -38,11 +38,11 @@ "devDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/test-utils": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/knex": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/knex": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "jest": "^29.7.0", @@ -52,10 +52,10 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/knex": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/knex": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1" } } diff --git a/packages/modules/inventory/package.json b/packages/modules/inventory/package.json index 4fb8b0583d..ad16cc7109 100644 --- a/packages/modules/inventory/package.json +++ b/packages/modules/inventory/package.json @@ -25,10 +25,10 @@ "devDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/test-utils": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "jest": "^29.7.0", @@ -38,9 +38,9 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1" }, "scripts": { diff --git a/packages/modules/link-modules/package.json b/packages/modules/link-modules/package.json index 29466ea45f..d99c6e5728 100644 --- a/packages/modules/link-modules/package.json +++ b/packages/modules/link-modules/package.json @@ -35,9 +35,9 @@ "devDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/test-utils": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "cross-env": "^5.2.1", @@ -48,9 +48,9 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1" } } diff --git a/packages/modules/locking/package.json b/packages/modules/locking/package.json index a6d649e554..31900b5f33 100644 --- a/packages/modules/locking/package.json +++ b/packages/modules/locking/package.json @@ -34,10 +34,10 @@ "devDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/test-utils": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "jest": "^29.7.0", @@ -47,9 +47,9 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1" } } diff --git a/packages/modules/notification/package.json b/packages/modules/notification/package.json index f4ed807ebd..61fe5f56cb 100644 --- a/packages/modules/notification/package.json +++ b/packages/modules/notification/package.json @@ -38,10 +38,10 @@ "devDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/test-utils": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "jest": "^29.7.0", @@ -51,9 +51,9 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1" } } diff --git a/packages/modules/order/package.json b/packages/modules/order/package.json index adc35f69eb..d1124ece68 100644 --- a/packages/modules/order/package.json +++ b/packages/modules/order/package.json @@ -29,7 +29,7 @@ "resolve:aliases": "tsc --showConfig -p tsconfig.json > tsconfig.resolved.json && tsc-alias -p tsconfig.resolved.json && rimraf tsconfig.resolved.json", "build": "rimraf dist && tsc --build && npm run resolve:aliases", "test": "jest --runInBand --bail --forceExit -- src/**/__tests__/**/*.ts", - "test:integration": "jest --forceExit -- integration-tests/**/__tests__/**/*.spec.ts", + "test:integration": "jest --forceExit -- integration-tests/__tests__/**/*.spec.ts", "migration:initial": "MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:create --initial", "migration:create": "MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:create", "migration:up": "MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:up", @@ -38,10 +38,10 @@ "devDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/test-utils": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "jest": "^29.7.0", @@ -51,9 +51,9 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1" } } diff --git a/packages/modules/order/src/utils/base-repository-find.ts b/packages/modules/order/src/utils/base-repository-find.ts index ec514ae78e..b039464963 100644 --- a/packages/modules/order/src/utils/base-repository-find.ts +++ b/packages/modules/order/src/utils/base-repository-find.ts @@ -20,11 +20,7 @@ export function setFindMethods(klass: Constructor, entity: any) { if (!("strategy" in findOptions_.options)) { if (findOptions_.options.limit != null || findOptions_.options.offset) { Object.assign(findOptions_.options, { - strategy: LoadStrategy.SELECT_IN, - }) - } else { - Object.assign(findOptions_.options, { - strategy: LoadStrategy.JOINED, + strategy: LoadStrategy.BALANCED, }) } } @@ -103,7 +99,7 @@ export function setFindMethods(klass: Constructor, entity: any) { if (!("strategy" in findOptions_.options)) { Object.assign(findOptions_.options, { - strategy: LoadStrategy.SELECT_IN, + strategy: LoadStrategy.BALANCED, }) } diff --git a/packages/modules/payment/package.json b/packages/modules/payment/package.json index 94abc4e6e0..7679610bc9 100644 --- a/packages/modules/payment/package.json +++ b/packages/modules/payment/package.json @@ -38,10 +38,10 @@ "devDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/test-utils": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "jest": "^29.7.0", @@ -51,9 +51,9 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1" } } diff --git a/packages/modules/payment/src/services/payment-module.ts b/packages/modules/payment/src/services/payment-module.ts index 28d3fd8c72..becad7eaf3 100644 --- a/packages/modules/payment/src/services/payment-module.ts +++ b/packages/modules/payment/src/services/payment-module.ts @@ -267,7 +267,7 @@ export default class PaymentModuleService ) } - @InjectManager() + @InjectTransactionManager() async updatePaymentCollections_( data: UpdatePaymentCollectionDTO[], @MedusaContext() sharedContext?: Context diff --git a/packages/modules/pricing/package.json b/packages/modules/pricing/package.json index 4c9f7e4f38..6386b5d5e7 100644 --- a/packages/modules/pricing/package.json +++ b/packages/modules/pricing/package.json @@ -38,10 +38,10 @@ "devDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/test-utils": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "jest": "^29.7.0", @@ -51,9 +51,9 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1" } } diff --git a/packages/modules/pricing/src/services/pricing-module.ts b/packages/modules/pricing/src/services/pricing-module.ts index 2d59ae2866..2cfed77824 100644 --- a/packages/modules/pricing/src/services/pricing-module.ts +++ b/packages/modules/pricing/src/services/pricing-module.ts @@ -885,7 +885,8 @@ export default class PricingModuleService return { attribute, operator: customRule.operator, - value: customRule.value, + // TODO: we throw above if value is not a number, but the model expect the value to be a string + value: customRule.value.toString(), } }) } diff --git a/packages/modules/product/integration-tests/__tests__/product-module-service/products.spec.ts b/packages/modules/product/integration-tests/__tests__/product-module-service/products.spec.ts index ed05dd058d..e879009013 100644 --- a/packages/modules/product/integration-tests/__tests__/product-module-service/products.spec.ts +++ b/packages/modules/product/integration-tests/__tests__/product-module-service/products.spec.ts @@ -864,7 +864,12 @@ moduleIntegrationTestRunner({ await service.upsertProducts([updateData]) const product = await service.retrieveProduct(productTwo.id, { - relations: ["*"], + relations: [ + "options", + "options.values", + "variants", + "variants.options", + ], }) expect(product.options).toHaveLength(1) diff --git a/packages/modules/product/package.json b/packages/modules/product/package.json index f1b351e223..4e5f24910e 100644 --- a/packages/modules/product/package.json +++ b/packages/modules/product/package.json @@ -38,10 +38,10 @@ "devDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/test-utils": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "faker": "^5.5.3", @@ -52,9 +52,9 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1" } } diff --git a/packages/modules/product/src/repositories/product-category.ts b/packages/modules/product/src/repositories/product-category.ts index b3ccfae6f0..f580339198 100644 --- a/packages/modules/product/src/repositories/product-category.ts +++ b/packages/modules/product/src/repositories/product-category.ts @@ -62,7 +62,7 @@ export class ProductCategoryRepository extends DALUtils.MikroOrmBaseTreeReposito } Object.assign(findOptions_.options, { - strategy: LoadStrategy.SELECT_IN, + strategy: LoadStrategy.BALANCED, }) return findOptions_ diff --git a/packages/modules/product/src/services/product-module-service.ts b/packages/modules/product/src/services/product-module-service.ts index 2af892b68a..30bbdca80b 100644 --- a/packages/modules/product/src/services/product-module-service.ts +++ b/packages/modules/product/src/services/product-module-service.ts @@ -1822,6 +1822,21 @@ export default class ProductModuleService productData.thumbnail = productData.images[0].url } + // TODO: these props are typed as number, the model expect a string, the API expect number etc + // There is some inconsistency here, we should fix it + if ("weight" in productData) { + productData.weight = productData.weight?.toString() as any + } + if ("length" in productData) { + productData.length = productData.length?.toString() as any + } + if ("height" in productData) { + productData.height = productData.height?.toString() as any + } + if ("width" in productData) { + productData.width = productData.width?.toString() as any + } + if (productData.images?.length) { productData.images = productData.images.map((image, index) => (image as { rank?: number }).rank != null diff --git a/packages/modules/promotion/integration-tests/__fixtures__/campaigns/index.ts b/packages/modules/promotion/integration-tests/__fixtures__/campaigns/index.ts index ad483cd1fc..a00a6fb9bb 100644 --- a/packages/modules/promotion/integration-tests/__fixtures__/campaigns/index.ts +++ b/packages/modules/promotion/integration-tests/__fixtures__/campaigns/index.ts @@ -12,7 +12,7 @@ export async function createCampaigns( campaignsData?: CreateCampaignDTO[] ): Promise { if (!campaignsData) { - const cp = JSON.parse(JSON.stringify(defaultCampaignsData)) + const cp = structuredClone(defaultCampaignsData) const starts_at = new Date(TODAY) starts_at.setDate(starts_at.getDate() - 1) diff --git a/packages/modules/promotion/package.json b/packages/modules/promotion/package.json index bc39a587ad..525240f782 100644 --- a/packages/modules/promotion/package.json +++ b/packages/modules/promotion/package.json @@ -39,10 +39,10 @@ "devDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/test-utils": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "jest": "^29.7.0", @@ -52,9 +52,9 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1" } } diff --git a/packages/modules/promotion/src/services/promotion-module.ts b/packages/modules/promotion/src/services/promotion-module.ts index 09b03d383a..b03d7500b1 100644 --- a/packages/modules/promotion/src/services/promotion-module.ts +++ b/packages/modules/promotion/src/services/promotion-module.ts @@ -18,6 +18,7 @@ import { CampaignBudgetType, ComputedActions, deduplicate, + EmitEvents, InjectManager, InjectTransactionManager, isDefined, @@ -139,11 +140,26 @@ export default class PromotionModuleService } @InjectManager() - listActivePromotions( + async listActivePromotions( filters?: FilterablePromotionProps, config?: FindConfig, sharedContext?: Context ): Promise { + const activePromotions = await this.listActivePromotions_( + filters, + config, + sharedContext + ) + + return this.baseRepository_.serialize(activePromotions) + } + + @InjectManager() + protected async listActivePromotions_( + filters?: FilterablePromotionProps, + config?: FindConfig, + @MedusaContext() sharedContext?: Context + ): Promise[]> { // Ensure we share the same now date across all filters const now = new Date() const activeFilters = { @@ -170,7 +186,11 @@ export default class PromotionModuleService ], } - return this.listPromotions(activeFilters, config, sharedContext) + return await this.promotionService_.list( + activeFilters, + config, + sharedContext + ) } @InjectTransactionManager() @@ -185,7 +205,7 @@ export default class PromotionModuleService const campaignBudgetMap = new Map() const promotionCodeUsageMap = new Map() - const existingPromotions = await this.listActivePromotions( + const existingPromotions = await this.listActivePromotions_( { code: promotionCodes }, { relations: ["campaign", "campaign.budget"] }, sharedContext @@ -200,9 +220,10 @@ export default class PromotionModuleService } } - const existingPromotionsMap = new Map( - existingPromotions.map((promotion) => [promotion.code!, promotion]) - ) + const existingPromotionsMap = new Map< + string, + InferEntityType + >(existingPromotions.map((promotion) => [promotion.code!, promotion])) for (let computedAction of computedActions) { const promotion = existingPromotionsMap.get(computedAction.code) @@ -293,7 +314,7 @@ export default class PromotionModuleService const promotionCodeUsageMap = new Map() const campaignBudgetMap = new Map() - const existingPromotions = await this.listActivePromotions( + const existingPromotions = await this.listActivePromotions_( { code: computedActions .map((computedAction) => computedAction.code) @@ -312,9 +333,10 @@ export default class PromotionModuleService } } - const existingPromotionsMap = new Map( - existingPromotions.map((promotion) => [promotion.code!, promotion]) - ) + const existingPromotionsMap = new Map< + string, + InferEntityType + >(existingPromotions.map((promotion) => [promotion.code!, promotion])) for (let computedAction of computedActions) { const promotion = existingPromotionsMap.get(computedAction.code) @@ -433,25 +455,18 @@ export default class PromotionModuleService const methodIdPromoValueMap = new Map() - const automaticPromotions = preventAutoPromotions - ? [] - : await this.listActivePromotions( - { is_automatic: true }, - { select: ["code"] }, - sharedContext - ) - - const automaticPromotionCodes = automaticPromotions.map((p) => p.code!) - const promotionCodesToApply = [ - ...promotionCodes, - ...automaticPromotionCodes, - ...appliedCodes, - ] + const promotionCodesToApply = [...promotionCodes, ...appliedCodes] const uniquePromotionCodes = Array.from(new Set(promotionCodesToApply)) + const queryFilter = preventAutoPromotions + ? { code: uniquePromotionCodes } + : { + $or: [{ code: uniquePromotionCodes }, { is_automatic: true }], + } + const promotions = await this.listActivePromotions( - { code: uniquePromotionCodes }, + queryFilter, { take: null, order: { application_method: { value: "DESC" } }, @@ -474,6 +489,9 @@ export default class PromotionModuleService promotions.map((promotion) => [promotion.code!, promotion]) ) + const automaticPromotions = promotions.filter((p) => p.is_automatic) + const automaticPromotionCodes = automaticPromotions.map((p) => p.code!) + for (const [code, adjustments] of codeAdjustmentMap.entries()) { for (const adjustment of adjustments.items) { computedActions.push({ @@ -628,7 +646,9 @@ export default class PromotionModuleService sharedContext ) - return Array.isArray(data) ? promotions : promotions[0] + return await this.baseRepository_.serialize< + PromotionTypes.PromotionDTO | PromotionTypes.PromotionDTO[] + >(Array.isArray(data) ? promotions : promotions[0]) } @InjectTransactionManager() @@ -887,6 +907,7 @@ export default class PromotionModuleService ): Promise @InjectManager() + @EmitEvents() // @ts-expect-error async updatePromotions( data: @@ -1040,7 +1061,7 @@ export default class PromotionModuleService ) { const promotionRuleIds = data.map((d) => d.id) - const promotionRules = await this.listPromotionRules( + const promotionRules = await this.promotionRuleService_.list( { id: promotionRuleIds }, { relations: ["values"] }, sharedContext @@ -1097,6 +1118,7 @@ export default class PromotionModuleService } @InjectManager() + @EmitEvents() async addPromotionRules( promotionId: string, rulesData: PromotionTypes.CreatePromotionRuleDTO[], @@ -1218,6 +1240,8 @@ export default class PromotionModuleService validatePromotionRuleAttributes(rulesData) + const promotionRuleValuesDataToCreate: CreatePromotionRuleValueDTO[] = [] + for (const ruleData of rulesData) { const { values, ...rest } = ruleData const promotionRuleData: CreatePromotionRuleDTO = { @@ -1238,12 +1262,14 @@ export default class PromotionModuleService promotion_rule: createdPromotionRule, })) - await this.promotionRuleValueService_.create( - promotionRuleValuesData, - sharedContext - ) + promotionRuleValuesDataToCreate.push(...promotionRuleValuesData) } + await this.promotionRuleValueService_.create( + promotionRuleValuesDataToCreate, + sharedContext + ) + return createdPromotionRules } @@ -1489,15 +1515,16 @@ export default class PromotionModuleService const updateBudgetData: UpdateCampaignBudgetDTO[] = [] const createBudgetData: CreateCampaignBudgetDTO[] = [] - const existingCampaigns = await this.listCampaigns( + const existingCampaigns = await this.campaignService_.list( { id: campaignIds }, { relations: ["budget"] }, sharedContext ) - const existingCampaignsMap = new Map( - existingCampaigns.map((campaign) => [campaign.id, campaign]) - ) + const existingCampaignsMap = new Map< + string, + InferEntityType + >(existingCampaigns.map((campaign) => [campaign.id, campaign])) for (const updateCampaignData of data) { const { budget: budgetData, ...campaignData } = updateCampaignData @@ -1554,7 +1581,7 @@ export default class PromotionModuleService @InjectManager() async addPromotionsToCampaign( data: PromotionTypes.AddPromotionsToCampaignDTO, - sharedContext?: Context + @MedusaContext() sharedContext: Context = {} ): Promise<{ ids: string[] }> { const ids = await this.addPromotionsToCampaign_(data, sharedContext) @@ -1621,7 +1648,7 @@ export default class PromotionModuleService @InjectManager() async removePromotionsFromCampaign( data: PromotionTypes.AddPromotionsToCampaignDTO, - sharedContext?: Context + @MedusaContext() sharedContext: Context = {} ): Promise<{ ids: string[] }> { const ids = await this.removePromotionsFromCampaign_(data, sharedContext) diff --git a/packages/modules/providers/locking-postgres/package.json b/packages/modules/providers/locking-postgres/package.json index c9d3e840b6..65cbdeb89e 100644 --- a/packages/modules/providers/locking-postgres/package.json +++ b/packages/modules/providers/locking-postgres/package.json @@ -21,10 +21,10 @@ "license": "MIT", "devDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "jest": "^29.7.0", diff --git a/packages/modules/region/package.json b/packages/modules/region/package.json index 7c5ad90457..86b0a99570 100644 --- a/packages/modules/region/package.json +++ b/packages/modules/region/package.json @@ -38,10 +38,10 @@ "devDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/test-utils": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "jest": "^29.7.0", @@ -51,9 +51,9 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1" } } diff --git a/packages/modules/sales-channel/package.json b/packages/modules/sales-channel/package.json index c8992f31fe..596930d87b 100644 --- a/packages/modules/sales-channel/package.json +++ b/packages/modules/sales-channel/package.json @@ -38,10 +38,10 @@ "devDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/test-utils": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "jest": "^29.7.0", @@ -51,9 +51,9 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1" } } diff --git a/packages/modules/settings/package.json b/packages/modules/settings/package.json index 5485aecea5..168c3ddc0d 100644 --- a/packages/modules/settings/package.json +++ b/packages/modules/settings/package.json @@ -38,10 +38,10 @@ "devDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/test-utils": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "jest": "^29.7.0", @@ -51,9 +51,9 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1" } } diff --git a/packages/modules/stock-location/package.json b/packages/modules/stock-location/package.json index a6fc684608..a02b4401eb 100644 --- a/packages/modules/stock-location/package.json +++ b/packages/modules/stock-location/package.json @@ -25,10 +25,10 @@ "devDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/test-utils": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "jest": "^29.7.0", @@ -38,9 +38,9 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1" }, "scripts": { diff --git a/packages/modules/store/package.json b/packages/modules/store/package.json index 3832fc200a..5838a1b0eb 100644 --- a/packages/modules/store/package.json +++ b/packages/modules/store/package.json @@ -38,10 +38,10 @@ "devDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/test-utils": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "jest": "^29.7.0", @@ -51,9 +51,9 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1" } } diff --git a/packages/modules/tax/package.json b/packages/modules/tax/package.json index ac6e4251e8..439d6ab597 100644 --- a/packages/modules/tax/package.json +++ b/packages/modules/tax/package.json @@ -38,10 +38,10 @@ "devDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/test-utils": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "jest": "^29.7.0", @@ -51,9 +51,9 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1" } } diff --git a/packages/modules/user/package.json b/packages/modules/user/package.json index b6c02a5235..2928d79969 100644 --- a/packages/modules/user/package.json +++ b/packages/modules/user/package.json @@ -38,10 +38,10 @@ "devDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/test-utils": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "jest": "^29.7.0", @@ -54,9 +54,9 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1" } } diff --git a/packages/modules/workflow-engine-inmemory/package.json b/packages/modules/workflow-engine-inmemory/package.json index 8f1a0200a7..72a89299aa 100644 --- a/packages/modules/workflow-engine-inmemory/package.json +++ b/packages/modules/workflow-engine-inmemory/package.json @@ -38,10 +38,10 @@ "devDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/test-utils": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "jest": "^29.7.0", @@ -55,9 +55,9 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1" } } diff --git a/packages/modules/workflow-engine-redis/package.json b/packages/modules/workflow-engine-redis/package.json index eb31eec0af..ff249aba56 100644 --- a/packages/modules/workflow-engine-redis/package.json +++ b/packages/modules/workflow-engine-redis/package.json @@ -38,10 +38,10 @@ "devDependencies": { "@medusajs/framework": "2.10.1", "@medusajs/test-utils": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "jest": "^29.7.0", @@ -56,9 +56,9 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.1", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1" } } diff --git a/packages/plugins/draft-order/package.json b/packages/plugins/draft-order/package.json index 9558369392..4f9a9288ba 100644 --- a/packages/plugins/draft-order/package.json +++ b/packages/plugins/draft-order/package.json @@ -53,11 +53,11 @@ "@medusajs/types": "2.10.1", "@medusajs/ui": "4.0.21", "@medusajs/ui-preset": "2.10.1", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/knex": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/knex": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "@swc/core": "1.5.7", "@types/lodash": "^4.17.15", "@types/node": "^20.0.0", @@ -65,7 +65,7 @@ "@types/react-dom": "^18.2.25", "awilix": "^8.0.1", "lodash": "^4.17.21", - "pg": "^8.13.0", + "pg": "^8.16.3", "react": "^18.2.0", "react-dom": "^18.2.0", "react-router-dom": "6.20.1", @@ -82,14 +82,14 @@ "@medusajs/icons": "2.10.1", "@medusajs/test-utils": "2.10.1", "@medusajs/ui": "4.0.21", - "@mikro-orm/cli": "6.4.3", - "@mikro-orm/core": "6.4.3", - "@mikro-orm/knex": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.2", + "@mikro-orm/core": "6.5.2", + "@mikro-orm/knex": "6.5.2", + "@mikro-orm/migrations": "6.5.2", + "@mikro-orm/postgresql": "6.5.2", "awilix": "^8.0.1", "lodash": "^4.17.21", - "pg": "^8.13.0", + "pg": "^8.16.3", "react-router-dom": "6.20.1" }, "engines": { diff --git a/yarn.lock b/yarn.lock index 826c7bd9a6..519801c203 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6096,7 +6096,7 @@ __metadata: dependencies: "@medusajs/framework": 2.10.1 "@medusajs/test-utils": 2.10.1 - "@mikro-orm/cli": 6.4.3 + "@mikro-orm/cli": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -6105,9 +6105,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -6167,10 +6167,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.1 "@medusajs/test-utils": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -6179,9 +6179,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -6224,10 +6224,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.1 "@medusajs/test-utils": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -6236,9 +6236,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -6249,10 +6249,10 @@ __metadata: dependencies: "@medusajs/telemetry": 2.10.1 "@medusajs/utils": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/knex": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/knex": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 "@types/express": ^4.17.17 @@ -6272,7 +6272,7 @@ __metadata: jest: ^29.7.0 meant: ^1.0.3 ora: ^5.4.1 - pg: ^8.13.0 + pg: ^8.16.3 pg-god: ^1.0.12 prompts: ^2.4.2 resolve-cwd: ^3.0.0 @@ -6283,12 +6283,12 @@ __metadata: winston: ^3.8.2 yargs: ^15.3.1 peerDependencies: - "@mikro-orm/core": 6.4.3 - "@mikro-orm/knex": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/knex": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 - pg: ^8.13.0 + pg: ^8.16.3 bin: medusa: cli.js languageName: unknown @@ -6299,10 +6299,10 @@ __metadata: resolution: "@medusajs/core-flows@workspace:packages/core/core-flows" dependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/knex": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/knex": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 awilix: ^8.0.1 @@ -6310,7 +6310,7 @@ __metadata: expect-type: ^0.20.0 jest: ^29.7.0 json-2-csv: ^5.5.4 - pg: ^8.13.0 + pg: ^8.16.3 rimraf: ^5.0.1 typescript: ^5.6.2 zod: 3.25.76 @@ -6326,10 +6326,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.1 "@medusajs/test-utils": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -6338,9 +6338,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -6351,10 +6351,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.1 "@medusajs/test-utils": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -6363,9 +6363,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -6446,11 +6446,11 @@ __metadata: "@medusajs/types": 2.10.1 "@medusajs/ui": 4.0.21 "@medusajs/ui-preset": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/knex": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/knex": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": 1.5.7 "@tanstack/react-query": 5.64.2 "@types/lodash": ^4.17.15 @@ -6462,7 +6462,7 @@ __metadata: date-fns: ^3.6.0 lodash: ^4.17.21 match-sorter: ^6.3.4 - pg: ^8.13.0 + pg: ^8.16.3 radix-ui: 1.1.2 react: ^18.2.0 react-dom: ^18.2.0 @@ -6480,14 +6480,14 @@ __metadata: "@medusajs/icons": 2.10.1 "@medusajs/test-utils": 2.10.1 "@medusajs/ui": 4.0.21 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/knex": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/knex": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 lodash: ^4.17.21 - pg: ^8.13.0 + pg: ^8.16.3 react-router-dom: 6.20.1 languageName: unknown linkType: soft @@ -6566,10 +6566,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.1 "@medusajs/test-utils": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -6595,10 +6595,10 @@ __metadata: "@medusajs/types": 2.10.1 "@medusajs/utils": 2.10.1 "@medusajs/workflows-sdk": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/knex": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/knex": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@opentelemetry/api": ^1.9.0 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 @@ -6621,7 +6621,7 @@ __metadata: lodash: 4.17.21 morgan: ^1.9.1 path-to-regexp: ^0.1.10 - pg: ^8.13.0 + pg: ^8.16.3 rimraf: ^3.0.2 supertest: ^4.0.2 tsconfig-paths: ^4.2.0 @@ -6632,15 +6632,15 @@ __metadata: peerDependencies: "@aws-sdk/client-dynamodb": ^3.218.0 "@medusajs/cli": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/knex": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/knex": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 connect-dynamodb: ^3.0.5 ioredis: ^5.4.1 - pg: ^8.13.0 + pg: ^8.16.3 vite: ^5.4.14 peerDependenciesMeta: "@aws-sdk/client-dynamodb": @@ -6679,10 +6679,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.1 "@medusajs/test-utils": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -6691,9 +6691,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -6738,11 +6738,11 @@ __metadata: dependencies: "@medusajs/framework": 2.10.1 "@medusajs/test-utils": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/knex": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/knex": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -6751,10 +6751,10 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/knex": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/knex": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -6765,10 +6765,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.1 "@medusajs/test-utils": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -6777,9 +6777,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -6804,9 +6804,9 @@ __metadata: dependencies: "@medusajs/framework": 2.10.1 "@medusajs/test-utils": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 cross-env: ^5.2.1 @@ -6816,9 +6816,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -6828,10 +6828,10 @@ __metadata: resolution: "@medusajs/locking-postgres@workspace:packages/modules/providers/locking-postgres" dependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -6864,10 +6864,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.1 "@medusajs/test-utils": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -6876,9 +6876,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7001,10 +7001,10 @@ __metadata: zod: 3.25.76 peerDependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/knex": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/knex": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@opentelemetry/instrumentation-pg": ^0.52.0 "@opentelemetry/resources": ^2.0.0 "@opentelemetry/sdk-node": ^0.200.0 @@ -7041,26 +7041,26 @@ __metadata: "@medusajs/orchestration": 2.10.1 "@medusajs/types": 2.10.1 "@medusajs/utils": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/knex": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/knex": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 awilix: ^8.0.1 cross-env: ^5.2.1 jest: ^29.7.0 - pg: ^8.13.0 + pg: ^8.16.3 rimraf: ^5.0.1 typescript: ^5.6.2 peerDependencies: - "@mikro-orm/core": 6.4.3 - "@mikro-orm/knex": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/knex": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 express: ^4.21.0 - pg: ^8.13.0 + pg: ^8.16.3 languageName: unknown linkType: soft @@ -7101,10 +7101,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.1 "@medusajs/test-utils": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -7113,9 +7113,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7135,26 +7135,26 @@ __metadata: dependencies: "@medusajs/types": 2.10.1 "@medusajs/utils": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/knex": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/knex": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 awilix: ^8.0.1 jest: ^29.7.0 - pg: ^8.13.0 + pg: ^8.16.3 rimraf: ^5.0.1 typescript: ^5.6.2 ulid: ^2.3.0 peerDependencies: - "@mikro-orm/core": 6.4.3 - "@mikro-orm/knex": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/knex": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 express: ^4.21.0 - pg: ^8.13.0 + pg: ^8.16.3 languageName: unknown linkType: soft @@ -7164,10 +7164,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.1 "@medusajs/test-utils": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -7176,9 +7176,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7206,10 +7206,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.1 "@medusajs/test-utils": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -7218,9 +7218,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7231,10 +7231,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.1 "@medusajs/test-utils": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -7243,9 +7243,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7256,10 +7256,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.1 "@medusajs/test-utils": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 faker: ^5.5.3 @@ -7269,9 +7269,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7282,10 +7282,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.1 "@medusajs/test-utils": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -7294,9 +7294,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7307,10 +7307,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.1 "@medusajs/test-utils": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -7319,9 +7319,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7332,10 +7332,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.1 "@medusajs/test-utils": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -7344,9 +7344,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7357,10 +7357,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.1 "@medusajs/test-utils": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -7369,9 +7369,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7382,10 +7382,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.1 "@medusajs/test-utils": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -7394,9 +7394,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7407,10 +7407,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.1 "@medusajs/test-utils": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -7419,9 +7419,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7432,10 +7432,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.1 "@medusajs/test-utils": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -7444,9 +7444,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7478,17 +7478,17 @@ __metadata: resolution: "@medusajs/test-utils@workspace:packages/medusa-test-utils" dependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/knex": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/knex": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@types/express": ^4.17.17 awilix: ^8.0.1 axios: ^0.21.4 express: ^4.21.0 get-port: ^5.1.0 jest: ^29.7.0 - pg: ^8.13.0 + pg: ^8.16.3 pg-god: ^1.0.12 randomatic: ^3.1.1 rimraf: ^3.0.2 @@ -7496,7 +7496,7 @@ __metadata: peerDependencies: "@medusajs/framework": 2.10.1 "@medusajs/medusa": 2.10.1 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 peerDependenciesMeta: "@medusajs/medusa": @@ -7640,10 +7640,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.1 "@medusajs/test-utils": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -7653,9 +7653,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7669,10 +7669,10 @@ __metadata: "@graphql-tools/merge": ^9.0.7 "@graphql-tools/schema": ^10.0.6 "@medusajs/types": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/knex": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/knex": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 "@types/express": ^4.17.21 @@ -7686,7 +7686,7 @@ __metadata: graphql: ^16.9.0 jest: ^29.7.0 jsonwebtoken: ^9.0.2 - pg: ^8.13.0 + pg: ^8.16.3 pg-connection-string: ^2.7.0 pg-god: ^1.0.12 pluralize: ^8.0.0 @@ -7695,13 +7695,13 @@ __metadata: ulid: ^2.3.0 zod: 3.25.76 peerDependencies: - "@mikro-orm/core": 6.4.3 - "@mikro-orm/knex": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/knex": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 express: ^4.21.0 - pg: ^8.13.0 + pg: ^8.16.3 languageName: unknown linkType: soft @@ -7711,10 +7711,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.1 "@medusajs/test-utils": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 cron-parser: ^4.9.0 @@ -7725,9 +7725,9 @@ __metadata: ulid: ^2.3.0 peerDependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7738,10 +7738,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.1 "@medusajs/test-utils": 2.10.1 - "@mikro-orm/cli": 6.4.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/cli": 6.5.2 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 bullmq: 5.13.0 @@ -7753,9 +7753,9 @@ __metadata: ulid: ^2.3.0 peerDependencies: "@medusajs/framework": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7768,68 +7768,68 @@ __metadata: "@medusajs/orchestration": 2.10.1 "@medusajs/types": 2.10.1 "@medusajs/utils": 2.10.1 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/knex": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/knex": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 awilix: ^8.0.1 expect-type: ^0.20.0 jest: ^29.7.0 - pg: ^8.13.0 + pg: ^8.16.3 rimraf: ^5.0.1 typescript: ^5.6.2 ulid: ^2.3.0 zod: 3.25.76 peerDependencies: - "@mikro-orm/core": 6.4.3 - "@mikro-orm/knex": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/knex": 6.5.2 + "@mikro-orm/migrations": 6.5.2 + "@mikro-orm/postgresql": 6.5.2 awilix: ^8.0.1 express: ^4.21.0 - pg: ^8.13.0 + pg: ^8.16.3 languageName: unknown linkType: soft -"@mikro-orm/cli@npm:6.4.3": - version: 6.4.3 - resolution: "@mikro-orm/cli@npm:6.4.3" +"@mikro-orm/cli@npm:6.5.2": + version: 6.5.2 + resolution: "@mikro-orm/cli@npm:6.5.2" dependencies: "@jercle/yargonaut": 1.1.5 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/knex": 6.4.3 - fs-extra: 11.2.0 + "@mikro-orm/core": 6.5.2 + "@mikro-orm/knex": 6.5.2 + fs-extra: 11.3.1 tsconfig-paths: 4.2.0 yargs: 17.7.2 bin: mikro-orm: ./cli mikro-orm-esm: ./esm - checksum: de49d269d942fad5b3bde9cc4d21d0252a38543e00e70335024c98c1dfbc12fb30ff6271215b998d5a3c56f0c5cc5bab30c0109cda76b47f8b64d81f312c8698 + checksum: deb736bbc2b5b6bc42aa91289f76e367205efa39a1cfa54d2fcabe0eff78828a79e9a89a8864158a122f816eadace87f7911f3b2bc8c3a452854c2962a9c0b02 languageName: node linkType: hard -"@mikro-orm/core@npm:6.4.3": - version: 6.4.3 - resolution: "@mikro-orm/core@npm:6.4.3" +"@mikro-orm/core@npm:6.5.2": + version: 6.5.2 + resolution: "@mikro-orm/core@npm:6.5.2" dependencies: dataloader: 2.2.3 - dotenv: 16.4.7 + dotenv: 17.2.1 esprima: 4.0.1 - fs-extra: 11.2.0 + fs-extra: 11.3.1 globby: 11.1.0 - mikro-orm: 6.4.3 + mikro-orm: 6.5.2 reflect-metadata: 0.2.2 - checksum: d056eb9323a10f940e101a8a95454dcb2c4fa3429517e1a14a1b706869f53e92c2d2d2c9dfe330c02afbef101612787b1184db255ac5d74df5b0df0059928dd2 + checksum: 410355df9b975b7a0faa7b41cb9617c7e8fcd2ad54887b9bc015f636fdfafa6787b6397786f9376b9aee0cc7af0babc79ec2d24ca6f9c2beb795e51059db36c1 languageName: node linkType: hard -"@mikro-orm/knex@npm:6.4.3": - version: 6.4.3 - resolution: "@mikro-orm/knex@npm:6.4.3" +"@mikro-orm/knex@npm:6.5.2": + version: 6.5.2 + resolution: "@mikro-orm/knex@npm:6.5.2" dependencies: - fs-extra: 11.2.0 + fs-extra: 11.3.1 knex: 3.1.0 sqlstring: 2.3.3 peerDependencies: @@ -7844,35 +7844,35 @@ __metadata: optional: true mariadb: optional: true - checksum: 08dabcf1ea99d6a976892b4973e5de3f4b53e7ed0d3a1e3dcec20dd9349ba5a3ed153bbb96173990cd12367b3744df17f27bb3de751624207592e5d2f6e8637d + checksum: 3cc17f91d44e47908fae5d31c9433baba4eb5c6f37c78364f20cab018805dcf5d8ddcc94f5612bfd219502f076ce832b903104e4a14252bb567aee873274c2c0 languageName: node linkType: hard -"@mikro-orm/migrations@npm:6.4.3": - version: 6.4.3 - resolution: "@mikro-orm/migrations@npm:6.4.3" +"@mikro-orm/migrations@npm:6.5.2": + version: 6.5.2 + resolution: "@mikro-orm/migrations@npm:6.5.2" dependencies: - "@mikro-orm/knex": 6.4.3 - fs-extra: 11.2.0 + "@mikro-orm/knex": 6.5.2 + fs-extra: 11.3.1 umzug: 3.8.2 peerDependencies: "@mikro-orm/core": ^6.0.0 - checksum: 04e7e2405a3d0d94213f2bf40c34988e190f8f0df5ff4565ef23c750680b198f293247418ee60c0605edfcbca119177f2e87dc01d3e6abfc15ec7c4dc976324a + checksum: b0258d52d343aa939791885b65cd0b2fcac691e1437ad8e41154aebac860c04c806d9c262e2c51a225428f42d1f3d2e06eb2a9f689e6332ac180c7d2a13747f1 languageName: node linkType: hard -"@mikro-orm/postgresql@npm:6.4.3": - version: 6.4.3 - resolution: "@mikro-orm/postgresql@npm:6.4.3" +"@mikro-orm/postgresql@npm:6.5.2": + version: 6.5.2 + resolution: "@mikro-orm/postgresql@npm:6.5.2" dependencies: - "@mikro-orm/knex": 6.4.3 - pg: 8.13.1 - postgres-array: 3.0.2 + "@mikro-orm/knex": 6.5.2 + pg: 8.16.3 + postgres-array: 3.0.4 postgres-date: 2.1.0 postgres-interval: 4.0.2 peerDependencies: "@mikro-orm/core": ^6.0.0 - checksum: c0068dbd8f81d646de1171e9933e1385cd24faedb8a4347b9ab2c24e9bfa19a56cc5a6245aaf84fc8a19b355d02a7f1c160400483aa12411e3487e82b854e12c + checksum: a3e10a3e1de4503270df95b71302f9fb2918eee6b2a665f54f1173b5e13320451dd2ef9a935ff023d178981e72a3550ec562ed4ce70043cf7bb4e618e3b5b2fb languageName: node linkType: hard @@ -18128,13 +18128,6 @@ __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" @@ -19502,7 +19495,7 @@ __metadata: node-fetch: ^3.3.1 open: ^9.1.0 ora: ^6.3.0 - pg: ^8.11.3 + pg: ^8.16.3 prettier: ^2.8.8 slugify: ^1.6.6 ts-node: ^10.9.1 @@ -20635,10 +20628,10 @@ __metadata: languageName: node linkType: hard -"dotenv@npm:16.4.7": - version: 16.4.7 - resolution: "dotenv@npm:16.4.7" - checksum: be9f597e36a8daf834452daa1f4cc30e5375a5968f98f46d89b16b983c567398a330580c88395069a77473943c06b877d1ca25b4afafcdd6d4adb549e8293462 +"dotenv@npm:17.2.1": + version: 17.2.1 + resolution: "dotenv@npm:17.2.1" + checksum: 918dd2f9d8b8f86b0afabad9534793d51de3718c437f9e7b6525628cf68c1d4ae768cc37a5afff38c066f58a8ecf549f4ac6cd5617485bd328e826112cc2650a languageName: node linkType: hard @@ -23016,14 +23009,14 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:11.2.0, fs-extra@npm:^11.1.0, fs-extra@npm:^11.2.0": - version: 11.2.0 - resolution: "fs-extra@npm:11.2.0" +"fs-extra@npm:11.3.1": + version: 11.3.1 + resolution: "fs-extra@npm:11.3.1" dependencies: graceful-fs: ^4.2.0 jsonfile: ^6.0.1 universalify: ^2.0.0 - checksum: d77a9a9efe60532d2e790e938c81a02c1b24904ef7a3efb3990b835514465ba720e99a6ea56fd5e2db53b4695319b644d76d5a0e9988a2beef80aa7b1da63398 + checksum: 61e5b7285b1ca72c68dfe1058b2514294a922683afac2a80aa90540f9bd85370763d675e3b408ef500077d355956fece3bd24b546790e261c3d3015967e2b2d9 languageName: node linkType: hard @@ -23049,6 +23042,17 @@ __metadata: languageName: node linkType: hard +"fs-extra@npm:^11.1.0, fs-extra@npm:^11.2.0": + version: 11.2.0 + resolution: "fs-extra@npm:11.2.0" + dependencies: + graceful-fs: ^4.2.0 + jsonfile: ^6.0.1 + universalify: ^2.0.0 + checksum: d77a9a9efe60532d2e790e938c81a02c1b24904ef7a3efb3990b835514465ba720e99a6ea56fd5e2db53b4695319b644d76d5a0e9988a2beef80aa7b1da63398 + languageName: node + linkType: hard + "fs-extra@npm:^7.0.1, fs-extra@npm:~7.0.1": version: 7.0.1 resolution: "fs-extra@npm:7.0.1" @@ -27215,10 +27219,10 @@ __metadata: languageName: node linkType: hard -"mikro-orm@npm:6.4.3": - version: 6.4.3 - resolution: "mikro-orm@npm:6.4.3" - checksum: 6d489b7ba8ee9e97545bf035c0d1571e5e00baba4653c24713f4f4703311461f10d467d42f230674049282add6340fc9f33f3e3034827f86d89b5d62b3cc0180 +"mikro-orm@npm:6.5.2": + version: 6.5.2 + resolution: "mikro-orm@npm:6.5.2" + checksum: 21cfa2c40ffdb03792ec119e442e1d902b91d8295af7dbe7dd7a0e0e9e217f533772b6f519a1e4c8446b300a0cbc7fd9c01b4041c1e5d47548dd54ca3d9dd276 languageName: node linkType: hard @@ -28772,13 +28776,6 @@ __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 - "param-case@npm:^3.0.4": version: 3.0.4 resolution: "param-case@npm:3.0.4" @@ -29053,10 +29050,10 @@ __metadata: languageName: node linkType: hard -"pg-cloudflare@npm:^1.1.1": - version: 1.1.1 - resolution: "pg-cloudflare@npm:1.1.1" - checksum: a68b957f755be6af813d68ccaf4c906a000fd2ecb362cd281220052cc9e2f6c26da3b88792742387008c30b3bf0d2fa3a0eff04aeb8af4414023c99ae78e07bd +"pg-cloudflare@npm:^1.2.7": + version: 1.2.7 + resolution: "pg-cloudflare@npm:1.2.7" + checksum: 8a52713dbdecc9d389dc4e65e3b7ede2e199ec3715f7491ee80a15db171f2d75677a102e9c2cef0cb91a2f310e91f976eaec0dd6ef5d8bf357de0b948f9d9431 languageName: node linkType: hard @@ -29067,13 +29064,6 @@ __metadata: languageName: node linkType: hard -"pg-connection-string@npm:^2.6.2": - version: 2.6.4 - resolution: "pg-connection-string@npm:2.6.4" - checksum: 0d0b617df0fc6507bf6a94bdcd56c7a305788a1402d69bff9773350947c8f525d6d8136128065370749a3325e99658ae40fbdcce620fb8e60126181f0591a6a6 - languageName: node - linkType: hard - "pg-connection-string@npm:^2.7.0": version: 2.7.0 resolution: "pg-connection-string@npm:2.7.0" @@ -29081,6 +29071,13 @@ __metadata: languageName: node linkType: hard +"pg-connection-string@npm:^2.9.1": + version: 2.9.1 + resolution: "pg-connection-string@npm:2.9.1" + checksum: 9a646529bbc0843806fc5de98ce93735a4612b571f11867178a85665d11989a827e6fd157388ca0e34ec948098564fce836c178cfd499b9f0e8cd9972b8e2e5c + languageName: node + linkType: hard + "pg-god@npm:^1.0.12": version: 1.0.12 resolution: "pg-god@npm:1.0.12" @@ -29111,23 +29108,30 @@ __metadata: languageName: node linkType: hard -"pg-pool@npm:^3.6.1": - version: 3.6.2 - resolution: "pg-pool@npm:3.6.2" +"pg-pool@npm:^3.10.1": + version: 3.10.1 + resolution: "pg-pool@npm:3.10.1" peerDependencies: pg: ">=8.0" - checksum: 14c524549490954b5e48457a4b808df8f619f6deeb3b395b0cd184a8f4ed65a9273fe0697ba0341a41d6745af197f1437eb1cf51fff0cbbf5b0fb3852ebe5392 + checksum: a00916b7df64226cc597fe769e3a757ff9b11562dc87ce5b0a54101a18c1fe282daaa2accaf27221e81e1e4cdf4da6a33dab09614734d32904d6c4e11c44a079 languageName: node linkType: hard -"pg-protocol@npm:*, pg-protocol@npm:^1.6.0": +"pg-protocol@npm:*": version: 1.6.1 resolution: "pg-protocol@npm:1.6.1" checksum: 7eadef4010ac0a3925c460be7332ca4098a5c6d5181725a62193fcfa800000ae6632d98d814f3989b42cf5fdc3b45e34c714a1959d29174e81e30730e140ae5f languageName: node linkType: hard -"pg-types@npm:^2.1.0, pg-types@npm:^2.2.0": +"pg-protocol@npm:^1.10.3": + version: 1.10.3 + resolution: "pg-protocol@npm:1.10.3" + checksum: f7ef54708c93ee6d271e37678296fc5097e4337fca91a88a3d99359b78633dbdbf6e983f0adb34b7cdd261b7ec7266deb20c3233bf3dfdb498b3e1098e8750b9 + languageName: node + linkType: hard + +"pg-types@npm:2.2.0, pg-types@npm:^2.2.0": version: 2.2.0 resolution: "pg-types@npm:2.2.0" dependencies: @@ -29155,18 +29159,16 @@ __metadata: languageName: node linkType: hard -"pg@npm:8.11.3": - version: 8.11.3 - resolution: "pg@npm:8.11.3" +"pg@npm:8.16.3": + version: 8.16.3 + resolution: "pg@npm:8.16.3" dependencies: - buffer-writer: 2.0.0 - packet-reader: 1.0.0 - pg-cloudflare: ^1.1.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 + pg-cloudflare: ^1.2.7 + pg-connection-string: ^2.9.1 + pg-pool: ^3.10.1 + pg-protocol: ^1.10.3 + pg-types: 2.2.0 + pgpass: 1.0.5 peerDependencies: pg-native: ">=3.0.1" dependenciesMeta: @@ -29175,11 +29177,11 @@ __metadata: peerDependenciesMeta: pg-native: optional: true - checksum: 07e6967fc8bd5d72bab9be6620626e8e3ab59128ebf56bf0de83d67f10801a19221d88b3317e90b93339ba48d0498b39967b782ae39686aabda6bc647bceb438 + checksum: a6a407ff0efb7599760d72ffdcda47a74c34c0fd71d896623caac45cf2cfb0f49a10973cce23110f182b9810639a1e9f6904454d7358c7001574ee0ffdcbce2a languageName: node linkType: hard -"pgpass@npm:1.x": +"pgpass@npm:1.0.5": version: 1.0.5 resolution: "pgpass@npm:1.0.5" dependencies: @@ -29867,10 +29869,10 @@ __metadata: languageName: node linkType: hard -"postgres-array@npm:3.0.2, postgres-array@npm:~3.0.1": - version: 3.0.2 - resolution: "postgres-array@npm:3.0.2" - checksum: 644aa071f67a66a59f641f8e623887d2b915bc102a32643e2aa8b54c11acd343c5ad97831ea444dd37bd4b921ba35add4aa2cb0c6b76700a8252c2324aeba5b4 +"postgres-array@npm:3.0.4": + version: 3.0.4 + resolution: "postgres-array@npm:3.0.4" + checksum: 47f3e648da512bacdd6a5ed55cf770605ec271330789faeece0fd13805a49f376d6e5c9e0e353377be11a9545e727dceaa2473566c505432bf06366ccd04c6b2 languageName: node linkType: hard @@ -29881,6 +29883,13 @@ __metadata: languageName: node linkType: hard +"postgres-array@npm:~3.0.1": + version: 3.0.2 + resolution: "postgres-array@npm:3.0.2" + checksum: 644aa071f67a66a59f641f8e623887d2b915bc102a32643e2aa8b54c11acd343c5ad97831ea444dd37bd4b921ba35add4aa2cb0c6b76700a8252c2324aeba5b4 + languageName: node + linkType: hard + "postgres-bytea@npm:~1.0.0": version: 1.0.0 resolution: "postgres-bytea@npm:1.0.0"