` block with `white-space: pre-wrap` or `white-space: pre`
+ *
+ * @remarks
+ *
+ * Default: false (`white-space: pre`)
+ */
+ wrapLongLines?: boolean;
/**
* Custom styles applied to code
*
@@ -79,6 +87,7 @@ export function CodeSnippet(props: CodeSnippetProps) {
language,
showLineNumbers = false,
highlightedNumbers,
+ wrapLongLines,
customStyle,
showCopyCodeButton = false,
} = props;
@@ -94,6 +103,7 @@ export function CodeSnippet(props: CodeSnippetProps) {
style={mode}
showLineNumbers={showLineNumbers}
wrapLines
+ wrapLongLines={wrapLongLines}
lineNumberStyle={{ color: theme.palette.textVerySubtle }}
lineProps={(lineNumber: number) =>
highlightedNumbers?.includes(lineNumber)
diff --git a/packages/core-components/src/components/Link/Link.test.tsx b/packages/core-components/src/components/Link/Link.test.tsx
index c132d832a2..c178ba6cbf 100644
--- a/packages/core-components/src/components/Link/Link.test.tsx
+++ b/packages/core-components/src/components/Link/Link.test.tsx
@@ -50,7 +50,7 @@ describe('', () => {
External Link,
);
const externalLink = screen.getByRole('link', {
- name: 'External Link , Opens in a new window',
+ name: 'External Link, Opens in a new window',
});
const externalLinkIcon = container.querySelector('svg');
expect(externalLink).not.toContainElement(externalLinkIcon);
@@ -62,6 +62,7 @@ describe('', () => {
External Link
,
);
+ // Note: when externalLinkIcon is present, the SVG adds whitespace to the accessible name
const externalLink = screen.getByRole('link', {
name: 'External Link , Opens in a new window',
});
diff --git a/packages/core-components/src/components/TabbedLayout/TabbedLayout.test.tsx b/packages/core-components/src/components/TabbedLayout/TabbedLayout.test.tsx
index 1be58d2dcf..3e4ab1df7c 100644
--- a/packages/core-components/src/components/TabbedLayout/TabbedLayout.test.tsx
+++ b/packages/core-components/src/components/TabbedLayout/TabbedLayout.test.tsx
@@ -47,18 +47,20 @@ describe('TabbedLayout', () => {
});
expect(error).toEqual([
+ expect.stringContaining(
+ 'Error: Child of TabbedLayout must be an TabbedLayout.Route',
+ ),
expect.objectContaining({
- detail: new Error(
- 'Child of TabbedLayout must be an TabbedLayout.Route',
- ),
+ type: 'unhandled-exception',
}),
+ expect.stringContaining(
+ 'Error: Child of TabbedLayout must be an TabbedLayout.Route',
+ ),
expect.objectContaining({
- detail: new Error(
- 'Child of TabbedLayout must be an TabbedLayout.Route',
- ),
+ type: 'unhandled-exception',
}),
- expect.stringMatching(
- /The above error occurred in the component/,
+ expect.stringContaining(
+ 'The above error occurred in the component',
),
]);
});
diff --git a/packages/core-components/src/components/Table/Table.test.tsx b/packages/core-components/src/components/Table/Table.test.tsx
index dfae66d1c2..dab5a462c2 100644
--- a/packages/core-components/src/components/Table/Table.test.tsx
+++ b/packages/core-components/src/components/Table/Table.test.tsx
@@ -68,7 +68,7 @@ describe('
', () => {
,
);
expect(rendered.getByText('second value, first row')).toHaveStyle({
- color: 'blue',
+ color: 'rgb(0, 0, 255)', // blue
});
});
@@ -85,7 +85,7 @@ describe('
', () => {
,
);
expect(rendered.getByText('second value, first row')).toHaveStyle({
- color: 'blue',
+ color: 'rgb(0, 0, 255)', // blue
'font-weight': 700,
});
});
@@ -115,10 +115,10 @@ describe('
', () => {
,
);
expect(rendered.getByText('second value, first row')).toHaveStyle({
- color: 'green',
+ color: 'rgb(0, 128, 0)', // green
});
expect(rendered.getByText('second value, second row')).toHaveStyle({
- color: 'red',
+ color: 'rgb(255, 0, 0)', // red
});
});
@@ -135,11 +135,11 @@ describe('
', () => {
,
);
expect(rendered.getByText('second value, first row')).toHaveStyle({
- color: 'green',
+ color: 'rgb(0, 128, 0)', // green
'font-weight': 700,
});
expect(rendered.getByText('second value, second row')).toHaveStyle({
- color: 'red',
+ color: 'rgb(255, 0, 0)', // red
'font-weight': 700,
});
});
@@ -165,11 +165,11 @@ describe('
', () => {
expect(rendered.getByText(column1.title).closest('th')).not.toHaveStyle(
{
- backgroundColor: 'pink',
+ backgroundColor: 'rgb(255, 192, 203)', // pink
},
);
expect(rendered.getByText(column2.title).closest('th')).toHaveStyle({
- backgroundColor: 'pink',
+ backgroundColor: 'rgb(255, 192, 203)', // pink
});
});
diff --git a/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx b/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx
index 4011fd2125..65e8a55801 100644
--- a/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx
+++ b/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx
@@ -67,18 +67,20 @@ describe(' component:/,
+ expect.stringContaining(
+ 'The above error occurred in the component:',
),
- expect.stringMatching(/^ErrorBoundary/),
- expect.stringMatching(/Warning: findDOMNode/), // React warning, unfortunate but currently true
+ expect.stringContaining('ErrorBoundary'),
+ expect.stringContaining('Warning: findDOMNode'), // React warning, unfortunate but currently true
]);
- expect(error.length).toEqual(5);
+ expect(error.length).toEqual(7);
});
});
diff --git a/packages/core-components/src/layout/Sidebar/Items.test.tsx b/packages/core-components/src/layout/Sidebar/Items.test.tsx
index 3121228ccd..35a0793409 100644
--- a/packages/core-components/src/layout/Sidebar/Items.test.tsx
+++ b/packages/core-components/src/layout/Sidebar/Items.test.tsx
@@ -96,7 +96,7 @@ describe('Items', () => {
it('should render a button with custom style', async () => {
expect(
await screen.findByRole('button', { name: /create/i }),
- ).toHaveStyle(`background-color: transparent`);
+ ).toHaveStyle(`background-color: rgba(0, 0, 0, 0)`); // transparent
});
it('should send button clicks to analytics', async () => {
diff --git a/packages/core-plugin-api/CHANGELOG.md b/packages/core-plugin-api/CHANGELOG.md
index a47e87fe66..8c6c617bcb 100644
--- a/packages/core-plugin-api/CHANGELOG.md
+++ b/packages/core-plugin-api/CHANGELOG.md
@@ -1,5 +1,14 @@
# @backstage/core-plugin-api
+## 1.12.1
+
+### Patch Changes
+
+- 358c6f7: The `useApp` and `useRouteRef` functions are now forwards compatible with the new frontend system. Along with the previous route reference changes this means that there is no longer a need to use `compatWrapper` from `@backstage/core-compat-api` to make code based on `@backstage/core-plugin-api` compatible with `@backstage/frontend-plugin-api` APIs.
+- 97cd16f: Reversed the relationship between the old `@backstage/core-plugin-api` and the new `@backstage/frontend-plugin-api`. Previously, the a lot of API definitions and utilities where defined in the old and re-exported from the old, but this change flips that around so that they now reside in the new package and are re-exported from the old. The external API of both packages remain the same, but this is a step towards being able to add further compatibility with the new frontend system built into the old.
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.13.2
+
## 1.12.1-next.0
### Patch Changes
diff --git a/packages/core-plugin-api/package.json b/packages/core-plugin-api/package.json
index 11e4a911c5..ef4982e07e 100644
--- a/packages/core-plugin-api/package.json
+++ b/packages/core-plugin-api/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/core-plugin-api",
- "version": "1.12.1-next.0",
+ "version": "1.12.1",
"description": "Core API used by Backstage plugins",
"backstage": {
"role": "web-library"
diff --git a/packages/core-plugin-api/src/extensions/extensions.test.tsx b/packages/core-plugin-api/src/extensions/extensions.test.tsx
index 75bb4ae443..59fe0d118d 100644
--- a/packages/core-plugin-api/src/extensions/extensions.test.tsx
+++ b/packages/core-plugin-api/src/extensions/extensions.test.tsx
@@ -26,7 +26,6 @@ import {
createReactExtension,
createRoutableExtension,
} from './extensions';
-import { ForwardedError } from '@backstage/errors';
jest.mock('../app');
@@ -117,7 +116,13 @@ describe('extensions', () => {
render( component:',
),
diff --git a/packages/frontend-plugin-api/src/schema/createSchemaFromZod.ts b/packages/frontend-plugin-api/src/schema/createSchemaFromZod.ts
index 85f9d5c44a..b15ff980ec 100644
--- a/packages/frontend-plugin-api/src/schema/createSchemaFromZod.ts
+++ b/packages/frontend-plugin-api/src/schema/createSchemaFromZod.ts
@@ -15,7 +15,7 @@
*/
import { JsonObject } from '@backstage/types';
-import { z, ZodSchema, ZodTypeDef } from 'zod';
+import { z, type ZodSchema, type ZodTypeDef } from 'zod';
import zodToJsonSchema from 'zod-to-json-schema';
import { PortableSchema } from './types';
diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.ts b/packages/frontend-plugin-api/src/wiring/createExtension.ts
index 9b55505056..6e4aba2910 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.ts
@@ -26,7 +26,7 @@ import {
} from '@internal/frontend';
import { ExtensionDataRef, ExtensionDataValue } from './createExtensionDataRef';
import { ExtensionInput } from './createExtensionInput';
-import { z } from 'zod';
+import type { z } from 'zod';
import { createSchemaFromZod } from '../schema/createSchemaFromZod';
import { OpaqueExtensionDefinition } from '@internal/frontend';
import { ExtensionDataContainer } from './types';
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
index c6723388ae..a7537d27e9 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
@@ -26,7 +26,7 @@ import {
ctxParamsSymbol,
VerifyExtensionAttachTo,
} from './createExtension';
-import { z } from 'zod';
+import type { z } from 'zod';
import { ExtensionInput } from './createExtensionInput';
import { ExtensionDataRef, ExtensionDataValue } from './createExtensionDataRef';
import { createExtensionDataContainer } from '@internal/frontend';
diff --git a/packages/frontend-test-utils/CHANGELOG.md b/packages/frontend-test-utils/CHANGELOG.md
index 3adc1d0f0b..c5399dc2e2 100644
--- a/packages/frontend-test-utils/CHANGELOG.md
+++ b/packages/frontend-test-utils/CHANGELOG.md
@@ -1,5 +1,15 @@
# @backstage/frontend-test-utils
+## 0.4.2
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-app@0.3.3
+ - @backstage/frontend-plugin-api@0.13.2
+ - @backstage/test-utils@1.7.14
+ - @backstage/frontend-app-api@0.13.3
+
## 0.4.2-next.0
### Patch Changes
diff --git a/packages/frontend-test-utils/package.json b/packages/frontend-test-utils/package.json
index 48ed1b6827..d6b63b22da 100644
--- a/packages/frontend-test-utils/package.json
+++ b/packages/frontend-test-utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/frontend-test-utils",
- "version": "0.4.2-next.0",
+ "version": "0.4.2",
"backstage": {
"role": "web-library"
},
diff --git a/packages/integration-react/CHANGELOG.md b/packages/integration-react/CHANGELOG.md
index cf30e3fadc..e7becc9337 100644
--- a/packages/integration-react/CHANGELOG.md
+++ b/packages/integration-react/CHANGELOG.md
@@ -1,5 +1,13 @@
# @backstage/integration-react
+## 1.2.13
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/core-plugin-api@1.12.1
+
## 1.2.13-next.0
### Patch Changes
diff --git a/packages/integration-react/package.json b/packages/integration-react/package.json
index d5cc25c5c2..9879042ef1 100644
--- a/packages/integration-react/package.json
+++ b/packages/integration-react/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/integration-react",
- "version": "1.2.13-next.0",
+ "version": "1.2.13",
"description": "Frontend package for managing integrations towards external systems",
"backstage": {
"role": "web-library"
diff --git a/packages/integration/CHANGELOG.md b/packages/integration/CHANGELOG.md
index a45b3d9770..b732447310 100644
--- a/packages/integration/CHANGELOG.md
+++ b/packages/integration/CHANGELOG.md
@@ -1,5 +1,45 @@
# @backstage/integration
+## 1.19.0
+
+### Minor Changes
+
+- 37fba1d: Added support for Bitbucket Cloud OAuth. This introduces an alternative authentication method using a workspace OAuth consumer, alongside App Passwords (deprecated) and API tokens. OAuth does not require a bot or service account and avoids token expiry issues.
+
+ **BREAKING CHANGES**
+
+ - **@backstage/integration** (`src/bitbucketCloud/core.ts`)
+
+ - `getBitbucketCloudRequestOptions` now returns a `Promise` and **must** be awaited.
+
+ - **@backstage/plugin-scaffolder-backend-module-bitbucket-cloud** (`src/actions/helpers.ts`)
+ - `getBitbucketClient` now returns a `Promise` and **must** be awaited.
+ - `getAuthorizationHeader` now returns a `Promise` and **must** be awaited.
+
+ **OAuth usage example**
+
+ ```yaml
+ integrations:
+ bitbucketCloud:
+ - clientId: client-id
+ clientSecret: client-secret
+ ```
+
+### Patch Changes
+
+- a26a322: Added support for using a GitHub App installation to generate tokens for public repository access when the `publicAccess` option is enabled. When all other authentication methods fail (e.g., the app is not installed in that organization), the provider will now use an available installation to generate a token that can be used to access public repositories as read only.
+- fb029b6: Updated luxon types
+- e15fdae: Made the github urls case insensitive.
+
+## 1.18.3-next.1
+
+### Patch Changes
+
+- fb029b6: Updated luxon types
+- Updated dependencies
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+
## 1.18.3-next.0
### Patch Changes
diff --git a/packages/integration/config.d.ts b/packages/integration/config.d.ts
index a601d63472..4278a8fcfe 100644
--- a/packages/integration/config.d.ts
+++ b/packages/integration/config.d.ts
@@ -174,7 +174,7 @@ export interface Config {
* The username to use for authenticated requests.
* @visibility secret
*/
- username: string;
+ username?: string;
/**
* Token used to authenticate requests.
* @visibility secret
@@ -186,6 +186,16 @@ export interface Config {
* @deprecated Use `token` instead.
*/
appPassword?: string;
+ /**
+ * OAuth client ID for Bitbucket Cloud.
+ * @visibility secret
+ */
+ clientId?: string;
+ /**
+ * OAuth client secret for Bitbucket Cloud.
+ * @visibility secret
+ */
+ clientSecret?: string;
/**
* PGP signing key for signing commits.
* @visibility secret
@@ -330,6 +340,10 @@ export interface Config {
* https://docs.github.com/en/rest/reference/apps#list-installations-for-the-authenticated-app--code-samples
*/
allowedInstallationOwners?: string[];
+ /**
+ * If true, then an installation token will be issued for access when no other token is available.
+ */
+ publicAccess?: boolean;
}>;
}>;
diff --git a/packages/integration/package.json b/packages/integration/package.json
index 41eeb67e06..a7f65efc9f 100644
--- a/packages/integration/package.json
+++ b/packages/integration/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/integration",
- "version": "1.18.3-next.0",
+ "version": "1.19.0",
"description": "Helpers for managing integrations towards external systems",
"backstage": {
"role": "common-library"
diff --git a/packages/integration/report.api.md b/packages/integration/report.api.md
index f642058ccd..561dea979d 100644
--- a/packages/integration/report.api.md
+++ b/packages/integration/report.api.md
@@ -250,6 +250,8 @@ export type BitbucketCloudIntegrationConfig = {
username?: string;
appPassword?: string;
token?: string;
+ clientId?: string;
+ clientSecret?: string;
commitSigningKey?: string;
};
@@ -450,12 +452,18 @@ export function getBitbucketCloudFileFetchUrl(
config: BitbucketCloudIntegrationConfig,
): string;
+// @public
+export function getBitbucketCloudOAuthToken(
+ clientId: string,
+ clientSecret: string,
+): Promise;
+
// @public
export function getBitbucketCloudRequestOptions(
config: BitbucketCloudIntegrationConfig,
-): {
+): Promise<{
headers: Record;
-};
+}>;
// @public @deprecated
export function getBitbucketDefaultBranch(
@@ -665,6 +673,7 @@ export type GithubAppConfig = {
clientId: string;
clientSecret: string;
allowedInstallationOwners?: string[];
+ publicAccess?: boolean;
};
// @public
diff --git a/packages/integration/src/azure/core.test.ts b/packages/integration/src/azure/core.test.ts
index 601057e499..fbd6747f56 100644
--- a/packages/integration/src/azure/core.test.ts
+++ b/packages/integration/src/azure/core.test.ts
@@ -73,7 +73,7 @@ describe('azure core', () => {
},
{
url: 'com/a/b/blob/master/path/to/c.yaml',
- error: 'Invalid URL: com/a/b/blob/master/path/to/c.yaml',
+ error: 'Invalid URL',
},
])('should handle error path %#', ({ url, error }) => {
expect(() => getAzureFileFetchUrl(url)).toThrow(error);
diff --git a/packages/integration/src/bitbucketCloud/config.test.ts b/packages/integration/src/bitbucketCloud/config.test.ts
index 9488c8b5f7..57e8803a14 100644
--- a/packages/integration/src/bitbucketCloud/config.test.ts
+++ b/packages/integration/src/bitbucketCloud/config.test.ts
@@ -85,6 +85,39 @@ describe('readBitbucketCloudIntegrationConfig', () => {
).toThrow(/token/);
});
+ it('reads OAuth configuration', () => {
+ const output = readBitbucketCloudIntegrationConfig(
+ buildConfig({
+ clientId: 'my-client-id',
+ clientSecret: 'my-client-secret',
+ }),
+ );
+ expect(output).toEqual({
+ host: BITBUCKET_CLOUD_HOST,
+ apiBaseUrl: BITBUCKET_CLOUD_API_BASE_URL,
+ clientId: 'my-client-id',
+ clientSecret: 'my-client-secret',
+ });
+ });
+
+ it('rejects incomplete OAuth configuration', () => {
+ expect(() =>
+ readBitbucketCloudIntegrationConfig(
+ buildConfig({
+ clientId: 'my-client-id',
+ }),
+ ),
+ ).toThrow(/incomplete OAuth configuration/);
+
+ expect(() =>
+ readBitbucketCloudIntegrationConfig(
+ buildConfig({
+ clientSecret: 'my-client-secret',
+ }),
+ ),
+ ).toThrow(/incomplete OAuth configuration/);
+ });
+
it('credentials hidden on the frontend', async () => {
const frontendConfig = await buildFrontendConfig({
token: 't',
@@ -103,6 +136,24 @@ describe('readBitbucketCloudIntegrationConfig', () => {
]);
});
+ it('OAuth credentials hidden on the frontend', async () => {
+ const frontendConfig = await buildFrontendConfig({
+ clientId: 'my-client-id',
+ clientSecret: 'my-client-secret',
+ });
+ expect(
+ readBitbucketCloudIntegrationConfigs(
+ frontendConfig.getOptionalConfigArray('integrations.bitbucketCloud') ??
+ [],
+ ),
+ ).toEqual([
+ {
+ host: BITBUCKET_CLOUD_HOST,
+ apiBaseUrl: BITBUCKET_CLOUD_API_BASE_URL,
+ },
+ ]);
+ });
+
// TODO: appPassword can be removed once fully
// deprecated by BitBucket on 9th June 2026.
describe('handles deprecated appPassword', () => {
diff --git a/packages/integration/src/bitbucketCloud/config.ts b/packages/integration/src/bitbucketCloud/config.ts
index 0e08e95a79..e47b215f98 100644
--- a/packages/integration/src/bitbucketCloud/config.ts
+++ b/packages/integration/src/bitbucketCloud/config.ts
@@ -54,6 +54,20 @@ export type BitbucketCloudIntegrationConfig = {
*/
token?: string;
+ /**
+ * The OAuth client ID for Bitbucket Cloud.
+ *
+ * See https://support.atlassian.com/bitbucket-cloud/docs/use-oauth-on-bitbucket-cloud/
+ */
+ clientId?: string;
+
+ /**
+ * The OAuth client secret for Bitbucket Cloud.
+ *
+ * See https://support.atlassian.com/bitbucket-cloud/docs/use-oauth-on-bitbucket-cloud/
+ */
+ clientSecret?: string;
+
/** PGP private key for signing commits. */
commitSigningKey?: string;
};
@@ -71,24 +85,36 @@ export function readBitbucketCloudIntegrationConfig(
const apiBaseUrl = BITBUCKET_CLOUD_API_BASE_URL;
// If config is provided, we assume authenticated access is desired
// (as the anonymous one is provided by default).
- const username = config.getString('username');
+ const username = config.getOptionalString('username');
// TODO: appPassword can be removed once fully
// deprecated by BitBucket on 9th June 2026.
const appPassword = config.getOptionalString('appPassword')?.trim();
const token = config.getOptionalString('token');
+ const clientId = config.getOptionalString('clientId')?.trim();
+ const clientSecret = config.getOptionalString('clientSecret')?.trim();
- if (!token && !appPassword) {
+ // Validate: if username is provided, token or appPassword is required
+ if (username && !token && !appPassword) {
throw new Error(
`Bitbucket Cloud integration must be configured with as username and either a token or an appPassword.`,
);
}
+ // Validate: OAuth requires both clientId and clientSecret
+ if ((clientId && !clientSecret) || (clientSecret && !clientId)) {
+ throw new Error(
+ `Bitbucket Cloud integration has incomplete OAuth configuration. Both clientId and clientSecret are required.`,
+ );
+ }
+
return {
host,
apiBaseUrl,
username,
appPassword,
token,
+ clientId,
+ clientSecret,
commitSigningKey: config.getOptionalString('commitSigningKey'),
};
}
diff --git a/packages/integration/src/bitbucketCloud/core.test.ts b/packages/integration/src/bitbucketCloud/core.test.ts
index fa8fc2ae43..4f46b5ad42 100644
--- a/packages/integration/src/bitbucketCloud/core.test.ts
+++ b/packages/integration/src/bitbucketCloud/core.test.ts
@@ -28,13 +28,15 @@ import {
// Mock constants
const BITBUCKET_CLOUD_HOST = 'bitbucket.org';
const BITBUCKET_CLOUD_API_BASE_URL = 'https://api.bitbucket.org/2.0';
+const BITBUCKET_CLOUD_OAUTH_TOKEN_URL =
+ 'https://bitbucket.org/site/oauth2/access_token';
describe('bitbucketCloud core', () => {
const worker = setupServer();
registerMswTestHooks(worker);
describe('getBitbucketCloudRequestOptions', () => {
- it('insert basic auth when needed', () => {
+ it('insert basic auth when needed', async () => {
const withUsernameAndToken: BitbucketCloudIntegrationConfig = {
host: BITBUCKET_CLOUD_HOST,
apiBaseUrl: BITBUCKET_CLOUD_API_BASE_URL,
@@ -54,20 +56,72 @@ describe('bitbucketCloud core', () => {
apiBaseUrl: BITBUCKET_CLOUD_API_BASE_URL,
};
expect(
- (getBitbucketCloudRequestOptions(withUsernameAndToken).headers as any)
+ (await getBitbucketCloudRequestOptions(withUsernameAndToken)).headers
.Authorization,
).toEqual('Basic c29tZS11c2VyQGRvbWFpbi5jb206bXktdG9rZW4=');
expect(
- (
- getBitbucketCloudRequestOptions(withUsernameAndPassword)
- .headers as any
- ).Authorization,
+ (await getBitbucketCloudRequestOptions(withUsernameAndPassword)).headers
+ .Authorization,
).toEqual('Basic c29tZS11c2VyOm15LXNlY3JldA==');
expect(
- (getBitbucketCloudRequestOptions(withoutUsername).headers as any)
+ (await getBitbucketCloudRequestOptions(withoutUsername)).headers
.Authorization,
).toBeUndefined();
});
+
+ it('handles OAuth token fetch errors', async () => {
+ // Test error handling
+ worker.use(
+ rest.post(BITBUCKET_CLOUD_OAUTH_TOKEN_URL, (_, res, ctx) =>
+ res(ctx.status(401), ctx.json({ error: 'invalid_client' })),
+ ),
+ );
+
+ const withOAuth: BitbucketCloudIntegrationConfig = {
+ host: BITBUCKET_CLOUD_HOST,
+ apiBaseUrl: BITBUCKET_CLOUD_API_BASE_URL,
+ clientId: 'test-client-id',
+ clientSecret: 'test-client-secret',
+ };
+
+ await expect(getBitbucketCloudRequestOptions(withOAuth)).rejects.toThrow(
+ /Failed to fetch OAuth token/,
+ );
+ });
+
+ it('uses OAuth Bearer token and caches it', async () => {
+ // Test OAuth + caching
+ let callCount = 0;
+ worker.use(
+ rest.post(BITBUCKET_CLOUD_OAUTH_TOKEN_URL, (_, res, ctx) => {
+ callCount++;
+ return res(
+ ctx.status(200),
+ ctx.json({
+ access_token: 'test-oauth-token',
+ expires_in: 3600,
+ }),
+ );
+ }),
+ );
+
+ const withOAuth: BitbucketCloudIntegrationConfig = {
+ host: BITBUCKET_CLOUD_HOST,
+ apiBaseUrl: BITBUCKET_CLOUD_API_BASE_URL,
+ clientId: 'test-client-id',
+ clientSecret: 'test-client-secret',
+ };
+
+ // First call should fetch token
+ const result1 = await getBitbucketCloudRequestOptions(withOAuth);
+ expect(result1.headers.Authorization).toEqual('Bearer test-oauth-token');
+ expect(callCount).toBe(1);
+
+ // Second call should use cached token (proves caching works)
+ const result2 = await getBitbucketCloudRequestOptions(withOAuth);
+ expect(result2.headers.Authorization).toEqual('Bearer test-oauth-token');
+ expect(callCount).toBe(1); // Still 1, proving cache was used
+ });
});
describe('getBitbucketCloudFileFetchUrl', () => {
diff --git a/packages/integration/src/bitbucketCloud/core.ts b/packages/integration/src/bitbucketCloud/core.ts
index a97de872de..9beb3bd748 100644
--- a/packages/integration/src/bitbucketCloud/core.ts
+++ b/packages/integration/src/bitbucketCloud/core.ts
@@ -17,6 +17,100 @@
import fetch from 'cross-fetch';
import parseGitUrl from 'git-url-parse';
import { BitbucketCloudIntegrationConfig } from './config';
+import { DateTime } from 'luxon';
+
+type OAuthTokenData = {
+ token: string;
+ expiresAt: DateTime;
+};
+
+// In-memory token cache (single entry since there's only one Bitbucket Cloud integration)
+let cachedToken: OAuthTokenData | undefined;
+
+// Track in-flight token refresh request to prevent concurrent fetches
+let refreshPromise: Promise | undefined;
+
+/**
+ * Fetches an OAuth access token from Bitbucket Cloud using client credentials flow.
+ * Tokens are cached with a 10-minute grace period to account for clock skew.
+ * Implements concurrent refresh protection to prevent multiple simultaneous token requests.
+ *
+ * @param clientId - OAuth client ID
+ * @param clientSecret - OAuth client secret
+ * @public
+ */
+export async function getBitbucketCloudOAuthToken(
+ clientId: string,
+ clientSecret: string,
+): Promise {
+ // Check cache
+ if (cachedToken && DateTime.now() < cachedToken.expiresAt) {
+ return cachedToken.token;
+ }
+
+ // Check if there's already a refresh in progress
+ if (refreshPromise) {
+ return refreshPromise;
+ }
+
+ // Start a new token fetch and track it
+ refreshPromise = (async () => {
+ try {
+ // Fetch new token
+ const credentials = Buffer.from(
+ `${clientId}:${clientSecret}`,
+ 'utf8',
+ ).toString('base64');
+
+ const response = await fetch(
+ 'https://bitbucket.org/site/oauth2/access_token',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/x-www-form-urlencoded',
+ Authorization: `Basic ${credentials}`,
+ },
+ body: 'grant_type=client_credentials',
+ },
+ );
+
+ if (!response.ok) {
+ throw new Error(
+ `Failed to fetch OAuth token from Bitbucket Cloud: ${response.status} ${response.statusText}`,
+ );
+ }
+
+ const data = await response.json();
+
+ if (!data.access_token) {
+ throw new Error('OAuth token response missing access_token field');
+ }
+
+ // Calculate expiration with 10-minute grace period
+ const expiresIn = data.expires_in || 3600; // Default to 1 hour
+ const expiresAt = DateTime.now()
+ .plus({ seconds: expiresIn })
+ .minus({ minutes: 10 });
+
+ // Cache the token
+ cachedToken = {
+ token: data.access_token,
+ expiresAt,
+ };
+
+ return data.access_token;
+ } catch (error) {
+ throw new Error(
+ `Failed to fetch OAuth token for Bitbucket Cloud: ${error}`,
+ );
+ } finally {
+ // Clean up the in-flight promise tracking
+ refreshPromise = undefined;
+ }
+ })();
+
+ return refreshPromise;
+}
/**
* Given a URL pointing to a path on a provider, returns the default branch.
@@ -34,7 +128,7 @@ export async function getBitbucketCloudDefaultBranch(
const branchUrl = `${config.apiBaseUrl}/repositories/${project}/${repoName}`;
const response = await fetch(
branchUrl,
- getBitbucketCloudRequestOptions(config),
+ await getBitbucketCloudRequestOptions(config),
);
if (!response.ok) {
@@ -118,18 +212,29 @@ export function getBitbucketCloudFileFetchUrl(
/**
* Gets the request options necessary to make requests to a given provider.
* Returns headers for authenticating with Bitbucket Cloud.
- * Supports both username/token and username/appPassword auth.
+ * Supports OAuth (clientId/clientSecret), username/token, and username/appPassword auth.
*
* @param config - The relevant provider config
* @public
*/
-export function getBitbucketCloudRequestOptions(
+export async function getBitbucketCloudRequestOptions(
config: BitbucketCloudIntegrationConfig,
-): {
+): Promise<{
headers: Record;
-} {
+}> {
const headers: Record = {};
+ // OAuth authentication (clientId/clientSecret)
+ if (config.clientId && config.clientSecret) {
+ const token = await getBitbucketCloudOAuthToken(
+ config.clientId,
+ config.clientSecret,
+ );
+ headers.Authorization = `Bearer ${token}`;
+ return { headers };
+ }
+
+ // Basic authentication (username + token/appPassword)
// TODO: appPassword can be removed once fully
// deprecated by BitBucket on 9th June 2026.
if (config.username && (config.token ?? config.appPassword)) {
diff --git a/packages/integration/src/bitbucketCloud/index.ts b/packages/integration/src/bitbucketCloud/index.ts
index 7119d3ea90..d0c11136b3 100644
--- a/packages/integration/src/bitbucketCloud/index.ts
+++ b/packages/integration/src/bitbucketCloud/index.ts
@@ -24,5 +24,6 @@ export {
getBitbucketCloudDefaultBranch,
getBitbucketCloudDownloadUrl,
getBitbucketCloudFileFetchUrl,
+ getBitbucketCloudOAuthToken,
getBitbucketCloudRequestOptions,
} from './core';
diff --git a/packages/integration/src/github/GithubIntegration.test.ts b/packages/integration/src/github/GithubIntegration.test.ts
index c54d4db2ef..70f1c4a16c 100644
--- a/packages/integration/src/github/GithubIntegration.test.ts
+++ b/packages/integration/src/github/GithubIntegration.test.ts
@@ -134,24 +134,4 @@ describe('replaceGithubUrlType', () => {
),
).toBe('https://github.com/backstage/backstage/blob/tree/README.md');
});
- it('should replace with lowercase', () => {
- expect(
- replaceGithubUrlType(
- 'https://githuB.com/backstage/backstage/blob/master/README.md',
- 'edit',
- ),
- ).toBe('https://github.com/backstage/backstage/edit/master/README.md');
- expect(
- replaceGithubUrlType(
- 'https://github.com/Backstage/backstage/blob/master/README.md',
- 'edit',
- ),
- ).toBe('https://github.com/backstage/backstage/edit/master/README.md');
- expect(
- replaceGithubUrlType(
- 'https://github.com/backstage/Backstage/blob/master/README.md',
- 'edit',
- ),
- ).toBe('https://github.com/backstage/backstage/edit/master/README.md');
- });
});
diff --git a/packages/integration/src/github/GithubIntegration.ts b/packages/integration/src/github/GithubIntegration.ts
index 79d5e7f421..880a2bed21 100644
--- a/packages/integration/src/github/GithubIntegration.ts
+++ b/packages/integration/src/github/GithubIntegration.ts
@@ -95,9 +95,7 @@ export function replaceGithubUrlType(
return url.replace(
/\/\/([^/]+)\/([^/]+)\/([^/]+)\/(blob|tree|edit)\//,
(_, host, owner, repo) => {
- return `//${host.toLocaleLowerCase('en-US')}/${owner.toLocaleLowerCase(
- 'en-US',
- )}/${repo.toLocaleLowerCase('en-US')}/${type}/`;
+ return `//${host}/${owner}/${repo}/${type}/`;
},
);
}
diff --git a/packages/integration/src/github/SingleInstanceGithubCredentialsProvider.test.ts b/packages/integration/src/github/SingleInstanceGithubCredentialsProvider.test.ts
index 0468e96e14..fefccf22f6 100644
--- a/packages/integration/src/github/SingleInstanceGithubCredentialsProvider.test.ts
+++ b/packages/integration/src/github/SingleInstanceGithubCredentialsProvider.test.ts
@@ -563,4 +563,330 @@ describe('SingleInstanceGithubCredentialsProvider tests', () => {
2,
);
});
+
+ describe('public access', () => {
+ it('should use an installation token when public access is enabled and owner is not in allowed list', async () => {
+ const githubProvider = SingleInstanceGithubCredentialsProvider.create({
+ host: 'github.com',
+ apps: [
+ {
+ appId: 1,
+ privateKey: 'privateKey',
+ webhookSecret: '123',
+ clientId: 'CLIENT_ID',
+ clientSecret: 'CLIENT_SECRET',
+ allowedInstallationOwners: ['other-org'],
+ publicAccess: true,
+ },
+ ],
+ });
+
+ octokit.apps.listInstallations.mockResolvedValue({
+ headers: {
+ etag: '123',
+ },
+ data: [
+ {
+ id: 1,
+ repository_selection: 'all',
+ account: {
+ login: 'other-org',
+ },
+ },
+ ],
+ } as RestEndpointMethodTypes['apps']['listInstallations']['response']);
+
+ octokit.apps.createInstallationAccessToken.mockResolvedValueOnce({
+ data: {
+ expires_at: DateTime.local().plus({ hours: 1 }).toString(),
+ token: 'public_access_token',
+ },
+ } as RestEndpointMethodTypes['apps']['createInstallationAccessToken']['response']);
+
+ const { token, headers, type } = await githubProvider.getCredentials({
+ url: 'https://github.com/some-public-org/some-repo',
+ });
+
+ expect(type).toEqual('app');
+ expect(token).toEqual('public_access_token');
+ expect(headers).toEqual({ Authorization: 'Bearer public_access_token' });
+ });
+
+ it('should use an installation token when public access is enabled and no installation exists for owner', async () => {
+ const githubProvider = SingleInstanceGithubCredentialsProvider.create({
+ host: 'github.com',
+ apps: [
+ {
+ appId: 1,
+ privateKey: 'privateKey',
+ webhookSecret: '123',
+ clientId: 'CLIENT_ID',
+ clientSecret: 'CLIENT_SECRET',
+ publicAccess: true,
+ },
+ ],
+ });
+
+ octokit.apps.listInstallations.mockResolvedValue({
+ headers: {
+ etag: '123',
+ },
+ data: [
+ {
+ id: 42,
+ repository_selection: 'all',
+ account: {
+ login: 'installed-org',
+ },
+ },
+ ],
+ } as RestEndpointMethodTypes['apps']['listInstallations']['response']);
+
+ octokit.apps.createInstallationAccessToken.mockResolvedValueOnce({
+ data: {
+ expires_at: DateTime.local().plus({ hours: 1 }).toString(),
+ token: 'public_installation_token',
+ },
+ } as RestEndpointMethodTypes['apps']['createInstallationAccessToken']['response']);
+
+ const { token, headers, type } = await githubProvider.getCredentials({
+ url: 'https://github.com/non-installed-org/some-repo',
+ });
+
+ expect(type).toEqual('app');
+ expect(token).toEqual('public_installation_token');
+ expect(headers).toEqual({
+ Authorization: 'Bearer public_installation_token',
+ });
+ });
+
+ it('should not use public access when normal installation credentials are available', async () => {
+ const githubProvider = SingleInstanceGithubCredentialsProvider.create({
+ host: 'github.com',
+ apps: [
+ {
+ appId: 1,
+ privateKey: 'privateKey',
+ webhookSecret: '123',
+ clientId: 'CLIENT_ID',
+ clientSecret: 'CLIENT_SECRET',
+ publicAccess: true,
+ },
+ ],
+ });
+
+ octokit.apps.listInstallations.mockResolvedValue({
+ headers: {
+ etag: '123',
+ },
+ data: [
+ {
+ id: 1,
+ repository_selection: 'all',
+ account: {
+ login: 'backstage',
+ },
+ },
+ ],
+ } as RestEndpointMethodTypes['apps']['listInstallations']['response']);
+
+ octokit.apps.createInstallationAccessToken.mockResolvedValueOnce({
+ data: {
+ expires_at: DateTime.local().plus({ hours: 1 }).toString(),
+ token: 'normal_token',
+ },
+ } as RestEndpointMethodTypes['apps']['createInstallationAccessToken']['response']);
+
+ const { token, type } = await githubProvider.getCredentials({
+ url: 'https://github.com/backstage/repo',
+ });
+
+ expect(type).toEqual('app');
+ expect(token).toEqual('normal_token');
+ // createInstallationAccessToken should only be called once for the normal flow
+ expect(octokit.apps.createInstallationAccessToken).toHaveBeenCalledTimes(
+ 1,
+ );
+ });
+
+ it('should fall back to configured token when public access fails', async () => {
+ const githubProvider = SingleInstanceGithubCredentialsProvider.create({
+ host: 'github.com',
+ apps: [
+ {
+ appId: 1,
+ privateKey: 'privateKey',
+ webhookSecret: '123',
+ clientId: 'CLIENT_ID',
+ clientSecret: 'CLIENT_SECRET',
+ allowedInstallationOwners: ['other-org'],
+ publicAccess: true,
+ },
+ ],
+ token: 'fallback_token',
+ });
+
+ octokit.apps.listInstallations.mockResolvedValue({
+ headers: {
+ etag: '123',
+ },
+ data: [],
+ } as unknown as RestEndpointMethodTypes['apps']['listInstallations']['response']);
+
+ const { token, type } = await githubProvider.getCredentials({
+ url: 'https://github.com/some-org/repo',
+ });
+
+ expect(type).toEqual('token');
+ expect(token).toEqual('fallback_token');
+ });
+
+ it('should return undefined when public access is disabled and no installation exists', async () => {
+ const githubProvider = SingleInstanceGithubCredentialsProvider.create({
+ host: 'github.com',
+ apps: [
+ {
+ appId: 1,
+ privateKey: 'privateKey',
+ webhookSecret: '123',
+ clientId: 'CLIENT_ID',
+ clientSecret: 'CLIENT_SECRET',
+ allowedInstallationOwners: ['other-org'],
+ // publicAccess is not set (defaults to false)
+ },
+ ],
+ });
+
+ octokit.apps.listInstallations.mockResolvedValue({
+ headers: {
+ etag: '123',
+ },
+ data: [
+ {
+ id: 1,
+ repository_selection: 'all',
+ account: {
+ login: 'other-org',
+ },
+ },
+ ],
+ } as RestEndpointMethodTypes['apps']['listInstallations']['response']);
+
+ const { token, headers } = await githubProvider.getCredentials({
+ url: 'https://github.com/some-org/repo',
+ });
+
+ expect(token).toBeUndefined();
+ expect(headers).toBeUndefined();
+ });
+
+ it('should cache public access tokens separately from regular tokens', async () => {
+ const githubProvider = SingleInstanceGithubCredentialsProvider.create({
+ host: 'github.com',
+ apps: [
+ {
+ appId: 1,
+ privateKey: 'privateKey',
+ webhookSecret: '123',
+ clientId: 'CLIENT_ID',
+ clientSecret: 'CLIENT_SECRET',
+ allowedInstallationOwners: ['installed-org'],
+ publicAccess: true,
+ },
+ ],
+ });
+
+ octokit.apps.listInstallations.mockResolvedValue({
+ headers: {
+ etag: '123',
+ },
+ data: [
+ {
+ id: 1,
+ repository_selection: 'all',
+ account: {
+ login: 'installed-org',
+ },
+ },
+ ],
+ } as RestEndpointMethodTypes['apps']['listInstallations']['response']);
+
+ octokit.apps.createInstallationAccessToken.mockResolvedValue({
+ data: {
+ expires_at: DateTime.local().plus({ hours: 1 }).toString(),
+ token: 'public_token',
+ },
+ } as RestEndpointMethodTypes['apps']['createInstallationAccessToken']['response']);
+
+ // First call for a public org
+ await githubProvider.getCredentials({
+ url: 'https://github.com/public-org/repo',
+ });
+
+ // Second call for the same public org should use cached token
+ await githubProvider.getCredentials({
+ url: 'https://github.com/public-org/repo',
+ });
+
+ // createInstallationAccessToken should only be called once due to caching
+ expect(octokit.apps.createInstallationAccessToken).toHaveBeenCalledTimes(
+ 1,
+ );
+ });
+
+ it('should use public access with multiple apps when only one has publicAccess enabled', async () => {
+ const githubProvider = SingleInstanceGithubCredentialsProvider.create({
+ host: 'github.com',
+ apps: [
+ {
+ appId: 1,
+ privateKey: 'privateKey',
+ webhookSecret: '123',
+ clientId: 'CLIENT_ID',
+ clientSecret: 'CLIENT_SECRET',
+ allowedInstallationOwners: ['org-1'],
+ // publicAccess not set, defaults to false
+ },
+ {
+ appId: 2,
+ privateKey: 'privateKey2',
+ webhookSecret: '456',
+ clientId: 'CLIENT_ID_2',
+ clientSecret: 'CLIENT_SECRET_2',
+ allowedInstallationOwners: ['org-2'],
+ publicAccess: true,
+ },
+ ],
+ });
+
+ octokit.apps.listInstallations.mockResolvedValue({
+ headers: {
+ etag: '123',
+ },
+ data: [
+ {
+ id: 1,
+ repository_selection: 'all',
+ account: {
+ login: 'org-2',
+ },
+ },
+ ],
+ } as RestEndpointMethodTypes['apps']['listInstallations']['response']);
+
+ octokit.apps.createInstallationAccessToken.mockResolvedValueOnce({
+ data: {
+ expires_at: DateTime.local().plus({ hours: 1 }).toString(),
+ token: 'public_access_from_app_2',
+ },
+ } as RestEndpointMethodTypes['apps']['createInstallationAccessToken']['response']);
+
+ const { token, type } = await githubProvider.getCredentials({
+ url: 'https://github.com/unknown-org/repo',
+ });
+
+ expect(type).toEqual('app');
+ expect(token).toEqual('public_access_from_app_2');
+ });
+ });
});
diff --git a/packages/integration/src/github/SingleInstanceGithubCredentialsProvider.ts b/packages/integration/src/github/SingleInstanceGithubCredentialsProvider.ts
index d2c1e37a65..40d166b223 100644
--- a/packages/integration/src/github/SingleInstanceGithubCredentialsProvider.ts
+++ b/packages/integration/src/github/SingleInstanceGithubCredentialsProvider.ts
@@ -100,6 +100,7 @@ class GithubAppManager {
private readonly baseAuthConfig: { appId: number; privateKey: string };
private readonly cache = new Cache();
private readonly allowedInstallationOwners: string[] | undefined; // undefined allows all installations
+ public readonly publicAccess: boolean;
constructor(config: GithubAppConfig, baseUrl?: string) {
this.allowedInstallationOwners = config.allowedInstallationOwners?.map(
@@ -116,6 +117,7 @@ class GithubAppManager {
authStrategy: createAppAuth,
auth: this.baseAuthConfig,
});
+ this.publicAccess = config.publicAccess ?? false;
}
async getInstallationCredentials(
@@ -170,6 +172,30 @@ class GithubAppManager {
});
}
+ async getPublicInstallationToken(): Promise<{ accessToken: string }> {
+ const [installation] = await this.getInstallations();
+
+ if (!installation) {
+ throw new Error(`No installation found for public app`);
+ }
+
+ return this.cache.getOrCreateToken(
+ `public:${installation.id}`,
+ undefined,
+ async () => {
+ const result = await this.appClient.apps.createInstallationAccessToken({
+ installation_id: installation.id,
+ headers: HEADERS,
+ });
+
+ return {
+ token: result.data.token,
+ expiresAt: DateTime.fromISO(result.data.expires_at),
+ };
+ },
+ );
+ }
+
getInstallations(): Promise<
RestEndpointMethodTypes['apps']['listInstallations']['response']['data']
> {
@@ -185,12 +211,14 @@ class GithubAppManager {
inst.account.login?.toLocaleLowerCase('en-US') ===
owner.toLocaleLowerCase('en-US'),
);
+
if (installation) {
return {
installationId: installation.id,
suspended: Boolean(installation.suspended_by),
};
}
+
const notFoundError = new Error(
`No app installation found for ${owner} in ${this.baseAuthConfig.appId}`,
);
@@ -245,10 +273,26 @@ export class GithubAppCredentialsMux {
const result = results.find(
resultItem => resultItem.credentials?.accessToken,
);
+
if (result) {
return result.credentials!.accessToken;
}
+ // If there was no token returned, then let's find a public access app and use an installation to get a token.
+ const publicAccessApp = this.apps.find(app => app.publicAccess);
+ if (publicAccessApp) {
+ const publicResult = await publicAccessApp
+ .getPublicInstallationToken()
+ .then(
+ credentials => ({ credentials, error: undefined }),
+ error => ({ credentials: undefined, error }),
+ );
+
+ if (publicResult.credentials?.accessToken) {
+ return publicResult.credentials.accessToken;
+ }
+ }
+
const errors = results.map(r => r.error);
const notNotFoundError = errors.find(err => err?.name !== 'NotFoundError');
if (notNotFoundError) {
diff --git a/packages/integration/src/github/config.ts b/packages/integration/src/github/config.ts
index 74a0267d62..f755b84c2a 100644
--- a/packages/integration/src/github/config.ts
+++ b/packages/integration/src/github/config.ts
@@ -109,6 +109,10 @@ export type GithubAppConfig = {
* https://docs.github.com/en/rest/reference/apps#list-installations-for-the-authenticated-app--code-samples
*/
allowedInstallationOwners?: string[];
+ /**
+ * If true, then an installation token will be issued for access when no other token is available.
+ */
+ publicAccess?: boolean;
};
/**
@@ -133,6 +137,7 @@ export function readGithubIntegrationConfig(
allowedInstallationOwners: c.getOptionalStringArray(
'allowedInstallationOwners',
),
+ publicAccess: c.getOptionalBoolean('publicAccess'),
}));
if (!isValidHost(host)) {
diff --git a/packages/repo-tools/CHANGELOG.md b/packages/repo-tools/CHANGELOG.md
index 36723eaecf..80904e4d06 100644
--- a/packages/repo-tools/CHANGELOG.md
+++ b/packages/repo-tools/CHANGELOG.md
@@ -1,5 +1,40 @@
# @backstage/repo-tools
+## 0.16.1
+
+### Patch Changes
+
+- 688f070: Updated to use new utilities from `@backstage/cli-common`.
+- 85895f9: Updates OpenAPI generator templates to preserve original property names (like 'group-name', 'user-id') from OpenAPI specs when propertyNaming=original is specified. Previously, these were always converted to camelCase regardless of the propertyNaming setting.
+
+ - Updates modelGeneric.mustache templates in both client and server generators
+ - Updates modelTaggedUnion.mustache templates in both client and server generators
+ - Uses {{baseName}} when available, falls back to {{name}} for backward compatibility
+ - Maintains backward compatibility - no changes when propertyNaming=original is not used
+
+- 2bae83a: Bump `@microsoft/api-documenter` and `@microsoft/api-extractor` to latest versions.
+- d1e38a7: Properly create workspace in OS temporary directory for `generate-patch` command
+- 2bae83a: Bumped dev dependencies `@types/node`
+- Updated dependencies
+ - @backstage/cli-node@0.2.16
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/cli-common@0.1.16
+ - @backstage/config-loader@1.10.7
+
+## 0.16.1-next.2
+
+### Patch Changes
+
+- 2bae83a: Bump `@microsoft/api-documenter` and `@microsoft/api-extractor` to latest versions.
+- 2bae83a: Bumped dev dependencies `@types/node`
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config-loader@1.10.7-next.1
+ - @backstage/cli-common@0.1.16-next.2
+ - @backstage/catalog-model@1.7.6
+ - @backstage/cli-node@0.2.16-next.1
+ - @backstage/errors@1.2.7
+
## 0.16.1-next.1
### Patch Changes
diff --git a/packages/repo-tools/package.json b/packages/repo-tools/package.json
index 8fb56a229a..8cf1b48d06 100644
--- a/packages/repo-tools/package.json
+++ b/packages/repo-tools/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/repo-tools",
- "version": "0.16.1-next.1",
+ "version": "0.16.1",
"description": "CLI for Backstage repo tooling ",
"backstage": {
"role": "cli"
diff --git a/packages/scaffolder-internal/CHANGELOG.md b/packages/scaffolder-internal/CHANGELOG.md
index 26f3232259..35db413d8f 100644
--- a/packages/scaffolder-internal/CHANGELOG.md
+++ b/packages/scaffolder-internal/CHANGELOG.md
@@ -1,5 +1,13 @@
# @internal/scaffolder
+## 0.0.16
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.13.2
+ - @backstage/plugin-scaffolder-react@1.19.4
+
## 0.0.16-next.0
### Patch Changes
diff --git a/packages/scaffolder-internal/package.json b/packages/scaffolder-internal/package.json
index 94ec12f591..98d76bb84e 100644
--- a/packages/scaffolder-internal/package.json
+++ b/packages/scaffolder-internal/package.json
@@ -1,6 +1,6 @@
{
"name": "@internal/scaffolder",
- "version": "0.0.16-next.0",
+ "version": "0.0.16",
"backstage": {
"role": "web-library",
"inline": true
diff --git a/packages/techdocs-cli-embedded-app/CHANGELOG.md b/packages/techdocs-cli-embedded-app/CHANGELOG.md
index 455f18d38f..825252391b 100644
--- a/packages/techdocs-cli-embedded-app/CHANGELOG.md
+++ b/packages/techdocs-cli-embedded-app/CHANGELOG.md
@@ -1,5 +1,63 @@
# techdocs-cli-embedded-app
+## 0.2.116-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/ui@0.11.0-next.0
+ - @backstage/cli@0.35.2-next.0
+ - @backstage/app-defaults@1.7.3
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/core-app-api@1.19.3
+ - @backstage/core-components@0.18.4
+ - @backstage/core-plugin-api@1.12.1
+ - @backstage/integration-react@1.2.13
+ - @backstage/test-utils@1.7.14
+ - @backstage/theme@0.7.1
+ - @backstage/plugin-catalog@1.32.1
+ - @backstage/plugin-techdocs@1.16.1
+ - @backstage/plugin-techdocs-react@1.3.6
+
+## 0.2.115
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-app-api@1.19.3
+ - @backstage/cli@0.35.0
+ - @backstage/ui@0.10.0
+ - @backstage/plugin-techdocs@1.16.1
+ - @backstage/plugin-catalog@1.32.1
+ - @backstage/core-components@0.18.4
+ - @backstage/test-utils@1.7.14
+ - @backstage/core-plugin-api@1.12.1
+ - @backstage/theme@0.7.1
+ - @backstage/app-defaults@1.7.3
+ - @backstage/integration-react@1.2.13
+ - @backstage/plugin-techdocs-react@1.3.6
+
+## 0.2.115-next.2
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-app-api@1.19.3-next.1
+ - @backstage/cli@0.35.0-next.2
+ - @backstage/plugin-techdocs@1.16.1-next.2
+ - @backstage/plugin-catalog@1.32.1-next.1
+ - @backstage/core-components@0.18.4-next.2
+ - @backstage/app-defaults@1.7.3-next.0
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/core-plugin-api@1.12.1-next.0
+ - @backstage/integration-react@1.2.13-next.0
+ - @backstage/test-utils@1.7.14-next.0
+ - @backstage/theme@0.7.1-next.0
+ - @backstage/ui@0.10.0-next.1
+ - @backstage/plugin-techdocs-react@1.3.6-next.0
+
## 0.2.115-next.1
### Patch Changes
diff --git a/packages/techdocs-cli-embedded-app/package.json b/packages/techdocs-cli-embedded-app/package.json
index a8a3ba85f4..151be92be9 100644
--- a/packages/techdocs-cli-embedded-app/package.json
+++ b/packages/techdocs-cli-embedded-app/package.json
@@ -1,6 +1,6 @@
{
"name": "techdocs-cli-embedded-app",
- "version": "0.2.115-next.1",
+ "version": "0.2.116-next.0",
"backstage": {
"role": "frontend"
},
diff --git a/packages/techdocs-cli-embedded-app/src/LiveReloadAddon.test.tsx b/packages/techdocs-cli-embedded-app/src/LiveReloadAddon.test.tsx
index 1a80def9e9..ec99f405ae 100644
--- a/packages/techdocs-cli-embedded-app/src/LiveReloadAddon.test.tsx
+++ b/packages/techdocs-cli-embedded-app/src/LiveReloadAddon.test.tsx
@@ -15,7 +15,7 @@
*/
import { render } from '@testing-library/react';
-import { TechDocsLiveReload } from './LiveReloadAddon';
+import { TechDocsLiveReload, utils } from './LiveReloadAddon';
jest.mock('@backstage/plugin-techdocs-react', () => ({
useShadowRootElements: jest.fn(() => [
@@ -38,12 +38,11 @@ jest.mock('@backstage/plugin-techdocs-react', () => ({
describe('TechDocsLiveReload', () => {
const originalXHR = global.XMLHttpRequest;
- let originalLocation: Location;
let openSpy: jest.Mock;
let sendSpy: jest.Mock;
+ let reloadPageSpy: jest.SpyInstance;
beforeEach(() => {
- originalLocation = window.location;
openSpy = jest.fn();
sendSpy = jest.fn(function (this: any) {
// simulate long-poll response that does NOT trigger reload (epoch unchanged)
@@ -65,9 +64,11 @@ describe('TechDocsLiveReload', () => {
global.XMLHttpRequest = MockXHR as any;
- // Replace window.location with a mutable object for tests
- delete (window as any).location;
- (window as any).location = { ...originalLocation, reload: jest.fn() };
+ // Spy on the utils object's reloadPage method
+ reloadPageSpy = jest
+ .spyOn(utils, 'reloadPage')
+ .mockImplementation(() => {});
+
jest.spyOn(window, 'addEventListener').mockImplementation(() => {});
jest.spyOn(window, 'removeEventListener').mockImplementation(() => {});
Object.defineProperty(document, 'visibilityState', {
@@ -79,23 +80,17 @@ describe('TechDocsLiveReload', () => {
afterEach(() => {
global.XMLHttpRequest = originalXHR;
jest.restoreAllMocks();
- // restore original window.location
- delete (window as any).location;
- (window as any).location = originalLocation;
});
it('polls livereload endpoint and does not reload when epoch unchanged', async () => {
- const reloadSpy = window.location.reload as unknown as jest.Mock;
render( | }
+ href="/path"
+ />
+ ```
+
+ **After:**
+
+ ```tsx
+ {/* Your custom content */} |
+ ```
+
+### Patch Changes
+
+- 50b7927: Fixed Checkbox indicator showing checkmark color when unchecked.
+
+ Affected components: Checkbox
+
+- 5bacf55: Fixed `ButtonIcon` incorrectly applying `className` to inner elements instead of only the root element.
+
+ Affected components: ButtonIcon
+
+- b3ad928: Fixed Table Row component to correctly handle cases where no `href` is provided, preventing unnecessary router provider wrapping and fixing the cursor incorrectly showing as a pointer despite the element not being a link.
+
+ Affected components: Row
+
+- a20d317: Added row selection support with visual state styling for hover, selected, and pressed states. Fixed checkbox rendering to only show for multi-select toggle mode.
+
+ Affected components: Table, TableHeader, Row, Column
+
+- fe7c751: Fixed `useTable` hook to prioritize `providedRowCount` over data length for accurate row count in server-side pagination scenarios.
+- c145031: Fixed Table column sorting indicator to show up arrow when no sort is active, correctly indicating that clicking will sort ascending.
+
+ Affected components: Column
+
## 0.10.0-next.1
### Minor Changes
diff --git a/packages/ui/css/styles.css b/packages/ui/css/styles.css
index c96eda05c9..f79b954080 100644
--- a/packages/ui/css/styles.css
+++ b/packages/ui/css/styles.css
@@ -51,9 +51,10 @@
--bui-gray-6: #8c8c8c;
--bui-gray-7: #757575;
--bui-gray-8: #595959;
- --bui-bg: var(--bui-gray-1);
+ --bui-bg-surface-0: var(--bui-gray-1);
--bui-bg-surface-1: var(--bui-white);
- --bui-bg-surface-2: var(--bui-gray-2);
+ --bui-bg-surface-2: var(--bui-gray-1);
+ --bui-bg-surface-3: var(--bui-gray-2);
--bui-bg-solid: #1f5493;
--bui-bg-solid-hover: #163a66;
--bui-bg-solid-pressed: #0f2b4e;
@@ -99,9 +100,10 @@
--bui-gray-6: #7b7b7b;
--bui-gray-7: #9e9e9e;
--bui-gray-8: #b4b4b4;
- --bui-bg: #333;
- --bui-bg-surface-1: #424242;
+ --bui-bg-surface-0: #333;
+ --bui-bg-surface-1: var(--bui-gray-1);
--bui-bg-surface-2: var(--bui-gray-2);
+ --bui-bg-surface-3: var(--bui-gray-3);
--bui-bg-solid: #9cc9ff;
--bui-bg-solid-hover: #83b9fd;
--bui-bg-solid-pressed: #83b9fd;
@@ -239,7 +241,7 @@
}
body {
- background-color: var(--bui-bg);
+ background-color: var(--bui-bg-surface-0);
color: var(--bui-fg-primary);
font-family: var(--bui-font-regular);
font-weight: var(--bui-font-weight-regular);
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 3ac6e991c8..a5461c6726 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/ui",
- "version": "0.10.0-next.1",
+ "version": "0.11.0-next.0",
"backstage": {
"role": "web-library"
},
@@ -50,7 +50,7 @@
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"chalk": "^5.4.1",
- "eslint-plugin-storybook": "^9.1.7",
+ "eslint-plugin-storybook": "^10.1.9",
"glob": "^11.0.1",
"globals": "^15.11.0",
"lightningcss": "^1.29.1",
@@ -58,7 +58,7 @@
"react": "^18.0.2",
"react-dom": "^18.0.2",
"react-router-dom": "^6.3.0",
- "storybook": "^9.1.7"
+ "storybook": "^10.1.10"
},
"peerDependencies": {
"@types/react": "^17.0.0 || ^18.0.0",
diff --git a/packages/ui/src/components/Accordion/Accordion.stories.tsx b/packages/ui/src/components/Accordion/Accordion.stories.tsx
index 6640bd5d6a..541cce5c84 100644
--- a/packages/ui/src/components/Accordion/Accordion.stories.tsx
+++ b/packages/ui/src/components/Accordion/Accordion.stories.tsx
@@ -13,8 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-import type { Meta, StoryObj } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
import {
Accordion,
AccordionTrigger,
@@ -36,15 +35,12 @@ const Content = () => (
);
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/Accordion',
component: Accordion,
-} satisfies Meta;
+});
-export default meta;
-type Story = StoryObj;
-
-export const Default: Story = {
+export const Default = meta.story({
render: () => (
),
-};
+});
-export const WithSubtitle: Story = {
+export const WithSubtitle = meta.story({
render: () => (
),
-};
+});
-export const CustomTrigger: Story = {
+export const CustomTrigger = meta.story({
render: () => (
@@ -87,9 +83,9 @@ export const CustomTrigger: Story = {
),
-};
+});
-export const DefaultExpanded: Story = {
+export const DefaultExpanded = meta.story({
render: () => (
),
-};
+});
-export const GroupSingleOpen: Story = {
+export const GroupSingleOpen = meta.story({
render: () => (
@@ -136,9 +132,9 @@ export const GroupSingleOpen: Story = {
),
-};
+});
-export const GroupMultipleOpen: Story = {
+export const GroupMultipleOpen = meta.story({
render: () => (
@@ -174,4 +170,4 @@ export const GroupMultipleOpen: Story = {
),
-};
+});
diff --git a/packages/ui/src/components/Avatar/Avatar.stories.tsx b/packages/ui/src/components/Avatar/Avatar.stories.tsx
index 582d82393e..75c1e68a67 100644
--- a/packages/ui/src/components/Avatar/Avatar.stories.tsx
+++ b/packages/ui/src/components/Avatar/Avatar.stories.tsx
@@ -13,36 +13,32 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-import type { Meta, StoryObj } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
import { Avatar } from './index';
import { Flex, Text } from '../..';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/Avatar',
component: Avatar,
-} satisfies Meta;
+});
-export default meta;
-type Story = StoryObj;
-
-export const Default: Story = {
+export const Default = meta.story({
args: {
src: 'https://avatars.githubusercontent.com/u/1540635?v=4',
name: 'Charles de Dreuille',
},
-};
+});
-export const Fallback: Story = {
+export const Fallback = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
src: 'https://avatars.githubusercontent.com/u/15406AAAAAAAAA',
},
-};
+});
-export const Sizes: Story = {
+export const Sizes = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: args => (
@@ -62,11 +58,11 @@ export const Sizes: Story = {
),
-};
+});
-export const Purpose: Story = {
+export const Purpose = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: args => (
@@ -93,4 +89,4 @@ export const Purpose: Story = {
),
-};
+});
diff --git a/packages/ui/src/components/Box/Box.stories.tsx b/packages/ui/src/components/Box/Box.stories.tsx
index 6637f45740..766a6668c7 100644
--- a/packages/ui/src/components/Box/Box.stories.tsx
+++ b/packages/ui/src/components/Box/Box.stories.tsx
@@ -1,3 +1,4 @@
+import preview from '../../../../../.storybook/preview';
/*
* Copyright 2024 The Backstage Authors
*
@@ -15,11 +16,10 @@
*/
import { ReactNode } from 'react';
-import type { Meta, StoryObj } from '@storybook/react-vite';
import { Box } from './Box';
import { Flex } from '../Flex';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/Box',
component: Box,
argTypes: {
@@ -31,10 +31,7 @@ const meta = {
control: false,
},
},
-} satisfies Meta;
-
-export default meta;
-type Story = StoryObj;
+});
const diagonalStripePattern = (() => {
const svg = `
@@ -47,7 +44,7 @@ const diagonalStripePattern = (() => {
return `data:image/svg+xml,${encodeURIComponent(svg)}`;
})();
-export const Default: Story = {
+export const Default = meta.story({
args: {
width: '64px',
height: '64px',
@@ -63,10 +60,10 @@ export const Default: Story = {
color: '#2563eb',
},
},
-};
+});
-export const Margin: Story = {
- args: { ...Default.args },
+export const Margin = meta.story({
+ args: { ...Default.input.args },
render: args => (
@@ -89,10 +86,10 @@ export const Margin: Story = {
),
-};
+});
-export const ResponsiveMargin: Story = {
- args: { ...Default.args },
+export const ResponsiveMargin = meta.story({
+ args: { ...Default.input.args },
render: args => (
@@ -115,10 +112,10 @@ export const ResponsiveMargin: Story = {
),
-};
+});
-export const CustomMargin: Story = {
- args: { ...Default.args },
+export const CustomMargin = meta.story({
+ args: { ...Default.input.args },
render: args => (
@@ -141,10 +138,10 @@ export const CustomMargin: Story = {
),
-};
+});
-export const CustomResponsiveMargin: Story = {
- args: { ...Default.args },
+export const CustomResponsiveMargin = meta.story({
+ args: { ...Default.input.args },
render: args => (
@@ -167,10 +164,10 @@ export const CustomResponsiveMargin: Story = {
),
-};
+});
-export const Padding: Story = {
- args: { ...Default.args },
+export const Padding = meta.story({
+ args: { ...Default.input.args },
render: args => (
@@ -193,10 +190,10 @@ export const Padding: Story = {
),
-};
+});
-export const ResponsivePadding: Story = {
- args: { ...Default.args },
+export const ResponsivePadding = meta.story({
+ args: { ...Default.input.args },
render: args => (
),
-};
+});
-export const CustomPadding: Story = {
- args: { ...Default.args },
+export const CustomPadding = meta.story({
+ args: { ...Default.input.args },
render: args => (
@@ -263,10 +260,10 @@ export const CustomPadding: Story = {
),
-};
+});
-export const CustomResponsivePadding: Story = {
- args: { ...Default.args },
+export const CustomResponsivePadding = meta.story({
+ args: { ...Default.input.args },
render: args => (
),
-};
+});
const CardDisplay = ({ children }: { children?: ReactNode }) => {
return (
@@ -327,7 +324,7 @@ const CardDisplay = ({ children }: { children?: ReactNode }) => {
);
};
-export const Display: Story = {
+export const Display = meta.story({
render: args => (
@@ -346,4 +343,4 @@ export const Display: Story = {
),
-};
+});
diff --git a/packages/ui/src/components/Button/Button.stories.tsx b/packages/ui/src/components/Button/Button.stories.tsx
index 4734770aa4..141db4da96 100644
--- a/packages/ui/src/components/Button/Button.stories.tsx
+++ b/packages/ui/src/components/Button/Button.stories.tsx
@@ -1,5 +1,5 @@
/*
- * Copyright 2024 The Backstage Authors
+ * Copyright 2025 The Backstage Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,15 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-import type { Meta, StoryObj } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
import { Button } from './Button';
import { Flex } from '../Flex';
import { Text } from '../Text';
import { RiArrowRightSLine, RiCloudLine } from '@remixicon/react';
import { useState } from 'react';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/Button',
component: Button,
argTypes: {
@@ -34,18 +33,15 @@ const meta = {
options: ['primary', 'secondary'],
},
},
-} satisfies Meta;
+});
-export default meta;
-type Story = StoryObj;
-
-export const Default: Story = {
+export const Default = meta.story({
args: {
children: 'Button',
},
-};
+});
-export const Variants: Story = {
+export const Variants = meta.story({
args: {
children: 'Button',
},
@@ -69,9 +65,9 @@ export const Variants: Story = {
),
-};
+});
-export const Sizes: Story = {
+export const Sizes = meta.story({
args: {
children: 'Button',
},
@@ -85,9 +81,9 @@ export const Sizes: Story = {
),
-};
+});
-export const WithIcons: Story = {
+export const WithIcons = meta.story({
args: {
children: 'Button',
},
@@ -102,9 +98,9 @@ export const WithIcons: Story = {
/>
),
-};
+});
-export const FullWidth: Story = {
+export const FullWidth = meta.story({
args: {
children: 'Button',
},
@@ -119,9 +115,9 @@ export const FullWidth: Story = {
/>
),
-};
+});
-export const Disabled: Story = {
+export const Disabled = meta.story({
render: () => (
),
-};
+});
-export const Responsive: Story = {
+export const Responsive = meta.story({
args: {
children: 'Button',
variant: {
@@ -149,12 +145,12 @@ export const Responsive: Story = {
sm: 'medium',
},
},
-};
+});
const variants = ['primary', 'secondary'] as const;
const sizes = ['small', 'medium'] as const;
-export const Playground: Story = {
+export const Playground = meta.story({
args: {
children: 'Button',
},
@@ -212,9 +208,9 @@ export const Playground: Story = {
))}
),
-};
+});
-export const Loading: Story = {
+export const Loading = meta.story({
render: () => {
const [isLoading, setIsLoading] = useState(false);
@@ -231,9 +227,9 @@ export const Loading: Story = {
);
},
-};
+});
-export const LoadingVariants: Story = {
+export const LoadingVariants = meta.story({
render: () => (
Primary
@@ -289,4 +285,4 @@ export const LoadingVariants: Story = {
),
-};
+});
diff --git a/packages/ui/src/components/ButtonIcon/ButtonIcon.stories.tsx b/packages/ui/src/components/ButtonIcon/ButtonIcon.stories.tsx
index 97072c3664..be6dad7754 100644
--- a/packages/ui/src/components/ButtonIcon/ButtonIcon.stories.tsx
+++ b/packages/ui/src/components/ButtonIcon/ButtonIcon.stories.tsx
@@ -1,5 +1,5 @@
/*
- * Copyright 2024 The Backstage Authors
+ * Copyright 2025 The Backstage Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,15 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-import type { Meta, StoryObj } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
import { ButtonIcon } from './ButtonIcon';
import { Flex } from '../Flex';
import { Text } from '../Text';
import { RiCloudLine } from '@remixicon/react';
import { useState } from 'react';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/ButtonIcon',
component: ButtonIcon,
argTypes: {
@@ -34,16 +33,13 @@ const meta = {
options: ['primary', 'secondary'],
},
},
-} satisfies Meta;
+});
-export default meta;
-type Story = StoryObj;
-
-export const Default: Story = {
+export const Default = meta.story({
render: () =>
),
-};
+});
-export const Sizes: Story = {
+export const Sizes = meta.story({
render: () => (
),
-};
+});
-export const Disabled: Story = {
+export const Disabled = meta.story({
render: () => (
),
-};
+});
-export const Responsive: Story = {
+export const Responsive = meta.story({
args: {
variant: {
initial: 'primary',
@@ -84,9 +80,9 @@ export const Responsive: Story = {
},
},
render: args =>
Primary
@@ -172,4 +168,4 @@ export const LoadingVariants: Story = {
),
-};
+});
diff --git a/packages/ui/src/components/ButtonLink/ButtonLink.stories.tsx b/packages/ui/src/components/ButtonLink/ButtonLink.stories.tsx
index 7d288065a4..4b9b9b747c 100644
--- a/packages/ui/src/components/ButtonLink/ButtonLink.stories.tsx
+++ b/packages/ui/src/components/ButtonLink/ButtonLink.stories.tsx
@@ -14,13 +14,14 @@
* limitations under the License.
*/
-import type { Meta, StoryFn, StoryObj } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
+import type { StoryFn } from '@storybook/react-vite';
import { ButtonLink } from './ButtonLink';
import { Flex } from '../Flex';
import { MemoryRouter } from 'react-router-dom';
import { RiArrowRightSLine, RiCloudLine } from '@remixicon/react';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/ButtonLink',
component: ButtonLink,
decorators: [
@@ -40,18 +41,15 @@ const meta = {
options: ['primary', 'secondary'],
},
},
-} satisfies Meta;
+});
-export default meta;
-type Story = StoryObj;
-
-export const Default: Story = {
+export const Default = meta.story({
args: {
children: 'Button',
},
-};
+});
-export const Variants: Story = {
+export const Variants = meta.story({
render: () => (
),
-};
+});
-export const Sizes: Story = {
+export const Sizes = meta.story({
args: {
children: 'Button',
},
@@ -96,9 +94,9 @@ export const Sizes: Story = {
),
-};
+});
-export const WithIcons: Story = {
+export const WithIcons = meta.story({
args: {
children: 'Button',
},
@@ -113,9 +111,9 @@ export const WithIcons: Story = {
/>
),
-};
+});
-export const FullWidth: Story = {
+export const FullWidth = meta.story({
args: {
children: 'Button',
},
@@ -130,9 +128,9 @@ export const FullWidth: Story = {
/>
),
-};
+});
-export const Disabled: Story = {
+export const Disabled = meta.story({
render: () => (
@@ -146,9 +144,9 @@ export const Disabled: Story = {
),
-};
+});
-export const Responsive: Story = {
+export const Responsive = meta.story({
args: {
children: 'Button',
variant: {
@@ -160,4 +158,4 @@ export const Responsive: Story = {
sm: 'medium',
},
},
-};
+});
diff --git a/packages/ui/src/components/Card/Card.stories.tsx b/packages/ui/src/components/Card/Card.stories.tsx
index 170d2b7984..f2a9c9bf07 100644
--- a/packages/ui/src/components/Card/Card.stories.tsx
+++ b/packages/ui/src/components/Card/Card.stories.tsx
@@ -1,5 +1,5 @@
/*
- * Copyright 2024 The Backstage Authors
+ * Copyright 2025 The Backstage Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,21 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-import type { Meta, StoryObj } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
import { Card, CardHeader, CardBody, CardFooter } from './Card';
import { Text } from '../..';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/Card',
component: Card,
subcomponents: { CardHeader, CardBody, CardFooter },
-} satisfies Meta;
+});
-export default meta;
-type Story = StoryObj;
-
-export const Default: Story = {
+export const Default = meta.story({
render: args => (
Header
@@ -35,19 +31,19 @@ export const Default: Story = {
Footer
),
-};
+});
-export const CustomSize: Story = {
+export const CustomSize = meta.story({
args: {
style: {
width: '300px',
height: '200px',
},
},
- render: Default.render,
-};
+ render: Default.input.render,
+});
-export const WithLongBody: Story = {
+export const WithLongBody = meta.story({
render: () => (
@@ -77,7 +73,7 @@ export const WithLongBody: Story = {
),
-};
+});
const ListRow = ({ children }: { children: React.ReactNode }) => {
return (
@@ -99,7 +95,7 @@ const ListRow = ({ children }: { children: React.ReactNode }) => {
);
};
-export const WithListRow: Story = {
+export const WithListRow = meta.story({
render: () => (
@@ -128,4 +124,4 @@ export const WithListRow: Story = {
),
-};
+});
diff --git a/packages/ui/src/components/Checkbox/Checkbox.stories.tsx b/packages/ui/src/components/Checkbox/Checkbox.stories.tsx
index a41b7f2c8d..c5318cc6fb 100644
--- a/packages/ui/src/components/Checkbox/Checkbox.stories.tsx
+++ b/packages/ui/src/components/Checkbox/Checkbox.stories.tsx
@@ -1,5 +1,5 @@
/*
- * Copyright 2024 The Backstage Authors
+ * Copyright 2025 The Backstage Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,27 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-import type { Meta, StoryObj } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
import { Checkbox } from './Checkbox';
import { Flex } from '../Flex';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/Checkbox',
component: Checkbox,
-} satisfies Meta;
+});
-export default meta;
-type Story = StoryObj;
-
-export const Default: Story = {
+export const Default = meta.story({
args: {
children: 'Accept terms and conditions',
},
-};
+});
-export const AllVariants: Story = {
- ...Default,
+export const AllVariants = meta.story({
+ ...Default.input,
render: () => (
Unchecked
@@ -44,4 +40,4 @@ export const AllVariants: Story = {
),
-};
+});
diff --git a/packages/ui/src/components/Container/Container.stories.tsx b/packages/ui/src/components/Container/Container.stories.tsx
index 504cb3de87..44ff6f2d17 100644
--- a/packages/ui/src/components/Container/Container.stories.tsx
+++ b/packages/ui/src/components/Container/Container.stories.tsx
@@ -1,5 +1,5 @@
/*
- * Copyright 2024 The Backstage Authors
+ * Copyright 2025 The Backstage Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,12 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-import type { Meta, StoryObj } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
import { Box } from '../Box/Box';
import { Container } from './Container';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/Container',
component: Container,
parameters: {
@@ -32,10 +31,7 @@ const meta = {
control: 'text',
},
},
-} satisfies Meta;
-
-export default meta;
-type Story = StoryObj;
+});
const DecorativeBox = () => (
(
/>
);
-export const Default: Story = {
+export const Default = meta.story({
args: {
children: ;
+});
-export default meta;
-type Story = StoryObj;
-
-export const Default: Story = {
+export const Default = meta.story({
render: args => {
return (
@@ -62,17 +60,15 @@ export const Default: Story = {
);
},
-};
+});
-export const Open: Story = {
+export const Open = Default.extend({
args: {
- ...Default.args,
defaultOpen: true,
},
- render: Default.render,
-};
+});
-export const NoTrigger: Story = {
+export const NoTrigger = meta.story({
args: {
isOpen: true,
},
@@ -100,9 +96,9 @@ export const NoTrigger: Story = {
);
},
-};
+});
-export const FixedWidth: Story = {
+export const FixedWidth = meta.story({
args: {
defaultOpen: true,
width: 600,
@@ -145,35 +141,35 @@ export const FixedWidth: Story = {
),
-};
+});
-export const FixedHeight: Story = {
+export const FixedHeight = meta.story({
args: {
defaultOpen: true,
height: 500,
},
- render: FixedWidth.render,
-};
+ render: FixedWidth.input.render,
+});
-export const FixedWidthAndHeight: Story = {
+export const FixedWidthAndHeight = meta.story({
args: {
defaultOpen: true,
width: 600,
height: 400,
},
- render: FixedWidth.render,
-};
+ render: FixedWidth.input.render,
+});
-export const FullWidthAndHeight: Story = {
+export const FullWidthAndHeight = meta.story({
args: {
defaultOpen: true,
width: '100%',
height: '100%',
},
- render: FixedWidth.render,
-};
+ render: FixedWidth.input.render,
+});
-export const Confirmation: Story = {
+export const Confirmation = meta.story({
args: {
isOpen: true,
},
@@ -199,9 +195,9 @@ export const Confirmation: Story = {
),
-};
+});
-export const WithForm: Story = {
+export const WithForm = meta.story({
args: {
isOpen: true,
},
@@ -235,20 +231,20 @@ export const WithForm: Story = {
),
-};
+});
-export const PreviewFixedWidthAndHeight: Story = {
+export const PreviewFixedWidthAndHeight = meta.story({
args: {
defaultOpen: undefined,
width: 600,
height: 400,
},
- render: FixedWidth.render,
-};
+ render: FixedWidth.input.render,
+});
-export const PreviewWithForm: Story = {
+export const PreviewWithForm = meta.story({
args: {
defaultOpen: undefined,
},
- render: WithForm.render,
-};
+ render: WithForm.input.render,
+});
diff --git a/packages/ui/src/components/FieldError/FieldError.stories.tsx b/packages/ui/src/components/FieldError/FieldError.stories.tsx
index 1922e12a0d..a0b2a05b92 100644
--- a/packages/ui/src/components/FieldError/FieldError.stories.tsx
+++ b/packages/ui/src/components/FieldError/FieldError.stories.tsx
@@ -1,5 +1,5 @@
/*
- * Copyright 2024 The Backstage Authors
+ * Copyright 2025 The Backstage Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,21 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-import type { Meta, StoryObj } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
import { TextField, Input, Form } from 'react-aria-components';
import { FieldError } from './FieldError';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/FieldError',
component: FieldError,
-} satisfies Meta;
-
-export default meta;
-type Story = StoryObj;
+});
// Show error with server validation using Form component
-export const WithServerValidation: Story = {
+export const WithServerValidation = meta.story({
render: () => (
),
-};
+});
// Show error using children
-export const WithCustomMessage: Story = {
+export const WithCustomMessage = meta.story({
render: () => (
This is a custom error message.
),
-};
+});
// Show error with render prop function
-export const WithRenderProp: Story = {
+export const WithRenderProp = meta.story({
render: () => (
),
-};
+});
diff --git a/packages/ui/src/components/FieldLabel/FieldLabel.stories.tsx b/packages/ui/src/components/FieldLabel/FieldLabel.stories.tsx
index d0e8f3e4fb..178df67284 100644
--- a/packages/ui/src/components/FieldLabel/FieldLabel.stories.tsx
+++ b/packages/ui/src/components/FieldLabel/FieldLabel.stories.tsx
@@ -1,5 +1,5 @@
/*
- * Copyright 2024 The Backstage Authors
+ * Copyright 2025 The Backstage Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-import type { Meta, StoryObj } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
import { FieldLabel } from './FieldLabel';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/FieldLabel',
component: FieldLabel,
argTypes: {
@@ -31,35 +30,32 @@ const meta = {
control: 'text',
},
},
-} satisfies Meta;
+});
-export default meta;
-type Story = StoryObj;
-
-export const Default: Story = {
+export const Default = meta.story({
args: {
label: 'Label',
},
-};
+});
-export const WithSecondaryLabel: Story = {
+export const WithSecondaryLabel = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
secondaryLabel: 'Secondary Label',
},
-};
+});
-export const WithDescription: Story = {
+export const WithDescription = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
description: 'Description',
},
-};
+});
-export const WithAllFields: Story = {
+export const WithAllFields = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
secondaryLabel: 'Secondary Label',
description: 'Description',
},
-};
+});
diff --git a/packages/ui/src/components/Flex/Flex.stories.tsx b/packages/ui/src/components/Flex/Flex.stories.tsx
index 87854e89c7..17ee740997 100644
--- a/packages/ui/src/components/Flex/Flex.stories.tsx
+++ b/packages/ui/src/components/Flex/Flex.stories.tsx
@@ -1,5 +1,5 @@
/*
- * Copyright 2024 The Backstage Authors
+ * Copyright 2025 The Backstage Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,13 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-import type { Meta, StoryObj } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
import { Flex } from './Flex';
import { Text } from '../Text';
import { Box } from '../Box';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/Flex',
component: Flex,
argTypes: {
@@ -36,10 +35,7 @@ const meta = {
options: ['row', 'column', 'row-reverse', 'column-reverse'],
},
},
-} satisfies Meta;
-
-export default meta;
-type Story = StoryObj;
+});
const DecorativeBox = ({
width = '48px',
@@ -78,7 +74,7 @@ const DecorativeBox = ({
);
};
-export const Default: Story = {
+export const Default = meta.story({
args: {
children: (
<>
@@ -88,23 +84,23 @@ export const Default: Story = {
),
},
-};
+});
-export const ColumnDirection: Story = {
+export const ColumnDirection = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
direction: 'column',
},
-};
+});
-export const RowDirection: Story = {
+export const RowDirection = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
direction: 'row',
},
-};
+});
-export const AlignStartInColumn: Story = {
+export const AlignStartInColumn = meta.story({
args: {
align: 'start',
direction: 'column',
@@ -116,9 +112,9 @@ export const AlignStartInColumn: Story = {
@@ -246,4 +242,4 @@ export const WithTextTruncate: Story = {
),
-};
+});
diff --git a/packages/ui/src/components/Grid/Grid.stories.tsx b/packages/ui/src/components/Grid/Grid.stories.tsx
index 66ea346b4f..56251b6085 100644
--- a/packages/ui/src/components/Grid/Grid.stories.tsx
+++ b/packages/ui/src/components/Grid/Grid.stories.tsx
@@ -1,5 +1,5 @@
/*
- * Copyright 2024 The Backstage Authors
+ * Copyright 2025 The Backstage Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,20 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-import type { Meta, StoryObj } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
import { Grid } from './Grid';
import type { GridItemProps } from './types';
import { Box } from '../Box/Box';
import { Flex } from '../Flex';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/Grid',
component: Grid.Root,
-} satisfies Meta;
-
-export default meta;
-type Story = StoryObj;
+});
const FakeBox = () => (
(
/>
);
-export const Default: Story = {
+export const Default = meta.story({
args: {
children: (
<>
@@ -51,16 +47,16 @@ export const Default: Story = {
),
},
-};
+});
-export const LargeGap: Story = {
+export const LargeGap = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
gap: '64px',
},
-};
+});
-export const ColumnSizes: Story = {
+export const ColumnSizes = meta.story({
args: {
columns: '12',
},
@@ -78,9 +74,9 @@ export const ColumnSizes: Story = {
))}
),
-};
+});
-export const RowAndColumns: Story = {
+export const RowAndColumns = meta.story({
args: {
columns: '12',
},
@@ -106,4 +102,4 @@ export const RowAndColumns: Story = {
),
-};
+});
diff --git a/packages/ui/src/components/Header/Header.module.css b/packages/ui/src/components/Header/Header.module.css
index ad50c42e0c..031cfd4d16 100644
--- a/packages/ui/src/components/Header/Header.module.css
+++ b/packages/ui/src/components/Header/Header.module.css
@@ -27,7 +27,7 @@
left: 0px;
right: 0px;
height: 16px;
- background-color: var(--bui-bg);
+ background-color: var(--bui-bg-surface-0);
z-index: 0;
}
diff --git a/packages/ui/src/components/Header/Header.stories.tsx b/packages/ui/src/components/Header/Header.stories.tsx
index 6ccda8bb50..7d1aa3a00a 100644
--- a/packages/ui/src/components/Header/Header.stories.tsx
+++ b/packages/ui/src/components/Header/Header.stories.tsx
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-import type { Meta, StoryObj, StoryFn } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
+import type { StoryFn } from '@storybook/react-vite';
import { Header } from './Header';
import type { HeaderTab } from './types';
import {
@@ -36,16 +37,13 @@ import {
} from '@remixicon/react';
import { HeaderPageBreadcrumb } from '../HeaderPage/types';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/Header',
component: Header,
parameters: {
layout: 'fullscreen',
},
-} satisfies Meta;
-
-export default meta;
-type Story = StoryObj;
+});
const withRouter = (Story: StoryFn) => (
@@ -199,19 +197,19 @@ const layoutDecorator = [
withRouter,
];
-export const Default: Story = {
+export const Default = meta.story({
args: {},
decorators: [withRouter],
-};
+});
-export const WithTabs: Story = {
+export const WithTabs = meta.story({
args: {
tabs,
},
decorators: [withRouter],
-};
+});
-export const WithCustomActions: Story = {
+export const WithCustomActions = meta.story({
args: {},
decorators: [withRouter],
render: args => (
@@ -240,20 +238,20 @@ export const WithCustomActions: Story = {
}
/>
),
-};
+});
-export const WithAllOptionsAndTabs: Story = {
+export const WithAllOptionsAndTabs = meta.story({
args: {
- ...WithCustomActions.args,
+ ...WithCustomActions.input.args,
tabs,
},
decorators: [withRouter],
- render: WithCustomActions.render,
-};
+ render: WithCustomActions.input.render,
+});
-export const WithHeaderPage: Story = {
+export const WithHeaderPage = meta.story({
args: {
- ...WithAllOptionsAndTabs.args,
+ ...WithAllOptionsAndTabs.input.args,
},
decorators: [withRouter],
render: args => (
@@ -276,9 +274,9 @@ export const WithHeaderPage: Story = {
/>
),
-};
+});
-export const WithLayout: Story = {
+export const WithLayout = meta.story({
decorators: layoutDecorator,
render: args => (
<>
@@ -291,9 +289,9 @@ export const WithLayout: Story = {
/>
),
-};
+});
-export const WithLayoutNoTabs: Story = {
+export const WithLayoutNoTabs = meta.story({
decorators: layoutDecorator,
render: args => (
<>
@@ -301,9 +299,9 @@ export const WithLayoutNoTabs: Story = {
),
-};
+});
-export const WithMockedURLIntegrations: Story = {
+export const WithMockedURLIntegrations = meta.story({
args: {
tabs,
},
@@ -373,9 +371,9 @@ export const WithMockedURLIntegrations: Story = {
),
-};
+});
-export const WithMockedURLNoMatch: Story = {
+export const WithMockedURLNoMatch = meta.story({
args: {
tabs,
},
@@ -397,9 +395,9 @@ export const WithMockedURLNoMatch: Story = {
),
-};
+});
-export const WithTabsMatchingStrategies: Story = {
+export const WithTabsMatchingStrategies = meta.story({
args: {
title: 'Route Matching Demo',
tabs: [
@@ -457,9 +455,9 @@ export const WithTabsMatchingStrategies: Story = {
),
-};
+});
-export const WithTabsExactMatching: Story = {
+export const WithTabsExactMatching = meta.story({
args: {
title: 'Exact Matching Demo',
tabs: [
@@ -496,9 +494,9 @@ export const WithTabsExactMatching: Story = {
),
-};
+});
-export const WithTabsPrefixMatchingDeep: Story = {
+export const WithTabsPrefixMatchingDeep = meta.story({
args: {
title: 'Deep Nesting Demo',
tabs: [
@@ -548,4 +546,4 @@ export const WithTabsPrefixMatchingDeep: Story = {
),
-};
+});
diff --git a/packages/ui/src/components/HeaderPage/HeaderPage.stories.tsx b/packages/ui/src/components/HeaderPage/HeaderPage.stories.tsx
index ab527bcda4..0631a6111d 100644
--- a/packages/ui/src/components/HeaderPage/HeaderPage.stories.tsx
+++ b/packages/ui/src/components/HeaderPage/HeaderPage.stories.tsx
@@ -1,3 +1,4 @@
+import preview from '../../../../../.storybook/preview';
/*
* Copyright 2025 The Backstage Authors
*
@@ -14,7 +15,7 @@
* limitations under the License.
*/
-import type { Meta, StoryObj, StoryFn } from '@storybook/react-vite';
+import type { StoryFn } from '@storybook/react-vite';
import { HeaderPage } from './HeaderPage';
import type { HeaderTab } from '../Header/types';
import { MemoryRouter } from 'react-router-dom';
@@ -29,16 +30,13 @@ import {
} from '../../';
import { RiMore2Line } from '@remixicon/react';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/HeaderPage',
component: HeaderPage,
parameters: {
layout: 'fullscreen',
},
-} satisfies Meta;
-
-export default meta;
-type Story = StoryObj;
+});
const tabs: HeaderTab[] = [
{
@@ -130,25 +128,25 @@ const layoutDecorator = [
),
];
-export const Default: Story = {
+export const Default = meta.story({
args: {
title: 'Page Title',
},
-};
+});
-export const WithTabs: Story = {
+export const WithTabs = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
tabs,
},
decorators: [withRouter],
-};
+});
-export const WithCustomActions: Story = {
+export const WithCustomActions = meta.story({
decorators: [withRouter],
render: () => (
@@ -174,48 +172,44 @@ export const WithCustomActions: Story = {
}
/>
),
-};
+});
-export const WithBreadcrumbs: Story = {
+export const WithBreadcrumbs = meta.story({
decorators: [withRouter],
args: {
- ...Default.args,
+ ...Default.input.args,
breadcrumbs: [{ label: 'Home', href: '/' }],
},
-};
+});
-export const WithLongBreadcrumbs: Story = {
+export const WithLongBreadcrumbs = meta.story({
decorators: [withRouter],
args: {
- ...Default.args,
+ ...Default.input.args,
breadcrumbs: [
{ label: 'Home', href: '/' },
{ label: 'Long Breadcrumb Name', href: '/long-breadcrumb' },
],
},
-};
+});
-export const WithEverything: Story = {
+export const WithEverything = meta.story({
decorators: [withRouter],
render: () => (
Custom action}
breadcrumbs={[{ label: 'Home', href: '/' }]}
/>
),
-};
+});
-export const WithLayout: Story = {
- args: {
- ...WithEverything.args,
- },
- decorators: [withRouter, ...layoutDecorator],
- render: WithEverything.render,
-};
+export const WithLayout = WithEverything.extend({
+ decorators: [...layoutDecorator],
+});
-export const WithTabsMatchingStrategies: Story = {
+export const WithTabsMatchingStrategies = meta.story({
args: {
title: 'Route Matching Demo',
tabs: [
@@ -273,9 +267,9 @@ export const WithTabsMatchingStrategies: Story = {
),
-};
+});
-export const WithTabsExactMatching: Story = {
+export const WithTabsExactMatching = meta.story({
args: {
title: 'Exact Matching Demo',
tabs: [
@@ -312,9 +306,9 @@ export const WithTabsExactMatching: Story = {
),
-};
+});
-export const WithTabsPrefixMatchingDeep: Story = {
+export const WithTabsPrefixMatchingDeep = meta.story({
args: {
title: 'Deep Nesting Demo',
tabs: [
@@ -364,4 +358,4 @@ export const WithTabsPrefixMatchingDeep: Story = {
),
-};
+});
diff --git a/packages/ui/src/components/Link/Link.stories.tsx b/packages/ui/src/components/Link/Link.stories.tsx
index 37f142c4dc..7d680e5616 100644
--- a/packages/ui/src/components/Link/Link.stories.tsx
+++ b/packages/ui/src/components/Link/Link.stories.tsx
@@ -14,13 +14,14 @@
* limitations under the License.
*/
-import type { Meta, StoryFn, StoryObj } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
+import type { StoryFn } from '@storybook/react-vite';
import { Link } from './Link';
import { Flex } from '../Flex';
import { Text } from '../Text';
import { MemoryRouter } from 'react-router-dom';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/Link',
component: Link,
args: {
@@ -33,29 +34,26 @@ const meta = {
),
],
-} satisfies Meta;
+});
-export default meta;
-type Story = StoryObj;
-
-export const Default: Story = {
+export const Default = meta.story({
args: {
href: '/',
children: 'Sign up for Backstage',
},
-};
+});
-export const ExternalLink: Story = {
+export const ExternalLink = meta.story({
args: {
href: 'https://backstage.io',
children: 'Sign up for Backstage',
target: '_blank',
},
-};
+});
-export const AllVariants: Story = {
+export const AllVariants = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: args => (
@@ -69,9 +67,9 @@ export const AllVariants: Story = {
),
-};
+});
-export const AllColors: Story = {
+export const AllColors = meta.story({
render: () => (
),
-};
+});
-export const AllWeights: Story = {
+export const AllWeights = meta.story({
render: () => (
@@ -225,9 +223,9 @@ export const AllWeights: Story = {
),
-};
+});
-export const Truncate: Story = {
+export const Truncate = meta.story({
args: {
children:
"A man looks at a painting in a museum and says, “Brothers and sisters I have none, but that man's father is my father's son.” Who is in the painting?",
@@ -235,21 +233,21 @@ export const Truncate: Story = {
truncate: true,
style: { width: '480px' },
},
-};
+});
-export const Responsive: Story = {
+export const Responsive = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
variant: {
xs: 'title-x-small',
md: 'body-x-small',
},
},
-};
+});
-export const Playground: Story = {
+export const Playground = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: args => (
@@ -269,4 +267,4 @@ export const Playground: Story = {
),
-};
+});
diff --git a/packages/ui/src/components/Menu/Menu.stories.tsx b/packages/ui/src/components/Menu/Menu.stories.tsx
index 7171b3ef83..ffe184d4ae 100644
--- a/packages/ui/src/components/Menu/Menu.stories.tsx
+++ b/packages/ui/src/components/Menu/Menu.stories.tsx
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import type { Meta, StoryObj } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
import {
MenuTrigger,
SubmenuTrigger,
@@ -38,7 +38,7 @@ import {
import { MemoryRouter } from 'react-router-dom';
import { useEffect, useState } from 'react';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/Menu',
component: MenuTrigger,
decorators: [
@@ -48,10 +48,7 @@ const meta = {
),
],
-} satisfies Meta;
-
-export default meta;
-type Story = StoryObj;
+});
const options = [
{ label: 'Apple', value: 'apple' },
@@ -65,7 +62,7 @@ const options = [
{ label: 'Honeydew', value: 'honeydew' },
];
-export const Preview: Story = {
+export const Preview = meta.story({
args: {
children: null,
},
@@ -91,11 +88,11 @@ export const Preview: Story = {
),
-};
+});
-export const PreviewSubmenu: Story = {
+export const PreviewSubmenu = meta.story({
args: {
- ...Preview.args,
+ ...Preview.input.args,
},
render: () => (
@@ -119,11 +116,11 @@ export const PreviewSubmenu: Story = {
),
-};
+});
-export const PreviewIcons: Story = {
+export const PreviewIcons = meta.story({
args: {
- ...Preview.args,
+ ...Preview.input.args,
},
render: () => (
@@ -135,11 +132,11 @@ export const PreviewIcons: Story = {
),
-};
+});
-export const PreviewSections: Story = {
+export const PreviewSections = meta.story({
args: {
- ...Preview.args,
+ ...Preview.input.args,
},
render: () => (
@@ -159,11 +156,11 @@ export const PreviewSections: Story = {
),
-};
+});
-export const PreviewSeparators: Story = {
+export const PreviewSeparators = meta.story({
args: {
- ...Preview.args,
+ ...Preview.input.args,
},
render: () => (
@@ -180,11 +177,11 @@ export const PreviewSeparators: Story = {
),
-};
+});
-export const PreviewLinks: Story = {
+export const PreviewLinks = meta.story({
args: {
- ...Preview.args,
+ ...Preview.input.args,
},
render: () => (
@@ -198,11 +195,11 @@ export const PreviewLinks: Story = {
),
-};
+});
-export const Opened: Story = {
+export const Opened = meta.story({
args: {
- ...Preview.args,
+ ...Preview.input.args,
},
render: () => (
@@ -214,11 +211,11 @@ export const Opened: Story = {
),
-};
+});
-export const WithIcons: Story = {
+export const WithIcons = meta.story({
args: {
- ...Preview.args,
+ ...Preview.input.args,
},
render: () => (
@@ -230,11 +227,11 @@ export const WithIcons: Story = {
),
-};
+});
-export const WithSections: Story = {
+export const WithSections = meta.story({
args: {
- ...Preview.args,
+ ...Preview.input.args,
},
render: () => (
@@ -254,11 +251,11 @@ export const WithSections: Story = {
),
-};
+});
-export const WithSeparators: Story = {
+export const WithSeparators = meta.story({
args: {
- ...Preview.args,
+ ...Preview.input.args,
},
render: () => (
@@ -275,11 +272,11 @@ export const WithSeparators: Story = {
),
-};
+});
-export const WithColors: Story = {
+export const WithColors = meta.story({
args: {
- ...Preview.args,
+ ...Preview.input.args,
},
render: () => (
@@ -295,11 +292,11 @@ export const WithColors: Story = {
),
-};
+});
-export const WithLinks: Story = {
+export const WithLinks = meta.story({
args: {
- ...Preview.args,
+ ...Preview.input.args,
},
render: () => (
@@ -313,11 +310,11 @@ export const WithLinks: Story = {
),
-};
+});
-export const Submenu: Story = {
+export const Submenu = meta.story({
args: {
- ...Preview.args,
+ ...Preview.input.args,
},
render: () => (
@@ -341,11 +338,11 @@ export const Submenu: Story = {
),
-};
+});
-export const Virtualized: Story = {
+export const Virtualized = meta.story({
args: {
- ...Preview.args,
+ ...Preview.input.args,
},
render: () => {
const [pokemon, setPokemon] = useState<
@@ -376,11 +373,11 @@ export const Virtualized: Story = {
);
},
-};
+});
-export const VirtualizedMaxHeight: Story = {
+export const VirtualizedMaxHeight = meta.story({
args: {
- ...Preview.args,
+ ...Preview.input.args,
},
render: () => {
const [pokemon, setPokemon] = useState<
@@ -411,9 +408,9 @@ export const VirtualizedMaxHeight: Story = {
);
},
-};
+});
-export const WithScroll: Story = {
+export const WithScroll = meta.story({
args: {
children: null,
},
@@ -446,4 +443,4 @@ export const WithScroll: Story = {
),
-};
+});
diff --git a/packages/ui/src/components/Menu/MenuAutocomplete.stories.tsx b/packages/ui/src/components/Menu/MenuAutocomplete.stories.tsx
index c0e1aca932..af68ec9415 100644
--- a/packages/ui/src/components/Menu/MenuAutocomplete.stories.tsx
+++ b/packages/ui/src/components/Menu/MenuAutocomplete.stories.tsx
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import type { Meta, StoryObj } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
import {
MenuTrigger,
SubmenuTrigger,
@@ -26,7 +26,7 @@ import { Button } from '../..';
import { useState, useEffect } from 'react';
import { MemoryRouter } from 'react-router-dom';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/MenuAutocomplete',
component: MenuTrigger,
decorators: [
@@ -36,10 +36,7 @@ const meta = {
),
],
-} satisfies Meta;
-
-export default meta;
-type Story = StoryObj;
+});
const options = [
{ label: 'Apple', value: 'apple' },
@@ -53,7 +50,7 @@ const options = [
{ label: 'Honeydew', value: 'honeydew' },
];
-export const Default: Story = {
+export const Default = meta.story({
args: {
children: null,
},
@@ -72,11 +69,11 @@ export const Default: Story = {
),
-};
+});
-export const PreviewAutocompleteMenu: Story = {
+export const PreviewAutocompleteMenu = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: () => (
@@ -93,11 +90,11 @@ export const PreviewAutocompleteMenu: Story = {
),
-};
+});
-export const Virtualized: Story = {
+export const Virtualized = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: () => {
const [pokemon, setPokemon] = useState<
@@ -132,11 +129,11 @@ export const Virtualized: Story = {
);
},
-};
+});
-export const VirtualizedMaxHeight: Story = {
+export const VirtualizedMaxHeight = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: () => {
const [pokemon, setPokemon] = useState<
@@ -172,11 +169,11 @@ export const VirtualizedMaxHeight: Story = {
);
},
-};
+});
-export const Submenu: Story = {
+export const Submenu = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: () => (
@@ -197,4 +194,4 @@ export const Submenu: Story = {
),
-};
+});
diff --git a/packages/ui/src/components/Menu/MenuAutocompleteListBox.stories.tsx b/packages/ui/src/components/Menu/MenuAutocompleteListBox.stories.tsx
index bf66f5f8fd..e1c22fbd9e 100644
--- a/packages/ui/src/components/Menu/MenuAutocompleteListBox.stories.tsx
+++ b/packages/ui/src/components/Menu/MenuAutocompleteListBox.stories.tsx
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import type { Meta, StoryObj } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
import {
MenuTrigger,
MenuAutocompleteListbox,
@@ -28,7 +28,7 @@ import { useEffect, useState } from 'react';
import { Selection } from 'react-aria-components';
import { MemoryRouter } from 'react-router-dom';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/MenuAutocompleteListBox',
component: MenuTrigger,
decorators: [
@@ -38,10 +38,7 @@ const meta = {
),
],
-} satisfies Meta;
-
-export default meta;
-type Story = StoryObj;
+});
const options = [
{ label: 'Apple', value: 'apple' },
@@ -55,7 +52,7 @@ const options = [
{ label: 'Honeydew', value: 'honeydew' },
];
-export const Default: Story = {
+export const Default = meta.story({
args: {
children: null,
},
@@ -83,11 +80,11 @@ export const Default: Story = {
);
},
-};
+});
-export const PreviewListbox: Story = {
+export const PreviewListbox = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: () => {
const [selected, setSelected] = useState(
@@ -113,11 +110,11 @@ export const PreviewListbox: Story = {
);
},
-};
+});
-export const PreviewListboxMultiple: Story = {
+export const PreviewListboxMultiple = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: () => {
const [selected, setSelected] = useState(
@@ -144,11 +141,11 @@ export const PreviewListboxMultiple: Story = {
);
},
-};
+});
-export const Submenu: Story = {
+export const Submenu = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: () => {
const [selected, setSelected] = useState(
@@ -182,11 +179,11 @@ export const Submenu: Story = {
);
},
-};
+});
-export const Virtualized: Story = {
+export const Virtualized = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: () => {
const [pokemon, setPokemon] = useState<
@@ -221,11 +218,11 @@ export const Virtualized: Story = {
);
},
-};
+});
-export const VirtualizedMaxHeight: Story = {
+export const VirtualizedMaxHeight = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: () => {
const [pokemon, setPokemon] = useState<
@@ -261,4 +258,4 @@ export const VirtualizedMaxHeight: Story = {
);
},
-};
+});
diff --git a/packages/ui/src/components/Menu/MenuListBox.stories.tsx b/packages/ui/src/components/Menu/MenuListBox.stories.tsx
index 72284fb6b9..2297598d0c 100644
--- a/packages/ui/src/components/Menu/MenuListBox.stories.tsx
+++ b/packages/ui/src/components/Menu/MenuListBox.stories.tsx
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-import type { Meta, StoryObj } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
import { MenuTrigger, MenuListBox, MenuListBoxItem } from './index';
import { Button, Flex, Text } from '../..';
import { useEffect, useState } from 'react';
import { Selection } from 'react-aria-components';
import { MemoryRouter } from 'react-router-dom';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/MenuListBox',
component: MenuTrigger,
decorators: [
@@ -31,12 +31,9 @@ const meta = {
),
],
-} satisfies Meta;
+});
-export default meta;
-type Story = StoryObj;
-
-export const Default: Story = {
+export const Default = meta.story({
args: {
children: null,
},
@@ -50,11 +47,11 @@ export const Default: Story = {
),
-};
+});
-export const Controlled: Story = {
+export const Controlled = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: () => {
const [selected, setSelected] = useState(new Set(['paul']));
@@ -86,11 +83,11 @@ export const Controlled: Story = {
);
},
-};
+});
-export const Virtualized: Story = {
+export const Virtualized = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: () => {
const [pokemon, setPokemon] = useState<
@@ -121,11 +118,11 @@ export const Virtualized: Story = {
);
},
-};
+});
-export const VirtualizedMaxHeight: Story = {
+export const VirtualizedMaxHeight = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: () => {
const [pokemon, setPokemon] = useState<
@@ -156,4 +153,4 @@ export const VirtualizedMaxHeight: Story = {
);
},
-};
+});
diff --git a/packages/ui/src/components/PasswordField/PasswordField.stories.tsx b/packages/ui/src/components/PasswordField/PasswordField.stories.tsx
index 1867e5b7bf..5f6a74d992 100644
--- a/packages/ui/src/components/PasswordField/PasswordField.stories.tsx
+++ b/packages/ui/src/components/PasswordField/PasswordField.stories.tsx
@@ -1,5 +1,5 @@
/*
- * Copyright 2024 The Backstage Authors
+ * Copyright 2025 The Backstage Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,15 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-import type { Meta, StoryObj } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
import { PasswordField } from './PasswordField';
import { Form } from 'react-aria-components';
import { Flex } from '../Flex';
import { FieldLabel } from '../FieldLabel';
import { RiSparklingLine } from '@remixicon/react';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/PasswordField',
component: PasswordField,
argTypes: {
@@ -32,12 +31,9 @@ const meta = {
control: 'object',
},
},
-} satisfies Meta;
+});
-export default meta;
-type Story = StoryObj;
-
-export const Default: Story = {
+export const Default = meta.story({
args: {
name: 'secret',
placeholder: 'Enter a secret',
@@ -45,11 +41,11 @@ export const Default: Story = {
maxWidth: '300px',
},
},
-};
+});
-export const Sizes: Story = {
+export const Sizes = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: args => (
@@ -57,79 +53,79 @@ export const Sizes: Story = {
),
-};
+});
-export const DefaultValue: Story = {
+export const DefaultValue = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
defaultValue: 'https://example.com',
},
-};
+});
-export const WithLabel: Story = {
+export const WithLabel = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
label: 'Label',
},
-};
+});
-export const WithDescription: Story = {
+export const WithDescription = meta.story({
args: {
- ...WithLabel.args,
+ ...WithLabel.input.args,
description: 'Description',
},
-};
+});
-export const Required: Story = {
+export const Required = meta.story({
args: {
- ...WithLabel.args,
+ ...WithLabel.input.args,
isRequired: true,
},
-};
+});
-export const Disabled: Story = {
+export const Disabled = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
isDisabled: true,
},
-};
+});
-export const WithIcon: Story = {
+export const WithIcon = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: args => (
;
+});
-export default meta;
-type Story = StoryObj;
-
-export const Default: Story = {
+export const Default = meta.story({
args: {
label: 'What is your favorite pokemon?',
},
@@ -36,11 +32,11 @@ export const Default: Story = {
Squirtle
),
-};
+});
-export const Horizontal: Story = {
+export const Horizontal = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
orientation: 'horizontal',
},
render: args => (
@@ -50,11 +46,11 @@ export const Horizontal: Story = {
Squirtle
),
-};
+});
-export const Disabled: Story = {
+export const Disabled = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
isDisabled: true,
},
render: args => (
@@ -64,11 +60,11 @@ export const Disabled: Story = {
Squirtle
),
-};
+});
-export const DisabledSingle: Story = {
+export const DisabledSingle = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: args => (
@@ -79,11 +75,11 @@ export const DisabledSingle: Story = {
Squirtle
),
-};
+});
-export const DisabledAndSelected: Story = {
+export const DisabledAndSelected = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
value: 'charmander',
},
render: args => (
@@ -95,11 +91,11 @@ export const DisabledAndSelected: Story = {
Squirtle
),
-};
+});
-export const Invalid: Story = {
+export const Invalid = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
name: 'pokemon',
isInvalid: true,
},
@@ -112,11 +108,11 @@ export const Invalid: Story = {
Squirtle
),
-};
+});
-export const Validation: Story = {
+export const Validation = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
name: 'pokemon',
defaultValue: 'charmander',
validationBehavior: 'aria',
@@ -129,11 +125,11 @@ export const Validation: Story = {
Squirtle
),
-};
+});
-export const ReadOnly: Story = {
+export const ReadOnly = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
isReadOnly: true,
defaultValue: 'charmander',
},
@@ -144,4 +140,4 @@ export const ReadOnly: Story = {
Squirtle
),
-};
+});
diff --git a/packages/ui/src/components/SearchField/SearchField.module.css b/packages/ui/src/components/SearchField/SearchField.module.css
index e99c212b29..765527c8c3 100644
--- a/packages/ui/src/components/SearchField/SearchField.module.css
+++ b/packages/ui/src/components/SearchField/SearchField.module.css
@@ -40,24 +40,25 @@
}
&[data-startCollapsed='true'] {
- transition: flex-basis 0.3s ease-in-out;
+ transition: flex-basis 0.3s ease-in-out, width 0.3s ease-in-out,
+ max-width 0.3s ease-in-out;
padding: 0;
flex: 0 1 auto;
&[data-collapsed='true'] {
- flex-basis: 200px;
- }
-
- &[data-collapsed='false'] {
cursor: pointer;
&[data-size='medium'] {
flex-basis: 2.5rem;
+ width: 2.5rem;
+ max-width: 2.5rem;
height: 2.5rem;
}
&[data-size='small'] {
flex-basis: 2rem;
+ width: 2rem;
+ max-width: 2rem;
height: 2rem;
}
@@ -79,6 +80,12 @@
}
}
}
+
+ &[data-collapsed='false'] {
+ flex-basis: 200px;
+ width: 200px;
+ max-width: 200px;
+ }
}
}
diff --git a/packages/ui/src/components/SearchField/SearchField.stories.tsx b/packages/ui/src/components/SearchField/SearchField.stories.tsx
index 81bc090835..2e07e742ad 100644
--- a/packages/ui/src/components/SearchField/SearchField.stories.tsx
+++ b/packages/ui/src/components/SearchField/SearchField.stories.tsx
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-import type { Meta, StoryObj } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
+import { useState } from 'react';
import { SearchField } from './SearchField';
import { Form } from 'react-aria-components';
import { Flex } from '../Flex';
@@ -25,7 +26,7 @@ import { Button } from '../Button';
import { Header } from '../Header';
import { MemoryRouter } from 'react-router-dom';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/SearchField',
component: SearchField,
argTypes: {
@@ -39,12 +40,9 @@ const meta = {
control: 'text',
},
},
-} satisfies Meta;
+});
-export default meta;
-type Story = StoryObj;
-
-export const Default: Story = {
+export const Default = meta.story({
args: {
name: 'url',
style: {
@@ -52,11 +50,11 @@ export const Default: Story = {
},
'aria-label': 'Search',
},
-};
+});
-export const Sizes: Story = {
+export const Sizes = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: args => (
@@ -64,46 +62,46 @@ export const Sizes: Story = {
),
-};
+});
-export const DefaultValue: Story = {
+export const DefaultValue = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
defaultValue: 'https://example.com',
},
-};
+});
-export const WithLabel: Story = {
+export const WithLabel = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
label: 'Label',
},
-};
+});
-export const WithDescription: Story = {
+export const WithDescription = meta.story({
args: {
- ...WithLabel.args,
+ ...WithLabel.input.args,
description: 'Description',
},
-};
+});
-export const Required: Story = {
+export const Required = meta.story({
args: {
- ...WithLabel.args,
+ ...WithLabel.input.args,
isRequired: true,
},
-};
+});
-export const Disabled: Story = {
+export const Disabled = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
isDisabled: true,
},
-};
+});
-export const WithIcon: Story = {
+export const WithIcon = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: args => (
+
+
+
),
-};
+});
-export const InHeader: Story = {
+export const StartCollapsedWithValue = meta.story({
+ args: {
+ ...StartCollapsed.input.args,
+ defaultValue: 'https://example.com',
+ },
+
+ render: args =>
@@ -204,11 +214,11 @@ export const InHeader: Story = {
/>
),
-};
+});
-export const StartCollapsedInHeader: Story = {
+export const StartCollapsedInHeader = meta.story({
args: {
- ...StartCollapsed.args,
+ ...StartCollapsed.input.args,
},
decorators: [
Story => (
@@ -241,11 +251,11 @@ export const StartCollapsedInHeader: Story = {
/>
),
-};
+});
-export const StartCollapsedWithButtons: Story = {
+export const StartCollapsedWithButtons = meta.story({
args: {
- ...StartCollapsed.args,
+ ...StartCollapsed.input.args,
},
render: args => (
@@ -271,11 +281,11 @@ export const StartCollapsedWithButtons: Story = {
),
-};
+});
-export const StartCollapsedWithOnChange: Story = {
+export const StartCollapsedWithOnChange = meta.story({
args: {
- ...StartCollapsed.args,
+ ...StartCollapsed.input.args,
},
render: args => {
const handleChange = (value: string) => {
@@ -292,4 +302,42 @@ export const StartCollapsedWithOnChange: Story = {
);
},
-};
+});
+
+export const StartCollapsedControlledEmpty = meta.story({
+ args: {
+ ...StartCollapsed.input.args,
+ },
+ render: function Render(args) {
+ const [value, setValue] = useState('');
+
+ return (
+
+
+ );
+ },
+});
+
+export const StartCollapsedControlledWithValue = meta.story({
+ args: {
+ ...StartCollapsed.input.args,
+ },
+ render: function Render(args) {
+ const [value, setValue] = useState('Component');
+
+ return (
+
+
+ );
+ },
+});
diff --git a/packages/ui/src/components/SearchField/SearchField.tsx b/packages/ui/src/components/SearchField/SearchField.tsx
index 775b7accc6..eea749e46f 100644
--- a/packages/ui/src/components/SearchField/SearchField.tsx
+++ b/packages/ui/src/components/SearchField/SearchField.tsx
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import { forwardRef, useEffect, useState } from 'react';
+import { forwardRef, useEffect, useState, useRef } from 'react';
import {
Input,
SearchField as AriaSearchField,
@@ -39,9 +39,6 @@ export const SearchField = forwardRef(
'aria-labelledby': ariaLabelledBy,
} = props;
- const [isCollapsed, setIsCollapsed] = useState(false);
- const [shouldCollapse, setShouldCollapse] = useState(true);
-
useEffect(() => {
if (!label && !ariaLabel && !ariaLabelledBy) {
console.warn(
@@ -71,30 +68,29 @@ export const SearchField = forwardRef(
...rest
} = cleanedProps;
+ const [isFocused, setIsFocused] = useState(false);
+ const inputRef = useRef(null);
+
// If a secondary label is provided, use it. Otherwise, use 'Required' if the field is required.
const secondaryLabelText =
secondaryLabel || (isRequired ? 'Required' : null);
- const handleClick = (isFocused: boolean) => {
+ const handleFocusChange = (isFocused: boolean) => {
props.onFocusChange?.(isFocused);
- if (shouldCollapse) {
- if (isFocused) {
- setIsCollapsed(true);
- } else {
- setIsCollapsed(false);
- }
- }
+ setIsFocused(isFocused);
};
- const handleChange = (value: string) => {
- props.onChange?.(value);
- if (value.length > 0) {
- setShouldCollapse(false);
- } else {
- setShouldCollapse(true);
- }
+ const handleContainerClick = () => {
+ inputRef.current?.focus();
};
+ const hasInputRef = !!inputRef.current;
+ const hasValue = !!inputRef.current?.value;
+
+ const isCollapsed = hasInputRef
+ ? startCollapsed && !hasValue && !isFocused
+ : startCollapsed && !rest.value && !rest.defaultValue && !isFocused;
+
return (
(
aria-label={ariaLabel}
aria-labelledby={ariaLabelledBy}
data-collapsed={isCollapsed}
- onFocusChange={handleClick}
- onChange={handleChange}
style={style}
{...rest}
+ onFocusChange={handleFocusChange}
ref={ref}
>
(
styles[classNames.inputWrapper],
)}
data-size={dataAttributes['data-size']}
+ onClick={handleContainerClick}
>
{icon !== false && (
(
)}
;
-
-export default meta;
-type Story = StoryObj;
+});
const fontOptions = [
{ value: 'sans', label: 'Sans-serif' },
@@ -66,23 +64,23 @@ const skills = [
{ value: 'swift', label: 'Swift' },
];
-export const Default: Story = {
+export const Default = meta.story({
args: {
options: fontOptions,
name: 'font',
},
-};
+});
-export const Searchable: Story = {
+export const Searchable = meta.story({
args: {
label: 'Country',
searchable: true,
searchPlaceholder: 'Search countries...',
options: countries,
},
-};
+});
-export const MultipleSelection: Story = {
+export const MultipleSelection = meta.story({
args: {
label: 'Select multiple options',
selectionMode: 'multiple',
@@ -93,9 +91,9 @@ export const MultipleSelection: Story = {
{ value: 'option4', label: 'Option 4' },
],
},
-};
+});
-export const SearchableMultiple: Story = {
+export const SearchableMultiple = meta.story({
args: {
label: 'Skills',
searchable: true,
@@ -103,9 +101,9 @@ export const SearchableMultiple: Story = {
searchPlaceholder: 'Filter skills...',
options: skills,
},
-};
+});
-export const Preview: Story = {
+export const Preview = meta.story({
args: {
label: 'Font Family',
options: fontOptions,
@@ -113,40 +111,40 @@ export const Preview: Story = {
name: 'font',
style: { maxWidth: 260 },
},
-};
+});
-export const WithLabel: Story = {
+export const WithLabel = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
label: 'Font Family',
},
-};
+});
-export const WithFullWidth: Story = {
+export const WithFullWidth = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
label: 'Font Family',
style: { width: '100%' },
},
-};
+});
-export const WithLabelAndDescription: Story = {
+export const WithLabelAndDescription = meta.story({
args: {
- ...WithLabel.args,
+ ...WithLabel.input.args,
description: 'Choose a font family for your document',
},
-};
+});
-export const WithIcon: Story = {
+export const WithIcon = meta.story({
args: {
- ...WithLabel.args,
+ ...WithLabel.input.args,
},
render: args => } />,
-};
+});
-export const Sizes: Story = {
+export const Sizes = meta.story({
args: {
- ...Preview.args,
+ ...Preview.input.args,
},
render: args => (
@@ -154,52 +152,52 @@ export const Sizes: Story = {
} />
),
-};
+});
-export const Required: Story = {
+export const Required = meta.story({
args: {
- ...Preview.args,
+ ...Preview.input.args,
isRequired: true,
},
-};
+});
-export const Disabled: Story = {
+export const Disabled = meta.story({
args: {
- ...Preview.args,
+ ...Preview.input.args,
isDisabled: true,
},
-};
+});
-export const DisabledOption: Story = {
+export const DisabledOption = meta.story({
args: {
- ...Preview.args,
+ ...Preview.input.args,
disabledKeys: ['cursive', 'serif'],
},
-};
+});
-export const NoOptions: Story = {
+export const NoOptions = meta.story({
args: {
- ...Preview.args,
+ ...Preview.input.args,
options: undefined,
},
-};
+});
-export const WithValue: Story = {
+export const WithValue = meta.story({
args: {
- ...Preview.args,
+ ...Preview.input.args,
selectedKey: 'mono',
defaultSelectedKey: 'serif',
},
-};
+});
-export const WithDefaultValue: Story = {
+export const WithDefaultValue = meta.story({
args: {
- ...Preview.args,
+ ...Preview.input.args,
defaultSelectedKey: 'serif',
options: fontOptions,
name: 'font',
},
-};
+});
const generateOptions = (count = 100) => {
const firstWords = [
@@ -323,17 +321,17 @@ const generateOptions = (count = 100) => {
}));
};
-export const WithManyOptions: Story = {
+export const WithManyOptions = meta.story({
args: {
label: 'Font Family',
options: generateOptions(),
name: 'font',
},
-};
+});
-export const WithError: Story = {
+export const WithError = meta.story({
args: {
- ...WithLabel.args,
+ ...WithLabel.input.args,
name: 'font',
},
render: args => (
@@ -341,9 +339,9 @@ export const WithError: Story = {
),
-};
+});
-export const WithLongNames: Story = {
+export const WithLongNames = meta.story({
args: {
label: 'Document Template',
options: [
@@ -378,11 +376,11 @@ export const WithLongNames: Story = {
style: { maxWidth: 400 },
defaultSelectedKey: 'annual-report-2024',
},
-};
+});
-export const WithLongNamesAndPadding: Story = {
+export const WithLongNamesAndPadding = meta.story({
args: {
- ...WithLongNames.args,
+ ...WithLongNames.input.args,
},
decorators: [
(Story, { args }) => (
@@ -391,11 +389,11 @@ export const WithLongNamesAndPadding: Story = {
),
],
-};
+});
-export const WithAccessibilityProps: Story = {
+export const WithAccessibilityProps = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: args => (
@@ -422,4 +420,4 @@ export const WithAccessibilityProps: Story = {
),
-};
+});
diff --git a/packages/ui/src/components/Skeleton/Skeleton.stories.tsx b/packages/ui/src/components/Skeleton/Skeleton.stories.tsx
index bbe25942f0..d9fc3ff120 100644
--- a/packages/ui/src/components/Skeleton/Skeleton.stories.tsx
+++ b/packages/ui/src/components/Skeleton/Skeleton.stories.tsx
@@ -13,12 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-import type { Meta, StoryObj } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
import { Skeleton } from './Skeleton';
import { Flex } from '../Flex';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/Skeleton',
component: Skeleton,
argTypes: {
@@ -37,24 +36,21 @@ const meta = {
height: 24,
rounded: false,
},
-} satisfies Meta;
+});
-export default meta;
-type Story = StoryObj;
-
-export const Default: Story = {
+export const Default = meta.story({
args: {},
-};
+});
-export const Rounded: Story = {
+export const Rounded = meta.story({
args: {
rounded: true,
width: 48,
height: 48,
},
-};
+});
-export const Demo1: Story = {
+export const Demo1 = meta.story({
render: () => (
),
-};
+});
-export const Demo2: Story = {
+export const Demo2 = meta.story({
render: () => (
),
-};
+});
diff --git a/packages/ui/src/components/Switch/Switch.stories.tsx b/packages/ui/src/components/Switch/Switch.stories.tsx
index 6d841bf772..d8538ec65c 100644
--- a/packages/ui/src/components/Switch/Switch.stories.tsx
+++ b/packages/ui/src/components/Switch/Switch.stories.tsx
@@ -13,27 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-import type { Meta, StoryObj } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
import { Switch } from './Switch';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/Switch',
component: Switch,
-} satisfies Meta;
+});
-export default meta;
-type Story = StoryObj;
-
-export const Default: Story = {
+export const Default = meta.story({
args: {
label: 'Switch',
},
-};
+});
-export const Disabled: Story = {
+export const Disabled = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
isDisabled: true,
},
-};
+});
diff --git a/packages/ui/src/components/Table/Table.stories.tsx b/packages/ui/src/components/Table/Table.stories.tsx
index 37790c5055..f7687af1c3 100644
--- a/packages/ui/src/components/Table/Table.stories.tsx
+++ b/packages/ui/src/components/Table/Table.stories.tsx
@@ -14,8 +14,9 @@
* limitations under the License.
*/
+import preview from '../../../../../.storybook/preview';
import { useState } from 'react';
-import type { Meta, StoryFn, StoryObj } from '@storybook/react-vite';
+import type { StoryFn } from '@storybook/react-vite';
import { type Selection } from 'react-aria-components';
import {
Table,
@@ -39,7 +40,7 @@ import { RiCactusLine } from '@remixicon/react';
import { TablePagination } from '../TablePagination';
import { Text } from '../Text';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/Table',
decorators: [
(Story: StoryFn) => (
@@ -48,16 +49,13 @@ const meta = {
),
],
-} satisfies Meta;
+});
// Added this fix to fix Chromatic timeout error. This bug is due to rerendering the table with too many rows.
// Work in progress to fix it here - https://github.com/backstage/backstage/pull/30687
const data1 = data1Raw.slice(0, 10);
-export default meta;
-type Story = StoryObj;
-
-export const TableOnly: Story = {
+export const TableOnly = meta.story({
render: () => {
return (
@@ -88,9 +86,9 @@ export const TableOnly: Story = {
);
},
-};
+});
-export const WithPaginationUncontrolled: Story = {
+export const WithPaginationUncontrolled = meta.story({
render: () => {
const { data, paginationProps } = useTable({ data: data1 });
@@ -122,9 +120,9 @@ export const WithPaginationUncontrolled: Story = {
);
},
-};
+});
-export const WithPaginationControlled: Story = {
+export const WithPaginationControlled = meta.story({
render: () => {
const [offset, setOffset] = useState(0);
const [pageSize, setPageSize] = useState(5);
@@ -172,9 +170,9 @@ export const WithPaginationControlled: Story = {
);
},
-};
+});
-export const Sorting: Story = {
+export const Sorting = meta.story({
render: () => {
return (
@@ -207,9 +205,9 @@ export const Sorting: Story = {
);
},
-};
+});
-export const TableRockBand: Story = {
+export const TableRockBand = meta.story({
render: () => {
const { data, paginationProps } = useTable({
data: data4,
@@ -246,9 +244,9 @@ export const TableRockBand: Story = {
);
},
-};
+});
-export const RowClick: Story = {
+export const RowClick = meta.story({
render: () => {
const { data, paginationProps } = useTable({
data: data4,
@@ -285,9 +283,9 @@ export const RowClick: Story = {
);
},
-};
+});
-export const RowLink: Story = {
+export const RowLink = meta.story({
render: () => {
const { data, paginationProps } = useTable({
data: data4,
@@ -324,9 +322,9 @@ export const RowLink: Story = {
);
},
-};
+});
-export const CellComponent: Story = {
+export const CellComponent = meta.story({
name: 'Cell',
render: () => {
return (
@@ -354,9 +352,9 @@ export const CellComponent: Story = {
);
},
-};
+});
-export const CellTextComponent: Story = {
+export const CellTextComponent = meta.story({
name: 'CellText',
render: () => {
return (
@@ -379,9 +377,9 @@ export const CellTextComponent: Story = {
);
},
-};
+});
-export const CellProfileComponent: Story = {
+export const CellProfileComponent = meta.story({
name: 'CellProfile',
render: () => {
return (
@@ -404,9 +402,9 @@ export const CellProfileComponent: Story = {
);
},
-};
+});
-export const SelectionSingleToggle: Story = {
+export const SelectionSingleToggle = meta.story({
render: () => {
const [selectedKeys, setSelectedKeys] = useState(new Set([]));
@@ -442,9 +440,9 @@ export const SelectionSingleToggle: Story = {
);
},
-};
+});
-export const SelectionMultiToggle: Story = {
+export const SelectionMultiToggle = meta.story({
render: () => {
const [selectedKeys, setSelectedKeys] = useState(new Set([]));
@@ -480,9 +478,9 @@ export const SelectionMultiToggle: Story = {
);
},
-};
+});
-export const SelectionSingleReplace: Story = {
+export const SelectionSingleReplace = meta.story({
render: () => {
const [selectedKeys, setSelectedKeys] = useState(new Set([]));
@@ -518,9 +516,9 @@ export const SelectionSingleReplace: Story = {
);
},
-};
+});
-export const SelectionMultiReplace: Story = {
+export const SelectionMultiReplace = meta.story({
render: () => {
const [selectedKeys, setSelectedKeys] = useState(new Set([]));
@@ -556,9 +554,9 @@ export const SelectionMultiReplace: Story = {
);
},
-};
+});
-export const SelectionToggleWithActions: Story = {
+export const SelectionToggleWithActions = meta.story({
render: () => {
const [selectedKeys, setSelectedKeys] = useState(new Set([]));
@@ -595,9 +593,9 @@ export const SelectionToggleWithActions: Story = {
);
},
-};
+});
-export const SelectionReplaceWithActions: Story = {
+export const SelectionReplaceWithActions = meta.story({
render: () => {
const [selectedKeys, setSelectedKeys] = useState(new Set([]));
@@ -634,9 +632,9 @@ export const SelectionReplaceWithActions: Story = {
);
},
-};
+});
-export const SelectionToggleWithLinks: Story = {
+export const SelectionToggleWithLinks = meta.story({
render: () => {
const [selectedKeys, setSelectedKeys] = useState(new Set([]));
@@ -672,9 +670,9 @@ export const SelectionToggleWithLinks: Story = {
);
},
-};
+});
-export const SelectionReplaceWithLinks: Story = {
+export const SelectionReplaceWithLinks = meta.story({
render: () => {
const [selectedKeys, setSelectedKeys] = useState(new Set([]));
@@ -710,9 +708,9 @@ export const SelectionReplaceWithLinks: Story = {
);
},
-};
+});
-export const SelectionWithDisabledRows: Story = {
+export const SelectionWithDisabledRows = meta.story({
render: () => {
const [selectedKeys, setSelectedKeys] = useState(new Set([]));
@@ -749,9 +747,9 @@ export const SelectionWithDisabledRows: Story = {
);
},
-};
+});
-export const SelectionWithPagination: Story = {
+export const SelectionWithPagination = meta.story({
render: () => {
const [selectedKeys, setSelectedKeys] = useState(new Set([]));
@@ -789,9 +787,9 @@ export const SelectionWithPagination: Story = {
);
},
-};
+});
-export const SelectionModePlayground: Story = {
+export const SelectionModePlayground = meta.story({
render: () => {
const [selectionMode, setSelectionMode] = useState<'single' | 'multiple'>(
'multiple',
@@ -849,9 +847,9 @@ export const SelectionModePlayground: Story = {
);
},
-};
+});
-export const SelectionBehaviorPlayground: Story = {
+export const SelectionBehaviorPlayground = meta.story({
render: () => {
const [selectionBehavior, setSelectionBehavior] = useState<
'toggle' | 'replace'
@@ -909,4 +907,4 @@ export const SelectionBehaviorPlayground: Story = {
);
},
-};
+});
diff --git a/packages/ui/src/components/TablePagination/TablePagination.stories.tsx b/packages/ui/src/components/TablePagination/TablePagination.stories.tsx
index 4550d00abb..a7d949a31d 100644
--- a/packages/ui/src/components/TablePagination/TablePagination.stories.tsx
+++ b/packages/ui/src/components/TablePagination/TablePagination.stories.tsx
@@ -1,5 +1,5 @@
/*
- * Copyright 2024 The Backstage Authors
+ * Copyright 2025 The Backstage Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,13 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-// TODO: Bring useArgs() back when we update Storybook to 9
-// import { useArgs } from 'storybook/preview-api';
-import type { Meta, StoryObj } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
import { TablePagination } from './TablePagination';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/TablePagination',
component: TablePagination,
argTypes: {
@@ -30,12 +27,9 @@ const meta = {
setOffset: { action: 'setOffset' },
setPageSize: { action: 'setPageSize' },
},
-} satisfies Meta;
+});
-export default meta;
-type Story = StoryObj;
-
-export const Default: Story = {
+export const Default = meta.story({
args: {
offset: 0,
pageSize: 10,
@@ -56,4 +50,4 @@ export const Default: Story = {
/>
);
},
-};
+});
diff --git a/packages/ui/src/components/Tabs/Tabs.stories.tsx b/packages/ui/src/components/Tabs/Tabs.stories.tsx
index c818d0fe4b..2a02bedc8c 100644
--- a/packages/ui/src/components/Tabs/Tabs.stories.tsx
+++ b/packages/ui/src/components/Tabs/Tabs.stories.tsx
@@ -14,19 +14,17 @@
* limitations under the License.
*/
-import type { Meta, StoryFn, StoryObj } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
+import type { StoryFn } from '@storybook/react-vite';
import { Tabs, TabList, Tab, TabPanel } from './Tabs';
import { MemoryRouter } from 'react-router-dom';
import { Box } from '../Box';
import { Text } from '../Text';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/Tabs',
component: Tabs,
-} satisfies Meta;
-
-export default meta;
-type Story = StoryObj;
+});
const withRouter = (Story: StoryFn) => (
@@ -34,7 +32,7 @@ const withRouter = (Story: StoryFn) => (
);
-export const Default: Story = {
+export const Default = meta.story({
args: {
children: '',
},
@@ -48,9 +46,9 @@ export const Default: Story = {
),
-};
+});
-export const WithTabPanels: Story = {
+export const WithTabPanels = meta.story({
args: {
children: '',
},
@@ -73,9 +71,9 @@ export const WithTabPanels: Story = {
),
-};
+});
-export const WithMockedURLTab2: Story = {
+export const WithMockedURLTab2 = meta.story({
args: {
children: '',
},
@@ -105,9 +103,9 @@ export const WithMockedURLTab2: Story = {
),
-};
+});
-export const WithMockedURLTab3: Story = {
+export const WithMockedURLTab3 = meta.story({
args: {
children: '',
},
@@ -137,9 +135,9 @@ export const WithMockedURLTab3: Story = {
),
-};
+});
-export const WithMockedURLNoMatch: Story = {
+export const WithMockedURLNoMatch = meta.story({
args: {
children: '',
},
@@ -173,11 +171,11 @@ export const WithMockedURLNoMatch: Story = {
),
-};
+});
// New stories for testing match strategies
-export const ExactMatchingDefault: Story = {
+export const ExactMatchingDefault = meta.story({
args: {
children: '',
},
@@ -211,9 +209,9 @@ export const ExactMatchingDefault: Story = {
),
-};
+});
-export const PrefixMatchingForNestedRoutes: Story = {
+export const PrefixMatchingForNestedRoutes = meta.story({
args: {
children: '',
},
@@ -251,9 +249,9 @@ export const PrefixMatchingForNestedRoutes: Story = {
),
-};
+});
-export const PrefixMatchingDeepNesting: Story = {
+export const PrefixMatchingDeepNesting = meta.story({
args: {
children: '',
},
@@ -286,9 +284,9 @@ export const PrefixMatchingDeepNesting: Story = {
),
-};
+});
-export const MixedMatchingStrategies: Story = {
+export const MixedMatchingStrategies = meta.story({
args: {
children: '',
},
@@ -337,9 +335,9 @@ export const MixedMatchingStrategies: Story = {
),
-};
+});
-export const PrefixMatchingEdgeCases: Story = {
+export const PrefixMatchingEdgeCases = meta.story({
args: {
children: '',
},
@@ -379,9 +377,9 @@ export const PrefixMatchingEdgeCases: Story = {
),
-};
+});
-export const PrefixMatchingWithSlash: Story = {
+export const PrefixMatchingWithSlash = meta.story({
args: {
children: '',
},
@@ -420,9 +418,9 @@ export const PrefixMatchingWithSlash: Story = {
),
-};
+});
-export const RootPathMatching: Story = {
+export const RootPathMatching = meta.story({
args: {
children: '',
},
@@ -454,9 +452,9 @@ export const RootPathMatching: Story = {
),
-};
+});
-export const AutoSelectionOfTabs: Story = {
+export const AutoSelectionOfTabs = meta.story({
args: {
children: '',
},
@@ -511,4 +509,4 @@ export const AutoSelectionOfTabs: Story = {
),
-};
+});
diff --git a/packages/ui/src/components/TagGroup/TagGroup.stories.tsx b/packages/ui/src/components/TagGroup/TagGroup.stories.tsx
index 7cc8d3c824..d33eed8bf1 100644
--- a/packages/ui/src/components/TagGroup/TagGroup.stories.tsx
+++ b/packages/ui/src/components/TagGroup/TagGroup.stories.tsx
@@ -14,8 +14,8 @@
* limitations under the License.
*/
+import preview from '../../../../../.storybook/preview';
import { useState } from 'react';
-import type { Meta, StoryObj } from '@storybook/react-vite';
import { TagGroup, Tag } from '.';
import type { Selection } from 'react-aria-components';
import { Flex } from '../../';
@@ -35,7 +35,7 @@ export interface ListItem {
isDisabled?: boolean;
}
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/TagGroup',
component: TagGroup,
argTypes: {
@@ -54,10 +54,7 @@ const meta = {
),
],
-} satisfies Meta>;
-
-export default meta;
-type Story = StoryObj;
+});
const initialList: ListItem[] = [
{ id: 'banana', name: 'Banana', icon:
@@ -109,9 +106,9 @@ export const Sizes: Story = {
),
-};
+});
-export const SelectionModeSingle: Story = {
+export const SelectionModeSingle = meta.story({
args: {
selectionMode: 'single',
'aria-label': 'Tag Group',
@@ -130,9 +127,9 @@ export const SelectionModeSingle: Story = {
);
},
-};
+});
-export const SelectionModeMultiple: Story = {
+export const SelectionModeMultiple = meta.story({
args: {
selectionMode: 'multiple',
'aria-label': 'Tag Group',
@@ -153,11 +150,11 @@ export const SelectionModeMultiple: Story = {
);
},
-};
+});
-export const WithIcon: Story = {
+export const WithIcon = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: args => (
@@ -168,9 +165,9 @@ export const WithIcon: Story = {
))}
),
-};
+});
-export const WithLink: Story = {
+export const WithLink = meta.story({
render: args => (
{initialList.map(item => (
@@ -180,9 +177,9 @@ export const WithLink: Story = {
))}
),
-};
+});
-export const Disabled: Story = {
+export const Disabled = meta.story({
render: args => (
{initialList.map(item => (
@@ -192,11 +189,11 @@ export const Disabled: Story = {
))}
),
-};
+});
-export const RemovingTags: Story = {
+export const RemovingTags = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: args => {
const [selected, setSelected] = useState(new Set(['travel']));
@@ -217,11 +214,11 @@ export const RemovingTags: Story = {
);
},
-};
+});
-export const WithIconAndRemoveButton: Story = {
+export const WithIconAndRemoveButton = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: args => {
const [selected, setSelected] = useState(new Set(['travel']));
@@ -244,4 +241,4 @@ export const WithIconAndRemoveButton: Story = {
);
},
-};
+});
diff --git a/packages/ui/src/components/Text/Text.stories.tsx b/packages/ui/src/components/Text/Text.stories.tsx
index 7f95f4d5a1..09a317716a 100644
--- a/packages/ui/src/components/Text/Text.stories.tsx
+++ b/packages/ui/src/components/Text/Text.stories.tsx
@@ -14,31 +14,28 @@
* limitations under the License.
*/
-import type { Meta, StoryObj } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
import { Text } from './Text';
import { Flex } from '../Flex';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/Text',
component: Text,
args: {
children: 'Text',
},
-} satisfies Meta;
+});
-export default meta;
-type Story = StoryObj;
-
-export const Default: Story = {
+export const Default = meta.story({
args: {
children:
"A man looks at a painting in a museum and says, “Brothers and sisters I have none, but that man's father is my father's son.” Who is in the painting?",
},
-};
+});
-export const AllVariants: Story = {
+export const AllVariants = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: args => (
@@ -52,9 +49,9 @@ export const AllVariants: Story = {
),
-};
+});
-export const AllWeights: Story = {
+export const AllWeights = meta.story({
render: () => (
@@ -91,11 +88,11 @@ export const AllWeights: Story = {
),
-};
+});
-export const AllColors: Story = {
+export const AllColors = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: args => (
@@ -106,30 +103,30 @@ export const AllColors: Story = {
),
-};
+});
-export const Truncate: Story = {
+export const Truncate = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
truncate: true,
as: 'p',
style: { width: '480px' },
},
-};
+});
-export const Responsive: Story = {
+export const Responsive = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
variant: {
xs: 'title-x-small',
md: 'body-large',
},
},
-};
+});
-export const WrappedInLink: Story = {
+export const WrappedInLink = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
decorators: [
Story => (
@@ -138,16 +135,16 @@ export const WrappedInLink: Story = {
),
],
-};
+});
-export const CustomRender: Story = {
+export const CustomRender = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
as: 'label',
},
-};
+});
-export const Playground: Story = {
+export const Playground = meta.story({
render: () => (
Subtitle
@@ -176,4 +173,4 @@ export const Playground: Story = {
),
-};
+});
diff --git a/packages/ui/src/components/TextField/TextField.stories.tsx b/packages/ui/src/components/TextField/TextField.stories.tsx
index 38115996ae..54457f351b 100644
--- a/packages/ui/src/components/TextField/TextField.stories.tsx
+++ b/packages/ui/src/components/TextField/TextField.stories.tsx
@@ -1,5 +1,5 @@
/*
- * Copyright 2024 The Backstage Authors
+ * Copyright 2025 The Backstage Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,15 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-import type { Meta, StoryObj } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
import { TextField } from './TextField';
import { Form } from 'react-aria-components';
import { Flex } from '../Flex';
import { FieldLabel } from '../FieldLabel';
import { RiEyeLine, RiSparklingLine } from '@remixicon/react';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/TextField',
component: TextField,
argTypes: {
@@ -32,12 +31,9 @@ const meta = {
control: 'object',
},
},
-} satisfies Meta;
+});
-export default meta;
-type Story = StoryObj;
-
-export const Default: Story = {
+export const Default = meta.story({
args: {
name: 'url',
placeholder: 'Enter a URL',
@@ -45,11 +41,11 @@ export const Default: Story = {
maxWidth: '300px',
},
},
-};
+});
-export const Sizes: Story = {
+export const Sizes = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: args => (
@@ -57,46 +53,46 @@ export const Sizes: Story = {
),
-};
+});
-export const DefaultValue: Story = {
+export const DefaultValue = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
defaultValue: 'https://example.com',
},
-};
+});
-export const WithLabel: Story = {
+export const WithLabel = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
label: 'Label',
},
-};
+});
-export const WithDescription: Story = {
+export const WithDescription = meta.story({
args: {
- ...WithLabel.args,
+ ...WithLabel.input.args,
description: 'Description',
},
-};
+});
-export const Required: Story = {
+export const Required = meta.story({
args: {
- ...WithLabel.args,
+ ...WithLabel.input.args,
isRequired: true,
},
-};
+});
-export const Disabled: Story = {
+export const Disabled = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
isDisabled: true,
},
-};
+});
-export const WithIcon: Story = {
+export const WithIcon = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
},
render: args => (
- {children ?? 'I am a tooltip'}
+ {children ?? 'I am a tooltip'}
),
-} as Meta<{
- children?: string;
- isOpen?: boolean;
- isDisabled?: boolean;
- placement?: Placement;
- delay?: number;
- closeDelay?: number;
-}>;
+});
-export default meta;
-type Story = StoryObj;
-
-export const Default: Story = {
+export const Default = meta.story({
args: {
children: 'I am a tooltip',
},
-};
+});
-export const IsOpen: Story = {
+export const IsOpen = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
isOpen: true,
},
-};
+});
-export const IsDisabled: Story = {
+export const IsDisabled = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
isDisabled: true,
},
-};
+});
-export const NoDelays: Story = {
+export const NoDelays = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
delay: 0,
closeDelay: 0,
},
-};
+});
-export const OrthogonalPlacements: Story = {
+export const OrthogonalPlacements = meta.story({
parameters: {
controls: {
exclude: ['placement'],
},
},
args: {
- ...Default.args,
+ ...Default.input.args,
isOpen: true,
},
render: ({ isOpen, children }) => {
@@ -113,13 +97,13 @@ export const OrthogonalPlacements: Story = {
);
},
-};
+});
-export const WithLongText: Story = {
+export const WithLongText = meta.story({
args: {
- ...Default.args,
+ ...Default.input.args,
isOpen: true,
children:
'I am a tooltip with a very long text. orem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.',
},
-};
+});
diff --git a/packages/ui/src/components/VisuallyHidden/VisuallyHidden.stories.tsx b/packages/ui/src/components/VisuallyHidden/VisuallyHidden.stories.tsx
index 9706edfc9b..cc75adbd5e 100644
--- a/packages/ui/src/components/VisuallyHidden/VisuallyHidden.stories.tsx
+++ b/packages/ui/src/components/VisuallyHidden/VisuallyHidden.stories.tsx
@@ -1,5 +1,5 @@
/*
- * Copyright 2024 The Backstage Authors
+ * Copyright 2025 The Backstage Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,13 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-import type { Meta, StoryObj } from '@storybook/react-vite';
+import preview from '../../../../../.storybook/preview';
import { VisuallyHidden } from './VisuallyHidden';
import { Text } from '../Text';
import { Flex } from '../Flex';
-const meta = {
+const meta = preview.meta({
title: 'Backstage UI/VisuallyHidden',
component: VisuallyHidden,
parameters: {
@@ -30,12 +29,9 @@ const meta = {
},
},
},
-} satisfies Meta;
+});
-export default meta;
-type Story = StoryObj;
-
-export const Default: Story = {
+export const Default = meta.story({
render: () => (
@@ -48,9 +44,9 @@ export const Default: Story = {
),
-};
+});
-export const ExampleUsage: Story = {
+export const ExampleUsage = meta.story({
render: () => (
@@ -70,4 +66,4 @@ export const ExampleUsage: Story = {
),
-};
+});
diff --git a/packages/ui/src/css/core.css b/packages/ui/src/css/core.css
index 5be23e7a1b..321ca07eff 100644
--- a/packages/ui/src/css/core.css
+++ b/packages/ui/src/css/core.css
@@ -27,7 +27,7 @@
}
body {
- background-color: var(--bui-bg);
+ background-color: var(--bui-bg-surface-0);
/* Text defaults */
color: var(--bui-fg-primary);
diff --git a/packages/ui/src/css/tokens.css b/packages/ui/src/css/tokens.css
index 028c60311d..459d98d48f 100644
--- a/packages/ui/src/css/tokens.css
+++ b/packages/ui/src/css/tokens.css
@@ -81,9 +81,10 @@
--bui-gray-8: #595959;
/* Background Colors */
- --bui-bg: var(--bui-gray-1);
+ --bui-bg-surface-0: var(--bui-gray-1);
--bui-bg-surface-1: var(--bui-white);
- --bui-bg-surface-2: var(--bui-gray-2);
+ --bui-bg-surface-2: var(--bui-gray-1);
+ --bui-bg-surface-3: var(--bui-gray-2);
--bui-bg-solid: #1f5493;
--bui-bg-solid-hover: #163a66;
--bui-bg-solid-pressed: #0f2b4e;
@@ -140,9 +141,10 @@
--bui-gray-8: #b4b4b4;
/* Background Colors */
- --bui-bg: #333333;
- --bui-bg-surface-1: #424242;
+ --bui-bg-surface-0: #333333;
+ --bui-bg-surface-1: var(--bui-gray-1);
--bui-bg-surface-2: var(--bui-gray-2);
+ --bui-bg-surface-3: var(--bui-gray-3);
--bui-bg-solid: #9cc9ff;
--bui-bg-solid-hover: #83b9fd;
--bui-bg-solid-pressed: #83b9fd;
diff --git a/packages/yarn-plugin/CHANGELOG.md b/packages/yarn-plugin/CHANGELOG.md
index 3c1903a019..20d37cf076 100644
--- a/packages/yarn-plugin/CHANGELOG.md
+++ b/packages/yarn-plugin/CHANGELOG.md
@@ -1,5 +1,12 @@
# yarn-plugin-backstage
+## 0.0.8
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/cli-common@0.1.16
+
## 0.0.8-next.0
### Patch Changes
diff --git a/packages/yarn-plugin/package.json b/packages/yarn-plugin/package.json
index 5a7bec9bcc..de8b7955d3 100644
--- a/packages/yarn-plugin/package.json
+++ b/packages/yarn-plugin/package.json
@@ -1,6 +1,6 @@
{
"name": "yarn-plugin-backstage",
- "version": "0.0.8-next.0",
+ "version": "0.0.8",
"description": "Yarn plugin for working with Backstage monorepos",
"backstage": {
"role": "node-library"
diff --git a/plugins/api-docs/CHANGELOG.md b/plugins/api-docs/CHANGELOG.md
index 7db04d494c..58db7fac24 100644
--- a/plugins/api-docs/CHANGELOG.md
+++ b/plugins/api-docs/CHANGELOG.md
@@ -1,5 +1,34 @@
# @backstage/plugin-api-docs
+## 0.13.2
+
+### Patch Changes
+
+- f3f84f1: Minor extension type updates after frontend API bump
+- d02db50: Remove unnecessary use of `compatWrapper` and `convertLegacyRouteRef`(s) for the new frontend system.
+- Updated dependencies
+ - @backstage/plugin-catalog@1.32.1
+ - @backstage/frontend-plugin-api@0.13.2
+ - @backstage/core-components@0.18.4
+ - @backstage/plugin-catalog-react@1.21.4
+ - @backstage/core-plugin-api@1.12.1
+ - @backstage/plugin-permission-react@0.4.39
+
+## 0.13.2-next.1
+
+### Patch Changes
+
+- f3f84f1: Minor extension type updates after frontend API bump
+- Updated dependencies
+ - @backstage/plugin-catalog@1.32.1-next.1
+ - @backstage/frontend-plugin-api@0.13.2-next.1
+ - @backstage/plugin-catalog-react@1.21.4-next.2
+ - @backstage/core-components@0.18.4-next.2
+ - @backstage/catalog-model@1.7.6
+ - @backstage/core-plugin-api@1.12.1-next.0
+ - @backstage/plugin-catalog-common@1.1.7
+ - @backstage/plugin-permission-react@0.4.39-next.0
+
## 0.13.2-next.0
### Patch Changes
diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json
index e8f7392e87..fd387bdbae 100644
--- a/plugins/api-docs/package.json
+++ b/plugins/api-docs/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-api-docs",
- "version": "0.13.2-next.0",
+ "version": "0.13.2",
"description": "A Backstage plugin that helps represent API entities in the frontend",
"backstage": {
"role": "frontend-plugin",
diff --git a/plugins/app-backend/CHANGELOG.md b/plugins/app-backend/CHANGELOG.md
index c28c59c78c..1923dd74a3 100644
--- a/plugins/app-backend/CHANGELOG.md
+++ b/plugins/app-backend/CHANGELOG.md
@@ -1,5 +1,30 @@
# @backstage/plugin-app-backend
+## 0.5.9
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/plugin-app-node@0.1.40
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/config-loader@1.10.7
+
+## 0.5.9-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-app-node@0.1.40-next.1
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config-loader@1.10.7-next.1
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/types@1.2.2
+
## 0.5.9-next.0
### Patch Changes
diff --git a/plugins/app-backend/package.json b/plugins/app-backend/package.json
index d41dea1880..9ab956713f 100644
--- a/plugins/app-backend/package.json
+++ b/plugins/app-backend/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-app-backend",
- "version": "0.5.9-next.0",
+ "version": "0.5.9",
"description": "A Backstage backend plugin that serves the Backstage frontend app",
"backstage": {
"role": "backend-plugin",
diff --git a/plugins/app-node/CHANGELOG.md b/plugins/app-node/CHANGELOG.md
index 1f1f124d16..ceab019e5a 100644
--- a/plugins/app-node/CHANGELOG.md
+++ b/plugins/app-node/CHANGELOG.md
@@ -1,5 +1,23 @@
# @backstage/plugin-app-node
+## 0.1.40
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/config-loader@1.10.7
+
+## 0.1.40-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config-loader@1.10.7-next.1
+
## 0.1.40-next.0
### Patch Changes
diff --git a/plugins/app-node/package.json b/plugins/app-node/package.json
index 77049a44c4..c41733eb04 100644
--- a/plugins/app-node/package.json
+++ b/plugins/app-node/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-app-node",
- "version": "0.1.40-next.0",
+ "version": "0.1.40",
"description": "Node.js library for the app plugin",
"backstage": {
"role": "node-library",
diff --git a/plugins/app-visualizer/CHANGELOG.md b/plugins/app-visualizer/CHANGELOG.md
index d04d2461ba..0dc550bb53 100644
--- a/plugins/app-visualizer/CHANGELOG.md
+++ b/plugins/app-visualizer/CHANGELOG.md
@@ -1,5 +1,26 @@
# @backstage/plugin-app-visualizer
+## 0.1.27-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/ui@0.11.0-next.0
+ - @backstage/core-components@0.18.4
+ - @backstage/core-plugin-api@1.12.1
+ - @backstage/frontend-plugin-api@0.13.2
+
+## 0.1.26
+
+### Patch Changes
+
+- d02db50: Remove unnecessary use of `compatWrapper` and `convertLegacyRouteRef`(s) for the new frontend system.
+- Updated dependencies
+ - @backstage/ui@0.10.0
+ - @backstage/frontend-plugin-api@0.13.2
+ - @backstage/core-components@0.18.4
+ - @backstage/core-plugin-api@1.12.1
+
## 0.1.26-next.1
### Patch Changes
diff --git a/plugins/app-visualizer/package.json b/plugins/app-visualizer/package.json
index 8b580ea17b..b736b07cd6 100644
--- a/plugins/app-visualizer/package.json
+++ b/plugins/app-visualizer/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-app-visualizer",
- "version": "0.1.26-next.1",
+ "version": "0.1.27-next.0",
"description": "Visualizes the Backstage app structure",
"backstage": {
"role": "frontend-plugin",
diff --git a/plugins/app/CHANGELOG.md b/plugins/app/CHANGELOG.md
index 0e84389ecd..66e1ca5b0b 100644
--- a/plugins/app/CHANGELOG.md
+++ b/plugins/app/CHANGELOG.md
@@ -1,5 +1,36 @@
# @backstage/plugin-app
+## 0.3.3
+
+### Patch Changes
+
+- f3f84f1: Minor extension type updates after frontend API bump
+- f7bc228: Support to set `defaultLanguage` and `availableLanguages` for the app language API in the new frontend system
+- d02db50: Remove unnecessary use of `compatWrapper` and `convertLegacyRouteRef`(s) for the new frontend system.
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.13.2
+ - @backstage/core-components@0.18.4
+ - @backstage/core-plugin-api@1.12.1
+ - @backstage/theme@0.7.1
+ - @backstage/integration-react@1.2.13
+ - @backstage/plugin-permission-react@0.4.39
+
+## 0.3.3-next.1
+
+### Patch Changes
+
+- f3f84f1: Minor extension type updates after frontend API bump
+- f7bc228: Support to set `defaultLanguage` and `availableLanguages` for the app language API in the new frontend system
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.13.2-next.1
+ - @backstage/core-components@0.18.4-next.2
+ - @backstage/core-plugin-api@1.12.1-next.0
+ - @backstage/integration-react@1.2.13-next.0
+ - @backstage/theme@0.7.1-next.0
+ - @backstage/types@1.2.2
+ - @backstage/version-bridge@1.0.11
+ - @backstage/plugin-permission-react@0.4.39-next.0
+
## 0.3.3-next.0
### Patch Changes
diff --git a/plugins/app/package.json b/plugins/app/package.json
index 8a87cae63e..a6a25d08ad 100644
--- a/plugins/app/package.json
+++ b/plugins/app/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-app",
- "version": "0.3.3-next.0",
+ "version": "0.3.3",
"backstage": {
"role": "frontend-plugin",
"pluginId": "app",
diff --git a/plugins/auth-backend-module-atlassian-provider/CHANGELOG.md b/plugins/auth-backend-module-atlassian-provider/CHANGELOG.md
index 29cb492841..b78cce757e 100644
--- a/plugins/auth-backend-module-atlassian-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-atlassian-provider/CHANGELOG.md
@@ -1,5 +1,23 @@
# @backstage/plugin-auth-backend-module-atlassian-provider
+## 0.4.10
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.4.10-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+
## 0.4.10-next.0
### Patch Changes
diff --git a/plugins/auth-backend-module-atlassian-provider/package.json b/plugins/auth-backend-module-atlassian-provider/package.json
index 6edf029908..28f4031eab 100644
--- a/plugins/auth-backend-module-atlassian-provider/package.json
+++ b/plugins/auth-backend-module-atlassian-provider/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth-backend-module-atlassian-provider",
- "version": "0.4.10-next.0",
+ "version": "0.4.10",
"description": "The atlassian-provider backend module for the auth plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-auth0-provider/CHANGELOG.md b/plugins/auth-backend-module-auth0-provider/CHANGELOG.md
index 9e73851696..6e9806b643 100644
--- a/plugins/auth-backend-module-auth0-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-auth0-provider/CHANGELOG.md
@@ -1,5 +1,23 @@
# @backstage/plugin-auth-backend-module-auth0-provider
+## 0.2.10
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.2.10-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+
## 0.2.10-next.0
### Patch Changes
diff --git a/plugins/auth-backend-module-auth0-provider/package.json b/plugins/auth-backend-module-auth0-provider/package.json
index bd1dacce32..8b749bc420 100644
--- a/plugins/auth-backend-module-auth0-provider/package.json
+++ b/plugins/auth-backend-module-auth0-provider/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth-backend-module-auth0-provider",
- "version": "0.2.10-next.0",
+ "version": "0.2.10",
"description": "The auth0-provider backend module for the auth plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-aws-alb-provider/CHANGELOG.md b/plugins/auth-backend-module-aws-alb-provider/CHANGELOG.md
index afea70a08b..aff6333c3c 100644
--- a/plugins/auth-backend-module-aws-alb-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-aws-alb-provider/CHANGELOG.md
@@ -1,5 +1,26 @@
# @backstage/plugin-auth-backend-module-aws-alb-provider
+## 0.4.10
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/plugin-auth-backend@0.25.7
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.4.10-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-backend@0.25.7-next.1
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/errors@1.2.7
+
## 0.4.10-next.0
### Patch Changes
diff --git a/plugins/auth-backend-module-aws-alb-provider/package.json b/plugins/auth-backend-module-aws-alb-provider/package.json
index d1776aca35..65ef39f0d5 100644
--- a/plugins/auth-backend-module-aws-alb-provider/package.json
+++ b/plugins/auth-backend-module-aws-alb-provider/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth-backend-module-aws-alb-provider",
- "version": "0.4.10-next.0",
+ "version": "0.4.10",
"description": "The aws-alb provider module for the Backstage auth backend.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-azure-easyauth-provider/CHANGELOG.md b/plugins/auth-backend-module-azure-easyauth-provider/CHANGELOG.md
index 9464f4ce1d..4829c70373 100644
--- a/plugins/auth-backend-module-azure-easyauth-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-azure-easyauth-provider/CHANGELOG.md
@@ -1,5 +1,25 @@
# @backstage/plugin-auth-backend-module-azure-easyauth-provider
+## 0.2.15
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.2.15-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/errors@1.2.7
+
## 0.2.15-next.0
### Patch Changes
diff --git a/plugins/auth-backend-module-azure-easyauth-provider/package.json b/plugins/auth-backend-module-azure-easyauth-provider/package.json
index f48ac8d234..ba0b80c93c 100644
--- a/plugins/auth-backend-module-azure-easyauth-provider/package.json
+++ b/plugins/auth-backend-module-azure-easyauth-provider/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth-backend-module-azure-easyauth-provider",
- "version": "0.2.15-next.0",
+ "version": "0.2.15",
"description": "The azure-easyauth-provider backend module for the auth plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-bitbucket-provider/CHANGELOG.md b/plugins/auth-backend-module-bitbucket-provider/CHANGELOG.md
index f4cb03f95e..0870c56aff 100644
--- a/plugins/auth-backend-module-bitbucket-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-bitbucket-provider/CHANGELOG.md
@@ -1,5 +1,23 @@
# @backstage/plugin-auth-backend-module-bitbucket-provider
+## 0.3.10
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.3.10-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+
## 0.3.10-next.0
### Patch Changes
diff --git a/plugins/auth-backend-module-bitbucket-provider/package.json b/plugins/auth-backend-module-bitbucket-provider/package.json
index 1131d0278c..83efe1ea70 100644
--- a/plugins/auth-backend-module-bitbucket-provider/package.json
+++ b/plugins/auth-backend-module-bitbucket-provider/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth-backend-module-bitbucket-provider",
- "version": "0.3.10-next.0",
+ "version": "0.3.10",
"description": "The bitbucket-provider backend module for the auth plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-bitbucket-server-provider/CHANGELOG.md b/plugins/auth-backend-module-bitbucket-server-provider/CHANGELOG.md
index c29d1ef826..2f9860e317 100644
--- a/plugins/auth-backend-module-bitbucket-server-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-bitbucket-server-provider/CHANGELOG.md
@@ -1,5 +1,21 @@
# @backstage/plugin-auth-backend-module-bitbucket-server-provider
+## 0.2.10
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.2.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+
## 0.2.10-next.0
### Patch Changes
diff --git a/plugins/auth-backend-module-bitbucket-server-provider/package.json b/plugins/auth-backend-module-bitbucket-server-provider/package.json
index 9d410e8da0..701fe9d337 100644
--- a/plugins/auth-backend-module-bitbucket-server-provider/package.json
+++ b/plugins/auth-backend-module-bitbucket-server-provider/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth-backend-module-bitbucket-server-provider",
- "version": "0.2.10-next.0",
+ "version": "0.2.10",
"description": "The bitbucket-server-provider backend module for the auth plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-cloudflare-access-provider/CHANGELOG.md b/plugins/auth-backend-module-cloudflare-access-provider/CHANGELOG.md
index b7928bd822..06d2bf174c 100644
--- a/plugins/auth-backend-module-cloudflare-access-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-cloudflare-access-provider/CHANGELOG.md
@@ -1,5 +1,25 @@
# @backstage/plugin-auth-backend-module-cloudflare-access-provider
+## 0.4.10
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.4.10-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+
## 0.4.10-next.0
### Patch Changes
diff --git a/plugins/auth-backend-module-cloudflare-access-provider/package.json b/plugins/auth-backend-module-cloudflare-access-provider/package.json
index 3b1a38f544..0cea95105c 100644
--- a/plugins/auth-backend-module-cloudflare-access-provider/package.json
+++ b/plugins/auth-backend-module-cloudflare-access-provider/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth-backend-module-cloudflare-access-provider",
- "version": "0.4.10-next.0",
+ "version": "0.4.10",
"description": "The cloudflare-access-provider backend module for the auth plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-gcp-iap-provider/CHANGELOG.md b/plugins/auth-backend-module-gcp-iap-provider/CHANGELOG.md
index 7fc1271072..1243523582 100644
--- a/plugins/auth-backend-module-gcp-iap-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-gcp-iap-provider/CHANGELOG.md
@@ -1,5 +1,25 @@
# @backstage/plugin-auth-backend-module-gcp-iap-provider
+## 0.4.10
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.4.10-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/errors@1.2.7
+ - @backstage/types@1.2.2
+
## 0.4.10-next.0
### Patch Changes
diff --git a/plugins/auth-backend-module-gcp-iap-provider/package.json b/plugins/auth-backend-module-gcp-iap-provider/package.json
index 99596dea0e..e045da8fc8 100644
--- a/plugins/auth-backend-module-gcp-iap-provider/package.json
+++ b/plugins/auth-backend-module-gcp-iap-provider/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth-backend-module-gcp-iap-provider",
- "version": "0.4.10-next.0",
+ "version": "0.4.10",
"description": "A GCP IAP auth provider module for the Backstage auth backend",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-github-provider/CHANGELOG.md b/plugins/auth-backend-module-github-provider/CHANGELOG.md
index 23bb42eac1..a8458f6b1d 100644
--- a/plugins/auth-backend-module-github-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-github-provider/CHANGELOG.md
@@ -1,5 +1,25 @@
# @backstage/plugin-auth-backend-module-github-provider
+## 0.4.0
+
+### Minor Changes
+
+- b3286d5: Added the `github.com/user-id` annotation to store GitHub's user ID (immutable) in user entities. Also includes addition of the `userIdMatchingUserEntityAnnotation` sign-in resolver that matches users by the new ID.
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.3.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+
## 0.3.10-next.0
### Patch Changes
diff --git a/plugins/auth-backend-module-github-provider/package.json b/plugins/auth-backend-module-github-provider/package.json
index 28a9404ef3..ce418e2b08 100644
--- a/plugins/auth-backend-module-github-provider/package.json
+++ b/plugins/auth-backend-module-github-provider/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth-backend-module-github-provider",
- "version": "0.3.10-next.0",
+ "version": "0.4.0",
"description": "The github-provider backend module for the auth plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-github-provider/report.api.md b/plugins/auth-backend-module-github-provider/report.api.md
index 6bad840d00..4581115679 100644
--- a/plugins/auth-backend-module-github-provider/report.api.md
+++ b/plugins/auth-backend-module-github-provider/report.api.md
@@ -17,13 +17,25 @@ export default authModuleGithubProvider;
// @public (undocumented)
export const githubAuthenticator: OAuthAuthenticator<
PassportOAuthAuthenticatorHelper,
- PassportProfile
+ GithubProfile
>;
+// @public (undocumented)
+export type GithubProfile = PassportProfile & {
+ nodeId?: string;
+};
+
// @public
export namespace githubSignInResolvers {
const usernameMatchingUserEntityName: SignInResolverFactory<
- OAuthAuthenticatorResult,
+ OAuthAuthenticatorResult,
+ | {
+ dangerouslyAllowSignInWithoutUserInCatalog?: boolean | undefined;
+ }
+ | undefined
+ >;
+ const userIdMatchingUserEntityAnnotation: SignInResolverFactory<
+ OAuthAuthenticatorResult,
| {
dangerouslyAllowSignInWithoutUserInCatalog?: boolean | undefined;
}
diff --git a/plugins/auth-backend-module-github-provider/src/authenticator.ts b/plugins/auth-backend-module-github-provider/src/authenticator.ts
index e9dc29e4a6..fa3e2b0987 100644
--- a/plugins/auth-backend-module-github-provider/src/authenticator.ts
+++ b/plugins/auth-backend-module-github-provider/src/authenticator.ts
@@ -22,10 +22,18 @@ import {
PassportProfile,
} from '@backstage/plugin-auth-node';
+/** @public */
+export type GithubProfile = PassportProfile & {
+ nodeId?: string;
+};
+
const ACCESS_TOKEN_PREFIX = 'access-token-v2.';
/** @public */
-export const githubAuthenticator = createOAuthAuthenticator({
+export const githubAuthenticator = createOAuthAuthenticator<
+ PassportOAuthAuthenticatorHelper,
+ GithubProfile
+>({
defaultProfileTransform:
PassportOAuthAuthenticatorHelper.defaultProfileTransform,
scopes: {
@@ -90,7 +98,7 @@ export const githubAuthenticator = createOAuthAuthenticator({
if (!session.refreshToken && !session.expiresInSeconds) {
session.refreshToken = ACCESS_TOKEN_PREFIX + session.accessToken;
}
- return { fullProfile, session };
+ return { fullProfile: fullProfile as GithubProfile, session };
},
async refresh(input, helper) {
@@ -115,7 +123,7 @@ export const githubAuthenticator = createOAuthAuthenticator({
});
return {
- fullProfile,
+ fullProfile: fullProfile as GithubProfile,
session: {
accessToken,
tokenType: 'bearer',
diff --git a/plugins/auth-backend-module-github-provider/src/index.ts b/plugins/auth-backend-module-github-provider/src/index.ts
index 646ba7c92a..678e188461 100644
--- a/plugins/auth-backend-module-github-provider/src/index.ts
+++ b/plugins/auth-backend-module-github-provider/src/index.ts
@@ -20,6 +20,6 @@
* @packageDocumentation
*/
-export { githubAuthenticator } from './authenticator';
+export { githubAuthenticator, type GithubProfile } from './authenticator';
export { authModuleGithubProvider as default } from './module';
export { githubSignInResolvers } from './resolvers';
diff --git a/plugins/auth-backend-module-github-provider/src/resolvers.ts b/plugins/auth-backend-module-github-provider/src/resolvers.ts
index 5a6934439f..e065432826 100644
--- a/plugins/auth-backend-module-github-provider/src/resolvers.ts
+++ b/plugins/auth-backend-module-github-provider/src/resolvers.ts
@@ -17,11 +17,12 @@
import {
createSignInResolverFactory,
OAuthAuthenticatorResult,
- PassportProfile,
SignInInfo,
} from '@backstage/plugin-auth-node';
import { z } from 'zod';
+import { GithubProfile } from './authenticator';
+
/**
* Available sign-in resolvers for the GitHub auth provider.
*
@@ -39,7 +40,7 @@ export namespace githubSignInResolvers {
.optional(),
create(options = {}) {
return async (
- info: SignInInfo>,
+ info: SignInInfo>,
ctx,
) => {
const { fullProfile } = info.result;
@@ -63,4 +64,44 @@ export namespace githubSignInResolvers {
};
},
});
+
+ /**
+ * Looks up the user by matching their GitHub user ID to the github.com/user-id annotation.
+ */
+ export const userIdMatchingUserEntityAnnotation = createSignInResolverFactory(
+ {
+ optionsSchema: z
+ .object({
+ dangerouslyAllowSignInWithoutUserInCatalog: z.boolean().optional(),
+ })
+ .optional(),
+ create(options = {}) {
+ return async (
+ info: SignInInfo>,
+ ctx,
+ ) => {
+ const { fullProfile } = info.result;
+
+ const userId = fullProfile.nodeId;
+ if (!userId) {
+ throw new Error(`GitHub user profile does not contain a user ID`);
+ }
+
+ return ctx.signInWithCatalogUser(
+ {
+ annotations: {
+ 'github.com/user-id': userId,
+ },
+ },
+ {
+ dangerousEntityRefFallback:
+ options?.dangerouslyAllowSignInWithoutUserInCatalog
+ ? { entityRef: { name: userId } }
+ : undefined,
+ },
+ );
+ };
+ },
+ },
+ );
}
diff --git a/plugins/auth-backend-module-gitlab-provider/CHANGELOG.md b/plugins/auth-backend-module-gitlab-provider/CHANGELOG.md
index 0cf1db7128..c31ef87722 100644
--- a/plugins/auth-backend-module-gitlab-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-gitlab-provider/CHANGELOG.md
@@ -1,5 +1,23 @@
# @backstage/plugin-auth-backend-module-gitlab-provider
+## 0.3.10
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.3.10-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+
## 0.3.10-next.0
### Patch Changes
diff --git a/plugins/auth-backend-module-gitlab-provider/package.json b/plugins/auth-backend-module-gitlab-provider/package.json
index ee06982336..81b2450555 100644
--- a/plugins/auth-backend-module-gitlab-provider/package.json
+++ b/plugins/auth-backend-module-gitlab-provider/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth-backend-module-gitlab-provider",
- "version": "0.3.10-next.0",
+ "version": "0.3.10",
"description": "The gitlab-provider backend module for the auth plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-google-provider/CHANGELOG.md b/plugins/auth-backend-module-google-provider/CHANGELOG.md
index 6c21b76fef..ef7f4a6506 100644
--- a/plugins/auth-backend-module-google-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-google-provider/CHANGELOG.md
@@ -1,5 +1,21 @@
# @backstage/plugin-auth-backend-module-google-provider
+## 0.3.10
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.3.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+
## 0.3.10-next.0
### Patch Changes
diff --git a/plugins/auth-backend-module-google-provider/package.json b/plugins/auth-backend-module-google-provider/package.json
index c0d04e491c..bc2523dbdb 100644
--- a/plugins/auth-backend-module-google-provider/package.json
+++ b/plugins/auth-backend-module-google-provider/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth-backend-module-google-provider",
- "version": "0.3.10-next.0",
+ "version": "0.3.10",
"description": "A Google auth provider module for the Backstage auth backend",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-guest-provider/CHANGELOG.md b/plugins/auth-backend-module-guest-provider/CHANGELOG.md
index 629e851ce9..221b83037e 100644
--- a/plugins/auth-backend-module-guest-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-guest-provider/CHANGELOG.md
@@ -1,5 +1,25 @@
# @backstage/plugin-auth-backend-module-guest-provider
+## 0.2.15
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.2.15-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/errors@1.2.7
+
## 0.2.15-next.0
### Patch Changes
diff --git a/plugins/auth-backend-module-guest-provider/package.json b/plugins/auth-backend-module-guest-provider/package.json
index 5f129b83b9..726674a1ae 100644
--- a/plugins/auth-backend-module-guest-provider/package.json
+++ b/plugins/auth-backend-module-guest-provider/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth-backend-module-guest-provider",
- "version": "0.2.15-next.0",
+ "version": "0.2.15",
"description": "The guest-provider backend module for the auth plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-microsoft-provider/CHANGELOG.md b/plugins/auth-backend-module-microsoft-provider/CHANGELOG.md
index 4353509f9c..7e4b112021 100644
--- a/plugins/auth-backend-module-microsoft-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-microsoft-provider/CHANGELOG.md
@@ -1,5 +1,23 @@
# @backstage/plugin-auth-backend-module-microsoft-provider
+## 0.3.10
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.3.10-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+
## 0.3.10-next.0
### Patch Changes
diff --git a/plugins/auth-backend-module-microsoft-provider/package.json b/plugins/auth-backend-module-microsoft-provider/package.json
index 9b7209cc2c..10e7b2ebec 100644
--- a/plugins/auth-backend-module-microsoft-provider/package.json
+++ b/plugins/auth-backend-module-microsoft-provider/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth-backend-module-microsoft-provider",
- "version": "0.3.10-next.0",
+ "version": "0.3.10",
"description": "The microsoft-provider backend module for the auth plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-oauth2-provider/CHANGELOG.md b/plugins/auth-backend-module-oauth2-provider/CHANGELOG.md
index dc10e9a4f8..8dadd4938e 100644
--- a/plugins/auth-backend-module-oauth2-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-oauth2-provider/CHANGELOG.md
@@ -1,5 +1,21 @@
# @backstage/plugin-auth-backend-module-oauth2-provider
+## 0.4.10
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.4.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+
## 0.4.10-next.0
### Patch Changes
diff --git a/plugins/auth-backend-module-oauth2-provider/package.json b/plugins/auth-backend-module-oauth2-provider/package.json
index d7c1c62aea..7ec85a39a0 100644
--- a/plugins/auth-backend-module-oauth2-provider/package.json
+++ b/plugins/auth-backend-module-oauth2-provider/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth-backend-module-oauth2-provider",
- "version": "0.4.10-next.0",
+ "version": "0.4.10",
"description": "The oauth2-provider backend module for the auth plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-oauth2-proxy-provider/CHANGELOG.md b/plugins/auth-backend-module-oauth2-proxy-provider/CHANGELOG.md
index c791003a0f..faa632f587 100644
--- a/plugins/auth-backend-module-oauth2-proxy-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-oauth2-proxy-provider/CHANGELOG.md
@@ -1,5 +1,22 @@
# @backstage/plugin-auth-backend-module-oauth2-proxy-provider
+## 0.2.15
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.2.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/errors@1.2.7
+
## 0.2.15-next.0
### Patch Changes
diff --git a/plugins/auth-backend-module-oauth2-proxy-provider/package.json b/plugins/auth-backend-module-oauth2-proxy-provider/package.json
index c6d4fbe77d..483022a70a 100644
--- a/plugins/auth-backend-module-oauth2-proxy-provider/package.json
+++ b/plugins/auth-backend-module-oauth2-proxy-provider/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth-backend-module-oauth2-proxy-provider",
- "version": "0.2.15-next.0",
+ "version": "0.2.15",
"description": "The oauth2-proxy-provider backend module for the auth plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-oidc-provider/CHANGELOG.md b/plugins/auth-backend-module-oidc-provider/CHANGELOG.md
index 50c0e98d58..591f1139e9 100644
--- a/plugins/auth-backend-module-oidc-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-oidc-provider/CHANGELOG.md
@@ -1,5 +1,39 @@
# @backstage/plugin-auth-backend-module-oidc-provider
+## 0.4.11-next.0
+
+### Patch Changes
+
+- e54fcb2: Added support for custom start URL search parameters (with the new `startUrlSearchParams` config property)
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/config@1.3.6
+ - @backstage/types@1.2.2
+ - @backstage/plugin-auth-backend@0.25.7
+ - @backstage/plugin-auth-node@0.6.10
+
+## 0.4.10
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/plugin-auth-backend@0.25.7
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.4.10-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-backend@0.25.7-next.1
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/types@1.2.2
+
## 0.4.10-next.0
### Patch Changes
diff --git a/plugins/auth-backend-module-oidc-provider/config.d.ts b/plugins/auth-backend-module-oidc-provider/config.d.ts
index c11b9319ec..f25d13ae2e 100644
--- a/plugins/auth-backend-module-oidc-provider/config.d.ts
+++ b/plugins/auth-backend-module-oidc-provider/config.d.ts
@@ -33,6 +33,7 @@ export interface Config {
additionalScopes?: string | string[];
prompt?: string;
timeout?: HumanDuration | string;
+ startUrlSearchParams?: [string: string];
signIn?: {
resolvers: Array<
| {
diff --git a/plugins/auth-backend-module-oidc-provider/package.json b/plugins/auth-backend-module-oidc-provider/package.json
index 5bc7a04766..933182d80d 100644
--- a/plugins/auth-backend-module-oidc-provider/package.json
+++ b/plugins/auth-backend-module-oidc-provider/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth-backend-module-oidc-provider",
- "version": "0.4.10-next.0",
+ "version": "0.4.11-next.0",
"description": "The oidc-provider backend module for the auth plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-oidc-provider/report.api.md b/plugins/auth-backend-module-oidc-provider/report.api.md
index 11cde22db1..ab7d2bda49 100644
--- a/plugins/auth-backend-module-oidc-provider/report.api.md
+++ b/plugins/auth-backend-module-oidc-provider/report.api.md
@@ -25,6 +25,7 @@ export const oidcAuthenticator: OAuthAuthenticator<
client: BaseClient;
strategy: Strategy;
}>;
+ searchParams: Record;
},
OidcAuthResult
>;
diff --git a/plugins/auth-backend-module-oidc-provider/src/authenticator.test.ts b/plugins/auth-backend-module-oidc-provider/src/authenticator.test.ts
index c327d4ecc5..1940a71082 100644
--- a/plugins/auth-backend-module-oidc-provider/src/authenticator.test.ts
+++ b/plugins/auth-backend-module-oidc-provider/src/authenticator.test.ts
@@ -279,6 +279,62 @@ describe('oidcAuthenticator', () => {
expect(searchParams.get('response_type')).toBe('code');
});
+ it('passes custom start URL search parameters', async () => {
+ const customImplementation = oidcAuthenticator.initialize({
+ callbackUrl: 'https://backstage.test/callback',
+ config: new ConfigReader({
+ metadataUrl: 'https://oidc.test/.well-known/openid-configuration',
+ clientId: 'clientId123',
+ clientSecret: 'clientSecret',
+ startUrlSearchParams: {
+ foo: '1',
+ bar: '2',
+ },
+ }),
+ });
+
+ const startResponse = await oidcAuthenticator.start(
+ startRequest,
+ customImplementation,
+ );
+
+ const { searchParams } = new URL(startResponse.url);
+
+ expect(searchParams.get('foo')).toBe('1');
+ expect(searchParams.get('bar')).toBe('2');
+ });
+
+ it('does not override the core start URL search parameters with custom ones', async () => {
+ const customImplementation = oidcAuthenticator.initialize({
+ callbackUrl: 'https://backstage.test/callback',
+ config: new ConfigReader({
+ metadataUrl: 'https://oidc.test/.well-known/openid-configuration',
+ clientId: 'clientId123',
+ clientSecret: 'clientSecret',
+ startUrlSearchParams: {
+ foo: '1',
+ prompt: 'customPrompt',
+ scope: 'customScope',
+ state: 'customState',
+ nonce: 'customNonce',
+ },
+ }),
+ });
+
+ const startResponse = await oidcAuthenticator.start(
+ startRequest,
+ customImplementation,
+ );
+
+ const { searchParams } = new URL(startResponse.url);
+
+ expect(searchParams.get('foo')).toBe('1');
+ expect(searchParams.get('scope')).not.toBe('customScope');
+ expect(searchParams.get('state')).not.toBe('customState');
+ expect(searchParams.get('nonce')).not.toBe('customNonce');
+ expect(searchParams.get('prompt')).not.toBe('customPrompt');
+ });
+
it('passes a nonce', async () => {
const startResponse = await oidcAuthenticator.start(
startRequest,
diff --git a/plugins/auth-backend-module-oidc-provider/src/authenticator.ts b/plugins/auth-backend-module-oidc-provider/src/authenticator.ts
index 6e7022f7cf..316ead3954 100644
--- a/plugins/auth-backend-module-oidc-provider/src/authenticator.ts
+++ b/plugins/auth-backend-module-oidc-provider/src/authenticator.ts
@@ -83,6 +83,9 @@ export const oidcAuthenticator = createOAuthAuthenticator({
);
const initializedPrompt = config.getOptionalString('prompt');
+ const startUrlSearchParams: Record =
+ config.getOptional('startUrlSearchParams') || {};
+
if (config.has('scope')) {
throw new Error(
'The oidc provider no longer supports the "scope" configuration option. Please use the "additionalScopes" option instead.',
@@ -143,17 +146,21 @@ export const oidcAuthenticator = createOAuthAuthenticator({
return { helper, client, strategy };
});
- return { initializedPrompt, promise };
+ return { initializedPrompt, promise, searchParams: startUrlSearchParams };
},
async start(input, ctx) {
- const { initializedPrompt, promise } = ctx;
+ const { initializedPrompt, promise, searchParams } = ctx;
const { helper } = await promise;
+
+ // Merge the custom start URL params, but do not override the standard params (scope, state etc)
const options: Record = {
+ ...searchParams,
scope: input.scope,
state: input.state,
nonce: crypto.randomBytes(16).toString('base64'),
};
+
const prompt = initializedPrompt || 'none';
if (prompt !== 'auto') {
options.prompt = prompt;
diff --git a/plugins/auth-backend-module-okta-provider/CHANGELOG.md b/plugins/auth-backend-module-okta-provider/CHANGELOG.md
index afeb13cdff..47bcb2f140 100644
--- a/plugins/auth-backend-module-okta-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-okta-provider/CHANGELOG.md
@@ -1,5 +1,23 @@
# @backstage/plugin-auth-backend-module-okta-provider
+## 0.2.10
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.2.10-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+
## 0.2.10-next.0
### Patch Changes
diff --git a/plugins/auth-backend-module-okta-provider/package.json b/plugins/auth-backend-module-okta-provider/package.json
index 048f6410e3..a4342efb03 100644
--- a/plugins/auth-backend-module-okta-provider/package.json
+++ b/plugins/auth-backend-module-okta-provider/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth-backend-module-okta-provider",
- "version": "0.2.10-next.0",
+ "version": "0.2.10",
"description": "The okta-provider backend module for the auth plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-onelogin-provider/CHANGELOG.md b/plugins/auth-backend-module-onelogin-provider/CHANGELOG.md
index 2a201b6a23..9ad81ae8c4 100644
--- a/plugins/auth-backend-module-onelogin-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-onelogin-provider/CHANGELOG.md
@@ -1,5 +1,23 @@
# @backstage/plugin-auth-backend-module-onelogin-provider
+## 0.3.10
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.3.10-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+
## 0.3.10-next.0
### Patch Changes
diff --git a/plugins/auth-backend-module-onelogin-provider/package.json b/plugins/auth-backend-module-onelogin-provider/package.json
index ada908ed07..aadfb3f273 100644
--- a/plugins/auth-backend-module-onelogin-provider/package.json
+++ b/plugins/auth-backend-module-onelogin-provider/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth-backend-module-onelogin-provider",
- "version": "0.3.10-next.0",
+ "version": "0.3.10",
"description": "The onelogin-provider backend module for the auth plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-openshift-provider/CHANGELOG.md b/plugins/auth-backend-module-openshift-provider/CHANGELOG.md
index 88fd02d73e..9cf3f67cd9 100644
--- a/plugins/auth-backend-module-openshift-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-openshift-provider/CHANGELOG.md
@@ -1,5 +1,25 @@
# @backstage/plugin-auth-backend-module-openshift-provider
+## 0.1.3
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.1.3-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/types@1.2.2
+
## 0.1.3-next.0
### Patch Changes
diff --git a/plugins/auth-backend-module-openshift-provider/package.json b/plugins/auth-backend-module-openshift-provider/package.json
index 1c1d23639b..94c21f1718 100644
--- a/plugins/auth-backend-module-openshift-provider/package.json
+++ b/plugins/auth-backend-module-openshift-provider/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth-backend-module-openshift-provider",
- "version": "0.1.3-next.0",
+ "version": "0.1.3",
"description": "The OpenShift backend module for the auth plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-pinniped-provider/CHANGELOG.md b/plugins/auth-backend-module-pinniped-provider/CHANGELOG.md
index 86429f1b56..5da6e92225 100644
--- a/plugins/auth-backend-module-pinniped-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-pinniped-provider/CHANGELOG.md
@@ -1,5 +1,25 @@
# @backstage/plugin-auth-backend-module-pinniped-provider
+## 0.3.10
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.3.10-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/types@1.2.2
+
## 0.3.10-next.0
### Patch Changes
diff --git a/plugins/auth-backend-module-pinniped-provider/package.json b/plugins/auth-backend-module-pinniped-provider/package.json
index a855298b92..ba1e04ff76 100644
--- a/plugins/auth-backend-module-pinniped-provider/package.json
+++ b/plugins/auth-backend-module-pinniped-provider/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth-backend-module-pinniped-provider",
- "version": "0.3.10-next.0",
+ "version": "0.3.10",
"description": "The pinniped-provider backend module for the auth plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-vmware-cloud-provider/CHANGELOG.md b/plugins/auth-backend-module-vmware-cloud-provider/CHANGELOG.md
index 2535bd1e87..431d709b37 100644
--- a/plugins/auth-backend-module-vmware-cloud-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-vmware-cloud-provider/CHANGELOG.md
@@ -1,5 +1,22 @@
# @backstage/plugin-auth-backend-module-vmware-cloud-provider
+## 0.5.10
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.5.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-model@1.7.6
+
## 0.5.10-next.0
### Patch Changes
diff --git a/plugins/auth-backend-module-vmware-cloud-provider/package.json b/plugins/auth-backend-module-vmware-cloud-provider/package.json
index 36dc189e5a..0445438588 100644
--- a/plugins/auth-backend-module-vmware-cloud-provider/package.json
+++ b/plugins/auth-backend-module-vmware-cloud-provider/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth-backend-module-vmware-cloud-provider",
- "version": "0.5.10-next.0",
+ "version": "0.5.10",
"description": "The vmware-cloud-provider backend module for the auth plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/auth-backend/CHANGELOG.md b/plugins/auth-backend/CHANGELOG.md
index 04752f4432..7eaef6e066 100644
--- a/plugins/auth-backend/CHANGELOG.md
+++ b/plugins/auth-backend/CHANGELOG.md
@@ -1,5 +1,29 @@
# @backstage/plugin-auth-backend
+## 0.25.7
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-catalog-node@1.20.1
+
+## 0.25.7-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/types@1.2.2
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+
## 0.25.7-next.0
### Patch Changes
diff --git a/plugins/auth-backend/package.json b/plugins/auth-backend/package.json
index c556f93de1..9db17b1a93 100644
--- a/plugins/auth-backend/package.json
+++ b/plugins/auth-backend/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth-backend",
- "version": "0.25.7-next.0",
+ "version": "0.25.7",
"description": "A Backstage backend plugin that handles authentication",
"backstage": {
"role": "backend-plugin",
diff --git a/plugins/auth-node/CHANGELOG.md b/plugins/auth-node/CHANGELOG.md
index 7cf9a43e21..4ad613457b 100644
--- a/plugins/auth-node/CHANGELOG.md
+++ b/plugins/auth-node/CHANGELOG.md
@@ -1,5 +1,30 @@
# @backstage/plugin-auth-node
+## 0.6.10
+
+### Patch Changes
+
+- 2389358: remove leading dot in auth cookie cleanup call
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- b35f8b2: Fixed chunked cookie replacing edge case in OAuthCookieManager class where some of the old chunks would not get removed if new chunked cookie would have fewer chunks.
+- e9dd634: fix flawed cookie removal logic with chunked tokens
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.6.10-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- e9dd634: fix flawed cookie removal logic with chunked tokens
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-client@1.12.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/types@1.2.2
+
## 0.6.10-next.0
### Patch Changes
diff --git a/plugins/auth-node/package.json b/plugins/auth-node/package.json
index a1154b7bbc..3e095caa91 100644
--- a/plugins/auth-node/package.json
+++ b/plugins/auth-node/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth-node",
- "version": "0.6.10-next.0",
+ "version": "0.6.10",
"backstage": {
"role": "node-library",
"pluginId": "auth",
diff --git a/plugins/auth-node/src/oauth/OAuthCookieManager.ts b/plugins/auth-node/src/oauth/OAuthCookieManager.ts
index afbedd4dba..fc376eae67 100644
--- a/plugins/auth-node/src/oauth/OAuthCookieManager.ts
+++ b/plugins/auth-node/src/oauth/OAuthCookieManager.ts
@@ -145,128 +145,154 @@ export class OAuthCookieManager {
maxAge: number,
origin?: string,
pathSuffix: string = '',
- ): Response {
+ ): void {
const options = {
maxAge,
...this.getConfig(origin, pathSuffix),
};
const req = res.req;
- let output = res;
- const chunkedFormatExists = OAuthCookieManager.chunkedCookieExists(
+ const newCookieShouldBeChunked = val.length > MAX_COOKIE_SIZE_CHARACTERS;
+ const existingChunkCount = OAuthCookieManager.countExistingCookieChunks(
req,
name,
);
+ const chunkedFormatExists = existingChunkCount > 0;
// If using the default cookieConfigurer, delete old cookie with domain
// explicitly set to the callbackUrl's domain (legacy behavior)
if (this.cookieConfigurer === defaultCookieConfigurer) {
- const { hostname: domain } = new URL(this.options.callbackUrl);
- output = output.cookie(name, '', {
- ...this.getRemoveCookieOptions(),
- domain: domain,
- });
-
- if (chunkedFormatExists) {
- for (let chunkNumber = 0; ; chunkNumber++) {
- const key = OAuthCookieManager.getCookieChunkName(name, chunkNumber);
- const exists = !!req.cookies[key];
- if (!exists) {
- break;
- }
- output = output.cookie(key, '', {
- ...this.getRemoveCookieOptions(),
- domain: domain,
- });
- }
- }
- }
-
- if (val.length > MAX_COOKIE_SIZE_CHARACTERS) {
- const nonChunkedFormatExists = !!req.cookies[name];
- if (nonChunkedFormatExists) {
- output = output.cookie(name, '', this.getRemoveCookieOptions());
- }
-
- const chunked = this.splitCookieToChunks(val, MAX_COOKIE_SIZE_CHARACTERS);
- chunked.forEach((value, chunkNumber) => {
- output = output.cookie(
- OAuthCookieManager.getCookieChunkName(name, chunkNumber),
- value,
- options,
- );
- });
- return output;
+ this.removeLegacyCookieWithDomain(res, name, existingChunkCount);
}
if (chunkedFormatExists) {
- for (let chunkNumber = 0; ; chunkNumber++) {
- const key = OAuthCookieManager.getCookieChunkName(name, chunkNumber);
- const exists = !!req.cookies[key];
- if (!exists) {
- break;
- }
- output = output.cookie(key, '', this.getRemoveCookieOptions());
- }
+ this.removeChunkedCookie(res, name, existingChunkCount);
}
- return output.cookie(name, val, options);
+ if (newCookieShouldBeChunked) {
+ this.setChunkedCookie(req, res, name, val, options);
+ } else {
+ res.cookie(name, val, options);
+ }
+ }
+
+ private removeLegacyCookieWithDomain(
+ res: Response,
+ name: string,
+ chunkCount: number,
+ ): void {
+ const { hostname: domain } = new URL(this.options.callbackUrl);
+ res.cookie(name, '', {
+ ...this.getRemoveCookieOptions(),
+ domain: domain,
+ });
+
+ this.removeChunkedCookie(res, name, chunkCount, { domain });
+ }
+
+ private setChunkedCookie(
+ req: Request,
+ res: Response,
+ name: string,
+ val: string,
+ options: CookieOptions,
+ ): void {
+ const nonChunkedFormatExists = !!req.cookies[name];
+ if (nonChunkedFormatExists) {
+ res.cookie(name, '', this.getRemoveCookieOptions());
+ }
+ const chunkedCookieArray = this.splitCookieToChunks(
+ val,
+ MAX_COOKIE_SIZE_CHARACTERS,
+ );
+ chunkedCookieArray.forEach((chunkValue, chunkNumber) => {
+ res.cookie(
+ OAuthCookieManager.getCookieChunkName(name, chunkNumber),
+ chunkValue,
+ options,
+ );
+ });
}
private getCookie(req: Request, name: string): string | undefined {
- const isChunked = OAuthCookieManager.chunkedCookieExists(req, name);
+ const existingChunkCount = OAuthCookieManager.countExistingCookieChunks(
+ req,
+ name,
+ );
+ const isChunked = existingChunkCount > 0;
if (isChunked) {
- const chunks: string[] = [];
- let chunkNumber = 0;
- let chunk =
- req.cookies[OAuthCookieManager.getCookieChunkName(name, chunkNumber)];
- while (chunk) {
- chunks.push(chunk);
- chunkNumber++;
- chunk =
- req.cookies[OAuthCookieManager.getCookieChunkName(name, chunkNumber)];
- }
- return chunks.join('');
+ return this.getChunkedCookie(req, name, existingChunkCount);
}
return req.cookies[name];
}
- private removeCookie(res: Response, name: string, origin?: string): Response {
- const req = res.req;
- const options = this.getRemoveCookieOptions(origin);
- const isChunked = OAuthCookieManager.chunkedCookieExists(req, name);
- if (isChunked) {
- const nonChunkedFormatExists = !!req.cookies[name];
- let output: Response = nonChunkedFormatExists
- ? res.cookie(name, '', options)
- : res;
- for (let chunkNumber = 0; ; chunkNumber++) {
- const key = OAuthCookieManager.getCookieChunkName(name, chunkNumber);
- const exists = !!req.cookies[key];
- if (!exists) {
- break;
- }
- output = output.cookie(key, '', options);
- }
- return output;
+ private getChunkedCookie(
+ req: Request,
+ name: string,
+ chunkCount: number,
+ ): string | undefined {
+ const chunkedCookieArray: string[] = [];
+ for (let chunkNumber = 0; chunkNumber < chunkCount; chunkNumber++) {
+ const chunk =
+ req.cookies[OAuthCookieManager.getCookieChunkName(name, chunkNumber)];
+ chunkedCookieArray.push(chunk);
+ }
+ return chunkedCookieArray.join('');
+ }
+
+ private removeCookie(res: Response, name: string, origin?: string): void {
+ const req = res.req;
+ const existingChunkCount = OAuthCookieManager.countExistingCookieChunks(
+ req,
+ name,
+ );
+ const chunkedFormatExists = existingChunkCount > 0;
+ const nonChunkedFormatExists = !!req.cookies[name];
+
+ if (nonChunkedFormatExists) {
+ res.cookie(name, '', this.getRemoveCookieOptions(origin));
+ }
+ if (chunkedFormatExists) {
+ this.removeChunkedCookie(res, name, existingChunkCount, {
+ origin,
+ });
+ }
+ }
+
+ private removeChunkedCookie(
+ res: Response,
+ name: string,
+ chunkCount: number,
+ { domain, origin }: { domain?: string; origin?: string } = {},
+ ): void {
+ for (let chunkNumber = 0; chunkNumber < chunkCount; chunkNumber++) {
+ const key = OAuthCookieManager.getCookieChunkName(name, chunkNumber);
+ const baseOptions = this.getRemoveCookieOptions(origin);
+ const options = domain ? { ...baseOptions, domain } : baseOptions;
+ res.cookie(key, '', options);
}
- return res.cookie(name, '', options);
}
private splitCookieToChunks(val: string, chunkSize: number): string[] {
const numChunks = Math.ceil(val.length / chunkSize);
- const chunks: string[] = Array(numChunks);
+ const chunkedCookieArray: string[] = Array(numChunks);
let offset: number = 0;
for (let i = 0; i < numChunks; i++) {
- chunks[i] = val.substring(offset, offset + chunkSize);
+ chunkedCookieArray[i] = val.substring(offset, offset + chunkSize);
offset += chunkSize;
}
- return chunks;
+ return chunkedCookieArray;
}
- private static chunkedCookieExists(req: Request, name: string): boolean {
- return !!req.cookies[OAuthCookieManager.getCookieChunkName(name, 0)];
+ private static countExistingCookieChunks(req: Request, name: string): number {
+ for (let chunkNumber = 0; ; chunkNumber++) {
+ const key = OAuthCookieManager.getCookieChunkName(name, chunkNumber);
+ const exists = !!req.cookies[key];
+ if (!exists) {
+ return chunkNumber;
+ }
+ }
}
private static getCookieChunkName(name: string, chunkIndex: number): string {
diff --git a/plugins/auth-node/src/oauth/createOAuthRouteHandlers.test.ts b/plugins/auth-node/src/oauth/createOAuthRouteHandlers.test.ts
index df012bcff1..f2cb27dfa9 100644
--- a/plugins/auth-node/src/oauth/createOAuthRouteHandlers.test.ts
+++ b/plugins/auth-node/src/oauth/createOAuthRouteHandlers.test.ts
@@ -19,7 +19,11 @@ import express from 'express';
import request, { SuperAgentTest } from 'supertest';
import cookieParser from 'cookie-parser';
import PromiseRouter from 'express-promise-router';
-import { AuthProviderRouteHandlers, AuthResolverContext } from '../types';
+import {
+ AuthProviderRouteHandlers,
+ AuthResolverContext,
+ CookieConfigurer,
+} from '../types';
import { createOAuthRouteHandlers } from './createOAuthRouteHandlers';
import { OAuthAuthenticator } from './types';
import { encodeOAuthState, OAuthState } from './state';
@@ -53,6 +57,9 @@ const mockSession = {
const fiveKilobyteRefreshToken =
'tylmRqYlw3LrrXATyPerWfYMXrF86h3FeI5DECH8lZ6bERd3SsSFaJZ7EVYw0Rr8HMQVqJAurcSDZBtXjry3y9hXGRmugroDiZngNw8ROSPqcWzaNWDbaVuxCGf3jdjccOio7MnbrmMGpKUF8dfx8DhBH9Vogj5qCWpDajxnGpG0HEOcAHmQbsmJ0KHKVIggAtTYIefjvO2I75Us5VI0sId1GYU0E2AsRVEGedu6oexiLV6QgyJHSyKzTTRD7DqZ4ktVLDsjOBUhAAEWbAl0vxhvjSUEt4YYEFshV5T13MhRGGma8QtVC7R1NItwtojj94QGfwnnQEviIuECONwQc6b4ObeQkPn4bgbsWG9PD5UJA9kBycBV8SqBQkKvT5nsrlsnO4E8zBJBtc2Pd14MUh6CzFng3Wee7v5uPQAnyDJT4V7COwY2F2opz2ifau6c6gUT5ybkEKbp945mo2R0mu99C7z99jhUq9RRxgrtSeNQ7o7j4NksnJThZMjxvpi978bG2P2oMWIl59LgsrYyUt2bkjEB5sQ1qwngitAQDy57flLwAyHAwTobQWjGDUumAAOHe9UqjsuPd6qf23nD0b2nn1rCtnGyJ0H6luaTT0Lqet1Eq9XRLHkL52mJN4iPLWKcDrYsK6KqKhIlVkHa4zXRKHnKONOgMqYioC155yncAirYYJQl142MWamHXqW3LsIjrPwPh9xj02TsWMG4hDt2kVb8Rp3qGJTDyDM79NKbIFFSkATIwyQmQB1THo0kAkpu3V7YYoOfDSl4N5TUbPJRSbEug6Xg3dqMjaHrL729xrGsc0iWC8DAKlTzPKnoVcjaYeru6zHIXhJJcs5BIxeA6afUcataOrzTddXdBiCehqtzjS0omXdeiHKv5d73fLeC5luUo1um6eVEidr5fXEApGpSHKsEo7mv1a9xOTCZPCE1lHntIkaG2vTgEc14QmGTXAjnaxuThGROxmm2gX8xM3JD6HYAfTxQpD5Y6fcMyF5joffBjLdFvHyYC66BghXIb4M7oZ0QQNqzMKzNuJ06JYLK4e0Pi2FQHt1XcO38sknlFnQh5S0GPMiGHXStIyDTfZNwPnI7iKH0GtsRZBUPmoG2cgJWSJPTMZOnIaC5AzZ8AClMT58GAa3MiyIhVLAs1hBv4BMu5mbY1QVSZ8UETZTDnXEn6rGIES41zkr1A3FThUhUTzJAwYLaG2nYn5Dtpge5C1B4LGElcVQDLJKKV3e6foYQMHcIzlwySKWSylI2bRjGJtE9594rlB9Yz1eno7KTtxy9IrMoAd13KnOCnrKjL40kGEWwbDScT0zob04qw1uuIcldUiLYLhPD0MtdxqtZTgvKeVTCeFNo23kWRnBvwhLlguGqvPCMfwXFjLldJsei9MElZgRrPgubBb7ZjSSdGT6CKey6TaFPx5jOT7V9v88jfQJMyEoX9jMCvCQZMFZyCMQdGKU40dOaozRqsymNMhPOgvheIhlXfN0MhU6RLJGhUen0QLuRBy2MiK82z1nkKSnlhMB3REmFmAIXrVhXiOalPLDVB9kR3csn5f6bddAcTzDLrv2YH6ZGhmXwILKJ0osKm8e9aIKVWHitr0LXl5zvkDj7U9CIVtktLLRodLTVxlKRS048LmbRBpGafoxXgOlcVfDmQO8LdKbKHWJOEN4oEhxF3zEgPf9rRMWEI0oE9KoOau7R5DVJMB6Bbf6tOxbHlVwPmnXGsEIJFDt7Wb79knZihK1mfLqaOumcAznQZiFdNt5NbBSestUCytXDDJn1fm8IGxXsBQSsEEtklg9phenjmMG38ABmyLhZCDiDEQ4M6VRPseVXpPhNYuija8YePhrB1y1aW1Cab7wglIIbeGj1Z06sJ6i4HGkAXtn2M1HolRLc6oPohihPaYtrKOFCtJarwbCHMtQjaR9GnzVfGoLFKemhY0kOZvAdLmB0g1QUKsmcKtNdpQwVYwciJE9vvIlgMIpeWBrU6cDkdIbQDOM6dvLicO3BZQqBXbSNgLcXsF1JqlD5YgUzdARjxv7tagxjXVJ4DVB31UgXcBWlEmI1gGrbVZUTQ4Kaj609StfQw2XNNdal8eES46C4rqHtTGCtdUjW7QINXaqt1efjNk4WYFS9OTGKL0GcgvF5ERlHuAQh0R2R0rSQLl72ayOZDeausNRBDYyI24pie4gFb2LI1hJjRwVTJej0xllYoPtMgLxmkCnUpPhbpPjIwPYIZfSYE6CoV7oxy4BDSyK6ueE6dUak6hlEZwOnDh3aOTSVioq53vuqk6ofC2kT2ar1PfgH5SGxpXB6RpI5bYiF4NYoDX9zEOKHD7hwVHoLK4UusPJWSNdbIDuIBmGb6p83vnEZukNaY5ocPZTZyM1Ex8dDOFiOiZs4bOgOY0NsJKv8pb4I1lDzSeBqPbytFkSAQrU5pUgK45bSIFlyEG3ef59nPHblCA8GstcMSm3zZETd5yVq1NAmQvAnabHyc10T3Arp8cm9Xe1SPVGMzEP6QjXMkZMRbwn8k9nXXcFNfRe6XjE4EhifwRuAYoUJ5jQEF5yrF1nYwwbsx6nlKtxlkxWljavjxH1aP8w8t50T3THX1hx39aktWddjRSjQJtu1rZcCxBCBx1FxictyrP9y5dhVVMGIup6mJ8vHws8nudLqHaiEEQlGlRGKi6hMcF31S8l1RWG6KJRsbm8x6jvJchk5ekr9Cj2fmCkpVdE2yCianjU7pCLibtfR7HV36uGK2d0DXwbrv0sXPr9M7KGgTLmSjlUJrohDBHshfHPdT5DgIq1boeBBZjxlxNoUxN7veZ80VjFSuNbCxTg9rcZeAT35qgt06oHboySGL1ZwGPs4Ip73tN1AYRlfo3PZBHWCT4V8mF0R9DDyFEdhkZtvjJLTNqroJsUuUAQzggheYufFunJ8lrwJyche4XaJqnKkv2JktuSbLXol2NoNX31493O2F2nnwWbzgff1jh2gDvPiG9o8wvNrXY06Ar47WDF62YipcLuAY50RnPWaVOgC2vV0OmDGMxnu3niKM0rSiyOtwWzc8SbRPkdRzGwqmtmSFfJSLzNdDLFAbGyDel7WzMUtWuXfvqEZwLVco49zrlcnLPAT4OKNvSl6AcZaTulU9sA2xbEK7gKMv7r8HNJLdEze2cgHG6rXUiayefWE3o2V8YjSHyUwV4PmrW8neAv0v5zKnKBsE6QwlYX23NoaPBvSokjStkNbLxLec0ip6Rgy7vJv5AEA7nxbDM53WUz44898OKHrVjN9vqvoKPBQUXf5BHihloJQCnpk03yzcc2h6y3e9rMFPyMyLFI6Hd4jCOuwtOqTJjAJAvcJzP7gKkeAe9N5ObwtjNqkkWPOd1AJccZukWnT1Lu390xfY3eyRjdMutc5OkTo4di2u0AjVH3LtRIRfa0AHVEly3ZvBCCYo9jCZ0CV8s6PlNOJ6SkyZyZzO3VyOUYxfj09D0P8kCaQ8YcyyoeSKPKVlFvxEqALW8nXASnKCv5mvsAyZMGpYRHtoyu4mVyCIrdOjmyGIK462aO6KaGC6lfWkKisQhLmSK2PmrPeimdS5ViOHllBfwexF5AsmNi6LYrjS00uPTki9K06h6yuppMVV8ykV6HIZoLABicTm5NofudhYrqV5hWstXxunHAk2cNq5Is1mFSNU4eedYbqu2c3y8iD3QzLWO6FmxwWFu3XUK8upSJ2cK34uUl8kX1uRsWSNEMIMOils8HZwHtxZ9fZ09sT2fRJKAIKxx57h0leLsjciNT5iTrMHgsNTlpa5I1QDSbEqtlFhDvh3TYmAYBYUENhcVBZmVK62XhTPpzgmEIQX4dlZJbz9g6I85jjfJILKLsEpmErtbzglmQpyQNw2EQFzYIWu25tv2dTDoDRP7uDV4KDKl5pXKRwu5z4UQI4sXLPACK78x6EoEyVUFnBktvnT7mQe5bqAlJ7dhqUEbzC3AJIgVosnRplZqXInSlNdpTFOasW3YyQmQtDB4183vKzCe4UMdKnHkRAoA127iSIUvKe5w66Cv8cQU38AFyWp5eedMNu9NlbqepUEaYSTmas5odjQUJ23D35QCuO67zFILoDKqWYv7jVKXMIVZUnyvspAWbtUFYDij5SmP2QQCgCpExeDtmoVPdjusL1QqQjukGVc9nXHwjhZ7KwrtrC5XMeKgl9EBvNjRum0sn4B7MLhuqJPqreoTLE2unGcI34mKbWRbyHjSq5xi8uZy72MuDCXyUU4GmZrXNqMG7QAw4wAvMKI31G0uHJEaOSV5II9XGAuYSGTuUuO4y31NTQBPpa2O0JFfnFJgYveVoWL3cCcjJivvEWezutrJ3eObOFbV4ACiZ1uXwJFlI484ILeWSNkS3jaSgfIYvBK9SMVZwg6IuFtjX6D855I4U4XHMqKWla3IcaKvIKwYFlrOWPq81lflKMPLQvJnrEiUi67jZJZYF0rMKtrv2ayFEfFBDtG58hA9uIkCbvHAQOBeWpzuTNUdtZoNdAuLqxddjpxZr4moFtk1CjdQihJNQLPeZR0ZrQYVBUPMyFIV639RykPOPyhxFMSKQNo9xjNCuxnoZWBbtqHHXtFZdUBq7qkb0GzfiADZ7LaRtj9MNOLLej35Wy0L0xPu5Hy5v9N0Jslj65YZJvC7N8uMYuIR6rMuh2MhuthHOlxLLbzcBy7gicP5aFofdt4fkOBgitm8CCRdm0f9DQpETZ5hEGmkI4V59HRs2Up4CG2ajOFIZwRmbvs3B8M5NZmwf1mmek0j7qfjkOhpsp7RHMqUztEYGd1RX3S6vaHDSFEouqPiU07CjNFDV1f8x94tUq8ldicDtQN1DbR5oBTvdmQZsgG8K6oU70IKNhwX4idMFNaTcQ0ZsfJk1rQLh6cIoksmrbm6tYu97HQhVsDmavCs5CnkN2mZDEEj9HfK6O53ck273X3jRo01lFfT65KcUSH71zr3KkLPzxBbhhCRmdpXQSfyHwbN7QbKWi6NkU8G7xb8oRFFsR';
+const eightAndAHalfKilobyteRefreshToken =
+ 'Ad62a2Bfa5cdCdE489CaF47BDBaF9fbd8CCB6b866Bfc04bB2f8ec7D19ddc7d3189e5249e231cAd567745d4Dc83Be5ADd5BdDdC3cdDa8Cbfe2B2f2Cb01876eadF0A444eA420FEfb5EaFD918A9BbfabD8eaa512FdE7F3fC03bA134d99ebb43fe58eE8C7DaA587a563eac5B75E4bc03E31BcD9dB5DABa0a24e7A6B44C0C585Fc2dAA1dCc5ba110BBeeF7404dE5a0e416A86e23aFADd9efA19faabC74DfdbeCe70E396E054fe2dA1dcCddf5f6f36d1dEF8371FD31BbCA9D1e23a6deCfC43Db00750a2feE0fc7ff6dBdeBaC1557ccA546E8B0B2E6860cfdDC96bBf2356Adff7CFCB1AACC183Fc3DE8bEb0dcFb22D19f44B9f4a6fC0AbE9BCa64e31baaD85aEdE42C1E3b4Cd7F8FEEDDda1dC25C50E93353Df12dCACCA85cD7E6Fb99cbAB4Fb59EDAc3De414ffdC1AbBa3AA06Cd11e9c6eAA1Eb6B1dACa1BE7afd34234Ae6B1Fd2e2Aeb7e0C74cbB3F6fFc39ec6Dd805ddA1433cDfD4bCBB8b19Aa6eB2d19eDE0e57E668302b9E700a4f170967E38F0C8c664AcFbAE6f98eAB5e3EC96AcFcf862Ae90843ffdeEBB89DE2933e55a4bCEB45E07aB1AeB2e8dE4e70e7d4aDB8B3020fC48d0FD4A2A03c6Cd97cbc6A169e13b7AE73A37F25082B4aBe19EB050F0768e2Db7D3514BCA067B79687d03260bd0A4bfFe02cF38Fd31bC09D52fccFAD1D73E51BE55f11BECfFBA6F988fEE16004Be54AD6CC87741DaA40Db1f600fEffC0fa17b77F85e883E6F9BE8e92dA6C862C28DBf128de0A8d307Ad6b1ddd4a9493ee1F8731aBd8Da2f0e85Af89DEC18678bd7ffAA75FA5a79f4cF5A0AAb4f3aD1Df7E2BBDD24Dd3BB12f26cA5f0359a9462f5f5e32EBCA7346BF171ba4F1E2af7f3Ee8B3C8C776B4f0D0622EeBDdBa9Cf9314a85c9F2952aaf25bB2B79A2418ACa6f3bbA76eFB99FA0eC8e30F4e7b5853dfB8f6cdAeEb337dbeD2392e95BECF0Aef66fDbeb0803Bc950EEfed4Ff9b865C80bBBdb074facCE5614E8CC6DF0033cF223c2D5dC60Bd6Bc30141dc5120B8D5D429D4e07cAdfBD67BfdAEFEce8D32C15BA9CaDC1dCCDbf2D59CB370B57cDCa083cC9fEabc8B607c74E167cc1AAE121c6265Fee7b39eDFE10d31E8d59ad4e266a176010AC505BEd8ca057Eb224cf57DA4dfb98fd10A3Ee64F6950Ac54dbD3ffcbB35EfC84BEA9cbCa49872eEc9dAb29161d7b80475C42226914B5FaFCecC023c1AecEa9F89Da95bA4EF2Df2c3Daf14cBdBb9533E07E2E6141e76d1558dF33aeFbfe572fcAd33d3cFCC055bDDd8D8d8f1dCAe6Cff2aCCAfe653b7e845ae459563D0da4E995D35559200EF6FaDbDA59a6BBD323cE8E370fC3996Ed9ebcef1dCeABb067c2c9E96adFC22F058bDEb00bc037549CBCEAF3e6D3b0bB914Aa8CB00a4a97D34cc6D15Eecb295B0a26bD83109EF2af3C82AF55f146ffB26Ebe727eD86dDEB1BF7b714Bb0a58Ad152daAaDC7F5dAEDfAA109d6fCe2847D3b32B41E8c29DAC6499bDA10F8A7a5c3E0b2a1d0f2DE2c3e88de4DFDF85B4AD4Ddae8e8D6dF5bF2affd8dFc2185A92E81E9CEFB0cd71Bf5Ac4C09AEe012eFC79B5dFf447b9AAAFadA871AEac9be09cDa26E1c56F54DD8b8Afac765Fc452c0e11B45daC6ec766B80002C544E4e6342b0B445CE1AfEC0FE8E9d7DE5EF5Ec4921515Ddb8Ee7BEbd68d7065154252E75d922A4b8E4d0AaEcc6Dc3db498E9CfF41bb121B69Ebb774B3cf998316C80Fe73F7d688bcDec894BD3adf5c5AA6A36044C5B01D2dCCcc23BF21F91cd95E55ca1aDaA770AE0b65fE67aA95d44D0BBD3FFDa20bc6EdFcC7e2ef5B46225EFF5c767BdCE8C666Cdcae2aCf9ADb7CD3C10b59be627AbE5B0FDEA16dD9C4727FbECF6bEcAb1b8E1f5716eDEbEaf4E550B8c7CAfDd0C0BE15b6D4bBE3261f9c657aB885B8862C74ED9af0FD725CBCBd7ded2B0d6fb8eEdc802BB1EC2c7609399844a2DCaDC0DF2a0ada1fa91E7a4FFeee6C7AEB3A42DCb85eCc3fe6b31B8D857225a43C49CDBAcB9E855CF9C3ecC05cc41FCCdc9c6b10aa201D0471658aaDBB2077abc0516ee7911F8e1A435eEDBf50e0C12b5AB3e40A4DC2aD61Cdefd6CDd2d16dC9c0d5eE5C2573A6AfceB43d9E6f9e3C7BdAa5CbD2FFcB1AcFAdf52B6EC5cc5B0AC36c2c932124dc8C43cd6867fBfAc1F4DFF957E0f8F09Ea0e4C60faccc4D4E84bC0F0163aD1e2E6977ff83FAaebDd2cc1Fa8BCa821B29f34F242E3FdAb05Bde16a0C46af8CeeAC2EaC00Cf81C112e6Ee0b79b9f5Af9eD0acCc330794aeDf8aa3551C35063BF2D108E4a190cDE9055a3eFB08CFCCe7750eCec6eD4BF2dFDbec7b3A9Bb6cDa71eAb0De2CCA3F6bACFF4ce9304b7B5EAd78a5DfDef6cDbd2df49f0F806ECd85Dab8B1B9B76C2AA0d50baBCAd9db11761f572feF3D50CEFAb6Bf3e38Af8EED4cafe43E47BD68dB67fEfaDC7b3FF2eF5C285DF0850bE8b17B2AfDCDa0923b4BF1f0E02a279B0bc87c5d2Ca60ADc1ccccE07f58BeDC8a31bC9F25bF3D7C6fA4be472cfA4B1F0Ffd37d0EcACAa1Cf1dA07Ee8aE5AB9f88E54db4b6be0cEb3aBcb0DdEf5394a40d25e5138aeBBE1f3b191eCcBFcCC949AAd584BFe2Fb932797E6ABBCaB8BEBB96daBD097fedA5fE1dfce3F0E4BEc518aB25FfCBBb0aA007ffafb04d3BbCC5e0347AcBbc3006C05C41CBeeBae17A149b15Bc1533aeB44017cc5BCDfc6c5d2AcCEc4c17A44e53D42dc68C6f93eFa7D1d2f9f2D4e4Dddd90dCa0f15dD1aa40D7eBff9b0Cb7d7Da33FD2cb0d5Af8DbcbaE47Fb86Abf8bE20A7FeBBD4a390abB6abfD8C8D5E41e2BEd8E3eBFD2d1B8d41d605AdEF2BE63E22C09A55fBbAbfbeb8fed339119bf34a8d0BA3e912702b9c0DF7b476FC538eD06571EF2dE208beCDA8134BeEcb1F794BeaaDCd5619fd05EABAA82d58cB0cC9Cc3adA0D5fcF915b6E9dA9517caB500aDEAc8aAB6ad26b3E2F8Bf7cd2004f7cF74cA4b2a495CDed2a7a5CE42b6DC8e95326a7637f21EbFCbEcE8860EfDb31Df9aaF6F133674723f716a600B1c01DC98c7aA4fBe9cb81E7C50F3Bdc966D8BDa1AFcd4EBfB922f2eba045B3726d3Cec02Bdd606ae43aaeaa0EA945D4ec95d9E5E1AcF92aa75F4db4AC453Ccc51ceAdBD7b0614BfeCC303AADc40bCfDDfC76bfafFdbcD47D4B729EEF1CCED07C3dF85EEfC2eCcbbB45F8D5f1D09e9A1964fEF402E29AE024dEEeAeDEfF377E7b2ee2F621165dEB3CE9f4471DEeb396Dc3B508Bb0C2A51c4CC4Ba5Ca1aa9ca7b401D6C0421EDB83CF03EA16bA24ceE3FC4e7Ad4BFc7dAbe16e4C2A51F4e2cAeb7bC7287684268ea7FAae360A1A8aF5BFED450db3D66363284eD57B2f9D25A5c4FE424a7feE764eaA0e47F96b77Af2bd725c1c8DbE5A7FF2e0c7cE7F9eE0FCf7bdF00543a9ED1C485CDC2e82386F440D04FEa6380B9bbE48C605bF0fbDe0dc2cEAe35C2BFB84dF62185B8e6BABBE89DcCF1b1Cedf5aDadeBdd3Bd66cc76aC6badb2F1ec27C411ccd3cCD823feE8A8F9aE8C0e1cc0fE6484fBd2c58C77Fbcbdc662C7EEeb684dAaeE0489C40d8A91d6DCec15A3e506783C35acBD0Dad364AeeC295d7eD1BecdB2d1d9d1352dE4F7f52B50e272ab9E57e8AFbCC54fEEbB640F5FD37b18f6a46D70f0cBCB98aBAdd6EfcF06f5f5Aa6D61b3FD4c1aeB46Be0Da0Dfcaf5c45e2FDF46C43aFcCb952Be929adaFcFeECbCDB6Edc61472DBC37Eeeff5a5B64Bd1Fee6B5e6861EcBfff3d6103a7E3e361EC08Ecb4d81c0FdefAdA9d861c12e7aD85678a23E5E94F3dC9677d4B82Dee5A24dDbebF20B880c25C6955dCCC276ff9C3505a85bBE6aB08E6EFb3C35DC1fcFDC8F86E4bE7C1F0fBF8b1B8594F122fFAd7c6CDe8fba97af1697Ae3e5cFc485B8E0Ae66dbD485afceBAAe550cdc9E4B4CbEbC51c85D6BeCb83BF51f41DDeCAbe4bB75209eA0EaeEe6010Da909b5CBd1D1CBaE7b579F48cd5Af0d2F81c1E8ADcaA4DaCA01Ea206fee4ECBc8fddaa505b41c114EABF753F5aD02B25Be96bEa1dfF5e04EddEcEbA8881EfCe9AB957e0366DdCD9E32ecBdFC1B0Ab6f1effdcb0b1A3d2f7eFEf59EB2bddC130305d4bAe6f627e1087B3Ef5Cdd1f2A75Eadc6B4d79A5b6d55fEA7ea30d3cDd74D74F3bD2aa99b5ab3FC83Acbb9ee0fBa05D4d23DACeBb16cda8A2bF7Ca4D85eee1BAc9D06Cd899861bB5e2e4B9c30E1C887d19DbF81cFe8Ae9b777249f542faAFE3b3bd49Ba5295afbd927A475C0C3B81C1ee6eEB8c00451CFBcCFfF7Fc8aD0b7251c00D507cEfe86BeEeFe5FBded0FBe30CC447DFaB930c04c4460e9f9cbf1BBF2eBFdF06D3AAed2af2BEDBA0f296AEfAf90571F9B63e0876fFADfDf61408B6dedeBfE2dE7a8ee750Ef78B1289b6fCdfdaC58393e373a5dA35d2b149c9FF5a1fA9DFeCc37c678Ce657A172D5d990BbbFDa089288dCa5F89f6CeF7cf6b1EB2609BBD65e6fFfa815Cc59abcE387ead000Af1B1C1cC87faB990D1b9AfcEfDc3D68cCCb9b7475803829dDebA48e92df26AC70027CcEfB6F6FDd1DA25DFB9dA0aE50398998E7EbEEaE11BB68a2E03c5f8306eaca1aF15CeBCB05a6FDb8E3BdAAeFfeC21Db12762dDBABd3eDf12A438B3C37B51cCaCD1Eda73dFCCeF06BCFbECE21F95e2Ae1d0F161dEec60a17D01d1Dc425b85aCD0adeCCBdddd310581aa0eF48FfF8a6A727E95BADefF6Cd011Df1c993DB5aE2ec8c3dD42cD704a5e0AC8bCbae34F245e7ABfba828efa3adFFefb33fCa32ad0b2Bd7C4Ae56C3d932E7A1a24bE87Bd235067A73CcBC5A8Cd44B0Fa5131dacCDEA7454aAb7c0Dfb006B6EbFAd3dD1EAEee79c9Da23FA02D88CD8333BE964E7D2eBbd1AAAE06E67463CCb6eceA604Cdd2A16d834599c86914Ea9b063243C4Ebe8E6aa677fdE2b67A6eE4Cfe1801273137ec777DEfc84D4B3d0e96dFF1f7CCaB0CFD307Ba1fC16b9C4f4d1fee0ee0f05BB1102eEeA5E49e7f339BE6d9335Bf2F28d57f194D9facA9c5af5B08B08D7530c7DDe99D0Ae0D8dD5d0c13B77fDf1E3Bc0aA8e71C32EAD5AaD7Bed538F26d4deaA3A67C667201C5Fd62A5FaeDde62E6DC78E62bEeaBFaa030cFDa4E86f5B3C48bBE7bB4Be5528D3D0fd69BCCE1D8B6d04Ee6B9a1B5c49572B21FFFf1bDf06cd98fa9ED5fd9Dc3B04bD4530B8CBD5d0106799E4CBCE64c65EFcfb4f84Ba0ced14BECdcd4bb33CA38B4eea4bF7e665Eda4a8ADfBfae5C45b2B91e2C1eCD0CcBC85275d4Ca8318638eB77Eab97845c40Ccd34f7ef99385Ce275B30013f7BfC2c088a2F332DAF6Ca2CFB21d5f8EAF177B519cAF56ca42a9DAfadBAECb5E16Bf671BDB2BBb15c8eb1F4Cb9dfDbfbcFcFAEABAD3aeeCF8e84BbEECf3dDf0f7FdBCF44aa1A4ac7bFac026B8Ab6C0004a1dCc6bc2b5eb8fA7cEEe9cEeAce5d287BCE0E5f3bBffdFaED134286794D704b32DD36cF2FF80dd39FB09cAbCF1FaF07a2aFB0EA7FeA464b90f77090B846Fad58Ca0fB83eA3d6C4dDBCFd17b8c5EFCc7a6e1efDaaE8B4Ecae65C89BC80Df9bC844cE9aDCcFdaE2be0f0Bc6AdBDB6E814d2050febEB3BaFCfBCCADF749BC2Cde2BeC0e7E6e14afa92Fe5fd51A8Ef62aC53FAE304B0f4317Ab5db11fD13ecAcd8995E6F87Fe4Ff5FF89e4B7b44A754f52a7E4fDDCdfDDefEE4aD7AcAacDCa17fd3a2b43D4bc74B3Cad0aeee8eDBa25D56e3Ba0C5cd8B8E2a2c0B8f951Fd7AFC75edEAee0c28bf3cEBc3af7C60ca147fC9cF0886B066e263f36CA5B5BB36aB82f0f0A58FE3d67f1a9fc24270e6170ac34E6eE5c1bc64B1B5f416afbb8E8edD2cFA9fdcAF7Be904EBaA1abF8b0c2D5cc176C5866fcbCECa5342d7439Cc5E859dBe6a18e9c58EC2e9a5bc20a79D3E3CF073aD4c4F12409E787fFA0Dd1C6d3f01b3CeaDC7F5Cc9be3415f0DFFD5F2E2Fb0dBA6843CCB1aECbF1480E8fCFc16e2cEDB8B8e292dFFeF1bBc6F9C7DD4b873DBbbD528d0fB1E4D02ba3EDe9f1c13b4DEE0FC8BAAdc5cAB40AF2EC4eFDAAfD31104bC04CEFFCbEAae6aA1C91FAccAEed7B3dE6FF226Db01f62E239fba8BD5aE9B7C9a4DeeF746ec2F9580368FB1DDcF785e410aec4a70005a609CBBebf42f714b3c59a76cB06c3c86Ca3dfbB5EcAC';
+
const baseConfig = {
authenticator: mockAuthenticator,
appUrl: 'http://127.0.0.1',
@@ -116,6 +123,30 @@ function getRefreshTokenCookie(test: SuperAgentTest, chunkNumber?: number) {
});
}
+function confirmRefreshTokenCookieDeletion(
+ res: request.Response,
+ {
+ domain = false,
+ path = '/my-provider',
+ chunkNumber,
+ }: { domain?: string | false; path?: string; chunkNumber?: number } = {},
+): boolean {
+ const setCookieHeaders = [res.get('Set-Cookie') ?? []].flat();
+ const cookieName =
+ chunkNumber !== undefined
+ ? `my-provider-refresh-token-${chunkNumber}`
+ : 'my-provider-refresh-token';
+ return setCookieHeaders.some(
+ cookie =>
+ cookie.includes(`${cookieName}=;`) &&
+ cookie.includes('Max-Age=0') &&
+ (domain
+ ? cookie.includes(`Domain=${domain}`)
+ : !cookie.includes('Domain=')) &&
+ (path ? cookie.includes(`Path=${path}`) : true),
+ );
+}
+
function getGrantedScopesCookie(test: SuperAgentTest) {
return test.jar.getCookie('my-provider-granted-scope', {
domain: '127.0.0.1',
@@ -125,6 +156,12 @@ function getGrantedScopesCookie(test: SuperAgentTest) {
});
}
+function extractTokenStringSlice(tokenString: string, index: number): string {
+ const chunkSize = 4000;
+ const start = index * chunkSize;
+ return tokenString.slice(start, start + chunkSize);
+}
+
describe('createOAuthRouteHandlers', () => {
afterEach(() => jest.clearAllMocks());
@@ -329,14 +366,137 @@ describe('createOAuthRouteHandlers', () => {
});
expect(getRefreshTokenCookie(agent, 0).value).toBe(
- fiveKilobyteRefreshToken.slice(0, 4000),
+ extractTokenStringSlice(fiveKilobyteRefreshToken, 0),
);
expect(getRefreshTokenCookie(agent, 1).value).toBe(
- fiveKilobyteRefreshToken.slice(4000),
+ extractTokenStringSlice(fiveKilobyteRefreshToken, 1),
);
expect(getGrantedScopesCookie(agent)).toBeUndefined();
});
+ it('should replace and clean up chunked token bigger than 4KB', async () => {
+ // Create and use a custom cookie configurer to make sure to circumvent legacy cookie removal mechanism logic
+ const customCookieConfigurer: CookieConfigurer = ({
+ callbackUrl,
+ providerId,
+ }) => {
+ const { pathname } = new URL(callbackUrl);
+ const path = pathname.endsWith(`${providerId}/handler/frame`)
+ ? pathname.slice(0, -'/handler/frame'.length)
+ : `${pathname}/${providerId}`;
+ return {
+ path: path,
+ secure: false,
+ sameSite: 'lax',
+ };
+ };
+ const agent = request.agent(
+ wrapInApp(
+ createOAuthRouteHandlers({
+ ...baseConfig,
+ cookieConfigurer: customCookieConfigurer,
+ }),
+ ),
+ );
+
+ agent.jar.setCookie(
+ 'my-provider-nonce=123',
+ '127.0.0.1',
+ '/my-provider/handler',
+ );
+
+ mockAuthenticator.authenticate.mockResolvedValue({
+ fullProfile: { id: 'id' } as PassportProfile,
+ session: {
+ ...mockSession,
+ refreshToken: fiveKilobyteRefreshToken,
+ },
+ });
+
+ // Simulate 8.5KB token (3-chunks) that should be replaced with 5KB token (2-chunks)
+ agent.jar.setCookie(
+ `my-provider-refresh-token-0=${extractTokenStringSlice(
+ eightAndAHalfKilobyteRefreshToken,
+ 0,
+ )}`,
+ '127.0.0.1',
+ '/my-provider',
+ );
+ agent.jar.setCookie(
+ `my-provider-refresh-token-1=${extractTokenStringSlice(
+ eightAndAHalfKilobyteRefreshToken,
+ 1,
+ )}`,
+ '127.0.0.1',
+ '/my-provider',
+ );
+ agent.jar.setCookie(
+ `my-provider-refresh-token-2=${extractTokenStringSlice(
+ eightAndAHalfKilobyteRefreshToken,
+ 2,
+ )}`,
+ '127.0.0.1',
+ '/my-provider',
+ );
+
+ const res = await agent.get('/my-provider/handler/frame').query({
+ state: encodeOAuthState({
+ env: 'development',
+ nonce: '123',
+ } as OAuthState),
+ });
+
+ expect(mockAuthenticator.authenticate).toHaveBeenCalledWith(
+ { req: expect.anything() },
+ { ctx: 'authenticator' },
+ );
+
+ expect(res.status).toBe(200);
+ expect(parseWebMessageResponse(res.text).response).toEqual({
+ type: 'authorization_response',
+ response: {
+ profile: {},
+ providerInfo: {
+ accessToken: 'access-token',
+ expiresInSeconds: 3,
+ idToken: 'id-token',
+ scope: 'my-scope',
+ },
+ },
+ });
+
+ expect(getRefreshTokenCookie(agent, 0).value).toBe(
+ extractTokenStringSlice(fiveKilobyteRefreshToken, 0),
+ );
+ expect(getRefreshTokenCookie(agent, 1).value).toBe(
+ extractTokenStringSlice(fiveKilobyteRefreshToken, 1),
+ );
+ // verify that the old chunked cookie 2 is cleaned up
+ expect(getRefreshTokenCookie(agent, 2)).toBeUndefined();
+
+ // verify that deletion was ordered for old chunked cookies
+ expect(
+ confirmRefreshTokenCookieDeletion(res, {
+ chunkNumber: 0,
+ domain: false,
+ }),
+ ).toBe(true);
+ expect(
+ confirmRefreshTokenCookieDeletion(res, {
+ chunkNumber: 1,
+ domain: false,
+ }),
+ ).toBe(true);
+ expect(
+ confirmRefreshTokenCookieDeletion(res, {
+ chunkNumber: 2,
+ domain: false,
+ }),
+ ).toBe(true);
+
+ expect(getGrantedScopesCookie(agent)).toBeUndefined();
+ });
+
it('should clean up old cookies (non-chunked) with domain attribute during migration', async () => {
const agent = request.agent(
wrapInApp(createOAuthRouteHandlers(baseConfig)),
@@ -367,15 +527,9 @@ describe('createOAuthRouteHandlers', () => {
});
expect(res.status).toBe(200);
-
- const setCookieHeaders = [res.get('Set-Cookie') ?? []].flat();
- const hasDeleteWithDomain = setCookieHeaders.some(
- cookie =>
- cookie.includes('my-provider-refresh-token=;') &&
- cookie.includes('Max-Age=0') &&
- cookie.includes('Domain=127.0.0.1'),
- );
- expect(hasDeleteWithDomain).toBe(true);
+ expect(
+ confirmRefreshTokenCookieDeletion(res, { domain: '127.0.0.1' }),
+ ).toBe(true);
expect(getRefreshTokenCookie(agent).value).toBe('refresh-token');
});
@@ -393,16 +547,19 @@ describe('createOAuthRouteHandlers', () => {
// Simulate old chunked cookies with domain attribute (legacy format)
agent.jar.setCookie(
- `my-provider-refresh-token-0=${fiveKilobyteRefreshToken.slice(
+ `my-provider-refresh-token-0=${extractTokenStringSlice(
+ fiveKilobyteRefreshToken,
0,
- 4000,
- )}; Domain=127.0.0.1`,
+ )}`,
+ '127.0.0.1',
'/my-provider',
);
agent.jar.setCookie(
- `my-provider-refresh-token-1=${fiveKilobyteRefreshToken.slice(
- 4000,
- )}; Domain=127.0.0.1`,
+ `my-provider-refresh-token-1=${extractTokenStringSlice(
+ fiveKilobyteRefreshToken,
+ 1,
+ )}`,
+ '127.0.0.1',
'/my-provider',
);
@@ -423,28 +580,24 @@ describe('createOAuthRouteHandlers', () => {
expect(res.status).toBe(200);
- const setCookieHeaders = [res.get('Set-Cookie') ?? []].flat();
- const hasChunk0DeleteWithDomain = setCookieHeaders.some(
- cookie =>
- cookie.includes('my-provider-refresh-token-0=') &&
- cookie.includes('Max-Age=0') &&
- cookie.includes('Domain=127.0.0.1'),
- );
- const hasChunk1DeleteWithDomain = setCookieHeaders.some(
- cookie =>
- cookie.includes('my-provider-refresh-token-1=') &&
- cookie.includes('Max-Age=0') &&
- cookie.includes('Domain=127.0.0.1'),
- );
-
- expect(hasChunk0DeleteWithDomain).toBe(true);
- expect(hasChunk1DeleteWithDomain).toBe(true);
+ expect(
+ confirmRefreshTokenCookieDeletion(res, {
+ chunkNumber: 0,
+ domain: '127.0.0.1',
+ }),
+ ).toBe(true);
+ expect(
+ confirmRefreshTokenCookieDeletion(res, {
+ chunkNumber: 1,
+ domain: '127.0.0.1',
+ }),
+ ).toBe(true);
expect(getRefreshTokenCookie(agent, 0).value).toBe(
- fiveKilobyteRefreshToken.slice(0, 4000),
+ extractTokenStringSlice(fiveKilobyteRefreshToken, 0),
);
expect(getRefreshTokenCookie(agent, 1).value).toBe(
- fiveKilobyteRefreshToken.slice(4000),
+ extractTokenStringSlice(fiveKilobyteRefreshToken, 1),
);
});
@@ -460,16 +613,19 @@ describe('createOAuthRouteHandlers', () => {
);
agent.jar.setCookie(
- `my-provider-refresh-token-0=${fiveKilobyteRefreshToken.slice(
+ `my-provider-refresh-token-0=${extractTokenStringSlice(
+ fiveKilobyteRefreshToken,
0,
- 4000,
)}; Domain=127.0.0.1`,
+ '127.0.0.1',
'/my-provider',
);
agent.jar.setCookie(
- `my-provider-refresh-token-1=${fiveKilobyteRefreshToken.slice(
- 4000,
+ `my-provider-refresh-token-1=${extractTokenStringSlice(
+ fiveKilobyteRefreshToken,
+ 1,
)}; Domain=127.0.0.1`,
+ '127.0.0.1',
'/my-provider',
);
@@ -487,22 +643,18 @@ describe('createOAuthRouteHandlers', () => {
expect(res.status).toBe(200);
- const setCookieHeaders = [res.get('Set-Cookie') ?? []].flat();
- const hasChunk0DeleteWithDomain = setCookieHeaders.some(
- cookie =>
- cookie.includes('my-provider-refresh-token-0=;') &&
- cookie.includes('Max-Age=0') &&
- cookie.includes('Domain=127.0.0.1'),
- );
- const hasChunk1DeleteWithDomain = setCookieHeaders.some(
- cookie =>
- cookie.includes('my-provider-refresh-token-1=;') &&
- cookie.includes('Max-Age=0') &&
- cookie.includes('Domain=127.0.0.1'),
- );
-
- expect(hasChunk0DeleteWithDomain).toBe(true);
- expect(hasChunk1DeleteWithDomain).toBe(true);
+ expect(
+ confirmRefreshTokenCookieDeletion(res, {
+ chunkNumber: 0,
+ domain: false,
+ }),
+ ).toBe(true);
+ expect(
+ confirmRefreshTokenCookieDeletion(res, {
+ chunkNumber: 1,
+ domain: false,
+ }),
+ ).toBe(true);
expect(getRefreshTokenCookie(agent).value).toBe('refresh-token');
expect(getRefreshTokenCookie(agent, 0)).toBeUndefined();
@@ -804,15 +956,18 @@ describe('createOAuthRouteHandlers', () => {
);
agent.jar.setCookie(
- `my-provider-refresh-token-0=${fiveKilobyteRefreshToken.slice(
+ `my-provider-refresh-token-0=${extractTokenStringSlice(
+ fiveKilobyteRefreshToken,
0,
- 4000,
)}`,
'127.0.0.1',
'/my-provider',
);
agent.jar.setCookie(
- `my-provider-refresh-token-1=${fiveKilobyteRefreshToken.slice(4000)}`,
+ `my-provider-refresh-token-1=${extractTokenStringSlice(
+ fiveKilobyteRefreshToken,
+ 1,
+ )}`,
'127.0.0.1',
'/my-provider',
);
diff --git a/plugins/auth-react/CHANGELOG.md b/plugins/auth-react/CHANGELOG.md
index 6a92a82a99..8d5ee31f64 100644
--- a/plugins/auth-react/CHANGELOG.md
+++ b/plugins/auth-react/CHANGELOG.md
@@ -1,5 +1,13 @@
# @backstage/plugin-auth-react
+## 0.1.22
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-components@0.18.4
+ - @backstage/core-plugin-api@1.12.1
+
## 0.1.22-next.0
### Patch Changes
diff --git a/plugins/auth-react/package.json b/plugins/auth-react/package.json
index 7348245f87..3a11292642 100644
--- a/plugins/auth-react/package.json
+++ b/plugins/auth-react/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth-react",
- "version": "0.1.22-next.0",
+ "version": "0.1.22",
"description": "Web library for the auth plugin",
"backstage": {
"role": "web-library",
diff --git a/plugins/auth/CHANGELOG.md b/plugins/auth/CHANGELOG.md
index 7c66e1b692..f402cffbd3 100644
--- a/plugins/auth/CHANGELOG.md
+++ b/plugins/auth/CHANGELOG.md
@@ -1,5 +1,14 @@
# @backstage/plugin-auth
+## 0.1.3
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.13.2
+ - @backstage/core-components@0.18.4
+ - @backstage/theme@0.7.1
+
## 0.1.3-next.0
### Patch Changes
diff --git a/plugins/auth/package.json b/plugins/auth/package.json
index 77412a3c05..629d00efa9 100644
--- a/plugins/auth/package.json
+++ b/plugins/auth/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth",
- "version": "0.1.3-next.0",
+ "version": "0.1.3",
"backstage": {
"role": "frontend-plugin",
"pluginId": "auth",
diff --git a/plugins/bitbucket-cloud-common/CHANGELOG.md b/plugins/bitbucket-cloud-common/CHANGELOG.md
index 0f6425b00b..2eb6fd31b6 100644
--- a/plugins/bitbucket-cloud-common/CHANGELOG.md
+++ b/plugins/bitbucket-cloud-common/CHANGELOG.md
@@ -1,5 +1,33 @@
# @backstage/plugin-bitbucket-cloud-common
+## 0.3.5
+
+### Patch Changes
+
+- 37fba1d: Added support for Bitbucket Cloud OAuth. This introduces an alternative authentication method using a workspace OAuth consumer, alongside App Passwords (deprecated) and API tokens. OAuth does not require a bot or service account and avoids token expiry issues.
+
+ **BREAKING CHANGES**
+
+ - **@backstage/integration** (`src/bitbucketCloud/core.ts`)
+
+ - `getBitbucketCloudRequestOptions` now returns a `Promise` and **must** be awaited.
+
+ - **@backstage/plugin-scaffolder-backend-module-bitbucket-cloud** (`src/actions/helpers.ts`)
+ - `getBitbucketClient` now returns a `Promise` and **must** be awaited.
+ - `getAuthorizationHeader` now returns a `Promise` and **must** be awaited.
+
+ **OAuth usage example**
+
+ ```yaml
+ integrations:
+ bitbucketCloud:
+ - clientId: client-id
+ clientSecret: client-secret
+ ```
+
+- Updated dependencies
+ - @backstage/integration@1.19.0
+
## 0.3.5-next.0
### Patch Changes
diff --git a/plugins/bitbucket-cloud-common/package.json b/plugins/bitbucket-cloud-common/package.json
index 354b2ad31c..ac47687ae3 100644
--- a/plugins/bitbucket-cloud-common/package.json
+++ b/plugins/bitbucket-cloud-common/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-bitbucket-cloud-common",
- "version": "0.3.5-next.0",
+ "version": "0.3.5",
"description": "Common functionalities for bitbucket-cloud plugins",
"backstage": {
"role": "common-library",
diff --git a/plugins/bitbucket-cloud-common/src/BitbucketCloudClient.ts b/plugins/bitbucket-cloud-common/src/BitbucketCloudClient.ts
index adbf08cf40..eb40b51b5b 100644
--- a/plugins/bitbucket-cloud-common/src/BitbucketCloudClient.ts
+++ b/plugins/bitbucket-cloud-common/src/BitbucketCloudClient.ts
@@ -14,7 +14,10 @@
* limitations under the License.
*/
-import { BitbucketCloudIntegrationConfig } from '@backstage/integration';
+import {
+ BitbucketCloudIntegrationConfig,
+ getBitbucketCloudOAuthToken,
+} from '@backstage/integration';
import fetch, { Request } from 'cross-fetch';
import { Models } from './models';
import { WithPagination } from './pagination';
@@ -139,22 +142,32 @@ export class BitbucketCloudClient {
}
private async request(req: Request): Promise {
- return fetch(req, { headers: this.getAuthHeaders() }).then(
- (response: Response) => {
- if (!response.ok) {
- throw new Error(
- `Unexpected response for ${req.method} ${req.url}. Expected 200 but got ${response.status} - ${response.statusText}`,
- );
- }
+ const headers = await this.getAuthHeaders();
+ return fetch(req, { headers }).then((response: Response) => {
+ if (!response.ok) {
+ throw new Error(
+ `Unexpected response for ${req.method} ${req.url}. Expected 200 but got ${response.status} - ${response.statusText}`,
+ );
+ }
- return response;
- },
- );
+ return response;
+ });
}
- private getAuthHeaders(): Record {
+ private async getAuthHeaders(): Promise> {
const headers: Record = {};
+ // OAuth authentication (clientId/clientSecret)
+ if (this.config.clientId && this.config.clientSecret) {
+ const token = await getBitbucketCloudOAuthToken(
+ this.config.clientId,
+ this.config.clientSecret,
+ );
+ headers.Authorization = `Bearer ${token}`;
+ return headers;
+ }
+
+ // Basic authentication (username/token or username/appPassword)
if (
this.config.username &&
(this.config.token ?? this.config.appPassword)
diff --git a/plugins/catalog-backend-module-aws/CHANGELOG.md b/plugins/catalog-backend-module-aws/CHANGELOG.md
index b720e047e8..aae01344ed 100644
--- a/plugins/catalog-backend-module-aws/CHANGELOG.md
+++ b/plugins/catalog-backend-module-aws/CHANGELOG.md
@@ -1,5 +1,48 @@
# @backstage/plugin-catalog-backend-module-aws
+## 0.4.19-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-defaults@0.14.1-next.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/integration@1.19.0
+ - @backstage/integration-aws-node@0.1.19
+ - @backstage/plugin-catalog-common@1.1.7
+ - @backstage/plugin-catalog-node@1.20.1
+ - @backstage/plugin-kubernetes-common@0.9.9
+
+## 0.4.18
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/backend-defaults@0.14.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-kubernetes-common@0.9.9
+ - @backstage/plugin-catalog-node@1.20.1
+
+## 0.4.18-next.2
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-defaults@0.14.0-next.1
+ - @backstage/integration@1.18.3-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/integration-aws-node@0.1.19
+ - @backstage/plugin-catalog-common@1.1.7
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+ - @backstage/plugin-kubernetes-common@0.9.9-next.0
+
## 0.4.18-next.1
### Patch Changes
diff --git a/plugins/catalog-backend-module-aws/package.json b/plugins/catalog-backend-module-aws/package.json
index 61ce045f5a..fe0ce05994 100644
--- a/plugins/catalog-backend-module-aws/package.json
+++ b/plugins/catalog-backend-module-aws/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-backend-module-aws",
- "version": "0.4.18-next.1",
+ "version": "0.4.19-next.0",
"description": "A Backstage catalog backend module that helps integrate towards AWS",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-azure/CHANGELOG.md b/plugins/catalog-backend-module-azure/CHANGELOG.md
index 88e6e91ca1..aa61bd3b04 100644
--- a/plugins/catalog-backend-module-azure/CHANGELOG.md
+++ b/plugins/catalog-backend-module-azure/CHANGELOG.md
@@ -1,5 +1,25 @@
# @backstage/plugin-catalog-backend-module-azure
+## 0.3.12
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-catalog-node@1.20.1
+
+## 0.3.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.18.3-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/plugin-catalog-common@1.1.7
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+
## 0.3.12-next.0
### Patch Changes
diff --git a/plugins/catalog-backend-module-azure/package.json b/plugins/catalog-backend-module-azure/package.json
index bea8d358d7..802d80077b 100644
--- a/plugins/catalog-backend-module-azure/package.json
+++ b/plugins/catalog-backend-module-azure/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-backend-module-azure",
- "version": "0.3.12-next.0",
+ "version": "0.3.12",
"description": "A Backstage catalog backend module that helps integrate towards Azure",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-backstage-openapi/CHANGELOG.md b/plugins/catalog-backend-module-backstage-openapi/CHANGELOG.md
index 001bb8c816..718dde0ce6 100644
--- a/plugins/catalog-backend-module-backstage-openapi/CHANGELOG.md
+++ b/plugins/catalog-backend-module-backstage-openapi/CHANGELOG.md
@@ -1,5 +1,38 @@
# @backstage/plugin-catalog-backend-module-backstage-openapi
+## 0.5.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-openapi-utils@0.6.5-next.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/plugin-catalog-node@1.20.1
+
+## 0.5.9
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-openapi-utils@0.6.4
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-catalog-node@1.20.1
+
+## 0.5.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-openapi-utils@0.6.4-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+
## 0.5.9-next.0
### Patch Changes
diff --git a/plugins/catalog-backend-module-backstage-openapi/package.json b/plugins/catalog-backend-module-backstage-openapi/package.json
index 5045026df4..9eb50da0bf 100644
--- a/plugins/catalog-backend-module-backstage-openapi/package.json
+++ b/plugins/catalog-backend-module-backstage-openapi/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-backend-module-backstage-openapi",
- "version": "0.5.9-next.0",
+ "version": "0.5.10-next.0",
"backstage": {
"role": "backend-plugin-module",
"pluginId": "catalog",
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md b/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md
index e34fb75316..52b988de1c 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md
+++ b/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md
@@ -1,5 +1,30 @@
# @backstage/plugin-catalog-backend-module-bitbucket-cloud
+## 0.5.6
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/plugin-bitbucket-cloud-common@0.3.5
+ - @backstage/plugin-events-node@0.4.18
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-catalog-node@1.20.1
+
+## 0.5.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18-next.1
+ - @backstage/integration@1.18.3-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/plugin-bitbucket-cloud-common@0.3.5-next.0
+ - @backstage/plugin-catalog-common@1.1.7
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+
## 0.5.6-next.0
### Patch Changes
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/package.json b/plugins/catalog-backend-module-bitbucket-cloud/package.json
index 02b677cffb..acc69c594e 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/package.json
+++ b/plugins/catalog-backend-module-bitbucket-cloud/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-backend-module-bitbucket-cloud",
- "version": "0.5.6-next.0",
+ "version": "0.5.6",
"description": "A Backstage catalog backend module that helps integrate towards Bitbucket Cloud",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md b/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md
index 96c75fb09d..8e3144e659 100644
--- a/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md
+++ b/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md
@@ -1,5 +1,29 @@
# @backstage/plugin-catalog-backend-module-bitbucket-server
+## 0.5.6
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/plugin-events-node@0.4.18
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-catalog-node@1.20.1
+
+## 0.5.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18-next.1
+ - @backstage/integration@1.18.3-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/plugin-catalog-common@1.1.7
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+
## 0.5.6-next.0
### Patch Changes
diff --git a/plugins/catalog-backend-module-bitbucket-server/package.json b/plugins/catalog-backend-module-bitbucket-server/package.json
index c026aaa869..ea4601e9c0 100644
--- a/plugins/catalog-backend-module-bitbucket-server/package.json
+++ b/plugins/catalog-backend-module-bitbucket-server/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-backend-module-bitbucket-server",
- "version": "0.5.6-next.0",
+ "version": "0.5.6",
"backstage": {
"role": "backend-plugin-module",
"pluginId": "catalog",
diff --git a/plugins/catalog-backend-module-gcp/CHANGELOG.md b/plugins/catalog-backend-module-gcp/CHANGELOG.md
index f660d65434..5102f3266f 100644
--- a/plugins/catalog-backend-module-gcp/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gcp/CHANGELOG.md
@@ -1,5 +1,25 @@
# @backstage/plugin-catalog-backend-module-gcp
+## 0.3.15
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-kubernetes-common@0.9.9
+ - @backstage/plugin-catalog-node@1.20.1
+
+## 0.3.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+ - @backstage/plugin-kubernetes-common@0.9.9-next.0
+
## 0.3.15-next.1
### Patch Changes
diff --git a/plugins/catalog-backend-module-gcp/package.json b/plugins/catalog-backend-module-gcp/package.json
index d50fa3baeb..620c35c84f 100644
--- a/plugins/catalog-backend-module-gcp/package.json
+++ b/plugins/catalog-backend-module-gcp/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-backend-module-gcp",
- "version": "0.3.15-next.1",
+ "version": "0.3.15",
"description": "A Backstage catalog backend module that helps integrate towards GCP",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-gcp/src/providers/__snapshots__/GkeEntityProvider.test.ts.snap b/plugins/catalog-backend-module-gcp/src/providers/__snapshots__/GkeEntityProvider.test.ts.snap
index c903bcd192..18fd9b58ce 100644
--- a/plugins/catalog-backend-module-gcp/src/providers/__snapshots__/GkeEntityProvider.test.ts.snap
+++ b/plugins/catalog-backend-module-gcp/src/providers/__snapshots__/GkeEntityProvider.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
exports[`GkeEntityProvider should return clusters as Resources 1`] = `
[MockFunction] {
diff --git a/plugins/catalog-backend-module-gerrit/CHANGELOG.md b/plugins/catalog-backend-module-gerrit/CHANGELOG.md
index d1493a5d34..ff8c27cbab 100644
--- a/plugins/catalog-backend-module-gerrit/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gerrit/CHANGELOG.md
@@ -1,5 +1,26 @@
# @backstage/plugin-catalog-backend-module-gerrit
+## 0.3.9
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-catalog-node@1.20.1
+
+## 0.3.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.18.3-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/plugin-catalog-common@1.1.7
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+
## 0.3.9-next.0
### Patch Changes
diff --git a/plugins/catalog-backend-module-gerrit/package.json b/plugins/catalog-backend-module-gerrit/package.json
index dbf1929bc8..4a336802e8 100644
--- a/plugins/catalog-backend-module-gerrit/package.json
+++ b/plugins/catalog-backend-module-gerrit/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-backend-module-gerrit",
- "version": "0.3.9-next.0",
+ "version": "0.3.9",
"backstage": {
"role": "backend-plugin-module",
"pluginId": "catalog",
diff --git a/plugins/catalog-backend-module-gitea/CHANGELOG.md b/plugins/catalog-backend-module-gitea/CHANGELOG.md
index 0e3ec28314..fa4ed4f98e 100644
--- a/plugins/catalog-backend-module-gitea/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gitea/CHANGELOG.md
@@ -1,5 +1,26 @@
# @backstage/plugin-catalog-backend-module-gitea
+## 0.1.7
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-catalog-node@1.20.1
+
+## 0.1.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.18.3-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/plugin-catalog-common@1.1.7
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+
## 0.1.7-next.0
### Patch Changes
diff --git a/plugins/catalog-backend-module-gitea/package.json b/plugins/catalog-backend-module-gitea/package.json
index f4dacc1e06..1077d3d050 100644
--- a/plugins/catalog-backend-module-gitea/package.json
+++ b/plugins/catalog-backend-module-gitea/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-backend-module-gitea",
- "version": "0.1.7-next.0",
+ "version": "0.1.7",
"license": "Apache-2.0",
"description": "The gitea backend module for the catalog plugin.",
"main": "src/index.ts",
diff --git a/plugins/catalog-backend-module-github-org/CHANGELOG.md b/plugins/catalog-backend-module-github-org/CHANGELOG.md
index bcd7ad1a94..5d084a5159 100644
--- a/plugins/catalog-backend-module-github-org/CHANGELOG.md
+++ b/plugins/catalog-backend-module-github-org/CHANGELOG.md
@@ -1,5 +1,31 @@
# @backstage/plugin-catalog-backend-module-github-org
+## 0.3.17
+
+### Patch Changes
+
+- ed5a7a3: Introduce new configuration option to exclude suspended users from GitHub Enterprise instances.
+
+ When it’s set to true, suspended users won’t be returned when querying the organization users for GitHub Enterprise instances.
+ Note that this option should be used only against GitHub Enterprise instances, the property does not exist in the github.com GraphQL schema, setting it will cause a schema validation error and the syncing of users will fail.
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18
+ - @backstage/plugin-catalog-backend-module-github@0.12.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-catalog-node@1.20.1
+
+## 0.3.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/plugin-catalog-backend-module-github@0.11.3-next.2
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+
## 0.3.17-next.1
### Patch Changes
diff --git a/plugins/catalog-backend-module-github-org/package.json b/plugins/catalog-backend-module-github-org/package.json
index 1f9f085dcb..d37a8c7a6e 100644
--- a/plugins/catalog-backend-module-github-org/package.json
+++ b/plugins/catalog-backend-module-github-org/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-backend-module-github-org",
- "version": "0.3.17-next.1",
+ "version": "0.3.17",
"description": "The github-org backend module for the catalog plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-github/CHANGELOG.md b/plugins/catalog-backend-module-github/CHANGELOG.md
index 8362bf651c..4be66e6d20 100644
--- a/plugins/catalog-backend-module-github/CHANGELOG.md
+++ b/plugins/catalog-backend-module-github/CHANGELOG.md
@@ -1,5 +1,38 @@
# @backstage/plugin-catalog-backend-module-github
+## 0.12.0
+
+### Minor Changes
+
+- b3286d5: Added the `github.com/user-id` annotation to store GitHub's user ID (immutable) in user entities. Also includes addition of the `userIdMatchingUserEntityAnnotation` sign-in resolver that matches users by the new ID.
+
+### Patch Changes
+
+- ed5a7a3: Introduce new configuration option to exclude suspended users from GitHub Enterprise instances.
+
+ When it’s set to true, suspended users won’t be returned when querying the organization users for GitHub Enterprise instances.
+ Note that this option should be used only against GitHub Enterprise instances, the property does not exist in the github.com GraphQL schema, setting it will cause a schema validation error and the syncing of users will fail.
+
+- a413977: Added configurable `pageSizes` option to `GithubOrgEntityProvider` for GitHub GraphQL API queries to prevent `RESOURCE_LIMITS_EXCEEDED` errors with organizations with large number of teams and members. This aligns the configuration options with `GithubMultiOrgEntityProvider`.
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/plugin-events-node@0.4.18
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-catalog-node@1.20.1
+
+## 0.11.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18-next.1
+ - @backstage/integration@1.18.3-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/plugin-catalog-common@1.1.7
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+
## 0.11.3-next.1
### Patch Changes
diff --git a/plugins/catalog-backend-module-github/package.json b/plugins/catalog-backend-module-github/package.json
index 8fc3f9f919..b37546ca00 100644
--- a/plugins/catalog-backend-module-github/package.json
+++ b/plugins/catalog-backend-module-github/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-backend-module-github",
- "version": "0.11.3-next.1",
+ "version": "0.12.0",
"description": "A Backstage catalog backend module that helps integrate towards GitHub",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-github/report.api.md b/plugins/catalog-backend-module-github/report.api.md
index 5f140a0d5e..25fc58be79 100644
--- a/plugins/catalog-backend-module-github/report.api.md
+++ b/plugins/catalog-backend-module-github/report.api.md
@@ -229,6 +229,7 @@ export class GithubOrgEntityProvider implements EntityProvider {
githubCredentialsProvider?: GithubCredentialsProvider;
userTransformer?: UserTransformer;
teamTransformer?: TeamTransformer;
+ pageSizes?: Partial;
excludeSuspendedUsers?: boolean;
});
connect(connection: EntityProviderConnection): Promise;
@@ -252,6 +253,7 @@ export interface GithubOrgEntityProviderOptions {
id: string;
logger: LoggerService;
orgUrl: string;
+ pageSizes?: Partial;
schedule?: 'manual' | SchedulerServiceTaskRunner;
teamTransformer?: TeamTransformer;
userTransformer?: UserTransformer;
@@ -305,6 +307,7 @@ export type GithubTeam = {
// @public
export type GithubUser = {
login: string;
+ id?: string;
bio?: string;
avatarUrl?: string;
email?: string;
diff --git a/plugins/catalog-backend-module-github/src/lib/annotation.ts b/plugins/catalog-backend-module-github/src/lib/annotation.ts
index 4db6ffb975..2d06388d65 100644
--- a/plugins/catalog-backend-module-github/src/lib/annotation.ts
+++ b/plugins/catalog-backend-module-github/src/lib/annotation.ts
@@ -35,3 +35,13 @@ export const ANNOTATION_GITHUB_USER_LOGIN = 'github.com/user-login';
* @public
*/
export const ANNOTATION_GITHUB_TEAM_SLUG = 'github.com/team-slug';
+
+/**
+ * The value of this annotation is the unique identifier for a user on
+ * [GitHub](https://github.com) (either the public one, or a private GitHub
+ * Enterprise installation) that is related to this entity. This is a stable
+ * identifier that persists even if the user changes their login name.
+ *
+ * @public
+ */
+export const ANNOTATION_GITHUB_USER_ID = 'github.com/user-id';
diff --git a/plugins/catalog-backend-module-github/src/lib/defaultTransformers.ts b/plugins/catalog-backend-module-github/src/lib/defaultTransformers.ts
index 6befd32056..4de9af89c8 100644
--- a/plugins/catalog-backend-module-github/src/lib/defaultTransformers.ts
+++ b/plugins/catalog-backend-module-github/src/lib/defaultTransformers.ts
@@ -19,6 +19,7 @@ import { graphql } from '@octokit/graphql';
import {
ANNOTATION_GITHUB_TEAM_SLUG,
ANNOTATION_GITHUB_USER_LOGIN,
+ ANNOTATION_GITHUB_USER_ID,
} from './annotation';
import { GithubTeam, GithubUser } from './github';
@@ -69,6 +70,7 @@ export const defaultUserTransformer = async (
name: item.login,
annotations: {
[ANNOTATION_GITHUB_USER_LOGIN]: item.login,
+ ...(item.id && { [ANNOTATION_GITHUB_USER_ID]: item.id }),
},
},
spec: {
diff --git a/plugins/catalog-backend-module-github/src/lib/github.ts b/plugins/catalog-backend-module-github/src/lib/github.ts
index bd77df4da7..0690ca125b 100644
--- a/plugins/catalog-backend-module-github/src/lib/github.ts
+++ b/plugins/catalog-backend-module-github/src/lib/github.ts
@@ -112,6 +112,7 @@ export type GithubOrg = {
*/
export type GithubUser = {
login: string;
+ id?: string;
bio?: string;
avatarUrl?: string;
email?: string;
@@ -202,6 +203,7 @@ export async function getOrganizationUsers(
avatarUrl,
bio,
email @include(if: $email),
+ id,
login,
name,
${suspendedAtField}
@@ -268,6 +270,7 @@ export async function getOrganizationTeams(
avatarUrl,
bio,
email,
+ id,
login,
name,
organizationVerifiedDomainEmails(login: $org)
@@ -362,6 +365,7 @@ export async function getOrganizationTeamsFromUsers(
avatarUrl,
bio,
email,
+ id,
login,
name,
organizationVerifiedDomainEmails(login: $org)
diff --git a/plugins/catalog-backend-module-github/src/lib/index.ts b/plugins/catalog-backend-module-github/src/lib/index.ts
index ac73430d33..48050e96bb 100644
--- a/plugins/catalog-backend-module-github/src/lib/index.ts
+++ b/plugins/catalog-backend-module-github/src/lib/index.ts
@@ -38,3 +38,8 @@ export {
buildOrgHierarchy,
} from './org';
export { parseGithubOrgUrl } from './util';
+export {
+ ANNOTATION_GITHUB_USER_LOGIN,
+ ANNOTATION_GITHUB_TEAM_SLUG,
+ ANNOTATION_GITHUB_USER_ID,
+} from './annotation';
diff --git a/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.test.ts b/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.test.ts
index 1aa1af46d7..e80579ee36 100644
--- a/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.test.ts
+++ b/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.test.ts
@@ -94,6 +94,7 @@ describe('GithubMultiOrgEntityProvider', () => {
nodes: [
{
login: 'a',
+ id: 'f',
name: 'b',
bio: 'c',
email: 'd',
@@ -101,6 +102,7 @@ describe('GithubMultiOrgEntityProvider', () => {
},
{
login: 'x',
+ id: 'g',
name: 'y',
bio: 'z',
email: 'w',
@@ -128,7 +130,10 @@ describe('GithubMultiOrgEntityProvider', () => {
},
members: {
pageInfo: { hasNextPage: false },
- nodes: [{ login: 'a' }, { login: 'x' }],
+ nodes: [
+ { login: 'a', id: 'f' },
+ { login: 'x', id: 'g' },
+ ],
},
},
],
@@ -156,6 +161,7 @@ describe('GithubMultiOrgEntityProvider', () => {
},
{
login: 'q',
+ id: 'h',
name: 'r',
bio: 's',
email: 't',
@@ -183,7 +189,10 @@ describe('GithubMultiOrgEntityProvider', () => {
},
members: {
pageInfo: { hasNextPage: false },
- nodes: [{ login: 'a' }, { login: 'q' }],
+ nodes: [
+ { login: 'a', id: 'f' },
+ { login: 'q', id: 'h' },
+ ],
},
},
],
@@ -215,6 +224,7 @@ describe('GithubMultiOrgEntityProvider', () => {
'backstage.io/managed-by-origin-location':
'url:https://github.com/a',
'github.com/user-login': 'a',
+ 'github.com/user-id': 'f',
},
description: 'c',
name: 'a',
@@ -241,6 +251,7 @@ describe('GithubMultiOrgEntityProvider', () => {
'backstage.io/managed-by-origin-location':
'url:https://github.com/x',
'github.com/user-login': 'x',
+ 'github.com/user-id': 'g',
},
description: 'z',
name: 'x',
@@ -267,6 +278,7 @@ describe('GithubMultiOrgEntityProvider', () => {
'backstage.io/managed-by-origin-location':
'url:https://github.com/q',
'github.com/user-login': 'q',
+ 'github.com/user-id': 'h',
},
description: 's',
name: 'q',
@@ -382,6 +394,7 @@ describe('GithubMultiOrgEntityProvider', () => {
nodes: [
{
login: 'a',
+ id: 'f',
name: 'b',
bio: 'c',
email: 'd',
@@ -389,6 +402,7 @@ describe('GithubMultiOrgEntityProvider', () => {
},
{
login: 'x',
+ id: 'g',
name: 'y',
bio: 'z',
email: 'w',
@@ -416,7 +430,10 @@ describe('GithubMultiOrgEntityProvider', () => {
},
members: {
pageInfo: { hasNextPage: false },
- nodes: [{ login: 'a' }, { login: 'x' }],
+ nodes: [
+ { login: 'a', id: 'f' },
+ { login: 'x', id: 'g' },
+ ],
},
},
],
@@ -444,6 +461,7 @@ describe('GithubMultiOrgEntityProvider', () => {
},
{
login: 'q',
+ id: 'h',
name: 'r',
bio: 's',
email: 't',
@@ -471,7 +489,10 @@ describe('GithubMultiOrgEntityProvider', () => {
},
members: {
pageInfo: { hasNextPage: false },
- nodes: [{ login: 'a' }, { login: 'q' }],
+ nodes: [
+ { login: 'a', id: 'f' },
+ { login: 'q', id: 'h' },
+ ],
},
},
],
@@ -517,6 +538,7 @@ describe('GithubMultiOrgEntityProvider', () => {
'backstage.io/managed-by-origin-location':
'url:https://github.com/a',
'github.com/user-login': 'a',
+ 'github.com/user-id': 'f',
},
description: 'c',
name: 'a',
@@ -543,6 +565,7 @@ describe('GithubMultiOrgEntityProvider', () => {
'backstage.io/managed-by-origin-location':
'url:https://github.com/x',
'github.com/user-login': 'x',
+ 'github.com/user-id': 'g',
},
description: 'z',
name: 'x',
@@ -569,6 +592,7 @@ describe('GithubMultiOrgEntityProvider', () => {
'backstage.io/managed-by-origin-location':
'url:https://github.com/q',
'github.com/user-login': 'q',
+ 'github.com/user-id': 'h',
},
description: 's',
name: 'q',
@@ -656,6 +680,7 @@ describe('GithubMultiOrgEntityProvider', () => {
nodes: [
{
login: 'a',
+ id: 'f',
name: 'b',
bio: 'c',
email: 'd',
@@ -663,6 +688,7 @@ describe('GithubMultiOrgEntityProvider', () => {
},
{
login: 'x',
+ id: 'g',
name: 'y',
bio: 'z',
email: 'w',
@@ -690,7 +716,10 @@ describe('GithubMultiOrgEntityProvider', () => {
},
members: {
pageInfo: { hasNextPage: false },
- nodes: [{ login: 'a' }, { login: 'x' }],
+ nodes: [
+ { login: 'a', id: 'f' },
+ { login: 'x', id: 'g' },
+ ],
},
},
],
@@ -718,6 +747,7 @@ describe('GithubMultiOrgEntityProvider', () => {
},
{
login: 'q',
+ id: 'h',
name: 'r',
bio: 's',
email: 't',
@@ -745,7 +775,10 @@ describe('GithubMultiOrgEntityProvider', () => {
},
members: {
pageInfo: { hasNextPage: false },
- nodes: [{ login: 'a' }, { login: 'q' }],
+ nodes: [
+ { login: 'a', id: 'f' },
+ { login: 'q', id: 'h' },
+ ],
},
},
],
@@ -783,6 +816,7 @@ describe('GithubMultiOrgEntityProvider', () => {
'backstage.io/managed-by-origin-location':
'url:https://github.com/a',
'github.com/user-login': 'a',
+ 'github.com/user-id': 'f',
},
description: 'c',
name: 'a',
@@ -809,6 +843,7 @@ describe('GithubMultiOrgEntityProvider', () => {
'backstage.io/managed-by-origin-location':
'url:https://github.com/x',
'github.com/user-login': 'x',
+ 'github.com/user-id': 'g',
},
description: 'z',
name: 'x',
@@ -835,6 +870,7 @@ describe('GithubMultiOrgEntityProvider', () => {
'backstage.io/managed-by-origin-location':
'url:https://github.com/q',
'github.com/user-login': 'q',
+ 'github.com/user-id': 'h',
},
description: 's',
name: 'q',
@@ -1099,6 +1135,7 @@ describe('GithubMultiOrgEntityProvider', () => {
nodes: [
{
login: 'a',
+ id: 'f',
name: 'b',
bio: 'c',
email: 'd',
@@ -1126,7 +1163,7 @@ describe('GithubMultiOrgEntityProvider', () => {
},
members: {
pageInfo: { hasNextPage: false },
- nodes: [{ login: 'a' }],
+ nodes: [{ login: 'a', id: 'f' }],
},
},
],
@@ -1151,7 +1188,7 @@ describe('GithubMultiOrgEntityProvider', () => {
},
members: {
pageInfo: { hasNextPage: false },
- nodes: [{ login: 'a' }],
+ nodes: [{ login: 'a', id: 'f' }],
},
},
],
@@ -1176,7 +1213,7 @@ describe('GithubMultiOrgEntityProvider', () => {
},
members: {
pageInfo: { hasNextPage: false },
- nodes: [{ login: 'a' }],
+ nodes: [{ login: 'a', id: 'f' }],
},
},
],
@@ -1213,6 +1250,7 @@ describe('GithubMultiOrgEntityProvider', () => {
'backstage.io/managed-by-origin-location':
'url:https://github.com/a',
'github.com/user-login': 'a',
+ 'github.com/user-id': 'f',
},
description: 'c',
name: 'a',
@@ -1300,7 +1338,7 @@ describe('GithubMultiOrgEntityProvider', () => {
},
members: {
pageInfo: { hasNextPage: false },
- nodes: [{ login: 'a', name: 'a' }],
+ nodes: [{ login: 'a', id: 'f', name: 'a' }],
},
},
],
@@ -1328,6 +1366,7 @@ describe('GithubMultiOrgEntityProvider', () => {
membership: {
user: {
name: 'a',
+ node_id: 'f',
avatar_url: 'https://avatars.githubusercontent.com/u/83820368',
email: 'user1@test.com',
login: 'a',
@@ -1351,6 +1390,7 @@ describe('GithubMultiOrgEntityProvider', () => {
'backstage.io/managed-by-origin-location':
'url:https://github.com/a',
'github.com/user-login': 'a',
+ 'github.com/user-id': 'f',
},
name: 'a',
},
@@ -1398,6 +1438,7 @@ describe('GithubMultiOrgEntityProvider', () => {
membership: {
user: {
name: 'a',
+ node_id: 'f',
avatar_url: 'https://avatars.githubusercontent.com/u/83820368',
email: 'user1@test.com',
login: 'a',
@@ -1422,6 +1463,7 @@ describe('GithubMultiOrgEntityProvider', () => {
'backstage.io/managed-by-origin-location':
'url:https://github.com/a',
'github.com/user-login': 'a',
+ 'github.com/user-id': 'f',
},
name: 'a',
},
@@ -1473,7 +1515,7 @@ describe('GithubMultiOrgEntityProvider', () => {
},
members: {
pageInfo: { hasNextPage: false },
- nodes: [{ login: 'a', name: 'a' }],
+ nodes: [{ login: 'a', id: 'f', name: 'a' }],
},
},
],
@@ -1493,6 +1535,7 @@ describe('GithubMultiOrgEntityProvider', () => {
membership: {
user: {
name: 'a',
+ node_id: 'f',
avatar_url: 'https://avatars.githubusercontent.com/u/83820368',
email: 'user1@test.com',
login: 'a',
@@ -1516,6 +1559,7 @@ describe('GithubMultiOrgEntityProvider', () => {
'backstage.io/managed-by-origin-location':
'url:https://github.com/a',
'github.com/user-login': 'a',
+ 'github.com/user-id': 'f',
},
name: 'a',
},
@@ -1729,7 +1773,7 @@ describe('GithubMultiOrgEntityProvider', () => {
},
members: {
pageInfo: { hasNextPage: false },
- nodes: [{ login: 'a', name: 'a' }],
+ nodes: [{ login: 'a', id: 'f', name: 'a' }],
},
},
},
@@ -1741,6 +1785,7 @@ describe('GithubMultiOrgEntityProvider', () => {
nodes: [
{
login: 'a',
+ id: 'f',
name: 'b',
bio: 'c',
email: 'd',
@@ -1748,6 +1793,7 @@ describe('GithubMultiOrgEntityProvider', () => {
},
{
login: 'w',
+ id: 'i',
name: 'x',
bio: 'y',
email: 'z',
@@ -1774,7 +1820,7 @@ describe('GithubMultiOrgEntityProvider', () => {
},
members: {
pageInfo: { hasNextPage: false },
- nodes: [{ login: 'a', name: 'a' }],
+ nodes: [{ login: 'a', id: 'f', name: 'a' }],
},
},
],
@@ -1798,7 +1844,7 @@ describe('GithubMultiOrgEntityProvider', () => {
},
members: {
pageInfo: { hasNextPage: false },
- nodes: [{ login: 'a', name: 'a' }],
+ nodes: [{ login: 'a', id: 'f', name: 'a' }],
},
},
],
@@ -1847,6 +1893,7 @@ describe('GithubMultiOrgEntityProvider', () => {
'backstage.io/managed-by-origin-location':
'url:https://github.com/a',
'github.com/user-login': 'a',
+ 'github.com/user-id': 'f',
},
name: 'a',
description: 'c',
@@ -2110,7 +2157,7 @@ describe('GithubMultiOrgEntityProvider', () => {
},
members: {
pageInfo: { hasNextPage: false },
- nodes: [{ login: 'a', name: 'a' }],
+ nodes: [{ login: 'a', id: 'f', name: 'a' }],
},
},
},
@@ -2147,7 +2194,7 @@ describe('GithubMultiOrgEntityProvider', () => {
},
members: {
pageInfo: { hasNextPage: false },
- nodes: [{ login: 'a', name: 'a' }],
+ nodes: [{ login: 'a', id: 'f', name: 'a' }],
},
},
],
@@ -2171,7 +2218,7 @@ describe('GithubMultiOrgEntityProvider', () => {
},
members: {
pageInfo: { hasNextPage: false },
- nodes: [{ login: 'a', name: 'a' }],
+ nodes: [{ login: 'a', id: 'f', name: 'a' }],
},
},
],
@@ -2194,6 +2241,7 @@ describe('GithubMultiOrgEntityProvider', () => {
member: {
name: 'a',
login: 'a',
+ node_id: 'f',
avatar_url: 'https://avatars.githubusercontent.com/u/83820368',
email: 'user1@test.com',
},
@@ -2245,6 +2293,7 @@ describe('GithubMultiOrgEntityProvider', () => {
'backstage.io/managed-by-origin-location':
'url:https://github.com/a',
'github.com/user-login': 'a',
+ 'github.com/user-id': 'f',
},
name: 'a',
},
@@ -2327,7 +2376,7 @@ describe('GithubMultiOrgEntityProvider', () => {
},
members: {
pageInfo: { hasNextPage: false },
- nodes: [{ login: 'a', name: 'a' }],
+ nodes: [{ login: 'a', id: 'f', name: 'a' }],
},
},
],
@@ -2350,6 +2399,7 @@ describe('GithubMultiOrgEntityProvider', () => {
member: {
name: 'a',
login: 'a',
+ node_id: 'f',
avatar_url: 'https://avatars.githubusercontent.com/u/83820368',
email: 'user1@test.com',
},
@@ -2401,6 +2451,7 @@ describe('GithubMultiOrgEntityProvider', () => {
'backstage.io/managed-by-origin-location':
'url:https://github.com/a',
'github.com/user-login': 'a',
+ 'github.com/user-id': 'f',
},
name: 'a',
},
diff --git a/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.ts b/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.ts
index 173da84f58..28d598b5b1 100644
--- a/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.ts
+++ b/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.ts
@@ -531,7 +531,13 @@ export class GithubMultiOrgEntityProvider implements EntityProvider {
const userTransformer =
this.options.userTransformer || defaultUserTransformer;
- const { name, avatar_url: avatarUrl, email, login } = event.membership.user;
+ const {
+ name,
+ avatar_url: avatarUrl,
+ email,
+ login,
+ node_id,
+ } = event.membership.user;
const org = event.organization.login;
const { headers } =
await this.options.githubCredentialsProvider.getCredentials({
@@ -573,6 +579,7 @@ export class GithubMultiOrgEntityProvider implements EntityProvider {
avatarUrl,
login,
email: email ?? undefined,
+ id: node_id,
},
{
org,
@@ -818,13 +825,14 @@ export class GithubMultiOrgEntityProvider implements EntityProvider {
const userTransformer =
this.options.userTransformer || defaultUserTransformer;
- const { name, avatar_url: avatarUrl, email, login } = event.member;
+ const { name, avatar_url: avatarUrl, email, login, node_id } = event.member;
const user = await userTransformer(
{
name,
avatarUrl,
login,
email: email ?? undefined,
+ id: node_id,
},
{
org,
diff --git a/plugins/catalog-backend-module-github/src/providers/GithubOrgEntityProvider.test.ts b/plugins/catalog-backend-module-github/src/providers/GithubOrgEntityProvider.test.ts
index 17fa00b137..9be5a3e161 100644
--- a/plugins/catalog-backend-module-github/src/providers/GithubOrgEntityProvider.test.ts
+++ b/plugins/catalog-backend-module-github/src/providers/GithubOrgEntityProvider.test.ts
@@ -89,6 +89,7 @@ describe('GithubOrgEntityProvider', () => {
nodes: [
{
login: 'a',
+ id: 'f',
name: 'b',
bio: 'c',
email: 'd',
@@ -136,6 +137,7 @@ describe('GithubOrgEntityProvider', () => {
'backstage.io/managed-by-origin-location':
'url:https://https://github.com/a',
'github.com/user-login': 'a',
+ 'github.com/user-id': 'f',
},
description: 'c',
name: 'a',
@@ -311,6 +313,7 @@ describe('GithubOrgEntityProvider', () => {
'backstage.io/managed-by-origin-location':
'url:https://github.com/githubuser',
'github.com/user-login': 'githubuser',
+ 'github.com/user-id': 'githubuserId',
},
},
spec: {
@@ -331,6 +334,7 @@ describe('GithubOrgEntityProvider', () => {
user: {
name: 'githubuser',
login: 'githubuser',
+ node_id: 'githubuserId',
avatar_url: 'https://avatars.githubusercontent.com/u/83820368',
email: 'user1@test.com',
},
@@ -398,6 +402,7 @@ describe('GithubOrgEntityProvider', () => {
'backstage.io/managed-by-origin-location':
'url:https://github.com/githubuser',
'github.com/user-login': 'githubuser',
+ 'github.com/user-id': 'githubuserId',
},
},
spec: {
@@ -418,6 +423,7 @@ describe('GithubOrgEntityProvider', () => {
user: {
name: 'githubuser',
login: 'githubuser',
+ node_id: 'githubuserId',
avatar_url: 'https://avatars.githubusercontent.com/u/83820368',
email: 'user1@test.com',
},
@@ -778,6 +784,7 @@ describe('GithubOrgEntityProvider', () => {
nodes: [
{
login: 'a',
+ id: 'f',
name: 'b',
bio: 'c',
email: 'd',
@@ -785,6 +792,7 @@ describe('GithubOrgEntityProvider', () => {
},
{
login: 'githubuser',
+ id: 'githubuserId',
name: 'githubuser',
bio: 'githubuser',
email: 'd',
@@ -865,6 +873,7 @@ describe('GithubOrgEntityProvider', () => {
'backstage.io/managed-by-origin-location':
'url:https://github.com/a',
'github.com/user-login': 'a',
+ 'github.com/user-id': 'f',
},
name: 'a',
description: 'c',
@@ -891,6 +900,7 @@ describe('GithubOrgEntityProvider', () => {
'backstage.io/managed-by-origin-location':
'url:https://github.com/githubuser',
'github.com/user-login': 'githubuser',
+ 'github.com/user-id': 'githubuserId',
},
name: 'githubuser',
description: 'githubuser',
@@ -1029,6 +1039,7 @@ describe('GithubOrgEntityProvider', () => {
nodes: [
{
login: 'a',
+ id: 'f',
name: 'b',
bio: 'c',
email: 'd',
@@ -1036,6 +1047,7 @@ describe('GithubOrgEntityProvider', () => {
},
{
login: 'githubuser',
+ id: 'githubuserId',
name: 'githubuser',
bio: 'githubuser',
email: 'd',
@@ -1112,6 +1124,7 @@ describe('GithubOrgEntityProvider', () => {
'backstage.io/managed-by-origin-location':
'url:https://github.com/githubuser',
'github.com/user-login': 'githubuser',
+ 'github.com/user-id': 'githubuserId',
},
name: 'githubuser',
description: 'githubuser',
@@ -1168,6 +1181,7 @@ describe('GithubOrgEntityProvider', () => {
'backstage.io/managed-by-origin-location':
'url:https://github.com/githubuser',
'github.com/user-login': 'githubuser',
+ 'github.com/user-id': 'githubuserId',
},
name: 'githubuser',
description: 'githubuser',
@@ -1277,6 +1291,7 @@ describe('GithubOrgEntityProvider', () => {
nodes: [
{
login: 'githubuser',
+ id: 'githubuserId',
name: 'githubuser',
bio: 'githubuser',
email: 'd',
@@ -1336,6 +1351,7 @@ describe('GithubOrgEntityProvider', () => {
'backstage.io/managed-by-origin-location':
'url:https://github.com/githubuser',
'github.com/user-login': 'githubuser',
+ 'github.com/user-id': 'githubuserId',
},
name: 'githubuser',
description: 'githubuser',
@@ -1392,6 +1408,7 @@ describe('GithubOrgEntityProvider', () => {
'backstage.io/managed-by-origin-location':
'url:https://github.com/githubuser',
'github.com/user-login': 'githubuser',
+ 'github.com/user-id': 'githubuserId',
},
name: 'githubuser',
description: 'githubuser',
diff --git a/plugins/catalog-backend-module-github/src/providers/GithubOrgEntityProvider.ts b/plugins/catalog-backend-module-github/src/providers/GithubOrgEntityProvider.ts
index 4758311e83..bb4b268e62 100644
--- a/plugins/catalog-backend-module-github/src/providers/GithubOrgEntityProvider.ts
+++ b/plugins/catalog-backend-module-github/src/providers/GithubOrgEntityProvider.ts
@@ -59,6 +59,7 @@ import {
getOrganizationTeams,
getOrganizationTeamsFromUsers,
getOrganizationUsers,
+ GithubPageSizes,
GithubTeam,
} from '../lib/github';
import { areGroupEntities, areUserEntities } from '../lib/guards';
@@ -132,6 +133,12 @@ export interface GithubOrgEntityProviderOptions {
*/
teamTransformer?: TeamTransformer;
+ /**
+ * Optionally configure page sizes for GitHub GraphQL API queries.
+ * Reduce these values if hitting RESOURCE_LIMITS_EXCEEDED errors.
+ */
+ pageSizes?: Partial;
+
/**
* Optionally exclude suspended users when querying organization users.
* @defaultValue false
@@ -176,6 +183,7 @@ export class GithubOrgEntityProvider implements EntityProvider {
userTransformer: options.userTransformer,
teamTransformer: options.teamTransformer,
events: options.events,
+ pageSizes: options.pageSizes,
excludeSuspendedUsers: options.excludeSuspendedUsers,
});
@@ -194,6 +202,7 @@ export class GithubOrgEntityProvider implements EntityProvider {
githubCredentialsProvider?: GithubCredentialsProvider;
userTransformer?: UserTransformer;
teamTransformer?: TeamTransformer;
+ pageSizes?: Partial;
excludeSuspendedUsers?: boolean;
},
) {
@@ -207,6 +216,13 @@ export class GithubOrgEntityProvider implements EntityProvider {
return `GithubOrgEntityProvider:${this.options.id}`;
}
+ private getPageSizes(): GithubPageSizes {
+ return {
+ ...DEFAULT_PAGE_SIZES,
+ ...this.options.pageSizes,
+ };
+ }
+
/** {@inheritdoc @backstage/plugin-catalog-node#EntityProvider.connect} */
async connect(connection: EntityProviderConnection) {
this.connection = connection;
@@ -242,18 +258,20 @@ export class GithubOrgEntityProvider implements EntityProvider {
});
const { org } = parseGithubOrgUrl(this.options.orgUrl);
+ const pageSizes = this.getPageSizes();
const { users } = await getOrganizationUsers(
client,
org,
tokenType,
this.options.userTransformer,
- DEFAULT_PAGE_SIZES,
+ pageSizes,
this.options.excludeSuspendedUsers,
);
const { teams } = await getOrganizationTeams(
client,
org,
this.options.teamTransformer,
+ pageSizes,
);
if (areGroupEntities(teams)) {
@@ -365,6 +383,7 @@ export class GithubOrgEntityProvider implements EntityProvider {
});
const { org } = parseGithubOrgUrl(this.options.orgUrl);
+ const pageSizes = this.getPageSizes();
const { team } = await getOrganizationTeam(
client,
org,
@@ -377,7 +396,7 @@ export class GithubOrgEntityProvider implements EntityProvider {
org,
tokenType,
this.options.userTransformer,
- DEFAULT_PAGE_SIZES,
+ pageSizes,
this.options.excludeSuspendedUsers,
);
@@ -395,6 +414,7 @@ export class GithubOrgEntityProvider implements EntityProvider {
org,
usersToRebuild.map(u => u.metadata.name),
this.options.teamTransformer,
+ pageSizes,
);
if (areGroupEntities(teams)) {
@@ -458,6 +478,7 @@ export class GithubOrgEntityProvider implements EntityProvider {
});
const { org } = parseGithubOrgUrl(this.options.orgUrl);
+ const pageSizes = this.getPageSizes();
const { team } = await getOrganizationTeam(
client,
org,
@@ -470,7 +491,7 @@ export class GithubOrgEntityProvider implements EntityProvider {
org,
tokenType,
this.options.userTransformer,
- DEFAULT_PAGE_SIZES,
+ pageSizes,
this.options.excludeSuspendedUsers,
);
@@ -481,6 +502,7 @@ export class GithubOrgEntityProvider implements EntityProvider {
org,
[userLogin],
this.options.teamTransformer,
+ pageSizes,
);
// we include group because the removed event need to update the old group too
@@ -565,7 +587,13 @@ export class GithubOrgEntityProvider implements EntityProvider {
const userTransformer =
this.options.userTransformer || defaultUserTransformer;
- const { name, avatar_url: avatarUrl, email, login } = event.membership.user;
+ const {
+ name,
+ avatar_url: avatarUrl,
+ email,
+ login,
+ node_id,
+ } = event.membership.user;
const org = event.organization.login;
const { headers } = await this.credentialsProvider.getCredentials({
url: this.options.orgUrl,
@@ -581,6 +609,7 @@ export class GithubOrgEntityProvider implements EntityProvider {
avatarUrl,
login,
email: email || undefined,
+ id: node_id,
// we don't have this information in the event, so the refresh will handle that for us
organizationVerifiedDomainEmails: [],
},
diff --git a/plugins/catalog-backend-module-gitlab-org/CHANGELOG.md b/plugins/catalog-backend-module-gitlab-org/CHANGELOG.md
index c7cb44a75f..e781626038 100644
--- a/plugins/catalog-backend-module-gitlab-org/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gitlab-org/CHANGELOG.md
@@ -1,5 +1,35 @@
# @backstage/plugin-catalog-backend-module-gitlab-org
+## 0.2.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-catalog-backend-module-gitlab@0.7.7-next.0
+ - @backstage/plugin-catalog-node@1.20.1
+ - @backstage/plugin-events-node@0.4.18
+
+## 0.2.16
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-catalog-backend-module-gitlab@0.7.6
+ - @backstage/plugin-catalog-node@1.20.1
+
+## 0.2.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/plugin-catalog-backend-module-gitlab@0.7.6-next.1
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+
## 0.2.16-next.0
### Patch Changes
diff --git a/plugins/catalog-backend-module-gitlab-org/package.json b/plugins/catalog-backend-module-gitlab-org/package.json
index 1ecdd6b91d..3587dd5e5e 100644
--- a/plugins/catalog-backend-module-gitlab-org/package.json
+++ b/plugins/catalog-backend-module-gitlab-org/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-backend-module-gitlab-org",
- "version": "0.2.16-next.0",
+ "version": "0.2.17-next.0",
"description": "The gitlab-org backend module for the catalog plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-gitlab/CHANGELOG.md b/plugins/catalog-backend-module-gitlab/CHANGELOG.md
index e4a8799928..d3e9b20730 100644
--- a/plugins/catalog-backend-module-gitlab/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gitlab/CHANGELOG.md
@@ -1,5 +1,44 @@
# @backstage/plugin-catalog-backend-module-gitlab
+## 0.7.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-defaults@0.14.1-next.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/integration@1.19.0
+ - @backstage/plugin-catalog-common@1.1.7
+ - @backstage/plugin-catalog-node@1.20.1
+ - @backstage/plugin-events-node@0.4.18
+
+## 0.7.6
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/backend-defaults@0.14.0
+ - @backstage/plugin-events-node@0.4.18
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-catalog-node@1.20.1
+
+## 0.7.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-defaults@0.14.0-next.1
+ - @backstage/plugin-events-node@0.4.18-next.1
+ - @backstage/integration@1.18.3-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/plugin-catalog-common@1.1.7
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+
## 0.7.6-next.0
### Patch Changes
diff --git a/plugins/catalog-backend-module-gitlab/package.json b/plugins/catalog-backend-module-gitlab/package.json
index 28838904cd..6f9770a568 100644
--- a/plugins/catalog-backend-module-gitlab/package.json
+++ b/plugins/catalog-backend-module-gitlab/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-backend-module-gitlab",
- "version": "0.7.6-next.0",
+ "version": "0.7.7-next.0",
"description": "A Backstage catalog backend module that helps integrate towards GitLab",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md b/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md
index 3d29535081..f1e8c36d89 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md
+++ b/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md
@@ -1,5 +1,52 @@
# @backstage/plugin-catalog-backend-module-incremental-ingestion
+## 0.7.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-defaults@0.14.1-next.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/types@1.2.2
+ - @backstage/plugin-catalog-backend@3.3.1-next.0
+ - @backstage/plugin-catalog-node@1.20.1
+ - @backstage/plugin-events-node@0.4.18
+ - @backstage/plugin-permission-common@0.9.3
+
+## 0.7.7
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- fb029b6: Updated luxon types
+- Updated dependencies
+ - @backstage/backend-defaults@0.14.0
+ - @backstage/plugin-catalog-backend@3.3.0
+ - @backstage/plugin-events-node@0.4.18
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-catalog-node@1.20.1
+
+## 0.7.7-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- fb029b6: Updated luxon types
+- Updated dependencies
+ - @backstage/backend-defaults@0.14.0-next.1
+ - @backstage/plugin-catalog-backend@3.2.1-next.1
+ - @backstage/plugin-events-node@0.4.18-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/types@1.2.2
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+ - @backstage/plugin-permission-common@0.9.3
+
## 0.7.7-next.0
### Patch Changes
diff --git a/plugins/catalog-backend-module-incremental-ingestion/package.json b/plugins/catalog-backend-module-incremental-ingestion/package.json
index 07559d6d01..133cae849e 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/package.json
+++ b/plugins/catalog-backend-module-incremental-ingestion/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-backend-module-incremental-ingestion",
- "version": "0.7.7-next.0",
+ "version": "0.7.8-next.0",
"description": "An entity provider for streaming large asset sources into the catalog",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-ldap/CHANGELOG.md b/plugins/catalog-backend-module-ldap/CHANGELOG.md
index 2dbc7cdfa1..6bcb9ea561 100644
--- a/plugins/catalog-backend-module-ldap/CHANGELOG.md
+++ b/plugins/catalog-backend-module-ldap/CHANGELOG.md
@@ -1,5 +1,26 @@
# @backstage/plugin-catalog-backend-module-ldap
+## 0.12.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-catalog-node@1.20.1
+
+## 0.12.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/types@1.2.2
+ - @backstage/plugin-catalog-common@1.1.7
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+
## 0.12.1-next.0
### Patch Changes
diff --git a/plugins/catalog-backend-module-ldap/package.json b/plugins/catalog-backend-module-ldap/package.json
index 4ed1c23ed5..52bce2aae7 100644
--- a/plugins/catalog-backend-module-ldap/package.json
+++ b/plugins/catalog-backend-module-ldap/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-backend-module-ldap",
- "version": "0.12.1-next.0",
+ "version": "0.12.1",
"description": "A Backstage catalog backend module that helps integrate towards LDAP",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-logs/CHANGELOG.md b/plugins/catalog-backend-module-logs/CHANGELOG.md
index 213138f4de..633be5a127 100644
--- a/plugins/catalog-backend-module-logs/CHANGELOG.md
+++ b/plugins/catalog-backend-module-logs/CHANGELOG.md
@@ -1,5 +1,32 @@
# @backstage/plugin-catalog-backend-module-logs
+## 0.1.18-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-catalog-backend@3.3.1-next.0
+ - @backstage/plugin-events-node@0.4.18
+
+## 0.1.17
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-catalog-backend@3.3.0
+ - @backstage/plugin-events-node@0.4.18
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.1.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-catalog-backend@3.2.1-next.1
+ - @backstage/plugin-events-node@0.4.18-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+
## 0.1.17-next.0
### Patch Changes
diff --git a/plugins/catalog-backend-module-logs/package.json b/plugins/catalog-backend-module-logs/package.json
index 581467311a..12224abd8a 100644
--- a/plugins/catalog-backend-module-logs/package.json
+++ b/plugins/catalog-backend-module-logs/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-backend-module-logs",
- "version": "0.1.17-next.0",
+ "version": "0.1.18-next.0",
"description": "A module that subscribes to catalog related events and logs them.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-msgraph/CHANGELOG.md b/plugins/catalog-backend-module-msgraph/CHANGELOG.md
index 51433c91c1..6577c69166 100644
--- a/plugins/catalog-backend-module-msgraph/CHANGELOG.md
+++ b/plugins/catalog-backend-module-msgraph/CHANGELOG.md
@@ -1,5 +1,24 @@
# @backstage/plugin-catalog-backend-module-msgraph
+## 0.8.3
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-catalog-node@1.20.1
+
+## 0.8.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/plugin-catalog-common@1.1.7
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+
## 0.8.3-next.0
### Patch Changes
diff --git a/plugins/catalog-backend-module-msgraph/package.json b/plugins/catalog-backend-module-msgraph/package.json
index 5a4161ae1f..0dddba19f7 100644
--- a/plugins/catalog-backend-module-msgraph/package.json
+++ b/plugins/catalog-backend-module-msgraph/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-backend-module-msgraph",
- "version": "0.8.3-next.0",
+ "version": "0.8.3",
"description": "A Backstage catalog backend module that helps integrate towards Microsoft Graph",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-openapi/CHANGELOG.md b/plugins/catalog-backend-module-openapi/CHANGELOG.md
index 3fd5040a18..031087fe0e 100644
--- a/plugins/catalog-backend-module-openapi/CHANGELOG.md
+++ b/plugins/catalog-backend-module-openapi/CHANGELOG.md
@@ -1,5 +1,26 @@
# @backstage/plugin-catalog-backend-module-openapi
+## 0.2.17
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-catalog-node@1.20.1
+
+## 0.2.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.18.3-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/types@1.2.2
+ - @backstage/plugin-catalog-common@1.1.7
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+
## 0.2.17-next.0
### Patch Changes
diff --git a/plugins/catalog-backend-module-openapi/package.json b/plugins/catalog-backend-module-openapi/package.json
index a32778dfe4..fa9eddcf3a 100644
--- a/plugins/catalog-backend-module-openapi/package.json
+++ b/plugins/catalog-backend-module-openapi/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-backend-module-openapi",
- "version": "0.2.17-next.0",
+ "version": "0.2.17",
"description": "A Backstage catalog backend module that helps with OpenAPI specifications",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-puppetdb/CHANGELOG.md b/plugins/catalog-backend-module-puppetdb/CHANGELOG.md
index ef31a1fa75..c270f87cb5 100644
--- a/plugins/catalog-backend-module-puppetdb/CHANGELOG.md
+++ b/plugins/catalog-backend-module-puppetdb/CHANGELOG.md
@@ -1,5 +1,25 @@
# @backstage/plugin-catalog-backend-module-puppetdb
+## 0.2.17
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-catalog-node@1.20.1
+
+## 0.2.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/types@1.2.2
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+
## 0.2.17-next.0
### Patch Changes
diff --git a/plugins/catalog-backend-module-puppetdb/package.json b/plugins/catalog-backend-module-puppetdb/package.json
index 218d037800..f2cd6115d1 100644
--- a/plugins/catalog-backend-module-puppetdb/package.json
+++ b/plugins/catalog-backend-module-puppetdb/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-backend-module-puppetdb",
- "version": "0.2.17-next.0",
+ "version": "0.2.17",
"description": "A Backstage catalog backend module that helps integrate towards PuppetDB",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-scaffolder-entity-model/CHANGELOG.md b/plugins/catalog-backend-module-scaffolder-entity-model/CHANGELOG.md
index fd98e743c2..f1e46d21fc 100644
--- a/plugins/catalog-backend-module-scaffolder-entity-model/CHANGELOG.md
+++ b/plugins/catalog-backend-module-scaffolder-entity-model/CHANGELOG.md
@@ -1,5 +1,25 @@
# @backstage/plugin-catalog-backend-module-scaffolder-entity-model
+## 0.2.15
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-catalog-node@1.20.1
+ - @backstage/plugin-scaffolder-common@1.7.4
+
+## 0.2.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/plugin-catalog-common@1.1.7
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+ - @backstage/plugin-scaffolder-common@1.7.4-next.0
+
## 0.2.15-next.0
### Patch Changes
diff --git a/plugins/catalog-backend-module-scaffolder-entity-model/package.json b/plugins/catalog-backend-module-scaffolder-entity-model/package.json
index bec61b7a20..49d98fd6fc 100644
--- a/plugins/catalog-backend-module-scaffolder-entity-model/package.json
+++ b/plugins/catalog-backend-module-scaffolder-entity-model/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-backend-module-scaffolder-entity-model",
- "version": "0.2.15-next.0",
+ "version": "0.2.15",
"description": "Adds support for the scaffolder specific entity model (e.g. the Template kind) to the catalog backend plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-unprocessed/CHANGELOG.md b/plugins/catalog-backend-module-unprocessed/CHANGELOG.md
index bb501f7c31..32dde9548a 100644
--- a/plugins/catalog-backend-module-unprocessed/CHANGELOG.md
+++ b/plugins/catalog-backend-module-unprocessed/CHANGELOG.md
@@ -1,5 +1,28 @@
# @backstage/plugin-catalog-backend-module-unprocessed
+## 0.6.7
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-catalog-unprocessed-entities-common@0.0.12
+ - @backstage/plugin-catalog-node@1.20.1
+
+## 0.6.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/errors@1.2.7
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+ - @backstage/plugin-catalog-unprocessed-entities-common@0.0.12-next.0
+ - @backstage/plugin-permission-common@0.9.3
+
## 0.6.7-next.1
### Patch Changes
diff --git a/plugins/catalog-backend-module-unprocessed/package.json b/plugins/catalog-backend-module-unprocessed/package.json
index fcb5d57809..b735e7a13a 100644
--- a/plugins/catalog-backend-module-unprocessed/package.json
+++ b/plugins/catalog-backend-module-unprocessed/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-backend-module-unprocessed",
- "version": "0.6.7-next.1",
+ "version": "0.6.7",
"description": "Backstage Catalog module to view unprocessed entities",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/catalog-backend/CHANGELOG.md b/plugins/catalog-backend/CHANGELOG.md
index 2ab123b03f..69d43dc35b 100644
--- a/plugins/catalog-backend/CHANGELOG.md
+++ b/plugins/catalog-backend/CHANGELOG.md
@@ -1,5 +1,62 @@
# @backstage/plugin-catalog-backend
+## 3.3.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-openapi-utils@0.6.5-next.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/catalog-client@1.12.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/integration@1.19.0
+ - @backstage/types@1.2.2
+ - @backstage/plugin-catalog-common@1.1.7
+ - @backstage/plugin-catalog-node@1.20.1
+ - @backstage/plugin-events-node@0.4.18
+ - @backstage/plugin-permission-common@0.9.3
+ - @backstage/plugin-permission-node@0.10.7
+
+## 3.3.0
+
+### Minor Changes
+
+- dce1824: Added `ActionsRegistry` actions for `register-entity` and `unregister-entity`
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- 8101ec1: Fixed default refresh service to go through the whole ancestry of the entity.
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/backend-openapi-utils@0.6.4
+ - @backstage/plugin-events-node@0.4.18
+ - @backstage/plugin-permission-node@0.10.7
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-catalog-node@1.20.1
+
+## 3.2.1-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/backend-openapi-utils@0.6.4-next.1
+ - @backstage/plugin-events-node@0.4.18-next.1
+ - @backstage/plugin-permission-node@0.10.7-next.1
+ - @backstage/integration@1.18.3-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-client@1.12.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/types@1.2.2
+ - @backstage/plugin-catalog-common@1.1.7
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+ - @backstage/plugin-permission-common@0.9.3
+
## 3.2.1-next.0
### Patch Changes
diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index 508299734f..8128df6616 100644
--- a/plugins/catalog-backend/package.json
+++ b/plugins/catalog-backend/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-backend",
- "version": "3.2.1-next.0",
+ "version": "3.3.1-next.0",
"description": "The Backstage backend plugin that provides the Backstage catalog",
"backstage": {
"role": "backend-plugin",
diff --git a/plugins/catalog-backend/src/actions/createRegisterCatalogEntitiesAction.test.ts b/plugins/catalog-backend/src/actions/createRegisterCatalogEntitiesAction.test.ts
new file mode 100644
index 0000000000..31a89a31f3
--- /dev/null
+++ b/plugins/catalog-backend/src/actions/createRegisterCatalogEntitiesAction.test.ts
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { createRegisterCatalogEntitiesAction } from './createRegisterCatalogEntitiesAction';
+import { catalogServiceMock } from '@backstage/plugin-catalog-node/testUtils';
+import { actionsRegistryServiceMock } from '@backstage/backend-test-utils/alpha';
+import { ForwardedError } from '@backstage/errors';
+
+describe('createRegisterCatalogEntitiesAction', () => {
+ it('should successfully register a catalog location with a valid URL', async () => {
+ const mockActionsRegistry = actionsRegistryServiceMock();
+ const mockCatalog = catalogServiceMock();
+
+ const mockLocationId = 'test-location-id-1234';
+ mockCatalog.addLocation = jest.fn().mockResolvedValue({
+ location: {
+ id: mockLocationId,
+ type: 'url',
+ target: 'https://github.com/example/repo/blob/main/catalog-info.yaml',
+ },
+ entities: [],
+ exists: false,
+ });
+
+ createRegisterCatalogEntitiesAction({
+ catalog: mockCatalog,
+ actionsRegistry: mockActionsRegistry,
+ });
+
+ const result = await mockActionsRegistry.invoke({
+ id: 'test:register-entity',
+ input: {
+ locationUrl:
+ 'https://github.com/example/repo/blob/main/catalog-info.yaml',
+ },
+ });
+
+ expect(result.output).toEqual({
+ locationId: mockLocationId,
+ });
+ expect(mockCatalog.addLocation).toHaveBeenCalledWith(
+ {
+ type: 'url',
+ target: 'https://github.com/example/repo/blob/main/catalog-info.yaml',
+ },
+ expect.objectContaining({
+ credentials: expect.any(Object),
+ }),
+ );
+ });
+
+ it('should throw an error if locationUrl is not a valid URL', async () => {
+ const mockActionsRegistry = actionsRegistryServiceMock();
+ const mockCatalog = catalogServiceMock();
+
+ createRegisterCatalogEntitiesAction({
+ catalog: mockCatalog,
+ actionsRegistry: mockActionsRegistry,
+ });
+
+ await expect(
+ mockActionsRegistry.invoke({
+ id: 'test:register-entity',
+ input: { locationUrl: 'not-a-valid-url' },
+ }),
+ ).rejects.toThrow('not-a-valid-url is an invalid URL');
+ });
+
+ it('should throw a ForwardedError if catalog.addLocation throws an error', async () => {
+ const mockActionsRegistry = actionsRegistryServiceMock();
+ const mockCatalog = catalogServiceMock();
+
+ const errorMessage = 'Failed to add location';
+ mockCatalog.addLocation = jest
+ .fn()
+ .mockRejectedValue(new Error(errorMessage));
+
+ createRegisterCatalogEntitiesAction({
+ catalog: mockCatalog,
+ actionsRegistry: mockActionsRegistry,
+ });
+
+ await expect(
+ mockActionsRegistry.invoke({
+ id: 'test:register-entity',
+ input: {
+ locationUrl:
+ 'https://github.com/example/repo/blob/main/catalog-info.yaml',
+ },
+ }),
+ ).rejects.toThrow(ForwardedError);
+ });
+});
diff --git a/plugins/catalog-backend/src/actions/createRegisterCatalogEntitiesAction.ts b/plugins/catalog-backend/src/actions/createRegisterCatalogEntitiesAction.ts
new file mode 100644
index 0000000000..c521672ae1
--- /dev/null
+++ b/plugins/catalog-backend/src/actions/createRegisterCatalogEntitiesAction.ts
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { ActionsRegistryService } from '@backstage/backend-plugin-api/alpha';
+import { InputError } from '@backstage/errors';
+import { CatalogService } from '@backstage/plugin-catalog-node';
+
+const isValidUrl = (url: string) => {
+ try {
+ // eslint-disable-next-line no-new
+ new URL(url);
+ return true;
+ } catch (error) {
+ return false;
+ }
+};
+
+export const createRegisterCatalogEntitiesAction = ({
+ catalog,
+ actionsRegistry,
+}: {
+ catalog: CatalogService;
+ actionsRegistry: ActionsRegistryService;
+}) => {
+ actionsRegistry.register({
+ name: 'register-entity',
+ title: 'Register entity in the Catalog',
+ attributes: {
+ destructive: false,
+ readOnly: false,
+ idempotent: false,
+ },
+ description: `Registers one or more entities in the Backstage catalog by creating a Location entity that points to a remote catalog-info.yaml file.
+
+This action is similar to the "Register existing component" flow in the Backstage UI, where you provide a URL to a catalog-info.yaml file describing catalog entities such as Components, Systems, Resources, APIs, Users, and Groups. The action will create a new Location entity that references the provided file; all entities defined within that file will be imported into the catalog.
+
+A unique identifier (locationId) will be returned for the newly created Location. You can use this identifier in the future to unregister or delete the Location and all entities it owns.
+`,
+ schema: {
+ input: z =>
+ z.object({
+ locationUrl: z
+ .string()
+ .describe(
+ `URL reference to the catalog-info.yaml file that describes the entity to register. For example: https://github.com/backstage/demo/blob/master/catalog-info.yaml`,
+ ),
+ }),
+ output: z =>
+ z.object({
+ locationId: z
+ .string()
+ .describe('The ID of the entity that was registered'),
+ }),
+ },
+ action: async ({ input, credentials }) => {
+ if (!isValidUrl(input.locationUrl)) {
+ throw new InputError(`${input.locationUrl} is an invalid URL`);
+ }
+
+ const result = await catalog.addLocation(
+ {
+ type: 'url',
+ target: input.locationUrl,
+ },
+ {
+ credentials,
+ },
+ );
+
+ return {
+ output: {
+ locationId: result.location.id,
+ },
+ };
+ },
+ });
+};
diff --git a/plugins/catalog-backend/src/actions/createUnregisterCatalogEntitiesAction.test.ts b/plugins/catalog-backend/src/actions/createUnregisterCatalogEntitiesAction.test.ts
new file mode 100644
index 0000000000..492a427630
--- /dev/null
+++ b/plugins/catalog-backend/src/actions/createUnregisterCatalogEntitiesAction.test.ts
@@ -0,0 +1,274 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { createUnregisterCatalogEntitiesAction } from './createUnregisterCatalogEntitiesAction';
+import { catalogServiceMock } from '@backstage/plugin-catalog-node/testUtils';
+import { actionsRegistryServiceMock } from '@backstage/backend-test-utils/alpha';
+
+describe('createUnregisterCatalogEntitiesAction', () => {
+ describe('with locationId', () => {
+ it('should successfully unregister a catalog location with a valid locationId', async () => {
+ const mockActionsRegistry = actionsRegistryServiceMock();
+ const mockCatalog = catalogServiceMock();
+
+ mockCatalog.removeLocationById = jest.fn().mockResolvedValue(undefined);
+
+ createUnregisterCatalogEntitiesAction({
+ catalog: mockCatalog,
+ actionsRegistry: mockActionsRegistry,
+ });
+
+ const result = await mockActionsRegistry.invoke({
+ id: 'test:unregister-entity',
+ input: { type: { locationId: 'test-location-id-1234' } },
+ });
+
+ expect(result.output).toEqual({});
+ expect(mockCatalog.removeLocationById).toHaveBeenCalledWith(
+ 'test-location-id-1234',
+ expect.objectContaining({
+ credentials: expect.any(Object),
+ }),
+ );
+ });
+
+ it('should throw an error if catalog.removeLocationById throws an error', async () => {
+ const mockActionsRegistry = actionsRegistryServiceMock();
+ const mockCatalog = catalogServiceMock();
+
+ const errorMessage = 'Failed to remove location';
+ mockCatalog.removeLocationById = jest
+ .fn()
+ .mockRejectedValue(new Error(errorMessage));
+
+ createUnregisterCatalogEntitiesAction({
+ catalog: mockCatalog,
+ actionsRegistry: mockActionsRegistry,
+ });
+
+ await expect(
+ mockActionsRegistry.invoke({
+ id: 'test:unregister-entity',
+ input: { type: { locationId: 'test-location-id-1234' } },
+ }),
+ ).rejects.toThrow(errorMessage);
+ });
+ });
+
+ describe('with locationUrl', () => {
+ it('should successfully unregister a catalog location with a valid locationUrl', async () => {
+ const mockActionsRegistry = actionsRegistryServiceMock();
+ const mockCatalog = catalogServiceMock();
+
+ const locationUrl =
+ 'https://github.com/backstage/demo/blob/master/catalog-info.yaml';
+
+ mockCatalog.getLocations = jest.fn().mockResolvedValue({
+ items: [
+ { id: 'location-id-1', target: locationUrl },
+ { id: 'location-id-2', target: 'https://other-url.com/catalog.yaml' },
+ ],
+ });
+ mockCatalog.removeLocationById = jest.fn().mockResolvedValue(undefined);
+
+ createUnregisterCatalogEntitiesAction({
+ catalog: mockCatalog,
+ actionsRegistry: mockActionsRegistry,
+ });
+
+ const result = await mockActionsRegistry.invoke({
+ id: 'test:unregister-entity',
+ input: { type: { locationUrl } },
+ });
+
+ expect(result.output).toEqual({});
+ expect(mockCatalog.getLocations).toHaveBeenCalledWith(
+ {},
+ expect.objectContaining({
+ credentials: expect.any(Object),
+ }),
+ );
+ expect(mockCatalog.removeLocationById).toHaveBeenCalledTimes(1);
+ expect(mockCatalog.removeLocationById).toHaveBeenCalledWith(
+ 'location-id-1',
+ expect.objectContaining({
+ credentials: expect.any(Object),
+ }),
+ );
+ });
+
+ it('should match locationUrl case-insensitively', async () => {
+ const mockActionsRegistry = actionsRegistryServiceMock();
+ const mockCatalog = catalogServiceMock();
+
+ mockCatalog.getLocations = jest.fn().mockResolvedValue({
+ items: [
+ {
+ id: 'location-id-1',
+ target:
+ 'https://github.com/Backstage/Demo/blob/master/catalog-info.yaml',
+ },
+ ],
+ });
+ mockCatalog.removeLocationById = jest.fn().mockResolvedValue(undefined);
+
+ createUnregisterCatalogEntitiesAction({
+ catalog: mockCatalog,
+ actionsRegistry: mockActionsRegistry,
+ });
+
+ const result = await mockActionsRegistry.invoke({
+ id: 'test:unregister-entity',
+ input: {
+ type: {
+ locationUrl:
+ 'https://github.com/backstage/demo/blob/master/catalog-info.yaml',
+ },
+ },
+ });
+
+ expect(result.output).toEqual({});
+ expect(mockCatalog.removeLocationById).toHaveBeenCalledTimes(1);
+ expect(mockCatalog.removeLocationById).toHaveBeenCalledWith(
+ 'location-id-1',
+ expect.objectContaining({
+ credentials: expect.any(Object),
+ }),
+ );
+ });
+
+ it('should unregister multiple locations with the same URL', async () => {
+ const mockActionsRegistry = actionsRegistryServiceMock();
+ const mockCatalog = catalogServiceMock();
+
+ const locationUrl =
+ 'https://github.com/backstage/demo/blob/master/catalog-info.yaml';
+
+ mockCatalog.getLocations = jest.fn().mockResolvedValue({
+ items: [
+ { id: 'location-id-1', target: locationUrl },
+ { id: 'location-id-2', target: locationUrl },
+ ],
+ });
+ mockCatalog.removeLocationById = jest.fn().mockResolvedValue(undefined);
+
+ createUnregisterCatalogEntitiesAction({
+ catalog: mockCatalog,
+ actionsRegistry: mockActionsRegistry,
+ });
+
+ const result = await mockActionsRegistry.invoke({
+ id: 'test:unregister-entity',
+ input: { type: { locationUrl } },
+ });
+
+ expect(result.output).toEqual({});
+ expect(mockCatalog.removeLocationById).toHaveBeenCalledTimes(2);
+ expect(mockCatalog.removeLocationById).toHaveBeenNthCalledWith(
+ 1,
+ 'location-id-1',
+ expect.objectContaining({
+ credentials: expect.any(Object),
+ }),
+ );
+ expect(mockCatalog.removeLocationById).toHaveBeenNthCalledWith(
+ 2,
+ 'location-id-2',
+ expect.objectContaining({
+ credentials: expect.any(Object),
+ }),
+ );
+ });
+
+ it('should throw NotFoundError if no location matches the URL', async () => {
+ const mockActionsRegistry = actionsRegistryServiceMock();
+ const mockCatalog = catalogServiceMock();
+
+ mockCatalog.getLocations = jest.fn().mockResolvedValue({
+ items: [
+ { id: 'location-id-1', target: 'https://other-url.com/catalog.yaml' },
+ ],
+ });
+
+ createUnregisterCatalogEntitiesAction({
+ catalog: mockCatalog,
+ actionsRegistry: mockActionsRegistry,
+ });
+
+ await expect(
+ mockActionsRegistry.invoke({
+ id: 'test:unregister-entity',
+ input: {
+ type: {
+ locationUrl:
+ 'https://github.com/backstage/demo/blob/master/catalog-info.yaml',
+ },
+ },
+ }),
+ ).rejects.toThrow(/NotFoundError/);
+ });
+
+ it('should throw NotFoundError with descriptive message when location not found', async () => {
+ const mockActionsRegistry = actionsRegistryServiceMock();
+ const mockCatalog = catalogServiceMock();
+
+ const locationUrl =
+ 'https://github.com/backstage/demo/blob/master/catalog-info.yaml';
+
+ mockCatalog.getLocations = jest.fn().mockResolvedValue({
+ items: [],
+ });
+
+ createUnregisterCatalogEntitiesAction({
+ catalog: mockCatalog,
+ actionsRegistry: mockActionsRegistry,
+ });
+
+ await expect(
+ mockActionsRegistry.invoke({
+ id: 'test:unregister-entity',
+ input: { type: { locationUrl } },
+ }),
+ ).rejects.toThrow(`Location with URL ${locationUrl} not found`);
+ });
+
+ it('should throw an error if catalog.getLocations throws an error', async () => {
+ const mockActionsRegistry = actionsRegistryServiceMock();
+ const mockCatalog = catalogServiceMock();
+
+ const errorMessage = 'Failed to get locations';
+ mockCatalog.getLocations = jest
+ .fn()
+ .mockRejectedValue(new Error(errorMessage));
+
+ createUnregisterCatalogEntitiesAction({
+ catalog: mockCatalog,
+ actionsRegistry: mockActionsRegistry,
+ });
+
+ await expect(
+ mockActionsRegistry.invoke({
+ id: 'test:unregister-entity',
+ input: {
+ type: {
+ locationUrl:
+ 'https://github.com/backstage/demo/blob/master/catalog-info.yaml',
+ },
+ },
+ }),
+ ).rejects.toThrow(errorMessage);
+ });
+ });
+});
diff --git a/plugins/catalog-backend/src/actions/createUnregisterCatalogEntitiesAction.ts b/plugins/catalog-backend/src/actions/createUnregisterCatalogEntitiesAction.ts
new file mode 100644
index 0000000000..542fc79ac5
--- /dev/null
+++ b/plugins/catalog-backend/src/actions/createUnregisterCatalogEntitiesAction.ts
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { ActionsRegistryService } from '@backstage/backend-plugin-api/alpha';
+import { NotFoundError } from '@backstage/errors';
+import { CatalogService } from '@backstage/plugin-catalog-node';
+
+export const createUnregisterCatalogEntitiesAction = ({
+ catalog,
+ actionsRegistry,
+}: {
+ catalog: CatalogService;
+ actionsRegistry: ActionsRegistryService;
+}) => {
+ actionsRegistry.register({
+ name: 'unregister-entity',
+ title: 'Unregister entity from the Catalog',
+ attributes: {
+ destructive: true,
+ readOnly: false,
+ idempotent: true,
+ },
+ description: `Unregisters a Location entity and all entities it owns from the Backstage catalog.
+
+This action is similar to the "Unregister location" function in the Backstage UI, where you provide the unique identifier (locationId) of a Location entity. Alternatively, you can provide the URL used to register the location. The action will remove the specified Location from the catalog as well as all entities that were created when the Location was imported.
+
+Once completed, all entities associated with the Location will be deleted from the catalog.
+`,
+ schema: {
+ input: z =>
+ z
+ .object({
+ type: z.union([
+ z.object({
+ locationId: z
+ .string()
+ .describe(`Location ID of the Entity to unregister`),
+ }),
+ z.object({
+ locationUrl: z
+ .string()
+ .describe(
+ `URL of the catalog-info.yaml file to unregister for example: https://github.com/backstage/demo/blob/master/catalog-info.yaml`,
+ ),
+ }),
+ ]),
+ })
+ .describe(
+ 'The type to the unregister-entity action. Either locationId or locationUrl must be provided.',
+ ),
+ output: z => z.object({}),
+ },
+ action: async ({ input: { type }, credentials }) => {
+ if ('locationId' in type) {
+ await catalog.removeLocationById(type.locationId, {
+ credentials,
+ });
+ } else {
+ const locations = await catalog
+ .getLocations(
+ {},
+ {
+ credentials,
+ },
+ )
+ .then(response =>
+ response.items.filter(
+ location =>
+ location.target.toLowerCase() ===
+ type.locationUrl.toLowerCase(),
+ ),
+ );
+
+ if (locations.length === 0) {
+ throw new NotFoundError(
+ `Location with URL ${type.locationUrl} not found`,
+ );
+ }
+
+ for (const location of locations) {
+ await catalog.removeLocationById(location.id, {
+ credentials,
+ });
+ }
+ }
+
+ return { output: {} };
+ },
+ });
+};
diff --git a/plugins/catalog-backend/src/actions/index.ts b/plugins/catalog-backend/src/actions/index.ts
index c53f956f62..5940bc32f1 100644
--- a/plugins/catalog-backend/src/actions/index.ts
+++ b/plugins/catalog-backend/src/actions/index.ts
@@ -17,6 +17,8 @@ import { ActionsRegistryService } from '@backstage/backend-plugin-api/alpha';
import { CatalogService } from '@backstage/plugin-catalog-node';
import { createGetCatalogEntityAction } from './createGetCatalogEntityAction.ts';
import { createValidateEntityAction } from './createValidateEntityAction.ts';
+import { createRegisterCatalogEntitiesAction } from './createRegisterCatalogEntitiesAction.ts';
+import { createUnregisterCatalogEntitiesAction } from './createUnregisterCatalogEntitiesAction.ts';
export const createCatalogActions = (options: {
actionsRegistry: ActionsRegistryService;
@@ -24,4 +26,6 @@ export const createCatalogActions = (options: {
}) => {
createGetCatalogEntityAction(options);
createValidateEntityAction(options);
+ createRegisterCatalogEntitiesAction(options);
+ createUnregisterCatalogEntitiesAction(options);
};
diff --git a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts
index e9d00f3451..7012c2e505 100644
--- a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts
+++ b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts
@@ -1577,10 +1577,11 @@ describe('DefaultEntitiesCatalog', () => {
totalItems: 0,
items: {
type: 'raw',
- entities: expect.objectContaining({ length: 10 }),
+ entities: expect.any(Array),
},
pageInfo: { nextCursor: expect.anything() },
});
+ expect(response.items.entities).toHaveLength(10);
response = await catalog.queryEntities({
...request,
cursor: response.pageInfo.nextCursor!,
@@ -1589,10 +1590,11 @@ describe('DefaultEntitiesCatalog', () => {
totalItems: 0,
items: {
type: 'raw',
- entities: expect.objectContaining({ length: 5 }),
+ entities: expect.any(Array),
},
pageInfo: { prevCursor: expect.anything() },
});
+ expect(response.items.entities).toHaveLength(5);
},
);
diff --git a/plugins/catalog-backend/src/service/DefaultRefreshService.ts b/plugins/catalog-backend/src/service/DefaultRefreshService.ts
index 99b78f900b..45a8f27c6e 100644
--- a/plugins/catalog-backend/src/service/DefaultRefreshService.ts
+++ b/plugins/catalog-backend/src/service/DefaultRefreshService.ts
@@ -29,20 +29,17 @@ export class DefaultRefreshService implements RefreshService {
const { entityRefs } = await this.database.listAncestors(tx, {
entityRef: options.entityRef,
});
- const locationAncestor = entityRefs.find(ref =>
+
+ const locationAncestors = entityRefs.filter(ref =>
ref.startsWith('location:'),
);
// TODO: Refreshes are currently scheduled(as soon as possible) for execution and will therefore happen in the future.
// There's room for improvements here where the refresh could potentially hang or return an ID so that the user can check progress.
- if (locationAncestor) {
- await this.database.refresh(tx, {
- entityRef: locationAncestor,
- });
+ for (const locationAncestor of locationAncestors) {
+ await this.database.refresh(tx, { entityRef: locationAncestor });
}
- await this.database.refresh(tx, {
- entityRef: options.entityRef,
- });
+ await this.database.refresh(tx, { entityRef: options.entityRef });
});
}
}
diff --git a/plugins/catalog-backend/src/service/response/write.test.ts b/plugins/catalog-backend/src/service/response/write.test.ts
index d60d1c3526..25aaa33aa1 100644
--- a/plugins/catalog-backend/src/service/response/write.test.ts
+++ b/plugins/catalog-backend/src/service/response/write.test.ts
@@ -327,9 +327,10 @@ describe('writeEntitiesResponse', () => {
expect(res.header['content-length']).not.toBeDefined();
expect(res.body).toEqual({
page: 1,
- items: expect.objectContaining({ length: 300 }),
+ items: expect.any(Array),
totalItems: 1337,
});
+ expect(res.body.items).toHaveLength(300);
});
});
@@ -438,9 +439,10 @@ describe('writeEntitiesResponse', () => {
expect(res.header['content-length']).toBeDefined();
expect(res.body).toEqual({
page: 1,
- items: expect.objectContaining({ length: 300 }),
+ items: expect.any(Array),
totalItems: 1337,
});
+ expect(res.body.items).toHaveLength(300);
});
});
});
diff --git a/plugins/catalog-graph/CHANGELOG.md b/plugins/catalog-graph/CHANGELOG.md
index 759f4fbb7c..b97ea7d6a2 100644
--- a/plugins/catalog-graph/CHANGELOG.md
+++ b/plugins/catalog-graph/CHANGELOG.md
@@ -1,5 +1,32 @@
# @backstage/plugin-catalog-graph
+## 0.5.4
+
+### Patch Changes
+
+- a67c144: Fixed zoom out description (replace `&` with &)
+- f3f84f1: Minor extension type updates after frontend API bump
+- d02db50: Remove unnecessary use of `compatWrapper` and `convertLegacyRouteRef`(s) for the new frontend system.
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.13.2
+ - @backstage/core-components@0.18.4
+ - @backstage/plugin-catalog-react@1.21.4
+ - @backstage/core-plugin-api@1.12.1
+
+## 0.5.4-next.1
+
+### Patch Changes
+
+- f3f84f1: Minor extension type updates after frontend API bump
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.13.2-next.1
+ - @backstage/plugin-catalog-react@1.21.4-next.2
+ - @backstage/core-components@0.18.4-next.2
+ - @backstage/catalog-client@1.12.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/core-plugin-api@1.12.1-next.0
+ - @backstage/types@1.2.2
+
## 0.5.4-next.0
### Patch Changes
diff --git a/plugins/catalog-graph/package.json b/plugins/catalog-graph/package.json
index fb28ba1a27..64b4331356 100644
--- a/plugins/catalog-graph/package.json
+++ b/plugins/catalog-graph/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-graph",
- "version": "0.5.4-next.0",
+ "version": "0.5.4",
"backstage": {
"role": "frontend-plugin",
"pluginId": "catalog-graph",
diff --git a/plugins/catalog-import/CHANGELOG.md b/plugins/catalog-import/CHANGELOG.md
index b549bb0b85..9e25364a9c 100644
--- a/plugins/catalog-import/CHANGELOG.md
+++ b/plugins/catalog-import/CHANGELOG.md
@@ -1,5 +1,19 @@
# @backstage/plugin-catalog-import
+## 0.13.8
+
+### Patch Changes
+
+- d02db50: Remove unnecessary use of `compatWrapper` and `convertLegacyRouteRef`(s) for the new frontend system.
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/frontend-plugin-api@0.13.2
+ - @backstage/core-components@0.18.4
+ - @backstage/plugin-catalog-react@1.21.4
+ - @backstage/core-plugin-api@1.12.1
+ - @backstage/integration-react@1.2.13
+ - @backstage/plugin-permission-react@0.4.39
+
## 0.13.8-next.0
### Patch Changes
diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json
index f18c00afa2..e9d25876af 100644
--- a/plugins/catalog-import/package.json
+++ b/plugins/catalog-import/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-import",
- "version": "0.13.8-next.0",
+ "version": "0.13.8",
"description": "A Backstage plugin the helps you import entities into your catalog",
"backstage": {
"role": "frontend-plugin",
diff --git a/plugins/catalog-node/CHANGELOG.md b/plugins/catalog-node/CHANGELOG.md
index 018df720cd..112e1cfca2 100644
--- a/plugins/catalog-node/CHANGELOG.md
+++ b/plugins/catalog-node/CHANGELOG.md
@@ -1,5 +1,27 @@
# @backstage/plugin-catalog-node
+## 1.20.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-permission-node@0.10.7
+ - @backstage/backend-plugin-api@1.6.0
+
+## 1.20.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-permission-node@0.10.7-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-client@1.12.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/errors@1.2.7
+ - @backstage/types@1.2.2
+ - @backstage/plugin-catalog-common@1.1.7
+ - @backstage/plugin-permission-common@0.9.3
+
## 1.20.1-next.0
### Patch Changes
diff --git a/plugins/catalog-node/package.json b/plugins/catalog-node/package.json
index d083c08d34..befa4e9b7f 100644
--- a/plugins/catalog-node/package.json
+++ b/plugins/catalog-node/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-node",
- "version": "1.20.1-next.0",
+ "version": "1.20.1",
"description": "The plugin-catalog-node module for @backstage/plugin-catalog-backend",
"backstage": {
"role": "node-library",
diff --git a/plugins/catalog-react/CHANGELOG.md b/plugins/catalog-react/CHANGELOG.md
index 8d0b154915..c66c5767ae 100644
--- a/plugins/catalog-react/CHANGELOG.md
+++ b/plugins/catalog-react/CHANGELOG.md
@@ -1,5 +1,43 @@
# @backstage/plugin-catalog-react
+## 1.21.4
+
+### Patch Changes
+
+- 6d39141: Fixed an issue where `EntityOwnerPicker` failed to filter options when the input text contained uppercase characters.
+- b3c0594: Use a versioned context for `useEntityList`, to better work with mixed `@backstage/plugin-catalog-react` versions.
+- c51c901: $contains may have string value in an entity filter. Typescript type and Zod parser were not the same.
+- d02db50: Remove unnecessary use of `compatWrapper` and `convertLegacyRouteRef`(s) for the new frontend system.
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.13.2
+ - @backstage/core-components@0.18.4
+ - @backstage/core-plugin-api@1.12.1
+ - @backstage/core-compat-api@0.5.5
+ - @backstage/frontend-test-utils@0.4.2
+ - @backstage/integration-react@1.2.13
+ - @backstage/plugin-permission-react@0.4.39
+
+## 1.21.4-next.2
+
+### Patch Changes
+
+- b3c0594: Use a versioned context for `useEntityList`, to better work with mixed `@backstage/plugin-catalog-react` versions.
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.13.2-next.1
+ - @backstage/core-components@0.18.4-next.2
+ - @backstage/catalog-client@1.12.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/core-compat-api@0.5.5-next.0
+ - @backstage/core-plugin-api@1.12.1-next.0
+ - @backstage/errors@1.2.7
+ - @backstage/frontend-test-utils@0.4.2-next.0
+ - @backstage/integration-react@1.2.13-next.0
+ - @backstage/types@1.2.2
+ - @backstage/version-bridge@1.0.11
+ - @backstage/plugin-catalog-common@1.1.7
+ - @backstage/plugin-permission-common@0.9.3
+ - @backstage/plugin-permission-react@0.4.39-next.0
+
## 1.21.4-next.1
### Patch Changes
diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json
index 013d1e7629..bfd4e11738 100644
--- a/plugins/catalog-react/package.json
+++ b/plugins/catalog-react/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-react",
- "version": "1.21.4-next.1",
+ "version": "1.21.4",
"description": "A frontend library that helps other Backstage plugins interact with the catalog",
"backstage": {
"role": "web-library",
diff --git a/plugins/catalog-react/report-alpha.api.md b/plugins/catalog-react/report-alpha.api.md
index 3f2ed575b4..22ac105eeb 100644
--- a/plugins/catalog-react/report-alpha.api.md
+++ b/plugins/catalog-react/report-alpha.api.md
@@ -549,7 +549,7 @@ export type EntityPredicateValue =
$in: EntityPredicatePrimitive[];
}
| {
- $contains: EntityPredicateExpression;
+ $contains: EntityPredicate;
};
// @alpha (undocumented)
diff --git a/plugins/catalog-react/src/alpha/blueprints/EntityCardBlueprint.test.tsx b/plugins/catalog-react/src/alpha/blueprints/EntityCardBlueprint.test.tsx
index 3c9a020c93..af04673ad1 100644
--- a/plugins/catalog-react/src/alpha/blueprints/EntityCardBlueprint.test.tsx
+++ b/plugins/catalog-react/src/alpha/blueprints/EntityCardBlueprint.test.tsx
@@ -60,20 +60,75 @@ describe('EntityCardBlueprint', () => {
{
"anyOf": [
{
- "type": [
- "string",
- "number",
- "boolean",
- ],
+ "additionalProperties": {
+ "anyOf": [
+ {
+ "type": [
+ "string",
+ "number",
+ "boolean",
+ ],
+ },
+ {
+ "additionalProperties": false,
+ "properties": {
+ "$exists": {
+ "type": "boolean",
+ },
+ },
+ "required": [
+ "$exists",
+ ],
+ "type": "object",
+ },
+ {
+ "additionalProperties": false,
+ "properties": {
+ "$in": {
+ "items": {
+ "$ref": "#/properties/filter/anyOf/1/anyOf/0/anyOf/0/additionalProperties/anyOf/0",
+ },
+ "type": "array",
+ },
+ },
+ "required": [
+ "$in",
+ ],
+ "type": "object",
+ },
+ {
+ "additionalProperties": false,
+ "properties": {
+ "$contains": {
+ "$ref": "#/properties/filter/anyOf/1",
+ },
+ },
+ "required": [
+ "$contains",
+ ],
+ "type": "object",
+ },
+ ],
+ },
+ "propertyNames": {
+ "pattern": "^(?!\\$).*$",
+ },
+ "type": "object",
},
{
- "items": {
- "$ref": "#/properties/filter/anyOf/1/anyOf/0/anyOf/0",
+ "additionalProperties": {
+ "not": {},
},
- "type": "array",
+ "propertyNames": {
+ "pattern": "^\\$",
+ },
+ "type": "object",
},
],
},
+ {
+ "$ref": "#/properties/filter/anyOf/1/anyOf/0/anyOf/0/additionalProperties/anyOf/0",
+ },
{
"additionalProperties": false,
"properties": {
@@ -116,58 +171,6 @@ describe('EntityCardBlueprint', () => {
],
"type": "object",
},
- {
- "additionalProperties": {
- "anyOf": [
- {
- "$ref": "#/properties/filter/anyOf/1/anyOf/0",
- },
- {
- "additionalProperties": false,
- "properties": {
- "$exists": {
- "type": "boolean",
- },
- },
- "required": [
- "$exists",
- ],
- "type": "object",
- },
- {
- "additionalProperties": false,
- "properties": {
- "$in": {
- "items": {
- "$ref": "#/properties/filter/anyOf/1/anyOf/0/anyOf/0",
- },
- "type": "array",
- },
- },
- "required": [
- "$in",
- ],
- "type": "object",
- },
- {
- "additionalProperties": false,
- "properties": {
- "$contains": {
- "$ref": "#/properties/filter/anyOf/1",
- },
- },
- "required": [
- "$contains",
- ],
- "type": "object",
- },
- ],
- },
- "propertyNames": {
- "pattern": "^(?!\\$).*$",
- },
- "type": "object",
- },
],
},
],
diff --git a/plugins/catalog-react/src/alpha/blueprints/EntityContentBlueprint.test.tsx b/plugins/catalog-react/src/alpha/blueprints/EntityContentBlueprint.test.tsx
index 729f15079f..e80834be92 100644
--- a/plugins/catalog-react/src/alpha/blueprints/EntityContentBlueprint.test.tsx
+++ b/plugins/catalog-react/src/alpha/blueprints/EntityContentBlueprint.test.tsx
@@ -62,20 +62,75 @@ describe('EntityContentBlueprint', () => {
{
"anyOf": [
{
- "type": [
- "string",
- "number",
- "boolean",
- ],
+ "additionalProperties": {
+ "anyOf": [
+ {
+ "type": [
+ "string",
+ "number",
+ "boolean",
+ ],
+ },
+ {
+ "additionalProperties": false,
+ "properties": {
+ "$exists": {
+ "type": "boolean",
+ },
+ },
+ "required": [
+ "$exists",
+ ],
+ "type": "object",
+ },
+ {
+ "additionalProperties": false,
+ "properties": {
+ "$in": {
+ "items": {
+ "$ref": "#/properties/filter/anyOf/1/anyOf/0/anyOf/0/additionalProperties/anyOf/0",
+ },
+ "type": "array",
+ },
+ },
+ "required": [
+ "$in",
+ ],
+ "type": "object",
+ },
+ {
+ "additionalProperties": false,
+ "properties": {
+ "$contains": {
+ "$ref": "#/properties/filter/anyOf/1",
+ },
+ },
+ "required": [
+ "$contains",
+ ],
+ "type": "object",
+ },
+ ],
+ },
+ "propertyNames": {
+ "pattern": "^(?!\\$).*$",
+ },
+ "type": "object",
},
{
- "items": {
- "$ref": "#/properties/filter/anyOf/1/anyOf/0/anyOf/0",
+ "additionalProperties": {
+ "not": {},
},
- "type": "array",
+ "propertyNames": {
+ "pattern": "^\\$",
+ },
+ "type": "object",
},
],
},
+ {
+ "$ref": "#/properties/filter/anyOf/1/anyOf/0/anyOf/0/additionalProperties/anyOf/0",
+ },
{
"additionalProperties": false,
"properties": {
@@ -118,58 +173,6 @@ describe('EntityContentBlueprint', () => {
],
"type": "object",
},
- {
- "additionalProperties": {
- "anyOf": [
- {
- "$ref": "#/properties/filter/anyOf/1/anyOf/0",
- },
- {
- "additionalProperties": false,
- "properties": {
- "$exists": {
- "type": "boolean",
- },
- },
- "required": [
- "$exists",
- ],
- "type": "object",
- },
- {
- "additionalProperties": false,
- "properties": {
- "$in": {
- "items": {
- "$ref": "#/properties/filter/anyOf/1/anyOf/0/anyOf/0",
- },
- "type": "array",
- },
- },
- "required": [
- "$in",
- ],
- "type": "object",
- },
- {
- "additionalProperties": false,
- "properties": {
- "$contains": {
- "$ref": "#/properties/filter/anyOf/1",
- },
- },
- "required": [
- "$contains",
- ],
- "type": "object",
- },
- ],
- },
- "propertyNames": {
- "pattern": "^(?!\\$).*$",
- },
- "type": "object",
- },
],
},
],
diff --git a/plugins/catalog-react/src/alpha/blueprints/EntityContextMenuItemBlueprint.test.tsx b/plugins/catalog-react/src/alpha/blueprints/EntityContextMenuItemBlueprint.test.tsx
index 55598f5de1..d92fcc1863 100644
--- a/plugins/catalog-react/src/alpha/blueprints/EntityContextMenuItemBlueprint.test.tsx
+++ b/plugins/catalog-react/src/alpha/blueprints/EntityContextMenuItemBlueprint.test.tsx
@@ -73,20 +73,75 @@ describe('EntityContextMenuItemBlueprint', () => {
{
"anyOf": [
{
- "type": [
- "string",
- "number",
- "boolean",
- ],
+ "additionalProperties": {
+ "anyOf": [
+ {
+ "type": [
+ "string",
+ "number",
+ "boolean",
+ ],
+ },
+ {
+ "additionalProperties": false,
+ "properties": {
+ "$exists": {
+ "type": "boolean",
+ },
+ },
+ "required": [
+ "$exists",
+ ],
+ "type": "object",
+ },
+ {
+ "additionalProperties": false,
+ "properties": {
+ "$in": {
+ "items": {
+ "$ref": "#/properties/filter/anyOf/0/anyOf/0/additionalProperties/anyOf/0",
+ },
+ "type": "array",
+ },
+ },
+ "required": [
+ "$in",
+ ],
+ "type": "object",
+ },
+ {
+ "additionalProperties": false,
+ "properties": {
+ "$contains": {
+ "$ref": "#/properties/filter",
+ },
+ },
+ "required": [
+ "$contains",
+ ],
+ "type": "object",
+ },
+ ],
+ },
+ "propertyNames": {
+ "pattern": "^(?!\\$).*$",
+ },
+ "type": "object",
},
{
- "items": {
- "$ref": "#/properties/filter/anyOf/0/anyOf/0",
+ "additionalProperties": {
+ "not": {},
},
- "type": "array",
+ "propertyNames": {
+ "pattern": "^\\$",
+ },
+ "type": "object",
},
],
},
+ {
+ "$ref": "#/properties/filter/anyOf/0/anyOf/0/additionalProperties/anyOf/0",
+ },
{
"additionalProperties": false,
"properties": {
@@ -129,58 +184,6 @@ describe('EntityContextMenuItemBlueprint', () => {
],
"type": "object",
},
- {
- "additionalProperties": {
- "anyOf": [
- {
- "$ref": "#/properties/filter/anyOf/0",
- },
- {
- "additionalProperties": false,
- "properties": {
- "$exists": {
- "type": "boolean",
- },
- },
- "required": [
- "$exists",
- ],
- "type": "object",
- },
- {
- "additionalProperties": false,
- "properties": {
- "$in": {
- "items": {
- "$ref": "#/properties/filter/anyOf/0/anyOf/0",
- },
- "type": "array",
- },
- },
- "required": [
- "$in",
- ],
- "type": "object",
- },
- {
- "additionalProperties": false,
- "properties": {
- "$contains": {
- "$ref": "#/properties/filter",
- },
- },
- "required": [
- "$contains",
- ],
- "type": "object",
- },
- ],
- },
- "propertyNames": {
- "pattern": "^(?!\\$).*$",
- },
- "type": "object",
- },
],
},
},
diff --git a/plugins/catalog-react/src/alpha/predicates/createEntityPredicateSchema.test.ts b/plugins/catalog-react/src/alpha/predicates/createEntityPredicateSchema.test.ts
index 4fdf921c1a..3553fa932b 100644
--- a/plugins/catalog-react/src/alpha/predicates/createEntityPredicateSchema.test.ts
+++ b/plugins/catalog-react/src/alpha/predicates/createEntityPredicateSchema.test.ts
@@ -16,84 +16,100 @@
import { z } from 'zod';
import { createEntityPredicateSchema } from './createEntityPredicateSchema';
+import { EntityPredicate } from './types';
describe('createEntityPredicateSchema', () => {
const schema = createEntityPredicateSchema(z);
- it.each([
- 'string',
- '',
- [],
- 1,
- { kind: 'component', 'spec.type': 'service' },
- { 'metadata.tags': { $in: ['java'] } },
- {
- $all: [
- { 'metadata.tags': { $contains: 'java' } },
- { 'metadata.tags': { $contains: 'spring' } },
- ],
- },
- { 'metadata.tags': ['java', 'spring'] },
- { 'metadata.tags': { $in: ['go'] } },
- { 'metadata.tags.0': 'java' },
- { $not: { 'metadata.tags': { $in: ['java'] } } },
- {
- $any: [{ kind: 'component', 'spec.type': 'service' }, { kind: 'group' }],
- },
- {
- relations: {
- $contains: { type: 'ownedBy', targetRef: 'group:default/g' },
+ describe('valid predicates', () => {
+ const predicates: EntityPredicate[] = [
+ 'string',
+ '',
+ 1,
+ { kind: 'component', 'spec.type': 'service' },
+ { 'metadata.tags': { $in: ['java'] } },
+ { 'metadata.tags': { $contains: 'java' } },
+ {
+ $all: [
+ { 'metadata.tags': { $contains: 'java' } },
+ { 'metadata.tags': { $contains: 'spring' } },
+ ],
},
- },
- {
- metadata: { $contains: { name: 'a' } },
- },
- { kind: 'component', 'spec.type': { $in: ['service', 'website'] } },
- {
- $any: [
- {
- $all: [
- {
- kind: 'component',
- 'spec.type': { $in: ['service', 'website'] },
- },
- ],
+ { 'metadata.tags': { $in: ['go'] } },
+ { 'metadata.tags.0': 'java' },
+ { $not: { 'metadata.tags': { $in: ['java'] } } },
+ {
+ $any: [
+ { kind: 'component', 'spec.type': 'service' },
+ { kind: 'group' },
+ ],
+ },
+ {
+ relations: {
+ $contains: { type: 'ownedBy', targetRef: 'group:default/g' },
},
- { $all: [{ kind: 'api', 'spec.type': 'grpc' }] },
- ],
- },
- { kind: 'component', 'spec.type': { $in: ['service'] } },
- { 'spec.owner': { $exists: true } },
- { 'spec.owner': { $exists: false } },
- { 'spec.type': 'service' },
- { $not: { 'spec.type': 'service' } },
- {
- kind: 'component',
- 'metadata.annotations.github.com/repo': { $exists: true },
- },
- { $all: [{ x: { $exists: true } }] },
- { $any: [{ x: { $exists: true } }] },
- { $not: { x: { $exists: true } } },
- { $not: { $all: [{ x: { $exists: true } }] } },
- ])('should accept valid predicate %j', predicate => {
- expect(schema.parse(predicate)).toEqual(predicate);
+ },
+ {
+ metadata: { $contains: { name: 'a' } },
+ },
+ { kind: 'component', 'spec.type': { $in: ['service', 'website'] } },
+ {
+ $any: [
+ {
+ $all: [
+ {
+ kind: 'component',
+ 'spec.type': { $in: ['service', 'website'] },
+ },
+ ],
+ },
+ { $all: [{ kind: 'api', 'spec.type': 'grpc' }] },
+ ],
+ },
+ { kind: 'component', 'spec.type': { $in: ['service'] } },
+ { 'spec.owner': { $exists: true } },
+ { 'spec.owner': { $exists: false } },
+ { 'spec.type': 'service' },
+ { $not: { 'spec.type': 'service' } },
+ {
+ kind: 'component',
+ 'metadata.annotations.github.com/repo': { $exists: true },
+ },
+ { $all: [{ x: { $exists: true } }] },
+ { $any: [{ x: { $exists: true } }] },
+ { $not: { x: { $exists: true } } },
+ { $not: { $all: [{ x: { $exists: true } }] } },
+ ];
+
+ it.each(predicates)('should accept valid predicate %j', predicate => {
+ expect(schema.parse(predicate)).toEqual(predicate);
+ });
});
- it.each([
- { kind: { 1: 'foo' } },
- { kind: { foo: 'bar' } },
- { kind: { $unknown: 'foo' } },
- { kind: { $in: 'foo' } },
- { kind: { $in: [{ x: 'foo' }] } },
- { kind: { $in: [{ x: 'foo' }] } },
- { 'spec.type': null },
- { $all: [{ x: { $unknown: true } }] },
- { $any: [{ x: { $unknown: true } }] },
- { $not: { x: { $unknown: true } } },
- { $not: { $all: [{ x: { $unknown: true } }] } },
- { $unknown: 'foo' },
- ])('should reject invalid predicate %j', predicate => {
- const result = schema.safeParse(predicate);
- expect(result.success).toBe(false);
+ describe('invalid predicates', () => {
+ const predicates: Array<
+ Exclude
+ > = [
+ [],
+ ['foo', 'bar'],
+ { kind: { 1: 'foo' } },
+ { kind: { foo: 'bar' } },
+ { kind: { $unknown: 'foo' } },
+ { kind: { $in: 'foo' } },
+ { kind: { $in: [{ x: 'foo' }] } },
+ { kind: { $in: [{ x: 'foo' }] } },
+ { 'spec.type': null },
+ { $all: [{ x: { $unknown: true } }] },
+ { $any: [{ x: { $unknown: true } }] },
+ { $not: { x: { $unknown: true } } },
+ { $not: { $all: [{ x: { $unknown: true } }] } },
+ { $unknown: 'foo' },
+ { 'metadata.tags': ['foo', 'bar'] },
+ ];
+
+ it.each(predicates)('should reject invalid predicate %j', predicate => {
+ const result = schema.safeParse(predicate);
+ expect(result.success).toBe(false);
+ });
});
});
diff --git a/plugins/catalog-react/src/alpha/predicates/createEntityPredicateSchema.ts b/plugins/catalog-react/src/alpha/predicates/createEntityPredicateSchema.ts
index cfd2e451df..3e31ec4d35 100644
--- a/plugins/catalog-react/src/alpha/predicates/createEntityPredicateSchema.ts
+++ b/plugins/catalog-react/src/alpha/predicates/createEntityPredicateSchema.ts
@@ -14,33 +14,44 @@
* limitations under the License.
*/
-import { EntityPredicate, EntityPredicateValue } from './types';
+import {
+ EntityPredicate,
+ EntityPredicateExpression,
+ EntityPredicatePrimitive,
+ EntityPredicateValue,
+} from './types';
import type { z as zImpl, ZodType } from 'zod';
/** @internal */
export function createEntityPredicateSchema(z: typeof zImpl) {
- const primitiveSchema = z.union([z.string(), z.number(), z.boolean()]);
-
- const comparableValueSchema = z.union([
- primitiveSchema,
- z.array(primitiveSchema),
- ]);
+ const primitiveSchema = z.union([
+ z.string(),
+ z.number(),
+ z.boolean(),
+ ]) as ZodType;
// eslint-disable-next-line prefer-const
let valuePredicateSchema: ZodType;
+ const expressionSchema = z.lazy(() =>
+ z.union([
+ z.record(z.string().regex(/^(?!\$).*$/), valuePredicateSchema),
+ z.record(z.string().regex(/^\$/), z.never()),
+ ]),
+ ) as ZodType;
+
const predicateSchema = z.lazy(() =>
z.union([
- comparableValueSchema,
+ expressionSchema,
+ primitiveSchema,
z.object({ $all: z.array(predicateSchema) }),
z.object({ $any: z.array(predicateSchema) }),
z.object({ $not: predicateSchema }),
- z.record(z.string().regex(/^(?!\$).*$/), valuePredicateSchema),
]),
) as ZodType;
valuePredicateSchema = z.union([
- comparableValueSchema,
+ primitiveSchema,
z.object({ $exists: z.boolean() }),
z.object({ $in: z.array(primitiveSchema) }),
z.object({ $contains: predicateSchema }),
diff --git a/plugins/catalog-react/src/alpha/predicates/types.ts b/plugins/catalog-react/src/alpha/predicates/types.ts
index a4a2e9199f..f19026c01b 100644
--- a/plugins/catalog-react/src/alpha/predicates/types.ts
+++ b/plugins/catalog-react/src/alpha/predicates/types.ts
@@ -34,7 +34,7 @@ export type EntityPredicateValue =
| EntityPredicatePrimitive
| { $exists: boolean }
| { $in: EntityPredicatePrimitive[] }
- | { $contains: EntityPredicateExpression };
+ | { $contains: EntityPredicate };
/** @alpha */
export type EntityPredicatePrimitive = string | number | boolean;
diff --git a/plugins/catalog-react/src/components/UserListPicker/useAllEntitiesCount.test.tsx b/plugins/catalog-react/src/components/UserListPicker/useAllEntitiesCount.test.tsx
index 0ba231b72a..07eaa479fd 100644
--- a/plugins/catalog-react/src/components/UserListPicker/useAllEntitiesCount.test.tsx
+++ b/plugins/catalog-react/src/components/UserListPicker/useAllEntitiesCount.test.tsx
@@ -68,15 +68,15 @@ describe('useAllEntitiesCount', () => {
),
});
- await waitFor(() =>
+ await waitFor(() => {
expect(mockCatalogApi.queryEntities).toHaveBeenCalledWith({
filter: {
'relations.ownedBy': ['user:default/owner'],
},
limit: 0,
- }),
- );
- expect(result.current).toEqual({ count: 10, loading: false });
+ });
+ expect(result.current).toEqual({ count: 10, loading: false });
+ });
});
it(`shouldn't invoke the endpoint at startup, when filters are missing`, async () => {
diff --git a/plugins/catalog-unprocessed-entities-common/CHANGELOG.md b/plugins/catalog-unprocessed-entities-common/CHANGELOG.md
index 67dfa74dae..2a9cca8511 100644
--- a/plugins/catalog-unprocessed-entities-common/CHANGELOG.md
+++ b/plugins/catalog-unprocessed-entities-common/CHANGELOG.md
@@ -1,5 +1,20 @@
# @backstage/plugin-catalog-unprocessed-entities-common
+## 0.0.12
+
+### Patch Changes
+
+- df4d646: Moved types, API and client to the common package, allowing both frontend and
+ backend plugins to use the `CatalogUnprocessedEntitiesClient`.
+
+ The following types, clients and interfaces have been deprecated and should be
+ imported from the `@backstage/plugin-catalog-unprocessed-entities-common` instead:
+ `CatalogUnprocessedEntitiesApi`, `CatalogUnprocessedEntitiesApiResponse`, `UnprocessedEntity`,
+ `UnprocessedEntityCache`, `UnprocessedEntityError`, `CatalogUnprocessedEntitiesClient`.
+
+ All those types, clients and interfaces are re-exported temporarily in the
+ `@backstage/plugin-catalog-unprocessed-entities` package until cleaned up.
+
## 0.0.12-next.0
### Patch Changes
diff --git a/plugins/catalog-unprocessed-entities-common/package.json b/plugins/catalog-unprocessed-entities-common/package.json
index c20e1c142a..58423cad91 100644
--- a/plugins/catalog-unprocessed-entities-common/package.json
+++ b/plugins/catalog-unprocessed-entities-common/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-unprocessed-entities-common",
- "version": "0.0.12-next.0",
+ "version": "0.0.12",
"description": "Common functionalities for the catalog-unprocessed-entities plugin",
"backstage": {
"role": "common-library",
diff --git a/plugins/catalog-unprocessed-entities/CHANGELOG.md b/plugins/catalog-unprocessed-entities/CHANGELOG.md
index b48f12b4dd..47be6beb8b 100644
--- a/plugins/catalog-unprocessed-entities/CHANGELOG.md
+++ b/plugins/catalog-unprocessed-entities/CHANGELOG.md
@@ -1,5 +1,27 @@
# @backstage/plugin-catalog-unprocessed-entities
+## 0.2.24
+
+### Patch Changes
+
+- d02db50: Remove unnecessary use of `compatWrapper` and `convertLegacyRouteRef`(s) for the new frontend system.
+- df4d646: Moved types, API and client to the common package, allowing both frontend and
+ backend plugins to use the `CatalogUnprocessedEntitiesClient`.
+
+ The following types, clients and interfaces have been deprecated and should be
+ imported from the `@backstage/plugin-catalog-unprocessed-entities-common` instead:
+ `CatalogUnprocessedEntitiesApi`, `CatalogUnprocessedEntitiesApiResponse`, `UnprocessedEntity`,
+ `UnprocessedEntityCache`, `UnprocessedEntityError`, `CatalogUnprocessedEntitiesClient`.
+
+ All those types, clients and interfaces are re-exported temporarily in the
+ `@backstage/plugin-catalog-unprocessed-entities` package until cleaned up.
+
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.13.2
+ - @backstage/core-components@0.18.4
+ - @backstage/core-plugin-api@1.12.1
+ - @backstage/plugin-catalog-unprocessed-entities-common@0.0.12
+
## 0.2.24-next.1
### Patch Changes
diff --git a/plugins/catalog-unprocessed-entities/package.json b/plugins/catalog-unprocessed-entities/package.json
index 0e8620df80..79dc840a03 100644
--- a/plugins/catalog-unprocessed-entities/package.json
+++ b/plugins/catalog-unprocessed-entities/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-unprocessed-entities",
- "version": "0.2.24-next.1",
+ "version": "0.2.24",
"backstage": {
"role": "frontend-plugin",
"pluginId": "catalog-unprocessed-entities",
@@ -50,6 +50,7 @@
"test": "backstage-cli package test"
},
"dependencies": {
+ "@backstage/core-compat-api": "workspace:^",
"@backstage/core-components": "workspace:^",
"@backstage/core-plugin-api": "workspace:^",
"@backstage/errors": "workspace:^",
diff --git a/plugins/catalog/CHANGELOG.md b/plugins/catalog/CHANGELOG.md
index 32dd520819..89f9bcdefe 100644
--- a/plugins/catalog/CHANGELOG.md
+++ b/plugins/catalog/CHANGELOG.md
@@ -1,5 +1,50 @@
# @backstage/plugin-catalog
+## 1.32.1
+
+### Patch Changes
+
+- f3f84f1: Minor extension type updates after frontend API bump
+- d02db50: Remove unnecessary use of `compatWrapper` and `convertLegacyRouteRef`(s) for the new frontend system.
+- 91f5ed8: Fixed `catalogAboutEntityCard` to filter icon links before calling useProps(), preventing side effects from hooks in filtered-out links
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.13.2
+ - @backstage/core-components@0.18.4
+ - @backstage/plugin-catalog-react@1.21.4
+ - @backstage/plugin-search-react@1.10.1
+ - @backstage/core-plugin-api@1.12.1
+ - @backstage/core-compat-api@0.5.5
+ - @backstage/integration-react@1.2.13
+ - @backstage/plugin-permission-react@0.4.39
+ - @backstage/plugin-scaffolder-common@1.7.4
+ - @backstage/plugin-techdocs-react@1.3.6
+
+## 1.32.1-next.1
+
+### Patch Changes
+
+- f3f84f1: Minor extension type updates after frontend API bump
+- 91f5ed8: Fixed `catalogAboutEntityCard` to filter icon links before calling useProps(), preventing side effects from hooks in filtered-out links
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.13.2-next.1
+ - @backstage/plugin-catalog-react@1.21.4-next.2
+ - @backstage/core-components@0.18.4-next.2
+ - @backstage/catalog-client@1.12.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/core-compat-api@0.5.5-next.0
+ - @backstage/core-plugin-api@1.12.1-next.0
+ - @backstage/errors@1.2.7
+ - @backstage/integration-react@1.2.13-next.0
+ - @backstage/types@1.2.2
+ - @backstage/version-bridge@1.0.11
+ - @backstage/plugin-catalog-common@1.1.7
+ - @backstage/plugin-permission-react@0.4.39-next.0
+ - @backstage/plugin-scaffolder-common@1.7.4-next.0
+ - @backstage/plugin-search-common@1.2.21
+ - @backstage/plugin-search-react@1.10.1-next.0
+ - @backstage/plugin-techdocs-common@0.1.1
+ - @backstage/plugin-techdocs-react@1.3.6-next.0
+
## 1.32.1-next.0
### Patch Changes
diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json
index 3901b11b29..f2e4e1f610 100644
--- a/plugins/catalog/package.json
+++ b/plugins/catalog/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog",
- "version": "1.32.1-next.0",
+ "version": "1.32.1",
"description": "The Backstage plugin for browsing the Backstage catalog",
"backstage": {
"role": "frontend-plugin",
diff --git a/plugins/catalog/src/alpha/pages.test.tsx b/plugins/catalog/src/alpha/pages.test.tsx
index cc83b9168b..0b35e63979 100644
--- a/plugins/catalog/src/alpha/pages.test.tsx
+++ b/plugins/catalog/src/alpha/pages.test.tsx
@@ -721,18 +721,27 @@ describe('Entity page', () => {
);
const { disabled } = params.useProps();
- await waitFor(async () => {
- await userEvent.click(screen.getByTestId('menu-button'));
- expect(screen.getByText('Test Title')).toBeInTheDocument();
- expect(screen.getByText('Test Icon')).toBeInTheDocument();
- const listItem = screen.getByText('Test Title').closest('li');
- expect(listItem).toHaveAttribute('aria-disabled', disabled.toString());
- if (!disabled) {
- await userEvent.click(screen.getByText('Test Title'));
- }
- expect(onClickMock).toHaveBeenCalledTimes(disabled ? 0 : 1);
- });
+ // Wait for entity to load first
+ await waitFor(() =>
+ expect(screen.getByText(/artist-lookup/)).toBeInTheDocument(),
+ );
+
+ await userEvent.click(screen.getByTestId('menu-button'));
+
+ // Wait for menu to open
+ await waitFor(() =>
+ expect(screen.getByText('Test Title')).toBeInTheDocument(),
+ );
+
+ expect(screen.getByText('Test Icon')).toBeInTheDocument();
+ const listItem = screen.getByText('Test Title').closest('li');
+ expect(listItem).toHaveAttribute('aria-disabled', disabled.toString());
+ if (!disabled) {
+ await userEvent.click(screen.getByText('Test Title'));
+ }
+
+ expect(onClickMock).toHaveBeenCalledTimes(disabled ? 0 : 1);
});
it.each([
diff --git a/plugins/config-schema/CHANGELOG.md b/plugins/config-schema/CHANGELOG.md
index 2dba805a25..1329d91732 100644
--- a/plugins/config-schema/CHANGELOG.md
+++ b/plugins/config-schema/CHANGELOG.md
@@ -1,5 +1,13 @@
# @backstage/plugin-config-schema
+## 0.1.75
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-components@0.18.4
+ - @backstage/core-plugin-api@1.12.1
+
## 0.1.75-next.0
### Patch Changes
diff --git a/plugins/config-schema/package.json b/plugins/config-schema/package.json
index 1018d9baab..46b051aca6 100644
--- a/plugins/config-schema/package.json
+++ b/plugins/config-schema/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-config-schema",
- "version": "0.1.75-next.0",
+ "version": "0.1.75",
"description": "A Backstage plugin that lets you browse the configuration schema of your app",
"backstage": {
"role": "frontend-plugin",
diff --git a/plugins/devtools-backend/CHANGELOG.md b/plugins/devtools-backend/CHANGELOG.md
index d1ae56ddac..0dc5503884 100644
--- a/plugins/devtools-backend/CHANGELOG.md
+++ b/plugins/devtools-backend/CHANGELOG.md
@@ -1,5 +1,52 @@
# @backstage/plugin-devtools-backend
+## 0.5.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-defaults@0.14.1-next.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/cli-common@0.1.16
+ - @backstage/config@1.3.6
+ - @backstage/config-loader@1.10.7
+ - @backstage/errors@1.2.7
+ - @backstage/types@1.2.2
+ - @backstage/plugin-devtools-common@0.1.20
+ - @backstage/plugin-permission-common@0.9.3
+ - @backstage/plugin-permission-node@0.10.7
+
+## 0.5.12
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- 291bf9d: Added scheduled tasks UI feature for the DevTools plugin
+- Updated dependencies
+ - @backstage/backend-defaults@0.14.0
+ - @backstage/plugin-permission-node@0.10.7
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/cli-common@0.1.16
+ - @backstage/config-loader@1.10.7
+ - @backstage/plugin-devtools-common@0.1.20
+
+## 0.5.12-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/backend-defaults@0.14.0-next.1
+ - @backstage/plugin-permission-node@0.10.7-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config-loader@1.10.7-next.1
+ - @backstage/cli-common@0.1.16-next.2
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/types@1.2.2
+ - @backstage/plugin-devtools-common@0.1.19
+ - @backstage/plugin-permission-common@0.9.3
+
## 0.5.12-next.0
### Patch Changes
diff --git a/plugins/devtools-backend/package.json b/plugins/devtools-backend/package.json
index f420652580..3f9baf249f 100644
--- a/plugins/devtools-backend/package.json
+++ b/plugins/devtools-backend/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-devtools-backend",
- "version": "0.5.12-next.0",
+ "version": "0.5.13-next.0",
"backstage": {
"role": "backend-plugin",
"pluginId": "devtools",
diff --git a/plugins/devtools-backend/src/plugin.ts b/plugins/devtools-backend/src/plugin.ts
index d3fefda343..d7ac3ff6d9 100644
--- a/plugins/devtools-backend/src/plugin.ts
+++ b/plugins/devtools-backend/src/plugin.ts
@@ -20,6 +20,10 @@ import {
} from '@backstage/backend-plugin-api';
import { createRouter } from './service/router';
import { devToolsPermissions } from '@backstage/plugin-devtools-common';
+import {
+ devToolsTaskSchedulerReadPermission,
+ devToolsTaskSchedulerCreatePermission,
+} from '@backstage/plugin-devtools-common/alpha';
/**
* DevTools backend plugin
@@ -61,7 +65,11 @@ export const devtoolsPlugin = createBackendPlugin({
path: '/health',
allow: 'unauthenticated',
});
- permissionsRegistry.addPermissions(devToolsPermissions);
+ permissionsRegistry.addPermissions([
+ ...devToolsPermissions,
+ devToolsTaskSchedulerReadPermission,
+ devToolsTaskSchedulerCreatePermission,
+ ]);
},
});
},
diff --git a/plugins/devtools-common/CHANGELOG.md b/plugins/devtools-common/CHANGELOG.md
index 6eeced0711..baa07b0bb7 100644
--- a/plugins/devtools-common/CHANGELOG.md
+++ b/plugins/devtools-common/CHANGELOG.md
@@ -1,5 +1,11 @@
# @backstage/plugin-devtools-common
+## 0.1.20
+
+### Patch Changes
+
+- 291bf9d: Added scheduled tasks UI feature for the DevTools plugin
+
## 0.1.19
### Patch Changes
diff --git a/plugins/devtools-common/package.json b/plugins/devtools-common/package.json
index cb21e9ed0a..7ece3371fa 100644
--- a/plugins/devtools-common/package.json
+++ b/plugins/devtools-common/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-devtools-common",
- "version": "0.1.19",
+ "version": "0.1.20",
"description": "Common functionalities for the devtools plugin",
"backstage": {
"role": "common-library",
@@ -13,10 +13,7 @@
]
},
"publishConfig": {
- "access": "public",
- "main": "dist/index.cjs.js",
- "module": "dist/index.esm.js",
- "types": "dist/index.d.ts"
+ "access": "public"
},
"homepage": "https://backstage.io",
"repository": {
@@ -26,8 +23,23 @@
},
"license": "Apache-2.0",
"sideEffects": false,
+ "exports": {
+ ".": "./src/index.ts",
+ "./alpha": "./src/alpha.ts",
+ "./package.json": "./package.json"
+ },
"main": "src/index.ts",
"types": "src/index.ts",
+ "typesVersions": {
+ "*": {
+ "alpha": [
+ "src/alpha.ts"
+ ],
+ "package.json": [
+ "package.json"
+ ]
+ }
+ },
"files": [
"dist"
],
diff --git a/plugins/devtools-common/report-alpha.api.md b/plugins/devtools-common/report-alpha.api.md
new file mode 100644
index 0000000000..3c3b7ff89e
--- /dev/null
+++ b/plugins/devtools-common/report-alpha.api.md
@@ -0,0 +1,69 @@
+## API Report File for "@backstage/plugin-devtools-common"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+import { BasicPermission } from '@backstage/plugin-permission-common';
+import { JsonObject } from '@backstage/types';
+
+// @alpha (undocumented)
+export const devToolsTaskSchedulerCreatePermission: BasicPermission;
+
+// @alpha (undocumented)
+export const devToolsTaskSchedulerReadPermission: BasicPermission;
+
+// @alpha (undocumented)
+export type ScheduledTasks = {
+ scheduledTasks?: TaskApiTasksResponse[];
+ error?: string;
+};
+
+// @alpha
+export interface TaskApiTasksResponse {
+ // (undocumented)
+ pluginId: string;
+ // (undocumented)
+ scope: 'global' | 'local';
+ // (undocumented)
+ settings: {
+ version: number;
+ } & JsonObject;
+ // (undocumented)
+ taskId: string;
+ // (undocumented)
+ taskState:
+ | {
+ status: 'running';
+ startedAt: string;
+ timesOutAt?: string;
+ lastRunError?: string;
+ lastRunEndedAt?: string;
+ }
+ | {
+ status: 'idle';
+ startsAt?: string;
+ lastRunError?: string;
+ lastRunEndedAt?: string;
+ }
+ | null;
+ // (undocumented)
+ workerState:
+ | {
+ status: 'initial-wait';
+ }
+ | {
+ status: 'idle';
+ }
+ | {
+ status: 'running';
+ }
+ | null;
+}
+
+// @alpha (undocumented)
+export type TriggerScheduledTask = {
+ error?: string;
+};
+
+// (No @packageDocumentation comment for this package)
+```
diff --git a/plugins/devtools-common/src/alpha.ts b/plugins/devtools-common/src/alpha.ts
new file mode 100644
index 0000000000..984967c4f3
--- /dev/null
+++ b/plugins/devtools-common/src/alpha.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export {
+ devToolsTaskSchedulerReadPermission,
+ devToolsTaskSchedulerCreatePermission,
+} from './permissions';
+export type {
+ ScheduledTasks,
+ TaskApiTasksResponse,
+ TriggerScheduledTask,
+} from './types';
diff --git a/plugins/devtools-common/src/index.ts b/plugins/devtools-common/src/index.ts
index be7426394b..88bc0d545f 100644
--- a/plugins/devtools-common/src/index.ts
+++ b/plugins/devtools-common/src/index.ts
@@ -20,5 +20,19 @@
* @packageDocumentation
*/
-export * from './types';
-export * from './permissions';
+export type {
+ ConfigError,
+ ConfigInfo,
+ DevToolsInfo,
+ Endpoint,
+ ExternalDependency,
+ PackageDependency,
+} from './types';
+export { ExternalDependencyStatus } from './types';
+export {
+ devToolsAdministerPermission,
+ devToolsConfigReadPermission,
+ devToolsExternalDependenciesReadPermission,
+ devToolsInfoReadPermission,
+ devToolsPermissions,
+} from './permissions';
diff --git a/plugins/devtools-common/src/permissions.ts b/plugins/devtools-common/src/permissions.ts
index ba464f7d80..42a7efe777 100644
--- a/plugins/devtools-common/src/permissions.ts
+++ b/plugins/devtools-common/src/permissions.ts
@@ -48,6 +48,22 @@ export const devToolsExternalDependenciesReadPermission = createPermission({
attributes: { action: 'read' },
});
+/**
+ * @alpha
+ */
+export const devToolsTaskSchedulerReadPermission = createPermission({
+ name: 'devtools.scheduler.read',
+ attributes: { action: 'read' },
+});
+
+/**
+ * @alpha
+ */
+export const devToolsTaskSchedulerCreatePermission = createPermission({
+ name: 'devtools.scheduler.trigger',
+ attributes: { action: 'update' },
+});
+
/**
* List of all Devtools permissions
*
diff --git a/plugins/devtools-common/src/types.ts b/plugins/devtools-common/src/types.ts
index f1e60d9c2d..dc35188fde 100644
--- a/plugins/devtools-common/src/types.ts
+++ b/plugins/devtools-common/src/types.ts
@@ -16,7 +16,7 @@
/* We want to maintain the same information as an enum, so we disable the redeclaration warning */
/* eslint-disable @typescript-eslint/no-redeclare */
-import { JsonValue } from '@backstage/types';
+import { JsonObject, JsonValue } from '@backstage/types';
/** @public */
export type Endpoint = {
@@ -82,3 +82,54 @@ export type ConfigError = {
messages?: string[];
stack?: string;
};
+
+/**
+ * The shape of a task definition as returned by the service's REST API.
+ * This is a duplication of the below:
+ * @see https://github.com/backstage/backstage/blob/master/packages/backend-defaults/src/entrypoints/scheduler/lib/types.ts
+ *
+ * @alpha
+ */
+export interface TaskApiTasksResponse {
+ taskId: string;
+ pluginId: string;
+ scope: 'global' | 'local';
+ settings: { version: number } & JsonObject;
+ taskState:
+ | {
+ status: 'running';
+ startedAt: string;
+ timesOutAt?: string;
+ lastRunError?: string;
+ lastRunEndedAt?: string;
+ }
+ | {
+ status: 'idle';
+ startsAt?: string;
+ lastRunError?: string;
+ lastRunEndedAt?: string;
+ }
+ | null;
+ workerState:
+ | {
+ status: 'initial-wait';
+ }
+ | {
+ status: 'idle';
+ }
+ | {
+ status: 'running';
+ }
+ | null;
+}
+
+/** @alpha */
+export type ScheduledTasks = {
+ scheduledTasks?: TaskApiTasksResponse[];
+ error?: string;
+};
+
+/** @alpha */
+export type TriggerScheduledTask = {
+ error?: string;
+};
diff --git a/plugins/devtools/CHANGELOG.md b/plugins/devtools/CHANGELOG.md
index 4bc547cbbe..8d842ef87a 100644
--- a/plugins/devtools/CHANGELOG.md
+++ b/plugins/devtools/CHANGELOG.md
@@ -1,5 +1,19 @@
# @backstage/plugin-devtools
+## 0.1.34
+
+### Patch Changes
+
+- d02db50: Remove unnecessary use of `compatWrapper` and `convertLegacyRouteRef`(s) for the new frontend system.
+- 291bf9d: Added scheduled tasks UI feature for the DevTools plugin
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.13.2
+ - @backstage/core-components@0.18.4
+ - @backstage/core-plugin-api@1.12.1
+ - @backstage/plugin-devtools-common@0.1.20
+ - @backstage/core-compat-api@0.5.5
+ - @backstage/plugin-permission-react@0.4.39
+
## 0.1.34-next.0
### Patch Changes
diff --git a/plugins/devtools/README.md b/plugins/devtools/README.md
index aef25ae21c..967f3693a6 100644
--- a/plugins/devtools/README.md
+++ b/plugins/devtools/README.md
@@ -34,6 +34,12 @@ Lists the configuration being used by your current running Backstage instance.
+### Scheduled Tasks
+
+Scheduled tasks can be viewed and triggered under the `Scheduled Tasks` tab. [See below to configure](#scheduled-tasks-configuration).
+
+
+
## Optional Features
The DevTools plugin can be setup with other tabs with additional helpful features.
@@ -489,3 +495,14 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
apt-get update && \
apt-get install -y ... iputils-ping
```
+
+### Scheduled Tasks Configuration
+
+Scheduled tasks can be viewed and triggered under the `Scheduled Tasks` tab. You first must add the list of plugins for scheduled tasks to your config:
+
+```yaml
+devTools:
+ scheduledTasks:
+ plugins:
+ - catalog
+```
diff --git a/plugins/devtools/config.d.ts b/plugins/devtools/config.d.ts
new file mode 100644
index 0000000000..841bb0b042
--- /dev/null
+++ b/plugins/devtools/config.d.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export interface Config {
+ devTools?: {
+ /**
+ * Scheduled tasks configuration
+ * @visibility frontend
+ */
+ scheduledTasks?: {
+ /**
+ * A list of plugin IDs to select from, e.g. ['catalog', 'scaffolder']
+ * @visibility frontend
+ */
+ plugins: string[];
+ };
+ };
+}
diff --git a/plugins/devtools/docs/devtools-scheduled-tasks-tab.png b/plugins/devtools/docs/devtools-scheduled-tasks-tab.png
new file mode 100644
index 0000000000..90e5e57d83
Binary files /dev/null and b/plugins/devtools/docs/devtools-scheduled-tasks-tab.png differ
diff --git a/plugins/devtools/package.json b/plugins/devtools/package.json
index b62712b1e2..c12374f779 100644
--- a/plugins/devtools/package.json
+++ b/plugins/devtools/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-devtools",
- "version": "0.1.34-next.0",
+ "version": "0.1.34",
"backstage": {
"role": "frontend-plugin",
"pluginId": "devtools",
@@ -40,7 +40,8 @@
}
},
"files": [
- "dist"
+ "dist",
+ "config.d.ts"
],
"scripts": {
"build": "backstage-cli package build",
@@ -52,6 +53,7 @@
"test": "backstage-cli package test"
},
"dependencies": {
+ "@backstage/core-compat-api": "workspace:^",
"@backstage/core-components": "workspace:^",
"@backstage/core-plugin-api": "workspace:^",
"@backstage/errors": "workspace:^",
@@ -62,6 +64,7 @@
"@material-ui/core": "^4.9.13",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "^4.0.0-alpha.57",
+ "lodash": "^4.17.21",
"react-json-view": "^1.21.3",
"react-use": "^17.2.4"
},
@@ -69,6 +72,7 @@
"@backstage/cli": "workspace:^",
"@backstage/dev-utils": "workspace:^",
"@testing-library/jest-dom": "^6.0.0",
+ "@types/lodash": "^4.14.151",
"@types/react": "^18.0.0",
"react": "^18.0.2",
"react-dom": "^18.0.2",
@@ -84,5 +88,6 @@
"@types/react": {
"optional": true
}
- }
+ },
+ "configSchema": "config.d.ts"
}
diff --git a/plugins/devtools/report.api.md b/plugins/devtools/report.api.md
index 70fbcaadb7..5f9a46016d 100644
--- a/plugins/devtools/report.api.md
+++ b/plugins/devtools/report.api.md
@@ -9,6 +9,7 @@ import { JSX as JSX_2 } from 'react/jsx-runtime';
import { ReactNode } from 'react';
import { RouteRef } from '@backstage/core-plugin-api';
import { TabProps } from '@material-ui/core/Tab';
+import { TaskApiTasksResponse } from '@backstage/plugin-devtools-common/alpha';
// @public (undocumented)
export const ConfigContent: () => JSX_2.Element;
@@ -49,6 +50,16 @@ export const ExternalDependenciesContent: () => JSX_2.Element;
// @public (undocumented)
export const InfoContent: () => JSX_2.Element;
+// @public (undocumented)
+export const ScheduledTaskDetailPanel: ({
+ rowData,
+}: {
+ rowData: TaskApiTasksResponse;
+}) => JSX_2.Element;
+
+// @public (undocumented)
+export const ScheduledTasksContent: () => JSX_2.Element;
+
// @public (undocumented)
export type SubRoute = {
path: string;
diff --git a/plugins/devtools/src/api/DevToolsApi.ts b/plugins/devtools/src/api/DevToolsApi.ts
index ff58a4ea16..4fc579ee06 100644
--- a/plugins/devtools/src/api/DevToolsApi.ts
+++ b/plugins/devtools/src/api/DevToolsApi.ts
@@ -20,6 +20,10 @@ import {
DevToolsInfo,
ExternalDependency,
} from '@backstage/plugin-devtools-common';
+import {
+ ScheduledTasks,
+ TriggerScheduledTask,
+} from '@backstage/plugin-devtools-common/alpha';
export const devToolsApiRef = createApiRef({
id: 'plugin.devtools.service',
@@ -29,4 +33,9 @@ export interface DevToolsApi {
getConfig(): Promise;
getExternalDependencies(): Promise;
getInfo(): Promise;
+ getScheduledTasksByPlugin(plugin: string): Promise;
+ triggerScheduledTask(
+ plugin: string,
+ taskId: string,
+ ): Promise;
}
diff --git a/plugins/devtools/src/api/DevToolsClient.ts b/plugins/devtools/src/api/DevToolsClient.ts
index e0b387a6ca..cd4f53fa81 100644
--- a/plugins/devtools/src/api/DevToolsClient.ts
+++ b/plugins/devtools/src/api/DevToolsClient.ts
@@ -20,6 +20,10 @@ import {
DevToolsInfo,
ExternalDependency,
} from '@backstage/plugin-devtools-common';
+import {
+ ScheduledTasks,
+ TriggerScheduledTask,
+} from '@backstage/plugin-devtools-common/alpha';
import { ResponseError } from '@backstage/errors';
import { DevToolsApi } from './DevToolsApi';
@@ -42,6 +46,45 @@ export class DevToolsClient implements DevToolsApi {
return configInfo;
}
+ public async getScheduledTasksByPlugin(
+ plugin: string,
+ ): Promise {
+ const baseUrl = `${await this.discoveryApi.getBaseUrl(plugin)}/`;
+ const url = new URL('.backstage/scheduler/v1/tasks', baseUrl);
+
+ const response = await this.fetchApi.fetch(url.toString());
+
+ if (!response.ok) {
+ throw await ResponseError.fromResponse(response);
+ }
+
+ const scheduledTasks = await response.json();
+ return {
+ scheduledTasks: scheduledTasks.tasks,
+ };
+ }
+
+ public async triggerScheduledTask(
+ plugin: string,
+ taskId: string,
+ ): Promise {
+ const baseUrl = `${await this.discoveryApi.getBaseUrl(plugin)}/`;
+ const url = new URL(
+ `.backstage/scheduler/v1/tasks/${taskId}/trigger`,
+ baseUrl,
+ );
+
+ const response = await this.fetchApi.fetch(url.toString(), {
+ method: 'POST',
+ });
+
+ if (!response.ok) {
+ throw await ResponseError.fromResponse(response);
+ }
+
+ return response.json() as Promise;
+ }
+
public async getExternalDependencies(): Promise<
ExternalDependency[] | undefined
> {
diff --git a/plugins/devtools/src/components/Content/ScheduledTasksContent/ScheduledTaskDetailedPanel.tsx b/plugins/devtools/src/components/Content/ScheduledTasksContent/ScheduledTaskDetailedPanel.tsx
new file mode 100644
index 0000000000..a29e1eb10e
--- /dev/null
+++ b/plugins/devtools/src/components/Content/ScheduledTasksContent/ScheduledTaskDetailedPanel.tsx
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { TaskApiTasksResponse } from '@backstage/plugin-devtools-common/alpha';
+import Grid from '@material-ui/core/Grid';
+import Typography from '@material-ui/core/Typography';
+import Box from '@material-ui/core/Box';
+import { createStyles, makeStyles, Theme } from '@material-ui/core/styles';
+import Alert from '@material-ui/lab/Alert';
+
+const useStyles = makeStyles((theme: Theme) =>
+ createStyles({
+ detailPanel: {
+ padding: theme.spacing(2),
+ backgroundColor: theme.palette.background.default,
+ },
+ detailLabel: {
+ fontWeight: 'bold',
+ marginRight: theme.spacing(1),
+ },
+ errorIcon: {
+ color: theme.palette.error.main,
+ marginRight: theme.spacing(1),
+ fontSize: '1.2rem',
+ },
+ detailPanelAlert: {
+ marginBottom: theme.spacing(2),
+ },
+ }),
+);
+
+/** @public */
+export const ScheduledTaskDetailPanel = ({
+ rowData,
+}: {
+ rowData: TaskApiTasksResponse;
+}) => {
+ const classes = useStyles();
+ const lastRunError = rowData.taskState?.lastRunError;
+
+ const DetailItem = ({ title, value }: { title: string; value: any }) => (
+ <>
+
+
+ {title}:
+
+
+
+
+ {value || 'N/A'}
+
+
+
+ );
+
+ return (
+
+ {lastRunError && (
+
+ Last Run Error: {lastRunError}
+
+ )}
+
+
+
+
+ );
+};
diff --git a/plugins/devtools/src/components/Content/ScheduledTasksContent/ScheduledTasksContent.tsx b/plugins/devtools/src/components/Content/ScheduledTasksContent/ScheduledTasksContent.tsx
new file mode 100644
index 0000000000..2d4abd56ef
--- /dev/null
+++ b/plugins/devtools/src/components/Content/ScheduledTasksContent/ScheduledTasksContent.tsx
@@ -0,0 +1,307 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { useState } from 'react';
+import Box from '@material-ui/core/Box';
+import Typography from '@material-ui/core/Typography';
+import IconButton from '@material-ui/core/IconButton';
+import Tooltip from '@material-ui/core/Tooltip';
+import Autocomplete from '@material-ui/lab/Autocomplete';
+import TextField from '@material-ui/core/TextField';
+import { makeStyles, createStyles, Theme } from '@material-ui/core/styles';
+import {
+ ErrorPanel,
+ Progress,
+ Table,
+ TableColumn,
+} from '@backstage/core-components';
+import Alert from '@material-ui/lab/Alert';
+import { useScheduledTasks, useTriggerScheduledTask } from '../../../hooks';
+import { TaskApiTasksResponse } from '@backstage/plugin-devtools-common/alpha';
+import { alertApiRef, configApiRef, useApi } from '@backstage/core-plugin-api';
+import RefreshIcon from '@material-ui/icons/Refresh';
+import NightsStay from '@material-ui/icons/NightsStay';
+import ErrorIcon from '@material-ui/icons/Error';
+import CircularProgress from '@material-ui/core/CircularProgress';
+import { ScheduledTaskDetailPanel } from './ScheduledTaskDetailedPanel';
+import { RequirePermission } from '@backstage/plugin-permission-react';
+import { devToolsTaskSchedulerCreatePermission } from '@backstage/plugin-devtools-common/alpha';
+
+const useStyles = makeStyles((theme: Theme) =>
+ createStyles({
+ paperStyle: {
+ display: 'flex',
+ marginBottom: theme.spacing(2),
+ },
+ flexContainer: {
+ display: 'flex',
+ flexDirection: 'row',
+ padding: 0,
+ },
+ formControl: {
+ minWidth: 240,
+ marginBottom: theme.spacing(2),
+ },
+ detailPanel: {
+ padding: theme.spacing(2),
+ backgroundColor: theme.palette.background.default,
+ },
+ detailLabel: {
+ fontWeight: 'bold',
+ marginRight: theme.spacing(1),
+ },
+ errorIcon: {
+ color: theme.palette.error.main,
+ marginRight: theme.spacing(1),
+ fontSize: '1.2rem',
+ },
+ detailPanelAlert: {
+ marginBottom: theme.spacing(2),
+ },
+ }),
+);
+
+const StatusDisplay = ({
+ icon,
+ text,
+}: {
+ icon: React.ReactNode;
+ text: string;
+}) => (
+
+ {icon}
+
+ {text}
+
+
+);
+
+/** @public */
+export const ScheduledTasksContent = () => {
+ const classes = useStyles();
+ const configApi = useApi(configApiRef);
+ const alertApi = useApi(alertApiRef);
+ const plugins =
+ configApi.getOptionalStringArray('devTools.scheduledTasks.plugins') || [];
+ const [selectedPlugin, setSelectedPlugin] = useState(plugins[0] || '');
+ const { scheduledTasks, loading, error } = useScheduledTasks(selectedPlugin);
+ const { triggerTask, isTriggering, triggerError } = useTriggerScheduledTask();
+
+ const [inputValue, setInputValue] = useState('');
+
+ const handleAutocompleteChange = (_event: any, newValue: string | null) => {
+ setSelectedPlugin(newValue || '');
+ };
+
+ const handleCommitChange = () => {
+ if (inputValue !== selectedPlugin) {
+ setSelectedPlugin(inputValue);
+ }
+ };
+
+ const handleKeyDown = (event: React.KeyboardEvent) => {
+ if (event.key === 'Enter') {
+ handleCommitChange();
+ // Prevent Autocomplete's default behavior (which might select a filtered item)
+ event.preventDefault();
+ event.stopPropagation();
+ }
+ };
+
+ if (!plugins || plugins.length === 0) {
+ return (
+
+ No plugins configured for scheduled tasks. Please configure
+ `devTools.scheduledTasks.plugins` in app-config.yaml.
+
+ );
+ }
+
+ const columns: TableColumn[] = [
+ {
+ title: 'Task ID',
+ field: 'taskId',
+ width: '35%',
+ render: (rowData: TaskApiTasksResponse) => {
+ const errorIconStyle: React.CSSProperties = {
+ color: '#f44336',
+ marginRight: '8px',
+ fontSize: '1.2rem',
+ verticalAlign: 'middle',
+ };
+
+ return (
+
+ {rowData.taskState?.lastRunError && (
+ {rowData.taskId}
+
+ );
+ },
+ },
+ {
+ title: 'Status',
+ field: 'taskState.status',
+ width: '15%',
+ render: (rowData: TaskApiTasksResponse) => {
+ const status = rowData.taskState?.status;
+
+ if (status === 'idle') {
+ return (
+ {status || 'N/A'} ;
+ },
+ },
+ {
+ title: 'Last Run',
+ field: 'taskState.lastRunEndedAt',
+ width: '25%',
+ render: (rowData: TaskApiTasksResponse) =>
+ rowData.taskState?.lastRunEndedAt
+ ? new Date(rowData.taskState.lastRunEndedAt).toLocaleString()
+ : 'N/A',
+ },
+ {
+ title: 'Next Run',
+ width: '15%',
+ render: (rowData: TaskApiTasksResponse) =>
+ rowData.taskState?.status === 'idle' && rowData.taskState.startsAt
+ ? new Date(rowData.taskState.startsAt).toLocaleString()
+ : 'N/A',
+ },
+ {
+ title: 'Actions',
+ render: (rowData: TaskApiTasksResponse) => (
+
+
+ {
+ triggerTask(selectedPlugin, rowData.taskId);
+ if (triggerError) {
+ alertApi.post({
+ message: `Error triggering task ${rowData.taskId}: ${error}`,
+ severity: 'error',
+ });
+ } else {
+ alertApi.post({
+ message: `Successfully triggered task ${rowData.taskId}`,
+ severity: 'success',
+ });
+ }
+ }}
+ >
+
+
+
+ ),
+ sorting: false,
+ width: '10%',
+ },
+ ];
+
+ return (
+
+ {
+ setInputValue(newInputValue);
+ }}
+ renderInput={params => (
+
+
+ The plugin ID "{selectedPlugin}" doesn't have any scheduled tasks or
+ may contain a typo.
+
+
+ Please verify:
+
+
+ -
+
+ The plugin ID is spelled correctly
+
+
+ -
+
+ The plugin has registered scheduled tasks
+
+
+
+
+ )}
+
+ {!loading && !error && (
+
+ No scheduled tasks found for {selectedPlugin}.
+
+ }
+ detailPanel={({ rowData }) => {
+ return
+
+
+
{extensions?.map((extension, index) => (
{
+ const api = useApi(devToolsApiRef);
+
+ const {
+ value,
+ loading,
+ error: asyncError,
+ } = useAsync(async () => {
+ return api.getScheduledTasksByPlugin(plugin);
+ }, [api, plugin]);
+
+ if (asyncError) {
+ return {
+ scheduledTasks: undefined,
+ loading: false,
+ error: asyncError.message,
+ };
+ }
+
+ return {
+ scheduledTasks: value?.scheduledTasks,
+ loading,
+ error: value?.error,
+ };
+};
diff --git a/plugins/devtools/src/hooks/useTriggerScheduledTask.ts b/plugins/devtools/src/hooks/useTriggerScheduledTask.ts
new file mode 100644
index 0000000000..d26b7a8025
--- /dev/null
+++ b/plugins/devtools/src/hooks/useTriggerScheduledTask.ts
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { useState, useCallback } from 'react';
+import { devToolsApiRef } from '../api';
+import { useApi } from '@backstage/core-plugin-api';
+
+export const useTriggerScheduledTask = () => {
+ const api = useApi(devToolsApiRef);
+ const [isTriggering, setIsTriggering] = useState(false);
+ const [error, setError] = useState();
+
+ const triggerTask = useCallback(
+ async (plugin: string, taskId: string) => {
+ setIsTriggering(true);
+ setError(undefined);
+
+ try {
+ await api.triggerScheduledTask(plugin, taskId);
+ } catch (e) {
+ setError(e);
+ } finally {
+ setIsTriggering(false);
+ }
+ },
+ [api],
+ );
+
+ return {
+ triggerTask,
+ isTriggering,
+ triggerError: error?.message,
+ };
+};
diff --git a/plugins/events-backend-module-aws-sqs/CHANGELOG.md b/plugins/events-backend-module-aws-sqs/CHANGELOG.md
index d3eacfee63..23eeee8fcd 100644
--- a/plugins/events-backend-module-aws-sqs/CHANGELOG.md
+++ b/plugins/events-backend-module-aws-sqs/CHANGELOG.md
@@ -1,5 +1,23 @@
# @backstage/plugin-events-backend-module-aws-sqs
+## 0.4.18
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.4.18-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/types@1.2.2
+
## 0.4.18-next.0
### Patch Changes
diff --git a/plugins/events-backend-module-aws-sqs/package.json b/plugins/events-backend-module-aws-sqs/package.json
index 49d0ef0b3a..dbcca544dd 100644
--- a/plugins/events-backend-module-aws-sqs/package.json
+++ b/plugins/events-backend-module-aws-sqs/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-events-backend-module-aws-sqs",
- "version": "0.4.18-next.0",
+ "version": "0.4.18",
"backstage": {
"role": "backend-plugin-module",
"pluginId": "events",
diff --git a/plugins/events-backend-module-azure/CHANGELOG.md b/plugins/events-backend-module-azure/CHANGELOG.md
index b176789833..07db604cc3 100644
--- a/plugins/events-backend-module-azure/CHANGELOG.md
+++ b/plugins/events-backend-module-azure/CHANGELOG.md
@@ -1,5 +1,21 @@
# @backstage/plugin-events-backend-module-azure
+## 0.2.27
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.2.27-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+
## 0.2.27-next.0
### Patch Changes
diff --git a/plugins/events-backend-module-azure/package.json b/plugins/events-backend-module-azure/package.json
index 51e79601c4..e0af5fda5c 100644
--- a/plugins/events-backend-module-azure/package.json
+++ b/plugins/events-backend-module-azure/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-events-backend-module-azure",
- "version": "0.2.27-next.0",
+ "version": "0.2.27",
"backstage": {
"role": "backend-plugin-module",
"pluginId": "events",
diff --git a/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md b/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md
index 29a9194bd7..4acd9bf71d 100644
--- a/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md
+++ b/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md
@@ -1,5 +1,21 @@
# @backstage/plugin-events-backend-module-bitbucket-cloud
+## 0.2.27
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.2.27-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+
## 0.2.27-next.0
### Patch Changes
diff --git a/plugins/events-backend-module-bitbucket-cloud/package.json b/plugins/events-backend-module-bitbucket-cloud/package.json
index 927e8b4ca0..cca7630e0d 100644
--- a/plugins/events-backend-module-bitbucket-cloud/package.json
+++ b/plugins/events-backend-module-bitbucket-cloud/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-events-backend-module-bitbucket-cloud",
- "version": "0.2.27-next.0",
+ "version": "0.2.27",
"backstage": {
"role": "backend-plugin-module",
"pluginId": "events",
diff --git a/plugins/events-backend-module-bitbucket-server/CHANGELOG.md b/plugins/events-backend-module-bitbucket-server/CHANGELOG.md
index 1c6b8d868c..3d602aebb2 100644
--- a/plugins/events-backend-module-bitbucket-server/CHANGELOG.md
+++ b/plugins/events-backend-module-bitbucket-server/CHANGELOG.md
@@ -1,5 +1,21 @@
# @backstage/plugin-events-backend-module-bitbucket-server
+## 0.1.8
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.1.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+
## 0.1.8-next.0
### Patch Changes
diff --git a/plugins/events-backend-module-bitbucket-server/package.json b/plugins/events-backend-module-bitbucket-server/package.json
index b57f83a078..452b3262a0 100644
--- a/plugins/events-backend-module-bitbucket-server/package.json
+++ b/plugins/events-backend-module-bitbucket-server/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-events-backend-module-bitbucket-server",
- "version": "0.1.8-next.0",
+ "version": "0.1.8",
"backstage": {
"role": "backend-plugin-module",
"pluginId": "events",
diff --git a/plugins/events-backend-module-gerrit/CHANGELOG.md b/plugins/events-backend-module-gerrit/CHANGELOG.md
index bff39866a7..4c0750ad67 100644
--- a/plugins/events-backend-module-gerrit/CHANGELOG.md
+++ b/plugins/events-backend-module-gerrit/CHANGELOG.md
@@ -1,5 +1,21 @@
# @backstage/plugin-events-backend-module-gerrit
+## 0.2.27
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.2.27-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+
## 0.2.27-next.0
### Patch Changes
diff --git a/plugins/events-backend-module-gerrit/package.json b/plugins/events-backend-module-gerrit/package.json
index 2fbe20a9eb..3d79d8805c 100644
--- a/plugins/events-backend-module-gerrit/package.json
+++ b/plugins/events-backend-module-gerrit/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-events-backend-module-gerrit",
- "version": "0.2.27-next.0",
+ "version": "0.2.27",
"backstage": {
"role": "backend-plugin-module",
"pluginId": "events",
diff --git a/plugins/events-backend-module-github/CHANGELOG.md b/plugins/events-backend-module-github/CHANGELOG.md
index 21f89ab3e2..edff58b374 100644
--- a/plugins/events-backend-module-github/CHANGELOG.md
+++ b/plugins/events-backend-module-github/CHANGELOG.md
@@ -1,5 +1,25 @@
# @backstage/plugin-events-backend-module-github
+## 0.4.7
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/plugin-events-node@0.4.18
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.4.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18-next.1
+ - @backstage/integration@1.18.3-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/types@1.2.2
+
## 0.4.7-next.0
### Patch Changes
diff --git a/plugins/events-backend-module-github/package.json b/plugins/events-backend-module-github/package.json
index 18489fe655..83513f30df 100644
--- a/plugins/events-backend-module-github/package.json
+++ b/plugins/events-backend-module-github/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-events-backend-module-github",
- "version": "0.4.7-next.0",
+ "version": "0.4.7",
"backstage": {
"role": "backend-plugin-module",
"pluginId": "events",
diff --git a/plugins/events-backend-module-gitlab/CHANGELOG.md b/plugins/events-backend-module-gitlab/CHANGELOG.md
index f819a5918c..b97a60c140 100644
--- a/plugins/events-backend-module-gitlab/CHANGELOG.md
+++ b/plugins/events-backend-module-gitlab/CHANGELOG.md
@@ -1,5 +1,22 @@
# @backstage/plugin-events-backend-module-gitlab
+## 0.3.8
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.3.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+
## 0.3.8-next.0
### Patch Changes
diff --git a/plugins/events-backend-module-gitlab/package.json b/plugins/events-backend-module-gitlab/package.json
index ce1a568cd8..e0d509fa3b 100644
--- a/plugins/events-backend-module-gitlab/package.json
+++ b/plugins/events-backend-module-gitlab/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-events-backend-module-gitlab",
- "version": "0.3.8-next.0",
+ "version": "0.3.8",
"backstage": {
"role": "backend-plugin-module",
"pluginId": "events",
diff --git a/plugins/events-backend-module-google-pubsub/CHANGELOG.md b/plugins/events-backend-module-google-pubsub/CHANGELOG.md
index dc8d774d47..d07530ac08 100644
--- a/plugins/events-backend-module-google-pubsub/CHANGELOG.md
+++ b/plugins/events-backend-module-google-pubsub/CHANGELOG.md
@@ -1,5 +1,24 @@
# @backstage/plugin-events-backend-module-google-pubsub
+## 0.1.7
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.1.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/types@1.2.2
+
## 0.1.7-next.0
### Patch Changes
diff --git a/plugins/events-backend-module-google-pubsub/package.json b/plugins/events-backend-module-google-pubsub/package.json
index 359c97c7f8..d5a97f3223 100644
--- a/plugins/events-backend-module-google-pubsub/package.json
+++ b/plugins/events-backend-module-google-pubsub/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-events-backend-module-google-pubsub",
- "version": "0.1.7-next.0",
+ "version": "0.1.7",
"description": "The google-pubsub backend module for the events plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/events-backend-module-kafka/CHANGELOG.md b/plugins/events-backend-module-kafka/CHANGELOG.md
index 5cd64af42d..3edfcf9487 100644
--- a/plugins/events-backend-module-kafka/CHANGELOG.md
+++ b/plugins/events-backend-module-kafka/CHANGELOG.md
@@ -1,5 +1,30 @@
# @backstage/plugin-events-backend-module-kafka
+## 0.2.0
+
+### Minor Changes
+
+- 2c74ea9: Added support for multiple named instances in `kafkaConsumingEventPublisher` configuration. The previous single configuration format is still supported for backward compatibility.
+- 2c74ea9: Added `KafkaPublishingEventConsumer` to support sending Backstage events to Kafka topics.
+
+ This addition enables Backstage to publish events to external Kafka systems, complementing the existing ability to receive events from Kafka. This allows for better integration with external systems that rely on Kafka for event streaming.
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.1.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/types@1.2.2
+
## 0.1.6-next.0
### Patch Changes
diff --git a/plugins/events-backend-module-kafka/README.md b/plugins/events-backend-module-kafka/README.md
index dbc5bf5607..f77b5d2f21 100644
--- a/plugins/events-backend-module-kafka/README.md
+++ b/plugins/events-backend-module-kafka/README.md
@@ -2,65 +2,107 @@
Welcome to the `events-backend-module-kafka` backend module!
-This package is a module for the `events-backend` backend plugin and extends the events system with an `KafkaConsumingEventPublisher.`
+This package is a module for the `events-backend` backend plugin and extends the events system with a `KafkaConsumingEventPublisher` and `KafkaPublishingEventConsumer`
-This event publisher will allow you to receive events from an Kafka queue and will publish these to the used `EventsService` implementation.
+This module provides two-way integration with Kafka:
+
+- **KafkaConsumingEventPublisher**: Receives events from Kafka queues and publishes them to the Backstage events system
+- **KafkaPublishingEventConsumer**: Consumes events from Backstage and publishes them to Kafka queues
## Configuration
-To set up Kafka queues, you need to configure the following values:
+To set up Kafka integration, you need to configure one or both of the following components:
+
+### KafkaConsumingEventPublisher Configuration
+
+To receive events from Kafka queues and publish them to Backstage:
```yaml
events:
modules:
kafka:
kafkaConsumingEventPublisher:
- clientId: your-client-id # (Required) Client ID used by Backstage to identify when connecting to the Kafka cluster.
- brokers: # (Required) List of brokers in the Kafka cluster to connect to.
- - broker1
- - broker2
- topics:
- - topic: 'backstage.topic' # (Required) Replace with actual topic name as expected by subscribers
- kafka:
- topics: # (Required) The Kafka topics to subscribe to.
- - topic1
- groupId: your-group-id # (Required) The GroupId to be used by the topic consumers.
+ production: # Instance name, will be included in logs
+ clientId: your-client-id # (Required) Client ID used by Backstage to identify when connecting to the Kafka cluster.
+ brokers: # (Required) List of brokers in the Kafka cluster to connect to.
+ - broker1
+ - broker2
+ topics:
+ - topic: 'backstage.topic' # (Required) Replace with actual topic name as expected by subscribers
+ kafka:
+ topics: # (Required) The Kafka topics to subscribe to.
+ - topic1
+ groupId: your-group-id # (Required) The GroupId to be used by the topic consumers.
+```
+
+### KafkaPublishingEventConsumer Configuration
+
+To publish events from Backstage to Kafka queues, you can configure the `KafkaPublishingEventConsumer`:
+
+```yaml
+events:
+ modules:
+ kafka:
+ kafkaPublishingEventConsumer:
+ production: # Instance name, will be included in logs
+ clientId: your-client-id # (Required) Client ID used by Backstage to identify when connecting to the Kafka cluster.
+ brokers: # (Required) List of brokers in the Kafka cluster to connect to.
+ - broker1
+ - broker2
+ topics:
+ - topic: 'catalog.entity.created' # (Required) The Backstage topic to consume from
+ kafka:
+ topic: kafka-topic-name # (Required) The Kafka topic to publish to
```
For a complete list of all available fields that can be configured, refer to the [config.d.ts file](./config.d.ts).
### Optional SSL Configuration
-If your Kafka cluster requires SSL, you can configure it as follows:
+If your Kafka cluster requires SSL, you can configure it for both `kafkaConsumingEventPublisher` and `kafkaPublishingEventConsumer` instances:
```yaml
events:
modules:
kafka:
kafkaConsumingEventPublisher:
- ssl:
- rejectUnauthorized: true # (Optional) If true, the server certificate is verified against the list of supplied CAs.
- ca: [path/to/ca-cert] # (Optional) Array of trusted certificates in PEM format.
- key: path/to/client-key # (Optional) Private key in PEM format.
- cert: path/to/client-cert # (Optional) Public x509 certificate in PEM format.
+ production:
+ # ... other configuration ...
+ ssl:
+ rejectUnauthorized: true # (Optional) If true, the server certificate is verified against the list of supplied CAs.
+ ca: [path/to/ca-cert] # (Optional) Array of trusted certificates in PEM format.
+ key: path/to/client-key # (Optional) Private key in PEM format.
+ cert: path/to/client-cert # (Optional) Public x509 certificate in PEM format.
+ kafkaPublishingEventConsumer:
+ production:
+ # ... other configuration ...
+ ssl:
+ # Same SSL configuration options as above
```
### Optional SASL Authentication Configuration
-If your Kafka cluster requires `SASL` authentication, you can configure it as follows:
+If your Kafka cluster requires SASL authentication, you can configure it for both components:
```yaml
events:
modules:
kafka:
kafkaConsumingEventPublisher:
- sasl:
- mechanism: 'plain' # SASL mechanism ('plain', 'scram-sha-256' or 'scram-sha-512')
- username: your-username # SASL username
- password: your-password # SASL password
+ production:
+ # ... other configuration ...
+ sasl:
+ mechanism: 'plain' # SASL mechanism ('plain', 'scram-sha-256' or 'scram-sha-512')
+ username: your-username # SASL username
+ password: your-password # SASL password
+ kafkaPublishingEventConsumer:
+ production:
+ # ... other configuration ...
+ sasl:
+ # Same SASL configuration options as above
```
-This section includes optional `SSL` and `SASL` authentication configuration for enhanced security.
+These SSL and SASL configurations apply to both Kafka components and provide enhanced security for your Kafka connections.
## Installation
diff --git a/plugins/events-backend-module-kafka/config.d.ts b/plugins/events-backend-module-kafka/config.d.ts
index 49c417098c..47ebae0653 100644
--- a/plugins/events-backend-module-kafka/config.d.ts
+++ b/plugins/events-backend-module-kafka/config.d.ts
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
import { HumanDuration } from '@backstage/types';
export interface Config {
@@ -25,179 +24,548 @@ export interface Config {
kafka?: {
/**
* Configuration for KafkaConsumingEventPublisher
+ *
+ * Supports either:
+ * 1. Single configuration object (legacy format)
+ * 2. Multiple named instances as a record where each key is a unique name for the Kafka instance
*/
- kafkaConsumingEventPublisher?: {
- /**
- * (Required) Client ID used by Backstage to identify when connecting to the Kafka cluster.
- */
- clientId: string;
- /**
- * (Required) List of brokers in the Kafka cluster to connect to.
- */
- brokers: string[];
- /**
- * Optional SSL connection parameters to connect to the cluster. Passed directly to Node tls.connect.
- * See https://nodejs.org/dist/latest-v8.x/docs/api/tls.html#tls_tls_createsecurecontext_options
- */
- ssl?:
- | {
- ca?: string[];
+ kafkaConsumingEventPublisher?:
+ | {
+ /**
+ * (Required) Client ID used by Backstage to identify when connecting to the Kafka cluster.
+ */
+ clientId: string;
+ /**
+ * (Required) List of brokers in the Kafka cluster to connect to.
+ */
+ brokers: string[];
+ /**
+ * Optional SSL connection parameters to connect to the cluster. Passed directly to Node tls.connect.
+ * See https://nodejs.org/dist/latest-v8.x/docs/api/tls.html#tls_tls_createsecurecontext_options
+ */
+ ssl?:
+ | {
+ ca?: string[];
+ /** @visibility secret */
+ key?: string;
+ cert?: string;
+ rejectUnauthorized?: boolean;
+ }
+ | boolean;
+ /**
+ * Optional SASL connection parameters.
+ */
+ sasl?: {
+ mechanism: 'plain' | 'scram-sha-256' | 'scram-sha-512';
+ username: string;
/** @visibility secret */
- key?: string;
- cert?: string;
- rejectUnauthorized?: boolean;
- }
- | boolean;
- /**
- * Optional SASL connection parameters.
- */
- sasl?: {
- mechanism: 'plain' | 'scram-sha-256' | 'scram-sha-512';
- username: string;
- /** @visibility secret */
- password: string;
- };
+ password: string;
+ };
- /**
- * Optional retry connection parameters.
- */
- retry: {
- /**
- * (Optional) Maximum wait time for a retry
- * Default: 30000 ms.
- */
- maxRetryTime: HumanDuration | string;
-
- /**
- * (Optional) Initial value used to calculate the retry (This is still randomized following the randomization factor)
- * Default: 300 ms.
- */
- initialRetryTime: HumanDuration | string;
-
- /**
- * (Optional) Randomization factor
- * Default: 0.2.
- */
- factor: number;
-
- /**
- * (Optional) Exponential factor
- * Default: 2.
- */
- multiplier: number;
-
- /**
- * (Optional) Max number of retries per call
- * Default: 5.
- */
- retries: number;
- };
-
- /**
- * (Optional) Timeout for authentication requests.
- * Default: 10000 ms.
- */
- authenticationTimeout: HumanDuration | string;
-
- /**
- * (Optional) Time to wait for a successful connection.
- * Default: 1000 ms.
- */
- connectionTimeout: HumanDuration | string;
-
- /**
- * (Optional) Time to wait for a successful request.
- * Default: 30000 ms.
- */
- requestTimeout: HumanDuration | string;
-
- /**
- * (Optional) The request timeout can be disabled by setting enforceRequestTimeout to false.
- * Default: true
- */
- enforceRequestTimeout: boolean;
-
- /**
- * Contains a object per topic for which an Kafka queue
- * should be used as source of events.
- */
- topics: Array<{
- /**
- * (Required) The Backstage topic to publish to
- */
- topic: string;
- /**
- * (Required) KafkaConsumer-related configuration.
- */
- kafka: {
/**
- * (Required) The Kafka topics to subscribe to
+ * Optional retry connection parameters.
*/
- topics: string[];
- /**
- * (Required) The GroupId to be used by the topic consumers
- */
- groupId: string;
+ retry?: {
+ /**
+ * (Optional) Maximum wait time for a retry
+ * Default: 30000 ms.
+ */
+ maxRetryTime?: HumanDuration | string;
+
+ /**
+ * (Optional) Initial value used to calculate the retry (This is still randomized following the randomization factor)
+ * Default: 300 ms.
+ */
+ initialRetryTime?: HumanDuration | string;
+
+ /**
+ * (Optional) Randomization factor
+ * Default: 0.2.
+ */
+ factor?: number;
+
+ /**
+ * (Optional) Exponential factor
+ * Default: 2.
+ */
+ multiplier?: number;
+
+ /**
+ * (Optional) Max number of retries per call
+ * Default: 5.
+ */
+ retries?: number;
+ };
/**
- * (Optional) Timeout used to detect failures.
- * The consumer sends periodic heartbeats to indicate its liveness to the broker.
- * If no heartbeats are received by the broker before the expiration of this session timeout,
- * then the broker will remove this consumer from the group and initiate a rebalance
+ * (Optional) Timeout for authentication requests.
+ * Default: 10000 ms.
+ */
+ authenticationTimeout?: HumanDuration | string;
+
+ /**
+ * (Optional) Time to wait for a successful connection.
+ * Default: 1000 ms.
+ */
+ connectionTimeout?: HumanDuration | string;
+
+ /**
+ * (Optional) Time to wait for a successful request.
* Default: 30000 ms.
*/
- sessionTimeout: HumanDuration | string;
+ requestTimeout?: HumanDuration | string;
/**
- * (Optional) The maximum time that the coordinator will wait for each member to rejoin when rebalancing the group
- * Default: 60000 ms.
+ * (Optional) The request timeout can be disabled by setting enforceRequestTimeout to false.
+ * Default: true
*/
- rebalanceTimeout: HumanDuration | string;
+ enforceRequestTimeout?: boolean;
/**
- * (Optional) The expected time between heartbeats to the consumer coordinator.
- * Heartbeats are used to ensure that the consumer's session stays active.
- * The value must be set lower than session timeout
- * Default: 3000 ms.
+ * Contains an object per topic for which a Kafka queue
+ * should be used as source of events.
*/
- heartbeatInterval: HumanDuration | string;
+ topics: Array<{
+ /**
+ * (Required) The Backstage topic to publish to
+ */
+ topic: string;
+ /**
+ * (Required) KafkaConsumer-related configuration.
+ */
+ kafka: {
+ /**
+ * (Required) The Kafka topics to subscribe to
+ */
+ topics: string[];
+ /**
+ * (Required) The GroupId to be used by the topic consumers
+ */
+ groupId: string;
- /**
- * (Optional) The period of time after which we force a refresh of metadata
- * even if we haven't seen any partition leadership changes to proactively discover any new brokers or partitions
- * Default: 300000 ms (5 minutes).
- */
- metadataMaxAge: HumanDuration | string;
+ /**
+ * (Optional) Timeout used to detect failures.
+ * The consumer sends periodic heartbeats to indicate its liveness to the broker.
+ * If no heartbeats are received by the broker before the expiration of this session timeout,
+ * then the broker will remove this consumer from the group and initiate a rebalance
+ * Default: 30000 ms.
+ */
+ sessionTimeout?: HumanDuration | string;
- /**
- * (Optional) The maximum amount of data per-partition the server will return.
- * This size must be at least as large as the maximum message size the server allows
- * or else it is possible for the producer to send messages larger than the consumer can fetch.
- * If that happens, the consumer can get stuck trying to fetch a large message on a certain partition
- * Default: 1048576 (1MB)
- */
- maxBytesPerPartition: number;
+ /**
+ * (Optional) The maximum time that the coordinator will wait for each member to rejoin when rebalancing the group
+ * Default: 60000 ms.
+ */
+ rebalanceTimeout?: HumanDuration | string;
- /**
- * (Optional) Minimum amount of data the server should return for a fetch request, otherwise wait up to maxWaitTime for more data to accumulate.
- * Default: 1
- */
- minBytes: number;
+ /**
+ * (Optional) The expected time between heartbeats to the consumer coordinator.
+ * Heartbeats are used to ensure that the consumer's session stays active.
+ * The value must be set lower than session timeout
+ * Default: 3000 ms.
+ */
+ heartbeatInterval?: HumanDuration | string;
- /**
- * (Optional) Maximum amount of bytes to accumulate in the response. Supported by Kafka >= 0.10.1.0
- * Default: 10485760 (10MB)
- */
- maxBytes: number;
+ /**
+ * (Optional) The period of time after which we force a refresh of metadata
+ * even if we haven't seen any partition leadership changes to proactively discover any new brokers or partitions
+ * Default: 300000 ms (5 minutes).
+ */
+ metadataMaxAge?: HumanDuration | string;
- /**
- * (Optional) The maximum amount of time the server will block before answering the fetch request
- * if there isn’t sufficient data to immediately satisfy the requirement given by minBytes
- * Default: 5000
- */
- maxWaitTime: HumanDuration | string;
+ /**
+ * (Optional) The maximum amount of data per-partition the server will return.
+ * This size must be at least as large as the maximum message size the server allows
+ * or else it is possible for the producer to send messages larger than the consumer can fetch.
+ * If that happens, the consumer can get stuck trying to fetch a large message on a certain partition
+ * Default: 1048576 (1MB)
+ */
+ maxBytesPerPartition?: number;
+
+ /**
+ * (Optional) Minimum amount of data the server should return for a fetch request, otherwise wait up to maxWaitTime for more data to accumulate.
+ * Default: 1
+ */
+ minBytes?: number;
+
+ /**
+ * (Optional) Maximum amount of bytes to accumulate in the response. Supported by Kafka >= 0.10.1.0
+ * Default: 10485760 (10MB)
+ */
+ maxBytes?: number;
+
+ /**
+ * (Optional) The maximum amount of time the server will block before answering the fetch request
+ * if there isn't sufficient data to immediately satisfy the requirement given by minBytes
+ * Default: 5000
+ */
+ maxWaitTime?: HumanDuration | string;
+ };
+ }>;
+ }
+ | {
+ [name: string]: {
+ /**
+ * (Required) Client ID used by Backstage to identify when connecting to the Kafka cluster.
+ */
+ clientId: string;
+ /**
+ * (Required) List of brokers in the Kafka cluster to connect to.
+ */
+ brokers: string[];
+ /**
+ * Optional SSL connection parameters to connect to the cluster. Passed directly to Node tls.connect.
+ * See https://nodejs.org/dist/latest-v8.x/docs/api/tls.html#tls_tls_createsecurecontext_options
+ */
+ ssl?:
+ | {
+ ca?: string[];
+ /** @visibility secret */
+ key?: string;
+ cert?: string;
+ rejectUnauthorized?: boolean;
+ }
+ | boolean;
+ /**
+ * Optional SASL connection parameters.
+ */
+ sasl?: {
+ mechanism: 'plain' | 'scram-sha-256' | 'scram-sha-512';
+ username: string;
+ /** @visibility secret */
+ password: string;
+ };
+
+ /**
+ * Optional retry connection parameters.
+ */
+ retry?: {
+ /**
+ * (Optional) Maximum wait time for a retry
+ * Default: 30000 ms.
+ */
+ maxRetryTime?: HumanDuration | string;
+
+ /**
+ * (Optional) Initial value used to calculate the retry (This is still randomized following the randomization factor)
+ * Default: 300 ms.
+ */
+ initialRetryTime?: HumanDuration | string;
+
+ /**
+ * (Optional) Randomization factor
+ * Default: 0.2.
+ */
+ factor?: number;
+
+ /**
+ * (Optional) Exponential factor
+ * Default: 2.
+ */
+ multiplier?: number;
+
+ /**
+ * (Optional) Max number of retries per call
+ * Default: 5.
+ */
+ retries?: number;
+ };
+
+ /**
+ * (Optional) Timeout for authentication requests.
+ * Default: 10000 ms.
+ */
+ authenticationTimeout?: HumanDuration | string;
+
+ /**
+ * (Optional) Time to wait for a successful connection.
+ * Default: 1000 ms.
+ */
+ connectionTimeout?: HumanDuration | string;
+
+ /**
+ * (Optional) Time to wait for a successful request.
+ * Default: 30000 ms.
+ */
+ requestTimeout?: HumanDuration | string;
+
+ /**
+ * (Optional) The request timeout can be disabled by setting enforceRequestTimeout to false.
+ * Default: true
+ */
+ enforceRequestTimeout?: boolean;
+
+ /**
+ * Contains an object per topic for which a Kafka queue
+ * should be used as source of events.
+ */
+ topics: Array<{
+ /**
+ * (Required) The Backstage topic to publish to
+ */
+ topic: string;
+ /**
+ * (Required) KafkaConsumer-related configuration.
+ */
+ kafka: {
+ /**
+ * (Required) The Kafka topics to subscribe to
+ */
+ topics: string[];
+ /**
+ * (Required) The GroupId to be used by the topic consumers
+ */
+ groupId: string;
+
+ /**
+ * (Optional) Timeout used to detect failures.
+ * The consumer sends periodic heartbeats to indicate its liveness to the broker.
+ * If no heartbeats are received by the broker before the expiration of this session timeout,
+ * then the broker will remove this consumer from the group and initiate a rebalance
+ * Default: 30000 ms.
+ */
+ sessionTimeout?: HumanDuration | string;
+
+ /**
+ * (Optional) The maximum time that the coordinator will wait for each member to rejoin when rebalancing the group
+ * Default: 60000 ms.
+ */
+ rebalanceTimeout?: HumanDuration | string;
+
+ /**
+ * (Optional) The expected time between heartbeats to the consumer coordinator.
+ * Heartbeats are used to ensure that the consumer's session stays active.
+ * The value must be set lower than session timeout
+ * Default: 3000 ms.
+ */
+ heartbeatInterval?: HumanDuration | string;
+
+ /**
+ * (Optional) The period of time after which we force a refresh of metadata
+ * even if we haven't seen any partition leadership changes to proactively discover any new brokers or partitions
+ * Default: 300000 ms (5 minutes).
+ */
+ metadataMaxAge?: HumanDuration | string;
+
+ /**
+ * (Optional) The maximum amount of data per-partition the server will return.
+ * This size must be at least as large as the maximum message size the server allows
+ * or else it is possible for the producer to send messages larger than the consumer can fetch.
+ * If that happens, the consumer can get stuck trying to fetch a large message on a certain partition
+ * Default: 1048576 (1MB)
+ */
+ maxBytesPerPartition?: number;
+
+ /**
+ * (Optional) Minimum amount of data the server should return for a fetch request, otherwise wait up to maxWaitTime for more data to accumulate.
+ * Default: 1
+ */
+ minBytes?: number;
+
+ /**
+ * (Optional) Maximum amount of bytes to accumulate in the response. Supported by Kafka >= 0.10.1.0
+ * Default: 10485760 (10MB)
+ */
+ maxBytes?: number;
+
+ /**
+ * (Optional) The maximum amount of time the server will block before answering the fetch request
+ * if there isn't sufficient data to immediately satisfy the requirement given by minBytes
+ * Default: 5000
+ */
+ maxWaitTime?: HumanDuration | string;
+ };
+ }>;
+ };
};
- }>;
+
+ /**
+ * Configuration for KafkaPublishingEventConsumer
+ *
+ * Supports multiple named instances as a record where each key is a unique name
+ * for the Kafka producer configuration.
+ */
+ kafkaPublishingEventConsumer?: {
+ [name: string]: {
+ /**
+ * (Required) Client ID used by Backstage to identify when connecting to the Kafka cluster.
+ */
+ clientId: string;
+ /**
+ * (Required) List of brokers in the Kafka cluster to connect to.
+ */
+ brokers: string[];
+ /**
+ * Optional SSL connection parameters to connect to the cluster. Passed directly to Node tls.connect.
+ * See https://nodejs.org/dist/latest-v8.x/docs/api/tls.html#tls_tls_createsecurecontext_options
+ */
+ ssl?:
+ | {
+ ca?: string[];
+ /** @visibility secret */
+ key?: string;
+ cert?: string;
+ rejectUnauthorized?: boolean;
+ }
+ | boolean;
+ /**
+ * Optional SASL connection parameters.
+ */
+ sasl?: {
+ mechanism: 'plain' | 'scram-sha-256' | 'scram-sha-512';
+ username: string;
+ /** @visibility secret */
+ password: string;
+ };
+
+ /**
+ * Optional retry connection parameters.
+ */
+ retry?: {
+ /**
+ * (Optional) Maximum wait time for a retry
+ * Default: 30000 ms.
+ */
+ maxRetryTime?: HumanDuration | string;
+
+ /**
+ * (Optional) Initial value used to calculate the retry (This is still randomized following the randomization factor)
+ * Default: 300 ms.
+ */
+ initialRetryTime?: HumanDuration | string;
+
+ /**
+ * (Optional) Randomization factor
+ * Default: 0.2.
+ */
+ factor?: number;
+
+ /**
+ * (Optional) Exponential factor
+ * Default: 2.
+ */
+ multiplier?: number;
+
+ /**
+ * (Optional) Max number of retries per call
+ * Default: 5.
+ */
+ retries?: number;
+ };
+
+ /**
+ * (Optional) Timeout for authentication requests.
+ * Default: 10000 ms.
+ */
+ authenticationTimeout?: HumanDuration | string;
+
+ /**
+ * (Optional) Time to wait for a successful connection.
+ * Default: 1000 ms.
+ */
+ connectionTimeout?: HumanDuration | string;
+
+ /**
+ * (Optional) Time to wait for a successful request.
+ * Default: 30000 ms.
+ */
+ requestTimeout?: HumanDuration | string;
+
+ /**
+ * (Optional) The request timeout can be disabled by setting enforceRequestTimeout to false.
+ * Default: true
+ */
+ enforceRequestTimeout?: boolean;
+
+ /**
+ * Contains an object per topic for which a Kafka queue
+ * should be used as destination for events.
+ */
+ topics: Array<{
+ /**
+ * (Required) The Backstage topic to consume from
+ */
+ topic: string;
+ /**
+ * (Required) KafkaProducer-related configuration.
+ */
+ kafka: {
+ /**
+ * (Required) The Kafka topic to publish to
+ */
+ topic: string;
+
+ /**
+ * (Optional) Allow topic creation when querying metadata for non-existent topics.
+ * Default: true
+ */
+ allowAutoTopicCreation?: boolean;
+
+ /**
+ * (Optional) The period of time after which we force a refresh of metadata
+ * even if we haven't seen any partition leadership changes to proactively discover any new brokers or partitions
+ * Default: 300000 ms (5 minutes).
+ */
+ metadataMaxAge?: HumanDuration | string;
+
+ /**
+ * (Optional) The maximum amount of time in ms that the transaction coordinator will wait for a transaction status update
+ * from the producer before proactively aborting the ongoing transaction.
+ * If this value is larger than the `transaction.max.timeout.ms`` setting in the broker, the request will fail with a `InvalidTransactionTimeout` error
+ * Default: 60000 ms.
+ */
+ transactionTimeout?: HumanDuration | string;
+
+ /**
+ * (Optional) Experimental. If enabled producer will ensure each message is written exactly once. Acks must be set to -1 ("all").
+ * Retries will default to MAX_SAFE_INTEGER.
+ * Default: false.
+ */
+ idempotent?: boolean;
+
+ /**
+ * (Optional) Max number of requests that may be in progress at any time. If falsey then no limit.
+ * Default: null.
+ */
+ maxInFlightRequests?: number;
+
+ /**
+ * Optional retry connection parameters.
+ */
+ retry?: {
+ /**
+ * (Optional) Maximum wait time for a retry
+ * Default: 30000 ms.
+ */
+ maxRetryTime?: HumanDuration | string;
+
+ /**
+ * (Optional) Initial value used to calculate the retry (This is still randomized following the randomization factor)
+ * Default: 300 ms.
+ */
+ initialRetryTime?: HumanDuration | string;
+
+ /**
+ * (Optional) Randomization factor
+ * Default: 0.2.
+ */
+ factor?: number;
+
+ /**
+ * (Optional) Exponential factor
+ * Default: 2.
+ */
+ multiplier?: number;
+
+ /**
+ * (Optional) Max number of retries per call
+ * Default: 5.
+ */
+ retries?: number;
+ };
+ };
+ }>;
+ };
};
};
};
diff --git a/plugins/events-backend-module-kafka/package.json b/plugins/events-backend-module-kafka/package.json
index a24538a617..d6e7b1ac0e 100644
--- a/plugins/events-backend-module-kafka/package.json
+++ b/plugins/events-backend-module-kafka/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-events-backend-module-kafka",
- "version": "0.1.6-next.0",
+ "version": "0.2.0",
"description": "The kafka backend module for the events plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/events-backend-module-kafka/report.api.md b/plugins/events-backend-module-kafka/report.api.md
index a6b129b82e..c5e6d29c6a 100644
--- a/plugins/events-backend-module-kafka/report.api.md
+++ b/plugins/events-backend-module-kafka/report.api.md
@@ -6,6 +6,6 @@
import { BackendFeature } from '@backstage/backend-plugin-api';
// @public
-const eventsModuleKafkaConsumingEventPublisher: BackendFeature;
-export default eventsModuleKafkaConsumingEventPublisher;
+const _default: BackendFeature;
+export default _default;
```
diff --git a/plugins/events-backend-module-kafka/src/KafkaConsumingEventPublisher/KafkaConsumingEventPublisher.test.ts b/plugins/events-backend-module-kafka/src/KafkaConsumingEventPublisher/KafkaConsumingEventPublisher.test.ts
new file mode 100644
index 0000000000..98781936b0
--- /dev/null
+++ b/plugins/events-backend-module-kafka/src/KafkaConsumingEventPublisher/KafkaConsumingEventPublisher.test.ts
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { KafkaConsumingEventPublisher } from './KafkaConsumingEventPublisher';
+import { Kafka } from 'kafkajs';
+import { ConfigReader } from '@backstage/config';
+import { mockServices } from '@backstage/backend-test-utils';
+
+jest.mock('kafkajs');
+
+describe('KafkaConsumingEventPublisher', () => {
+ const mockLogger = mockServices.logger.mock();
+ const mockEvents = mockServices.events.mock();
+
+ const mockConsumer = {
+ connect: jest.fn(),
+ disconnect: jest.fn(),
+ subscribe: jest.fn(),
+ run: jest.fn(),
+ };
+
+ const mockKafkaClient = {
+ consumer: jest.fn().mockReturnValue(mockConsumer),
+ } as unknown as Kafka;
+
+ jest.mocked(Kafka).mockImplementation(() => mockKafkaClient);
+
+ const mockConfig = new ConfigReader({
+ events: {
+ modules: {
+ kafka: {
+ kafkaConsumingEventPublisher: {
+ dev: {
+ clientId: 'backstage-events',
+ brokers: ['kafka1:9092', 'kafka2:9092'],
+ topics: [
+ {
+ topic: 'backstage-topic',
+ kafka: {
+ topics: ['test-topic'],
+ groupId: 'test-group',
+ },
+ },
+ ],
+ },
+ },
+ },
+ },
+ },
+ });
+
+ beforeEach(() => {
+ jest.clearAllMocks();
+ });
+
+ it('should create instances from config', () => {
+ const consumers = KafkaConsumingEventPublisher.fromConfig({
+ config: mockConfig,
+ events: mockEvents,
+ logger: mockLogger,
+ });
+
+ expect(consumers).toBeInstanceOf(Array);
+ expect(consumers).toHaveLength(1);
+ expect(consumers[0]).toBeInstanceOf(KafkaConsumingEventPublisher);
+ });
+
+ it('should return empty array when no config', () => {
+ const consumers = KafkaConsumingEventPublisher.fromConfig({
+ config: new ConfigReader({}),
+ events: mockEvents,
+ logger: mockLogger,
+ });
+
+ expect(consumers).toEqual([]);
+ });
+
+ it('should start all consumers', async () => {
+ const consumers = KafkaConsumingEventPublisher.fromConfig({
+ config: mockConfig,
+ events: mockEvents,
+ logger: mockLogger,
+ });
+
+ expect(consumers).toHaveLength(1);
+
+ await consumers[0].start();
+
+ expect(mockConsumer.connect).toHaveBeenCalled();
+ expect(mockConsumer.subscribe).toHaveBeenCalledWith({
+ topics: ['test-topic'],
+ });
+ expect(mockConsumer.run).toHaveBeenCalled();
+ });
+
+ it('should shutdown all consumers', async () => {
+ const consumers = KafkaConsumingEventPublisher.fromConfig({
+ config: mockConfig,
+ events: mockEvents,
+ logger: mockLogger,
+ });
+
+ expect(consumers).toHaveLength(1);
+
+ await consumers[0].shutdown();
+
+ expect(mockConsumer.disconnect).toHaveBeenCalled();
+ });
+
+ it('should handle multiple consumer configs', () => {
+ const multiConsumerConfig = new ConfigReader({
+ events: {
+ modules: {
+ kafka: {
+ kafkaConsumingEventPublisher: {
+ dev: {
+ clientId: 'backstage-events',
+ brokers: ['kafka1:9092'],
+ topics: [
+ {
+ topic: 'topic1',
+ kafka: {
+ topics: ['kafka-topic-1'],
+ groupId: 'group1',
+ },
+ },
+ {
+ topic: 'topic2',
+ kafka: {
+ topics: ['kafka-topic-2'],
+ groupId: 'group2',
+ },
+ },
+ ],
+ },
+ },
+ },
+ },
+ },
+ });
+
+ const consumers = KafkaConsumingEventPublisher.fromConfig({
+ config: multiConsumerConfig,
+ events: mockEvents,
+ logger: mockLogger,
+ });
+
+ expect(consumers).toHaveLength(1);
+ expect(mockKafkaClient.consumer).toHaveBeenCalledTimes(2);
+ });
+});
diff --git a/plugins/events-backend-module-kafka/src/KafkaConsumingEventPublisher/KafkaConsumingEventPublisher.ts b/plugins/events-backend-module-kafka/src/KafkaConsumingEventPublisher/KafkaConsumingEventPublisher.ts
new file mode 100644
index 0000000000..b996032575
--- /dev/null
+++ b/plugins/events-backend-module-kafka/src/KafkaConsumingEventPublisher/KafkaConsumingEventPublisher.ts
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { LoggerService } from '@backstage/backend-plugin-api';
+import { EventsService } from '@backstage/plugin-events-node';
+import { Consumer, Kafka } from 'kafkajs';
+import {
+ KafkaConsumerConfig,
+ KafkaConsumingEventPublisherConfig,
+ readConsumerConfig,
+} from './config';
+import { Config } from '@backstage/config';
+import { loggerServiceAdapter } from '../utils/LoggerServiceAdapter';
+import { convertHeadersToMetadata } from '../utils/kafkaTransformers';
+
+type KafkaConsumer = {
+ consumer: Consumer;
+ config: KafkaConsumerConfig;
+};
+
+/**
+ * This class subscribes to Kafka topics and publishes events received to the registered subscriber.
+ * The message payload will be used as the event payload and passed to the subscribers.
+ */
+export class KafkaConsumingEventPublisher {
+ private readonly kafkaConsumers: KafkaConsumer[];
+ private readonly logger: LoggerService;
+
+ static fromConfig(env: {
+ config: Config;
+ events: EventsService;
+ logger: LoggerService;
+ }): KafkaConsumingEventPublisher[] {
+ const configs = readConsumerConfig(env.config, env.logger);
+
+ return configs.map(
+ kafkaConfig =>
+ new KafkaConsumingEventPublisher(env.logger, env.events, kafkaConfig),
+ );
+ }
+
+ private constructor(
+ logger: LoggerService,
+ private readonly events: EventsService,
+ config: KafkaConsumingEventPublisherConfig,
+ ) {
+ this.logger = logger.child({
+ class: KafkaConsumingEventPublisher.prototype.constructor.name,
+ instance: config.instance,
+ });
+
+ const kafka = new Kafka({
+ ...config.kafkaConfig,
+ logCreator: loggerServiceAdapter(this.logger),
+ });
+
+ this.kafkaConsumers = config.kafkaConsumerConfigs.map(consumerConfig => ({
+ consumer: kafka.consumer(consumerConfig.consumerConfig),
+ config: consumerConfig,
+ }));
+ }
+
+ async start(): Promise {
+ await Promise.all(
+ this.kafkaConsumers.map(async ({ consumer, config }) => {
+ const consumerLogger = this.logger.child({
+ id: `events.kafka.publisher:${config.backstageTopic}`,
+ groupId: config.consumerConfig.groupId,
+ kafkaTopics: config.consumerSubscribeTopics.topics.toString(),
+ backstageTopic: config.backstageTopic,
+ });
+ try {
+ await consumer.connect();
+ await consumer.subscribe(config.consumerSubscribeTopics);
+
+ await consumer.run({
+ eachMessage: async ({ message }) => {
+ this.events.publish({
+ topic: config.backstageTopic,
+ eventPayload: JSON.parse(message.value?.toString()!),
+ metadata: convertHeadersToMetadata(message.headers),
+ });
+ },
+ });
+ } catch (error: any) {
+ consumerLogger.error('Kafka consumer connection failed', error);
+ }
+ }),
+ );
+ }
+
+ async shutdown(): Promise {
+ await Promise.all(
+ this.kafkaConsumers.map(({ consumer }) => consumer.disconnect()),
+ );
+ }
+}
diff --git a/plugins/events-backend-module-kafka/src/KafkaConsumingEventPublisher/config.test.ts b/plugins/events-backend-module-kafka/src/KafkaConsumingEventPublisher/config.test.ts
new file mode 100644
index 0000000000..16ee9e0a4c
--- /dev/null
+++ b/plugins/events-backend-module-kafka/src/KafkaConsumingEventPublisher/config.test.ts
@@ -0,0 +1,354 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { ConfigReader } from '@backstage/config';
+import { readConsumerConfig } from './config';
+import { mockServices } from '@backstage/backend-test-utils';
+
+const mockLogger = mockServices.logger.mock();
+
+describe('readConsumerConfig', () => {
+ it('not configured', () => {
+ const publisherConfigs = readConsumerConfig(
+ new ConfigReader({}),
+ mockLogger,
+ );
+
+ expect(publisherConfigs).toEqual([]);
+ });
+
+ it('only required fields configured', () => {
+ const config = new ConfigReader({
+ events: {
+ modules: {
+ kafka: {
+ kafkaConsumingEventPublisher: {
+ dev: {
+ clientId: 'backstage-events',
+ brokers: ['kafka1:9092', 'kafka2:9092'],
+ topics: [
+ {
+ topic: 'fake1',
+ kafka: {
+ topics: ['topic-A'],
+ groupId: 'my-group',
+ },
+ },
+ {
+ topic: 'fake2',
+ kafka: {
+ topics: ['topic-B'],
+ groupId: 'my-group',
+ },
+ },
+ ],
+ },
+ },
+ },
+ },
+ },
+ });
+
+ const publisherConfigs = readConsumerConfig(config, mockLogger);
+
+ expect(publisherConfigs).toBeDefined();
+ expect(Array.isArray(publisherConfigs)).toBe(true);
+ expect(publisherConfigs).toHaveLength(1);
+
+ const devConfig = publisherConfigs[0];
+ expect(devConfig.instance).toBe('dev');
+ expect(devConfig.kafkaConsumerConfigs.length).toBe(2);
+
+ expect(devConfig.kafkaConfig.clientId).toEqual('backstage-events');
+ expect(devConfig.kafkaConfig.brokers).toEqual([
+ 'kafka1:9092',
+ 'kafka2:9092',
+ ]);
+
+ expect(devConfig.kafkaConsumerConfigs).toEqual([
+ {
+ backstageTopic: 'fake1',
+ consumerConfig: {
+ groupId: 'my-group',
+ },
+ consumerSubscribeTopics: {
+ topics: ['topic-A'],
+ },
+ },
+ {
+ backstageTopic: 'fake2',
+ consumerConfig: {
+ groupId: 'my-group',
+ },
+ consumerSubscribeTopics: {
+ topics: ['topic-B'],
+ },
+ },
+ ]);
+ });
+
+ it('all fields configured', () => {
+ const config = new ConfigReader({
+ events: {
+ modules: {
+ kafka: {
+ kafkaConsumingEventPublisher: {
+ dev: {
+ clientId: 'backstage-events',
+ brokers: ['kafka1:9092', 'kafka2:9092'],
+ ssl: true,
+ sasl: {
+ mechanism: 'plain',
+ username: 'username',
+ password: 'password',
+ },
+ retry: {
+ maxRetryTime: { milliseconds: 20000 },
+ initialRetryTime: { milliseconds: 200 },
+ factor: '0.4',
+ multiplier: '4',
+ retries: '10',
+ },
+ authenticationTimeout: { milliseconds: 20000 },
+ connectionTimeout: { milliseconds: 1500 },
+ requestTimeout: { milliseconds: 20000 },
+ enforceRequestTimeout: false,
+ topics: [
+ {
+ topic: 'fake1',
+ kafka: {
+ topics: ['topic-A'],
+ groupId: 'my-group',
+ sessionTimeout: { milliseconds: 20000 },
+ rebalanceTimeout: { milliseconds: 50000 },
+ heartbeatInterval: { milliseconds: 2000 },
+ metadataMaxAge: { milliseconds: 400000 },
+ maxBytesPerPartition: 50000,
+ minBytes: 2,
+ maxBytes: 500000,
+ maxWaitTime: { milliseconds: 4000 },
+ },
+ },
+ {
+ topic: 'fake2',
+ kafka: {
+ topics: ['topic-B'],
+ groupId: 'my-group',
+ },
+ },
+ ],
+ },
+ },
+ },
+ },
+ },
+ });
+
+ const publisherConfigs = readConsumerConfig(config, mockLogger);
+
+ expect(publisherConfigs).toBeDefined();
+ expect(Array.isArray(publisherConfigs)).toBe(true);
+ expect(publisherConfigs).toHaveLength(1);
+
+ const devConfig = publisherConfigs[0];
+ expect(devConfig.instance).toBe('dev');
+
+ // Client configuration
+ expect(devConfig.kafkaConfig.clientId).toEqual('backstage-events');
+ expect(devConfig.kafkaConfig.brokers).toEqual([
+ 'kafka1:9092',
+ 'kafka2:9092',
+ ]);
+ expect(devConfig.kafkaConfig.ssl).toBeTruthy();
+ expect(devConfig.kafkaConfig.sasl).toStrictEqual({
+ mechanism: 'plain',
+ username: 'username',
+ password: 'password',
+ });
+ expect(devConfig.kafkaConfig.authenticationTimeout).toBe(20000);
+ expect(devConfig.kafkaConfig.connectionTimeout).toBe(1500);
+ expect(devConfig.kafkaConfig.requestTimeout).toBe(20000);
+ expect(devConfig.kafkaConfig.enforceRequestTimeout).toBeFalsy();
+ expect(devConfig.kafkaConfig.retry).toStrictEqual({
+ maxRetryTime: 20000,
+ initialRetryTime: 200,
+ factor: 0.4,
+ multiplier: 4,
+ retries: 10,
+ });
+
+ // Consumer configuration
+ expect(devConfig.kafkaConsumerConfigs.length).toBe(2);
+
+ expect(devConfig.kafkaConsumerConfigs).toEqual([
+ {
+ backstageTopic: 'fake1',
+ consumerConfig: {
+ groupId: 'my-group',
+ sessionTimeout: 20000,
+ rebalanceTimeout: 50000,
+ heartbeatInterval: 2000,
+ metadataMaxAge: 400000,
+ maxBytesPerPartition: 50000,
+ minBytes: 2,
+ maxBytes: 500000,
+ maxWaitTimeInMs: 4000,
+ },
+ consumerSubscribeTopics: {
+ topics: ['topic-A'],
+ },
+ },
+ {
+ backstageTopic: 'fake2',
+ consumerConfig: {
+ groupId: 'my-group',
+ },
+ consumerSubscribeTopics: {
+ topics: ['topic-B'],
+ },
+ },
+ ]);
+ });
+
+ it('should handle HumanDuration and string values for durations and timeouts', () => {
+ const config = new ConfigReader({
+ events: {
+ modules: {
+ kafka: {
+ kafkaConsumingEventPublisher: {
+ dev: {
+ clientId: 'backstage-events',
+ brokers: ['kafka1:9092', 'kafka2:9092'],
+ retry: {
+ maxRetryTime: { seconds: 1 },
+ initialRetryTime: { minutes: 1 },
+ factor: 0.4,
+ multiplier: 4,
+ retries: 10,
+ },
+ authenticationTimeout: { hours: 1 },
+ connectionTimeout: { days: 1 },
+ topics: [],
+ requestTimeout: '1m',
+ },
+ },
+ },
+ },
+ },
+ });
+
+ const publisherConfigs = readConsumerConfig(config, mockLogger);
+
+ expect(publisherConfigs).toBeDefined();
+ expect(Array.isArray(publisherConfigs)).toBe(true);
+ expect(publisherConfigs).toHaveLength(1);
+
+ const devConfig = publisherConfigs[0];
+ expect(devConfig.instance).toBe('dev');
+
+ // Client configuration
+ expect(devConfig.kafkaConfig.clientId).toEqual('backstage-events');
+ expect(devConfig.kafkaConfig.brokers).toEqual([
+ 'kafka1:9092',
+ 'kafka2:9092',
+ ]);
+ expect(devConfig.kafkaConfig.authenticationTimeout).toBe(3600000);
+ expect(devConfig.kafkaConfig.connectionTimeout).toBe(86400000);
+ expect(devConfig.kafkaConfig.requestTimeout).toBe(60000);
+ expect(devConfig.kafkaConfig.retry).toStrictEqual({
+ maxRetryTime: 1000,
+ initialRetryTime: 60000,
+ factor: 0.4,
+ multiplier: 4,
+ retries: 10,
+ });
+
+ // Consumer configuration
+ expect(devConfig.kafkaConsumerConfigs.length).toBe(0);
+ });
+
+ it('single instance configuration (legacy format)', () => {
+ const config = new ConfigReader({
+ events: {
+ modules: {
+ kafka: {
+ kafkaConsumingEventPublisher: {
+ clientId: 'backstage-events',
+ brokers: ['kafka1:9092', 'kafka2:9092'],
+ topics: [
+ {
+ topic: 'fake1',
+ kafka: {
+ topics: ['topic-A'],
+ groupId: 'my-group',
+ },
+ },
+ {
+ topic: 'fake2',
+ kafka: {
+ topics: ['topic-B'],
+ groupId: 'my-group',
+ },
+ },
+ ],
+ },
+ },
+ },
+ },
+ });
+
+ const publisherConfigs = readConsumerConfig(config, mockLogger);
+
+ expect(publisherConfigs).toBeDefined();
+ expect(Array.isArray(publisherConfigs)).toBe(true);
+ expect(publisherConfigs).toHaveLength(1);
+
+ const defaultConfig = publisherConfigs[0];
+ expect(defaultConfig.instance).toBe('default');
+ expect(defaultConfig.kafkaConsumerConfigs.length).toBe(2);
+
+ expect(defaultConfig.kafkaConfig.clientId).toEqual('backstage-events');
+ expect(defaultConfig.kafkaConfig.brokers).toEqual([
+ 'kafka1:9092',
+ 'kafka2:9092',
+ ]);
+
+ expect(defaultConfig.kafkaConsumerConfigs).toEqual([
+ {
+ backstageTopic: 'fake1',
+ consumerConfig: {
+ groupId: 'my-group',
+ },
+ consumerSubscribeTopics: {
+ topics: ['topic-A'],
+ },
+ },
+ {
+ backstageTopic: 'fake2',
+ consumerConfig: {
+ groupId: 'my-group',
+ },
+ consumerSubscribeTopics: {
+ topics: ['topic-B'],
+ },
+ },
+ ]);
+
+ // Verify deprecation warning was logged
+ expect(mockLogger.warn).toHaveBeenCalledWith(
+ 'Legacy single config format detected at events.modules.kafka.kafkaConsumingEventPublisher.',
+ );
+ });
+});
diff --git a/plugins/events-backend-module-kafka/src/KafkaConsumingEventPublisher/config.ts b/plugins/events-backend-module-kafka/src/KafkaConsumingEventPublisher/config.ts
new file mode 100644
index 0000000000..b07378a1d6
--- /dev/null
+++ b/plugins/events-backend-module-kafka/src/KafkaConsumingEventPublisher/config.ts
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { Config } from '@backstage/config';
+import { ConsumerConfig, ConsumerSubscribeTopics, KafkaConfig } from 'kafkajs';
+import {
+ readKafkaConfig,
+ readOptionalHumanDurationInMs,
+} from '../utils/config';
+import { LoggerService } from '@backstage/backend-plugin-api';
+
+export interface KafkaConsumerConfig {
+ backstageTopic: string;
+ consumerConfig: ConsumerConfig;
+ consumerSubscribeTopics: ConsumerSubscribeTopics;
+}
+
+export interface KafkaConsumingEventPublisherConfig {
+ instance: string;
+ kafkaConfig: KafkaConfig;
+ kafkaConsumerConfigs: KafkaConsumerConfig[];
+}
+
+const CONFIG_PREFIX_PUBLISHER =
+ 'events.modules.kafka.kafkaConsumingEventPublisher';
+
+const processSinglePublisher = (
+ instanceName: string,
+ publisherConfig: Config,
+): KafkaConsumingEventPublisherConfig => {
+ return {
+ instance: instanceName,
+ kafkaConfig: readKafkaConfig(publisherConfig),
+ kafkaConsumerConfigs: publisherConfig
+ .getConfigArray('topics')
+ .map(topicConfig => {
+ return {
+ backstageTopic: topicConfig.getString('topic'),
+ consumerConfig: {
+ groupId: topicConfig.getString('kafka.groupId'),
+ sessionTimeout: readOptionalHumanDurationInMs(
+ topicConfig,
+ 'kafka.sessionTimeout',
+ ),
+ rebalanceTimeout: readOptionalHumanDurationInMs(
+ topicConfig,
+ 'kafka.rebalanceTimeout',
+ ),
+ heartbeatInterval: readOptionalHumanDurationInMs(
+ topicConfig,
+ 'kafka.heartbeatInterval',
+ ),
+ metadataMaxAge: readOptionalHumanDurationInMs(
+ topicConfig,
+ 'kafka.metadataMaxAge',
+ ),
+ maxBytesPerPartition: topicConfig.getOptionalNumber(
+ 'kafka.maxBytesPerPartition',
+ ),
+ minBytes: topicConfig.getOptionalNumber('kafka.minBytes'),
+ maxBytes: topicConfig.getOptionalNumber('kafka.maxBytes'),
+ maxWaitTimeInMs: readOptionalHumanDurationInMs(
+ topicConfig,
+ 'kafka.maxWaitTime',
+ ),
+ },
+ consumerSubscribeTopics: {
+ topics: topicConfig.getStringArray('kafka.topics'),
+ },
+ };
+ }),
+ };
+};
+
+export const readConsumerConfig = (
+ config: Config,
+ logger: LoggerService,
+): KafkaConsumingEventPublisherConfig[] => {
+ const publishersConfig = config.getOptionalConfig(CONFIG_PREFIX_PUBLISHER);
+
+ // Check for legacy single publisher format
+ if (publishersConfig?.getOptionalString('clientId')) {
+ logger.warn(
+ 'Legacy single config format detected at events.modules.kafka.kafkaConsumingEventPublisher.',
+ );
+ return [
+ processSinglePublisher(
+ 'default', // use `default` as instance name for legacy single config
+ publishersConfig,
+ ),
+ ];
+ }
+
+ return (
+ publishersConfig
+ ?.keys()
+ ?.map(publisherKey =>
+ processSinglePublisher(
+ publisherKey,
+ publishersConfig.getConfig(publisherKey),
+ ),
+ ) ?? []
+ );
+};
diff --git a/plugins/events-backend-module-kafka/src/KafkaConsumingEventPublisher/index.ts b/plugins/events-backend-module-kafka/src/KafkaConsumingEventPublisher/index.ts
new file mode 100644
index 0000000000..94d36a81e0
--- /dev/null
+++ b/plugins/events-backend-module-kafka/src/KafkaConsumingEventPublisher/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { eventsModuleKafkaConsumingEventPublisher } from './module';
diff --git a/plugins/events-backend-module-kafka/src/KafkaConsumingEventPublisher/module.test.ts b/plugins/events-backend-module-kafka/src/KafkaConsumingEventPublisher/module.test.ts
new file mode 100644
index 0000000000..19ac969800
--- /dev/null
+++ b/plugins/events-backend-module-kafka/src/KafkaConsumingEventPublisher/module.test.ts
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { createServiceFactory } from '@backstage/backend-plugin-api';
+import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
+import { eventsServiceRef } from '@backstage/plugin-events-node';
+import { TestEventsService } from '@backstage/plugin-events-backend-test-utils';
+import { eventsModuleKafkaConsumingEventPublisher } from './module';
+import { KafkaConsumingEventPublisher } from './KafkaConsumingEventPublisher';
+
+jest.mock('./KafkaConsumingEventPublisher');
+
+describe('eventsModuleKafkaConsumingEventPublisher', () => {
+ it('should be correctly wired and set up', async () => {
+ const events = new TestEventsService();
+ const eventsServiceFactory = createServiceFactory({
+ service: eventsServiceRef,
+ deps: {},
+ async factory({}) {
+ return events;
+ },
+ });
+
+ const mockKafkaConsumingEventPublisher = {
+ start: jest.fn(),
+ shutdown: jest.fn(),
+ } as unknown as KafkaConsumingEventPublisher;
+
+ jest
+ .mocked(KafkaConsumingEventPublisher.fromConfig)
+ .mockReturnValue([mockKafkaConsumingEventPublisher]);
+
+ await startTestBackend({
+ features: [
+ eventsServiceFactory,
+ eventsModuleKafkaConsumingEventPublisher,
+ mockServices.rootConfig.factory({
+ data: {
+ events: {
+ modules: {
+ kafka: {
+ kafkaConsumingEventPublisher: {
+ dev: {
+ clientId: 'backstage-events',
+ brokers: ['kafka1:9092', 'kafka2:9092'],
+ topics: {
+ fake1: {
+ kafka: {
+ topics: ['topic-A'],
+ groupId: 'my-group',
+ },
+ },
+ fake2: {
+ kafka: {
+ topics: ['topic-B'],
+ groupId: 'my-group',
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ }),
+ ],
+ });
+
+ // Verify that the Kafka consumer client was started
+ expect(mockKafkaConsumingEventPublisher.start).toHaveBeenCalled();
+
+ // Verify that the shutdown hook was registered
+ expect(mockKafkaConsumingEventPublisher.shutdown).not.toHaveBeenCalled();
+ });
+
+ it('should handle empty configuration gracefully', async () => {
+ const events = new TestEventsService();
+ const eventsServiceFactory = createServiceFactory({
+ service: eventsServiceRef,
+ deps: {},
+ async factory({}) {
+ return events;
+ },
+ });
+
+ jest.mocked(KafkaConsumingEventPublisher.fromConfig).mockReturnValue([]);
+
+ await startTestBackend({
+ features: [
+ eventsServiceFactory,
+ eventsModuleKafkaConsumingEventPublisher,
+ mockServices.rootConfig.factory({
+ data: {
+ events: {
+ modules: {
+ kafka: {
+ // No kafkaConsumingEventPublisher config
+ },
+ },
+ },
+ },
+ }),
+ ],
+ });
+
+ // Verify that fromConfig was called but returned empty array
+ expect(KafkaConsumingEventPublisher.fromConfig).toHaveBeenCalled();
+ });
+});
diff --git a/plugins/events-backend-module-kafka/src/service/eventsModuleKafkaConsumingEventPublisher.ts b/plugins/events-backend-module-kafka/src/KafkaConsumingEventPublisher/module.ts
similarity index 69%
rename from plugins/events-backend-module-kafka/src/service/eventsModuleKafkaConsumingEventPublisher.ts
rename to plugins/events-backend-module-kafka/src/KafkaConsumingEventPublisher/module.ts
index b524454ca0..8ad3396c76 100644
--- a/plugins/events-backend-module-kafka/src/service/eventsModuleKafkaConsumingEventPublisher.ts
+++ b/plugins/events-backend-module-kafka/src/KafkaConsumingEventPublisher/module.ts
@@ -17,11 +17,11 @@ import {
coreServices,
createBackendModule,
} from '@backstage/backend-plugin-api';
-import { KafkaConsumerClient } from '../publisher/KafkaConsumerClient';
import { eventsServiceRef } from '@backstage/plugin-events-node';
+import { KafkaConsumingEventPublisher } from './KafkaConsumingEventPublisher';
/**
- * Kafka module for the Events plugin.
+ * Reads messages off of Kafka topics and forwards them into the Backstage events system.
*
* @public
*/
@@ -34,22 +34,22 @@ export const eventsModuleKafkaConsumingEventPublisher = createBackendModule({
config: coreServices.rootConfig,
events: eventsServiceRef,
logger: coreServices.logger,
- lifecycle: coreServices.lifecycle,
+ lifecycle: coreServices.rootLifecycle,
},
async init({ config, logger, events, lifecycle }) {
- const kafka = KafkaConsumerClient.fromConfig({
+ const consumers = KafkaConsumingEventPublisher.fromConfig({
config,
events,
logger,
});
- if (!kafka) {
- return;
- }
+ lifecycle.addStartupHook(async () => {
+ await Promise.all(consumers.map(consumer => consumer.start()));
+ });
- await kafka.start();
-
- lifecycle.addShutdownHook(async () => await kafka.shutdown());
+ lifecycle.addShutdownHook(async () => {
+ await Promise.all(consumers.map(consumer => consumer.shutdown()));
+ });
},
});
},
diff --git a/plugins/events-backend-module-kafka/src/KafkaPublishingEventConsumer/KafkaPublishingEventConsumer.test.ts b/plugins/events-backend-module-kafka/src/KafkaPublishingEventConsumer/KafkaPublishingEventConsumer.test.ts
new file mode 100644
index 0000000000..6379605901
--- /dev/null
+++ b/plugins/events-backend-module-kafka/src/KafkaPublishingEventConsumer/KafkaPublishingEventConsumer.test.ts
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { KafkaPublishingEventConsumer } from './KafkaPublishingEventConsumer';
+import { Kafka } from 'kafkajs';
+import { mockServices } from '@backstage/backend-test-utils';
+import { ConfigReader } from '@backstage/config';
+
+jest.mock('kafkajs');
+
+describe('KafkaPublishingEventConsumer', () => {
+ const mockLogger = mockServices.logger.mock();
+ const mockEvents = mockServices.events.mock();
+
+ const mockProducer = {
+ connect: jest.fn(),
+ disconnect: jest.fn(),
+ send: jest.fn(),
+ };
+
+ const mockKafkaClient = {
+ producer: jest.fn().mockReturnValue(mockProducer),
+ } as unknown as Kafka;
+
+ jest.mocked(Kafka).mockImplementation(() => mockKafkaClient);
+
+ const mockConfig = new ConfigReader({
+ events: {
+ modules: {
+ kafka: {
+ kafkaPublishingEventConsumer: {
+ dev: {
+ clientId: 'backstage-events',
+ brokers: ['kafka1:9092'],
+ topics: [
+ {
+ topic: 'backstage-topic',
+ kafka: {
+ topic: 'kafka-topic',
+ allowAutoTopicCreation: true,
+ },
+ },
+ ],
+ },
+ },
+ },
+ },
+ },
+ });
+
+ beforeEach(() => {
+ jest.clearAllMocks();
+ });
+
+ it('should create instances from config', () => {
+ const consumers = KafkaPublishingEventConsumer.fromConfig({
+ config: mockConfig,
+ events: mockEvents,
+ logger: mockLogger,
+ });
+
+ expect(consumers).toHaveLength(1);
+ expect(consumers[0]).toBeInstanceOf(KafkaPublishingEventConsumer);
+ });
+
+ it('should start the consumer and subscribe to events', async () => {
+ const consumers = KafkaPublishingEventConsumer.fromConfig({
+ config: mockConfig,
+ events: mockEvents,
+ logger: mockLogger,
+ });
+
+ await consumers[0].start();
+
+ expect(mockProducer.connect).toHaveBeenCalled();
+ expect(mockEvents.subscribe).toHaveBeenCalledWith({
+ id: 'kafka:publisher:backstage-topic',
+ topics: ['backstage-topic'],
+ onEvent: expect.any(Function),
+ });
+ });
+
+ it('should shutdown the producer', async () => {
+ const consumers = KafkaPublishingEventConsumer.fromConfig({
+ config: mockConfig,
+ events: mockEvents,
+ logger: mockLogger,
+ });
+
+ await consumers[0].shutdown();
+
+ expect(mockProducer.disconnect).toHaveBeenCalled();
+ });
+});
diff --git a/plugins/events-backend-module-kafka/src/KafkaPublishingEventConsumer/KafkaPublishingEventConsumer.ts b/plugins/events-backend-module-kafka/src/KafkaPublishingEventConsumer/KafkaPublishingEventConsumer.ts
new file mode 100644
index 0000000000..f9443f2d69
--- /dev/null
+++ b/plugins/events-backend-module-kafka/src/KafkaPublishingEventConsumer/KafkaPublishingEventConsumer.ts
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { LoggerService } from '@backstage/backend-plugin-api';
+import { EventParams, EventsService } from '@backstage/plugin-events-node';
+import { Kafka, Producer } from 'kafkajs';
+import {
+ KafkaPublisherConfig,
+ KafkaPublishingEventConsumerConfig,
+ readPublisherConfig,
+} from './config';
+import { Config } from '@backstage/config';
+import { loggerServiceAdapter } from '../utils/LoggerServiceAdapter';
+import { payloadToBuffer } from '../utils/kafkaTransformers';
+
+type KafkaPublisher = {
+ producer: Producer;
+ config: KafkaPublisherConfig;
+};
+
+/**
+ * This class subscribes to Backstage internal events and publishes them to Kafka topics.
+ * The internal event payload will be serialized and sent to the configured Kafka topic.
+ */
+export class KafkaPublishingEventConsumer {
+ private readonly kafkaPublishers: KafkaPublisher[];
+ private readonly logger: LoggerService;
+
+ static fromConfig(env: {
+ config: Config;
+ events: EventsService;
+ logger: LoggerService;
+ }): KafkaPublishingEventConsumer[] {
+ const configs = readPublisherConfig(env.config);
+
+ return configs.map(
+ kafkaConfig =>
+ new KafkaPublishingEventConsumer(env.logger, env.events, kafkaConfig),
+ );
+ }
+
+ private constructor(
+ logger: LoggerService,
+ private readonly events: EventsService,
+ config: KafkaPublishingEventConsumerConfig,
+ ) {
+ this.logger = logger.child({
+ class: KafkaPublishingEventConsumer.prototype.constructor.name,
+ instance: config.instance,
+ });
+
+ const kafka = new Kafka({
+ ...config.kafkaConfig,
+ logCreator: loggerServiceAdapter(this.logger),
+ });
+
+ this.kafkaPublishers = config.kafkaPublisherConfigs.map(
+ publisherConfig => ({
+ producer: kafka.producer(publisherConfig.producerConfig),
+ config: publisherConfig,
+ }),
+ );
+ }
+
+ async start(): Promise {
+ await Promise.all(
+ this.kafkaPublishers.map(async ({ producer, config }) => {
+ try {
+ await producer.connect();
+
+ this.events.subscribe({
+ id: `kafka:publisher:${config.backstageTopic}`,
+ topics: [config.backstageTopic],
+ onEvent: async (params: EventParams) => {
+ await producer.send({
+ topic: config.kafkaTopic,
+ messages: [
+ {
+ value: payloadToBuffer(params.eventPayload),
+ },
+ ],
+ });
+ },
+ });
+ this.logger.info(
+ `Subscribed to EventService, publishing events to external topic: ${config.backstageTopic}`,
+ );
+ } catch (error: any) {
+ this.logger.error(
+ `Kafka producer connection failed for topic ${config.backstageTopic}`,
+ error,
+ );
+ }
+ }),
+ );
+ }
+
+ async shutdown(): Promise {
+ await Promise.all(
+ this.kafkaPublishers.map(({ producer }) => producer.disconnect()),
+ );
+ }
+}
diff --git a/plugins/events-backend-module-kafka/src/KafkaPublishingEventConsumer/config.test.ts b/plugins/events-backend-module-kafka/src/KafkaPublishingEventConsumer/config.test.ts
new file mode 100644
index 0000000000..bd4d622238
--- /dev/null
+++ b/plugins/events-backend-module-kafka/src/KafkaPublishingEventConsumer/config.test.ts
@@ -0,0 +1,360 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { ConfigReader } from '@backstage/config';
+import { readPublisherConfig } from './config';
+
+describe('readPublisherConfig', () => {
+ it('not configured', () => {
+ const publisherConfigs = readPublisherConfig(new ConfigReader({}));
+
+ expect(publisherConfigs).toEqual([]);
+ });
+
+ it('only required fields configured', () => {
+ const config = new ConfigReader({
+ events: {
+ modules: {
+ kafka: {
+ kafkaPublishingEventConsumer: {
+ dev: {
+ clientId: 'backstage-events',
+ brokers: ['kafka1:9092', 'kafka2:9092'],
+ topics: [
+ {
+ topic: 'fake1',
+ kafka: {
+ topic: 'topic-A',
+ },
+ },
+ {
+ topic: 'fake2',
+ kafka: {
+ topic: 'topic-B',
+ },
+ },
+ ],
+ },
+ },
+ },
+ },
+ },
+ });
+
+ const publisherConfigs = readPublisherConfig(config);
+
+ expect(publisherConfigs).toBeDefined();
+ expect(Array.isArray(publisherConfigs)).toBe(true);
+ expect(publisherConfigs).toHaveLength(1);
+
+ const devConfig = publisherConfigs[0];
+ expect(devConfig.instance).toBe('dev');
+ expect(devConfig.kafkaPublisherConfigs.length).toBe(2);
+
+ expect(devConfig.kafkaConfig.clientId).toEqual('backstage-events');
+ expect(devConfig.kafkaConfig.brokers).toEqual([
+ 'kafka1:9092',
+ 'kafka2:9092',
+ ]);
+
+ expect(devConfig.kafkaPublisherConfigs).toEqual([
+ {
+ backstageTopic: 'fake1',
+ kafkaTopic: 'topic-A',
+ producerConfig: {
+ allowAutoTopicCreation: undefined,
+ metadataMaxAge: undefined,
+ transactionTimeout: undefined,
+ idempotent: undefined,
+ maxInFlightRequests: undefined,
+ retry: {},
+ },
+ },
+ {
+ backstageTopic: 'fake2',
+ kafkaTopic: 'topic-B',
+ producerConfig: {
+ allowAutoTopicCreation: undefined,
+ metadataMaxAge: undefined,
+ transactionTimeout: undefined,
+ idempotent: undefined,
+ maxInFlightRequests: undefined,
+ retry: {},
+ },
+ },
+ ]);
+ });
+
+ it('all fields configured', () => {
+ const config = new ConfigReader({
+ events: {
+ modules: {
+ kafka: {
+ kafkaPublishingEventConsumer: {
+ dev: {
+ clientId: 'backstage-events',
+ brokers: ['kafka1:9092', 'kafka2:9092'],
+ ssl: true,
+ sasl: {
+ mechanism: 'plain',
+ username: 'username',
+ password: 'password',
+ },
+ retry: {
+ maxRetryTime: { milliseconds: 20000 },
+ initialRetryTime: { milliseconds: 200 },
+ factor: '0.4',
+ multiplier: '4',
+ retries: '10',
+ },
+ authenticationTimeout: { milliseconds: 20000 },
+ connectionTimeout: { milliseconds: 1500 },
+ requestTimeout: { milliseconds: 20000 },
+ enforceRequestTimeout: false,
+ topics: [
+ {
+ topic: 'fake1',
+ kafka: {
+ topic: 'topic-A',
+ allowAutoTopicCreation: true,
+ metadataMaxAge: { milliseconds: 400000 },
+ transactionTimeout: { milliseconds: 30000 },
+ idempotent: true,
+ maxInFlightRequests: 5,
+ retry: {
+ maxRetryTime: { milliseconds: 15000 },
+ initialRetryTime: { milliseconds: 100 },
+ factor: '0.2',
+ multiplier: '2',
+ retries: '5',
+ },
+ },
+ },
+ {
+ topic: 'fake2',
+ kafka: {
+ topic: 'topic-B',
+ },
+ },
+ ],
+ },
+ },
+ },
+ },
+ },
+ });
+
+ const publisherConfigs = readPublisherConfig(config);
+
+ expect(publisherConfigs).toBeDefined();
+ expect(Array.isArray(publisherConfigs)).toBe(true);
+ expect(publisherConfigs).toHaveLength(1);
+
+ const devConfig = publisherConfigs[0];
+ expect(devConfig.instance).toBe('dev');
+
+ // Client configuration
+ expect(devConfig.kafkaConfig.clientId).toEqual('backstage-events');
+ expect(devConfig.kafkaConfig.brokers).toEqual([
+ 'kafka1:9092',
+ 'kafka2:9092',
+ ]);
+ expect(devConfig.kafkaConfig.ssl).toBeTruthy();
+ expect(devConfig.kafkaConfig.sasl).toStrictEqual({
+ mechanism: 'plain',
+ username: 'username',
+ password: 'password',
+ });
+ expect(devConfig.kafkaConfig.authenticationTimeout).toBe(20000);
+ expect(devConfig.kafkaConfig.connectionTimeout).toBe(1500);
+ expect(devConfig.kafkaConfig.requestTimeout).toBe(20000);
+ expect(devConfig.kafkaConfig.enforceRequestTimeout).toBeFalsy();
+ expect(devConfig.kafkaConfig.retry).toStrictEqual({
+ maxRetryTime: 20000,
+ initialRetryTime: 200,
+ factor: 0.4,
+ multiplier: 4,
+ retries: 10,
+ });
+
+ // Publisher configuration
+ expect(devConfig.kafkaPublisherConfigs.length).toBe(2);
+
+ expect(devConfig.kafkaPublisherConfigs).toEqual([
+ {
+ backstageTopic: 'fake1',
+ kafkaTopic: 'topic-A',
+ producerConfig: {
+ allowAutoTopicCreation: true,
+ metadataMaxAge: 400000,
+ transactionTimeout: 30000,
+ idempotent: true,
+ maxInFlightRequests: 5,
+ retry: {
+ maxRetryTime: 15000,
+ initialRetryTime: 100,
+ factor: 0.2,
+ multiplier: 2,
+ retries: 5,
+ },
+ },
+ },
+ {
+ backstageTopic: 'fake2',
+ kafkaTopic: 'topic-B',
+ producerConfig: {
+ allowAutoTopicCreation: undefined,
+ metadataMaxAge: undefined,
+ transactionTimeout: undefined,
+ idempotent: undefined,
+ maxInFlightRequests: undefined,
+ retry: {},
+ },
+ },
+ ]);
+ });
+
+ it('should handle HumanDuration and string values for durations and timeouts', () => {
+ const config = new ConfigReader({
+ events: {
+ modules: {
+ kafka: {
+ kafkaPublishingEventConsumer: {
+ dev: {
+ clientId: 'backstage-events',
+ brokers: ['kafka1:9092', 'kafka2:9092'],
+ retry: {
+ maxRetryTime: { seconds: 1 },
+ initialRetryTime: { minutes: 1 },
+ factor: 0.4,
+ multiplier: 4,
+ retries: 10,
+ },
+ authenticationTimeout: { hours: 1 },
+ connectionTimeout: { days: 1 },
+ topics: [
+ {
+ topic: 'fake1',
+ kafka: {
+ topic: 'topic-A',
+ metadataMaxAge: { seconds: 300 },
+ transactionTimeout: '30s',
+ },
+ },
+ ],
+ requestTimeout: '1m',
+ },
+ },
+ },
+ },
+ },
+ });
+
+ const publisherConfigs = readPublisherConfig(config);
+
+ expect(publisherConfigs).toBeDefined();
+ expect(Array.isArray(publisherConfigs)).toBe(true);
+ expect(publisherConfigs).toHaveLength(1);
+
+ const devConfig = publisherConfigs[0];
+ expect(devConfig.instance).toBe('dev');
+
+ // Client configuration
+ expect(devConfig.kafkaConfig.clientId).toEqual('backstage-events');
+ expect(devConfig.kafkaConfig.brokers).toEqual([
+ 'kafka1:9092',
+ 'kafka2:9092',
+ ]);
+ expect(devConfig.kafkaConfig.authenticationTimeout).toBe(3600000);
+ expect(devConfig.kafkaConfig.connectionTimeout).toBe(86400000);
+ expect(devConfig.kafkaConfig.requestTimeout).toBe(60000);
+ expect(devConfig.kafkaConfig.retry).toStrictEqual({
+ maxRetryTime: 1000,
+ initialRetryTime: 60000,
+ factor: 0.4,
+ multiplier: 4,
+ retries: 10,
+ });
+
+ // Publisher configuration
+ expect(devConfig.kafkaPublisherConfigs.length).toBe(1);
+ expect(
+ devConfig.kafkaPublisherConfigs[0].producerConfig.metadataMaxAge,
+ ).toBe(300000);
+ expect(
+ devConfig.kafkaPublisherConfigs[0].producerConfig.transactionTimeout,
+ ).toBe(30000);
+ });
+
+ it('should handle multiple instances', () => {
+ const config = new ConfigReader({
+ events: {
+ modules: {
+ kafka: {
+ kafkaPublishingEventConsumer: {
+ dev: {
+ clientId: 'backstage-dev',
+ brokers: ['kafka-dev:9092'],
+ topics: [
+ {
+ topic: 'dev-topic',
+ kafka: {
+ topic: 'kafka-dev-topic',
+ },
+ },
+ ],
+ },
+ prod: {
+ clientId: 'backstage-prod',
+ brokers: ['kafka-prod1:9092', 'kafka-prod2:9092'],
+ topics: [
+ {
+ topic: 'prod-topic',
+ kafka: {
+ topic: 'kafka-prod-topic',
+ },
+ },
+ ],
+ },
+ },
+ },
+ },
+ },
+ });
+
+ const publisherConfigs = readPublisherConfig(config);
+
+ expect(publisherConfigs).toBeDefined();
+ expect(Array.isArray(publisherConfigs)).toBe(true);
+ expect(publisherConfigs).toHaveLength(2);
+
+ const devConfig = publisherConfigs.find(c => c.instance === 'dev')!;
+ expect(devConfig.kafkaConfig.clientId).toBe('backstage-dev');
+ expect(devConfig.kafkaConfig.brokers).toEqual(['kafka-dev:9092']);
+ expect(devConfig.kafkaPublisherConfigs).toHaveLength(1);
+ expect(devConfig.kafkaPublisherConfigs[0].backstageTopic).toBe('dev-topic');
+
+ const prodConfig = publisherConfigs.find(c => c.instance === 'prod')!;
+ expect(prodConfig.kafkaConfig.clientId).toBe('backstage-prod');
+ expect(prodConfig.kafkaConfig.brokers).toEqual([
+ 'kafka-prod1:9092',
+ 'kafka-prod2:9092',
+ ]);
+ expect(prodConfig.kafkaPublisherConfigs).toHaveLength(1);
+ expect(prodConfig.kafkaPublisherConfigs[0].backstageTopic).toBe(
+ 'prod-topic',
+ );
+ });
+});
diff --git a/plugins/events-backend-module-kafka/src/KafkaPublishingEventConsumer/config.ts b/plugins/events-backend-module-kafka/src/KafkaPublishingEventConsumer/config.ts
new file mode 100644
index 0000000000..8439e24405
--- /dev/null
+++ b/plugins/events-backend-module-kafka/src/KafkaPublishingEventConsumer/config.ts
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { Config } from '@backstage/config';
+import {
+ readKafkaConfig,
+ readOptionalHumanDurationInMs,
+ readRetryConfig,
+} from '../utils/config';
+import { KafkaConfig, ProducerConfig } from 'kafkajs';
+
+export interface KafkaPublisherConfig {
+ backstageTopic: string;
+ kafkaTopic: string;
+ producerConfig: ProducerConfig;
+}
+
+export interface KafkaPublishingEventConsumerConfig {
+ instance: string;
+ kafkaConfig: KafkaConfig;
+ kafkaPublisherConfigs: KafkaPublisherConfig[];
+}
+
+const CONFIG_PREFIX_PUBLISHER =
+ 'events.modules.kafka.kafkaPublishingEventConsumer';
+
+export const readPublisherConfig = (
+ config: Config,
+): KafkaPublishingEventConsumerConfig[] => {
+ const publishers = config.getOptionalConfig(CONFIG_PREFIX_PUBLISHER);
+
+ return (
+ publishers?.keys()?.map(publisherKey => {
+ const publisherConfig = publishers.getConfig(publisherKey);
+
+ return {
+ instance: publisherKey,
+ kafkaConfig: readKafkaConfig(publisherConfig),
+ kafkaPublisherConfigs: publisherConfig
+ .getConfigArray('topics')
+ .map(topicConfig => {
+ return {
+ backstageTopic: topicConfig.getString('topic'),
+ kafkaTopic: topicConfig.getString('kafka.topic'),
+ producerConfig: {
+ allowAutoTopicCreation: topicConfig.getOptionalBoolean(
+ 'kafka.allowAutoTopicCreation',
+ ),
+ metadataMaxAge: readOptionalHumanDurationInMs(
+ topicConfig,
+ 'kafka.metadataMaxAge',
+ ),
+ transactionTimeout: readOptionalHumanDurationInMs(
+ topicConfig,
+ 'kafka.transactionTimeout',
+ ),
+ idempotent: topicConfig.getOptionalBoolean('kafka.idempotent'),
+ maxInFlightRequests: topicConfig.getOptionalNumber(
+ 'kafka.maxInFlightRequests',
+ ),
+ retry: readRetryConfig(
+ topicConfig.getOptionalConfig('kafka.retry'),
+ ),
+ },
+ };
+ }),
+ };
+ }) ?? []
+ );
+};
diff --git a/plugins/events-backend-module-kafka/src/KafkaPublishingEventConsumer/index.ts b/plugins/events-backend-module-kafka/src/KafkaPublishingEventConsumer/index.ts
new file mode 100644
index 0000000000..42fadd2a5a
--- /dev/null
+++ b/plugins/events-backend-module-kafka/src/KafkaPublishingEventConsumer/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { eventsModuleKafkaPublishingEventConsumer } from './module';
diff --git a/plugins/events-backend-module-kafka/src/KafkaPublishingEventConsumer/module.test.ts b/plugins/events-backend-module-kafka/src/KafkaPublishingEventConsumer/module.test.ts
new file mode 100644
index 0000000000..39c8268300
--- /dev/null
+++ b/plugins/events-backend-module-kafka/src/KafkaPublishingEventConsumer/module.test.ts
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { createServiceFactory } from '@backstage/backend-plugin-api';
+import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
+import { eventsServiceRef } from '@backstage/plugin-events-node';
+import { TestEventsService } from '@backstage/plugin-events-backend-test-utils';
+import { eventsModuleKafkaPublishingEventConsumer } from './module';
+import { KafkaPublishingEventConsumer } from './KafkaPublishingEventConsumer';
+
+jest.mock('./KafkaPublishingEventConsumer');
+
+describe('eventsModuleKafkaPublishingEventConsumer', () => {
+ it('should be correctly wired and set up', async () => {
+ const events = new TestEventsService();
+ const eventsServiceFactory = createServiceFactory({
+ service: eventsServiceRef,
+ deps: {},
+ async factory({}) {
+ return events;
+ },
+ });
+
+ const mockKafkaPublishingEventConsumer = {
+ start: jest.fn(),
+ shutdown: jest.fn(),
+ } as unknown as KafkaPublishingEventConsumer;
+
+ jest
+ .mocked(KafkaPublishingEventConsumer.fromConfig)
+ .mockReturnValue([mockKafkaPublishingEventConsumer]);
+
+ await startTestBackend({
+ features: [
+ eventsServiceFactory,
+ eventsModuleKafkaPublishingEventConsumer,
+ mockServices.rootConfig.factory({
+ data: {
+ events: {
+ modules: {
+ kafka: {
+ kafkaPublishingEventConsumer: {
+ dev: {
+ clientId: 'backstage-events',
+ brokers: ['kafka1:9092', 'kafka2:9092'],
+ topics: [
+ {
+ topic: 'fake1',
+ kafka: {
+ topic: 'topic-A',
+ },
+ },
+ {
+ topic: 'fake2',
+ kafka: {
+ topic: 'topic-B',
+ },
+ },
+ ],
+ },
+ },
+ },
+ },
+ },
+ },
+ }),
+ ],
+ });
+
+ // Verify that the Kafka publishing event consumer was started
+ expect(mockKafkaPublishingEventConsumer.start).toHaveBeenCalled();
+
+ // Verify that the shutdown hook was registered (but not called yet)
+ expect(mockKafkaPublishingEventConsumer.shutdown).not.toHaveBeenCalled();
+ });
+
+ it('should handle empty configuration gracefully', async () => {
+ const events = new TestEventsService();
+ const eventsServiceFactory = createServiceFactory({
+ service: eventsServiceRef,
+ deps: {},
+ async factory({}) {
+ return events;
+ },
+ });
+
+ jest.mocked(KafkaPublishingEventConsumer.fromConfig).mockReturnValue([]);
+
+ await startTestBackend({
+ features: [
+ eventsServiceFactory,
+ eventsModuleKafkaPublishingEventConsumer,
+ mockServices.rootConfig.factory({
+ data: {
+ events: {
+ modules: {
+ kafka: {
+ // No kafkaPublishingEventConsumer config
+ },
+ },
+ },
+ },
+ }),
+ ],
+ });
+
+ // Verify that fromConfig was called but returned empty array
+ expect(KafkaPublishingEventConsumer.fromConfig).toHaveBeenCalled();
+ });
+});
diff --git a/plugins/events-backend-module-kafka/src/KafkaPublishingEventConsumer/module.ts b/plugins/events-backend-module-kafka/src/KafkaPublishingEventConsumer/module.ts
new file mode 100644
index 0000000000..dd5f0c50ab
--- /dev/null
+++ b/plugins/events-backend-module-kafka/src/KafkaPublishingEventConsumer/module.ts
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import {
+ coreServices,
+ createBackendModule,
+} from '@backstage/backend-plugin-api';
+import { eventsServiceRef } from '@backstage/plugin-events-node';
+import { KafkaPublishingEventConsumer } from './KafkaPublishingEventConsumer';
+
+/**
+ * Reads internal Backstage events and forwards them to Kafka topics.
+ *
+ * @public
+ */
+export const eventsModuleKafkaPublishingEventConsumer = createBackendModule({
+ pluginId: 'events',
+ moduleId: 'kafka-publishing-event-consumer',
+ register(env) {
+ env.registerInit({
+ deps: {
+ config: coreServices.rootConfig,
+ events: eventsServiceRef,
+ logger: coreServices.logger,
+ lifecycle: coreServices.rootLifecycle,
+ },
+ async init({ config, logger, events, lifecycle }) {
+ const consumers = KafkaPublishingEventConsumer.fromConfig({
+ config,
+ events,
+ logger,
+ });
+
+ lifecycle.addStartupHook(async () => {
+ await Promise.all(consumers.map(consumer => consumer.start()));
+ });
+
+ lifecycle.addShutdownHook(async () => {
+ await Promise.all(consumers.map(consumer => consumer.shutdown()));
+ });
+ },
+ });
+ },
+});
diff --git a/plugins/events-backend-module-kafka/src/index.ts b/plugins/events-backend-module-kafka/src/index.ts
index 3ba6207d7d..af4fb02bf1 100644
--- a/plugins/events-backend-module-kafka/src/index.ts
+++ b/plugins/events-backend-module-kafka/src/index.ts
@@ -13,14 +13,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+import { createBackendFeatureLoader } from '@backstage/backend-plugin-api';
+import { eventsModuleKafkaConsumingEventPublisher } from './KafkaConsumingEventPublisher';
+import { eventsModuleKafkaPublishingEventConsumer } from './KafkaPublishingEventConsumer';
/**
* The module "kafka" for the Backstage backend plugin "events"
- * adding an Kafka-based publisher,
- * receiving events from an Kafka topic and passing it to the
- * internal event broker.
+ * adding Kafka-based event handling:
+ * - Consumer: receives events from Kafka topics and passes them to the internal event broker
+ * - Publisher: receives internal events and publishes them to Kafka topics
*
* @packageDocumentation
*/
-export { eventsModuleKafkaConsumingEventPublisher as default } from './service/eventsModuleKafkaConsumingEventPublisher';
+export default createBackendFeatureLoader({
+ *loader() {
+ yield eventsModuleKafkaConsumingEventPublisher;
+ yield eventsModuleKafkaPublishingEventConsumer;
+ },
+});
diff --git a/plugins/events-backend-module-kafka/src/publisher/KafkaConsumerClient.test.ts b/plugins/events-backend-module-kafka/src/publisher/KafkaConsumerClient.test.ts
deleted file mode 100644
index 5824bf4d41..0000000000
--- a/plugins/events-backend-module-kafka/src/publisher/KafkaConsumerClient.test.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2025 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { KafkaConsumerClient } from './KafkaConsumerClient';
-import { ConfigReader } from '@backstage/config';
-import { KafkaConsumingEventPublisher } from './KafkaConsumingEventPublisher';
-import { mockServices } from '@backstage/backend-test-utils';
-
-jest.mock('kafkajs');
-jest.mock('./KafkaConsumingEventPublisher');
-
-describe('KafkaConsumerClient', () => {
- const mockLogger = mockServices.logger.mock();
- const mockEvents = mockServices.events.mock();
-
- const mockConfig = new ConfigReader({
- events: {
- modules: {
- kafka: {
- kafkaConsumingEventPublisher: {
- clientId: 'backstage-events',
- brokers: ['kafka1:9092', 'kafka2:9092'],
- topics: [
- {
- topic: 'fake1',
- kafka: {
- topics: ['topic-A'],
- groupId: 'my-group',
- },
- },
- {
- topic: 'fake2',
- kafka: {
- topics: ['topic-B'],
- groupId: 'my-group',
- },
- },
- ],
- },
- },
- },
- },
- });
-
- beforeEach(() => {
- jest.clearAllMocks();
- });
-
- it('should create an instance from config', () => {
- const client = KafkaConsumerClient.fromConfig({
- config: mockConfig,
- events: mockEvents,
- logger: mockLogger,
- });
-
- expect(client).toBeInstanceOf(KafkaConsumerClient);
- });
-
- it('should not create an instance from config', () => {
- const client = KafkaConsumerClient.fromConfig({
- config: new ConfigReader({}),
- events: mockEvents,
- logger: mockLogger,
- });
-
- expect(client).toBeUndefined();
- });
-
- it('should create a consumer for each topic from config', () => {
- KafkaConsumerClient.fromConfig({
- config: mockConfig,
- events: mockEvents,
- logger: mockLogger,
- });
-
- expect(KafkaConsumingEventPublisher.fromConfig).toHaveBeenCalledTimes(2);
- });
-
- it('should start all consumers', async () => {
- const mockConsumer = {
- start: jest.fn().mockResolvedValue(undefined),
- };
- (KafkaConsumingEventPublisher.fromConfig as jest.Mock).mockReturnValue(
- mockConsumer,
- );
-
- const client = KafkaConsumerClient.fromConfig({
- config: mockConfig,
- events: mockEvents,
- logger: mockLogger,
- });
-
- expect(client).toBeDefined();
-
- await client?.start();
-
- expect(mockConsumer.start).toHaveBeenCalled();
- });
-
- it('should shutdown all consumers', async () => {
- const mockConsumer = {
- shutdown: jest.fn().mockResolvedValue(undefined),
- };
- (KafkaConsumingEventPublisher.fromConfig as jest.Mock).mockReturnValue(
- mockConsumer,
- );
-
- const client = KafkaConsumerClient.fromConfig({
- config: mockConfig,
- events: mockEvents,
- logger: mockLogger,
- });
-
- expect(client).toBeDefined();
-
- await client?.shutdown();
-
- expect(mockConsumer.shutdown).toHaveBeenCalled();
- });
-});
diff --git a/plugins/events-backend-module-kafka/src/publisher/KafkaConsumerClient.ts b/plugins/events-backend-module-kafka/src/publisher/KafkaConsumerClient.ts
deleted file mode 100644
index d506e4a6af..0000000000
--- a/plugins/events-backend-module-kafka/src/publisher/KafkaConsumerClient.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2025 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { LoggerService } from '@backstage/backend-plugin-api';
-import { Config } from '@backstage/config';
-import { EventsService } from '@backstage/plugin-events-node';
-import { Kafka } from 'kafkajs';
-import { KafkaEventSourceConfig, readConfig } from './config';
-import { KafkaConsumingEventPublisher } from './KafkaConsumingEventPublisher';
-import { loggerServiceAdapter } from './LoggerServiceAdapter';
-
-/**
- * KafkaConsumerClient
- *
- * This class creates the Kafka client that will be used to create the KafkaConsumingEventPublisher
- */
-export class KafkaConsumerClient {
- private readonly kafka: Kafka;
- private readonly consumers: KafkaConsumingEventPublisher[];
-
- static fromConfig(options: {
- config: Config;
- events: EventsService;
- logger: LoggerService;
- }): KafkaConsumerClient | undefined {
- const kafkaConfig = readConfig(options.config);
-
- if (!kafkaConfig) {
- options.logger.info(
- 'Kafka consumer not configured, skipping initialization',
- );
- return undefined;
- }
-
- return new KafkaConsumerClient(options.logger, options.events, kafkaConfig);
- }
-
- private constructor(
- logger: LoggerService,
- events: EventsService,
- config: KafkaEventSourceConfig,
- ) {
- this.kafka = new Kafka({
- ...config.kafkaConfig,
- logCreator: loggerServiceAdapter(logger),
- });
-
- this.consumers = config.kafkaConsumerConfigs.map(consumerConfig =>
- KafkaConsumingEventPublisher.fromConfig({
- kafkaClient: this.kafka,
- config: consumerConfig,
- logger,
- events,
- }),
- );
- }
-
- async start(): Promise {
- this.consumers.map(async consumer => await consumer.start());
- }
-
- async shutdown(): Promise {
- this.consumers.map(async consumer => await consumer.shutdown());
- }
-}
diff --git a/plugins/events-backend-module-kafka/src/publisher/KafkaConsumingEventPublisher.test.ts b/plugins/events-backend-module-kafka/src/publisher/KafkaConsumingEventPublisher.test.ts
deleted file mode 100644
index 64c53595ad..0000000000
--- a/plugins/events-backend-module-kafka/src/publisher/KafkaConsumingEventPublisher.test.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2025 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { KafkaConsumingEventPublisher } from './KafkaConsumingEventPublisher';
-import { Kafka } from 'kafkajs';
-import { KafkaConsumerConfig } from './config';
-import { mockServices } from '@backstage/backend-test-utils';
-
-jest.mock('kafkajs');
-
-describe('KafkaConsumingEventPublisher', () => {
- const mockLogger = mockServices.logger.mock();
- const mockEvents = mockServices.events.mock();
-
- const mockConsumer = {
- connect: jest.fn(),
- disconnect: jest.fn(),
- subscribe: jest.fn(),
- run: jest.fn(),
- };
-
- const mockKafkaClient = {
- consumer: jest.fn().mockReturnValue(mockConsumer),
- } as unknown as Kafka;
-
- const kafkaConsumerConfig: KafkaConsumerConfig = {
- consumerConfig: {
- groupId: 'test-group',
- },
- consumerSubscribeTopics: {
- topics: ['test-topic'],
- },
- backstageTopic: 'backstage-topic',
- };
-
- beforeEach(() => {
- jest.clearAllMocks();
- });
-
- it('should create an instance from config', () => {
- const consumer = KafkaConsumingEventPublisher.fromConfig({
- kafkaClient: mockKafkaClient,
- config: kafkaConsumerConfig,
- events: mockEvents,
- logger: mockLogger,
- });
-
- expect(consumer).toBeInstanceOf(KafkaConsumingEventPublisher);
- });
-
- it('should start the consumer', async () => {
- const consumer = KafkaConsumingEventPublisher.fromConfig({
- kafkaClient: mockKafkaClient,
- config: kafkaConsumerConfig,
- events: mockEvents,
- logger: mockLogger,
- });
-
- await consumer.start();
-
- expect(mockConsumer.connect).toHaveBeenCalled();
- expect(mockConsumer.subscribe).toHaveBeenCalledWith(
- kafkaConsumerConfig.consumerSubscribeTopics,
- );
- expect(mockConsumer.run).toHaveBeenCalled();
- });
-
- it('should shutdown the consumer', async () => {
- const consumer = KafkaConsumingEventPublisher.fromConfig({
- kafkaClient: mockKafkaClient,
- config: kafkaConsumerConfig,
- events: mockEvents,
- logger: mockLogger,
- });
-
- await consumer.shutdown();
-
- expect(mockConsumer.disconnect).toHaveBeenCalled();
- });
-});
diff --git a/plugins/events-backend-module-kafka/src/publisher/KafkaConsumingEventPublisher.ts b/plugins/events-backend-module-kafka/src/publisher/KafkaConsumingEventPublisher.ts
deleted file mode 100644
index dfc6186fb5..0000000000
--- a/plugins/events-backend-module-kafka/src/publisher/KafkaConsumingEventPublisher.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2025 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { LoggerService } from '@backstage/backend-plugin-api';
-import { EventParams, EventsService } from '@backstage/plugin-events-node';
-import { Consumer, ConsumerSubscribeTopics, IHeaders, Kafka } from 'kafkajs';
-import { KafkaConsumerConfig } from './config';
-
-type EventMetadata = EventParams['metadata'];
-
-/**
- * This class subscribes to Kafka topics and publishes events received to the registered subscriber.
- * The message payload will be used as the event payload and passed to the subscribers.
- */
-export class KafkaConsumingEventPublisher {
- private readonly kafkaConsumer: Consumer;
- private readonly consumerSubscribeTopics: ConsumerSubscribeTopics;
- private readonly backstageTopic: string;
- private readonly logger: LoggerService;
-
- static fromConfig(env: {
- kafkaClient: Kafka;
- config: KafkaConsumerConfig;
- events: EventsService;
- logger: LoggerService;
- }): KafkaConsumingEventPublisher {
- return new KafkaConsumingEventPublisher(
- env.kafkaClient,
- env.logger,
- env.events,
- env.config,
- );
- }
-
- private readonly events: EventsService;
-
- private constructor(
- kafkaClient: Kafka,
- logger: LoggerService,
- events: EventsService,
- config: KafkaConsumerConfig,
- ) {
- this.events = events;
- this.kafkaConsumer = kafkaClient.consumer(config.consumerConfig);
- this.consumerSubscribeTopics = config.consumerSubscribeTopics;
- this.backstageTopic = config.backstageTopic;
- const id = `events.kafka.publisher:${this.backstageTopic}`;
- this.logger = logger.child({
- class: KafkaConsumingEventPublisher.prototype.constructor.name,
- groupId: config.consumerConfig.groupId,
- kafkaTopics: config.consumerSubscribeTopics.topics.toString(),
- backstageTopic: config.backstageTopic,
- taskId: id,
- });
- }
-
- async start(): Promise {
- try {
- await this.kafkaConsumer.connect();
-
- await this.kafkaConsumer.subscribe(this.consumerSubscribeTopics);
-
- await this.kafkaConsumer.run({
- eachMessage: async ({ message }) => {
- this.events.publish({
- topic: this.backstageTopic,
- eventPayload: JSON.parse(message.value?.toString()!),
- metadata: this.convertHeadersToMetadata(message.headers),
- });
- },
- });
- } catch (error: any) {
- this.logger.error('Kafka consumer connection failed ', error);
- }
- }
-
- async shutdown(): Promise {
- await this.kafkaConsumer.disconnect();
- }
-
- private convertHeadersToMetadata = (
- headers: IHeaders | undefined,
- ): EventParams['metadata'] => {
- if (!headers) return undefined;
-
- const metadata: EventMetadata = {};
-
- Object.entries(headers).forEach(([key, value]) => {
- // If value is an array use toString() on all values converting any Buffer types to valid strings
- if (Array.isArray(value)) metadata[key] = value.map(v => v.toString());
- // Always return the values using toString() to catch all Buffer types that should be converted to strings
- else metadata[key] = value?.toString();
- });
-
- return metadata;
- };
-}
diff --git a/plugins/events-backend-module-kafka/src/publisher/config.test.ts b/plugins/events-backend-module-kafka/src/publisher/config.test.ts
deleted file mode 100644
index fc7e3049b0..0000000000
--- a/plugins/events-backend-module-kafka/src/publisher/config.test.ts
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright 2025 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { ConfigReader } from '@backstage/config';
-import { readConfig } from './config';
-
-describe('readConfig', () => {
- it('not configured', () => {
- const publisherConfigs = readConfig(new ConfigReader({}));
-
- expect(publisherConfigs).toBeUndefined();
- });
-
- it('only required fields configured', () => {
- const config = new ConfigReader({
- events: {
- modules: {
- kafka: {
- kafkaConsumingEventPublisher: {
- clientId: 'backstage-events',
- brokers: ['kafka1:9092', 'kafka2:9092'],
- topics: [
- {
- topic: 'fake1',
- kafka: {
- topics: ['topic-A'],
- groupId: 'my-group',
- },
- },
- {
- topic: 'fake2',
- kafka: {
- topics: ['topic-B'],
- groupId: 'my-group',
- },
- },
- ],
- },
- },
- },
- },
- });
-
- const publisherConfigs = readConfig(config);
-
- expect(publisherConfigs).toBeDefined();
-
- expect(publisherConfigs?.kafkaConsumerConfigs.length).toBe(2);
-
- expect(publisherConfigs?.kafkaConfig.clientId).toEqual('backstage-events');
- expect(publisherConfigs?.kafkaConfig.brokers).toEqual([
- 'kafka1:9092',
- 'kafka2:9092',
- ]);
- expect(publisherConfigs?.kafkaConsumerConfigs[0].backstageTopic).toEqual(
- 'fake1',
- );
- expect(
- publisherConfigs?.kafkaConsumerConfigs[0].consumerConfig.groupId,
- ).toEqual('my-group');
- expect(
- publisherConfigs?.kafkaConsumerConfigs[0].consumerSubscribeTopics.topics,
- ).toEqual(['topic-A']);
- });
-
- it('all fields configured', () => {
- const config = new ConfigReader({
- events: {
- modules: {
- kafka: {
- kafkaConsumingEventPublisher: {
- clientId: 'backstage-events',
- brokers: ['kafka1:9092', 'kafka2:9092'],
- ssl: true,
- sasl: {
- mechanism: 'plain',
- username: 'username',
- password: 'password',
- },
- retry: {
- maxRetryTime: { milliseconds: 20000 },
- initialRetryTime: { milliseconds: 200 },
- factor: '0.4',
- multiplier: '4',
- retries: '10',
- },
- authenticationTimeout: { milliseconds: 20000 },
- connectionTimeout: { milliseconds: 1500 },
- requestTimeout: { milliseconds: 20000 },
- enforceRequestTimeout: false,
- topics: [
- {
- topic: 'fake1',
- kafka: {
- topics: ['topic-A'],
- groupId: 'my-group',
- sessionTimeout: { milliseconds: 20000 },
- rebalanceTimeout: { milliseconds: 50000 },
- heartbeatInterval: { milliseconds: 2000 },
- metadataMaxAge: { milliseconds: 400000 },
- maxBytesPerPartition: 50000,
- minBytes: 2,
- maxBytes: 500000,
- maxWaitTime: { milliseconds: 4000 },
- },
- },
- {
- topic: 'fake2',
- kafka: {
- topics: ['topic-B'],
- groupId: 'my-group',
- },
- },
- ],
- },
- },
- },
- },
- });
-
- const publisherConfigs = readConfig(config);
-
- expect(publisherConfigs).toBeDefined();
-
- // Client configuration
- expect(publisherConfigs?.kafkaConfig.clientId).toEqual('backstage-events');
- expect(publisherConfigs?.kafkaConfig.brokers).toEqual([
- 'kafka1:9092',
- 'kafka2:9092',
- ]);
- expect(publisherConfigs?.kafkaConfig.ssl).toBeTruthy();
- expect(publisherConfigs?.kafkaConfig.sasl).toStrictEqual({
- mechanism: 'plain',
- username: 'username',
- password: 'password',
- });
- expect(publisherConfigs?.kafkaConfig.authenticationTimeout).toBe(20000);
- expect(publisherConfigs?.kafkaConfig.connectionTimeout).toBe(1500);
- expect(publisherConfigs?.kafkaConfig.requestTimeout).toBe(20000);
- expect(publisherConfigs?.kafkaConfig.enforceRequestTimeout).toBeFalsy();
- expect(publisherConfigs?.kafkaConfig.retry).toStrictEqual({
- maxRetryTime: 20000,
- initialRetryTime: 200,
- factor: 0.4,
- multiplier: 4,
- retries: 10,
- });
-
- // Consumer configuration
- expect(publisherConfigs?.kafkaConsumerConfigs.length).toBe(2);
- expect(publisherConfigs?.kafkaConsumerConfigs[0].backstageTopic).toEqual(
- 'fake1',
- );
- expect(
- publisherConfigs?.kafkaConsumerConfigs[0].consumerConfig.groupId,
- ).toEqual('my-group');
- expect(
- publisherConfigs?.kafkaConsumerConfigs[0].consumerSubscribeTopics.topics,
- ).toEqual(['topic-A']);
-
- expect(
- publisherConfigs?.kafkaConsumerConfigs[0].consumerConfig.sessionTimeout,
- ).toBe(20000);
- expect(
- publisherConfigs?.kafkaConsumerConfigs[0].consumerConfig.rebalanceTimeout,
- ).toBe(50000);
- expect(
- publisherConfigs?.kafkaConsumerConfigs[0].consumerConfig
- .heartbeatInterval,
- ).toBe(2000);
- expect(
- publisherConfigs?.kafkaConsumerConfigs[0].consumerConfig.metadataMaxAge,
- ).toBe(400000);
- expect(
- publisherConfigs?.kafkaConsumerConfigs[0].consumerConfig
- .maxBytesPerPartition,
- ).toBe(50000);
- expect(
- publisherConfigs?.kafkaConsumerConfigs[0].consumerConfig.minBytes,
- ).toBe(2);
- expect(
- publisherConfigs?.kafkaConsumerConfigs[0].consumerConfig.maxBytes,
- ).toBe(500000);
- expect(
- publisherConfigs?.kafkaConsumerConfigs[0].consumerConfig.maxWaitTimeInMs,
- ).toBe(4000);
- });
-
- it('should handle HumanDuration and string values for durations and timeouts', () => {
- const config = new ConfigReader({
- events: {
- modules: {
- kafka: {
- kafkaConsumingEventPublisher: {
- clientId: 'backstage-events',
- brokers: ['kafka1:9092', 'kafka2:9092'],
- retry: {
- maxRetryTime: { seconds: 1 },
- initialRetryTime: { minutes: 1 },
- factor: 0.4,
- multiplier: 4,
- retries: 10,
- },
- authenticationTimeout: { hours: 1 },
- connectionTimeout: { days: 1 },
- topics: [],
- requestTimeout: '1m',
- },
- },
- },
- },
- });
-
- const publisherConfigs = readConfig(config);
-
- expect(publisherConfigs).toBeDefined();
-
- // Client configuration
- expect(publisherConfigs?.kafkaConfig.clientId).toEqual('backstage-events');
- expect(publisherConfigs?.kafkaConfig.brokers).toEqual([
- 'kafka1:9092',
- 'kafka2:9092',
- ]);
- expect(publisherConfigs?.kafkaConfig.authenticationTimeout).toBe(3600000);
- expect(publisherConfigs?.kafkaConfig.connectionTimeout).toBe(86400000);
- expect(publisherConfigs?.kafkaConfig.requestTimeout).toBe(60000);
- expect(publisherConfigs?.kafkaConfig.retry).toStrictEqual({
- maxRetryTime: 1000,
- initialRetryTime: 60000,
- factor: 0.4,
- multiplier: 4,
- retries: 10,
- });
-
- // Consumer configuration
- expect(publisherConfigs?.kafkaConsumerConfigs.length).toBe(0);
- });
-});
diff --git a/plugins/events-backend-module-kafka/src/publisher/config.ts b/plugins/events-backend-module-kafka/src/publisher/config.ts
deleted file mode 100644
index 7534ce4d38..0000000000
--- a/plugins/events-backend-module-kafka/src/publisher/config.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright 2025 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { Config, readDurationFromConfig } from '@backstage/config';
-import { durationToMilliseconds } from '@backstage/types';
-import { ConsumerConfig, ConsumerSubscribeTopics, KafkaConfig } from 'kafkajs';
-
-export interface KafkaConsumerConfig {
- backstageTopic: string;
- consumerConfig: ConsumerConfig;
- consumerSubscribeTopics: ConsumerSubscribeTopics;
-}
-
-export interface KafkaEventSourceConfig {
- kafkaConfig: KafkaConfig;
- kafkaConsumerConfigs: KafkaConsumerConfig[];
-}
-
-const CONFIG_PREFIX_PUBLISHER =
- 'events.modules.kafka.kafkaConsumingEventPublisher';
-
-/**
- * Reads an optional HumanDuration from the config and returns the value in milliseconds if the key is defined.
- *
- * @param config - The configuration object to read from.
- * @param key - The key to look up in the configuration.
- * @returns The duration in milliseconds, or undefined if the key is not defined.
- */
-const readOptionalHumanDurationInMs = (
- config: Config,
- key: string,
-): number | undefined => {
- const humanDuration = config.has(key)
- ? readDurationFromConfig(config, { key })
- : undefined;
-
- if (!humanDuration) return undefined;
-
- return durationToMilliseconds(humanDuration);
-};
-
-export const readConfig = (
- config: Config,
-): KafkaEventSourceConfig | undefined => {
- const kafkaConfig = config.getOptionalConfig(CONFIG_PREFIX_PUBLISHER);
-
- if (!kafkaConfig) {
- return undefined;
- }
-
- const clientId = kafkaConfig.getString('clientId');
- const brokers = kafkaConfig.getStringArray('brokers');
-
- const authenticationTimeout = readOptionalHumanDurationInMs(
- kafkaConfig,
- 'authenticationTimeout',
- );
-
- const connectionTimeout = readOptionalHumanDurationInMs(
- kafkaConfig,
- 'connectionTimeout',
- );
- const requestTimeout = readOptionalHumanDurationInMs(
- kafkaConfig,
- 'requestTimeout',
- );
- const enforceRequestTimeout = kafkaConfig.getOptionalBoolean(
- 'enforceRequestTimeout',
- );
-
- const ssl = kafkaConfig.getOptional('ssl') as KafkaConfig['ssl'];
- const sasl = kafkaConfig.getOptional('sasl') as KafkaConfig['sasl'];
-
- const retry: KafkaConfig['retry'] = {
- maxRetryTime: readOptionalHumanDurationInMs(
- kafkaConfig,
- 'retry.maxRetryTime',
- ),
- initialRetryTime: readOptionalHumanDurationInMs(
- kafkaConfig,
- 'retry.initialRetryTime',
- ),
- factor: kafkaConfig.getOptionalNumber('retry.factor'),
- multiplier: kafkaConfig.getOptionalNumber('retry.multiplier'),
- retries: kafkaConfig.getOptionalNumber('retry.retries'),
- };
-
- const kafkaConsumerConfigs: KafkaConsumerConfig[] = kafkaConfig
- .getConfigArray('topics')
- .map(topic => {
- return {
- backstageTopic: topic.getString('topic'),
- consumerConfig: {
- groupId: topic.getString('kafka.groupId'),
- sessionTimeout: readOptionalHumanDurationInMs(
- topic,
- 'kafka.sessionTimeout',
- ),
- rebalanceTimeout: readOptionalHumanDurationInMs(
- topic,
- 'kafka.rebalanceTimeout',
- ),
- heartbeatInterval: readOptionalHumanDurationInMs(
- topic,
- 'kafka.heartbeatInterval',
- ),
- metadataMaxAge: readOptionalHumanDurationInMs(
- topic,
- 'kafka.metadataMaxAge',
- ),
- maxBytesPerPartition: topic.getOptionalNumber(
- 'kafka.maxBytesPerPartition',
- ),
- minBytes: topic.getOptionalNumber('kafka.minBytes'),
- maxBytes: topic.getOptionalNumber('kafka.maxBytes'),
- maxWaitTimeInMs: readOptionalHumanDurationInMs(
- topic,
- 'kafka.maxWaitTime',
- ),
- },
- consumerSubscribeTopics: {
- topics: topic.getStringArray('kafka.topics'),
- },
- };
- });
-
- return {
- kafkaConfig: {
- clientId,
- brokers,
- ssl,
- sasl,
- authenticationTimeout,
- connectionTimeout,
- requestTimeout,
- enforceRequestTimeout,
- retry,
- },
- kafkaConsumerConfigs,
- };
-};
diff --git a/plugins/events-backend-module-kafka/src/service/eventsModuleKafkaConsumingEventPublisher.test.ts b/plugins/events-backend-module-kafka/src/service/eventsModuleKafkaConsumingEventPublisher.test.ts
deleted file mode 100644
index 816793f635..0000000000
--- a/plugins/events-backend-module-kafka/src/service/eventsModuleKafkaConsumingEventPublisher.test.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2025 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { createServiceFactory } from '@backstage/backend-plugin-api';
-import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
-import { eventsServiceRef } from '@backstage/plugin-events-node';
-import { TestEventsService } from '@backstage/plugin-events-backend-test-utils';
-import { eventsModuleKafkaConsumingEventPublisher } from './eventsModuleKafkaConsumingEventPublisher';
-import { KafkaConsumerClient } from '../publisher/KafkaConsumerClient';
-
-jest.mock('../publisher/KafkaConsumerClient');
-
-describe('eventsModuleKafkaConsumingEventPublisher', () => {
- it('should be correctly wired and set up', async () => {
- const events = new TestEventsService();
- const eventsServiceFactory = createServiceFactory({
- service: eventsServiceRef,
- deps: {},
- async factory({}) {
- return events;
- },
- });
-
- const mockKafkaConsumerClient = {
- start: jest.fn(),
- shutdown: jest.fn(),
- };
- (KafkaConsumerClient.fromConfig as jest.Mock).mockReturnValue(
- mockKafkaConsumerClient,
- );
-
- await startTestBackend({
- features: [
- eventsServiceFactory,
- eventsModuleKafkaConsumingEventPublisher,
- mockServices.rootConfig.factory({
- data: {
- events: {
- modules: {
- kafka: {
- kafkaConsumingEventPublisher: {
- clientId: 'backstage-events',
- brokers: ['kafka1:9092', 'kafka2:9092'],
- topics: {
- fake1: {
- kafka: {
- topics: ['topic-A'],
- groupId: 'my-group',
- },
- },
- fake2: {
- kafka: {
- topics: ['topic-B'],
- groupId: 'my-group',
- },
- },
- },
- },
- },
- },
- },
- },
- }),
- ],
- });
-
- // Verify that the Kafka consumer client was started
- expect(mockKafkaConsumerClient.start).toHaveBeenCalled();
-
- // Verify that the shutdown hook was registered
- expect(mockKafkaConsumerClient.shutdown).not.toHaveBeenCalled();
- });
-});
diff --git a/plugins/events-backend-module-kafka/src/publisher/LoggerServiceAdapter.ts b/plugins/events-backend-module-kafka/src/utils/LoggerServiceAdapter.ts
similarity index 100%
rename from plugins/events-backend-module-kafka/src/publisher/LoggerServiceAdapter.ts
rename to plugins/events-backend-module-kafka/src/utils/LoggerServiceAdapter.ts
diff --git a/plugins/events-backend-module-kafka/src/utils/config.test.ts b/plugins/events-backend-module-kafka/src/utils/config.test.ts
new file mode 100644
index 0000000000..2bd6121ba2
--- /dev/null
+++ b/plugins/events-backend-module-kafka/src/utils/config.test.ts
@@ -0,0 +1,235 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { ConfigReader } from '@backstage/config';
+import { readRetryConfig, readKafkaConfig } from './config';
+
+describe('readRetryConfig', () => {
+ it('should return empty object when config is undefined', () => {
+ const result = readRetryConfig(undefined);
+ expect(result).toEqual({});
+ });
+
+ it('should return empty object when config is empty', () => {
+ const config = new ConfigReader({});
+ const result = readRetryConfig(config);
+ expect(result).toEqual({});
+ });
+
+ it('should read retry configuration with milliseconds', () => {
+ const config = new ConfigReader({
+ maxRetryTime: { milliseconds: 20000 },
+ initialRetryTime: { milliseconds: 200 },
+ factor: 0.4,
+ multiplier: 4,
+ retries: 10,
+ });
+
+ const result = readRetryConfig(config);
+
+ expect(result).toEqual({
+ maxRetryTime: 20000,
+ initialRetryTime: 200,
+ factor: 0.4,
+ multiplier: 4,
+ retries: 10,
+ });
+ });
+
+ it('should read retry configuration with string values', () => {
+ const config = new ConfigReader({
+ maxRetryTime: { seconds: 20 },
+ initialRetryTime: { minutes: 1 },
+ factor: '0.4',
+ multiplier: '4',
+ retries: '10',
+ });
+
+ const result = readRetryConfig(config);
+
+ expect(result).toEqual({
+ maxRetryTime: 20000,
+ initialRetryTime: 60000,
+ factor: 0.4,
+ multiplier: 4,
+ retries: 10,
+ });
+ });
+
+ it('should handle HumanDuration values', () => {
+ const config = new ConfigReader({
+ maxRetryTime: { hours: 1 },
+ initialRetryTime: { days: 1 },
+ });
+
+ const result = readRetryConfig(config);
+
+ expect(result).toEqual({
+ maxRetryTime: 3600000,
+ initialRetryTime: 86400000,
+ factor: undefined,
+ multiplier: undefined,
+ retries: undefined,
+ });
+ });
+
+ it('should handle partial configuration', () => {
+ const config = new ConfigReader({
+ maxRetryTime: { milliseconds: 15000 },
+ retries: 5,
+ });
+
+ const result = readRetryConfig(config);
+
+ expect(result).toEqual({
+ maxRetryTime: 15000,
+ initialRetryTime: undefined,
+ factor: undefined,
+ multiplier: undefined,
+ retries: 5,
+ });
+ });
+});
+
+describe('readKafkaConfig', () => {
+ it('should read minimal kafka configuration', () => {
+ const config = new ConfigReader({
+ clientId: 'test-client',
+ brokers: ['kafka1:9092', 'kafka2:9092'],
+ });
+
+ const result = readKafkaConfig(config);
+
+ expect(result).toEqual({
+ clientId: 'test-client',
+ brokers: ['kafka1:9092', 'kafka2:9092'],
+ authenticationTimeout: undefined,
+ connectionTimeout: undefined,
+ requestTimeout: undefined,
+ enforceRequestTimeout: undefined,
+ ssl: undefined,
+ sasl: undefined,
+ retry: {},
+ });
+ });
+
+ it('should read full kafka configuration with all optional fields', () => {
+ const config = new ConfigReader({
+ clientId: 'backstage-events',
+ brokers: ['kafka1:9092', 'kafka2:9092'],
+ authenticationTimeout: { milliseconds: 20000 },
+ connectionTimeout: { milliseconds: 1500 },
+ requestTimeout: { milliseconds: 20000 },
+ enforceRequestTimeout: false,
+ ssl: true,
+ sasl: {
+ mechanism: 'plain',
+ username: 'username',
+ password: 'password',
+ },
+ retry: {
+ maxRetryTime: { milliseconds: 20000 },
+ initialRetryTime: { milliseconds: 200 },
+ factor: 0.4,
+ multiplier: 4,
+ retries: 10,
+ },
+ });
+
+ const result = readKafkaConfig(config);
+
+ expect(result).toEqual({
+ clientId: 'backstage-events',
+ brokers: ['kafka1:9092', 'kafka2:9092'],
+ authenticationTimeout: 20000,
+ connectionTimeout: 1500,
+ requestTimeout: 20000,
+ enforceRequestTimeout: false,
+ ssl: true,
+ sasl: {
+ mechanism: 'plain',
+ username: 'username',
+ password: 'password',
+ },
+ retry: {
+ maxRetryTime: 20000,
+ initialRetryTime: 200,
+ factor: 0.4,
+ multiplier: 4,
+ retries: 10,
+ },
+ });
+ });
+
+ it('should handle HumanDuration values for timeouts', () => {
+ const config = new ConfigReader({
+ clientId: 'test-client',
+ brokers: ['kafka:9092'],
+ authenticationTimeout: { hours: 1 },
+ connectionTimeout: { days: 1 },
+ requestTimeout: { minutes: 5 },
+ });
+
+ const result = readKafkaConfig(config);
+
+ expect(result.authenticationTimeout).toBe(3600000);
+ expect(result.connectionTimeout).toBe(86400000);
+ expect(result.requestTimeout).toBe(300000);
+ });
+
+ it('should handle complex SSL configuration', () => {
+ const config = new ConfigReader({
+ clientId: 'secure-client',
+ brokers: ['secure-kafka:9093'],
+ ssl: {
+ rejectUnauthorized: false,
+ ca: 'ca-certificate',
+ key: 'client-key',
+ cert: 'client-cert',
+ },
+ });
+
+ const result = readKafkaConfig(config);
+
+ expect(result.ssl).toEqual({
+ rejectUnauthorized: false,
+ ca: 'ca-certificate',
+ key: 'client-key',
+ cert: 'client-cert',
+ });
+ });
+
+ it('should handle complex SASL configuration', () => {
+ const config = new ConfigReader({
+ clientId: 'sasl-client',
+ brokers: ['sasl-kafka:9094'],
+ sasl: {
+ mechanism: 'scram-sha-256',
+ username: 'kafka-user',
+ password: 'kafka-password',
+ authorizationIdentity: 'authz-user',
+ },
+ });
+
+ const result = readKafkaConfig(config);
+
+ expect(result.sasl).toEqual({
+ mechanism: 'scram-sha-256',
+ username: 'kafka-user',
+ password: 'kafka-password',
+ authorizationIdentity: 'authz-user',
+ });
+ });
+});
diff --git a/plugins/events-backend-module-kafka/src/utils/config.ts b/plugins/events-backend-module-kafka/src/utils/config.ts
new file mode 100644
index 0000000000..4e140d26a3
--- /dev/null
+++ b/plugins/events-backend-module-kafka/src/utils/config.ts
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { Config, readDurationFromConfig } from '@backstage/config';
+import { durationToMilliseconds } from '@backstage/types';
+import { KafkaConfig, RetryOptions } from 'kafkajs';
+
+/**
+ * Reads an optional HumanDuration from the config and returns the value in milliseconds if the key is defined.
+ *
+ * @param config - The configuration object to read from.
+ * @param key - The key to look up in the configuration.
+ * @returns The duration in milliseconds, or undefined if the key is not defined.
+ */
+export const readOptionalHumanDurationInMs = (
+ config: Config,
+ key: string,
+): number | undefined => {
+ const humanDuration = config.has(key)
+ ? readDurationFromConfig(config, { key })
+ : undefined;
+
+ if (!humanDuration) return undefined;
+
+ return durationToMilliseconds(humanDuration);
+};
+
+/**
+ * Reads retry configuration options from the provided config object.
+ *
+ * @param config - The configuration object to read retry options from, or undefined.
+ * @returns A RetryOptions object with optional retry settings, or an empty object if config is undefined.
+ */
+export const readRetryConfig = (config: Config | undefined): RetryOptions => {
+ if (!config) {
+ return {};
+ }
+
+ return {
+ maxRetryTime: readOptionalHumanDurationInMs(config, 'maxRetryTime'),
+ initialRetryTime: readOptionalHumanDurationInMs(config, 'initialRetryTime'),
+ factor: config.getOptionalNumber('factor'),
+ multiplier: config.getOptionalNumber('multiplier'),
+ retries: config.getOptionalNumber('retries'),
+ };
+};
+
+/**
+ * Reads Kafka configuration from the provided config object.
+ *
+ * @param config - The configuration object containing Kafka settings.
+ * @returns A KafkaConfig object with all necessary Kafka connection and authentication settings.
+ */
+export const readKafkaConfig = (config: Config): KafkaConfig => {
+ return {
+ clientId: config.getString('clientId'),
+ brokers: config.getStringArray('brokers'),
+ authenticationTimeout: readOptionalHumanDurationInMs(
+ config,
+ 'authenticationTimeout',
+ ),
+ connectionTimeout: readOptionalHumanDurationInMs(
+ config,
+ 'connectionTimeout',
+ ),
+ requestTimeout: readOptionalHumanDurationInMs(config, 'requestTimeout'),
+ enforceRequestTimeout: config.getOptionalBoolean('enforceRequestTimeout'),
+ ssl: config.getOptional('ssl') as KafkaConfig['ssl'],
+ sasl: config.getOptional('sasl') as KafkaConfig['sasl'],
+ retry: readRetryConfig(config.getOptionalConfig('retry')),
+ };
+};
diff --git a/plugins/events-backend-module-kafka/src/utils/kafkaTransformers.test.ts b/plugins/events-backend-module-kafka/src/utils/kafkaTransformers.test.ts
new file mode 100644
index 0000000000..bfb373ea53
--- /dev/null
+++ b/plugins/events-backend-module-kafka/src/utils/kafkaTransformers.test.ts
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { convertHeadersToMetadata, payloadToBuffer } from './kafkaTransformers';
+
+describe('kafka-transformers', () => {
+ describe('convertHeadersToMetadata', () => {
+ it('should return undefined when headers is undefined', () => {
+ const result = convertHeadersToMetadata(undefined);
+ expect(result).toBeUndefined();
+ });
+
+ it('should convert string headers to metadata', () => {
+ const headers = {
+ 'content-type': 'application/json',
+ 'user-id': '12345',
+ };
+
+ const result = convertHeadersToMetadata(headers);
+
+ expect(result).toEqual({
+ 'content-type': 'application/json',
+ 'user-id': '12345',
+ });
+ });
+
+ it('should convert Buffer headers to string metadata', () => {
+ const headers = {
+ 'content-type': Buffer.from('application/json'),
+ 'correlation-id': Buffer.from('abc-123'),
+ };
+
+ const result = convertHeadersToMetadata(headers);
+
+ expect(result).toEqual({
+ 'content-type': 'application/json',
+ 'correlation-id': 'abc-123',
+ });
+ });
+
+ it('should convert array headers to string array metadata', () => {
+ const headers = {
+ tags: ['tag1', 'tag2'],
+ 'buffer-tags': [Buffer.from('tag3'), Buffer.from('tag4')],
+ 'mixed-tags': ['tag5', Buffer.from('tag6')],
+ };
+
+ const result = convertHeadersToMetadata(headers);
+
+ expect(result).toEqual({
+ tags: ['tag1', 'tag2'],
+ 'buffer-tags': ['tag3', 'tag4'],
+ 'mixed-tags': ['tag5', 'tag6'],
+ });
+ });
+
+ it('should handle mixed header types', () => {
+ const headers = {
+ 'string-header': 'value',
+ 'buffer-header': Buffer.from('buffer-value'),
+ 'array-header': ['item1', Buffer.from('item2')],
+ 'undefined-header': undefined,
+ };
+
+ const result = convertHeadersToMetadata(headers);
+
+ expect(result).toEqual({
+ 'string-header': 'value',
+ 'buffer-header': 'buffer-value',
+ 'array-header': ['item1', 'item2'],
+ 'undefined-header': undefined,
+ });
+ });
+
+ it('should handle empty headers object', () => {
+ const headers = {};
+ const result = convertHeadersToMetadata(headers);
+ expect(result).toEqual({});
+ });
+ });
+
+ describe('payloadToBuffer', () => {
+ it('should return the same Buffer when payload is already a Buffer', () => {
+ const originalBuffer = Buffer.from('test data');
+
+ const result = payloadToBuffer(originalBuffer);
+
+ expect(result).toBe(originalBuffer);
+ expect(Buffer.isBuffer(result)).toBe(true);
+ });
+
+ it('should convert string to Buffer', () => {
+ const payload = 'hello world';
+
+ const result = payloadToBuffer(payload);
+
+ expect(Buffer.isBuffer(result)).toBe(true);
+ expect(result.toString()).toBe('hello world');
+ });
+
+ it('should convert object to JSON Buffer', () => {
+ const payload = { name: 'John', age: 30 };
+
+ const result = payloadToBuffer(payload);
+
+ expect(Buffer.isBuffer(result)).toBe(true);
+ expect(JSON.parse(result.toString())).toEqual(payload);
+ });
+
+ it('should convert array to JSON Buffer', () => {
+ const payload = [1, 2, 3, 'test'];
+
+ const result = payloadToBuffer(payload);
+
+ expect(Buffer.isBuffer(result)).toBe(true);
+ expect(JSON.parse(result.toString())).toEqual(payload);
+ });
+
+ it('should convert primitives to JSON Buffer', () => {
+ expect(payloadToBuffer(42).toString()).toBe('42');
+ expect(payloadToBuffer(true).toString()).toBe('true');
+ expect(payloadToBuffer(null).toString()).toBe('null');
+ });
+ });
+});
diff --git a/plugins/events-backend-module-kafka/src/utils/kafkaTransformers.ts b/plugins/events-backend-module-kafka/src/utils/kafkaTransformers.ts
new file mode 100644
index 0000000000..871cb08a04
--- /dev/null
+++ b/plugins/events-backend-module-kafka/src/utils/kafkaTransformers.ts
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { EventParams } from '@backstage/plugin-events-node';
+import { IHeaders } from 'kafkajs';
+
+type EventMetadata = EventParams['metadata'];
+
+export const convertHeadersToMetadata = (
+ headers: IHeaders | undefined,
+): EventMetadata => {
+ if (!headers) return undefined;
+
+ const metadata: EventMetadata = {};
+
+ Object.entries(headers).forEach(([key, value]) => {
+ // If value is an array use toString() on all values converting any Buffer types to valid strings
+ if (Array.isArray(value)) metadata[key] = value.map(v => v.toString());
+ // Always return the values using toString() to catch all Buffer types that should be converted to strings
+ else metadata[key] = value?.toString();
+ });
+
+ return metadata;
+};
+
+export const payloadToBuffer = (payload: unknown): Buffer => {
+ if (Buffer.isBuffer(payload)) {
+ return payload;
+ }
+
+ if (typeof payload === 'string') {
+ return Buffer.from(payload, 'utf8'); // More explicit encoding
+ }
+
+ // Convert to JSON string then encode
+ return Buffer.from(JSON.stringify(payload), 'utf8');
+};
diff --git a/plugins/events-backend-test-utils/CHANGELOG.md b/plugins/events-backend-test-utils/CHANGELOG.md
index 91ac1aa27e..a9233cc14a 100644
--- a/plugins/events-backend-test-utils/CHANGELOG.md
+++ b/plugins/events-backend-test-utils/CHANGELOG.md
@@ -1,5 +1,12 @@
# @backstage/plugin-events-backend-test-utils
+## 0.1.51
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18
+
## 0.1.51-next.0
### Patch Changes
diff --git a/plugins/events-backend-test-utils/package.json b/plugins/events-backend-test-utils/package.json
index 64c0ee9925..814fb23241 100644
--- a/plugins/events-backend-test-utils/package.json
+++ b/plugins/events-backend-test-utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-events-backend-test-utils",
- "version": "0.1.51-next.0",
+ "version": "0.1.51",
"description": "The plugin-events-backend-test-utils for @backstage/plugin-events-node",
"backstage": {
"role": "node-library",
diff --git a/plugins/events-backend/CHANGELOG.md b/plugins/events-backend/CHANGELOG.md
index 8663b0707b..d504f3fdaf 100644
--- a/plugins/events-backend/CHANGELOG.md
+++ b/plugins/events-backend/CHANGELOG.md
@@ -1,5 +1,40 @@
# @backstage/plugin-events-backend
+## 0.5.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-openapi-utils@0.6.5-next.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/types@1.2.2
+ - @backstage/plugin-events-node@0.4.18
+
+## 0.5.9
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/backend-openapi-utils@0.6.4
+ - @backstage/plugin-events-node@0.4.18
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.5.9-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/backend-openapi-utils@0.6.4-next.1
+ - @backstage/plugin-events-node@0.4.18-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/types@1.2.2
+
## 0.5.9-next.0
### Patch Changes
diff --git a/plugins/events-backend/package.json b/plugins/events-backend/package.json
index db9f5c9c72..5089655b6e 100644
--- a/plugins/events-backend/package.json
+++ b/plugins/events-backend/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-events-backend",
- "version": "0.5.9-next.0",
+ "version": "0.5.10-next.0",
"backstage": {
"role": "backend-plugin",
"pluginId": "events",
diff --git a/plugins/events-node/CHANGELOG.md b/plugins/events-node/CHANGELOG.md
index 7ed7f0afb1..d748102a2b 100644
--- a/plugins/events-node/CHANGELOG.md
+++ b/plugins/events-node/CHANGELOG.md
@@ -1,5 +1,23 @@
# @backstage/plugin-events-node
+## 0.4.18
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.4.18-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/errors@1.2.7
+ - @backstage/types@1.2.2
+
## 0.4.18-next.0
### Patch Changes
diff --git a/plugins/events-node/package.json b/plugins/events-node/package.json
index 156fb4b263..c8dc226198 100644
--- a/plugins/events-node/package.json
+++ b/plugins/events-node/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-events-node",
- "version": "0.4.18-next.0",
+ "version": "0.4.18",
"description": "The plugin-events-node module for @backstage/plugin-events-backend",
"backstage": {
"role": "node-library",
@@ -65,7 +65,7 @@
"devDependencies": {
"@backstage/backend-test-utils": "workspace:^",
"@backstage/cli": "workspace:^",
- "msw": "^1.0.0"
+ "msw": "^2.0.0"
},
"configSchema": "config.d.ts"
}
diff --git a/plugins/events-node/src/api/DefaultEventsService.test.ts b/plugins/events-node/src/api/DefaultEventsService.test.ts
index 13a6a68fa4..a62cc24f14 100644
--- a/plugins/events-node/src/api/DefaultEventsService.test.ts
+++ b/plugins/events-node/src/api/DefaultEventsService.test.ts
@@ -17,7 +17,7 @@
import { DefaultEventsService } from './DefaultEventsService';
import { EventParams } from './EventParams';
import { EVENTS_NOTIFY_TIMEOUT_HEADER } from './EventsService';
-import { rest } from 'msw';
+import { http, HttpResponse } from 'msw';
import { setupServer } from 'msw/node';
import {
mockServices,
@@ -129,18 +129,18 @@ describe('DefaultEventsService', () => {
});
mswServer.use(
- rest.put(
+ http.put(
'http://localhost:0/api/events/bus/v1/subscriptions/a.tester',
- (_req, res, ctx) => res(ctx.status(200)),
+ () => new HttpResponse(null, { status: 200 }),
),
- rest.get(
+ http.get(
'http://localhost:0/api/events/bus/v1/subscriptions/a.tester/events',
- (_req, res, ctx) =>
- res(
- ctx.status(200),
- ctx.json({
+ () =>
+ HttpResponse.json(
+ {
events: [{ topic: 'test', payload: { foo: 'bar' } }],
- }),
+ },
+ { status: 200 },
),
),
);
@@ -180,38 +180,36 @@ describe('DefaultEventsService', () => {
});
mswServer.use(
- rest.put(
+ http.put(
'http://localhost:0/api/events/bus/v1/subscriptions/a.tester',
- (_req, res, ctx) => res(ctx.status(200)),
+ () => new HttpResponse(null, { status: 200 }),
),
// The first and third calls result in a blocking 202 that is resolved after 100ms
// The second and fourth calls result in a 200 with an event
// The fifth call blocks until the end of the test
// No more than 5 calls should be made
- rest.get(
+ http.get(
'http://localhost:0/api/events/bus/v1/subscriptions/a.tester/events',
- (_req, res, ctx) => {
+ () => {
callCount += 1;
if (callCount === 1 || callCount === 3) {
- return res(
- ctx.status(202),
- ctx.body(
- new ReadableStream({
- start(controller) {
- setTimeout(() => controller.close(), 100);
- },
- }),
- ),
+ return new HttpResponse(
+ new ReadableStream({
+ start(controller) {
+ setTimeout(() => controller.close(), 100);
+ },
+ }),
+ { status: 202 },
);
} else if (callCount === 2 || callCount === 4) {
- return res(
- ctx.status(200),
- ctx.json({
+ return HttpResponse.json(
+ {
events: [{ topic: 'test', payload: { callCount } }],
- }),
+ },
+ { status: 200 },
);
} else if (callCount === 5) {
- return res(ctx.status(202), ctx.body(blockingStream));
+ return new HttpResponse(blockingStream, { status: 202 });
}
throw new Error(`events endpoint called too many times`);
},
@@ -268,45 +266,42 @@ describe('DefaultEventsService', () => {
});
mswServer.use(
- rest.put(
+ http.put(
'http://localhost:0/api/events/bus/v1/subscriptions/a.tester',
- (_req, res, ctx) => res(ctx.status(200)),
+ () => new HttpResponse(null, { status: 200 }),
),
// The first and third calls result in a blocking 202 that is resolved after 100ms
// The second and fourth calls result in a 200 with an event
// The fifth call blocks until the end of the test
// No more than 5 calls should be made
- rest.get(
+ http.get(
'http://localhost:0/api/events/bus/v1/subscriptions/a.tester/events',
- (_req, res, ctx) => {
+ () => {
callCount += 1;
if (callCount === 1 || callCount === 3) {
- return res(
- ctx.status(202),
- ctx.body(
- new ReadableStream({
- start(controller) {
- setTimeout(() => controller.close(), 100);
- },
- }),
- ),
+ return new HttpResponse(
+ new ReadableStream({
+ start(controller) {
+ setTimeout(() => controller.close(), 100);
+ },
+ }),
+ { status: 202 },
);
} else if (callCount === 2 || callCount === 4) {
- return res(
- ctx.status(200),
- ctx.json({
+ return HttpResponse.json(
+ {
events: [{ topic: 'test', payload: { callCount } }],
- }),
+ },
+ { status: 200 },
);
} else if (callCount === 5) {
// 5th call has a timeout header so polling should proceed to the next call
- return res(
- ctx.set(EVENTS_NOTIFY_TIMEOUT_HEADER, '100'),
- ctx.status(202),
- ctx.body(blockingStream),
- );
+ return new HttpResponse(blockingStream, {
+ status: 202,
+ headers: { [EVENTS_NOTIFY_TIMEOUT_HEADER]: '100' },
+ });
} else if (callCount === 6) {
- return res(ctx.status(202), ctx.body(blockingStream));
+ return new HttpResponse(blockingStream, { status: 202 });
}
throw new Error(`events endpoint called too many times`);
},
@@ -358,11 +353,11 @@ describe('DefaultEventsService', () => {
let calledApi = false;
mswServer.use(
- rest.put(
+ http.put(
'http://localhost:0/api/events/bus/v1/subscriptions/a.tester',
- (_req, res, ctx) => {
+ () => {
calledApi = true;
- res(ctx.status(200));
+ return new HttpResponse(null, { status: 200 });
},
),
);
@@ -393,9 +388,9 @@ describe('DefaultEventsService', () => {
});
mswServer.use(
- rest.put(
+ http.put(
'http://localhost:0/api/events/bus/v1/subscriptions/a.tester',
- (_req, res, ctx) => res(ctx.status(404)),
+ () => new HttpResponse(null, { status: 404 }),
),
);
@@ -432,9 +427,9 @@ describe('DefaultEventsService', () => {
});
mswServer.use(
- rest.put(
+ http.put(
'http://localhost:0/api/events/bus/v1/subscriptions/a.tester',
- (_req, res, ctx) => res(ctx.status(404)),
+ () => new HttpResponse(null, { status: 404 }),
),
);
diff --git a/plugins/example-todo-list-backend/CHANGELOG.md b/plugins/example-todo-list-backend/CHANGELOG.md
index 411e010d16..4d7a89509f 100644
--- a/plugins/example-todo-list-backend/CHANGELOG.md
+++ b/plugins/example-todo-list-backend/CHANGELOG.md
@@ -1,5 +1,20 @@
# @internal/plugin-todo-list-backend
+## 1.0.46
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0
+
+## 1.0.46-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/errors@1.2.7
+
## 1.0.46-next.0
### Patch Changes
diff --git a/plugins/example-todo-list-backend/package.json b/plugins/example-todo-list-backend/package.json
index 4a8e2748c2..108655947a 100644
--- a/plugins/example-todo-list-backend/package.json
+++ b/plugins/example-todo-list-backend/package.json
@@ -1,6 +1,6 @@
{
"name": "@internal/plugin-todo-list-backend",
- "version": "1.0.46-next.0",
+ "version": "1.0.46",
"backstage": {
"role": "backend-plugin",
"pluginId": "todo-list",
diff --git a/plugins/example-todo-list/CHANGELOG.md b/plugins/example-todo-list/CHANGELOG.md
index d2db721b76..798fa8df02 100644
--- a/plugins/example-todo-list/CHANGELOG.md
+++ b/plugins/example-todo-list/CHANGELOG.md
@@ -1,5 +1,13 @@
# @internal/plugin-todo-list
+## 1.0.46
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-components@0.18.4
+ - @backstage/core-plugin-api@1.12.1
+
## 1.0.46-next.0
### Patch Changes
diff --git a/plugins/example-todo-list/package.json b/plugins/example-todo-list/package.json
index 7867750b3a..ad138b4713 100644
--- a/plugins/example-todo-list/package.json
+++ b/plugins/example-todo-list/package.json
@@ -1,6 +1,6 @@
{
"name": "@internal/plugin-todo-list",
- "version": "1.0.46-next.0",
+ "version": "1.0.46",
"backstage": {
"role": "frontend-plugin",
"pluginId": "todo-list",
diff --git a/plugins/gateway-backend/CHANGELOG.md b/plugins/gateway-backend/CHANGELOG.md
index fe3719d120..5e6c6254d9 100644
--- a/plugins/gateway-backend/CHANGELOG.md
+++ b/plugins/gateway-backend/CHANGELOG.md
@@ -1,5 +1,22 @@
# @backstage/plugin-gateway-backend
+## 1.1.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- 7e860dd: Updated dependency `eventsource` to `^4.0.0`.
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0
+
+## 1.1.1-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0-next.1
+
## 1.1.1-next.0
### Patch Changes
diff --git a/plugins/gateway-backend/package.json b/plugins/gateway-backend/package.json
index 7d5bd658e1..4cc39faf7b 100644
--- a/plugins/gateway-backend/package.json
+++ b/plugins/gateway-backend/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-gateway-backend",
- "version": "1.1.1-next.0",
+ "version": "1.1.1",
"backstage": {
"role": "backend-plugin",
"pluginId": "gateway",
@@ -46,7 +46,7 @@
"@backstage/backend-test-utils": "workspace:^",
"@backstage/cli": "workspace:^",
"@types/express": "^4.17.6",
- "eventsource": "^3.0.6",
+ "eventsource": "^4.0.0",
"wait-for-expect": "^3.0.2"
}
}
diff --git a/plugins/home-react/CHANGELOG.md b/plugins/home-react/CHANGELOG.md
index 6da0bf0084..81c9fbc1be 100644
--- a/plugins/home-react/CHANGELOG.md
+++ b/plugins/home-react/CHANGELOG.md
@@ -1,5 +1,31 @@
# @backstage/plugin-home-react
+## 0.1.33
+
+### Patch Changes
+
+- be21c5c: Updated dependency `@rjsf/utils` to `5.24.13`.
+ Updated dependency `@rjsf/core` to `5.24.13`.
+ Updated dependency `@rjsf/material-ui` to `5.24.13`.
+ Updated dependency `@rjsf/validator-ajv8` to `5.24.13`.
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.13.2
+ - @backstage/core-components@0.18.4
+ - @backstage/core-plugin-api@1.12.1
+
+## 0.1.33-next.1
+
+### Patch Changes
+
+- be21c5c: Updated dependency `@rjsf/utils` to `5.24.13`.
+ Updated dependency `@rjsf/core` to `5.24.13`.
+ Updated dependency `@rjsf/material-ui` to `5.24.13`.
+ Updated dependency `@rjsf/validator-ajv8` to `5.24.13`.
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.13.2-next.1
+ - @backstage/core-components@0.18.4-next.2
+ - @backstage/core-plugin-api@1.12.1-next.0
+
## 0.1.33-next.0
### Patch Changes
diff --git a/plugins/home-react/package.json b/plugins/home-react/package.json
index f94413ca64..8f69f7eab7 100644
--- a/plugins/home-react/package.json
+++ b/plugins/home-react/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-home-react",
- "version": "0.1.33-next.0",
+ "version": "0.1.33",
"description": "A Backstage plugin that contains react components helps you build a home page",
"backstage": {
"role": "web-library",
diff --git a/plugins/home/CHANGELOG.md b/plugins/home/CHANGELOG.md
index 29d73e946a..6a1cbcd825 100644
--- a/plugins/home/CHANGELOG.md
+++ b/plugins/home/CHANGELOG.md
@@ -1,5 +1,43 @@
# @backstage/plugin-home
+## 0.8.15
+
+### Patch Changes
+
+- d02db50: Remove unnecessary use of `compatWrapper` and `convertLegacyRouteRef`(s) for the new frontend system.
+- be21c5c: Updated dependency `@rjsf/utils` to `5.24.13`.
+ Updated dependency `@rjsf/core` to `5.24.13`.
+ Updated dependency `@rjsf/material-ui` to `5.24.13`.
+ Updated dependency `@rjsf/validator-ajv8` to `5.24.13`.
+- Updated dependencies
+ - @backstage/core-app-api@1.19.3
+ - @backstage/frontend-plugin-api@0.13.2
+ - @backstage/core-components@0.18.4
+ - @backstage/plugin-catalog-react@1.21.4
+ - @backstage/core-plugin-api@1.12.1
+ - @backstage/plugin-home-react@0.1.33
+ - @backstage/theme@0.7.1
+
+## 0.8.15-next.1
+
+### Patch Changes
+
+- be21c5c: Updated dependency `@rjsf/utils` to `5.24.13`.
+ Updated dependency `@rjsf/core` to `5.24.13`.
+ Updated dependency `@rjsf/material-ui` to `5.24.13`.
+ Updated dependency `@rjsf/validator-ajv8` to `5.24.13`.
+- Updated dependencies
+ - @backstage/core-app-api@1.19.3-next.1
+ - @backstage/frontend-plugin-api@0.13.2-next.1
+ - @backstage/plugin-catalog-react@1.21.4-next.2
+ - @backstage/core-components@0.18.4-next.2
+ - @backstage/plugin-home-react@0.1.33-next.1
+ - @backstage/catalog-client@1.12.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/core-plugin-api@1.12.1-next.0
+ - @backstage/theme@0.7.1-next.0
+
## 0.8.15-next.0
### Patch Changes
diff --git a/plugins/home/package.json b/plugins/home/package.json
index 01c0c5bb40..5716626c36 100644
--- a/plugins/home/package.json
+++ b/plugins/home/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-home",
- "version": "0.8.15-next.0",
+ "version": "0.8.15",
"description": "A Backstage plugin that helps you build a home page",
"backstage": {
"role": "frontend-plugin",
diff --git a/plugins/kubernetes-backend/CHANGELOG.md b/plugins/kubernetes-backend/CHANGELOG.md
index 888354fa2e..a8ebfa6f8f 100644
--- a/plugins/kubernetes-backend/CHANGELOG.md
+++ b/plugins/kubernetes-backend/CHANGELOG.md
@@ -1,5 +1,49 @@
# @backstage/plugin-kubernetes-backend
+## 0.21.0
+
+### Minor Changes
+
+- 7f9846f: Add possibility to extends Kubernetes REST API. Add fetcher to parameters for custom objects provider
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- fb029b6: Updated luxon types
+- e9589d9: Replace `@aws-sdk/signature-v4` with `@smithy/signature-v4`,
+ as stated in the [package documentation](https://www.npmjs.com/package/@aws-sdk/signature-v4?activeTab=readme)
+- 8fa8d87: Add Kubernetes Plugin Secrets Accordion with masked secret datas
+- Updated dependencies
+ - @backstage/plugin-permission-node@0.10.7
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-kubernetes-node@0.4.0
+ - @backstage/plugin-kubernetes-common@0.9.9
+ - @backstage/plugin-catalog-node@1.20.1
+
+## 0.21.0-next.2
+
+### Minor Changes
+
+- 7f9846f: Add possibility to extends Kubernetes REST API. Add fetcher to parameters for custom objects provider
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- fb029b6: Updated luxon types
+- Updated dependencies
+ - @backstage/plugin-permission-node@0.10.7-next.1
+ - @backstage/plugin-kubernetes-node@0.4.0-next.2
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-client@1.12.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/integration-aws-node@0.1.19
+ - @backstage/types@1.2.2
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+ - @backstage/plugin-kubernetes-common@0.9.9-next.0
+ - @backstage/plugin-permission-common@0.9.3
+
## 0.20.5-next.1
### Patch Changes
diff --git a/plugins/kubernetes-backend/package.json b/plugins/kubernetes-backend/package.json
index a4cb8e924a..2aac84c616 100644
--- a/plugins/kubernetes-backend/package.json
+++ b/plugins/kubernetes-backend/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-kubernetes-backend",
- "version": "0.20.5-next.1",
+ "version": "0.21.0",
"description": "A Backstage backend plugin that integrates towards Kubernetes",
"backstage": {
"role": "backend-plugin",
diff --git a/plugins/kubernetes-backend/src/cluster-locator/__snapshots__/CatalogClusterLocator.test.ts.snap b/plugins/kubernetes-backend/src/cluster-locator/__snapshots__/CatalogClusterLocator.test.ts.snap
index f8b3e71515..64526faacb 100644
--- a/plugins/kubernetes-backend/src/cluster-locator/__snapshots__/CatalogClusterLocator.test.ts.snap
+++ b/plugins/kubernetes-backend/src/cluster-locator/__snapshots__/CatalogClusterLocator.test.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
exports[`CatalogClusterLocator returns the aws cluster details provided by annotations 1`] = `
{
diff --git a/plugins/kubernetes-cluster/CHANGELOG.md b/plugins/kubernetes-cluster/CHANGELOG.md
index f61279e01b..5666354a62 100644
--- a/plugins/kubernetes-cluster/CHANGELOG.md
+++ b/plugins/kubernetes-cluster/CHANGELOG.md
@@ -1,5 +1,32 @@
# @backstage/plugin-kubernetes-cluster
+## 0.0.32
+
+### Patch Changes
+
+- 2bae83a: Bumped dev dependencies `@types/node`
+- Updated dependencies
+ - @backstage/plugin-kubernetes-react@0.5.14
+ - @backstage/core-components@0.18.4
+ - @backstage/plugin-catalog-react@1.21.4
+ - @backstage/plugin-kubernetes-common@0.9.9
+ - @backstage/core-plugin-api@1.12.1
+ - @backstage/plugin-permission-react@0.4.39
+
+## 0.0.32-next.2
+
+### Patch Changes
+
+- 2bae83a: Bumped dev dependencies `@types/node`
+- Updated dependencies
+ - @backstage/plugin-catalog-react@1.21.4-next.2
+ - @backstage/core-components@0.18.4-next.2
+ - @backstage/catalog-model@1.7.6
+ - @backstage/core-plugin-api@1.12.1-next.0
+ - @backstage/plugin-kubernetes-common@0.9.9-next.0
+ - @backstage/plugin-kubernetes-react@0.5.14-next.1
+ - @backstage/plugin-permission-react@0.4.39-next.0
+
## 0.0.32-next.1
### Patch Changes
diff --git a/plugins/kubernetes-cluster/package.json b/plugins/kubernetes-cluster/package.json
index f5f67971f9..4e43179c0c 100644
--- a/plugins/kubernetes-cluster/package.json
+++ b/plugins/kubernetes-cluster/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-kubernetes-cluster",
- "version": "0.0.32-next.1",
+ "version": "0.0.32",
"description": "A Backstage plugin that shows details of Kubernetes clusters",
"backstage": {
"role": "frontend-plugin",
diff --git a/plugins/kubernetes-common/CHANGELOG.md b/plugins/kubernetes-common/CHANGELOG.md
index 902a7e1f1d..de8f93897c 100644
--- a/plugins/kubernetes-common/CHANGELOG.md
+++ b/plugins/kubernetes-common/CHANGELOG.md
@@ -1,5 +1,11 @@
# @backstage/plugin-kubernetes-common
+## 0.9.9
+
+### Patch Changes
+
+- 8fa8d87: Add Kubernetes Plugin Secrets Accordion with masked secret datas
+
## 0.9.9-next.0
### Patch Changes
diff --git a/plugins/kubernetes-common/package.json b/plugins/kubernetes-common/package.json
index 512ed1f7eb..db2d9c2837 100644
--- a/plugins/kubernetes-common/package.json
+++ b/plugins/kubernetes-common/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-kubernetes-common",
- "version": "0.9.9-next.0",
+ "version": "0.9.9",
"description": "Common functionalities for kubernetes, to be shared between kubernetes and kubernetes-backend plugin",
"backstage": {
"role": "common-library",
diff --git a/plugins/kubernetes-node/CHANGELOG.md b/plugins/kubernetes-node/CHANGELOG.md
index d3f12c3c7d..a0fad104d8 100644
--- a/plugins/kubernetes-node/CHANGELOG.md
+++ b/plugins/kubernetes-node/CHANGELOG.md
@@ -1,5 +1,31 @@
# @backstage/plugin-kubernetes-node
+## 0.4.0
+
+### Minor Changes
+
+- 7f9846f: Add possibility to extends Kubernetes REST API. Add fetcher to parameters for custom objects provider
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-kubernetes-common@0.9.9
+
+## 0.4.0-next.2
+
+### Minor Changes
+
+- 7f9846f: Add possibility to extends Kubernetes REST API. Add fetcher to parameters for custom objects provider
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/types@1.2.2
+ - @backstage/plugin-kubernetes-common@0.9.9-next.0
+
## 0.3.7-next.1
### Patch Changes
diff --git a/plugins/kubernetes-node/package.json b/plugins/kubernetes-node/package.json
index 9796e05212..8778449eaa 100644
--- a/plugins/kubernetes-node/package.json
+++ b/plugins/kubernetes-node/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-kubernetes-node",
- "version": "0.3.7-next.1",
+ "version": "0.4.0",
"description": "Node.js library for the kubernetes plugin",
"backstage": {
"role": "node-library",
diff --git a/plugins/kubernetes-react/CHANGELOG.md b/plugins/kubernetes-react/CHANGELOG.md
index b260e25475..d1bb328016 100644
--- a/plugins/kubernetes-react/CHANGELOG.md
+++ b/plugins/kubernetes-react/CHANGELOG.md
@@ -1,5 +1,17 @@
# @backstage/plugin-kubernetes-react
+## 0.5.14
+
+### Patch Changes
+
+- f966a85: Enabled a pod terminal at GKE
+- 8fa8d87: Add Kubernetes Plugin Secrets Accordion with masked secret datas
+- f15d5f1: add missing i18n support for kubernetes and kubernetes-react
+- Updated dependencies
+ - @backstage/core-components@0.18.4
+ - @backstage/plugin-kubernetes-common@0.9.9
+ - @backstage/core-plugin-api@1.12.1
+
## 0.5.14-next.1
### Patch Changes
diff --git a/plugins/kubernetes-react/package.json b/plugins/kubernetes-react/package.json
index da1b5f6e3e..a634594e60 100644
--- a/plugins/kubernetes-react/package.json
+++ b/plugins/kubernetes-react/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-kubernetes-react",
- "version": "0.5.14-next.1",
+ "version": "0.5.14",
"description": "Web library for the kubernetes-react plugin",
"backstage": {
"role": "web-library",
@@ -84,7 +84,7 @@
"@testing-library/react": "^16.0.0",
"@types/react": "^18.0.0",
"jest-websocket-mock": "^2.5.0",
- "msw": "^1.3.1",
+ "msw": "^2.0.0",
"react": "^18.0.2",
"react-dom": "^18.0.2",
"react-router-dom": "^6.3.0"
diff --git a/plugins/kubernetes-react/src/api/KubernetesBackendClient.test.ts b/plugins/kubernetes-react/src/api/KubernetesBackendClient.test.ts
index 4698f01dfe..3e8b7aa437 100644
--- a/plugins/kubernetes-react/src/api/KubernetesBackendClient.test.ts
+++ b/plugins/kubernetes-react/src/api/KubernetesBackendClient.test.ts
@@ -16,7 +16,7 @@
import { KubernetesAuthProvidersApi } from '../kubernetes-auth-provider';
import { KubernetesBackendClient } from './KubernetesBackendClient';
-import { rest } from 'msw';
+import { http, HttpResponse } from 'msw';
import { UrlPatternDiscovery } from '@backstage/core-app-api';
import { setupServer } from 'msw/node';
import { MockFetchApi, registerMswTestHooks } from '@backstage/test-utils';
@@ -89,23 +89,24 @@ describe('KubernetesBackendClient', () => {
it('hits the /clusters API', async () => {
identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
worker.use(
- rest.get('http://localhost:1234/api/kubernetes/clusters', (_, res, ctx) =>
- res(ctx.json({ items: [{ name: 'cluster-a', authProvider: 'aws' }] })),
+ http.get('http://localhost:1234/api/kubernetes/clusters', () =>
+ HttpResponse.json({
+ items: [{ name: 'cluster-a', authProvider: 'aws' }],
+ }),
),
);
const clusters = await backendClient.getClusters();
- expect(clusters).toStrictEqual([
- { name: 'cluster-a', authProvider: 'aws' },
- ]);
+ expect(clusters).toEqual([{ name: 'cluster-a', authProvider: 'aws' }]);
});
it('/clusters API throws a 404 Error', async () => {
identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
worker.use(
- rest.get('http://localhost:1234/api/kubernetes/clusters', (_, res, ctx) =>
- res(ctx.status(404)),
+ http.get(
+ 'http://localhost:1234/api/kubernetes/clusters',
+ () => new HttpResponse(null, { status: 404 }),
),
);
@@ -117,8 +118,9 @@ describe('KubernetesBackendClient', () => {
it('/clusters API throws a 500 Error', async () => {
identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
worker.use(
- rest.get('http://localhost:1234/api/kubernetes/clusters', (_, res, ctx) =>
- res(ctx.status(500)),
+ http.get(
+ 'http://localhost:1234/api/kubernetes/clusters',
+ () => new HttpResponse(null, { status: 500 }),
),
);
@@ -130,9 +132,9 @@ describe('KubernetesBackendClient', () => {
it('hits the /resources/custom/query API', async () => {
identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
worker.use(
- rest.post(
+ http.post(
'http://localhost:1234/api/kubernetes/resources/custom/query',
- (_, res, ctx) => res(ctx.json(mockResponse)),
+ () => HttpResponse.json(mockResponse),
),
);
@@ -157,15 +159,15 @@ describe('KubernetesBackendClient', () => {
const customObject: ObjectsByEntityResponse =
await backendClient.getCustomObjectsByEntity(request);
- expect(customObject).toStrictEqual(mockResponse);
+ expect(customObject).toEqual(mockResponse);
});
it('/resources/custom/query API throws a 404 error', async () => {
identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
worker.use(
- rest.post(
+ http.post(
'http://localhost:1234/api/kubernetes/resources/custom/query',
- (_, res, ctx) => res(ctx.status(404)),
+ () => new HttpResponse(null, { status: 404 }),
),
);
@@ -197,9 +199,9 @@ describe('KubernetesBackendClient', () => {
it('/resources/custom/query API throws a 500 error', async () => {
identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
worker.use(
- rest.post(
+ http.post(
'http://localhost:1234/api/kubernetes/resources/custom/query',
- (_, res, ctx) => res(ctx.status(500)),
+ () => new HttpResponse(null, { status: 500 }),
),
);
@@ -231,9 +233,8 @@ describe('KubernetesBackendClient', () => {
it('hits the /services/{entityName} API', async () => {
identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
worker.use(
- rest.post(
- 'http://localhost:1234/api/kubernetes/services/test-name',
- (_, res, ctx) => res(ctx.json(mockResponse)),
+ http.post('http://localhost:1234/api/kubernetes/services/test-name', () =>
+ HttpResponse.json(mockResponse),
),
);
@@ -250,15 +251,15 @@ describe('KubernetesBackendClient', () => {
const entityObject: ObjectsByEntityResponse =
await backendClient.getObjectsByEntity(request);
- expect(entityObject).toStrictEqual(mockResponse);
+ expect(entityObject).toEqual(mockResponse);
});
it('services/{entityName} API throws a 404 error', async () => {
identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
worker.use(
- rest.post(
+ http.post(
'http://localhost:1234/api/kubernetes/services/test-name',
- (_, res, ctx) => res(ctx.status(404)),
+ () => new HttpResponse(null, { status: 404 }),
),
);
@@ -282,9 +283,9 @@ describe('KubernetesBackendClient', () => {
it('services/{entityName} API throws a 500 error', async () => {
identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
worker.use(
- rest.post(
+ http.post(
'http://localhost:1234/api/kubernetes/services/test-name',
- (_, res, ctx) => res(ctx.status(500)),
+ () => new HttpResponse(null, { status: 500 }),
),
);
@@ -308,9 +309,9 @@ describe('KubernetesBackendClient', () => {
it('hits the /resources/workloads/query API', async () => {
identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
worker.use(
- rest.post(
+ http.post(
'http://localhost:1234/api/kubernetes/resources/workloads/query',
- (_, res, ctx) => res(ctx.json(mockResponse)),
+ () => HttpResponse.json(mockResponse),
),
);
@@ -328,15 +329,15 @@ describe('KubernetesBackendClient', () => {
const response: ObjectsByEntityResponse =
await backendClient.getWorkloadsByEntity(request);
- expect(response).toStrictEqual(mockResponse);
+ expect(response).toEqual(mockResponse);
});
it('/resources/workloads/query API throws a 404 error', async () => {
identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
worker.use(
- rest.post(
+ http.post(
'http://localhost:1234/api/kubernetes/resources/workloads/query',
- (_, res, ctx) => res(ctx.status(404)),
+ () => new HttpResponse(null, { status: 404 }),
),
);
@@ -361,9 +362,9 @@ describe('KubernetesBackendClient', () => {
it('/resources/workloads/query API throws a 500 error', async () => {
identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
worker.use(
- rest.post(
+ http.post(
'http://localhost:1234/api/kubernetes/resources/workloads/query',
- (_, res, ctx) => res(ctx.status(500)),
+ () => new HttpResponse(null, { status: 500 }),
),
);
@@ -388,12 +389,10 @@ describe('KubernetesBackendClient', () => {
describe('proxy', () => {
beforeEach(() => {
worker.use(
- rest.get(
- 'http://localhost:1234/api/kubernetes/clusters',
- (_, res, ctx) =>
- res(
- ctx.json({ items: [{ name: 'cluster-a', authProvider: 'aws' }] }),
- ),
+ http.get('http://localhost:1234/api/kubernetes/clusters', () =>
+ HttpResponse.json({
+ items: [{ name: 'cluster-a', authProvider: 'aws' }],
+ }),
),
);
identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
@@ -401,20 +400,16 @@ describe('KubernetesBackendClient', () => {
it('hits the /proxy API with oidc as protocol and okta as auth provider', async () => {
worker.use(
- rest.get(
- 'http://localhost:1234/api/kubernetes/clusters',
- (_, res, ctx) =>
- res(
- ctx.json({
- items: [
- {
- name: 'cluster-a',
- authProvider: 'oidc',
- oidcTokenProvider: 'okta',
- },
- ],
- }),
- ),
+ http.get('http://localhost:1234/api/kubernetes/clusters', () =>
+ HttpResponse.json({
+ items: [
+ {
+ name: 'cluster-a',
+ authProvider: 'oidc',
+ oidcTokenProvider: 'okta',
+ },
+ ],
+ }),
),
);
kubernetesAuthProvidersApi.getCredentials.mockResolvedValue({
@@ -428,16 +423,14 @@ describe('KubernetesBackendClient', () => {
},
};
worker.use(
- rest.get(
+ http.get(
'http://localhost:1234/api/kubernetes/proxy/api/v1/namespaces',
- (req, res, ctx) =>
- res(
- req.headers.get(
- 'Backstage-Kubernetes-Authorization-oidc-okta',
- ) === 'k8-token3'
- ? ctx.json(nsResponse)
- : ctx.status(403),
- ),
+ ({ request }) =>
+ request.headers.get(
+ 'Backstage-Kubernetes-Authorization-oidc-okta',
+ ) === 'k8-token3'
+ ? HttpResponse.json(nsResponse)
+ : new HttpResponse(null, { status: 403 }),
),
);
@@ -448,7 +441,7 @@ describe('KubernetesBackendClient', () => {
const response = await backendClient.proxy(request);
- await expect(response.json()).resolves.toStrictEqual(nsResponse);
+ await expect(response.json()).resolves.toEqual(nsResponse);
expect(kubernetesAuthProvidersApi.getCredentials).toHaveBeenCalledWith(
'oidc.okta',
);
@@ -457,19 +450,15 @@ describe('KubernetesBackendClient', () => {
it('hits the /proxy API with serviceAccount as auth provider', async () => {
identityApi.getCredentials.mockResolvedValue({ token: 'idToken' });
worker.use(
- rest.get(
- 'http://localhost:1234/api/kubernetes/clusters',
- (_, res, ctx) =>
- res(
- ctx.json({
- items: [
- {
- name: 'cluster-a',
- authProvider: 'serviceAccount',
- },
- ],
- }),
- ),
+ http.get('http://localhost:1234/api/kubernetes/clusters', () =>
+ HttpResponse.json({
+ items: [
+ {
+ name: 'cluster-a',
+ authProvider: 'serviceAccount',
+ },
+ ],
+ }),
),
);
@@ -481,14 +470,12 @@ describe('KubernetesBackendClient', () => {
},
};
worker.use(
- rest.get(
+ http.get(
'http://localhost:1234/api/kubernetes/proxy/api/v1/namespaces',
- (req, res, ctx) =>
- res(
- req.headers.get('Authorization') === 'Bearer idToken'
- ? ctx.json(nsResponse)
- : ctx.status(403),
- ),
+ ({ request }) =>
+ request.headers.get('Authorization') === 'Bearer idToken'
+ ? HttpResponse.json(nsResponse)
+ : new HttpResponse(null, { status: 403 }),
),
);
@@ -499,7 +486,7 @@ describe('KubernetesBackendClient', () => {
const response = await backendClient.proxy(request);
- await expect(response.json()).resolves.toStrictEqual(nsResponse);
+ await expect(response.json()).resolves.toEqual(nsResponse);
expect(kubernetesAuthProvidersApi.getCredentials).toHaveBeenCalledWith(
'serviceAccount',
);
@@ -507,24 +494,20 @@ describe('KubernetesBackendClient', () => {
it('ignores oidcTokenProvider for non-oidc auth provider', async () => {
worker.use(
- rest.get(
- 'http://localhost:1234/api/kubernetes/clusters',
- (_, res, ctx) =>
- res(
- ctx.json({
- items: [
- {
- name: 'cluster-a',
- authProvider: 'not oidc',
- oidcTokenProvider: 'should be ignored',
- },
- ],
- }),
- ),
+ http.get('http://localhost:1234/api/kubernetes/clusters', () =>
+ HttpResponse.json({
+ items: [
+ {
+ name: 'cluster-a',
+ authProvider: 'not oidc',
+ oidcTokenProvider: 'should be ignored',
+ },
+ ],
+ }),
),
- rest.get(
+ http.get(
'http://localhost:1234/api/kubernetes/proxy/api/v1/namespaces',
- (_, res, ctx) => res(ctx.json([])),
+ () => HttpResponse.json([]),
),
);
@@ -552,15 +535,13 @@ describe('KubernetesBackendClient', () => {
},
};
worker.use(
- rest.get(
+ http.get(
'http://localhost:1234/api/kubernetes/proxy/api/v1/namespaces',
- (req, res, ctx) =>
- res(
- req.headers.get('Backstage-Kubernetes-Authorization-aws') ===
- 'k8-token'
- ? ctx.json(nsResponse)
- : ctx.status(403),
- ),
+ ({ request }) =>
+ request.headers.get('Backstage-Kubernetes-Authorization-aws') ===
+ 'k8-token'
+ ? HttpResponse.json(nsResponse)
+ : new HttpResponse(null, { status: 403 }),
),
);
@@ -570,7 +551,7 @@ describe('KubernetesBackendClient', () => {
};
const response = await backendClient.proxy(request);
- await expect(response.json()).resolves.toStrictEqual(nsResponse);
+ await expect(response.json()).resolves.toEqual(nsResponse);
});
it('/proxy API throws a 404 error', async () => {
@@ -578,9 +559,9 @@ describe('KubernetesBackendClient', () => {
token: 'k8-token',
});
worker.use(
- rest.get(
+ http.get(
'http://localhost:1234/api/kubernetes/proxy/api/v1/namespaces',
- (_, res, ctx) => res(ctx.status(404)),
+ () => new HttpResponse(null, { status: 404 }),
),
);
@@ -616,15 +597,13 @@ describe('KubernetesBackendClient', () => {
},
};
worker.use(
- rest.get(
+ http.get(
'http://localhost:1234/api/kubernetes/proxy/api/v1/namespaces',
- (req, res, ctx) =>
- res(
- req.headers.get('Backstage-Kubernetes-Authorization') ===
- 'Bearer k8-token'
- ? ctx.json(nsResponse)
- : ctx.status(403),
- ),
+ ({ request }) =>
+ request.headers.get('Backstage-Kubernetes-Authorization') ===
+ 'Bearer k8-token'
+ ? HttpResponse.json(nsResponse)
+ : new HttpResponse(null, { status: 403 }),
),
);
@@ -646,14 +625,12 @@ describe('KubernetesBackendClient', () => {
},
};
worker.use(
- rest.get(
+ http.get(
'http://localhost:1234/api/kubernetes/proxy/api/v1/namespaces/new-ns',
- (req, res, ctx) =>
- res(
- req.headers.get('Backstage-Kubernetes-Authorization')
- ? ctx.status(403)
- : ctx.json(nsResponse),
- ),
+ ({ request }) =>
+ request.headers.get('Backstage-Kubernetes-Authorization')
+ ? new HttpResponse(null, { status: 403 })
+ : HttpResponse.json(nsResponse),
),
);
kubernetesAuthProvidersApi.getCredentials.mockResolvedValue({});
@@ -663,7 +640,7 @@ describe('KubernetesBackendClient', () => {
path: '/api/v1/namespaces/new-ns',
});
- await expect(response.json()).resolves.toStrictEqual(nsResponse);
+ await expect(response.json()).resolves.toEqual(nsResponse);
});
});
});
diff --git a/plugins/kubernetes-react/src/api/formatters/HeadlampClusterLinksFormatter.test.ts b/plugins/kubernetes-react/src/api/formatters/HeadlampClusterLinksFormatter.test.ts
index 533e966137..12de678718 100644
--- a/plugins/kubernetes-react/src/api/formatters/HeadlampClusterLinksFormatter.test.ts
+++ b/plugins/kubernetes-react/src/api/formatters/HeadlampClusterLinksFormatter.test.ts
@@ -21,11 +21,6 @@ describe('HeadlampClusterLinksFormatter', () => {
beforeEach(() => {
formatter = new HeadlampClusterLinksFormatter();
- // Mock window.location.origin
- Object.defineProperty(window, 'location', {
- value: { origin: 'http://localhost:3000' },
- writable: true,
- });
});
it('formats internal dashboard link correctly', async () => {
@@ -41,7 +36,7 @@ describe('HeadlampClusterLinksFormatter', () => {
const result = await formatter.formatClusterLink(options);
expect(result.toString()).toBe(
- 'http://localhost:3000/headlamp?to=%2Fc%2Ftest-cluster%2Fpods%2Fdefault%2Ftest-pod',
+ 'http://localhost/headlamp?to=%2Fc%2Ftest-cluster%2Fpods%2Fdefault%2Ftest-pod',
);
});
diff --git a/plugins/kubernetes/CHANGELOG.md b/plugins/kubernetes/CHANGELOG.md
index 3780dee9c6..3aeaa369fa 100644
--- a/plugins/kubernetes/CHANGELOG.md
+++ b/plugins/kubernetes/CHANGELOG.md
@@ -1,5 +1,20 @@
# @backstage/plugin-kubernetes
+## 0.12.14
+
+### Patch Changes
+
+- f15d5f1: add missing i18n support for kubernetes and kubernetes-react
+- d02db50: Remove unnecessary use of `compatWrapper` and `convertLegacyRouteRef`(s) for the new frontend system.
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.13.2
+ - @backstage/plugin-kubernetes-react@0.5.14
+ - @backstage/core-components@0.18.4
+ - @backstage/plugin-catalog-react@1.21.4
+ - @backstage/plugin-kubernetes-common@0.9.9
+ - @backstage/core-plugin-api@1.12.1
+ - @backstage/plugin-permission-react@0.4.39
+
## 0.12.14-next.1
### Patch Changes
diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json
index a455747640..33692f5886 100644
--- a/plugins/kubernetes/package.json
+++ b/plugins/kubernetes/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-kubernetes",
- "version": "0.12.14-next.1",
+ "version": "0.12.14",
"description": "A Backstage plugin that integrates towards Kubernetes",
"backstage": {
"role": "frontend-plugin",
diff --git a/plugins/mcp-actions-backend/CHANGELOG.md b/plugins/mcp-actions-backend/CHANGELOG.md
index 78341c0273..c91b47584c 100644
--- a/plugins/mcp-actions-backend/CHANGELOG.md
+++ b/plugins/mcp-actions-backend/CHANGELOG.md
@@ -1,5 +1,43 @@
# @backstage/plugin-mcp-actions-backend
+## 0.1.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-defaults@0.14.1-next.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/catalog-client@1.12.1
+ - @backstage/errors@1.2.7
+ - @backstage/types@1.2.2
+ - @backstage/plugin-catalog-node@1.20.1
+
+## 0.1.6
+
+### Patch Changes
+
+- e83e038: Added `@cfworker/json-schema` as a dependency to this package part of the `@modelcontextprotocol/sdk` bump as it's required in the types
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- 79ef471: Clarify error handling in readme and update handleError.ts to include all backstage/errors
+- Updated dependencies
+ - @backstage/backend-defaults@0.14.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-catalog-node@1.20.1
+
+## 0.1.6-next.1
+
+### Patch Changes
+
+- e83e038: Added `@cfworker/json-schema` as a dependency to this package part of the `@modelcontextprotocol/sdk` bump as it's required in the types
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/backend-defaults@0.14.0-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-client@1.12.1
+ - @backstage/errors@1.2.7
+ - @backstage/types@1.2.2
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+
## 0.1.6-next.0
### Patch Changes
diff --git a/plugins/mcp-actions-backend/package.json b/plugins/mcp-actions-backend/package.json
index da90397438..b99cb48afe 100644
--- a/plugins/mcp-actions-backend/package.json
+++ b/plugins/mcp-actions-backend/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-mcp-actions-backend",
- "version": "0.1.6-next.0",
+ "version": "0.1.7-next.0",
"backstage": {
"role": "backend-plugin",
"pluginId": "mcp-actions",
@@ -40,7 +40,8 @@
"@backstage/errors": "workspace:^",
"@backstage/plugin-catalog-node": "workspace:^",
"@backstage/types": "workspace:^",
- "@modelcontextprotocol/sdk": "^1.12.3",
+ "@cfworker/json-schema": "^4.1.1",
+ "@modelcontextprotocol/sdk": "^1.24.3",
"express": "^4.22.0",
"express-promise-router": "^4.1.0",
"zod": "^3.22.4"
diff --git a/plugins/mui-to-bui/CHANGELOG.md b/plugins/mui-to-bui/CHANGELOG.md
index 81ccaeb013..7f4a45c885 100644
--- a/plugins/mui-to-bui/CHANGELOG.md
+++ b/plugins/mui-to-bui/CHANGELOG.md
@@ -1,5 +1,26 @@
# @backstage/plugin-mui-to-bui
+## 0.2.3-next.0
+
+### Patch Changes
+
+- e4a1180: Updated tokens from `--bui-bg` to `--bui-bg-surface-0`
+- Updated dependencies
+ - @backstage/ui@0.11.0-next.0
+ - @backstage/core-plugin-api@1.12.1
+ - @backstage/frontend-plugin-api@0.13.2
+ - @backstage/theme@0.7.1
+
+## 0.2.2
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/ui@0.10.0
+ - @backstage/frontend-plugin-api@0.13.2
+ - @backstage/core-plugin-api@1.12.1
+ - @backstage/theme@0.7.1
+
## 0.2.2-next.1
### Patch Changes
diff --git a/plugins/mui-to-bui/package.json b/plugins/mui-to-bui/package.json
index f5f014a9ed..2305eec5a3 100644
--- a/plugins/mui-to-bui/package.json
+++ b/plugins/mui-to-bui/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-mui-to-bui",
- "version": "0.2.2-next.1",
+ "version": "0.2.3-next.0",
"backstage": {
"role": "frontend-plugin",
"pluginId": "mui-to-bui",
diff --git a/plugins/mui-to-bui/src/components/BuiThemerPage/convertMuiToBuiTheme.test.ts b/plugins/mui-to-bui/src/components/BuiThemerPage/convertMuiToBuiTheme.test.ts
index 6ba3f7d2d9..48bb318a71 100644
--- a/plugins/mui-to-bui/src/components/BuiThemerPage/convertMuiToBuiTheme.test.ts
+++ b/plugins/mui-to-bui/src/components/BuiThemerPage/convertMuiToBuiTheme.test.ts
@@ -59,7 +59,7 @@ describe('convertMuiToBuiTheme', () => {
// Border radius tokens are only generated when radius is 0
expect(result.css).not.toContain('--bui-radius-3:');
// Background default maps to surface-2
- expect(result.css).toContain('--bui-bg: #f5f5f5;');
+ expect(result.css).toContain('--bui-bg-surface-0: #f5f5f5;');
expect(result.css).toContain('--bui-bg-surface-2: #f5f5f5;');
expect(result.css).toContain('--bui-bg-surface-1: #ffffff;');
expect(result.css).toContain('--bui-fg-primary: #000000;');
@@ -98,7 +98,7 @@ describe('convertMuiToBuiTheme', () => {
expect(result.css).toContain("[data-theme-mode='dark'] {");
// Background default maps to surface-2 in dark mode as well
- expect(result.css).toContain('--bui-bg: #121212;');
+ expect(result.css).toContain('--bui-bg-surface-0: #121212;');
expect(result.css).toContain('--bui-bg-surface-2: #121212;');
expect(result.css).toContain('--bui-bg-surface-1: #1e1e1e;');
expect(result.css).toContain('--bui-fg-primary: #ffffff;');
diff --git a/plugins/mui-to-bui/src/components/BuiThemerPage/convertMuiToBuiTheme.ts b/plugins/mui-to-bui/src/components/BuiThemerPage/convertMuiToBuiTheme.ts
index 1b8528922b..029d70cec7 100644
--- a/plugins/mui-to-bui/src/components/BuiThemerPage/convertMuiToBuiTheme.ts
+++ b/plugins/mui-to-bui/src/components/BuiThemerPage/convertMuiToBuiTheme.ts
@@ -110,9 +110,10 @@ function generateBuiVariables(theme: Mui5Theme): Record {
// Generate surface colors
Object.entries({
- '': palette.background.default,
+ 'surface-0': palette.background.default,
'surface-1': palette.background.paper,
'surface-2': palette.background.default,
+ 'surface-3': palette.background.default,
solid: palette.primary.main,
'solid-hover': blend(palette.primary.main, palette.primary.dark, 0.5),
'solid-pressed': palette.primary.dark,
@@ -125,7 +126,7 @@ function generateBuiVariables(theme: Mui5Theme): Record {
warning: palette.warning.light,
success: palette.success.light,
}).forEach(([key, value]) => {
- styleObject[`--bui-bg${key ? `-${key}` : ''}`] = value;
+ styleObject[`--bui-bg-${key}`] = value;
});
// Border colors
diff --git a/plugins/notifications-backend-module-email/CHANGELOG.md b/plugins/notifications-backend-module-email/CHANGELOG.md
index feade91398..21cb61c4c4 100644
--- a/plugins/notifications-backend-module-email/CHANGELOG.md
+++ b/plugins/notifications-backend-module-email/CHANGELOG.md
@@ -1,5 +1,49 @@
# @backstage/plugin-notifications-backend-module-email
+## 0.3.17
+
+### Patch Changes
+
+- a5d5b3a: SES config for the notification email processor now supports utilizing an ARN for the SES identity when sending an email after the SES SDK V2 update.
+
+ The `sesConfig.fromArn` will set the `fromEmailAddressIdentityArn` option for the SES `SendEmailCommand`. The `sesConfig.sourceArn` field is removed since no equivalent option is available in the send email command options. Setting `sesConfig.sourceArn` will have no effect and log a warning. Example changes:
+
+ ```diff
+ notifications:
+ processors:
+ email:
+ transportConfig:
+ transport: "ses"
+ region: "us-west-2"
+ sender: "sender@mycompany.com"
+ replyTo: "no-reply@mycompany.com"
+ sesConfig:
+ - sourceArn: "arn:aws:ses:us-west-2:123456789012:identity/example.com"
+ fromArn: "arn:aws:ses:us-west-2:123456789012:identity/example.com"
+ ```
+
+- b267aea: Updated dependency `@types/nodemailer` to `^7.0.0`.
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-catalog-node@1.20.1
+ - @backstage/plugin-notifications-node@0.2.22
+
+## 0.3.17-next.1
+
+### Patch Changes
+
+- b267aea: Updated dependency `@types/nodemailer` to `^7.0.0`.
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-client@1.12.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/integration-aws-node@0.1.19
+ - @backstage/types@1.2.2
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+ - @backstage/plugin-notifications-common@0.2.0
+ - @backstage/plugin-notifications-node@0.2.22-next.1
+
## 0.3.17-next.0
### Patch Changes
diff --git a/plugins/notifications-backend-module-email/README.md b/plugins/notifications-backend-module-email/README.md
index c1ead48876..248bb2c501 100644
--- a/plugins/notifications-backend-module-email/README.md
+++ b/plugins/notifications-backend-module-email/README.md
@@ -81,7 +81,6 @@ notifications:
receiver: 'users'
# Optional SES config
# sesConfig:
- # sourceArn: 'arn:aws:ses:us-west-2:123456789012:identity/example.com'
# fromArn: 'arn:aws:ses:us-west-2:123456789012:identity/example.com'
# configurationSetName: 'custom-config'
# How many emails to send concurrently, defaults to 2
diff --git a/plugins/notifications-backend-module-email/config.d.ts b/plugins/notifications-backend-module-email/config.d.ts
index 7116826c5d..55a751f8fa 100644
--- a/plugins/notifications-backend-module-email/config.d.ts
+++ b/plugins/notifications-backend-module-email/config.d.ts
@@ -136,10 +136,6 @@ export interface Config {
* Optional SES config for mail options. Allows for delegated sender
*/
sesConfig?: {
- /**
- * ARN of the identity to use as the source of the email
- */
- sourceArn?: string;
/**
* ARN of the identity to use for the "From"/sender address of the email
*/
diff --git a/plugins/notifications-backend-module-email/package.json b/plugins/notifications-backend-module-email/package.json
index e62ae5e92f..b1f2831758 100644
--- a/plugins/notifications-backend-module-email/package.json
+++ b/plugins/notifications-backend-module-email/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-notifications-backend-module-email",
- "version": "0.3.17-next.0",
+ "version": "0.3.17",
"description": "The email backend module for the notifications plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.test.ts b/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.test.ts
index ebe1b90f35..ad0817521f 100644
--- a/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.test.ts
+++ b/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.test.ts
@@ -497,9 +497,13 @@ describe('NotificationsEmailProcessor', () => {
text: 'https://example.org/notifications',
to: 'mock@backstage.io',
ses: {
- SourceArn: 'arn:aws:ses:us-west-2:123456789012:identity/example.com',
- FromArn: 'arn:aws:ses:us-west-2:123456789012:identity/example.com',
+ FromEmailAddressIdentityArn:
+ 'arn:aws:ses:us-west-2:123456789012:identity/example.com',
},
});
+
+ expect(logger.warn).toHaveBeenCalledWith(
+ 'sourceArn is not supported in SESv2 and will be ignored',
+ );
});
});
diff --git a/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.ts b/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.ts
index eadfe7747e..e0e27232c2 100644
--- a/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.ts
+++ b/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.ts
@@ -45,6 +45,7 @@ import { DefaultAwsCredentialsManager } from '@backstage/integration-aws-node';
import { NotificationTemplateRenderer } from '../extensions';
import Mail from 'nodemailer/lib/mailer';
import pThrottle from 'p-throttle';
+import { SendEmailCommandInput } from '@aws-sdk/client-sesv2';
export class NotificationsEmailProcessor implements NotificationProcessor {
private transporter: any;
@@ -53,6 +54,7 @@ export class NotificationsEmailProcessor implements NotificationProcessor {
private readonly sender: string;
private readonly replyTo?: string;
private readonly sesConfig?: Config;
+ private readonly sesOptions?: Partial;
private readonly cacheTtl: number;
private readonly concurrencyLimit: number;
private readonly throttleInterval: number;
@@ -91,6 +93,7 @@ export class NotificationsEmailProcessor implements NotificationProcessor {
this.sender = emailProcessorConfig.getString('sender');
this.replyTo = emailProcessorConfig.getOptionalString('replyTo');
this.sesConfig = emailProcessorConfig.getOptionalConfig('sesConfig');
+ this.sesOptions = this.getSesOptions();
this.concurrencyLimit =
emailProcessorConfig.getOptionalNumber('concurrencyLimit') ?? 2;
this.throttleInterval = emailProcessorConfig.has('throttleInterval')
@@ -307,20 +310,23 @@ export class NotificationsEmailProcessor implements NotificationProcessor {
return contentParts.join('\n\n');
}
- private async getSesOptions() {
+ private getSesOptions(): Partial | undefined {
if (!this.sesConfig) {
return undefined;
}
- const ses: Record = {};
- const sourceArn = this.sesConfig.getOptionalString('sourceArn');
+ const ses: Partial = {};
const fromArn = this.sesConfig.getOptionalString('fromArn');
+ const sourceArn = this.sesConfig.getOptionalString('sourceArn');
const configurationSetName = this.sesConfig.getOptionalString(
'configurationSetName',
);
- if (sourceArn) ses.SourceArn = sourceArn;
- if (fromArn) ses.FromArn = fromArn;
+ if (fromArn) ses.FromEmailAddressIdentityArn = fromArn;
if (configurationSetName) ses.ConfigurationSetName = configurationSetName;
+ if (sourceArn)
+ this.logger.warn(
+ 'sourceArn is not supported in SESv2 and will be ignored',
+ );
return Object.keys(ses).length > 0 ? ses : undefined;
}
@@ -332,7 +338,7 @@ export class NotificationsEmailProcessor implements NotificationProcessor {
html: this.getHtmlContent(notification),
text: this.getTextContent(notification),
replyTo: this.replyTo,
- ses: await this.getSesOptions(),
+ ses: this.sesOptions,
};
await this.sendMails(mailOptions, emails);
@@ -350,7 +356,7 @@ export class NotificationsEmailProcessor implements NotificationProcessor {
html: await this.templateRenderer?.getHtml?.(notification),
text: await this.templateRenderer?.getText?.(notification),
replyTo: this.replyTo,
- ses: await this.getSesOptions(),
+ ses: this.sesOptions,
};
await this.sendMails(mailOptions, emails);
diff --git a/plugins/notifications-backend-module-slack/CHANGELOG.md b/plugins/notifications-backend-module-slack/CHANGELOG.md
index 9000ef2203..4d9c711297 100644
--- a/plugins/notifications-backend-module-slack/CHANGELOG.md
+++ b/plugins/notifications-backend-module-slack/CHANGELOG.md
@@ -1,5 +1,34 @@
# @backstage/plugin-notifications-backend-module-slack
+## 0.3.0
+
+### Minor Changes
+
+- f95a516: Enables optional routes to Slack channels for broadcast notifications based on origin and/or topics.
+
+### Patch Changes
+
+- b80857a: Slack notification handler throttling can now be configured with the `concurrencyLimit` and `throttleInterval` options.
+- f8230e4: Updated dependency `@faker-js/faker` to `^10.0.0`.
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-catalog-node@1.20.1
+ - @backstage/plugin-notifications-node@0.2.22
+
+## 0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/types@1.2.2
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+ - @backstage/plugin-notifications-common@0.2.0
+ - @backstage/plugin-notifications-node@0.2.22-next.1
+
## 0.2.2-next.0
### Patch Changes
diff --git a/plugins/notifications-backend-module-slack/config.d.ts b/plugins/notifications-backend-module-slack/config.d.ts
index 8cd450940e..17a4e25e0d 100644
--- a/plugins/notifications-backend-module-slack/config.d.ts
+++ b/plugins/notifications-backend-module-slack/config.d.ts
@@ -13,6 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+import { HumanDuration } from '@backstage/types';
+
export interface Config {
notifications?: {
processors?: {
@@ -26,8 +28,40 @@ export interface Config {
* Broadcast notification receivers when receiver is set to config
* These can be Slack User IDs, Slack User Email addresses, Slack Channel
* Names, or Slack Channel IDs. Any valid identifier that chat.postMessage can accept.
+ * @deprecated Use broadcastRoutes instead for more granular control
*/
broadcastChannels?: string[];
+ /**
+ * Optional username to display as the sender of the notification
+ */
+ username?: string;
+ /**
+ * Routes for broadcast notifications based on origin and/or topic.
+ * Routes are evaluated in order, first match wins.
+ * Origin+topic matches take precedence over origin-only matches.
+ */
+ broadcastRoutes?: Array<{
+ /**
+ * The origin to match (e.g., 'plugin:catalog', 'external:my-service')
+ */
+ origin?: string;
+ /**
+ * The topic to match (e.g., 'entity-updated', 'alerts')
+ */
+ topic?: string;
+ /**
+ * The Slack channel(s) to send to. Can be channel IDs, channel names, or user IDs.
+ */
+ channel: string | string[];
+ }>;
+ /**
+ * Concurrency limit for Slack notifications per backend instance of the notifications plugin, defaults to 10.
+ */
+ concurrencyLimit?: number;
+ /**
+ * Throttle duration between Slack notifications per backend instance of the notifications plugin, defaults to 1 minute.
+ */
+ throttleInterval?: HumanDuration | string;
}>;
};
};
diff --git a/plugins/notifications-backend-module-slack/package.json b/plugins/notifications-backend-module-slack/package.json
index 9cb2486d3e..0e35577006 100644
--- a/plugins/notifications-backend-module-slack/package.json
+++ b/plugins/notifications-backend-module-slack/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-notifications-backend-module-slack",
- "version": "0.2.2-next.0",
+ "version": "0.3.0",
"description": "The slack backend module for the notifications plugin.",
"backstage": {
"role": "backend-plugin-module",
@@ -54,7 +54,7 @@
"@backstage/cli": "workspace:^",
"@backstage/plugin-catalog-node": "workspace:^",
"@backstage/test-utils": "workspace:^",
- "@faker-js/faker": "^8.4.1",
+ "@faker-js/faker": "^10.0.0",
"msw": "^2.0.0"
},
"configSchema": "config.d.ts"
diff --git a/plugins/notifications-backend-module-slack/src/lib/SlackNotificationProcessor.test.ts b/plugins/notifications-backend-module-slack/src/lib/SlackNotificationProcessor.test.ts
index ad4bf01e9f..9490ff7dde 100644
--- a/plugins/notifications-backend-module-slack/src/lib/SlackNotificationProcessor.test.ts
+++ b/plugins/notifications-backend-module-slack/src/lib/SlackNotificationProcessor.test.ts
@@ -19,6 +19,22 @@ import { SlackNotificationProcessor } from './SlackNotificationProcessor';
import { catalogServiceMock } from '@backstage/plugin-catalog-node/testUtils';
import { WebClient } from '@slack/web-api';
import { Entity } from '@backstage/catalog-model';
+import pThrottle from 'p-throttle';
+import { durationToMilliseconds } from '@backstage/types';
+
+const throttleConfigs: Array<{ limit: number; interval: number }> = [];
+
+jest.mock('p-throttle', () => ({
+ __esModule: true,
+ default: jest.fn((config: { limit: number; interval: number }) => {
+ throttleConfigs.push(config);
+ return Promise | any>(fn: T) =>
+ (...args: Parameters) =>
+ Promise.resolve(fn(...args));
+ }),
+}));
+
+const mockedPThrottle = pThrottle as jest.MockedFunction;
jest.mock('@slack/web-api', () => {
const mockSlack = {
@@ -128,6 +144,8 @@ describe('SlackNotificationProcessor', () => {
beforeEach(() => {
jest.clearAllMocks();
+ throttleConfigs.length = 0;
+ mockedPThrottle.mockClear();
});
it('should send a notification to a group', async () => {
@@ -393,6 +411,462 @@ describe('SlackNotificationProcessor', () => {
});
});
+ describe('when broadcast routes are configured', () => {
+ it('should route by origin and topic (highest priority)', async () => {
+ const slack = new WebClient();
+ const routesConfig = mockServices.rootConfig({
+ data: {
+ app: {
+ baseUrl: 'https://example.org',
+ },
+ notifications: {
+ processors: {
+ slack: [
+ {
+ token: 'mock-token',
+ broadcastChannels: ['default-channel'],
+ broadcastRoutes: [
+ { origin: 'plugin:catalog', channel: 'catalog-channel' },
+ { topic: 'alerts', channel: 'alerts-channel' },
+ {
+ origin: 'plugin:catalog',
+ topic: 'alerts',
+ channel: 'catalog-alerts-channel',
+ },
+ ],
+ },
+ ],
+ },
+ },
+ },
+ });
+
+ const processor = SlackNotificationProcessor.fromConfig(routesConfig, {
+ auth,
+ logger,
+ catalog: catalogServiceMock({
+ entities: DEFAULT_ENTITIES_RESPONSE.items,
+ }),
+ slack,
+ })[0];
+
+ await processor.postProcess(
+ {
+ origin: 'plugin:catalog',
+ id: '1234',
+ user: null,
+ created: new Date(),
+ payload: {
+ title: 'notification',
+ topic: 'alerts',
+ },
+ },
+ {
+ recipients: { type: 'broadcast' },
+ payload: { title: 'notification', topic: 'alerts' },
+ },
+ );
+
+ expect(slack.chat.postMessage).toHaveBeenCalledTimes(1);
+ expect(slack.chat.postMessage).toHaveBeenCalledWith(
+ expect.objectContaining({ channel: 'catalog-alerts-channel' }),
+ );
+ });
+
+ it('should route by origin only when no origin+topic match', async () => {
+ const slack = new WebClient();
+ const routesConfig = mockServices.rootConfig({
+ data: {
+ app: {
+ baseUrl: 'https://example.org',
+ },
+ notifications: {
+ processors: {
+ slack: [
+ {
+ token: 'mock-token',
+ broadcastRoutes: [
+ { origin: 'plugin:catalog', channel: 'catalog-channel' },
+ { topic: 'alerts', channel: 'alerts-channel' },
+ ],
+ },
+ ],
+ },
+ },
+ },
+ });
+
+ const processor = SlackNotificationProcessor.fromConfig(routesConfig, {
+ auth,
+ logger,
+ catalog: catalogServiceMock({
+ entities: DEFAULT_ENTITIES_RESPONSE.items,
+ }),
+ slack,
+ })[0];
+
+ await processor.postProcess(
+ {
+ origin: 'plugin:catalog',
+ id: '1234',
+ user: null,
+ created: new Date(),
+ payload: {
+ title: 'notification',
+ topic: 'updates',
+ },
+ },
+ {
+ recipients: { type: 'broadcast' },
+ payload: { title: 'notification', topic: 'updates' },
+ },
+ );
+
+ expect(slack.chat.postMessage).toHaveBeenCalledTimes(1);
+ expect(slack.chat.postMessage).toHaveBeenCalledWith(
+ expect.objectContaining({ channel: 'catalog-channel' }),
+ );
+ });
+
+ it('should route by topic only when no origin match', async () => {
+ const slack = new WebClient();
+ const routesConfig = mockServices.rootConfig({
+ data: {
+ app: {
+ baseUrl: 'https://example.org',
+ },
+ notifications: {
+ processors: {
+ slack: [
+ {
+ token: 'mock-token',
+ broadcastRoutes: [
+ { origin: 'plugin:catalog', channel: 'catalog-channel' },
+ { topic: 'alerts', channel: 'alerts-channel' },
+ ],
+ },
+ ],
+ },
+ },
+ },
+ });
+
+ const processor = SlackNotificationProcessor.fromConfig(routesConfig, {
+ auth,
+ logger,
+ catalog: catalogServiceMock({
+ entities: DEFAULT_ENTITIES_RESPONSE.items,
+ }),
+ slack,
+ })[0];
+
+ await processor.postProcess(
+ {
+ origin: 'plugin:unknown',
+ id: '1234',
+ user: null,
+ created: new Date(),
+ payload: {
+ title: 'notification',
+ topic: 'alerts',
+ },
+ },
+ {
+ recipients: { type: 'broadcast' },
+ payload: { title: 'notification', topic: 'alerts' },
+ },
+ );
+
+ expect(slack.chat.postMessage).toHaveBeenCalledTimes(1);
+ expect(slack.chat.postMessage).toHaveBeenCalledWith(
+ expect.objectContaining({ channel: 'alerts-channel' }),
+ );
+ });
+
+ it('should fall back to broadcastChannels when no route matches', async () => {
+ const slack = new WebClient();
+ const routesConfig = mockServices.rootConfig({
+ data: {
+ app: {
+ baseUrl: 'https://example.org',
+ },
+ notifications: {
+ processors: {
+ slack: [
+ {
+ token: 'mock-token',
+ broadcastChannels: ['default-channel'],
+ broadcastRoutes: [
+ { origin: 'plugin:catalog', channel: 'catalog-channel' },
+ ],
+ },
+ ],
+ },
+ },
+ },
+ });
+
+ const processor = SlackNotificationProcessor.fromConfig(routesConfig, {
+ auth,
+ logger,
+ catalog: catalogServiceMock({
+ entities: DEFAULT_ENTITIES_RESPONSE.items,
+ }),
+ slack,
+ })[0];
+
+ await processor.postProcess(
+ {
+ origin: 'plugin:unknown',
+ id: '1234',
+ user: null,
+ created: new Date(),
+ payload: {
+ title: 'notification',
+ },
+ },
+ {
+ recipients: { type: 'broadcast' },
+ payload: { title: 'notification' },
+ },
+ );
+
+ expect(slack.chat.postMessage).toHaveBeenCalledTimes(1);
+ expect(slack.chat.postMessage).toHaveBeenCalledWith(
+ expect.objectContaining({ channel: 'default-channel' }),
+ );
+ });
+
+ it('should support multiple channels in a route', async () => {
+ const slack = new WebClient();
+ const routesConfig = mockServices.rootConfig({
+ data: {
+ app: {
+ baseUrl: 'https://example.org',
+ },
+ notifications: {
+ processors: {
+ slack: [
+ {
+ token: 'mock-token',
+ broadcastRoutes: [
+ {
+ origin: 'plugin:catalog',
+ channel: ['channel1', 'channel2', 'channel3'],
+ },
+ ],
+ },
+ ],
+ },
+ },
+ },
+ });
+
+ const processor = SlackNotificationProcessor.fromConfig(routesConfig, {
+ auth,
+ logger,
+ catalog: catalogServiceMock({
+ entities: DEFAULT_ENTITIES_RESPONSE.items,
+ }),
+ slack,
+ })[0];
+
+ await processor.postProcess(
+ {
+ origin: 'plugin:catalog',
+ id: '1234',
+ user: null,
+ created: new Date(),
+ payload: {
+ title: 'notification',
+ },
+ },
+ {
+ recipients: { type: 'broadcast' },
+ payload: { title: 'notification' },
+ },
+ );
+
+ expect(slack.chat.postMessage).toHaveBeenCalledTimes(3);
+ expect(slack.chat.postMessage).toHaveBeenCalledWith(
+ expect.objectContaining({ channel: 'channel1' }),
+ );
+ expect(slack.chat.postMessage).toHaveBeenCalledWith(
+ expect.objectContaining({ channel: 'channel2' }),
+ );
+ expect(slack.chat.postMessage).toHaveBeenCalledWith(
+ expect.objectContaining({ channel: 'channel3' }),
+ );
+ });
+
+ it('should support single channel as string in a route', async () => {
+ const slack = new WebClient();
+ const routesConfig = mockServices.rootConfig({
+ data: {
+ app: {
+ baseUrl: 'https://example.org',
+ },
+ notifications: {
+ processors: {
+ slack: [
+ {
+ token: 'mock-token',
+ broadcastRoutes: [
+ { topic: 'alerts', channel: 'single-alerts-channel' },
+ ],
+ },
+ ],
+ },
+ },
+ },
+ });
+
+ const processor = SlackNotificationProcessor.fromConfig(routesConfig, {
+ auth,
+ logger,
+ catalog: catalogServiceMock({
+ entities: DEFAULT_ENTITIES_RESPONSE.items,
+ }),
+ slack,
+ })[0];
+
+ await processor.postProcess(
+ {
+ origin: 'plugin:any',
+ id: '1234',
+ user: null,
+ created: new Date(),
+ payload: {
+ title: 'notification',
+ topic: 'alerts',
+ },
+ },
+ {
+ recipients: { type: 'broadcast' },
+ payload: { title: 'notification', topic: 'alerts' },
+ },
+ );
+
+ expect(slack.chat.postMessage).toHaveBeenCalledTimes(1);
+ expect(slack.chat.postMessage).toHaveBeenCalledWith(
+ expect.objectContaining({ channel: 'single-alerts-channel' }),
+ );
+ });
+
+ it('should not send when no route matches and no broadcastChannels configured', async () => {
+ const slack = new WebClient();
+ const routesConfig = mockServices.rootConfig({
+ data: {
+ app: {
+ baseUrl: 'https://example.org',
+ },
+ notifications: {
+ processors: {
+ slack: [
+ {
+ token: 'mock-token',
+ broadcastRoutes: [
+ { origin: 'plugin:catalog', channel: 'catalog-channel' },
+ ],
+ },
+ ],
+ },
+ },
+ },
+ });
+
+ const processor = SlackNotificationProcessor.fromConfig(routesConfig, {
+ auth,
+ logger,
+ catalog: catalogServiceMock({
+ entities: DEFAULT_ENTITIES_RESPONSE.items,
+ }),
+ slack,
+ })[0];
+
+ await processor.postProcess(
+ {
+ origin: 'plugin:unknown',
+ id: '1234',
+ user: null,
+ created: new Date(),
+ payload: {
+ title: 'notification',
+ topic: 'unknown-topic',
+ },
+ },
+ {
+ recipients: { type: 'broadcast' },
+ payload: { title: 'notification', topic: 'unknown-topic' },
+ },
+ );
+
+ expect(slack.chat.postMessage).not.toHaveBeenCalled();
+ });
+
+ it('should match origin+topic route over origin-only route', async () => {
+ const slack = new WebClient();
+ const routesConfig = mockServices.rootConfig({
+ data: {
+ app: {
+ baseUrl: 'https://example.org',
+ },
+ notifications: {
+ processors: {
+ slack: [
+ {
+ token: 'mock-token',
+ broadcastRoutes: [
+ // Origin-only route defined first
+ { origin: 'plugin:catalog', channel: 'general-catalog' },
+ // More specific origin+topic route defined second
+ {
+ origin: 'plugin:catalog',
+ topic: 'entity-deleted',
+ channel: 'catalog-deletions',
+ },
+ ],
+ },
+ ],
+ },
+ },
+ },
+ });
+
+ const processor = SlackNotificationProcessor.fromConfig(routesConfig, {
+ auth,
+ logger,
+ catalog: catalogServiceMock({
+ entities: DEFAULT_ENTITIES_RESPONSE.items,
+ }),
+ slack,
+ })[0];
+
+ await processor.postProcess(
+ {
+ origin: 'plugin:catalog',
+ id: '1234',
+ user: null,
+ created: new Date(),
+ payload: {
+ title: 'notification',
+ topic: 'entity-deleted',
+ },
+ },
+ {
+ recipients: { type: 'broadcast' },
+ payload: { title: 'notification', topic: 'entity-deleted' },
+ },
+ );
+
+ // Should use the origin+topic match, not the origin-only match
+ expect(slack.chat.postMessage).toHaveBeenCalledTimes(1);
+ expect(slack.chat.postMessage).toHaveBeenCalledWith(
+ expect.objectContaining({ channel: 'catalog-deletions' }),
+ );
+ });
+ });
+
describe('when slack.com/bot-notify annotation is missing', () => {
it('should not send notification to a group without annotation', async () => {
const slack = new WebClient();
@@ -953,4 +1427,81 @@ describe('SlackNotificationProcessor', () => {
);
});
});
+
+ describe('when throttling is not configured', () => {
+ it('should use default concurrency limit of 10 per minute', async () => {
+ const slack = new WebClient();
+
+ const processor = SlackNotificationProcessor.fromConfig(config, {
+ auth,
+ logger,
+ catalog: catalogServiceMock({
+ entities: DEFAULT_ENTITIES_RESPONSE.items,
+ }),
+ slack,
+ })[0];
+
+ await processor.processOptions({
+ recipients: { type: 'entity', entityRef: 'group:default/mock' },
+ payload: { title: 'notification' },
+ });
+
+ expect(slack.chat.postMessage).toHaveBeenCalled();
+ expect(throttleConfigs).toEqual([
+ {
+ limit: 10,
+ interval: durationToMilliseconds({ minutes: 1 }),
+ },
+ ]);
+ });
+ });
+
+ describe('when throttling is configured', () => {
+ it('should use custom concurrency limit and interval values', async () => {
+ const slack = new WebClient();
+ const throttlingConfig = mockServices.rootConfig({
+ data: {
+ app: {
+ baseUrl: 'https://example.org',
+ },
+ notifications: {
+ processors: {
+ slack: [
+ {
+ token: 'mock-token',
+ concurrencyLimit: 5,
+ throttleInterval: 'PT30S',
+ },
+ ],
+ },
+ },
+ },
+ });
+
+ const processor = SlackNotificationProcessor.fromConfig(
+ throttlingConfig,
+ {
+ auth,
+ logger,
+ catalog: catalogServiceMock({
+ entities: DEFAULT_ENTITIES_RESPONSE.items,
+ }),
+ slack,
+ },
+ )[0];
+
+ await processor.processOptions({
+ recipients: { type: 'entity', entityRef: 'group:default/mock' },
+ payload: { title: 'notification' },
+ });
+
+ expect(slack.chat.postMessage).toHaveBeenCalled();
+ expect(throttleConfigs).toEqual([
+ {
+ limit: 5,
+ interval: durationToMilliseconds({ seconds: 30 }),
+ },
+ ]);
+ });
+ });
});
diff --git a/plugins/notifications-backend-module-slack/src/lib/SlackNotificationProcessor.ts b/plugins/notifications-backend-module-slack/src/lib/SlackNotificationProcessor.ts
index f9b00c9a58..e8f8d9eda4 100644
--- a/plugins/notifications-backend-module-slack/src/lib/SlackNotificationProcessor.ts
+++ b/plugins/notifications-backend-module-slack/src/lib/SlackNotificationProcessor.ts
@@ -21,7 +21,7 @@ import {
parseEntityRef,
UserEntity,
} from '@backstage/catalog-model';
-import { Config } from '@backstage/config';
+import { Config, readDurationFromConfig } from '@backstage/config';
import { NotFoundError } from '@backstage/errors';
import { Notification } from '@backstage/plugin-notifications-common';
import {
@@ -34,6 +34,7 @@ import { ChatPostMessageArguments, WebClient } from '@slack/web-api';
import DataLoader from 'dataloader';
import pThrottle from 'p-throttle';
import { ANNOTATION_SLACK_BOT_NOTIFY } from './constants';
+import { BroadcastRoute } from './types';
import { ExpiryMap, toChatPostMessageArgs } from './util';
import { CatalogService } from '@backstage/plugin-catalog-node';
@@ -48,8 +49,11 @@ export class SlackNotificationProcessor implements NotificationProcessor {
private readonly messagesSent: Counter;
private readonly messagesFailed: Counter;
private readonly broadcastChannels?: string[];
+ private readonly broadcastRoutes?: BroadcastRoute[];
private readonly entityLoader: DataLoader;
private readonly username?: string;
+ private readonly concurrencyLimit: number;
+ private readonly throttleInterval: number;
static fromConfig(
config: Config,
@@ -68,10 +72,23 @@ export class SlackNotificationProcessor implements NotificationProcessor {
const slack = options.slack ?? new WebClient(token);
const broadcastChannels = c.getOptionalStringArray('broadcastChannels');
const username = c.getOptionalString('username');
+ const broadcastRoutesConfig = c.getOptionalConfigArray('broadcastRoutes');
+ const broadcastRoutes = broadcastRoutesConfig?.map(route =>
+ this.parseBroadcastRoute(route),
+ );
+ const concurrencyLimit = c.getOptionalNumber('concurrencyLimit') ?? 10;
+ const throttleInterval = c.has('throttleInterval')
+ ? durationToMilliseconds(
+ readDurationFromConfig(c, { key: 'throttleInterval' }),
+ )
+ : durationToMilliseconds({ minutes: 1 });
return new SlackNotificationProcessor({
slack,
broadcastChannels,
+ broadcastRoutes,
username,
+ concurrencyLimit,
+ throttleInterval,
...options,
});
});
@@ -83,16 +100,32 @@ export class SlackNotificationProcessor implements NotificationProcessor {
logger: LoggerService;
catalog: CatalogService;
broadcastChannels?: string[];
+ broadcastRoutes?: BroadcastRoute[];
username?: string;
+ concurrencyLimit?: number;
+ throttleInterval?: number;
}) {
- const { auth, catalog, logger, slack, broadcastChannels, username } =
- options;
+ const {
+ auth,
+ catalog,
+ logger,
+ slack,
+ broadcastChannels,
+ broadcastRoutes,
+ username,
+ concurrencyLimit,
+ throttleInterval,
+ } = options;
this.logger = logger;
this.catalog = catalog;
this.auth = auth;
this.slack = slack;
this.broadcastChannels = broadcastChannels;
+ this.broadcastRoutes = broadcastRoutes;
this.username = username;
+ this.concurrencyLimit = concurrencyLimit ?? 10;
+ this.throttleInterval =
+ throttleInterval ?? durationToMilliseconds({ minutes: 1 });
this.entityLoader = new DataLoader(
async entityRefs => {
@@ -134,8 +167,8 @@ export class SlackNotificationProcessor implements NotificationProcessor {
);
const throttle = pThrottle({
- limit: 10,
- interval: durationToMilliseconds({ minutes: 1 }),
+ limit: this.concurrencyLimit,
+ interval: this.throttleInterval,
});
const throttled = throttle((opts: ChatPostMessageArguments) =>
this.sendNotification(opts),
@@ -235,7 +268,8 @@ export class SlackNotificationProcessor implements NotificationProcessor {
// Handle broadcast case
if (notification.user === null) {
- destinations.push(...(this.broadcastChannels ?? []));
+ const routedChannels = this.getBroadcastDestinations(notification);
+ destinations.push(...routedChannels);
} else if (options.recipients.type === 'entity') {
// Handle user-specific notification
const entityRefs = [options.recipients.entityRef].flat();
@@ -384,4 +418,88 @@ export class SlackNotificationProcessor implements NotificationProcessor {
throw new Error(`Failed to send notification: ${response.error}`);
}
}
+
+ private static parseBroadcastRoute(route: Config): BroadcastRoute {
+ const channelValue = route.getOptional('channel');
+ let channels: string[];
+
+ if (typeof channelValue === 'string') {
+ channels = [channelValue];
+ } else if (Array.isArray(channelValue)) {
+ channels = channelValue as string[];
+ } else {
+ throw new Error(
+ 'broadcastRoutes entry must have a channel property (string or string[])',
+ );
+ }
+
+ return {
+ origin: route.getOptionalString('origin'),
+ topic: route.getOptionalString('topic'),
+ channels,
+ };
+ }
+
+ /**
+ * Gets the destination channels for a broadcast notification based on
+ * configured routes. Routes are matched by origin and/or topic.
+ *
+ * Matching precedence:
+ * 1. Routes with both origin AND topic matching (most specific)
+ * 2. Routes with only origin matching
+ * 3. Routes with only topic matching
+ * 4. Default broadcastChannels (least specific fallback)
+ *
+ * The first matching route wins within each precedence level.
+ */
+ private getBroadcastDestinations(notification: Notification): string[] {
+ const { origin } = notification;
+ const { topic } = notification.payload;
+
+ if (!this.broadcastRoutes || this.broadcastRoutes.length === 0) {
+ // Fall back to legacy broadcastChannels config
+ return this.broadcastChannels ?? [];
+ }
+
+ // Find most specific match
+ // Priority 1: origin AND topic match
+ const originAndTopicMatch = this.broadcastRoutes.find(
+ route =>
+ route.origin !== undefined &&
+ route.topic !== undefined &&
+ route.origin === origin &&
+ route.topic === topic,
+ );
+
+ if (originAndTopicMatch) {
+ return originAndTopicMatch.channels;
+ }
+
+ // Priority 2: origin-only match (no topic specified in route)
+ const originOnlyMatch = this.broadcastRoutes.find(
+ route =>
+ route.origin !== undefined &&
+ route.topic === undefined &&
+ route.origin === origin,
+ );
+
+ if (originOnlyMatch) {
+ return originOnlyMatch.channels;
+ }
+
+ // Priority 3: topic-only match (no origin specified in route)
+ const topicOnlyMatch = this.broadcastRoutes.find(
+ route =>
+ route.topic !== undefined &&
+ route.origin === undefined &&
+ route.topic === topic,
+ );
+
+ if (topicOnlyMatch) {
+ return topicOnlyMatch.channels;
+ }
+
+ // No match found, fall back to legacy broadcastChannels
+ return this.broadcastChannels ?? [];
+ }
}
diff --git a/plugins/notifications-backend-module-slack/src/lib/types.ts b/plugins/notifications-backend-module-slack/src/lib/types.ts
index bd87e9656c..316df03462 100644
--- a/plugins/notifications-backend-module-slack/src/lib/types.ts
+++ b/plugins/notifications-backend-module-slack/src/lib/types.ts
@@ -18,3 +18,16 @@ export interface SlackNotificationOptions {
url: string;
payload: string;
}
+
+/**
+ * Configuration for routing broadcast notifications to specific Slack channels
+ * based on origin and/or topic.
+ */
+export type BroadcastRoute = {
+ /** The origin to match (e.g., 'plugin:catalog', 'external:my-service') */
+ origin?: string;
+ /** The topic to match (e.g., 'entity-updated', 'alerts') */
+ topic?: string;
+ /** The Slack channel(s) to send to */
+ channels: string[];
+};
diff --git a/plugins/notifications-backend/CHANGELOG.md b/plugins/notifications-backend/CHANGELOG.md
index 7ae71e5b23..91da5468ca 100644
--- a/plugins/notifications-backend/CHANGELOG.md
+++ b/plugins/notifications-backend/CHANGELOG.md
@@ -1,5 +1,32 @@
# @backstage/plugin-notifications-backend
+## 0.6.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-signals-node@0.1.27
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-catalog-node@1.20.1
+ - @backstage/plugin-notifications-node@0.2.22
+
+## 0.6.1-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-signals-node@0.1.27-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/types@1.2.2
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+ - @backstage/plugin-notifications-common@0.2.0
+ - @backstage/plugin-notifications-node@0.2.22-next.1
+
## 0.6.1-next.0
### Patch Changes
diff --git a/plugins/notifications-backend/package.json b/plugins/notifications-backend/package.json
index 5e50a6b787..7262b65d38 100644
--- a/plugins/notifications-backend/package.json
+++ b/plugins/notifications-backend/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-notifications-backend",
- "version": "0.6.1-next.0",
+ "version": "0.6.1",
"backstage": {
"role": "backend-plugin",
"pluginId": "notifications",
diff --git a/plugins/notifications-node/CHANGELOG.md b/plugins/notifications-node/CHANGELOG.md
index 97cd9b2585..98d1b3c84c 100644
--- a/plugins/notifications-node/CHANGELOG.md
+++ b/plugins/notifications-node/CHANGELOG.md
@@ -1,5 +1,24 @@
# @backstage/plugin-notifications-node
+## 0.2.22
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-signals-node@0.1.27
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.2.22-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-signals-node@0.1.27-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-client@1.12.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/plugin-notifications-common@0.2.0
+
## 0.2.22-next.0
### Patch Changes
diff --git a/plugins/notifications-node/package.json b/plugins/notifications-node/package.json
index 25d7b2f9ca..8007852dd5 100644
--- a/plugins/notifications-node/package.json
+++ b/plugins/notifications-node/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-notifications-node",
- "version": "0.2.22-next.0",
+ "version": "0.2.22",
"description": "Node.js library for the notifications plugin",
"backstage": {
"role": "node-library",
diff --git a/plugins/notifications/CHANGELOG.md b/plugins/notifications/CHANGELOG.md
index b40d8540bf..50bd9b35a3 100644
--- a/plugins/notifications/CHANGELOG.md
+++ b/plugins/notifications/CHANGELOG.md
@@ -1,5 +1,22 @@
# @backstage/plugin-notifications
+## 0.5.12
+
+### Patch Changes
+
+- d02db50: Remove unnecessary use of `compatWrapper` and `convertLegacyRouteRef`(s) for the new frontend system.
+- 53347cc: Move long notification descriptions behind `Show more/less` button.
+
+ This improves readability of the notifications list by preventing long descriptions from taking up too much space
+ or rendering very small scrollable areas.
+
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.13.2
+ - @backstage/core-components@0.18.4
+ - @backstage/core-plugin-api@1.12.1
+ - @backstage/theme@0.7.1
+ - @backstage/plugin-signals-react@0.0.18
+
## 0.5.12-next.0
### Patch Changes
diff --git a/plugins/notifications/package.json b/plugins/notifications/package.json
index 5f2c652425..1a6b544da3 100644
--- a/plugins/notifications/package.json
+++ b/plugins/notifications/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-notifications",
- "version": "0.5.12-next.0",
+ "version": "0.5.12",
"backstage": {
"role": "frontend-plugin",
"pluginId": "notifications",
diff --git a/plugins/notifications/src/components/NotificationsFilters/NotificationsFilters.tsx b/plugins/notifications/src/components/NotificationsFilters/NotificationsFilters.tsx
index 7e3f519b0c..e8fa422fa1 100644
--- a/plugins/notifications/src/components/NotificationsFilters/NotificationsFilters.tsx
+++ b/plugins/notifications/src/components/NotificationsFilters/NotificationsFilters.tsx
@@ -14,14 +14,11 @@
* limitations under the License.
*/
import { ChangeEvent } from 'react';
-
-import Divider from '@material-ui/core/Divider';
import FormControl from '@material-ui/core/FormControl';
import Grid from '@material-ui/core/Grid';
import InputLabel from '@material-ui/core/InputLabel';
import MenuItem from '@material-ui/core/MenuItem';
import Select from '@material-ui/core/Select';
-import Typography from '@material-ui/core/Typography';
import { GetNotificationsOptions } from '../../api';
import { NotificationSeverity } from '@backstage/plugin-notifications-common';
@@ -200,11 +197,6 @@ export const NotificationsFilters = ({
return (
<>
-
- Filters
-
-
View
diff --git a/plugins/notifications/src/components/NotificationsPage/NotificationsPage.tsx b/plugins/notifications/src/components/NotificationsPage/NotificationsPage.tsx
index 739e9a1535..69242ac60e 100644
--- a/plugins/notifications/src/components/NotificationsPage/NotificationsPage.tsx
+++ b/plugins/notifications/src/components/NotificationsPage/NotificationsPage.tsx
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import { useState, useMemo, useEffect } from 'react';
+import { useEffect, useMemo, useState } from 'react';
import throttle from 'lodash/throttle';
import {
Content,
@@ -156,13 +156,17 @@ export const NotificationsPage = (props?: NotificationsPageProps) => {
const isUnread = !!value?.[1]?.unread;
const allTopics = value?.[2]?.topics;
- let tableTitle = `All notifications (${totalCount})`;
+ let tableTitle = `All notifications `;
if (saved) {
- tableTitle = `Saved notifications (${totalCount})`;
+ tableTitle = `Saved notifications`;
} else if (unreadOnly === true) {
- tableTitle = `Unread notifications (${totalCount})`;
+ tableTitle = `Unread notifications`;
} else if (unreadOnly === false) {
- tableTitle = `Read notifications (${totalCount})`;
+ tableTitle = `Read notifications`;
+ }
+
+ if (totalCount) {
+ tableTitle += ` (${totalCount})`;
}
return (
diff --git a/plugins/notifications/src/components/NotificationsTable/NotificationDescription.tsx b/plugins/notifications/src/components/NotificationsTable/NotificationDescription.tsx
new file mode 100644
index 0000000000..762900c2b9
--- /dev/null
+++ b/plugins/notifications/src/components/NotificationsTable/NotificationDescription.tsx
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import Typography from '@material-ui/core/Typography';
+import Button from '@material-ui/core/Button';
+import { useState } from 'react';
+
+const MAX_LENGTH = 100;
+
+export const NotificationDescription = (props: { description: string }) => {
+ const { description } = props;
+ const [shown, setShown] = useState(false);
+ const isLong = description.length > MAX_LENGTH;
+
+ if (!isLong) {
+ return {description} ;
+ }
+
+ if (shown) {
+ return (
+
+ {description}{' '}
+
+
+ );
+ }
+ return (
+
+ {description.substring(0, MAX_LENGTH)}...{' '}
+
+
+ );
+};
diff --git a/plugins/notifications/src/components/NotificationsTable/NotificationsTable.tsx b/plugins/notifications/src/components/NotificationsTable/NotificationsTable.tsx
index 8ec237e62f..952c18f9f9 100644
--- a/plugins/notifications/src/components/NotificationsTable/NotificationsTable.tsx
+++ b/plugins/notifications/src/components/NotificationsTable/NotificationsTable.tsx
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import { useState, useCallback, useMemo, useEffect } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
import throttle from 'lodash/throttle';
// @ts-ignore
import RelativeTime from 'react-relative-time';
@@ -37,14 +37,11 @@ import { notificationsApiRef } from '../../api';
import { SelectAll } from './SelectAll';
import { BulkActions } from './BulkActions';
import { NotificationIcon } from './NotificationIcon';
+import { NotificationDescription } from './NotificationDescription';
const ThrottleDelayMs = 1000;
const useStyles = makeStyles(theme => ({
- description: {
- maxHeight: '5rem',
- overflow: 'auto',
- },
severityItem: {
alignContent: 'center',
},
@@ -53,8 +50,10 @@ const useStyles = makeStyles(theme => ({
verticalAlign: 'text-bottom',
},
notificationInfoRow: {
- marginLeft: theme.spacing(0.5),
marginRight: theme.spacing(0.5),
+ '&:not(:first-child)': {
+ marginLeft: theme.spacing(0.5),
+ },
},
}));
@@ -240,9 +239,9 @@ export const NotificationsTable = ({
)}
{notification.payload.description ? (
-
- {notification.payload.description}
-
+
@@ -318,7 +317,6 @@ export const NotificationsTable = ({
onMarkAllRead,
onNotificationsSelectChange,
classes.severityItem,
- classes.description,
classes.broadcastIcon,
classes.notificationInfoRow,
markAsReadOnLinkOpen,
diff --git a/plugins/notifications/src/components/NotificationsTable/SelectAll.tsx b/plugins/notifications/src/components/NotificationsTable/SelectAll.tsx
index 9bcc497132..f6d6ff48c9 100644
--- a/plugins/notifications/src/components/NotificationsTable/SelectAll.tsx
+++ b/plugins/notifications/src/components/NotificationsTable/SelectAll.tsx
@@ -16,6 +16,7 @@
import Checkbox from '@material-ui/core/Checkbox';
import FormControlLabel from '@material-ui/core/FormControlLabel';
import { makeStyles } from '@material-ui/core/styles';
+import Tooltip from '@material-ui/core/Tooltip';
const useStyles = makeStyles({
label: {
@@ -23,6 +24,7 @@ const useStyles = makeStyles({
maxWidth: '2rem',
'& span': {
paddingRight: '0px',
+ marginRight: '2px',
},
},
});
@@ -43,13 +45,15 @@ export const SelectAll = ({
label={count > 0 ? `(${count})` : undefined}
className={classes.label}
control={
- 0}
- indeterminate={count > 0 && totalCount !== count}
- onChange={onSelectAll}
- />
+
+ 0}
+ indeterminate={count > 0 && totalCount !== count}
+ onChange={onSelectAll}
+ />
+
}
/>
);
diff --git a/plugins/org-react/CHANGELOG.md b/plugins/org-react/CHANGELOG.md
index 5cfb6f1a18..ffe7af52f1 100644
--- a/plugins/org-react/CHANGELOG.md
+++ b/plugins/org-react/CHANGELOG.md
@@ -1,5 +1,14 @@
# @backstage/plugin-org-react
+## 0.1.45
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-components@0.18.4
+ - @backstage/plugin-catalog-react@1.21.4
+ - @backstage/core-plugin-api@1.12.1
+
## 0.1.45-next.0
### Patch Changes
diff --git a/plugins/org-react/package.json b/plugins/org-react/package.json
index a077894bc7..99403d689d 100644
--- a/plugins/org-react/package.json
+++ b/plugins/org-react/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-org-react",
- "version": "0.1.45-next.0",
+ "version": "0.1.45",
"backstage": {
"role": "web-library",
"pluginId": "org",
diff --git a/plugins/org/CHANGELOG.md b/plugins/org/CHANGELOG.md
index 3bc994dcfe..90292a0f78 100644
--- a/plugins/org/CHANGELOG.md
+++ b/plugins/org/CHANGELOG.md
@@ -1,5 +1,30 @@
# @backstage/plugin-org
+## 0.6.47
+
+### Patch Changes
+
+- f3f84f1: Minor extension type updates after frontend API bump
+- d02db50: Remove unnecessary use of `compatWrapper` and `convertLegacyRouteRef`(s) for the new frontend system.
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.13.2
+ - @backstage/core-components@0.18.4
+ - @backstage/plugin-catalog-react@1.21.4
+ - @backstage/core-plugin-api@1.12.1
+
+## 0.6.47-next.1
+
+### Patch Changes
+
+- f3f84f1: Minor extension type updates after frontend API bump
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.13.2-next.1
+ - @backstage/plugin-catalog-react@1.21.4-next.2
+ - @backstage/core-components@0.18.4-next.2
+ - @backstage/catalog-model@1.7.6
+ - @backstage/core-plugin-api@1.12.1-next.0
+ - @backstage/plugin-catalog-common@1.1.7
+
## 0.6.47-next.0
### Patch Changes
diff --git a/plugins/org/package.json b/plugins/org/package.json
index 09e801d7be..a48dad9f25 100644
--- a/plugins/org/package.json
+++ b/plugins/org/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-org",
- "version": "0.6.47-next.0",
+ "version": "0.6.47",
"description": "A Backstage plugin that helps you create entity pages for your organization",
"backstage": {
"role": "frontend-plugin",
diff --git a/plugins/permission-backend-module-policy-allow-all/CHANGELOG.md b/plugins/permission-backend-module-policy-allow-all/CHANGELOG.md
index ec8e371159..a9709fd88b 100644
--- a/plugins/permission-backend-module-policy-allow-all/CHANGELOG.md
+++ b/plugins/permission-backend-module-policy-allow-all/CHANGELOG.md
@@ -1,5 +1,24 @@
# @backstage/plugin-permission-backend-module-allow-all-policy
+## 0.2.15
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/plugin-permission-node@0.10.7
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.2.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/plugin-permission-node@0.10.7-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/plugin-permission-common@0.9.3
+
## 0.2.15-next.0
### Patch Changes
diff --git a/plugins/permission-backend-module-policy-allow-all/package.json b/plugins/permission-backend-module-policy-allow-all/package.json
index 1d4c5af43c..5cddb60c98 100644
--- a/plugins/permission-backend-module-policy-allow-all/package.json
+++ b/plugins/permission-backend-module-policy-allow-all/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-permission-backend-module-allow-all-policy",
- "version": "0.2.15-next.0",
+ "version": "0.2.15",
"description": "Allow all policy backend module for the permission plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/permission-backend/CHANGELOG.md b/plugins/permission-backend/CHANGELOG.md
index 4b63ed405c..196de3238b 100644
--- a/plugins/permission-backend/CHANGELOG.md
+++ b/plugins/permission-backend/CHANGELOG.md
@@ -1,5 +1,28 @@
# @backstage/plugin-permission-backend
+## 0.7.7
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/plugin-permission-node@0.10.7
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.7.7-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/plugin-permission-node@0.10.7-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/plugin-permission-common@0.9.3
+
## 0.7.7-next.0
### Patch Changes
diff --git a/plugins/permission-backend/package.json b/plugins/permission-backend/package.json
index 5e599c2d3b..f3c840b693 100644
--- a/plugins/permission-backend/package.json
+++ b/plugins/permission-backend/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-permission-backend",
- "version": "0.7.7-next.0",
+ "version": "0.7.7",
"backstage": {
"role": "backend-plugin",
"pluginId": "permission",
diff --git a/plugins/permission-backend/src/service/PermissionIntegrationClient.test.ts b/plugins/permission-backend/src/service/PermissionIntegrationClient.test.ts
index ece99f08c7..822d10b858 100644
--- a/plugins/permission-backend/src/service/PermissionIntegrationClient.test.ts
+++ b/plugins/permission-backend/src/service/PermissionIntegrationClient.test.ts
@@ -148,9 +148,7 @@ describe('PermissionIntegrationClient', () => {
],
);
- expect(response).toEqual(
- expect.objectContaining([{ id: '123', result: AuthorizeResult.ALLOW }]),
- );
+ expect(response).toEqual([{ id: '123', result: AuthorizeResult.ALLOW }]);
});
it('should not include authorization headers if no token is supplied', async () => {
diff --git a/plugins/permission-node/CHANGELOG.md b/plugins/permission-node/CHANGELOG.md
index 4594d38882..6c9fe8a91b 100644
--- a/plugins/permission-node/CHANGELOG.md
+++ b/plugins/permission-node/CHANGELOG.md
@@ -1,5 +1,26 @@
# @backstage/plugin-permission-node
+## 0.10.7
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.10.7-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/plugin-permission-common@0.9.3
+
## 0.10.7-next.0
### Patch Changes
diff --git a/plugins/permission-node/package.json b/plugins/permission-node/package.json
index 3384aa7524..1ae3935b4c 100644
--- a/plugins/permission-node/package.json
+++ b/plugins/permission-node/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-permission-node",
- "version": "0.10.7-next.0",
+ "version": "0.10.7",
"description": "Common permission and authorization utilities for backend plugins",
"backstage": {
"role": "node-library",
diff --git a/plugins/permission-react/CHANGELOG.md b/plugins/permission-react/CHANGELOG.md
index cf0248c840..9a377d5dc8 100644
--- a/plugins/permission-react/CHANGELOG.md
+++ b/plugins/permission-react/CHANGELOG.md
@@ -1,5 +1,12 @@
# @backstage/plugin-permission-react
+## 0.4.39
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-plugin-api@1.12.1
+
## 0.4.39-next.0
### Patch Changes
diff --git a/plugins/permission-react/package.json b/plugins/permission-react/package.json
index 098959f342..17b4d65b51 100644
--- a/plugins/permission-react/package.json
+++ b/plugins/permission-react/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-permission-react",
- "version": "0.4.39-next.0",
+ "version": "0.4.39",
"backstage": {
"role": "web-library",
"pluginId": "permission",
diff --git a/plugins/proxy-backend/CHANGELOG.md b/plugins/proxy-backend/CHANGELOG.md
index 8bb9e73f52..7541c8faf1 100644
--- a/plugins/proxy-backend/CHANGELOG.md
+++ b/plugins/proxy-backend/CHANGELOG.md
@@ -1,5 +1,24 @@
# @backstage/plugin-proxy-backend
+## 0.6.9
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-proxy-node@0.1.11
+
+## 0.6.9-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/types@1.2.2
+ - @backstage/plugin-proxy-node@0.1.11-next.1
+
## 0.6.9-next.0
### Patch Changes
diff --git a/plugins/proxy-backend/package.json b/plugins/proxy-backend/package.json
index 331ea354c2..c75e9a42e7 100644
--- a/plugins/proxy-backend/package.json
+++ b/plugins/proxy-backend/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-proxy-backend",
- "version": "0.6.9-next.0",
+ "version": "0.6.9",
"description": "A Backstage backend plugin that helps you set up proxy endpoints in the backend",
"backstage": {
"role": "backend-plugin",
diff --git a/plugins/proxy-node/CHANGELOG.md b/plugins/proxy-node/CHANGELOG.md
index 12abd91157..e2bf6a15cf 100644
--- a/plugins/proxy-node/CHANGELOG.md
+++ b/plugins/proxy-node/CHANGELOG.md
@@ -1,5 +1,19 @@
# @backstage/plugin-proxy-node
+## 0.1.11
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.1.11-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0-next.1
+
## 0.1.11-next.0
### Patch Changes
diff --git a/plugins/proxy-node/package.json b/plugins/proxy-node/package.json
index 4ac4d1fe96..9134a6c2b5 100644
--- a/plugins/proxy-node/package.json
+++ b/plugins/proxy-node/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-proxy-node",
- "version": "0.1.11-next.0",
+ "version": "0.1.11",
"description": "The plugin-proxy-node module for @backstage/plugin-proxy-backend",
"backstage": {
"role": "node-library",
diff --git a/plugins/scaffolder-backend-module-azure/CHANGELOG.md b/plugins/scaffolder-backend-module-azure/CHANGELOG.md
index f1984afffd..6061d57a41 100644
--- a/plugins/scaffolder-backend-module-azure/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-azure/CHANGELOG.md
@@ -1,5 +1,25 @@
# @backstage/plugin-scaffolder-backend-module-azure
+## 0.2.16
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-scaffolder-node@0.12.2
+
+## 0.2.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.18.3-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/plugin-scaffolder-node@0.12.2-next.1
+
## 0.2.16-next.0
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-azure/package.json b/plugins/scaffolder-backend-module-azure/package.json
index ff47d56ed1..d76d5c41d8 100644
--- a/plugins/scaffolder-backend-module-azure/package.json
+++ b/plugins/scaffolder-backend-module-azure/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-scaffolder-backend-module-azure",
- "version": "0.2.16-next.0",
+ "version": "0.2.16",
"description": "The azure module for @backstage/plugin-scaffolder-backend",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/CHANGELOG.md b/plugins/scaffolder-backend-module-bitbucket-cloud/CHANGELOG.md
index 3238b13b21..d18fbaf5d4 100644
--- a/plugins/scaffolder-backend-module-bitbucket-cloud/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/CHANGELOG.md
@@ -1,5 +1,50 @@
# @backstage/plugin-scaffolder-backend-module-bitbucket-cloud
+## 0.3.0
+
+### Minor Changes
+
+- 37fba1d: Added support for Bitbucket Cloud OAuth. This introduces an alternative authentication method using a workspace OAuth consumer, alongside App Passwords (deprecated) and API tokens. OAuth does not require a bot or service account and avoids token expiry issues.
+
+ **BREAKING CHANGES**
+
+ - **@backstage/integration** (`src/bitbucketCloud/core.ts`)
+
+ - `getBitbucketCloudRequestOptions` now returns a `Promise` and **must** be awaited.
+
+ - **@backstage/plugin-scaffolder-backend-module-bitbucket-cloud** (`src/actions/helpers.ts`)
+ - `getBitbucketClient` now returns a `Promise` and **must** be awaited.
+ - `getAuthorizationHeader` now returns a `Promise` and **must** be awaited.
+
+ **OAuth usage example**
+
+ ```yaml
+ integrations:
+ bitbucketCloud:
+ - clientId: client-id
+ clientSecret: client-secret
+ ```
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/plugin-bitbucket-cloud-common@0.3.5
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-scaffolder-node@0.12.2
+
+## 0.2.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.18.3-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/plugin-bitbucket-cloud-common@0.3.5-next.0
+ - @backstage/plugin-scaffolder-node@0.12.2-next.1
+
## 0.2.16-next.0
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/package.json b/plugins/scaffolder-backend-module-bitbucket-cloud/package.json
index 7c44716291..512e5a7c55 100644
--- a/plugins/scaffolder-backend-module-bitbucket-cloud/package.json
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-scaffolder-backend-module-bitbucket-cloud",
- "version": "0.2.16-next.0",
+ "version": "0.3.0",
"description": "The Bitbucket Cloud module for @backstage/plugin-scaffolder-backend",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloud.ts b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloud.ts
index 722bf01303..a278410639 100644
--- a/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloud.ts
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloud.ts
@@ -25,6 +25,7 @@ import {
import { Config } from '@backstage/config';
import { getAuthorizationHeader } from './helpers';
+import { getBitbucketCloudOAuthToken } from '@backstage/integration';
import { examples } from './bitbucketCloud.examples';
const createRepository = async (opts: {
@@ -216,7 +217,7 @@ export function createPublishBitbucketCloudAction(options: {
);
}
- const authorization = getAuthorizationHeader(
+ const authorization = await getAuthorizationHeader(
ctx.input.token ? { token: ctx.input.token } : integrationConfig.config,
);
@@ -249,6 +250,18 @@ export function createPublishBitbucketCloudAction(options: {
username: 'x-token-auth',
password: ctx.input.token,
};
+ } else if (
+ integrationConfig.config.clientId &&
+ integrationConfig.config.clientSecret
+ ) {
+ const token = await getBitbucketCloudOAuthToken(
+ integrationConfig.config.clientId,
+ integrationConfig.config.clientSecret,
+ );
+ auth = {
+ username: 'x-token-auth',
+ password: token,
+ };
} else {
if (
!integrationConfig.config.username ||
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudBranchRestriction.test.ts b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudBranchRestriction.test.ts
index 55ee430091..2ac54894d5 100644
--- a/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudBranchRestriction.test.ts
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudBranchRestriction.test.ts
@@ -22,11 +22,11 @@ jest.mock('bitbucket', () => ({
}));
describe('bitbucketCloud:branchRestriction:create', () => {
- it('getBitbucketClient should return the correct headers with username and password', () => {
+ it('getBitbucketClient should return the correct headers with username and password', async () => {
expect.assertions(1);
const username = 'username';
const password = 'password';
- getBitbucketClient({ username: username, appPassword: password });
+ await getBitbucketClient({ username: username, appPassword: password });
expect(Bitbucket).toHaveBeenCalledWith({
auth: {
username: username,
@@ -35,12 +35,14 @@ describe('bitbucketCloud:branchRestriction:create', () => {
});
});
- it('getBitbucketClient should throw if only one of username or password is provided', () => {
+ it('getBitbucketClient should throw if only one of username or password is provided', async () => {
expect.assertions(2);
const username = 'username';
const password = 'password';
- expect(() => getBitbucketClient({ username })).toThrow(Error);
- expect(() => getBitbucketClient({ appPassword: password })).toThrow(Error);
+ await expect(getBitbucketClient({ username })).rejects.toThrow(Error);
+ await expect(getBitbucketClient({ appPassword: password })).rejects.toThrow(
+ Error,
+ );
});
});
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudBranchRestriction.ts b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudBranchRestriction.ts
index 233818e00a..a12f63f980 100644
--- a/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudBranchRestriction.ts
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudBranchRestriction.ts
@@ -37,6 +37,8 @@ const createBitbucketCloudBranchRestriction = async (opts: {
token?: string;
username?: string;
appPassword?: string;
+ clientId?: string;
+ clientSecret?: string;
};
}) => {
const {
@@ -52,7 +54,7 @@ const createBitbucketCloudBranchRestriction = async (opts: {
authorization,
} = opts;
- const bitbucket = getBitbucketClient(authorization);
+ const bitbucket = await getBitbucketClient(authorization);
return await bitbucket.branchrestrictions.create({
_body: {
groups: groups,
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudPipelinesRun.ts b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudPipelinesRun.ts
index 4bf9226db7..372f45c928 100644
--- a/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudPipelinesRun.ts
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudPipelinesRun.ts
@@ -68,7 +68,7 @@ export const createBitbucketPipelinesRunAction = (options: {
const host = 'bitbucket.org';
const integrationConfig = integrations.bitbucketCloud.byHost(host);
- const authorization = getAuthorizationHeader(
+ const authorization = await getAuthorizationHeader(
token ? { token } : integrationConfig!.config,
);
let response: Response;
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudPullRequest.ts b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudPullRequest.ts
index 9969f13eb2..40dd09d386 100644
--- a/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudPullRequest.ts
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloudPullRequest.ts
@@ -28,6 +28,7 @@ import {
import { Config } from '@backstage/config';
import fs from 'fs-extra';
import { getAuthorizationHeader } from './helpers';
+import { getBitbucketCloudOAuthToken } from '@backstage/integration';
import { examples } from './bitbucketCloudPullRequest.examples';
const createPullRequest = async (opts: {
@@ -317,7 +318,7 @@ export function createPublishBitbucketCloudPullRequestAction(options: {
);
}
- const authorization = getAuthorizationHeader(
+ const authorization = await getAuthorizationHeader(
ctx.input.token ? { token: ctx.input.token } : integrationConfig.config,
);
@@ -365,6 +366,18 @@ export function createPublishBitbucketCloudPullRequestAction(options: {
username: 'x-token-auth',
password: ctx.input.token,
};
+ } else if (
+ integrationConfig.config.clientId &&
+ integrationConfig.config.clientSecret
+ ) {
+ const token = await getBitbucketCloudOAuthToken(
+ integrationConfig.config.clientId,
+ integrationConfig.config.clientSecret,
+ );
+ auth = {
+ username: 'x-token-auth',
+ password: token,
+ };
} else {
if (
!integrationConfig.config.username ||
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/helpers.ts b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/helpers.ts
index 2e68d4e8b8..47a212fcab 100644
--- a/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/helpers.ts
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/helpers.ts
@@ -15,12 +15,28 @@
*/
import { Bitbucket } from 'bitbucket';
+import { getBitbucketCloudOAuthToken } from '@backstage/integration';
-export const getBitbucketClient = (config: {
+export const getBitbucketClient = async (config: {
token?: string;
username?: string;
appPassword?: string;
+ clientId?: string;
+ clientSecret?: string;
}) => {
+ // If OAuth credentials provided, fetch token
+ if (config.clientId && config.clientSecret) {
+ const token = await getBitbucketCloudOAuthToken(
+ config.clientId,
+ config.clientSecret,
+ );
+ return new Bitbucket({
+ auth: {
+ token,
+ },
+ });
+ }
+
if (config.token) {
return new Bitbucket({
auth: {
@@ -38,15 +54,26 @@ export const getBitbucketClient = (config: {
});
}
throw new Error(
- `Authorization has not been provided for Bitbucket Cloud. Please add either provide a username and token or username and appPassword to the Integrations config`,
+ `Authorization has not been provided for Bitbucket Cloud. Please provide either OAuth credentials (clientId/clientSecret), username and token, or username and appPassword in the Integrations config`,
);
};
-export const getAuthorizationHeader = (config: {
+export const getAuthorizationHeader = async (config: {
username?: string;
appPassword?: string;
token?: string;
-}) => {
+ clientId?: string;
+ clientSecret?: string;
+}): Promise => {
+ // OAuth authentication
+ if (config.clientId && config.clientSecret) {
+ const token = await getBitbucketCloudOAuthToken(
+ config.clientId,
+ config.clientSecret,
+ );
+ return `Bearer ${token}`;
+ }
+
// TODO: appPassword can be removed once fully
// deprecated by BitBucket on 9th June 2026.
if (config.username && (config.token ?? config.appPassword)) {
@@ -62,6 +89,6 @@ export const getAuthorizationHeader = (config: {
}
throw new Error(
- `Authorization has not been provided for Bitbucket Cloud. Please add either provide a username and token or username and appPassword to the Integrations config`,
+ `Authorization has not been provided for Bitbucket Cloud. Please provide either OAuth credentials (clientId/clientSecret), username and token, or username and appPassword in the Integrations config`,
);
};
diff --git a/plugins/scaffolder-backend-module-bitbucket-server/CHANGELOG.md b/plugins/scaffolder-backend-module-bitbucket-server/CHANGELOG.md
index d533bb63f4..1591b4f1df 100644
--- a/plugins/scaffolder-backend-module-bitbucket-server/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-bitbucket-server/CHANGELOG.md
@@ -1,5 +1,27 @@
# @backstage/plugin-scaffolder-backend-module-bitbucket-server
+## 0.2.16
+
+### Patch Changes
+
+- 5a6aca2: Improve error message when provided target branch is missing
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-scaffolder-node@0.12.2
+
+## 0.2.16-next.1
+
+### Patch Changes
+
+- 5a6aca2: Improve error message when provided target branch is missing
+- Updated dependencies
+ - @backstage/integration@1.18.3-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/plugin-scaffolder-node@0.12.2-next.1
+
## 0.2.16-next.0
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-bitbucket-server/package.json b/plugins/scaffolder-backend-module-bitbucket-server/package.json
index 3590b4112a..98544c3baa 100644
--- a/plugins/scaffolder-backend-module-bitbucket-server/package.json
+++ b/plugins/scaffolder-backend-module-bitbucket-server/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-scaffolder-backend-module-bitbucket-server",
- "version": "0.2.16-next.0",
+ "version": "0.2.16",
"description": "The Bitbucket Server module for @backstage/plugin-scaffolder-backend",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-bitbucket/CHANGELOG.md b/plugins/scaffolder-backend-module-bitbucket/CHANGELOG.md
index 56c67b9a14..404670d688 100644
--- a/plugins/scaffolder-backend-module-bitbucket/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-bitbucket/CHANGELOG.md
@@ -1,5 +1,29 @@
# @backstage/plugin-scaffolder-backend-module-bitbucket
+## 0.3.17
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.3.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.16
+ - @backstage/plugin-scaffolder-node@0.12.2
+
+## 0.3.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.18.3-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.16-next.1
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.16-next.1
+ - @backstage/plugin-scaffolder-node@0.12.2-next.1
+
## 0.3.17-next.0
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-bitbucket/package.json b/plugins/scaffolder-backend-module-bitbucket/package.json
index 4516920aa7..cbbab54143 100644
--- a/plugins/scaffolder-backend-module-bitbucket/package.json
+++ b/plugins/scaffolder-backend-module-bitbucket/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-scaffolder-backend-module-bitbucket",
- "version": "0.3.17-next.0",
+ "version": "0.3.17",
"description": "The bitbucket module for @backstage/plugin-scaffolder-backend",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-confluence-to-markdown/CHANGELOG.md b/plugins/scaffolder-backend-module-confluence-to-markdown/CHANGELOG.md
index db8919e652..1644c76641 100644
--- a/plugins/scaffolder-backend-module-confluence-to-markdown/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-confluence-to-markdown/CHANGELOG.md
@@ -1,5 +1,25 @@
# @backstage/plugin-scaffolder-backend-module-confluence-to-markdown
+## 0.3.16
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-scaffolder-node@0.12.2
+
+## 0.3.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.18.3-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/plugin-scaffolder-node@0.12.2-next.1
+
## 0.3.16-next.0
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-confluence-to-markdown/package.json b/plugins/scaffolder-backend-module-confluence-to-markdown/package.json
index ada64e8f9c..177f7ea512 100644
--- a/plugins/scaffolder-backend-module-confluence-to-markdown/package.json
+++ b/plugins/scaffolder-backend-module-confluence-to-markdown/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-scaffolder-backend-module-confluence-to-markdown",
- "version": "0.3.16-next.0",
+ "version": "0.3.16",
"description": "The confluence-to-markdown module for @backstage/plugin-scaffolder-backend",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md b/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md
index 4f600fc7b0..89042a3074 100644
--- a/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md
@@ -1,5 +1,41 @@
# @backstage/plugin-scaffolder-backend-module-cookiecutter
+## 0.3.19-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-defaults@0.14.1-next.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/integration@1.19.0
+ - @backstage/types@1.2.2
+ - @backstage/plugin-scaffolder-node@0.12.2
+
+## 0.3.18
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/backend-defaults@0.14.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-scaffolder-node@0.12.2
+
+## 0.3.18-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-defaults@0.14.0-next.1
+ - @backstage/integration@1.18.3-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/types@1.2.2
+ - @backstage/plugin-scaffolder-node@0.12.2-next.1
+
## 0.3.18-next.0
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-cookiecutter/package.json b/plugins/scaffolder-backend-module-cookiecutter/package.json
index 64fb9236af..82e2713623 100644
--- a/plugins/scaffolder-backend-module-cookiecutter/package.json
+++ b/plugins/scaffolder-backend-module-cookiecutter/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-scaffolder-backend-module-cookiecutter",
- "version": "0.3.18-next.0",
+ "version": "0.3.19-next.0",
"description": "A module for the scaffolder backend that lets you template projects using cookiecutter",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-gcp/CHANGELOG.md b/plugins/scaffolder-backend-module-gcp/CHANGELOG.md
index ab185367bc..5294344dc7 100644
--- a/plugins/scaffolder-backend-module-gcp/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-gcp/CHANGELOG.md
@@ -1,5 +1,25 @@
# @backstage/plugin-scaffolder-backend-module-gcp
+## 0.2.16
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-scaffolder-node@0.12.2
+
+## 0.2.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.18.3-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/plugin-scaffolder-node@0.12.2-next.1
+
## 0.2.16-next.0
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-gcp/package.json b/plugins/scaffolder-backend-module-gcp/package.json
index c9a954831e..bb50ebd277 100644
--- a/plugins/scaffolder-backend-module-gcp/package.json
+++ b/plugins/scaffolder-backend-module-gcp/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-scaffolder-backend-module-gcp",
- "version": "0.2.16-next.0",
+ "version": "0.2.16",
"description": "The GCP Bucket module for @backstage/plugin-scaffolder-backend",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-gerrit/CHANGELOG.md b/plugins/scaffolder-backend-module-gerrit/CHANGELOG.md
index 26696b6452..cc45967b3b 100644
--- a/plugins/scaffolder-backend-module-gerrit/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-gerrit/CHANGELOG.md
@@ -1,5 +1,25 @@
# @backstage/plugin-scaffolder-backend-module-gerrit
+## 0.2.16
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-scaffolder-node@0.12.2
+
+## 0.2.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.18.3-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/plugin-scaffolder-node@0.12.2-next.1
+
## 0.2.16-next.0
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-gerrit/package.json b/plugins/scaffolder-backend-module-gerrit/package.json
index 07592568ca..62d4ebb286 100644
--- a/plugins/scaffolder-backend-module-gerrit/package.json
+++ b/plugins/scaffolder-backend-module-gerrit/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-scaffolder-backend-module-gerrit",
- "version": "0.2.16-next.0",
+ "version": "0.2.16",
"description": "The gerrit module for @backstage/plugin-scaffolder-backend",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-gitea/CHANGELOG.md b/plugins/scaffolder-backend-module-gitea/CHANGELOG.md
index d3a913d054..46852ad119 100644
--- a/plugins/scaffolder-backend-module-gitea/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-gitea/CHANGELOG.md
@@ -1,5 +1,25 @@
# @backstage/plugin-scaffolder-backend-module-gitea
+## 0.2.16
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-scaffolder-node@0.12.2
+
+## 0.2.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.18.3-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/plugin-scaffolder-node@0.12.2-next.1
+
## 0.2.16-next.0
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-gitea/package.json b/plugins/scaffolder-backend-module-gitea/package.json
index 99e2c05f86..21e7d4c98a 100644
--- a/plugins/scaffolder-backend-module-gitea/package.json
+++ b/plugins/scaffolder-backend-module-gitea/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-scaffolder-backend-module-gitea",
- "version": "0.2.16-next.0",
+ "version": "0.2.16",
"description": "The gitea module for @backstage/plugin-scaffolder-backend",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-github/CHANGELOG.md b/plugins/scaffolder-backend-module-github/CHANGELOG.md
index 46ec5e751d..0a636abb22 100644
--- a/plugins/scaffolder-backend-module-github/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-github/CHANGELOG.md
@@ -1,5 +1,30 @@
# @backstage/plugin-scaffolder-backend-module-github
+## 0.9.3
+
+### Patch Changes
+
+- dab3d3f: Added autocompletion resource `owners` for retrieving GitHub repository owners.
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-catalog-node@1.20.1
+ - @backstage/plugin-scaffolder-node@0.12.2
+
+## 0.9.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.18.3-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/types@1.2.2
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+ - @backstage/plugin-scaffolder-node@0.12.2-next.1
+
## 0.9.3-next.0
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-github/package.json b/plugins/scaffolder-backend-module-github/package.json
index f22f9a3741..4f58dc4eee 100644
--- a/plugins/scaffolder-backend-module-github/package.json
+++ b/plugins/scaffolder-backend-module-github/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-scaffolder-backend-module-github",
- "version": "0.9.3-next.0",
+ "version": "0.9.3",
"description": "The github module for @backstage/plugin-scaffolder-backend",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-github/src/autocomplete/autocomplete.test.ts b/plugins/scaffolder-backend-module-github/src/autocomplete/autocomplete.test.ts
index 9b9aaff9c2..8076a4de01 100644
--- a/plugins/scaffolder-backend-module-github/src/autocomplete/autocomplete.test.ts
+++ b/plugins/scaffolder-backend-module-github/src/autocomplete/autocomplete.test.ts
@@ -31,6 +31,9 @@ const mockOctokit = {
listForAuthenticatedUser: jest.fn(),
listBranches: jest.fn(),
},
+ orgs: {
+ listForAuthenticatedUser: jest.fn(),
+ },
},
};
jest.mock('octokit', () => ({
@@ -95,6 +98,30 @@ describe('handleAutocompleteRequest', () => {
});
});
+ it('should return owners', async () => {
+ const handleAutocompleteRequest = createHandleAutocompleteRequest({
+ integrations: mockIntegrations,
+ });
+
+ mockOctokit.rest.orgs.listForAuthenticatedUser.mockResolvedValue({
+ data: [
+ {
+ login: 'backstage',
+ },
+ ],
+ });
+
+ const result = await handleAutocompleteRequest({
+ resource: 'owners',
+ token: 'token',
+ context: {},
+ });
+
+ expect(result).toEqual({
+ results: [{ id: 'backstage' }],
+ });
+ });
+
it('should throw an error for invalid resource', async () => {
const handleAutocompleteRequest = createHandleAutocompleteRequest({
integrations: mockIntegrations,
diff --git a/plugins/scaffolder-backend-module-github/src/autocomplete/autocomplete.ts b/plugins/scaffolder-backend-module-github/src/autocomplete/autocomplete.ts
index 35d6b4f930..b3efde9333 100644
--- a/plugins/scaffolder-backend-module-github/src/autocomplete/autocomplete.ts
+++ b/plugins/scaffolder-backend-module-github/src/autocomplete/autocomplete.ts
@@ -64,6 +64,15 @@ export function createHandleAutocompleteRequest(options: {
return { results };
}
+ case 'owners': {
+ const orgs = await client.paginate(
+ client.rest.orgs.listForAuthenticatedUser,
+ );
+
+ const results = orgs.map(r => ({ id: r.login }));
+
+ return { results };
+ }
default:
throw new InputError(`Invalid resource: ${resource}`);
}
diff --git a/plugins/scaffolder-backend-module-gitlab/CHANGELOG.md b/plugins/scaffolder-backend-module-gitlab/CHANGELOG.md
index a22e1d71bf..41a8c18bd9 100644
--- a/plugins/scaffolder-backend-module-gitlab/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-gitlab/CHANGELOG.md
@@ -1,5 +1,33 @@
# @backstage/plugin-scaffolder-backend-module-gitlab
+## 0.11.0
+
+### Minor Changes
+
+- f2d034b: In the `gitlabRepoPush` action, add 'auto' possibility for `commitAction` input.
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-scaffolder-node@0.12.2
+
+## 0.11.0-next.1
+
+### Minor Changes
+
+- f2d034b: In the `gitlabRepoPush` action, add 'auto' possibility for `commitAction` input.
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.18.3-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/plugin-scaffolder-node@0.12.2-next.1
+
## 0.10.1-next.0
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-gitlab/package.json b/plugins/scaffolder-backend-module-gitlab/package.json
index 21786474e2..a447da9417 100644
--- a/plugins/scaffolder-backend-module-gitlab/package.json
+++ b/plugins/scaffolder-backend-module-gitlab/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-scaffolder-backend-module-gitlab",
- "version": "0.10.1-next.0",
+ "version": "0.11.0",
"backstage": {
"role": "backend-plugin-module",
"pluginId": "scaffolder",
diff --git a/plugins/scaffolder-backend-module-notifications/CHANGELOG.md b/plugins/scaffolder-backend-module-notifications/CHANGELOG.md
index 584f2bcc7d..c7100f71f9 100644
--- a/plugins/scaffolder-backend-module-notifications/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-notifications/CHANGELOG.md
@@ -1,5 +1,24 @@
# @backstage/plugin-scaffolder-backend-module-notifications
+## 0.1.17
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-notifications-node@0.2.22
+ - @backstage/plugin-scaffolder-node@0.12.2
+
+## 0.1.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/plugin-notifications-common@0.2.0
+ - @backstage/plugin-notifications-node@0.2.22-next.1
+ - @backstage/plugin-scaffolder-node@0.12.2-next.1
+
## 0.1.17-next.0
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-notifications/package.json b/plugins/scaffolder-backend-module-notifications/package.json
index 64bd96badb..89b76a7808 100644
--- a/plugins/scaffolder-backend-module-notifications/package.json
+++ b/plugins/scaffolder-backend-module-notifications/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-scaffolder-backend-module-notifications",
- "version": "0.1.17-next.0",
+ "version": "0.1.17",
"description": "The notifications backend module for the scaffolder plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-rails/CHANGELOG.md b/plugins/scaffolder-backend-module-rails/CHANGELOG.md
index e6e17558b3..48db86578e 100644
--- a/plugins/scaffolder-backend-module-rails/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-rails/CHANGELOG.md
@@ -1,5 +1,28 @@
# @backstage/plugin-scaffolder-backend-module-rails
+## 0.5.16
+
+### Patch Changes
+
+- 2bae83a: Bumped dev dependencies `@types/node`
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-scaffolder-node@0.12.2
+
+## 0.5.16-next.1
+
+### Patch Changes
+
+- 2bae83a: Bumped dev dependencies `@types/node`
+- Updated dependencies
+ - @backstage/integration@1.18.3-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/types@1.2.2
+ - @backstage/plugin-scaffolder-node@0.12.2-next.1
+
## 0.5.16-next.0
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-rails/package.json b/plugins/scaffolder-backend-module-rails/package.json
index 2ae26dd016..0a778daeff 100644
--- a/plugins/scaffolder-backend-module-rails/package.json
+++ b/plugins/scaffolder-backend-module-rails/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-scaffolder-backend-module-rails",
- "version": "0.5.16-next.0",
+ "version": "0.5.16",
"description": "A module for the scaffolder backend that lets you template projects using Rails",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-sentry/CHANGELOG.md b/plugins/scaffolder-backend-module-sentry/CHANGELOG.md
index 8fbec8e18b..427c5bcfd0 100644
--- a/plugins/scaffolder-backend-module-sentry/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-sentry/CHANGELOG.md
@@ -1,5 +1,23 @@
# @backstage/plugin-scaffolder-backend-module-sentry
+## 0.2.16
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-scaffolder-node@0.12.2
+
+## 0.2.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/plugin-scaffolder-node@0.12.2-next.1
+
## 0.2.16-next.0
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-sentry/package.json b/plugins/scaffolder-backend-module-sentry/package.json
index a012921907..d8f8c2dd31 100644
--- a/plugins/scaffolder-backend-module-sentry/package.json
+++ b/plugins/scaffolder-backend-module-sentry/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-scaffolder-backend-module-sentry",
- "version": "0.2.16-next.0",
+ "version": "0.2.16",
"backstage": {
"role": "backend-plugin-module",
"pluginId": "scaffolder",
diff --git a/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md b/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md
index 2c436729f9..dba988783c 100644
--- a/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md
@@ -1,5 +1,34 @@
# @backstage/plugin-scaffolder-backend-module-yeoman
+## 0.4.18-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/types@1.2.2
+ - @backstage/plugin-scaffolder-node@0.12.2
+ - @backstage/plugin-scaffolder-node-test-utils@0.3.7-next.0
+
+## 0.4.17
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-scaffolder-node@0.12.2
+ - @backstage/plugin-scaffolder-node-test-utils@0.3.6
+
+## 0.4.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/types@1.2.2
+ - @backstage/plugin-scaffolder-node@0.12.2-next.1
+ - @backstage/plugin-scaffolder-node-test-utils@0.3.6-next.1
+
## 0.4.17-next.0
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-yeoman/package.json b/plugins/scaffolder-backend-module-yeoman/package.json
index 66e1342a8e..afacdad9a4 100644
--- a/plugins/scaffolder-backend-module-yeoman/package.json
+++ b/plugins/scaffolder-backend-module-yeoman/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-scaffolder-backend-module-yeoman",
- "version": "0.4.17-next.0",
+ "version": "0.4.18-next.0",
"backstage": {
"role": "backend-plugin-module",
"pluginId": "scaffolder",
diff --git a/plugins/scaffolder-backend/CHANGELOG.md b/plugins/scaffolder-backend/CHANGELOG.md
index e9b0bdc5e7..17776a4b49 100644
--- a/plugins/scaffolder-backend/CHANGELOG.md
+++ b/plugins/scaffolder-backend/CHANGELOG.md
@@ -1,5 +1,107 @@
# @backstage/plugin-scaffolder-backend
+## 3.1.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-openapi-utils@0.6.5-next.0
+ - @backstage/backend-defaults@0.14.1-next.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/integration@1.19.0
+ - @backstage/types@1.2.2
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/plugin-bitbucket-cloud-common@0.3.5
+ - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.15
+ - @backstage/plugin-catalog-node@1.20.1
+ - @backstage/plugin-events-node@0.4.18
+ - @backstage/plugin-permission-common@0.9.3
+ - @backstage/plugin-permission-node@0.10.7
+ - @backstage/plugin-scaffolder-backend-module-azure@0.2.16
+ - @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.17
+ - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.3.0
+ - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.16
+ - @backstage/plugin-scaffolder-backend-module-gerrit@0.2.16
+ - @backstage/plugin-scaffolder-backend-module-gitea@0.2.16
+ - @backstage/plugin-scaffolder-backend-module-github@0.9.3
+ - @backstage/plugin-scaffolder-backend-module-gitlab@0.11.0
+ - @backstage/plugin-scaffolder-common@1.7.4
+ - @backstage/plugin-scaffolder-node@0.12.2
+
+## 3.1.0
+
+### Minor Changes
+
+- a4cd405: Add `defaultEnvironment` config to scaffolder to enable more flexible and custom templates. Now it's possible enable access to default parameters and secrets in templates, improving security and reducing complexity.
+
+### Patch Changes
+
+- be5972b: Fixed a bug where config was not passed to NunjucksWorkflowRunner, causing defaultEnvironment to be undefined
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- 2bae83a: Updated `isolated-vm` to `6.0.1`
+- 25b560e: Internal change to support new versions of the `logform` library
+- 8f4aded: Fixing OpenAPI definition
+- 1226647: Updated dependency `esbuild` to `^0.27.0`.
+- Updated dependencies
+ - @backstage/plugin-scaffolder-backend-module-gitlab@0.11.0
+ - @backstage/integration@1.19.0
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.3.0
+ - @backstage/plugin-bitbucket-cloud-common@0.3.5
+ - @backstage/backend-defaults@0.14.0
+ - @backstage/backend-openapi-utils@0.6.4
+ - @backstage/plugin-events-node@0.4.18
+ - @backstage/plugin-permission-node@0.10.7
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-scaffolder-backend-module-github@0.9.3
+ - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.16
+ - @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.17
+ - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.15
+ - @backstage/plugin-catalog-node@1.20.1
+ - @backstage/plugin-scaffolder-backend-module-azure@0.2.16
+ - @backstage/plugin-scaffolder-backend-module-gerrit@0.2.16
+ - @backstage/plugin-scaffolder-backend-module-gitea@0.2.16
+ - @backstage/plugin-scaffolder-common@1.7.4
+ - @backstage/plugin-scaffolder-node@0.12.2
+
+## 3.1.0-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- 2bae83a: Updated `isolated-vm` to `6.0.1`
+- 25b560e: Internal change to support new versions of the `logform` library
+- 1226647: Updated dependency `esbuild` to `^0.27.0`.
+- Updated dependencies
+ - @backstage/plugin-scaffolder-backend-module-gitlab@0.11.0-next.1
+ - @backstage/backend-defaults@0.14.0-next.1
+ - @backstage/backend-openapi-utils@0.6.4-next.1
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/plugin-events-node@0.4.18-next.1
+ - @backstage/plugin-permission-node@0.10.7-next.1
+ - @backstage/integration@1.18.3-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.16-next.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/config@1.3.6
+ - @backstage/errors@1.2.7
+ - @backstage/types@1.2.2
+ - @backstage/plugin-bitbucket-cloud-common@0.3.5-next.0
+ - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.15-next.1
+ - @backstage/plugin-catalog-node@1.20.1-next.1
+ - @backstage/plugin-permission-common@0.9.3
+ - @backstage/plugin-scaffolder-backend-module-azure@0.2.16-next.1
+ - @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.17-next.1
+ - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.16-next.1
+ - @backstage/plugin-scaffolder-backend-module-gerrit@0.2.16-next.1
+ - @backstage/plugin-scaffolder-backend-module-gitea@0.2.16-next.1
+ - @backstage/plugin-scaffolder-backend-module-github@0.9.3-next.1
+ - @backstage/plugin-scaffolder-common@1.7.4-next.0
+ - @backstage/plugin-scaffolder-node@0.12.2-next.1
+
## 3.1.0-next.0
### Minor Changes
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index c3876a7926..7d26366e6d 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-scaffolder-backend",
- "version": "3.1.0-next.0",
+ "version": "3.1.1-next.0",
"description": "The Backstage backend plugin that helps you create new things",
"backstage": {
"role": "backend-plugin",
diff --git a/plugins/scaffolder-backend/sample-templates/bitbucket-demo/template.yaml b/plugins/scaffolder-backend/sample-templates/bitbucket-demo/template.yaml
index 0a7c841d8f..c8f85974ea 100644
--- a/plugins/scaffolder-backend/sample-templates/bitbucket-demo/template.yaml
+++ b/plugins/scaffolder-backend/sample-templates/bitbucket-demo/template.yaml
@@ -69,7 +69,7 @@ spec:
url: https://github.com/backstage/community/tree/main/backstage-community-sessions
- id: publish
name: Publish
- action: publish:bitbucket
+ action: publish:bitbucketCloud
input:
description: This is ${{ parameters.name }}
repoUrl: ${{ parameters.repoUrl }}
@@ -81,10 +81,28 @@ spec:
repoContentsUrl: ${{ steps['publish'].output.repoContentsUrl }}
catalogInfoPath: '/catalog-info.yaml'
+ - id: create-pr-file
+ name: Create PR File
+ action: fetch:plain
+ input:
+ targetPath: ./pr-demo
+ url: https://github.com/backstage/community/blob/main/README.md
+ - id: create-pr
+ name: Create Pull Request
+ action: publish:bitbucketCloud:pull-request
+ input:
+ repoUrl: ${{ parameters.repoUrl }}
+ title: Test PR for ${{ parameters.name }}
+ description: This is a test pull request created by the scaffolder template to test OAuth support
+ sourceBranch: scaffolder-pr-${{ parameters.name }}
+ targetBranch: master
+
output:
links:
- title: Repository
url: ${{ steps['publish'].output.remoteUrl }}
+ - title: Pull Request
+ url: ${{ steps['create-pr'].output.pullRequestUrl }}
- title: Open in catalog
icon: catalog
entityRef: ${{ steps['register'].output.entityRef }}
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.ts
index 3a15b345db..ef704bc9e0 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/TaskWorker.ts
@@ -134,6 +134,7 @@ export class TaskWorker {
additionalTemplateFilters,
additionalTemplateGlobals,
permissions,
+ config,
});
return new TaskWorker({
diff --git a/plugins/scaffolder-common/CHANGELOG.md b/plugins/scaffolder-common/CHANGELOG.md
index 1bc44a09c5..5ca131e060 100644
--- a/plugins/scaffolder-common/CHANGELOG.md
+++ b/plugins/scaffolder-common/CHANGELOG.md
@@ -1,5 +1,12 @@
# @backstage/plugin-scaffolder-common
+## 1.7.4
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.19.0
+
## 1.7.4-next.0
### Patch Changes
diff --git a/plugins/scaffolder-common/package.json b/plugins/scaffolder-common/package.json
index 1949f12e18..24898228dc 100644
--- a/plugins/scaffolder-common/package.json
+++ b/plugins/scaffolder-common/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-scaffolder-common",
- "version": "1.7.4-next.0",
+ "version": "1.7.4",
"description": "Common functionalities for the scaffolder, to be shared between scaffolder and scaffolder-backend plugin",
"backstage": {
"role": "common-library",
diff --git a/plugins/scaffolder-node-test-utils/CHANGELOG.md b/plugins/scaffolder-node-test-utils/CHANGELOG.md
index 91fff5040d..7980a7146e 100644
--- a/plugins/scaffolder-node-test-utils/CHANGELOG.md
+++ b/plugins/scaffolder-node-test-utils/CHANGELOG.md
@@ -1,5 +1,34 @@
# @backstage/plugin-scaffolder-node-test-utils
+## 0.3.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/backend-test-utils@1.10.3-next.0
+ - @backstage/types@1.2.2
+ - @backstage/plugin-scaffolder-node@0.12.2
+
+## 0.3.6
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-test-utils@1.10.2
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-scaffolder-node@0.12.2
+
+## 0.3.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-test-utils@1.10.2-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/types@1.2.2
+ - @backstage/plugin-scaffolder-node@0.12.2-next.1
+
## 0.3.6-next.0
### Patch Changes
diff --git a/plugins/scaffolder-node-test-utils/package.json b/plugins/scaffolder-node-test-utils/package.json
index 3c79f30575..f7b3a4179e 100644
--- a/plugins/scaffolder-node-test-utils/package.json
+++ b/plugins/scaffolder-node-test-utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-scaffolder-node-test-utils",
- "version": "0.3.6-next.0",
+ "version": "0.3.7-next.0",
"backstage": {
"role": "node-library",
"pluginId": "scaffolder",
diff --git a/plugins/scaffolder-node/CHANGELOG.md b/plugins/scaffolder-node/CHANGELOG.md
index a621739d50..dcb7d78184 100644
--- a/plugins/scaffolder-node/CHANGELOG.md
+++ b/plugins/scaffolder-node/CHANGELOG.md
@@ -1,5 +1,27 @@
# @backstage/plugin-scaffolder-node
+## 0.12.2
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/backend-plugin-api@1.6.0
+ - @backstage/plugin-scaffolder-common@1.7.4
+
+## 0.12.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.18.3-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/errors@1.2.7
+ - @backstage/types@1.2.2
+ - @backstage/plugin-permission-common@0.9.3
+ - @backstage/plugin-scaffolder-common@1.7.4-next.0
+
## 0.12.2-next.0
### Patch Changes
diff --git a/plugins/scaffolder-node/package.json b/plugins/scaffolder-node/package.json
index 995ae74b4b..ec82ec8ac5 100644
--- a/plugins/scaffolder-node/package.json
+++ b/plugins/scaffolder-node/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-scaffolder-node",
- "version": "0.12.2-next.0",
+ "version": "0.12.2",
"description": "The plugin-scaffolder-node module for @backstage/plugin-scaffolder-backend",
"backstage": {
"role": "node-library",
diff --git a/plugins/scaffolder-react/CHANGELOG.md b/plugins/scaffolder-react/CHANGELOG.md
index 552035d603..363804954b 100644
--- a/plugins/scaffolder-react/CHANGELOG.md
+++ b/plugins/scaffolder-react/CHANGELOG.md
@@ -1,5 +1,48 @@
# @backstage/plugin-scaffolder-react
+## 1.19.4
+
+### Patch Changes
+
+- fb029b6: Updated luxon types
+- 5ca461e: Fixed bug where custom `review.name` values were incorrectly formatted by `startCase`, preserving them exactly as written.
+- be21c5c: Updated dependency `@rjsf/utils` to `5.24.13`.
+ Updated dependency `@rjsf/core` to `5.24.13`.
+ Updated dependency `@rjsf/material-ui` to `5.24.13`.
+ Updated dependency `@rjsf/validator-ajv8` to `5.24.13`.
+- 9b38f22: Updated dependency `use-immer` to `^0.11.0`.
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.13.2
+ - @backstage/core-components@0.18.4
+ - @backstage/plugin-catalog-react@1.21.4
+ - @backstage/core-plugin-api@1.12.1
+ - @backstage/theme@0.7.1
+ - @backstage/plugin-permission-react@0.4.39
+ - @backstage/plugin-scaffolder-common@1.7.4
+
+## 1.19.4-next.2
+
+### Patch Changes
+
+- fb029b6: Updated luxon types
+- be21c5c: Updated dependency `@rjsf/utils` to `5.24.13`.
+ Updated dependency `@rjsf/core` to `5.24.13`.
+ Updated dependency `@rjsf/material-ui` to `5.24.13`.
+ Updated dependency `@rjsf/validator-ajv8` to `5.24.13`.
+- 9b38f22: Updated dependency `use-immer` to `^0.11.0`.
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.13.2-next.1
+ - @backstage/plugin-catalog-react@1.21.4-next.2
+ - @backstage/core-components@0.18.4-next.2
+ - @backstage/catalog-client@1.12.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/core-plugin-api@1.12.1-next.0
+ - @backstage/theme@0.7.1-next.0
+ - @backstage/types@1.2.2
+ - @backstage/version-bridge@1.0.11
+ - @backstage/plugin-permission-react@0.4.39-next.0
+ - @backstage/plugin-scaffolder-common@1.7.4-next.0
+
## 1.19.4-next.1
### Patch Changes
diff --git a/plugins/scaffolder-react/package.json b/plugins/scaffolder-react/package.json
index 81a01f9229..3bad0ad4c7 100644
--- a/plugins/scaffolder-react/package.json
+++ b/plugins/scaffolder-react/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-scaffolder-react",
- "version": "1.19.4-next.1",
+ "version": "1.19.4",
"description": "A frontend library that helps other Backstage plugins interact with the Scaffolder",
"backstage": {
"role": "web-library",
diff --git a/plugins/scaffolder-react/src/next/components/Stepper/Stepper.test.tsx b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.test.tsx
index b0746e0672..6a542396de 100644
--- a/plugins/scaffolder-react/src/next/components/Stepper/Stepper.test.tsx
+++ b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.test.tsx
@@ -514,11 +514,12 @@ describe('Stepper', () => {
const mockFormData = { firstName: 'John' };
- Object.defineProperty(window, 'location', {
- value: {
- search: `?formData=${JSON.stringify(mockFormData)}`,
- },
- });
+ // Use history.replaceState to set the query string (jsdom 27 doesn't allow redefining window.location)
+ window.history.replaceState(
+ {},
+ '',
+ `?formData=${JSON.stringify(mockFormData)}`,
+ );
const { getByRole } = await renderInTestApp(
diff --git a/plugins/scaffolder/CHANGELOG.md b/plugins/scaffolder/CHANGELOG.md
index 69554368b7..14a27c8d2a 100644
--- a/plugins/scaffolder/CHANGELOG.md
+++ b/plugins/scaffolder/CHANGELOG.md
@@ -1,5 +1,56 @@
# @backstage/plugin-scaffolder
+## 1.35.0
+
+### Minor Changes
+
+- dab3d3f: Added field extension `RepoOwnerPicker` for retrieving GitHub repository owners.
+
+### Patch Changes
+
+- d02db50: Remove unnecessary use of `compatWrapper` and `convertLegacyRouteRef`(s) for the new frontend system.
+- be21c5c: Updated dependency `@rjsf/utils` to `5.24.13`.
+ Updated dependency `@rjsf/core` to `5.24.13`.
+ Updated dependency `@rjsf/material-ui` to `5.24.13`.
+ Updated dependency `@rjsf/validator-ajv8` to `5.24.13`.
+- Updated dependencies
+ - @backstage/integration@1.19.0
+ - @backstage/frontend-plugin-api@0.13.2
+ - @backstage/plugin-scaffolder-react@1.19.4
+ - @backstage/core-components@0.18.4
+ - @backstage/plugin-catalog-react@1.21.4
+ - @backstage/core-plugin-api@1.12.1
+ - @backstage/integration-react@1.2.13
+ - @backstage/plugin-permission-react@0.4.39
+ - @backstage/plugin-scaffolder-common@1.7.4
+ - @backstage/plugin-techdocs-react@1.3.6
+
+## 1.34.4-next.1
+
+### Patch Changes
+
+- be21c5c: Updated dependency `@rjsf/utils` to `5.24.13`.
+ Updated dependency `@rjsf/core` to `5.24.13`.
+ Updated dependency `@rjsf/material-ui` to `5.24.13`.
+ Updated dependency `@rjsf/validator-ajv8` to `5.24.13`.
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.13.2-next.1
+ - @backstage/plugin-scaffolder-react@1.19.4-next.2
+ - @backstage/integration@1.18.3-next.1
+ - @backstage/plugin-catalog-react@1.21.4-next.2
+ - @backstage/core-components@0.18.4-next.2
+ - @backstage/catalog-client@1.12.1
+ - @backstage/catalog-model@1.7.6
+ - @backstage/core-plugin-api@1.12.1-next.0
+ - @backstage/errors@1.2.7
+ - @backstage/integration-react@1.2.13-next.0
+ - @backstage/types@1.2.2
+ - @backstage/plugin-catalog-common@1.1.7
+ - @backstage/plugin-permission-react@0.4.39-next.0
+ - @backstage/plugin-scaffolder-common@1.7.4-next.0
+ - @backstage/plugin-techdocs-common@0.1.1
+ - @backstage/plugin-techdocs-react@1.3.6-next.0
+
## 1.34.4-next.0
### Patch Changes
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index 55302da959..2d6f52eab4 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-scaffolder",
- "version": "1.34.4-next.0",
+ "version": "1.35.0",
"description": "The Backstage plugin that helps you create new things",
"backstage": {
"role": "frontend-plugin",
diff --git a/plugins/scaffolder/report-alpha.api.md b/plugins/scaffolder/report-alpha.api.md
index 7c0247cae9..7ffe367327 100644
--- a/plugins/scaffolder/report-alpha.api.md
+++ b/plugins/scaffolder/report-alpha.api.md
@@ -350,6 +350,21 @@ const _default: OverridableFrontendPlugin<
field: () => Promise;
};
}>;
+ 'scaffolder-form-field:scaffolder/repo-owner-picker': OverridableExtensionDefinition<{
+ kind: 'scaffolder-form-field';
+ name: 'repo-owner-picker';
+ config: {};
+ configInput: {};
+ output: ExtensionDataRef<
+ () => Promise,
+ 'scaffolder.form-field-loader',
+ {}
+ >;
+ inputs: {};
+ params: {
+ field: () => Promise;
+ };
+ }>;
'scaffolder-form-field:scaffolder/repo-url-picker': OverridableExtensionDefinition<{
kind: 'scaffolder-form-field';
name: 'repo-url-picker';
@@ -499,6 +514,8 @@ export const scaffolderTranslationRef: TranslationRef<
readonly 'fields.repoUrlPicker.repository.title': 'Repositories Available';
readonly 'fields.repoUrlPicker.repository.description': 'The name of the repository';
readonly 'fields.repoUrlPicker.repository.inputTitle': 'Repository';
+ readonly 'fields.repoOwnerPicker.title': 'Owner';
+ readonly 'fields.repoOwnerPicker.description': 'The owner of the repository';
readonly 'aboutCard.launchTemplate': 'Launch Template';
readonly 'actionsPage.content.emptyState.title': 'No information to display';
readonly 'actionsPage.content.emptyState.description': 'There are no actions installed or there was an issue communicating with backend.';
diff --git a/plugins/scaffolder/report.api.md b/plugins/scaffolder/report.api.md
index 2e9c6be1ef..e624b157fa 100644
--- a/plugins/scaffolder/report.api.md
+++ b/plugins/scaffolder/report.api.md
@@ -391,6 +391,30 @@ export const RepoBranchPickerFieldExtension: FieldExtensionComponent_2<
}
>;
+// @public
+export const RepoOwnerPickerFieldExtension: FieldExtensionComponent_2<
+ string,
+ {
+ host?: string | undefined;
+ requestUserCredentials?:
+ | {
+ secretsKey: string;
+ additionalScopes?:
+ | {
+ azure?: string[] | undefined;
+ github?: string[] | undefined;
+ gitlab?: string[] | undefined;
+ bitbucket?: string[] | undefined;
+ gerrit?: string[] | undefined;
+ gitea?: string[] | undefined;
+ }
+ | undefined;
+ }
+ | undefined;
+ excludedOwners?: string[] | undefined;
+ }
+>;
+
// @public
export const repoPickerValidation: (
value: string,
diff --git a/plugins/scaffolder/src/alpha/components/TemplateEditorPage/TemplateEditorBrowser.test.tsx b/plugins/scaffolder/src/alpha/components/TemplateEditorPage/TemplateEditorBrowser.test.tsx
index 427f679188..86400fcfde 100644
--- a/plugins/scaffolder/src/alpha/components/TemplateEditorPage/TemplateEditorBrowser.test.tsx
+++ b/plugins/scaffolder/src/alpha/components/TemplateEditorPage/TemplateEditorBrowser.test.tsx
@@ -20,14 +20,6 @@ import { MockFileSystemAccess } from '../../../lib/filesystem/MockFileSystemAcce
import { DirectoryEditorProvider } from './DirectoryEditorContext';
import { TemplateEditorBrowser } from './TemplateEditorBrowser';
-Blob.prototype.text = async function text() {
- return new Promise(resolve => {
- const reader = new FileReader();
- reader.onload = () => resolve(reader.result as string);
- reader.readAsText(this);
- });
-};
-
describe('TemplateEditorBrowser', () => {
it('should render files and expand dirs without exploding', async () => {
await renderInTestApp(
diff --git a/plugins/scaffolder/src/alpha/extensions.tsx b/plugins/scaffolder/src/alpha/extensions.tsx
index 429e6d493a..5215fc0968 100644
--- a/plugins/scaffolder/src/alpha/extensions.tsx
+++ b/plugins/scaffolder/src/alpha/extensions.tsx
@@ -127,6 +127,14 @@ export const repoBranchPickerFormField = FormFieldBlueprint.make({
},
});
+export const repoOwnerPickerFormField = FormFieldBlueprint.make({
+ name: 'repo-owner-picker',
+ params: {
+ field: () =>
+ import('./fields/RepoOwnerPicker').then(m => m.RepoOwnerPicker),
+ },
+});
+
export const scaffolderApi = ApiBlueprint.make({
params: defineParams =>
defineParams({
diff --git a/plugins/scaffolder/src/alpha/fields/RepoOwnerPicker.ts b/plugins/scaffolder/src/alpha/fields/RepoOwnerPicker.ts
new file mode 100644
index 0000000000..059d71fb83
--- /dev/null
+++ b/plugins/scaffolder/src/alpha/fields/RepoOwnerPicker.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { createFormField } from '@backstage/plugin-scaffolder-react/alpha';
+import {
+ RepoOwnerPicker as Component,
+ RepoOwnerPickerFieldSchema,
+} from '../../components/fields/RepoOwnerPicker';
+
+export const RepoOwnerPicker = createFormField({
+ component: Component,
+ name: 'RepoOwnerPicker',
+ schema: RepoOwnerPickerFieldSchema,
+});
diff --git a/plugins/scaffolder/src/alpha/plugin.tsx b/plugins/scaffolder/src/alpha/plugin.tsx
index 5bb744e2ea..502aab0bbc 100644
--- a/plugins/scaffolder/src/alpha/plugin.tsx
+++ b/plugins/scaffolder/src/alpha/plugin.tsx
@@ -35,6 +35,7 @@ import {
ownedEntityPickerFormField,
ownerPickerFormField,
repoBranchPickerFormField,
+ repoOwnerPickerFormField,
repoUrlPickerFormField,
scaffolderApi,
scaffolderNavItem,
@@ -88,5 +89,6 @@ export default createFrontendPlugin({
myGroupsPickerFormField,
ownedEntityPickerFormField,
repoBranchPickerFormField,
+ repoOwnerPickerFormField,
],
});
diff --git a/plugins/scaffolder/src/components/fields/RepoOwnerPicker/DefaultRepoOwnerPicker.test.tsx b/plugins/scaffolder/src/components/fields/RepoOwnerPicker/DefaultRepoOwnerPicker.test.tsx
new file mode 100644
index 0000000000..2e335a44a3
--- /dev/null
+++ b/plugins/scaffolder/src/components/fields/RepoOwnerPicker/DefaultRepoOwnerPicker.test.tsx
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { fireEvent, screen } from '@testing-library/react';
+import { renderInTestApp } from '@backstage/test-utils';
+
+import { DefaultRepoOwnerPicker } from './DefaultRepoOwnerPicker';
+
+describe('DefaultRepoOwnerPicker', () => {
+ it('renders an input field', async () => {
+ const { getByRole } = await renderInTestApp(
+ 0 && !owner}
+ >
+ onChange({ owner: e.target.value })}
+ value={owner}
+ />
+
+ {schema?.description ?? t('fields.repoOwnerPicker.description')}
+
+
+ );
+};
diff --git a/plugins/scaffolder/src/components/fields/RepoOwnerPicker/GitHubRepoOwnerPicker.test.tsx b/plugins/scaffolder/src/components/fields/RepoOwnerPicker/GitHubRepoOwnerPicker.test.tsx
new file mode 100644
index 0000000000..bfc6c76768
--- /dev/null
+++ b/plugins/scaffolder/src/components/fields/RepoOwnerPicker/GitHubRepoOwnerPicker.test.tsx
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+ ScaffolderApi,
+ scaffolderApiRef,
+} from '@backstage/plugin-scaffolder-react';
+import { GitHubRepoOwnerPicker } from './GitHubRepoOwnerPicker';
+import { act, fireEvent, waitFor, screen } from '@testing-library/react';
+import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
+import userEvent from '@testing-library/user-event';
+
+describe('GitHubRepoOwnerPicker', () => {
+ const scaffolderApiMock: Partial = {
+ autocomplete: jest
+ .fn()
+ .mockResolvedValue({ results: [{ id: 'owner1' }, { id: 'owner2' }] }),
+ };
+
+ it('renders an input field', async () => {
+ const { getByRole } = await renderInTestApp(
+
+ ,
+ );
+
+ expect(getByRole('textbox')).toBeInTheDocument();
+ expect(getByRole('textbox')).toHaveValue('owner1');
+ });
+
+ it('input field disabled', async () => {
+ await renderInTestApp(
+
+ ,
+ );
+
+ const input = screen.getByRole('textbox');
+
+ // Expect input to be disabled
+ expect(input).toBeDisabled();
+ expect(input).toHaveValue('owner1');
+ });
+
+ it('calls onChange when the input field changes', async () => {
+ const onChange = jest.fn();
+
+ const { getByRole } = await renderInTestApp(
+
+ ,
+ );
+
+ const input = getByRole('textbox');
+
+ act(() => {
+ input.focus();
+ fireEvent.change(input, {
+ target: { value: 'owner2' },
+ });
+ input.blur();
+ });
+
+ expect(onChange).toHaveBeenCalledWith({ owner: 'owner2' });
+ });
+
+ it('should populate owners', async () => {
+ const onChange = jest.fn();
+
+ const { getByRole, getByText } = await renderInTestApp(
+
+ ,
+ );
+
+ // Open the Autocomplete dropdown
+ const input = getByRole('textbox');
+ await userEvent.click(input);
+
+ // Verify that the available owners are shown
+ await waitFor(() => expect(getByText('owner1')).toBeInTheDocument());
+
+ // Verify that selecting an option calls onChange
+ await userEvent.click(getByText('owner1'));
+ expect(onChange).toHaveBeenCalledWith({
+ owner: 'owner1',
+ });
+ });
+
+ it('should filter out excluded owners', async () => {
+ const onChange = jest.fn();
+
+ const { getByRole, getByText } = await renderInTestApp(
+
+ ,
+ );
+
+ // Open the Autocomplete dropdown
+ const input = getByRole('textbox');
+ await userEvent.click(input);
+
+ // Verify that the excluded owners are not shown
+ await waitFor(() => expect(getByText('owner2')).toBeInTheDocument());
+ expect(screen.queryByText('owner1')).not.toBeInTheDocument();
+ });
+});
diff --git a/plugins/scaffolder/src/components/fields/RepoOwnerPicker/GitHubRepoOwnerPicker.tsx b/plugins/scaffolder/src/components/fields/RepoOwnerPicker/GitHubRepoOwnerPicker.tsx
new file mode 100644
index 0000000000..9258ef312d
--- /dev/null
+++ b/plugins/scaffolder/src/components/fields/RepoOwnerPicker/GitHubRepoOwnerPicker.tsx
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { useApi } from '@backstage/core-plugin-api';
+import { scaffolderApiRef } from '@backstage/plugin-scaffolder-react';
+import FormControl from '@material-ui/core/FormControl';
+import FormHelperText from '@material-ui/core/FormHelperText';
+import TextField from '@material-ui/core/TextField';
+import Autocomplete from '@material-ui/lab/Autocomplete';
+import { useCallback, useState } from 'react';
+import useDebounce from 'react-use/esm/useDebounce';
+import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
+
+import { BaseRepoOwnerPickerProps } from './types';
+import { scaffolderTranslationRef } from '../../../translation';
+
+/**
+ * The underlying component that is rendered in the form for the `GitHubRepoOwnerPicker`
+ * field extension.
+ *
+ * @public
+ *
+ */
+export const GitHubRepoOwnerPicker = ({
+ onChange,
+ state,
+ rawErrors,
+ accessToken,
+ isDisabled,
+ required,
+ schema,
+ excludedOwners = [],
+}: BaseRepoOwnerPickerProps<{
+ accessToken?: string;
+ excludedOwners?: string[];
+}>) => {
+ const { host, owner } = state;
+
+ const [availableOwners, setAvailableOwners] = useState([]);
+
+ const scaffolderApi = useApi(scaffolderApiRef);
+ const { t } = useTranslationRef(scaffolderTranslationRef);
+
+ const updateAvailableOwners = useCallback(() => {
+ if (!scaffolderApi.autocomplete || !accessToken || !host) {
+ setAvailableOwners([]);
+ return;
+ }
+
+ scaffolderApi
+ .autocomplete({
+ token: accessToken,
+ resource: 'owners',
+ context: { host },
+ provider: 'github',
+ })
+ .then(({ results }) => {
+ const owners = results
+ .map(r => r.id)
+ .filter(id => !excludedOwners.includes(id));
+
+ setAvailableOwners(owners);
+ })
+ .catch(() => {
+ setAvailableOwners([]);
+ });
+ }, [host, accessToken, scaffolderApi, excludedOwners]);
+
+ useDebounce(updateAvailableOwners, 500, [updateAvailableOwners]);
+
+ return (
+ 0 && !owner}
+ >
+ {
+ onChange({ owner: newValue || '' });
+ }}
+ disabled={isDisabled}
+ options={availableOwners}
+ renderInput={params => (
+
+ {schema?.description ?? t('fields.repoOwnerPicker.description')}
+
+
+ );
+};
diff --git a/plugins/scaffolder/src/components/fields/RepoOwnerPicker/RepoOwnerPicker.test.tsx b/plugins/scaffolder/src/components/fields/RepoOwnerPicker/RepoOwnerPicker.test.tsx
new file mode 100644
index 0000000000..c51d74416b
--- /dev/null
+++ b/plugins/scaffolder/src/components/fields/RepoOwnerPicker/RepoOwnerPicker.test.tsx
@@ -0,0 +1,308 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Form } from '@backstage/plugin-scaffolder-react/alpha';
+import validator from '@rjsf/validator-ajv8';
+import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
+import {
+ scmIntegrationsApiRef,
+ ScmIntegrationsApi,
+ scmAuthApiRef,
+ ScmAuthApi,
+} from '@backstage/integration-react';
+
+import {
+ SecretsContextProvider,
+ scaffolderApiRef,
+ useTemplateSecrets,
+ ScaffolderRJSFField,
+} from '@backstage/plugin-scaffolder-react';
+import { act, fireEvent, screen } from '@testing-library/react';
+import { RepoOwnerPicker } from './RepoOwnerPicker';
+
+describe('RepoOwnerPicker', () => {
+ const mockIntegrationsApi: Partial = {
+ byHost: () => ({ type: 'github' }),
+ };
+
+ let mockScmAuthApi: Partial;
+
+ beforeEach(() => {
+ mockScmAuthApi = {
+ getCredentials: jest.fn().mockResolvedValue({ token: 'abc123' }),
+ };
+ });
+
+ describe('happy path rendering', () => {
+ it('should render the repo owner picker with minimal props', async () => {
+ const onSubmit = jest.fn();
+
+ const { getByRole, getByText } = await renderInTestApp(
+
+
+
+ ,
+ );
+
+ const input = getByRole('textbox');
+ const submitButton = getByRole('button');
+
+ fireEvent.change(input, { target: { value: 'owner1' } });
+
+ fireEvent.click(submitButton);
+
+ expect(onSubmit).toHaveBeenCalledWith(
+ expect.objectContaining({
+ formData: 'owner1',
+ }),
+ expect.anything(),
+ );
+
+ expect(getByText('Owner')).toBeInTheDocument();
+ expect(getByText('The owner of the repository')).toBeInTheDocument();
+ });
+
+ it('should disable the picker when ui:disabled', async () => {
+ const onSubmit = jest.fn();
+
+ await renderInTestApp(
+
+
+
+ ,
+ );
+
+ const input = screen.getByRole('textbox');
+
+ expect(input).toBeDisabled();
+ });
+
+ it('should render properly with title and description', async () => {
+ const { getByText } = await renderInTestApp(
+
+
+
+ ,
+ );
+
+ expect(getByText('test title')).toBeInTheDocument();
+ expect(getByText('test description')).toBeInTheDocument();
+ });
+ });
+
+ describe('requestUserCredentials', () => {
+ it('should call the scmAuthApi with the correct params', async () => {
+ const secretsKey = 'testKey';
+
+ const SecretsComponent = () => {
+ const { secrets } = useTemplateSecrets();
+ const secret = secrets[secretsKey];
+ return secret ? {secret} : null;
+ };
+
+ const { getByText } = await renderInTestApp(
+
+
+
+ ,
+ );
+
+ await act(async () => {
+ // need to wait for the debounce to finish
+ await new Promise(resolve => setTimeout(resolve, 600));
+ });
+
+ expect(mockScmAuthApi.getCredentials).toHaveBeenCalledWith({
+ url: 'https://github.com',
+ additionalScope: {
+ repoWrite: true,
+ customScopes: {
+ github: ['workflow'],
+ },
+ },
+ });
+
+ expect(getByText('abc123')).toBeInTheDocument();
+ });
+
+ it('should call the scmAuthApi with the correct params if workspace is nested', async () => {
+ await renderInTestApp(
+
+
+
+ ,
+ );
+
+ await act(async () => {
+ // need to wait for the debounce to finish
+ await new Promise(resolve => setTimeout(resolve, 600));
+ });
+
+ expect(mockScmAuthApi.getCredentials).toHaveBeenCalledWith({
+ url: 'https://github.com',
+ additionalScope: {
+ repoWrite: true,
+ },
+ });
+ });
+
+ it('should not call the scmAuthApi if secret is available in the state', async () => {
+ const secretsKey = 'testKey';
+
+ const SecretsComponent = () => {
+ const { secrets } = useTemplateSecrets();
+ const secret = secrets[secretsKey];
+ return secret ? {secret} : null;
+ };
+
+ const { getByText } = await renderInTestApp(
+
+
+
+ ,
+ );
+
+ await act(async () => {
+ // need to wait for the debounce to finish
+ await new Promise(resolve => setTimeout(resolve, 600));
+ });
+
+ // as we already have a secret in the state, getCredentials should not be called again.
+ expect(mockScmAuthApi.getCredentials).toHaveBeenCalledTimes(0);
+
+ expect(getByText('abc123')).toBeInTheDocument();
+ });
+ });
+});
diff --git a/plugins/scaffolder/src/components/fields/RepoOwnerPicker/RepoOwnerPicker.tsx b/plugins/scaffolder/src/components/fields/RepoOwnerPicker/RepoOwnerPicker.tsx
new file mode 100644
index 0000000000..bcb1a0001c
--- /dev/null
+++ b/plugins/scaffolder/src/components/fields/RepoOwnerPicker/RepoOwnerPicker.tsx
@@ -0,0 +1,138 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { useApi } from '@backstage/core-plugin-api';
+import {
+ scmIntegrationsApiRef,
+ scmAuthApiRef,
+} from '@backstage/integration-react';
+import { useEffect, useState, useCallback, useMemo } from 'react';
+import useDebounce from 'react-use/esm/useDebounce';
+import { useTemplateSecrets } from '@backstage/plugin-scaffolder-react';
+
+import { RepoOwnerPickerProps } from './schema';
+import { RepoOwnerPickerState } from './types';
+import { DefaultRepoOwnerPicker } from './DefaultRepoOwnerPicker';
+import { GitHubRepoOwnerPicker } from './GitHubRepoOwnerPicker';
+
+/**
+ * The underlying component that is rendered in the form for the `RepoOwnerPicker`
+ * field extension.
+ *
+ * @public
+ */
+export const RepoOwnerPicker = (props: RepoOwnerPickerProps) => {
+ const { uiSchema, onChange, rawErrors, formData, schema, required } = props;
+ const [state, setState] = useState({
+ owner: formData || '',
+ });
+ const excludedOwners = useMemo(
+ () => uiSchema?.['ui:options']?.excludedOwners ?? [],
+ [uiSchema],
+ );
+ const { host, owner } = state;
+
+ const integrationApi = useApi(scmIntegrationsApiRef);
+ const scmAuthApi = useApi(scmAuthApiRef);
+
+ const { secrets, setSecrets } = useTemplateSecrets();
+
+ useDebounce(
+ async () => {
+ const { requestUserCredentials } = uiSchema?.['ui:options'] ?? {};
+
+ if (!requestUserCredentials || !host) {
+ return;
+ }
+
+ // don't show login prompt if secret value is already in state
+ if (secrets[requestUserCredentials.secretsKey]) {
+ return;
+ }
+
+ // user has requested that we use the users credentials
+ // so lets grab them using the scmAuthApi and pass through
+ // any additional scopes from the ui:options
+ const { token } = await scmAuthApi.getCredentials({
+ url: `https://${host}`,
+ additionalScope: {
+ repoWrite: true,
+ customScopes: requestUserCredentials.additionalScopes,
+ },
+ });
+
+ // set the secret using the key provided in the ui:options for use
+ // in the templating the manifest with ${{ secrets[secretsKey] }}
+ setSecrets({ [requestUserCredentials.secretsKey]: token });
+ },
+ 500,
+ [host, uiSchema],
+ );
+
+ useEffect(() => {
+ if (uiSchema?.['ui:options']?.host) {
+ const hostUiOption = uiSchema['ui:options'].host;
+ setState(prevState => ({ ...prevState, host: hostUiOption }));
+ }
+ }, [uiSchema]);
+
+ useEffect(() => {
+ onChange(owner);
+ }, [owner, onChange]);
+
+ const updateLocalState = useCallback(
+ (newState: RepoOwnerPickerState) => {
+ setState(prevState => ({ ...prevState, ...newState }));
+ },
+ [setState],
+ );
+
+ const hostType = (host && integrationApi.byHost(host)?.type) ?? null;
+
+ const renderRepoOwnerPicker = () => {
+ switch (hostType) {
+ case 'github':
+ return (
+ = T & {
+ onChange: (state: RepoOwnerPickerState) => void;
+ state: RepoOwnerPickerState;
+ rawErrors: string[];
+ isDisabled?: boolean;
+ required?: boolean;
+ schema?: RJSFSchema;
+};
diff --git a/plugins/scaffolder/src/components/fields/VirtualizedListbox.test.tsx b/plugins/scaffolder/src/components/fields/VirtualizedListbox.test.tsx
index 59f311fe88..8a058d5320 100644
--- a/plugins/scaffolder/src/components/fields/VirtualizedListbox.test.tsx
+++ b/plugins/scaffolder/src/components/fields/VirtualizedListbox.test.tsx
@@ -33,7 +33,7 @@ describe(' {
[configApiRef, configApiMock],
]}
>
-
+
,
@@ -205,7 +211,7 @@ describe('SearchPagination', () => {
it('Set page cursor in the context', async () => {
const initialState = {
- term: '',
+ term: 'a',
types: [],
filters: {},
pageCursor: 'MQ==', // page: 1
@@ -253,7 +259,7 @@ describe('SearchPagination', () => {
it('Resets page cursor when page limit changes', async () => {
const initialState = {
- term: '',
+ term: 'a',
types: [],
filters: {},
pageCursor: 'Mg==', // page: 2
@@ -280,9 +286,7 @@ describe('SearchPagination', () => {
pageCursor: undefined,
pageLimit: 10,
}),
- {
- signal: expect.any(AbortSignal),
- },
+ { signal: expect.any(AbortSignal) },
);
});
});
diff --git a/plugins/search-react/src/components/SearchResultGroup/SearchResultGroup.test.tsx b/plugins/search-react/src/components/SearchResultGroup/SearchResultGroup.test.tsx
index cb274be0a0..0f46f15ed4 100644
--- a/plugins/search-react/src/components/SearchResultGroup/SearchResultGroup.test.tsx
+++ b/plugins/search-react/src/components/SearchResultGroup/SearchResultGroup.test.tsx
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import { screen, waitFor } from '@testing-library/react';
+import { screen, waitFor, fireEvent } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import MenuItem from '@material-ui/core/MenuItem';
@@ -66,7 +66,7 @@ describe('SearchResultGroup', () => {
});
it('Renders without exploding', async () => {
- query.mockResolvedValueOnce({
+ query.mockResolvedValue({
results,
});
@@ -96,7 +96,7 @@ describe('SearchResultGroup', () => {
});
it('Renders search results from context', async () => {
- query.mockResolvedValueOnce({
+ query.mockResolvedValue({
results,
});
@@ -107,7 +107,9 @@ describe('SearchResultGroup', () => {
[analyticsApiRef, analyticsApiMock],
]}
>
-
+
{
});
it('Could be customized with filters', async () => {
- query.mockResolvedValueOnce({
+ query.mockResolvedValue({
results,
});
@@ -272,7 +278,7 @@ describe('SearchResultGroup', () => {
});
it('Could have a text search filter field', async () => {
- query.mockResolvedValueOnce({
+ query.mockResolvedValue({
results,
});
@@ -312,10 +318,10 @@ describe('SearchResultGroup', () => {
await userEvent.click(screen.getByText('owner'));
- await userEvent.type(
- screen.getByRole('textbox'),
- '{backspace}{backspace}{backspace}{backspace}techdocs-core',
- );
+ // Use fireEvent.blur for contentEditable elements since userEvent.type with
+ // backspace doesn't work properly in jsdom (jsdom limitation, not a bug)
+ const textbox = screen.getByRole('textbox');
+ fireEvent.blur(textbox, { target: { textContent: 'techdocs-core' } });
await waitFor(() => {
expect(screen.getByText('techdocs-core')).toBeInTheDocument();
@@ -323,7 +329,7 @@ describe('SearchResultGroup', () => {
});
it('Could have a select search filter field', async () => {
- query.mockResolvedValueOnce({
+ query.mockResolvedValue({
results,
});
@@ -376,7 +382,7 @@ describe('SearchResultGroup', () => {
});
it('Shows a progress bar when loading results', async () => {
- query.mockReturnValueOnce(new Promise(() => {}));
+ query.mockReturnValue(new Promise(() => {}));
await renderInTestApp(
{
});
it('Does not render result group if no results returned and disableRenderingWithNoResults prop is provided', async () => {
- query.mockResolvedValueOnce({ results: [] });
+ query.mockResolvedValue({ results: [] });
await renderInTestApp(
{
});
it('Should render custom component when no results returned', async () => {
- query.mockResolvedValueOnce({ results: [] });
+ query.mockResolvedValue({ results: [] });
await renderInTestApp(
{
});
it('Shows an error panel when results rendering fails', async () => {
- query.mockRejectedValueOnce(new Error());
+ query.mockRejectedValue(new Error());
await renderInTestApp(
(
initialValue.pageCursor,
);
+ const isFirstEmptyMount = useRef(true);
const prevTerm = usePrevious(term);
const prevFilters = usePrevious(filters);
const abortControllerRef = useRef(null);
- const result = useAsync(async () => {
+ const result = useAsync(async (): Promise => {
+ if (isFirstEmptyMount.current) {
+ if (!term && !types.length && !Object.keys(filters).length) {
+ return {
+ results: [],
+ numberOfResults: 0,
+ };
+ }
+
+ isFirstEmptyMount.current = false;
+ }
+
// Here we cancel the previous request before making a new one
if (abortControllerRef.current) {
abortControllerRef.current.abort();
diff --git a/plugins/search/CHANGELOG.md b/plugins/search/CHANGELOG.md
index 789e9b2603..8ffeceef6a 100644
--- a/plugins/search/CHANGELOG.md
+++ b/plugins/search/CHANGELOG.md
@@ -1,5 +1,34 @@
# @backstage/plugin-search
+## 1.5.1
+
+### Patch Changes
+
+- f3f84f1: Minor extension type updates after frontend API bump
+- d02db50: Remove unnecessary use of `compatWrapper` and `convertLegacyRouteRef`(s) for the new frontend system.
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.13.2
+ - @backstage/core-components@0.18.4
+ - @backstage/plugin-catalog-react@1.21.4
+ - @backstage/plugin-search-react@1.10.1
+ - @backstage/core-plugin-api@1.12.1
+
+## 1.5.1-next.1
+
+### Patch Changes
+
+- f3f84f1: Minor extension type updates after frontend API bump
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.13.2-next.1
+ - @backstage/plugin-catalog-react@1.21.4-next.2
+ - @backstage/core-components@0.18.4-next.2
+ - @backstage/core-plugin-api@1.12.1-next.0
+ - @backstage/errors@1.2.7
+ - @backstage/types@1.2.2
+ - @backstage/version-bridge@1.0.11
+ - @backstage/plugin-search-common@1.2.21
+ - @backstage/plugin-search-react@1.10.1-next.0
+
## 1.5.1-next.0
### Patch Changes
diff --git a/plugins/search/package.json b/plugins/search/package.json
index 794178d870..35db8a6d35 100644
--- a/plugins/search/package.json
+++ b/plugins/search/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-search",
- "version": "1.5.1-next.0",
+ "version": "1.5.1",
"description": "The Backstage plugin that provides your backstage app with search",
"backstage": {
"role": "frontend-plugin",
diff --git a/plugins/search/report-alpha.api.md b/plugins/search/report-alpha.api.md
index 5353fec09e..b129d4ab6c 100644
--- a/plugins/search/report-alpha.api.md
+++ b/plugins/search/report-alpha.api.md
@@ -264,8 +264,8 @@ export const searchTranslationRef: TranslationRef<
readonly 'searchType.tabs.allTitle': 'All';
readonly 'searchType.allResults': 'All Results';
readonly 'searchType.accordion.collapse': 'Collapse';
- readonly 'searchType.accordion.allTitle': 'All';
readonly 'searchType.accordion.numberOfResults': '{{number}} results';
+ readonly 'searchType.accordion.allTitle': 'All';
readonly 'sidebarSearchModal.title': 'Search';
}
>;
diff --git a/plugins/search/src/components/HomePageComponent/HomePageSearchBar.test.tsx b/plugins/search/src/components/HomePageComponent/HomePageSearchBar.test.tsx
index e7c47b7d30..270bdbb2eb 100644
--- a/plugins/search/src/components/HomePageComponent/HomePageSearchBar.test.tsx
+++ b/plugins/search/src/components/HomePageComponent/HomePageSearchBar.test.tsx
@@ -46,12 +46,7 @@ describe('('Search');
+ await userEvent.type(input, 'text');
+
+ await waitFor(() => {
+ expect(searchApiMock.query).toHaveBeenCalledWith(
+ {
+ term: 'text',
+ filters: {},
+ types: [],
+ pageCursor: undefined,
+ },
+ { signal: expect.any(AbortSignal) },
+ );
+ });
});
it('Should render a custom Modal correctly', async () => {
@@ -146,7 +151,6 @@ describe('SearchModal', () => {
},
);
- expect(searchApiMock.query).toHaveBeenCalledTimes(1);
await userEvent.keyboard('{Escape}');
expect(toggleModal).toHaveBeenCalledTimes(1);
});
diff --git a/plugins/signals-backend/CHANGELOG.md b/plugins/signals-backend/CHANGELOG.md
index 778eedd8e0..ba15a7f165 100644
--- a/plugins/signals-backend/CHANGELOG.md
+++ b/plugins/signals-backend/CHANGELOG.md
@@ -1,5 +1,27 @@
# @backstage/plugin-signals-backend
+## 0.3.11
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18
+ - @backstage/plugin-signals-node@0.1.27
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.3.11-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.18-next.1
+ - @backstage/plugin-signals-node@0.1.27-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/types@1.2.2
+
## 0.3.11-next.0
### Patch Changes
diff --git a/plugins/signals-backend/package.json b/plugins/signals-backend/package.json
index 16e84637bd..16ff55a7a4 100644
--- a/plugins/signals-backend/package.json
+++ b/plugins/signals-backend/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-signals-backend",
- "version": "0.3.11-next.0",
+ "version": "0.3.11",
"backstage": {
"role": "backend-plugin",
"pluginId": "signals",
diff --git a/plugins/signals-node/CHANGELOG.md b/plugins/signals-node/CHANGELOG.md
index 4d963038a4..89f3cbfc09 100644
--- a/plugins/signals-node/CHANGELOG.md
+++ b/plugins/signals-node/CHANGELOG.md
@@ -1,5 +1,27 @@
# @backstage/plugin-signals-node
+## 0.1.27
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10
+ - @backstage/plugin-events-node@0.4.18
+ - @backstage/backend-plugin-api@1.6.0
+
+## 0.1.27-next.1
+
+### Patch Changes
+
+- de96a60: chore(deps): bump `express` from 4.21.2 to 4.22.0
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.6.10-next.1
+ - @backstage/plugin-events-node@0.4.18-next.1
+ - @backstage/backend-plugin-api@1.6.0-next.1
+ - @backstage/config@1.3.6
+ - @backstage/types@1.2.2
+
## 0.1.27-next.0
### Patch Changes
diff --git a/plugins/signals-node/package.json b/plugins/signals-node/package.json
index 3727d3de12..41df262538 100644
--- a/plugins/signals-node/package.json
+++ b/plugins/signals-node/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-signals-node",
- "version": "0.1.27-next.0",
+ "version": "0.1.27",
"description": "Node.js library for the signals plugin",
"backstage": {
"role": "node-library",
diff --git a/plugins/signals-react/CHANGELOG.md b/plugins/signals-react/CHANGELOG.md
index 6938e0271b..d8ad46909e 100644
--- a/plugins/signals-react/CHANGELOG.md
+++ b/plugins/signals-react/CHANGELOG.md
@@ -1,5 +1,12 @@
# @backstage/plugin-signals-react
+## 0.0.18
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-plugin-api@1.12.1
+
## 0.0.18-next.0
### Patch Changes
diff --git a/plugins/signals-react/package.json b/plugins/signals-react/package.json
index fa67692556..debc7647ef 100644
--- a/plugins/signals-react/package.json
+++ b/plugins/signals-react/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-signals-react",
- "version": "0.0.18-next.0",
+ "version": "0.0.18",
"description": "Web library for the signals plugin",
"backstage": {
"role": "web-library",
diff --git a/plugins/signals/CHANGELOG.md b/plugins/signals/CHANGELOG.md
index 20fadf416f..2e170fd29d 100644
--- a/plugins/signals/CHANGELOG.md
+++ b/plugins/signals/CHANGELOG.md
@@ -1,5 +1,16 @@
# @backstage/plugin-signals
+## 0.0.26
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.13.2
+ - @backstage/core-components@0.18.4
+ - @backstage/core-plugin-api@1.12.1
+ - @backstage/theme@0.7.1
+ - @backstage/plugin-signals-react@0.0.18
+
## 0.0.26-next.0
### Patch Changes
diff --git a/plugins/signals/package.json b/plugins/signals/package.json
index 9a9ae4c9da..6ff62d6943 100644
--- a/plugins/signals/package.json
+++ b/plugins/signals/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-signals",
- "version": "0.0.26-next.0",
+ "version": "0.0.26",
"backstage": {
"role": "frontend-plugin",
"pluginId": "signals",
diff --git a/plugins/techdocs-addons-test-utils/CHANGELOG.md b/plugins/techdocs-addons-test-utils/CHANGELOG.md
index 1f78d1fa4b..21ace9fa17 100644
--- a/plugins/techdocs-addons-test-utils/CHANGELOG.md
+++ b/plugins/techdocs-addons-test-utils/CHANGELOG.md
@@ -1,5 +1,39 @@
# @backstage/plugin-techdocs-addons-test-utils
+## 2.0.0
+
+### Major Changes
+
+- 8d6709e: **BREAKING**: `TechDocsAddonTester.renderWithEffects()` no longer returns a screen; this means that you can no longer grab assertions such as `getByText` from its return value.
+
+ Newer versions of `@testing-library` recommends using the `screen` export for assertions - and removing this from the addon tester contract allows us to more freely iterate on which underlying version of the testing library is being used.
+
+ One notable effect of this, however, is that the `@testing-library` `screen` does NOT support assertions on the shadow DOM, which techdocs relies on. You will therefore want to add a dependency on [the `shadow-dom-testing-library` package](https://github.com/konnorrogers/shadow-dom-testing-library/) in your tests, and using its `screen` and its dedicated `*Shadow*` methods. As an example, if you keep doing `getByText` you will not get matches inside the shadow DOM - switch to `getByShadowText` instead.
+
+ ```ts
+ import { screen } from 'shadow-dom-testing-library';
+
+ // ... render the addon ...
+ await TechDocsAddonTester.buildAddonsInTechDocs([, fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin, fsevents@patch:fsevents@npm%3A~2.3.3#optional!builtin":
+"fsevents@patch:fsevents@npm%3A^2.3.3#optional!builtin, fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin, fsevents@patch:fsevents@npm%3A~2.3.3#optional!builtin":
version: 2.3.3
resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin::version=2.3.3&hash=df0bf1"
dependencies:
@@ -31894,7 +32125,7 @@ __metadata:
languageName: node
linkType: hard
-"gaxios@npm:^7.0.0, gaxios@npm:^7.0.0-rc.4":
+"gaxios@npm:^7.0.0, gaxios@npm:^7.0.0-rc.4, gaxios@npm:^7.1.3":
version: 7.1.3
resolution: "gaxios@npm:7.1.3"
dependencies:
@@ -31936,6 +32167,13 @@ __metadata:
languageName: node
linkType: hard
+"generator-function@npm:^2.0.0":
+ version: 2.0.1
+ resolution: "generator-function@npm:2.0.1"
+ checksum: 10/eb7e7eb896c5433f3d40982b2ccacdb3dd990dd3499f14040e002b5d54572476513be8a2e6f9609f6e41ab29f2c4469307611ddbfc37ff4e46b765c326663805
+ languageName: node
+ linkType: hard
+
"generic-names@npm:^2.0.1":
version: 2.0.1
resolution: "generic-names@npm:2.0.1"
@@ -31983,7 +32221,7 @@ __metadata:
languageName: node
linkType: hard
-"get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.2, get-intrinsic@npm:^1.2.4, get-intrinsic@npm:^1.2.5, get-intrinsic@npm:^1.2.6, get-intrinsic@npm:^1.3.0":
+"get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.4, get-intrinsic@npm:^1.2.5, get-intrinsic@npm:^1.2.6, get-intrinsic@npm:^1.3.0":
version: 1.3.0
resolution: "get-intrinsic@npm:1.3.0"
dependencies:
@@ -32001,6 +32239,27 @@ __metadata:
languageName: node
linkType: hard
+"get-intrinsic@npm:^1.2.2":
+ version: 1.3.1
+ resolution: "get-intrinsic@npm:1.3.1"
+ dependencies:
+ async-function: "npm:^1.0.0"
+ async-generator-function: "npm:^1.0.0"
+ call-bind-apply-helpers: "npm:^1.0.2"
+ es-define-property: "npm:^1.0.1"
+ es-errors: "npm:^1.3.0"
+ es-object-atoms: "npm:^1.1.1"
+ function-bind: "npm:^1.1.2"
+ generator-function: "npm:^2.0.0"
+ get-proto: "npm:^1.0.1"
+ gopd: "npm:^1.2.0"
+ has-symbols: "npm:^1.1.0"
+ hasown: "npm:^2.0.2"
+ math-intrinsics: "npm:^1.1.0"
+ checksum: 10/bb579dda84caa4a3a41611bdd483dade7f00f246f2a7992eb143c5861155290df3fdb48a8406efa3dfb0b434e2c8fafa4eebd469e409d0439247f85fc3fa2cc1
+ languageName: node
+ linkType: hard
+
"get-nonce@npm:^1.0.0":
version: 1.0.1
resolution: "get-nonce@npm:1.0.1"
@@ -32106,12 +32365,12 @@ __metadata:
languageName: node
linkType: hard
-"get-tsconfig@npm:^4.7.0, get-tsconfig@npm:^4.7.2":
- version: 4.7.3
- resolution: "get-tsconfig@npm:4.7.3"
+"get-tsconfig@npm:^4.10.0, get-tsconfig@npm:^4.10.1":
+ version: 4.13.0
+ resolution: "get-tsconfig@npm:4.13.0"
dependencies:
resolve-pkg-maps: "npm:^1.0.0"
- checksum: 10/7397bb4f8aef936df4d9016555b662dcf5279f3c46428b7c7c1ff5e94ab2b87d018b3dda0f4bc1a28b154d5affd0eac5d014511172c085fd8a9cdff9ea7fe043
+ checksum: 10/3603c6da30e312636e4c20461e779114c9126601d1eca70ee4e36e3e3c00e3c21892d2d920027333afa2cc9e20998a436b14abe03a53cde40742581cb0e9ceb2
languageName: node
linkType: hard
@@ -32219,25 +32478,20 @@ __metadata:
languageName: node
linkType: hard
-"glob@npm:11.0.3":
- version: 11.0.3
- resolution: "glob@npm:11.0.3"
+"glob@npm:13.0.0":
+ version: 13.0.0
+ resolution: "glob@npm:13.0.0"
dependencies:
- foreground-child: "npm:^3.3.1"
- jackspeak: "npm:^4.1.1"
- minimatch: "npm:^10.0.3"
+ minimatch: "npm:^10.1.1"
minipass: "npm:^7.1.2"
- package-json-from-dist: "npm:^1.0.0"
path-scurry: "npm:^2.0.0"
- bin:
- glob: dist/esm/bin.mjs
- checksum: 10/2ae536c1360c0266b523b2bfa6aadc10144a8b7e08869b088e37ac3c27cd30774f82e4bfb291cde796776e878f9e13200c7ff44010eb7054e00f46f649397893
+ checksum: 10/de390721d29ee1c9ea41e40ec2aa0de2cabafa68022e237dc4297665a5e4d650776f2573191984ea1640aba1bf0ea34eddef2d8cbfbfc2ad24b5fb0af41d8846
languageName: node
linkType: hard
"glob@npm:^10.0.0, glob@npm:^10.2.2, glob@npm:^10.3.10, glob@npm:^10.3.7, glob@npm:^10.4.1":
- version: 10.4.5
- resolution: "glob@npm:10.4.5"
+ version: 10.5.0
+ resolution: "glob@npm:10.5.0"
dependencies:
foreground-child: "npm:^3.1.0"
jackspeak: "npm:^3.1.2"
@@ -32247,11 +32501,11 @@ __metadata:
path-scurry: "npm:^1.11.1"
bin:
glob: dist/esm/bin.mjs
- checksum: 10/698dfe11828b7efd0514cd11e573eaed26b2dff611f0400907281ce3eab0c1e56143ef9b35adc7c77ecc71fba74717b510c7c223d34ca8a98ec81777b293d4ac
+ checksum: 10/ab3bccfefcc0afaedbd1f480cd0c4a2c0e322eb3f0aa7ceaa31b3f00b825069f17cf0f1fc8b6f256795074b903f37c0ade37ddda6a176aa57f1c2bbfe7240653
languageName: node
linkType: hard
-"glob@npm:^11.0.1":
+"glob@npm:^11.0.1, glob@npm:^11.1.0":
version: 11.1.0
resolution: "glob@npm:11.1.0"
dependencies:
@@ -32449,7 +32703,7 @@ __metadata:
languageName: node
linkType: hard
-"google-auth-library@npm:^10.0.0, google-auth-library@npm:^10.0.0-rc.1":
+"google-auth-library@npm:^10.0.0-rc.1, google-auth-library@npm:^10.5.0":
version: 10.5.0
resolution: "google-auth-library@npm:10.5.0"
dependencies:
@@ -32688,16 +32942,16 @@ __metadata:
linkType: hard
"graphql@npm:^14.0.2 || ^15.5":
- version: 15.9.0
- resolution: "graphql@npm:15.9.0"
- checksum: 10/ce1f50672bcb369395d07a47048bcbb429ed1ce06dbcafb7a0999df791cb7aa7206be21497907973dbc8a01df3cd7f632f43c583f248538f186f5adfa1a0d1c5
+ version: 15.10.1
+ resolution: "graphql@npm:15.10.1"
+ checksum: 10/49177f52c1fbac022866d39bb15040122da4c3ccd12644233b20edfcb1f76aa92aa92f2a82af4668101d8f726112fda111cb11a12feb05635cd689443a7aafb8
languageName: node
linkType: hard
"graphql@npm:^16.0.0, graphql@npm:^16.8.1":
- version: 16.10.0
- resolution: "graphql@npm:16.10.0"
- checksum: 10/d42cf81ddcf3a61dfb213217576bf33c326f15b02c4cee369b373dc74100cbdcdc4479b3b797e79b654dabd8fddf50ef65ff75420e9ce5596c02e21f24c9126a
+ version: 16.12.0
+ resolution: "graphql@npm:16.12.0"
+ checksum: 10/e299bc97cca178e549c8c1ed4cb164f631f07be987d3657f76cdf18c0250040cc0d456d4b6d41c87b855cac97b15a62ed345557527efcb0546492895a893bb87
languageName: node
linkType: hard
@@ -32914,6 +33168,15 @@ __metadata:
languageName: node
linkType: hard
+"hast-util-parse-selector@npm:^4.0.0":
+ version: 4.0.0
+ resolution: "hast-util-parse-selector@npm:4.0.0"
+ dependencies:
+ "@types/hast": "npm:^3.0.0"
+ checksum: 10/76087670d3b0b50b23a6cb70bca53a6176d6608307ccdbb3ed18b650b82e7c3513bfc40348f1389dc0c5ae872b9a768851f4335f44654abd7deafd6974c52402
+ languageName: node
+ linkType: hard
+
"hast-util-whitespace@npm:^2.0.0":
version: 2.0.0
resolution: "hast-util-whitespace@npm:2.0.0"
@@ -32934,6 +33197,19 @@ __metadata:
languageName: node
linkType: hard
+"hastscript@npm:^9.0.0":
+ version: 9.0.1
+ resolution: "hastscript@npm:9.0.1"
+ dependencies:
+ "@types/hast": "npm:^3.0.0"
+ comma-separated-tokens: "npm:^2.0.0"
+ hast-util-parse-selector: "npm:^4.0.0"
+ property-information: "npm:^7.0.0"
+ space-separated-tokens: "npm:^2.0.0"
+ checksum: 10/9aa8135faf0307807cca4075bef4e3403ae1ce959ad4b9e6720892ba957d58ff98b2f60b5eb3ac67d88ae897dc918997299cd4249d7ac602a0066dd46442c5d4
+ languageName: node
+ linkType: hard
+
"he@npm:1.2.0, he@npm:^1.2.0":
version: 1.2.0
resolution: "he@npm:1.2.0"
@@ -32965,9 +33241,9 @@ __metadata:
linkType: hard
"helmet@npm:^6.0.0":
- version: 6.0.1
- resolution: "helmet@npm:6.0.1"
- checksum: 10/0eec311e1a3820e206226563e55d7115fa66e9a34922229472c1dac407c5d00f0d5c4f5f7afed714fba40287aac1c30dcbfa9b3c096f1146f9d6a55c4527d65d
+ version: 6.2.0
+ resolution: "helmet@npm:6.2.0"
+ checksum: 10/f112fcd0d8494e6c8ad10e9307e182f1be9c9c4917a3f9a3718c13ae120d4c4e1f251e735297d6a9266e068dcc0463ab101c8d7f2b809c0ceabcef4681f81a2a
languageName: node
linkType: hard
@@ -33030,6 +33306,13 @@ __metadata:
languageName: node
linkType: hard
+"hookified@npm:^1.10.0":
+ version: 1.12.2
+ resolution: "hookified@npm:1.12.2"
+ checksum: 10/d445956d47ea8a3d30b29a9c1fe9945536577fa027d83c69eff9de4d47e22167fbe2b0721a8c4df6a0a2b53f0cc0b9eeda3a311ea9b4f20e09b2bb556105b035
+ languageName: node
+ linkType: hard
+
"hoopy@npm:^0.1.4":
version: 0.1.4
resolution: "hoopy@npm:0.1.4"
@@ -33072,15 +33355,6 @@ __metadata:
languageName: node
linkType: hard
-"html-encoding-sniffer@npm:^3.0.0":
- version: 3.0.0
- resolution: "html-encoding-sniffer@npm:3.0.0"
- dependencies:
- whatwg-encoding: "npm:^2.0.0"
- checksum: 10/707a812ec2acaf8bb5614c8618dc81e2fb6b4399d03e95ff18b65679989a072f4e919b9bef472039301a1bbfba64063ba4c79ea6e851c653ac9db80dbefe8fe5
- languageName: node
- linkType: hard
-
"html-encoding-sniffer@npm:^4.0.0":
version: 4.0.0
resolution: "html-encoding-sniffer@npm:4.0.0"
@@ -33122,8 +33396,8 @@ __metadata:
linkType: hard
"html-webpack-plugin@npm:^5.6.3":
- version: 5.6.3
- resolution: "html-webpack-plugin@npm:5.6.3"
+ version: 5.6.5
+ resolution: "html-webpack-plugin@npm:5.6.5"
dependencies:
"@types/html-minifier-terser": "npm:^6.0.0"
html-minifier-terser: "npm:^6.0.2"
@@ -33138,7 +33412,7 @@ __metadata:
optional: true
webpack:
optional: true
- checksum: 10/fd2bf1ac04823526c8b609555d027b38b9d61b4ba9f5c8116a37cc6b62d5b86cab1f478616e8c5344fee13663d2566f5c470c66265ecb1e9574dc38d0459889d
+ checksum: 10/89e84f6ede068242348b2c2f09da67bf39a6b22d14399eaf16e399be05a4e2bb1f3f1c71ec03b7193aed96ebe2cf61d45a70565408b271661f7ea8635b237701
languageName: node
linkType: hard
@@ -33411,9 +33685,9 @@ __metadata:
linkType: hard
"humanize-duration@npm:^3.25.1":
- version: 3.32.2
- resolution: "humanize-duration@npm:3.32.2"
- checksum: 10/2dfe847085c7586d2cc83613b8643a4cca70966a16522e3786be07f0283087502e5340e98a79867c7b019ea22ae85c3fa9d1ca1be587eb19ccf03710c986d41d
+ version: 3.33.2
+ resolution: "humanize-duration@npm:3.33.2"
+ checksum: 10/ac6bc74b095d53e6ff320126d64c0998de213d0e38d0996f23389603c034c8f825915d4318fc19cfdb0612c4963d72d200da43cd7c28ac865bbf9a61f53418f4
languageName: node
linkType: hard
@@ -33467,15 +33741,6 @@ __metadata:
languageName: node
linkType: hard
-"iconv-lite@npm:^0.4.24, iconv-lite@npm:~0.4.24":
- version: 0.4.24
- resolution: "iconv-lite@npm:0.4.24"
- dependencies:
- safer-buffer: "npm:>= 2.1.2 < 3"
- checksum: 10/6d3a2dac6e5d1fb126d25645c25c3a1209f70cceecc68b8ef51ae0da3cdc078c151fade7524a30b12a3094926336831fca09c666ef55b37e2c69638b5d6bd2e3
- languageName: node
- linkType: hard
-
"iconv-lite@npm:^0.7.0":
version: 0.7.0
resolution: "iconv-lite@npm:0.7.0"
@@ -33485,6 +33750,15 @@ __metadata:
languageName: node
linkType: hard
+"iconv-lite@npm:~0.4.24":
+ version: 0.4.24
+ resolution: "iconv-lite@npm:0.4.24"
+ dependencies:
+ safer-buffer: "npm:>= 2.1.2 < 3"
+ checksum: 10/6d3a2dac6e5d1fb126d25645c25c3a1209f70cceecc68b8ef51ae0da3cdc078c151fade7524a30b12a3094926336831fca09c666ef55b37e2c69638b5d6bd2e3
+ languageName: node
+ linkType: hard
+
"icss-replace-symbols@npm:^1.1.0":
version: 1.1.0
resolution: "icss-replace-symbols@npm:1.1.0"
@@ -33551,13 +33825,20 @@ __metadata:
languageName: node
linkType: hard
-"ignore@npm:^5.1.4, ignore@npm:^5.1.8, ignore@npm:^5.2.0, ignore@npm:^5.2.4, ignore@npm:^5.3.1":
+"ignore@npm:^5.1.4, ignore@npm:^5.2.0, ignore@npm:^5.2.4":
version: 5.3.2
resolution: "ignore@npm:5.3.2"
checksum: 10/cceb6a457000f8f6a50e1196429750d782afce5680dd878aa4221bd79972d68b3a55b4b1458fc682be978f4d3c6a249046aa0880637367216444ab7b014cfc98
languageName: node
linkType: hard
+"ignore@npm:^7.0.0":
+ version: 7.0.5
+ resolution: "ignore@npm:7.0.5"
+ checksum: 10/f134b96a4de0af419196f52c529d5c6120c4456ff8a6b5a14ceaaa399f883e15d58d2ce651c9b69b9388491d4669dda47285d307e827de9304a53a1824801bc6
+ languageName: node
+ linkType: hard
+
"immediate@npm:~3.0.5":
version: 3.0.6
resolution: "immediate@npm:3.0.6"
@@ -33633,15 +33914,15 @@ __metadata:
languageName: node
linkType: hard
-"import-local@npm:^3.0.2":
- version: 3.0.2
- resolution: "import-local@npm:3.0.2"
+"import-local@npm:^3.2.0":
+ version: 3.2.0
+ resolution: "import-local@npm:3.2.0"
dependencies:
pkg-dir: "npm:^4.2.0"
resolve-cwd: "npm:^3.0.0"
bin:
import-local-fixture: fixtures/cli.js
- checksum: 10/c74d9f9484c878cda1de3434613c7ff72d5dadcf20e5482542232d7c2575b713ff88701d6675fcf09a3684cb23fb407c8b333b9cbc59438712723d058d8e976c
+ checksum: 10/0b0b0b412b2521739fbb85eeed834a3c34de9bc67e670b3d0b86248fc460d990a7b116ad056c084b87a693ef73d1f17268d6a5be626bb43c998a8b1c8a230004
languageName: node
linkType: hard
@@ -33783,30 +34064,7 @@ __metadata:
languageName: node
linkType: hard
-"inquirer@npm:8.2.6":
- version: 8.2.6
- resolution: "inquirer@npm:8.2.6"
- dependencies:
- ansi-escapes: "npm:^4.2.1"
- chalk: "npm:^4.1.1"
- cli-cursor: "npm:^3.1.0"
- cli-width: "npm:^3.0.0"
- external-editor: "npm:^3.0.3"
- figures: "npm:^3.0.0"
- lodash: "npm:^4.17.21"
- mute-stream: "npm:0.0.8"
- ora: "npm:^5.4.1"
- run-async: "npm:^2.4.0"
- rxjs: "npm:^7.5.5"
- string-width: "npm:^4.1.0"
- strip-ansi: "npm:^6.0.0"
- through: "npm:^2.3.6"
- wrap-ansi: "npm:^6.0.1"
- checksum: 10/f642b9e5a94faaba54f277bdda2af0e0a6b592bd7f88c60e1614b5795b19336c7025e0c2923915d5f494f600a02fe8517413779a794415bb79a9563b061d68ab
- languageName: node
- linkType: hard
-
-"inquirer@npm:^8.0.0, inquirer@npm:^8.2.0":
+"inquirer@npm:8.2.7, inquirer@npm:^8.0.0, inquirer@npm:^8.2.0":
version: 8.2.7
resolution: "inquirer@npm:8.2.7"
dependencies:
@@ -34011,13 +34269,6 @@ __metadata:
languageName: node
linkType: hard
-"is-arrayish@npm:^0.3.1":
- version: 0.3.2
- resolution: "is-arrayish@npm:0.3.2"
- checksum: 10/81a78d518ebd8b834523e25d102684ee0f7e98637136d3bdc93fd09636350fa06f1d8ca997ea28143d4d13cb1b69c0824f082db0ac13e1ab3311c10ffea60ade
- languageName: node
- linkType: hard
-
"is-async-function@npm:^2.0.0":
version: 2.0.0
resolution: "is-async-function@npm:2.0.0"
@@ -34089,7 +34340,7 @@ __metadata:
languageName: node
linkType: hard
-"is-core-module@npm:^2.13.0, is-core-module@npm:^2.15.1, is-core-module@npm:^2.16.0":
+"is-core-module@npm:^2.13.0, is-core-module@npm:^2.16.0, is-core-module@npm:^2.16.1":
version: 2.16.1
resolution: "is-core-module@npm:2.16.1"
dependencies:
@@ -34207,7 +34458,7 @@ __metadata:
languageName: node
linkType: hard
-"is-generator-fn@npm:^2.0.0":
+"is-generator-fn@npm:^2.1.0":
version: 2.1.0
resolution: "is-generator-fn@npm:2.1.0"
checksum: 10/a6ad5492cf9d1746f73b6744e0c43c0020510b59d56ddcb78a91cbc173f09b5e6beff53d75c9c5a29feb618bfef2bf458e025ecf3a57ad2268e2fb2569f56215
@@ -34736,9 +34987,9 @@ __metadata:
linkType: hard
"isbinaryfile@npm:^5.0.0":
- version: 5.0.4
- resolution: "isbinaryfile@npm:5.0.4"
- checksum: 10/6162e900b17e6c73da6138667d6b195ed234f9fd9d073e7c8c07ee36657e63b6a69d73da55f522d45a1928f5da4642b5d25d27e24ebd3bb68b83647d594bee79
+ version: 5.0.7
+ resolution: "isbinaryfile@npm:5.0.7"
+ checksum: 10/af240b2a80db5cffbb3ddcb4d89403802d6b67d21b63fbcc0be5cefcefc013f499477c5837a5b2f029ba3d163543eab36eaee7cd701f2c44ee5ac890f0fadac5
languageName: node
linkType: hard
@@ -34785,8 +35036,8 @@ __metadata:
linkType: hard
"isomorphic-git@npm:^1.23.0":
- version: 1.27.2
- resolution: "isomorphic-git@npm:1.27.2"
+ version: 1.35.1
+ resolution: "isomorphic-git@npm:1.35.1"
dependencies:
async-lock: "npm:^1.4.1"
clean-git-ref: "npm:^2.0.1"
@@ -34795,14 +35046,13 @@ __metadata:
ignore: "npm:^5.1.4"
minimisted: "npm:^2.0.0"
pako: "npm:^1.0.10"
- path-browserify: "npm:^1.0.1"
pify: "npm:^4.0.1"
- readable-stream: "npm:^3.4.0"
- sha.js: "npm:^2.4.9"
+ readable-stream: "npm:^4.0.0"
+ sha.js: "npm:^2.4.12"
simple-get: "npm:^4.0.1"
bin:
isogit: cli.cjs
- checksum: 10/da4fa5ae6180e4a528b84f24ad4144c1a7587d5e79ed3f323b936809dc23b133615b96d7ecbb363009a30a2c9518bdf5efd572f918ddad801edc81693ddbb175
+ checksum: 10/8f9244ef09a02c2779aaf682b8db40b208860d57f1bf9deed3c35641a87221f56e490b3f94178579f95d46e6a4e1bb593590994d8138649b32d60d03f9e1f5f8
languageName: node
linkType: hard
@@ -34847,29 +35097,16 @@ __metadata:
languageName: node
linkType: hard
-"istanbul-lib-instrument@npm:^5.0.4":
- version: 5.1.0
- resolution: "istanbul-lib-instrument@npm:5.1.0"
+"istanbul-lib-instrument@npm:^6.0.0, istanbul-lib-instrument@npm:^6.0.2":
+ version: 6.0.3
+ resolution: "istanbul-lib-instrument@npm:6.0.3"
dependencies:
- "@babel/core": "npm:^7.12.3"
- "@babel/parser": "npm:^7.14.7"
- "@istanbuljs/schema": "npm:^0.1.2"
- istanbul-lib-coverage: "npm:^3.2.0"
- semver: "npm:^6.3.0"
- checksum: 10/7447ba3f8049f331d5b4a1c450183e88c2fdad044149ad0d9830f71bc8da90d841c393b830bc33237ae75122c3b0e03ca845701873d6c51690bc25caa1f13a94
- languageName: node
- linkType: hard
-
-"istanbul-lib-instrument@npm:^6.0.0":
- version: 6.0.1
- resolution: "istanbul-lib-instrument@npm:6.0.1"
- dependencies:
- "@babel/core": "npm:^7.12.3"
- "@babel/parser": "npm:^7.14.7"
- "@istanbuljs/schema": "npm:^0.1.2"
+ "@babel/core": "npm:^7.23.9"
+ "@babel/parser": "npm:^7.23.9"
+ "@istanbuljs/schema": "npm:^0.1.3"
istanbul-lib-coverage: "npm:^3.2.0"
semver: "npm:^7.5.4"
- checksum: 10/95fd8c66e586840989cb3c7819c6da66c4742a6fedbf16b51a5c7f1898941ad07b79ddff020f479d3a1d76743ecdbf255d93c35221875687477d4b118026e7e7
+ checksum: 10/aa5271c0008dfa71b6ecc9ba1e801bf77b49dc05524e8c30d58aaf5b9505e0cd12f25f93165464d4266a518c5c75284ecb598fbd89fec081ae77d2c9d3327695
languageName: node
linkType: hard
@@ -34884,14 +35121,14 @@ __metadata:
languageName: node
linkType: hard
-"istanbul-lib-source-maps@npm:^4.0.0":
- version: 4.0.0
- resolution: "istanbul-lib-source-maps@npm:4.0.0"
+"istanbul-lib-source-maps@npm:^5.0.0":
+ version: 5.0.6
+ resolution: "istanbul-lib-source-maps@npm:5.0.6"
dependencies:
+ "@jridgewell/trace-mapping": "npm:^0.3.23"
debug: "npm:^4.1.1"
istanbul-lib-coverage: "npm:^3.0.0"
- source-map: "npm:^0.6.1"
- checksum: 10/765252abc6b5c9d29905fc97ce04b92da87d198f2c0161e62fe0aac8bb74fb7bd472a5e1d90fe3e78723d8cad43913f08d8eefa0339536fcc33b3a1922cf5fc3
+ checksum: 10/569dd0a392ee3464b1fe1accbaef5cc26de3479eacb5b91d8c67ebb7b425d39fd02247d85649c3a0e9c29b600809fa60b5af5a281a75a89c01f385b1e24823a2
languageName: node
linkType: hard
@@ -34986,106 +35223,110 @@ __metadata:
languageName: node
linkType: hard
-"jest-changed-files@npm:^29.7.0":
- version: 29.7.0
- resolution: "jest-changed-files@npm:29.7.0"
+"jest-changed-files@npm:30.2.0":
+ version: 30.2.0
+ resolution: "jest-changed-files@npm:30.2.0"
dependencies:
- execa: "npm:^5.0.0"
- jest-util: "npm:^29.7.0"
+ execa: "npm:^5.1.1"
+ jest-util: "npm:30.2.0"
p-limit: "npm:^3.1.0"
- checksum: 10/3d93742e56b1a73a145d55b66e96711fbf87ef89b96c2fab7cfdfba8ec06612591a982111ca2b712bb853dbc16831ec8b43585a2a96b83862d6767de59cbf83d
+ checksum: 10/ff2275ed5839b88c12ffa66fdc5c17ba02d3e276be6b558bed92872c282d050c3fdd1a275a81187cbe35c16d6d40337b85838772836463c7a2fbd1cba9785ca0
languageName: node
linkType: hard
-"jest-circus@npm:^29.7.0":
- version: 29.7.0
- resolution: "jest-circus@npm:29.7.0"
+"jest-circus@npm:30.2.0":
+ version: 30.2.0
+ resolution: "jest-circus@npm:30.2.0"
dependencies:
- "@jest/environment": "npm:^29.7.0"
- "@jest/expect": "npm:^29.7.0"
- "@jest/test-result": "npm:^29.7.0"
- "@jest/types": "npm:^29.6.3"
+ "@jest/environment": "npm:30.2.0"
+ "@jest/expect": "npm:30.2.0"
+ "@jest/test-result": "npm:30.2.0"
+ "@jest/types": "npm:30.2.0"
"@types/node": "npm:*"
- chalk: "npm:^4.0.0"
+ chalk: "npm:^4.1.2"
co: "npm:^4.6.0"
- dedent: "npm:^1.0.0"
- is-generator-fn: "npm:^2.0.0"
- jest-each: "npm:^29.7.0"
- jest-matcher-utils: "npm:^29.7.0"
- jest-message-util: "npm:^29.7.0"
- jest-runtime: "npm:^29.7.0"
- jest-snapshot: "npm:^29.7.0"
- jest-util: "npm:^29.7.0"
+ dedent: "npm:^1.6.0"
+ is-generator-fn: "npm:^2.1.0"
+ jest-each: "npm:30.2.0"
+ jest-matcher-utils: "npm:30.2.0"
+ jest-message-util: "npm:30.2.0"
+ jest-runtime: "npm:30.2.0"
+ jest-snapshot: "npm:30.2.0"
+ jest-util: "npm:30.2.0"
p-limit: "npm:^3.1.0"
- pretty-format: "npm:^29.7.0"
- pure-rand: "npm:^6.0.0"
+ pretty-format: "npm:30.2.0"
+ pure-rand: "npm:^7.0.0"
slash: "npm:^3.0.0"
- stack-utils: "npm:^2.0.3"
- checksum: 10/716a8e3f40572fd0213bcfc1da90274bf30d856e5133af58089a6ce45089b63f4d679bd44e6be9d320e8390483ebc3ae9921981993986d21639d9019b523123d
+ stack-utils: "npm:^2.0.6"
+ checksum: 10/68bfc65d92385db1017643988215e4ff5af0b10bcab86fb749a063be6bb7d5eb556dc53dd21bedf833a19aa6ae1a781a8d27b2bea25562de02d294b3017435a9
languageName: node
linkType: hard
-"jest-cli@npm:^29.7.0":
- version: 29.7.0
- resolution: "jest-cli@npm:29.7.0"
+"jest-cli@npm:30.2.0":
+ version: 30.2.0
+ resolution: "jest-cli@npm:30.2.0"
dependencies:
- "@jest/core": "npm:^29.7.0"
- "@jest/test-result": "npm:^29.7.0"
- "@jest/types": "npm:^29.6.3"
- chalk: "npm:^4.0.0"
- create-jest: "npm:^29.7.0"
- exit: "npm:^0.1.2"
- import-local: "npm:^3.0.2"
- jest-config: "npm:^29.7.0"
- jest-util: "npm:^29.7.0"
- jest-validate: "npm:^29.7.0"
- yargs: "npm:^17.3.1"
+ "@jest/core": "npm:30.2.0"
+ "@jest/test-result": "npm:30.2.0"
+ "@jest/types": "npm:30.2.0"
+ chalk: "npm:^4.1.2"
+ exit-x: "npm:^0.2.2"
+ import-local: "npm:^3.2.0"
+ jest-config: "npm:30.2.0"
+ jest-util: "npm:30.2.0"
+ jest-validate: "npm:30.2.0"
+ yargs: "npm:^17.7.2"
peerDependencies:
node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
peerDependenciesMeta:
node-notifier:
optional: true
bin:
- jest: bin/jest.js
- checksum: 10/6cc62b34d002c034203065a31e5e9a19e7c76d9e8ef447a6f70f759c0714cb212c6245f75e270ba458620f9c7b26063cd8cf6cd1f7e3afd659a7cc08add17307
+ jest: ./bin/jest.js
+ checksum: 10/1cc8304f0e2608801c84cdecce9565a6178f668a6475aed3767a1d82cc539915f98e7404d7c387510313684011dc3095c15397d6725f73aac80fbd96c4155faa
languageName: node
linkType: hard
-"jest-config@npm:^29.7.0":
- version: 29.7.0
- resolution: "jest-config@npm:29.7.0"
+"jest-config@npm:30.2.0":
+ version: 30.2.0
+ resolution: "jest-config@npm:30.2.0"
dependencies:
- "@babel/core": "npm:^7.11.6"
- "@jest/test-sequencer": "npm:^29.7.0"
- "@jest/types": "npm:^29.6.3"
- babel-jest: "npm:^29.7.0"
- chalk: "npm:^4.0.0"
- ci-info: "npm:^3.2.0"
- deepmerge: "npm:^4.2.2"
- glob: "npm:^7.1.3"
- graceful-fs: "npm:^4.2.9"
- jest-circus: "npm:^29.7.0"
- jest-environment-node: "npm:^29.7.0"
- jest-get-type: "npm:^29.6.3"
- jest-regex-util: "npm:^29.6.3"
- jest-resolve: "npm:^29.7.0"
- jest-runner: "npm:^29.7.0"
- jest-util: "npm:^29.7.0"
- jest-validate: "npm:^29.7.0"
- micromatch: "npm:^4.0.4"
+ "@babel/core": "npm:^7.27.4"
+ "@jest/get-type": "npm:30.1.0"
+ "@jest/pattern": "npm:30.0.1"
+ "@jest/test-sequencer": "npm:30.2.0"
+ "@jest/types": "npm:30.2.0"
+ babel-jest: "npm:30.2.0"
+ chalk: "npm:^4.1.2"
+ ci-info: "npm:^4.2.0"
+ deepmerge: "npm:^4.3.1"
+ glob: "npm:^10.3.10"
+ graceful-fs: "npm:^4.2.11"
+ jest-circus: "npm:30.2.0"
+ jest-docblock: "npm:30.2.0"
+ jest-environment-node: "npm:30.2.0"
+ jest-regex-util: "npm:30.0.1"
+ jest-resolve: "npm:30.2.0"
+ jest-runner: "npm:30.2.0"
+ jest-util: "npm:30.2.0"
+ jest-validate: "npm:30.2.0"
+ micromatch: "npm:^4.0.8"
parse-json: "npm:^5.2.0"
- pretty-format: "npm:^29.7.0"
+ pretty-format: "npm:30.2.0"
slash: "npm:^3.0.0"
strip-json-comments: "npm:^3.1.1"
peerDependencies:
"@types/node": "*"
+ esbuild-register: ">=3.4.0"
ts-node: ">=9.0.0"
peerDependenciesMeta:
"@types/node":
optional: true
+ esbuild-register:
+ optional: true
ts-node:
optional: true
- checksum: 10/6bdf570e9592e7d7dd5124fc0e21f5fe92bd15033513632431b211797e3ab57eaa312f83cc6481b3094b72324e369e876f163579d60016677c117ec4853cf02b
+ checksum: 10/296786b0a3d62de77e2f691f208d54ab541c1a73f87747d922eda643c6f25b89125ef3150170c07a6c8a316a30c15428e46237d499f688b0777f38de8a61ad16
languageName: node
linkType: hard
@@ -35098,7 +35339,19 @@ __metadata:
languageName: node
linkType: hard
-"jest-diff@npm:^29.2.0, jest-diff@npm:^29.7.0":
+"jest-diff@npm:30.2.0":
+ version: 30.2.0
+ resolution: "jest-diff@npm:30.2.0"
+ dependencies:
+ "@jest/diff-sequences": "npm:30.0.1"
+ "@jest/get-type": "npm:30.1.0"
+ chalk: "npm:^4.1.2"
+ pretty-format: "npm:30.2.0"
+ checksum: 10/1fb9e4fb7dff81814b4f69eaa7db28e184d62306a3a8ea2447d02ca53d2cfa771e83ede513f67ec5239dffacfaac32ff2b49866d211e4c7516f51c1fc06ede42
+ languageName: node
+ linkType: hard
+
+"jest-diff@npm:^29.2.0":
version: 29.7.0
resolution: "jest-diff@npm:29.7.0"
dependencies:
@@ -35110,60 +35363,40 @@ __metadata:
languageName: node
linkType: hard
-"jest-docblock@npm:^29.7.0":
- version: 29.7.0
- resolution: "jest-docblock@npm:29.7.0"
+"jest-docblock@npm:30.2.0":
+ version: 30.2.0
+ resolution: "jest-docblock@npm:30.2.0"
dependencies:
- detect-newline: "npm:^3.0.0"
- checksum: 10/8d48818055bc96c9e4ec2e217a5a375623c0d0bfae8d22c26e011074940c202aa2534a3362294c81d981046885c05d304376afba9f2874143025981148f3e96d
+ detect-newline: "npm:^3.1.0"
+ checksum: 10/e01a7d1193947ed0f9713c26bfc7852e51cb758cafec807e5665a0a8d582473a43778bee099f8aa5c70b2941963e5341f4b10bd86b036a4fa3bcec0f4c04e099
languageName: node
linkType: hard
-"jest-each@npm:^29.7.0":
- version: 29.7.0
- resolution: "jest-each@npm:29.7.0"
+"jest-each@npm:30.2.0":
+ version: 30.2.0
+ resolution: "jest-each@npm:30.2.0"
dependencies:
- "@jest/types": "npm:^29.6.3"
- chalk: "npm:^4.0.0"
- jest-get-type: "npm:^29.6.3"
- jest-util: "npm:^29.7.0"
- pretty-format: "npm:^29.7.0"
- checksum: 10/bd1a077654bdaa013b590deb5f7e7ade68f2e3289180a8c8f53bc8a49f3b40740c0ec2d3a3c1aee906f682775be2bebbac37491d80b634d15276b0aa0f2e3fda
+ "@jest/get-type": "npm:30.1.0"
+ "@jest/types": "npm:30.2.0"
+ chalk: "npm:^4.1.2"
+ jest-util: "npm:30.2.0"
+ pretty-format: "npm:30.2.0"
+ checksum: 10/f95e7dc1cef4b6a77899325702a214834ae25d01276cc31279654dc7e04f63c1925a37848dd16a0d16508c0fd3d182145f43c10af93952b7a689df3aeac198e9
languageName: node
linkType: hard
-"jest-environment-jsdom@npm:^29.0.2":
- version: 29.7.0
- resolution: "jest-environment-jsdom@npm:29.7.0"
+"jest-environment-node@npm:30.2.0":
+ version: 30.2.0
+ resolution: "jest-environment-node@npm:30.2.0"
dependencies:
- "@jest/environment": "npm:^29.7.0"
- "@jest/fake-timers": "npm:^29.7.0"
- "@jest/types": "npm:^29.6.3"
- "@types/jsdom": "npm:^20.0.0"
+ "@jest/environment": "npm:30.2.0"
+ "@jest/fake-timers": "npm:30.2.0"
+ "@jest/types": "npm:30.2.0"
"@types/node": "npm:*"
- jest-mock: "npm:^29.7.0"
- jest-util: "npm:^29.7.0"
- jsdom: "npm:^20.0.0"
- peerDependencies:
- canvas: ^2.5.0
- peerDependenciesMeta:
- canvas:
- optional: true
- checksum: 10/23bbfc9bca914baef4b654f7983175a4d49b0f515a5094ebcb8f819f28ec186f53c0ba06af1855eac04bab1457f4ea79dae05f70052cf899863e8096daa6e0f5
- languageName: node
- linkType: hard
-
-"jest-environment-node@npm:^29.7.0":
- version: 29.7.0
- resolution: "jest-environment-node@npm:29.7.0"
- dependencies:
- "@jest/environment": "npm:^29.7.0"
- "@jest/fake-timers": "npm:^29.7.0"
- "@jest/types": "npm:^29.6.3"
- "@types/node": "npm:*"
- jest-mock: "npm:^29.7.0"
- jest-util: "npm:^29.7.0"
- checksum: 10/9cf7045adf2307cc93aed2f8488942e39388bff47ec1df149a997c6f714bfc66b2056768973770d3f8b1bf47396c19aa564877eb10ec978b952c6018ed1bd637
+ jest-mock: "npm:30.2.0"
+ jest-util: "npm:30.2.0"
+ jest-validate: "npm:30.2.0"
+ checksum: 10/7918bfea7367bd3e12dbbc4ea5afb193b5c47e480a6d1382512f051e2f028458fc9f5ef2f6260737ad41a0b1894661790ff3aaf3cbb4148a33ce2ce7aec64847
languageName: node
linkType: hard
@@ -35174,232 +35407,223 @@ __metadata:
languageName: node
linkType: hard
-"jest-haste-map@npm:29.7.0":
- version: 29.7.0
- resolution: "jest-haste-map@npm:29.7.0"
+"jest-haste-map@npm:30.2.0":
+ version: 30.2.0
+ resolution: "jest-haste-map@npm:30.2.0"
dependencies:
- "@jest/types": "npm:^29.6.3"
- "@types/graceful-fs": "npm:^4.1.3"
+ "@jest/types": "npm:30.2.0"
"@types/node": "npm:*"
- anymatch: "npm:^3.0.3"
- fb-watchman: "npm:^2.0.0"
- fsevents: "npm:^2.3.2"
- graceful-fs: "npm:^4.2.9"
- jest-regex-util: "npm:^29.6.3"
- jest-util: "npm:^29.7.0"
- jest-worker: "npm:^29.7.0"
- micromatch: "npm:^4.0.4"
+ anymatch: "npm:^3.1.3"
+ fb-watchman: "npm:^2.0.2"
+ fsevents: "npm:^2.3.3"
+ graceful-fs: "npm:^4.2.11"
+ jest-regex-util: "npm:30.0.1"
+ jest-util: "npm:30.2.0"
+ jest-worker: "npm:30.2.0"
+ micromatch: "npm:^4.0.8"
walker: "npm:^1.0.8"
dependenciesMeta:
fsevents:
optional: true
- checksum: 10/8531b42003581cb18a69a2774e68c456fb5a5c3280b1b9b77475af9e346b6a457250f9d756bfeeae2fe6cbc9ef28434c205edab9390ee970a919baddfa08bb85
+ checksum: 10/a88be6b0b672144aa30fe2d72e630d639c8d8729ee2cef84d0f830eac2005ac021cd8354f8ed8ecd74223f6a8b281efb62f466f5c9e01ed17650e38761051f4c
languageName: node
linkType: hard
-"jest-haste-map@patch:jest-haste-map@npm%3A29.7.0#./.yarn/patches/jest-haste-map-npm-29.7.0-e3be419eff.patch::locator=root%40workspace%3A.":
- version: 29.7.0
- resolution: "jest-haste-map@patch:jest-haste-map@npm%3A29.7.0#./.yarn/patches/jest-haste-map-npm-29.7.0-e3be419eff.patch::version=29.7.0&hash=feed88&locator=root%40workspace%3A."
+"jest-leak-detector@npm:30.2.0":
+ version: 30.2.0
+ resolution: "jest-leak-detector@npm:30.2.0"
dependencies:
- "@jest/types": "npm:^29.6.3"
- "@types/graceful-fs": "npm:^4.1.3"
- "@types/node": "npm:*"
- anymatch: "npm:^3.0.3"
- fb-watchman: "npm:^2.0.0"
- fsevents: "npm:^2.3.2"
- graceful-fs: "npm:^4.2.9"
- jest-regex-util: "npm:^29.6.3"
- jest-util: "npm:^29.7.0"
- jest-worker: "npm:^29.7.0"
- micromatch: "npm:^4.0.4"
- walker: "npm:^1.0.8"
- dependenciesMeta:
- fsevents:
- optional: true
- checksum: 10/e93fab6316f0cdb5e930491efe87e9957a83200a58c37acedbea84472fbf67472675e3235d249b04726aaf09a23a5eadc4a7890e85969e2a8c7bf6b402c1ff5e
+ "@jest/get-type": "npm:30.1.0"
+ pretty-format: "npm:30.2.0"
+ checksum: 10/c430d6ed7910b2174738fbdca4ea64cbfe805216414c0d143c1090148f1389fec99d0733c0a8ed0a86709c89b4a4085b4749ac3a2cbc7deaf3ca87457afd24fc
languageName: node
linkType: hard
-"jest-leak-detector@npm:^29.7.0":
- version: 29.7.0
- resolution: "jest-leak-detector@npm:29.7.0"
+"jest-matcher-utils@npm:30.2.0":
+ version: 30.2.0
+ resolution: "jest-matcher-utils@npm:30.2.0"
dependencies:
- jest-get-type: "npm:^29.6.3"
- pretty-format: "npm:^29.7.0"
- checksum: 10/e3950e3ddd71e1d0c22924c51a300a1c2db6cf69ec1e51f95ccf424bcc070f78664813bef7aed4b16b96dfbdeea53fe358f8aeaaea84346ae15c3735758f1605
+ "@jest/get-type": "npm:30.1.0"
+ chalk: "npm:^4.1.2"
+ jest-diff: "npm:30.2.0"
+ pretty-format: "npm:30.2.0"
+ checksum: 10/f3f1ecf68ca63c9d1d80a175637a8fc655edfd1ee83220f6e3f6bd464ecbe2f93148fdd440a5a5e5a2b0b2cc8ee84ddc3dcef58a6dbc66821c792f48d260c6d4
languageName: node
linkType: hard
-"jest-matcher-utils@npm:^29.7.0":
- version: 29.7.0
- resolution: "jest-matcher-utils@npm:29.7.0"
+"jest-message-util@npm:30.2.0":
+ version: 30.2.0
+ resolution: "jest-message-util@npm:30.2.0"
dependencies:
- chalk: "npm:^4.0.0"
- jest-diff: "npm:^29.7.0"
- jest-get-type: "npm:^29.6.3"
- pretty-format: "npm:^29.7.0"
- checksum: 10/981904a494299cf1e3baed352f8a3bd8b50a8c13a662c509b6a53c31461f94ea3bfeffa9d5efcfeb248e384e318c87de7e3baa6af0f79674e987482aa189af40
- languageName: node
- linkType: hard
-
-"jest-message-util@npm:^29.7.0":
- version: 29.7.0
- resolution: "jest-message-util@npm:29.7.0"
- dependencies:
- "@babel/code-frame": "npm:^7.12.13"
- "@jest/types": "npm:^29.6.3"
- "@types/stack-utils": "npm:^2.0.0"
- chalk: "npm:^4.0.0"
- graceful-fs: "npm:^4.2.9"
- micromatch: "npm:^4.0.4"
- pretty-format: "npm:^29.7.0"
+ "@babel/code-frame": "npm:^7.27.1"
+ "@jest/types": "npm:30.2.0"
+ "@types/stack-utils": "npm:^2.0.3"
+ chalk: "npm:^4.1.2"
+ graceful-fs: "npm:^4.2.11"
+ micromatch: "npm:^4.0.8"
+ pretty-format: "npm:30.2.0"
slash: "npm:^3.0.0"
- stack-utils: "npm:^2.0.3"
- checksum: 10/31d53c6ed22095d86bab9d14c0fa70c4a92c749ea6ceece82cf30c22c9c0e26407acdfbdb0231435dc85a98d6d65ca0d9cbcd25cd1abb377fe945e843fb770b9
+ stack-utils: "npm:^2.0.6"
+ checksum: 10/e29ec76e8c8e4da5f5b25198be247535626ccf3a940e93fdd51fc6a6bcf70feaa2921baae3806182a090431d90b08c939eb13fb64249b171d2e9ae3a452a8fd2
languageName: node
linkType: hard
-"jest-mock@npm:^29.7.0":
- version: 29.7.0
- resolution: "jest-mock@npm:29.7.0"
+"jest-mock@npm:30.2.0":
+ version: 30.2.0
+ resolution: "jest-mock@npm:30.2.0"
dependencies:
- "@jest/types": "npm:^29.6.3"
+ "@jest/types": "npm:30.2.0"
"@types/node": "npm:*"
- jest-util: "npm:^29.7.0"
- checksum: 10/ae51d1b4f898724be5e0e52b2268a68fcd876d9b20633c864a6dd6b1994cbc48d62402b0f40f3a1b669b30ebd648821f086c26c08ffde192ced951ff4670d51c
+ jest-util: "npm:30.2.0"
+ checksum: 10/cde9b56805f90bf811a9231873ee88a0fb83bf4bf50972ae76960725da65220fcb119688f2e90e1ef33fbfd662194858d7f43809d881f1c41bb55d94e62adeab
languageName: node
linkType: hard
-"jest-pnp-resolver@npm:^1.2.2":
- version: 1.2.2
- resolution: "jest-pnp-resolver@npm:1.2.2"
+"jest-pnp-resolver@npm:^1.2.3":
+ version: 1.2.3
+ resolution: "jest-pnp-resolver@npm:1.2.3"
peerDependencies:
jest-resolve: "*"
peerDependenciesMeta:
jest-resolve:
optional: true
- checksum: 10/bd85dcc0e76e0eb0c3d56382ec140f08d25ff4068cda9d0e360bb78fb176cb726d0beab82dc0e8694cafd09f55fee7622b8bcb240afa5fad301f4ed3eebb4f47
+ checksum: 10/db1a8ab2cb97ca19c01b1cfa9a9c8c69a143fde833c14df1fab0766f411b1148ff0df878adea09007ac6a2085ec116ba9a996a6ad104b1e58c20adbf88eed9b2
languageName: node
linkType: hard
-"jest-regex-util@npm:^29.6.3":
- version: 29.6.3
- resolution: "jest-regex-util@npm:29.6.3"
- checksum: 10/0518beeb9bf1228261695e54f0feaad3606df26a19764bc19541e0fc6e2a3737191904607fb72f3f2ce85d9c16b28df79b7b1ec9443aa08c3ef0e9efda6f8f2a
+"jest-regex-util@npm:30.0.1":
+ version: 30.0.1
+ resolution: "jest-regex-util@npm:30.0.1"
+ checksum: 10/fa8dac80c3e94db20d5e1e51d1bdf101cf5ede8f4e0b8f395ba8b8ea81e71804ffd747452a6bb6413032865de98ac656ef8ae43eddd18d980b6442a2764ed562
languageName: node
linkType: hard
-"jest-resolve-dependencies@npm:^29.7.0":
- version: 29.7.0
- resolution: "jest-resolve-dependencies@npm:29.7.0"
+"jest-resolve-dependencies@npm:30.2.0":
+ version: 30.2.0
+ resolution: "jest-resolve-dependencies@npm:30.2.0"
dependencies:
- jest-regex-util: "npm:^29.6.3"
- jest-snapshot: "npm:^29.7.0"
- checksum: 10/1e206f94a660d81e977bcfb1baae6450cb4a81c92e06fad376cc5ea16b8e8c6ea78c383f39e95591a9eb7f925b6a1021086c38941aa7c1b8a6a813c2f6e93675
+ jest-regex-util: "npm:30.0.1"
+ jest-snapshot: "npm:30.2.0"
+ checksum: 10/0ff1a574f8c07f2e54a4ac8ab17aea00dfe2982e99b03fbd44f4211a94b8e5a59fdc43a59f9d6c0578a10a7b56a0611ad5ab40e4893973ff3f40dd414433b194
languageName: node
linkType: hard
-"jest-resolve@npm:^29.7.0":
- version: 29.7.0
- resolution: "jest-resolve@npm:29.7.0"
+"jest-resolve@npm:30.2.0":
+ version: 30.2.0
+ resolution: "jest-resolve@npm:30.2.0"
dependencies:
- chalk: "npm:^4.0.0"
- graceful-fs: "npm:^4.2.9"
- jest-haste-map: "npm:^29.7.0"
- jest-pnp-resolver: "npm:^1.2.2"
- jest-util: "npm:^29.7.0"
- jest-validate: "npm:^29.7.0"
- resolve: "npm:^1.20.0"
- resolve.exports: "npm:^2.0.0"
+ chalk: "npm:^4.1.2"
+ graceful-fs: "npm:^4.2.11"
+ jest-haste-map: "npm:30.2.0"
+ jest-pnp-resolver: "npm:^1.2.3"
+ jest-util: "npm:30.2.0"
+ jest-validate: "npm:30.2.0"
slash: "npm:^3.0.0"
- checksum: 10/faa466fd9bc69ea6c37a545a7c6e808e073c66f46ab7d3d8a6ef084f8708f201b85d5fe1799789578b8b47fa1de47b9ee47b414d1863bc117a49e032ba77b7c7
+ unrs-resolver: "npm:^1.7.11"
+ checksum: 10/e1f03da6811a946f5d885ea739a973975d099cc760641f9e1f90ac9c6621408538ba1e909f789d45d6e8d2411b78fb09230f16f15669621aa407aed7511fdf01
languageName: node
linkType: hard
-"jest-runner@npm:^29.7.0":
- version: 29.7.0
- resolution: "jest-runner@npm:29.7.0"
+"jest-runner@npm:30.2.0":
+ version: 30.2.0
+ resolution: "jest-runner@npm:30.2.0"
dependencies:
- "@jest/console": "npm:^29.7.0"
- "@jest/environment": "npm:^29.7.0"
- "@jest/test-result": "npm:^29.7.0"
- "@jest/transform": "npm:^29.7.0"
- "@jest/types": "npm:^29.6.3"
+ "@jest/console": "npm:30.2.0"
+ "@jest/environment": "npm:30.2.0"
+ "@jest/test-result": "npm:30.2.0"
+ "@jest/transform": "npm:30.2.0"
+ "@jest/types": "npm:30.2.0"
"@types/node": "npm:*"
- chalk: "npm:^4.0.0"
+ chalk: "npm:^4.1.2"
emittery: "npm:^0.13.1"
- graceful-fs: "npm:^4.2.9"
- jest-docblock: "npm:^29.7.0"
- jest-environment-node: "npm:^29.7.0"
- jest-haste-map: "npm:^29.7.0"
- jest-leak-detector: "npm:^29.7.0"
- jest-message-util: "npm:^29.7.0"
- jest-resolve: "npm:^29.7.0"
- jest-runtime: "npm:^29.7.0"
- jest-util: "npm:^29.7.0"
- jest-watcher: "npm:^29.7.0"
- jest-worker: "npm:^29.7.0"
+ exit-x: "npm:^0.2.2"
+ graceful-fs: "npm:^4.2.11"
+ jest-docblock: "npm:30.2.0"
+ jest-environment-node: "npm:30.2.0"
+ jest-haste-map: "npm:30.2.0"
+ jest-leak-detector: "npm:30.2.0"
+ jest-message-util: "npm:30.2.0"
+ jest-resolve: "npm:30.2.0"
+ jest-runtime: "npm:30.2.0"
+ jest-util: "npm:30.2.0"
+ jest-watcher: "npm:30.2.0"
+ jest-worker: "npm:30.2.0"
p-limit: "npm:^3.1.0"
source-map-support: "npm:0.5.13"
- checksum: 10/9d8748a494bd90f5c82acea99be9e99f21358263ce6feae44d3f1b0cd90991b5df5d18d607e73c07be95861ee86d1cbab2a3fc6ca4b21805f07ac29d47c1da1e
+ checksum: 10/d3706aa70e64a7ef8b38360d34ea6c261ba4d0b42136d7fb603c4fa71c24fa81f22c39ed2e39ee0db2363a42827810291f3ceb6a299e5996b41d701ad9b24184
languageName: node
linkType: hard
-"jest-runtime@npm:^29.0.2, jest-runtime@npm:^29.7.0":
- version: 29.7.0
- resolution: "jest-runtime@npm:29.7.0"
+"jest-runtime@npm:30.2.0":
+ version: 30.2.0
+ resolution: "jest-runtime@npm:30.2.0"
dependencies:
- "@jest/environment": "npm:^29.7.0"
- "@jest/fake-timers": "npm:^29.7.0"
- "@jest/globals": "npm:^29.7.0"
- "@jest/source-map": "npm:^29.6.3"
- "@jest/test-result": "npm:^29.7.0"
- "@jest/transform": "npm:^29.7.0"
- "@jest/types": "npm:^29.6.3"
+ "@jest/environment": "npm:30.2.0"
+ "@jest/fake-timers": "npm:30.2.0"
+ "@jest/globals": "npm:30.2.0"
+ "@jest/source-map": "npm:30.0.1"
+ "@jest/test-result": "npm:30.2.0"
+ "@jest/transform": "npm:30.2.0"
+ "@jest/types": "npm:30.2.0"
"@types/node": "npm:*"
- chalk: "npm:^4.0.0"
- cjs-module-lexer: "npm:^1.0.0"
- collect-v8-coverage: "npm:^1.0.0"
- glob: "npm:^7.1.3"
- graceful-fs: "npm:^4.2.9"
- jest-haste-map: "npm:^29.7.0"
- jest-message-util: "npm:^29.7.0"
- jest-mock: "npm:^29.7.0"
- jest-regex-util: "npm:^29.6.3"
- jest-resolve: "npm:^29.7.0"
- jest-snapshot: "npm:^29.7.0"
- jest-util: "npm:^29.7.0"
+ chalk: "npm:^4.1.2"
+ cjs-module-lexer: "npm:^2.1.0"
+ collect-v8-coverage: "npm:^1.0.2"
+ glob: "npm:^10.3.10"
+ graceful-fs: "npm:^4.2.11"
+ jest-haste-map: "npm:30.2.0"
+ jest-message-util: "npm:30.2.0"
+ jest-mock: "npm:30.2.0"
+ jest-regex-util: "npm:30.0.1"
+ jest-resolve: "npm:30.2.0"
+ jest-snapshot: "npm:30.2.0"
+ jest-util: "npm:30.2.0"
slash: "npm:^3.0.0"
strip-bom: "npm:^4.0.0"
- checksum: 10/59eb58eb7e150e0834a2d0c0d94f2a0b963ae7182cfa6c63f2b49b9c6ef794e5193ef1634e01db41420c36a94cefc512cdd67a055cd3e6fa2f41eaf0f82f5a20
+ checksum: 10/81a3a9951420863f001e74c510bf35b85ae983f636f43ee1ffa1618b5a8ddafb681bc2810f71814bc8c8373e9593c89576b2325daf3c765e50057e48d5941df3
languageName: node
linkType: hard
-"jest-snapshot@npm:^29.7.0":
- version: 29.7.0
- resolution: "jest-snapshot@npm:29.7.0"
+"jest-snapshot@npm:30.2.0":
+ version: 30.2.0
+ resolution: "jest-snapshot@npm:30.2.0"
dependencies:
- "@babel/core": "npm:^7.11.6"
- "@babel/generator": "npm:^7.7.2"
- "@babel/plugin-syntax-jsx": "npm:^7.7.2"
- "@babel/plugin-syntax-typescript": "npm:^7.7.2"
- "@babel/types": "npm:^7.3.3"
- "@jest/expect-utils": "npm:^29.7.0"
- "@jest/transform": "npm:^29.7.0"
- "@jest/types": "npm:^29.6.3"
- babel-preset-current-node-syntax: "npm:^1.0.0"
- chalk: "npm:^4.0.0"
- expect: "npm:^29.7.0"
- graceful-fs: "npm:^4.2.9"
- jest-diff: "npm:^29.7.0"
- jest-get-type: "npm:^29.6.3"
- jest-matcher-utils: "npm:^29.7.0"
- jest-message-util: "npm:^29.7.0"
- jest-util: "npm:^29.7.0"
- natural-compare: "npm:^1.4.0"
- pretty-format: "npm:^29.7.0"
- semver: "npm:^7.5.3"
- checksum: 10/cb19a3948256de5f922d52f251821f99657339969bf86843bd26cf3332eae94883e8260e3d2fba46129a27c3971c1aa522490e460e16c7fad516e82d10bbf9f8
+ "@babel/core": "npm:^7.27.4"
+ "@babel/generator": "npm:^7.27.5"
+ "@babel/plugin-syntax-jsx": "npm:^7.27.1"
+ "@babel/plugin-syntax-typescript": "npm:^7.27.1"
+ "@babel/types": "npm:^7.27.3"
+ "@jest/expect-utils": "npm:30.2.0"
+ "@jest/get-type": "npm:30.1.0"
+ "@jest/snapshot-utils": "npm:30.2.0"
+ "@jest/transform": "npm:30.2.0"
+ "@jest/types": "npm:30.2.0"
+ babel-preset-current-node-syntax: "npm:^1.2.0"
+ chalk: "npm:^4.1.2"
+ expect: "npm:30.2.0"
+ graceful-fs: "npm:^4.2.11"
+ jest-diff: "npm:30.2.0"
+ jest-matcher-utils: "npm:30.2.0"
+ jest-message-util: "npm:30.2.0"
+ jest-util: "npm:30.2.0"
+ pretty-format: "npm:30.2.0"
+ semver: "npm:^7.7.2"
+ synckit: "npm:^0.11.8"
+ checksum: 10/119390b49f397ed622ba7c375fc15f97af67c4fc49a34cf829c86ee732be2b06ad3c7171c76bb842a0e84a234783f1a4c721909aa316fbe00c6abc7c5962dfbc
+ languageName: node
+ linkType: hard
+
+"jest-util@npm:30.2.0":
+ version: 30.2.0
+ resolution: "jest-util@npm:30.2.0"
+ dependencies:
+ "@jest/types": "npm:30.2.0"
+ "@types/node": "npm:*"
+ chalk: "npm:^4.1.2"
+ ci-info: "npm:^4.2.0"
+ graceful-fs: "npm:^4.2.11"
+ picomatch: "npm:^4.0.2"
+ checksum: 10/cf2f2fb83417ea69f9992121561c95cf4e9aad7946819b771b8b52addf78811101b33b51d0a39fa0c305f2751dab262feed7699de052659ff03d51827c8862f5
languageName: node
linkType: hard
@@ -35417,33 +35641,33 @@ __metadata:
languageName: node
linkType: hard
-"jest-validate@npm:^29.7.0":
- version: 29.7.0
- resolution: "jest-validate@npm:29.7.0"
+"jest-validate@npm:30.2.0":
+ version: 30.2.0
+ resolution: "jest-validate@npm:30.2.0"
dependencies:
- "@jest/types": "npm:^29.6.3"
- camelcase: "npm:^6.2.0"
- chalk: "npm:^4.0.0"
- jest-get-type: "npm:^29.6.3"
+ "@jest/get-type": "npm:30.1.0"
+ "@jest/types": "npm:30.2.0"
+ camelcase: "npm:^6.3.0"
+ chalk: "npm:^4.1.2"
leven: "npm:^3.1.0"
- pretty-format: "npm:^29.7.0"
- checksum: 10/8ee1163666d8eaa16d90a989edba2b4a3c8ab0ffaa95ad91b08ca42b015bfb70e164b247a5b17f9de32d096987cada63ed8491ab82761bfb9a28bc34b27ae161
+ pretty-format: "npm:30.2.0"
+ checksum: 10/61e66c6df29a1e181f8de063678dd2096bb52cc8a8ead3c9a3f853d54eca458ad04c7fb81931d9274affb67d0504a91a2a520456a139a26665810c3bf039b677
languageName: node
linkType: hard
-"jest-watcher@npm:^29.7.0":
- version: 29.7.0
- resolution: "jest-watcher@npm:29.7.0"
+"jest-watcher@npm:30.2.0":
+ version: 30.2.0
+ resolution: "jest-watcher@npm:30.2.0"
dependencies:
- "@jest/test-result": "npm:^29.7.0"
- "@jest/types": "npm:^29.6.3"
+ "@jest/test-result": "npm:30.2.0"
+ "@jest/types": "npm:30.2.0"
"@types/node": "npm:*"
- ansi-escapes: "npm:^4.2.1"
- chalk: "npm:^4.0.0"
+ ansi-escapes: "npm:^4.3.2"
+ chalk: "npm:^4.1.2"
emittery: "npm:^0.13.1"
- jest-util: "npm:^29.7.0"
- string-length: "npm:^4.0.1"
- checksum: 10/4f616e0345676631a7034b1d94971aaa719f0cd4a6041be2aa299be437ea047afd4fe05c48873b7963f5687a2f6c7cbf51244be8b14e313b97bfe32b1e127e55
+ jest-util: "npm:30.2.0"
+ string-length: "npm:^4.0.2"
+ checksum: 10/fa38d06dcc59dbbd6a9ff22dea499d3c81ed376d9993b82d01797a99bf466d48641a99b9f3670a4b5480ca31144c5e017b96b7059e4d7541358fb48cf517a2db
languageName: node
linkType: hard
@@ -35466,6 +35690,19 @@ __metadata:
languageName: node
linkType: hard
+"jest-worker@npm:30.2.0":
+ version: 30.2.0
+ resolution: "jest-worker@npm:30.2.0"
+ dependencies:
+ "@types/node": "npm:*"
+ "@ungap/structured-clone": "npm:^1.3.0"
+ jest-util: "npm:30.2.0"
+ merge-stream: "npm:^2.0.0"
+ supports-color: "npm:^8.1.1"
+ checksum: 10/9354b0c71c80173f673da6bbc0ddaad26e4395b06532f7332e0c1e93e855b873b10139b040e01eda77f3dc5a0b67613e2bd7c56c4947ee771acfc3611de2ca29
+ languageName: node
+ linkType: hard
+
"jest-worker@npm:^27.4.5":
version: 27.5.1
resolution: "jest-worker@npm:27.5.1"
@@ -35489,26 +35726,26 @@ __metadata:
languageName: node
linkType: hard
-"jest@npm:^29.7.0":
- version: 29.7.0
- resolution: "jest@npm:29.7.0"
+"jest@npm:^30.2.0":
+ version: 30.2.0
+ resolution: "jest@npm:30.2.0"
dependencies:
- "@jest/core": "npm:^29.7.0"
- "@jest/types": "npm:^29.6.3"
- import-local: "npm:^3.0.2"
- jest-cli: "npm:^29.7.0"
+ "@jest/core": "npm:30.2.0"
+ "@jest/types": "npm:30.2.0"
+ import-local: "npm:^3.2.0"
+ jest-cli: "npm:30.2.0"
peerDependencies:
node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
peerDependenciesMeta:
node-notifier:
optional: true
bin:
- jest: bin/jest.js
- checksum: 10/97023d78446098c586faaa467fbf2c6b07ff06e2c85a19e3926adb5b0effe9ac60c4913ae03e2719f9c01ae8ffd8d92f6b262cedb9555ceeb5d19263d8c6362a
+ jest: ./bin/jest.js
+ checksum: 10/61c9d100750e4354cd7305d1f3ba253ffde4deaf12cb4be4d42d54f2dd5986e383a39c4a8691dbdc3839c69094a52413ed36f1886540ac37b71914a990b810d0
languageName: node
linkType: hard
-"jiti@npm:^2.0.0, jiti@npm:^2.4.2":
+"jiti@npm:^2.0.0, jiti@npm:^2.6.0":
version: 2.6.1
resolution: "jiti@npm:2.6.1"
bin:
@@ -35539,23 +35776,23 @@ __metadata:
linkType: hard
"jose@npm:^5.0.0":
- version: 5.8.0
- resolution: "jose@npm:5.8.0"
- checksum: 10/d5a11135754aeb7e3dcfbfb33ae1087541a081002cedb533e4705a9d71237a2c22f21085a291a0847939257a7b2f2374b589d306be17c3330049aefb62719c5e
+ version: 5.10.0
+ resolution: "jose@npm:5.10.0"
+ checksum: 10/03881d1dfb390dcf50926402edcfe233bf557b5a77321fcb1bdb53453bc1cdd26d2d0a9ab28c7445cbb826881f84fdf5074179700f10c2711ccb9880f51065d7
languageName: node
linkType: hard
-"jose@npm:^6.0.10":
- version: 6.0.10
- resolution: "jose@npm:6.0.10"
- checksum: 10/8ba0d1aca94bdf780247c737328114fab3e394e1531e881dfe3fdd1d4a293b08cf7c0242769e72c8c8eee15c95761b542cf10730c3dfbb108084762df7d25cec
+"jose@npm:^6.0.10, jose@npm:^6.1.1":
+ version: 6.1.3
+ resolution: "jose@npm:6.1.3"
+ checksum: 10/9626c51e8c3792b505e954f3094698c182208617b62dfb27269230f31e57560b083985ed8128b8a9753aa92daf18d3a2341cc826d149503f14569abe87d42389
languageName: node
linkType: hard
"js-base64@npm:^3.6.0":
- version: 3.7.7
- resolution: "js-base64@npm:3.7.7"
- checksum: 10/185e34c536a6b1c4e1ad8bd96d25b49a9ea4e6803e259eaaaca95f1b392a0d590b2933c5ca8580c776f7279507944b81ff1faf889d84baa5e31f026e96d676a5
+ version: 3.7.8
+ resolution: "js-base64@npm:3.7.8"
+ checksum: 10/4baa9a222bc094b072933e4894735653b59992477c731879784e3112f21862b08dd5c56b8b23b0b8e43bc5bb514d957621d1892a6c58950f29e12b731fe087b6
languageName: node
linkType: hard
@@ -35594,30 +35831,7 @@ __metadata:
languageName: node
linkType: hard
-"js-yaml@npm:=4.1.0":
- version: 4.1.0
- resolution: "js-yaml@npm:4.1.0"
- dependencies:
- argparse: "npm:^2.0.1"
- bin:
- js-yaml: bin/js-yaml.js
- checksum: 10/c138a34a3fd0d08ebaf71273ad4465569a483b8a639e0b118ff65698d257c2791d3199e3f303631f2cb98213fa7b5f5d6a4621fd0fff819421b990d30d967140
- languageName: node
- linkType: hard
-
-"js-yaml@npm:^3.10.0, js-yaml@npm:^3.13.0, js-yaml@npm:^3.13.1, js-yaml@npm:^3.6.1, js-yaml@npm:^3.8.3":
- version: 3.14.1
- resolution: "js-yaml@npm:3.14.1"
- dependencies:
- argparse: "npm:^1.0.7"
- esprima: "npm:^4.0.0"
- bin:
- js-yaml: bin/js-yaml.js
- checksum: 10/9e22d80b4d0105b9899135365f746d47466ed53ef4223c529b3c0f7a39907743fdbd3c4379f94f1106f02755b5e90b2faaf84801a891135544e1ea475d1a1379
- languageName: node
- linkType: hard
-
-"js-yaml@npm:^4.0.0, js-yaml@npm:^4.1.0, js-yaml@npm:^4.1.1, js-yaml@npm:~4.1.0":
+"js-yaml@npm:=4.1.1, js-yaml@npm:^4.0.0, js-yaml@npm:^4.1.0, js-yaml@npm:^4.1.1, js-yaml@npm:~4.1.0":
version: 4.1.1
resolution: "js-yaml@npm:4.1.1"
dependencies:
@@ -35628,6 +35842,18 @@ __metadata:
languageName: node
linkType: hard
+"js-yaml@npm:^3.10.0, js-yaml@npm:^3.13.0, js-yaml@npm:^3.13.1, js-yaml@npm:^3.6.1, js-yaml@npm:^3.8.3":
+ version: 3.14.2
+ resolution: "js-yaml@npm:3.14.2"
+ dependencies:
+ argparse: "npm:^1.0.7"
+ esprima: "npm:^4.0.0"
+ bin:
+ js-yaml: bin/js-yaml.js
+ checksum: 10/172e0b6007b0bf0fc8d2469c94424f7dd765c64a047d2b790831fecef2204a4054eabf4d911eb73ab8c9a3256ab8ba1ee8d655b789bf24bf059c772acc2075a1
+ languageName: node
+ linkType: hard
+
"jsbn@npm:1.1.0, jsbn@npm:^1.1.0":
version: 1.1.0
resolution: "jsbn@npm:1.1.0"
@@ -35690,46 +35916,6 @@ __metadata:
languageName: node
linkType: hard
-"jsdom@npm:^20.0.0":
- version: 20.0.0
- resolution: "jsdom@npm:20.0.0"
- dependencies:
- abab: "npm:^2.0.6"
- acorn: "npm:^8.7.1"
- acorn-globals: "npm:^6.0.0"
- cssom: "npm:^0.5.0"
- cssstyle: "npm:^2.3.0"
- data-urls: "npm:^3.0.2"
- decimal.js: "npm:^10.3.1"
- domexception: "npm:^4.0.0"
- escodegen: "npm:^2.0.0"
- form-data: "npm:^4.0.0"
- html-encoding-sniffer: "npm:^3.0.0"
- http-proxy-agent: "npm:^5.0.0"
- https-proxy-agent: "npm:^5.0.1"
- is-potential-custom-element-name: "npm:^1.0.1"
- nwsapi: "npm:^2.2.0"
- parse5: "npm:^7.0.0"
- saxes: "npm:^6.0.0"
- symbol-tree: "npm:^3.2.4"
- tough-cookie: "npm:^4.0.0"
- w3c-hr-time: "npm:^1.0.2"
- w3c-xmlserializer: "npm:^3.0.0"
- webidl-conversions: "npm:^7.0.0"
- whatwg-encoding: "npm:^2.0.0"
- whatwg-mimetype: "npm:^3.0.0"
- whatwg-url: "npm:^11.0.0"
- ws: "npm:^8.8.0"
- xml-name-validator: "npm:^4.0.0"
- peerDependencies:
- canvas: ^2.5.0
- peerDependenciesMeta:
- canvas:
- optional: true
- checksum: 10/5492ef8f496183bbce738977a0fb43b57a269d9d79fe12ea03d33ce9821a5ef54cb1580b94a662bf2d5ba463790fb61a9e892a87eb95d02e72bdf4068280a737
- languageName: node
- linkType: hard
-
"jsdom@npm:^25.0.1":
version: 25.0.1
resolution: "jsdom@npm:25.0.1"
@@ -35764,6 +35950,39 @@ __metadata:
languageName: node
linkType: hard
+"jsdom@npm:^27.1.0":
+ version: 27.3.0
+ resolution: "jsdom@npm:27.3.0"
+ dependencies:
+ "@acemir/cssom": "npm:^0.9.28"
+ "@asamuzakjp/dom-selector": "npm:^6.7.6"
+ cssstyle: "npm:^5.3.4"
+ data-urls: "npm:^6.0.0"
+ decimal.js: "npm:^10.6.0"
+ html-encoding-sniffer: "npm:^4.0.0"
+ http-proxy-agent: "npm:^7.0.2"
+ https-proxy-agent: "npm:^7.0.6"
+ is-potential-custom-element-name: "npm:^1.0.1"
+ parse5: "npm:^8.0.0"
+ saxes: "npm:^6.0.0"
+ symbol-tree: "npm:^3.2.4"
+ tough-cookie: "npm:^6.0.0"
+ w3c-xmlserializer: "npm:^5.0.0"
+ webidl-conversions: "npm:^8.0.0"
+ whatwg-encoding: "npm:^3.1.1"
+ whatwg-mimetype: "npm:^4.0.0"
+ whatwg-url: "npm:^15.1.0"
+ ws: "npm:^8.18.3"
+ xml-name-validator: "npm:^5.0.0"
+ peerDependencies:
+ canvas: ^3.0.0
+ peerDependenciesMeta:
+ canvas:
+ optional: true
+ checksum: 10/c650e954df04a80e7309984450ce764ae2a840810b9575b20204194dee3c5cff42e65526519cb58b946ffe66a058b7b763bad4814b3903a9c86a2c1651b8b74b
+ languageName: node
+ linkType: hard
+
"jsep@npm:^1.2.0, jsep@npm:^1.3.6, jsep@npm:^1.4.0":
version: 1.4.0
resolution: "jsep@npm:1.4.0"
@@ -36209,45 +36428,45 @@ __metadata:
languageName: node
linkType: hard
-"jwa@npm:^1.4.1":
- version: 1.4.1
- resolution: "jwa@npm:1.4.1"
+"jwa@npm:^1.4.2":
+ version: 1.4.2
+ resolution: "jwa@npm:1.4.2"
dependencies:
- buffer-equal-constant-time: "npm:1.0.1"
+ buffer-equal-constant-time: "npm:^1.0.1"
ecdsa-sig-formatter: "npm:1.0.11"
safe-buffer: "npm:^5.0.1"
- checksum: 10/0bc002b71dd70480fedc7d442a4d2b9185a9947352a027dcb4935864ad2323c57b5d391adf968a3622b61e940cef4f3484d5813b95864539272d41cac145d6f3
+ checksum: 10/a46c9ddbcc226d9e85e13ef96328c7d331abddd66b5a55ec44bcf4350464a6125385ac9c1e64faa0fae8d586d90a14d6b5e96c73f0388970a3918d5252efb0f3
languageName: node
linkType: hard
-"jwa@npm:^2.0.0":
- version: 2.0.0
- resolution: "jwa@npm:2.0.0"
+"jwa@npm:^2.0.1":
+ version: 2.0.1
+ resolution: "jwa@npm:2.0.1"
dependencies:
- buffer-equal-constant-time: "npm:1.0.1"
+ buffer-equal-constant-time: "npm:^1.0.1"
ecdsa-sig-formatter: "npm:1.0.11"
safe-buffer: "npm:^5.0.1"
- checksum: 10/ab983f6685d99d13ddfbffef9b1c66309a536362a8412d49ba6e687d834a1240ce39290f30ac7dbe241e0ab6c76fee7ff795776ce534e11d148158c9b7193498
+ checksum: 10/b04312a1de85f912b96aa3a7211717b8336945fab5b4f7cbc7800f4c80934060c0a3111576fad8d76e41ad62887d6da4b21fd4c47e45c174197f8be7dc0c1694
languageName: node
linkType: hard
"jws@npm:^3.2.2":
- version: 3.2.2
- resolution: "jws@npm:3.2.2"
+ version: 3.2.3
+ resolution: "jws@npm:3.2.3"
dependencies:
- jwa: "npm:^1.4.1"
+ jwa: "npm:^1.4.2"
safe-buffer: "npm:^5.0.1"
- checksum: 10/70b016974af8a76d25030c80a0097b24ed5b17a9cf10f43b163c11cb4eb248d5d04a3fe48c0d724d2884c32879d878ccad7be0663720f46b464f662f7ed778fe
+ checksum: 10/707387dd1cabcc3d9c2818f773cfaac7ede66e79ca11bbd159285a88cf5d8e8f355afcb8ee373e7bb0fcf9b7a2df015b22c50f27842f2c77453f04cd9f8f4009
languageName: node
linkType: hard
"jws@npm:^4.0.0":
- version: 4.0.0
- resolution: "jws@npm:4.0.0"
+ version: 4.0.1
+ resolution: "jws@npm:4.0.1"
dependencies:
- jwa: "npm:^2.0.0"
+ jwa: "npm:^2.0.1"
safe-buffer: "npm:^5.0.1"
- checksum: 10/1d15f4cdea376c6bd6a81002bd2cb0bf3d51d83da8f0727947b5ba3e10cf366721b8c0d099bf8c1eb99eb036e2c55e5fd5efd378ccff75a2b4e0bd10002348b9
+ checksum: 10/75d7b157489fa9a72023712c58a7a7706c7e2b10eec27fabd3bb9cae0c9e492251ab72527d20a8a5f5726196f0508c320c643fddff7076657f6bca16d0ceeeeb
languageName: node
linkType: hard
@@ -36275,11 +36494,11 @@ __metadata:
linkType: hard
"keyv@npm:*, keyv@npm:^5.2.1":
- version: 5.3.4
- resolution: "keyv@npm:5.3.4"
+ version: 5.5.5
+ resolution: "keyv@npm:5.5.5"
dependencies:
- "@keyv/serialize": "npm:^1.0.3"
- checksum: 10/3e294eb1168af78ad3430d0cc47b6839fd3e70593238d35226a0a1e4094abe397ea378b7bce35cfcb314e55b5d1b4fcdae3c19bee5610e78d283b3cb5b279c8b
+ "@keyv/serialize": "npm:^1.1.1"
+ checksum: 10/4bbc2119151d67bfc04d3a08fc98f4efac5e171e8c99519fc7bc9ae9e05df4d1c6c835a5d133d563ed109a20db4688f3f9738400cbd3674f6303cdfc4490d429
languageName: node
linkType: hard
@@ -36372,32 +36591,28 @@ __metadata:
linkType: hard
"knip@npm:^5.42.0":
- version: 5.42.2
- resolution: "knip@npm:5.42.2"
+ version: 5.71.0
+ resolution: "knip@npm:5.71.0"
dependencies:
- "@nodelib/fs.walk": "npm:3.0.1"
- "@snyk/github-codeowners": "npm:1.1.0"
- easy-table: "npm:1.2.0"
- enhanced-resolve: "npm:^5.18.0"
+ "@nodelib/fs.walk": "npm:^1.2.3"
fast-glob: "npm:^3.3.3"
- jiti: "npm:^2.4.2"
- js-yaml: "npm:^4.1.0"
+ formatly: "npm:^0.3.0"
+ jiti: "npm:^2.6.0"
+ js-yaml: "npm:^4.1.1"
minimist: "npm:^1.2.8"
- picocolors: "npm:^1.1.0"
+ oxc-resolver: "npm:^11.13.2"
+ picocolors: "npm:^1.1.1"
picomatch: "npm:^4.0.1"
- pretty-ms: "npm:^9.0.0"
- smol-toml: "npm:^1.3.1"
- strip-json-comments: "npm:5.0.1"
- summary: "npm:2.1.0"
- zod: "npm:^3.22.4"
- zod-validation-error: "npm:^3.0.3"
+ smol-toml: "npm:^1.5.2"
+ strip-json-comments: "npm:5.0.3"
+ zod: "npm:^4.1.11"
peerDependencies:
"@types/node": ">=18"
- typescript: ">=5.0.4"
+ typescript: ">=5.0.4 <7"
bin:
knip: bin/knip.js
knip-bun: bin/knip-bun.js
- checksum: 10/1e540ad66e8e5cd2dfceb0c333ca46446300f4e40a51599ca6cd8de705bf0f928332ca108de28306ae7b54cc8fc1f66667135193baf32d4ccd30560797825935
+ checksum: 10/68c1508be9db70865559f5ebc106f8a6aced8e4799949655e92a59fbb3f530c042087e50565cfdd698b619f69f584ee214cc7b315f3241d483d09e4fd200c45b
languageName: node
linkType: hard
@@ -36450,14 +36665,14 @@ __metadata:
linkType: hard
"kubernetes-models@npm:^4.1.0, kubernetes-models@npm:^4.3.1":
- version: 4.4.2
- resolution: "kubernetes-models@npm:4.4.2"
+ version: 4.5.1
+ resolution: "kubernetes-models@npm:4.5.1"
dependencies:
- "@kubernetes-models/apimachinery": "npm:^2.0.2"
+ "@kubernetes-models/apimachinery": "npm:^2.2.0"
"@kubernetes-models/base": "npm:^5.0.1"
"@kubernetes-models/validate": "npm:^4.0.0"
"@swc/helpers": "npm:^0.5.8"
- checksum: 10/67956c3be831d02a0de3742809f1f8c89382eb11a9d66e7161f314413a1ddfce963513aa4eeba451a07a814b2f2afa959984a891f6e504e23e12825285a70a4e
+ checksum: 10/65a7b2064dcfbc719a80da7fd24b44775f68423170eb7abef3d4946604acdb5c8a3b2c8fded1d7212e2725b10ccf13abc94adf3091dc8005e25cd5321577ae92
languageName: node
linkType: hard
@@ -36513,15 +36728,15 @@ __metadata:
linkType: hard
"ldapts@npm:^8.0.6":
- version: 8.0.16
- resolution: "ldapts@npm:8.0.16"
+ version: 8.0.25
+ resolution: "ldapts@npm:8.0.25"
dependencies:
"@types/asn1": "npm:>=0.2.4"
asn1: "npm:0.2.6"
debug: "npm:4.4.3"
strict-event-emitter-types: "npm:2.0.0"
whatwg-url: "npm:15.1.0"
- checksum: 10/06f4780f9fccdcfbb1610bb1cd119e3ac6bf6355c364ac0f8f287d43b9dc0ee82ad7347383864136a1c211d60b5a594787acae9fcf01fb4c9214879962b882a6
+ checksum: 10/75fb390d5b4154b2d8c5da11e9d8123b1ae1bf50842a62a99309b90e96529939e2816c36f250dc6fb8e6f248e5da8012fe61522c058fe767f2429645649e51f5
languageName: node
linkType: hard
@@ -36593,92 +36808,102 @@ __metadata:
languageName: node
linkType: hard
-"lightningcss-darwin-arm64@npm:1.30.1":
- version: 1.30.1
- resolution: "lightningcss-darwin-arm64@npm:1.30.1"
+"lightningcss-android-arm64@npm:1.30.2":
+ version: 1.30.2
+ resolution: "lightningcss-android-arm64@npm:1.30.2"
+ conditions: os=android & cpu=arm64
+ languageName: node
+ linkType: hard
+
+"lightningcss-darwin-arm64@npm:1.30.2":
+ version: 1.30.2
+ resolution: "lightningcss-darwin-arm64@npm:1.30.2"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard
-"lightningcss-darwin-x64@npm:1.30.1":
- version: 1.30.1
- resolution: "lightningcss-darwin-x64@npm:1.30.1"
+"lightningcss-darwin-x64@npm:1.30.2":
+ version: 1.30.2
+ resolution: "lightningcss-darwin-x64@npm:1.30.2"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard
-"lightningcss-freebsd-x64@npm:1.30.1":
- version: 1.30.1
- resolution: "lightningcss-freebsd-x64@npm:1.30.1"
+"lightningcss-freebsd-x64@npm:1.30.2":
+ version: 1.30.2
+ resolution: "lightningcss-freebsd-x64@npm:1.30.2"
conditions: os=freebsd & cpu=x64
languageName: node
linkType: hard
-"lightningcss-linux-arm-gnueabihf@npm:1.30.1":
- version: 1.30.1
- resolution: "lightningcss-linux-arm-gnueabihf@npm:1.30.1"
+"lightningcss-linux-arm-gnueabihf@npm:1.30.2":
+ version: 1.30.2
+ resolution: "lightningcss-linux-arm-gnueabihf@npm:1.30.2"
conditions: os=linux & cpu=arm
languageName: node
linkType: hard
-"lightningcss-linux-arm64-gnu@npm:1.30.1":
- version: 1.30.1
- resolution: "lightningcss-linux-arm64-gnu@npm:1.30.1"
+"lightningcss-linux-arm64-gnu@npm:1.30.2":
+ version: 1.30.2
+ resolution: "lightningcss-linux-arm64-gnu@npm:1.30.2"
conditions: os=linux & cpu=arm64 & libc=glibc
languageName: node
linkType: hard
-"lightningcss-linux-arm64-musl@npm:1.30.1":
- version: 1.30.1
- resolution: "lightningcss-linux-arm64-musl@npm:1.30.1"
+"lightningcss-linux-arm64-musl@npm:1.30.2":
+ version: 1.30.2
+ resolution: "lightningcss-linux-arm64-musl@npm:1.30.2"
conditions: os=linux & cpu=arm64 & libc=musl
languageName: node
linkType: hard
-"lightningcss-linux-x64-gnu@npm:1.30.1":
- version: 1.30.1
- resolution: "lightningcss-linux-x64-gnu@npm:1.30.1"
+"lightningcss-linux-x64-gnu@npm:1.30.2":
+ version: 1.30.2
+ resolution: "lightningcss-linux-x64-gnu@npm:1.30.2"
conditions: os=linux & cpu=x64 & libc=glibc
languageName: node
linkType: hard
-"lightningcss-linux-x64-musl@npm:1.30.1":
- version: 1.30.1
- resolution: "lightningcss-linux-x64-musl@npm:1.30.1"
+"lightningcss-linux-x64-musl@npm:1.30.2":
+ version: 1.30.2
+ resolution: "lightningcss-linux-x64-musl@npm:1.30.2"
conditions: os=linux & cpu=x64 & libc=musl
languageName: node
linkType: hard
-"lightningcss-win32-arm64-msvc@npm:1.30.1":
- version: 1.30.1
- resolution: "lightningcss-win32-arm64-msvc@npm:1.30.1"
+"lightningcss-win32-arm64-msvc@npm:1.30.2":
+ version: 1.30.2
+ resolution: "lightningcss-win32-arm64-msvc@npm:1.30.2"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard
-"lightningcss-win32-x64-msvc@npm:1.30.1":
- version: 1.30.1
- resolution: "lightningcss-win32-x64-msvc@npm:1.30.1"
+"lightningcss-win32-x64-msvc@npm:1.30.2":
+ version: 1.30.2
+ resolution: "lightningcss-win32-x64-msvc@npm:1.30.2"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard
"lightningcss@npm:^1.29.1":
- version: 1.30.1
- resolution: "lightningcss@npm:1.30.1"
+ version: 1.30.2
+ resolution: "lightningcss@npm:1.30.2"
dependencies:
detect-libc: "npm:^2.0.3"
- lightningcss-darwin-arm64: "npm:1.30.1"
- lightningcss-darwin-x64: "npm:1.30.1"
- lightningcss-freebsd-x64: "npm:1.30.1"
- lightningcss-linux-arm-gnueabihf: "npm:1.30.1"
- lightningcss-linux-arm64-gnu: "npm:1.30.1"
- lightningcss-linux-arm64-musl: "npm:1.30.1"
- lightningcss-linux-x64-gnu: "npm:1.30.1"
- lightningcss-linux-x64-musl: "npm:1.30.1"
- lightningcss-win32-arm64-msvc: "npm:1.30.1"
- lightningcss-win32-x64-msvc: "npm:1.30.1"
+ lightningcss-android-arm64: "npm:1.30.2"
+ lightningcss-darwin-arm64: "npm:1.30.2"
+ lightningcss-darwin-x64: "npm:1.30.2"
+ lightningcss-freebsd-x64: "npm:1.30.2"
+ lightningcss-linux-arm-gnueabihf: "npm:1.30.2"
+ lightningcss-linux-arm64-gnu: "npm:1.30.2"
+ lightningcss-linux-arm64-musl: "npm:1.30.2"
+ lightningcss-linux-x64-gnu: "npm:1.30.2"
+ lightningcss-linux-x64-musl: "npm:1.30.2"
+ lightningcss-win32-arm64-msvc: "npm:1.30.2"
+ lightningcss-win32-x64-msvc: "npm:1.30.2"
dependenciesMeta:
+ lightningcss-android-arm64:
+ optional: true
lightningcss-darwin-arm64:
optional: true
lightningcss-darwin-x64:
@@ -36699,7 +36924,7 @@ __metadata:
optional: true
lightningcss-win32-x64-msvc:
optional: true
- checksum: 10/6c921135216cc498dfcb87e35dffe8432e99306cbd58009c598b1daf20c81cc14535abbd4c1066e5d1faf4080ed44a2995e8ecc343633db4897a2d041b76fb05
+ checksum: 10/d6cc06d9bac295589a49446e9c45a241dfa16f4f81a7318c26cbc0be3e189003ec0da5d9a0fd9bdffc63a3ce05878cc7329277eaac77a826e8b68c73dc96cfda
languageName: node
linkType: hard
@@ -36800,10 +37025,10 @@ __metadata:
languageName: node
linkType: hard
-"load-esm@npm:1.0.2":
- version: 1.0.2
- resolution: "load-esm@npm:1.0.2"
- checksum: 10/1b4adb40c28c6fdbd4ca8c97942c04debddb3c93ae91413540ff5a21ca3511a651988c835cb80cad7288d1ecb869c4794b8a787ab02e09cc07ec951ad1eefcf9
+"load-esm@npm:1.0.3":
+ version: 1.0.3
+ resolution: "load-esm@npm:1.0.3"
+ checksum: 10/6949e8c253dddccca2a0ded1e9e0bbbc81924439d99e3a7d0f946ba6cdcd16de22c3cef28d997fd950befda0826ca65c3f913d9ba893d50e9cfc0bbd9a2a1e90
languageName: node
linkType: hard
@@ -36892,15 +37117,6 @@ __metadata:
languageName: node
linkType: hard
-"locate-path@npm:^7.2.0":
- version: 7.2.0
- resolution: "locate-path@npm:7.2.0"
- dependencies:
- p-locate: "npm:^6.0.0"
- checksum: 10/1c6d269d4efec555937081be964e8a9b4a136319c79ca1d45ac6382212a8466113c75bd89e44521ca8ecd1c47fb08523b56eee5c0712bc7d14fec5f729deeb42
- languageName: node
- linkType: hard
-
"lodash-es@npm:^4.17.21":
version: 4.17.21
resolution: "lodash-es@npm:4.17.21"
@@ -37027,20 +37243,6 @@ __metadata:
languageName: node
linkType: hard
-"lodash.hasin@npm:^4.5.2":
- version: 4.5.2
- resolution: "lodash.hasin@npm:4.5.2"
- checksum: 10/d491be2eb53bcd004ac7eeefdc072fe6b76c701088bf95e8ca406a0b00e45739507ca6ffbce3829bdc9bc13e034877a2bbc08229e3f24d4095c3aa75f927d96a
- languageName: node
- linkType: hard
-
-"lodash.head@npm:^4.0.1":
- version: 4.0.1
- resolution: "lodash.head@npm:4.0.1"
- checksum: 10/37666c4f96ad907025754a0e76db49adab148bd2d1a1f4597c4bf7a006d4daad802453e162dffe08d2a488c1283a29f5366c1fc3a1bd2300423c32b0ecb26156
- languageName: node
- linkType: hard
-
"lodash.isarguments@npm:^3.1.0":
version: 3.1.0
resolution: "lodash.isarguments@npm:3.1.0"
@@ -37069,20 +37271,6 @@ __metadata:
languageName: node
linkType: hard
-"lodash.isnil@npm:^4.0.0":
- version: 4.0.0
- resolution: "lodash.isnil@npm:4.0.0"
- checksum: 10/ebf8df69879badd6ad99c4f64c54c470248df5cf92b208ca730861b1d8ac058da7b632ac811d18b0929d93cbac8d8fc866e781ee816b0142c56952e85edc682f
- languageName: node
- linkType: hard
-
-"lodash.isobject@npm:^3.0.2":
- version: 3.0.2
- resolution: "lodash.isobject@npm:3.0.2"
- checksum: 10/6c1667cbc4494d0a13a3617a4b23278d6d02dac520311f2bbb43f16f2cf71d2e6eb9dec8057315b77459df4890c756a256a087d3f4baa44a79ab5d6c968b060e
- languageName: node
- linkType: hard
-
"lodash.isstring@npm:^4.0.1":
version: 4.0.1
resolution: "lodash.isstring@npm:4.0.1"
@@ -37292,7 +37480,7 @@ __metadata:
languageName: node
linkType: hard
-"logform@npm:^2.3.2, logform@npm:^2.6.0, logform@npm:^2.7.0":
+"logform@npm:^2.3.2, logform@npm:^2.7.0":
version: 2.7.0
resolution: "logform@npm:2.7.0"
dependencies:
@@ -37392,17 +37580,17 @@ __metadata:
languageName: node
linkType: hard
-"lru-cache@npm:^10.0.0, lru-cache@npm:^10.0.1, lru-cache@npm:^10.2.0":
+"lru-cache@npm:^10.0.0, lru-cache@npm:^10.0.1, lru-cache@npm:^10.2.0, lru-cache@npm:^10.4.3":
version: 10.4.3
resolution: "lru-cache@npm:10.4.3"
checksum: 10/e6e90267360476720fa8e83cc168aa2bf0311f3f2eea20a6ba78b90a885ae72071d9db132f40fda4129c803e7dcec3a6b6a6fbb44ca90b081630b810b5d6a41a
languageName: node
linkType: hard
-"lru-cache@npm:^11.0.0":
- version: 11.0.2
- resolution: "lru-cache@npm:11.0.2"
- checksum: 10/25fcb66e9d91eaf17227c6abfe526a7bed5903de74f93bfde380eb8a13410c5e8d3f14fe447293f3f322a7493adf6f9f015c6f1df7a235ff24ec30f366e1c058
+"lru-cache@npm:^11.0.0, lru-cache@npm:^11.2.2, lru-cache@npm:^11.2.4":
+ version: 11.2.4
+ resolution: "lru-cache@npm:11.2.4"
+ checksum: 10/3b2da74c0b6653767f8164c38c4c4f4d7f0cc10c62bfa512663d94a830191ae6a5af742a8d88a8b30d5f9974652d3adae53931f32069139ad24fa2a18a199aca
languageName: node
linkType: hard
@@ -37461,7 +37649,14 @@ __metadata:
languageName: node
linkType: hard
-"luxon@npm:^3.0.0, luxon@npm:^3.2.1, luxon@npm:^3.4.3, luxon@npm:^3.5.0, luxon@npm:~3.5.0":
+"luxon@npm:^3.0.0, luxon@npm:^3.2.1, luxon@npm:^3.4.3, luxon@npm:^3.5.0":
+ version: 3.7.2
+ resolution: "luxon@npm:3.7.2"
+ checksum: 10/b24cd205ed306ce7415991687897dcc4027921ae413c9116590bc33a95f93b86ce52cf74ba72b4f5c5ab1c10090517f54ac8edfb127c049e0bf55b90dc2260be
+ languageName: node
+ linkType: hard
+
+"luxon@npm:~3.5.0":
version: 3.5.0
resolution: "luxon@npm:3.5.0"
checksum: 10/48f86e6c1c96815139f8559456a3354a276ba79bcef0ae0d4f2172f7652f3ba2be2237b0e103b8ea0b79b47715354ac9fac04eb1db3485dcc72d5110491dd47f
@@ -37513,7 +37708,7 @@ __metadata:
languageName: node
linkType: hard
-"magic-string@npm:^0.30.0, magic-string@npm:^0.30.10, magic-string@npm:^0.30.17, magic-string@npm:^0.30.3":
+"magic-string@npm:^0.30.0, magic-string@npm:^0.30.17, magic-string@npm:^0.30.21, magic-string@npm:^0.30.3":
version: 0.30.21
resolution: "magic-string@npm:0.30.21"
dependencies:
@@ -37936,6 +38131,13 @@ __metadata:
languageName: node
linkType: hard
+"mdn-data@npm:2.12.2":
+ version: 2.12.2
+ resolution: "mdn-data@npm:2.12.2"
+ checksum: 10/854e41715a9358e69f9a530117cd6ca7e71d06176469de8d70b1e629753b6827f5bd730995c16ad3750f3c9bad92230f8e4e178de2b34926b05f5205d27d76af
+ languageName: node
+ linkType: hard
+
"mdurl@npm:^1.0.0, mdurl@npm:^1.0.1":
version: 1.0.1
resolution: "mdurl@npm:1.0.1"
@@ -38018,7 +38220,7 @@ __metadata:
languageName: node
linkType: hard
-"memfs@npm:^4.28.0, memfs@npm:^4.6.0":
+"memfs@npm:^4.51.1, memfs@npm:^4.6.0":
version: 4.51.1
resolution: "memfs@npm:4.51.1"
dependencies:
@@ -38117,8 +38319,8 @@ __metadata:
linkType: hard
"micromark-core-commonmark@npm:^1.0.0, micromark-core-commonmark@npm:^1.0.1":
- version: 1.0.6
- resolution: "micromark-core-commonmark@npm:1.0.6"
+ version: 1.1.0
+ resolution: "micromark-core-commonmark@npm:1.1.0"
dependencies:
decode-named-character-reference: "npm:^1.0.0"
micromark-factory-destination: "npm:^1.0.0"
@@ -38136,25 +38338,25 @@ __metadata:
micromark-util-symbol: "npm:^1.0.0"
micromark-util-types: "npm:^1.0.1"
uvu: "npm:^0.5.0"
- checksum: 10/20daa4b78b88afea7658c2bd428c830734c72fbb2184c1f0761bb4c1e5fcf266509e7d46ad5f7b2a2aeb32cd17951788733cad458632457b52397534d930030a
+ checksum: 10/a73694d223ac8baad8ff00597a3c39d61f5b32bfd56fe4bcf295d75b2a4e8e67fb2edbfc7cc287b362b9d7f6d24fce08b6a7e8b5b155d79bcc1e4d9b2756ffb2
languageName: node
linkType: hard
"micromark-extension-gfm-autolink-literal@npm:^1.0.0":
- version: 1.0.0
- resolution: "micromark-extension-gfm-autolink-literal@npm:1.0.0"
+ version: 1.0.5
+ resolution: "micromark-extension-gfm-autolink-literal@npm:1.0.5"
dependencies:
micromark-util-character: "npm:^1.0.0"
micromark-util-sanitize-uri: "npm:^1.0.0"
micromark-util-symbol: "npm:^1.0.0"
micromark-util-types: "npm:^1.0.0"
- checksum: 10/4bb5841980725bbbe59b311b5b5efbab74b363da00669b96e7744ea76532d972720d1ce92a024baeafbac2c92dbf90b5595a18212415a59ced7610202304ce13
+ checksum: 10/1e0ccc758baef3cd0478ba84ff86fa1ec2b389042421c7cade9485b775456c1a9c3bd797393002b2c6f6abd9bdf829cb114874557bbcb8e43d16d06a464811c0
languageName: node
linkType: hard
"micromark-extension-gfm-footnote@npm:^1.0.0":
- version: 1.0.3
- resolution: "micromark-extension-gfm-footnote@npm:1.0.3"
+ version: 1.1.2
+ resolution: "micromark-extension-gfm-footnote@npm:1.1.2"
dependencies:
micromark-core-commonmark: "npm:^1.0.0"
micromark-factory-space: "npm:^1.0.0"
@@ -38162,60 +38364,64 @@ __metadata:
micromark-util-normalize-identifier: "npm:^1.0.0"
micromark-util-sanitize-uri: "npm:^1.0.0"
micromark-util-symbol: "npm:^1.0.0"
+ micromark-util-types: "npm:^1.0.0"
uvu: "npm:^0.5.0"
- checksum: 10/1e8920582a2d365eebe48239daaeade3b88d7f6b800f1dd7e7b0d6add730105048d7d1fd68138955b397d572d410c280345560e407328c07fa334e17a965a578
+ checksum: 10/8777073fb76d2fd01f6b2405106af6c349c1e25660c4d37cadcc61c187d71c8444870f73cefaaa67f12884d5e45c78ee3c5583561a0b330bd91c6d997113584a
languageName: node
linkType: hard
"micromark-extension-gfm-strikethrough@npm:^1.0.0":
- version: 1.0.1
- resolution: "micromark-extension-gfm-strikethrough@npm:1.0.1"
+ version: 1.0.7
+ resolution: "micromark-extension-gfm-strikethrough@npm:1.0.7"
dependencies:
micromark-util-chunked: "npm:^1.0.0"
micromark-util-classify-character: "npm:^1.0.0"
micromark-util-resolve-all: "npm:^1.0.0"
micromark-util-symbol: "npm:^1.0.0"
micromark-util-types: "npm:^1.0.0"
- checksum: 10/720aa4e47ac4701faf5640be40a97a249b880d5f8f2787106a0d12bd11dd8ab9e29a513af738743be07d42a02734e024184114b719435160e012c4ba9f7464bd
+ uvu: "npm:^0.5.0"
+ checksum: 10/8411ef1aa5dc83f662e8b45b085f70ddff29deb3c4259269e8a1ff656397abb755d8ea841a14be23e8585a31d3c0a5de1bd2c05f3453b66670e499d4a0004f5e
languageName: node
linkType: hard
"micromark-extension-gfm-table@npm:^1.0.0":
- version: 1.0.0
- resolution: "micromark-extension-gfm-table@npm:1.0.0"
+ version: 1.0.7
+ resolution: "micromark-extension-gfm-table@npm:1.0.7"
dependencies:
micromark-factory-space: "npm:^1.0.0"
micromark-util-character: "npm:^1.0.0"
micromark-util-symbol: "npm:^1.0.0"
micromark-util-types: "npm:^1.0.0"
- checksum: 10/220e2d5c66e4dcd8565cc067d584136fc91dbf249bcee69c6a6cb5656b536144d29734d922602bdfd82242dad2a3d128b25f57e93c50091fd96d7071618eedd9
+ uvu: "npm:^0.5.0"
+ checksum: 10/f05d86a099c941a2a309d60bf4839d16a00a93cb880cda4ab8faeb831647763fff6e03197ec15b80e1f195002afcca6afe2b95c3622b049b82d7ff8ef1c1c776
languageName: node
linkType: hard
"micromark-extension-gfm-tagfilter@npm:^1.0.0":
- version: 1.0.0
- resolution: "micromark-extension-gfm-tagfilter@npm:1.0.0"
+ version: 1.0.2
+ resolution: "micromark-extension-gfm-tagfilter@npm:1.0.2"
dependencies:
micromark-util-types: "npm:^1.0.0"
- checksum: 10/2950168c4329486da0d411afebae47601dbbdb8ba51892d88ef451dd62e4d412afaba267f1e4a1d0c93b1b25723cfcdcbb013c458f652e8ab2a1046dd1b5c352
+ checksum: 10/55c7d9019d6a39efaaed2c2e40b0aaa137d2c4f9c94cac82e93f509a806c3a775e4c815b5d8e986617450b68861a19776e4b886307e83db452b393f15a837b39
languageName: node
linkType: hard
"micromark-extension-gfm-task-list-item@npm:^1.0.0":
- version: 1.0.0
- resolution: "micromark-extension-gfm-task-list-item@npm:1.0.0"
+ version: 1.0.5
+ resolution: "micromark-extension-gfm-task-list-item@npm:1.0.5"
dependencies:
micromark-factory-space: "npm:^1.0.0"
micromark-util-character: "npm:^1.0.0"
micromark-util-symbol: "npm:^1.0.0"
micromark-util-types: "npm:^1.0.0"
- checksum: 10/a8bc41ce4c5599cde45804737381ca5136b43c64c05034e396e476958232916d3bc23e585d3f71c59f03666c568bced41f177a76497267259b813ab4987dd3a5
+ uvu: "npm:^0.5.0"
+ checksum: 10/46bb1baa10bfb785a2e3e2f975e5509260b9995d5c3aeddf77051957d218ce1af4ea737bcb6a56a930e62d42b05307b20632a400eff25cdb290789ff3170cad5
languageName: node
linkType: hard
"micromark-extension-gfm@npm:^2.0.0":
- version: 2.0.1
- resolution: "micromark-extension-gfm@npm:2.0.1"
+ version: 2.0.3
+ resolution: "micromark-extension-gfm@npm:2.0.3"
dependencies:
micromark-extension-gfm-autolink-literal: "npm:^1.0.0"
micromark-extension-gfm-footnote: "npm:^1.0.0"
@@ -38225,200 +38431,204 @@ __metadata:
micromark-extension-gfm-task-list-item: "npm:^1.0.0"
micromark-util-combine-extensions: "npm:^1.0.0"
micromark-util-types: "npm:^1.0.0"
- checksum: 10/701d065102685a338c7eb87520587575dffbc240639a379c64f83971b3ffbeaf0165aa43ce72b0255856e991b395a5fc71dc436ec76d723f462a39ec16eade5e
+ checksum: 10/3ffd06ced4314abd0f0c72ec227f034f38dd47facbb62439ef3216d42f32433f3901d14675cf806e8d73689802a11849958b330bb5b55dd4fd5cdc64ebaf345c
languageName: node
linkType: hard
"micromark-factory-destination@npm:^1.0.0":
- version: 1.0.0
- resolution: "micromark-factory-destination@npm:1.0.0"
+ version: 1.1.0
+ resolution: "micromark-factory-destination@npm:1.1.0"
dependencies:
micromark-util-character: "npm:^1.0.0"
micromark-util-symbol: "npm:^1.0.0"
micromark-util-types: "npm:^1.0.0"
- checksum: 10/8e733ae9c1c2342f14ff290bf09946e20f6f540117d80342377a765cac48df2ea5e748f33c8b07501ad7a43414b1a6597c8510ede2052b6bf1251fab89748e20
+ checksum: 10/9e2b5fb5fedbf622b687e20d51eb3d56ae90c0e7ecc19b37bd5285ec392c1e56f6e21aa7cfcb3c01eda88df88fe528f3acb91a5f57d7f4cba310bc3cd7f824fa
languageName: node
linkType: hard
"micromark-factory-label@npm:^1.0.0":
- version: 1.0.0
- resolution: "micromark-factory-label@npm:1.0.0"
+ version: 1.1.0
+ resolution: "micromark-factory-label@npm:1.1.0"
dependencies:
micromark-util-character: "npm:^1.0.0"
micromark-util-symbol: "npm:^1.0.0"
micromark-util-types: "npm:^1.0.0"
- checksum: 10/37f34d8e42e3a606a636419ffe0f99fd7f6054778365aac56d1cc11585d1cd46000dbf938319abb2ea5e245803679d3cfa46afb5aecf2702bfd963113481f14c
+ uvu: "npm:^0.5.0"
+ checksum: 10/fcda48f1287d9b148c562c627418a2ab759cdeae9c8e017910a0cba94bb759a96611e1fc6df33182e97d28fbf191475237298983bb89ef07d5b02464b1ad28d5
languageName: node
linkType: hard
"micromark-factory-space@npm:^1.0.0":
- version: 1.0.0
- resolution: "micromark-factory-space@npm:1.0.0"
+ version: 1.1.0
+ resolution: "micromark-factory-space@npm:1.1.0"
dependencies:
micromark-util-character: "npm:^1.0.0"
micromark-util-types: "npm:^1.0.0"
- checksum: 10/70d3aafde4e68ef4e509a3b644e9a29e4aada00801279e346577b008cbca06d78051bcd62aa7ea7425856ed73f09abd2b36607803055f726f52607ee7cb706b0
+ checksum: 10/b58435076b998a7e244259a4694eb83c78915581206b6e7fc07b34c6abd36a1726ade63df8972fbf6c8fa38eecb9074f4e17be8d53f942e3b3d23d1a0ecaa941
languageName: node
linkType: hard
"micromark-factory-title@npm:^1.0.0":
- version: 1.0.0
- resolution: "micromark-factory-title@npm:1.0.0"
+ version: 1.1.0
+ resolution: "micromark-factory-title@npm:1.1.0"
dependencies:
micromark-factory-space: "npm:^1.0.0"
micromark-util-character: "npm:^1.0.0"
micromark-util-symbol: "npm:^1.0.0"
micromark-util-types: "npm:^1.0.0"
- checksum: 10/d9bf0779c49f013fea5fc5daadcee91e1703c81c1b5091337e806c24f1ea224d69f534d174aba2eccff7826620af71bb3db83b1caf14cbb89bea53f4e8e38bc3
+ checksum: 10/4432d3dbc828c81f483c5901b0c6591a85d65a9e33f7d96ba7c3ae821617a0b3237ff5faf53a9152d00aaf9afb3a9f185b205590f40ed754f1d9232e0e9157b1
languageName: node
linkType: hard
"micromark-factory-whitespace@npm:^1.0.0":
- version: 1.0.0
- resolution: "micromark-factory-whitespace@npm:1.0.0"
+ version: 1.1.0
+ resolution: "micromark-factory-whitespace@npm:1.1.0"
dependencies:
micromark-factory-space: "npm:^1.0.0"
micromark-util-character: "npm:^1.0.0"
micromark-util-symbol: "npm:^1.0.0"
micromark-util-types: "npm:^1.0.0"
- checksum: 10/0888386e6ea2dd665a5182c570d9b3d0a172d3f11694ca5a2a84e552149c9f1429f5b975ec26e1f0fa4388c55a656c9f359ce5e0603aff6175ba3e255076f20b
+ checksum: 10/ef0fa682c7d593d85a514ee329809dee27d10bc2a2b65217d8ef81173e33b8e83c549049764b1ad851adfe0a204dec5450d9d20a4ca8598f6c94533a73f73fcd
languageName: node
linkType: hard
"micromark-util-character@npm:^1.0.0":
- version: 1.1.0
- resolution: "micromark-util-character@npm:1.1.0"
+ version: 1.2.0
+ resolution: "micromark-util-character@npm:1.2.0"
dependencies:
micromark-util-symbol: "npm:^1.0.0"
micromark-util-types: "npm:^1.0.0"
- checksum: 10/81a1e4ee996e89966f58620088ca1ad49a6b1474fa488992be9b6f62d783d621c33f74c01f8560a2960412a43e83c7d991c711620ff3ee49169eb77de0bb2e3a
+ checksum: 10/88cf80f9b4c95266f24814ef587fb4180454668dcc3be4ac829e1227188cf349c8981bfca29e3eab1682f324c2c47544c0b0b799a26fbf9df5f156c6a84c970c
languageName: node
linkType: hard
"micromark-util-chunked@npm:^1.0.0":
- version: 1.0.0
- resolution: "micromark-util-chunked@npm:1.0.0"
+ version: 1.1.0
+ resolution: "micromark-util-chunked@npm:1.1.0"
dependencies:
micromark-util-symbol: "npm:^1.0.0"
- checksum: 10/c1efd56e8c4217bcf1c6f1a9fb9912b4a2a5503b00d031da902be922fb3fee60409ac53f11739991291357b2784fb0647ddfc74c94753a068646c0cb0fd71421
+ checksum: 10/c435bde9110cb595e3c61b7f54c2dc28ee03e6a57fa0fc1e67e498ad8bac61ee5a7457a2b6a73022ddc585676ede4b912d28dcf57eb3bd6951e54015e14dc20b
languageName: node
linkType: hard
"micromark-util-classify-character@npm:^1.0.0":
- version: 1.0.0
- resolution: "micromark-util-classify-character@npm:1.0.0"
+ version: 1.1.0
+ resolution: "micromark-util-classify-character@npm:1.1.0"
dependencies:
micromark-util-character: "npm:^1.0.0"
micromark-util-symbol: "npm:^1.0.0"
micromark-util-types: "npm:^1.0.0"
- checksum: 10/180446e6a1dec653f625ded028f244784e1db8d10ad05c5d70f08af9de393b4a03dc6cf6fa5ed8ccc9c24bbece7837abf3bf66681c0b4adf159364b7d5236dfd
+ checksum: 10/8499cb0bb1f7fb946f5896285fcca65cd742f66cd3e79ba7744792bd413ec46834f932a286de650349914d02e822946df3b55d03e6a8e1d245d1ddbd5102e5b0
languageName: node
linkType: hard
"micromark-util-combine-extensions@npm:^1.0.0":
- version: 1.0.0
- resolution: "micromark-util-combine-extensions@npm:1.0.0"
+ version: 1.1.0
+ resolution: "micromark-util-combine-extensions@npm:1.1.0"
dependencies:
micromark-util-chunked: "npm:^1.0.0"
micromark-util-types: "npm:^1.0.0"
- checksum: 10/5304a820ef75340e1be69d6ad167055b6ba9a3bafe8171e5945a935752f462415a9dd61eb3490220c055a8a11167209a45bfa73f278338b7d3d61fa1464d3f35
+ checksum: 10/ee78464f5d4b61ccb437850cd2d7da4d690b260bca4ca7a79c4bb70291b84f83988159e373b167181b6716cb197e309bc6e6c96a68cc3ba9d50c13652774aba9
languageName: node
linkType: hard
"micromark-util-decode-numeric-character-reference@npm:^1.0.0":
- version: 1.0.0
- resolution: "micromark-util-decode-numeric-character-reference@npm:1.0.0"
+ version: 1.1.0
+ resolution: "micromark-util-decode-numeric-character-reference@npm:1.1.0"
dependencies:
micromark-util-symbol: "npm:^1.0.0"
- checksum: 10/f3ae2bb582a80f1e9d3face026f585c0c472335c064bd850bde152376f0394cb2831746749b6be6e0160f7d73626f67d10716026c04c87f402c0dd45a1a28633
+ checksum: 10/4733fe75146e37611243f055fc6847137b66f0cde74d080e33bd26d0408c1d6f44cabc984063eee5968b133cb46855e729d555b9ff8d744652262b7b51feec73
languageName: node
linkType: hard
"micromark-util-decode-string@npm:^1.0.0":
- version: 1.0.0
- resolution: "micromark-util-decode-string@npm:1.0.0"
+ version: 1.1.0
+ resolution: "micromark-util-decode-string@npm:1.1.0"
dependencies:
+ decode-named-character-reference: "npm:^1.0.0"
micromark-util-character: "npm:^1.0.0"
micromark-util-decode-numeric-character-reference: "npm:^1.0.0"
- parse-entities: "npm:^3.0.0"
- checksum: 10/9c7e6e3950e675f39058935e065e8774a1ef26a0d386eb45abd96fb8c0312c8a72464c672f41a3c7668974ac2a7cb2ad23b84eee3775b0bd4c47947d9fc64888
+ micromark-util-symbol: "npm:^1.0.0"
+ checksum: 10/f1625155db452f15aa472918499689ba086b9c49d1322a08b22bfbcabe918c61b230a3002c8bc3ea9b1f52ca7a9bb1c3dd43ccb548c7f5f8b16c24a1ae77a813
languageName: node
linkType: hard
"micromark-util-encode@npm:^1.0.0":
- version: 1.0.0
- resolution: "micromark-util-encode@npm:1.0.0"
- checksum: 10/16985a6b355721307553d1893da364e83144ef068f84978071a9b4b3d884b65c3138f8330fb039aac10f75766b4906e03c5e62baafb1bf5e731f959878277712
+ version: 1.1.0
+ resolution: "micromark-util-encode@npm:1.1.0"
+ checksum: 10/4ef29d02b12336918cea6782fa87c8c578c67463925221d4e42183a706bde07f4b8b5f9a5e1c7ce8c73bb5a98b261acd3238fecd152e6dd1cdfa2d1ae11b60a0
languageName: node
linkType: hard
"micromark-util-html-tag-name@npm:^1.0.0":
- version: 1.0.0
- resolution: "micromark-util-html-tag-name@npm:1.0.0"
- checksum: 10/ed07ce9b9bb30cc4ea57f733089b3a253a6132c0608ccfc105eadb32f1f80bbd2347bf8a74f897fe039d7805a59f602fd4dd15f6adc7926d40b3646da2888d0f
+ version: 1.2.0
+ resolution: "micromark-util-html-tag-name@npm:1.2.0"
+ checksum: 10/ccf0fa99b5c58676dc5192c74665a3bfd1b536fafaf94723bd7f31f96979d589992df6fcf2862eba290ef18e6a8efb30ec8e1e910d9f3fc74f208871e9f84750
languageName: node
linkType: hard
"micromark-util-normalize-identifier@npm:^1.0.0":
- version: 1.0.0
- resolution: "micromark-util-normalize-identifier@npm:1.0.0"
+ version: 1.1.0
+ resolution: "micromark-util-normalize-identifier@npm:1.1.0"
dependencies:
micromark-util-symbol: "npm:^1.0.0"
- checksum: 10/d7c09d5e8318fb72f194af72664bd84a48a2928e3550b2b21c8fbc0ec22524f2a72e0f6663d2b95dc189a6957d3d7759b60716e888909710767cd557be821f8b
+ checksum: 10/8655bea41ffa4333e03fc22462cb42d631bbef9c3c07b625fd852b7eb442a110f9d2e5902a42e65188d85498279569502bf92f3434a1180fc06f7c37edfbaee2
languageName: node
linkType: hard
"micromark-util-resolve-all@npm:^1.0.0":
- version: 1.0.0
- resolution: "micromark-util-resolve-all@npm:1.0.0"
+ version: 1.1.0
+ resolution: "micromark-util-resolve-all@npm:1.1.0"
dependencies:
micromark-util-types: "npm:^1.0.0"
- checksum: 10/409667f2bd126ef8acce009270d2aecaaa5584c5807672bc657b09e50aa91bd2e552cf41e5be1e6469244a83349cbb71daf6059b746b1c44e3f35446fef63e50
+ checksum: 10/1ce6c0237cd3ca061e76fae6602cf95014e764a91be1b9f10d36cb0f21ca88f9a07de8d49ab8101efd0b140a4fbfda6a1efb72027ab3f4d5b54c9543271dc52c
languageName: node
linkType: hard
"micromark-util-sanitize-uri@npm:^1.0.0":
- version: 1.0.0
- resolution: "micromark-util-sanitize-uri@npm:1.0.0"
+ version: 1.2.0
+ resolution: "micromark-util-sanitize-uri@npm:1.2.0"
dependencies:
micromark-util-character: "npm:^1.0.0"
micromark-util-encode: "npm:^1.0.0"
micromark-util-symbol: "npm:^1.0.0"
- checksum: 10/198e91b9f86d429ebc74737c0378764c8dc2e988f46a6846f59223938bc9f3a5d4ae97ce9ce801ac6f3a76cce3da1196cbb3d5ba13bb4cce53026b06891a61da
+ checksum: 10/0d024100d95ffb88bf75f3360e305b545c1eb745430959b8633f7aa93f37ec401fc7094c90c97298409a9e30d94d53b895bae224e1bb966bea114976cfa0fd48
languageName: node
linkType: hard
"micromark-util-subtokenize@npm:^1.0.0":
- version: 1.0.0
- resolution: "micromark-util-subtokenize@npm:1.0.0"
+ version: 1.1.0
+ resolution: "micromark-util-subtokenize@npm:1.1.0"
dependencies:
micromark-util-chunked: "npm:^1.0.0"
micromark-util-symbol: "npm:^1.0.0"
micromark-util-types: "npm:^1.0.0"
- checksum: 10/0b19352a05c958c38782be7be6ca1c5ce004f24b4d5fdb70666d2dfa4c75d859a0fc44ef3e899ad085fe3022b0cd1201748f96b5617d09e43ea455ba2e2d0f9a
+ uvu: "npm:^0.5.0"
+ checksum: 10/075a1db6ea586d65827d3eead33dbfc520c4e43659c93fcd8fd82f44a7b75cfe61dcde967a3dfcc2ffd999347440ba5aa6698e65a04f3fc627e13e9f12a1a910
languageName: node
linkType: hard
"micromark-util-symbol@npm:^1.0.0":
- version: 1.0.0
- resolution: "micromark-util-symbol@npm:1.0.0"
- checksum: 10/93945fd4863bcf9e4186ee6f234a1ef790f884e927287aed6741d41d37dae4c0783d36f3f811e94e1634ea86c6bb484b6d2691d5e87a471aee32500cb1a4c136
+ version: 1.1.0
+ resolution: "micromark-util-symbol@npm:1.1.0"
+ checksum: 10/a26b6b1efd77a715a4d9bbe0a5338eaf3d04ea5e85733e34fee56dfeabf64495c0afc5438fe5220316884cd3a5eae1f17768e0ff4e117827ea4a653897466f86
languageName: node
linkType: hard
"micromark-util-types@npm:^1.0.0, micromark-util-types@npm:^1.0.1":
- version: 1.0.1
- resolution: "micromark-util-types@npm:1.0.1"
- checksum: 10/cc270381bb1035e610592d76a9889ec7d2d8f613bd6c2cbbfc09cae8232602af132ca4d2a5d498b0f9e30db6bc33e0320bb7386ee2abc7267d6a1c25dadcbd85
+ version: 1.1.0
+ resolution: "micromark-util-types@npm:1.1.0"
+ checksum: 10/287ac5de4a3802bb6f6c3842197c294997a488db1c0486e03c7a8e674d9eb7720c17dda1bcb814814b8343b338c4826fcbc0555f3e75463712a60dcdb53a028e
languageName: node
linkType: hard
"micromark@npm:^3.0.0":
- version: 3.0.5
- resolution: "micromark@npm:3.0.5"
+ version: 3.2.0
+ resolution: "micromark@npm:3.2.0"
dependencies:
"@types/debug": "npm:^4.0.0"
debug: "npm:^4.0.0"
+ decode-named-character-reference: "npm:^1.0.0"
micromark-core-commonmark: "npm:^1.0.1"
micromark-factory-space: "npm:^1.0.0"
micromark-util-character: "npm:^1.0.0"
@@ -38432,12 +38642,12 @@ __metadata:
micromark-util-subtokenize: "npm:^1.0.0"
micromark-util-symbol: "npm:^1.0.0"
micromark-util-types: "npm:^1.0.1"
- parse-entities: "npm:^3.0.0"
- checksum: 10/cb6c259849562f69f901150f37343ed7f952b75d01a3f0c312b5a0fe58c5f3304067c66be5dcf4a781a4da51073a631c2db095d3647f5d6d7895b44f181197b5
+ uvu: "npm:^0.5.0"
+ checksum: 10/560a4a501efc3859d622461aaa9345fb95b99a2f34d3d3f2a775ab04de1dd857cb0f642083a6b28ab01bd817f5f0741a1be9857fd702f45e04a3752927a66719
languageName: node
linkType: hard
-"micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5, micromatch@npm:^4.0.7, micromatch@npm:^4.0.8":
+"micromatch@npm:^4.0.2, micromatch@npm:^4.0.5, micromatch@npm:^4.0.7, micromatch@npm:^4.0.8":
version: 4.0.8
resolution: "micromatch@npm:4.0.8"
dependencies:
@@ -38600,14 +38810,14 @@ __metadata:
linkType: hard
"mini-css-extract-plugin@npm:^2.4.2, mini-css-extract-plugin@npm:^2.9.2":
- version: 2.9.3
- resolution: "mini-css-extract-plugin@npm:2.9.3"
+ version: 2.9.4
+ resolution: "mini-css-extract-plugin@npm:2.9.4"
dependencies:
schema-utils: "npm:^4.0.0"
tapable: "npm:^2.2.1"
peerDependencies:
webpack: ^5.0.0
- checksum: 10/55bcc341af9e472c3b8010aa1a8a0212aef78eb8a76d07e3f9d5646b357af03ab4cae0dabfb03be8e0476064f36ab415be2fa65682b6acdb420805c67cdee4c6
+ checksum: 10/24a0418dc49baed58a10a8b81e4d2fe474e89ccdc9370a7c69bd0aeeb5a70d2b4ee12f33b98c95a68423c79c1de7cc2a25aaa2105600b712e7d594cb0d56c9d4
languageName: node
linkType: hard
@@ -38661,7 +38871,7 @@ __metadata:
languageName: node
linkType: hard
-"minimatch@npm:^10.0.3, minimatch@npm:^10.1.1":
+"minimatch@npm:^10.1.1":
version: 10.1.1
resolution: "minimatch@npm:10.1.1"
dependencies:
@@ -38982,8 +39192,8 @@ __metadata:
linkType: hard
"mockttp@npm:^3.13.0":
- version: 3.15.5
- resolution: "mockttp@npm:3.15.5"
+ version: 3.17.1
+ resolution: "mockttp@npm:3.17.1"
dependencies:
"@graphql-tools/schema": "npm:^8.5.0"
"@graphql-tools/utils": "npm:^8.8.0"
@@ -39001,7 +39211,7 @@ __metadata:
cors: "npm:^2.8.4"
cors-gate: "npm:^1.1.3"
cross-fetch: "npm:^3.1.5"
- destroyable-server: "npm:^1.0.2"
+ destroyable-server: "npm:^1.1.1"
express: "npm:^4.14.0"
fast-json-patch: "npm:^3.1.1"
graphql: "npm:^14.0.2 || ^15.5"
@@ -39020,7 +39230,7 @@ __metadata:
parse-multipart-data: "npm:^1.4.0"
performance-now: "npm:^2.1.0"
portfinder: "npm:^1.0.32"
- read-tls-client-hello: "npm:^1.0.0"
+ read-tls-client-hello: "npm:^1.1.0"
semver: "npm:^7.5.3"
socks-proxy-agent: "npm:^7.0.0"
typed-error: "npm:^3.0.2"
@@ -39029,7 +39239,7 @@ __metadata:
ws: "npm:^8.8.0"
bin:
mockttp: dist/admin/admin-bin.js
- checksum: 10/93eca69baa35db11ae7f541d712bfd208edf0017db3091e874f59fc64a7c036179906b4e9b66936f054ad1c258645d085452dafab58a1c2df9fd6d67330f8328
+ checksum: 10/09278221361b9896636bbf9e6a6d6427afe2375c035dcc6ddd56d308a7b197ae3a5196fba7b00b9fb1bfb0b4c22daacc046bdc207e0ab9ef15bb2a79637cdfbf
languageName: node
linkType: hard
@@ -39231,19 +39441,19 @@ __metadata:
linkType: hard
"mysql2@npm:^3.0.0":
- version: 3.11.5
- resolution: "mysql2@npm:3.11.5"
+ version: 3.15.3
+ resolution: "mysql2@npm:3.15.3"
dependencies:
aws-ssl-profiles: "npm:^1.1.1"
denque: "npm:^2.1.0"
generate-function: "npm:^2.3.1"
- iconv-lite: "npm:^0.6.3"
+ iconv-lite: "npm:^0.7.0"
long: "npm:^5.2.1"
lru.min: "npm:^1.0.0"
named-placeholders: "npm:^1.1.3"
seq-queue: "npm:^0.0.5"
sqlstring: "npm:^2.3.2"
- checksum: 10/912dc364f6f9684721add5474c732f5d7c2403ec17cb05b06f95adafab3cb32daa2798b283d48d0951d11af94a58558581ed22635803fc6baab651d3651c1cc9
+ checksum: 10/96fbab423afb05a9ac397c272aa1097872797e224b7d1785ac05b7e46d0884c1e613ad9e2c3082ad7973f229357f9ab5824a7f90e8c582b2094ce52027fff8e3
languageName: node
linkType: hard
@@ -39311,6 +39521,15 @@ __metadata:
languageName: node
linkType: hard
+"napi-postinstall@npm:^0.3.0":
+ version: 0.3.4
+ resolution: "napi-postinstall@npm:0.3.4"
+ bin:
+ napi-postinstall: lib/cli.js
+ checksum: 10/5541381508f9e1051ff3518701c7130ebac779abb3a1ffe9391fcc3cab4cc0569b0ba0952357db3f6b12909c3bb508359a7a60261ffd795feebbdab967175832
+ languageName: node
+ linkType: hard
+
"native-duplexpair@npm:^1.0.0":
version: 1.0.0
resolution: "native-duplexpair@npm:1.0.0"
@@ -39529,7 +39748,7 @@ __metadata:
languageName: node
linkType: hard
-"node-fetch@npm:^2.6.0, node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.12, node-fetch@npm:^2.6.7, node-fetch@npm:^2.6.9, node-fetch@npm:^2.7.0":
+"node-fetch@npm:^2.6.0, node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.7, node-fetch@npm:^2.6.9, node-fetch@npm:^2.7.0":
version: 2.7.0
resolution: "node-fetch@npm:2.7.0"
dependencies:
@@ -39788,15 +40007,15 @@ __metadata:
linkType: hard
"nodemailer@npm:^7.0.7":
- version: 7.0.9
- resolution: "nodemailer@npm:7.0.9"
- checksum: 10/88883c58afe356d2b4c24b1e976c04857e8a7a7145e1752dab69072900b0cc2e3daa0964a08c653e692fb64382453e1cfcee3d863828844c8d6f6239727b9023
+ version: 7.0.11
+ resolution: "nodemailer@npm:7.0.11"
+ checksum: 10/2ad4dd56a4caf84a83aa6f4378ded26d5ef8a644ca3be09c3b4fb2255d861369e620f29be6c3c97148ac4a50aa5fdff6240b9d60805362bd99ca15f2ea62e8a2
languageName: node
linkType: hard
"nodemon@npm:^3.0.1":
- version: 3.1.10
- resolution: "nodemon@npm:3.1.10"
+ version: 3.1.11
+ resolution: "nodemon@npm:3.1.11"
dependencies:
chokidar: "npm:^3.5.2"
debug: "npm:^4"
@@ -39810,7 +40029,7 @@ __metadata:
undefsafe: "npm:^2.0.5"
bin:
nodemon: bin/nodemon.js
- checksum: 10/af5f63d0b4af3ee54f60c136996692232f836815ddd37c0368fd8e50c31dd0180a4db5cdb7f4c2c5a96b31c77f30a77c2253ac34438913839846098af813fd20
+ checksum: 10/0f43d2c70abe0764e26e438dbe0c78bc429746a558dabf5dd94b13f6f3a79b4bd7d5793347acafddaee5eab594a806c2ad43efc999d342e28d185661718da8dc
languageName: node
linkType: hard
@@ -40099,10 +40318,10 @@ __metadata:
languageName: node
linkType: hard
-"nwsapi@npm:^2.2.0, nwsapi@npm:^2.2.12":
- version: 2.2.13
- resolution: "nwsapi@npm:2.2.13"
- checksum: 10/f7f30a236f2ee513ea8042f1a987481dc2b900167c47f7163882f0fcfe7ccb57b5c8daaf2c91008dc20a204fcd79e050aee25001433ad99990bbed5a8c74121c
+"nwsapi@npm:^2.2.12":
+ version: 2.2.23
+ resolution: "nwsapi@npm:2.2.23"
+ checksum: 10/aa4a570039c33d70b51436d1bb533f3e2c33c488ccbe9b09285c46a6cee5ef266fd60103461085c6954ba52460786a8138f042958328c7c1b4763898eb3dadfa
languageName: node
linkType: hard
@@ -40221,7 +40440,7 @@ __metadata:
languageName: node
linkType: hard
-"object.values@npm:^1.1.6, object.values@npm:^1.2.0, object.values@npm:^1.2.1":
+"object.values@npm:^1.1.6, object.values@npm:^1.2.1":
version: 1.2.1
resolution: "object.values@npm:1.2.1"
dependencies:
@@ -40293,13 +40512,6 @@ __metadata:
languageName: node
linkType: hard
-"on-headers@npm:~1.0.2":
- version: 1.0.2
- resolution: "on-headers@npm:1.0.2"
- checksum: 10/870766c16345855e2012e9422ba1ab110c7e44ad5891a67790f84610bd70a72b67fdd71baf497295f1d1bf38dd4c92248f825d48729c53c0eae5262fb69fa171
- languageName: node
- linkType: hard
-
"on-headers@npm:~1.1.0":
version: 1.1.0
resolution: "on-headers@npm:1.1.0"
@@ -40377,19 +40589,19 @@ __metadata:
languageName: node
linkType: hard
-"open@npm:^10.0.3":
- version: 10.0.3
- resolution: "open@npm:10.0.3"
+"open@npm:^10.0.3, open@npm:^10.2.0":
+ version: 10.2.0
+ resolution: "open@npm:10.2.0"
dependencies:
default-browser: "npm:^5.2.1"
define-lazy-prop: "npm:^3.0.0"
is-inside-container: "npm:^1.0.0"
- is-wsl: "npm:^3.1.0"
- checksum: 10/4dc757ad1d3d63490822f991e9cbe3a7c05b7249fca2eaa571cb7d191e5cec88bc37e15d8ef4fd740d8989a288b661d8da253caa8d98e8c97430ddbbb0ae4ed1
+ wsl-utils: "npm:^0.1.0"
+ checksum: 10/e6ad9474734eac3549dcc7d85e952394856ccaee48107c453bd6a725b82e3b8ed5f427658935df27efa76b411aeef62888edea8a9e347e8e7c82632ec966b30e
languageName: node
linkType: hard
-"open@npm:^8.0.0, open@npm:^8.0.4, open@npm:^8.4.0":
+"open@npm:^8.0.0, open@npm:^8.4.0":
version: 8.4.2
resolution: "open@npm:8.4.2"
dependencies:
@@ -40572,13 +40784,6 @@ __metadata:
languageName: node
linkType: hard
-"os-tmpdir@npm:~1.0.2":
- version: 1.0.2
- resolution: "os-tmpdir@npm:1.0.2"
- checksum: 10/5666560f7b9f10182548bf7013883265be33620b1c1b4a4d405c25be2636f970c5488ff3e6c48de75b55d02bde037249fe5dbfbb4c0fb7714953d56aed062e6d
- languageName: node
- linkType: hard
-
"osx-release@npm:^1.0.0":
version: 1.1.0
resolution: "osx-release@npm:1.1.0"
@@ -40615,6 +40820,75 @@ __metadata:
languageName: node
linkType: hard
+"oxc-resolver@npm:^11.13.2":
+ version: 11.14.2
+ resolution: "oxc-resolver@npm:11.14.2"
+ dependencies:
+ "@oxc-resolver/binding-android-arm-eabi": "npm:11.14.2"
+ "@oxc-resolver/binding-android-arm64": "npm:11.14.2"
+ "@oxc-resolver/binding-darwin-arm64": "npm:11.14.2"
+ "@oxc-resolver/binding-darwin-x64": "npm:11.14.2"
+ "@oxc-resolver/binding-freebsd-x64": "npm:11.14.2"
+ "@oxc-resolver/binding-linux-arm-gnueabihf": "npm:11.14.2"
+ "@oxc-resolver/binding-linux-arm-musleabihf": "npm:11.14.2"
+ "@oxc-resolver/binding-linux-arm64-gnu": "npm:11.14.2"
+ "@oxc-resolver/binding-linux-arm64-musl": "npm:11.14.2"
+ "@oxc-resolver/binding-linux-ppc64-gnu": "npm:11.14.2"
+ "@oxc-resolver/binding-linux-riscv64-gnu": "npm:11.14.2"
+ "@oxc-resolver/binding-linux-riscv64-musl": "npm:11.14.2"
+ "@oxc-resolver/binding-linux-s390x-gnu": "npm:11.14.2"
+ "@oxc-resolver/binding-linux-x64-gnu": "npm:11.14.2"
+ "@oxc-resolver/binding-linux-x64-musl": "npm:11.14.2"
+ "@oxc-resolver/binding-openharmony-arm64": "npm:11.14.2"
+ "@oxc-resolver/binding-wasm32-wasi": "npm:11.14.2"
+ "@oxc-resolver/binding-win32-arm64-msvc": "npm:11.14.2"
+ "@oxc-resolver/binding-win32-ia32-msvc": "npm:11.14.2"
+ "@oxc-resolver/binding-win32-x64-msvc": "npm:11.14.2"
+ dependenciesMeta:
+ "@oxc-resolver/binding-android-arm-eabi":
+ optional: true
+ "@oxc-resolver/binding-android-arm64":
+ optional: true
+ "@oxc-resolver/binding-darwin-arm64":
+ optional: true
+ "@oxc-resolver/binding-darwin-x64":
+ optional: true
+ "@oxc-resolver/binding-freebsd-x64":
+ optional: true
+ "@oxc-resolver/binding-linux-arm-gnueabihf":
+ optional: true
+ "@oxc-resolver/binding-linux-arm-musleabihf":
+ optional: true
+ "@oxc-resolver/binding-linux-arm64-gnu":
+ optional: true
+ "@oxc-resolver/binding-linux-arm64-musl":
+ optional: true
+ "@oxc-resolver/binding-linux-ppc64-gnu":
+ optional: true
+ "@oxc-resolver/binding-linux-riscv64-gnu":
+ optional: true
+ "@oxc-resolver/binding-linux-riscv64-musl":
+ optional: true
+ "@oxc-resolver/binding-linux-s390x-gnu":
+ optional: true
+ "@oxc-resolver/binding-linux-x64-gnu":
+ optional: true
+ "@oxc-resolver/binding-linux-x64-musl":
+ optional: true
+ "@oxc-resolver/binding-openharmony-arm64":
+ optional: true
+ "@oxc-resolver/binding-wasm32-wasi":
+ optional: true
+ "@oxc-resolver/binding-win32-arm64-msvc":
+ optional: true
+ "@oxc-resolver/binding-win32-ia32-msvc":
+ optional: true
+ "@oxc-resolver/binding-win32-x64-msvc":
+ optional: true
+ checksum: 10/f64fa5cd61700b0ba370319f87b6c5ef45b9036f2c21719a563999285493f8152d9c7922d35d07208088d3893327de91c10e65cbc4131782aeeb9f9da365ae7c
+ languageName: node
+ linkType: hard
+
"p-cancelable@npm:^1.0.0":
version: 1.1.0
resolution: "p-cancelable@npm:1.1.0"
@@ -40684,15 +40958,6 @@ __metadata:
languageName: node
linkType: hard
-"p-limit@npm:^4.0.0":
- version: 4.0.0
- resolution: "p-limit@npm:4.0.0"
- dependencies:
- yocto-queue: "npm:^1.0.0"
- checksum: 10/01d9d70695187788f984226e16c903475ec6a947ee7b21948d6f597bed788e3112cc7ec2e171c1d37125057a5f45f3da21d8653e04a3a793589e12e9e80e756b
- languageName: node
- linkType: hard
-
"p-locate@npm:^3.0.0":
version: 3.0.0
resolution: "p-locate@npm:3.0.0"
@@ -40720,15 +40985,6 @@ __metadata:
languageName: node
linkType: hard
-"p-locate@npm:^6.0.0":
- version: 6.0.0
- resolution: "p-locate@npm:6.0.0"
- dependencies:
- p-limit: "npm:^4.0.0"
- checksum: 10/2bfe5234efa5e7a4e74b30a5479a193fdd9236f8f6b4d2f3f69e3d286d9a7d7ab0c118a2a50142efcf4e41625def635bd9332d6cbf9cc65d85eb0718c579ab38
- languageName: node
- linkType: hard
-
"p-map@npm:^2.0.0":
version: 2.1.0
resolution: "p-map@npm:2.1.0"
@@ -40990,6 +41246,21 @@ __metadata:
languageName: node
linkType: hard
+"parse-entities@npm:^4.0.0":
+ version: 4.0.2
+ resolution: "parse-entities@npm:4.0.2"
+ dependencies:
+ "@types/unist": "npm:^2.0.0"
+ character-entities-legacy: "npm:^3.0.0"
+ character-reference-invalid: "npm:^2.0.0"
+ decode-named-character-reference: "npm:^1.0.0"
+ is-alphanumerical: "npm:^2.0.0"
+ is-decimal: "npm:^2.0.0"
+ is-hexadecimal: "npm:^2.0.0"
+ checksum: 10/b0ce693d0b3d7ed1cea6fe814e6e077c71532695f01178e846269e9a2bc2f7ff34ca4bb8db80b48af0451100f25bb010df6591c9bb6306e4680ccb423d1e4038
+ languageName: node
+ linkType: hard
+
"parse-json@npm:^5.0.0, parse-json@npm:^5.2.0":
version: 5.2.0
resolution: "parse-json@npm:5.2.0"
@@ -41009,13 +41280,6 @@ __metadata:
languageName: node
linkType: hard
-"parse-ms@npm:^4.0.0":
- version: 4.0.0
- resolution: "parse-ms@npm:4.0.0"
- checksum: 10/673c801d9f957ff79962d71ed5a24850163f4181a90dd30c4e3666b3a804f53b77f1f0556792e8b2adbb5d58757907d1aa51d7d7dc75997c2a56d72937cbc8b7
- languageName: node
- linkType: hard
-
"parse-multipart-data@npm:^1.4.0":
version: 1.5.0
resolution: "parse-multipart-data@npm:1.5.0"
@@ -41049,11 +41313,20 @@ __metadata:
linkType: hard
"parse5@npm:^7.0.0, parse5@npm:^7.1.2":
- version: 7.2.0
- resolution: "parse5@npm:7.2.0"
+ version: 7.3.0
+ resolution: "parse5@npm:7.3.0"
dependencies:
- entities: "npm:^4.5.0"
- checksum: 10/49dabfe848f00e8cad8d9198a094d667fbdecbfa5143ddf8fb708e499b5ba76426c16135c8993b1d8e01827b92e8cfab0a9a248afa6ad7cc6f38aecf5bd017e6
+ entities: "npm:^6.0.0"
+ checksum: 10/b0e48be20b820c655b138b86fa6fb3a790de6c891aa2aba536524f8027b4dca4fe538f11a0e5cf2f6f847d120dbb9e4822dcaeb933ff1e10850a2ef0154d1d88
+ languageName: node
+ linkType: hard
+
+"parse5@npm:^8.0.0":
+ version: 8.0.0
+ resolution: "parse5@npm:8.0.0"
+ dependencies:
+ entities: "npm:^6.0.0"
+ checksum: 10/1973850932bb1cbd52ab64502761489fbe1bb43a52dee7ce41aac0b6c33a51a92aaee04661590b0912b739ae9ee316bce4c78c8ea34af42a7e522c983c3c6cf5
languageName: node
linkType: hard
@@ -41084,13 +41357,13 @@ __metadata:
linkType: hard
"passport-auth0@npm:^1.4.3":
- version: 1.4.4
- resolution: "passport-auth0@npm:1.4.4"
+ version: 1.4.5
+ resolution: "passport-auth0@npm:1.4.5"
dependencies:
- axios: "npm:^1.6.0"
+ axios: "npm:^1.7.4"
passport-oauth: "npm:^1.0.0"
passport-oauth2: "npm:^1.6.0"
- checksum: 10/307d2d8d687a29dbe2fc98fbee1cc948f76e936c6ae7ffeb28076c98b558a942be1cbc0eedb58d9003285bf4e816f6e971b0edb7a604d290272b1ba8e731006d
+ checksum: 10/e9e40e82862f75312ffd0dbed09cd62693008551b07e7ada75725597c3763361aa2f3070ea485e70219572a23d459ea03553dd8f2c5d683ece83577007bdf5b9
languageName: node
linkType: hard
@@ -41238,13 +41511,6 @@ __metadata:
languageName: node
linkType: hard
-"path-exists@npm:^5.0.0":
- version: 5.0.0
- resolution: "path-exists@npm:5.0.0"
- checksum: 10/8ca842868cab09423994596eb2c5ec2a971c17d1a3cb36dbf060592c730c725cd524b9067d7d2a1e031fef9ba7bd2ac6dc5ec9fb92aa693265f7be3987045254
- languageName: node
- linkType: hard
-
"path-is-absolute@npm:^1.0.0":
version: 1.0.1
resolution: "path-is-absolute@npm:1.0.1"
@@ -41314,10 +41580,10 @@ __metadata:
languageName: node
linkType: hard
-"path-to-regexp@npm:8.2.0":
- version: 8.2.0
- resolution: "path-to-regexp@npm:8.2.0"
- checksum: 10/23378276a172b8ba5f5fb824475d1818ca5ccee7bbdb4674701616470f23a14e536c1db11da9c9e6d82b82c556a817bbf4eee6e41b9ed20090ef9427cbb38e13
+"path-to-regexp@npm:8.3.0, path-to-regexp@npm:^8.0.0, path-to-regexp@npm:^8.1.0, path-to-regexp@npm:^8.2.0":
+ version: 8.3.0
+ resolution: "path-to-regexp@npm:8.3.0"
+ checksum: 10/568f148fc64f5fd1ecebf44d531383b28df924214eabf5f2570dce9587a228e36c37882805ff02d71c6209b080ea3ee6a4d2b712b5df09741b67f1f3cf91e55a
languageName: node
linkType: hard
@@ -41328,13 +41594,6 @@ __metadata:
languageName: node
linkType: hard
-"path-to-regexp@npm:^8.0.0, path-to-regexp@npm:^8.1.0, path-to-regexp@npm:^8.2.0":
- version: 8.3.0
- resolution: "path-to-regexp@npm:8.3.0"
- checksum: 10/568f148fc64f5fd1ecebf44d531383b28df924214eabf5f2570dce9587a228e36c37882805ff02d71c6209b080ea3ee6a4d2b712b5df09741b67f1f3cf91e55a
- languageName: node
- linkType: hard
-
"path-to-regexp@npm:~0.1.12":
version: 0.1.12
resolution: "path-to-regexp@npm:0.1.12"
@@ -41356,6 +41615,13 @@ __metadata:
languageName: node
linkType: hard
+"pathe@npm:^2.0.3":
+ version: 2.0.3
+ resolution: "pathe@npm:2.0.3"
+ checksum: 10/01e9a69928f39087d96e1751ce7d6d50da8c39abf9a12e0ac2389c42c83bc76f78c45a475bd9026a02e6a6f79be63acc75667df855862fe567d99a00a540d23d
+ languageName: node
+ linkType: hard
+
"pathval@npm:^2.0.0":
version: 2.0.0
resolution: "pathval@npm:2.0.0"
@@ -41421,10 +41687,10 @@ __metadata:
languageName: node
linkType: hard
-"pg-cloudflare@npm:^1.1.1":
- version: 1.1.1
- resolution: "pg-cloudflare@npm:1.1.1"
- checksum: 10/45ca0c7926967ec9e66a9efc73ca57e3e933671b541bc774631a02ce683e7f658d0a4e881119b3f61486f38e344ae1b008d3a20eb5e21701c5fa8ff8382c5538
+"pg-cloudflare@npm:^1.2.7":
+ version: 1.2.7
+ resolution: "pg-cloudflare@npm:1.2.7"
+ checksum: 10/3d171407cbce36436c461200666ba6bd884bfe98016972760a797cec850199b8024a40055d80322c5fc02909e1533a144e9b108a99f7d7e21d0c42612f9821fb
languageName: node
linkType: hard
@@ -41435,7 +41701,7 @@ __metadata:
languageName: node
linkType: hard
-"pg-connection-string@npm:^2.3.0, pg-connection-string@npm:^2.5.0, pg-connection-string@npm:^2.7.0":
+"pg-connection-string@npm:^2.3.0, pg-connection-string@npm:^2.5.0, pg-connection-string@npm:^2.9.1":
version: 2.9.1
resolution: "pg-connection-string@npm:2.9.1"
checksum: 10/40e9e9cd752121e72bff18d83e6c7ecda9056426815a84294de018569a319293c924704c8b7f0604fdc588835c7927647dea4f3c87a014e715bcbb17d794e9f0
@@ -41456,23 +41722,23 @@ __metadata:
languageName: node
linkType: hard
-"pg-pool@npm:^3.8.0":
- version: 3.8.0
- resolution: "pg-pool@npm:3.8.0"
+"pg-pool@npm:^3.10.1":
+ version: 3.10.1
+ resolution: "pg-pool@npm:3.10.1"
peerDependencies:
pg: ">=8.0"
- checksum: 10/be6b7c6932fa177dc69ca8980d959f24b4979911465ac11656b8ff86707cba035e776416d8aac1029e8cc4d8eb8989ed2cc85a33ac6b76e266b20a81284436d8
+ checksum: 10/b389a714be59ebe53ec412cbff513191cc0b7a203faa5d26416b6a038cafdfe30fbf1a5936b77bb76109c49bd7c4a116870a5a46a45796b1b34c96f016d7fbe2
languageName: node
linkType: hard
-"pg-protocol@npm:*, pg-protocol@npm:^1.8.0":
- version: 1.8.0
- resolution: "pg-protocol@npm:1.8.0"
- checksum: 10/52f67d8161ae4afb1dbf96f6ad12a2ecf478dbb0b80baa239047cd562dee378961fd446f0a1cfc1fd323e052fbb3df47e886c5d9d86a2803a000d36682b29094
+"pg-protocol@npm:*, pg-protocol@npm:^1.10.3":
+ version: 1.10.3
+ resolution: "pg-protocol@npm:1.10.3"
+ checksum: 10/31da85319084c03f403efee7accce9786964df82a7feb60e6bd77b71f1e622c74a2a644a2bc434389d0ab92e5abdeedea69ebdb53b1897d9f01d2a1f51a8a2fe
languageName: node
linkType: hard
-"pg-types@npm:^2.1.0, pg-types@npm:^2.2.0":
+"pg-types@npm:2.2.0, pg-types@npm:^2.2.0":
version: 2.2.0
resolution: "pg-types@npm:2.2.0"
dependencies:
@@ -41486,15 +41752,15 @@ __metadata:
linkType: hard
"pg@npm:^8.11.3, pg@npm:^8.9.0":
- version: 8.14.1
- resolution: "pg@npm:8.14.1"
+ version: 8.16.3
+ resolution: "pg@npm:8.16.3"
dependencies:
- pg-cloudflare: "npm:^1.1.1"
- pg-connection-string: "npm:^2.7.0"
- pg-pool: "npm:^3.8.0"
- pg-protocol: "npm:^1.8.0"
- pg-types: "npm:^2.1.0"
- pgpass: "npm:1.x"
+ pg-cloudflare: "npm:^1.2.7"
+ pg-connection-string: "npm:^2.9.1"
+ pg-pool: "npm:^3.10.1"
+ pg-protocol: "npm:^1.10.3"
+ pg-types: "npm:2.2.0"
+ pgpass: "npm:1.0.5"
peerDependencies:
pg-native: ">=3.0.1"
dependenciesMeta:
@@ -41503,16 +41769,16 @@ __metadata:
peerDependenciesMeta:
pg-native:
optional: true
- checksum: 10/45f2d5719fd74a6a4784c5115c0ff482af92d1e5b101bf423160b6a983e37cc2fad4a7eea2a06f27e6f8bdb8abce23486d2d522c8c52c90f68a2bc897f0553c4
+ checksum: 10/6a2885a3f581d6c6dddddf5a4bb2790ee84f402ed7d73ece8b6bc102c58c17e4c5f17894c241633aa2f1d4fedd8f2401a80a9a02ef18bb57d05cbbfd8a53ca4d
languageName: node
linkType: hard
-"pgpass@npm:1.x":
- version: 1.0.2
- resolution: "pgpass@npm:1.0.2"
+"pgpass@npm:1.0.5":
+ version: 1.0.5
+ resolution: "pgpass@npm:1.0.5"
dependencies:
- split: "npm:^1.0.0"
- checksum: 10/4f09d81d5aa9e3e409e2a58dc71f889ca92233d66772adcb810e53e637b49013ae84b8dd831aa5e6f1413bffb4b9b1eafd1a05227c8cf05c39f5cd276d4e9492
+ split2: "npm:^4.1.0"
+ checksum: 10/0a6f3bf76e36bdb3c20a7e8033140c732767bba7e81f845f7489fc3123a2bd6e3b8e704f08cba86b117435414b5d2422e20ba9d5f2efb6f0c75c9efca73e8e87
languageName: node
linkType: hard
@@ -41644,7 +41910,7 @@ __metadata:
languageName: node
linkType: hard
-"pirates@npm:^4.0.1, pirates@npm:^4.0.4, pirates@npm:^4.0.6":
+"pirates@npm:^4.0.1, pirates@npm:^4.0.6, pirates@npm:^4.0.7":
version: 4.0.7
resolution: "pirates@npm:4.0.7"
checksum: 10/2427f371366081ae42feb58214f04805d6b41d6b84d74480ebcc9e0ddbd7105a139f7c653daeaf83ad8a1a77214cf07f64178e76de048128fec501eab3305a96
@@ -41708,27 +41974,27 @@ __metadata:
languageName: node
linkType: hard
-"playwright-core@npm:1.54.2":
- version: 1.54.2
- resolution: "playwright-core@npm:1.54.2"
+"playwright-core@npm:1.57.0":
+ version: 1.57.0
+ resolution: "playwright-core@npm:1.57.0"
bin:
playwright-core: cli.js
- checksum: 10/8eb8b37d7b02c2394f85567c5703464ee7c85929e1de7118946548a0277cacd41a6f247b8f7eb50c921433346f785356eff8132a9d3c6c2dcf3402c6a83e4f18
+ checksum: 10/ec066602f0196f036006caee14a30d0a57533a76673bb9a0c609ef56e21decf018f0e8d402ba2fb18251393be6a1c9e193c83266f1670fe50838c5340e220de0
languageName: node
linkType: hard
-"playwright@npm:1.54.2":
- version: 1.54.2
- resolution: "playwright@npm:1.54.2"
+"playwright@npm:1.57.0":
+ version: 1.57.0
+ resolution: "playwright@npm:1.57.0"
dependencies:
fsevents: "npm:2.3.2"
- playwright-core: "npm:1.54.2"
+ playwright-core: "npm:1.57.0"
dependenciesMeta:
fsevents:
optional: true
bin:
playwright: cli.js
- checksum: 10/3f4fedc1e2290b6da6960eedf0d78b9097251848b499b0627186ca85e94178fe6be1590c4926246ff4dad5729fc80ab63fee6554fe736d29c0a1808ec483467f
+ checksum: 10/241559210f98ef11b6bd6413f2d29da7ef67c7865b72053192f0d164fab9e0d3bd47913b3351d5de6433a8aff2d8424d4b8bd668df420bf4dda7ae9fcd37b942
languageName: node
linkType: hard
@@ -41784,12 +42050,12 @@ __metadata:
linkType: hard
"portfinder@npm:^1.0.28, portfinder@npm:^1.0.32":
- version: 1.0.37
- resolution: "portfinder@npm:1.0.37"
+ version: 1.0.38
+ resolution: "portfinder@npm:1.0.38"
dependencies:
async: "npm:^3.2.6"
debug: "npm:^4.3.6"
- checksum: 10/0d9addb4b28451319bc95feb7af6c060188e176199eebd1b66ef7ea460102e546aedcd6dc7039c5942812c9696218403106e2a45b66a8c551888fc18830b0014
+ checksum: 10/369155c3e7efa10ad348cd6686eb9efe57f334a4638f9107fd6ad6705dc532841f9bd8346182591280b2c7837600d8fb0cf0d1ced69a78caa8544fc3bb43653a
languageName: node
linkType: hard
@@ -42363,6 +42629,13 @@ __metadata:
languageName: node
linkType: hard
+"presentable-error@npm:^0.0.1":
+ version: 0.0.1
+ resolution: "presentable-error@npm:0.0.1"
+ checksum: 10/013809ee7a47ced847a8d860e9b89a56cdd8c4f1ad04ad8da1e58fd60843f77f497d204146bb15aaa9793d3b94ad8626eed01256fc9eb5839a545af2000a5fa4
+ languageName: node
+ linkType: hard
+
"prettier@npm:^2.2.1, prettier@npm:^2.7.1":
version: 2.8.8
resolution: "prettier@npm:2.8.8"
@@ -42389,6 +42662,17 @@ __metadata:
languageName: node
linkType: hard
+"pretty-format@npm:30.2.0, pretty-format@npm:^30.0.0":
+ version: 30.2.0
+ resolution: "pretty-format@npm:30.2.0"
+ dependencies:
+ "@jest/schemas": "npm:30.0.5"
+ ansi-styles: "npm:^5.2.0"
+ react-is: "npm:^18.3.1"
+ checksum: 10/725890d648e3400575eebc99a334a4cd1498e0d36746313913706bbeea20ada27e17c184a3cd45c50f705c16111afa829f3450233fc0fda5eed293c69757e926
+ languageName: node
+ linkType: hard
+
"pretty-format@npm:^27.0.2":
version: 27.5.1
resolution: "pretty-format@npm:27.5.1"
@@ -42400,7 +42684,7 @@ __metadata:
languageName: node
linkType: hard
-"pretty-format@npm:^29.0.0, pretty-format@npm:^29.7.0":
+"pretty-format@npm:^29.7.0":
version: 29.7.0
resolution: "pretty-format@npm:29.7.0"
dependencies:
@@ -42420,15 +42704,6 @@ __metadata:
languageName: node
linkType: hard
-"pretty-ms@npm:^9.0.0":
- version: 9.2.0
- resolution: "pretty-ms@npm:9.2.0"
- dependencies:
- parse-ms: "npm:^4.0.0"
- checksum: 10/a65a1d81560867f4f7128862fdbf0e1c2d3c5607bf75cae7758bf8111e2c4b744be46e084704125a38ba918bb43defa7a53aaff0f48c5c2d95367d3148c980d9
- languageName: node
- linkType: hard
-
"printj@npm:~1.1.0":
version: 1.1.2
resolution: "printj@npm:1.1.2"
@@ -42586,7 +42861,7 @@ __metadata:
languageName: node
linkType: hard
-"prompts@npm:^2.0.1, prompts@npm:^2.4.2":
+"prompts@npm:^2.4.2":
version: 2.4.2
resolution: "prompts@npm:2.4.2"
dependencies:
@@ -42643,6 +42918,13 @@ __metadata:
languageName: node
linkType: hard
+"property-information@npm:^7.0.0":
+ version: 7.1.0
+ resolution: "property-information@npm:7.1.0"
+ checksum: 10/896d38a52ad7170de73f832d277c69e76a9605d941ebb3f0d6e56271414a7fdf95ff6d2819e68036b8a0c7d2d4d88bf1d4a5765c032cb19c2343567ee3a14b15
+ languageName: node
+ linkType: hard
+
"proto3-json-serializer@npm:^2.0.2":
version: 2.0.2
resolution: "proto3-json-serializer@npm:2.0.2"
@@ -42712,13 +42994,6 @@ __metadata:
languageName: node
linkType: hard
-"psl@npm:^1.1.33":
- version: 1.8.0
- resolution: "psl@npm:1.8.0"
- checksum: 10/5f62a8eca06cb4a017983d15b92b0d38dc8699d637eabc8cb482c59b4106c9760f59cc8afabcb8bb7b98f0322907680d8f0f59226386fffab5248d180bc04578
- languageName: node
- linkType: hard
-
"pstree.remy@npm:^1.1.8":
version: 1.1.8
resolution: "pstree.remy@npm:1.1.8"
@@ -42787,14 +43062,14 @@ __metadata:
languageName: node
linkType: hard
-"pure-rand@npm:^6.0.0":
- version: 6.0.4
- resolution: "pure-rand@npm:6.0.4"
- checksum: 10/34fed0abe99d3db7ddc459c12e1eda6bff05db6a17f2017a1ae12202271ccf276fb223b442653518c719671c1b339bbf97f27ba9276dba0997c89e45c4e6a3bf
+"pure-rand@npm:^7.0.0":
+ version: 7.0.1
+ resolution: "pure-rand@npm:7.0.1"
+ checksum: 10/c61a576fda5032ec9763ecb000da4a8f19263b9e2f9ae9aa2759c8fbd9dc6b192b2ce78391ebd41abb394a5fedb7bcc4b03c9e6141ac8ab20882dd5717698b80
languageName: node
linkType: hard
-"qs@npm:^6.10.1, qs@npm:^6.10.3, qs@npm:^6.11.0, qs@npm:^6.11.2, qs@npm:^6.12.2, qs@npm:^6.12.3, qs@npm:^6.14.0, qs@npm:^6.7.0, qs@npm:^6.9.4, qs@npm:~6.14.0":
+"qs@npm:^6.10.1, qs@npm:^6.10.3, qs@npm:^6.11.2, qs@npm:^6.12.2, qs@npm:^6.12.3, qs@npm:^6.14.0, qs@npm:^6.7.0, qs@npm:^6.9.4, qs@npm:~6.14.0":
version: 6.14.0
resolution: "qs@npm:6.14.0"
dependencies:
@@ -42956,11 +43231,11 @@ __metadata:
linkType: hard
"rate-limit-redis@npm:^4.2.0":
- version: 4.2.1
- resolution: "rate-limit-redis@npm:4.2.1"
+ version: 4.3.1
+ resolution: "rate-limit-redis@npm:4.3.1"
peerDependencies:
express-rate-limit: ">= 6"
- checksum: 10/c36c50cfca992cbd14c97c08bb01c7d1d340d27b5fa1a2c1154275fec0b59c187eb6fb207da3d035c7c87e7629c92324cd53074f854dbb16548faf94f5a41351
+ checksum: 10/6e02374832ced889a61829e327d03d021c50c0fc3ac86674d8c922cd3a50c0451091106811c308ed5553776a28b6acbc5313e2c9d37aecb198ab306f249de21b
languageName: node
linkType: hard
@@ -43254,9 +43529,9 @@ __metadata:
languageName: node
linkType: hard
-"react-docgen@npm:^8.0.0":
- version: 8.0.1
- resolution: "react-docgen@npm:8.0.1"
+"react-docgen@npm:^8.0.0, react-docgen@npm:^8.0.2":
+ version: 8.0.2
+ resolution: "react-docgen@npm:8.0.2"
dependencies:
"@babel/core": "npm:^7.28.0"
"@babel/traverse": "npm:^7.28.0"
@@ -43268,7 +43543,7 @@ __metadata:
doctrine: "npm:^3.0.0"
resolve: "npm:^1.22.1"
strip-indent: "npm:^4.0.0"
- checksum: 10/6eb9ec3870c0f527fd05b048a842e2338825d99703312d6f4e84f3ae0e5eda427e6b4c7c07a93b21d8740e2be23e779e0237c4b2783160e285f0121711e2f47c
+ checksum: 10/b56f594237a0bdf1356dee6a416ab6f2f38f60a7330cbdaf1da93d366f29f6bfbbfedecd51d47f6ba2a898985c3205c369e7f6cad528478560d9363717243ff8
languageName: node
linkType: hard
@@ -43409,11 +43684,11 @@ __metadata:
linkType: hard
"react-hook-form@npm:^7.12.2":
- version: 7.55.0
- resolution: "react-hook-form@npm:7.55.0"
+ version: 7.67.0
+ resolution: "react-hook-form@npm:7.67.0"
peerDependencies:
react: ^16.8.0 || ^17 || ^18 || ^19
- checksum: 10/900e06064c1b4977f2e3e249a0f91742ae6bd1f2109701b80a9280b1c2b4bee8aac26aed7104371101eadad724f0bbe0215499e84623e6375007489ae850fe8e
+ checksum: 10/0e74a48b2da0f79166d5c6701f78a08fd5165e901e46ce5a578f0a2f25005e861023ffb35c1a96373c23701a84c3fce2111c4aced824d2ca08c9b2420a645551
languageName: node
linkType: hard
@@ -43472,7 +43747,7 @@ __metadata:
languageName: node
linkType: hard
-"react-is@npm:^18.0.0, react-is@npm:^18.2.0":
+"react-is@npm:^18.0.0, react-is@npm:^18.2.0, react-is@npm:^18.3.1":
version: 18.3.1
resolution: "react-is@npm:18.3.1"
checksum: 10/d5f60c87d285af24b1e1e7eaeb123ec256c3c8bdea7061ab3932e3e14685708221bf234ec50b21e10dd07f008f1b966a2730a0ce4ff67905b3872ff2042aec22
@@ -43639,12 +43914,12 @@ __metadata:
linkType: hard
"react-resizable-panels@npm:^3.0.4":
- version: 3.0.4
- resolution: "react-resizable-panels@npm:3.0.4"
+ version: 3.0.6
+ resolution: "react-resizable-panels@npm:3.0.6"
peerDependencies:
react: ^16.14.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
react-dom: ^16.14.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
- checksum: 10/92b8ac224d3c60c7c8ea0d80f712d9cd719afad76d4f1a5b8c8cc7c886b77f1d5058fa622ea057f28f5f7fc1a2c86e38e14d7b0f33722c30bff02e37f9fba705
+ checksum: 10/cacd2a0a63e4ecca193ceb2c8369d760946987c6386e38be39c7f98f909db923f161dbfd5187c289f5093c035c4a7757c4bd30b0d792bd8b45f2bc64183fe47f
languageName: node
linkType: hard
@@ -43808,7 +44083,7 @@ __metadata:
languageName: node
linkType: hard
-"react-syntax-highlighter@npm:^15.4.5, react-syntax-highlighter@npm:^15.6.1":
+"react-syntax-highlighter@npm:^15.4.5":
version: 15.6.6
resolution: "react-syntax-highlighter@npm:15.6.6"
dependencies:
@@ -43824,6 +44099,22 @@ __metadata:
languageName: node
linkType: hard
+"react-syntax-highlighter@npm:^16.0.0":
+ version: 16.1.0
+ resolution: "react-syntax-highlighter@npm:16.1.0"
+ dependencies:
+ "@babel/runtime": "npm:^7.28.4"
+ highlight.js: "npm:^10.4.1"
+ highlightjs-vue: "npm:^1.0.0"
+ lowlight: "npm:^1.17.0"
+ prismjs: "npm:^1.30.0"
+ refractor: "npm:^5.0.0"
+ peerDependencies:
+ react: ">= 0.14.0"
+ checksum: 10/d55bc96802357de2102703fb3ffe86a67d52099e93da9624a900609e4d8b6f5f95472d42423951631348fdee2679d661b17aaf41039035dc3f1bbabf0423d62e
+ languageName: node
+ linkType: hard
+
"react-test-renderer@npm:^16.13.1":
version: 16.14.0
resolution: "react-test-renderer@npm:16.14.0"
@@ -43877,8 +44168,8 @@ __metadata:
linkType: hard
"react-use@npm:^17.2.4, react-use@npm:^17.3.2, react-use@npm:^17.4.0":
- version: 17.5.1
- resolution: "react-use@npm:17.5.1"
+ version: 17.6.0
+ resolution: "react-use@npm:17.6.0"
dependencies:
"@types/js-cookie": "npm:^2.2.6"
"@xobotyi/scrollbar-width": "npm:^1.9.5"
@@ -43897,7 +44188,7 @@ __metadata:
peerDependencies:
react: "*"
react-dom: "*"
- checksum: 10/2da403a9949dbd964b9b8e20dcd354db66b7f7d5ca1f42572fbcdb06bd49ee828c295be4912cb87abc163d1b54820bb8c5fa85314a16c4579d9e30bf9cbd5759
+ checksum: 10/a817b74e82b481a39d3539bfe8d3b535c08d59d44a75ea91f65e56a7ccaedb0de185159e50b44ea4a635dda0c1c7159f07530e81a1d64b57130e0a715a107795
languageName: node
linkType: hard
@@ -43967,7 +44258,7 @@ __metadata:
languageName: node
linkType: hard
-"read-tls-client-hello@npm:^1.0.0":
+"read-tls-client-hello@npm:^1.0.0, read-tls-client-hello@npm:^1.1.0":
version: 1.1.0
resolution: "read-tls-client-hello@npm:1.1.0"
dependencies:
@@ -44066,6 +44357,13 @@ __metadata:
languageName: node
linkType: hard
+"readdirp@npm:^4.0.1":
+ version: 4.1.2
+ resolution: "readdirp@npm:4.1.2"
+ checksum: 10/7b817c265940dba90bb9c94d82920d76c3a35ea2d67f9f9d8bd936adcfe02d50c802b14be3dd2e725e002dddbe2cc1c7a0edfb1bc3a365c9dfd5a61e612eea1e
+ languageName: node
+ linkType: hard
+
"readline-sync@npm:1.4.9":
version: 1.4.9
resolution: "readline-sync@npm:1.4.9"
@@ -44210,6 +44508,18 @@ __metadata:
languageName: node
linkType: hard
+"refractor@npm:^5.0.0":
+ version: 5.0.0
+ resolution: "refractor@npm:5.0.0"
+ dependencies:
+ "@types/hast": "npm:^3.0.0"
+ "@types/prismjs": "npm:^1.0.0"
+ hastscript: "npm:^9.0.0"
+ parse-entities: "npm:^4.0.0"
+ checksum: 10/a14ceb938ed6f7f17dfa44660d3f3aff33e8896710bd76af0b411778791918bf20f923a191ff197fbc6a8e3f06c4371b83882f46ce76736f804dbe2b82b0be94
+ languageName: node
+ linkType: hard
+
"regenerator-runtime@npm:^0.10.5":
version: 0.10.5
resolution: "regenerator-runtime@npm:0.10.5"
@@ -44476,13 +44786,6 @@ __metadata:
languageName: node
linkType: hard
-"resolve.exports@npm:^2.0.0":
- version: 2.0.0
- resolution: "resolve.exports@npm:2.0.0"
- checksum: 10/a94fe2c064c57b4cc64de8c13eab28f744ee2327af4e458f2db00b5bbc3e7bf91b59fca043e35e2a3cf70bdae2263825c926b62200e2eb78d5c55a88d14932a8
- languageName: node
- linkType: hard
-
"resolve@npm:1.22.8":
version: 1.22.8
resolution: "resolve@npm:1.22.8"
@@ -44762,33 +45065,33 @@ __metadata:
linkType: hard
"rollup-plugin-dts@npm:^6.1.0":
- version: 6.1.1
- resolution: "rollup-plugin-dts@npm:6.1.1"
+ version: 6.3.0
+ resolution: "rollup-plugin-dts@npm:6.3.0"
dependencies:
- "@babel/code-frame": "npm:^7.24.2"
- magic-string: "npm:^0.30.10"
+ "@babel/code-frame": "npm:^7.27.1"
+ magic-string: "npm:^0.30.21"
peerDependencies:
rollup: ^3.29.4 || ^4
typescript: ^4.5 || ^5.0
dependenciesMeta:
"@babel/code-frame":
optional: true
- checksum: 10/8a66833a5af32f77d9bbc746339097d4af2382e5160f7629d85dcecb4efad12cbfebd37c79147fa688f073c333d71f53135e08a225a3fc3e9a3b3f92c46b2381
+ checksum: 10/1b2b25126eee0c4e7f59d82ee5850b0c5779a1a0bb77d677798e20a3d29dba76d1a19a73300ed5b20aab02f6888ecc4209a95b07f6cc9c1b80af14bdcbeda5b9
languageName: node
linkType: hard
"rollup-plugin-esbuild@npm:^6.1.1":
- version: 6.1.1
- resolution: "rollup-plugin-esbuild@npm:6.1.1"
+ version: 6.2.1
+ resolution: "rollup-plugin-esbuild@npm:6.2.1"
dependencies:
- "@rollup/pluginutils": "npm:^5.0.5"
- debug: "npm:^4.3.4"
- es-module-lexer: "npm:^1.3.1"
- get-tsconfig: "npm:^4.7.2"
+ debug: "npm:^4.4.0"
+ es-module-lexer: "npm:^1.6.0"
+ get-tsconfig: "npm:^4.10.0"
+ unplugin-utils: "npm:^0.2.4"
peerDependencies:
esbuild: ">=0.18.0"
rollup: ^1.20.0 || ^2.0.0 || ^3.0.0 || ^4.0.0
- checksum: 10/bba2d1dfb92a193823ac9dd1cdd44a8fd8cd9f25868e9a22ca077e1b7445feb4eaaf6df051148e367fc902d7d59c9f50efab49086c24c367972f05c86f3a656d
+ checksum: 10/e5731b86c4e01c6ccd3998a2f90794bd738fe83a3a809b9e82456e4b1d173c296ef302c2a6669b966b12c757c1787f0585ae88cd73b98f3c0ad6ad7f779940aa
languageName: node
linkType: hard
@@ -44851,42 +45154,32 @@ __metadata:
languageName: node
linkType: hard
-"rollup@npm:^0.63.4":
- version: 0.63.5
- resolution: "rollup@npm:0.63.5"
- dependencies:
- "@types/estree": "npm:0.0.39"
- "@types/node": "npm:*"
- bin:
- rollup: ./bin/rollup
- checksum: 10/c52ad022bb732ea0e962b3ec45779d9d0523f75283bded8d0c97788f97946781d617b971e7e732ad7a63af60aad76ca534c415d8b101c7ff7d3f5cc879aba025
- languageName: node
- linkType: hard
-
"rollup@npm:^4.27.3, rollup@npm:^4.43.0":
- version: 4.46.2
- resolution: "rollup@npm:4.46.2"
+ version: 4.53.3
+ resolution: "rollup@npm:4.53.3"
dependencies:
- "@rollup/rollup-android-arm-eabi": "npm:4.46.2"
- "@rollup/rollup-android-arm64": "npm:4.46.2"
- "@rollup/rollup-darwin-arm64": "npm:4.46.2"
- "@rollup/rollup-darwin-x64": "npm:4.46.2"
- "@rollup/rollup-freebsd-arm64": "npm:4.46.2"
- "@rollup/rollup-freebsd-x64": "npm:4.46.2"
- "@rollup/rollup-linux-arm-gnueabihf": "npm:4.46.2"
- "@rollup/rollup-linux-arm-musleabihf": "npm:4.46.2"
- "@rollup/rollup-linux-arm64-gnu": "npm:4.46.2"
- "@rollup/rollup-linux-arm64-musl": "npm:4.46.2"
- "@rollup/rollup-linux-loongarch64-gnu": "npm:4.46.2"
- "@rollup/rollup-linux-ppc64-gnu": "npm:4.46.2"
- "@rollup/rollup-linux-riscv64-gnu": "npm:4.46.2"
- "@rollup/rollup-linux-riscv64-musl": "npm:4.46.2"
- "@rollup/rollup-linux-s390x-gnu": "npm:4.46.2"
- "@rollup/rollup-linux-x64-gnu": "npm:4.46.2"
- "@rollup/rollup-linux-x64-musl": "npm:4.46.2"
- "@rollup/rollup-win32-arm64-msvc": "npm:4.46.2"
- "@rollup/rollup-win32-ia32-msvc": "npm:4.46.2"
- "@rollup/rollup-win32-x64-msvc": "npm:4.46.2"
+ "@rollup/rollup-android-arm-eabi": "npm:4.53.3"
+ "@rollup/rollup-android-arm64": "npm:4.53.3"
+ "@rollup/rollup-darwin-arm64": "npm:4.53.3"
+ "@rollup/rollup-darwin-x64": "npm:4.53.3"
+ "@rollup/rollup-freebsd-arm64": "npm:4.53.3"
+ "@rollup/rollup-freebsd-x64": "npm:4.53.3"
+ "@rollup/rollup-linux-arm-gnueabihf": "npm:4.53.3"
+ "@rollup/rollup-linux-arm-musleabihf": "npm:4.53.3"
+ "@rollup/rollup-linux-arm64-gnu": "npm:4.53.3"
+ "@rollup/rollup-linux-arm64-musl": "npm:4.53.3"
+ "@rollup/rollup-linux-loong64-gnu": "npm:4.53.3"
+ "@rollup/rollup-linux-ppc64-gnu": "npm:4.53.3"
+ "@rollup/rollup-linux-riscv64-gnu": "npm:4.53.3"
+ "@rollup/rollup-linux-riscv64-musl": "npm:4.53.3"
+ "@rollup/rollup-linux-s390x-gnu": "npm:4.53.3"
+ "@rollup/rollup-linux-x64-gnu": "npm:4.53.3"
+ "@rollup/rollup-linux-x64-musl": "npm:4.53.3"
+ "@rollup/rollup-openharmony-arm64": "npm:4.53.3"
+ "@rollup/rollup-win32-arm64-msvc": "npm:4.53.3"
+ "@rollup/rollup-win32-ia32-msvc": "npm:4.53.3"
+ "@rollup/rollup-win32-x64-gnu": "npm:4.53.3"
+ "@rollup/rollup-win32-x64-msvc": "npm:4.53.3"
"@types/estree": "npm:1.0.8"
fsevents: "npm:~2.3.2"
dependenciesMeta:
@@ -44910,7 +45203,7 @@ __metadata:
optional: true
"@rollup/rollup-linux-arm64-musl":
optional: true
- "@rollup/rollup-linux-loongarch64-gnu":
+ "@rollup/rollup-linux-loong64-gnu":
optional: true
"@rollup/rollup-linux-ppc64-gnu":
optional: true
@@ -44924,17 +45217,21 @@ __metadata:
optional: true
"@rollup/rollup-linux-x64-musl":
optional: true
+ "@rollup/rollup-openharmony-arm64":
+ optional: true
"@rollup/rollup-win32-arm64-msvc":
optional: true
"@rollup/rollup-win32-ia32-msvc":
optional: true
+ "@rollup/rollup-win32-x64-gnu":
+ optional: true
"@rollup/rollup-win32-x64-msvc":
optional: true
fsevents:
optional: true
bin:
rollup: dist/bin/rollup
- checksum: 10/3acc425a9828e8ba75eaec9cb506a680d3deaa09a753635140cc4a3c98445ba6e3f631b32ca1c98965b3f60672d2815cd560ea844bba497d69e65c58c02327cf
+ checksum: 10/e2eff82405061fa907f15dfbf742b1f5fb4b214495c00989bcdbe21da5fcb3f6dec3deabacec491300a53c99da409586cfc77bdf29b411fccb9089b72cd3728d
languageName: node
linkType: hard
@@ -44954,11 +45251,12 @@ __metadata:
"@octokit/rest": "npm:^19.0.3"
"@playwright/test": "npm:^1.32.3"
"@spotify/eslint-plugin": "npm:^15.0.0"
- "@storybook/addon-a11y": "npm:^9.1.7"
- "@storybook/addon-docs": "npm:^9.1.7"
- "@storybook/addon-links": "npm:^9.1.7"
- "@storybook/addon-themes": "npm:^9.1.7"
- "@storybook/react-vite": "npm:^9.1.7"
+ "@storybook/addon-a11y": "npm:^10.1.9"
+ "@storybook/addon-docs": "npm:^10.1.9"
+ "@storybook/addon-links": "npm:^10.1.9"
+ "@storybook/addon-themes": "npm:^10.1.9"
+ "@storybook/addon-vitest": "npm:^10.1.9"
+ "@storybook/react-vite": "npm:^10.1.9"
"@techdocs/cli": "workspace:*"
"@types/cacheable-request": "npm:^8.3.6"
"@types/global-agent": "npm:^2.1.3"
@@ -44986,7 +45284,7 @@ __metadata:
shx: "npm:^0.4.0"
sloc: "npm:^0.3.1"
sort-package-json: "npm:^2.8.0"
- storybook: "npm:^9.1.7"
+ storybook: "npm:^10.1.10"
ts-morph: "npm:^24.0.0"
typedoc: "npm:^0.28.0"
typescript: "npm:~5.7.0"
@@ -45015,6 +45313,13 @@ __metadata:
languageName: node
linkType: hard
+"rrweb-cssom@npm:^0.8.0":
+ version: 0.8.0
+ resolution: "rrweb-cssom@npm:0.8.0"
+ checksum: 10/07521ee36fb6569c17906afad1ac7ff8f099d49ade9249e190693ac36cdf27f88d9acf0cc66978935d5d0a23fca105643d7e9125b9a9d91ed9db9e02d31d7d80
+ languageName: node
+ linkType: hard
+
"rtl-css-js@npm:^1.16.1":
version: 1.16.1
resolution: "rtl-css-js@npm:1.16.1"
@@ -45040,7 +45345,7 @@ __metadata:
languageName: node
linkType: hard
-"run-parallel@npm:^1.1.9, run-parallel@npm:^1.2.0":
+"run-parallel@npm:^1.1.9":
version: 1.2.0
resolution: "run-parallel@npm:1.2.0"
dependencies:
@@ -45058,15 +45363,6 @@ __metadata:
languageName: node
linkType: hard
-"rxjs@npm:^6.6.3":
- version: 6.6.7
- resolution: "rxjs@npm:6.6.7"
- dependencies:
- tslib: "npm:^1.9.0"
- checksum: 10/c8263ebb20da80dd7a91c452b9e96a178331f402344bbb40bc772b56340fcd48d13d1f545a1e3d8e464893008c5e306cc42a1552afe0d562b1a6d4e1e6262b03
- languageName: node
- linkType: hard
-
"sade@npm:^1.7.3":
version: 1.8.1
resolution: "sade@npm:1.8.1"
@@ -45383,7 +45679,7 @@ __metadata:
languageName: node
linkType: hard
-"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.1.2, semver@npm:^7.1.3, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.6.2":
+"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.1.2, semver@npm:^7.1.3, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.6.2, semver@npm:^7.7.2":
version: 7.7.3
resolution: "semver@npm:7.7.3"
bin:
@@ -45630,7 +45926,7 @@ __metadata:
languageName: node
linkType: hard
-"sha.js@npm:^2.4.0, sha.js@npm:^2.4.11, sha.js@npm:^2.4.12, sha.js@npm:^2.4.8, sha.js@npm:^2.4.9":
+"sha.js@npm:^2.4.0, sha.js@npm:^2.4.11, sha.js@npm:^2.4.12, sha.js@npm:^2.4.8":
version: 2.4.12
resolution: "sha.js@npm:2.4.12"
dependencies:
@@ -45700,10 +45996,10 @@ __metadata:
languageName: node
linkType: hard
-"shell-quote@npm:^1.6.1, shell-quote@npm:^1.7.3, shell-quote@npm:^1.8.1":
- version: 1.8.1
- resolution: "shell-quote@npm:1.8.1"
- checksum: 10/af19ab5a1ec30cb4b2f91fd6df49a7442d5c4825a2e269b3712eded10eedd7f9efeaab96d57829880733fc55bcdd8e9b1d8589b4befb06667c731d08145e274d
+"shell-quote@npm:1.8.3, shell-quote@npm:^1.6.1, shell-quote@npm:^1.7.3, shell-quote@npm:^1.8.1":
+ version: 1.8.3
+ resolution: "shell-quote@npm:1.8.3"
+ checksum: 10/5473e354637c2bd698911224129c9a8961697486cff1fb221f234d71c153fc377674029b0223d1d3c953a68d451d79366abfe53d1a0b46ee1f28eb9ade928f4c
languageName: node
linkType: hard
@@ -45846,15 +46142,6 @@ __metadata:
languageName: node
linkType: hard
-"simple-swizzle@npm:^0.2.2":
- version: 0.2.2
- resolution: "simple-swizzle@npm:0.2.2"
- dependencies:
- is-arrayish: "npm:^0.3.1"
- checksum: 10/c6dffff17aaa383dae7e5c056fbf10cf9855a9f79949f20ee225c04f06ddde56323600e0f3d6797e82d08d006e93761122527438ee9531620031c08c9e0d73cc
- languageName: node
- linkType: hard
-
"simple-update-notifier@npm:^2.0.0":
version: 2.0.0
resolution: "simple-update-notifier@npm:2.0.0"
@@ -45962,10 +46249,10 @@ __metadata:
languageName: node
linkType: hard
-"smol-toml@npm:^1.3.1":
- version: 1.3.1
- resolution: "smol-toml@npm:1.3.1"
- checksum: 10/b999828ea46cf44ae90b6293884d6a139dfb4545ac6f86cbd1002568a943a43d8895ad82413855d095eec0c0bc21d23413c0a25a26c7fad6395c2ce42c2fdbd0
+"smol-toml@npm:^1.5.2":
+ version: 1.5.2
+ resolution: "smol-toml@npm:1.5.2"
+ checksum: 10/0a7e9192d1cbd04c3122224306de33962f4f5ac7e78a48b7c3795a675683b6efeb8f73ad3fabda7635926a510948cb4654a729d17b35ec43d56d35a71cf906f4
languageName: node
linkType: hard
@@ -46121,7 +46408,7 @@ __metadata:
languageName: node
linkType: hard
-"source-map-js@npm:^1.2.1":
+"source-map-js@npm:^1.0.1, source-map-js@npm:^1.2.1":
version: 1.2.1
resolution: "source-map-js@npm:1.2.1"
checksum: 10/ff9d8c8bf096d534a5b7707e0382ef827b4dd360a577d3f34d2b9f48e12c9d230b5747974ee7c607f0df65113732711bb701fe9ece3c7edbd43cb2294d707df3
@@ -46197,13 +46484,6 @@ __metadata:
languageName: node
linkType: hard
-"spawn-command@npm:^0.0.2-1":
- version: 0.0.2
- resolution: "spawn-command@npm:0.0.2"
- checksum: 10/f13e8c3c63abd4a0b52fb567eba5f7940d480c5ed3ec61781d38a1850f179b1196c39e6efa2bbd301f82c1bf1cd7807abc8fbd8fc8e44bcaa3975a124c0d1657
- languageName: node
- linkType: hard
-
"spawndamnit@npm:^3.0.1":
version: 3.0.1
resolution: "spawndamnit@npm:3.0.1"
@@ -46257,12 +46537,10 @@ __metadata:
languageName: node
linkType: hard
-"split@npm:^1.0.0":
- version: 1.0.1
- resolution: "split@npm:1.0.1"
- dependencies:
- through: "npm:2"
- checksum: 10/12f4554a5792c7e98bb3e22b53c63bfa5ef89aa704353e1db608a55b51f5b12afaad6e4a8ecf7843c15f273f43cdadd67b3705cc43d48a75c2cf4641d51f7e7a
+"split2@npm:^4.1.0":
+ version: 4.2.0
+ resolution: "split2@npm:4.2.0"
+ checksum: 10/09bbefc11bcf03f044584c9764cd31a252d8e52cea29130950b26161287c11f519807c5e54bd9e5804c713b79c02cefe6a98f4688630993386be353e03f534ab
languageName: node
linkType: hard
@@ -46382,7 +46660,7 @@ __metadata:
languageName: node
linkType: hard
-"stack-utils@npm:^2.0.2, stack-utils@npm:^2.0.3":
+"stack-utils@npm:^2.0.2, stack-utils@npm:^2.0.6":
version: 2.0.6
resolution: "stack-utils@npm:2.0.6"
dependencies:
@@ -46473,21 +46751,21 @@ __metadata:
languageName: node
linkType: hard
-"storybook@npm:^9.1.7":
- version: 9.1.7
- resolution: "storybook@npm:9.1.7"
+"storybook@npm:^10.1.10":
+ version: 10.1.10
+ resolution: "storybook@npm:10.1.10"
dependencies:
"@storybook/global": "npm:^5.0.0"
+ "@storybook/icons": "npm:^2.0.0"
"@testing-library/jest-dom": "npm:^6.6.3"
"@testing-library/user-event": "npm:^14.6.1"
"@vitest/expect": "npm:3.2.4"
- "@vitest/mocker": "npm:3.2.4"
"@vitest/spy": "npm:3.2.4"
- better-opn: "npm:^3.0.2"
- esbuild: "npm:^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0"
- esbuild-register: "npm:^3.5.0"
+ esbuild: "npm:^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0 || ^0.26.0 || ^0.27.0"
+ open: "npm:^10.2.0"
recast: "npm:^0.23.5"
semver: "npm:^7.6.2"
+ use-sync-external-store: "npm:^1.5.0"
ws: "npm:^8.18.0"
peerDependencies:
prettier: ^2 || ^3
@@ -46495,8 +46773,8 @@ __metadata:
prettier:
optional: true
bin:
- storybook: ./bin/index.cjs
- checksum: 10/3ad9a953d1c54249153c7928e970d41f9b7ce376649f5a07f71c622b0b524784955c8d11afca8903e712c28655cce7c94d9e2b5f094ceb883d284ffdcd5f0d01
+ storybook: ./dist/bin/dispatcher.js
+ checksum: 10/c1f01c7ab57e80d2f2ef3a5c49baad5904e77c8e079199ad134e98a7ae455d52422390cd704e64142b36668874c055670dbffe0e334e1f4d541ebd4384052dd7
languageName: node
linkType: hard
@@ -46627,9 +46905,9 @@ __metadata:
linkType: hard
"strict-event-emitter@npm:^0.4.3":
- version: 0.4.3
- resolution: "strict-event-emitter@npm:0.4.3"
- checksum: 10/ee335aba8a43bc6749d3337d78b9f6dbe8358d34b6eb38e7075dadf7f1cae621d96588663dda22dce17e6e7c7e281ddac79ca47421da8250bb4bf53b979508a5
+ version: 0.4.6
+ resolution: "strict-event-emitter@npm:0.4.6"
+ checksum: 10/abdbf59b6c45b599cc2f227fa473765d1510d155ebd22533e8ecb06110dfacb2ff07aece7fd528dde2b4f9e379d60f2687eee8af3fa2877c3ed88ee5b7ed2707
languageName: node
linkType: hard
@@ -46661,13 +46939,13 @@ __metadata:
languageName: node
linkType: hard
-"string-length@npm:^4.0.1":
- version: 4.0.1
- resolution: "string-length@npm:4.0.1"
+"string-length@npm:^4.0.2":
+ version: 4.0.2
+ resolution: "string-length@npm:4.0.2"
dependencies:
char-regex: "npm:^1.0.2"
strip-ansi: "npm:^6.0.0"
- checksum: 10/7bd3191668ddafa6f574a8b17a1bd1b085737d64ceefa51f72cdd19c45a730422cd70d984eee7584d6e5b5c84b6318633c6d6a720a4bfd7c58769985fa77573e
+ checksum: 10/ce85533ef5113fcb7e522bcf9e62cb33871aa99b3729cec5595f4447f660b0cefd542ca6df4150c97a677d58b0cb727a3fe09ac1de94071d05526c73579bf505
languageName: node
linkType: hard
@@ -46761,7 +47039,7 @@ __metadata:
languageName: node
linkType: hard
-"string.prototype.trimend@npm:^1.0.8, string.prototype.trimend@npm:^1.0.9":
+"string.prototype.trimend@npm:^1.0.9":
version: 1.0.9
resolution: "string.prototype.trimend@npm:1.0.9"
dependencies:
@@ -46832,11 +47110,11 @@ __metadata:
linkType: hard
"strip-ansi@npm:^7.0.1, strip-ansi@npm:^7.1.0":
- version: 7.1.0
- resolution: "strip-ansi@npm:7.1.0"
+ version: 7.1.2
+ resolution: "strip-ansi@npm:7.1.2"
dependencies:
ansi-regex: "npm:^6.0.1"
- checksum: 10/475f53e9c44375d6e72807284024ac5d668ee1d06010740dec0b9744f2ddf47de8d7151f80e5f6190fc8f384e802fdf9504b76a7e9020c9faee7103623338be2
+ checksum: 10/db0e3f9654e519c8a33c50fc9304d07df5649388e7da06d3aabf66d29e5ad65d5e6315d8519d409c15b32fa82c1df7e11ed6f8cd50b0e4404463f0c9d77c8d0b
languageName: node
linkType: hard
@@ -46921,10 +47199,10 @@ __metadata:
languageName: node
linkType: hard
-"strip-json-comments@npm:5.0.1":
- version: 5.0.1
- resolution: "strip-json-comments@npm:5.0.1"
- checksum: 10/b314af70c6666a71133e309a571bdb87687fc878d9fd8b38ebed393a77b89835b92f191aa6b0bc10dfd028ba99eed6b6365985001d64c5aef32a4a82456a156b
+"strip-json-comments@npm:5.0.3":
+ version: 5.0.3
+ resolution: "strip-json-comments@npm:5.0.3"
+ checksum: 10/3ccbf26f278220f785e4b71f8a719a6a063d72558cc63cb450924254af258a4f4c008b8c9b055373a680dc7bd525be9e543ad742c177f8a7667e0b726258e0e4
languageName: node
linkType: hard
@@ -46956,12 +47234,12 @@ __metadata:
languageName: node
linkType: hard
-"strtok3@npm:^10.2.2":
- version: 10.3.1
- resolution: "strtok3@npm:10.3.1"
+"strtok3@npm:^10.3.1":
+ version: 10.3.4
+ resolution: "strtok3@npm:10.3.4"
dependencies:
"@tokenizer/token": "npm:^0.3.0"
- checksum: 10/bb7950cc9ce98ec742a5db360630f0b004f16197959ae28d8c8dad4f8f0e405d71cfdc992483038ba29a0b4cbd7227618ad2492005b510d84a3fc5903df0c13f
+ checksum: 10/53be14a567dca149be56cb072eaa3c0fffd70d066acf800cf588b91558c6d475364ff8d550524ce0499fc4873a4b0d42ad8c542bfdb9fb39cba520ef2e2e9818
languageName: node
linkType: hard
@@ -47084,54 +47362,56 @@ __metadata:
linkType: hard
"sucrase@npm:^3.20.2":
- version: 3.35.0
- resolution: "sucrase@npm:3.35.0"
+ version: 3.35.1
+ resolution: "sucrase@npm:3.35.1"
dependencies:
"@jridgewell/gen-mapping": "npm:^0.3.2"
commander: "npm:^4.0.0"
- glob: "npm:^10.3.10"
lines-and-columns: "npm:^1.1.6"
mz: "npm:^2.7.0"
pirates: "npm:^4.0.1"
+ tinyglobby: "npm:^0.2.11"
ts-interface-checker: "npm:^0.1.9"
bin:
sucrase: bin/sucrase
sucrase-node: bin/sucrase-node
- checksum: 10/bc601558a62826f1c32287d4fdfa4f2c09fe0fec4c4d39d0e257fd9116d7d6227a18309721d4185ec84c9dc1af0d5ec0e05a42a337fbb74fc293e068549aacbe
+ checksum: 10/539f5c6ebc1ff8d449a89eb52b8c8944a730b9840ddadbd299a7d89ebcf16c3f4bc9aa59e1f2e112a502e5cf1508f7e02065f0e97c0435eb9a7058e997dfff5a
languageName: node
linkType: hard
-"summary@npm:2.1.0":
- version: 2.1.0
- resolution: "summary@npm:2.1.0"
- checksum: 10/10ac12ce12c013b56ad44c37cfac206961f0993d98867b33b1b03a27b38a1cf8dd2db0b788883356c5335bbbb37d953772ef4a381d6fc8f408faf99f2bc54af5
- languageName: node
- linkType: hard
-
-"superagent@npm:^9.0.1":
- version: 9.0.2
- resolution: "superagent@npm:9.0.2"
+"superagent@npm:^10.2.3":
+ version: 10.2.3
+ resolution: "superagent@npm:10.2.3"
dependencies:
- component-emitter: "npm:^1.3.0"
+ component-emitter: "npm:^1.3.1"
cookiejar: "npm:^2.1.4"
- debug: "npm:^4.3.4"
+ debug: "npm:^4.3.7"
fast-safe-stringify: "npm:^2.1.1"
- form-data: "npm:^4.0.0"
- formidable: "npm:^3.5.1"
+ form-data: "npm:^4.0.4"
+ formidable: "npm:^3.5.4"
methods: "npm:^1.1.2"
mime: "npm:2.6.0"
- qs: "npm:^6.11.0"
- checksum: 10/d3c0c9051ceec84d5b431eaa410ad81bcd53255cea57af1fc66d683a24c34f3ba4761b411072a9bf489a70e3d5b586a78a0e6f2eac6a561067e7d196ddab0907
+ qs: "npm:^6.11.2"
+ checksum: 10/377bf938e68927dd772169c5285be27872bf6e84fac01c52bcd9396bc5b348c9ded8f8be54649510ec09a67bc5096055847b37cb01b3bca0eb06ff1856170e35
languageName: node
linkType: hard
"supertest@npm:^7.0.0, supertest@npm:^7.1.0":
- version: 7.1.0
- resolution: "supertest@npm:7.1.0"
+ version: 7.1.4
+ resolution: "supertest@npm:7.1.4"
dependencies:
methods: "npm:^1.1.2"
- superagent: "npm:^9.0.1"
- checksum: 10/20069f739a44821dfa4f7f397b9086ef31a358366331138f97945eedb2e231796e7c55b032125d3bd12f9839f089fbb809893dbc0f98edc57e12333b9f42b726
+ superagent: "npm:^10.2.3"
+ checksum: 10/ecb5d41f2b62b257dbdcabac245c32b8e8fb264fe2636dd85c2c883569d23dc14adc0a471abb84187cbdb49bc36ad870ad355b4a0b85973f510fd57fc229e6cc
+ languageName: node
+ linkType: hard
+
+"supports-color@npm:8.1.1, supports-color@npm:^8.0.0, supports-color@npm:^8.1.1, supports-color@npm:~8.1.1":
+ version: 8.1.1
+ resolution: "supports-color@npm:8.1.1"
+ dependencies:
+ has-flag: "npm:^4.0.0"
+ checksum: 10/157b534df88e39c5518c5e78c35580c1eca848d7dbaf31bbe06cdfc048e22c7ff1a9d046ae17b25691128f631a51d9ec373c1b740c12ae4f0de6e292037e4282
languageName: node
linkType: hard
@@ -47162,15 +47442,6 @@ __metadata:
languageName: node
linkType: hard
-"supports-color@npm:^8.0.0, supports-color@npm:^8.1.0, supports-color@npm:^8.1.1, supports-color@npm:~8.1.1":
- version: 8.1.1
- resolution: "supports-color@npm:8.1.1"
- dependencies:
- has-flag: "npm:^4.0.0"
- checksum: 10/157b534df88e39c5518c5e78c35580c1eca848d7dbaf31bbe06cdfc048e22c7ff1a9d046ae17b25691128f631a51d9ec373c1b740c12ae4f0de6e292037e4282
- languageName: node
- linkType: hard
-
"supports-preserve-symlinks-flag@npm:^1.0.0":
version: 1.0.0
resolution: "supports-preserve-symlinks-flag@npm:1.0.0"
@@ -47195,17 +47466,17 @@ __metadata:
languageName: node
linkType: hard
-"swagger-client@npm:^3.35.5":
- version: 3.35.6
- resolution: "swagger-client@npm:3.35.6"
+"swagger-client@npm:^3.36.0":
+ version: 3.36.0
+ resolution: "swagger-client@npm:3.36.0"
dependencies:
"@babel/runtime-corejs3": "npm:^7.22.15"
"@scarf/scarf": "npm:=1.4.0"
- "@swagger-api/apidom-core": "npm:>=1.0.0-beta.41 <1.0.0-rc.0"
- "@swagger-api/apidom-error": "npm:>=1.0.0-beta.41 <1.0.0-rc.0"
- "@swagger-api/apidom-json-pointer": "npm:>=1.0.0-beta.41 <1.0.0-rc.0"
- "@swagger-api/apidom-ns-openapi-3-1": "npm:>=1.0.0-beta.41 <1.0.0-rc.0"
- "@swagger-api/apidom-reference": "npm:>=1.0.0-beta.41 <1.0.0-rc.0"
+ "@swagger-api/apidom-core": "npm:^1.0.0-rc.1"
+ "@swagger-api/apidom-error": "npm:^1.0.0-rc.1"
+ "@swagger-api/apidom-json-pointer": "npm:^1.0.0-rc.1"
+ "@swagger-api/apidom-ns-openapi-3-1": "npm:^1.0.0-rc.1"
+ "@swagger-api/apidom-reference": "npm:^1.0.0-rc.1"
"@swaggerexpert/cookie": "npm:^2.0.2"
deepmerge: "npm:~4.3.0"
fast-json-patch: "npm:^3.0.0-1"
@@ -47217,13 +47488,13 @@ __metadata:
openapi-server-url-templating: "npm:^1.3.0"
ramda: "npm:^0.30.1"
ramda-adjunct: "npm:^5.1.0"
- checksum: 10/fb6582dc45c2ae6a26ae4cc80f0a3d97e31f3b058676951f93670828f2f30f5d44ecd7c029465f5452b251a533be329a955c92cec11be7128baa5e2e963e6f9d
+ checksum: 10/ea69e017cf266b44e2ef8e01a862975789bc62a537ab28baffb80b51d99640e35fac44eea5b744e98d0f6151fa290a09f840a5ad3f0103ead508e628b10dbc7b
languageName: node
linkType: hard
"swagger-ui-react@npm:^5.27.1":
- version: 5.29.0
- resolution: "swagger-ui-react@npm:5.29.0"
+ version: 5.30.3
+ resolution: "swagger-ui-react@npm:5.30.3"
dependencies:
"@babel/runtime-corejs3": "npm:^7.27.1"
"@scarf/scarf": "npm:=1.4.0"
@@ -47232,11 +47503,11 @@ __metadata:
classnames: "npm:^2.5.1"
css.escape: "npm:1.5.1"
deep-extend: "npm:0.6.0"
- dompurify: "npm:=3.2.4"
+ dompurify: "npm:=3.2.6"
ieee754: "npm:^1.2.1"
immutable: "npm:^3.x.x"
js-file-download: "npm:^0.4.12"
- js-yaml: "npm:=4.1.0"
+ js-yaml: "npm:=4.1.1"
lodash: "npm:^4.17.21"
prop-types: "npm:^15.8.1"
randexp: "npm:^0.5.3"
@@ -47247,14 +47518,14 @@ __metadata:
react-immutable-pure-component: "npm:^2.2.0"
react-inspector: "npm:^6.0.1"
react-redux: "npm:^9.2.0"
- react-syntax-highlighter: "npm:^15.6.1"
+ react-syntax-highlighter: "npm:^16.0.0"
redux: "npm:^5.0.1"
redux-immutable: "npm:^4.0.0"
remarkable: "npm:^2.0.1"
reselect: "npm:^5.1.1"
serialize-error: "npm:^8.1.0"
sha.js: "npm:^2.4.12"
- swagger-client: "npm:^3.35.5"
+ swagger-client: "npm:^3.36.0"
url-parse: "npm:^1.5.10"
xml: "npm:=1.0.1"
xml-but-prettier: "npm:^1.0.1"
@@ -47262,7 +47533,7 @@ __metadata:
peerDependencies:
react: ">=16.8.0 <20"
react-dom: ">=16.8.0 <20"
- checksum: 10/994a7b06b17fe12693a7a09057161723f5e2ab2c80c747879951a54f0d7a0cd4c65c139bdaf229f13d61f5dd61c2b63218881fc23081ced0cc91745b48d806d5
+ checksum: 10/6f466414072806e60a3e36d58029b0679cd80cd9488e79a2142bebcd0829efa587f1b3249c2feab3ab692b3a70f5b90038f3fd14430f8ae41c6ec904f8041f79
languageName: node
linkType: hard
@@ -47279,14 +47550,14 @@ __metadata:
linkType: hard
"swr@npm:^2.0.0, swr@npm:^2.2.5":
- version: 2.2.5
- resolution: "swr@npm:2.2.5"
+ version: 2.3.7
+ resolution: "swr@npm:2.3.7"
dependencies:
- client-only: "npm:^0.0.1"
- use-sync-external-store: "npm:^1.2.0"
+ dequal: "npm:^2.0.3"
+ use-sync-external-store: "npm:^1.4.0"
peerDependencies:
- react: ^16.11.0 || ^17.0.0 || ^18.0.0
- checksum: 10/f02b3bd5a198a0f62f9a53d7c0528c4a58aa61a43310bea169614b6e873dadb52599e856ef0775405b6aa7409835343da0cf328948aa892aa309bf4b7e7d6902
+ react: ^16.11.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+ checksum: 10/a7a9f141ea31146f2787c36854ca0998f65d38503fe73fc3c0695ebba37821487eb43e62cece15d1739bc531e8430c15ac5f6ea695293e861fdbc2de92514d96
languageName: node
linkType: hard
@@ -47304,6 +47575,15 @@ __metadata:
languageName: node
linkType: hard
+"synckit@npm:^0.11.8":
+ version: 0.11.11
+ resolution: "synckit@npm:0.11.11"
+ dependencies:
+ "@pkgr/core": "npm:^0.2.9"
+ checksum: 10/6ecd88212b5be80004376b6ea74babcba284566ff59a50d8803afcaa78c165b5d268635c1dd84532ee3f690a979409e1eda225a8a35bed2d135ffdcea06ce7b0
+ languageName: node
+ linkType: hard
+
"tapable@npm:^1.0.0":
version: 1.1.3
resolution: "tapable@npm:1.1.3"
@@ -47497,8 +47777,8 @@ __metadata:
linkType: hard
"terser-webpack-plugin@npm:*, terser-webpack-plugin@npm:^5.1.3, terser-webpack-plugin@npm:^5.3.11":
- version: 5.3.15
- resolution: "terser-webpack-plugin@npm:5.3.15"
+ version: 5.3.16
+ resolution: "terser-webpack-plugin@npm:5.3.16"
dependencies:
"@jridgewell/trace-mapping": "npm:^0.3.25"
jest-worker: "npm:^27.4.5"
@@ -47514,7 +47794,7 @@ __metadata:
optional: true
uglify-js:
optional: true
- checksum: 10/54059f0fe56c16a1e30032b33b1321051d562b5292adcf88d160c7d8e74779867014e98548ae59ba5283fe60f8725bea37c16b42f2c89ee430382cff74198b7a
+ checksum: 10/09dfbff602acfa114cdd174254b69a04adbc47856021ab351e37982202fd1ec85e0b62ffd5864c98beb8e96aef2f43da490b3448b4541db539c2cff6607394a6
languageName: node
linkType: hard
@@ -47646,7 +47926,7 @@ __metadata:
languageName: node
linkType: hard
-"through@npm:2, through@npm:^2.3.6, through@npm:~2.3":
+"through@npm:^2.3.6, through@npm:~2.3":
version: 2.3.8
resolution: "through@npm:2.3.8"
checksum: 10/5da78346f70139a7d213b65a0106f3c398d6bc5301f9248b5275f420abc2c4b1e77c2abc72d218dedc28c41efb2e7c312cb76a7730d04f9c2d37d247da3f4198
@@ -47717,7 +47997,7 @@ __metadata:
languageName: node
linkType: hard
-"tinyglobby@npm:^0.2.15, tinyglobby@npm:^0.2.9":
+"tinyglobby@npm:^0.2.11, tinyglobby@npm:^0.2.15, tinyglobby@npm:^0.2.9":
version: 0.2.15
resolution: "tinyglobby@npm:0.2.15"
dependencies:
@@ -47748,10 +48028,10 @@ __metadata:
languageName: node
linkType: hard
-"tldts-core@npm:^6.1.51":
- version: 6.1.51
- resolution: "tldts-core@npm:6.1.51"
- checksum: 10/861d5736d714abfd649c0545b9aae27058cd76f28f83077328fde6ba5ba9f7f107227d09406cfd38baf6215fc7840545ed0b17352f2f364182265887774394dc
+"tldts-core@npm:^6.1.86":
+ version: 6.1.86
+ resolution: "tldts-core@npm:6.1.86"
+ checksum: 10/cb5dff9cc15661ac773a2099e98c99a5cb3cebc35909c23cc4261ff7992032c7501995ae995de3574dbbf3431e59c47496534d52f5e96abcb231f0e72144c020
languageName: node
linkType: hard
@@ -47763,13 +48043,13 @@ __metadata:
linkType: hard
"tldts@npm:^6.1.32":
- version: 6.1.51
- resolution: "tldts@npm:6.1.51"
+ version: 6.1.86
+ resolution: "tldts@npm:6.1.86"
dependencies:
- tldts-core: "npm:^6.1.51"
+ tldts-core: "npm:^6.1.86"
bin:
tldts: bin/cli.js
- checksum: 10/42e664469b1497af2fc6ac4cbf94f8a6507fcd23bf59521ace34223e36cb74ec7a003cf42834fcc4ba159c7448aa7e6f0f79f1f2fb8145b2e72ef44e87f035ec
+ checksum: 10/f7e66824e44479ccdda55ea556af14ce61c4d27708be403e3f90631defde49f82a580e1ca07187cc7e3b349e257a30c2808a22903f3a0548e136ebb609ccc109
languageName: node
linkType: hard
@@ -47784,15 +48064,6 @@ __metadata:
languageName: node
linkType: hard
-"tmp@npm:^0.0.33":
- version: 0.0.33
- resolution: "tmp@npm:0.0.33"
- dependencies:
- os-tmpdir: "npm:~1.0.2"
- checksum: 10/09c0abfd165cff29b32be42bc35e80b8c64727d97dedde6550022e88fa9fd39a084660415ed8e3ebaa2aca1ee142f86df8b31d4196d4f81c774a3a20fd4b6abf
- languageName: node
- linkType: hard
-
"tmp@npm:^0.2.5":
version: 0.2.5
resolution: "tmp@npm:0.2.5"
@@ -47886,24 +48157,12 @@ __metadata:
languageName: node
linkType: hard
-"tough-cookie@npm:^4.0.0":
- version: 4.1.4
- resolution: "tough-cookie@npm:4.1.4"
- dependencies:
- psl: "npm:^1.1.33"
- punycode: "npm:^2.1.1"
- universalify: "npm:^0.2.0"
- url-parse: "npm:^1.5.3"
- checksum: 10/75663f4e2cd085f16af0b217e4218772adf0617fb3227171102618a54ce0187a164e505d61f773ed7d65988f8ff8a8f935d381f87da981752c1171b076b4afac
- languageName: node
- linkType: hard
-
"tough-cookie@npm:^5.0.0":
- version: 5.0.0
- resolution: "tough-cookie@npm:5.0.0"
+ version: 5.1.2
+ resolution: "tough-cookie@npm:5.1.2"
dependencies:
tldts: "npm:^6.1.32"
- checksum: 10/a98d3846ed386e399e8b470c1eb08a6a296944246eabc55c9fe79d629bd2cdaa62f5a6572f271fe0060987906bd20468d72a219a3b4cbe51086bea48d2d677b6
+ checksum: 10/de430e6e6d34b794137e05b8ac2aa6b74ebbe6cdceb4126f168cf1e76101162a4b2e0e7587c3b70e728bd8654fc39958b2035be7619ee6f08e7257610ba4cd04
languageName: node
linkType: hard
@@ -47916,21 +48175,12 @@ __metadata:
languageName: node
linkType: hard
-"tr46@npm:^3.0.0":
- version: 3.0.0
- resolution: "tr46@npm:3.0.0"
- dependencies:
- punycode: "npm:^2.1.1"
- checksum: 10/b09a15886cbfaee419a3469081223489051ce9dca3374dd9500d2378adedbee84a3c73f83bfdd6bb13d53657753fc0d4e20a46bfcd3f1b9057ef528426ad7ce4
- languageName: node
- linkType: hard
-
-"tr46@npm:^5.0.0":
- version: 5.0.0
- resolution: "tr46@npm:5.0.0"
+"tr46@npm:^5.1.0":
+ version: 5.1.1
+ resolution: "tr46@npm:5.1.1"
dependencies:
punycode: "npm:^2.3.1"
- checksum: 10/29155adb167d048d3c95d181f7cb5ac71948b4e8f3070ec455986e1f34634acae50ae02a3c8d448121c3afe35b76951cd46ed4c128fd80264280ca9502237a3e
+ checksum: 10/833a0e1044574da5790148fd17866d4ddaea89e022de50279967bcd6b28b4ce0d30d59eb3acf9702b60918975b3bad481400337e3a2e6326cffa5c77b874753d
languageName: node
linkType: hard
@@ -47959,7 +48209,7 @@ __metadata:
languageName: node
linkType: hard
-"tree-kill@npm:^1.2.2":
+"tree-kill@npm:1.2.2, tree-kill@npm:^1.2.2":
version: 1.2.2
resolution: "tree-kill@npm:1.2.2"
bin:
@@ -48057,7 +48307,7 @@ __metadata:
languageName: node
linkType: hard
-"ts-api-utils@npm:^2.0.1, ts-api-utils@npm:^2.1.0":
+"ts-api-utils@npm:^2.1.0":
version: 2.1.0
resolution: "ts-api-utils@npm:2.1.0"
peerDependencies:
@@ -48067,14 +48317,14 @@ __metadata:
linkType: hard
"ts-checker-rspack-plugin@npm:^1.1.5":
- version: 1.1.5
- resolution: "ts-checker-rspack-plugin@npm:1.1.5"
+ version: 1.2.1
+ resolution: "ts-checker-rspack-plugin@npm:1.2.1"
dependencies:
"@babel/code-frame": "npm:^7.27.1"
- "@rspack/lite-tapable": "npm:^1.0.1"
+ "@rspack/lite-tapable": "npm:^1.1.0"
chokidar: "npm:^3.6.0"
is-glob: "npm:^4.0.3"
- memfs: "npm:^4.28.0"
+ memfs: "npm:^4.51.1"
minimatch: "npm:^9.0.5"
picocolors: "npm:^1.1.1"
peerDependencies:
@@ -48083,7 +48333,7 @@ __metadata:
peerDependenciesMeta:
"@rspack/core":
optional: true
- checksum: 10/d43f87a5860f3b8f528bf8f43c78c2d958a18fa484d791a204047fc5672134fd689665021ee25b07f9f9d8c807cd291978f58b789bf531b4704a9a4e3ad84735
+ checksum: 10/c2e4a4e0cfda6a358e2b3c134446359f74ed57787c23cb270ae6d72bfa1fae91e42968d04c9c5921a39c2995869a56fb8f3c8f906f24d7a94a33dca31ece2f22
languageName: node
linkType: hard
@@ -48507,19 +48757,19 @@ __metadata:
linkType: hard
"typedoc@npm:^0.28.0":
- version: 0.28.9
- resolution: "typedoc@npm:0.28.9"
+ version: 0.28.15
+ resolution: "typedoc@npm:0.28.15"
dependencies:
- "@gerrit0/mini-shiki": "npm:^3.9.0"
+ "@gerrit0/mini-shiki": "npm:^3.17.0"
lunr: "npm:^2.3.9"
markdown-it: "npm:^14.1.0"
minimatch: "npm:^9.0.5"
- yaml: "npm:^2.8.0"
+ yaml: "npm:^2.8.1"
peerDependencies:
typescript: 5.0.x || 5.1.x || 5.2.x || 5.3.x || 5.4.x || 5.5.x || 5.6.x || 5.7.x || 5.8.x || 5.9.x
bin:
typedoc: bin/typedoc
- checksum: 10/b803651a2c1295c293c68b97bc8aa722ba89fe253b23104aab0f751f30921b69a813352173bf09fa65efc0c6dfbce11305f365218ee7298f955a0993907da36d
+ checksum: 10/c4bfed5435c5fbd8a63f0e058b7d845c83872c2648c5db49c2ace613013dbce55ca04b30630db2c72abbbd0850d8c110781cd5da6c508e781f7a7845a0e9c0d7
languageName: node
linkType: hard
@@ -48968,13 +49218,6 @@ __metadata:
languageName: node
linkType: hard
-"universalify@npm:^0.2.0":
- version: 0.2.0
- resolution: "universalify@npm:0.2.0"
- checksum: 10/e86134cb12919d177c2353196a4cc09981524ee87abf621f7bc8d249dbbbebaec5e7d1314b96061497981350df786e4c5128dbf442eba104d6e765bc260678b5
- languageName: node
- linkType: hard
-
"universalify@npm:^2.0.0":
version: 2.0.0
resolution: "universalify@npm:2.0.0"
@@ -48998,13 +49241,25 @@ __metadata:
languageName: node
linkType: hard
-"unplugin@npm:^1.3.1":
- version: 1.16.1
- resolution: "unplugin@npm:1.16.1"
+"unplugin-utils@npm:^0.2.4":
+ version: 0.2.5
+ resolution: "unplugin-utils@npm:0.2.5"
dependencies:
- acorn: "npm:^8.14.0"
+ pathe: "npm:^2.0.3"
+ picomatch: "npm:^4.0.3"
+ checksum: 10/f9ff443089de3159ccab001d075fa4245a741696182dbe6b9708aa01945ded163bd846a3f4099132a2195de3fcbefe404a05380e4697faa4c5917c89f97a2361
+ languageName: node
+ linkType: hard
+
+"unplugin@npm:^2.3.5":
+ version: 2.3.11
+ resolution: "unplugin@npm:2.3.11"
+ dependencies:
+ "@jridgewell/remapping": "npm:^2.3.5"
+ acorn: "npm:^8.15.0"
+ picomatch: "npm:^4.0.3"
webpack-virtual-modules: "npm:^0.6.2"
- checksum: 10/4b46d7d2a63d334a45111ba57a266b3f8993ef12a72b77d7b31ffc455e8a9bef9c0e37ea463eb409dbf7ccec0b9868aeb845dd42c690d9288e4b8ac2d90fbefd
+ checksum: 10/7b4adbfaac8894e8491c452c0b67c612b57e103761e842d9013ebea89a4ae92a78df4ec0aa30e5e3eaaefd47dd287973d5a662271624b7346a15d9236d257f9d
languageName: node
linkType: hard
@@ -49015,6 +49270,73 @@ __metadata:
languageName: node
linkType: hard
+"unrs-resolver@npm:^1.7.11":
+ version: 1.11.1
+ resolution: "unrs-resolver@npm:1.11.1"
+ dependencies:
+ "@unrs/resolver-binding-android-arm-eabi": "npm:1.11.1"
+ "@unrs/resolver-binding-android-arm64": "npm:1.11.1"
+ "@unrs/resolver-binding-darwin-arm64": "npm:1.11.1"
+ "@unrs/resolver-binding-darwin-x64": "npm:1.11.1"
+ "@unrs/resolver-binding-freebsd-x64": "npm:1.11.1"
+ "@unrs/resolver-binding-linux-arm-gnueabihf": "npm:1.11.1"
+ "@unrs/resolver-binding-linux-arm-musleabihf": "npm:1.11.1"
+ "@unrs/resolver-binding-linux-arm64-gnu": "npm:1.11.1"
+ "@unrs/resolver-binding-linux-arm64-musl": "npm:1.11.1"
+ "@unrs/resolver-binding-linux-ppc64-gnu": "npm:1.11.1"
+ "@unrs/resolver-binding-linux-riscv64-gnu": "npm:1.11.1"
+ "@unrs/resolver-binding-linux-riscv64-musl": "npm:1.11.1"
+ "@unrs/resolver-binding-linux-s390x-gnu": "npm:1.11.1"
+ "@unrs/resolver-binding-linux-x64-gnu": "npm:1.11.1"
+ "@unrs/resolver-binding-linux-x64-musl": "npm:1.11.1"
+ "@unrs/resolver-binding-wasm32-wasi": "npm:1.11.1"
+ "@unrs/resolver-binding-win32-arm64-msvc": "npm:1.11.1"
+ "@unrs/resolver-binding-win32-ia32-msvc": "npm:1.11.1"
+ "@unrs/resolver-binding-win32-x64-msvc": "npm:1.11.1"
+ napi-postinstall: "npm:^0.3.0"
+ dependenciesMeta:
+ "@unrs/resolver-binding-android-arm-eabi":
+ optional: true
+ "@unrs/resolver-binding-android-arm64":
+ optional: true
+ "@unrs/resolver-binding-darwin-arm64":
+ optional: true
+ "@unrs/resolver-binding-darwin-x64":
+ optional: true
+ "@unrs/resolver-binding-freebsd-x64":
+ optional: true
+ "@unrs/resolver-binding-linux-arm-gnueabihf":
+ optional: true
+ "@unrs/resolver-binding-linux-arm-musleabihf":
+ optional: true
+ "@unrs/resolver-binding-linux-arm64-gnu":
+ optional: true
+ "@unrs/resolver-binding-linux-arm64-musl":
+ optional: true
+ "@unrs/resolver-binding-linux-ppc64-gnu":
+ optional: true
+ "@unrs/resolver-binding-linux-riscv64-gnu":
+ optional: true
+ "@unrs/resolver-binding-linux-riscv64-musl":
+ optional: true
+ "@unrs/resolver-binding-linux-s390x-gnu":
+ optional: true
+ "@unrs/resolver-binding-linux-x64-gnu":
+ optional: true
+ "@unrs/resolver-binding-linux-x64-musl":
+ optional: true
+ "@unrs/resolver-binding-wasm32-wasi":
+ optional: true
+ "@unrs/resolver-binding-win32-arm64-msvc":
+ optional: true
+ "@unrs/resolver-binding-win32-ia32-msvc":
+ optional: true
+ "@unrs/resolver-binding-win32-x64-msvc":
+ optional: true
+ checksum: 10/4de653508cbaae47883a896bd5cdfef0e5e87b428d62620d16fd35cd534beaebf08ebf0cf2f8b4922aa947b2fe745180facf6cc3f39ba364f7ce0f974cb06a70
+ languageName: node
+ linkType: hard
+
"untildify@npm:^4.0.0":
version: 4.0.0
resolution: "untildify@npm:4.0.0"
@@ -49106,7 +49428,7 @@ __metadata:
languageName: node
linkType: hard
-"url-parse@npm:^1.5.10, url-parse@npm:^1.5.3":
+"url-parse@npm:^1.5.10":
version: 1.5.10
resolution: "url-parse@npm:1.5.10"
dependencies:
@@ -49263,12 +49585,12 @@ __metadata:
languageName: node
linkType: hard
-"use-sync-external-store@npm:^1.2.0, use-sync-external-store@npm:^1.4.0":
- version: 1.4.0
- resolution: "use-sync-external-store@npm:1.4.0"
+"use-sync-external-store@npm:^1.4.0, use-sync-external-store@npm:^1.5.0":
+ version: 1.6.0
+ resolution: "use-sync-external-store@npm:1.6.0"
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
- checksum: 10/08bf581a8a2effaefc355e9d18ed025d436230f4cc973db2f593166df357cf63e47b9097b6e5089b594758bde322e1737754ad64905e030d70f8ff7ee671fd01
+ checksum: 10/b40ad2847ba220695bff2d4ba4f4d60391c0fb4fb012faa7a4c18eb38b69181936f5edc55a522c4d20a788d1a879b73c3810952c9d0fd128d01cb3f22042c09e
languageName: node
linkType: hard
@@ -49517,8 +49839,8 @@ __metadata:
linkType: hard
"vite@npm:^7.1.5":
- version: 7.1.5
- resolution: "vite@npm:7.1.5"
+ version: 7.2.6
+ resolution: "vite@npm:7.2.6"
dependencies:
esbuild: "npm:^0.25.0"
fdir: "npm:^6.5.0"
@@ -49567,7 +49889,7 @@ __metadata:
optional: true
bin:
vite: bin/vite.js
- checksum: 10/59edeef7e98757a668b2ad8a1731a5657fa83e22a165a36b7359225ea98a9be39b2f486710c0cf5085edb85daee7c8b6b6b0bd85d0ef32a1aa84aef71aabd0f0
+ checksum: 10/c640ed9c91957749287af2f483f5b5024a56718ba7cf32b0e2c398772fdf7fdb9fd5f97665c41712d4e9422c14009e283d0b69ac1b64b4f91474625bebe324de
languageName: node
linkType: hard
@@ -49585,15 +49907,6 @@ __metadata:
languageName: node
linkType: hard
-"w3c-hr-time@npm:^1.0.2":
- version: 1.0.2
- resolution: "w3c-hr-time@npm:1.0.2"
- dependencies:
- browser-process-hrtime: "npm:^1.0.0"
- checksum: 10/03851d90c236837c24c2983f5a8806a837c6515b21d52e5f29776b07cc08695779303d481454d768308489f00dd9d3232d595acaa5b2686d199465a4d9f7b283
- languageName: node
- linkType: hard
-
"w3c-keyname@npm:^2.2.4":
version: 2.2.4
resolution: "w3c-keyname@npm:2.2.4"
@@ -49601,15 +49914,6 @@ __metadata:
languageName: node
linkType: hard
-"w3c-xmlserializer@npm:^3.0.0":
- version: 3.0.0
- resolution: "w3c-xmlserializer@npm:3.0.0"
- dependencies:
- xml-name-validator: "npm:^4.0.0"
- checksum: 10/b4d73e20be283cc9975573a88979d15c08daa9c00911f8c777ef2af74eea11ba635fec18647ff0374ce880ec32ae573d17bd0f787053fc3085a530345b2feab6
- languageName: node
- linkType: hard
-
"w3c-xmlserializer@npm:^5.0.0":
version: 5.0.0
resolution: "w3c-xmlserializer@npm:5.0.0"
@@ -49633,6 +49937,13 @@ __metadata:
languageName: node
linkType: hard
+"walk-up-path@npm:^4.0.0":
+ version: 4.0.0
+ resolution: "walk-up-path@npm:4.0.0"
+ checksum: 10/6a230b20e5de296895116dc12b09dafaec1f72b8060c089533d296e241aff059dfaebe0d015c77467f857e4b40c78e08f7481add76f340233a1f34fa8af9ed63
+ languageName: node
+ linkType: hard
+
"walkdir@npm:^0.4.1":
version: 0.4.1
resolution: "walkdir@npm:0.4.1"
@@ -49876,15 +50187,6 @@ __metadata:
languageName: node
linkType: hard
-"whatwg-encoding@npm:^2.0.0":
- version: 2.0.0
- resolution: "whatwg-encoding@npm:2.0.0"
- dependencies:
- iconv-lite: "npm:0.6.3"
- checksum: 10/162d712d88fd134a4fe587e53302da812eb4215a1baa4c394dfd86eff31d0a079ff932c05233857997de07481093358d6e7587997358f49b8a580a777be22089
- languageName: node
- linkType: hard
-
"whatwg-encoding@npm:^3.1.1":
version: 3.1.1
resolution: "whatwg-encoding@npm:3.1.1"
@@ -49908,7 +50210,7 @@ __metadata:
languageName: node
linkType: hard
-"whatwg-url@npm:15.1.0":
+"whatwg-url@npm:15.1.0, whatwg-url@npm:^15.0.0, whatwg-url@npm:^15.1.0":
version: 15.1.0
resolution: "whatwg-url@npm:15.1.0"
dependencies:
@@ -49918,23 +50220,13 @@ __metadata:
languageName: node
linkType: hard
-"whatwg-url@npm:^11.0.0":
- version: 11.0.0
- resolution: "whatwg-url@npm:11.0.0"
- dependencies:
- tr46: "npm:^3.0.0"
- webidl-conversions: "npm:^7.0.0"
- checksum: 10/dfcd51c6f4bfb54685528fb10927f3fd3d7c809b5671beef4a8cdd7b1408a7abf3343a35bc71dab83a1424f1c1e92cc2700d7930d95d231df0fac361de0c7648
- languageName: node
- linkType: hard
-
"whatwg-url@npm:^14.0.0":
- version: 14.0.0
- resolution: "whatwg-url@npm:14.0.0"
+ version: 14.2.0
+ resolution: "whatwg-url@npm:14.2.0"
dependencies:
- tr46: "npm:^5.0.0"
+ tr46: "npm:^5.1.0"
webidl-conversions: "npm:^7.0.0"
- checksum: 10/67ea7a359a90663b28c816d76379b4be62d13446e9a4c0ae0b5ae0294b1c22577750fcdceb40827bb35a61777b7093056953c856604a28b37d6a209ba59ad062
+ checksum: 10/f0a95b0601c64f417c471536a2d828b4c16fe37c13662483a32f02f183ed0f441616609b0663fb791e524e8cd56d9a86dd7366b1fc5356048ccb09b576495e7c
languageName: node
linkType: hard
@@ -50090,7 +50382,7 @@ __metadata:
languageName: node
linkType: hard
-"winston-transport@npm:^4.5.0, winston-transport@npm:^4.7.0":
+"winston-transport@npm:^4.5.0, winston-transport@npm:^4.7.0, winston-transport@npm:^4.9.0":
version: 4.9.0
resolution: "winston-transport@npm:4.9.0"
dependencies:
@@ -50102,21 +50394,21 @@ __metadata:
linkType: hard
"winston@npm:^3.13.0, winston@npm:^3.2.1":
- version: 3.16.0
- resolution: "winston@npm:3.16.0"
+ version: 3.18.3
+ resolution: "winston@npm:3.18.3"
dependencies:
"@colors/colors": "npm:^1.6.0"
- "@dabh/diagnostics": "npm:^2.0.2"
+ "@dabh/diagnostics": "npm:^2.0.8"
async: "npm:^3.2.3"
is-stream: "npm:^2.0.0"
- logform: "npm:^2.6.0"
+ logform: "npm:^2.7.0"
one-time: "npm:^1.0.0"
readable-stream: "npm:^3.4.0"
safe-stable-stringify: "npm:^2.3.1"
stack-trace: "npm:0.0.x"
triple-beam: "npm:^1.3.0"
- winston-transport: "npm:^4.7.0"
- checksum: 10/cacec5268a965dcd3752bfe223d36eb003ac86b0cabc3d794521dfa6f937f78c86c8da84a53956c0f32169a55b438f6db0ee2aa028d57a2bcd69e1895a2e9d97
+ winston-transport: "npm:^4.9.0"
+ checksum: 10/0d94690e051c625ff5a2731b3057ddaa709445cc791c707c56f99ad7b5bf3eebe634656f707c01c9409dc21dbc118903464f80e29c0cb438b1cc2739c0135e51
languageName: node
linkType: hard
@@ -50197,7 +50489,7 @@ __metadata:
languageName: node
linkType: hard
-"write-file-atomic@npm:^4.0.0, write-file-atomic@npm:^4.0.2":
+"write-file-atomic@npm:^4.0.0":
version: 4.0.2
resolution: "write-file-atomic@npm:4.0.2"
dependencies:
@@ -50217,7 +50509,7 @@ __metadata:
languageName: node
linkType: hard
-"ws@npm:*, ws@npm:^8.12.0, ws@npm:^8.13.0, ws@npm:^8.17.1, ws@npm:^8.18.0, ws@npm:^8.18.2, ws@npm:^8.8.0":
+"ws@npm:*, ws@npm:^8.12.0, ws@npm:^8.13.0, ws@npm:^8.17.1, ws@npm:^8.18.0, ws@npm:^8.18.2, ws@npm:^8.18.3, ws@npm:^8.8.0":
version: 8.18.3
resolution: "ws@npm:8.18.3"
peerDependencies:
@@ -50262,6 +50554,15 @@ __metadata:
languageName: node
linkType: hard
+"wsl-utils@npm:^0.1.0":
+ version: 0.1.0
+ resolution: "wsl-utils@npm:0.1.0"
+ dependencies:
+ is-wsl: "npm:^3.1.0"
+ checksum: 10/de4c92187e04c3c27b4478f410a02e81c351dc85efa3447bf1666f34fc80baacd890a6698ec91995631714086992036013286aea3d77e6974020d40a08e00aec
+ languageName: node
+ linkType: hard
+
"xcase@npm:^2.0.1":
version: 2.0.1
resolution: "xcase@npm:2.0.1"
@@ -50285,13 +50586,6 @@ __metadata:
languageName: node
linkType: hard
-"xml-name-validator@npm:^4.0.0":
- version: 4.0.0
- resolution: "xml-name-validator@npm:4.0.0"
- checksum: 10/f9582a3f281f790344a471c207516e29e293c6041b2c20d84dd6e58832cd7c19796c47e108fd4fd4b164a5e72ad94f2268f8ace8231cde4a2c6428d6aa220f92
- languageName: node
- linkType: hard
-
"xml-name-validator@npm:^5.0.0":
version: 5.0.0
resolution: "xml-name-validator@npm:5.0.0"
@@ -50377,7 +50671,7 @@ __metadata:
languageName: node
linkType: hard
-"yaml@npm:^2.0.0, yaml@npm:^2.0.0-10, yaml@npm:^2.1.1, yaml@npm:^2.2.1, yaml@npm:^2.2.2, yaml@npm:^2.3.2, yaml@npm:^2.3.3, yaml@npm:^2.3.4, yaml@npm:^2.7.0, yaml@npm:^2.8.0":
+"yaml@npm:^2.0.0, yaml@npm:^2.0.0-10, yaml@npm:^2.1.1, yaml@npm:^2.2.1, yaml@npm:^2.2.2, yaml@npm:^2.3.2, yaml@npm:^2.3.3, yaml@npm:^2.3.4, yaml@npm:^2.7.0, yaml@npm:^2.8.1":
version: 2.8.2
resolution: "yaml@npm:2.8.2"
bin:
@@ -50400,6 +50694,21 @@ __metadata:
languageName: node
linkType: hard
+"yargs@npm:17.7.2, yargs@npm:^17.1.1, yargs@npm:^17.3.1, yargs@npm:^17.7.1, yargs@npm:^17.7.2":
+ version: 17.7.2
+ resolution: "yargs@npm:17.7.2"
+ dependencies:
+ cliui: "npm:^8.0.1"
+ escalade: "npm:^3.1.1"
+ get-caller-file: "npm:^2.0.5"
+ require-directory: "npm:^2.1.1"
+ string-width: "npm:^4.2.3"
+ y18n: "npm:^5.0.5"
+ yargs-parser: "npm:^21.1.1"
+ checksum: 10/abb3e37678d6e38ea85485ed86ebe0d1e3464c640d7d9069805ea0da12f69d5a32df8e5625e370f9c96dd1c2dc088ab2d0a4dd32af18222ef3c4224a19471576
+ languageName: node
+ linkType: hard
+
"yargs@npm:^16.2.0":
version: 16.2.0
resolution: "yargs@npm:16.2.0"
@@ -50415,21 +50724,6 @@ __metadata:
languageName: node
linkType: hard
-"yargs@npm:^17.1.1, yargs@npm:^17.3.1, yargs@npm:^17.7.1, yargs@npm:^17.7.2":
- version: 17.7.2
- resolution: "yargs@npm:17.7.2"
- dependencies:
- cliui: "npm:^8.0.1"
- escalade: "npm:^3.1.1"
- get-caller-file: "npm:^2.0.5"
- require-directory: "npm:^2.1.1"
- string-width: "npm:^4.2.3"
- y18n: "npm:^5.0.5"
- yargs-parser: "npm:^21.1.1"
- checksum: 10/abb3e37678d6e38ea85485ed86ebe0d1e3464c640d7d9069805ea0da12f69d5a32df8e5625e370f9c96dd1c2dc088ab2d0a4dd32af18222ef3c4224a19471576
- languageName: node
- linkType: hard
-
"yarn-plugin-backstage@workspace:packages/yarn-plugin":
version: 0.0.0-use.local
resolution: "yarn-plugin-backstage@workspace:packages/yarn-plugin"
@@ -50548,13 +50842,6 @@ __metadata:
languageName: node
linkType: hard
-"yocto-queue@npm:^1.0.0":
- version: 1.2.1
- resolution: "yocto-queue@npm:1.2.1"
- checksum: 10/0843d6c2c0558e5c06e98edf9c17942f25c769e21b519303a5c2adefd5b738c9b2054204dc856ac0cd9d134b1bc27d928ce84fd23c9e2423b7e013d5a6f50577
- languageName: node
- linkType: hard
-
"yoctocolors-cjs@npm:^2.1.2":
version: 2.1.2
resolution: "yoctocolors-cjs@npm:2.1.2"
@@ -50596,16 +50883,16 @@ __metadata:
languageName: node
linkType: hard
-"zod-to-json-schema@npm:^3.20.4, zod-to-json-schema@npm:^3.21.4, zod-to-json-schema@npm:^3.24.1":
- version: 3.24.6
- resolution: "zod-to-json-schema@npm:3.24.6"
+"zod-to-json-schema@npm:^3.20.4, zod-to-json-schema@npm:^3.21.4, zod-to-json-schema@npm:^3.25.0":
+ version: 3.25.0
+ resolution: "zod-to-json-schema@npm:3.25.0"
peerDependencies:
- zod: ^3.24.1
- checksum: 10/a2c30cf1f250aa79a7f975e65b4236d1abafafd63b43c43475057f28ce6e13f4c882391553c656fb426fd09665e6ae293c2439b4ed8600863beda43fb1a56922
+ zod: ^3.25 || ^4
+ checksum: 10/cb932e20b5b5e64c75b2c34a7e6dae74b727292eab9e014b93c2607378b8cb1b227f80b429053ceb77c8e0dddc338837f9e534b2a658540ff60c9e4ffdc7cc19
languageName: node
linkType: hard
-"zod-validation-error@npm:^3.0.3, zod-validation-error@npm:^3.4.0":
+"zod-validation-error@npm:^3.4.0":
version: 3.5.4
resolution: "zod-validation-error@npm:3.5.4"
peerDependencies:
@@ -50614,10 +50901,17 @@ __metadata:
languageName: node
linkType: hard
-"zod@npm:^3.22.4, zod@npm:^3.23.8, zod@npm:^3.24.2":
- version: 3.25.67
- resolution: "zod@npm:3.25.67"
- checksum: 10/0e35432dcca7f053e63f5dd491a87c78abe0d981817547252c3b6d05f0f58788695d1a69724759c6501dff3fd62929be24c9f314a3625179bee889150f7a61fa
+"zod@npm:^3.22.4, zod@npm:^3.24.2":
+ version: 3.25.76
+ resolution: "zod@npm:3.25.76"
+ checksum: 10/f0c963ec40cd96858451d1690404d603d36507c1fc9682f2dae59ab38b578687d542708a7fdbf645f77926f78c9ed558f57c3d3aa226c285f798df0c4da16995
+ languageName: node
+ linkType: hard
+
+"zod@npm:^3.25 || ^4.0, zod@npm:^4.1.11":
+ version: 4.1.13
+ resolution: "zod@npm:4.1.13"
+ checksum: 10/0679190318928f69fcb07751063719de232c663b13955fcdb55db59839569d39f3f29b955cb0cba7af0b724233f88c06b3e84c550397ad4e68f8088fa6799d88
languageName: node
linkType: hard