diff --git a/.changeset/real-cobras-deny.md b/.changeset/real-cobras-deny.md new file mode 100644 index 0000000000..2ac9c3360a --- /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.4 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 13d13d4eff..8d3a27bb9a 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 4ae518fe7b..f32b47cfa9 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.4", + "@mikro-orm/knex": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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/knex": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/knex": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "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 e0270ac8b5..e7f85efceb 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.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/core": "6.5.4", + "@mikro-orm/knex": "6.5.4", + "@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" }, diff --git a/packages/core/framework/package.json b/packages/core/framework/package.json index e2505d99c6..03fe85369e 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.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/core": "6.5.4", + "@mikro-orm/knex": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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/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.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/knex": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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": { diff --git a/packages/core/js-sdk/package.json b/packages/core/js-sdk/package.json index cf9c8f874f..4e8d0c3299 100644 --- a/packages/core/js-sdk/package.json +++ b/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" }, diff --git a/packages/core/modules-sdk/package.json b/packages/core/modules-sdk/package.json index fb11dab4b5..8774387bd5 100644 --- a/packages/core/modules-sdk/package.json +++ b/packages/core/modules-sdk/package.json @@ -31,31 +31,31 @@ "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", + "@medusajs/types": "2.10.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/knex": "6.5.4", + "@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/knex": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/knex": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "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 b27f9ea832..af5ae7c68f 100644 --- a/packages/core/orchestration/package.json +++ b/packages/core/orchestration/package.json @@ -26,31 +26,31 @@ "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", + "@medusajs/types": "2.10.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/knex": "6.5.4", + "@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/knex": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/knex": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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", diff --git a/packages/core/orchestration/src/joiner/remote-joiner.ts b/packages/core/orchestration/src/joiner/remote-joiner.ts index 95116af412..f1bc1f65c6 100644 --- a/packages/core/orchestration/src/joiner/remote-joiner.ts +++ b/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( 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 3d7a35db30..aa22aed0ef 100644 --- a/packages/core/utils/package.json +++ b/packages/core/utils/package.json @@ -26,10 +26,11 @@ "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", + "@medusajs/types": "2.10.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/knex": "6.5.4", + "@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/knex": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/knex": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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", 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 d9955cf25a..a00950b0ca 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 @@ -59,15 +59,15 @@ export class MikroOrmBase { async transaction( task: (transactionManager: TManager) => Promise, options: { + manager?: TManager isolationLevel?: string enableNestedTransactions?: boolean transaction?: TManager } = {} ): Promise { - this.manager_.global = true - return await transactionWrapper(this.manager_, task, options).catch( - dbErrorMapper - ) + const manager = this.getFreshManager() + + return await transactionWrapper(manager, task, options).catch(dbErrorMapper) } async serialize( @@ -463,12 +463,9 @@ export function mikroOrmBaseRepositoryFactory( 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, - }) - } 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..b7b68edb9e 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: { 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/modules-sdk/__tests__/medusa-internal-service.ts b/packages/core/utils/src/modules-sdk/__tests__/medusa-internal-service.ts index 6044862726..fa1f70149d 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..5560694169 100644 --- a/packages/core/utils/src/modules-sdk/decorators/inject-manager.ts +++ b/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 = - originalContext.manager ?? resourceWithManager.getFreshManager() + copiedContext.manager ??= + resourceWithManager.getFreshManager(originalContext) if (originalContext?.transactionManager) { copiedContext.transactionManager = originalContext?.transactionManager diff --git a/packages/core/utils/src/modules-sdk/decorators/inject-transaction-manager.ts b/packages/core/utils/src/modules-sdk/decorators/inject-transaction-manager.ts index 32b44a5270..384b7522e6 100644 --- a/packages/core/utils/src/modules-sdk/decorators/inject-transaction-manager.ts +++ b/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: diff --git a/packages/core/workflows-sdk/package.json b/packages/core/workflows-sdk/package.json index 40776f8d5b..ffe7c0d102 100644 --- a/packages/core/workflows-sdk/package.json +++ b/packages/core/workflows-sdk/package.json @@ -27,16 +27,17 @@ "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", + "@medusajs/types": "2.10.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/knex": "6.5.4", + "@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/knex": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/knex": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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", diff --git a/packages/medusa-test-utils/package.json b/packages/medusa-test-utils/package.json index 93cf8bce8b..9c729ff54d 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.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/core": "6.5.4", + "@mikro-orm/knex": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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": { diff --git a/packages/medusa-test-utils/src/medusa-test-runner-utils/wait-workflow-executions.ts b/packages/medusa-test-utils/src/medusa-test-runner-utils/wait-workflow-executions.ts index 5d2406567c..5e3419bfc1 100644 --- a/packages/medusa-test-utils/src/medusa-test-runner-utils/wait-workflow-executions.ts +++ b/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 diff --git a/packages/medusa/package.json b/packages/medusa/package.json index 9b3939c84e..ff10632dc2 100644 --- a/packages/medusa/package.json +++ b/packages/medusa/package.json @@ -136,10 +136,10 @@ }, "peerDependencies": { "@medusajs/framework": "2.10.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/core": "6.5.4", + "@mikro-orm/knex": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "@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 0491acea6c..282715efe2 100644 --- a/packages/modules/api-key/package.json +++ b/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/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "awilix": "^8.0.1" } } diff --git a/packages/modules/auth/package.json b/packages/modules/auth/package.json index a94dabd7a3..251e51dee1 100644 --- a/packages/modules/auth/package.json +++ b/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/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "awilix": "^8.0.1" } } diff --git a/packages/modules/cart/package.json b/packages/modules/cart/package.json index 3bb2c1f633..35a2a84898 100644 --- a/packages/modules/cart/package.json +++ b/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/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "awilix": "^8.0.1" } } diff --git a/packages/modules/currency/package.json b/packages/modules/currency/package.json index 5b6f296add..57c5410e27 100644 --- a/packages/modules/currency/package.json +++ b/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/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "awilix": "^8.0.1" } } diff --git a/packages/modules/customer/package.json b/packages/modules/customer/package.json index 0e0bfae475..628000db0b 100644 --- a/packages/modules/customer/package.json +++ b/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/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "awilix": "^8.0.1" } } diff --git a/packages/modules/file/package.json b/packages/modules/file/package.json index 679e5a8ab6..92810262fc 100644 --- a/packages/modules/file/package.json +++ b/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/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "@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 0219f06963..c7fd449df0 100644 --- a/packages/modules/fulfillment/package.json +++ b/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/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "awilix": "^8.0.1" } } diff --git a/packages/modules/index/package.json b/packages/modules/index/package.json index 385b78441c..67fd5b2d65 100644 --- a/packages/modules/index/package.json +++ b/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/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.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/knex": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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/knex": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/knex": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "awilix": "^8.0.1" } } diff --git a/packages/modules/inventory/package.json b/packages/modules/inventory/package.json index 5593cf6d76..5f5a47fa91 100644 --- a/packages/modules/inventory/package.json +++ b/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/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "awilix": "^8.0.1" }, "scripts": { diff --git a/packages/modules/link-modules/package.json b/packages/modules/link-modules/package.json index 8b7bfb1f2c..19606df212 100644 --- a/packages/modules/link-modules/package.json +++ b/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/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "awilix": "^8.0.1" } } diff --git a/packages/modules/locking/package.json b/packages/modules/locking/package.json index fc8b4a8ebc..0128293b03 100644 --- a/packages/modules/locking/package.json +++ b/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/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "awilix": "^8.0.1" } } diff --git a/packages/modules/locking/src/services/locking-module.ts b/packages/modules/locking/src/services/locking-module.ts index fd55a58347..bd2e3236b9 100644 --- a/packages/modules/locking/src/services/locking-module.ts +++ b/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" diff --git a/packages/modules/notification/package.json b/packages/modules/notification/package.json index 0692e97de0..a3bf0fb6dc 100644 --- a/packages/modules/notification/package.json +++ b/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/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "awilix": "^8.0.1" } } diff --git a/packages/modules/order/package.json b/packages/modules/order/package.json index 933d5907c8..bfaf18b7b2 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 --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/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "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 b984abd401..6f08e1b721 100644 --- a/packages/modules/payment/package.json +++ b/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/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "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 daae87bce6..2fe00e2615 100644 --- a/packages/modules/payment/src/services/payment-module.ts +++ b/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 diff --git a/packages/modules/pricing/package.json b/packages/modules/pricing/package.json index 6668092e65..fae1186f82 100644 --- a/packages/modules/pricing/package.json +++ b/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/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "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 53fd304089..fc93e0f5b3 100644 --- a/packages/modules/pricing/src/services/pricing-module.ts +++ b/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(), } }) } 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 1ba6506bdb..70e94e1b15 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 @@ -826,7 +826,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 25e8f0be2e..b8251f301f 100644 --- a/packages/modules/product/package.json +++ b/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/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "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 c23c14ec31..f5573a37f8 100644 --- a/packages/modules/product/src/repositories/product-category.ts +++ b/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_ diff --git a/packages/modules/product/src/services/product-module-service.ts b/packages/modules/product/src/services/product-module-service.ts index 70e334bf08..297b246cf9 100644 --- a/packages/modules/product/src/services/product-module-service.ts +++ b/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 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 68b47ce487..be129f0c31 100644 --- a/packages/modules/promotion/package.json +++ b/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/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "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 241935f9bd..bef3ae7008 100644 --- a/packages/modules/promotion/src/services/promotion-module.ts +++ b/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 @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,12 +1314,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 } @@ -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) diff --git a/packages/modules/providers/locking-postgres/package.json b/packages/modules/providers/locking-postgres/package.json index cf304b1354..38a8ef80f6 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.3", - "@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.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "@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 fa03f50d08..730262cd68 100644 --- a/packages/modules/region/package.json +++ b/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/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "awilix": "^8.0.1" } } diff --git a/packages/modules/sales-channel/package.json b/packages/modules/sales-channel/package.json index 2583505cc6..1050e05af1 100644 --- a/packages/modules/sales-channel/package.json +++ b/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/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "awilix": "^8.0.1" } } diff --git a/packages/modules/settings/package.json b/packages/modules/settings/package.json index 4f4bf2a73d..8f73cbfde0 100644 --- a/packages/modules/settings/package.json +++ b/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/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "awilix": "^8.0.1" } } diff --git a/packages/modules/stock-location/package.json b/packages/modules/stock-location/package.json index 687bf9b5da..76718697e5 100644 --- a/packages/modules/stock-location/package.json +++ b/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/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "awilix": "^8.0.1" }, "scripts": { diff --git a/packages/modules/store/package.json b/packages/modules/store/package.json index b14ae11a38..b0b8fd04d2 100644 --- a/packages/modules/store/package.json +++ b/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/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "awilix": "^8.0.1" } } diff --git a/packages/modules/tax/package.json b/packages/modules/tax/package.json index eada515971..2e76621960 100644 --- a/packages/modules/tax/package.json +++ b/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/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "awilix": "^8.0.1" } } diff --git a/packages/modules/user/package.json b/packages/modules/user/package.json index 512c80df68..b8740f6357 100644 --- a/packages/modules/user/package.json +++ b/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/core": "6.4.3", - "@mikro-orm/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/cli": "6.5.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "awilix": "^8.0.1" } } diff --git a/packages/modules/workflow-engine-inmemory/package.json b/packages/modules/workflow-engine-inmemory/package.json index 8e8ad9182b..51075137ca 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.3", "@medusajs/test-utils": "2.10.3", - "@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.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "awilix": "^8.0.1" } } diff --git a/packages/modules/workflow-engine-redis/package.json b/packages/modules/workflow-engine-redis/package.json index 012dbf5de8..cf7c0c9b13 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.3", "@medusajs/test-utils": "2.10.3", - "@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.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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/migrations": "6.4.3", - "@mikro-orm/postgresql": "6.4.3", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@mikro-orm/postgresql": "6.5.4", "awilix": "^8.0.1" } } diff --git a/packages/plugins/draft-order/package.json b/packages/plugins/draft-order/package.json index 6bc2c4d9d4..bd3f081994 100644 --- a/packages/plugins/draft-order/package.json +++ b/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/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.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/knex": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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", - "@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", + "@medusajs/ui": "4.0.21", + "@mikro-orm/cli": "6.5.4", + "@mikro-orm/core": "6.5.4", + "@mikro-orm/knex": "6.5.4", + "@mikro-orm/migrations": "6.5.4", + "@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": { diff --git a/yarn.lock b/yarn.lock index e75df151db..887eac1454 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6096,7 +6096,7 @@ __metadata: dependencies: "@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 @@ -6105,9 +6105,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -6167,10 +6167,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.3 "@medusajs/test-utils": 2.10.3 - "@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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@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.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -6224,10 +6224,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.3 "@medusajs/test-utils": 2.10.3 - "@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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@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.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -6249,10 +6249,10 @@ __metadata: dependencies: "@medusajs/telemetry": 2.10.3 "@medusajs/utils": 2.10.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/core": 6.5.4 + "@mikro-orm/knex": 6.5.4 + "@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.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.4 + "@mikro-orm/knex": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 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.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/core": 6.5.4 + "@mikro-orm/knex": 6.5.4 + "@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 @@ -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.3 "@medusajs/test-utils": 2.10.3 - "@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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@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.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -6351,10 +6351,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.3 "@medusajs/test-utils": 2.10.3 - "@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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@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.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -6444,13 +6444,13 @@ __metadata: "@medusajs/js-sdk": 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/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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/knex": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@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 @@ -6479,15 +6479,15 @@ __metadata: "@medusajs/framework": 2.10.3 "@medusajs/icons": 2.10.3 "@medusajs/test-utils": 2.10.3 - "@medusajs/ui": 4.0.23 - "@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 + "@medusajs/ui": 4.0.21 + "@mikro-orm/cli": 6.5.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/knex": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@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 languageName: unknown linkType: soft @@ -6566,10 +6566,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.3 "@medusajs/test-utils": 2.10.3 - "@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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -6595,10 +6595,10 @@ __metadata: "@medusajs/types": 2.10.3 "@medusajs/utils": 2.10.3 "@medusajs/workflows-sdk": 2.10.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/core": 6.5.4 + "@mikro-orm/knex": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@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.3 - "@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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/knex": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@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: "@aws-sdk/client-dynamodb": @@ -6679,10 +6679,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.3 "@medusajs/test-utils": 2.10.3 - "@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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@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.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -6732,17 +6732,26 @@ __metadata: languageName: unknown linkType: soft +"@medusajs/icons@npm:2.10.1": + version: 2.10.1 + resolution: "@medusajs/icons@npm:2.10.1" + peerDependencies: + react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc + checksum: 280e7174376a1e36db5376a2efee659a6b4f1002bd9136a6966c039587373688c4f1239830873c9d592bc570592ddc014037d7af6d9d075e5093ae6c74d0f351 + languageName: node + linkType: hard + "@medusajs/index@2.10.3, @medusajs/index@workspace:packages/modules/index": version: 0.0.0-use.local resolution: "@medusajs/index@workspace:packages/modules/index" dependencies: "@medusajs/framework": 2.10.3 "@medusajs/test-utils": 2.10.3 - "@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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/knex": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -6751,10 +6760,10 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.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/core": 6.5.4 + "@mikro-orm/knex": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -6765,10 +6774,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.3 "@medusajs/test-utils": 2.10.3 - "@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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -6777,9 +6786,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -6804,9 +6813,9 @@ __metadata: dependencies: "@medusajs/framework": 2.10.3 "@medusajs/test-utils": 2.10.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 cross-env: ^5.2.1 @@ -6816,9 +6825,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -6828,10 +6837,10 @@ __metadata: resolution: "@medusajs/locking-postgres@workspace:packages/modules/providers/locking-postgres" dependencies: "@medusajs/framework": 2.10.3 - "@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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -6864,10 +6873,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.3 "@medusajs/test-utils": 2.10.3 - "@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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -6876,9 +6885,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7001,10 +7010,10 @@ __metadata: zod: 3.25.76 peerDependencies: "@medusajs/framework": 2.10.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/core": 6.5.4 + "@mikro-orm/knex": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@opentelemetry/instrumentation-pg": ^0.52.0 "@opentelemetry/resources": ^2.0.0 "@opentelemetry/sdk-node": ^0.200.0 @@ -7041,26 +7050,26 @@ __metadata: "@medusajs/orchestration": 2.10.3 "@medusajs/types": 2.10.3 "@medusajs/utils": 2.10.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/core": 6.5.4 + "@mikro-orm/knex": 6.5.4 + "@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 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.4 + "@mikro-orm/knex": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 express: ^4.21.0 - pg: ^8.13.0 + pg: ^8.16.3 languageName: unknown linkType: soft @@ -7101,10 +7110,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.3 "@medusajs/test-utils": 2.10.3 - "@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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -7113,9 +7122,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7135,26 +7144,26 @@ __metadata: dependencies: "@medusajs/types": 2.10.3 "@medusajs/utils": 2.10.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/core": 6.5.4 + "@mikro-orm/knex": 6.5.4 + "@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 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.4 + "@mikro-orm/knex": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 express: ^4.21.0 - pg: ^8.13.0 + pg: ^8.16.3 languageName: unknown linkType: soft @@ -7164,10 +7173,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.3 "@medusajs/test-utils": 2.10.3 - "@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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -7176,9 +7185,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7206,10 +7215,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.3 "@medusajs/test-utils": 2.10.3 - "@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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -7218,9 +7227,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7231,10 +7240,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.3 "@medusajs/test-utils": 2.10.3 - "@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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -7243,9 +7252,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7256,10 +7265,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.3 "@medusajs/test-utils": 2.10.3 - "@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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 faker: ^5.5.3 @@ -7269,9 +7278,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7282,10 +7291,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.3 "@medusajs/test-utils": 2.10.3 - "@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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -7294,9 +7303,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7307,10 +7316,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.3 "@medusajs/test-utils": 2.10.3 - "@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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -7319,9 +7328,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7332,10 +7341,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.3 "@medusajs/test-utils": 2.10.3 - "@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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -7344,9 +7353,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7357,10 +7366,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.3 "@medusajs/test-utils": 2.10.3 - "@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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -7369,9 +7378,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7382,10 +7391,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.3 "@medusajs/test-utils": 2.10.3 - "@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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -7394,9 +7403,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7407,10 +7416,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.3 "@medusajs/test-utils": 2.10.3 - "@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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -7419,9 +7428,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7432,10 +7441,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.3 "@medusajs/test-utils": 2.10.3 - "@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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -7444,9 +7453,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7478,17 +7487,17 @@ __metadata: resolution: "@medusajs/test-utils@workspace:packages/medusa-test-utils" dependencies: "@medusajs/framework": 2.10.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/core": 6.5.4 + "@mikro-orm/knex": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@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 +7505,7 @@ __metadata: 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: "@medusajs/medusa": @@ -7634,16 +7643,40 @@ __metadata: languageName: unknown linkType: soft +"@medusajs/ui@npm:4.0.21": + version: 4.0.21 + resolution: "@medusajs/ui@npm:4.0.21" + dependencies: + "@medusajs/icons": 2.10.1 + "@tanstack/react-table": 8.20.5 + clsx: ^1.2.1 + copy-to-clipboard: ^3.3.3 + cva: 1.0.0-beta.1 + prism-react-renderer: ^2.0.6 + prismjs: ^1.29.0 + radix-ui: 1.1.2 + react-aria: ^3.33.1 + react-currency-input-field: ^3.6.11 + react-stately: ^3.31.1 + sonner: ^1.5.0 + tailwind-merge: ^2.2.1 + peerDependencies: + react: ^18.0.0 || ^19.0.0 || ^19.0.0-rc + react-dom: ^18.0.0 || ^19.0.0 || ^19.0.0-rc + checksum: 9e5af539201aa2e50090134a492a992e01233943a39c7d21e8193469c4d379c6a0fce55cc2541cb4ce4e93813bb76015e9256043769a551a8c0cad338774512d + languageName: node + linkType: hard + "@medusajs/user@2.10.3, @medusajs/user@workspace:^, @medusajs/user@workspace:packages/modules/user": version: 0.0.0-use.local resolution: "@medusajs/user@workspace:packages/modules/user" dependencies: "@medusajs/framework": 2.10.3 "@medusajs/test-utils": 2.10.3 - "@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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 jest: ^29.7.0 @@ -7653,9 +7686,9 @@ __metadata: typescript: ^5.6.2 peerDependencies: "@medusajs/framework": 2.10.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7669,10 +7702,10 @@ __metadata: "@graphql-tools/merge": ^9.0.7 "@graphql-tools/schema": ^10.0.6 "@medusajs/types": 2.10.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/core": 6.5.4 + "@mikro-orm/knex": 6.5.4 + "@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 @@ -7686,7 +7719,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 +7728,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.4 + "@mikro-orm/knex": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 express: ^4.21.0 - pg: ^8.13.0 + pg: ^8.16.3 languageName: unknown linkType: soft @@ -7711,10 +7744,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.3 "@medusajs/test-utils": 2.10.3 - "@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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 cron-parser: ^4.9.0 @@ -7725,9 +7758,9 @@ __metadata: ulid: ^2.3.0 peerDependencies: "@medusajs/framework": 2.10.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7738,10 +7771,10 @@ __metadata: dependencies: "@medusajs/framework": 2.10.3 "@medusajs/test-utils": 2.10.3 - "@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.4 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 bullmq: 5.13.0 @@ -7753,9 +7786,9 @@ __metadata: ulid: ^2.3.0 peerDependencies: "@medusajs/framework": 2.10.3 - "@mikro-orm/core": 6.4.3 - "@mikro-orm/migrations": 6.4.3 - "@mikro-orm/postgresql": 6.4.3 + "@mikro-orm/core": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -7768,68 +7801,68 @@ __metadata: "@medusajs/orchestration": 2.10.3 "@medusajs/types": 2.10.3 "@medusajs/utils": 2.10.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/core": 6.5.4 + "@mikro-orm/knex": 6.5.4 + "@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 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.4 + "@mikro-orm/knex": 6.5.4 + "@mikro-orm/migrations": 6.5.4 + "@mikro-orm/postgresql": 6.5.4 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.4": + version: 6.5.4 + resolution: "@mikro-orm/cli@npm:6.5.4" 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.4 + "@mikro-orm/knex": 6.5.4 + fs-extra: 11.3.2 tsconfig-paths: 4.2.0 yargs: 17.7.2 bin: mikro-orm: ./cli mikro-orm-esm: ./esm - checksum: de49d269d942fad5b3bde9cc4d21d0252a38543e00e70335024c98c1dfbc12fb30ff6271215b998d5a3c56f0c5cc5bab30c0109cda76b47f8b64d81f312c8698 + checksum: 828694dcb8a1c5b8c12e0e0610032bd772f085f45ffa5fc13be5c87c1f28f13539b56204151588af0ab6656cba1dce3fb20966ac03d50815f315ba66bc240acb 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.4": + version: 6.5.4 + resolution: "@mikro-orm/core@npm:6.5.4" dependencies: dataloader: 2.2.3 - dotenv: 16.4.7 + dotenv: 17.2.2 esprima: 4.0.1 - fs-extra: 11.2.0 + fs-extra: 11.3.2 globby: 11.1.0 - mikro-orm: 6.4.3 + mikro-orm: 6.5.4 reflect-metadata: 0.2.2 - checksum: d056eb9323a10f940e101a8a95454dcb2c4fa3429517e1a14a1b706869f53e92c2d2d2c9dfe330c02afbef101612787b1184db255ac5d74df5b0df0059928dd2 + checksum: 20058d8b02afbb73ec850451bf1a388c3e135e99045bab9d268a6375617140d9b4adddcc9064564ee2e55a8d56fd9112ad56349745daf372373fefb6115f18cb 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.4": + version: 6.5.4 + resolution: "@mikro-orm/knex@npm:6.5.4" dependencies: - fs-extra: 11.2.0 + fs-extra: 11.3.2 knex: 3.1.0 sqlstring: 2.3.3 peerDependencies: @@ -7844,35 +7877,35 @@ __metadata: optional: true mariadb: optional: true - checksum: 08dabcf1ea99d6a976892b4973e5de3f4b53e7ed0d3a1e3dcec20dd9349ba5a3ed153bbb96173990cd12367b3744df17f27bb3de751624207592e5d2f6e8637d + checksum: e8effea42422ceefec2ce50b74c493a5919e702f39f3167cf3f431f73d9a27d0f77800e20f961302257ec92afb5010068b35cb9632a114e086cf78306fd290b4 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.4": + version: 6.5.4 + resolution: "@mikro-orm/migrations@npm:6.5.4" dependencies: - "@mikro-orm/knex": 6.4.3 - fs-extra: 11.2.0 + "@mikro-orm/knex": 6.5.4 + fs-extra: 11.3.2 umzug: 3.8.2 peerDependencies: "@mikro-orm/core": ^6.0.0 - checksum: 04e7e2405a3d0d94213f2bf40c34988e190f8f0df5ff4565ef23c750680b198f293247418ee60c0605edfcbca119177f2e87dc01d3e6abfc15ec7c4dc976324a + checksum: 345aea93fb5652f8c78c057d89e55fc2b8f106fad65ac44ee7d39c1f85b3ae402c35dacba0cf2cc5ace1a0abb2074a1de1b45c55e79bbaee2217744df32542bc 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.4": + version: 6.5.4 + resolution: "@mikro-orm/postgresql@npm:6.5.4" dependencies: - "@mikro-orm/knex": 6.4.3 - pg: 8.13.1 - postgres-array: 3.0.2 + "@mikro-orm/knex": 6.5.4 + 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: a5102550998041ab6b91c528a8a8a69d06f1d851194679c0b27ff54d433798089417555b44e2371caab056eaa84e8865bd4dbd5eecacb04f1c0ae8304aa5a2df languageName: node linkType: hard @@ -18128,13 +18161,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 +19528,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 +20661,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.2": + version: 17.2.2 + resolution: "dotenv@npm:17.2.2" + checksum: be66513504590aff6eccb14167625aed9bd42ce80547f4fe5d195860211971a7060949b57108dfaeaf90658f79e40edccd3f233f0a978bff507b5b1565ae162b languageName: node linkType: hard @@ -23016,14 +23042,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.2": + version: 11.3.2 + resolution: "fs-extra@npm:11.3.2" dependencies: graceful-fs: ^4.2.0 jsonfile: ^6.0.1 universalify: ^2.0.0 - checksum: d77a9a9efe60532d2e790e938c81a02c1b24904ef7a3efb3990b835514465ba720e99a6ea56fd5e2db53b4695319b644d76d5a0e9988a2beef80aa7b1da63398 + checksum: f5d629e1bb646d5dedb4d8b24c5aad3deb8cc1d5438979d6f237146cd10e113b49a949ae1b54212c2fbc98e2d0995f38009a9a1d0520f0287943335e65fe919b languageName: node linkType: hard @@ -23049,6 +23075,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 +27252,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.4": + version: 6.5.4 + resolution: "mikro-orm@npm:6.5.4" + checksum: f2ee9bc9598d88ca086f34d26283355ddd48b1a2095ce90d0c59b8d629309d28759b327dd2dedbea4c72c3bcb189ba37d8a24013edce8402a711e640b138c6d4 languageName: node linkType: hard @@ -28772,13 +28809,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 +29083,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 +29097,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 +29104,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 +29141,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 +29192,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 +29210,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 +29902,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 +29916,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"