From 9db37c735e02247d219cbb42381c5c566758a606 Mon Sep 17 00:00:00 2001 From: "Carlos R. L. Rodrigues" Date: Wed, 29 Nov 2023 11:32:25 +0000 Subject: [PATCH 01/17] chore: use loaded module reference --- packages/modules-sdk/src/definitions.ts | 1 + .../src/loaders/utils/load-internal.ts | 6 +- packages/modules-sdk/src/medusa-app.ts | 108 +++++++++++------- packages/modules-sdk/src/medusa-module.ts | 16 ++- packages/pricing/src/index.ts | 3 +- packages/pricing/src/module-definition.ts | 3 + packages/product/src/index.ts | 3 +- packages/product/src/module-definition.ts | 3 + packages/types/src/modules-sdk/index.ts | 22 +++- 9 files changed, 109 insertions(+), 56 deletions(-) diff --git a/packages/modules-sdk/src/definitions.ts b/packages/modules-sdk/src/definitions.ts index 78b00d0e9c6c6..f7883f24a3e38 100644 --- a/packages/modules-sdk/src/definitions.ts +++ b/packages/modules-sdk/src/definitions.ts @@ -11,6 +11,7 @@ export enum Modules { CACHE = "cacheService", PRODUCT = "productService", PRICING = "pricingService", + LINK = "linkModules", } export enum ModuleRegistrationName { diff --git a/packages/modules-sdk/src/loaders/utils/load-internal.ts b/packages/modules-sdk/src/loaders/utils/load-internal.ts index 57f695cd78d7e..08a20747434f9 100644 --- a/packages/modules-sdk/src/loaders/utils/load-internal.ts +++ b/packages/modules-sdk/src/loaders/utils/load-internal.ts @@ -121,11 +121,13 @@ export async function loadInternalModule( } export async function loadModuleMigrations( - resolution: ModuleResolution + resolution: ModuleResolution, + moduleExports?: ModuleExports ): Promise<[Function | undefined, Function | undefined]> { let loadedModule: ModuleExports try { - loadedModule = await import(resolution.resolutionPath as string) + loadedModule = + moduleExports ?? (await import(resolution.resolutionPath as string)) return [loadedModule.runMigrations, loadedModule.revertMigration] } catch { diff --git a/packages/modules-sdk/src/medusa-app.ts b/packages/modules-sdk/src/medusa-app.ts index 9ba593ab93d3d..e6cf592ef8ed9 100644 --- a/packages/modules-sdk/src/medusa-app.ts +++ b/packages/modules-sdk/src/medusa-app.ts @@ -1,12 +1,15 @@ +import { mergeTypeDefs } from "@graphql-tools/merge" +import { makeExecutableSchema } from "@graphql-tools/schema" +import { RemoteFetchDataCallback } from "@medusajs/orchestration" import { ExternalModuleDeclaration, InternalModuleDeclaration, LoadedModule, - LoaderOptions, MedusaContainer, MODULE_RESOURCE_TYPE, MODULE_SCOPE, ModuleDefinition, + ModuleExports, ModuleJoinerConfig, ModuleServiceInitializeOptions, RemoteJoinerQuery, @@ -17,19 +20,16 @@ import { isObject, ModulesSdkUtils, } from "@medusajs/utils" +import { asValue } from "awilix" import { MODULE_PACKAGE_NAMES, ModuleRegistrationName, Modules, } from "./definitions" import { MedusaModule } from "./medusa-module" -import { RemoteFetchDataCallback } from "@medusajs/orchestration" import { RemoteLink } from "./remote-link" import { RemoteQuery } from "./remote-query" import { cleanGraphQLSchema } from "./utils" -import { asValue } from "awilix" -import { makeExecutableSchema } from "@graphql-tools/schema" -import { mergeTypeDefs } from "@graphql-tools/merge" const LinkModulePackage = "@medusajs/link-modules" @@ -71,6 +71,7 @@ async function loadModules(modulesConfig, sharedContainer) { Object.keys(modulesConfig).map(async (moduleName) => { const mod = modulesConfig[moduleName] let path: string + let moduleExports: ModuleExports | undefined = undefined let declaration: any = {} let definition: ModuleDefinition | undefined = undefined @@ -78,6 +79,7 @@ async function loadModules(modulesConfig, sharedContainer) { const mod_ = mod as unknown as InternalModuleDeclaration path = mod_.resolve ?? MODULE_PACKAGE_NAMES[moduleName] definition = mod_.definition + moduleExports = mod_.resolve as ModuleExports declaration = { ...mod } delete declaration.definition } else { @@ -98,6 +100,7 @@ async function loadModules(modulesConfig, sharedContainer) { declaration, sharedContainer, moduleDefinition: definition, + moduleExports, })) as LoadedModule const service = loaded[moduleName] @@ -119,9 +122,16 @@ async function loadModules(modulesConfig, sharedContainer) { return allModules } -async function initializeLinks(config, linkModules, injectedDependencies) { +async function initializeLinks({ + config, + linkModules, + injectedDependencies, + moduleExports, +}) { try { - const { initialize, runMigrations } = await import(LinkModulePackage) + const { initialize, runMigrations } = + moduleExports ?? (await import(LinkModulePackage)) + const linkResolution = await initialize( config, linkModules, @@ -140,6 +150,10 @@ async function initializeLinks(config, linkModules, injectedDependencies) { } } +function isMedusaModule(mod) { + return typeof mod?.initialize === "function" +} + function cleanAndMergeSchema(loadedSchema) { const { schema: cleanedSchema, notFound } = cleanGraphQLSchema(loadedSchema) const mergedSchema = mergeTypeDefs(cleanedSchema) @@ -174,32 +188,28 @@ export type MedusaAppOutput = { runMigrations: RunMigrationFn } -export async function MedusaApp( - { - sharedContainer, - sharedResourcesConfig, - servicesConfig, - modulesConfigPath, - modulesConfigFileName, - modulesConfig, - linkModules, - remoteFetchData, - injectedDependencies, - }: { - sharedContainer?: MedusaContainer - sharedResourcesConfig?: SharedResources - loadedModules?: LoadedModule[] - servicesConfig?: ModuleJoinerConfig[] - modulesConfigPath?: string - modulesConfigFileName?: string - modulesConfig?: MedusaModuleConfig - linkModules?: ModuleJoinerConfig | ModuleJoinerConfig[] - remoteFetchData?: RemoteFetchDataCallback - injectedDependencies?: any - } = { - injectedDependencies: {}, - } -): Promise<{ +export async function MedusaApp({ + sharedContainer, + sharedResourcesConfig, + servicesConfig, + modulesConfigPath, + modulesConfigFileName, + modulesConfig, + linkModules, + remoteFetchData, + injectedDependencies, +}: { + sharedContainer?: MedusaContainer + sharedResourcesConfig?: SharedResources + loadedModules?: LoadedModule[] + servicesConfig?: ModuleJoinerConfig[] + modulesConfigPath?: string + modulesConfigFileName?: string + modulesConfig?: MedusaModuleConfig + linkModules?: ModuleJoinerConfig | ModuleJoinerConfig[] + remoteFetchData?: RemoteFetchDataCallback + injectedDependencies?: any +} = {}): Promise<{ modules: Record link: RemoteLink | undefined query: ( @@ -210,6 +220,8 @@ export async function MedusaApp( notFound?: Record> runMigrations: RunMigrationFn }> { + injectedDependencies ??= {} + const sharedContainer_ = createMedusaContainer({}, sharedContainer) const modules: MedusaModuleConfig = @@ -241,8 +253,10 @@ export async function MedusaApp( } // remove the link module from the modules - const linkModule = modules[LinkModulePackage] + const linkModule = modules[LinkModulePackage] ?? modules[Modules.LINK] delete modules[LinkModulePackage] + delete modules[Modules.LINK] + let linkModuleOptions = {} if (isObject(linkModule)) { @@ -267,11 +281,12 @@ export async function MedusaApp( remoteLink, linkResolution, runMigrations: linkModuleMigration, - } = await initializeLinks( - linkModuleOptions, + } = await initializeLinks({ + config: linkModuleOptions, linkModules, - injectedDependencies - ) + injectedDependencies, + moduleExports: isMedusaModule(linkModule) ? linkModule : undefined, + }) const loadedSchema = getLoadedSchema() const { schema, notFound } = cleanAndMergeSchema(loadedSchema) @@ -294,16 +309,29 @@ export async function MedusaApp( for (const moduleName of Object.keys(allModules)) { const moduleResolution = MedusaModule.getModuleResolutions(moduleName) + if (!moduleResolution.options?.database) { + moduleResolution.options ??= {} + moduleResolution.options.database = { + ...(sharedResourcesConfig?.database ?? {}), + } + } + await MedusaModule.migrateUp( moduleResolution.definition.key, moduleResolution.resolutionPath as string, - moduleResolution.options + moduleResolution.options, + moduleResolution.moduleExports ) } + const linkModuleOpt = { ...linkModuleOptions } + linkModuleOpt.database ??= { + ...(sharedResourcesConfig?.database ?? {}), + } + linkModuleMigration && (await linkModuleMigration({ - options: linkModuleOptions, + options: linkModuleOpt, injectedDependencies, })) } diff --git a/packages/modules-sdk/src/medusa-module.ts b/packages/modules-sdk/src/medusa-module.ts index 6b2a8033410e8..09fd8a66315a5 100644 --- a/packages/modules-sdk/src/medusa-module.ts +++ b/packages/modules-sdk/src/medusa-module.ts @@ -421,7 +421,8 @@ export class MedusaModule { public static async migrateUp( moduleKey: string, modulePath: string, - options?: Record + options?: Record, + moduleExports?: ModuleExports ): Promise { const moduleResolutions = registerMedusaModule(moduleKey, { scope: MODULE_SCOPE.INTERNAL, @@ -431,7 +432,10 @@ export class MedusaModule { }) for (const mod in moduleResolutions) { - const [migrateUp] = await loadModuleMigrations(moduleResolutions[mod]) + const [migrateUp] = await loadModuleMigrations( + moduleResolutions[mod], + moduleExports + ) if (typeof migrateUp === "function") { await migrateUp({ @@ -445,7 +449,8 @@ export class MedusaModule { public static async migrateDown( moduleKey: string, modulePath: string, - options?: Record + options?: Record, + moduleExports?: ModuleExports ): Promise { const moduleResolutions = registerMedusaModule(moduleKey, { scope: MODULE_SCOPE.INTERNAL, @@ -455,7 +460,10 @@ export class MedusaModule { }) for (const mod in moduleResolutions) { - const [, migrateDown] = await loadModuleMigrations(moduleResolutions[mod]) + const [, migrateDown] = await loadModuleMigrations( + moduleResolutions[mod], + moduleExports + ) if (typeof migrateDown === "function") { await migrateDown({ diff --git a/packages/pricing/src/index.ts b/packages/pricing/src/index.ts index 45da1e739db52..77327e4f759a7 100644 --- a/packages/pricing/src/index.ts +++ b/packages/pricing/src/index.ts @@ -2,9 +2,8 @@ import { moduleDefinition } from "./module-definition" export default moduleDefinition -export * from "./scripts" export * from "./initialize" -export * from "./types" export * from "./loaders" export * from "./models" export * from "./services" +export * from "./types" diff --git a/packages/pricing/src/module-definition.ts b/packages/pricing/src/module-definition.ts index 721047739aab3..e7f9b9b4a1f9f 100644 --- a/packages/pricing/src/module-definition.ts +++ b/packages/pricing/src/module-definition.ts @@ -2,6 +2,7 @@ import { ModuleExports } from "@medusajs/types" import { PricingModuleService } from "@services" import loadConnection from "./loaders/connection" import loadContainer from "./loaders/container" +import { revertMigration, runMigrations } from "./scripts" const service = PricingModuleService const loaders = [loadContainer, loadConnection] as any @@ -9,4 +10,6 @@ const loaders = [loadContainer, loadConnection] as any export const moduleDefinition: ModuleExports = { service, loaders, + revertMigration, + runMigrations, } diff --git a/packages/product/src/index.ts b/packages/product/src/index.ts index 45da1e739db52..77327e4f759a7 100644 --- a/packages/product/src/index.ts +++ b/packages/product/src/index.ts @@ -2,9 +2,8 @@ import { moduleDefinition } from "./module-definition" export default moduleDefinition -export * from "./scripts" export * from "./initialize" -export * from "./types" export * from "./loaders" export * from "./models" export * from "./services" +export * from "./types" diff --git a/packages/product/src/module-definition.ts b/packages/product/src/module-definition.ts index d47414c790107..6f8d33dd1c7ba 100644 --- a/packages/product/src/module-definition.ts +++ b/packages/product/src/module-definition.ts @@ -2,6 +2,7 @@ import { ModuleExports } from "@medusajs/types" import { ProductModuleService } from "@services" import loadConnection from "./loaders/connection" import loadContainer from "./loaders/container" +import { revertMigration, runMigrations } from "./scripts" const service = ProductModuleService const loaders = [loadContainer, loadConnection] as any @@ -9,4 +10,6 @@ const loaders = [loadContainer, loadConnection] as any export const moduleDefinition: ModuleExports = { service, loaders, + runMigrations, + revertMigration, } diff --git a/packages/types/src/modules-sdk/index.ts b/packages/types/src/modules-sdk/index.ts index 43ff5622a8b94..0c88193c90524 100644 --- a/packages/types/src/modules-sdk/index.ts +++ b/packages/types/src/modules-sdk/index.ts @@ -1,8 +1,12 @@ -import { JoinerRelationship, JoinerServiceConfig, RemoteJoinerQuery } from "../joiner" +import { + JoinerRelationship, + JoinerServiceConfig, + RemoteJoinerQuery, +} from "../joiner" -import { Logger } from "../logger" import { MedusaContainer } from "../common" import { RepositoryService } from "../dal" +import { Logger } from "../logger" export type Constructor = new (...args: any[]) => T export * from "../common/medusa-container" @@ -32,7 +36,7 @@ export type InternalModuleDeclaration = { resources: MODULE_RESOURCE_TYPE dependencies?: string[] definition?: ModuleDefinition // That represent the definition of the module, such as the one we have for the medusa supported modules. This property is used for custom made modules. - resolve?: string + resolve?: string | ModuleExports options?: Record /** * If multiple modules are registered with the same key, the alias can be used to differentiate them @@ -223,14 +227,20 @@ export declare type ModuleJoinerRelationship = JoinerRelationship & { export type ModuleExports = { service: Constructor loaders?: ModuleLoaderFunction[] + /** + * @deprecated property will be removed in future versions + */ migrations?: any[] + /** + * @deprecated property will be removed in future versions + */ models?: Constructor[] runMigrations?( - options: LoaderOptions, + options: LoaderOptions, moduleDeclaration?: InternalModuleDeclaration ): Promise revertMigration?( - options: LoaderOptions, + options: LoaderOptions, moduleDeclaration?: InternalModuleDeclaration ): Promise } @@ -264,4 +274,4 @@ export type ModuleServiceInitializeCustomDataLayerOptions = { export type RemoteQueryFunction = ( query: string | RemoteJoinerQuery | object, variables?: Record -) => Promise | null \ No newline at end of file +) => Promise | null From 9a48d934ef7515dffb3c9e0ad4cb54f269cc963f Mon Sep 17 00:00:00 2001 From: "Carlos R. L. Rodrigues" Date: Wed, 29 Nov 2023 11:38:41 +0000 Subject: [PATCH 02/17] changeset --- .changeset/fuzzy-tips-clap.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .changeset/fuzzy-tips-clap.md diff --git a/.changeset/fuzzy-tips-clap.md b/.changeset/fuzzy-tips-clap.md new file mode 100644 index 0000000000000..a3b8f163fe796 --- /dev/null +++ b/.changeset/fuzzy-tips-clap.md @@ -0,0 +1,8 @@ +--- +"@medusajs/modules-sdk": patch +"@medusajs/pricing": patch +"@medusajs/product": patch +"@medusajs/types": patch +--- + +Medusa App loading modules reference From 2fe8ae9c1dfeb7a5dca2316933869d6b40fe2b19 Mon Sep 17 00:00:00 2001 From: "Carlos R. L. Rodrigues" Date: Wed, 29 Nov 2023 13:05:02 +0000 Subject: [PATCH 03/17] type --- packages/medusa/src/loaders/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/medusa/src/loaders/index.ts b/packages/medusa/src/loaders/index.ts index 3dda60962d392..55c5def91349f 100644 --- a/packages/medusa/src/loaders/index.ts +++ b/packages/medusa/src/loaders/index.ts @@ -49,7 +49,7 @@ async function loadLegacyModulesEntities(configModules, container) { continue } - let modulePath = isString(moduleConfig) + const modulePath = isString(moduleConfig) ? moduleConfig : (moduleConfig as InternalModuleDeclaration).resolve ?? (definition.defaultPackage as string) @@ -67,7 +67,7 @@ async function loadLegacyModulesEntities(configModules, container) { continue } - const module = await import(modulePath) + const module = await import(modulePath as string) if (module.default?.models) { module.default.models.map((model) => From 0e009fce170c392a6f3d4a9b7499a2d382b45ca3 Mon Sep 17 00:00:00 2001 From: "Carlos R. L. Rodrigues" Date: Mon, 22 Jan 2024 10:13:55 -0300 Subject: [PATCH 04/17] LINK module reference --- packages/modules-sdk/src/definitions.ts | 2 ++ packages/modules-sdk/src/medusa-app.ts | 2 +- packages/pricing/src/module-definition.ts | 3 --- packages/product/src/module-definition.ts | 3 --- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/modules-sdk/src/definitions.ts b/packages/modules-sdk/src/definitions.ts index 503ad6163f30e..59e4c71fedbb5 100644 --- a/packages/modules-sdk/src/definitions.ts +++ b/packages/modules-sdk/src/definitions.ts @@ -7,6 +7,7 @@ import { import { upperCaseFirst } from "@medusajs/utils" export enum Modules { + LINK = "linkModules", EVENT_BUS = "eventBus", STOCK_LOCATION = "stockLocationService", INVENTORY = "inventoryService", @@ -35,6 +36,7 @@ export enum ModuleRegistrationName { } export const MODULE_PACKAGE_NAMES = { + [Modules.LINK]: "@medusajs/link-modules", [Modules.PRODUCT]: "@medusajs/product", [Modules.EVENT_BUS]: "@medusajs/event-bus-local", [Modules.STOCK_LOCATION]: "@medusajs/stock-location", diff --git a/packages/modules-sdk/src/medusa-app.ts b/packages/modules-sdk/src/medusa-app.ts index 068e40be51c1f..96e97a5f646be 100644 --- a/packages/modules-sdk/src/medusa-app.ts +++ b/packages/modules-sdk/src/medusa-app.ts @@ -31,7 +31,7 @@ import { RemoteLink } from "./remote-link" import { RemoteQuery } from "./remote-query" import { cleanGraphQLSchema } from "./utils" -const LinkModulePackage = "@medusajs/link-modules" +const LinkModulePackage = MODULE_PACKAGE_NAMES[Modules.LINK] export type RunMigrationFn = ( options?: ModuleServiceInitializeOptions, diff --git a/packages/pricing/src/module-definition.ts b/packages/pricing/src/module-definition.ts index e7f9b9b4a1f9f..721047739aab3 100644 --- a/packages/pricing/src/module-definition.ts +++ b/packages/pricing/src/module-definition.ts @@ -2,7 +2,6 @@ import { ModuleExports } from "@medusajs/types" import { PricingModuleService } from "@services" import loadConnection from "./loaders/connection" import loadContainer from "./loaders/container" -import { revertMigration, runMigrations } from "./scripts" const service = PricingModuleService const loaders = [loadContainer, loadConnection] as any @@ -10,6 +9,4 @@ const loaders = [loadContainer, loadConnection] as any export const moduleDefinition: ModuleExports = { service, loaders, - revertMigration, - runMigrations, } diff --git a/packages/product/src/module-definition.ts b/packages/product/src/module-definition.ts index 6f8d33dd1c7ba..d47414c790107 100644 --- a/packages/product/src/module-definition.ts +++ b/packages/product/src/module-definition.ts @@ -2,7 +2,6 @@ import { ModuleExports } from "@medusajs/types" import { ProductModuleService } from "@services" import loadConnection from "./loaders/connection" import loadContainer from "./loaders/container" -import { revertMigration, runMigrations } from "./scripts" const service = ProductModuleService const loaders = [loadContainer, loadConnection] as any @@ -10,6 +9,4 @@ const loaders = [loadContainer, loadConnection] as any export const moduleDefinition: ModuleExports = { service, loaders, - runMigrations, - revertMigration, } From 35e4489312525135cff5420236abaea2a27b1e8e Mon Sep 17 00:00:00 2001 From: "Carlos R. L. Rodrigues" Date: Mon, 22 Jan 2024 10:16:03 -0300 Subject: [PATCH 05/17] changeset --- .changeset/fuzzy-tips-clap.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/.changeset/fuzzy-tips-clap.md b/.changeset/fuzzy-tips-clap.md index a3b8f163fe796..f147942359131 100644 --- a/.changeset/fuzzy-tips-clap.md +++ b/.changeset/fuzzy-tips-clap.md @@ -1,7 +1,5 @@ --- "@medusajs/modules-sdk": patch -"@medusajs/pricing": patch -"@medusajs/product": patch "@medusajs/types": patch --- From cf5c75092389ce202965631abe3dcbd85722bbcf Mon Sep 17 00:00:00 2001 From: "Carlos R. L. Rodrigues" Date: Mon, 22 Jan 2024 11:59:08 -0300 Subject: [PATCH 06/17] resolve if not string --- packages/modules-sdk/src/medusa-app.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/modules-sdk/src/medusa-app.ts b/packages/modules-sdk/src/medusa-app.ts index 96e97a5f646be..4359cd5b53bc1 100644 --- a/packages/modules-sdk/src/medusa-app.ts +++ b/packages/modules-sdk/src/medusa-app.ts @@ -18,6 +18,7 @@ import { ContainerRegistrationKeys, createMedusaContainer, isObject, + isString, ModulesSdkUtils, } from "@medusajs/utils" import { asValue } from "awilix" @@ -79,7 +80,9 @@ async function loadModules(modulesConfig, sharedContainer) { const mod_ = mod as unknown as InternalModuleDeclaration path = mod_.resolve ?? MODULE_PACKAGE_NAMES[moduleName] definition = mod_.definition - moduleExports = mod_.resolve as ModuleExports + moduleExports = !isString(mod_.resolve) + ? (mod_.resolve as ModuleExports) + : undefined declaration = { ...mod } delete declaration.definition } else { From aad77a1a439a0d5c5b4998ed412a9b16c10d20e2 Mon Sep 17 00:00:00 2001 From: "Carlos R. L. Rodrigues" Date: Mon, 22 Jan 2024 13:09:15 -0300 Subject: [PATCH 07/17] revert --- packages/pricing/src/index.ts | 3 +-- packages/product/src/index.ts | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/pricing/src/index.ts b/packages/pricing/src/index.ts index 49dd96bd172ac..f4609139aa329 100644 --- a/packages/pricing/src/index.ts +++ b/packages/pricing/src/index.ts @@ -5,7 +5,6 @@ import { ModulesSdkUtils } from "@medusajs/utils" export default moduleDefinition - const migrationScriptOptions = { moduleName: Modules.PRICING, models: Models, @@ -20,7 +19,7 @@ export const revertMigration = ModulesSdkUtils.buildRevertMigrationScript( ) export * from "./initialize" +export * from "./types" export * from "./loaders" export * from "./models" export * from "./services" -export * from "./types" diff --git a/packages/product/src/index.ts b/packages/product/src/index.ts index 2602df03a3c91..e8df9fb52e004 100644 --- a/packages/product/src/index.ts +++ b/packages/product/src/index.ts @@ -5,7 +5,6 @@ import * as ProductModels from "@models" export default moduleDefinition - const migrationScriptOptions = { moduleName: Modules.PRODUCT, models: ProductModels, @@ -19,9 +18,8 @@ export const revertMigration = ModulesSdkUtils.buildRevertMigrationScript( migrationScriptOptions ) - export * from "./initialize" +export * from "./types" export * from "./loaders" export * from "./models" export * from "./services" -export * from "./types" From 6528072a861b44483cece200c8aae345d5b1326d Mon Sep 17 00:00:00 2001 From: "Carlos R. L. Rodrigues" Date: Mon, 22 Jan 2024 14:20:30 -0300 Subject: [PATCH 08/17] update modules definition --- packages/authentication/src/index.ts | 16 --------------- .../authentication/src/module-definition.ts | 18 +++++++++++++++++ packages/cart/src/index.ts | 17 ---------------- packages/cart/src/module-definition.ts | 18 +++++++++++++++++ packages/customer/src/index.ts | 18 ----------------- packages/customer/src/module-definition.ts | 19 ++++++++++++++++++ packages/payment/src/index.ts | 17 ---------------- packages/payment/src/module-definition.ts | 20 +++++++++++++++++++ packages/pricing/src/index.ts | 18 +---------------- packages/pricing/src/module-definition.ts | 18 +++++++++++++++++ packages/product/src/index.ts | 18 +---------------- packages/product/src/module-definition.ts | 19 ++++++++++++++++++ 12 files changed, 114 insertions(+), 102 deletions(-) diff --git a/packages/authentication/src/index.ts b/packages/authentication/src/index.ts index 46e1b299381e8..9a40872764356 100644 --- a/packages/authentication/src/index.ts +++ b/packages/authentication/src/index.ts @@ -1,22 +1,6 @@ import { moduleDefinition } from "./module-definition" -import { Modules } from "@medusajs/modules-sdk" -import * as Models from "@models" -import { ModulesSdkUtils } from "@medusajs/utils" export default moduleDefinition -const migrationScriptOptions = { - moduleName: Modules.AUTHENTICATION, - models: Models, - pathToMigrations: __dirname + "/migrations", -} - -export const runMigrations = ModulesSdkUtils.buildMigrationScript( - migrationScriptOptions -) -export const revertMigration = ModulesSdkUtils.buildRevertMigrationScript( - migrationScriptOptions -) - export * from "./initialize" export * from "./loaders" diff --git a/packages/authentication/src/module-definition.ts b/packages/authentication/src/module-definition.ts index 89b9e240a662d..215e19c13aa7c 100644 --- a/packages/authentication/src/module-definition.ts +++ b/packages/authentication/src/module-definition.ts @@ -1,13 +1,31 @@ +import { Modules } from "@medusajs/modules-sdk" import { ModuleExports } from "@medusajs/types" +import { ModulesSdkUtils } from "@medusajs/utils" +import * as Models from "@models" import { AuthenticationModuleService } from "@services" import loadConnection from "./loaders/connection" import loadContainer from "./loaders/container" import loadProviders from "./loaders/providers" +const migrationScriptOptions = { + moduleName: Modules.AUTHENTICATION, + models: Models, + pathToMigrations: __dirname + "/migrations", +} + +export const runMigrations = ModulesSdkUtils.buildMigrationScript( + migrationScriptOptions +) +export const revertMigration = ModulesSdkUtils.buildRevertMigrationScript( + migrationScriptOptions +) + const service = AuthenticationModuleService const loaders = [loadContainer, loadConnection, loadProviders] as any export const moduleDefinition: ModuleExports = { service, loaders, + runMigrations, + revertMigration, } diff --git a/packages/cart/src/index.ts b/packages/cart/src/index.ts index 13081ed6847db..9a40872764356 100644 --- a/packages/cart/src/index.ts +++ b/packages/cart/src/index.ts @@ -1,23 +1,6 @@ -import { Modules } from "@medusajs/modules-sdk" -import { ModulesSdkUtils } from "@medusajs/utils" -import * as Models from "@models" import { moduleDefinition } from "./module-definition" export default moduleDefinition -const migrationScriptOptions = { - moduleName: Modules.CART, - models: Models, - pathToMigrations: __dirname + "/migrations", -} - -export const runMigrations = ModulesSdkUtils.buildMigrationScript( - migrationScriptOptions -) -export const revertMigration = ModulesSdkUtils.buildRevertMigrationScript( - migrationScriptOptions -) - export * from "./initialize" export * from "./loaders" - diff --git a/packages/cart/src/module-definition.ts b/packages/cart/src/module-definition.ts index 133814940b6ff..1db51b9c5cf38 100644 --- a/packages/cart/src/module-definition.ts +++ b/packages/cart/src/module-definition.ts @@ -1,12 +1,30 @@ +import { Modules } from "@medusajs/modules-sdk" import { ModuleExports } from "@medusajs/types" +import { ModulesSdkUtils } from "@medusajs/utils" +import * as Models from "@models" import loadConnection from "./loaders/connection" import loadContainer from "./loaders/container" import { CartModuleService } from "./services" +const migrationScriptOptions = { + moduleName: Modules.CART, + models: Models, + pathToMigrations: __dirname + "/migrations", +} + +export const runMigrations = ModulesSdkUtils.buildMigrationScript( + migrationScriptOptions +) +export const revertMigration = ModulesSdkUtils.buildRevertMigrationScript( + migrationScriptOptions +) + const service = CartModuleService const loaders = [loadContainer, loadConnection] as any export const moduleDefinition: ModuleExports = { service, loaders, + runMigrations, + revertMigration, } diff --git a/packages/customer/src/index.ts b/packages/customer/src/index.ts index c84e04625b609..9a40872764356 100644 --- a/packages/customer/src/index.ts +++ b/packages/customer/src/index.ts @@ -1,24 +1,6 @@ -import { Modules } from "@medusajs/modules-sdk" -import { ModulesSdkUtils } from "@medusajs/utils" -import * as Models from "@models" - import { moduleDefinition } from "./module-definition" export default moduleDefinition -const migrationScriptOptions = { - moduleName: Modules.CUSTOMER, - models: Models, - pathToMigrations: __dirname + "/migrations", -} - -export const revertMigration = ModulesSdkUtils.buildRevertMigrationScript( - migrationScriptOptions -) - -export const runMigration = ModulesSdkUtils.buildMigrationScript( - migrationScriptOptions -) - export * from "./initialize" export * from "./loaders" diff --git a/packages/customer/src/module-definition.ts b/packages/customer/src/module-definition.ts index d3e28a4c78b74..81e86620beece 100644 --- a/packages/customer/src/module-definition.ts +++ b/packages/customer/src/module-definition.ts @@ -1,12 +1,31 @@ +import { Modules } from "@medusajs/modules-sdk" import { ModuleExports } from "@medusajs/types" +import { ModulesSdkUtils } from "@medusajs/utils" +import * as Models from "@models" import { CustomerModuleService } from "@services" import loadConnection from "./loaders/connection" import loadContainer from "./loaders/container" +const migrationScriptOptions = { + moduleName: Modules.CUSTOMER, + models: Models, + pathToMigrations: __dirname + "/migrations", +} + +export const revertMigration = ModulesSdkUtils.buildRevertMigrationScript( + migrationScriptOptions +) + +export const runMigrations = ModulesSdkUtils.buildMigrationScript( + migrationScriptOptions +) + const service = CustomerModuleService const loaders = [loadContainer, loadConnection] as any export const moduleDefinition: ModuleExports = { service, loaders, + runMigrations, + revertMigration, } diff --git a/packages/payment/src/index.ts b/packages/payment/src/index.ts index 5ec1f1b289ad7..9a40872764356 100644 --- a/packages/payment/src/index.ts +++ b/packages/payment/src/index.ts @@ -1,23 +1,6 @@ import { moduleDefinition } from "./module-definition" -import { Modules } from "@medusajs/modules-sdk" -import { ModulesSdkUtils } from "@medusajs/utils" - -import * as PaymentModels from "@models" export default moduleDefinition -const migrationScriptOptions = { - moduleName: Modules.PAYMENT, - models: PaymentModels, - pathToMigrations: __dirname + "/migrations", -} - -export const runMigrations = ModulesSdkUtils.buildMigrationScript( - migrationScriptOptions -) -export const revertMigration = ModulesSdkUtils.buildRevertMigrationScript( - migrationScriptOptions -) - export * from "./initialize" export * from "./loaders" diff --git a/packages/payment/src/module-definition.ts b/packages/payment/src/module-definition.ts index 543a6ef254546..3b7c8e329a897 100644 --- a/packages/payment/src/module-definition.ts +++ b/packages/payment/src/module-definition.ts @@ -5,10 +5,30 @@ import { PaymentModuleService } from "@services" import loadConnection from "./loaders/connection" import loadContainer from "./loaders/container" +import { Modules } from "@medusajs/modules-sdk" +import { ModulesSdkUtils } from "@medusajs/utils" + +import * as PaymentModels from "@models" + +const migrationScriptOptions = { + moduleName: Modules.PAYMENT, + models: PaymentModels, + pathToMigrations: __dirname + "/migrations", +} + +export const runMigrations = ModulesSdkUtils.buildMigrationScript( + migrationScriptOptions +) +export const revertMigration = ModulesSdkUtils.buildRevertMigrationScript( + migrationScriptOptions +) + const service = PaymentModuleService const loaders = [loadContainer, loadConnection] as any export const moduleDefinition: ModuleExports = { service, loaders, + runMigrations, + revertMigration, } diff --git a/packages/pricing/src/index.ts b/packages/pricing/src/index.ts index f4609139aa329..77327e4f759a7 100644 --- a/packages/pricing/src/index.ts +++ b/packages/pricing/src/index.ts @@ -1,25 +1,9 @@ import { moduleDefinition } from "./module-definition" -import { Modules } from "@medusajs/modules-sdk" -import * as Models from "@models" -import { ModulesSdkUtils } from "@medusajs/utils" export default moduleDefinition -const migrationScriptOptions = { - moduleName: Modules.PRICING, - models: Models, - pathToMigrations: __dirname + "/migrations", -} - -export const runMigrations = ModulesSdkUtils.buildMigrationScript( - migrationScriptOptions -) -export const revertMigration = ModulesSdkUtils.buildRevertMigrationScript( - migrationScriptOptions -) - export * from "./initialize" -export * from "./types" export * from "./loaders" export * from "./models" export * from "./services" +export * from "./types" diff --git a/packages/pricing/src/module-definition.ts b/packages/pricing/src/module-definition.ts index 721047739aab3..b2cbdca76290a 100644 --- a/packages/pricing/src/module-definition.ts +++ b/packages/pricing/src/module-definition.ts @@ -1,12 +1,30 @@ +import { Modules } from "@medusajs/modules-sdk" import { ModuleExports } from "@medusajs/types" +import { ModulesSdkUtils } from "@medusajs/utils" +import * as Models from "@models" import { PricingModuleService } from "@services" import loadConnection from "./loaders/connection" import loadContainer from "./loaders/container" +const migrationScriptOptions = { + moduleName: Modules.PRICING, + models: Models, + pathToMigrations: __dirname + "/migrations", +} + +export const runMigrations = ModulesSdkUtils.buildMigrationScript( + migrationScriptOptions +) +export const revertMigration = ModulesSdkUtils.buildRevertMigrationScript( + migrationScriptOptions +) + const service = PricingModuleService const loaders = [loadContainer, loadConnection] as any export const moduleDefinition: ModuleExports = { service, loaders, + runMigrations, + revertMigration, } diff --git a/packages/product/src/index.ts b/packages/product/src/index.ts index e8df9fb52e004..77327e4f759a7 100644 --- a/packages/product/src/index.ts +++ b/packages/product/src/index.ts @@ -1,25 +1,9 @@ import { moduleDefinition } from "./module-definition" -import { ModulesSdkUtils } from "@medusajs/utils" -import { Modules } from "@medusajs/modules-sdk" -import * as ProductModels from "@models" export default moduleDefinition -const migrationScriptOptions = { - moduleName: Modules.PRODUCT, - models: ProductModels, - pathToMigrations: __dirname + "/migrations", -} - -export const runMigrations = ModulesSdkUtils.buildMigrationScript( - migrationScriptOptions -) -export const revertMigration = ModulesSdkUtils.buildRevertMigrationScript( - migrationScriptOptions -) - export * from "./initialize" -export * from "./types" export * from "./loaders" export * from "./models" export * from "./services" +export * from "./types" diff --git a/packages/product/src/module-definition.ts b/packages/product/src/module-definition.ts index d47414c790107..177c5c0cb978c 100644 --- a/packages/product/src/module-definition.ts +++ b/packages/product/src/module-definition.ts @@ -3,10 +3,29 @@ import { ProductModuleService } from "@services" import loadConnection from "./loaders/connection" import loadContainer from "./loaders/container" +import { Modules } from "@medusajs/modules-sdk" +import { ModulesSdkUtils } from "@medusajs/utils" +import * as ProductModels from "@models" + +const migrationScriptOptions = { + moduleName: Modules.PRODUCT, + models: ProductModels, + pathToMigrations: __dirname + "/migrations", +} + +export const runMigrations = ModulesSdkUtils.buildMigrationScript( + migrationScriptOptions +) +export const revertMigration = ModulesSdkUtils.buildRevertMigrationScript( + migrationScriptOptions +) + const service = ProductModuleService const loaders = [loadContainer, loadConnection] as any export const moduleDefinition: ModuleExports = { service, loaders, + runMigrations, + revertMigration, } From 2fad6b0268df6e63aab97164c15eef660e9314c4 Mon Sep 17 00:00:00 2001 From: "Carlos R. L. Rodrigues" Date: Mon, 22 Jan 2024 14:22:52 -0300 Subject: [PATCH 09/17] changeset --- .changeset/fuzzy-tips-clap.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.changeset/fuzzy-tips-clap.md b/.changeset/fuzzy-tips-clap.md index f147942359131..d04506576b0f0 100644 --- a/.changeset/fuzzy-tips-clap.md +++ b/.changeset/fuzzy-tips-clap.md @@ -1,6 +1,13 @@ --- "@medusajs/modules-sdk": patch "@medusajs/types": patch +"@medusajs/authetication": patch +"@medusajs/cart": patch +"@medusajs/customer": patch +"@medusajs/payment": patch +"@medusajs/pricing": patch +"@medusajs/product": patch +"@medusajs/product": patch --- Medusa App loading modules reference From 1046666e1e9a207778640ee08548b4204373d926 Mon Sep 17 00:00:00 2001 From: "Carlos R. L. Rodrigues" Date: Mon, 22 Jan 2024 14:24:25 -0300 Subject: [PATCH 10/17] fix changeset --- .changeset/fuzzy-tips-clap.md | 1 - 1 file changed, 1 deletion(-) diff --git a/.changeset/fuzzy-tips-clap.md b/.changeset/fuzzy-tips-clap.md index d04506576b0f0..dc1ad1d876ee3 100644 --- a/.changeset/fuzzy-tips-clap.md +++ b/.changeset/fuzzy-tips-clap.md @@ -7,7 +7,6 @@ "@medusajs/payment": patch "@medusajs/pricing": patch "@medusajs/product": patch -"@medusajs/product": patch --- Medusa App loading modules reference From 875f7f544f50052c19d4494b6f15f886ce243702 Mon Sep 17 00:00:00 2001 From: "Carlos R. L. Rodrigues" Date: Mon, 22 Jan 2024 15:34:20 -0300 Subject: [PATCH 11/17] normalize all modules entrypoints --- .changeset/fuzzy-tips-clap.md | 3 +++ .../plugins/__tests__/product/admin/index.ts | 4 ++-- packages/authentication/src/index.ts | 7 +++++- packages/cart/src/index.ts | 8 +++++-- packages/customer/src/index.ts | 8 +++++-- packages/inventory/src/index.ts | 2 -- packages/payment/src/index.ts | 8 +++++-- packages/pricing/src/index.ts | 11 +++++---- packages/product/src/index.ts | 11 +++++---- packages/promotion/src/index.ts | 24 +++++-------------- packages/promotion/src/module-definition.ts | 18 ++++++++++++++ packages/stock-location/src/index.ts | 2 -- .../stock-location/src/module-definition.ts | 6 ++--- 13 files changed, 68 insertions(+), 44 deletions(-) diff --git a/.changeset/fuzzy-tips-clap.md b/.changeset/fuzzy-tips-clap.md index dc1ad1d876ee3..599f810c94087 100644 --- a/.changeset/fuzzy-tips-clap.md +++ b/.changeset/fuzzy-tips-clap.md @@ -7,6 +7,9 @@ "@medusajs/payment": patch "@medusajs/pricing": patch "@medusajs/product": patch +"@medusajs/promotion": patch +"@medusajs/inventory": patch +"@medusajs/stock-location": patch --- Medusa App loading modules reference diff --git a/integration-tests/plugins/__tests__/product/admin/index.ts b/integration-tests/plugins/__tests__/product/admin/index.ts index 8d514214e778d..e382ff5bb3388 100644 --- a/integration-tests/plugins/__tests__/product/admin/index.ts +++ b/integration-tests/plugins/__tests__/product/admin/index.ts @@ -16,7 +16,7 @@ import { } from "../../../../factories" import { createDefaultRuleTypes } from "../../../helpers/create-default-rule-types" -jest.setTimeout(5000000) +jest.setTimeout(50000) const adminHeaders = { headers: { @@ -80,7 +80,7 @@ describe("/admin/products", () => { await db.teardown() }) - it("should create a product", async () => { + it.only("should create a product", async () => { const api = useApi()! as AxiosInstance const payload = { diff --git a/packages/authentication/src/index.ts b/packages/authentication/src/index.ts index 9a40872764356..98c26a5e9e4d7 100644 --- a/packages/authentication/src/index.ts +++ b/packages/authentication/src/index.ts @@ -1,6 +1,11 @@ -import { moduleDefinition } from "./module-definition" +import { + moduleDefinition, + revertMigration, + runMigrations, +} from "./module-definition" export default moduleDefinition +export { revertMigration, runMigrations } export * from "./initialize" export * from "./loaders" diff --git a/packages/cart/src/index.ts b/packages/cart/src/index.ts index 9a40872764356..d449f7354469a 100644 --- a/packages/cart/src/index.ts +++ b/packages/cart/src/index.ts @@ -1,6 +1,10 @@ -import { moduleDefinition } from "./module-definition" +import { + moduleDefinition, + revertMigration, + runMigrations, +} from "./module-definition" export default moduleDefinition +export { revertMigration, runMigrations } export * from "./initialize" -export * from "./loaders" diff --git a/packages/customer/src/index.ts b/packages/customer/src/index.ts index 9a40872764356..d449f7354469a 100644 --- a/packages/customer/src/index.ts +++ b/packages/customer/src/index.ts @@ -1,6 +1,10 @@ -import { moduleDefinition } from "./module-definition" +import { + moduleDefinition, + revertMigration, + runMigrations, +} from "./module-definition" export default moduleDefinition +export { revertMigration, runMigrations } export * from "./initialize" -export * from "./loaders" diff --git a/packages/inventory/src/index.ts b/packages/inventory/src/index.ts index d3159f3c9a771..1cb6f68e0bb0f 100644 --- a/packages/inventory/src/index.ts +++ b/packages/inventory/src/index.ts @@ -1,8 +1,6 @@ -import { revertMigration, runMigrations } from "./migrations/run-migration" import { moduleDefinition } from "./module-definition" export default moduleDefinition export * from "./initialize" export { revertMigration, runMigrations } from "./migrations/run-migration" -export * from "./types" diff --git a/packages/payment/src/index.ts b/packages/payment/src/index.ts index 9a40872764356..d449f7354469a 100644 --- a/packages/payment/src/index.ts +++ b/packages/payment/src/index.ts @@ -1,6 +1,10 @@ -import { moduleDefinition } from "./module-definition" +import { + moduleDefinition, + revertMigration, + runMigrations, +} from "./module-definition" export default moduleDefinition +export { revertMigration, runMigrations } export * from "./initialize" -export * from "./loaders" diff --git a/packages/pricing/src/index.ts b/packages/pricing/src/index.ts index 77327e4f759a7..d449f7354469a 100644 --- a/packages/pricing/src/index.ts +++ b/packages/pricing/src/index.ts @@ -1,9 +1,10 @@ -import { moduleDefinition } from "./module-definition" +import { + moduleDefinition, + revertMigration, + runMigrations, +} from "./module-definition" export default moduleDefinition +export { revertMigration, runMigrations } export * from "./initialize" -export * from "./loaders" -export * from "./models" -export * from "./services" -export * from "./types" diff --git a/packages/product/src/index.ts b/packages/product/src/index.ts index 77327e4f759a7..d449f7354469a 100644 --- a/packages/product/src/index.ts +++ b/packages/product/src/index.ts @@ -1,9 +1,10 @@ -import { moduleDefinition } from "./module-definition" +import { + moduleDefinition, + revertMigration, + runMigrations, +} from "./module-definition" export default moduleDefinition +export { revertMigration, runMigrations } export * from "./initialize" -export * from "./loaders" -export * from "./models" -export * from "./services" -export * from "./types" diff --git a/packages/promotion/src/index.ts b/packages/promotion/src/index.ts index 220ccf1f5c4bf..d449f7354469a 100644 --- a/packages/promotion/src/index.ts +++ b/packages/promotion/src/index.ts @@ -1,22 +1,10 @@ -import { moduleDefinition } from "./module-definition" -import { Modules } from "@medusajs/modules-sdk" -import * as Models from "@models" -import { ModulesSdkUtils } from "@medusajs/utils" +import { + moduleDefinition, + revertMigration, + runMigrations, +} from "./module-definition" export default moduleDefinition - -const migrationScriptOptions = { - moduleName: Modules.PROMOTION, - models: Models, - pathToMigrations: __dirname + "/migrations", -} - -export const runMigrations = ModulesSdkUtils.buildMigrationScript( - migrationScriptOptions -) -export const revertMigration = ModulesSdkUtils.buildRevertMigrationScript( - migrationScriptOptions -) +export { revertMigration, runMigrations } export * from "./initialize" -export * from "./loaders" diff --git a/packages/promotion/src/module-definition.ts b/packages/promotion/src/module-definition.ts index db87261647c29..d2e899cef86d3 100644 --- a/packages/promotion/src/module-definition.ts +++ b/packages/promotion/src/module-definition.ts @@ -1,12 +1,30 @@ +import { Modules } from "@medusajs/modules-sdk" import { ModuleExports } from "@medusajs/types" +import { ModulesSdkUtils } from "@medusajs/utils" +import * as Models from "@models" import { PromotionModuleService } from "@services" import loadConnection from "./loaders/connection" import loadContainer from "./loaders/container" +const migrationScriptOptions = { + moduleName: Modules.PROMOTION, + models: Models, + pathToMigrations: __dirname + "/migrations", +} + +export const runMigrations = ModulesSdkUtils.buildMigrationScript( + migrationScriptOptions +) +export const revertMigration = ModulesSdkUtils.buildRevertMigrationScript( + migrationScriptOptions +) + const service = PromotionModuleService const loaders = [loadContainer, loadConnection] as any export const moduleDefinition: ModuleExports = { service, loaders, + runMigrations, + revertMigration, } diff --git a/packages/stock-location/src/index.ts b/packages/stock-location/src/index.ts index d3159f3c9a771..6ec4fe48341f7 100644 --- a/packages/stock-location/src/index.ts +++ b/packages/stock-location/src/index.ts @@ -1,8 +1,6 @@ -import { revertMigration, runMigrations } from "./migrations/run-migration" import { moduleDefinition } from "./module-definition" export default moduleDefinition - export * from "./initialize" export { revertMigration, runMigrations } from "./migrations/run-migration" export * from "./types" diff --git a/packages/stock-location/src/module-definition.ts b/packages/stock-location/src/module-definition.ts index 6fdf83e2ed4e1..44ed23a71c771 100644 --- a/packages/stock-location/src/module-definition.ts +++ b/packages/stock-location/src/module-definition.ts @@ -1,9 +1,9 @@ -import StockLocationService from "./services/stock-location" -import loadConnection from "./loaders/connection" -import * as StockLocationModels from "./models" import { ModuleExports } from "@medusajs/types" +import loadConnection from "./loaders/connection" import migrations from "./migrations" import { revertMigration, runMigrations } from "./migrations/run-migration" +import * as StockLocationModels from "./models" +import StockLocationService from "./services/stock-location" const service = StockLocationService const loaders = [loadConnection] From 986629da9a01a3eb404ad0f0ee11b4688b039259 Mon Sep 17 00:00:00 2001 From: "Carlos R. L. Rodrigues" Date: Mon, 22 Jan 2024 15:41:59 -0300 Subject: [PATCH 12/17] remove .only --- integration-tests/plugins/__tests__/product/admin/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/plugins/__tests__/product/admin/index.ts b/integration-tests/plugins/__tests__/product/admin/index.ts index e382ff5bb3388..3449f83f8ad39 100644 --- a/integration-tests/plugins/__tests__/product/admin/index.ts +++ b/integration-tests/plugins/__tests__/product/admin/index.ts @@ -80,7 +80,7 @@ describe("/admin/products", () => { await db.teardown() }) - it.only("should create a product", async () => { + it("should create a product", async () => { const api = useApi()! as AxiosInstance const payload = { From 723c766979d06b6ad50dfb1ec194a91214364e14 Mon Sep 17 00:00:00 2001 From: "Carlos R. L. Rodrigues" Date: Mon, 22 Jan 2024 15:58:13 -0300 Subject: [PATCH 13/17] exporting types --- packages/pricing/src/index.ts | 1 + packages/product/src/index.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/pricing/src/index.ts b/packages/pricing/src/index.ts index d449f7354469a..d6bb9fb737609 100644 --- a/packages/pricing/src/index.ts +++ b/packages/pricing/src/index.ts @@ -8,3 +8,4 @@ export default moduleDefinition export { revertMigration, runMigrations } export * from "./initialize" +export * from "./types" diff --git a/packages/product/src/index.ts b/packages/product/src/index.ts index d449f7354469a..d6bb9fb737609 100644 --- a/packages/product/src/index.ts +++ b/packages/product/src/index.ts @@ -8,3 +8,4 @@ export default moduleDefinition export { revertMigration, runMigrations } export * from "./initialize" +export * from "./types" From a8fab05a141f07befadac356c310ff7e4a35c22e Mon Sep 17 00:00:00 2001 From: "Carlos R. L. Rodrigues" Date: Mon, 22 Jan 2024 16:59:48 -0300 Subject: [PATCH 14/17] pricing exporting models --- packages/pricing/src/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/pricing/src/index.ts b/packages/pricing/src/index.ts index d6bb9fb737609..e804aa9266169 100644 --- a/packages/pricing/src/index.ts +++ b/packages/pricing/src/index.ts @@ -8,4 +8,6 @@ export default moduleDefinition export { revertMigration, runMigrations } export * from "./initialize" +// TODO: remove models exported from here +export * from "./models" export * from "./types" From 720177fdb91ea6a9fb436772b88b06d8b85ecfc7 Mon Sep 17 00:00:00 2001 From: "Carlos R. L. Rodrigues" Date: Mon, 22 Jan 2024 21:03:25 -0300 Subject: [PATCH 15/17] export service --- packages/pricing/src/index.ts | 3 ++- packages/product/src/index.ts | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/pricing/src/index.ts b/packages/pricing/src/index.ts index e804aa9266169..515ee01a9179f 100644 --- a/packages/pricing/src/index.ts +++ b/packages/pricing/src/index.ts @@ -8,6 +8,7 @@ export default moduleDefinition export { revertMigration, runMigrations } export * from "./initialize" -// TODO: remove models exported from here +// TODO: remove export from models and services export * from "./models" +export * from "./services" export * from "./types" diff --git a/packages/product/src/index.ts b/packages/product/src/index.ts index d6bb9fb737609..515ee01a9179f 100644 --- a/packages/product/src/index.ts +++ b/packages/product/src/index.ts @@ -8,4 +8,7 @@ export default moduleDefinition export { revertMigration, runMigrations } export * from "./initialize" +// TODO: remove export from models and services +export * from "./models" +export * from "./services" export * from "./types" From a58818b1bb5d3030986e20c0c3b4267f521fd4fa Mon Sep 17 00:00:00 2001 From: "Carlos R. L. Rodrigues" Date: Tue, 23 Jan 2024 08:04:33 -0300 Subject: [PATCH 16/17] rem not yet released modules --- .changeset/fuzzy-tips-clap.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.changeset/fuzzy-tips-clap.md b/.changeset/fuzzy-tips-clap.md index 599f810c94087..efca81c488a80 100644 --- a/.changeset/fuzzy-tips-clap.md +++ b/.changeset/fuzzy-tips-clap.md @@ -1,13 +1,9 @@ --- "@medusajs/modules-sdk": patch "@medusajs/types": patch -"@medusajs/authetication": patch -"@medusajs/cart": patch -"@medusajs/customer": patch "@medusajs/payment": patch "@medusajs/pricing": patch "@medusajs/product": patch -"@medusajs/promotion": patch "@medusajs/inventory": patch "@medusajs/stock-location": patch --- From cf01deac6b82c3bf528cc77d96c35afe5222bfaa Mon Sep 17 00:00:00 2001 From: "Carlos R. L. Rodrigues" Date: Tue, 23 Jan 2024 08:06:26 -0300 Subject: [PATCH 17/17] rem payment --- .changeset/fuzzy-tips-clap.md | 1 - 1 file changed, 1 deletion(-) diff --git a/.changeset/fuzzy-tips-clap.md b/.changeset/fuzzy-tips-clap.md index efca81c488a80..5dd00f4c08aa3 100644 --- a/.changeset/fuzzy-tips-clap.md +++ b/.changeset/fuzzy-tips-clap.md @@ -1,7 +1,6 @@ --- "@medusajs/modules-sdk": patch "@medusajs/types": patch -"@medusajs/payment": patch "@medusajs/pricing": patch "@medusajs/product": patch "@medusajs/inventory": patch