chore(): upgrade mikro orm (#13450)

.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.4

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"
   }
 }

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",

packages/cli/medusa-cli/package.json

@@ -32,16 +32,16 @@
   "author": "Sebastian Rindom",
   "license": "MIT",
   "devDependencies": {
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/knex": "6.4.3",
+    "@mikro-orm/knex": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@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/core": "6.5.4",
-    "@mikro-orm/knex": "6.4.3",
+    "@mikro-orm/knex": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1",
-    "pg": "^8.13.0"
+    "pg": "^8.16.3"
   },
   "gitHead": "81a7ff73d012fda722f6e9ef0bd9ba0232d37808"
 }

packages/core/core-flows/package.json

@@ -27,16 +27,16 @@
   "license": "MIT",
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/knex": "6.4.3",
+    "@mikro-orm/knex": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@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"
   },

packages/core/framework/package.json

@@ -56,10 +56,10 @@
   "devDependencies": {
     "@aws-sdk/client-dynamodb": "^3.218.0",
     "@medusajs/cli": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/knex": "6.4.3",
+    "@mikro-orm/knex": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@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.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/knex": "6.4.3",
+    "@mikro-orm/knex": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "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": {

packages/core/js-sdk/package.json

@@ -29,13 +29,13 @@
   "author": "Medusa",
   "license": "MIT",
   "devDependencies": {
+    "@medusajs/types": "2.10.3",
     "jest": "^29.7.0",
     "msw": "^2.3.0",
     "rimraf": "^5.0.1",
     "typescript": "^5.6.2"
   },
   "dependencies": {
-    "@medusajs/types": "2.10.3",
     "fetch-event-stream": "^0.1.5",
     "qs": "^6.12.1"
   },

packages/core/modules-sdk/package.json

@@ -31,31 +31,31 @@
     "watch": "tsc --build --watch"
   },
   "devDependencies": {
-    "@mikro-orm/core": "6.4.3",
+    "@medusajs/types": "2.10.3",
-    "@mikro-orm/knex": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/knex": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
+    "@mikro-orm/postgresql": "6.5.4",
     "@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"
   },
   "dependencies": {
     "@medusajs/orchestration": "2.10.3",
-    "@medusajs/types": "2.10.3",
     "@medusajs/utils": "2.10.3"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/knex": "6.4.3",
+    "@mikro-orm/knex": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1",
     "express": "^4.21.0",
-    "pg": "^8.13.0"
+    "pg": "^8.16.3"
   }
 }

packages/core/modules-sdk/src/remote-query/to-remote-query.ts

@@ -36,7 +36,7 @@ export function toRemoteQuery<const TEntity extends string>(
     pagination?: Partial<RemoteQueryInput<TEntity>["pagination"]>
     context?: Record<string, any>
     withDeleted?: boolean
-    strategy?: "joined" | "select-in"
+    strategy?: "joined" | "select-in" | "balanced"
   },
   entitiesMap: Map<string, any>
 ): RemoteQueryGraph<TEntity> {

packages/core/orchestration/package.json

@@ -26,31 +26,31 @@
   "author": "Medusa",
   "license": "MIT",
   "devDependencies": {
-    "@mikro-orm/core": "6.4.3",
+    "@medusajs/types": "2.10.3",
-    "@mikro-orm/knex": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/knex": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
+    "@mikro-orm/postgresql": "6.5.4",
     "@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"
   },
   "dependencies": {
-    "@medusajs/types": "2.10.3",
     "@medusajs/utils": "2.10.3",
     "ulid": "^2.3.0"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/knex": "6.4.3",
+    "@mikro-orm/knex": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1",
     "express": "^4.21.0",
-    "pg": "^8.13.0"
+    "pg": "^8.16.3"
   },
   "scripts": {
     "build": "rimraf dist && tsc --build",

packages/core/orchestration/src/joiner/remote-joiner.ts

@@ -479,7 +479,7 @@ export class RemoteJoiner {
       if (Object.keys(service_.fieldAlias!).length) {
         const conflictAliases = Array.from(
           service_.relationships!.keys()
-        ).filter((alias) => fieldAlias[alias])
+        ).filter((alias) => fieldAlias[alias as string])
 
         if (conflictAliases.length) {
           throw new Error(

packages/core/types/src/dal/index.ts

@@ -55,7 +55,7 @@ export interface OptionsQuery<T> {
   /**
    * Load strategy (e.g for mikro orm it accept select-in or joined)
    */
-  strategy?: "select-in" | "joined" | (string & {})
+  strategy?: "select-in" | "joined" | "balanced" | (string & {})
 }
 
 /**

packages/core/types/src/modules-sdk/remote-query-object-from-string.ts

@@ -74,7 +74,7 @@ export type RemoteQueryInput<TEntry extends string> =
         /**
          * 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<TEntry extends string> =
         /**
          * Strategy will be send to the entry module called method
          */
-        strategy?: "joined" | "select-in"
+        strategy?: "joined" | "select-in" | "balanced"
       }
 
 export type RemoteQueryGraph<TEntry extends string> = {

packages/core/utils/package.json

@@ -26,10 +26,11 @@
   "author": "Medusa",
   "license": "MIT",
   "devDependencies": {
-    "@mikro-orm/core": "6.4.3",
+    "@medusajs/types": "2.10.3",
-    "@mikro-orm/knex": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/knex": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "@types/express": "^4.17.21",
@@ -37,7 +38,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"
@@ -47,7 +48,6 @@
     "@graphql-codegen/typescript": "^4.0.9",
     "@graphql-tools/merge": "^9.0.7",
     "@graphql-tools/schema": "^10.0.6",
-    "@medusajs/types": "2.10.3",
     "@types/pluralize": "^0.0.33",
     "bignumber.js": "^9.1.2",
     "dotenv": "^16.4.5",
@@ -60,13 +60,13 @@
     "zod": "3.25.76"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/knex": "6.4.3",
+    "@mikro-orm/knex": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1",
     "express": "^4.21.0",
-    "pg": "^8.13.0"
+    "pg": "^8.16.3"
   },
   "scripts": {
     "build": "rimraf dist && tsc --build",

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 { EntityProperty, Platform, Property, Type } from "@mikro-orm/core"
-import { isDefined, isPresent, trimZeros } from "../../common"
+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<string | number, string> {
+  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"
+  }
+}

packages/core/utils/src/dal/mikro-orm/mikro-orm-repository.ts

@@ -59,15 +59,15 @@ export class MikroOrmBase {
   async transaction<TManager = unknown>(
     task: (transactionManager: TManager) => Promise<any>,
     options: {
+      manager?: TManager
       isolationLevel?: string
       enableNestedTransactions?: boolean
       transaction?: TManager
     } = {}
   ): Promise<any> {
-    this.manager_.global = true
+    const manager = this.getFreshManager()
-    return await transactionWrapper(this.manager_, task, options).catch(
+
-      dbErrorMapper
+    return await transactionWrapper(manager, task, options).catch(dbErrorMapper)
-    )
   }
 
   async serialize<TOutput extends object | object[]>(
@@ -463,12 +463,9 @@ export function mikroOrmBaseRepositoryFactory<const T extends object>(
 
       if (!("strategy" in findOptions_.options)) {
         if (findOptions_.options.limit != null || findOptions_.options.offset) {
+          // TODO: from 7+ it will be the default strategy
           Object.assign(findOptions_.options, {
-            strategy: LoadStrategy.SELECT_IN,
+            strategy: LoadStrategy.BALANCED,
-          })
-        } else {
-          Object.assign(findOptions_.options, {
-            strategy: LoadStrategy.JOINED,
           })
         }
       }

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: {

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<T>
 
-    ENTITIES[modelName] = RegisteredEntity
+    Entity({ tableName })(
-    return RegisteredEntity
+      Filter(mikroOrmSoftDeletableFilterOptions)(MikroORMEntity)
+    ) as any
+
+    const entityMetadata =
+      MetadataStorage.getMetadataFromDecorator(MikroORMEntity)
+
+    ENTITIES[modelName] = entityMetadata.class as Constructor<any>
+    return entityMetadata.class as Infer<T>
   }
 
   /**

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(),

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 = {

packages/core/utils/src/modules-sdk/decorators/inject-manager.ts

@@ -23,7 +23,7 @@ export function InjectManager(managerProperty?: string): MethodDecorator {
       const originalContext = args[argIndex] ?? {}
       const copiedContext = {} as Context
       for (const key in originalContext) {
-        if (key === "manager" || key === "transactionManager") {
+        if (key === "transactionManager") {
           continue
         }
 
@@ -51,8 +51,8 @@ export function InjectManager(managerProperty?: string): MethodDecorator {
         )
       }
 
-      copiedContext.manager =
+      copiedContext.manager ??=
-        originalContext.manager ?? resourceWithManager.getFreshManager()
+        resourceWithManager.getFreshManager(originalContext)
 
       if (originalContext?.transactionManager) {
         copiedContext.transactionManager = originalContext?.transactionManager

packages/core/utils/src/modules-sdk/decorators/inject-transaction-manager.ts

@@ -35,7 +35,7 @@ export function InjectTransactionManager(
         async (transactionManager) => {
           const copiedContext = {} as Context
           for (const key in originalContext) {
-            if (key === "manager" || key === "transactionManager") {
+            if (key === "transactionManager") {
               continue
             }
 
@@ -52,10 +52,6 @@ export function InjectTransactionManager(
 
           copiedContext.transactionManager = transactionManager
 
-          if (originalContext?.manager) {
-            copiedContext.manager = originalContext?.manager
-          }
-
           copiedContext.__type = MedusaContextType
 
           args[argIndex] = copiedContext
@@ -63,6 +59,7 @@ export function InjectTransactionManager(
           return await originalMethod.apply(this, args)
         },
         {
+          manager: originalContext?.manager,
           transaction: originalContext?.transactionManager,
           isolationLevel: (originalContext as Context)?.isolationLevel,
           enableNestedTransactions:

packages/core/workflows-sdk/package.json

@@ -27,16 +27,17 @@
   "author": "Medusa",
   "license": "MIT",
   "devDependencies": {
-    "@mikro-orm/core": "6.4.3",
+    "@medusajs/types": "2.10.3",
-    "@mikro-orm/knex": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/knex": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
+    "@mikro-orm/postgresql": "6.5.4",
     "@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"
@@ -44,18 +45,17 @@
   "dependencies": {
     "@medusajs/modules-sdk": "2.10.3",
     "@medusajs/orchestration": "2.10.3",
-    "@medusajs/types": "2.10.3",
     "@medusajs/utils": "2.10.3",
     "ulid": "^2.3.0"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/knex": "6.4.3",
+    "@mikro-orm/knex": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1",
     "express": "^4.21.0",
-    "pg": "^8.13.0"
+    "pg": "^8.16.3"
   },
   "scripts": {
     "build": "rimraf dist && tsc --build",

packages/medusa-test-utils/package.json

@@ -26,13 +26,13 @@
   "license": "MIT",
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/knex": "6.4.3",
+    "@mikro-orm/knex": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "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.3",
     "@medusajs/medusa": "2.10.3",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1"
   },
   "peerDependenciesMeta": {

packages/medusa-test-utils/src/medusa-test-runner-utils/wait-workflow-executions.ts

@@ -1,5 +1,5 @@
 import { Modules } from "@medusajs/framework/utils"
-import { MedusaContainer } from "@medusajs/types"
+import { MedusaContainer } from "@medusajs/framework/types"
 
 /**
  * Waits for all workflow executions to finish. When relying on workflows but not necessarily

packages/medusa/package.json

@@ -136,10 +136,10 @@
   },
   "peerDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/knex": "6.4.3",
+    "@mikro-orm/knex": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@opentelemetry/instrumentation-pg": "^0.52.0",
     "@opentelemetry/resources": "^2.0.0",
     "@opentelemetry/sdk-node": "^0.200.0",

packages/modules/api-key/package.json

@@ -38,7 +38,7 @@
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "jest": "^29.7.0",
@@ -48,9 +48,9 @@
   },
   "peerDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1"
   }
 }

packages/modules/auth/package.json

@@ -38,10 +38,10 @@
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "jest": "^29.7.0",
@@ -51,9 +51,9 @@
   },
   "peerDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1"
   }
 }

packages/modules/cart/package.json

@@ -38,10 +38,10 @@
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "jest": "^29.7.0",
@@ -51,9 +51,9 @@
   },
   "peerDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1"
   }
 }

packages/modules/currency/package.json

@@ -38,10 +38,10 @@
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "jest": "^29.7.0",
@@ -51,9 +51,9 @@
   },
   "peerDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1"
   }
 }

packages/modules/customer/package.json

@@ -39,10 +39,10 @@
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "jest": "^29.7.0",
@@ -52,9 +52,9 @@
   },
   "peerDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1"
   }
 }

packages/modules/file/package.json

@@ -38,10 +38,10 @@
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "jest": "^29.7.0",

packages/modules/fulfillment/package.json

@@ -38,10 +38,10 @@
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "jest": "^29.7.0",
@@ -51,9 +51,9 @@
   },
   "peerDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1"
   }
 }

packages/modules/index/package.json

@@ -38,11 +38,11 @@
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/knex": "6.4.3",
+    "@mikro-orm/knex": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "jest": "^29.7.0",
@@ -52,10 +52,10 @@
   },
   "peerDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/knex": "6.4.3",
+    "@mikro-orm/knex": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1"
   }
 }

packages/modules/inventory/package.json

@@ -25,10 +25,10 @@
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "jest": "^29.7.0",
@@ -38,9 +38,9 @@
   },
   "peerDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1"
   },
   "scripts": {

packages/modules/link-modules/package.json

@@ -35,9 +35,9 @@
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "cross-env": "^5.2.1",
@@ -48,9 +48,9 @@
   },
   "peerDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1"
   }
 }

packages/modules/locking/package.json

@@ -34,10 +34,10 @@
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "jest": "^29.7.0",
@@ -47,9 +47,9 @@
   },
   "peerDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1"
   }
 }

packages/modules/locking/src/services/locking-module.ts

@@ -3,7 +3,7 @@ import {
   ILockingModule,
   InternalModuleDeclaration,
   Logger,
-} from "@medusajs/types"
+} from "@medusajs/framework/types"
 import { EntityManager } from "@mikro-orm/core"
 import { LockingDefaultProvider } from "@types"
 import LockingProviderService from "./locking-provider"

packages/modules/notification/package.json

@@ -38,10 +38,10 @@
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "jest": "^29.7.0",
@@ -51,9 +51,9 @@
   },
   "peerDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1"
   }
 }

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 --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.3",
     "@medusajs/test-utils": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "jest": "^29.7.0",
@@ -51,9 +51,9 @@
   },
   "peerDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1"
   }
 }

packages/modules/order/src/utils/base-repository-find.ts

@@ -20,11 +20,7 @@ export function setFindMethods<T>(klass: Constructor<T>, entity: any) {
     if (!("strategy" in findOptions_.options)) {
       if (findOptions_.options.limit != null || findOptions_.options.offset) {
         Object.assign(findOptions_.options, {
-          strategy: LoadStrategy.SELECT_IN,
+          strategy: LoadStrategy.BALANCED,
-        })
-      } else {
-        Object.assign(findOptions_.options, {
-          strategy: LoadStrategy.JOINED,
         })
       }
     }
@@ -103,7 +99,7 @@ export function setFindMethods<T>(klass: Constructor<T>, entity: any) {
 
     if (!("strategy" in findOptions_.options)) {
       Object.assign(findOptions_.options, {
-        strategy: LoadStrategy.SELECT_IN,
+        strategy: LoadStrategy.BALANCED,
       })
     }
 

packages/modules/payment/package.json

@@ -38,10 +38,10 @@
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "jest": "^29.7.0",
@@ -51,9 +51,9 @@
   },
   "peerDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1"
   }
 }

packages/modules/payment/src/services/payment-module.ts

@@ -264,7 +264,7 @@ export default class PaymentModuleService
     )
   }
 
-  @InjectManager()
+  @InjectTransactionManager()
   async updatePaymentCollections_(
     data: UpdatePaymentCollectionDTO[],
     @MedusaContext() sharedContext?: Context

packages/modules/pricing/package.json

@@ -38,10 +38,10 @@
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "jest": "^29.7.0",
@@ -51,9 +51,9 @@
   },
   "peerDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1"
   }
 }

packages/modules/pricing/src/services/pricing-module.ts

@@ -868,7 +868,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(),
               }
             })
           }

packages/modules/product/integration-tests/__tests__/product-module-service/products.spec.ts

@@ -826,7 +826,12 @@ moduleIntegrationTestRunner<IProductModuleService>({
           await service.upsertProducts([updateData])
 
           const product = await service.retrieveProduct(productTwo.id, {
-            relations: ["*"],
+            relations: [
+              "options",
+              "options.values",
+              "variants",
+              "variants.options",
+            ],
           })
 
           expect(product.options).toHaveLength(1)

packages/modules/product/package.json

@@ -38,10 +38,10 @@
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "faker": "^5.5.3",
@@ -52,9 +52,9 @@
   },
   "peerDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1"
   }
 }

packages/modules/product/src/repositories/product-category.ts

@@ -61,7 +61,7 @@ export class ProductCategoryRepository extends DALUtils.MikroOrmBaseTreeReposito
     }
 
     Object.assign(findOptions_.options, {
-      strategy: LoadStrategy.SELECT_IN,
+      strategy: LoadStrategy.BALANCED,
     })
 
     return findOptions_

packages/modules/product/src/services/product-module-service.ts

@@ -1879,6 +1879,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

packages/modules/promotion/integration-tests/__fixtures__/campaigns/index.ts

@@ -12,7 +12,7 @@ export async function createCampaigns(
   campaignsData?: CreateCampaignDTO[]
 ): Promise<Campaign[]> {
   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)

packages/modules/promotion/package.json

@@ -39,10 +39,10 @@
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "jest": "^29.7.0",
@@ -52,9 +52,9 @@
   },
   "peerDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1"
   }
 }

packages/modules/promotion/src/services/promotion-module.ts

@@ -690,7 +690,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()
@@ -949,6 +951,7 @@ export default class PromotionModuleService
   ): Promise<PromotionTypes.PromotionDTO[]>
 
   @InjectManager()
+  @EmitEvents()
   // @ts-expect-error
   async updatePromotions(
     data:
@@ -1165,6 +1168,7 @@ export default class PromotionModuleService
   }
 
   @InjectManager()
+  @EmitEvents()
   async addPromotionRules(
     promotionId: string,
     rulesData: PromotionTypes.CreatePromotionRuleDTO[],
@@ -1288,6 +1292,8 @@ export default class PromotionModuleService
 
     validatePromotionRuleAttributes(rulesData)
 
+    const promotionRuleValuesDataToCreate: CreatePromotionRuleValueDTO[] = []
+
     for (const ruleData of rulesData) {
       const { values, ...rest } = ruleData
       const promotionRuleData: CreatePromotionRuleDTO = {
@@ -1308,11 +1314,13 @@ export default class PromotionModuleService
         promotion_rule: createdPromotionRule,
       }))
 
+      promotionRuleValuesDataToCreate.push(...promotionRuleValuesData)
+    }
+
     await this.promotionRuleValueService_.create(
-        promotionRuleValuesData,
+      promotionRuleValuesDataToCreate,
       sharedContext
     )
-    }
 
     return createdPromotionRules
   }
@@ -1630,7 +1638,7 @@ export default class PromotionModuleService
   @EmitEvents()
   async addPromotionsToCampaign(
     data: PromotionTypes.AddPromotionsToCampaignDTO,
-    @MedusaContext() sharedContext?: Context
+    @MedusaContext() sharedContext: Context = {}
   ): Promise<{ ids: string[] }> {
     const ids = await this.addPromotionsToCampaign_(data, sharedContext)
 

packages/modules/providers/locking-postgres/package.json

@@ -21,10 +21,10 @@
   "license": "MIT",
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "jest": "^29.7.0",

packages/modules/region/package.json

@@ -38,10 +38,10 @@
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "jest": "^29.7.0",
@@ -51,9 +51,9 @@
   },
   "peerDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1"
   }
 }

packages/modules/sales-channel/package.json

@@ -38,10 +38,10 @@
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "jest": "^29.7.0",
@@ -51,9 +51,9 @@
   },
   "peerDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1"
   }
 }

packages/modules/settings/package.json

@@ -38,10 +38,10 @@
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "jest": "^29.7.0",
@@ -51,9 +51,9 @@
   },
   "peerDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1"
   }
 }

packages/modules/stock-location/package.json

@@ -25,10 +25,10 @@
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "jest": "^29.7.0",
@@ -38,9 +38,9 @@
   },
   "peerDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1"
   },
   "scripts": {

packages/modules/store/package.json

@@ -38,10 +38,10 @@
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "jest": "^29.7.0",
@@ -51,9 +51,9 @@
   },
   "peerDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1"
   }
 }

packages/modules/tax/package.json

@@ -38,10 +38,10 @@
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "jest": "^29.7.0",
@@ -51,9 +51,9 @@
   },
   "peerDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1"
   }
 }

packages/modules/user/package.json

@@ -38,10 +38,10 @@
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "jest": "^29.7.0",
@@ -54,9 +54,9 @@
   },
   "peerDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1"
   }
 }

packages/modules/workflow-engine-inmemory/package.json

@@ -38,10 +38,10 @@
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "jest": "^29.7.0",
@@ -55,9 +55,9 @@
   },
   "peerDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1"
   }
 }

packages/modules/workflow-engine-redis/package.json

@@ -38,10 +38,10 @@
   "devDependencies": {
     "@medusajs/framework": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "jest": "^29.7.0",
@@ -56,9 +56,9 @@
   },
   "peerDependencies": {
     "@medusajs/framework": "2.10.3",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1"
   }
 }

packages/plugins/draft-order/package.json

@@ -51,13 +51,13 @@
     "@medusajs/icons": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
     "@medusajs/types": "2.10.3",
-    "@medusajs/ui": "4.0.23",
+    "@medusajs/ui": "4.0.21",
     "@medusajs/ui-preset": "2.10.3",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/knex": "6.4.3",
+    "@mikro-orm/knex": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "@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",
@@ -81,15 +81,15 @@
     "@medusajs/framework": "2.10.3",
     "@medusajs/icons": "2.10.3",
     "@medusajs/test-utils": "2.10.3",
-    "@medusajs/ui": "4.0.23",
+    "@medusajs/ui": "4.0.21",
-    "@mikro-orm/cli": "6.4.3",
+    "@mikro-orm/cli": "6.5.4",
-    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/core": "6.5.4",
-    "@mikro-orm/knex": "6.4.3",
+    "@mikro-orm/knex": "6.5.4",
-    "@mikro-orm/migrations": "6.4.3",
+    "@mikro-orm/migrations": "6.5.4",
-    "@mikro-orm/postgresql": "6.4.3",
+    "@mikro-orm/postgresql": "6.5.4",
     "awilix": "^8.0.1",
     "lodash": "^4.17.21",
-    "pg": "^8.13.0",
+    "pg": "^8.16.3",
     "react-router-dom": "6.20.1"
   },
   "engines": {