From f4dd390ab16a7a5443536ef7c8c9f4e7952f5613 Mon Sep 17 00:00:00 2001 From: Adrien de Peretti Date: Fri, 5 Jul 2024 13:10:03 +0200 Subject: [PATCH] chore: Apply defineMikroOrmCliConfig (#7975) **What** Ensure all module rely on the same config for the dev db FIXES CORE-2493 --- packages/modules/api-key/mikro-orm.config.dev.ts | 12 +++--------- packages/modules/auth/mikro-orm.config.dev.ts | 8 +++----- packages/modules/cart/mikro-orm.config.dev.ts | 8 +++----- packages/modules/currency/mikro-orm.config.dev.ts | 5 ++--- packages/modules/customer/mikro-orm.config.dev.ts | 12 +++--------- .../modules/fulfillment/mikro-orm.config.dev.ts | 2 +- .../modules/inventory-next/mikro-orm.config.dev.ts | 12 +++--------- .../modules/notification/mikro-orm.config.dev.ts | 2 +- packages/modules/order/mikro-orm.config.dev.ts | 12 +++--------- packages/modules/payment/mikro-orm.config.dev.ts | 8 +++----- packages/modules/pricing/mikro-orm.config.dev.ts | 8 +++----- packages/modules/product/mikro-orm.config.dev.ts | 13 ++++--------- packages/modules/promotion/mikro-orm.config.dev.ts | 8 +++----- packages/modules/region/mikro-orm.config.dev.ts | 7 +++---- .../modules/sales-channel/mikro-orm.config.dev.ts | 8 +++----- .../stock-location-next/mikro-orm.config.dev.ts | 12 +++--------- packages/modules/store/mikro-orm.config.dev.ts | 8 +++----- packages/modules/tax/mikro-orm.config.dev.ts | 12 +++--------- packages/modules/user/mikro-orm.config.dev.ts | 12 +++--------- .../mikro-orm.config.dev.ts | 9 ++++----- .../workflow-engine-redis/mikro-orm.config.dev.ts | 9 ++++----- 21 files changed, 61 insertions(+), 126 deletions(-) diff --git a/packages/modules/api-key/mikro-orm.config.dev.ts b/packages/modules/api-key/mikro-orm.config.dev.ts index df194ea7c8..561ebe87cc 100644 --- a/packages/modules/api-key/mikro-orm.config.dev.ts +++ b/packages/modules/api-key/mikro-orm.config.dev.ts @@ -1,12 +1,6 @@ import * as entities from "./src/models" -import { TSMigrationGenerator } from "@medusajs/utils" +import { defineMikroOrmCliConfig, Modules } from "@medusajs/utils" -module.exports = { +export default defineMikroOrmCliConfig(Modules.API_KEY, { entities: Object.values(entities), - schema: "public", - clientUrl: "postgres://postgres@localhost/medusa-api-key", - type: "postgresql", - migrations: { - generator: TSMigrationGenerator, - }, -} +}) diff --git a/packages/modules/auth/mikro-orm.config.dev.ts b/packages/modules/auth/mikro-orm.config.dev.ts index 6992456cce..27c64ea32b 100644 --- a/packages/modules/auth/mikro-orm.config.dev.ts +++ b/packages/modules/auth/mikro-orm.config.dev.ts @@ -1,8 +1,6 @@ import * as entities from "./src/models" +import { defineMikroOrmCliConfig, Modules } from "@medusajs/utils" -module.exports = { +export default defineMikroOrmCliConfig(Modules.AUTH, { entities: Object.values(entities), - schema: "public", - clientUrl: "postgres://postgres@localhost/medusa-auth", - type: "postgresql", -} +}) diff --git a/packages/modules/cart/mikro-orm.config.dev.ts b/packages/modules/cart/mikro-orm.config.dev.ts index 41fc47b359..f84e539724 100644 --- a/packages/modules/cart/mikro-orm.config.dev.ts +++ b/packages/modules/cart/mikro-orm.config.dev.ts @@ -1,8 +1,6 @@ import * as entities from "./src/models" +import { defineMikroOrmCliConfig, Modules } from "@medusajs/utils" -module.exports = { +export default defineMikroOrmCliConfig(Modules.CART, { entities: Object.values(entities), - schema: "public", - clientUrl: "postgres://postgres@localhost/medusa-cart", - type: "postgresql", -} +}) diff --git a/packages/modules/currency/mikro-orm.config.dev.ts b/packages/modules/currency/mikro-orm.config.dev.ts index 37e66a6be2..6c52647591 100644 --- a/packages/modules/currency/mikro-orm.config.dev.ts +++ b/packages/modules/currency/mikro-orm.config.dev.ts @@ -1,7 +1,6 @@ -import { defineMikroOrmCliConfig } from "@medusajs/utils" +import { defineMikroOrmCliConfig, Modules } from "@medusajs/utils" import * as entities from "./src/models" -export default defineMikroOrmCliConfig({ +export default defineMikroOrmCliConfig(Modules.CURRENCY, { entities: Object.values(entities), - databaseName: "medusa-currency", }) diff --git a/packages/modules/customer/mikro-orm.config.dev.ts b/packages/modules/customer/mikro-orm.config.dev.ts index 20fc41e5be..2b3a613eeb 100644 --- a/packages/modules/customer/mikro-orm.config.dev.ts +++ b/packages/modules/customer/mikro-orm.config.dev.ts @@ -1,12 +1,6 @@ import * as entities from "./src/models" -import { TSMigrationGenerator } from "@medusajs/utils" +import { defineMikroOrmCliConfig, Modules } from "@medusajs/utils" -module.exports = { +export default defineMikroOrmCliConfig(Modules.CUSTOMER, { entities: Object.values(entities), - schema: "public", - clientUrl: "postgres://postgres@localhost/medusa-customer", - type: "postgresql", - migrations: { - generator: TSMigrationGenerator, - }, -} +}) diff --git a/packages/modules/fulfillment/mikro-orm.config.dev.ts b/packages/modules/fulfillment/mikro-orm.config.dev.ts index 5f14027b44..1079f2365f 100644 --- a/packages/modules/fulfillment/mikro-orm.config.dev.ts +++ b/packages/modules/fulfillment/mikro-orm.config.dev.ts @@ -1,6 +1,6 @@ import * as entities from "./src/models" import { defineMikroOrmCliConfig, Modules } from "@medusajs/utils" -module.exports = defineMikroOrmCliConfig(Modules.FULFILLMENT, { +export default defineMikroOrmCliConfig(Modules.FULFILLMENT, { entities: Object.values(entities), }) diff --git a/packages/modules/inventory-next/mikro-orm.config.dev.ts b/packages/modules/inventory-next/mikro-orm.config.dev.ts index 89f3871b23..11bdfad9ed 100644 --- a/packages/modules/inventory-next/mikro-orm.config.dev.ts +++ b/packages/modules/inventory-next/mikro-orm.config.dev.ts @@ -1,13 +1,7 @@ import * as entities from "./src/models" -import { TSMigrationGenerator } from "@medusajs/utils" +import { defineMikroOrmCliConfig, Modules } from "@medusajs/utils" -module.exports = { +export default defineMikroOrmCliConfig(Modules.INVENTORY, { entities: Object.values(entities), - schema: "public", - clientUrl: "postgres://postgres@localhost/medusa-inventory", - type: "postgresql", - migrations: { - generator: TSMigrationGenerator, - }, -} +}) diff --git a/packages/modules/notification/mikro-orm.config.dev.ts b/packages/modules/notification/mikro-orm.config.dev.ts index 01802bd865..ca687ffc53 100644 --- a/packages/modules/notification/mikro-orm.config.dev.ts +++ b/packages/modules/notification/mikro-orm.config.dev.ts @@ -1,6 +1,6 @@ import * as entities from "./src/models" import { defineMikroOrmCliConfig, Modules } from "@medusajs/utils" -module.exports = defineMikroOrmCliConfig(Modules.NOTIFICATION, { +export default defineMikroOrmCliConfig(Modules.NOTIFICATION, { entities: Object.values(entities), }) diff --git a/packages/modules/order/mikro-orm.config.dev.ts b/packages/modules/order/mikro-orm.config.dev.ts index 963eb5e619..5b46ffe9dd 100644 --- a/packages/modules/order/mikro-orm.config.dev.ts +++ b/packages/modules/order/mikro-orm.config.dev.ts @@ -1,12 +1,6 @@ -import { TSMigrationGenerator } from "@medusajs/utils" +import { defineMikroOrmCliConfig, Modules } from "@medusajs/utils" import * as entities from "./src/models" -module.exports = { +export default defineMikroOrmCliConfig(Modules.ORDER, { entities: Object.values(entities), - schema: "public", - clientUrl: "postgres://postgres@localhost/medusa-order", - type: "postgresql", - migrations: { - generator: TSMigrationGenerator, - }, -} +}) diff --git a/packages/modules/payment/mikro-orm.config.dev.ts b/packages/modules/payment/mikro-orm.config.dev.ts index 9e03481768..52f2951a36 100644 --- a/packages/modules/payment/mikro-orm.config.dev.ts +++ b/packages/modules/payment/mikro-orm.config.dev.ts @@ -1,8 +1,6 @@ import * as entities from "./src/models" +import { defineMikroOrmCliConfig, Modules } from "@medusajs/utils" -module.exports = { +export default defineMikroOrmCliConfig(Modules.PAYMENT, { entities: Object.values(entities), - schema: "public", - clientUrl: "postgres://postgres@localhost/medusa-payment", - type: "postgresql", -} +}) diff --git a/packages/modules/pricing/mikro-orm.config.dev.ts b/packages/modules/pricing/mikro-orm.config.dev.ts index fe6da460e6..038f512a6d 100644 --- a/packages/modules/pricing/mikro-orm.config.dev.ts +++ b/packages/modules/pricing/mikro-orm.config.dev.ts @@ -1,8 +1,6 @@ import * as entities from "./src/models" +import { defineMikroOrmCliConfig, Modules } from "@medusajs/utils" -module.exports = { +export default defineMikroOrmCliConfig(Modules.PRICING, { entities: Object.values(entities), - schema: "public", - clientUrl: "postgres://postgres@localhost/medusa-pricing", - type: "postgresql", -} +}) diff --git a/packages/modules/product/mikro-orm.config.dev.ts b/packages/modules/product/mikro-orm.config.dev.ts index 8096e6325a..daa79585ac 100644 --- a/packages/modules/product/mikro-orm.config.dev.ts +++ b/packages/modules/product/mikro-orm.config.dev.ts @@ -1,12 +1,7 @@ -import { TSMigrationGenerator } from "@mikro-orm/migrations" import * as entities from "./src/models" +import { defineMikroOrmCliConfig, Modules } from "@medusajs/utils" -module.exports = { +export default defineMikroOrmCliConfig(Modules.PRODUCT, { entities: Object.values(entities), - schema: "public", - clientUrl: "postgres://postgres@localhost/medusa-products", - type: "postgresql", - migrations: { - generator: TSMigrationGenerator, - }, -} + databaseName: "medusa-products", +}) diff --git a/packages/modules/promotion/mikro-orm.config.dev.ts b/packages/modules/promotion/mikro-orm.config.dev.ts index a07c8806f3..dc9ef94345 100644 --- a/packages/modules/promotion/mikro-orm.config.dev.ts +++ b/packages/modules/promotion/mikro-orm.config.dev.ts @@ -1,8 +1,6 @@ import * as entities from "./src/models" +import { defineMikroOrmCliConfig, Modules } from "@medusajs/utils" -module.exports = { +export default defineMikroOrmCliConfig(Modules.PRODUCT, { entities: Object.values(entities), - schema: "public", - clientUrl: "postgres://postgres@localhost/medusa-promotion", - type: "postgresql", -} +}) diff --git a/packages/modules/region/mikro-orm.config.dev.ts b/packages/modules/region/mikro-orm.config.dev.ts index 4fa735e4c3..a2e1382556 100644 --- a/packages/modules/region/mikro-orm.config.dev.ts +++ b/packages/modules/region/mikro-orm.config.dev.ts @@ -1,7 +1,6 @@ -import { defineMikroOrmCliConfig } from "@medusajs/utils" +import { defineMikroOrmCliConfig, Modules } from "@medusajs/utils" import * as entities from "./src/models" -export default defineMikroOrmCliConfig({ +export default defineMikroOrmCliConfig(Modules.REGION, { entities: Object.values(entities), - databaseName: "medusa-region", -}) \ No newline at end of file +}) diff --git a/packages/modules/sales-channel/mikro-orm.config.dev.ts b/packages/modules/sales-channel/mikro-orm.config.dev.ts index 48d29b9bb4..8f9f45ef98 100644 --- a/packages/modules/sales-channel/mikro-orm.config.dev.ts +++ b/packages/modules/sales-channel/mikro-orm.config.dev.ts @@ -1,8 +1,6 @@ import * as entities from "./src/models" +import { defineMikroOrmCliConfig, Modules } from "@medusajs/utils" -module.exports = { +export default defineMikroOrmCliConfig(Modules.SALES_CHANNEL, { entities: Object.values(entities), - schema: "public", - clientUrl: "postgres://postgres@localhost/medusa-sales-channel", - type: "postgresql", -} +}) diff --git a/packages/modules/stock-location-next/mikro-orm.config.dev.ts b/packages/modules/stock-location-next/mikro-orm.config.dev.ts index 44d8bb6455..00da7459ef 100644 --- a/packages/modules/stock-location-next/mikro-orm.config.dev.ts +++ b/packages/modules/stock-location-next/mikro-orm.config.dev.ts @@ -1,13 +1,7 @@ import * as entities from "./src/models" -import { TSMigrationGenerator } from "@medusajs/utils" +import { defineMikroOrmCliConfig, Modules } from "@medusajs/utils" -module.exports = { +export default defineMikroOrmCliConfig(Modules.STOCK_LOCATION, { entities: Object.values(entities), - schema: "public", - clientUrl: "postgres://postgres@localhost/medusa-stock-location", - type: "postgresql", - migrations: { - generator: TSMigrationGenerator, - }, -} +}) diff --git a/packages/modules/store/mikro-orm.config.dev.ts b/packages/modules/store/mikro-orm.config.dev.ts index 3c666f1f69..486c39ae9b 100644 --- a/packages/modules/store/mikro-orm.config.dev.ts +++ b/packages/modules/store/mikro-orm.config.dev.ts @@ -1,8 +1,6 @@ import * as entities from "./src/models" +import { defineMikroOrmCliConfig, Modules } from "@medusajs/utils" -module.exports = { +export default defineMikroOrmCliConfig(Modules.STORE, { entities: Object.values(entities), - schema: "public", - clientUrl: "postgres://postgres@localhost/medusa-store", - type: "postgresql", -} +}) diff --git a/packages/modules/tax/mikro-orm.config.dev.ts b/packages/modules/tax/mikro-orm.config.dev.ts index bd4bfe9701..33896c8c66 100644 --- a/packages/modules/tax/mikro-orm.config.dev.ts +++ b/packages/modules/tax/mikro-orm.config.dev.ts @@ -1,12 +1,6 @@ -import { TSMigrationGenerator } from "@medusajs/utils" +import { defineMikroOrmCliConfig, Modules } from "@medusajs/utils" import * as entities from "./src/models" -module.exports = { +export default defineMikroOrmCliConfig(Modules.TAX, { entities: Object.values(entities), - schema: "public", - clientUrl: "postgres://postgres@localhost/medusa-tax", - type: "postgresql", - migrations: { - generator: TSMigrationGenerator, - }, -} +}) diff --git a/packages/modules/user/mikro-orm.config.dev.ts b/packages/modules/user/mikro-orm.config.dev.ts index 451c0035c4..2deb0982b1 100644 --- a/packages/modules/user/mikro-orm.config.dev.ts +++ b/packages/modules/user/mikro-orm.config.dev.ts @@ -1,12 +1,6 @@ import * as entities from "./src/models" -import { TSMigrationGenerator } from "@medusajs/utils" +import { defineMikroOrmCliConfig, Modules } from "@medusajs/utils" -module.exports = { +export default defineMikroOrmCliConfig(Modules.USER, { entities: Object.values(entities), - schema: "public", - clientUrl: "postgres://postgres@localhost/medusa-user", - type: "postgresql", - migrations: { - generator: TSMigrationGenerator, - }, -} +}) diff --git a/packages/modules/workflow-engine-inmemory/mikro-orm.config.dev.ts b/packages/modules/workflow-engine-inmemory/mikro-orm.config.dev.ts index 81651a7600..3380283402 100644 --- a/packages/modules/workflow-engine-inmemory/mikro-orm.config.dev.ts +++ b/packages/modules/workflow-engine-inmemory/mikro-orm.config.dev.ts @@ -1,8 +1,7 @@ import * as entities from "./src/models" +import { defineMikroOrmCliConfig, Modules } from "@medusajs/utils" -module.exports = { +export default defineMikroOrmCliConfig(Modules.WORKFLOW_ENGINE, { entities: Object.values(entities), - schema: "public", - clientUrl: "postgres://postgres@localhost/medusa-workflow-engine-inmemory", - type: "postgresql", -} + databaseName: "medusa-workflow-engine-inmemory", +}) diff --git a/packages/modules/workflow-engine-redis/mikro-orm.config.dev.ts b/packages/modules/workflow-engine-redis/mikro-orm.config.dev.ts index 5468c7a41d..341f75d3fd 100644 --- a/packages/modules/workflow-engine-redis/mikro-orm.config.dev.ts +++ b/packages/modules/workflow-engine-redis/mikro-orm.config.dev.ts @@ -1,8 +1,7 @@ import * as entities from "./src/models" +import { defineMikroOrmCliConfig, Modules } from "@medusajs/utils" -module.exports = { +export default defineMikroOrmCliConfig(Modules.WORKFLOW_ENGINE, { entities: Object.values(entities), - schema: "public", - clientUrl: "postgres://postgres@localhost/medusa-workflow-engine-redis", - type: "postgresql", -} + databaseName: "medusa-workflow-engine-redis", +})