chore(): Move peer deps into a single package and re export from framework (#13439)

* chore(): Move peer deps into a single package and re export from framework

* WIP

* update core packages

* update cli and deps

* update medusa

* update exports path

* remove analyze

* update modules deps

* finalise changes

* fix yarn

* fix import

* Refactor peer dependencies into a single package

Consolidate peer dependencies into one package and re-export from the framework.

* update changeset

* Update .changeset/brown-cows-sleep.md

Co-authored-by: Oli Juhl <59018053+olivermrbl@users.noreply.github.com>

* rm deps

* fix deps

* increase timeout

* upgrade version

* update versions

* update versions

* fixes

* update lock

* fix missing import

* fix missing import

---------

Co-authored-by: Oli Juhl <59018053+olivermrbl@users.noreply.github.com>
This commit is contained in:
Adrien de PerettiandOli Juhl authored and GitHub committed 2025-09-22 18:36:22 +02:00
1 parent 55f89b2151
commit 12a96a7c70
349 files changed
+641 -1062

No files matched your search

@@ -8,7 +8,7 @@ import {
PrimaryKey,
Property,
Rel,
} from "@mikro-orm/core"
} from "@medusajs/deps/mikro-orm/core"
import { Searchable } from "../decorators/searchable"
@Entity()
@@ -1,5 +1,10 @@
import { Entity, MikroORM, OnInit, Property } from "@mikro-orm/core"
import { defineConfig } from "@mikro-orm/postgresql"
import {
Entity,
MikroORM,
OnInit,
Property,
} from "@medusajs/deps/mikro-orm/core"
import { defineConfig } from "@medusajs/deps/mikro-orm/postgresql"
import { BaseEntity } from "../base-entity"
describe("BaseEntity", () => {
@@ -1,6 +1,6 @@
import { BigNumberRawValue } from "@medusajs/types"
import { Entity, MikroORM, PrimaryKey } from "@mikro-orm/core"
import { defineConfig } from "@mikro-orm/postgresql"
import { Entity, MikroORM, PrimaryKey } from "@medusajs/deps/mikro-orm/core"
import { defineConfig } from "@medusajs/deps/mikro-orm/postgresql"
import { BigNumber } from "../../../totals/big-number"
import { MikroOrmBigNumberProperty } from "../big-number-field"
@@ -1,5 +1,5 @@
import { MikroORM } from "@mikro-orm/core"
import { defineConfig } from "@mikro-orm/postgresql"
import { MikroORM } from "@medusajs/deps/mikro-orm/core"
import { defineConfig } from "@medusajs/deps/mikro-orm/postgresql"
import { SearchableEntity1, SearchableEntity2 } from "../__fixtures__/utils"
import { mikroOrmFreeTextSearchFilterOptionsFactory } from "../mikro-orm-free-text-search-filter"
@@ -1,5 +1,5 @@
import { MikroORM } from "@mikro-orm/core"
import { defineConfig } from "@mikro-orm/postgresql"
import { MikroORM } from "@medusajs/deps/mikro-orm/core"
import { defineConfig } from "@medusajs/deps/mikro-orm/postgresql"
import {
Entity1WithUnDecoratedProp,
Entity2WithUnDecoratedProp,
@@ -4,7 +4,7 @@ import {
OnInit,
OptionalProps,
PrimaryKey,
} from "@mikro-orm/core"
} from "@medusajs/deps/mikro-orm/core"
import { generateEntityId } from "../../common"
@Entity({ abstract: true })
@@ -1,5 +1,5 @@
import { BigNumberInput } from "@medusajs/types"
import { EntityProperty, Platform, Property, Type } from "@mikro-orm/core"
import { EntityProperty, Platform, Property, Type } from "@medusajs/deps/mikro-orm/core"
import { isDefined, isObject, isPresent, trimZeros } from "../../common"
import { BigNumber } from "../../totals/big-number"
@@ -1,10 +1,10 @@
import { Constructor } from "@medusajs/types"
import { MikroORM, Utils } from "@mikro-orm/core"
import { MikroORM, Utils } from "@medusajs/deps/mikro-orm/core"
import {
Migrator as BaseMigrator,
Migration,
UmzugMigration,
} from "@mikro-orm/migrations"
} from "@medusajs/deps/mikro-orm/migrations"
import { isFileDisabled, isFileSkipped } from "../../common/define-file-config"
import { dynamicImport } from "../../common/dynamic-import"
@@ -4,7 +4,7 @@ import {
NotFoundError,
NotNullConstraintViolationException,
UniqueConstraintViolationException,
} from "@mikro-orm/core"
} from "@medusajs/deps/mikro-orm/core"
import { MedusaError, upperCaseFirst } from "../../common"
function parseValue(value: string) {
@@ -1,4 +1,4 @@
import { MetadataStorage } from "@mikro-orm/core"
import { MetadataStorage } from "@medusajs/deps/mikro-orm/core"
export function ForeignKey() {
return function (target, propertyName) {
@@ -1,4 +1,4 @@
import { MetadataStorage } from "@mikro-orm/core"
import { MetadataStorage } from "@medusajs/deps/mikro-orm/core"
export function Searchable() {
return function (target, propertyName) {
@@ -6,7 +6,7 @@ import {
PrimaryKey,
Property,
Rel,
} from "@mikro-orm/core"
} from "@medusajs/deps/mikro-orm/core"
import { Searchable } from "../../decorators/searchable"
// Circular dependency one level
@@ -13,8 +13,8 @@ import {
Property,
Unique,
wrap,
} from "@mikro-orm/core"
import { defineConfig } from "@mikro-orm/postgresql"
} from "@medusajs/deps/mikro-orm/core"
import { defineConfig } from "@medusajs/deps/mikro-orm/postgresql"
import BigNumber from "bignumber.js"
import { dropDatabase } from "pg-god"
import { MikroOrmBigNumberProperty } from "../../big-number-field"
@@ -1,5 +1,8 @@
import { MikroORM } from "@mikro-orm/core"
import { defineConfig, SqlEntityManager } from "@mikro-orm/postgresql"
import { MikroORM } from "@medusajs/deps/mikro-orm/core"
import {
defineConfig,
SqlEntityManager,
} from "@medusajs/deps/mikro-orm/postgresql"
import { dropDatabase } from "pg-god"
import { mikroOrmUpdateDeletedAtRecursively } from "../../utils"
import { getDatabaseURL, pgGodCredentials } from "../__fixtures__/database"
@@ -17,8 +20,8 @@ import {
const dbName = "mikroorm-utils-integration-1"
jest.mock("@mikro-orm/core", () => ({
...jest.requireActual("@mikro-orm/core"),
jest.mock("@medusajs/deps/mikro-orm/core", () => ({
...jest.requireActual("@medusajs/deps/mikro-orm/core"),
wrap: jest.fn().mockImplementation((entity) => ({
...entity,
init: jest.fn().mockResolvedValue(entity),
@@ -1,6 +1,6 @@
import { ModuleServiceInitializeOptions } from "@medusajs/types"
import { Filter as MikroORMFilter } from "@mikro-orm/core"
import { TSMigrationGenerator } from "@mikro-orm/migrations"
import { Filter as MikroORMFilter } from "@medusajs/deps/mikro-orm/core"
import { TSMigrationGenerator } from "@medusajs/deps/mikro-orm/migrations"
import { isString, retryExecution, stringifyCircular } from "../../common"
import { normalizeMigrationSQL } from "../utils"
import { CustomDBMigrator } from "./custom-db-migrator"
@@ -83,7 +83,9 @@ export async function mikroOrmCreateConnection(
schema = database.connection.context?.client?.config?.searchPath
}
const { MikroORM, defineConfig } = await import("@mikro-orm/postgresql")
const { MikroORM, defineConfig } = await import(
"@medusajs/deps/mikro-orm/postgresql"
)
const mikroOrmConfig = defineConfig({
discovery: { disableDynamicFileAccess: true, warnWhenNoEntities: false },
entities,
@@ -3,9 +3,10 @@ import type {
EntityProperty,
FindOneOptions,
FindOptions,
} from "@mikro-orm/core"
import { EntityMetadata, raw, ReferenceKind } from "@mikro-orm/core"
import { SqlEntityManager } from "@mikro-orm/postgresql"
EntityMetadata,
} from "@medusajs/deps/mikro-orm/core"
import { raw, ReferenceKind } from "@medusajs/deps/mikro-orm/postgresql"
import { SqlEntityManager } from "@medusajs/deps/mikro-orm/postgresql"
export const FreeTextSearchFilterKeyPrefix = "freeTextSearch_"
@@ -21,8 +21,8 @@ import {
FilterQuery as MikroFilterQuery,
FindOptions as MikroOptions,
ReferenceKind,
} from "@mikro-orm/core"
import { SqlEntityManager } from "@mikro-orm/postgresql"
} from "@medusajs/deps/mikro-orm/core"
import { SqlEntityManager } from "@medusajs/deps/mikro-orm/postgresql"
import {
arrayDifference,
isString,
@@ -15,7 +15,7 @@ import {
ReferenceKind,
SerializationContext,
Utils,
} from "@mikro-orm/core"
} from "@medusajs/deps/mikro-orm/core"
const STATIC_OPTIONS_SHAPE: {
populate: string[] | boolean | undefined
@@ -1,5 +1,5 @@
import { EntityMetadata, FindOptions } from "@mikro-orm/core"
import { SqlEntityManager } from "@mikro-orm/postgresql"
import { EntityMetadata, FindOptions } from "@medusajs/deps/mikro-orm/core"
import { SqlEntityManager } from "@medusajs/deps/mikro-orm/postgresql"
import { promiseAll } from "../../common"
import { isString } from "../../common/is-string"
import { buildQuery } from "../../modules-sdk/build-query"