diff --git a/.changeset/odd-ducks-spend.md b/.changeset/odd-ducks-spend.md new file mode 100644 index 0000000000..365e39bd40 --- /dev/null +++ b/.changeset/odd-ducks-spend.md @@ -0,0 +1,6 @@ +--- +'@backstage/plugin-events-backend-module-github': minor +'@backstage/plugin-events-backend-module-gitlab': minor +--- + +**BREAKING ALPHA**: Modules from `events-backend-module-github` and `events-backend-module-gitlab` are now exported as `default` instead of being a named export. diff --git a/plugins/events-backend-module-github/src/alpha.ts b/plugins/events-backend-module-github/src/alpha.ts index 2db8e9d9aa..b5f33168d0 100644 --- a/plugins/events-backend-module-github/src/alpha.ts +++ b/plugins/events-backend-module-github/src/alpha.ts @@ -14,5 +14,13 @@ * limitations under the License. */ -export { eventsModuleGithubEventRouter } from './service/eventsModuleGithubEventRouter'; -export { eventsModuleGithubWebhook } from './service/eventsModuleGithubWebhook'; +import { createBackendFeatureLoader } from '@backstage/backend-plugin-api'; + +export default createBackendFeatureLoader({ + loader() { + return [ + import('./service/eventsModuleGithubEventRouter'), + import('./service/eventsModuleGithubWebhook'), + ]; + }, +}); diff --git a/plugins/events-backend-module-github/src/service/eventsModuleGithubEventRouter.test.ts b/plugins/events-backend-module-github/src/service/eventsModuleGithubEventRouter.test.ts index d69a128c4c..a22caacea2 100644 --- a/plugins/events-backend-module-github/src/service/eventsModuleGithubEventRouter.test.ts +++ b/plugins/events-backend-module-github/src/service/eventsModuleGithubEventRouter.test.ts @@ -18,7 +18,7 @@ import { createServiceFactory } from '@backstage/backend-plugin-api'; import { startTestBackend } from '@backstage/backend-test-utils'; import { TestEventsService } from '@backstage/plugin-events-backend-test-utils'; import { eventsServiceRef } from '@backstage/plugin-events-node'; -import { eventsModuleGithubEventRouter } from './eventsModuleGithubEventRouter'; +import eventsModuleGithubEventRouter from './eventsModuleGithubEventRouter'; describe('eventsModuleGithubEventRouter', () => { it('should be correctly wired and set up', async () => { diff --git a/plugins/events-backend-module-github/src/service/eventsModuleGithubEventRouter.ts b/plugins/events-backend-module-github/src/service/eventsModuleGithubEventRouter.ts index 694b4b162d..0550d016b7 100644 --- a/plugins/events-backend-module-github/src/service/eventsModuleGithubEventRouter.ts +++ b/plugins/events-backend-module-github/src/service/eventsModuleGithubEventRouter.ts @@ -25,7 +25,7 @@ import { GithubEventRouter } from '../router/GithubEventRouter'; * * @alpha */ -export const eventsModuleGithubEventRouter = createBackendModule({ +export default createBackendModule({ pluginId: 'events', moduleId: 'github-event-router', register(env) { diff --git a/plugins/events-backend-module-github/src/service/eventsModuleGithubWebhook.test.ts b/plugins/events-backend-module-github/src/service/eventsModuleGithubWebhook.test.ts index ec5ec66946..3e7f281326 100644 --- a/plugins/events-backend-module-github/src/service/eventsModuleGithubWebhook.test.ts +++ b/plugins/events-backend-module-github/src/service/eventsModuleGithubWebhook.test.ts @@ -21,7 +21,7 @@ import { RequestDetails, } from '@backstage/plugin-events-node'; import { sign } from '@octokit/webhooks-methods'; -import { eventsModuleGithubWebhook } from './eventsModuleGithubWebhook'; +import eventsModuleGithubWebhook from './eventsModuleGithubWebhook'; describe('eventsModuleGithubWebhook', () => { const secret = 'valid-secret'; diff --git a/plugins/events-backend-module-github/src/service/eventsModuleGithubWebhook.ts b/plugins/events-backend-module-github/src/service/eventsModuleGithubWebhook.ts index 647b21c364..5cd10d8cc6 100644 --- a/plugins/events-backend-module-github/src/service/eventsModuleGithubWebhook.ts +++ b/plugins/events-backend-module-github/src/service/eventsModuleGithubWebhook.ts @@ -28,7 +28,7 @@ import { createGithubSignatureValidator } from '../http/createGithubSignatureVal * * @alpha */ -export const eventsModuleGithubWebhook = createBackendModule({ +export default createBackendModule({ pluginId: 'events', moduleId: 'github-webhook', register(env) { diff --git a/plugins/events-backend-module-gitlab/src/alpha.ts b/plugins/events-backend-module-gitlab/src/alpha.ts index 65610af96c..5c4b3488a7 100644 --- a/plugins/events-backend-module-gitlab/src/alpha.ts +++ b/plugins/events-backend-module-gitlab/src/alpha.ts @@ -14,5 +14,13 @@ * limitations under the License. */ -export { eventsModuleGitlabEventRouter } from './service/eventsModuleGitlabEventRouter'; -export { eventsModuleGitlabWebhook } from './service/eventsModuleGitlabWebhook'; +import { createBackendFeatureLoader } from '@backstage/backend-plugin-api'; + +export default createBackendFeatureLoader({ + loader() { + return [ + import('./service/eventsModuleGitlabEventRouter'), + import('./service/eventsModuleGitlabWebhook'), + ]; + }, +}); diff --git a/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabEventRouter.test.ts b/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabEventRouter.test.ts index 48ed7ef4d3..39f161e916 100644 --- a/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabEventRouter.test.ts +++ b/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabEventRouter.test.ts @@ -18,7 +18,7 @@ import { createServiceFactory } from '@backstage/backend-plugin-api'; import { startTestBackend } from '@backstage/backend-test-utils'; import { TestEventsService } from '@backstage/plugin-events-backend-test-utils'; import { eventsServiceRef } from '@backstage/plugin-events-node'; -import { eventsModuleGitlabEventRouter } from './eventsModuleGitlabEventRouter'; +import eventsModuleGitlabEventRouter from './eventsModuleGitlabEventRouter'; describe('eventsModuleGitlabEventRouter', () => { it('should be correctly wired and set up', async () => { diff --git a/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabEventRouter.ts b/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabEventRouter.ts index 66245efb58..3e4f4f5561 100644 --- a/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabEventRouter.ts +++ b/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabEventRouter.ts @@ -25,7 +25,7 @@ import { GitlabEventRouter } from '../router/GitlabEventRouter'; * * @alpha */ -export const eventsModuleGitlabEventRouter = createBackendModule({ +export default createBackendModule({ pluginId: 'events', moduleId: 'gitlab-event-router', register(env) { diff --git a/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabWebhook.test.ts b/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabWebhook.test.ts index d3452dd813..7671b6740c 100644 --- a/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabWebhook.test.ts +++ b/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabWebhook.test.ts @@ -20,7 +20,7 @@ import { HttpPostIngressOptions, RequestDetails, } from '@backstage/plugin-events-node'; -import { eventsModuleGitlabWebhook } from './eventsModuleGitlabWebhook'; +import eventsModuleGitlabWebhook from './eventsModuleGitlabWebhook'; describe('gitlabWebhookEventsModule', () => { const requestWithToken = (token?: string) => { diff --git a/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabWebhook.ts b/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabWebhook.ts index 77bca7236b..34a047fbe6 100644 --- a/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabWebhook.ts +++ b/plugins/events-backend-module-gitlab/src/service/eventsModuleGitlabWebhook.ts @@ -30,7 +30,7 @@ import { createGitlabTokenValidator } from '../http/createGitlabTokenValidator'; * * @alpha */ -export const eventsModuleGitlabWebhook = createBackendModule({ +export default createBackendModule({ pluginId: 'events', moduleId: 'gitlab-webhook', register(env) {