chore: Update modules deps (#9286)

This commit is contained in:
Adrien de Peretti
2024-09-26 07:44:35 +02:00
committed by GitHub
parent 11d8264062
commit e096feb7d5
518 changed files with 1115 additions and 957 deletions
@@ -3,7 +3,7 @@ import {
MedusaService,
model,
Module,
} from "@medusajs/utils"
} from "@medusajs/framework/utils"
export const User = model.define("user", {
id: model.id().primaryKey(),
@@ -1,6 +1,6 @@
import { MedusaModule } from "@medusajs/modules-sdk"
import { ILinkModule, ModuleJoinerConfig } from "@medusajs/types"
import { Modules, defineLink, isObject } from "@medusajs/utils"
import { MedusaModule } from "@medusajs/framework/modules-sdk"
import { ILinkModule, ModuleJoinerConfig } from "@medusajs/framework/types"
import { Modules, defineLink, isObject } from "@medusajs/framework/utils"
import { moduleIntegrationTestRunner } from "medusa-test-utils"
import { MigrationsExecutionPlanner } from "../../src"
import {
+2 -5
View File
@@ -33,7 +33,7 @@
"test:integration": "jest --forceExit -- integration-tests/**/__tests__/**/*.ts"
},
"devDependencies": {
"@medusajs/types": "^1.11.16",
"@medusajs/framework": "^0.0.1",
"cross-env": "^5.2.1",
"jest": "^29.7.0",
"medusa-test-utils": "^1.1.44",
@@ -43,11 +43,8 @@
"tsc-alias": "^1.8.6",
"typescript": "^5.6.2"
},
"dependencies": {
"@medusajs/modules-sdk": "^1.12.11",
"@medusajs/utils": "^1.11.9"
},
"peerDependencies": {
"@medusajs/framework": "^0.0.1",
"@mikro-orm/core": "5.9.7",
"@mikro-orm/migrations": "5.9.7",
"@mikro-orm/postgresql": "5.9.7",
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { LINKS, Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { LINKS, Modules } from "@medusajs/framework/utils"
export const CartPaymentCollection: ModuleJoinerConfig = {
serviceName: LINKS.CartPaymentCollection,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { LINKS, Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { LINKS, Modules } from "@medusajs/framework/utils"
export const CartPromotion: ModuleJoinerConfig = {
serviceName: LINKS.CartPromotion,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { LINKS, Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { LINKS, Modules } from "@medusajs/framework/utils"
export const LocationFulfillmentProvider: ModuleJoinerConfig = {
serviceName: LINKS.LocationFulfillmentProvider,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { LINKS, Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { LINKS, Modules } from "@medusajs/framework/utils"
export const LocationFulfillmentSet: ModuleJoinerConfig = {
serviceName: LINKS.LocationFulfillmentSet,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { LINKS, Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { LINKS, Modules } from "@medusajs/framework/utils"
export const OrderCart: ModuleJoinerConfig = {
serviceName: LINKS.OrderCart,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { LINKS, Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { LINKS, Modules } from "@medusajs/framework/utils"
export const OrderClaimPaymentCollection: ModuleJoinerConfig = {
serviceName: LINKS.OrderClaimPaymentCollection,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { LINKS, Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { LINKS, Modules } from "@medusajs/framework/utils"
export const OrderExchangePaymentCollection: ModuleJoinerConfig = {
serviceName: LINKS.OrderExchangePaymentCollection,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { LINKS, Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { LINKS, Modules } from "@medusajs/framework/utils"
export const OrderFulfillment: ModuleJoinerConfig = {
serviceName: LINKS.OrderFulfillment,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { LINKS, Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { LINKS, Modules } from "@medusajs/framework/utils"
export const OrderPaymentCollection: ModuleJoinerConfig = {
serviceName: LINKS.OrderPaymentCollection,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { LINKS, Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { LINKS, Modules } from "@medusajs/framework/utils"
export const OrderPromotion: ModuleJoinerConfig = {
serviceName: LINKS.OrderPromotion,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { LINKS, Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { LINKS, Modules } from "@medusajs/framework/utils"
export const ReturnFulfillment: ModuleJoinerConfig = {
serviceName: LINKS.ReturnFulfillment,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { LINKS, Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { LINKS, Modules } from "@medusajs/framework/utils"
export const ProductSalesChannel: ModuleJoinerConfig = {
serviceName: LINKS.ProductSalesChannel,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { LINKS, Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { LINKS, Modules } from "@medusajs/framework/utils"
export const ProductVariantInventoryItem: ModuleJoinerConfig = {
serviceName: LINKS.ProductVariantInventoryItem,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { LINKS, Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { LINKS, Modules } from "@medusajs/framework/utils"
export const ProductVariantPriceSet: ModuleJoinerConfig = {
serviceName: LINKS.ProductVariantPriceSet,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { LINKS, Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { LINKS, Modules } from "@medusajs/framework/utils"
export const PublishableApiKeySalesChannel: ModuleJoinerConfig = {
serviceName: LINKS.PublishableApiKeySalesChannel,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { Modules } from "@medusajs/framework/utils"
export const CartCustomer: ModuleJoinerConfig = {
isLink: true,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { Modules } from "@medusajs/framework/utils"
export const CartProduct: ModuleJoinerConfig = {
isLink: true,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { Modules } from "@medusajs/framework/utils"
export const CartRegion: ModuleJoinerConfig = {
isLink: true,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { Modules } from "@medusajs/framework/utils"
export const CartSalesChannel: ModuleJoinerConfig = {
isLink: true,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { Modules } from "@medusajs/framework/utils"
export const InventoryLevelStockLocation: ModuleJoinerConfig = {
isLink: true,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { Modules } from "@medusajs/framework/utils"
export const LineItemAdjustmentPromotion: ModuleJoinerConfig = {
isLink: true,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { Modules } from "@medusajs/framework/utils"
export const OrderCustomer: ModuleJoinerConfig = {
isLink: true,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { Modules } from "@medusajs/framework/utils"
export const OrderProduct: ModuleJoinerConfig = {
isLink: true,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { Modules } from "@medusajs/framework/utils"
export const OrderRegion: ModuleJoinerConfig = {
isLink: true,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { Modules } from "@medusajs/framework/utils"
export const OrderSalesChannel: ModuleJoinerConfig = {
isLink: true,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { Modules } from "@medusajs/framework/utils"
export const StoreCurrencies: ModuleJoinerConfig = {
isLink: true,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { LINKS, Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { LINKS, Modules } from "@medusajs/framework/utils"
export const RegionPaymentProvider: ModuleJoinerConfig = {
serviceName: LINKS.RegionPaymentProvider,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { LINKS, Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { LINKS, Modules } from "@medusajs/framework/utils"
export const SalesChannelLocation: ModuleJoinerConfig = {
serviceName: LINKS.SalesChannelLocation,
@@ -1,5 +1,5 @@
import { ModuleJoinerConfig } from "@medusajs/types"
import { LINKS, Modules } from "@medusajs/utils"
import { ModuleJoinerConfig } from "@medusajs/framework/types"
import { LINKS, Modules } from "@medusajs/framework/utils"
export const ShippingOptionPriceSet: ModuleJoinerConfig = {
serviceName: LINKS.ShippingOptionPriceSet,
@@ -2,7 +2,7 @@ import {
MedusaModule,
MODULE_RESOURCE_TYPE,
MODULE_SCOPE,
} from "@medusajs/modules-sdk"
} from "@medusajs/framework/modules-sdk"
import {
ExternalModuleDeclaration,
ILinkModule,
@@ -12,7 +12,7 @@ import {
ModuleJoinerConfig,
ModuleServiceInitializeCustomDataLayerOptions,
ModuleServiceInitializeOptions,
} from "@medusajs/types"
} from "@medusajs/framework/types"
import {
arrayDifference,
composeLinkName,
@@ -21,7 +21,7 @@ import {
Modules,
simpleHash,
toPascalCase,
} from "@medusajs/utils"
} from "@medusajs/framework/utils"
import * as linkDefinitions from "../definitions"
import { MigrationsExecutionPlanner } from "../migration"
import { InitializeModuleInjectableDependencies } from "../types"
@@ -2,7 +2,7 @@ import {
JoinerRelationship,
ModuleExports,
ModuleJoinerConfig,
} from "@medusajs/types"
} from "@medusajs/framework/types"
import { getModuleService, getReadOnlyModuleService } from "@services"
import { getLoaders } from "../loaders"
@@ -3,8 +3,8 @@ import {
LoaderOptions,
ModuleServiceInitializeCustomDataLayerOptions,
ModuleServiceInitializeOptions,
} from "@medusajs/types"
import { ModulesSdkUtils } from "@medusajs/utils"
} from "@medusajs/framework/types"
import { ModulesSdkUtils } from "@medusajs/framework/utils"
import { EntitySchema } from "@mikro-orm/core"
@@ -6,13 +6,13 @@ import {
LoaderOptions,
ModuleJoinerConfig,
ModulesSdkTypes,
} from "@medusajs/types"
} from "@medusajs/framework/types"
import {
composeLinkName,
composeTableName,
simpleHash,
toPascalCase,
} from "@medusajs/utils"
} from "@medusajs/framework/utils"
import { asClass, asValue } from "awilix"
export function containerLoader(entity, joinerConfig: ModuleJoinerConfig) {
return async (
@@ -2,7 +2,7 @@ import {
JoinerRelationship,
ModuleJoinerConfig,
ModuleLoaderFunction,
} from "@medusajs/types"
} from "@medusajs/framework/types"
import { generateEntity } from "../utils"
import { connectionLoader } from "./connection"
@@ -4,14 +4,14 @@ import {
ModuleJoinerConfig,
ModuleServiceInitializeOptions,
PlannerActionLinkDescriptor,
} from "@medusajs/types"
} from "@medusajs/framework/types"
import {
DALUtils,
ModulesSdkUtils,
arrayDifference,
promiseAll,
} from "@medusajs/utils"
} from "@medusajs/framework/utils"
import { EntitySchema, MikroORM } from "@mikro-orm/core"
import { DatabaseSchema, PostgreSqlDriver } from "@mikro-orm/postgresql"
import { generateEntity } from "../utils"
@@ -1,2 +1,2 @@
export { MikroOrmBaseRepository as BaseRepository } from "@medusajs/utils"
export { MikroOrmBaseRepository as BaseRepository } from "@medusajs/framework/utils"
export { getLinkRepository } from "./link"
@@ -1,10 +1,10 @@
import { Context, ModuleJoinerConfig } from "@medusajs/types"
import { Context, ModuleJoinerConfig } from "@medusajs/framework/types"
import { EntitySchema } from "@mikro-orm/core"
import {
generateEntityId,
mikroOrmBaseRepositoryFactory,
} from "@medusajs/utils"
} from "@medusajs/framework/utils"
import { SqlEntityManager } from "@mikro-orm/postgresql"
export function getLinkRepository(model: EntitySchema) {
@@ -1,5 +1,9 @@
import { Constructor, ILinkModule, ModuleJoinerConfig } from "@medusajs/types"
import { isDefined } from "@medusajs/utils"
import {
Constructor,
ILinkModule,
ModuleJoinerConfig,
} from "@medusajs/framework/types"
import { isDefined } from "@medusajs/framework/utils"
import { LinkModuleService } from "@services"
export function getModuleService(
@@ -8,7 +8,7 @@ import {
ModuleJoinerConfig,
RestoreReturn,
SoftDeleteReturn,
} from "@medusajs/types"
} from "@medusajs/framework/types"
import {
CommonEvents,
InjectManager,
@@ -20,7 +20,7 @@ import {
MedusaError,
Modules,
ModulesSdkUtils,
} from "@medusajs/utils"
} from "@medusajs/framework/utils"
import { LinkService } from "@services"
import { shouldForceTransaction } from "../utils"
@@ -1,10 +1,10 @@
import { Context, FindConfig } from "@medusajs/types"
import { Context, FindConfig } from "@medusajs/framework/types"
import {
InjectManager,
InjectTransactionManager,
MedusaContext,
ModulesSdkUtils,
} from "@medusajs/utils"
} from "@medusajs/framework/utils"
import { doNotForceTransaction } from "../utils"
type InjectedDependencies = {
@@ -1,4 +1,4 @@
import { Logger } from "@medusajs/types"
import { Logger } from "@medusajs/framework/types"
export type InitializeModuleInjectableDependencies = {
logger?: Logger
@@ -1,4 +1,4 @@
import { camelToSnakeCase, simpleHash } from "@medusajs/utils"
import { camelToSnakeCase, simpleHash } from "@medusajs/framework/utils"
export function compressName(name: string, limit = 58) {
if (name.length <= limit) {
@@ -1,10 +1,13 @@
import { JoinerRelationship, ModuleJoinerConfig } from "@medusajs/types"
import {
JoinerRelationship,
ModuleJoinerConfig,
} from "@medusajs/framework/types"
import {
SoftDeletableFilterKey,
composeTableName,
mikroOrmSoftDeletableFilterOptions,
simpleHash,
} from "@medusajs/utils"
} from "@medusajs/framework/utils"
import { EntitySchema } from "@mikro-orm/core"
import { compressName } from "./compress-name"
@@ -1,12 +1,15 @@
import { MedusaModule } from "@medusajs/modules-sdk"
import { ModuleJoinerConfig, ModuleJoinerRelationship } from "@medusajs/types"
import { MedusaModule } from "@medusajs/framework/modules-sdk"
import {
ModuleJoinerConfig,
ModuleJoinerRelationship,
} from "@medusajs/framework/types"
import {
camelToSnakeCase,
composeTableName,
isString,
lowerCaseFirst,
toPascalCase,
} from "@medusajs/utils"
} from "@medusajs/framework/utils"
export function generateGraphQLSchema(
joinerConfig: ModuleJoinerConfig,
@@ -1,4 +1,4 @@
import { MODULE_RESOURCE_TYPE } from "@medusajs/modules-sdk"
import { MODULE_RESOURCE_TYPE } from "@medusajs/framework/modules-sdk"
export * from "./generate-entity"
export * from "./generate-schema"