diff --git a/packages/core/modules-sdk/src/loaders/__mocks__/@plugins/default.ts b/packages/core/modules-sdk/src/loaders/__mocks__/@providers/default.ts similarity index 100% rename from packages/core/modules-sdk/src/loaders/__mocks__/@plugins/default.ts rename to packages/core/modules-sdk/src/loaders/__mocks__/@providers/default.ts diff --git a/packages/core/modules-sdk/src/loaders/__mocks__/@plugins/no-default.ts b/packages/core/modules-sdk/src/loaders/__mocks__/@providers/no-default.ts similarity index 100% rename from packages/core/modules-sdk/src/loaders/__mocks__/@plugins/no-default.ts rename to packages/core/modules-sdk/src/loaders/__mocks__/@providers/no-default.ts diff --git a/packages/core/modules-sdk/src/loaders/__mocks__/@plugins/no-service.ts b/packages/core/modules-sdk/src/loaders/__mocks__/@providers/no-service.ts similarity index 100% rename from packages/core/modules-sdk/src/loaders/__mocks__/@plugins/no-service.ts rename to packages/core/modules-sdk/src/loaders/__mocks__/@providers/no-service.ts diff --git a/packages/core/modules-sdk/src/loaders/__tests__/module-provider-loader.ts b/packages/core/modules-sdk/src/loaders/__tests__/module-provider-loader.ts index f52adc10a8..cc383af882 100644 --- a/packages/core/modules-sdk/src/loaders/__tests__/module-provider-loader.ts +++ b/packages/core/modules-sdk/src/loaders/__tests__/module-provider-loader.ts @@ -21,7 +21,7 @@ describe("modules loader", () => { it("should register the provider service", async () => { const moduleProviders = [ { - resolve: "@plugins/default", + resolve: "@providers/default", options: {}, }, ] @@ -46,7 +46,7 @@ describe("modules loader", () => { } const moduleProviders = [ { - resolve: "@plugins/default", + resolve: "@providers/default", options: {}, }, ] @@ -65,7 +65,7 @@ describe("modules loader", () => { it("should log the errors if no service is defined", async () => { const moduleProviders = [ { - resolve: "@plugins/no-service", + resolve: "@providers/no-service", options: {}, }, ] @@ -74,7 +74,7 @@ describe("modules loader", () => { await moduleProviderLoader({ container, providers: moduleProviders }) } catch (error) { expect(error.message).toBe( - "No services found in plugin @plugins/no-service -- make sure your plugin has a default export of services." + "@providers/no-service doesn't seem to have a main service exported -- make sure your module has a default export of a service." ) } }) @@ -82,7 +82,7 @@ describe("modules loader", () => { it("should throw if no default export is defined", async () => { const moduleProviders = [ { - resolve: "@plugins/no-default", + resolve: "@providers/no-default", options: {}, }, ] @@ -91,7 +91,7 @@ describe("modules loader", () => { await moduleProviderLoader({ container, providers: moduleProviders }) } catch (error) { expect(error.message).toBe( - "No services found in plugin @plugins/no-default -- make sure your plugin has a default export of services." + "@providers/no-default doesn't seem to have a main service exported -- make sure your module has a default export of a service." ) } }) diff --git a/packages/core/modules-sdk/src/loaders/module-provider-loader.ts b/packages/core/modules-sdk/src/loaders/module-provider-loader.ts index 388122712a..373c96bb72 100644 --- a/packages/core/modules-sdk/src/loaders/module-provider-loader.ts +++ b/packages/core/modules-sdk/src/loaders/module-provider-loader.ts @@ -12,7 +12,7 @@ export async function moduleProviderLoader({ registerServiceFn?: ( klass, container: MedusaContainer, - pluginDetails: any + moduleDetails: any ) => Promise }) { if (!providers?.length) { @@ -20,8 +20,8 @@ export async function moduleProviderLoader({ } await promiseAll( - providers.map(async (pluginDetails) => { - await loadModuleProvider(container, pluginDetails, registerServiceFn) + providers.map(async (moduleDetails) => { + await loadModuleProvider(container, moduleDetails, registerServiceFn) }) ) } @@ -29,11 +29,11 @@ export async function moduleProviderLoader({ export async function loadModuleProvider( container: MedusaContainer, provider: ModuleProvider, - registerServiceFn?: (klass, container, pluginDetails) => Promise + registerServiceFn?: (klass, container, moduleDetails) => Promise ) { let loadedProvider: any - const pluginName = provider.resolve ?? provider.provider_name ?? "" + const moduleName = provider.resolve ?? provider.provider_name ?? "" try { loadedProvider = provider.resolve @@ -43,7 +43,7 @@ export async function loadModuleProvider( } } catch (error) { throw new Error( - `Unable to find plugin ${pluginName} -- perhaps you need to install its package?` + `Unable to find module ${moduleName} -- perhaps you need to install its package?` ) } @@ -51,7 +51,7 @@ export async function loadModuleProvider( if (!loadedProvider?.services?.length) { throw new Error( - `No services found in plugin ${provider.resolve} -- make sure your plugin has a default export of services.` + `${provider.resolve} doesn't seem to have a main service exported -- make sure your module has a default export of a service.` ) }