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:
co-authored by
Oli Juhl
parent
55f89b2151
commit
12a96a7c70
@@ -27,18 +27,12 @@
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
"@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",
|
||||
"awilix": "^8.0.1",
|
||||
"expect-type": "^0.20.0",
|
||||
"express": "^4.21.0",
|
||||
"jest": "^29.7.0",
|
||||
"pg": "^8.16.3",
|
||||
"pg-god": "^1.0.12",
|
||||
"rimraf": "^5.0.1",
|
||||
"typescript": "^5.6.2"
|
||||
@@ -48,6 +42,7 @@
|
||||
"@graphql-codegen/typescript": "^4.0.9",
|
||||
"@graphql-tools/merge": "^9.0.7",
|
||||
"@graphql-tools/schema": "^10.0.6",
|
||||
"@medusajs/deps": "2.10.3",
|
||||
"@types/pluralize": "^0.0.33",
|
||||
"bignumber.js": "^9.1.2",
|
||||
"dotenv": "^16.4.5",
|
||||
@@ -60,13 +55,7 @@
|
||||
"zod": "3.25.76"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@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.16.3"
|
||||
"express": "^4.21.0"
|
||||
},
|
||||
"scripts": {
|
||||
"build": "rimraf dist && tsc --build",
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Index } from "@mikro-orm/core"
|
||||
import { Index } from "@medusajs/deps/mikro-orm/core"
|
||||
|
||||
/**
|
||||
* Create a PSQL index statement
|
||||
|
||||
@@ -6,7 +6,7 @@ import {
|
||||
ClassOrFunctionReturning,
|
||||
createContainer,
|
||||
Resolver,
|
||||
} from "awilix"
|
||||
} from "@medusajs/deps/awilix"
|
||||
|
||||
function asArray(
|
||||
resolvers: (ClassOrFunctionReturning<unknown> | Resolver<unknown>)[]
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
+2
-2
@@ -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
|
||||
|
||||
+2
-2
@@ -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"
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
import { ArrayType, EntityMetadata, MetadataStorage } from "@mikro-orm/core"
|
||||
import {
|
||||
ArrayType,
|
||||
EntityMetadata,
|
||||
MetadataStorage,
|
||||
} from "@medusajs/deps/mikro-orm/core"
|
||||
import { expectTypeOf } from "expect-type"
|
||||
import { DmlEntity } from "../entity"
|
||||
import { model } from "../entity-builder"
|
||||
|
||||
@@ -6,7 +6,7 @@ import type {
|
||||
Infer,
|
||||
PropertyType,
|
||||
} from "@medusajs/types"
|
||||
import { Entity, Filter, MetadataStorage } from "@mikro-orm/core"
|
||||
import { Entity, Filter, MetadataStorage } from "@medusajs/deps/mikro-orm/core"
|
||||
|
||||
import {
|
||||
mikroOrmFreeTextSearchFilterOptionsFactory,
|
||||
|
||||
@@ -12,7 +12,7 @@ import {
|
||||
PrimaryKey,
|
||||
Property,
|
||||
Utils,
|
||||
} from "@mikro-orm/core"
|
||||
} from "@medusajs/deps/mikro-orm/core"
|
||||
import { generateEntityId, isDefined } from "../../../common"
|
||||
import { MikroOrmBigNumberProperty } from "../../../dal"
|
||||
import { PrimaryKeyModifier } from "../../properties/primary-key"
|
||||
|
||||
@@ -17,7 +17,7 @@ import {
|
||||
OnInit,
|
||||
Property,
|
||||
rel,
|
||||
} from "@mikro-orm/core"
|
||||
} from "@medusajs/deps/mikro-orm/core"
|
||||
import { camelToSnakeCase, pluralize } from "../../../common"
|
||||
import { DmlEntity } from "../../entity"
|
||||
import { BelongsTo } from "../../relations"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Check, CheckOptions } from "@mikro-orm/core"
|
||||
import { Check, CheckOptions } from "@medusajs/deps/mikro-orm/core"
|
||||
import { CheckConstraint, EntityConstructor } from "@medusajs/types"
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { DMLSchema, EntityConstructor, EntityIndex } from "@medusajs/types"
|
||||
import { MetadataStorage } from "@mikro-orm/core"
|
||||
import { MetadataStorage } from "@medusajs/deps/mikro-orm/core"
|
||||
import { arrayDifference } from "../../../common"
|
||||
|
||||
/*
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { EntityConstructor } from "@medusajs/types"
|
||||
import { MetadataStorage, MikroORM } from "@mikro-orm/core"
|
||||
import { defineConfig } from "@mikro-orm/postgresql"
|
||||
import { MetadataStorage, MikroORM } from "@medusajs/deps/mikro-orm/core"
|
||||
import { defineConfig } from "@medusajs/deps/mikro-orm/postgresql"
|
||||
import { join } from "path"
|
||||
import { createDatabase, dropDatabase } from "pg-god"
|
||||
import { FileSystem } from "../../../common"
|
||||
|
||||
@@ -3,8 +3,8 @@ import {
|
||||
CheckConstraintViolationException,
|
||||
MetadataStorage,
|
||||
MikroORM,
|
||||
} 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 { join } from "path"
|
||||
import { createDatabase, dropDatabase } from "pg-god"
|
||||
import { FileSystem } from "../../../common"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { EntityConstructor } from "@medusajs/types"
|
||||
import { MetadataStorage, MikroORM } from "@mikro-orm/core"
|
||||
import { defineConfig } from "@mikro-orm/postgresql"
|
||||
import { MetadataStorage, MikroORM } from "@medusajs/deps/mikro-orm/core"
|
||||
import { defineConfig } from "@medusajs/deps/mikro-orm/postgresql"
|
||||
import { join } from "path"
|
||||
import { createDatabase, dropDatabase } from "pg-god"
|
||||
import { FileSystem } from "../../../common"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { EntityConstructor } from "@medusajs/types"
|
||||
import { MetadataStorage, MikroORM } from "@mikro-orm/core"
|
||||
import { defineConfig } from "@mikro-orm/postgresql"
|
||||
import { MetadataStorage, MikroORM } from "@medusajs/deps/mikro-orm/core"
|
||||
import { defineConfig } from "@medusajs/deps/mikro-orm/postgresql"
|
||||
import { join } from "path"
|
||||
import { createDatabase, dropDatabase } from "pg-god"
|
||||
import { FileSystem } from "../../../common"
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
import { EntityConstructor } from "@medusajs/types"
|
||||
import { MetadataStorage, MikroORM } from "@mikro-orm/core"
|
||||
import { defineConfig, SqlEntityManager } from "@mikro-orm/postgresql"
|
||||
import { MetadataStorage, MikroORM } from "@medusajs/deps/mikro-orm/core"
|
||||
import {
|
||||
defineConfig,
|
||||
SqlEntityManager,
|
||||
} from "@medusajs/deps/mikro-orm/postgresql"
|
||||
import { join } from "path"
|
||||
import { createDatabase, dropDatabase } from "pg-god"
|
||||
import { FileSystem } from "../../../common"
|
||||
|
||||
@@ -1,10 +1,13 @@
|
||||
import { MikroORM, MikroORMOptions } from "@mikro-orm/core"
|
||||
import { MikroORM, MikroORMOptions } from "@medusajs/deps/mikro-orm/core"
|
||||
import {
|
||||
MigrateOptions,
|
||||
MigrationResult,
|
||||
UmzugMigration,
|
||||
} from "@mikro-orm/migrations"
|
||||
import { defineConfig, PostgreSqlDriver } from "@mikro-orm/postgresql"
|
||||
} from "@medusajs/deps/mikro-orm/migrations"
|
||||
import {
|
||||
defineConfig,
|
||||
PostgreSqlDriver,
|
||||
} from "@medusajs/deps/mikro-orm/postgresql"
|
||||
import { EventEmitter } from "events"
|
||||
import { access, mkdir, rename, writeFile } from "fs/promises"
|
||||
import { dirname, join } from "path"
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
import { join } from "path"
|
||||
import { setTimeout } from "timers/promises"
|
||||
import { MetadataStorage } from "@mikro-orm/core"
|
||||
import { MetadataStorage } from "@medusajs/deps/mikro-orm/core"
|
||||
|
||||
import { Migrations } from "../../index"
|
||||
import { FileSystem } from "../../../common"
|
||||
|
||||
+3
-3
@@ -1,6 +1,6 @@
|
||||
import { MetadataStorage } from "@mikro-orm/core"
|
||||
import { TSMigrationGenerator } from "@mikro-orm/migrations"
|
||||
import { MikroORM } from "@mikro-orm/postgresql"
|
||||
import { MetadataStorage } from "@medusajs/deps/mikro-orm/core"
|
||||
import { TSMigrationGenerator } from "@medusajs/deps/mikro-orm/migrations"
|
||||
import { MikroORM } from "@medusajs/deps/mikro-orm/postgresql"
|
||||
import { join } from "path"
|
||||
import { createDatabase, dropDatabase } from "pg-god"
|
||||
|
||||
|
||||
+3
-3
@@ -1,8 +1,8 @@
|
||||
import { join } from "path"
|
||||
import { MikroORM } from "@mikro-orm/postgresql"
|
||||
import { MetadataStorage } from "@mikro-orm/core"
|
||||
import { MikroORM } from "@medusajs/deps/mikro-orm/postgresql"
|
||||
import { MetadataStorage } from "@medusajs/deps/mikro-orm/core"
|
||||
import { createDatabase, dropDatabase } from "pg-god"
|
||||
import { TSMigrationGenerator } from "@mikro-orm/migrations"
|
||||
import { TSMigrationGenerator } from "@medusajs/deps/mikro-orm/migrations"
|
||||
|
||||
import { model } from "../../../dml"
|
||||
import { FileSystem } from "../../../common"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { ModuleServiceInitializeOptions } from "@medusajs/types"
|
||||
import { knex } from "@mikro-orm/postgresql"
|
||||
import { knex } from "@medusajs/deps/mikro-orm/postgresql"
|
||||
|
||||
type Options = ModuleServiceInitializeOptions["database"]
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ import {
|
||||
RepositoryService,
|
||||
} from "@medusajs/types"
|
||||
|
||||
import { asClass } from "awilix"
|
||||
import { asClass } from "@medusajs/deps/awilix"
|
||||
import { MedusaInternalService } from "../medusa-internal-service"
|
||||
import { lowerCaseFirst } from "../../common"
|
||||
import {
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
import { Logger, MedusaContainer, ModulesSdkTypes } from "@medusajs/types"
|
||||
import { PostgreSqlDriver, SqlEntityManager } from "@mikro-orm/postgresql"
|
||||
import { asValue } from "awilix"
|
||||
import {
|
||||
PostgreSqlDriver,
|
||||
SqlEntityManager,
|
||||
} from "@medusajs/deps/mikro-orm/postgresql"
|
||||
import { asValue } from "@medusajs/deps/awilix"
|
||||
import { ContainerRegistrationKeys, MedusaError } from "../../common"
|
||||
import { mikroOrmCreateConnection } from "../../dal"
|
||||
import { isSharedConnectionSymbol } from "../create-pg-connection"
|
||||
|
||||
@@ -14,7 +14,7 @@ import {
|
||||
type EntityClass,
|
||||
type EntityManager,
|
||||
type EntitySchema,
|
||||
} from "@mikro-orm/core"
|
||||
} from "@medusajs/deps/mikro-orm/core"
|
||||
import {
|
||||
isDefined,
|
||||
isObject,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { LoaderOptions, Logger, ModulesSdkTypes } from "@medusajs/types"
|
||||
import { EntitySchema } from "@mikro-orm/core"
|
||||
import { EntitySchema } from "@medusajs/deps/mikro-orm/core"
|
||||
import { EOL } from "os"
|
||||
import { resolve } from "path"
|
||||
import { dynamicImport, isFileSkipped } from "../../common"
|
||||
|
||||
@@ -4,8 +4,8 @@ import type {
|
||||
EntityClassGroup,
|
||||
EntitySchema,
|
||||
MikroORMOptions,
|
||||
} 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 { kebabCase } from "../common"
|
||||
import { CustomDBMigrator, CustomTsMigrationGenerator } from "../dal"
|
||||
import { DmlEntity, toMikroOrmEntities } from "../dml"
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
|
||||
*/
|
||||
|
||||
import { Client, type ClientConfig } from "pg"
|
||||
import { Client, type ClientConfig } from "@medusajs/deps/pg"
|
||||
import { parse } from "pg-connection-string"
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user