diff --git a/packages/canon/report.api.md b/packages/canon/report.api.md
index e725d0ac8b..fc1f773b4b 100644
--- a/packages/canon/report.api.md
+++ b/packages/canon/report.api.md
@@ -5,9 +5,11 @@
```ts
///
+import type { CSSProperties } from 'react';
import { ForwardRefExoticComponent } from 'react';
import { default as React_2 } from 'react';
import * as React_3 from 'react';
+import { ReactNode } from 'react';
import { RefAttributes } from 'react';
// @public (undocumented)
@@ -84,6 +86,8 @@ export interface ButtonProps {
// (undocumented)
size?: 'small' | 'medium' | Partial
>;
// (undocumented)
+ style?: React.CSSProperties;
+ // (undocumented)
variant?:
| 'primary'
| 'secondary'
@@ -91,6 +95,29 @@ export interface ButtonProps {
| Partial>;
}
+// @public (undocumented)
+export interface CanonContextProps {
+ // (undocumented)
+ breakpoint: Breakpoint;
+ // (undocumented)
+ getResponsiveValue: (
+ value: string | Partial>,
+ ) => string;
+ // (undocumented)
+ icons: IconMap;
+}
+
+// @public (undocumented)
+export const CanonProvider: (props: CanonProviderProps) => React_2.JSX.Element;
+
+// @public (undocumented)
+export interface CanonProviderProps {
+ // (undocumented)
+ children?: ReactNode;
+ // (undocumented)
+ overrides?: Partial>;
+}
+
// @public (undocumented)
export const Checkbox: React_2.ForwardRefExoticComponent<
CheckboxProps & React_2.RefAttributes
@@ -200,6 +227,33 @@ export interface GridProps extends SpaceProps {
style?: React.CSSProperties;
}
+// @public (undocumented)
+export const Heading: React_2.ForwardRefExoticComponent<
+ HeadingProps & React_2.RefAttributes
+>;
+
+// @public (undocumented)
+export interface HeadingProps {
+ // (undocumented)
+ as?: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
+ // (undocumented)
+ children: React.ReactNode;
+ // (undocumented)
+ variant?:
+ | 'display'
+ | 'title1'
+ | 'title2'
+ | 'title3'
+ | 'title4'
+ | 'title5'
+ | Partial<
+ Record<
+ Breakpoint,
+ 'display' | 'title1' | 'title2' | 'title3' | 'title4' | 'title5'
+ >
+ >;
+}
+
// @public (undocumented)
export const Icon: (props: IconProps) => React_2.JSX.Element;
@@ -222,8 +276,11 @@ export type IconNames =
| 'chevronRight'
| 'chevronUp'
| 'cloud'
+ | 'externalLink'
| 'heart'
+ | 'moon'
| 'plus'
+ | 'sun'
| 'trash';
// @public (undocumented)
@@ -232,6 +289,9 @@ export type IconProps = {
size?: number;
};
+// @public (undocumented)
+export const icons: IconMap;
+
// @public (undocumented)
export const Inline: ForwardRefExoticComponent<
InlineProps & RefAttributes
@@ -374,6 +434,32 @@ export const TableRow: React_3.ForwardRefExoticComponent<
React_3.RefAttributes
>;
+// @public (undocumented)
+const Text_2: React_2.ForwardRefExoticComponent<
+ TextProps & React_2.RefAttributes
+>;
+export { Text_2 as Text };
+
+// @public (undocumented)
+export interface TextProps {
+ // (undocumented)
+ children: ReactNode;
+ // (undocumented)
+ style?: CSSProperties;
+ // (undocumented)
+ variant?:
+ | 'subtitle'
+ | 'body'
+ | 'caption'
+ | 'label'
+ | Partial>;
+ // (undocumented)
+ weight?: 'regular' | 'bold' | Partial>;
+}
+
+// @public (undocumented)
+export const useCanon: () => CanonContextProps;
+
// @public (undocumented)
export interface UtilityProps extends SpaceProps {
// (undocumented)
diff --git a/packages/canon/src/components/Box/Box.stories.tsx b/packages/canon/src/components/Box/Box.stories.tsx
index bd4e597fa0..d11f9fbab7 100644
--- a/packages/canon/src/components/Box/Box.stories.tsx
+++ b/packages/canon/src/components/Box/Box.stories.tsx
@@ -40,22 +40,28 @@ const meta = {
export default meta;
type Story = StoryObj;
-export const Basic: Story = {
+export const Default: Story = {
args: {
style: {
- background: '#1f47ff',
- color: 'white',
- padding: '4px 8px',
+ width: '64px',
+ height: '64px',
+ background: '#eaf2fd',
borderRadius: '4px',
+ border: '1px solid #2563eb',
+ color: '#2563eb',
+ backgroundImage:
+ 'url("data:image/svg+xml,%3Csvg%20width%3D%226%22%20height%3D%226%22%20viewBox%3D%220%200%206%206%22%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%3E%3Cg%20fill%3D%22%232563eb%22%20fill-opacity%3D%220.3%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20d%3D%22M5%200h1L0%206V5zM6%205v1H5z%22/%3E%3C/g%3E%3C/svg%3E")',
},
- children: 'Basic Box',
},
};
export const Display: Story = {
args: {
style: {
- ...Basic.args?.style,
+ ...Default.args?.style,
+ width: 'auto',
+ height: 'auto',
+ padding: '8px',
},
},
render: args => (
@@ -84,7 +90,10 @@ export const Display: Story = {
export const FlexDirection: Story = {
args: {
style: {
- ...Basic.args?.style,
+ ...Default.args?.style,
+ width: 'auto',
+ height: 'auto',
+ padding: '8px',
},
display: 'flex',
gap: 'xs',
@@ -110,8 +119,10 @@ export const FlexDirection: Story = {
export const JustifyContent: Story = {
args: {
style: {
- ...Basic.args?.style,
+ ...Default.args?.style,
width: '200px',
+ height: 'auto',
+ padding: '8px',
},
display: 'flex',
gap: 'xs',
@@ -153,9 +164,10 @@ export const JustifyContent: Story = {
export const AlignItems: Story = {
args: {
style: {
- ...Basic.args?.style,
+ ...Default.args?.style,
width: '200px',
height: '100px',
+ padding: '8px',
},
display: 'flex',
gap: 'xs',
@@ -289,8 +301,10 @@ export const Margin: Story = {
export const FlexWrap: Story = {
args: {
style: {
- ...Basic.args?.style,
+ ...Default.args?.style,
width: '200px',
+ height: 'auto',
+ padding: '8px',
},
display: 'flex',
gap: 'xs',
@@ -328,11 +342,14 @@ export const FlexWrap: Story = {
export const BorderRadius: Story = {
args: {
style: {
- background: '#1f47ff',
- color: 'white',
- padding: '4px 8px',
width: '64px',
height: '64px',
+ background: '#eaf2fd',
+ border: '1px solid #2563eb',
+ color: '#2563eb',
+ backgroundImage:
+ 'url("data:image/svg+xml,%3Csvg%20width%3D%226%22%20height%3D%226%22%20viewBox%3D%220%200%206%206%22%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%3E%3Cg%20fill%3D%22%232563eb%22%20fill-opacity%3D%220.3%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20d%3D%22M5%200h1L0%206V5zM6%205v1H5z%22/%3E%3C/g%3E%3C/svg%3E")',
+ padding: '4px 8px',
},
display: 'flex',
alignItems: 'center',
diff --git a/packages/canon/src/components/Button/Button.stories.tsx b/packages/canon/src/components/Button/Button.stories.tsx
index c921efa6f2..728098970c 100644
--- a/packages/canon/src/components/Button/Button.stories.tsx
+++ b/packages/canon/src/components/Button/Button.stories.tsx
@@ -19,13 +19,12 @@ import type { Meta, StoryObj } from '@storybook/react';
import { Button } from './Button';
import { Inline } from '../Inline';
import { Stack } from '../Stack';
+import { Text } from '../Text';
+import { ButtonProps } from './types';
const meta = {
title: 'Components/Button',
component: Button,
- parameters: {
- layout: 'centered',
- },
argTypes: {
size: {
control: 'select',
@@ -40,12 +39,6 @@ const meta = {
export default meta;
type Story = StoryObj;
-export const Primary: Story = {
- args: {
- children: 'Primary button',
- },
-};
-
export const Variants: Story = {
args: {
children: 'Button',
@@ -59,9 +52,15 @@ export const Variants: Story = {
},
render: () => (
- Primary
- Secondary
- Tertiary
+
+ Button
+
+
+ Button
+
+
+ Button
+
),
};
@@ -125,3 +124,47 @@ export const Responsive: Story = {
},
},
};
+
+const variants: string[] = ['primary', 'secondary', 'tertiary'];
+
+export const Playground: Story = {
+ args: {
+ children: 'Button',
+ },
+ render: () => (
+
+ {variants.map(variant => (
+
+ {variant}
+ {['small', 'medium'].map(size => (
+
+
+ Button
+
+
+ Button
+
+
+ Button
+
+
+ ))}
+
+ ))}
+
+ ),
+};
diff --git a/packages/canon/src/components/Button/Button.tsx b/packages/canon/src/components/Button/Button.tsx
index e4166e5c79..a186aada39 100644
--- a/packages/canon/src/components/Button/Button.tsx
+++ b/packages/canon/src/components/Button/Button.tsx
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+'use client';
+
import React, { forwardRef } from 'react';
import { Icon } from '../Icon';
import { ButtonProps } from './types';
@@ -29,6 +31,8 @@ export const Button = forwardRef(
iconStart,
iconEnd,
children,
+ style,
+ ...rest
} = props;
const { getResponsiveValue } = useCanon();
@@ -39,7 +43,7 @@ export const Button = forwardRef(
return (
(
`cn-button-${responsiveSize}`,
`cn-button-${responsiveVariant}`,
].join(' ')}
+ style={style}
>
Button
A button component that can be used to trigger actions.
-Usage
;
-export const Primary: Story = {
+export const Default: Story = {
args: {
label: 'Accept terms and conditions',
},
};
+
+export const AllVariants: Story = {
+ render: () => (
+
+
+ ),
+};
+
+export const Playground: Story = {
+ render: () => (
+
+ All variants
+
+
+
+ ),
+};
diff --git a/packages/canon/src/components/Checkbox/Docs.mdx b/packages/canon/src/components/Checkbox/Docs.mdx
index 12e13abf03..9826708888 100644
--- a/packages/canon/src/components/Checkbox/Docs.mdx
+++ b/packages/canon/src/components/Checkbox/Docs.mdx
@@ -10,7 +10,7 @@ import { PropsTable } from '../../../docs/components/PropsTable';
Checkbox
A checkbox component that can be used to trigger actions.
-Usage
;
export default meta;
type Story = StoryObj;
-const FakeBox = () => (
+const DecorativeBox = () => (
-
),
};
+
+export const Preview: Story = {
+ render: () => (
+
+
+ ),
+};
diff --git a/packages/canon/src/components/Grid/Grid.stories.tsx b/packages/canon/src/components/Grid/Grid.stories.tsx
index 8fa6caec23..9aeec52d00 100644
--- a/packages/canon/src/components/Grid/Grid.stories.tsx
+++ b/packages/canon/src/components/Grid/Grid.stories.tsx
@@ -43,7 +43,14 @@ type Story = StoryObj;
const FakeBox = () => (
diff --git a/packages/canon/src/components/Heading/Heading.stories.tsx b/packages/canon/src/components/Heading/Heading.stories.tsx
index 8c46528a2f..dc74ea0e16 100644
--- a/packages/canon/src/components/Heading/Heading.stories.tsx
+++ b/packages/canon/src/components/Heading/Heading.stories.tsx
@@ -18,20 +18,19 @@ import React from 'react';
import type { Meta, StoryObj } from '@storybook/react';
import { Heading } from './Heading';
import { Stack } from '../Stack';
-
+import { Text } from '../Text';
const meta = {
title: 'Components/Heading',
component: Heading,
+ args: {
+ children: 'Heading',
+ },
} satisfies Meta;
export default meta;
type Story = StoryObj;
-export const Default: Story = {
- args: {
- children: 'Heading',
- },
-};
+export const Default: Story = {};
export const Title1: Story = {
args: {
@@ -41,11 +40,8 @@ export const Title1: Story = {
};
export const AllVariants: Story = {
- args: {
- children: 'Heading',
- },
render: () => (
-
+
Display
Title 1
Title 2
@@ -57,7 +53,6 @@ export const AllVariants: Story = {
export const Responsive: Story = {
args: {
- ...Default.args,
variant: {
xs: 'title4',
md: 'display',
@@ -67,8 +62,21 @@ export const Responsive: Story = {
export const CustomTag: Story = {
args: {
- ...Default.args,
variant: 'title5',
as: 'h2',
},
};
+
+export const Playground: Story = {
+ render: () => (
+
+ All variants
+ Display
+ Title 1
+ Title 2
+ Title 3
+ Title 4
+ Title 5
+
+ ),
+};
diff --git a/packages/canon/src/components/Heading/Heading.tsx b/packages/canon/src/components/Heading/Heading.tsx
index 04ce6bcdfa..1ac9f7d997 100644
--- a/packages/canon/src/components/Heading/Heading.tsx
+++ b/packages/canon/src/components/Heading/Heading.tsx
@@ -14,10 +14,13 @@
* limitations under the License.
*/
+'use client';
+
import React, { forwardRef } from 'react';
import { HeadingProps } from './types';
import { useCanon } from '../../contexts/canon';
+/** @public */
export const Heading = forwardRef(
(props, ref) => {
const { children, variant = 'title1', as = 'h1', ...restProps } = props;
diff --git a/packages/canon/src/components/Heading/styles.css b/packages/canon/src/components/Heading/styles.css
index d2d6a27576..446a5b7d2b 100644
--- a/packages/canon/src/components/Heading/styles.css
+++ b/packages/canon/src/components/Heading/styles.css
@@ -23,36 +23,36 @@
&.text-display {
font-size: var(--canon-font-size-display);
line-height: 100%;
- font-weight: var(--canon-font-bold);
+ font-weight: var(--canon-font-weight-bold);
}
&.text-title1 {
font-size: var(--canon-font-size-title1);
line-height: 100%;
- font-weight: var(--canon-font-bold);
+ font-weight: var(--canon-font-weight-bold);
}
&.text-title2 {
font-size: var(--canon-font-size-title2);
line-height: 100%;
- font-weight: var(--canon-font-bold);
+ font-weight: var(--canon-font-weight-bold);
}
&.text-title3 {
font-size: var(--canon-font-size-title3);
line-height: 100%;
- font-weight: var(--canon-font-bold);
+ font-weight: var(--canon-font-weight-bold);
}
&.text-title4 {
font-size: var(--canon-font-size-title4);
line-height: 100%;
- font-weight: var(--canon-font-bold);
+ font-weight: var(--canon-font-weight-bold);
}
&.text-title5 {
font-size: var(--canon-font-size-title5);
line-height: 100%;
- font-weight: var(--canon-font-bold);
+ font-weight: var(--canon-font-weight-bold);
}
}
diff --git a/packages/canon/src/components/Icon/Docs.mdx b/packages/canon/src/components/Icon/Docs.mdx
index 463fe60133..41c296424c 100644
--- a/packages/canon/src/components/Icon/Docs.mdx
+++ b/packages/canon/src/components/Icon/Docs.mdx
@@ -2,7 +2,7 @@ import { Canvas, Meta, Unstyled, Source } from '@storybook/blocks';
import * as IconStories from './Icon.stories';
import { Title, Text } from '../../../docs/components';
import { PropsTable } from '../../../docs/components/PropsTable/PropsTable';
-import { defaultIcons } from './icons';
+import { icons } from './icons';
Icons are used to represent an action or a state.
-Usage
;
-export const Primary: Story = {
+export const Default: Story = {
args: {
name: 'heart',
},
diff --git a/packages/canon/src/components/Icon/Icon.tsx b/packages/canon/src/components/Icon/Icon.tsx
index 1df46c8a78..d4dbf601e3 100644
--- a/packages/canon/src/components/Icon/Icon.tsx
+++ b/packages/canon/src/components/Icon/Icon.tsx
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+'use client';
+
import React from 'react';
import { useCanon } from '../../contexts/canon';
import type { IconProps } from './types';
diff --git a/packages/canon/src/components/Icon/icons.ts b/packages/canon/src/components/Icon/icons.ts
index ff5cd9a507..40cbefb72d 100644
--- a/packages/canon/src/components/Icon/icons.ts
+++ b/packages/canon/src/components/Icon/icons.ts
@@ -35,10 +35,13 @@ import {
RiArrowRightCircleLine,
RiArrowUpCircleLine,
RiCheckLine,
+ RiMoonLine,
+ RiSunLine,
+ RiExternalLinkLine,
} from '@remixicon/react';
-// List of default icons
-export const defaultIcons: IconMap = {
+/** @public */
+export const icons: IconMap = {
arrowDown: RiArrowDownFill,
arrowLeft: RiArrowLeftFill,
arrowRight: RiArrowRightFill,
@@ -53,7 +56,10 @@ export const defaultIcons: IconMap = {
chevronLeft: RiArrowLeftSLine,
chevronRight: RiArrowRightSLine,
cloud: RiCloudFill,
+ externalLink: RiExternalLinkLine,
heart: RiHeartFill,
+ moon: RiMoonLine,
plus: RiAddLine,
+ sun: RiSunLine,
trash: RiDeleteBin6Line,
};
diff --git a/packages/canon/src/components/Icon/index.tsx b/packages/canon/src/components/Icon/index.tsx
index 3e7564c77e..0fa2eac35b 100644
--- a/packages/canon/src/components/Icon/index.tsx
+++ b/packages/canon/src/components/Icon/index.tsx
@@ -15,4 +15,5 @@
*/
export * from './Icon';
+export * from './icons';
export type * from './types';
diff --git a/packages/canon/src/components/Icon/types.ts b/packages/canon/src/components/Icon/types.ts
index a65a9f0913..57eddc74ba 100644
--- a/packages/canon/src/components/Icon/types.ts
+++ b/packages/canon/src/components/Icon/types.ts
@@ -30,8 +30,11 @@ export type IconNames =
| 'chevronRight'
| 'chevronUp'
| 'cloud'
+ | 'externalLink'
| 'heart'
+ | 'moon'
| 'plus'
+ | 'sun'
| 'trash';
/** @public */
diff --git a/packages/canon/src/components/Inline/Inline.stories.tsx b/packages/canon/src/components/Inline/Inline.stories.tsx
index b6653a3067..6aa6079989 100644
--- a/packages/canon/src/components/Inline/Inline.stories.tsx
+++ b/packages/canon/src/components/Inline/Inline.stories.tsx
@@ -41,6 +41,9 @@ const meta = {
control: 'text',
},
},
+ args: {
+ children: 'hello world',
+ },
} satisfies Meta;
export default meta;
@@ -52,33 +55,12 @@ const fakeBlockList = [
{ width: 80, height: 50 },
{ width: 120, height: 70 },
{ width: 95, height: 65 },
- { width: 110, height: 55 },
+ { width: 80, height: 32 },
{ width: 130, height: 60 },
{ width: 100, height: 80 },
{ width: 140, height: 45 },
{ width: 85, height: 70 },
{ width: 125, height: 50 },
- { width: 105, height: 75 },
- { width: 115, height: 65 },
- { width: 135, height: 55 },
- { width: 90, height: 60 },
- { width: 145, height: 80 },
- { width: 75, height: 45 },
- { width: 155, height: 70 },
- { width: 60, height: 50 },
- { width: 160, height: 75 },
- { width: 70, height: 65 },
- { width: 150, height: 55 },
- { width: 95, height: 60 },
- { width: 120, height: 80 },
- { width: 85, height: 45 },
- { width: 130, height: 70 },
- { width: 100, height: 50 },
- { width: 140, height: 75 },
- { width: 110, height: 65 },
- { width: 125, height: 55 },
- { width: 105, height: 60 },
- { width: 145, height: 80 },
];
const FakeBox = ({
@@ -90,67 +72,66 @@ const FakeBox = ({
}) => (
+ {fakeBlockList.map((block, index) => (
+
+ ),
};
export const AlignLeft: Story = {
args: {
- ...Default.args,
align: 'left',
},
};
export const AlignCenter: Story = {
args: {
- ...Default.args,
align: 'center',
},
};
export const AlignRight: Story = {
args: {
- ...Default.args,
align: 'right',
},
};
export const VerticalAlignTop: Story = {
args: {
- ...Default.args,
alignY: 'top',
},
};
export const VerticalAlignCenter: Story = {
args: {
- ...Default.args,
alignY: 'center',
},
};
export const VerticalAlignBottom: Story = {
args: {
- ...Default.args,
alignY: 'bottom',
},
};
export const LargeGap: Story = {
args: {
- ...Default.args,
gap: 'xl',
},
};
diff --git a/packages/canon/src/components/Stack/Stack.stories.tsx b/packages/canon/src/components/Stack/Stack.stories.tsx
index 7e77bc861d..4c48cf80cc 100644
--- a/packages/canon/src/components/Stack/Stack.stories.tsx
+++ b/packages/canon/src/components/Stack/Stack.stories.tsx
@@ -17,7 +17,6 @@
import React from 'react';
import type { Meta, StoryObj } from '@storybook/react';
import { Stack } from './Stack';
-import { Box } from '../Box/Box';
const meta = {
title: 'Components/Stack',
@@ -40,81 +39,97 @@ const meta = {
args: {
align: 'left',
gap: 'xs',
+ children: 'hello world',
},
} satisfies Meta;
export default meta;
type Story = StoryObj;
-const FakeBox = () => (
-
- Fake Box
-
-);
+const DecorativeBox = () => {
+ return (
+
+ );
+};
export const Default: Story = {
- args: {
- children: (
- <>
-
+
+
+
+ ),
};
export const AlignLeft: Story = {
- args: {
- ...Default.args,
- align: 'left',
- },
+ render: () => (
+
+
+ ),
};
export const AlignCenter: Story = {
- args: {
- ...Default.args,
- align: 'center',
- },
+ render: () => (
+
+
+ ),
};
export const AlignRight: Story = {
- args: {
- ...Default.args,
- align: 'right',
- },
+ render: () => (
+
+
+ ),
};
export const ResponsiveAlign: Story = {
- args: {
- ...Default.args,
- align: {
- xs: 'left',
- md: 'center',
- lg: 'right',
- },
- },
+ render: () => (
+
+
+ ),
};
export const ResponsiveGap: Story = {
- args: {
- ...Default.args,
- gap: {
- xs: 'xs',
- md: 'md',
- lg: '2xl',
- },
- },
+ render: () => (
+
+
+ ),
};
export const LargeGap: Story = {
- args: {
- ...Default.args,
- gap: 'xl',
- },
+ render: () => (
+
+
+ ),
};
diff --git a/packages/canon/src/components/Table/stories/Example1.stories.tsx b/packages/canon/src/components/Table/Table.stories.tsx
similarity index 86%
rename from packages/canon/src/components/Table/stories/Example1.stories.tsx
rename to packages/canon/src/components/Table/Table.stories.tsx
index 140293438e..c4c08be527 100644
--- a/packages/canon/src/components/Table/stories/Example1.stories.tsx
+++ b/packages/canon/src/components/Table/Table.stories.tsx
@@ -14,23 +14,6 @@
* limitations under the License.
*/
-import * as React from 'react';
-import type { Meta, StoryObj } from '@storybook/react';
-import {
- Table,
- TableHead,
- TableRow,
- TableHeader,
- TableCell,
- TableBody,
- TableFooter,
-} from '../Table';
-
-const meta = {
- title: 'Components/Table/Examples/Simple',
- component: Table,
-} satisfies Meta;
-
const invoices = [
{
invoice: 'INV001',
@@ -76,6 +59,31 @@ const invoices = [
},
];
+import React from 'react';
+import type { Meta, StoryObj } from '@storybook/react';
+import {
+ Table,
+ TableBody,
+ TableCell,
+ TableFooter,
+ TableHead,
+ TableHeader,
+ TableRow,
+} from '../Table';
+
+const meta = {
+ title: 'Components/Table',
+ component: Table,
+ subcomponents: {
+ TableBody: TableBody as React.ComponentType,
+ TableCell: TableCell as React.ComponentType,
+ TableFooter: TableFooter as React.ComponentType,
+ TableHead: TableHead as React.ComponentType,
+ TableHeader: TableHeader as React.ComponentType,
+ TableRow: TableRow as React.ComponentType,
+ },
+} satisfies Meta;
+
export default meta;
type Story = StoryObj;
diff --git a/packages/canon/src/components/Table/stories/TableBody.stories.tsx b/packages/canon/src/components/Table/stories/TableBody.stories.tsx
deleted file mode 100644
index f69d26f0bd..0000000000
--- a/packages/canon/src/components/Table/stories/TableBody.stories.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2024 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 * as React from 'react';
-import type { Meta, StoryObj } from '@storybook/react';
-import { Table, TableBody } from '../Table';
-
-const meta = {
- title: 'Components/Table/Components/TableBody',
- component: TableBody,
- decorators: [
- Story => (
-
- ),
- ],
-} satisfies Meta;
-
-export default meta;
-type Story = StoryObj;
-
-export const Default: Story = {
- args: {
- children: "Hello World! I'm a basic table body",
- },
-};
diff --git a/packages/canon/src/components/Table/stories/TableHeader.stories.tsx b/packages/canon/src/components/Table/stories/TableHeader.stories.tsx
deleted file mode 100644
index a2f044dcc3..0000000000
--- a/packages/canon/src/components/Table/stories/TableHeader.stories.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2024 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 * as React from 'react';
-import type { Meta, StoryObj } from '@storybook/react';
-import { Table, TableHeader } from '../Table';
-
-const meta = {
- title: 'Components/Table/Components/TableHeader',
- component: TableHeader,
- decorators: [
- Story => (
-
- ),
- ],
-} satisfies Meta;
-
-export default meta;
-type Story = StoryObj;
-
-export const Default: Story = {
- args: {
- children: "Hello World! I'm a basic table header",
- },
-};
diff --git a/packages/canon/src/components/Table/stories/TableRow.stories.tsx b/packages/canon/src/components/Table/stories/TableRow.stories.tsx
deleted file mode 100644
index 7eb58ed5a4..0000000000
--- a/packages/canon/src/components/Table/stories/TableRow.stories.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2024 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 * as React from 'react';
-import type { Meta, StoryObj } from '@storybook/react';
-import { Table, TableRow, TableHeader } from '../Table';
-
-const meta = {
- title: 'Components/Table/Components/TableRow',
- component: TableRow,
- decorators: [
- Story => (
-
- ),
- ],
-} satisfies Meta;
-
-export default meta;
-type Story = StoryObj;
-
-export const Default: Story = {
- args: {
- children: "Hello World! I'm a basic table row",
- },
-};
diff --git a/packages/canon/src/components/Table/styles.css b/packages/canon/src/components/Table/styles.css
index bf3d8603e3..574fae67bf 100644
--- a/packages/canon/src/components/Table/styles.css
+++ b/packages/canon/src/components/Table/styles.css
@@ -18,7 +18,7 @@
.table-header {
tr {
- /* border-bottom: 1px solid var(--canon-outline); */
+ /* border-bottom: 1px solid var(--canon-border); */
}
}
diff --git a/packages/canon/src/components/Text/Text.stories.tsx b/packages/canon/src/components/Text/Text.stories.tsx
index 2cde7ed553..b0776beee9 100644
--- a/packages/canon/src/components/Text/Text.stories.tsx
+++ b/packages/canon/src/components/Text/Text.stories.tsx
@@ -22,6 +22,9 @@ import { Stack } from '../Stack';
const meta = {
title: 'Components/Text',
component: Text,
+ args: {
+ children: 'Text',
+ },
} satisfies Meta;
export default meta;
@@ -30,42 +33,91 @@ type Story = StoryObj;
export const Default: Story = {
args: {
children:
- 'Lorem ipsum dolor sit amet consectetur. Nec arcu vel lacus magna adipiscing nisi mauris tortor viverra. Enim rhoncus quisque consectetur ligula diam ac lacus massa. Id interdum id pellentesque justo ut massa nibh amet. Odio massa in scelerisque tortor massa integer purus amet enim. Eros sit neque nullam facilisis. Purus massa dignissim aliquet purus eu in. Urna consequat ullamcorper arcu amet dictumst. Commodo praesent turpis fringilla tristique congue volutpat in. Nulla in nulla ultrices lacus. In ultrices id tellus ut.',
+ "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?",
+ style: { maxWidth: '600px' },
},
};
export const AllVariants: Story = {
- args: {
- children: 'Text',
- },
render: () => (
- Subtitle {Default.args?.children}
- Body {Default.args?.children}
- Caption {Default.args?.children}
- Label {Default.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?
+
+
+ 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?
+
+
+ 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?
+
+
+ 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 AllWeights: Story = {
- args: {
- children: 'Text',
- },
render: () => (
- Regular {Default.args?.children}
- Bold {Default.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?
+
+
+ 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 Responsive: Story = {
args: {
- ...Default.args,
variant: {
xs: 'label',
md: 'body',
},
},
};
+
+export const Playground: Story = {
+ render: () => (
+
+ Subtitle
+
+ 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?
+
+ Body
+
+ 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?
+
+ Caption
+
+ 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?
+
+ Label
+
+ 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?
+
+
+ ),
+};
diff --git a/packages/canon/src/components/Text/Text.tsx b/packages/canon/src/components/Text/Text.tsx
index 3af01f92f9..dd0baf3f8e 100644
--- a/packages/canon/src/components/Text/Text.tsx
+++ b/packages/canon/src/components/Text/Text.tsx
@@ -14,16 +14,20 @@
* limitations under the License.
*/
+'use client';
+
import React, { forwardRef } from 'react';
import { TextProps } from './types';
import { useCanon } from '../../contexts/canon';
+/** @public */
export const Text = forwardRef(
(props, ref) => {
const {
children,
variant = 'body',
weight = 'regular',
+ style,
...restProps
} = props;
@@ -36,10 +40,11 @@ export const Text = forwardRef(
return (
{children}
diff --git a/packages/canon/src/components/Text/types.ts b/packages/canon/src/components/Text/types.ts
index d3232e1d67..7e11bed6e3 100644
--- a/packages/canon/src/components/Text/types.ts
+++ b/packages/canon/src/components/Text/types.ts
@@ -14,11 +14,12 @@
* limitations under the License.
*/
+import type { CSSProperties, ReactNode } from 'react';
import type { Breakpoint } from '../../types';
/** @public */
export interface TextProps {
- children: React.ReactNode;
+ children: ReactNode;
variant?:
| 'subtitle'
| 'body'
@@ -26,4 +27,5 @@ export interface TextProps {
| 'label'
| Partial>;
weight?: 'regular' | 'bold' | Partial>;
+ style?: CSSProperties;
}
diff --git a/packages/canon/src/contexts/canon.tsx b/packages/canon/src/contexts/canon.tsx
index a8c21e8fa9..92b36ce396 100644
--- a/packages/canon/src/contexts/canon.tsx
+++ b/packages/canon/src/contexts/canon.tsx
@@ -14,13 +14,16 @@
* limitations under the License.
*/
+'use client';
+
import React, { createContext, useContext, ReactNode } from 'react';
import { IconMap, IconNames } from '../components/Icon/types';
-import { defaultIcons } from '../components/Icon/icons';
+import { icons } from '../components/Icon/icons';
import { useMediaQuery } from '../hooks/useMediaQuery';
import type { Breakpoint } from '../types';
-interface CanonContextProps {
+/** @public */
+export interface CanonContextProps {
icons: IconMap;
breakpoint: Breakpoint;
getResponsiveValue: (
@@ -29,12 +32,13 @@ interface CanonContextProps {
}
const CanonContext = createContext({
- icons: defaultIcons,
+ icons,
breakpoint: 'md',
getResponsiveValue: () => '',
});
-interface CanonProviderProps {
+/** @public */
+export interface CanonProviderProps {
children?: ReactNode;
overrides?: Partial>;
}
@@ -44,7 +48,7 @@ export const CanonProvider = (props: CanonProviderProps) => {
const { children, overrides } = props;
// Merge provided overrides with default icons
- const combinedIcons = { ...defaultIcons, ...overrides };
+ const combinedIcons = { ...icons, ...overrides };
const isBreakpointSm = useMediaQuery(`(min-width: 640px)`);
const isBreakpointMd = useMediaQuery(`(min-width: 768px)`);
diff --git a/packages/canon/src/css/base.css b/packages/canon/src/css/base.css
index f2bf6b3363..b8bd0c4f81 100644
--- a/packages/canon/src/css/base.css
+++ b/packages/canon/src/css/base.css
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-@layer base {
- @import './normalize.css';
+@import './normalize.css';
+@layer base {
*,
html,
body {
diff --git a/packages/canon/src/css/core.css b/packages/canon/src/css/core.css
index 9f8dcfff19..4f15d571c7 100644
--- a/packages/canon/src/css/core.css
+++ b/packages/canon/src/css/core.css
@@ -19,38 +19,14 @@
@import './utilities.css';
/* Light theme tokens */
-:root {
- /* Colors */
- --canon-accent: #000;
- --canon-background: #f8f8f8;
- --canon-surface-1: #fff;
- --canon-surface-2: #f4f4f4;
- --canon-surface-3: #f1f1f1;
-
- /* Borders */
- --canon-border-base: rgba(0, 0, 0, 0.1);
- --canon-border-warning: #e36d05;
- --canon-border-error: #e22b2b;
- --canon-border-selected: #1db954;
-
- /* States - Add more states */
- --canon-error: #f50000;
-
- /* Text colors */
- --canon-text-primary: #000;
- --canon-text-primary-on-accent: #fff;
- --canon-text-secondary: #646464;
-
- /* Box shadows */
- /* --canon-box-shadow-small: 0 0 0 1px rgba(0, 0, 0, 0.05); */
- /* --canon-box-shadow-medium: 0 0 0 1px rgba(0, 0, 0, 0.1); */
- /* --canon-box-shadow-large: 0 0 0 1px rgba(0, 0, 0, 0.2); */
+[data-theme='light'] {
/* Font families */
--canon-font-regular: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
'Helvetica Neue', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
'Segoe UI Symbol', 'Noto Color Emoji';
- --canon-font-monospace: 'Monospace', monospace;
+ --canon-font-monospace: ui-monospace, 'Menlo', 'Monaco', 'Consolas',
+ 'Liberation Mono', 'Courier New', monospace;
/* Font weights */
--canon-font-weight-regular: 400;
@@ -93,10 +69,81 @@
/* Container */
--canon-container-max-width: 1200px;
--canon-container-padding: 1rem;
+
+ /* Colors */
+ --canon-accent: #000;
+ --canon-background: #f8f8f8;
+ --canon-surface-1: #fff;
+ --canon-surface-2: #f4f4f4;
+ --canon-surface-3: #f1f1f1;
+
+ /* Borders */
+ --canon-border-base: rgba(0, 0, 0, 0.1);
+ --canon-border-hover: rgba(0, 0, 0, 0.2);
+ --canon-border-warning: #e36d05;
+ --canon-border-error: #e22b2b;
+ --canon-border-selected: #1db954;
+
+ /* States - Add more states */
+ --canon-error: #f50000;
+
+ /* Text colors */
+ --canon-text-primary: #000;
+ --canon-text-primary-on-accent: #fff;
+ --canon-text-secondary: #646464;
}
/* Dark theme tokens */
[data-theme='dark'] {
+ /* Font families */
+ --canon-font-regular: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
+ 'Helvetica Neue', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
+ 'Segoe UI Symbol', 'Noto Color Emoji';
+ --canon-font-monospace: ui-monospace, 'Menlo', 'Monaco', 'Consolas',
+ 'Liberation Mono', 'Courier New', monospace;
+
+ /* Font weights */
+ --canon-font-weight-regular: 400;
+ --canon-font-weight-bold: 600;
+
+ /* Font sizes */
+ --canon-font-size-label: 0.625rem; /* 10px */
+ --canon-font-size-caption: 0.75rem; /* 12px */
+ --canon-font-size-body: 0.875rem; /* 14px */
+ --canon-font-size-subtitle: 1rem; /* 16px */
+ --canon-font-size-title5: 1.25rem; /* 20px */
+ --canon-font-size-title4: 1.5rem; /* 24px */
+ --canon-font-size-title3: 2rem; /* 32px */
+ --canon-font-size-title2: 3rem; /* 48px */
+ --canon-font-size-title1: 4rem; /* 64px */
+ --canon-font-size-display: 5.75rem; /* 92px */
+
+ /* Spacing */
+ --canon-spacing-5xs: 0.125rem; /* 2px */
+ --canon-spacing-4xs: 0.25rem; /* 4px */
+ --canon-spacing-3xs: 0.375rem; /* 6px */
+ --canon-spacing-2xs: 0.5rem; /* 8px */
+ --canon-spacing-xs: 0.75rem; /* 12px */
+ --canon-spacing-sm: 1rem; /* 16px */
+ --canon-spacing-md: 1.5rem; /* 24px */
+ --canon-spacing-lg: 2rem; /* 32px */
+ --canon-spacing-xl: 2.5rem; /* 40px */
+ --canon-spacing-2xl: 3rem; /* 48px */
+ --canon-spacing-3xl: 3.5rem; /* 56px */
+
+ /* Border radius */
+ --canon-border-radius-2xs: 0.125rem; /* 2px */
+ --canon-border-radius-xs: 0.25rem; /* 4px */
+ --canon-border-radius-sm: 0.5rem; /* 8px */
+ --canon-border-radius-md: 0.75rem; /* 12px */
+ --canon-border-radius-lg: 1rem; /* 16px */
+ --canon-border-radius-xl: 1.25rem; /* 20px */
+ --canon-border-radius-2xl: 1.5rem; /* 24px */
+
+ /* Container */
+ --canon-container-max-width: 1200px;
+ --canon-container-padding: 1rem;
+
/* Colors */
--canon-accent: #fff;
--canon-background: #000;
diff --git a/packages/canon/src/css/normalize.css b/packages/canon/src/css/normalize.css
index 80e1ca4119..ca637e9d3f 100644
--- a/packages/canon/src/css/normalize.css
+++ b/packages/canon/src/css/normalize.css
@@ -9,193 +9,195 @@ Document
Use a better box model (opinionated).
*/
-*,
-::before,
-::after {
- box-sizing: border-box;
-}
+@layer base {
+ *,
+ ::before,
+ ::after {
+ box-sizing: border-box;
+ }
-html {
- /* Improve consistency of default fonts in all browsers. (https://github.com/sindresorhus/modern-normalize/issues/3) */
- font-family: system-ui, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif,
- 'Apple Color Emoji', 'Segoe UI Emoji';
- line-height: 1.15; /* 1. Correct the line height in all browsers. */
- -webkit-text-size-adjust: 100%; /* 2. Prevent adjustments of font size after orientation changes in iOS. */
- tab-size: 4; /* 3. Use a more readable tab size (opinionated). */
-}
+ html {
+ /* Improve consistency of default fonts in all browsers. (https://github.com/sindresorhus/modern-normalize/issues/3) */
+ font-family: system-ui, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif,
+ 'Apple Color Emoji', 'Segoe UI Emoji';
+ line-height: 1.15; /* 1. Correct the line height in all browsers. */
+ -webkit-text-size-adjust: 100%; /* 2. Prevent adjustments of font size after orientation changes in iOS. */
+ tab-size: 4; /* 3. Use a more readable tab size (opinionated). */
+ }
-/*
+ /*
Sections
========
*/
-body {
- margin: 0; /* Remove the margin in all browsers. */
-}
+ body {
+ margin: 0; /* Remove the margin in all browsers. */
+ }
-/*
+ /*
Text-level semantics
====================
*/
-/**
+ /**
Add the correct font weight in Chrome and Safari.
*/
-b,
-strong {
- font-weight: bolder;
-}
+ b,
+ strong {
+ font-weight: bolder;
+ }
-/**
+ /**
1. Improve consistency of default fonts in all browsers. (https://github.com/sindresorhus/modern-normalize/issues/3)
2. Correct the odd 'em' font sizing in all browsers.
*/
-code,
-kbd,
-samp,
-pre {
- font-family: ui-monospace, SFMono-Regular, Consolas, 'Liberation Mono', Menlo,
- monospace; /* 1 */
- font-size: 1em; /* 2 */
-}
+ code,
+ kbd,
+ samp,
+ pre {
+ font-family: ui-monospace, SFMono-Regular, Consolas, 'Liberation Mono',
+ Menlo, monospace; /* 1 */
+ font-size: 1em; /* 2 */
+ }
-/**
+ /**
Add the correct font size in all browsers.
*/
-small {
- font-size: 80%;
-}
+ small {
+ font-size: 80%;
+ }
-/**
+ /**
Prevent 'sub' and 'sup' elements from affecting the line height in all browsers.
*/
-sub,
-sup {
- font-size: 75%;
- line-height: 0;
- position: relative;
- vertical-align: baseline;
-}
+ sub,
+ sup {
+ font-size: 75%;
+ line-height: 0;
+ position: relative;
+ vertical-align: baseline;
+ }
-sub {
- bottom: -0.25em;
-}
+ sub {
+ bottom: -0.25em;
+ }
-sup {
- top: -0.5em;
-}
+ sup {
+ top: -0.5em;
+ }
-/*
+ /*
Tabular data
============
*/
-/**
+ /**
Correct table border color inheritance in Chrome and Safari. (https://issues.chromium.org/issues/40615503, https://bugs.webkit.org/show_bug.cgi?id=195016)
*/
-table {
- border-color: currentcolor;
-}
+ table {
+ border-color: currentcolor;
+ }
-/*
+ /*
Forms
=====
*/
-/**
+ /**
1. Change the font styles in all browsers.
2. Remove the margin in Firefox and Safari.
*/
-button,
-input,
-optgroup,
-select,
-textarea {
- font-family: inherit; /* 1 */
- font-size: 100%; /* 1 */
- line-height: 1.15; /* 1 */
- margin: 0; /* 2 */
-}
+ button,
+ input,
+ optgroup,
+ select,
+ textarea {
+ font-family: inherit; /* 1 */
+ font-size: 100%; /* 1 */
+ line-height: 1.15; /* 1 */
+ margin: 0; /* 2 */
+ }
-/**
+ /**
Correct the inability to style clickable types in iOS and Safari.
*/
-button,
-[type='button'],
-[type='reset'],
-[type='submit'] {
- -webkit-appearance: button;
-}
+ button,
+ [type='button'],
+ [type='reset'],
+ [type='submit'] {
+ -webkit-appearance: button;
+ }
-/**
+ /**
Remove the padding so developers are not caught out when they zero out 'fieldset' elements in all browsers.
*/
-legend {
- padding: 0;
-}
+ legend {
+ padding: 0;
+ }
-/**
+ /**
Add the correct vertical alignment in Chrome and Firefox.
*/
-progress {
- vertical-align: baseline;
-}
+ progress {
+ vertical-align: baseline;
+ }
-/**
+ /**
Correct the cursor style of increment and decrement buttons in Safari.
*/
-::-webkit-inner-spin-button,
-::-webkit-outer-spin-button {
- height: auto;
-}
+ ::-webkit-inner-spin-button,
+ ::-webkit-outer-spin-button {
+ height: auto;
+ }
-/**
+ /**
1. Correct the odd appearance in Chrome and Safari.
2. Correct the outline style in Safari.
*/
-[type='search'] {
- -webkit-appearance: textfield; /* 1 */
- outline-offset: -2px; /* 2 */
-}
+ [type='search'] {
+ -webkit-appearance: textfield; /* 1 */
+ outline-offset: -2px; /* 2 */
+ }
-/**
+ /**
Remove the inner padding in Chrome and Safari on macOS.
*/
-::-webkit-search-decoration {
- -webkit-appearance: none;
-}
+ ::-webkit-search-decoration {
+ -webkit-appearance: none;
+ }
-/**
+ /**
1. Correct the inability to style clickable types in iOS and Safari.
2. Change font properties to 'inherit' in Safari.
*/
-::-webkit-file-upload-button {
- -webkit-appearance: button; /* 1 */
- font: inherit; /* 2 */
-}
+ ::-webkit-file-upload-button {
+ -webkit-appearance: button; /* 1 */
+ font: inherit; /* 2 */
+ }
-/*
+ /*
Interactive
===========
*/
-/*
+ /*
Add the correct display in Chrome and Safari.
*/
-summary {
- display: list-item;
+ summary {
+ display: list-item;
+ }
}
diff --git a/packages/canon/src/css/utilities/2xl.css b/packages/canon/src/css/utilities/2xl.css
index 8938d0dbc5..4ea3d82db0 100644
--- a/packages/canon/src/css/utilities/2xl.css
+++ b/packages/canon/src/css/utilities/2xl.css
@@ -377,6 +377,10 @@
margin: var(--canon-spacing-2xl);
}
+ .cu-2xl-m-2xs {
+ margin: var(--canon-spacing-2xs);
+ }
+
.cu-2xl-m-lg {
margin: var(--canon-spacing-lg);
}
@@ -405,6 +409,10 @@
margin-bottom: var(--canon-spacing-2xl);
}
+ .cu-2xl-mb-2xs {
+ margin-bottom: var(--canon-spacing-2xs);
+ }
+
.cu-2xl-mb-lg {
margin-bottom: var(--canon-spacing-lg);
}
@@ -433,6 +441,10 @@
margin-left: var(--canon-spacing-2xl);
}
+ .cu-2xl-ml-2xs {
+ margin-left: var(--canon-spacing-2xs);
+ }
+
.cu-2xl-ml-lg {
margin-left: var(--canon-spacing-lg);
}
@@ -461,6 +473,10 @@
margin-right: var(--canon-spacing-2xl);
}
+ .cu-2xl-mr-2xs {
+ margin-right: var(--canon-spacing-2xs);
+ }
+
.cu-2xl-mr-lg {
margin-right: var(--canon-spacing-lg);
}
@@ -489,6 +505,10 @@
margin-top: var(--canon-spacing-2xl);
}
+ .cu-2xl-mt-2xs {
+ margin-top: var(--canon-spacing-2xs);
+ }
+
.cu-2xl-mt-lg {
margin-top: var(--canon-spacing-lg);
}
@@ -518,6 +538,11 @@
margin-right: var(--canon-spacing-2xl);
}
+ .cu-2xl-mx-2xs {
+ margin-left: var(--canon-spacing-2xs);
+ margin-right: var(--canon-spacing-2xs);
+ }
+
.cu-2xl-mx-lg {
margin-left: var(--canon-spacing-lg);
margin-right: var(--canon-spacing-lg);
@@ -553,6 +578,11 @@
margin-bottom: var(--canon-spacing-2xl);
}
+ .cu-2xl-my-2xs {
+ margin-top: var(--canon-spacing-2xs);
+ margin-bottom: var(--canon-spacing-2xs);
+ }
+
.cu-2xl-my-lg {
margin-top: var(--canon-spacing-lg);
margin-bottom: var(--canon-spacing-lg);
@@ -587,6 +617,10 @@
padding: var(--canon-spacing-2xl);
}
+ .cu-2xl-p-2xs {
+ padding: var(--canon-spacing-2xs);
+ }
+
.cu-2xl-p-lg {
padding: var(--canon-spacing-lg);
}
@@ -615,6 +649,10 @@
padding-bottom: var(--canon-spacing-2xl);
}
+ .cu-2xl-pb-2xs {
+ padding-bottom: var(--canon-spacing-2xs);
+ }
+
.cu-2xl-pb-lg {
padding-bottom: var(--canon-spacing-lg);
}
@@ -643,6 +681,10 @@
padding-left: var(--canon-spacing-2xl);
}
+ .cu-2xl-pl-2xs {
+ padding-left: var(--canon-spacing-2xs);
+ }
+
.cu-2xl-pl-lg {
padding-left: var(--canon-spacing-lg);
}
@@ -671,6 +713,10 @@
padding-right: var(--canon-spacing-2xl);
}
+ .cu-2xl-pr-2xs {
+ padding-right: var(--canon-spacing-2xs);
+ }
+
.cu-2xl-pr-lg {
padding-right: var(--canon-spacing-lg);
}
@@ -699,6 +745,10 @@
padding-top: var(--canon-spacing-2xl);
}
+ .cu-2xl-pt-2xs {
+ padding-top: var(--canon-spacing-2xs);
+ }
+
.cu-2xl-pt-lg {
padding-top: var(--canon-spacing-lg);
}
@@ -728,6 +778,11 @@
padding-right: var(--canon-spacing-2xl);
}
+ .cu-2xl-px-2xs {
+ padding-left: var(--canon-spacing-2xs);
+ padding-right: var(--canon-spacing-2xs);
+ }
+
.cu-2xl-px-lg {
padding-left: var(--canon-spacing-lg);
padding-right: var(--canon-spacing-lg);
@@ -763,6 +818,11 @@
padding-bottom: var(--canon-spacing-2xl);
}
+ .cu-2xl-py-2xs {
+ padding-top: var(--canon-spacing-2xs);
+ padding-bottom: var(--canon-spacing-2xs);
+ }
+
.cu-2xl-py-lg {
padding-top: var(--canon-spacing-lg);
padding-bottom: var(--canon-spacing-lg);
diff --git a/packages/canon/src/css/utilities/lg.css b/packages/canon/src/css/utilities/lg.css
index 3053a0dde3..caa2adb310 100644
--- a/packages/canon/src/css/utilities/lg.css
+++ b/packages/canon/src/css/utilities/lg.css
@@ -377,6 +377,10 @@
margin: var(--canon-spacing-2xl);
}
+ .cu-lg-m-2xs {
+ margin: var(--canon-spacing-2xs);
+ }
+
.cu-lg-m-lg {
margin: var(--canon-spacing-lg);
}
@@ -405,6 +409,10 @@
margin-bottom: var(--canon-spacing-2xl);
}
+ .cu-lg-mb-2xs {
+ margin-bottom: var(--canon-spacing-2xs);
+ }
+
.cu-lg-mb-lg {
margin-bottom: var(--canon-spacing-lg);
}
@@ -433,6 +441,10 @@
margin-left: var(--canon-spacing-2xl);
}
+ .cu-lg-ml-2xs {
+ margin-left: var(--canon-spacing-2xs);
+ }
+
.cu-lg-ml-lg {
margin-left: var(--canon-spacing-lg);
}
@@ -461,6 +473,10 @@
margin-right: var(--canon-spacing-2xl);
}
+ .cu-lg-mr-2xs {
+ margin-right: var(--canon-spacing-2xs);
+ }
+
.cu-lg-mr-lg {
margin-right: var(--canon-spacing-lg);
}
@@ -489,6 +505,10 @@
margin-top: var(--canon-spacing-2xl);
}
+ .cu-lg-mt-2xs {
+ margin-top: var(--canon-spacing-2xs);
+ }
+
.cu-lg-mt-lg {
margin-top: var(--canon-spacing-lg);
}
@@ -518,6 +538,11 @@
margin-right: var(--canon-spacing-2xl);
}
+ .cu-lg-mx-2xs {
+ margin-left: var(--canon-spacing-2xs);
+ margin-right: var(--canon-spacing-2xs);
+ }
+
.cu-lg-mx-lg {
margin-left: var(--canon-spacing-lg);
margin-right: var(--canon-spacing-lg);
@@ -553,6 +578,11 @@
margin-bottom: var(--canon-spacing-2xl);
}
+ .cu-lg-my-2xs {
+ margin-top: var(--canon-spacing-2xs);
+ margin-bottom: var(--canon-spacing-2xs);
+ }
+
.cu-lg-my-lg {
margin-top: var(--canon-spacing-lg);
margin-bottom: var(--canon-spacing-lg);
@@ -587,6 +617,10 @@
padding: var(--canon-spacing-2xl);
}
+ .cu-lg-p-2xs {
+ padding: var(--canon-spacing-2xs);
+ }
+
.cu-lg-p-lg {
padding: var(--canon-spacing-lg);
}
@@ -615,6 +649,10 @@
padding-bottom: var(--canon-spacing-2xl);
}
+ .cu-lg-pb-2xs {
+ padding-bottom: var(--canon-spacing-2xs);
+ }
+
.cu-lg-pb-lg {
padding-bottom: var(--canon-spacing-lg);
}
@@ -643,6 +681,10 @@
padding-left: var(--canon-spacing-2xl);
}
+ .cu-lg-pl-2xs {
+ padding-left: var(--canon-spacing-2xs);
+ }
+
.cu-lg-pl-lg {
padding-left: var(--canon-spacing-lg);
}
@@ -671,6 +713,10 @@
padding-right: var(--canon-spacing-2xl);
}
+ .cu-lg-pr-2xs {
+ padding-right: var(--canon-spacing-2xs);
+ }
+
.cu-lg-pr-lg {
padding-right: var(--canon-spacing-lg);
}
@@ -699,6 +745,10 @@
padding-top: var(--canon-spacing-2xl);
}
+ .cu-lg-pt-2xs {
+ padding-top: var(--canon-spacing-2xs);
+ }
+
.cu-lg-pt-lg {
padding-top: var(--canon-spacing-lg);
}
@@ -728,6 +778,11 @@
padding-right: var(--canon-spacing-2xl);
}
+ .cu-lg-px-2xs {
+ padding-left: var(--canon-spacing-2xs);
+ padding-right: var(--canon-spacing-2xs);
+ }
+
.cu-lg-px-lg {
padding-left: var(--canon-spacing-lg);
padding-right: var(--canon-spacing-lg);
@@ -763,6 +818,11 @@
padding-bottom: var(--canon-spacing-2xl);
}
+ .cu-lg-py-2xs {
+ padding-top: var(--canon-spacing-2xs);
+ padding-bottom: var(--canon-spacing-2xs);
+ }
+
.cu-lg-py-lg {
padding-top: var(--canon-spacing-lg);
padding-bottom: var(--canon-spacing-lg);
diff --git a/packages/canon/src/css/utilities/md.css b/packages/canon/src/css/utilities/md.css
index 62491f047a..fe6d56ad7c 100644
--- a/packages/canon/src/css/utilities/md.css
+++ b/packages/canon/src/css/utilities/md.css
@@ -377,6 +377,10 @@
margin: var(--canon-spacing-2xl);
}
+ .cu-md-m-2xs {
+ margin: var(--canon-spacing-2xs);
+ }
+
.cu-md-m-lg {
margin: var(--canon-spacing-lg);
}
@@ -405,6 +409,10 @@
margin-bottom: var(--canon-spacing-2xl);
}
+ .cu-md-mb-2xs {
+ margin-bottom: var(--canon-spacing-2xs);
+ }
+
.cu-md-mb-lg {
margin-bottom: var(--canon-spacing-lg);
}
@@ -433,6 +441,10 @@
margin-left: var(--canon-spacing-2xl);
}
+ .cu-md-ml-2xs {
+ margin-left: var(--canon-spacing-2xs);
+ }
+
.cu-md-ml-lg {
margin-left: var(--canon-spacing-lg);
}
@@ -461,6 +473,10 @@
margin-right: var(--canon-spacing-2xl);
}
+ .cu-md-mr-2xs {
+ margin-right: var(--canon-spacing-2xs);
+ }
+
.cu-md-mr-lg {
margin-right: var(--canon-spacing-lg);
}
@@ -489,6 +505,10 @@
margin-top: var(--canon-spacing-2xl);
}
+ .cu-md-mt-2xs {
+ margin-top: var(--canon-spacing-2xs);
+ }
+
.cu-md-mt-lg {
margin-top: var(--canon-spacing-lg);
}
@@ -518,6 +538,11 @@
margin-right: var(--canon-spacing-2xl);
}
+ .cu-md-mx-2xs {
+ margin-left: var(--canon-spacing-2xs);
+ margin-right: var(--canon-spacing-2xs);
+ }
+
.cu-md-mx-lg {
margin-left: var(--canon-spacing-lg);
margin-right: var(--canon-spacing-lg);
@@ -553,6 +578,11 @@
margin-bottom: var(--canon-spacing-2xl);
}
+ .cu-md-my-2xs {
+ margin-top: var(--canon-spacing-2xs);
+ margin-bottom: var(--canon-spacing-2xs);
+ }
+
.cu-md-my-lg {
margin-top: var(--canon-spacing-lg);
margin-bottom: var(--canon-spacing-lg);
@@ -587,6 +617,10 @@
padding: var(--canon-spacing-2xl);
}
+ .cu-md-p-2xs {
+ padding: var(--canon-spacing-2xs);
+ }
+
.cu-md-p-lg {
padding: var(--canon-spacing-lg);
}
@@ -615,6 +649,10 @@
padding-bottom: var(--canon-spacing-2xl);
}
+ .cu-md-pb-2xs {
+ padding-bottom: var(--canon-spacing-2xs);
+ }
+
.cu-md-pb-lg {
padding-bottom: var(--canon-spacing-lg);
}
@@ -643,6 +681,10 @@
padding-left: var(--canon-spacing-2xl);
}
+ .cu-md-pl-2xs {
+ padding-left: var(--canon-spacing-2xs);
+ }
+
.cu-md-pl-lg {
padding-left: var(--canon-spacing-lg);
}
@@ -671,6 +713,10 @@
padding-right: var(--canon-spacing-2xl);
}
+ .cu-md-pr-2xs {
+ padding-right: var(--canon-spacing-2xs);
+ }
+
.cu-md-pr-lg {
padding-right: var(--canon-spacing-lg);
}
@@ -699,6 +745,10 @@
padding-top: var(--canon-spacing-2xl);
}
+ .cu-md-pt-2xs {
+ padding-top: var(--canon-spacing-2xs);
+ }
+
.cu-md-pt-lg {
padding-top: var(--canon-spacing-lg);
}
@@ -728,6 +778,11 @@
padding-right: var(--canon-spacing-2xl);
}
+ .cu-md-px-2xs {
+ padding-left: var(--canon-spacing-2xs);
+ padding-right: var(--canon-spacing-2xs);
+ }
+
.cu-md-px-lg {
padding-left: var(--canon-spacing-lg);
padding-right: var(--canon-spacing-lg);
@@ -763,6 +818,11 @@
padding-bottom: var(--canon-spacing-2xl);
}
+ .cu-md-py-2xs {
+ padding-top: var(--canon-spacing-2xs);
+ padding-bottom: var(--canon-spacing-2xs);
+ }
+
.cu-md-py-lg {
padding-top: var(--canon-spacing-lg);
padding-bottom: var(--canon-spacing-lg);
diff --git a/packages/canon/src/css/utilities/sm.css b/packages/canon/src/css/utilities/sm.css
index 60ddf67de5..87657c2222 100644
--- a/packages/canon/src/css/utilities/sm.css
+++ b/packages/canon/src/css/utilities/sm.css
@@ -377,6 +377,10 @@
margin: var(--canon-spacing-2xl);
}
+ .cu-sm-m-2xs {
+ margin: var(--canon-spacing-2xs);
+ }
+
.cu-sm-m-lg {
margin: var(--canon-spacing-lg);
}
@@ -405,6 +409,10 @@
margin-bottom: var(--canon-spacing-2xl);
}
+ .cu-sm-mb-2xs {
+ margin-bottom: var(--canon-spacing-2xs);
+ }
+
.cu-sm-mb-lg {
margin-bottom: var(--canon-spacing-lg);
}
@@ -433,6 +441,10 @@
margin-left: var(--canon-spacing-2xl);
}
+ .cu-sm-ml-2xs {
+ margin-left: var(--canon-spacing-2xs);
+ }
+
.cu-sm-ml-lg {
margin-left: var(--canon-spacing-lg);
}
@@ -461,6 +473,10 @@
margin-right: var(--canon-spacing-2xl);
}
+ .cu-sm-mr-2xs {
+ margin-right: var(--canon-spacing-2xs);
+ }
+
.cu-sm-mr-lg {
margin-right: var(--canon-spacing-lg);
}
@@ -489,6 +505,10 @@
margin-top: var(--canon-spacing-2xl);
}
+ .cu-sm-mt-2xs {
+ margin-top: var(--canon-spacing-2xs);
+ }
+
.cu-sm-mt-lg {
margin-top: var(--canon-spacing-lg);
}
@@ -518,6 +538,11 @@
margin-right: var(--canon-spacing-2xl);
}
+ .cu-sm-mx-2xs {
+ margin-left: var(--canon-spacing-2xs);
+ margin-right: var(--canon-spacing-2xs);
+ }
+
.cu-sm-mx-lg {
margin-left: var(--canon-spacing-lg);
margin-right: var(--canon-spacing-lg);
@@ -553,6 +578,11 @@
margin-bottom: var(--canon-spacing-2xl);
}
+ .cu-sm-my-2xs {
+ margin-top: var(--canon-spacing-2xs);
+ margin-bottom: var(--canon-spacing-2xs);
+ }
+
.cu-sm-my-lg {
margin-top: var(--canon-spacing-lg);
margin-bottom: var(--canon-spacing-lg);
@@ -587,6 +617,10 @@
padding: var(--canon-spacing-2xl);
}
+ .cu-sm-p-2xs {
+ padding: var(--canon-spacing-2xs);
+ }
+
.cu-sm-p-lg {
padding: var(--canon-spacing-lg);
}
@@ -615,6 +649,10 @@
padding-bottom: var(--canon-spacing-2xl);
}
+ .cu-sm-pb-2xs {
+ padding-bottom: var(--canon-spacing-2xs);
+ }
+
.cu-sm-pb-lg {
padding-bottom: var(--canon-spacing-lg);
}
@@ -643,6 +681,10 @@
padding-left: var(--canon-spacing-2xl);
}
+ .cu-sm-pl-2xs {
+ padding-left: var(--canon-spacing-2xs);
+ }
+
.cu-sm-pl-lg {
padding-left: var(--canon-spacing-lg);
}
@@ -671,6 +713,10 @@
padding-right: var(--canon-spacing-2xl);
}
+ .cu-sm-pr-2xs {
+ padding-right: var(--canon-spacing-2xs);
+ }
+
.cu-sm-pr-lg {
padding-right: var(--canon-spacing-lg);
}
@@ -699,6 +745,10 @@
padding-top: var(--canon-spacing-2xl);
}
+ .cu-sm-pt-2xs {
+ padding-top: var(--canon-spacing-2xs);
+ }
+
.cu-sm-pt-lg {
padding-top: var(--canon-spacing-lg);
}
@@ -728,6 +778,11 @@
padding-right: var(--canon-spacing-2xl);
}
+ .cu-sm-px-2xs {
+ padding-left: var(--canon-spacing-2xs);
+ padding-right: var(--canon-spacing-2xs);
+ }
+
.cu-sm-px-lg {
padding-left: var(--canon-spacing-lg);
padding-right: var(--canon-spacing-lg);
@@ -763,6 +818,11 @@
padding-bottom: var(--canon-spacing-2xl);
}
+ .cu-sm-py-2xs {
+ padding-top: var(--canon-spacing-2xs);
+ padding-bottom: var(--canon-spacing-2xs);
+ }
+
.cu-sm-py-lg {
padding-top: var(--canon-spacing-lg);
padding-bottom: var(--canon-spacing-lg);
diff --git a/packages/canon/src/css/utilities/xl.css b/packages/canon/src/css/utilities/xl.css
index 0a999756ae..7d9e3b8add 100644
--- a/packages/canon/src/css/utilities/xl.css
+++ b/packages/canon/src/css/utilities/xl.css
@@ -377,6 +377,10 @@
margin: var(--canon-spacing-2xl);
}
+ .cu-xl-m-2xs {
+ margin: var(--canon-spacing-2xs);
+ }
+
.cu-xl-m-lg {
margin: var(--canon-spacing-lg);
}
@@ -405,6 +409,10 @@
margin-bottom: var(--canon-spacing-2xl);
}
+ .cu-xl-mb-2xs {
+ margin-bottom: var(--canon-spacing-2xs);
+ }
+
.cu-xl-mb-lg {
margin-bottom: var(--canon-spacing-lg);
}
@@ -433,6 +441,10 @@
margin-left: var(--canon-spacing-2xl);
}
+ .cu-xl-ml-2xs {
+ margin-left: var(--canon-spacing-2xs);
+ }
+
.cu-xl-ml-lg {
margin-left: var(--canon-spacing-lg);
}
@@ -461,6 +473,10 @@
margin-right: var(--canon-spacing-2xl);
}
+ .cu-xl-mr-2xs {
+ margin-right: var(--canon-spacing-2xs);
+ }
+
.cu-xl-mr-lg {
margin-right: var(--canon-spacing-lg);
}
@@ -489,6 +505,10 @@
margin-top: var(--canon-spacing-2xl);
}
+ .cu-xl-mt-2xs {
+ margin-top: var(--canon-spacing-2xs);
+ }
+
.cu-xl-mt-lg {
margin-top: var(--canon-spacing-lg);
}
@@ -518,6 +538,11 @@
margin-right: var(--canon-spacing-2xl);
}
+ .cu-xl-mx-2xs {
+ margin-left: var(--canon-spacing-2xs);
+ margin-right: var(--canon-spacing-2xs);
+ }
+
.cu-xl-mx-lg {
margin-left: var(--canon-spacing-lg);
margin-right: var(--canon-spacing-lg);
@@ -553,6 +578,11 @@
margin-bottom: var(--canon-spacing-2xl);
}
+ .cu-xl-my-2xs {
+ margin-top: var(--canon-spacing-2xs);
+ margin-bottom: var(--canon-spacing-2xs);
+ }
+
.cu-xl-my-lg {
margin-top: var(--canon-spacing-lg);
margin-bottom: var(--canon-spacing-lg);
@@ -587,6 +617,10 @@
padding: var(--canon-spacing-2xl);
}
+ .cu-xl-p-2xs {
+ padding: var(--canon-spacing-2xs);
+ }
+
.cu-xl-p-lg {
padding: var(--canon-spacing-lg);
}
@@ -615,6 +649,10 @@
padding-bottom: var(--canon-spacing-2xl);
}
+ .cu-xl-pb-2xs {
+ padding-bottom: var(--canon-spacing-2xs);
+ }
+
.cu-xl-pb-lg {
padding-bottom: var(--canon-spacing-lg);
}
@@ -643,6 +681,10 @@
padding-left: var(--canon-spacing-2xl);
}
+ .cu-xl-pl-2xs {
+ padding-left: var(--canon-spacing-2xs);
+ }
+
.cu-xl-pl-lg {
padding-left: var(--canon-spacing-lg);
}
@@ -671,6 +713,10 @@
padding-right: var(--canon-spacing-2xl);
}
+ .cu-xl-pr-2xs {
+ padding-right: var(--canon-spacing-2xs);
+ }
+
.cu-xl-pr-lg {
padding-right: var(--canon-spacing-lg);
}
@@ -699,6 +745,10 @@
padding-top: var(--canon-spacing-2xl);
}
+ .cu-xl-pt-2xs {
+ padding-top: var(--canon-spacing-2xs);
+ }
+
.cu-xl-pt-lg {
padding-top: var(--canon-spacing-lg);
}
@@ -728,6 +778,11 @@
padding-right: var(--canon-spacing-2xl);
}
+ .cu-xl-px-2xs {
+ padding-left: var(--canon-spacing-2xs);
+ padding-right: var(--canon-spacing-2xs);
+ }
+
.cu-xl-px-lg {
padding-left: var(--canon-spacing-lg);
padding-right: var(--canon-spacing-lg);
@@ -763,6 +818,11 @@
padding-bottom: var(--canon-spacing-2xl);
}
+ .cu-xl-py-2xs {
+ padding-top: var(--canon-spacing-2xs);
+ padding-bottom: var(--canon-spacing-2xs);
+ }
+
.cu-xl-py-lg {
padding-top: var(--canon-spacing-lg);
padding-bottom: var(--canon-spacing-lg);
diff --git a/packages/canon/src/css/utilities/xs.css b/packages/canon/src/css/utilities/xs.css
index 28ec25c817..926a2cc627 100644
--- a/packages/canon/src/css/utilities/xs.css
+++ b/packages/canon/src/css/utilities/xs.css
@@ -376,6 +376,10 @@
margin: var(--canon-spacing-2xl);
}
+ .cu-m-2xs {
+ margin: var(--canon-spacing-2xs);
+ }
+
.cu-m-lg {
margin: var(--canon-spacing-lg);
}
@@ -404,6 +408,10 @@
margin-bottom: var(--canon-spacing-2xl);
}
+ .cu-mb-2xs {
+ margin-bottom: var(--canon-spacing-2xs);
+ }
+
.cu-mb-lg {
margin-bottom: var(--canon-spacing-lg);
}
@@ -432,6 +440,10 @@
margin-left: var(--canon-spacing-2xl);
}
+ .cu-ml-2xs {
+ margin-left: var(--canon-spacing-2xs);
+ }
+
.cu-ml-lg {
margin-left: var(--canon-spacing-lg);
}
@@ -460,6 +472,10 @@
margin-right: var(--canon-spacing-2xl);
}
+ .cu-mr-2xs {
+ margin-right: var(--canon-spacing-2xs);
+ }
+
.cu-mr-lg {
margin-right: var(--canon-spacing-lg);
}
@@ -488,6 +504,10 @@
margin-top: var(--canon-spacing-2xl);
}
+ .cu-mt-2xs {
+ margin-top: var(--canon-spacing-2xs);
+ }
+
.cu-mt-lg {
margin-top: var(--canon-spacing-lg);
}
@@ -517,6 +537,11 @@
margin-right: var(--canon-spacing-2xl);
}
+ .cu-mx-2xs {
+ margin-left: var(--canon-spacing-2xs);
+ margin-right: var(--canon-spacing-2xs);
+ }
+
.cu-mx-lg {
margin-left: var(--canon-spacing-lg);
margin-right: var(--canon-spacing-lg);
@@ -552,6 +577,11 @@
margin-bottom: var(--canon-spacing-2xl);
}
+ .cu-my-2xs {
+ margin-top: var(--canon-spacing-2xs);
+ margin-bottom: var(--canon-spacing-2xs);
+ }
+
.cu-my-lg {
margin-top: var(--canon-spacing-lg);
margin-bottom: var(--canon-spacing-lg);
@@ -586,6 +616,10 @@
padding: var(--canon-spacing-2xl);
}
+ .cu-p-2xs {
+ padding: var(--canon-spacing-2xs);
+ }
+
.cu-p-lg {
padding: var(--canon-spacing-lg);
}
@@ -614,6 +648,10 @@
padding-bottom: var(--canon-spacing-2xl);
}
+ .cu-pb-2xs {
+ padding-bottom: var(--canon-spacing-2xs);
+ }
+
.cu-pb-lg {
padding-bottom: var(--canon-spacing-lg);
}
@@ -642,6 +680,10 @@
padding-left: var(--canon-spacing-2xl);
}
+ .cu-pl-2xs {
+ padding-left: var(--canon-spacing-2xs);
+ }
+
.cu-pl-lg {
padding-left: var(--canon-spacing-lg);
}
@@ -670,6 +712,10 @@
padding-right: var(--canon-spacing-2xl);
}
+ .cu-pr-2xs {
+ padding-right: var(--canon-spacing-2xs);
+ }
+
.cu-pr-lg {
padding-right: var(--canon-spacing-lg);
}
@@ -698,6 +744,10 @@
padding-top: var(--canon-spacing-2xl);
}
+ .cu-pt-2xs {
+ padding-top: var(--canon-spacing-2xs);
+ }
+
.cu-pt-lg {
padding-top: var(--canon-spacing-lg);
}
@@ -727,6 +777,11 @@
padding-right: var(--canon-spacing-2xl);
}
+ .cu-px-2xs {
+ padding-left: var(--canon-spacing-2xs);
+ padding-right: var(--canon-spacing-2xs);
+ }
+
.cu-px-lg {
padding-left: var(--canon-spacing-lg);
padding-right: var(--canon-spacing-lg);
@@ -762,6 +817,11 @@
padding-bottom: var(--canon-spacing-2xl);
}
+ .cu-py-2xs {
+ padding-top: var(--canon-spacing-2xs);
+ padding-bottom: var(--canon-spacing-2xs);
+ }
+
.cu-py-lg {
padding-top: var(--canon-spacing-lg);
padding-bottom: var(--canon-spacing-lg);
diff --git a/packages/canon/src/index.ts b/packages/canon/src/index.ts
index 23432295e2..f6cca4bed6 100644
--- a/packages/canon/src/index.ts
+++ b/packages/canon/src/index.ts
@@ -20,12 +20,17 @@
* @packageDocumentation
*/
+// Providers
+export * from './contexts/canon';
+
// Layout components
export * from './components/Box';
export * from './components/Grid';
export * from './components/Stack';
export * from './components/Inline';
export * from './components/Container';
+export * from './components/Text';
+export * from './components/Heading';
// UI components
export * from './components/Button';
diff --git a/packages/catalog-client/CHANGELOG.md b/packages/catalog-client/CHANGELOG.md
index a02c900ded..96c511d97e 100644
--- a/packages/catalog-client/CHANGELOG.md
+++ b/packages/catalog-client/CHANGELOG.md
@@ -1,5 +1,13 @@
# @backstage/catalog-client
+## 1.9.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/errors@1.2.7-next.0
+
## 1.9.0
### Minor Changes
diff --git a/packages/catalog-client/package.json b/packages/catalog-client/package.json
index 6da28963d7..4dbd595089 100644
--- a/packages/catalog-client/package.json
+++ b/packages/catalog-client/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/catalog-client",
- "version": "1.9.0",
+ "version": "1.9.1-next.0",
"description": "An isomorphic client for the catalog backend",
"backstage": {
"role": "common-library"
diff --git a/packages/catalog-model/CHANGELOG.md b/packages/catalog-model/CHANGELOG.md
index 38df41f4d8..a8447c64fe 100644
--- a/packages/catalog-model/CHANGELOG.md
+++ b/packages/catalog-model/CHANGELOG.md
@@ -1,5 +1,13 @@
# @backstage/catalog-model
+## 1.7.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/errors@1.2.7-next.0
+
## 1.7.2
### Patch Changes
diff --git a/packages/catalog-model/package.json b/packages/catalog-model/package.json
index 35fdaea699..0e14357671 100644
--- a/packages/catalog-model/package.json
+++ b/packages/catalog-model/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/catalog-model",
- "version": "1.7.2",
+ "version": "1.7.3-next.0",
"description": "Types and validators that help describe the model of a Backstage Catalog",
"backstage": {
"role": "common-library"
diff --git a/packages/cli-node/CHANGELOG.md b/packages/cli-node/CHANGELOG.md
index ae7a20f763..a2f6104715 100644
--- a/packages/cli-node/CHANGELOG.md
+++ b/packages/cli-node/CHANGELOG.md
@@ -1,5 +1,14 @@
# @backstage/cli-node
+## 0.2.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/cli-common@0.1.15
+
## 0.2.11
### Patch Changes
diff --git a/packages/cli-node/package.json b/packages/cli-node/package.json
index 016d1f7fc6..38e2fcd285 100644
--- a/packages/cli-node/package.json
+++ b/packages/cli-node/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/cli-node",
- "version": "0.2.11",
+ "version": "0.2.12-next.0",
"description": "Node.js library for Backstage CLIs",
"backstage": {
"role": "node-library"
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
index 90cc10ce79..f2396cdd3b 100644
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -1,5 +1,38 @@
# @backstage/cli
+## 0.29.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/cli-node@0.2.12-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/config-loader@1.9.5-next.1
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/release-manifests@0.0.12
+ - @backstage/cli-common@0.1.15
+ - @backstage/eslint-plugin@0.1.10
+ - @backstage/integration@1.16.1-next.0
+
+## 0.29.5-next.0
+
+### Patch Changes
+
+- e937ce0: Fixed incompatible `@typescript-eslint` versions with current `eslint@8.x.x`
+- Updated dependencies
+ - @backstage/config-loader@1.9.5-next.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/cli-common@0.1.15
+ - @backstage/cli-node@0.2.11
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/eslint-plugin@0.1.10
+ - @backstage/integration@1.16.0
+ - @backstage/release-manifests@0.0.12
+ - @backstage/types@1.2.0
+
## 0.29.4
### Patch Changes
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 67d5e5eb41..ce936223a3 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/cli",
- "version": "0.29.4",
+ "version": "0.29.5-next.1",
"description": "CLI for developing Backstage plugins and apps",
"backstage": {
"role": "cli"
@@ -77,8 +77,8 @@
"@swc/jest": "^0.2.22",
"@types/jest": "^29.5.11",
"@types/webpack-env": "^1.15.2",
- "@typescript-eslint/eslint-plugin": "^6.12.0",
- "@typescript-eslint/parser": "^6.7.2",
+ "@typescript-eslint/eslint-plugin": "^8.17.0",
+ "@typescript-eslint/parser": "^8.16.0",
"@yarnpkg/lockfile": "^1.1.0",
"@yarnpkg/parsers": "^3.0.0",
"bfj": "^8.0.0",
@@ -95,14 +95,14 @@
"eslint": "^8.6.0",
"eslint-config-prettier": "^9.0.0",
"eslint-formatter-friendly": "^7.0.0",
- "eslint-plugin-deprecation": "^2.0.0",
- "eslint-plugin-import": "^2.25.4",
- "eslint-plugin-jest": "^28.0.0",
- "eslint-plugin-jsx-a11y": "^6.5.1",
- "eslint-plugin-react": "^7.28.0",
- "eslint-plugin-react-hooks": "^4.3.0",
- "eslint-plugin-unused-imports": "^3.0.0",
- "eslint-webpack-plugin": "^4.0.0",
+ "eslint-plugin-deprecation": "^3.0.0",
+ "eslint-plugin-import": "^2.31.0",
+ "eslint-plugin-jest": "^28.9.0",
+ "eslint-plugin-jsx-a11y": "^6.10.2",
+ "eslint-plugin-react": "^7.37.2",
+ "eslint-plugin-react-hooks": "^5.0.0",
+ "eslint-plugin-unused-imports": "^4.1.4",
+ "eslint-webpack-plugin": "^4.2.0",
"express": "^4.17.1",
"fork-ts-checker-webpack-plugin": "^9.0.0",
"fs-extra": "^11.2.0",
diff --git a/packages/config-loader/CHANGELOG.md b/packages/config-loader/CHANGELOG.md
index 9cba2ee17a..fd99a9cac4 100644
--- a/packages/config-loader/CHANGELOG.md
+++ b/packages/config-loader/CHANGELOG.md
@@ -1,5 +1,26 @@
# @backstage/config-loader
+## 1.9.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/cli-common@0.1.15
+
+## 1.9.5-next.0
+
+### Patch Changes
+
+- 8ecf8cb: Exclude `@backstage/backend-common` from schema collection if `@backstage/backend-defaults` is present
+- Updated dependencies
+ - @backstage/cli-common@0.1.15
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/types@1.2.0
+
## 1.9.3
### Patch Changes
diff --git a/packages/config-loader/package.json b/packages/config-loader/package.json
index ae67a5b492..c964e01c41 100644
--- a/packages/config-loader/package.json
+++ b/packages/config-loader/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/config-loader",
- "version": "1.9.3",
+ "version": "1.9.5-next.1",
"description": "Config loading functionality used by Backstage backend, and CLI",
"backstage": {
"role": "node-library"
diff --git a/packages/config-loader/src/schema/collect.test.ts b/packages/config-loader/src/schema/collect.test.ts
index 8c6d1c6b90..53db5c6da7 100644
--- a/packages/config-loader/src/schema/collect.test.ts
+++ b/packages/config-loader/src/schema/collect.test.ts
@@ -68,6 +68,7 @@ describe('collectConfigSchemas', () => {
{
path: path.join('node_modules', 'a', 'package.json'),
value: mockSchema,
+ packageName: 'a',
},
]);
});
@@ -89,6 +90,62 @@ describe('collectConfigSchemas', () => {
{
path: path.join('root', 'package.json'),
value: mockSchema,
+ packageName: 'root',
+ },
+ ]);
+ });
+
+ it('should not include schemas for backend-common if theres a backend-defaults package', async () => {
+ mockDir.setContent({
+ root: {
+ 'package.json': JSON.stringify({
+ name: 'root',
+ dependencies: {
+ '@backstage/backend-common': '1',
+ '@backstage/backend-defaults': '1',
+ },
+ configSchema: { ...mockSchema, title: 'root' },
+ }),
+ },
+ node_modules: {
+ '@backstage': {
+ 'backend-common': {
+ 'package.json': JSON.stringify({
+ name: '@backstage/backend-common',
+ version: '1',
+ configSchema: { ...mockSchema, title: 'backend-common' },
+ }),
+ },
+ 'backend-defaults': {
+ 'package.json': JSON.stringify({
+ name: '@backstage/backend-defaults',
+ version: '1',
+ configSchema: { ...mockSchema, title: 'backend-defaults' },
+ }),
+ },
+ },
+ },
+ });
+
+ process.chdir(mockDir.path);
+
+ await expect(
+ collectConfigSchemas(['root'], [path.join('root', 'package.json')]),
+ ).resolves.toEqual([
+ {
+ path: path.join('root', 'package.json'),
+ value: { ...mockSchema, title: 'root' },
+ packageName: 'root',
+ },
+ {
+ path: path.join(
+ 'node_modules',
+ '@backstage',
+ 'backend-defaults',
+ 'package.json',
+ ),
+ value: { ...mockSchema, title: 'backend-defaults' },
+ packageName: '@backstage/backend-defaults',
},
]);
});
@@ -159,18 +216,22 @@ describe('collectConfigSchemas', () => {
{
path: path.join('node_modules', 'b', 'package.json'),
value: { ...mockSchema, title: 'b' },
+ packageName: 'b',
},
{
path: path.join('node_modules', 'c1', 'package.json'),
value: { ...mockSchema, title: 'c1' },
+ packageName: 'c1',
},
{
path: path.join('node_modules', 'd1', 'package.json'),
value: { ...mockSchema, title: 'd1' },
+ packageName: 'd1',
},
{
path: path.join('root', 'package.json'),
value: { ...mockSchema, title: 'root' },
+ packageName: 'root',
},
]),
);
@@ -213,10 +274,12 @@ describe('collectConfigSchemas', () => {
{
path: path.join('node_modules', 'a', 'package.json'),
value: { ...mockSchema, title: 'inline' },
+ packageName: 'a',
},
{
path: path.join('node_modules', 'b', 'schema.json'),
value: { ...mockSchema, title: 'external' },
+ packageName: 'b',
},
{
path: path.join('node_modules', 'c', 'schema.d.ts'),
@@ -231,6 +294,7 @@ describe('collectConfigSchemas', () => {
},
required: ['tsKey'],
},
+ packageName: 'c',
},
]),
);
@@ -284,14 +348,17 @@ describe('collectConfigSchemas', () => {
{
path: path.join('node_modules', 'a', 'package.json'),
value: mockSchema,
+ packageName: 'a',
},
{
path: path.join('node_modules', 'b', 'package.json'),
value: { ...mockSchema, title: 'b' },
+ packageName: 'b',
},
{
path: path.join('node_modules', 'c', 'package.json'),
value: { ...mockSchema, title: 'c1' },
+ packageName: 'c',
},
{
path: path.join(
@@ -302,6 +369,7 @@ describe('collectConfigSchemas', () => {
'package.json',
),
value: { ...mockSchema, title: 'c2' },
+ packageName: 'c',
},
]),
);
diff --git a/packages/config-loader/src/schema/collect.ts b/packages/config-loader/src/schema/collect.ts
index 7120c12d90..c7af64e0f3 100644
--- a/packages/config-loader/src/schema/collect.ts
+++ b/packages/config-loader/src/schema/collect.ts
@@ -45,7 +45,7 @@ export async function collectConfigSchemas(
packagePaths: string[],
): Promise {
const schemas = new Array();
- const tsSchemaPaths = new Array();
+ const tsSchemaPaths = new Array<{ packageName: string; path: string }>();
const visitedPackageVersions = new Map>(); // pkgName: [versions...]
const currentDir = await fs.realpath(process.cwd());
@@ -115,22 +115,25 @@ export async function collectConfigSchemas(
);
}
if (isDts) {
- tsSchemaPaths.push(
- relativePath(
+ tsSchemaPaths.push({
+ path: relativePath(
currentDir,
resolvePath(dirname(pkgPath), pkg.configSchema),
),
- );
+ packageName: pkg.name,
+ });
} else {
const path = resolvePath(dirname(pkgPath), pkg.configSchema);
const value = await fs.readJson(path);
schemas.push({
+ packageName: pkg.name,
value,
path: relativePath(currentDir, path),
});
}
} else {
schemas.push({
+ packageName: pkg.name,
value: pkg.configSchema,
path: relativePath(currentDir, pkgPath),
});
@@ -150,15 +153,31 @@ export async function collectConfigSchemas(
]);
const tsSchemas = await compileTsSchemas(tsSchemaPaths);
+ const allSchemas = schemas.concat(tsSchemas);
- return schemas.concat(tsSchemas);
+ const hasBackendDefaults = allSchemas.some(
+ ({ packageName }) => packageName === '@backstage/backend-defaults',
+ );
+
+ if (hasBackendDefaults) {
+ // We filter out backend-common schemas here to avoid issues with
+ // schema merging over different versions of the same schema.
+ // led to issues such as https://github.com/backstage/backstage/issues/28170
+ return allSchemas.filter(
+ ({ packageName }) => packageName !== '@backstage/backend-common',
+ );
+ }
+
+ return allSchemas;
}
// This handles the support of TypeScript .d.ts config schema declarations.
// We collect all typescript schema definition and compile them all in one go.
// This is much faster than compiling them separately.
-async function compileTsSchemas(paths: string[]) {
- if (paths.length === 0) {
+async function compileTsSchemas(
+ entries: { path: string; packageName: string }[],
+) {
+ if (entries.length === 0) {
return [];
}
@@ -168,20 +187,23 @@ async function compileTsSchemas(paths: string[]) {
'typescript-json-schema'
);
- const program = getProgramFromFiles(paths, {
- incremental: false,
- isolatedModules: true,
- lib: ['ES5'], // Skipping most libs speeds processing up a lot, we just need the primitive types anyway
- noEmit: true,
- noResolve: true,
- skipLibCheck: true, // Skipping lib checks speeds things up
- skipDefaultLibCheck: true,
- strict: true,
- typeRoots: [], // Do not include any additional types
- types: [],
- });
+ const program = getProgramFromFiles(
+ entries.map(({ path }) => path),
+ {
+ incremental: false,
+ isolatedModules: true,
+ lib: ['ES5'], // Skipping most libs speeds processing up a lot, we just need the primitive types anyway
+ noEmit: true,
+ noResolve: true,
+ skipLibCheck: true, // Skipping lib checks speeds things up
+ skipDefaultLibCheck: true,
+ strict: true,
+ typeRoots: [], // Do not include any additional types
+ types: [],
+ },
+ );
- const tsSchemas = paths.map(path => {
+ const tsSchemas = entries.map(({ path, packageName }) => {
let value;
try {
const generator = buildGenerator(
@@ -228,7 +250,7 @@ async function compileTsSchemas(paths: string[]) {
if (!value) {
throw new Error(`Invalid schema in ${path}, missing Config export`);
}
- return { path, value };
+ return { path, value, packageName };
});
return tsSchemas;
diff --git a/packages/config-loader/src/schema/compile.test.ts b/packages/config-loader/src/schema/compile.test.ts
index ff0a9543aa..b39d2537d1 100644
--- a/packages/config-loader/src/schema/compile.test.ts
+++ b/packages/config-loader/src/schema/compile.test.ts
@@ -21,10 +21,12 @@ describe('compileConfigSchemas', () => {
const validate = compileConfigSchemas([
{
path: 'a',
+ packageName: 'a',
value: { type: 'object', properties: { a: { type: 'string' } } },
},
{
path: 'b',
+ packageName: 'b',
value: { type: 'object', properties: { b: { type: 'number' } } },
},
]);
@@ -64,6 +66,7 @@ describe('compileConfigSchemas', () => {
const validate = compileConfigSchemas([
{
path: 'a1',
+ packageName: 'a1',
value: {
type: 'object',
properties: {
@@ -80,6 +83,7 @@ describe('compileConfigSchemas', () => {
},
{
path: 'a2',
+ packageName: 'a2',
value: {
type: 'object',
properties: {
@@ -126,6 +130,7 @@ describe('compileConfigSchemas', () => {
compileConfigSchemas([
{
path: 'a1',
+ packageName: 'a1',
value: {
type: 'object',
properties: { a: { type: 'string', visibility: 'frontend' } },
@@ -133,6 +138,7 @@ describe('compileConfigSchemas', () => {
},
{
path: 'a2',
+ packageName: 'a2',
value: {
type: 'object',
properties: { a: { type: 'string', visibility: 'secret' } },
@@ -148,6 +154,7 @@ describe('compileConfigSchemas', () => {
const validate = compileConfigSchemas([
{
path: 'a1',
+ packageName: 'a1',
value: {
type: 'object',
properties: {
@@ -179,6 +186,7 @@ describe('compileConfigSchemas', () => {
const validate = compileConfigSchemas([
{
path: 'a1',
+ packageName: 'a1',
value: {
type: 'object',
properties: {
@@ -242,6 +250,7 @@ describe('deepVisibility', () => {
const validate = compileConfigSchemas([
{
path: 'a1',
+ packageName: 'a1',
value: {
type: 'object',
properties: {
@@ -257,6 +266,7 @@ describe('deepVisibility', () => {
},
{
path: 'a2',
+ packageName: 'a2',
value: {
type: 'object',
deepVisibility: 'secret',
@@ -305,6 +315,7 @@ describe('deepVisibility', () => {
compileConfigSchemas([
{
path: 'a1',
+ packageName: 'a1',
value: {
type: 'object',
properties: {
@@ -320,6 +331,7 @@ describe('deepVisibility', () => {
},
{
path: 'a2',
+ packageName: 'a2',
value: {
type: 'object',
deepVisibility: 'secret',
@@ -346,6 +358,7 @@ describe('deepVisibility', () => {
compileConfigSchemas([
{
path: 'a2',
+ packageName: 'a2',
value: {
type: 'object',
deepVisibility: 'secret',
@@ -376,6 +389,7 @@ describe('deepVisibility', () => {
compileConfigSchemas([
{
path: 'a2',
+ packageName: 'a2',
value: {
type: 'object',
properties: {
@@ -398,6 +412,7 @@ describe('deepVisibility', () => {
compileConfigSchemas([
{
path: 'a1',
+ packageName: 'a1',
value: {
type: 'object',
properties: {
@@ -418,6 +433,7 @@ describe('deepVisibility', () => {
},
{
path: 'a2',
+ packageName: 'a2',
value: {
type: 'object',
deepVisibility: 'secret',
diff --git a/packages/config-loader/src/schema/types.ts b/packages/config-loader/src/schema/types.ts
index 8f679c93fc..4ba65245da 100644
--- a/packages/config-loader/src/schema/types.ts
+++ b/packages/config-loader/src/schema/types.ts
@@ -29,6 +29,10 @@ export type ConfigSchemaPackageEntry = {
* The relative path that the configuration schema was discovered at.
*/
path: string;
+ /**
+ * The package name for the package this belongs to
+ */
+ packageName: string;
};
/**
diff --git a/packages/config/CHANGELOG.md b/packages/config/CHANGELOG.md
index 7e7d23781b..6a1758386d 100644
--- a/packages/config/CHANGELOG.md
+++ b/packages/config/CHANGELOG.md
@@ -1,5 +1,13 @@
# @backstage/config
+## 1.3.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/errors@1.2.7-next.0
+
## 1.3.1
### Patch Changes
diff --git a/packages/config/package.json b/packages/config/package.json
index df50874aa9..37e011f363 100644
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/config",
- "version": "1.3.1",
+ "version": "1.3.2-next.0",
"description": "Config API used by Backstage core, backend, and CLI",
"backstage": {
"role": "common-library"
diff --git a/packages/core-app-api/CHANGELOG.md b/packages/core-app-api/CHANGELOG.md
index 788e848e96..b4fcc236c8 100644
--- a/packages/core-app-api/CHANGELOG.md
+++ b/packages/core-app-api/CHANGELOG.md
@@ -1,5 +1,15 @@
# @backstage/core-app-api
+## 1.15.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/types@1.2.1-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/version-bridge@1.0.10
+
## 1.15.3
### Patch Changes
diff --git a/packages/core-app-api/package.json b/packages/core-app-api/package.json
index a7f02cace7..9cb1f68af1 100644
--- a/packages/core-app-api/package.json
+++ b/packages/core-app-api/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/core-app-api",
- "version": "1.15.3",
+ "version": "1.15.4-next.0",
"description": "Core app API used by Backstage apps",
"backstage": {
"role": "web-library"
diff --git a/packages/core-compat-api/CHANGELOG.md b/packages/core-compat-api/CHANGELOG.md
index 208b42470b..4feac45ec7 100644
--- a/packages/core-compat-api/CHANGELOG.md
+++ b/packages/core-compat-api/CHANGELOG.md
@@ -1,5 +1,14 @@
# @backstage/core-compat-api
+## 0.3.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.9.4-next.0
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/version-bridge@1.0.10
+
## 0.3.4
### Patch Changes
diff --git a/packages/core-compat-api/package.json b/packages/core-compat-api/package.json
index db93a47b31..4c9409356c 100644
--- a/packages/core-compat-api/package.json
+++ b/packages/core-compat-api/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/core-compat-api",
- "version": "0.3.4",
+ "version": "0.3.5-next.0",
"backstage": {
"role": "web-library"
},
diff --git a/packages/core-components/CHANGELOG.md b/packages/core-components/CHANGELOG.md
index f16f61bc47..2fd2cb6973 100644
--- a/packages/core-components/CHANGELOG.md
+++ b/packages/core-components/CHANGELOG.md
@@ -1,5 +1,16 @@
# @backstage/core-components
+## 0.16.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/theme@0.6.3
+ - @backstage/version-bridge@1.0.10
+
## 0.16.2
### Patch Changes
diff --git a/packages/core-components/package.json b/packages/core-components/package.json
index d50c03acb6..5689b9e4f7 100644
--- a/packages/core-components/package.json
+++ b/packages/core-components/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/core-components",
- "version": "0.16.2",
+ "version": "0.16.3-next.0",
"description": "Core components used by Backstage plugins and apps",
"backstage": {
"role": "web-library"
diff --git a/packages/core-plugin-api/CHANGELOG.md b/packages/core-plugin-api/CHANGELOG.md
index c338f8d090..bb29bc4a10 100644
--- a/packages/core-plugin-api/CHANGELOG.md
+++ b/packages/core-plugin-api/CHANGELOG.md
@@ -1,5 +1,16 @@
# @backstage/core-plugin-api
+## 1.10.3-next.0
+
+### Patch Changes
+
+- b40eb41: Move `Expand` and `ExpandRecursive` to `@backstage/types`
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/version-bridge@1.0.10
+
## 1.10.2
### Patch Changes
diff --git a/packages/core-plugin-api/package.json b/packages/core-plugin-api/package.json
index 31b0480bde..e3959b3990 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.10.2",
+ "version": "1.10.3-next.0",
"description": "Core API used by Backstage plugins",
"backstage": {
"role": "web-library"
diff --git a/packages/core-plugin-api/report-alpha.api.md b/packages/core-plugin-api/report-alpha.api.md
index c0f0d02535..281d943e50 100644
--- a/packages/core-plugin-api/report-alpha.api.md
+++ b/packages/core-plugin-api/report-alpha.api.md
@@ -4,6 +4,8 @@
```ts
import { ApiRef } from '@backstage/core-plugin-api';
+import { Expand } from '@backstage/types';
+import { ExpandRecursive } from '@backstage/types';
import { Observable } from '@backstage/types';
import { TranslationMessages as TranslationMessages_2 } from '@backstage/core-plugin-api/alpha';
import { TranslationRef as TranslationRef_2 } from '@backstage/core-plugin-api/alpha';
diff --git a/packages/core-plugin-api/src/apis/definitions/TranslationApi.ts b/packages/core-plugin-api/src/apis/definitions/TranslationApi.ts
index 202b2093a0..dba8753828 100644
--- a/packages/core-plugin-api/src/apis/definitions/TranslationApi.ts
+++ b/packages/core-plugin-api/src/apis/definitions/TranslationApi.ts
@@ -15,7 +15,7 @@
*/
import { ApiRef, createApiRef } from '@backstage/core-plugin-api';
-import { Observable } from '@backstage/types';
+import { Expand, ExpandRecursive, Observable } from '@backstage/types';
import { TranslationRef } from '../../translation';
/**
@@ -98,22 +98,6 @@ type CollapsedMessages = {
: key]: TMessages[key];
};
-/**
- * Helper type that expands type hints
- *
- * @ignore
- */
-type Expand = T extends infer O ? { [K in keyof O]: O[K] } : never;
-
-/**
- * Helper type that expands type hints recursively
- *
- * @ignore
- */
-type ExpandRecursive = T extends infer O
- ? { [K in keyof O]: ExpandRecursive }
- : never;
-
/**
* Trim away whitespace
*
diff --git a/packages/create-app/CHANGELOG.md b/packages/create-app/CHANGELOG.md
index 06e61c380f..e6b2cda208 100644
--- a/packages/create-app/CHANGELOG.md
+++ b/packages/create-app/CHANGELOG.md
@@ -1,5 +1,27 @@
# @backstage/create-app
+## 0.5.24-next.2
+
+### Patch Changes
+
+- Bumped create-app version.
+- Updated dependencies
+ - @backstage/cli-common@0.1.15
+
+## 0.5.24-next.1
+
+### Patch Changes
+
+- 828c993: Added `-j 2` to `dev` script to help cases where the backend does not start up during local development
+
+## 0.5.24-next.0
+
+### Patch Changes
+
+- Bumped create-app version.
+- Updated dependencies
+ - @backstage/cli-common@0.1.15
+
## 0.5.23
### Patch Changes
diff --git a/packages/create-app/package.json b/packages/create-app/package.json
index 1e9c89c5c3..df834fe126 100644
--- a/packages/create-app/package.json
+++ b/packages/create-app/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/create-app",
- "version": "0.5.23",
+ "version": "0.5.24-next.2",
"description": "A CLI that helps you create your own Backstage app",
"backstage": {
"role": "cli"
diff --git a/packages/create-app/seed-yarn.lock b/packages/create-app/seed-yarn.lock
index 00a86105cc..21b2aa543d 100644
--- a/packages/create-app/seed-yarn.lock
+++ b/packages/create-app/seed-yarn.lock
@@ -16,3 +16,28 @@
// package: the name of the package, e.g. @testing-library/react
// query: the version query to pin the version for, e.g. ^14.0.0
// version: the version to pin to, must be in range of the query, e.g. 14.11.0
+
+"@google-cloud/storage@^7.0.0":
+ version "7.14.0"
+ resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-7.14.0.tgz#eda9715f68507949214af804c906eba6d168a214"
+ integrity sha512-H41bPL2cMfSi4EEnFzKvg7XSb7T67ocSXrmF7MPjfgFB0L6CKGzfIYJheAZi1iqXjz6XaCT1OBf6HCG5vDBTOQ==
+
+"@octokit/types@npm:^13.0.0":
+ version "13.6.2"
+ resolved "https://registry.yarnpkg.com/@octokit/types/-/types-13.6.2.tgz#e10fc4d2bdd65d836d1ced223b03ad4cfdb525bd"
+ integrity sha512-WpbZfZUcZU77DrSW4wbsSgTPfKcp286q3ItaIgvSbBpZJlu6mnYXAkjZz6LVZPXkEvLIM8McanyZejKTYUHipA==
+
+"@octokit/types@npm:^13.1.0":
+ version "13.6.2"
+ resolved "https://registry.yarnpkg.com/@octokit/types/-/types-13.6.2.tgz#e10fc4d2bdd65d836d1ced223b03ad4cfdb525bd"
+ integrity sha512-WpbZfZUcZU77DrSW4wbsSgTPfKcp286q3ItaIgvSbBpZJlu6mnYXAkjZz6LVZPXkEvLIM8McanyZejKTYUHipA==
+
+"@octokit/types@npm:^13.5.0":
+ version "13.6.2"
+ resolved "https://registry.yarnpkg.com/@octokit/types/-/types-13.6.2.tgz#e10fc4d2bdd65d836d1ced223b03ad4cfdb525bd"
+ integrity sha512-WpbZfZUcZU77DrSW4wbsSgTPfKcp286q3ItaIgvSbBpZJlu6mnYXAkjZz6LVZPXkEvLIM8McanyZejKTYUHipA==
+
+"@octokit/openapi-types@^22.2.0":
+ version "22.2.0"
+ resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-22.2.0.tgz#75aa7dcd440821d99def6a60b5f014207ae4968e"
+ integrity sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg==
diff --git a/packages/create-app/templates/default-app/package.json.hbs b/packages/create-app/templates/default-app/package.json.hbs
index 21bdd41bdf..7b9413e63e 100644
--- a/packages/create-app/templates/default-app/package.json.hbs
+++ b/packages/create-app/templates/default-app/package.json.hbs
@@ -6,7 +6,7 @@
"node": "20 || 22"
},
"scripts": {
- "dev": "yarn workspaces foreach -A --include backend --include app --parallel -v -i run start",
+ "dev": "yarn workspaces foreach -A --include backend --include app --parallel --jobs unlimited -v -i run start",
"start": "yarn workspace app start",
"start-backend": "yarn workspace backend start",
"build:backend": "yarn workspace backend build",
diff --git a/packages/dev-utils/CHANGELOG.md b/packages/dev-utils/CHANGELOG.md
index 1c84fe95a9..4166201ca7 100644
--- a/packages/dev-utils/CHANGELOG.md
+++ b/packages/dev-utils/CHANGELOG.md
@@ -1,5 +1,27 @@
# @backstage/dev-utils
+## 1.1.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/plugin-catalog-react@1.15.1-next.1
+ - @backstage/app-defaults@1.5.16-next.0
+ - @backstage/core-app-api@1.15.4-next.0
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/integration-react@1.2.3-next.0
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/theme@0.6.3
+
+## 1.1.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-catalog-react@1.15.1-next.0
+ - @backstage/integration-react@1.2.2
+
## 1.1.5
### Patch Changes
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index c5fc82eea4..9af46d1f91 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/dev-utils",
- "version": "1.1.5",
+ "version": "1.1.6-next.1",
"description": "Utilities for developing Backstage plugins.",
"backstage": {
"role": "web-library"
diff --git a/packages/e2e-test/CHANGELOG.md b/packages/e2e-test/CHANGELOG.md
index da466666cc..87fe1442c0 100644
--- a/packages/e2e-test/CHANGELOG.md
+++ b/packages/e2e-test/CHANGELOG.md
@@ -1,5 +1,30 @@
# e2e-test
+## 0.2.24-next.2
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/create-app@0.5.24-next.2
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/cli-common@0.1.15
+
+## 0.2.24-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/create-app@0.5.24-next.1
+
+## 0.2.24-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/create-app@0.5.24-next.0
+ - @backstage/cli-common@0.1.15
+ - @backstage/errors@1.2.6
+
## 0.2.23
### Patch Changes
diff --git a/packages/e2e-test/package.json b/packages/e2e-test/package.json
index b45c9dbafd..548aedb4f5 100644
--- a/packages/e2e-test/package.json
+++ b/packages/e2e-test/package.json
@@ -1,6 +1,6 @@
{
"name": "e2e-test",
- "version": "0.2.23",
+ "version": "0.2.24-next.2",
"description": "E2E test for verifying Backstage packages",
"backstage": {
"role": "cli"
diff --git a/packages/errors/CHANGELOG.md b/packages/errors/CHANGELOG.md
index db1b40c1d4..3f78104038 100644
--- a/packages/errors/CHANGELOG.md
+++ b/packages/errors/CHANGELOG.md
@@ -1,5 +1,12 @@
# @backstage/errors
+## 1.2.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+
## 1.2.6
### Patch Changes
diff --git a/packages/errors/package.json b/packages/errors/package.json
index d3d830fd06..021067f1cd 100644
--- a/packages/errors/package.json
+++ b/packages/errors/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/errors",
- "version": "1.2.6",
+ "version": "1.2.7-next.0",
"description": "Common utilities for error handling within Backstage",
"backstage": {
"role": "common-library"
diff --git a/packages/frontend-app-api/CHANGELOG.md b/packages/frontend-app-api/CHANGELOG.md
index 2c1a2d11ba..5e97506f00 100644
--- a/packages/frontend-app-api/CHANGELOG.md
+++ b/packages/frontend-app-api/CHANGELOG.md
@@ -1,5 +1,19 @@
# @backstage/frontend-app-api
+## 0.10.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.9.4-next.0
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/types@1.2.1-next.0
+ - @backstage/frontend-defaults@0.1.5-next.0
+ - @backstage/core-app-api@1.15.4-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/version-bridge@1.0.10
+
## 0.10.3
### Patch Changes
diff --git a/packages/frontend-app-api/package.json b/packages/frontend-app-api/package.json
index a15d967ca0..44f4248f8b 100644
--- a/packages/frontend-app-api/package.json
+++ b/packages/frontend-app-api/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/frontend-app-api",
- "version": "0.10.3",
+ "version": "0.10.4-next.0",
"backstage": {
"role": "web-library"
},
diff --git a/packages/frontend-defaults/CHANGELOG.md b/packages/frontend-defaults/CHANGELOG.md
index 54e597d4af..91b44e3747 100644
--- a/packages/frontend-defaults/CHANGELOG.md
+++ b/packages/frontend-defaults/CHANGELOG.md
@@ -1,5 +1,16 @@
# @backstage/frontend-defaults
+## 0.1.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.9.4-next.0
+ - @backstage/frontend-app-api@0.10.4-next.0
+ - @backstage/plugin-app@0.1.5-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+
## 0.1.4
### Patch Changes
diff --git a/packages/frontend-defaults/package.json b/packages/frontend-defaults/package.json
index 4ec1fd4385..2db3d377ea 100644
--- a/packages/frontend-defaults/package.json
+++ b/packages/frontend-defaults/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/frontend-defaults",
- "version": "0.1.4",
+ "version": "0.1.5-next.0",
"backstage": {
"role": "web-library"
},
diff --git a/packages/frontend-internal/CHANGELOG.md b/packages/frontend-internal/CHANGELOG.md
index 126d8316d6..8c9a4e222a 100644
--- a/packages/frontend-internal/CHANGELOG.md
+++ b/packages/frontend-internal/CHANGELOG.md
@@ -1,5 +1,14 @@
# @internal/frontend
+## 0.0.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.9.4-next.0
+ - @backstage/types@1.2.1-next.0
+ - @backstage/version-bridge@1.0.10
+
## 0.0.4
### Patch Changes
diff --git a/packages/frontend-internal/package.json b/packages/frontend-internal/package.json
index e998435a02..7e5cb9ed74 100644
--- a/packages/frontend-internal/package.json
+++ b/packages/frontend-internal/package.json
@@ -1,6 +1,6 @@
{
"name": "@internal/frontend",
- "version": "0.0.4",
+ "version": "0.0.5-next.0",
"backstage": {
"role": "web-library",
"inline": true
diff --git a/packages/frontend-plugin-api/CHANGELOG.md b/packages/frontend-plugin-api/CHANGELOG.md
index db0c8e30d4..9a0edc47d8 100644
--- a/packages/frontend-plugin-api/CHANGELOG.md
+++ b/packages/frontend-plugin-api/CHANGELOG.md
@@ -1,5 +1,16 @@
# @backstage/frontend-plugin-api
+## 0.9.4-next.0
+
+### Patch Changes
+
+- b40eb41: Move `Expand` and `ExpandRecursive` to `@backstage/types`
+- Updated dependencies
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/types@1.2.1-next.0
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/version-bridge@1.0.10
+
## 0.9.3
### Patch Changes
diff --git a/packages/frontend-plugin-api/package.json b/packages/frontend-plugin-api/package.json
index 932afb0f24..0c45b10693 100644
--- a/packages/frontend-plugin-api/package.json
+++ b/packages/frontend-plugin-api/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/frontend-plugin-api",
- "version": "0.9.3",
+ "version": "0.9.4-next.0",
"backstage": {
"role": "web-library"
},
diff --git a/packages/frontend-plugin-api/report.api.md b/packages/frontend-plugin-api/report.api.md
index acc9efed61..24c2ff6d3b 100644
--- a/packages/frontend-plugin-api/report.api.md
+++ b/packages/frontend-plugin-api/report.api.md
@@ -39,6 +39,7 @@ import { ErrorApi } from '@backstage/core-plugin-api';
import { ErrorApiError } from '@backstage/core-plugin-api';
import { ErrorApiErrorContext } from '@backstage/core-plugin-api';
import { errorApiRef } from '@backstage/core-plugin-api';
+import { Expand } from '@backstage/types';
import { FeatureFlag } from '@backstage/core-plugin-api';
import { FeatureFlagsApi } from '@backstage/core-plugin-api';
import { featureFlagsApiRef } from '@backstage/core-plugin-api';
diff --git a/packages/frontend-plugin-api/src/types.ts b/packages/frontend-plugin-api/src/types.ts
index a658760758..9088a9d772 100644
--- a/packages/frontend-plugin-api/src/types.ts
+++ b/packages/frontend-plugin-api/src/types.ts
@@ -17,13 +17,6 @@
import { ReactNode } from 'react';
import { FrontendPlugin } from './wiring';
-// TODO(Rugvip): This might be a quite useful utility type, maybe add to @backstage/types?
-/**
- * Utility type to expand type aliases into their equivalent type.
- * @ignore
- */
-export type Expand = T extends infer O ? { [K in keyof O]: O[K] } : never;
-
/** @public */
export type CoreProgressProps = {};
diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.ts b/packages/frontend-plugin-api/src/wiring/createExtension.ts
index 16f9f341a7..baf0b31215 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.ts
@@ -15,7 +15,7 @@
*/
import { ApiHolder, AppNode } from '../apis';
-import { Expand } from '../types';
+import { Expand } from '@backstage/types';
import {
ResolveInputValueOverrides,
resolveInputOverrides,
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
index e22179127a..3d55b0bbe0 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
@@ -15,7 +15,7 @@
*/
import { ApiHolder, AppNode } from '../apis';
-import { Expand } from '../types';
+import { Expand } from '@backstage/types';
import {
ExtensionDefinition,
ResolvedExtensionInputs,
diff --git a/packages/frontend-plugin-api/src/wiring/resolveInputOverrides.ts b/packages/frontend-plugin-api/src/wiring/resolveInputOverrides.ts
index cf201779e0..0541ca3620 100644
--- a/packages/frontend-plugin-api/src/wiring/resolveInputOverrides.ts
+++ b/packages/frontend-plugin-api/src/wiring/resolveInputOverrides.ts
@@ -15,7 +15,7 @@
*/
import { AppNode } from '../apis';
-import { Expand } from '../types';
+import { Expand } from '@backstage/types';
import { ResolvedExtensionInput } from './createExtension';
import {
ExtensionDataContainer,
diff --git a/packages/frontend-test-utils/CHANGELOG.md b/packages/frontend-test-utils/CHANGELOG.md
index cad80f92b7..bb9408eed9 100644
--- a/packages/frontend-test-utils/CHANGELOG.md
+++ b/packages/frontend-test-utils/CHANGELOG.md
@@ -1,5 +1,18 @@
# @backstage/frontend-test-utils
+## 0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.9.4-next.0
+ - @backstage/types@1.2.1-next.0
+ - @backstage/frontend-app-api@0.10.4-next.0
+ - @backstage/plugin-app@0.1.5-next.0
+ - @backstage/test-utils@1.7.4-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/version-bridge@1.0.10
+
## 0.2.4
### Patch Changes
diff --git a/packages/frontend-test-utils/package.json b/packages/frontend-test-utils/package.json
index b77e13ec9c..87dd5937e9 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.2.4",
+ "version": "0.2.5-next.0",
"backstage": {
"role": "web-library"
},
diff --git a/packages/integration-aws-node/CHANGELOG.md b/packages/integration-aws-node/CHANGELOG.md
index f865939c58..93241411fb 100644
--- a/packages/integration-aws-node/CHANGELOG.md
+++ b/packages/integration-aws-node/CHANGELOG.md
@@ -1,5 +1,13 @@
# @backstage/integration-aws-node
+## 0.1.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+
## 0.1.14
### Patch Changes
diff --git a/packages/integration-aws-node/package.json b/packages/integration-aws-node/package.json
index 844d737fd3..e6054cf1cf 100644
--- a/packages/integration-aws-node/package.json
+++ b/packages/integration-aws-node/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/integration-aws-node",
- "version": "0.1.14",
+ "version": "0.1.15-next.0",
"description": "Helpers for fetching AWS account credentials",
"backstage": {
"role": "node-library"
diff --git a/packages/integration-react/CHANGELOG.md b/packages/integration-react/CHANGELOG.md
index cb62de0848..3e285a1498 100644
--- a/packages/integration-react/CHANGELOG.md
+++ b/packages/integration-react/CHANGELOG.md
@@ -1,5 +1,14 @@
# @backstage/integration-react
+## 1.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/integration@1.16.1-next.0
+
## 1.2.2
### Patch Changes
diff --git a/packages/integration-react/package.json b/packages/integration-react/package.json
index 728bf15426..53ad6f1bf7 100644
--- a/packages/integration-react/package.json
+++ b/packages/integration-react/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/integration-react",
- "version": "1.2.2",
+ "version": "1.2.3-next.0",
"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 4ba86a8c48..cf58088ec2 100644
--- a/packages/integration/CHANGELOG.md
+++ b/packages/integration/CHANGELOG.md
@@ -1,5 +1,13 @@
# @backstage/integration
+## 1.16.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+
## 1.16.0
### Minor Changes
diff --git a/packages/integration/package.json b/packages/integration/package.json
index e6057e628f..23b5924a43 100644
--- a/packages/integration/package.json
+++ b/packages/integration/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/integration",
- "version": "1.16.0",
+ "version": "1.16.1-next.0",
"description": "Helpers for managing integrations towards external systems",
"backstage": {
"role": "common-library"
diff --git a/packages/repo-tools/CHANGELOG.md b/packages/repo-tools/CHANGELOG.md
index d0dcba5094..66425b0ebf 100644
--- a/packages/repo-tools/CHANGELOG.md
+++ b/packages/repo-tools/CHANGELOG.md
@@ -1,5 +1,29 @@
# @backstage/repo-tools
+## 0.12.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/cli-node@0.2.12-next.0
+ - @backstage/config-loader@1.9.5-next.1
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/cli-common@0.1.15
+
+## 0.12.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/config-loader@1.9.5-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/cli-common@0.1.15
+ - @backstage/cli-node@0.2.11
+ - @backstage/errors@1.2.6
+
## 0.12.0
### Minor Changes
diff --git a/packages/repo-tools/package.json b/packages/repo-tools/package.json
index 26da54fd5a..8b5ba736c8 100644
--- a/packages/repo-tools/package.json
+++ b/packages/repo-tools/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/repo-tools",
- "version": "0.12.0",
+ "version": "0.12.1-next.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 2a14cf3411..585c0edb51 100644
--- a/packages/scaffolder-internal/CHANGELOG.md
+++ b/packages/scaffolder-internal/CHANGELOG.md
@@ -1,5 +1,28 @@
# @internal/scaffolder
+## 0.0.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-scaffolder-react@1.14.3-next.2
+ - @backstage/frontend-plugin-api@0.9.4-next.0
+
+## 0.0.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-scaffolder-react@1.14.3-next.1
+
+## 0.0.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-scaffolder-react@1.14.3-next.0
+ - @backstage/frontend-plugin-api@0.9.3
+
## 0.0.4
### Patch Changes
diff --git a/packages/scaffolder-internal/package.json b/packages/scaffolder-internal/package.json
index 906d2526b7..4f4479919d 100644
--- a/packages/scaffolder-internal/package.json
+++ b/packages/scaffolder-internal/package.json
@@ -1,6 +1,6 @@
{
"name": "@internal/scaffolder",
- "version": "0.0.4",
+ "version": "0.0.5-next.2",
"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 8ba656aca5..c39a760304 100644
--- a/packages/techdocs-cli-embedded-app/CHANGELOG.md
+++ b/packages/techdocs-cli-embedded-app/CHANGELOG.md
@@ -1,5 +1,53 @@
# techdocs-cli-embedded-app
+## 0.2.104-next.2
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-techdocs@1.12.1-next.1
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/plugin-catalog@1.26.1-next.1
+ - @backstage/app-defaults@1.5.16-next.0
+ - @backstage/cli@0.29.5-next.1
+ - @backstage/core-app-api@1.15.4-next.0
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/integration-react@1.2.3-next.0
+ - @backstage/test-utils@1.7.4-next.0
+ - @backstage/plugin-techdocs-react@1.2.13-next.0
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/theme@0.6.3
+
+## 0.2.104-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-catalog@1.26.1-next.0
+ - @backstage/plugin-techdocs@1.12.1-next.0
+ - @backstage/cli@0.29.5-next.0
+ - @backstage/integration-react@1.2.2
+
+## 0.2.104-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/cli@0.29.5-next.0
+ - @backstage/app-defaults@1.5.15
+ - @backstage/catalog-model@1.7.2
+ - @backstage/config@1.3.1
+ - @backstage/core-app-api@1.15.3
+ - @backstage/core-components@0.16.2
+ - @backstage/core-plugin-api@1.10.2
+ - @backstage/integration-react@1.2.2
+ - @backstage/test-utils@1.7.3
+ - @backstage/theme@0.6.3
+ - @backstage/plugin-catalog@1.26.0
+ - @backstage/plugin-techdocs@1.12.0
+ - @backstage/plugin-techdocs-react@1.2.12
+
## 0.2.103
### Patch Changes
diff --git a/packages/techdocs-cli-embedded-app/package.json b/packages/techdocs-cli-embedded-app/package.json
index cb8e9d828a..c7685aab83 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.103",
+ "version": "0.2.104-next.2",
"backstage": {
"role": "frontend"
},
diff --git a/packages/techdocs-cli/CHANGELOG.md b/packages/techdocs-cli/CHANGELOG.md
index f047a778e4..ea73d21769 100644
--- a/packages/techdocs-cli/CHANGELOG.md
+++ b/packages/techdocs-cli/CHANGELOG.md
@@ -1,5 +1,27 @@
# @techdocs/cli
+## 1.8.25-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-defaults@0.7.0-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/plugin-techdocs-node@1.12.16-next.1
+ - @backstage/cli-common@0.1.15
+
+## 1.8.25-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-defaults@0.7.0-next.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/cli-common@0.1.15
+ - @backstage/config@1.3.1
+ - @backstage/plugin-techdocs-node@1.12.16-next.0
+
## 1.8.24
### Patch Changes
diff --git a/packages/techdocs-cli/package.json b/packages/techdocs-cli/package.json
index 685f4ddb0c..77e0f56974 100644
--- a/packages/techdocs-cli/package.json
+++ b/packages/techdocs-cli/package.json
@@ -1,6 +1,6 @@
{
"name": "@techdocs/cli",
- "version": "1.8.24",
+ "version": "1.8.25-next.1",
"description": "Utility CLI for managing TechDocs sites in Backstage.",
"backstage": {
"role": "cli"
diff --git a/packages/test-utils/CHANGELOG.md b/packages/test-utils/CHANGELOG.md
index c175d1ea31..a36766d16c 100644
--- a/packages/test-utils/CHANGELOG.md
+++ b/packages/test-utils/CHANGELOG.md
@@ -1,5 +1,18 @@
# @backstage/test-utils
+## 1.7.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/types@1.2.1-next.0
+ - @backstage/core-app-api@1.15.4-next.0
+ - @backstage/plugin-permission-react@0.4.30-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/plugin-permission-common@0.8.4-next.0
+ - @backstage/theme@0.6.3
+
## 1.7.3
### Patch Changes
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
index 19381013cf..394769e375 100644
--- a/packages/test-utils/package.json
+++ b/packages/test-utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/test-utils",
- "version": "1.7.3",
+ "version": "1.7.4-next.0",
"description": "Utilities to test Backstage plugins and apps.",
"backstage": {
"role": "web-library"
diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md
index c7980abd94..261db3ef73 100644
--- a/packages/types/CHANGELOG.md
+++ b/packages/types/CHANGELOG.md
@@ -1,5 +1,11 @@
# @backstage/types
+## 1.2.1-next.0
+
+### Patch Changes
+
+- b40eb41: Move `Expand` and `ExpandRecursive` to `@backstage/types`
+
## 1.2.0
### Minor Changes
diff --git a/packages/types/package.json b/packages/types/package.json
index efbc62a9a2..ac5c7e121a 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/types",
- "version": "1.2.0",
+ "version": "1.2.1-next.0",
"description": "Common TypeScript types used within Backstage",
"backstage": {
"role": "common-library"
diff --git a/packages/types/report.api.md b/packages/types/report.api.md
index 8169a506ef..b6bfae0862 100644
--- a/packages/types/report.api.md
+++ b/packages/types/report.api.md
@@ -21,6 +21,20 @@ export type DeferredPromise<
// @public
export function durationToMilliseconds(duration: HumanDuration): number;
+// @public
+export type Expand = T extends infer O
+ ? {
+ [K in keyof O]: O[K];
+ }
+ : never;
+
+// @public
+export type ExpandRecursive = T extends infer O
+ ? {
+ [K in keyof O]: ExpandRecursive;
+ }
+ : never;
+
// @public
export type HumanDuration = {
years?: number;
diff --git a/packages/types/src/expand.test.ts b/packages/types/src/expand.test.ts
new file mode 100644
index 0000000000..007cef27ef
--- /dev/null
+++ b/packages/types/src/expand.test.ts
@@ -0,0 +1,38 @@
+/*
+ * 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 { Expand, ExpandRecursive } from './expand';
+
+describe('expand', () => {
+ it('should expand type aliases into their equivalent type', () => {
+ type Test = { a: string } & { b: number };
+ // expanded type
+ type Result = Expand;
+
+ const result: Result = { a: 'string', b: 1 };
+ expect(result).toEqual({ a: 'string', b: 1 });
+ });
+
+ it('should expand types recursively', () => {
+ type Test = { a: string } & { b: { c: { e: string } } } & {
+ b: { c: { d: boolean } };
+ };
+ // expanded type
+ type Result = ExpandRecursive;
+
+ const result: Result = { a: 'string', b: { c: { e: 'string', d: true } } };
+ expect(result).toEqual({ a: 'string', b: { c: { e: 'string', d: true } } });
+ });
+});
diff --git a/packages/canon/src/components/Table/stories/TableCaption.stories.tsx b/packages/types/src/expand.ts
similarity index 59%
rename from packages/canon/src/components/Table/stories/TableCaption.stories.tsx
rename to packages/types/src/expand.ts
index 46ea5f0f4d..6c417642e4 100644
--- a/packages/canon/src/components/Table/stories/TableCaption.stories.tsx
+++ b/packages/types/src/expand.ts
@@ -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.
@@ -14,17 +14,18 @@
* limitations under the License.
*/
-import type { Meta, StoryObj } from '@storybook/react';
-import { TableCaption } from '../Table';
+/**
+ * Utility type to expand type aliases into their equivalent type.
+ * @public
+ */
-const meta = {
- title: 'Components/Table/Components/TableCaption',
- component: TableCaption,
-} satisfies Meta;
+export type Expand = T extends infer O ? { [K in keyof O]: O[K] } : never;
-export default meta;
-type Story = StoryObj;
-
-export const Default: Story = {
- args: {},
-};
+/**
+ * Helper type that expands type hints recursively
+ *
+ * @public
+ */
+export type ExpandRecursive = T extends infer O
+ ? { [K in keyof O]: ExpandRecursive }
+ : never;
diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index 480c85818a..707c158b03 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -24,3 +24,4 @@ export { createDeferred, type DeferredPromise } from './deferred';
export type { JsonArray, JsonObject, JsonPrimitive, JsonValue } from './json';
export type { Observable, Observer, Subscription } from './observable';
export { type HumanDuration, durationToMilliseconds } from './time';
+export { type Expand, type ExpandRecursive } from './expand';
diff --git a/packages/yarn-plugin/README.md b/packages/yarn-plugin/README.md
index 67ea19b1bd..c1d5647b8e 100644
--- a/packages/yarn-plugin/README.md
+++ b/packages/yarn-plugin/README.md
@@ -24,3 +24,17 @@ The resulting changes in the file system should be committed to your repo.
The yarn plugin recognizes the version string `"backstage:^"`, and replaces it
with the appropriate version based on the overall Backstage version in
backstage.json.
+
+## Local Development
+
+- Run unit tests: `yarn test`
+- Build the plugin locally: `yarn build`
+- Rebuild whenever plugin files change: `yarn start`
+- Install local build (in a package directory outside the Backstage monorepo):
+ `yarn plugin import
+/path/to/backstage-repo/packages/yarn-plugin/bundles/@yarnpkg/plugin-backstage.js`
+
+The plugin can be manually tested in any repository running at least yarn 4.1.1.
+Sadly it can't be manually tested directly in the Backstage monorepo - since
+packages in this repository use `workspace:^` dependencies, there's no use case
+for the yarn plugin.
diff --git a/packages/yarn-plugin/package.json b/packages/yarn-plugin/package.json
index f237fa45ad..742b9bbe93 100644
--- a/packages/yarn-plugin/package.json
+++ b/packages/yarn-plugin/package.json
@@ -42,6 +42,7 @@
"@backstage/cli": "workspace:^",
"@yarnpkg/builder": "^4.0.0",
"fs-extra": "^11.2.0",
- "nodemon": "^3.0.1"
+ "nodemon": "^3.0.1",
+ "yaml": "^2.0.0"
}
}
diff --git a/packages/yarn-plugin/src/index.test.ts b/packages/yarn-plugin/src/index.test.ts
new file mode 100644
index 0000000000..d58387bca9
--- /dev/null
+++ b/packages/yarn-plugin/src/index.test.ts
@@ -0,0 +1,306 @@
+/*
+ * Copyright 2024 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 { join as joinPath } from 'path';
+import { spawn, SpawnOptionsWithoutStdio } from 'child_process';
+import fs from 'fs-extra';
+import yaml from 'yaml';
+import { findPaths } from '@backstage/cli-common';
+import { createMockDirectory } from '@backstage/backend-test-utils';
+
+jest.setTimeout(30_000);
+
+const mockDir = createMockDirectory();
+
+const executeCommand = (
+ command: string,
+ args: string[],
+ options?: SpawnOptionsWithoutStdio,
+): Promise<{
+ exitCode: number;
+ stdout: string;
+ stderr: string;
+}> => {
+ return new Promise((resolve, reject) => {
+ const stdout: Buffer[] = [];
+ const stderr: Buffer[] = [];
+
+ const shell = process.platform === 'win32';
+ const proc = spawn(command, args, { ...options, shell });
+
+ proc.stdout?.on('data', data => {
+ stdout.push(Buffer.from(data));
+ });
+
+ proc.stderr?.on('data', data => {
+ stderr.push(Buffer.from(data));
+ });
+
+ proc.on('error', reject);
+ proc.on('exit', exitCode => {
+ resolve({
+ exitCode: exitCode ?? 0,
+ stdout: Buffer.concat(stdout).toString('utf8'),
+ stderr: Buffer.concat(stderr).toString('utf8'),
+ });
+ });
+ });
+};
+
+const runYarnInstall = () =>
+ executeCommand('yarn', ['--mode=update-lockfile'], { cwd: mockDir.path });
+
+const nonWorkspaceEntries = (lockFileString: string = '') => {
+ const lockFile = yaml.parse(lockFileString);
+
+ const result: Record = {};
+ for (const key of Object.keys(lockFile)) {
+ if (lockFile[key].version !== '0.0.0-use.local') {
+ result[key] = lockFile[key];
+ }
+ }
+
+ return result;
+};
+
+describe('Backstage yarn plugin', () => {
+ describe.each`
+ yarnVersion
+ ${'4.1.1'}
+ ${'stable'}
+ `('yarn $yarnVersion', ({ yarnVersion }) => {
+ let initialLockFileContent: string | undefined;
+
+ beforeAll(async () => {
+ const { targetRoot } = findPaths(process.cwd());
+ await executeCommand('yarn', ['build'], {
+ cwd: joinPath(targetRoot, 'packages/yarn-plugin'),
+ });
+
+ mockDir.setContent({
+ 'yarn.lock': '',
+ 'package.json': JSON.stringify({
+ workspaces: {
+ packages: ['packages/*'],
+ },
+ }),
+ 'backstage.json': JSON.stringify({ version: '0.9.0' }),
+ packages: {
+ a: {
+ 'package.json': JSON.stringify({
+ name: 'a',
+ dependencies: {
+ '@backstage/config': '^0.1.2',
+ },
+ }),
+ },
+ b: {
+ 'package.json': JSON.stringify({
+ name: 'b',
+ dependencies: {
+ '@backstage/cli-common': '^0.1.1',
+ '@backstage/config': '^0.1.2',
+ },
+ }),
+ },
+ },
+ });
+
+ await executeCommand('yarn', ['set', 'version', yarnVersion], {
+ cwd: mockDir.path,
+ });
+
+ await executeCommand(
+ 'yarn',
+ ['config', 'set', 'enableGlobalCache', 'true'],
+ { cwd: mockDir.path },
+ );
+
+ await runYarnInstall();
+
+ initialLockFileContent = await fs.readFile(
+ joinPath(mockDir.path, 'yarn.lock'),
+ 'utf-8',
+ );
+
+ await executeCommand(
+ 'yarn',
+ [
+ 'plugin',
+ 'import',
+ joinPath(
+ targetRoot,
+ 'packages/yarn-plugin/bundles/@yarnpkg/plugin-backstage.js',
+ ),
+ ],
+ {
+ cwd: mockDir.path,
+ },
+ );
+ });
+
+ beforeEach(() => {
+ mockDir.addContent({
+ 'backstage.json': JSON.stringify({ version: '0.9.0' }),
+ packages: {
+ a: {
+ 'package.json': JSON.stringify({
+ name: 'a',
+ dependencies: {
+ '@backstage/config': '^0.1.2',
+ },
+ }),
+ },
+ b: {
+ 'package.json': JSON.stringify({
+ name: 'b',
+ dependencies: {
+ '@backstage/cli-common': '^0.1.1',
+ '@backstage/config': '^0.1.2',
+ },
+ }),
+ },
+ },
+ });
+ });
+
+ it('does not change yarn.lock when no backstage:^ versions are present', async () => {
+ await runYarnInstall();
+
+ await expect(
+ fs.readFile(joinPath(mockDir.path, 'yarn.lock'), 'utf-8'),
+ ).resolves.toEqual(initialLockFileContent);
+ });
+
+ describe('with backstage:^ dependencies', () => {
+ beforeEach(async () => {
+ mockDir.addContent({
+ 'packages/a/package.json': JSON.stringify({
+ name: 'a',
+ dependencies: {
+ '@backstage/config': 'backstage:^',
+ },
+ }),
+ 'packages/b/package.json': JSON.stringify({
+ name: 'b',
+ dependencies: {
+ '@backstage/config': 'backstage:^',
+ '@backstage/cli-common': 'backstage:^',
+ },
+ }),
+ });
+
+ await runYarnInstall();
+ });
+
+ it('retains existing lockfile entries', async () => {
+ const lockFileContent = await fs.readFile(
+ joinPath(mockDir.path, 'yarn.lock'),
+ 'utf-8',
+ );
+
+ expect(nonWorkspaceEntries(lockFileContent)).toEqual(
+ nonWorkspaceEntries(initialLockFileContent),
+ );
+ });
+
+ it('bumps packages when backstage.json changes', async () => {
+ mockDir.addContent({
+ 'backstage.json': JSON.stringify({
+ version: '1.0.0',
+ }),
+ });
+
+ await runYarnInstall();
+
+ const lockFileContent = await fs.readFile(
+ joinPath(mockDir.path, 'yarn.lock'),
+ 'utf-8',
+ );
+
+ const lockFile = yaml.parse(lockFileContent);
+
+ // Versions from old manifest no longer appear in lockfile
+ expect(lockFile['@backstage/cli-common@npm:^0.1.1']).toBeUndefined();
+ expect(lockFile['@backstage/config@npm:^0.1.2']).toBeUndefined();
+
+ // Versions from new manifest have been added to lockfile
+ expect(lockFile['@backstage/cli-common@npm:^0.1.8']).toBeDefined();
+ expect(lockFile['@backstage/config@npm:^1.0.0']).toBeDefined();
+ });
+
+ describe('after removing backstage:^ dependencies', () => {
+ beforeEach(async () => {
+ mockDir.addContent({
+ 'packages/a/package.json': JSON.stringify({
+ name: 'a',
+ dependencies: {
+ '@backstage/config': '^0.1.2',
+ },
+ }),
+ 'packages/b/package.json': JSON.stringify({
+ name: 'b',
+ dependencies: {
+ '@backstage/config': '^0.1.2',
+ '@backstage/cli-common': '^0.1.1',
+ },
+ }),
+ });
+
+ await runYarnInstall();
+ });
+
+ it('restores the original yarn.lock content', async () => {
+ const lockFileContent = await fs.readFile(
+ joinPath(mockDir.path, 'yarn.lock'),
+ 'utf-8',
+ );
+
+ expect(lockFileContent).toEqual(initialLockFileContent);
+ });
+ });
+
+ describe.each`
+ packageName | description
+ ${'node-fetch'} | ${'non-Backstage package'}
+ ${'@backstage/foo'} | ${'invalid Backstage package'}
+ `(
+ 'when backstage:^ range is used with $description "$packageName"',
+ ({ packageName }) => {
+ beforeEach(async () => {
+ mockDir.addContent({
+ 'packages/c/package.json': JSON.stringify({
+ name: 'c',
+ dependencies: {
+ [packageName]: 'backstage:^',
+ },
+ }),
+ });
+ });
+
+ it('fails to install', async () => {
+ const { exitCode, stdout } = await runYarnInstall();
+
+ expect(exitCode).toEqual(1);
+ expect(stdout).toContain(
+ `Package ${packageName} not found in manifest for Backstage v0.9.0`,
+ );
+ });
+ },
+ );
+ });
+ });
+});
diff --git a/plugins/api-docs/CHANGELOG.md b/plugins/api-docs/CHANGELOG.md
index 4c00da4e1f..b82ed199c7 100644
--- a/plugins/api-docs/CHANGELOG.md
+++ b/plugins/api-docs/CHANGELOG.md
@@ -1,5 +1,30 @@
# @backstage/plugin-api-docs
+## 0.12.3-next.1
+
+### Patch Changes
+
+- dcf6e72: Fix typo in default path of api docs definition route
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.9.4-next.0
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/plugin-catalog@1.26.1-next.1
+ - @backstage/core-compat-api@0.3.5-next.0
+ - @backstage/plugin-catalog-react@1.15.1-next.1
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/plugin-permission-react@0.4.30-next.0
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/plugin-catalog-common@1.1.3-next.0
+
+## 0.12.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-catalog-react@1.15.1-next.0
+ - @backstage/plugin-catalog@1.26.1-next.0
+ - @backstage/core-compat-api@0.3.4
+
## 0.12.2
### Patch Changes
diff --git a/plugins/api-docs/README-alpha.md b/plugins/api-docs/README-alpha.md
index d92fdb53da..ddff429135 100644
--- a/plugins/api-docs/README-alpha.md
+++ b/plugins/api-docs/README-alpha.md
@@ -826,10 +826,10 @@ export default createFrontendModule({
createEntityContentExtension({
// Name is necessary so the system knows that this extension will override the default 'definition' entity content extension provided by the 'api-docs' plugin
name: 'definition',
- // Returing a custom content component
+ // Returning a custom content component
loader: () =>
import('./components').then(m => (
- | undefined;
- static create(database: PluginDatabaseManager): AuthDatabase {
+ static create(database: DatabaseService): AuthDatabase {
return new AuthDatabase(database);
}
@@ -60,7 +60,7 @@ export class AuthDatabase {
});
}
- private constructor(database: PluginDatabaseManager) {
+ private constructor(database: DatabaseService) {
this.#database = database;
}
diff --git a/plugins/auth-backend/src/identity/StaticKeyStore.ts b/plugins/auth-backend/src/identity/StaticKeyStore.ts
index 13b9faf771..f7274d4b83 100644
--- a/plugins/auth-backend/src/identity/StaticKeyStore.ts
+++ b/plugins/auth-backend/src/identity/StaticKeyStore.ts
@@ -15,7 +15,7 @@
*/
import { AnyJWK, KeyStore, StoredKey } from './types';
import { exportJWK, importPKCS8, importSPKI, JWK } from 'jose';
-import { KeyLike } from 'jose/dist/types/types';
+import { KeyLike } from 'jose';
import { promises as fs } from 'fs';
import { Config } from '@backstage/config';
diff --git a/plugins/auth-backend/src/providers/router.ts b/plugins/auth-backend/src/providers/router.ts
index e449372143..2867611075 100644
--- a/plugins/auth-backend/src/providers/router.ts
+++ b/plugins/auth-backend/src/providers/router.ts
@@ -14,12 +14,10 @@
* limitations under the License.
*/
-import {
- PluginEndpointDiscovery,
- TokenManager,
-} from '@backstage/backend-common';
+import { TokenManager } from '@backstage/backend-common';
import {
AuthService,
+ DiscoveryService,
HttpAuthService,
LoggerService,
} from '@backstage/backend-plugin-api';
@@ -47,7 +45,7 @@ export function bindProviderRouters(
baseUrl: string;
config: Config;
logger: LoggerService;
- discovery: PluginEndpointDiscovery;
+ discovery: DiscoveryService;
auth: AuthService;
httpAuth: HttpAuthService;
tokenManager?: TokenManager;
diff --git a/plugins/auth-node/CHANGELOG.md b/plugins/auth-node/CHANGELOG.md
index c53246c4ee..da724b8a2a 100644
--- a/plugins/auth-node/CHANGELOG.md
+++ b/plugins/auth-node/CHANGELOG.md
@@ -1,5 +1,31 @@
# @backstage/plugin-auth-node
+## 0.5.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/catalog-client@1.9.1-next.0
+
+## 0.5.6-next.0
+
+### Patch Changes
+
+- d9d62ef: Remove some internal usages of the backend-common package
+- 8379bf4: Remove usages of `PluginDatabaseManager` and `PluginEndpointDiscovery` and replace with their equivalent service types
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-client@1.9.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/types@1.2.0
+
## 0.5.5
### Patch Changes
diff --git a/plugins/auth-node/package.json b/plugins/auth-node/package.json
index dc62a76c82..f44607e10e 100644
--- a/plugins/auth-node/package.json
+++ b/plugins/auth-node/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-auth-node",
- "version": "0.5.5",
+ "version": "0.5.6-next.1",
"backstage": {
"role": "node-library",
"pluginId": "auth",
@@ -56,6 +56,7 @@
"zod-validation-error": "^3.4.0"
},
"devDependencies": {
+ "@backstage/backend-defaults": "workspace:^",
"@backstage/backend-test-utils": "workspace:^",
"@backstage/cli": "workspace:^",
"cookie-parser": "^1.4.6",
diff --git a/plugins/auth-node/report.api.md b/plugins/auth-node/report.api.md
index db61257f7a..e5f33b4e7e 100644
--- a/plugins/auth-node/report.api.md
+++ b/plugins/auth-node/report.api.md
@@ -6,6 +6,7 @@
import { BackstageIdentityResponse as BackstageIdentityResponse_2 } from '@backstage/plugin-auth-node';
import { BackstageSignInResult as BackstageSignInResult_2 } from '@backstage/plugin-auth-node';
import { Config } from '@backstage/config';
+import { DiscoveryService } from '@backstage/backend-plugin-api';
import { Entity } from '@backstage/catalog-model';
import { EntityFilterQuery } from '@backstage/catalog-client';
import express from 'express';
@@ -13,7 +14,6 @@ import { ExtensionPoint } from '@backstage/backend-plugin-api';
import { JsonObject } from '@backstage/types';
import { JsonValue } from '@backstage/types';
import { LoggerService } from '@backstage/backend-plugin-api';
-import { PluginEndpointDiscovery } from '@backstage/backend-common';
import { Profile } from 'passport';
import { Request as Request_2 } from 'express';
import { Response as Response_2 } from 'express';
@@ -265,7 +265,7 @@ export class IdentityClient {
// @public
export type IdentityClientOptions = {
- discovery: PluginEndpointDiscovery;
+ discovery: DiscoveryService;
issuer?: string;
algorithms?: string[];
};
diff --git a/plugins/auth-node/src/identity/DefaultIdentityClient.test.ts b/plugins/auth-node/src/identity/DefaultIdentityClient.test.ts
index b9bf3cabd2..68765c6bef 100644
--- a/plugins/auth-node/src/identity/DefaultIdentityClient.test.ts
+++ b/plugins/auth-node/src/identity/DefaultIdentityClient.test.ts
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import { PluginEndpointDiscovery } from '@backstage/backend-common';
+
import {
decodeProtectedHeader,
exportJWK,
@@ -27,6 +27,7 @@ import { v4 as uuid } from 'uuid';
import { DefaultIdentityClient } from './DefaultIdentityClient';
import { IdentityApiGetIdentityRequest } from './IdentityApi';
+import { DiscoveryService } from '@backstage/backend-plugin-api';
interface AnyJWK extends Record {
use: 'sig';
@@ -87,7 +88,7 @@ function jwtKid(jwt: string): string {
const server = setupServer();
const mockBaseUrl = 'http://backstage:9191/i-am-a-mock-base';
-const discovery: PluginEndpointDiscovery = {
+const discovery: DiscoveryService = {
async getBaseUrl() {
return mockBaseUrl;
},
diff --git a/plugins/auth-node/src/identity/DefaultIdentityClient.ts b/plugins/auth-node/src/identity/DefaultIdentityClient.ts
index 1095609dec..aa6f4c95c4 100644
--- a/plugins/auth-node/src/identity/DefaultIdentityClient.ts
+++ b/plugins/auth-node/src/identity/DefaultIdentityClient.ts
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-import { PluginEndpointDiscovery } from '@backstage/backend-common';
import { AuthenticationError } from '@backstage/errors';
import {
createRemoteJWKSet,
@@ -24,10 +23,11 @@ import {
JWSHeaderParameters,
jwtVerify,
} from 'jose';
-import { GetKeyFunction } from 'jose/dist/types/types';
+import { GetKeyFunction } from 'jose';
import { getBearerTokenFromAuthorizationHeader } from './getBearerTokenFromAuthorizationHeader';
import { IdentityApi, IdentityApiGetIdentityRequest } from './IdentityApi';
import { BackstageIdentityResponse } from '../types';
+import { DiscoveryService } from '@backstage/backend-plugin-api';
const CLOCK_MARGIN_S = 10;
@@ -38,7 +38,7 @@ const CLOCK_MARGIN_S = 10;
* @public
*/
export type IdentityClientOptions = {
- discovery: PluginEndpointDiscovery;
+ discovery: DiscoveryService;
issuer?: string;
/** JWS "alg" (Algorithm) Header Parameter values. Defaults to an array containing just ES256.
@@ -54,7 +54,7 @@ export type IdentityClientOptions = {
* @public
*/
export class DefaultIdentityClient implements IdentityApi {
- private readonly discovery: PluginEndpointDiscovery;
+ private readonly discovery: DiscoveryService;
private readonly issuer?: string;
private readonly algorithms?: string[];
private keyStore?: GetKeyFunction;
diff --git a/plugins/auth-node/src/identity/IdentityClient.test.ts b/plugins/auth-node/src/identity/IdentityClient.test.ts
index 418eb544ad..91cd1759aa 100644
--- a/plugins/auth-node/src/identity/IdentityClient.test.ts
+++ b/plugins/auth-node/src/identity/IdentityClient.test.ts
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-import { PluginEndpointDiscovery } from '@backstage/backend-common';
import { registerMswTestHooks } from '@backstage/backend-test-utils';
import {
decodeProtectedHeader,
@@ -28,6 +27,7 @@ import { setupServer } from 'msw/node';
import { v4 as uuid } from 'uuid';
import { IdentityClient } from './IdentityClient';
+import { DiscoveryService } from '@backstage/backend-plugin-api';
interface AnyJWK extends Record {
use: 'sig';
@@ -88,7 +88,7 @@ function jwtKid(jwt: string): string {
const server = setupServer();
const mockBaseUrl = 'http://backstage:9191/i-am-a-mock-base';
-const discovery: PluginEndpointDiscovery = {
+const discovery: DiscoveryService = {
async getBaseUrl() {
return mockBaseUrl;
},
diff --git a/plugins/auth-node/src/oauth/createOAuthRouteHandlers.test.ts b/plugins/auth-node/src/oauth/createOAuthRouteHandlers.test.ts
index 4ea8dc17cc..46fa058b47 100644
--- a/plugins/auth-node/src/oauth/createOAuthRouteHandlers.test.ts
+++ b/plugins/auth-node/src/oauth/createOAuthRouteHandlers.test.ts
@@ -22,10 +22,11 @@ import PromiseRouter from 'express-promise-router';
import { AuthProviderRouteHandlers, AuthResolverContext } from '../types';
import { createOAuthRouteHandlers } from './createOAuthRouteHandlers';
import { OAuthAuthenticator } from './types';
-import { errorHandler } from '@backstage/backend-common';
import { encodeOAuthState, OAuthState } from './state';
import { PassportProfile } from '../passport';
import { parseWebMessageResponse } from '../flow/__testUtils__/parseWebMessageResponse';
+import { MiddlewareFactory } from '@backstage/backend-defaults/rootHttpRouter';
+import { mockServices } from '@backstage/backend-test-utils';
const mockAuthenticator: jest.Mocked> = {
initialize: jest.fn(_r => ({ ctx: 'authenticator' })),
@@ -63,13 +64,17 @@ const baseConfig = {
};
function wrapInApp(handlers: AuthProviderRouteHandlers) {
+ const middleware = MiddlewareFactory.create({
+ logger: mockServices.logger.mock(),
+ config: mockServices.rootConfig(),
+ });
const app = express();
const router = PromiseRouter();
router.use(cookieParser());
app.use('/my-provider', router);
- app.use(errorHandler());
+ app.use(middleware.error());
router.get('/start', handlers.start.bind(handlers));
router.get('/handler/frame', handlers.frameHandler.bind(handlers));
diff --git a/plugins/auth-react/CHANGELOG.md b/plugins/auth-react/CHANGELOG.md
index 54562d78ce..3368816247 100644
--- a/plugins/auth-react/CHANGELOG.md
+++ b/plugins/auth-react/CHANGELOG.md
@@ -1,5 +1,14 @@
# @backstage/plugin-auth-react
+## 0.1.11-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/errors@1.2.7-next.0
+
## 0.1.10
### Patch Changes
diff --git a/plugins/auth-react/package.json b/plugins/auth-react/package.json
index 27b79569f8..24f880b0fc 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.10",
+ "version": "0.1.11-next.0",
"description": "Web library for the auth plugin",
"backstage": {
"role": "web-library",
diff --git a/plugins/bitbucket-cloud-common/CHANGELOG.md b/plugins/bitbucket-cloud-common/CHANGELOG.md
index c95b53a947..39d5306a9d 100644
--- a/plugins/bitbucket-cloud-common/CHANGELOG.md
+++ b/plugins/bitbucket-cloud-common/CHANGELOG.md
@@ -1,5 +1,12 @@
# @backstage/plugin-bitbucket-cloud-common
+## 0.2.27-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/integration@1.16.1-next.0
+
## 0.2.26
### Patch Changes
diff --git a/plugins/bitbucket-cloud-common/package.json b/plugins/bitbucket-cloud-common/package.json
index f63f4c3b19..60ffec37a2 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.2.26",
+ "version": "0.2.27-next.0",
"description": "Common functionalities for bitbucket-cloud plugins",
"backstage": {
"role": "common-library",
diff --git a/plugins/catalog-backend-module-aws/CHANGELOG.md b/plugins/catalog-backend-module-aws/CHANGELOG.md
index 6b08b086af..c83e9b4713 100644
--- a/plugins/catalog-backend-module-aws/CHANGELOG.md
+++ b/plugins/catalog-backend-module-aws/CHANGELOG.md
@@ -1,5 +1,37 @@
# @backstage/plugin-catalog-backend-module-aws
+## 0.4.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-defaults@0.7.0-next.1
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-catalog-node@1.15.1-next.1
+ - @backstage/plugin-kubernetes-common@0.9.2-next.0
+ - @backstage/integration-aws-node@0.1.15-next.0
+ - @backstage/plugin-catalog-common@1.1.3-next.0
+ - @backstage/integration@1.16.1-next.0
+
+## 0.4.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-defaults@0.7.0-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/integration@1.16.0
+ - @backstage/integration-aws-node@0.1.14
+ - @backstage/plugin-catalog-common@1.1.2
+ - @backstage/plugin-catalog-node@1.15.1-next.0
+ - @backstage/plugin-kubernetes-common@0.9.1
+
## 0.4.6
### Patch Changes
diff --git a/plugins/catalog-backend-module-aws/package.json b/plugins/catalog-backend-module-aws/package.json
index e9b4abdf9c..a6ec06543d 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.6",
+ "version": "0.4.7-next.1",
"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 8c0a36bac7..1347a527da 100644
--- a/plugins/catalog-backend-module-azure/CHANGELOG.md
+++ b/plugins/catalog-backend-module-azure/CHANGELOG.md
@@ -1,5 +1,27 @@
# @backstage/plugin-catalog-backend-module-azure
+## 0.3.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/plugin-catalog-node@1.15.1-next.1
+ - @backstage/plugin-catalog-common@1.1.3-next.0
+ - @backstage/integration@1.16.1-next.0
+
+## 0.3.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/integration@1.16.0
+ - @backstage/plugin-catalog-common@1.1.2
+ - @backstage/plugin-catalog-node@1.15.1-next.0
+
## 0.3.0
### Minor Changes
diff --git a/plugins/catalog-backend-module-azure/package.json b/plugins/catalog-backend-module-azure/package.json
index b28189998f..211b036fd9 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.0",
+ "version": "0.3.1-next.1",
"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 a641dabe2d..d3104764f4 100644
--- a/plugins/catalog-backend-module-backstage-openapi/CHANGELOG.md
+++ b/plugins/catalog-backend-module-backstage-openapi/CHANGELOG.md
@@ -1,5 +1,29 @@
# @backstage/plugin-catalog-backend-module-backstage-openapi
+## 0.4.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-openapi-utils@0.4.1-next.1
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-catalog-node@1.15.1-next.1
+
+## 0.4.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-openapi-utils@0.4.1-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/plugin-catalog-node@1.15.1-next.0
+
## 0.4.3
### Patch Changes
diff --git a/plugins/catalog-backend-module-backstage-openapi/package.json b/plugins/catalog-backend-module-backstage-openapi/package.json
index 091c3f95d9..015ecbf1a8 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.4.3",
+ "version": "0.4.4-next.1",
"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 924ec6b587..638036c004 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md
+++ b/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md
@@ -1,5 +1,35 @@
# @backstage/plugin-catalog-backend-module-bitbucket-cloud
+## 0.4.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/plugin-catalog-node@1.15.1-next.1
+ - @backstage/plugin-events-node@0.4.7-next.1
+ - @backstage/catalog-client@1.9.1-next.0
+ - @backstage/plugin-catalog-common@1.1.3-next.0
+ - @backstage/integration@1.16.1-next.0
+ - @backstage/plugin-bitbucket-cloud-common@0.2.27-next.0
+
+## 0.4.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-client@1.9.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/config@1.3.1
+ - @backstage/integration@1.16.0
+ - @backstage/plugin-bitbucket-cloud-common@0.2.26
+ - @backstage/plugin-catalog-common@1.1.2
+ - @backstage/plugin-catalog-node@1.15.1-next.0
+ - @backstage/plugin-events-node@0.4.7-next.0
+
## 0.4.3
### Patch Changes
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/package.json b/plugins/catalog-backend-module-bitbucket-cloud/package.json
index 34e265fba9..e038cf234d 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.4.3",
+ "version": "0.4.4-next.1",
"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 188bfe6366..30cdf81f8b 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.3.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-catalog-node@1.15.1-next.1
+ - @backstage/integration@1.16.1-next.0
+
+## 0.3.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/integration@1.16.0
+ - @backstage/plugin-catalog-node@1.15.1-next.0
+
## 0.3.0
### Minor Changes
diff --git a/plugins/catalog-backend-module-bitbucket-server/package.json b/plugins/catalog-backend-module-bitbucket-server/package.json
index ca74c8d65e..7edb2b22a6 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.3.0",
+ "version": "0.3.1-next.1",
"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 0b1b529b1b..69e69f0ce4 100644
--- a/plugins/catalog-backend-module-gcp/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gcp/CHANGELOG.md
@@ -1,5 +1,27 @@
# @backstage/plugin-catalog-backend-module-gcp
+## 0.3.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/plugin-catalog-node@1.15.1-next.1
+ - @backstage/plugin-kubernetes-common@0.9.2-next.0
+
+## 0.3.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/config@1.3.1
+ - @backstage/plugin-catalog-node@1.15.1-next.0
+ - @backstage/plugin-kubernetes-common@0.9.1
+
## 0.3.3
### Patch Changes
diff --git a/plugins/catalog-backend-module-gcp/package.json b/plugins/catalog-backend-module-gcp/package.json
index 8e8c35222a..83d12b210a 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.3",
+ "version": "0.3.4-next.1",
"description": "A Backstage catalog backend module that helps integrate towards GCP",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-gerrit/CHANGELOG.md b/plugins/catalog-backend-module-gerrit/CHANGELOG.md
index 88edcc3e51..dc9bf0b019 100644
--- a/plugins/catalog-backend-module-gerrit/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gerrit/CHANGELOG.md
@@ -1,5 +1,27 @@
# @backstage/plugin-catalog-backend-module-gerrit
+## 0.2.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-catalog-node@1.15.1-next.1
+ - @backstage/integration@1.16.1-next.0
+
+## 0.2.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/integration@1.16.0
+ - @backstage/plugin-catalog-node@1.15.1-next.0
+
## 0.2.5
### Patch Changes
diff --git a/plugins/catalog-backend-module-gerrit/package.json b/plugins/catalog-backend-module-gerrit/package.json
index f69c9a1ffc..45d5dc4e21 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.2.5",
+ "version": "0.2.6-next.1",
"backstage": {
"role": "backend-plugin-module",
"pluginId": "catalog",
diff --git a/plugins/catalog-backend-module-github-org/CHANGELOG.md b/plugins/catalog-backend-module-github-org/CHANGELOG.md
index 86cdf4904e..a77a6541ad 100644
--- a/plugins/catalog-backend-module-github-org/CHANGELOG.md
+++ b/plugins/catalog-backend-module-github-org/CHANGELOG.md
@@ -1,5 +1,27 @@
# @backstage/plugin-catalog-backend-module-github-org
+## 0.3.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-catalog-backend-module-github@0.7.9-next.1
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/plugin-catalog-node@1.15.1-next.1
+ - @backstage/plugin-events-node@0.4.7-next.1
+
+## 0.3.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-catalog-backend-module-github@0.7.9-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/plugin-catalog-node@1.15.1-next.0
+ - @backstage/plugin-events-node@0.4.7-next.0
+
## 0.3.5
### Patch Changes
diff --git a/plugins/catalog-backend-module-github-org/package.json b/plugins/catalog-backend-module-github-org/package.json
index 47dd09f53f..eb68e47e06 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.5",
+ "version": "0.3.6-next.1",
"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 e2680d5663..6164209635 100644
--- a/plugins/catalog-backend-module-github/CHANGELOG.md
+++ b/plugins/catalog-backend-module-github/CHANGELOG.md
@@ -1,5 +1,37 @@
# @backstage/plugin-catalog-backend-module-github
+## 0.7.9-next.1
+
+### Patch Changes
+
+- 4ab00e4: Fixes an issue in `GithubMultiOrgEntityProvider` that caused an error when processing teams without a parent.
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/plugin-catalog-backend@1.30.0-next.1
+ - @backstage/plugin-catalog-node@1.15.1-next.1
+ - @backstage/plugin-events-node@0.4.7-next.1
+ - @backstage/catalog-client@1.9.1-next.0
+ - @backstage/plugin-catalog-common@1.1.3-next.0
+ - @backstage/integration@1.16.1-next.0
+
+## 0.7.9-next.0
+
+### Patch Changes
+
+- 8379bf4: Remove usages of `PluginDatabaseManager` and `PluginEndpointDiscovery` and replace with their equivalent service types
+- Updated dependencies
+ - @backstage/plugin-catalog-backend@1.30.0-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-client@1.9.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/config@1.3.1
+ - @backstage/integration@1.16.0
+ - @backstage/plugin-catalog-common@1.1.2
+ - @backstage/plugin-catalog-node@1.15.1-next.0
+ - @backstage/plugin-events-node@0.4.7-next.0
+
## 0.7.8
### Patch Changes
diff --git a/plugins/catalog-backend-module-github/package.json b/plugins/catalog-backend-module-github/package.json
index 3a85c1548d..ce731cd8c9 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.7.8",
+ "version": "0.7.9-next.1",
"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 dcc94e47bc..8cd87f646a 100644
--- a/plugins/catalog-backend-module-github/report.api.md
+++ b/plugins/catalog-backend-module-github/report.api.md
@@ -10,6 +10,7 @@ import { CatalogApi } from '@backstage/catalog-client';
import { CatalogProcessor } from '@backstage/plugin-catalog-node';
import { CatalogProcessorEmit } from '@backstage/plugin-catalog-node';
import { Config } from '@backstage/config';
+import { DiscoveryService } from '@backstage/backend-plugin-api';
import { Entity } from '@backstage/catalog-model';
import { EntityProvider } from '@backstage/plugin-catalog-node';
import { EntityProviderConnection } from '@backstage/plugin-catalog-node';
@@ -21,7 +22,6 @@ import { GithubIntegrationConfig } from '@backstage/integration';
import { graphql } from '@octokit/graphql';
import { LocationSpec } from '@backstage/plugin-catalog-node';
import { LoggerService } from '@backstage/backend-plugin-api';
-import { PluginEndpointDiscovery } from '@backstage/backend-common';
import { SchedulerService } from '@backstage/backend-plugin-api';
import { SchedulerServiceTaskRunner } from '@backstage/backend-plugin-api';
import { ScmIntegrationRegistry } from '@backstage/integration';
@@ -127,7 +127,7 @@ export class GithubLocationAnalyzer implements ScmLocationAnalyzer {
// @public (undocumented)
export type GithubLocationAnalyzerOptions = {
config: Config;
- discovery: PluginEndpointDiscovery;
+ discovery: DiscoveryService;
tokenManager?: TokenManager;
auth?: AuthService;
githubCredentialsProvider?: GithubCredentialsProvider;
diff --git a/plugins/catalog-backend-module-github/src/analyzers/GithubLocationAnalyzer.test.ts b/plugins/catalog-backend-module-github/src/analyzers/GithubLocationAnalyzer.test.ts
index d3be18f489..25a19ba1ff 100644
--- a/plugins/catalog-backend-module-github/src/analyzers/GithubLocationAnalyzer.test.ts
+++ b/plugins/catalog-backend-module-github/src/analyzers/GithubLocationAnalyzer.test.ts
@@ -32,7 +32,6 @@ jest.mock('@octokit/rest', () => {
return { Octokit };
});
-import { PluginEndpointDiscovery } from '@backstage/backend-common';
import { GithubLocationAnalyzer } from './GithubLocationAnalyzer';
import {
registerMswTestHooks,
@@ -40,26 +39,21 @@ import {
} from '@backstage/backend-test-utils';
import { setupServer } from 'msw/node';
import { http, HttpResponse } from 'msw';
-import { ConfigReader } from '@backstage/config';
const server = setupServer();
describe('GithubLocationAnalyzer', () => {
- const mockDiscoveryApi: jest.Mocked = {
- getBaseUrl: jest.fn().mockResolvedValue('http://localhost:7007'),
- getExternalBaseUrl: jest.fn(),
- };
+ const mockDiscovery = mockServices.discovery.mock({
+ getBaseUrl: async () => 'http://localhost:7007',
+ });
const mockAuthService = mockServices.auth.mock({
getPluginRequestToken: async () => ({ token: 'abc123' }),
});
- const config = new ConfigReader({
- integrations: {
- github: [
- {
- host: 'h.com',
- token: 't',
- },
- ],
+ const config = mockServices.rootConfig({
+ data: {
+ integrations: {
+ github: [{ host: 'h.com', token: 't' }],
+ },
},
});
@@ -121,7 +115,7 @@ describe('GithubLocationAnalyzer', () => {
});
const analyzer = new GithubLocationAnalyzer({
- discovery: mockDiscoveryApi,
+ discovery: mockDiscovery,
auth: mockAuthService,
config,
});
@@ -148,7 +142,7 @@ describe('GithubLocationAnalyzer', () => {
});
const analyzer = new GithubLocationAnalyzer({
- discovery: mockDiscoveryApi,
+ discovery: mockDiscovery,
auth: mockAuthService,
config,
});
@@ -174,7 +168,7 @@ describe('GithubLocationAnalyzer', () => {
});
const analyzer = new GithubLocationAnalyzer({
- discovery: mockDiscoveryApi,
+ discovery: mockDiscovery,
auth: mockAuthService,
config,
});
diff --git a/plugins/catalog-backend-module-github/src/analyzers/GithubLocationAnalyzer.ts b/plugins/catalog-backend-module-github/src/analyzers/GithubLocationAnalyzer.ts
index b635878f92..cbf43287a3 100644
--- a/plugins/catalog-backend-module-github/src/analyzers/GithubLocationAnalyzer.ts
+++ b/plugins/catalog-backend-module-github/src/analyzers/GithubLocationAnalyzer.ts
@@ -29,18 +29,17 @@ import {
ScmLocationAnalyzer,
} from '@backstage/plugin-catalog-node';
import {
- PluginEndpointDiscovery,
TokenManager,
createLegacyAuthAdapters,
} from '@backstage/backend-common';
import { Config } from '@backstage/config';
-import { AuthService } from '@backstage/backend-plugin-api';
+import { AuthService, DiscoveryService } from '@backstage/backend-plugin-api';
import { extname } from 'path';
/** @public */
export type GithubLocationAnalyzerOptions = {
config: Config;
- discovery: PluginEndpointDiscovery;
+ discovery: DiscoveryService;
tokenManager?: TokenManager;
auth?: AuthService;
githubCredentialsProvider?: GithubCredentialsProvider;
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 df49ac9803..2186b11f50 100644
--- a/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.test.ts
+++ b/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.test.ts
@@ -1596,6 +1596,62 @@ describe('GithubMultiOrgEntityProvider', () => {
});
});
+ it('should create a new group from a new team without parent', async () => {
+ await events.publish({
+ topic: 'github.team',
+ eventPayload: {
+ action: 'created',
+ organization: {
+ login: 'orgB',
+ },
+ team: {
+ name: 'New Team',
+ slug: 'new-team',
+ description: 'description from the new team',
+ html_url: 'https://github.com/orgs/orgB/teams/new-team',
+ parent: null,
+ },
+ },
+ });
+
+ expect(entityProviderConnection.applyMutation).toHaveBeenCalledTimes(1);
+ expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({
+ type: 'delta',
+ added: [
+ {
+ entity: {
+ apiVersion: 'backstage.io/v1alpha1',
+ kind: 'Group',
+ metadata: {
+ name: 'new-team',
+ namespace: 'orgb',
+ description: 'description from the new team',
+ annotations: {
+ 'backstage.io/edit-url':
+ 'https://github.com/orgs/orgB/teams/new-team/edit',
+ 'backstage.io/managed-by-location':
+ 'url:https://github.com/orgs/orgB/teams/new-team',
+ 'backstage.io/managed-by-origin-location':
+ 'url:https://github.com/orgs/orgB/teams/new-team',
+ 'github.com/team-slug': 'orgB/new-team',
+ },
+ },
+ spec: {
+ type: 'team',
+ children: [],
+ members: [],
+ profile: {
+ displayName: 'New Team',
+ },
+ },
+ },
+ locationKey: 'github-multi-org-provider:my-id',
+ },
+ ],
+ removed: [],
+ });
+ });
+
it('should remove a group from a deleted team', async () => {
await events.publish({
topic: 'github.team',
@@ -1869,6 +1925,170 @@ describe('GithubMultiOrgEntityProvider', () => {
],
});
});
+
+ it('should update group without parent', async () => {
+ const mockClient = jest.fn();
+
+ mockClient
+ .mockResolvedValueOnce({
+ organization: {
+ team: {
+ slug: 'team',
+ combinedSlug: 'orgA/team',
+ name: 'TeamA',
+ description: 'The one and only team',
+ avatarUrl: 'http://example.com/team.jpeg',
+ editTeamUrl: 'https://example.com',
+ parentTeam: null,
+ members: {
+ pageInfo: { hasNextPage: false },
+ nodes: [],
+ },
+ },
+ },
+ })
+ .mockResolvedValueOnce({
+ organization: {
+ membersWithRole: {
+ pageInfo: { hasNextPage: false },
+ nodes: [],
+ },
+ },
+ })
+ .mockResolvedValueOnce({
+ organization: {
+ teams: {
+ pageInfo: { hasNextPage: false },
+ nodes: [
+ {
+ slug: 'team',
+ combinedSlug: 'orgA/team',
+ name: 'TeamA',
+ description: 'The one and only team',
+ avatarUrl: 'http://example.com/team.jpeg',
+ editTeamUrl: 'https://example.com',
+ parentTeam: null,
+ members: {
+ pageInfo: { hasNextPage: false },
+ nodes: [],
+ },
+ },
+ ],
+ },
+ },
+ })
+ .mockResolvedValueOnce({
+ organization: {
+ teams: {
+ pageInfo: { hasNextPage: false },
+ nodes: [
+ {
+ slug: 'team',
+ combinedSlug: 'orgB/team',
+ name: 'TeamB',
+ description: 'The one and only team',
+ avatarUrl: 'http://example.com/team.jpeg',
+ editTeamUrl: 'https://example.com',
+ parentTeam: null,
+ members: {
+ pageInfo: { hasNextPage: false },
+ nodes: [],
+ },
+ },
+ ],
+ },
+ },
+ });
+
+ (graphql.defaults as jest.Mock).mockReturnValue(mockClient);
+
+ await events.publish({
+ topic: 'github.team',
+ eventPayload: {
+ action: 'edited',
+ changes: {
+ name: {
+ from: 'oldName',
+ },
+ description: {
+ from: 'oldDescription',
+ },
+ },
+ team: {
+ slug: 'team',
+ parent: null,
+ },
+ organization: {
+ login: 'orgA',
+ },
+ },
+ });
+
+ expect(entityProviderConnection.applyMutation).toHaveBeenCalledTimes(1);
+ expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({
+ type: 'delta',
+ added: [
+ {
+ entity: {
+ apiVersion: 'backstage.io/v1alpha1',
+ kind: 'Group',
+ metadata: {
+ annotations: {
+ 'backstage.io/edit-url': 'https://example.com',
+ 'backstage.io/managed-by-location':
+ 'url:https://github.com/orgs/orgA/teams/team',
+ 'backstage.io/managed-by-origin-location':
+ 'url:https://github.com/orgs/orgA/teams/team',
+ 'github.com/team-slug': 'orgA/team',
+ },
+ namespace: 'orga',
+ name: 'team',
+ description: 'The one and only team',
+ },
+ spec: {
+ children: [],
+ profile: {
+ displayName: 'TeamA',
+ picture: 'http://example.com/team.jpeg',
+ },
+ type: 'team',
+ members: [],
+ },
+ },
+ locationKey: 'github-multi-org-provider:my-id',
+ },
+ ],
+ removed: [
+ {
+ entity: {
+ apiVersion: 'backstage.io/v1alpha1',
+ kind: 'Group',
+ metadata: {
+ annotations: {
+ 'backstage.io/managed-by-location':
+ 'url:https://github.com/orgs/orgA/teams/oldname',
+ 'backstage.io/managed-by-origin-location':
+ 'url:https://github.com/orgs/orgA/teams/oldname',
+ 'github.com/team-slug': 'orgA/oldname',
+ },
+ namespace: 'orga',
+ name: 'oldname',
+ description: 'oldDescription',
+ },
+ spec: {
+ children: [],
+ profile: {
+ displayName: 'oldName',
+ },
+ type: 'team',
+ members: [],
+ },
+ },
+ locationKey: 'github-multi-org-provider:my-id',
+ },
+ ],
+ });
+ });
});
describe('membership', () => {
diff --git a/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.ts b/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.ts
index 4367383cd2..fbfdc8a20d 100644
--- a/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.ts
+++ b/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.ts
@@ -602,7 +602,9 @@ export class GithubMultiOrgEntityProvider implements EntityProvider {
editTeamUrl: `${url}/edit`,
combinedSlug: `${org}/${slug}`,
description: description ?? undefined,
- parentTeam: { slug: event.team?.parent?.slug || '' } as GithubTeam,
+ parentTeam: event.team?.parent?.slug
+ ? ({ slug: event.team.parent.slug } as GithubTeam)
+ : undefined,
// entity will be removed or is new
members: [],
},
@@ -705,7 +707,9 @@ export class GithubMultiOrgEntityProvider implements EntityProvider {
slug: oldSlug,
combinedSlug: `${org}/${oldSlug}`,
description: event.changes.description?.from,
- parentTeam: { slug: event.team?.parent?.slug || '' } as GithubTeam,
+ parentTeam: event.team?.parent?.slug
+ ? ({ slug: event.team.parent.slug } as GithubTeam)
+ : undefined,
// entity will be removed
members: [],
},
diff --git a/plugins/catalog-backend-module-gitlab-org/CHANGELOG.md b/plugins/catalog-backend-module-gitlab-org/CHANGELOG.md
index 9c012d1894..f53dc5ad31 100644
--- a/plugins/catalog-backend-module-gitlab-org/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gitlab-org/CHANGELOG.md
@@ -1,5 +1,26 @@
# @backstage/plugin-catalog-backend-module-gitlab-org
+## 0.2.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/plugin-catalog-node@1.15.1-next.1
+ - @backstage/plugin-events-node@0.4.7-next.1
+ - @backstage/plugin-catalog-backend-module-gitlab@0.6.2-next.1
+
+## 0.2.5-next.0
+
+### Patch Changes
+
+- d9d62ef: Remove some internal usages of the backend-common package
+- Updated dependencies
+ - @backstage/plugin-catalog-backend-module-gitlab@0.6.1-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/plugin-catalog-node@1.15.1-next.0
+ - @backstage/plugin-events-node@0.4.7-next.0
+
## 0.2.4
### Patch Changes
diff --git a/plugins/catalog-backend-module-gitlab-org/package.json b/plugins/catalog-backend-module-gitlab-org/package.json
index c6cac3d116..f0c820ff2c 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.4",
+ "version": "0.2.5-next.1",
"description": "The gitlab-org backend module for the catalog plugin.",
"backstage": {
"role": "backend-plugin-module",
@@ -33,7 +33,6 @@
"test": "backstage-cli package test"
},
"dependencies": {
- "@backstage/backend-common": "^0.25.0",
"@backstage/backend-plugin-api": "workspace:^",
"@backstage/plugin-catalog-backend-module-gitlab": "workspace:^",
"@backstage/plugin-catalog-node": "workspace:^",
diff --git a/plugins/catalog-backend-module-gitlab-org/src/catalogModuleGitlabOrgDiscoveryEntityProvider.ts b/plugins/catalog-backend-module-gitlab-org/src/catalogModuleGitlabOrgDiscoveryEntityProvider.ts
index ffb2cfb629..85c1b65028 100644
--- a/plugins/catalog-backend-module-gitlab-org/src/catalogModuleGitlabOrgDiscoveryEntityProvider.ts
+++ b/plugins/catalog-backend-module-gitlab-org/src/catalogModuleGitlabOrgDiscoveryEntityProvider.ts
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-import { loggerToWinstonLogger } from '@backstage/backend-common';
import {
coreServices,
createBackendModule,
@@ -44,7 +43,7 @@ export const catalogModuleGitlabOrgDiscoveryEntityProvider =
async init({ config, catalog, logger, scheduler, events }) {
const gitlabOrgDiscoveryEntityProvider =
GitlabOrgDiscoveryEntityProvider.fromConfig(config, {
- logger: loggerToWinstonLogger(logger),
+ logger,
events,
scheduler,
});
diff --git a/plugins/catalog-backend-module-gitlab/CHANGELOG.md b/plugins/catalog-backend-module-gitlab/CHANGELOG.md
index 4634958a20..007d8d7fbf 100644
--- a/plugins/catalog-backend-module-gitlab/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gitlab/CHANGELOG.md
@@ -1,5 +1,34 @@
# @backstage/plugin-catalog-backend-module-gitlab
+## 0.6.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-defaults@0.7.0-next.1
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/plugin-catalog-node@1.15.1-next.1
+ - @backstage/plugin-events-node@0.4.7-next.1
+ - @backstage/plugin-catalog-common@1.1.3-next.0
+ - @backstage/integration@1.16.1-next.0
+
+## 0.6.1-next.0
+
+### Patch Changes
+
+- 575613f: Go back to using `node-fetch` for gitlab
+- Updated dependencies
+ - @backstage/backend-defaults@0.7.0-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/config@1.3.1
+ - @backstage/integration@1.16.0
+ - @backstage/plugin-catalog-common@1.1.2
+ - @backstage/plugin-catalog-node@1.15.1-next.0
+ - @backstage/plugin-events-node@0.4.7-next.0
+
## 0.6.0
### Minor Changes
diff --git a/plugins/catalog-backend-module-gitlab/package.json b/plugins/catalog-backend-module-gitlab/package.json
index 8705fa467a..bc1b924502 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.6.0",
+ "version": "0.6.2-next.1",
"description": "A Backstage catalog backend module that helps integrate towards GitLab",
"backstage": {
"role": "backend-plugin-module",
@@ -61,6 +61,7 @@
"@backstage/plugin-events-node": "workspace:^",
"@gitbeaker/rest": "^40.0.3",
"lodash": "^4.17.21",
+ "node-fetch": "^2.7.0",
"uuid": "^11.0.0"
},
"devDependencies": {
diff --git a/plugins/catalog-backend-module-gitlab/src/lib/client.ts b/plugins/catalog-backend-module-gitlab/src/lib/client.ts
index 81ba58db5d..561f38634b 100644
--- a/plugins/catalog-backend-module-gitlab/src/lib/client.ts
+++ b/plugins/catalog-backend-module-gitlab/src/lib/client.ts
@@ -14,6 +14,9 @@
* limitations under the License.
*/
+// NOTE(freben): Intentionally uses node-fetch because of https://github.com/backstage/backstage/issues/28190
+import fetch from 'node-fetch';
+
import {
getGitLabRequestOptions,
GitLabIntegrationConfig,
diff --git a/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md b/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md
index fb693a2af5..166954ed54 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md
+++ b/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md
@@ -1,5 +1,38 @@
# @backstage/plugin-catalog-backend-module-incremental-ingestion
+## 0.6.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/backend-defaults@0.7.0-next.1
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-catalog-backend@1.30.0-next.1
+ - @backstage/plugin-catalog-node@1.15.1-next.1
+ - @backstage/plugin-events-node@0.4.7-next.1
+ - @backstage/plugin-permission-common@0.8.4-next.0
+
+## 0.6.2-next.0
+
+### Patch Changes
+
+- ec547b8: Remove the error handler middleware, since that is now provided by the framework
+- Updated dependencies
+ - @backstage/backend-defaults@0.7.0-next.0
+ - @backstage/plugin-catalog-backend@1.30.0-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/types@1.2.0
+ - @backstage/plugin-catalog-node@1.15.1-next.0
+ - @backstage/plugin-events-node@0.4.7-next.0
+ - @backstage/plugin-permission-common@0.8.3
+
## 0.6.1
### Patch Changes
diff --git a/plugins/catalog-backend-module-incremental-ingestion/package.json b/plugins/catalog-backend-module-incremental-ingestion/package.json
index fa3b3d021c..073ed2778f 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.6.1",
+ "version": "0.6.2-next.1",
"description": "An entity provider for streaming large asset sources into the catalog",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/module/WrapperProviders.ts b/plugins/catalog-backend-module-incremental-ingestion/src/module/WrapperProviders.ts
index 2f8a8df3ba..11b9619dc5 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/module/WrapperProviders.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/module/WrapperProviders.ts
@@ -79,7 +79,6 @@ export class WrapperProviders {
return new IncrementalProviderRouter(
new IncrementalIngestionDatabaseManager({ client: this.options.client }),
this.options.logger,
- this.options.config,
).createRouter();
}
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/router/routes.ts b/plugins/catalog-backend-module-incremental-ingestion/src/router/routes.ts
index ad8d6ce103..ca6f600840 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/router/routes.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/router/routes.ts
@@ -18,22 +18,17 @@ import express from 'express';
import Router from 'express-promise-router';
import { IncrementalIngestionDatabaseManager } from '../database/IncrementalIngestionDatabaseManager';
import { LoggerService } from '@backstage/backend-plugin-api';
-import { MiddlewareFactory } from '@backstage/backend-defaults/rootHttpRouter';
-import { Config } from '@backstage/config';
export class IncrementalProviderRouter {
private manager: IncrementalIngestionDatabaseManager;
private logger: LoggerService;
- private config: Config;
constructor(
manager: IncrementalIngestionDatabaseManager,
logger: LoggerService,
- config: Config,
) {
this.manager = manager;
this.logger = logger;
- this.config = config;
}
createRouter(): express.Router {
@@ -253,12 +248,6 @@ export class IncrementalProviderRouter {
},
);
- const middleware = MiddlewareFactory.create({
- logger: this.logger,
- config: this.config,
- });
- router.use(middleware.error());
-
return router;
}
}
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/service/IncrementalCatalogBuilder.ts b/plugins/catalog-backend-module-incremental-ingestion/src/service/IncrementalCatalogBuilder.ts
index ed4414b68b..6ea2f10a64 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/service/IncrementalCatalogBuilder.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/service/IncrementalCatalogBuilder.ts
@@ -66,7 +66,6 @@ export class IncrementalCatalogBuilder {
const incrementalAdminRouter = await new IncrementalProviderRouter(
this.manager,
routerLogger,
- this.env.config,
).createRouter();
return { incrementalAdminRouter };
diff --git a/plugins/catalog-backend-module-ldap/CHANGELOG.md b/plugins/catalog-backend-module-ldap/CHANGELOG.md
index 121933f3a8..f39c3a6ad1 100644
--- a/plugins/catalog-backend-module-ldap/CHANGELOG.md
+++ b/plugins/catalog-backend-module-ldap/CHANGELOG.md
@@ -1,5 +1,31 @@
# @backstage/plugin-catalog-backend-module-ldap
+## 0.11.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-catalog-node@1.15.1-next.1
+ - @backstage/plugin-catalog-common@1.1.3-next.0
+
+## 0.11.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/types@1.2.0
+ - @backstage/plugin-catalog-common@1.1.2
+ - @backstage/plugin-catalog-node@1.15.1-next.0
+
## 0.11.0
### Minor Changes
diff --git a/plugins/catalog-backend-module-ldap/package.json b/plugins/catalog-backend-module-ldap/package.json
index b19ab69e6d..e6c6884be7 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.11.0",
+ "version": "0.11.1-next.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 3e7f67b9ae..42ecfecf33 100644
--- a/plugins/catalog-backend-module-logs/CHANGELOG.md
+++ b/plugins/catalog-backend-module-logs/CHANGELOG.md
@@ -1,5 +1,23 @@
# @backstage/plugin-catalog-backend-module-logs
+## 0.1.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/plugin-catalog-backend@1.30.0-next.1
+ - @backstage/plugin-events-node@0.4.7-next.1
+
+## 0.1.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-catalog-backend@1.30.0-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/plugin-events-node@0.4.7-next.0
+
## 0.1.5
### Patch Changes
diff --git a/plugins/catalog-backend-module-logs/package.json b/plugins/catalog-backend-module-logs/package.json
index 09f7adaef6..4350d83b4e 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.5",
+ "version": "0.1.6-next.1",
"description": "A module that subscribes to catalog releated 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 6364dcdce6..08231f2651 100644
--- a/plugins/catalog-backend-module-msgraph/CHANGELOG.md
+++ b/plugins/catalog-backend-module-msgraph/CHANGELOG.md
@@ -1,5 +1,33 @@
# @backstage/plugin-catalog-backend-module-msgraph
+## 0.6.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/plugin-catalog-node@1.15.1-next.1
+ - @backstage/plugin-catalog-common@1.1.3-next.0
+
+## 0.6.6-next.1
+
+### Patch Changes
+
+- 29a4aa8: fix(config): add missing parameters in config schema
+
+## 0.6.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/config@1.3.1
+ - @backstage/plugin-catalog-common@1.1.2
+ - @backstage/plugin-catalog-node@1.15.1-next.0
+
## 0.6.5
### Patch Changes
diff --git a/plugins/catalog-backend-module-msgraph/config.d.ts b/plugins/catalog-backend-module-msgraph/config.d.ts
index b93026e1bb..b04c1cd303 100644
--- a/plugins/catalog-backend-module-msgraph/config.d.ts
+++ b/plugins/catalog-backend-module-msgraph/config.d.ts
@@ -165,6 +165,12 @@ export interface Config {
* This can be useful for huge organizations.
*/
loadPhotos?: boolean;
+ /**
+ * The fields to be fetched on query.
+ *
+ * E.g. ["id", "displayName", "description"]
+ */
+ select?: string[];
};
group?: {
@@ -257,15 +263,38 @@ export interface Config {
*/
queryMode?: string;
user?: {
+ /**
+ * The "expand" argument to apply to users.
+ *
+ * E.g. "manager".
+ */
+ expand?: string;
/**
* The filter to apply to extract users.
*
* E.g. "accountEnabled eq true and userType eq 'member'"
*/
filter?: string;
+ /**
+ * Set to false to not load user photos.
+ * This can be useful for huge organizations.
+ */
+ loadPhotos?: boolean;
+ /**
+ * The fields to be fetched on query.
+ *
+ * E.g. ["id", "displayName", "description"]
+ */
+ select?: string[];
};
group?: {
+ /**
+ * The "expand" argument to apply to groups.
+ *
+ * E.g. "member".
+ */
+ expand?: string;
/**
* The filter to apply to extract groups.
*
@@ -284,6 +313,11 @@ export interface Config {
* E.g. ["id", "displayName", "description"]
*/
select?: string[];
+ /**
+ * Whether to ingest groups that are members of the found/filtered/searched groups.
+ * Default value is `false`.
+ */
+ includeSubGroups?: boolean;
};
userGroupMember?: {
diff --git a/plugins/catalog-backend-module-msgraph/package.json b/plugins/catalog-backend-module-msgraph/package.json
index a787131723..0e1b77deb9 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.6.5",
+ "version": "0.6.6-next.2",
"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 a78aa27725..0c8d4526e3 100644
--- a/plugins/catalog-backend-module-openapi/CHANGELOG.md
+++ b/plugins/catalog-backend-module-openapi/CHANGELOG.md
@@ -1,5 +1,30 @@
# @backstage/plugin-catalog-backend-module-openapi
+## 0.2.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/plugin-catalog-node@1.15.1-next.1
+ - @backstage/plugin-catalog-common@1.1.3-next.0
+ - @backstage/integration@1.16.1-next.0
+
+## 0.2.6-next.0
+
+### Patch Changes
+
+- 57e794a: Refactor to no longer use backend-common
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/integration@1.16.0
+ - @backstage/types@1.2.0
+ - @backstage/plugin-catalog-common@1.1.2
+ - @backstage/plugin-catalog-node@1.15.1-next.0
+
## 0.2.5
### Patch Changes
diff --git a/plugins/catalog-backend-module-openapi/package.json b/plugins/catalog-backend-module-openapi/package.json
index 049577bbd2..a6266a8bf3 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.5",
+ "version": "0.2.6-next.1",
"description": "A Backstage catalog backend module that helps with OpenAPI specifications",
"backstage": {
"role": "backend-plugin-module",
@@ -38,16 +38,12 @@
},
"dependencies": {
"@apidevtools/json-schema-ref-parser": "^11.0.0",
- "@backstage/backend-common": "^0.25.0",
"@backstage/backend-plugin-api": "workspace:^",
"@backstage/catalog-model": "workspace:^",
- "@backstage/config": "workspace:^",
"@backstage/integration": "workspace:^",
- "@backstage/plugin-catalog-backend": "workspace:^",
"@backstage/plugin-catalog-common": "workspace:^",
"@backstage/plugin-catalog-node": "workspace:^",
"@backstage/types": "workspace:^",
- "winston": "^3.2.1",
"yaml": "^2.1.1"
},
"devDependencies": {
diff --git a/plugins/catalog-backend-module-openapi/report.api.md b/plugins/catalog-backend-module-openapi/report.api.md
index d79d852387..5884a486cd 100644
--- a/plugins/catalog-backend-module-openapi/report.api.md
+++ b/plugins/catalog-backend-module-openapi/report.api.md
@@ -5,12 +5,12 @@
```ts
import { BackendFeature } from '@backstage/backend-plugin-api';
import { CatalogProcessor } from '@backstage/plugin-catalog-node';
-import { Config } from '@backstage/config';
import { Entity } from '@backstage/catalog-model';
import { JsonValue } from '@backstage/types';
import { LocationSpec } from '@backstage/plugin-catalog-common';
-import { Logger } from 'winston';
-import { PlaceholderResolverParams } from '@backstage/plugin-catalog-backend';
+import { LoggerService } from '@backstage/backend-plugin-api';
+import { PlaceholderResolverParams } from '@backstage/plugin-catalog-node';
+import { RootConfigService } from '@backstage/backend-plugin-api';
import { ScmIntegrations } from '@backstage/integration';
import { UrlReaderService } from '@backstage/backend-plugin-api';
@@ -30,14 +30,14 @@ export const openApiPlaceholderResolver: typeof jsonSchemaRefPlaceholderResolver
export class OpenApiRefProcessor implements CatalogProcessor {
constructor(options: {
integrations: ScmIntegrations;
- logger: Logger;
+ logger: LoggerService;
reader: UrlReaderService;
});
// (undocumented)
static fromConfig(
- config: Config,
+ config: RootConfigService,
options: {
- logger: Logger;
+ logger: LoggerService;
reader: UrlReaderService;
},
): OpenApiRefProcessor;
diff --git a/plugins/catalog-backend-module-openapi/src/OpenApiRefProcessor.test.ts b/plugins/catalog-backend-module-openapi/src/OpenApiRefProcessor.test.ts
index ea165b74a7..6e6e476525 100644
--- a/plugins/catalog-backend-module-openapi/src/OpenApiRefProcessor.test.ts
+++ b/plugins/catalog-backend-module-openapi/src/OpenApiRefProcessor.test.ts
@@ -13,12 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import { ConfigReader } from '@backstage/config';
-import { LocationSpec } from '@backstage/plugin-catalog-backend';
+
+import { LocationSpec } from '@backstage/plugin-catalog-common';
import { OpenApiRefProcessor } from './OpenApiRefProcessor';
import { bundleFileWithRefs } from './lib';
import { mockServices } from '@backstage/backend-test-utils';
-import { loggerToWinstonLogger } from '@backstage/backend-common';
jest.mock('./lib', () => ({
bundleFileWithRefs: jest.fn(),
@@ -46,15 +45,10 @@ describe('OpenApiRefProcessor', () => {
kind,
spec: { definition: '', ...spec },
};
- const config = new ConfigReader({});
- const reader = {
- read: jest.fn(),
- readUrl: jest.fn(),
- readTree: jest.fn(),
- search: jest.fn(),
- };
+ const config = mockServices.rootConfig();
+ const reader = mockServices.urlReader.mock();
const processor = OpenApiRefProcessor.fromConfig(config, {
- logger: loggerToWinstonLogger(mockServices.logger.mock()),
+ logger: mockServices.logger.mock(),
reader,
});
diff --git a/plugins/catalog-backend-module-openapi/src/OpenApiRefProcessor.ts b/plugins/catalog-backend-module-openapi/src/OpenApiRefProcessor.ts
index 39de58466e..d666e1d374 100644
--- a/plugins/catalog-backend-module-openapi/src/OpenApiRefProcessor.ts
+++ b/plugins/catalog-backend-module-openapi/src/OpenApiRefProcessor.ts
@@ -13,14 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import { UrlReaderService } from '@backstage/backend-plugin-api';
+
+import {
+ LoggerService,
+ RootConfigService,
+ UrlReaderService,
+} from '@backstage/backend-plugin-api';
import { Entity } from '@backstage/catalog-model';
-import { Config } from '@backstage/config';
import { ScmIntegrations } from '@backstage/integration';
import { CatalogProcessor } from '@backstage/plugin-catalog-node';
import { LocationSpec } from '@backstage/plugin-catalog-common';
import { bundleFileWithRefs } from './lib';
-import { Logger } from 'winston';
/**
* @public
@@ -28,12 +31,12 @@ import { Logger } from 'winston';
*/
export class OpenApiRefProcessor implements CatalogProcessor {
private readonly integrations: ScmIntegrations;
- private readonly logger: Logger;
+ private readonly logger: LoggerService;
private readonly reader: UrlReaderService;
static fromConfig(
- config: Config,
- options: { logger: Logger; reader: UrlReaderService },
+ config: RootConfigService,
+ options: { logger: LoggerService; reader: UrlReaderService },
) {
const integrations = ScmIntegrations.fromConfig(config);
@@ -45,7 +48,7 @@ export class OpenApiRefProcessor implements CatalogProcessor {
constructor(options: {
integrations: ScmIntegrations;
- logger: Logger;
+ logger: LoggerService;
reader: UrlReaderService;
}) {
this.integrations = options.integrations;
diff --git a/plugins/catalog-backend-module-openapi/src/jsonSchemaRefPlaceholderResolver.test.ts b/plugins/catalog-backend-module-openapi/src/jsonSchemaRefPlaceholderResolver.test.ts
index afa523ccf0..280d00c4fa 100644
--- a/plugins/catalog-backend-module-openapi/src/jsonSchemaRefPlaceholderResolver.test.ts
+++ b/plugins/catalog-backend-module-openapi/src/jsonSchemaRefPlaceholderResolver.test.ts
@@ -13,7 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import { PlaceholderResolverParams } from '@backstage/plugin-catalog-backend';
+
+import { PlaceholderResolverParams } from '@backstage/plugin-catalog-node';
import { jsonSchemaRefPlaceholderResolver } from './jsonSchemaRefPlaceholderResolver';
import { bundleFileWithRefs } from './lib';
diff --git a/plugins/catalog-backend-module-openapi/src/jsonSchemaRefPlaceholderResolver.ts b/plugins/catalog-backend-module-openapi/src/jsonSchemaRefPlaceholderResolver.ts
index befafbde8a..91a01afec1 100644
--- a/plugins/catalog-backend-module-openapi/src/jsonSchemaRefPlaceholderResolver.ts
+++ b/plugins/catalog-backend-module-openapi/src/jsonSchemaRefPlaceholderResolver.ts
@@ -13,9 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import { PlaceholderResolverParams } from '@backstage/plugin-catalog-backend';
+
import { JsonValue } from '@backstage/types';
-import { processingResult } from '@backstage/plugin-catalog-node';
+import {
+ PlaceholderResolverParams,
+ processingResult,
+} from '@backstage/plugin-catalog-node';
import { bundleFileWithRefs } from './lib';
/** @public */
diff --git a/plugins/catalog-backend-module-puppetdb/CHANGELOG.md b/plugins/catalog-backend-module-puppetdb/CHANGELOG.md
index 38ef9c3c4f..6b7b83bd49 100644
--- a/plugins/catalog-backend-module-puppetdb/CHANGELOG.md
+++ b/plugins/catalog-backend-module-puppetdb/CHANGELOG.md
@@ -1,5 +1,29 @@
# @backstage/plugin-catalog-backend-module-puppetdb
+## 0.2.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-catalog-node@1.15.1-next.1
+
+## 0.2.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/types@1.2.0
+ - @backstage/plugin-catalog-node@1.15.1-next.0
+
## 0.2.5
### Patch Changes
diff --git a/plugins/catalog-backend-module-puppetdb/package.json b/plugins/catalog-backend-module-puppetdb/package.json
index 5adb3b6cf2..65770f85f2 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.5",
+ "version": "0.2.6-next.1",
"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 a8e66005ed..225d939243 100644
--- a/plugins/catalog-backend-module-scaffolder-entity-model/CHANGELOG.md
+++ b/plugins/catalog-backend-module-scaffolder-entity-model/CHANGELOG.md
@@ -1,5 +1,27 @@
# @backstage/plugin-catalog-backend-module-scaffolder-entity-model
+## 0.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/plugin-catalog-node@1.15.1-next.1
+ - @backstage/plugin-scaffolder-common@1.5.9-next.0
+ - @backstage/plugin-catalog-common@1.1.3-next.0
+
+## 0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/plugin-catalog-common@1.1.2
+ - @backstage/plugin-catalog-node@1.15.1-next.0
+ - @backstage/plugin-scaffolder-common@1.5.8
+
## 0.2.3
### 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 becc73cd68..ab0aa88e2d 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.3",
+ "version": "0.2.4-next.1",
"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 594bca9666..3abef7be97 100644
--- a/plugins/catalog-backend-module-unprocessed/CHANGELOG.md
+++ b/plugins/catalog-backend-module-unprocessed/CHANGELOG.md
@@ -1,5 +1,31 @@
# @backstage/plugin-catalog-backend-module-unprocessed
+## 0.5.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-auth-node@0.5.6-next.1
+ - @backstage/plugin-catalog-node@1.15.1-next.1
+ - @backstage/plugin-permission-common@0.8.4-next.0
+ - @backstage/plugin-catalog-unprocessed-entities-common@0.0.7-next.0
+
+## 0.5.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.5.6-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/errors@1.2.6
+ - @backstage/plugin-catalog-node@1.15.1-next.0
+ - @backstage/plugin-catalog-unprocessed-entities-common@0.0.6
+ - @backstage/plugin-permission-common@0.8.3
+
## 0.5.3
### Patch Changes
diff --git a/plugins/catalog-backend-module-unprocessed/package.json b/plugins/catalog-backend-module-unprocessed/package.json
index bc6caf4f7f..1ad1c2e7a4 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.5.3",
+ "version": "0.5.4-next.1",
"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 cae2aba3da..3788471093 100644
--- a/plugins/catalog-backend/CHANGELOG.md
+++ b/plugins/catalog-backend/CHANGELOG.md
@@ -1,5 +1,53 @@
# @backstage/plugin-catalog-backend
+## 1.30.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/backend-openapi-utils@0.4.1-next.1
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-catalog-node@1.15.1-next.1
+ - @backstage/plugin-events-node@0.4.7-next.1
+ - @backstage/plugin-permission-common@0.8.4-next.0
+ - @backstage/plugin-permission-node@0.8.7-next.1
+ - @backstage/plugin-search-backend-module-catalog@0.3.0-next.1
+ - @backstage/catalog-client@1.9.1-next.0
+ - @backstage/plugin-catalog-common@1.1.3-next.0
+ - @backstage/integration@1.16.1-next.0
+
+## 1.30.0-next.0
+
+### Minor Changes
+
+- dd515e3: Removed the long-deprecated `DefaultCatalogCollatorFactory` and `DefaultCatalogCollatorFactoryOptions` exports, which now no longer exist in the search plugin's offerings. If you were using these, you want to migrate to [the new backend system](https://backstage.io/docs/backend-system/) and use the [catalog collator](https://backstage.io/docs/features/search/collators#catalog) directly.
+
+### Patch Changes
+
+- d9d62ef: Remove some internal usages of the backend-common package
+- 8379bf4: Remove usages of `PluginDatabaseManager` and `PluginEndpointDiscovery` and replace with their equivalent service types
+- be0aae7: Improved concurrency of the `entities` endpoint when using the streamed query mode behind the `catalog.disableRelationsCompatibility` flag.
+- 3d475a0: Updated condition in `resolveCodeOwner` to fix a bug where `normalizeCodeOwner` could potentially be called with an invalid argument causing an error in `CodeOwnersProcessor`
+- Updated dependencies
+ - @backstage/plugin-search-backend-module-catalog@0.3.0-next.0
+ - @backstage/plugin-permission-node@0.8.7-next.0
+ - @backstage/backend-openapi-utils@0.4.1-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-client@1.9.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/integration@1.16.0
+ - @backstage/types@1.2.0
+ - @backstage/plugin-catalog-common@1.1.2
+ - @backstage/plugin-catalog-node@1.15.1-next.0
+ - @backstage/plugin-events-node@0.4.7-next.0
+ - @backstage/plugin-permission-common@0.8.3
+
## 1.29.0
### Minor Changes
diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index 1192931fa1..216e720b07 100644
--- a/plugins/catalog-backend/package.json
+++ b/plugins/catalog-backend/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-backend",
- "version": "1.29.0",
+ "version": "1.30.0-next.1",
"description": "The Backstage backend plugin that provides the Backstage catalog",
"backstage": {
"role": "backend-plugin",
diff --git a/plugins/catalog-backend/report.api.md b/plugins/catalog-backend/report.api.md
index a200057a3a..ea7e11d0d7 100644
--- a/plugins/catalog-backend/report.api.md
+++ b/plugins/catalog-backend/report.api.md
@@ -28,8 +28,6 @@ import { CatalogProcessorRelationResult as CatalogProcessorRelationResult_2 } fr
import { CatalogProcessorResult as CatalogProcessorResult_2 } from '@backstage/plugin-catalog-node';
import { Config } from '@backstage/config';
import { DatabaseService } from '@backstage/backend-plugin-api';
-import { DefaultCatalogCollatorFactory as DefaultCatalogCollatorFactory_2 } from '@backstage/plugin-search-backend-module-catalog';
-import { DefaultCatalogCollatorFactoryOptions as DefaultCatalogCollatorFactoryOptions_2 } from '@backstage/plugin-search-backend-module-catalog';
import { DeferredEntity as DeferredEntity_2 } from '@backstage/plugin-catalog-node';
import { DiscoveryService } from '@backstage/backend-plugin-api';
import { EntitiesSearchFilter as EntitiesSearchFilter_2 } from '@backstage/plugin-catalog-node';
@@ -58,7 +56,6 @@ import { PlaceholderResolver as PlaceholderResolver_2 } from '@backstage/plugin-
import { PlaceholderResolverParams as PlaceholderResolverParams_2 } from '@backstage/plugin-catalog-node';
import { PlaceholderResolverRead as PlaceholderResolverRead_2 } from '@backstage/plugin-catalog-node';
import { PlaceholderResolverResolveUrl as PlaceholderResolverResolveUrl_2 } from '@backstage/plugin-catalog-node';
-import { PluginEndpointDiscovery } from '@backstage/backend-common';
import { RootConfigService } from '@backstage/backend-plugin-api';
import { Router } from 'express';
import { SchedulerService } from '@backstage/backend-plugin-api';
@@ -285,7 +282,7 @@ export function createRandomProcessingInterval(options: {
// @public @deprecated (undocumented)
export class DefaultCatalogCollator {
constructor(options: {
- discovery: PluginEndpointDiscovery;
+ discovery: DiscoveryService;
tokenManager: TokenManager;
locationTemplate?: string;
filter?: GetEntitiesRequest['filter'];
@@ -299,7 +296,7 @@ export class DefaultCatalogCollator {
// (undocumented)
protected readonly catalogClient: CatalogApi;
// (undocumented)
- protected discovery: PluginEndpointDiscovery;
+ protected discovery: DiscoveryService;
// (undocumented)
execute(): Promise;
// (undocumented)
@@ -308,7 +305,7 @@ export class DefaultCatalogCollator {
static fromConfig(
_config: Config,
options: {
- discovery: PluginEndpointDiscovery;
+ discovery: DiscoveryService;
tokenManager: TokenManager;
filter?: GetEntitiesRequest['filter'];
},
@@ -326,13 +323,6 @@ export class DefaultCatalogCollator {
// @public @deprecated (undocumented)
export const defaultCatalogCollatorEntityTransformer: CatalogCollatorEntityTransformer_2;
-// @public @deprecated (undocumented)
-export const DefaultCatalogCollatorFactory: typeof DefaultCatalogCollatorFactory_2;
-
-// @public @deprecated (undocumented)
-export type DefaultCatalogCollatorFactoryOptions =
- DefaultCatalogCollatorFactoryOptions_2;
-
// @public @deprecated (undocumented)
export type DeferredEntity = DeferredEntity_2;
diff --git a/plugins/catalog-backend/src/deprecated.ts b/plugins/catalog-backend/src/deprecated.ts
index 2d08d2ce0c..3865852214 100644
--- a/plugins/catalog-backend/src/deprecated.ts
+++ b/plugins/catalog-backend/src/deprecated.ts
@@ -53,9 +53,7 @@ import {
} from '@backstage/plugin-catalog-node';
import {
defaultCatalogCollatorEntityTransformer as _defaultCatalogCollatorEntityTransformer,
- DefaultCatalogCollatorFactory as _DefaultCatalogCollatorFactory,
type CatalogCollatorEntityTransformer as _CatalogCollatorEntityTransformer,
- type DefaultCatalogCollatorFactoryOptions as _DefaultCatalogCollatorFactoryOptions,
} from '@backstage/plugin-search-backend-module-catalog';
/**
@@ -254,12 +252,6 @@ export type AnalyzeLocationGenerateEntity = _AnalyzeLocationGenerateEntity;
*/
export type AnalyzeLocationEntityField = _AnalyzeLocationEntityField;
-/**
- * @public
- * @deprecated import from `@backstage/plugin-search-backend-module-catalog` instead
- */
-export const DefaultCatalogCollatorFactory = _DefaultCatalogCollatorFactory;
-
/**
* @public
* @deprecated import from `@backstage/plugin-search-backend-module-catalog` instead
@@ -267,13 +259,6 @@ export const DefaultCatalogCollatorFactory = _DefaultCatalogCollatorFactory;
export const defaultCatalogCollatorEntityTransformer =
_defaultCatalogCollatorEntityTransformer;
-/**
- * @public
- * @deprecated import from `@backstage/plugin-search-backend-module-catalog` instead
- */
-export type DefaultCatalogCollatorFactoryOptions =
- _DefaultCatalogCollatorFactoryOptions;
-
/**
* @public
* @deprecated import from `@backstage/plugin-search-backend-module-catalog` instead
diff --git a/plugins/catalog-backend/src/processors/codeowners/resolve.test.ts b/plugins/catalog-backend/src/processors/codeowners/resolve.test.ts
index f9cdf79530..722d27fdb9 100644
--- a/plugins/catalog-backend/src/processors/codeowners/resolve.test.ts
+++ b/plugins/catalog-backend/src/processors/codeowners/resolve.test.ts
@@ -46,6 +46,14 @@ describe('resolveCodeOwner', () => {
),
).toBe('team-foo');
});
+ it('should return undefined if the codeowners file contains no names', () => {
+ expect(
+ resolveCodeOwner(
+ `*`,
+ 'https://github.com/acme/repo/tree/docs/catalog-info.yaml',
+ ),
+ ).toBe(undefined);
+ });
});
describe('normalizeCodeOwner', () => {
diff --git a/plugins/catalog-backend/src/processors/codeowners/resolve.ts b/plugins/catalog-backend/src/processors/codeowners/resolve.ts
index 675f6542aa..b0c44a8797 100644
--- a/plugins/catalog-backend/src/processors/codeowners/resolve.ts
+++ b/plugins/catalog-backend/src/processors/codeowners/resolve.ts
@@ -30,7 +30,9 @@ export function resolveCodeOwner(
const { filepath } = parseGitUrl(catalogInfoFileUrl);
const match = codeowners.matchFile(filepath, codeOwnerEntries);
- return match ? normalizeCodeOwner(match.owners[0]) : undefined;
+ return match?.owners?.length
+ ? normalizeCodeOwner(match.owners[0])
+ : undefined;
}
export function normalizeCodeOwner(owner: string) {
diff --git a/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts b/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts
index aee65bd2e1..9473d45bb6 100644
--- a/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts
+++ b/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts
@@ -14,11 +14,11 @@
* limitations under the License.
*/
+import { TokenManager } from '@backstage/backend-common';
import {
- PluginEndpointDiscovery,
- TokenManager,
-} from '@backstage/backend-common';
-import { registerMswTestHooks } from '@backstage/backend-test-utils';
+ mockServices,
+ registerMswTestHooks,
+} from '@backstage/backend-test-utils';
import { Entity } from '@backstage/catalog-model';
import { DefaultCatalogCollator } from './DefaultCatalogCollator';
import { setupServer } from 'msw/node';
@@ -58,22 +58,20 @@ const expectedEntities: Entity[] = [
];
describe('DefaultCatalogCollator', () => {
- let mockDiscoveryApi: jest.Mocked;
+ const mockDiscovery = mockServices.discovery.mock({
+ getBaseUrl: async () => 'http://localhost:7007',
+ });
let mockTokenManager: jest.Mocked;
let collator: DefaultCatalogCollator;
registerMswTestHooks(server);
beforeAll(() => {
- mockDiscoveryApi = {
- getBaseUrl: jest.fn().mockResolvedValue('http://localhost:7007'),
- getExternalBaseUrl: jest.fn(),
- };
mockTokenManager = {
getToken: jest.fn().mockResolvedValue({ token: '' }),
authenticate: jest.fn(),
};
collator = new DefaultCatalogCollator({
- discovery: mockDiscoveryApi,
+ discovery: mockDiscovery,
tokenManager: mockTokenManager,
});
});
@@ -98,7 +96,7 @@ describe('DefaultCatalogCollator', () => {
it('fetches from the configured catalog service', async () => {
const documents = await collator.execute();
- expect(mockDiscoveryApi.getBaseUrl).toHaveBeenCalledWith('catalog');
+ expect(mockDiscovery.getBaseUrl).toHaveBeenCalledWith('catalog');
expect(documents).toHaveLength(expectedEntities.length);
});
@@ -133,7 +131,7 @@ describe('DefaultCatalogCollator', () => {
it('maps a returned entity with a custom locationTemplate', async () => {
// Provide an alternate location template.
collator = new DefaultCatalogCollator({
- discovery: mockDiscoveryApi,
+ discovery: mockDiscovery,
tokenManager: mockTokenManager,
locationTemplate: '/software/:name',
});
@@ -147,7 +145,7 @@ describe('DefaultCatalogCollator', () => {
it('allows filtering of the retrieved catalog entities', async () => {
// Provide an alternate location template.
collator = DefaultCatalogCollator.fromConfig(new ConfigReader({}), {
- discovery: mockDiscoveryApi,
+ discovery: mockDiscovery,
tokenManager: mockTokenManager,
filter: {
kind: ['Foo', 'Bar'],
diff --git a/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts b/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
index 74aab07fc3..11f6030ce6 100644
--- a/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
+++ b/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
@@ -14,10 +14,7 @@
* limitations under the License.
*/
-import {
- PluginEndpointDiscovery,
- TokenManager,
-} from '@backstage/backend-common';
+import { TokenManager } from '@backstage/backend-common';
import {
Entity,
isUserEntity,
@@ -32,6 +29,7 @@ import {
import { catalogEntityReadPermission } from '@backstage/plugin-catalog-common/alpha';
import { CatalogEntityDocument } from '@backstage/plugin-catalog-common';
import { Permission } from '@backstage/plugin-permission-common';
+import { DiscoveryService } from '@backstage/backend-plugin-api';
/**
* @public
@@ -39,7 +37,7 @@ import { Permission } from '@backstage/plugin-permission-common';
* use `DefaultCatalogCollatorFactory` instead.
*/
export class DefaultCatalogCollator {
- protected discovery: PluginEndpointDiscovery;
+ protected discovery: DiscoveryService;
protected locationTemplate: string;
protected filter?: GetEntitiesRequest['filter'];
protected readonly catalogClient: CatalogApi;
@@ -51,7 +49,7 @@ export class DefaultCatalogCollator {
static fromConfig(
_config: Config,
options: {
- discovery: PluginEndpointDiscovery;
+ discovery: DiscoveryService;
tokenManager: TokenManager;
filter?: GetEntitiesRequest['filter'];
},
@@ -62,7 +60,7 @@ export class DefaultCatalogCollator {
}
constructor(options: {
- discovery: PluginEndpointDiscovery;
+ discovery: DiscoveryService;
tokenManager: TokenManager;
locationTemplate?: string;
filter?: GetEntitiesRequest['filter'];
diff --git a/plugins/catalog-backend/src/service/createRouter.test.ts b/plugins/catalog-backend/src/service/createRouter.test.ts
index 234a636a62..aa068a2122 100644
--- a/plugins/catalog-backend/src/service/createRouter.test.ts
+++ b/plugins/catalog-backend/src/service/createRouter.test.ts
@@ -42,6 +42,12 @@ import { wrapServer } from '@backstage/backend-openapi-utils';
import { Server } from 'http';
import { mockCredentials, mockServices } from '@backstage/backend-test-utils';
import { LocationAnalyzer } from '@backstage/plugin-catalog-node';
+import { MiddlewareFactory } from '@backstage/backend-defaults/rootHttpRouter';
+
+const middleware = MiddlewareFactory.create({
+ logger: mockServices.logger.mock(),
+ config: mockServices.rootConfig(),
+});
describe('createRouter readonly disabled', () => {
let entitiesCatalog: jest.Mocked;
@@ -86,6 +92,7 @@ describe('createRouter readonly disabled', () => {
locationAnalyzer,
permissionsService,
});
+ router.use(middleware.error());
app = await wrapServer(express().use(router));
});
@@ -965,6 +972,7 @@ describe('createRouter readonly and raw json enabled', () => {
httpAuth: mockServices.httpAuth(),
permissionsService,
});
+ router.use(middleware.error());
app = express().use(router);
});
diff --git a/plugins/catalog-backend/src/service/createRouter.ts b/plugins/catalog-backend/src/service/createRouter.ts
index f0b6793c3f..be5b650e6a 100644
--- a/plugins/catalog-backend/src/service/createRouter.ts
+++ b/plugins/catalog-backend/src/service/createRouter.ts
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-import { errorHandler } from '@backstage/backend-common';
import {
ANNOTATION_LOCATION,
ANNOTATION_ORIGIN_LOCATION,
@@ -446,6 +445,5 @@ export async function createRouter(
});
}
- router.use(errorHandler());
return router;
}
diff --git a/plugins/catalog-common/CHANGELOG.md b/plugins/catalog-common/CHANGELOG.md
index 00c5be2202..6041a6a3a8 100644
--- a/plugins/catalog-common/CHANGELOG.md
+++ b/plugins/catalog-common/CHANGELOG.md
@@ -1,5 +1,14 @@
# @backstage/plugin-catalog-common
+## 1.1.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/plugin-permission-common@0.8.4-next.0
+ - @backstage/plugin-search-common@1.2.17-next.0
+
## 1.1.2
### Patch Changes
diff --git a/plugins/catalog-common/package.json b/plugins/catalog-common/package.json
index fc910d4a4b..ea8cfbe678 100644
--- a/plugins/catalog-common/package.json
+++ b/plugins/catalog-common/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-common",
- "version": "1.1.2",
+ "version": "1.1.3-next.0",
"description": "Common functionalities for the catalog plugin",
"backstage": {
"role": "common-library",
diff --git a/plugins/catalog-graph/CHANGELOG.md b/plugins/catalog-graph/CHANGELOG.md
index c6a2ce356f..78da59a0e8 100644
--- a/plugins/catalog-graph/CHANGELOG.md
+++ b/plugins/catalog-graph/CHANGELOG.md
@@ -1,5 +1,27 @@
# @backstage/plugin-catalog-graph
+## 0.4.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.9.4-next.0
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/types@1.2.1-next.0
+ - @backstage/core-compat-api@0.3.5-next.0
+ - @backstage/plugin-catalog-react@1.15.1-next.1
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/catalog-client@1.9.1-next.0
+
+## 0.4.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-catalog-react@1.15.1-next.0
+ - @backstage/core-compat-api@0.3.4
+
## 0.4.14
### Patch Changes
diff --git a/plugins/catalog-graph/package.json b/plugins/catalog-graph/package.json
index 1ef5c67c01..98cc47269e 100644
--- a/plugins/catalog-graph/package.json
+++ b/plugins/catalog-graph/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-graph",
- "version": "0.4.14",
+ "version": "0.4.15-next.1",
"backstage": {
"role": "frontend-plugin",
"pluginId": "catalog-graph",
diff --git a/plugins/catalog-import/CHANGELOG.md b/plugins/catalog-import/CHANGELOG.md
index ac6a423213..f902c4638d 100644
--- a/plugins/catalog-import/CHANGELOG.md
+++ b/plugins/catalog-import/CHANGELOG.md
@@ -1,5 +1,32 @@
# @backstage/plugin-catalog-import
+## 0.12.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.9.4-next.0
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/core-compat-api@0.3.5-next.0
+ - @backstage/plugin-catalog-react@1.15.1-next.1
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/integration-react@1.2.3-next.0
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/catalog-client@1.9.1-next.0
+ - @backstage/plugin-catalog-common@1.1.3-next.0
+ - @backstage/integration@1.16.1-next.0
+
+## 0.12.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-catalog-react@1.15.1-next.0
+ - @backstage/integration-react@1.2.2
+ - @backstage/core-compat-api@0.3.4
+
## 0.12.8
### Patch Changes
diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json
index e053cd5e85..0e13e4c931 100644
--- a/plugins/catalog-import/package.json
+++ b/plugins/catalog-import/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-import",
- "version": "0.12.8",
+ "version": "0.12.9-next.1",
"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 e66fc38c6e..e82df45202 100644
--- a/plugins/catalog-node/CHANGELOG.md
+++ b/plugins/catalog-node/CHANGELOG.md
@@ -1,5 +1,33 @@
# @backstage/plugin-catalog-node
+## 1.15.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-permission-common@0.8.4-next.0
+ - @backstage/plugin-permission-node@0.8.7-next.1
+ - @backstage/catalog-client@1.9.1-next.0
+ - @backstage/plugin-catalog-common@1.1.3-next.0
+
+## 1.15.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-permission-node@0.8.7-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-client@1.9.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/errors@1.2.6
+ - @backstage/types@1.2.0
+ - @backstage/plugin-catalog-common@1.1.2
+ - @backstage/plugin-permission-common@0.8.3
+
## 1.15.0
### Minor Changes
diff --git a/plugins/catalog-node/package.json b/plugins/catalog-node/package.json
index 62604a7f42..fccf7de35a 100644
--- a/plugins/catalog-node/package.json
+++ b/plugins/catalog-node/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog-node",
- "version": "1.15.0",
+ "version": "1.15.1-next.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 b3a1551889..1a05159ead 100644
--- a/plugins/catalog-react/CHANGELOG.md
+++ b/plugins/catalog-react/CHANGELOG.md
@@ -1,5 +1,34 @@
# @backstage/plugin-catalog-react
+## 1.15.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.9.4-next.0
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/types@1.2.1-next.0
+ - @backstage/core-compat-api@0.3.5-next.0
+ - @backstage/frontend-test-utils@0.2.5-next.0
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/integration-react@1.2.3-next.0
+ - @backstage/plugin-permission-react@0.4.30-next.0
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-permission-common@0.8.4-next.0
+ - @backstage/catalog-client@1.9.1-next.0
+ - @backstage/plugin-catalog-common@1.1.3-next.0
+ - @backstage/version-bridge@1.0.10
+
+## 1.15.1-next.0
+
+### Patch Changes
+
+- cbfc0a4: Fixed an issue where the `
+ {({ TransitionProps }) => (
+
+ {props.children as ReactNode}
+
+ )}
+
+);
+
+const PaperComponent = (props: PaperProps) => (
+ ,
+ 'PopperComponent' | 'PaperComponent' | 'popupIcon' | 'renderInput'
+> & {
+ name: string;
+ label?: string;
+ LabelProps?: TypographyProps<'label'>;
+ TextFieldProps?: Omit;
+ renderInput?: AutocompleteProps<
+ T,
+ Multiple,
+ DisableClearable,
+ FreeSolo
+ >['renderInput'];
+};
+
+export function CatalogAutocomplete<
+ T,
+ Multiple extends boolean | undefined = undefined,
+ DisableClearable extends boolean | undefined = undefined,
+ FreeSolo extends boolean | undefined = undefined,
+>(props: CatalogAutocompleteProps) {
+ const { label, name, LabelProps, TextFieldProps, ...rest } = props;
+ const classes = useStyles();
+ const renderInput = useCallback(
+ (params: AutocompleteRenderInputParams) => (
+
+ {label ? (
+
+ {label}
+ {autocomplete}
+
+ ) : (
+ autocomplete
+ )}
+
+ );
+}
diff --git a/plugins/catalog-react/src/components/CatalogAutocomplete/index.tsx b/plugins/catalog-react/src/components/CatalogAutocomplete/index.tsx
new file mode 100644
index 0000000000..7f1552c5bb
--- /dev/null
+++ b/plugins/catalog-react/src/components/CatalogAutocomplete/index.tsx
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2024 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 {
+ CatalogAutocomplete,
+ type CatalogAutocompleteProps,
+} from './CatalogAutocomplete';
diff --git a/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx b/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx
index fd88a7a31e..09b5c1e908 100644
--- a/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx
+++ b/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx
@@ -16,22 +16,19 @@
import Box from '@material-ui/core/Box';
import { TextFieldProps } from '@material-ui/core/TextField';
-import Typography from '@material-ui/core/Typography';
import { makeStyles } from '@material-ui/core/styles';
-import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
-import Autocomplete from '@material-ui/lab/Autocomplete';
-import React, { useEffect, useMemo, useState, ReactNode } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
import { useApi } from '@backstage/core-plugin-api';
import useAsync from 'react-use/esm/useAsync';
import { catalogApiRef } from '../../api';
import { EntityAutocompletePickerOption } from './EntityAutocompletePickerOption';
-import { EntityAutocompletePickerInput } from './EntityAutocompletePickerInput';
import {
DefaultEntityFilters,
useEntityList,
} from '../../hooks/useEntityListProvider';
import { EntityFilter } from '../../types';
import { reduceBackendCatalogFilters } from '../../utils/filters';
+import { CatalogAutocomplete } from '../CatalogAutocomplete';
/** @public */
export type AllowedEntityFilters = {
@@ -86,7 +83,6 @@ export function EntityAutocompletePicker<
initialSelectedOptions = [],
filtersForAvailableValues = ['kind'],
} = props;
-
const classes = useStyles();
const {
@@ -152,36 +148,26 @@ export function EntityAutocompletePicker<
return (
-
- {label}
-
- PopperComponent={popperProps => (
- {popperProps.children as ReactNode}
- )}
- multiple
- disableCloseOnSelect
- options={availableOptions}
- value={selectedOptions}
- onChange={(_event: object, options: string[]) =>
- setSelectedOptions(options)
- }
- renderOption={(option, { selected }) => (
-
+
+ multiple
+ disableCloseOnSelect
+ label={label}
+ name={`${String(name)}-picker`}
+ options={availableOptions}
+ value={selectedOptions}
+ TextFieldProps={InputProps}
+ onChange={(_event: object, options: string[]) =>
+ setSelectedOptions(options)
+ }
+ renderOption={(option, { selected }) => (
+
);
}
diff --git a/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePickerInput.tsx b/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePickerInput.tsx
deleted file mode 100644
index 133024330c..0000000000
--- a/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePickerInput.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2022 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 TextField, { TextFieldProps } from '@material-ui/core/TextField';
-import { createStyles, makeStyles, Theme } from '@material-ui/core/styles';
-import React from 'react';
-import classnames from 'classnames';
-
-const useStyles = makeStyles(
- (theme: Theme) =>
- createStyles({
- input: {
- backgroundColor: theme.palette.background.paper,
- },
- }),
- {
- name: 'CatalogReactEntityAutocompletePickerInput',
- },
-);
-
-export function EntityAutocompletePickerInput(params: TextFieldProps) {
- const classes = useStyles();
-
- return (
- (
queryParamOwners.length ? queryParamOwners : filters.owners?.values ?? [],
);
@@ -186,84 +177,69 @@ export const EntityOwnerPicker = (props?: EntityOwnerPickerProps) => {
return (
-
- {t('entityOwnerPicker.title')}
- {
- if (typeof v === 'string') {
- return stringifyEntityRef(o) === v;
- }
- return o === v;
- }}
- getOptionLabel={o => {
- const entity =
- typeof o === 'string'
- ? cache.getEntity(o) ||
- parseEntityRef(o, {
- defaultKind: 'group',
- defaultNamespace: 'default',
- })
- : o;
- return humanizeEntity(entity, humanizeEntityRef(entity));
- }}
- onChange={(_: object, owners) => {
- setText('');
- setSelectedOwners(
- owners.map(e => {
- const entityRef =
- typeof e === 'string' ? e : stringifyEntityRef(e);
+
+ label={t('entityOwnerPicker.title')}
+ multiple
+ disableCloseOnSelect
+ loading={loading}
+ options={availableOwners}
+ value={selectedOwners as unknown as Entity[]}
+ getOptionSelected={(o, v) => {
+ if (typeof v === 'string') {
+ return stringifyEntityRef(o) === v;
+ }
+ return o === v;
+ }}
+ getOptionLabel={o => {
+ const entity =
+ typeof o === 'string'
+ ? cache.getEntity(o) ||
+ parseEntityRef(o, {
+ defaultKind: 'group',
+ defaultNamespace: 'default',
+ })
+ : o;
+ return humanizeEntity(entity, humanizeEntityRef(entity));
+ }}
+ onChange={(_: object, owners) => {
+ setText('');
+ setSelectedOwners(
+ owners.map(e => {
+ const entityRef =
+ typeof e === 'string' ? e : stringifyEntityRef(e);
- if (typeof e !== 'string') {
- cache.setEntity(e);
- }
- return entityRef;
- }),
- );
- }}
- filterOptions={x => x}
- renderOption={(entity, { selected }) => {
- return {
- setText(e.currentTarget.value);
- }}
- variant="outlined"
- />
- )}
- ListboxProps={{
- onScroll: (e: React.MouseEvent) => {
- const element = e.currentTarget;
- const hasReachedEnd =
- Math.abs(
- element.scrollHeight -
- element.clientHeight -
- element.scrollTop,
- ) < 1;
-
- if (hasReachedEnd && value?.cursor) {
- handleFetch({ items: value.items, cursor: value.cursor });
+ if (typeof e !== 'string') {
+ cache.setEntity(e);
}
- },
- 'data-testid': 'owner-picker-listbox',
- }}
- />
-
+ return entityRef;
+ }),
+ );
+ }}
+ filterOptions={x => x}
+ renderOption={(entity, { selected }) => {
+ return
);
};
-
-function Popper({ children }: PopperProps) {
- return {children as ReactNode}
;
-}
diff --git a/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.tsx b/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.tsx
index a2f0c8f729..a1b6e5b562 100644
--- a/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.tsx
+++ b/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.tsx
@@ -18,33 +18,24 @@ import { EntityErrorFilter, EntityOrphanFilter } from '../../filters';
import Box from '@material-ui/core/Box';
import Checkbox from '@material-ui/core/Checkbox';
import FormControlLabel from '@material-ui/core/FormControlLabel';
-import TextField from '@material-ui/core/TextField';
-import Typography from '@material-ui/core/Typography';
-import { createStyles, makeStyles, Theme } from '@material-ui/core/styles';
+import { makeStyles } from '@material-ui/core/styles';
import CheckBoxIcon from '@material-ui/icons/CheckBox';
import CheckBoxOutlineBlankIcon from '@material-ui/icons/CheckBoxOutlineBlank';
-import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
-import React, { useState, ReactNode } from 'react';
+import React, { useState } from 'react';
import { useEntityList } from '../../hooks';
-import Autocomplete from '@material-ui/lab/Autocomplete';
import { catalogReactTranslationRef } from '../../translation';
import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
+import { CatalogAutocomplete } from '../CatalogAutocomplete';
/** @public */
export type CatalogReactEntityProcessingStatusPickerClassKey = 'input';
const useStyles = makeStyles(
- (theme: Theme) =>
- createStyles({
- root: {},
- input: {
- backgroundColor: theme.palette.background.paper,
- },
- label: {
- textTransform: 'none',
- fontWeight: 'bold',
- },
- }),
+ {
+ root: {},
+ input: {},
+ label: {},
+ },
{ name: 'CatalogReactEntityProcessingStatusPickerPicker' },
);
@@ -77,47 +68,34 @@ export const EntityProcessingStatusPicker = () => {
return (
-
- {t('entityProcessingStatusPicker.title')}
-
- PopperComponent={popperProps => (
- {popperProps.children as ReactNode}
- )}
- multiple
- disableCloseOnSelect
- options={availableAdvancedItems}
- value={selectedAdvancedItems}
- onChange={(_: object, value: string[]) => {
- setSelectedAdvancedItems(value);
- orphanChange(value.includes('Is Orphan'));
- errorChange(value.includes('Has Error'));
- }}
- renderOption={(option, { selected }) => (
-
+
+ label={t('entityProcessingStatusPicker.title')}
+ multiple
+ disableCloseOnSelect
+ options={availableAdvancedItems}
+ value={selectedAdvancedItems}
+ onChange={(_: object, value: string[]) => {
+ setSelectedAdvancedItems(value);
+ orphanChange(value.includes('Is Orphan'));
+ errorChange(value.includes('Has Error'));
+ }}
+ renderOption={(option, { selected }) => (
+
);
};
diff --git a/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx b/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx
index 8701c56301..2a922cf417 100644
--- a/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx
+++ b/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx
@@ -555,7 +555,7 @@ describe('(
: 'none';
};
- const paginationMode: PaginationMode = getPaginationMode();
+ const paginationMode = getPaginationMode();
const paginationLimit =
typeof props.pagination === 'object' ? props.pagination.limit ?? 20 : 20;
@@ -227,7 +227,7 @@ export const EntityListProvider = (
appliedFilters: {} as EntityFilters,
entities: [],
backendEntities: [],
- pageInfo: paginationMode === 'cursor' ? {} : undefined,
+ pageInfo: {},
offset,
limit,
};
@@ -279,7 +279,8 @@ export const EntityListProvider = (
);
if (
- paginationMode === 'offset' ||
+ (paginationMode === 'offset' &&
+ (outputState.limit !== limit || outputState.offset !== offset)) ||
!isEqual(previousBackendFilter, backendFilter)
) {
const response = await catalogApi.queryEntities({
diff --git a/plugins/catalog-unprocessed-entities-common/CHANGELOG.md b/plugins/catalog-unprocessed-entities-common/CHANGELOG.md
index 96700a091a..5da2451dbe 100644
--- a/plugins/catalog-unprocessed-entities-common/CHANGELOG.md
+++ b/plugins/catalog-unprocessed-entities-common/CHANGELOG.md
@@ -1,5 +1,12 @@
# @backstage/plugin-catalog-unprocessed-entities-common
+## 0.0.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-permission-common@0.8.4-next.0
+
## 0.0.6
### Patch Changes
diff --git a/plugins/catalog-unprocessed-entities-common/package.json b/plugins/catalog-unprocessed-entities-common/package.json
index 43ada59ccb..d11cc64131 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.6",
+ "version": "0.0.7-next.0",
"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 2ad22c3d28..268e860faa 100644
--- a/plugins/catalog-unprocessed-entities/CHANGELOG.md
+++ b/plugins/catalog-unprocessed-entities/CHANGELOG.md
@@ -1,5 +1,15 @@
# @backstage/plugin-catalog-unprocessed-entities
+## 0.2.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/errors@1.2.7-next.0
+
## 0.2.12
### Patch Changes
diff --git a/plugins/catalog-unprocessed-entities/package.json b/plugins/catalog-unprocessed-entities/package.json
index 8f60d8be73..89cfc75e18 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.12",
+ "version": "0.2.13-next.0",
"backstage": {
"role": "frontend-plugin",
"pluginId": "catalog-unprocessed-entities",
diff --git a/plugins/catalog/CHANGELOG.md b/plugins/catalog/CHANGELOG.md
index e3b9a2f423..99fdf53768 100644
--- a/plugins/catalog/CHANGELOG.md
+++ b/plugins/catalog/CHANGELOG.md
@@ -1,5 +1,36 @@
# @backstage/plugin-catalog
+## 1.26.1-next.1
+
+### Patch Changes
+
+- 208e53b: Fixing spelling mistake in translation
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.9.4-next.0
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/types@1.2.1-next.0
+ - @backstage/core-compat-api@0.3.5-next.0
+ - @backstage/plugin-catalog-react@1.15.1-next.1
+ - @backstage/plugin-search-react@1.8.5-next.0
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/integration-react@1.2.3-next.0
+ - @backstage/plugin-permission-react@0.4.30-next.0
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-scaffolder-common@1.5.9-next.0
+ - @backstage/plugin-search-common@1.2.17-next.0
+ - @backstage/catalog-client@1.9.1-next.0
+ - @backstage/plugin-catalog-common@1.1.3-next.0
+
+## 1.26.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-catalog-react@1.15.1-next.0
+ - @backstage/integration-react@1.2.2
+ - @backstage/core-compat-api@0.3.4
+
## 1.26.0
### Minor Changes
diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json
index a2f2ecddd2..ef17de69ce 100644
--- a/plugins/catalog/package.json
+++ b/plugins/catalog/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-catalog",
- "version": "1.26.0",
+ "version": "1.26.1-next.1",
"description": "The Backstage plugin for browsing the Backstage catalog",
"backstage": {
"role": "frontend-plugin",
diff --git a/plugins/catalog/report-alpha.api.md b/plugins/catalog/report-alpha.api.md
index 3a9f0c6c33..bdd9240d53 100644
--- a/plugins/catalog/report-alpha.api.md
+++ b/plugins/catalog/report-alpha.api.md
@@ -115,7 +115,7 @@ export const catalogTranslationRef: TranslationRef<
readonly 'hasSystemsCard.emptyMessage': 'No system is part of this domain';
readonly 'relatedEntitiesCard.emptyHelpLinkTitle': 'Learn how to change this';
readonly 'systemDiagramCard.title': 'System Diagram';
- readonly 'systemDiagramCard.description': 'Use pinch & zoo to move around the diagram.';
+ readonly 'systemDiagramCard.description': 'Use pinch & zoom to move around the diagram.';
readonly 'systemDiagramCard.edgeLabels.dependsOn': 'depends on';
readonly 'systemDiagramCard.edgeLabels.partOf': 'part of';
readonly 'systemDiagramCard.edgeLabels.provides': 'provides';
diff --git a/plugins/catalog/src/alpha/translation.ts b/plugins/catalog/src/alpha/translation.ts
index e5e6fa18e2..2dc2f2d34e 100644
--- a/plugins/catalog/src/alpha/translation.ts
+++ b/plugins/catalog/src/alpha/translation.ts
@@ -156,7 +156,7 @@ export const catalogTranslationRef = createTranslationRef({
},
systemDiagramCard: {
title: 'System Diagram',
- description: 'Use pinch & zoo to move around the diagram.',
+ description: 'Use pinch & zoom to move around the diagram.',
edgeLabels: {
partOf: 'part of',
provides: 'provides',
diff --git a/plugins/catalog/src/components/AboutCard/AboutCard.tsx b/plugins/catalog/src/components/AboutCard/AboutCard.tsx
index cf4a3c2d43..4039c88b38 100644
--- a/plugins/catalog/src/components/AboutCard/AboutCard.tsx
+++ b/plugins/catalog/src/components/AboutCard/AboutCard.tsx
@@ -104,7 +104,7 @@ export interface AboutCardProps {
* Exported publicly via the EntityAboutCard
*
* NOTE: We generally do not accept pull requests to extend this class with more
- * props and cusomizability. If you need to tweak it, consider making a bespoke
+ * props and customizability. If you need to tweak it, consider making a bespoke
* card in your own repository instead, that is perfect for your own needs.
*/
export function AboutCard(props: AboutCardProps) {
diff --git a/plugins/catalog/src/plugin.ts b/plugins/catalog/src/plugin.ts
index a339ff31a8..50d858a45f 100644
--- a/plugins/catalog/src/plugin.ts
+++ b/plugins/catalog/src/plugin.ts
@@ -27,6 +27,7 @@ import {
createFromTemplateRouteRef,
unregisterRedirectRouteRef,
viewTechDocRouteRef,
+ rootRouteRef,
} from './routes';
import {
createApiFactory,
@@ -54,7 +55,6 @@ import { HasSubdomainsCardProps } from './components/HasSubdomainsCard';
import { HasSystemsCardProps } from './components/HasSystemsCard';
import { RelatedEntitiesCardProps } from './components/RelatedEntitiesCard';
import { CatalogSearchResultListItemProps } from './components/CatalogSearchResultListItem';
-import { rootRouteRef } from './routes';
import { DefaultEntityPresentationApi } from './apis/EntityPresentationApi';
/** @public */
diff --git a/plugins/config-schema/CHANGELOG.md b/plugins/config-schema/CHANGELOG.md
index b9f754aa56..ef400bebb6 100644
--- a/plugins/config-schema/CHANGELOG.md
+++ b/plugins/config-schema/CHANGELOG.md
@@ -1,5 +1,15 @@
# @backstage/plugin-config-schema
+## 0.1.64-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/types@1.2.1-next.0
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/errors@1.2.7-next.0
+
## 0.1.63
### Patch Changes
diff --git a/plugins/config-schema/package.json b/plugins/config-schema/package.json
index 66846633b9..535833a466 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.63",
+ "version": "0.1.64-next.0",
"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 fe70fcb8e5..156a108e6e 100644
--- a/plugins/devtools-backend/CHANGELOG.md
+++ b/plugins/devtools-backend/CHANGELOG.md
@@ -1,5 +1,38 @@
# @backstage/plugin-devtools-backend
+## 0.5.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/backend-defaults@0.7.0-next.1
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/config-loader@1.9.5-next.1
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-devtools-common@0.1.15-next.0
+ - @backstage/plugin-permission-common@0.8.4-next.0
+ - @backstage/plugin-permission-node@0.8.7-next.1
+ - @backstage/cli-common@0.1.15
+
+## 0.5.1-next.0
+
+### Patch Changes
+
+- ec547b8: Remove the error handler middleware, since that is now provided by the framework
+- Updated dependencies
+ - @backstage/backend-defaults@0.7.0-next.0
+ - @backstage/config-loader@1.9.5-next.0
+ - @backstage/plugin-permission-node@0.8.7-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/cli-common@0.1.15
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/types@1.2.0
+ - @backstage/plugin-devtools-common@0.1.14
+ - @backstage/plugin-permission-common@0.8.3
+
## 0.5.0
### Minor Changes
diff --git a/plugins/devtools-backend/package.json b/plugins/devtools-backend/package.json
index 45d17bdeaf..1ecb6c3d05 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.0",
+ "version": "0.5.1-next.1",
"backstage": {
"role": "backend-plugin",
"pluginId": "devtools",
diff --git a/plugins/devtools-backend/src/service/router.ts b/plugins/devtools-backend/src/service/router.ts
index adcb79c4cd..ad77495b36 100644
--- a/plugins/devtools-backend/src/service/router.ts
+++ b/plugins/devtools-backend/src/service/router.ts
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
import { AuthorizeResult } from '@backstage/plugin-permission-common';
import {
devToolsConfigReadPermission,
@@ -20,7 +21,6 @@ import {
devToolsInfoReadPermission,
devToolsPermissions,
} from '@backstage/plugin-devtools-common';
-
import { DevToolsBackendApi } from '../api';
import { NotAllowedError } from '@backstage/errors';
import Router from 'express-promise-router';
@@ -33,7 +33,6 @@ import {
PermissionsService,
RootConfigService,
} from '@backstage/backend-plugin-api';
-import { MiddlewareFactory } from '@backstage/backend-defaults/rootHttpRouter';
/**
* @internal
@@ -121,8 +120,5 @@ export async function createRouter(
response.status(200).json(health);
});
- const middleware = MiddlewareFactory.create({ logger, config });
-
- router.use(middleware.error());
return router;
}
diff --git a/plugins/devtools-common/CHANGELOG.md b/plugins/devtools-common/CHANGELOG.md
index 59d3cc733c..29340a093d 100644
--- a/plugins/devtools-common/CHANGELOG.md
+++ b/plugins/devtools-common/CHANGELOG.md
@@ -1,5 +1,13 @@
# @backstage/plugin-devtools-common
+## 0.1.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/plugin-permission-common@0.8.4-next.0
+
## 0.1.14
### Patch Changes
diff --git a/plugins/devtools-common/package.json b/plugins/devtools-common/package.json
index e5c3c6a821..07151a2819 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.14",
+ "version": "0.1.15-next.0",
"description": "Common functionalities for the devtools plugin",
"backstage": {
"role": "common-library",
diff --git a/plugins/devtools/CHANGELOG.md b/plugins/devtools/CHANGELOG.md
index 790464a4a4..89c111fe17 100644
--- a/plugins/devtools/CHANGELOG.md
+++ b/plugins/devtools/CHANGELOG.md
@@ -1,5 +1,18 @@
# @backstage/plugin-devtools
+## 0.1.23-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.9.4-next.0
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/core-compat-api@0.3.5-next.0
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/plugin-permission-react@0.4.30-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-devtools-common@0.1.15-next.0
+
## 0.1.22
### Patch Changes
diff --git a/plugins/devtools/package.json b/plugins/devtools/package.json
index 8f0e1c9fbb..fe7b9b4ad8 100644
--- a/plugins/devtools/package.json
+++ b/plugins/devtools/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-devtools",
- "version": "0.1.22",
+ "version": "0.1.23-next.0",
"backstage": {
"role": "frontend-plugin",
"pluginId": "devtools",
diff --git a/plugins/events-backend-module-aws-sqs/CHANGELOG.md b/plugins/events-backend-module-aws-sqs/CHANGELOG.md
index 12cac86542..78daf43ea1 100644
--- a/plugins/events-backend-module-aws-sqs/CHANGELOG.md
+++ b/plugins/events-backend-module-aws-sqs/CHANGELOG.md
@@ -1,5 +1,25 @@
# @backstage/plugin-events-backend-module-aws-sqs
+## 0.4.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/plugin-events-node@0.4.7-next.1
+
+## 0.4.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/types@1.2.0
+ - @backstage/plugin-events-node@0.4.7-next.0
+
## 0.4.6
### Patch Changes
diff --git a/plugins/events-backend-module-aws-sqs/package.json b/plugins/events-backend-module-aws-sqs/package.json
index ebe9afa141..f6df586632 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.6",
+ "version": "0.4.7-next.1",
"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 53ec57fc6a..8ad191a016 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.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/plugin-events-node@0.4.7-next.1
+
+## 0.2.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/plugin-events-node@0.4.7-next.0
+
## 0.2.15
### Patch Changes
diff --git a/plugins/events-backend-module-azure/package.json b/plugins/events-backend-module-azure/package.json
index cc2fedfc5a..0cba4a8c15 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.15",
+ "version": "0.2.16-next.1",
"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 ab94e89e59..9e6a2ba709 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.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/plugin-events-node@0.4.7-next.1
+
+## 0.2.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/plugin-events-node@0.4.7-next.0
+
## 0.2.15
### Patch Changes
diff --git a/plugins/events-backend-module-bitbucket-cloud/package.json b/plugins/events-backend-module-bitbucket-cloud/package.json
index 8e2fc8fffe..7e46e34778 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.15",
+ "version": "0.2.16-next.1",
"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 5bdeecff0b..900e474ad4 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.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/plugin-events-node@0.4.7-next.1
+
+## 0.2.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/plugin-events-node@0.4.7-next.0
+
## 0.2.15
### Patch Changes
diff --git a/plugins/events-backend-module-gerrit/package.json b/plugins/events-backend-module-gerrit/package.json
index 9a5ece50fe..18943476dd 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.15",
+ "version": "0.2.16-next.1",
"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 be616b132c..0d9ca3bd96 100644
--- a/plugins/events-backend-module-github/CHANGELOG.md
+++ b/plugins/events-backend-module-github/CHANGELOG.md
@@ -1,5 +1,23 @@
# @backstage/plugin-events-backend-module-github
+## 0.2.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/plugin-events-node@0.4.7-next.1
+
+## 0.2.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/plugin-events-node@0.4.7-next.0
+
## 0.2.15
### Patch Changes
diff --git a/plugins/events-backend-module-github/package.json b/plugins/events-backend-module-github/package.json
index 1620e3dcbe..aa591f7a8d 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.2.15",
+ "version": "0.2.16-next.1",
"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 9063fa0942..2d90696d77 100644
--- a/plugins/events-backend-module-gitlab/CHANGELOG.md
+++ b/plugins/events-backend-module-gitlab/CHANGELOG.md
@@ -1,5 +1,23 @@
# @backstage/plugin-events-backend-module-gitlab
+## 0.2.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/plugin-events-node@0.4.7-next.1
+
+## 0.2.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/plugin-events-node@0.4.7-next.0
+
## 0.2.15
### Patch Changes
diff --git a/plugins/events-backend-module-gitlab/package.json b/plugins/events-backend-module-gitlab/package.json
index 64b96ecf73..5ebb4ee13c 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.2.15",
+ "version": "0.2.16-next.1",
"backstage": {
"role": "backend-plugin-module",
"pluginId": "events",
diff --git a/plugins/events-backend-test-utils/CHANGELOG.md b/plugins/events-backend-test-utils/CHANGELOG.md
index a18cfaf65f..f74a52ed21 100644
--- a/plugins/events-backend-test-utils/CHANGELOG.md
+++ b/plugins/events-backend-test-utils/CHANGELOG.md
@@ -1,5 +1,19 @@
# @backstage/plugin-events-backend-test-utils
+## 0.1.40-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.7-next.1
+
+## 0.1.40-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-events-node@0.4.7-next.0
+
## 0.1.39
### Patch Changes
diff --git a/plugins/events-backend-test-utils/package.json b/plugins/events-backend-test-utils/package.json
index dd4e087668..69d53122c9 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.39",
+ "version": "0.1.40-next.1",
"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 94b699e30a..49543a6e0b 100644
--- a/plugins/events-backend/CHANGELOG.md
+++ b/plugins/events-backend/CHANGELOG.md
@@ -1,5 +1,30 @@
# @backstage/plugin-events-backend
+## 0.4.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/backend-openapi-utils@0.4.1-next.1
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-events-node@0.4.7-next.1
+
+## 0.4.1-next.0
+
+### Patch Changes
+
+- d9d62ef: Remove some internal usages of the backend-common package
+- Updated dependencies
+ - @backstage/backend-openapi-utils@0.4.1-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/types@1.2.0
+ - @backstage/plugin-events-node@0.4.7-next.0
+
## 0.4.0
### Minor Changes
diff --git a/plugins/events-backend/package.json b/plugins/events-backend/package.json
index 2ea87c5b23..06bf20ef49 100644
--- a/plugins/events-backend/package.json
+++ b/plugins/events-backend/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-events-backend",
- "version": "0.4.0",
+ "version": "0.4.1-next.1",
"backstage": {
"role": "backend-plugin",
"pluginId": "events",
diff --git a/plugins/events-backend/src/service/http/HttpPostIngressEventPublisher.test.ts b/plugins/events-backend/src/service/http/HttpPostIngressEventPublisher.test.ts
index 32a24de169..16f36d6b0a 100644
--- a/plugins/events-backend/src/service/http/HttpPostIngressEventPublisher.test.ts
+++ b/plugins/events-backend/src/service/http/HttpPostIngressEventPublisher.test.ts
@@ -21,6 +21,12 @@ import Router from 'express-promise-router';
import request from 'supertest';
import { HttpPostIngressEventPublisher } from './HttpPostIngressEventPublisher';
import { mockServices } from '@backstage/backend-test-utils';
+import { MiddlewareFactory } from '@backstage/backend-defaults/rootHttpRouter';
+
+const middleware = MiddlewareFactory.create({
+ logger: mockServices.logger.mock(),
+ config: mockServices.rootConfig(),
+});
describe('HttpPostIngressEventPublisher', () => {
const logger = mockServices.logger.mock();
@@ -110,6 +116,7 @@ describe('HttpPostIngressEventPublisher', () => {
logger,
});
publisher.bind(router);
+ router.use(middleware.error());
const response = await request(app)
.post('/http/testA')
@@ -124,7 +131,7 @@ describe('HttpPostIngressEventPublisher', () => {
'Failed to retrieve raw body from incoming event for topic testA; not a buffer: object',
name: 'Error',
},
- request: { method: 'POST', url: '/testA' },
+ request: { method: 'POST', url: '/http/testA' },
response: { statusCode: 500 },
}),
);
@@ -149,6 +156,7 @@ describe('HttpPostIngressEventPublisher', () => {
logger,
});
publisher.bind(router);
+ router.use(middleware.error());
const response = await request(app)
.post('/http/testA')
@@ -163,7 +171,7 @@ describe('HttpPostIngressEventPublisher', () => {
name: 'UnsupportedCharsetError',
statusCode: 415,
},
- request: { method: 'POST', url: '/testA' },
+ request: { method: 'POST', url: '/http/testA' },
response: { statusCode: 415 },
}),
);
@@ -188,6 +196,7 @@ describe('HttpPostIngressEventPublisher', () => {
logger,
});
publisher.bind(router);
+ router.use(middleware.error());
const response = await request(app)
.post('/http/testA')
@@ -202,7 +211,7 @@ describe('HttpPostIngressEventPublisher', () => {
name: 'UnsupportedMediaTypeError',
statusCode: 415,
},
- request: { method: 'POST', url: '/testA' },
+ request: { method: 'POST', url: '/http/testA' },
response: { statusCode: 415 },
}),
);
diff --git a/plugins/events-backend/src/service/http/HttpPostIngressEventPublisher.ts b/plugins/events-backend/src/service/http/HttpPostIngressEventPublisher.ts
index fe17186856..806247e870 100644
--- a/plugins/events-backend/src/service/http/HttpPostIngressEventPublisher.ts
+++ b/plugins/events-backend/src/service/http/HttpPostIngressEventPublisher.ts
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-import { errorHandler } from '@backstage/backend-common';
import { LoggerService } from '@backstage/backend-plugin-api';
import { Config } from '@backstage/config';
import { CustomErrorBase } from '@backstage/errors';
@@ -97,7 +96,6 @@ export class HttpPostIngressEventPublisher {
this.addRouteForTopic(router, topic, ingresses[topic].validator),
);
- router.use(errorHandler());
return router;
}
diff --git a/plugins/events-node/CHANGELOG.md b/plugins/events-node/CHANGELOG.md
index d0b1159a49..095c2e2e4e 100644
--- a/plugins/events-node/CHANGELOG.md
+++ b/plugins/events-node/CHANGELOG.md
@@ -1,5 +1,23 @@
# @backstage/plugin-events-node
+## 0.4.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/errors@1.2.7-next.0
+
+## 0.4.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/errors@1.2.6
+ - @backstage/types@1.2.0
+
## 0.4.6
### Patch Changes
diff --git a/plugins/events-node/package.json b/plugins/events-node/package.json
index 0e5349581b..99acc474e0 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.6",
+ "version": "0.4.7-next.1",
"description": "The plugin-events-node module for @backstage/plugin-events-backend",
"backstage": {
"role": "node-library",
diff --git a/plugins/example-todo-list-backend/CHANGELOG.md b/plugins/example-todo-list-backend/CHANGELOG.md
index d9cd27df72..215919311a 100644
--- a/plugins/example-todo-list-backend/CHANGELOG.md
+++ b/plugins/example-todo-list-backend/CHANGELOG.md
@@ -1,5 +1,23 @@
# @internal/plugin-todo-list-backend
+## 1.0.35-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-auth-node@0.5.6-next.1
+
+## 1.0.35-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.5.6-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/errors@1.2.6
+
## 1.0.34
### Patch Changes
diff --git a/plugins/example-todo-list-backend/package.json b/plugins/example-todo-list-backend/package.json
index 37d897ba21..5aa5071492 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.34",
+ "version": "1.0.35-next.1",
"backstage": {
"role": "backend-plugin",
"pluginId": "todo-list",
diff --git a/plugins/example-todo-list-backend/src/service/router.ts b/plugins/example-todo-list-backend/src/service/router.ts
index abadbbb4d9..9ff4c6e91b 100644
--- a/plugins/example-todo-list-backend/src/service/router.ts
+++ b/plugins/example-todo-list-backend/src/service/router.ts
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-import { errorHandler } from '@backstage/backend-common';
import express from 'express';
import Router from 'express-promise-router';
import { add, getAll, update } from './todos';
@@ -75,7 +74,6 @@ export async function createRouter(
res.json(update(req.body));
});
- router.use(errorHandler());
return router;
}
diff --git a/plugins/example-todo-list-common/CHANGELOG.md b/plugins/example-todo-list-common/CHANGELOG.md
index dfa17595da..22793e6d9e 100644
--- a/plugins/example-todo-list-common/CHANGELOG.md
+++ b/plugins/example-todo-list-common/CHANGELOG.md
@@ -1,5 +1,12 @@
# @internal/plugin-todo-list-common
+## 1.0.24-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-permission-common@0.8.4-next.0
+
## 1.0.23
### Patch Changes
diff --git a/plugins/example-todo-list-common/package.json b/plugins/example-todo-list-common/package.json
index 09f1545bc7..e2d62d8caf 100644
--- a/plugins/example-todo-list-common/package.json
+++ b/plugins/example-todo-list-common/package.json
@@ -1,6 +1,6 @@
{
"name": "@internal/plugin-todo-list-common",
- "version": "1.0.23",
+ "version": "1.0.24-next.0",
"backstage": {
"role": "common-library",
"pluginId": "todo-list",
diff --git a/plugins/example-todo-list/CHANGELOG.md b/plugins/example-todo-list/CHANGELOG.md
index adc0d4a669..8846473b5f 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.35-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/core-components@0.16.3-next.0
+
## 1.0.34
### Patch Changes
diff --git a/plugins/example-todo-list/package.json b/plugins/example-todo-list/package.json
index 84ee24abd4..d1e467c03c 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.34",
+ "version": "1.0.35-next.0",
"backstage": {
"role": "frontend-plugin",
"pluginId": "todo-list",
diff --git a/plugins/home-react/CHANGELOG.md b/plugins/home-react/CHANGELOG.md
index 90d5b1a3f4..a0919210f9 100644
--- a/plugins/home-react/CHANGELOG.md
+++ b/plugins/home-react/CHANGELOG.md
@@ -1,5 +1,22 @@
# @backstage/plugin-home-react
+## 0.1.22-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/core-components@0.16.3-next.0
+
+## 0.1.22-next.0
+
+### Patch Changes
+
+- d8f9079: Updated dependency `@rjsf/utils` to `5.23.2`.
+ Updated dependency `@rjsf/core` to `5.23.2`.
+ Updated dependency `@rjsf/material-ui` to `5.23.2`.
+ Updated dependency `@rjsf/validator-ajv8` to `5.23.2`.
+
## 0.1.21
### Patch Changes
diff --git a/plugins/home-react/package.json b/plugins/home-react/package.json
index 5d17c8626b..51679b21c8 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.21",
+ "version": "0.1.22-next.1",
"description": "A Backstage plugin that contains react components helps you build a home page",
"backstage": {
"role": "web-library",
@@ -46,7 +46,7 @@
"@backstage/core-plugin-api": "workspace:^",
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
- "@rjsf/utils": "5.23.1"
+ "@rjsf/utils": "5.23.2"
},
"devDependencies": {
"@backstage/cli": "workspace:^",
diff --git a/plugins/home/CHANGELOG.md b/plugins/home/CHANGELOG.md
index 7946fdbb7b..b20b9e5b77 100644
--- a/plugins/home/CHANGELOG.md
+++ b/plugins/home/CHANGELOG.md
@@ -1,5 +1,53 @@
# @backstage/plugin-home
+## 0.8.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.9.4-next.0
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/core-compat-api@0.3.5-next.0
+ - @backstage/plugin-catalog-react@1.15.1-next.1
+ - @backstage/core-app-api@1.15.4-next.0
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/plugin-home-react@0.1.22-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/catalog-client@1.9.1-next.0
+ - @backstage/theme@0.6.3
+
+## 0.8.4-next.1
+
+### Patch Changes
+
+- d8f9079: Updated dependency `@rjsf/utils` to `5.23.2`.
+ Updated dependency `@rjsf/core` to `5.23.2`.
+ Updated dependency `@rjsf/material-ui` to `5.23.2`.
+ Updated dependency `@rjsf/validator-ajv8` to `5.23.2`.
+- Updated dependencies
+ - @backstage/plugin-catalog-react@1.15.1-next.0
+ - @backstage/plugin-home-react@0.1.22-next.0
+ - @backstage/core-compat-api@0.3.4
+
+## 0.8.4-next.0
+
+### Patch Changes
+
+- 7932f1e: Exported `QuickStartCard` component.
+- Updated dependencies
+ - @backstage/catalog-client@1.9.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/config@1.3.1
+ - @backstage/core-app-api@1.15.3
+ - @backstage/core-compat-api@0.3.4
+ - @backstage/core-components@0.16.2
+ - @backstage/core-plugin-api@1.10.2
+ - @backstage/frontend-plugin-api@0.9.3
+ - @backstage/theme@0.6.3
+ - @backstage/plugin-catalog-react@1.15.0
+ - @backstage/plugin-home-react@0.1.21
+
## 0.8.3
### Patch Changes
diff --git a/plugins/home/package.json b/plugins/home/package.json
index efadf8aaeb..7d3b35d40a 100644
--- a/plugins/home/package.json
+++ b/plugins/home/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-home",
- "version": "0.8.3",
+ "version": "0.8.4-next.2",
"description": "A Backstage plugin that helps you build a home page",
"backstage": {
"role": "frontend-plugin",
@@ -70,10 +70,10 @@
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.61",
- "@rjsf/core": "5.23.1",
- "@rjsf/material-ui": "5.23.1",
- "@rjsf/utils": "5.23.1",
- "@rjsf/validator-ajv8": "5.23.1",
+ "@rjsf/core": "5.23.2",
+ "@rjsf/material-ui": "5.23.2",
+ "@rjsf/utils": "5.23.2",
+ "@rjsf/validator-ajv8": "5.23.2",
"lodash": "^4.17.21",
"luxon": "^3.4.3",
"react-grid-layout": "1.3.4",
diff --git a/plugins/home/report.api.md b/plugins/home/report.api.md
index 878d8ef646..1cff56f50c 100644
--- a/plugins/home/report.api.md
+++ b/plugins/home/report.api.md
@@ -187,6 +187,11 @@ export type LayoutConfiguration = {
// @public
export type Operators = '<' | '<=' | '==' | '!=' | '>' | '>=' | 'contains';
+// @public
+export const QuickStartCard: (
+ props: CardExtensionProps_2,
+) => JSX_2.Element;
+
// @public
export type QuickStartCardProps = {
modalTitle?: string | React_2.JSX.Element;
diff --git a/plugins/home/src/index.ts b/plugins/home/src/index.ts
index 154186f169..3a6f152d03 100644
--- a/plugins/home/src/index.ts
+++ b/plugins/home/src/index.ts
@@ -35,6 +35,7 @@ export {
HomePageTopVisited,
HomePageRecentlyVisited,
FeaturedDocsCard,
+ QuickStartCard,
} from './plugin';
export * from './components';
export * from './assets';
diff --git a/plugins/kubernetes-backend/CHANGELOG.md b/plugins/kubernetes-backend/CHANGELOG.md
index 84fc7b644e..f18719e721 100644
--- a/plugins/kubernetes-backend/CHANGELOG.md
+++ b/plugins/kubernetes-backend/CHANGELOG.md
@@ -1,5 +1,43 @@
# @backstage/plugin-kubernetes-backend
+## 0.19.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-auth-node@0.5.6-next.1
+ - @backstage/plugin-catalog-node@1.15.1-next.1
+ - @backstage/plugin-kubernetes-common@0.9.2-next.0
+ - @backstage/plugin-kubernetes-node@0.2.2-next.1
+ - @backstage/plugin-permission-common@0.8.4-next.0
+ - @backstage/integration-aws-node@0.1.15-next.0
+ - @backstage/plugin-permission-node@0.8.7-next.1
+ - @backstage/catalog-client@1.9.1-next.0
+
+## 0.19.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-permission-node@0.8.7-next.0
+ - @backstage/plugin-auth-node@0.5.6-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-client@1.9.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/integration-aws-node@0.1.14
+ - @backstage/types@1.2.0
+ - @backstage/plugin-catalog-node@1.15.1-next.0
+ - @backstage/plugin-kubernetes-common@0.9.1
+ - @backstage/plugin-kubernetes-node@0.2.2-next.0
+ - @backstage/plugin-permission-common@0.8.3
+
## 0.19.1
### Patch Changes
diff --git a/plugins/kubernetes-backend/package.json b/plugins/kubernetes-backend/package.json
index fd2bebecd7..42261edf90 100644
--- a/plugins/kubernetes-backend/package.json
+++ b/plugins/kubernetes-backend/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-kubernetes-backend",
- "version": "0.19.1",
+ "version": "0.19.2-next.1",
"description": "A Backstage backend plugin that integrates towards Kubernetes",
"backstage": {
"role": "backend-plugin",
diff --git a/plugins/kubernetes-backend/src/routes/resourceRoutes.test.ts b/plugins/kubernetes-backend/src/routes/resourceRoutes.test.ts
index 01da602232..7ace17e805 100644
--- a/plugins/kubernetes-backend/src/routes/resourceRoutes.test.ts
+++ b/plugins/kubernetes-backend/src/routes/resourceRoutes.test.ts
@@ -169,7 +169,7 @@ describe('resourcesRoutes', () => {
error: { name: 'InputError', message: 'entity is a required field' },
request: {
method: 'POST',
- url: '/api/kubernetes/resources/workloads/query',
+ url: '/resources/workloads/query',
},
response: { statusCode: 400 },
});
@@ -193,7 +193,7 @@ describe('resourcesRoutes', () => {
},
request: {
method: 'POST',
- url: '/api/kubernetes/resources/workloads/query',
+ url: '/resources/workloads/query',
},
response: { statusCode: 400 },
});
@@ -216,7 +216,7 @@ describe('resourcesRoutes', () => {
},
request: {
method: 'POST',
- url: '/api/kubernetes/resources/workloads/query',
+ url: '/resources/workloads/query',
},
response: { statusCode: 400 },
});
@@ -240,7 +240,7 @@ describe('resourcesRoutes', () => {
},
request: {
method: 'POST',
- url: '/api/kubernetes/resources/workloads/query',
+ url: '/resources/workloads/query',
},
response: { statusCode: 401 },
});
@@ -264,7 +264,7 @@ describe('resourcesRoutes', () => {
},
request: {
method: 'POST',
- url: '/api/kubernetes/resources/workloads/query',
+ url: '/resources/workloads/query',
},
response: { statusCode: 401 },
});
@@ -287,7 +287,7 @@ describe('resourcesRoutes', () => {
},
request: {
method: 'POST',
- url: '/api/kubernetes/resources/workloads/query',
+ url: '/resources/workloads/query',
},
response: { statusCode: 500 },
});
@@ -346,7 +346,7 @@ describe('resourcesRoutes', () => {
},
request: {
method: 'POST',
- url: '/api/kubernetes/resources/custom/query',
+ url: '/resources/custom/query',
},
response: { statusCode: 400 },
});
@@ -370,7 +370,7 @@ describe('resourcesRoutes', () => {
},
request: {
method: 'POST',
- url: '/api/kubernetes/resources/custom/query',
+ url: '/resources/custom/query',
},
response: { statusCode: 400 },
});
@@ -394,7 +394,7 @@ describe('resourcesRoutes', () => {
},
request: {
method: 'POST',
- url: '/api/kubernetes/resources/custom/query',
+ url: '/resources/custom/query',
},
response: { statusCode: 400 },
});
@@ -420,7 +420,7 @@ describe('resourcesRoutes', () => {
error: { name: 'InputError', message: 'entity is a required field' },
request: {
method: 'POST',
- url: '/api/kubernetes/resources/custom/query',
+ url: '/resources/custom/query',
},
response: { statusCode: 400 },
});
@@ -451,7 +451,7 @@ describe('resourcesRoutes', () => {
},
request: {
method: 'POST',
- url: '/api/kubernetes/resources/custom/query',
+ url: '/resources/custom/query',
},
response: { statusCode: 400 },
});
@@ -481,7 +481,7 @@ describe('resourcesRoutes', () => {
},
request: {
method: 'POST',
- url: '/api/kubernetes/resources/custom/query',
+ url: '/resources/custom/query',
},
response: { statusCode: 400 },
});
@@ -512,7 +512,7 @@ describe('resourcesRoutes', () => {
},
request: {
method: 'POST',
- url: '/api/kubernetes/resources/custom/query',
+ url: '/resources/custom/query',
},
response: { statusCode: 401 },
});
@@ -543,7 +543,7 @@ describe('resourcesRoutes', () => {
},
request: {
method: 'POST',
- url: '/api/kubernetes/resources/custom/query',
+ url: '/resources/custom/query',
},
response: { statusCode: 401 },
});
@@ -573,7 +573,7 @@ describe('resourcesRoutes', () => {
},
request: {
method: 'POST',
- url: '/api/kubernetes/resources/custom/query',
+ url: '/resources/custom/query',
},
response: { statusCode: 500 },
});
diff --git a/plugins/kubernetes-backend/src/service/KubernetesProxy.test.ts b/plugins/kubernetes-backend/src/service/KubernetesProxy.test.ts
index 41803dcd9d..3ed8b25c56 100644
--- a/plugins/kubernetes-backend/src/service/KubernetesProxy.test.ts
+++ b/plugins/kubernetes-backend/src/service/KubernetesProxy.test.ts
@@ -16,7 +16,6 @@
import 'buffer';
import { resolve as resolvePath } from 'path';
-import { errorHandler } from '@backstage/backend-common';
import {
createMockDirectory,
mockServices,
@@ -53,6 +52,12 @@ import {
import type { Request } from 'express';
import { BackstageCredentials } from '@backstage/backend-plugin-api';
+import { MiddlewareFactory } from '@backstage/backend-defaults/rootHttpRouter';
+
+const middleware = MiddlewareFactory.create({
+ logger: mockServices.logger.mock(),
+ config: mockServices.rootConfig(),
+});
const mockCertDir = createMockDirectory({
content: {
@@ -117,7 +122,7 @@ describe('KubernetesProxy', () => {
const app = express().use(
Router()
.use(proxyPath, proxy.createRequestHandler({ permissionApi }))
- .use(errorHandler()),
+ .use(middleware.error()),
);
const requestPromise = request(app).get(proxyPath + requestPath);
@@ -924,7 +929,7 @@ describe('KubernetesProxy', () => {
.use(
Router()
.use(proxyPath, proxy.createRequestHandler({ permissionApi }))
- .use(errorHandler()),
+ .use(middleware.error()),
)
.listen(0, '0.0.0.0', () => {
proxyPort = (expressServer.address() as AddressInfo).port;
diff --git a/plugins/kubernetes-cluster/CHANGELOG.md b/plugins/kubernetes-cluster/CHANGELOG.md
index 34de94352a..e2b03ebe10 100644
--- a/plugins/kubernetes-cluster/CHANGELOG.md
+++ b/plugins/kubernetes-cluster/CHANGELOG.md
@@ -1,5 +1,24 @@
# @backstage/plugin-kubernetes-cluster
+## 0.0.21-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/plugin-catalog-react@1.15.1-next.1
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/plugin-kubernetes-react@0.5.3-next.0
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/plugin-kubernetes-common@0.9.2-next.0
+
+## 0.0.21-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-catalog-react@1.15.1-next.0
+
## 0.0.20
### Patch Changes
diff --git a/plugins/kubernetes-cluster/package.json b/plugins/kubernetes-cluster/package.json
index 050a38cad6..30a05f16a7 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.20",
+ "version": "0.0.21-next.1",
"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 2dd975f6ea..20b0861e56 100644
--- a/plugins/kubernetes-common/CHANGELOG.md
+++ b/plugins/kubernetes-common/CHANGELOG.md
@@ -1,5 +1,14 @@
# @backstage/plugin-kubernetes-common
+## 0.9.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/plugin-permission-common@0.8.4-next.0
+
## 0.9.1
### Patch Changes
diff --git a/plugins/kubernetes-common/package.json b/plugins/kubernetes-common/package.json
index 0d329aa2f9..ed7709b66c 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.1",
+ "version": "0.9.2-next.0",
"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 af8f85edf5..a92f835d11 100644
--- a/plugins/kubernetes-node/CHANGELOG.md
+++ b/plugins/kubernetes-node/CHANGELOG.md
@@ -1,5 +1,25 @@
# @backstage/plugin-kubernetes-node
+## 0.2.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/plugin-kubernetes-common@0.9.2-next.0
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/types@1.2.0
+ - @backstage/plugin-kubernetes-common@0.9.1
+
## 0.2.1
### Patch Changes
diff --git a/plugins/kubernetes-node/package.json b/plugins/kubernetes-node/package.json
index a83fd2513d..ed79366ffa 100644
--- a/plugins/kubernetes-node/package.json
+++ b/plugins/kubernetes-node/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-kubernetes-node",
- "version": "0.2.1",
+ "version": "0.2.2-next.1",
"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 a005d3126f..e2fa233c9d 100644
--- a/plugins/kubernetes-react/CHANGELOG.md
+++ b/plugins/kubernetes-react/CHANGELOG.md
@@ -1,5 +1,17 @@
# @backstage/plugin-kubernetes-react
+## 0.5.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/types@1.2.1-next.0
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-kubernetes-common@0.9.2-next.0
+
## 0.5.2
### Patch Changes
diff --git a/plugins/kubernetes-react/package.json b/plugins/kubernetes-react/package.json
index b9ec19795c..413278930e 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.2",
+ "version": "0.5.3-next.0",
"description": "Web library for the kubernetes-react plugin",
"backstage": {
"role": "web-library",
diff --git a/plugins/kubernetes/CHANGELOG.md b/plugins/kubernetes/CHANGELOG.md
index ec6f5d3b07..58a6054d0f 100644
--- a/plugins/kubernetes/CHANGELOG.md
+++ b/plugins/kubernetes/CHANGELOG.md
@@ -1,5 +1,27 @@
# @backstage/plugin-kubernetes
+## 0.12.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.9.4-next.0
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/core-compat-api@0.3.5-next.0
+ - @backstage/plugin-catalog-react@1.15.1-next.1
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/plugin-kubernetes-react@0.5.3-next.0
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/plugin-kubernetes-common@0.9.2-next.0
+
+## 0.12.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-catalog-react@1.15.1-next.0
+ - @backstage/core-compat-api@0.3.4
+
## 0.12.2
### Patch Changes
diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json
index 67d180bd2b..9a71b5f302 100644
--- a/plugins/kubernetes/package.json
+++ b/plugins/kubernetes/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-kubernetes",
- "version": "0.12.2",
+ "version": "0.12.3-next.1",
"description": "A Backstage plugin that integrates towards Kubernetes",
"backstage": {
"role": "frontend-plugin",
diff --git a/plugins/notifications-backend-module-email/CHANGELOG.md b/plugins/notifications-backend-module-email/CHANGELOG.md
index 3477594163..c129b4312c 100644
--- a/plugins/notifications-backend-module-email/CHANGELOG.md
+++ b/plugins/notifications-backend-module-email/CHANGELOG.md
@@ -1,5 +1,36 @@
# @backstage/plugin-notifications-backend-module-email
+## 0.3.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/plugin-catalog-node@1.15.1-next.1
+ - @backstage/integration-aws-node@0.1.15-next.0
+ - @backstage/plugin-notifications-node@0.2.11-next.1
+ - @backstage/catalog-client@1.9.1-next.0
+ - @backstage/plugin-notifications-common@0.0.8-next.0
+
+## 0.3.5-next.0
+
+### Patch Changes
+
+- bed5f35: Added more examples of the plugin configuration
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-client@1.9.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/config@1.3.1
+ - @backstage/integration-aws-node@0.1.14
+ - @backstage/types@1.2.0
+ - @backstage/plugin-catalog-node@1.15.1-next.0
+ - @backstage/plugin-notifications-common@0.0.7
+ - @backstage/plugin-notifications-node@0.2.11-next.0
+
## 0.3.4
### Patch Changes
diff --git a/plugins/notifications-backend-module-email/README.md b/plugins/notifications-backend-module-email/README.md
index 1defad74b4..3ccee8f1e8 100644
--- a/plugins/notifications-backend-module-email/README.md
+++ b/plugins/notifications-backend-module-email/README.md
@@ -24,13 +24,13 @@ export const notificationsModuleEmailDecorator = createBackendModule({
},
async init({ emailTemplates }) {
emailTemplates.setTemplateRenderer({
- getSubject(notification) {
+ async getSubject(notification) {
return `New notification from ${notification.source}`;
},
- getText(notification) {
+ async getText(notification) {
return notification.content;
},
- getHtml(notification) {
+ async getHtml(notification) {
return `${notification.content}
`;
},
});
@@ -54,19 +54,50 @@ notifications:
secure: false
username: 'my-username'
password: 'my-password'
+
+ # AWS SES
+ # transportConfig:
+ # transport: 'ses'
+ # accessKeyId: 'my-access-key
+ # region: 'us-west-2'
+
+ # sendmail
+ # transportConfig:
+ # transport: 'sendmail'
+ # path: '/usr/sbin/sendmail'
+ # newline: 'unix'
+
# The email sender address
sender: 'sender@mycompany.com'
replyTo: 'no-reply@mycompany.com'
- # Who to get email for broadcast notifications
+ # Who to send email for broadcast notifications
broadcastConfig:
receiver: 'users'
# How many emails to send concurrently, defaults to 2
concurrencyLimit: 10
+ # How much to throttle between emails, defaults to 100ms
+ throttleInterval:
+ seconds: 60
# Cache configuration for email addresses
# This is to prevent unnecessary calls to the catalog
cache:
ttl:
days: 1
+ # Notification filter which this processor will handle
+ filter:
+ # Minimum severity of the notification to send email
+ minSeverity: high
+ # Maximum severity of the notification to send email
+ maxSeverity: critical
+ # Topics that are excluded from sending email
+ excludedTopics:
+ - scaffolder
+ # List of allowed email addresses to get notifications via email
+ allowlistEmailAddresses:
+ - john.doe@backstage.io
+ # List of denied email addresses to get notifications via email
+ denylistEmailAddresses:
+ - jane.doe@backstage.io
```
See `config.d.ts` for more options for configuration.
diff --git a/plugins/notifications-backend-module-email/package.json b/plugins/notifications-backend-module-email/package.json
index f1b532c690..1eade8dbe8 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.4",
+ "version": "0.3.5-next.1",
"description": "The email backend module for the notifications plugin.",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/notifications-backend/CHANGELOG.md b/plugins/notifications-backend/CHANGELOG.md
index 224c8b3328..e4f0f2c359 100644
--- a/plugins/notifications-backend/CHANGELOG.md
+++ b/plugins/notifications-backend/CHANGELOG.md
@@ -1,5 +1,40 @@
# @backstage/plugin-notifications-backend
+## 0.5.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-auth-node@0.5.6-next.1
+ - @backstage/plugin-catalog-node@1.15.1-next.1
+ - @backstage/plugin-events-node@0.4.7-next.1
+ - @backstage/plugin-signals-node@0.1.16-next.1
+ - @backstage/plugin-notifications-node@0.2.11-next.1
+ - @backstage/catalog-client@1.9.1-next.0
+ - @backstage/plugin-notifications-common@0.0.8-next.0
+
+## 0.5.1-next.0
+
+### Patch Changes
+
+- cbc0e63: Remove `@backstage/backend-common` dependency
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.5.6-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-client@1.9.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/plugin-catalog-node@1.15.1-next.0
+ - @backstage/plugin-events-node@0.4.7-next.0
+ - @backstage/plugin-notifications-common@0.0.7
+ - @backstage/plugin-notifications-node@0.2.11-next.0
+ - @backstage/plugin-signals-node@0.1.16-next.0
+
## 0.5.0
### Minor Changes
diff --git a/plugins/notifications-backend/dev/index.ts b/plugins/notifications-backend/dev/index.ts
index f1fe453457..936c31f211 100644
--- a/plugins/notifications-backend/dev/index.ts
+++ b/plugins/notifications-backend/dev/index.ts
@@ -26,7 +26,6 @@ import {
} from '@backstage/plugin-notifications-common';
import express, { Response } from 'express';
import Router from 'express-promise-router';
-import { MiddlewareFactory } from '@backstage/backend-defaults/rootHttpRouter';
const randomSeverity = (): NotificationSeverity => {
return notificationSeverities[
@@ -77,12 +76,8 @@ const notificationsDebug = createBackendPlugin({
deps: {
notifications: notificationService,
httpRouter: coreServices.httpRouter,
- config: coreServices.rootConfig,
- logger: coreServices.logger,
},
- async init({ notifications, httpRouter, config, logger }) {
- const middleware = MiddlewareFactory.create({ config, logger });
-
+ async init({ notifications, httpRouter }) {
const router = Router();
router.use(express.json());
router.post('/', async (_, res: Response) => {
@@ -100,7 +95,6 @@ const notificationsDebug = createBackendPlugin({
});
res.status(200).send({ status: 'ok' });
});
- router.use(middleware.error());
httpRouter.use(router);
httpRouter.addAuthPolicy({
diff --git a/plugins/notifications-backend/package.json b/plugins/notifications-backend/package.json
index 4330d4c903..d0270ba3ff 100644
--- a/plugins/notifications-backend/package.json
+++ b/plugins/notifications-backend/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-notifications-backend",
- "version": "0.5.0",
+ "version": "0.5.1-next.1",
"backstage": {
"role": "backend-plugin",
"pluginId": "notifications",
diff --git a/plugins/notifications-common/CHANGELOG.md b/plugins/notifications-common/CHANGELOG.md
index 2e537829ba..74d6451ba6 100644
--- a/plugins/notifications-common/CHANGELOG.md
+++ b/plugins/notifications-common/CHANGELOG.md
@@ -1,5 +1,12 @@
# @backstage/plugin-notifications-common
+## 0.0.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/config@1.3.2-next.0
+
## 0.0.7
### Patch Changes
diff --git a/plugins/notifications-common/package.json b/plugins/notifications-common/package.json
index 4ba9d060a9..ade754154e 100644
--- a/plugins/notifications-common/package.json
+++ b/plugins/notifications-common/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-notifications-common",
- "version": "0.0.7",
+ "version": "0.0.8-next.0",
"description": "Common functionalities for the notifications plugin",
"backstage": {
"role": "common-library",
diff --git a/plugins/notifications-node/CHANGELOG.md b/plugins/notifications-node/CHANGELOG.md
index d42c49981b..0615e6d528 100644
--- a/plugins/notifications-node/CHANGELOG.md
+++ b/plugins/notifications-node/CHANGELOG.md
@@ -1,5 +1,27 @@
# @backstage/plugin-notifications-node
+## 0.2.11-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/plugin-signals-node@0.1.16-next.1
+ - @backstage/catalog-client@1.9.1-next.0
+ - @backstage/plugin-notifications-common@0.0.8-next.0
+
+## 0.2.11-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-client@1.9.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/plugin-notifications-common@0.0.7
+ - @backstage/plugin-signals-node@0.1.16-next.0
+
## 0.2.10
### Patch Changes
diff --git a/plugins/notifications-node/package.json b/plugins/notifications-node/package.json
index ef4c533676..0963a87efa 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.10",
+ "version": "0.2.11-next.1",
"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 dcbbad5a30..02fbdd3e4d 100644
--- a/plugins/notifications/CHANGELOG.md
+++ b/plugins/notifications/CHANGELOG.md
@@ -1,5 +1,18 @@
# @backstage/plugin-notifications
+## 0.5.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/types@1.2.1-next.0
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/plugin-signals-react@0.0.9-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/theme@0.6.3
+ - @backstage/plugin-notifications-common@0.0.8-next.0
+
## 0.5.0
### Minor Changes
diff --git a/plugins/notifications/package.json b/plugins/notifications/package.json
index 8a066413e1..dda00762b3 100644
--- a/plugins/notifications/package.json
+++ b/plugins/notifications/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-notifications",
- "version": "0.5.0",
+ "version": "0.5.1-next.0",
"backstage": {
"role": "frontend-plugin",
"pluginId": "notifications",
diff --git a/plugins/org-react/CHANGELOG.md b/plugins/org-react/CHANGELOG.md
index 0a2558ef17..68f7c6e50e 100644
--- a/plugins/org-react/CHANGELOG.md
+++ b/plugins/org-react/CHANGELOG.md
@@ -1,5 +1,23 @@
# @backstage/plugin-org-react
+## 0.1.34-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/plugin-catalog-react@1.15.1-next.1
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/catalog-client@1.9.1-next.0
+
+## 0.1.34-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-catalog-react@1.15.1-next.0
+
## 0.1.33
### Patch Changes
diff --git a/plugins/org-react/package.json b/plugins/org-react/package.json
index e130aa6f6b..1049e635c0 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.33",
+ "version": "0.1.34-next.1",
"backstage": {
"role": "web-library",
"pluginId": "org",
diff --git a/plugins/org/CHANGELOG.md b/plugins/org/CHANGELOG.md
index ed5515fe3b..5c387c7b1a 100644
--- a/plugins/org/CHANGELOG.md
+++ b/plugins/org/CHANGELOG.md
@@ -1,5 +1,26 @@
# @backstage/plugin-org
+## 0.6.35-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.9.4-next.0
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/core-compat-api@0.3.5-next.0
+ - @backstage/plugin-catalog-react@1.15.1-next.1
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/plugin-catalog-common@1.1.3-next.0
+
+## 0.6.35-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-catalog-react@1.15.1-next.0
+ - @backstage/core-compat-api@0.3.4
+
## 0.6.34
### Patch Changes
diff --git a/plugins/org/package.json b/plugins/org/package.json
index d137c86c10..c2aa1b0fc0 100644
--- a/plugins/org/package.json
+++ b/plugins/org/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-org",
- "version": "0.6.34",
+ "version": "0.6.35-next.1",
"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 e72281d74d..1f71ec8f12 100644
--- a/plugins/permission-backend-module-policy-allow-all/CHANGELOG.md
+++ b/plugins/permission-backend-module-policy-allow-all/CHANGELOG.md
@@ -1,5 +1,25 @@
# @backstage/plugin-permission-backend-module-allow-all-policy
+## 0.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/plugin-auth-node@0.5.6-next.1
+ - @backstage/plugin-permission-common@0.8.4-next.0
+ - @backstage/plugin-permission-node@0.8.7-next.1
+
+## 0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-permission-node@0.8.7-next.0
+ - @backstage/plugin-auth-node@0.5.6-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/plugin-permission-common@0.8.3
+
## 0.2.3
### 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 17305b7fe1..10ff45f8a3 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.3",
+ "version": "0.2.4-next.1",
"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 9d2b9249f8..777bf4c507 100644
--- a/plugins/permission-backend/CHANGELOG.md
+++ b/plugins/permission-backend/CHANGELOG.md
@@ -1,5 +1,30 @@
# @backstage/plugin-permission-backend
+## 0.5.53-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-auth-node@0.5.6-next.1
+ - @backstage/plugin-permission-common@0.8.4-next.0
+ - @backstage/plugin-permission-node@0.8.7-next.1
+
+## 0.5.53-next.0
+
+### Patch Changes
+
+- d9d62ef: Remove some internal usages of the backend-common package
+- Updated dependencies
+ - @backstage/plugin-permission-node@0.8.7-next.0
+ - @backstage/plugin-auth-node@0.5.6-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/plugin-permission-common@0.8.3
+
## 0.5.52
### Patch Changes
diff --git a/plugins/permission-backend/package.json b/plugins/permission-backend/package.json
index 6e513c1950..1ebdf866f0 100644
--- a/plugins/permission-backend/package.json
+++ b/plugins/permission-backend/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-permission-backend",
- "version": "0.5.52",
+ "version": "0.5.53-next.1",
"backstage": {
"role": "backend-plugin",
"pluginId": "permission",
@@ -67,6 +67,7 @@
"zod": "^3.22.4"
},
"devDependencies": {
+ "@backstage/backend-defaults": "workspace:^",
"@backstage/backend-test-utils": "workspace:^",
"@backstage/cli": "workspace:^",
"@types/lodash": "^4.14.151",
diff --git a/plugins/permission-backend/src/service/router.test.ts b/plugins/permission-backend/src/service/router.test.ts
index f12bacc61d..e3fb5418cf 100644
--- a/plugins/permission-backend/src/service/router.test.ts
+++ b/plugins/permission-backend/src/service/router.test.ts
@@ -27,6 +27,7 @@ import { createRouter } from './router';
import { ConfigReader } from '@backstage/config';
import { BackstageCredentials } from '@backstage/backend-plugin-api';
import { mockCredentials, mockServices } from '@backstage/backend-test-utils';
+import { MiddlewareFactory } from '@backstage/backend-defaults/rootHttpRouter';
const mockApplyConditions: jest.MockedFunction<
InstanceType['applyConditions']
@@ -60,6 +61,11 @@ const policy = {
}),
};
+const middleware = MiddlewareFactory.create({
+ logger: mockServices.logger.mock(),
+ config: mockServices.rootConfig(),
+});
+
describe('createRouter', () => {
let app: express.Express;
@@ -75,7 +81,7 @@ describe('createRouter', () => {
userInfo: mockServices.userInfo(),
policy,
});
-
+ router.use(middleware.error());
app = express().use(router);
});
diff --git a/plugins/permission-backend/src/service/router.ts b/plugins/permission-backend/src/service/router.ts
index db2b72f95c..c624947375 100644
--- a/plugins/permission-backend/src/service/router.ts
+++ b/plugins/permission-backend/src/service/router.ts
@@ -17,10 +17,7 @@
import { z } from 'zod';
import express, { Request, Response } from 'express';
import Router from 'express-promise-router';
-import {
- createLegacyAuthAdapters,
- errorHandler,
-} from '@backstage/backend-common';
+import { createLegacyAuthAdapters } from '@backstage/backend-common';
import { InputError } from '@backstage/errors';
import { IdentityApi } from '@backstage/plugin-auth-node';
import {
@@ -251,7 +248,5 @@ export async function createRouter(
},
);
- router.use(errorHandler());
-
return router;
}
diff --git a/plugins/permission-common/CHANGELOG.md b/plugins/permission-common/CHANGELOG.md
index 42b4d02810..3fac4d2b9e 100644
--- a/plugins/permission-common/CHANGELOG.md
+++ b/plugins/permission-common/CHANGELOG.md
@@ -1,5 +1,14 @@
# @backstage/plugin-permission-common
+## 0.8.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+
## 0.8.3
### Patch Changes
diff --git a/plugins/permission-common/package.json b/plugins/permission-common/package.json
index 6e500e4016..833110d1d7 100644
--- a/plugins/permission-common/package.json
+++ b/plugins/permission-common/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-permission-common",
- "version": "0.8.3",
+ "version": "0.8.4-next.0",
"description": "Isomorphic types and client for Backstage permissions and authorization",
"backstage": {
"role": "common-library",
diff --git a/plugins/permission-node/CHANGELOG.md b/plugins/permission-node/CHANGELOG.md
index ccac778536..1e5bd1dd0e 100644
--- a/plugins/permission-node/CHANGELOG.md
+++ b/plugins/permission-node/CHANGELOG.md
@@ -1,5 +1,28 @@
# @backstage/plugin-permission-node
+## 0.8.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-auth-node@0.5.6-next.1
+ - @backstage/plugin-permission-common@0.8.4-next.0
+
+## 0.8.7-next.0
+
+### Patch Changes
+
+- d9d62ef: Remove some internal usages of the backend-common package
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.5.6-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/plugin-permission-common@0.8.3
+
## 0.8.6
### Patch Changes
diff --git a/plugins/permission-node/package.json b/plugins/permission-node/package.json
index 341b25e8ec..f002af3445 100644
--- a/plugins/permission-node/package.json
+++ b/plugins/permission-node/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-permission-node",
- "version": "0.8.6",
+ "version": "0.8.7-next.1",
"description": "Common permission and authorization utilities for backend plugins",
"backstage": {
"role": "node-library",
@@ -69,6 +69,7 @@
"zod-to-json-schema": "^3.20.4"
},
"devDependencies": {
+ "@backstage/backend-defaults": "workspace:^",
"@backstage/backend-test-utils": "workspace:^",
"@backstage/cli": "workspace:^",
"@types/supertest": "^2.0.8",
diff --git a/plugins/permission-node/src/integration/createPermissionIntegrationRouter.test.ts b/plugins/permission-node/src/integration/createPermissionIntegrationRouter.test.ts
index a38059e547..0062ef03b6 100644
--- a/plugins/permission-node/src/integration/createPermissionIntegrationRouter.test.ts
+++ b/plugins/permission-node/src/integration/createPermissionIntegrationRouter.test.ts
@@ -29,6 +29,8 @@ import {
PermissionIntegrationRouterOptions,
} from './createPermissionIntegrationRouter';
import { createPermissionRule } from './createPermissionRule';
+import { MiddlewareFactory } from '@backstage/backend-defaults/rootHttpRouter';
+import { mockServices } from '@backstage/backend-test-utils';
const testPermission: Permission = createPermission({
name: 'test.permission',
@@ -109,6 +111,11 @@ const mockedOptionResources: PermissionIntegrationRouterOptions = {
],
};
+const middleware = MiddlewareFactory.create({
+ logger: mockServices.logger.mock(),
+ config: mockServices.rootConfig(),
+});
+
const createApp = (
mockedGetResources:
| typeof defaultMockedGetResources1 = defaultMockedGetResources1,
@@ -122,7 +129,7 @@ const createApp = (
})
: createPermissionIntegrationRouter({ permissions: [testPermission] });
- return express().use(router);
+ return express().use(router.use(middleware.error()));
};
describe('createPermissionIntegrationRouter', () => {
@@ -453,7 +460,9 @@ describe('createPermissionIntegrationRouter', () => {
beforeEach(async () => {
const app = express().use(
- createPermissionIntegrationRouter(mockedOptionResources),
+ createPermissionIntegrationRouter(mockedOptionResources).use(
+ middleware.error(),
+ ),
);
response = await request(app)
@@ -765,7 +774,7 @@ describe('createPermissionIntegrationRouter', () => {
resourceType: 'test-resource',
permissions: [testPermission],
rules: [testRule1, testRule2],
- }),
+ }).use(middleware.error()),
),
)
.post('/.well-known/backstage/permissions/apply-conditions')
diff --git a/plugins/permission-node/src/integration/createPermissionIntegrationRouter.ts b/plugins/permission-node/src/integration/createPermissionIntegrationRouter.ts
index 5210e6fb1c..de1e32169a 100644
--- a/plugins/permission-node/src/integration/createPermissionIntegrationRouter.ts
+++ b/plugins/permission-node/src/integration/createPermissionIntegrationRouter.ts
@@ -19,7 +19,6 @@ import Router from 'express-promise-router';
import { z } from 'zod';
import zodToJsonSchema from 'zod-to-json-schema';
import { InputError } from '@backstage/errors';
-import { errorHandler } from '@backstage/backend-common';
import {
AuthorizeResult,
DefinitivePolicyDecision,
@@ -483,9 +482,6 @@ export function createPermissionIntegrationRouter<
},
);
- // TODO(belugas): Remove this when dropping support to the legacy backend system because setting the error handler manually is no logger required in the new system.
- router.use(errorHandler());
-
return router;
}
diff --git a/plugins/permission-react/CHANGELOG.md b/plugins/permission-react/CHANGELOG.md
index 95a0d65697..2338370873 100644
--- a/plugins/permission-react/CHANGELOG.md
+++ b/plugins/permission-react/CHANGELOG.md
@@ -1,5 +1,14 @@
# @backstage/plugin-permission-react
+## 0.4.30-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/plugin-permission-common@0.8.4-next.0
+
## 0.4.29
### Patch Changes
diff --git a/plugins/permission-react/package.json b/plugins/permission-react/package.json
index 3b8593656e..2af6fd9508 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.29",
+ "version": "0.4.30-next.0",
"backstage": {
"role": "web-library",
"pluginId": "permission",
diff --git a/plugins/proxy-backend/CHANGELOG.md b/plugins/proxy-backend/CHANGELOG.md
index ac10603876..7a30f80a80 100644
--- a/plugins/proxy-backend/CHANGELOG.md
+++ b/plugins/proxy-backend/CHANGELOG.md
@@ -1,5 +1,23 @@
# @backstage/plugin-proxy-backend
+## 0.5.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+
+## 0.5.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/types@1.2.0
+
## 0.5.9
### Patch Changes
diff --git a/plugins/proxy-backend/package.json b/plugins/proxy-backend/package.json
index 4045a179bd..8f3de355bf 100644
--- a/plugins/proxy-backend/package.json
+++ b/plugins/proxy-backend/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-proxy-backend",
- "version": "0.5.9",
+ "version": "0.5.10-next.1",
"description": "A Backstage backend plugin that helps you set up proxy endpoints in the backend",
"backstage": {
"role": "backend-plugin",
diff --git a/plugins/scaffolder-backend-module-azure/CHANGELOG.md b/plugins/scaffolder-backend-module-azure/CHANGELOG.md
index f245e1ab3c..80a095b8d5 100644
--- a/plugins/scaffolder-backend-module-azure/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-azure/CHANGELOG.md
@@ -1,5 +1,27 @@
# @backstage/plugin-scaffolder-backend-module-azure
+## 0.2.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-scaffolder-node@0.6.3-next.1
+ - @backstage/integration@1.16.1-next.0
+
+## 0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-scaffolder-node@0.6.3-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/integration@1.16.0
+
## 0.2.4
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-azure/package.json b/plugins/scaffolder-backend-module-azure/package.json
index f4f8754210..5fa09afda6 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.4",
+ "version": "0.2.5-next.1",
"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 461c84106e..a1415099c1 100644
--- a/plugins/scaffolder-backend-module-bitbucket-cloud/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/CHANGELOG.md
@@ -1,5 +1,29 @@
# @backstage/plugin-scaffolder-backend-module-bitbucket-cloud
+## 0.2.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-scaffolder-node@0.6.3-next.1
+ - @backstage/integration@1.16.1-next.0
+ - @backstage/plugin-bitbucket-cloud-common@0.2.27-next.0
+
+## 0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-scaffolder-node@0.6.3-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/integration@1.16.0
+ - @backstage/plugin-bitbucket-cloud-common@0.2.26
+
## 0.2.4
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/package.json b/plugins/scaffolder-backend-module-bitbucket-cloud/package.json
index 425b0e5035..9703ab0c86 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.4",
+ "version": "0.2.5-next.1",
"description": "The Bitbucket Cloud module for @backstage/plugin-scaffolder-backend",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-bitbucket-server/CHANGELOG.md b/plugins/scaffolder-backend-module-bitbucket-server/CHANGELOG.md
index ff62b65dd1..7a3e06af53 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.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-scaffolder-node@0.6.3-next.1
+ - @backstage/integration@1.16.1-next.0
+
+## 0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-scaffolder-node@0.6.3-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/integration@1.16.0
+
## 0.2.4
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-bitbucket-server/package.json b/plugins/scaffolder-backend-module-bitbucket-server/package.json
index 24749ee14c..b262004950 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.4",
+ "version": "0.2.5-next.1",
"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 c93d4c175b..9cce359738 100644
--- a/plugins/scaffolder-backend-module-bitbucket/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-bitbucket/CHANGELOG.md
@@ -1,5 +1,31 @@
# @backstage/plugin-scaffolder-backend-module-bitbucket
+## 0.3.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-scaffolder-node@0.6.3-next.1
+ - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.5-next.1
+ - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.5-next.1
+ - @backstage/integration@1.16.1-next.0
+
+## 0.3.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-scaffolder-node@0.6.3-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/integration@1.16.0
+ - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.5-next.0
+ - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.5-next.0
+
## 0.3.5
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-bitbucket/package.json b/plugins/scaffolder-backend-module-bitbucket/package.json
index b50baf4871..b8d13a765e 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.5",
+ "version": "0.3.6-next.1",
"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 787e6ca7e9..3380e36131 100644
--- a/plugins/scaffolder-backend-module-confluence-to-markdown/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-confluence-to-markdown/CHANGELOG.md
@@ -1,5 +1,27 @@
# @backstage/plugin-scaffolder-backend-module-confluence-to-markdown
+## 0.3.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-scaffolder-node@0.6.3-next.1
+ - @backstage/integration@1.16.1-next.0
+
+## 0.3.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-scaffolder-node@0.6.3-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/integration@1.16.0
+
## 0.3.4
### 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 e2ab02557b..29f7bc11eb 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.4",
+ "version": "0.3.5-next.1",
"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 da4b40f042..925c042844 100644
--- a/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md
@@ -1,5 +1,31 @@
# @backstage/plugin-scaffolder-backend-module-cookiecutter
+## 0.3.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/backend-defaults@0.7.0-next.1
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-scaffolder-node@0.6.3-next.1
+ - @backstage/integration@1.16.1-next.0
+
+## 0.3.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-defaults@0.7.0-next.0
+ - @backstage/plugin-scaffolder-node@0.6.3-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/integration@1.16.0
+ - @backstage/types@1.2.0
+
## 0.3.5
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-cookiecutter/package.json b/plugins/scaffolder-backend-module-cookiecutter/package.json
index ebf99dfcc8..41ecc9b958 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.5",
+ "version": "0.3.6-next.1",
"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 ae7f63e3a7..a39d9e5f9a 100644
--- a/plugins/scaffolder-backend-module-gcp/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-gcp/CHANGELOG.md
@@ -1,5 +1,27 @@
# @backstage/plugin-scaffolder-backend-module-gcp
+## 0.2.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-scaffolder-node@0.6.3-next.1
+ - @backstage/integration@1.16.1-next.0
+
+## 0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-scaffolder-node@0.6.3-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/integration@1.16.0
+
## 0.2.4
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-gcp/package.json b/plugins/scaffolder-backend-module-gcp/package.json
index 4ac560e6e2..b1ca3dc384 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.4",
+ "version": "0.2.5-next.1",
"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 4aafbe27ce..2098ef4ec0 100644
--- a/plugins/scaffolder-backend-module-gerrit/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-gerrit/CHANGELOG.md
@@ -1,5 +1,27 @@
# @backstage/plugin-scaffolder-backend-module-gerrit
+## 0.2.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-scaffolder-node@0.6.3-next.1
+ - @backstage/integration@1.16.1-next.0
+
+## 0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-scaffolder-node@0.6.3-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/integration@1.16.0
+
## 0.2.4
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-gerrit/package.json b/plugins/scaffolder-backend-module-gerrit/package.json
index 601fa93941..0a0a35acad 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.4",
+ "version": "0.2.5-next.1",
"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 d1b71f1260..6edfa1cfac 100644
--- a/plugins/scaffolder-backend-module-gitea/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-gitea/CHANGELOG.md
@@ -1,5 +1,27 @@
# @backstage/plugin-scaffolder-backend-module-gitea
+## 0.2.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-scaffolder-node@0.6.3-next.1
+ - @backstage/integration@1.16.1-next.0
+
+## 0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-scaffolder-node@0.6.3-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/integration@1.16.0
+
## 0.2.4
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-gitea/package.json b/plugins/scaffolder-backend-module-gitea/package.json
index f55e8103c2..6ab4ae6e13 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.4",
+ "version": "0.2.5-next.1",
"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 6f875f7cb8..c4e4b92102 100644
--- a/plugins/scaffolder-backend-module-github/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-github/CHANGELOG.md
@@ -1,5 +1,37 @@
# @backstage/plugin-scaffolder-backend-module-github
+## 0.5.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-scaffolder-node@0.6.3-next.1
+ - @backstage/catalog-client@1.9.1-next.0
+ - @backstage/integration@1.16.1-next.0
+
+## 0.5.5-next.1
+
+### Patch Changes
+
+- edaf925: Updates to allow users to subscribe to the newly created repository within GitHub to mimic similar functionality found within the GitHub UI.
+
+## 0.5.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-scaffolder-node@0.6.3-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-client@1.9.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/integration@1.16.0
+
## 0.5.4
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-github/package.json b/plugins/scaffolder-backend-module-github/package.json
index 6ca3806b7a..4a1dffaf08 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.5.4",
+ "version": "0.5.5-next.2",
"description": "The github module for @backstage/plugin-scaffolder-backend",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-github/report.api.md b/plugins/scaffolder-backend-module-github/report.api.md
index 60ed9db5ef..935886bf14 100644
--- a/plugins/scaffolder-backend-module-github/report.api.md
+++ b/plugins/scaffolder-backend-module-github/report.api.md
@@ -279,6 +279,7 @@ export function createGithubRepoCreateAction(options: {
[key: string]: string;
}
| undefined;
+ subscribe?: boolean | undefined;
},
JsonObject
>;
@@ -441,6 +442,7 @@ export function createPublishGithubAction(options: {
[key: string]: string;
}
| undefined;
+ subscribe?: boolean | undefined;
},
JsonObject
>;
diff --git a/plugins/scaffolder-backend-module-github/src/actions/github.test.ts b/plugins/scaffolder-backend-module-github/src/actions/github.test.ts
index f2f36e263a..2f629622d0 100644
--- a/plugins/scaffolder-backend-module-github/src/actions/github.test.ts
+++ b/plugins/scaffolder-backend-module-github/src/actions/github.test.ts
@@ -74,6 +74,9 @@ const mockOctokit = {
createOrUpdateRepoSecret: jest.fn(),
getRepoPublicKey: jest.fn(),
},
+ activity: {
+ setRepoSubscription: jest.fn(),
+ },
},
request: jest.fn(),
};
@@ -1796,4 +1799,26 @@ describe('publish:github', () => {
});
},
);
+
+ it('should add user subscription', async () => {
+ mockOctokit.rest.users.getByUsername.mockResolvedValue({
+ data: { type: 'Organization' },
+ });
+ mockOctokit.rest.repos.createInOrg.mockResolvedValue({ data: {} });
+
+ await action.handler({
+ ...mockContext,
+ input: {
+ ...mockContext.input,
+ subscribe: true,
+ },
+ });
+
+ expect(mockOctokit.rest.activity.setRepoSubscription).toHaveBeenCalledWith({
+ owner: 'owner',
+ repo: 'repo',
+ subscribed: true,
+ ignored: false,
+ });
+ });
});
diff --git a/plugins/scaffolder-backend-module-github/src/actions/github.ts b/plugins/scaffolder-backend-module-github/src/actions/github.ts
index 6d8e0046c2..e3a9ff3352 100644
--- a/plugins/scaffolder-backend-module-github/src/actions/github.ts
+++ b/plugins/scaffolder-backend-module-github/src/actions/github.ts
@@ -117,6 +117,7 @@ export function createPublishGithubAction(options: {
requiredCommitSigning?: boolean;
requiredLinearHistory?: boolean;
customProperties?: { [key: string]: string };
+ subscribe?: boolean;
}>({
id: 'publish:github',
description:
@@ -168,6 +169,7 @@ export function createPublishGithubAction(options: {
requiredCommitSigning: inputProps.requiredCommitSigning,
requiredLinearHistory: inputProps.requiredLinearHistory,
customProperties: inputProps.customProperties,
+ subscribe: inputProps.subscribe,
},
},
output: {
@@ -218,6 +220,7 @@ export function createPublishGithubAction(options: {
oidcCustomization,
token: providedToken,
customProperties,
+ subscribe = false,
requiredCommitSigning = false,
requiredLinearHistory = false,
} = ctx.input;
@@ -260,6 +263,7 @@ export function createPublishGithubAction(options: {
secrets,
oidcCustomization,
customProperties,
+ subscribe,
ctx.logger,
);
diff --git a/plugins/scaffolder-backend-module-github/src/actions/githubRepoCreate.test.ts b/plugins/scaffolder-backend-module-github/src/actions/githubRepoCreate.test.ts
index 66d54366c5..864c5b729f 100644
--- a/plugins/scaffolder-backend-module-github/src/actions/githubRepoCreate.test.ts
+++ b/plugins/scaffolder-backend-module-github/src/actions/githubRepoCreate.test.ts
@@ -55,6 +55,9 @@ const mockOctokit = {
createOrUpdateRepoSecret: jest.fn(),
getRepoPublicKey: jest.fn(),
},
+ activity: {
+ setRepoSubscription: jest.fn(),
+ },
},
request: jest.fn(),
};
@@ -754,4 +757,26 @@ describe('github:repo:create', () => {
'https://github.com/clone/url.git',
);
});
+
+ it('should subscribe user to repository', async () => {
+ mockOctokit.rest.users.getByUsername.mockResolvedValue({
+ data: { type: 'Organization' },
+ });
+ mockOctokit.rest.repos.createInOrg.mockResolvedValue({ data: {} });
+
+ await action.handler({
+ ...mockContext,
+ input: {
+ ...mockContext.input,
+ subscribe: true,
+ },
+ });
+
+ expect(mockOctokit.rest.activity.setRepoSubscription).toHaveBeenCalledWith({
+ owner: 'owner',
+ repo: 'repo',
+ subscribed: true,
+ ignored: false,
+ });
+ });
});
diff --git a/plugins/scaffolder-backend-module-github/src/actions/githubRepoCreate.ts b/plugins/scaffolder-backend-module-github/src/actions/githubRepoCreate.ts
index 61dea32c35..b4608e57de 100644
--- a/plugins/scaffolder-backend-module-github/src/actions/githubRepoCreate.ts
+++ b/plugins/scaffolder-backend-module-github/src/actions/githubRepoCreate.ts
@@ -102,6 +102,7 @@ export function createGithubRepoCreateAction(options: {
requireCommitSigning?: boolean;
requiredLinearHistory?: boolean;
customProperties?: { [key: string]: string };
+ subscribe?: boolean;
}>({
id: 'github:repo:create',
description: 'Creates a GitHub repository.',
@@ -143,6 +144,7 @@ export function createGithubRepoCreateAction(options: {
requiredCommitSigning: inputProps.requiredCommitSigning,
requiredLinearHistory: inputProps.requiredLinearHistory,
customProperties: inputProps.customProperties,
+ subscribe: inputProps.subscribe,
},
},
output: {
@@ -176,6 +178,7 @@ export function createGithubRepoCreateAction(options: {
secrets,
oidcCustomization,
customProperties,
+ subscribe,
token: providedToken,
} = ctx.input;
@@ -217,6 +220,7 @@ export function createGithubRepoCreateAction(options: {
secrets,
oidcCustomization,
customProperties,
+ subscribe,
ctx.logger,
);
diff --git a/plugins/scaffolder-backend-module-github/src/actions/helpers.ts b/plugins/scaffolder-backend-module-github/src/actions/helpers.ts
index 9bba0ca359..242f95ce34 100644
--- a/plugins/scaffolder-backend-module-github/src/actions/helpers.ts
+++ b/plugins/scaffolder-backend-module-github/src/actions/helpers.ts
@@ -149,6 +149,7 @@ export async function createGithubRepoWithCollaboratorsAndTopics(
}
| undefined,
customProperties: { [key: string]: string } | undefined,
+ subscribe: boolean | undefined,
logger: LoggerService,
) {
// eslint-disable-next-line testing-library/no-await-sync-queries
@@ -330,6 +331,15 @@ export async function createGithubRepoWithCollaboratorsAndTopics(
);
}
+ if (subscribe) {
+ await client.rest.activity.setRepoSubscription({
+ subscribed: true,
+ ignored: false,
+ owner,
+ repo,
+ });
+ }
+
return newRepo;
}
diff --git a/plugins/scaffolder-backend-module-github/src/actions/inputProperties.ts b/plugins/scaffolder-backend-module-github/src/actions/inputProperties.ts
index 2c86cf492e..8b30168225 100644
--- a/plugins/scaffolder-backend-module-github/src/actions/inputProperties.ts
+++ b/plugins/scaffolder-backend-module-github/src/actions/inputProperties.ts
@@ -317,6 +317,12 @@ const customProperties = {
type: 'object',
};
+const subscribe = {
+ title: 'Subscribe to repository',
+ description: `Subscribe to the repository. The default value is 'false'`,
+ type: 'boolean',
+};
+
export { access };
export { allowMergeCommit };
export { allowRebaseMerge };
@@ -357,3 +363,4 @@ export { repoVariables };
export { secrets };
export { oidcCustomization };
export { customProperties };
+export { subscribe };
diff --git a/plugins/scaffolder-backend-module-gitlab/CHANGELOG.md b/plugins/scaffolder-backend-module-gitlab/CHANGELOG.md
index 89e36fe253..2397ba9ee6 100644
--- a/plugins/scaffolder-backend-module-gitlab/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-gitlab/CHANGELOG.md
@@ -1,5 +1,27 @@
# @backstage/plugin-scaffolder-backend-module-gitlab
+## 0.7.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-scaffolder-node@0.6.3-next.1
+ - @backstage/integration@1.16.1-next.0
+
+## 0.7.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-scaffolder-node@0.6.3-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/integration@1.16.0
+
## 0.7.0
### Minor Changes
diff --git a/plugins/scaffolder-backend-module-gitlab/package.json b/plugins/scaffolder-backend-module-gitlab/package.json
index 54a00202a6..4967d7606f 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.7.0",
+ "version": "0.7.1-next.1",
"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 d72829bb8b..104302138e 100644
--- a/plugins/scaffolder-backend-module-notifications/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-notifications/CHANGELOG.md
@@ -1,5 +1,25 @@
# @backstage/plugin-scaffolder-backend-module-notifications
+## 0.1.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/plugin-scaffolder-node@0.6.3-next.1
+ - @backstage/plugin-notifications-node@0.2.11-next.1
+ - @backstage/plugin-notifications-common@0.0.8-next.0
+
+## 0.1.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-scaffolder-node@0.6.3-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/plugin-notifications-common@0.0.7
+ - @backstage/plugin-notifications-node@0.2.11-next.0
+
## 0.1.5
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-notifications/package.json b/plugins/scaffolder-backend-module-notifications/package.json
index 85ca672999..14be0abed4 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.5",
+ "version": "0.1.6-next.1",
"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 367ba3e7ed..8ecc627d3a 100644
--- a/plugins/scaffolder-backend-module-rails/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-rails/CHANGELOG.md
@@ -1,5 +1,29 @@
# @backstage/plugin-scaffolder-backend-module-rails
+## 0.5.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-scaffolder-node@0.6.3-next.1
+ - @backstage/integration@1.16.1-next.0
+
+## 0.5.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-scaffolder-node@0.6.3-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/integration@1.16.0
+ - @backstage/types@1.2.0
+
## 0.5.4
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-rails/package.json b/plugins/scaffolder-backend-module-rails/package.json
index 71c4db82bb..1bf60d8f5b 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.4",
+ "version": "0.5.5-next.1",
"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 cefda32ecb..0c585cf8d5 100644
--- a/plugins/scaffolder-backend-module-sentry/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-sentry/CHANGELOG.md
@@ -1,5 +1,25 @@
# @backstage/plugin-scaffolder-backend-module-sentry
+## 0.2.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-scaffolder-node@0.6.3-next.1
+
+## 0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-scaffolder-node@0.6.3-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+
## 0.2.4
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-sentry/package.json b/plugins/scaffolder-backend-module-sentry/package.json
index 2ef71a168f..85000f1390 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.4",
+ "version": "0.2.5-next.1",
"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 a51193110b..6d76fb6cb1 100644
--- a/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md
@@ -1,5 +1,25 @@
# @backstage/plugin-scaffolder-backend-module-yeoman
+## 0.4.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/plugin-scaffolder-node@0.6.3-next.1
+ - @backstage/plugin-scaffolder-node-test-utils@0.1.18-next.1
+
+## 0.4.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-scaffolder-node@0.6.3-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/types@1.2.0
+ - @backstage/plugin-scaffolder-node-test-utils@0.1.18-next.0
+
## 0.4.5
### Patch Changes
diff --git a/plugins/scaffolder-backend-module-yeoman/package.json b/plugins/scaffolder-backend-module-yeoman/package.json
index a6e78a04a8..c154cb9a4d 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.5",
+ "version": "0.4.6-next.1",
"backstage": {
"role": "backend-plugin-module",
"pluginId": "scaffolder",
diff --git a/plugins/scaffolder-backend/CHANGELOG.md b/plugins/scaffolder-backend/CHANGELOG.md
index c3ff979c57..72cae8f5af 100644
--- a/plugins/scaffolder-backend/CHANGELOG.md
+++ b/plugins/scaffolder-backend/CHANGELOG.md
@@ -1,5 +1,79 @@
# @backstage/plugin-scaffolder-backend
+## 1.29.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/backend-defaults@0.7.0-next.1
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-auth-node@0.5.6-next.1
+ - @backstage/plugin-catalog-node@1.15.1-next.1
+ - @backstage/plugin-events-node@0.4.7-next.1
+ - @backstage/plugin-permission-common@0.8.4-next.0
+ - @backstage/plugin-scaffolder-common@1.5.9-next.0
+ - @backstage/plugin-scaffolder-node@0.6.3-next.1
+ - @backstage/plugin-scaffolder-backend-module-gitlab@0.7.1-next.1
+ - @backstage/plugin-permission-node@0.8.7-next.1
+ - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.4-next.1
+ - @backstage/plugin-scaffolder-backend-module-azure@0.2.5-next.1
+ - @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.6-next.1
+ - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.5-next.1
+ - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.5-next.1
+ - @backstage/plugin-scaffolder-backend-module-gerrit@0.2.5-next.1
+ - @backstage/plugin-scaffolder-backend-module-gitea@0.2.5-next.1
+ - @backstage/plugin-scaffolder-backend-module-github@0.5.5-next.2
+ - @backstage/catalog-client@1.9.1-next.0
+ - @backstage/integration@1.16.1-next.0
+ - @backstage/plugin-bitbucket-cloud-common@0.2.27-next.0
+
+## 1.29.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-scaffolder-backend-module-github@0.5.5-next.1
+
+## 1.29.0-next.0
+
+### Minor Changes
+
+- 5d9e5c8: Added the ability to use `${{ context.task.id }}` in nunjucks templating, as well as `ctx.task.id` in actions to get the current task ID.
+
+### Patch Changes
+
+- 8379bf4: Remove usages of `PluginDatabaseManager` and `PluginEndpointDiscovery` and replace with their equivalent service types
+- Updated dependencies
+ - @backstage/backend-defaults@0.7.0-next.0
+ - @backstage/plugin-scaffolder-node@0.6.3-next.0
+ - @backstage/plugin-permission-node@0.8.7-next.0
+ - @backstage/plugin-auth-node@0.5.6-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-client@1.9.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/integration@1.16.0
+ - @backstage/types@1.2.0
+ - @backstage/plugin-bitbucket-cloud-common@0.2.26
+ - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.4-next.0
+ - @backstage/plugin-catalog-node@1.15.1-next.0
+ - @backstage/plugin-events-node@0.4.7-next.0
+ - @backstage/plugin-permission-common@0.8.3
+ - @backstage/plugin-scaffolder-backend-module-azure@0.2.5-next.0
+ - @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.6-next.0
+ - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.5-next.0
+ - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.5-next.0
+ - @backstage/plugin-scaffolder-backend-module-gerrit@0.2.5-next.0
+ - @backstage/plugin-scaffolder-backend-module-gitea@0.2.5-next.0
+ - @backstage/plugin-scaffolder-backend-module-github@0.5.5-next.0
+ - @backstage/plugin-scaffolder-backend-module-gitlab@0.7.1-next.0
+ - @backstage/plugin-scaffolder-common@1.5.8
+
## 1.28.0
### Minor Changes
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index 7e245e12f2..7d5a9c201b 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-scaffolder-backend",
- "version": "1.28.0",
+ "version": "1.29.0-next.2",
"description": "The Backstage backend plugin that helps you create new things",
"backstage": {
"role": "backend-plugin",
diff --git a/plugins/scaffolder-backend/report.api.md b/plugins/scaffolder-backend/report.api.md
index c2e6c18ad8..20273697d3 100644
--- a/plugins/scaffolder-backend/report.api.md
+++ b/plugins/scaffolder-backend/report.api.md
@@ -39,7 +39,6 @@ import { PermissionEvaluator } from '@backstage/plugin-permission-common';
import { PermissionRule } from '@backstage/plugin-permission-node';
import { PermissionRuleParams } from '@backstage/plugin-permission-common';
import { PermissionsService } from '@backstage/backend-plugin-api';
-import { PluginDatabaseManager } from '@backstage/backend-common';
import { RESOURCE_TYPE_SCAFFOLDER_ACTION } from '@backstage/plugin-scaffolder-common/alpha';
import { RESOURCE_TYPE_SCAFFOLDER_TEMPLATE } from '@backstage/plugin-scaffolder-common/alpha';
import { ScaffolderEntitiesProcessor as ScaffolderEntitiesProcessor_2 } from '@backstage/plugin-catalog-backend-module-scaffolder-entity-model';
@@ -520,7 +519,7 @@ export class DatabaseTaskStore implements TaskStore {
// @public
export type DatabaseTaskStoreOptions = {
- database: PluginDatabaseManager | Knex;
+ database: DatabaseService | Knex;
events?: EventsService;
};
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
index 8114532566..4dbe938679 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
@@ -15,8 +15,10 @@
*/
import { JsonObject } from '@backstage/types';
-import { PluginDatabaseManager } from '@backstage/backend-common';
-import { resolvePackagePath } from '@backstage/backend-plugin-api';
+import {
+ DatabaseService,
+ resolvePackagePath,
+} from '@backstage/backend-plugin-api';
import { ConflictError, NotFoundError } from '@backstage/errors';
import { Knex } from 'knex';
import { v4 as uuid } from 'uuid';
@@ -78,19 +80,19 @@ export type RawDbTaskEventRow = {
* @public
*/
export type DatabaseTaskStoreOptions = {
- database: PluginDatabaseManager | Knex;
+ database: DatabaseService | Knex;
events?: EventsService;
};
/**
- * Type guard to help DatabaseTaskStore understand when database is PluginDatabaseManager vs. when database is a Knex instance.
+ * Type guard to help DatabaseTaskStore understand when database is DatabaseService vs. when database is a Knex instance.
*
* * @public
*/
-function isPluginDatabaseManager(
- opt: PluginDatabaseManager | Knex,
-): opt is PluginDatabaseManager {
- return (opt as PluginDatabaseManager).getClient !== undefined;
+function isDatabaseService(
+ opt: DatabaseService | Knex,
+): opt is DatabaseService {
+ return (opt as DatabaseService).getClient !== undefined;
}
const parseSqlDateToIsoString = (input: T): T | string => {
@@ -152,9 +154,9 @@ export class DatabaseTaskStore implements TaskStore {
}
private static async getClient(
- database: PluginDatabaseManager | Knex,
+ database: DatabaseService | Knex,
): Promise {
- if (isPluginDatabaseManager(database)) {
+ if (isDatabaseService(database)) {
return database.getClient();
}
@@ -162,10 +164,10 @@ export class DatabaseTaskStore implements TaskStore {
}
private static async runMigrations(
- database: PluginDatabaseManager | Knex,
+ database: DatabaseService | Knex,
client: Knex,
): Promise {
- if (!isPluginDatabaseManager(database)) {
+ if (!isDatabaseService(database)) {
await client.migrate.latest({
directory: migrationsDir,
});
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
index 3990ac14b6..7e204d35df 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
@@ -707,6 +707,34 @@ describe('NunjucksWorkflowRunner', () => {
expect(output.foo).toEqual('BACKSTAGE');
});
+
+ it('should include task ID in the templated context', async () => {
+ const task = createMockTaskWithSpec({
+ apiVersion: 'scaffolder.backstage.io/v1beta3',
+ steps: [
+ {
+ id: 'test',
+ name: 'name',
+ action: 'jest-mock-action',
+ input: {
+ values: {
+ taskId: '${{context.task.id}}',
+ },
+ },
+ },
+ ],
+ output: {},
+ parameters: {},
+ });
+
+ await runner.execute(task);
+
+ expect(fakeActionHandler).toHaveBeenCalledWith(
+ expect.objectContaining({
+ input: { values: { taskId: 'test-workspace' } },
+ }),
+ );
+ });
});
describe('redactions', () => {
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
index c5413a08e0..ad9d85cb2d 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
@@ -80,6 +80,11 @@ type TemplateContext = {
ref?: string;
};
each?: JsonValue;
+ context: {
+ task: {
+ id: string;
+ };
+ };
};
type CheckpointState =
@@ -367,6 +372,9 @@ export class NunjucksWorkflowRunner implements WorkflowRunner {
await action.handler({
input: iteration.input,
+ task: {
+ id: await task.getWorkspaceName(),
+ },
secrets: task.secrets ?? {},
// TODO(blam): move to LoggerService and away from Winston
logger: loggerToWinstonLogger(taskLogger),
@@ -490,6 +498,11 @@ export class NunjucksWorkflowRunner implements WorkflowRunner {
parameters: task.spec.parameters,
steps: {},
user: task.spec.user,
+ context: {
+ task: {
+ id: taskId,
+ },
+ },
};
const [decision]: PolicyDecision[] =
diff --git a/plugins/scaffolder-backend/src/service/router.test.ts b/plugins/scaffolder-backend/src/service/router.test.ts
index 55d8b91293..42a89cc7f3 100644
--- a/plugins/scaffolder-backend/src/service/router.test.ts
+++ b/plugins/scaffolder-backend/src/service/router.test.ts
@@ -17,7 +17,6 @@
import {
DatabaseManager,
loggerToWinstonLogger,
- PluginDatabaseManager,
} from '@backstage/backend-common';
import { ConfigReader } from '@backstage/config';
import { TemplateEntityV1beta3 } from '@backstage/plugin-scaffolder-common';
@@ -52,6 +51,7 @@ import { AutocompleteHandler } from '@backstage/plugin-scaffolder-node/alpha';
import { UrlReaders } from '@backstage/backend-defaults/urlReader';
import { catalogServiceMock } from '@backstage/plugin-catalog-node/testUtils';
import { EventsService } from '@backstage/plugin-events-node';
+import { DatabaseService } from '@backstage/backend-plugin-api';
const mockAccess = jest.fn();
@@ -68,7 +68,7 @@ jest.mock('fs-extra', () => ({
remove: jest.fn(),
}));
-function createDatabase(): PluginDatabaseManager {
+function createDatabase(): DatabaseService {
return DatabaseManager.fromConfig(
new ConfigReader({
backend: {
diff --git a/plugins/scaffolder-common/CHANGELOG.md b/plugins/scaffolder-common/CHANGELOG.md
index 26f4cb1c5c..b46354fee1 100644
--- a/plugins/scaffolder-common/CHANGELOG.md
+++ b/plugins/scaffolder-common/CHANGELOG.md
@@ -1,5 +1,14 @@
# @backstage/plugin-scaffolder-common
+## 1.5.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/plugin-permission-common@0.8.4-next.0
+
## 1.5.8
### Patch Changes
diff --git a/plugins/scaffolder-common/package.json b/plugins/scaffolder-common/package.json
index 38b1f25823..b54d25937e 100644
--- a/plugins/scaffolder-common/package.json
+++ b/plugins/scaffolder-common/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-scaffolder-common",
- "version": "1.5.8",
+ "version": "1.5.9-next.0",
"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 2d7ba2f637..ef36bb993a 100644
--- a/plugins/scaffolder-node-test-utils/CHANGELOG.md
+++ b/plugins/scaffolder-node-test-utils/CHANGELOG.md
@@ -1,5 +1,23 @@
# @backstage/plugin-scaffolder-node-test-utils
+## 0.1.18-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/backend-test-utils@1.2.1-next.1
+ - @backstage/plugin-scaffolder-node@0.6.3-next.1
+
+## 0.1.18-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-scaffolder-node@0.6.3-next.0
+ - @backstage/backend-test-utils@1.2.1-next.0
+ - @backstage/types@1.2.0
+
## 0.1.17
### Patch Changes
diff --git a/plugins/scaffolder-node-test-utils/package.json b/plugins/scaffolder-node-test-utils/package.json
index 044a7ced2e..a64aa4b411 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.1.17",
+ "version": "0.1.18-next.1",
"backstage": {
"role": "node-library",
"pluginId": "scaffolder",
diff --git a/plugins/scaffolder-node-test-utils/src/actions/mockActionContext.ts b/plugins/scaffolder-node-test-utils/src/actions/mockActionContext.ts
index b178a1d51d..1d45051753 100644
--- a/plugins/scaffolder-node-test-utils/src/actions/mockActionContext.ts
+++ b/plugins/scaffolder-node-test-utils/src/actions/mockActionContext.ts
@@ -45,6 +45,9 @@ export const createMockActionContext = <
input: {} as TActionInput,
checkpoint: jest.fn(),
getInitiatorCredentials: () => Promise.resolve(credentials),
+ task: {
+ id: 'mock-task-id',
+ },
};
const createDefaultWorkspace = () => ({
@@ -58,8 +61,15 @@ export const createMockActionContext = <
};
}
- const { input, logger, logStream, secrets, templateInfo, workspacePath } =
- options;
+ const {
+ input,
+ logger,
+ logStream,
+ secrets,
+ templateInfo,
+ workspacePath,
+ task,
+ } = options;
return {
...defaultContext,
@@ -71,6 +81,7 @@ export const createMockActionContext = <
...(logStream && { logStream }),
...(input && { input }),
...(secrets && { secrets }),
+ ...(task && { task }),
templateInfo,
};
};
diff --git a/plugins/scaffolder-node/CHANGELOG.md b/plugins/scaffolder-node/CHANGELOG.md
index 6d8285f959..dd6f4aaa10 100644
--- a/plugins/scaffolder-node/CHANGELOG.md
+++ b/plugins/scaffolder-node/CHANGELOG.md
@@ -1,5 +1,31 @@
# @backstage/plugin-scaffolder-node
+## 0.6.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-scaffolder-common@1.5.9-next.0
+ - @backstage/integration@1.16.1-next.0
+
+## 0.6.3-next.0
+
+### Patch Changes
+
+- 5d9e5c8: Added the ability to use `${{ context.task.id }}` in nunjucks templating, as well as `ctx.task.id` in actions to get the current task ID.
+- 7dd0013: Deprecate the `logStream` option in `executeShellCommand`, replacing it with a logger instance.
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/errors@1.2.6
+ - @backstage/integration@1.16.0
+ - @backstage/types@1.2.0
+ - @backstage/plugin-scaffolder-common@1.5.8
+
## 0.6.2
### Patch Changes
diff --git a/plugins/scaffolder-node/package.json b/plugins/scaffolder-node/package.json
index 546bb91e02..97cf63dc4f 100644
--- a/plugins/scaffolder-node/package.json
+++ b/plugins/scaffolder-node/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-scaffolder-node",
- "version": "0.6.2",
+ "version": "0.6.3-next.1",
"description": "The plugin-scaffolder-node module for @backstage/plugin-scaffolder-backend",
"backstage": {
"role": "node-library",
diff --git a/plugins/scaffolder-node/report.api.md b/plugins/scaffolder-node/report.api.md
index c14a689d1a..0afd6dc202 100644
--- a/plugins/scaffolder-node/report.api.md
+++ b/plugins/scaffolder-node/report.api.md
@@ -9,6 +9,7 @@ import { BackstageCredentials } from '@backstage/backend-plugin-api';
import { JsonObject } from '@backstage/types';
import { JsonValue } from '@backstage/types';
import { Logger } from 'winston';
+import { LoggerService } from '@backstage/backend-plugin-api';
import { Observable } from '@backstage/types';
import { Schema } from 'jsonschema';
import { ScmIntegrationRegistry } from '@backstage/integration';
@@ -41,6 +42,9 @@ export type ActionContext<
): void;
createTemporaryDirectory(): Promise;
getInitiatorCredentials(): Promise;
+ task: {
+ id: string;
+ };
templateInfo?: TemplateInfo;
isDryRun?: boolean;
user?: {
@@ -191,6 +195,7 @@ export type ExecuteShellCommandOptions = {
command: string;
args: string[];
options?: SpawnOptionsWithoutStdio;
+ logger?: LoggerService;
logStream?: Writable;
};
diff --git a/plugins/scaffolder-node/src/actions/executeShellCommand.test.ts b/plugins/scaffolder-node/src/actions/executeShellCommand.test.ts
new file mode 100644
index 0000000000..67951f915c
--- /dev/null
+++ b/plugins/scaffolder-node/src/actions/executeShellCommand.test.ts
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2024 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 { spawn } from 'child_process';
+import { PassThrough, Writable } from 'stream';
+import { executeShellCommand } from './executeShellCommand';
+
+jest.mock('child_process', () => ({
+ spawn: jest.fn(),
+}));
+
+describe('executeShellCommand', () => {
+ let mockSpawn: jest.Mock;
+ let mockProcess: any;
+ let mockLogger: jest.Mocked;
+ let mockLogStream: Writable;
+
+ beforeEach(() => {
+ mockSpawn = spawn as jest.Mock;
+ mockProcess = {
+ stdout: new PassThrough(),
+ stderr: new PassThrough(),
+ on: jest.fn((event: string, callback: (code: number) => void) => {
+ if (event === 'close') {
+ callback(0);
+ }
+ }),
+ };
+ mockSpawn.mockReturnValue(mockProcess);
+
+ mockLogStream = new PassThrough();
+
+ mockLogger = {
+ info: jest.fn(),
+ error: jest.fn(),
+ } as unknown as jest.Mocked;
+ jest.clearAllMocks();
+ });
+
+ afterEach(() => {
+ jest.resetAllMocks();
+ });
+
+ it('should execute without logger or logStream', async () => {
+ await executeShellCommand({
+ command: 'echo',
+ args: ['Hello World'],
+ });
+
+ expect(mockSpawn).toHaveBeenCalledWith('echo', ['Hello World'], undefined);
+ });
+
+ it('should execute with logger but no logStream', async () => {
+ const logStreamSpy = jest.spyOn(mockLogStream, 'write');
+ await executeShellCommand({
+ command: 'echo',
+ args: ['Hello World'],
+ logger: mockLogger,
+ });
+
+ // Simulate command output
+ mockProcess.stdout.emit('data', Buffer.from('Hello World\n'));
+
+ mockProcess.on('close', (code: any) => {
+ expect(code).toBe(0);
+ expect(logStreamSpy).not.toHaveBeenCalled();
+ expect(mockLogger.info).toHaveBeenCalledWith('Hello World');
+ expect(mockLogger.error).not.toHaveBeenCalledWith(expect.anything());
+ });
+ });
+
+ it('should execute with logStream but no logger', async () => {
+ const logStreamSpy = jest.spyOn(mockLogStream, 'write');
+
+ await executeShellCommand({
+ command: 'echo',
+ args: ['Hello World'],
+ logStream: mockLogStream,
+ });
+
+ mockProcess.stdout.emit('data', Buffer.from('Hello World\n'));
+ mockProcess.stderr.emit('data', Buffer.from('Command not found\n'));
+
+ mockProcess.on('close', () => {
+ expect(logStreamSpy).toHaveBeenCalledWith(expect.any(Buffer));
+ expect(logStreamSpy).toHaveBeenCalledTimes(2);
+ expect(mockLogger.info).not.toHaveBeenCalled();
+ });
+ });
+
+ it('should execute with both logger and logStream', async () => {
+ const logStreamSpy = jest.spyOn(mockLogStream, 'write');
+
+ await executeShellCommand({
+ command: 'echo',
+ args: ['Hello World'],
+ logger: mockLogger,
+ logStream: mockLogStream,
+ });
+
+ mockProcess.stdout.emit('data', Buffer.from('Hello World\n'));
+ mockProcess.stderr.emit('data', Buffer.from('Command not found\n'));
+
+ mockProcess.on('close', () => {
+ expect(mockLogger.info).toHaveBeenCalledWith('Hello World');
+ expect(mockLogger.error).toHaveBeenCalledWith('Command not found');
+ expect(logStreamSpy).toHaveBeenCalledTimes(2);
+ });
+ });
+
+ it('should handle non-zero exit code', async () => {
+ mockProcess.on.mockImplementation(
+ (event: string, callback: (arg0: number) => void) => {
+ if (event === 'close') {
+ callback(1); // Simulate command failing
+ }
+ },
+ );
+
+ await expect(
+ executeShellCommand({
+ command: 'echo',
+ args: ['Hello World'],
+ logger: mockLogger,
+ }),
+ ).rejects.toThrow('Command echo failed, exit code: 1');
+ });
+});
diff --git a/plugins/scaffolder-node/src/actions/executeShellCommand.ts b/plugins/scaffolder-node/src/actions/executeShellCommand.ts
index ce54989589..1d45d74327 100644
--- a/plugins/scaffolder-node/src/actions/executeShellCommand.ts
+++ b/plugins/scaffolder-node/src/actions/executeShellCommand.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import { LoggerService } from '@backstage/backend-plugin-api';
import { spawn, SpawnOptionsWithoutStdio } from 'child_process';
import { PassThrough, Writable } from 'stream';
@@ -29,7 +30,12 @@ export type ExecuteShellCommandOptions = {
args: string[];
/** options to pass to spawn */
options?: SpawnOptionsWithoutStdio;
- /** stream to capture stdout and stderr output */
+ /** logger to capture stdout and stderr output */
+ logger?: LoggerService;
+ /**
+ * stream to capture stdout and stderr output
+ * @deprecated please provide a logger instead.
+ */
logStream?: Writable;
};
@@ -45,20 +51,25 @@ export async function executeShellCommand(
command,
args,
options: spawnOptions,
+ logger,
logStream = new PassThrough(),
} = options;
await new Promise((resolve, reject) => {
const process = spawn(command, args, spawnOptions);
- process.stdout.on('data', stream => {
- logStream.write(stream);
+ process.stdout.on('data', chunk => {
+ logStream?.write(chunk);
+ logger?.info(
+ Buffer.isBuffer(chunk) ? chunk.toString('utf8').trim() : chunk.trim(),
+ );
});
-
- process.stderr.on('data', stream => {
- logStream.write(stream);
+ process.stderr.on('data', chunk => {
+ logStream?.write(chunk);
+ logger?.error(
+ Buffer.isBuffer(chunk) ? chunk.toString('utf8').trim() : chunk.trim(),
+ );
});
-
process.on('error', error => {
return reject(error);
});
diff --git a/plugins/scaffolder-node/src/actions/types.ts b/plugins/scaffolder-node/src/actions/types.ts
index 5dd9d5526f..171d3d82db 100644
--- a/plugins/scaffolder-node/src/actions/types.ts
+++ b/plugins/scaffolder-node/src/actions/types.ts
@@ -57,6 +57,13 @@ export type ActionContext<
*/
getInitiatorCredentials(): Promise;
+ /**
+ * Task information
+ */
+ task: {
+ id: string;
+ };
+
templateInfo?: TemplateInfo;
/**
diff --git a/plugins/scaffolder-react/CHANGELOG.md b/plugins/scaffolder-react/CHANGELOG.md
index 9518c28cda..8d3cde2750 100644
--- a/plugins/scaffolder-react/CHANGELOG.md
+++ b/plugins/scaffolder-react/CHANGELOG.md
@@ -1,5 +1,52 @@
# @backstage/plugin-scaffolder-react
+## 1.14.3-next.2
+
+### Patch Changes
+
+- 91bb99a: Fix field extension validation not working when field is in dependencies in an array field
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.9.4-next.0
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/types@1.2.1-next.0
+ - @backstage/plugin-catalog-react@1.15.1-next.1
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/plugin-permission-react@0.4.30-next.0
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/plugin-scaffolder-common@1.5.9-next.0
+ - @backstage/catalog-client@1.9.1-next.0
+ - @backstage/theme@0.6.3
+ - @backstage/version-bridge@1.0.10
+
+## 1.14.3-next.1
+
+### Patch Changes
+
+- d8f9079: Updated dependency `@rjsf/utils` to `5.23.2`.
+ Updated dependency `@rjsf/core` to `5.23.2`.
+ Updated dependency `@rjsf/material-ui` to `5.23.2`.
+ Updated dependency `@rjsf/validator-ajv8` to `5.23.2`.
+- Updated dependencies
+ - @backstage/plugin-catalog-react@1.15.1-next.0
+
+## 1.14.3-next.0
+
+### Patch Changes
+
+- 37421bc: Fixed scaffolder form fields not resolving correctly in the `useCustomFieldExtensions` hook.
+- Updated dependencies
+ - @backstage/catalog-client@1.9.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/core-components@0.16.2
+ - @backstage/core-plugin-api@1.10.2
+ - @backstage/frontend-plugin-api@0.9.3
+ - @backstage/theme@0.6.3
+ - @backstage/types@1.2.0
+ - @backstage/version-bridge@1.0.10
+ - @backstage/plugin-catalog-react@1.15.0
+ - @backstage/plugin-permission-react@0.4.29
+ - @backstage/plugin-scaffolder-common@1.5.8
+
## 1.14.2
### Patch Changes
diff --git a/plugins/scaffolder-react/package.json b/plugins/scaffolder-react/package.json
index 6ea25a5e65..9bb87b6544 100644
--- a/plugins/scaffolder-react/package.json
+++ b/plugins/scaffolder-react/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-scaffolder-react",
- "version": "1.14.2",
+ "version": "1.14.3-next.2",
"description": "A frontend library that helps other Backstage plugins interact with the Scaffolder",
"backstage": {
"role": "web-library",
@@ -73,10 +73,10 @@
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.61",
"@react-hookz/web": "^24.0.0",
- "@rjsf/core": "5.23.1",
- "@rjsf/material-ui": "5.23.1",
- "@rjsf/utils": "5.23.1",
- "@rjsf/validator-ajv8": "5.23.1",
+ "@rjsf/core": "5.23.2",
+ "@rjsf/material-ui": "5.23.2",
+ "@rjsf/utils": "5.23.2",
+ "@rjsf/validator-ajv8": "5.23.2",
"@types/json-schema": "^7.0.9",
"ajv-errors": "^3.0.0",
"classnames": "^2.2.6",
diff --git a/plugins/scaffolder-react/src/hooks/useCustomFieldExtensions.ts b/plugins/scaffolder-react/src/hooks/useCustomFieldExtensions.ts
index d1e670330e..d44fc18e07 100644
--- a/plugins/scaffolder-react/src/hooks/useCustomFieldExtensions.ts
+++ b/plugins/scaffolder-react/src/hooks/useCustomFieldExtensions.ts
@@ -34,11 +34,11 @@ export const useCustomFieldExtensions = <
) => {
// Get custom fields created with FormFieldBlueprint
const formFieldsApi = useApi(formFieldsApiRef);
- const [{ result: blueprintFields }, methods] = useAsync(
- formFieldsApi.getFormFields,
+ const [{ result: blueprintFields }, { execute }] = useAsync(
+ () => formFieldsApi.getFormFields(),
[],
);
- useMountEffect(methods.execute);
+ useMountEffect(execute);
// Get custom fields created with ScaffolderFieldExtensions
const outletFields = useElementFilter(outlet, elements =>
diff --git a/plugins/scaffolder-react/src/next/components/Stepper/createAsyncValidators.test.ts b/plugins/scaffolder-react/src/next/components/Stepper/createAsyncValidators.test.ts
index f4dab376bc..02e15ec53b 100644
--- a/plugins/scaffolder-react/src/next/components/Stepper/createAsyncValidators.test.ts
+++ b/plugins/scaffolder-react/src/next/components/Stepper/createAsyncValidators.test.ts
@@ -435,4 +435,62 @@ describe('createAsyncValidators', () => {
expect(validators.CustomLinkField).toHaveBeenCalled();
});
+
+ it('should validate field in the dependencies in an array field', async () => {
+ const schema: JsonObject = {
+ title: 'Make a choice',
+ properties: {
+ myArray: {
+ type: 'array',
+ title: 'Array',
+ items: {
+ type: 'object',
+ required: ['selector'],
+ properties: {
+ selector: {
+ title: 'Selector',
+ type: 'string',
+ enum: ['Choice 1', 'Choice 2'],
+ },
+ },
+ dependencies: {
+ selector: {
+ oneOf: [
+ { properties: { selector: { enum: ['Choice 1'] } } },
+ {
+ properties: {
+ selector: { enum: ['Choice 2'] },
+ customValidatedField: {
+ title: 'Custom validated field',
+ type: 'string',
+ 'ui:field': 'ValidateKebabCase',
+ },
+ },
+ },
+ ],
+ },
+ },
+ },
+ },
+ },
+ };
+
+ const validators = { ValidateKebabCase: jest.fn() };
+
+ const validate = createAsyncValidators(schema, validators, {
+ apiHolder: { get: jest.fn() },
+ });
+
+ await validate({
+ myArray: [
+ {
+ selector: 'Choice 2',
+ customValidatedField: 'apple',
+ },
+ { selector: 'Choice 1' },
+ ],
+ });
+
+ expect(validators.ValidateKebabCase).toHaveBeenCalled();
+ });
});
diff --git a/plugins/scaffolder-react/src/next/components/Stepper/createAsyncValidators.ts b/plugins/scaffolder-react/src/next/components/Stepper/createAsyncValidators.ts
index d11d0b9b3b..b8ae3a6dfd 100644
--- a/plugins/scaffolder-react/src/next/components/Stepper/createAsyncValidators.ts
+++ b/plugins/scaffolder-react/src/next/components/Stepper/createAsyncValidators.ts
@@ -135,6 +135,26 @@ export const createAsyncValidators = (
for (const [, propValue] of Object.entries(properties)) {
await doValidate(propValue);
}
+ if (Array.isArray(value)) {
+ for (const [_, v] of Object.entries(value)) {
+ const { schema: itemSchema, uiSchema: itemUiSchema } =
+ extractSchemaFromStep(definitionInSchema.items);
+
+ if (isObject(v)) {
+ for (const [pK, pV] of Object.entries(v)) {
+ if ('ui:field' in itemUiSchema[pK]) {
+ await validateForm(
+ itemUiSchema[pK]['ui:field'],
+ pK,
+ pV,
+ itemSchema,
+ itemUiSchema,
+ );
+ }
+ }
+ }
+ }
+ }
} else if (isObject(value)) {
formValidation[key] = await validate(formData, pointer, value);
}
diff --git a/plugins/scaffolder/CHANGELOG.md b/plugins/scaffolder/CHANGELOG.md
index 847b714c4e..bfb6bfd934 100644
--- a/plugins/scaffolder/CHANGELOG.md
+++ b/plugins/scaffolder/CHANGELOG.md
@@ -1,5 +1,62 @@
# @backstage/plugin-scaffolder
+## 1.27.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-scaffolder-react@1.14.3-next.2
+ - @backstage/frontend-plugin-api@0.9.4-next.0
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/types@1.2.1-next.0
+ - @backstage/core-compat-api@0.3.5-next.0
+ - @backstage/plugin-catalog-react@1.15.1-next.1
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/integration-react@1.2.3-next.0
+ - @backstage/plugin-permission-react@0.4.30-next.0
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-scaffolder-common@1.5.9-next.0
+ - @backstage/catalog-client@1.9.1-next.0
+ - @backstage/plugin-catalog-common@1.1.3-next.0
+ - @backstage/integration@1.16.1-next.0
+
+## 1.27.4-next.1
+
+### Patch Changes
+
+- d8f9079: Updated dependency `@rjsf/utils` to `5.23.2`.
+ Updated dependency `@rjsf/core` to `5.23.2`.
+ Updated dependency `@rjsf/material-ui` to `5.23.2`.
+ Updated dependency `@rjsf/validator-ajv8` to `5.23.2`.
+- Updated dependencies
+ - @backstage/plugin-catalog-react@1.15.1-next.0
+ - @backstage/plugin-scaffolder-react@1.14.3-next.1
+ - @backstage/integration-react@1.2.2
+ - @backstage/core-compat-api@0.3.4
+
+## 1.27.4-next.0
+
+### Patch Changes
+
+- 3f09ef4: Fix issue with `secrets` not being forwarded properly to the backend when creating a task
+- Updated dependencies
+ - @backstage/plugin-scaffolder-react@1.14.3-next.0
+ - @backstage/catalog-client@1.9.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/core-compat-api@0.3.4
+ - @backstage/core-components@0.16.2
+ - @backstage/core-plugin-api@1.10.2
+ - @backstage/errors@1.2.6
+ - @backstage/frontend-plugin-api@0.9.3
+ - @backstage/integration@1.16.0
+ - @backstage/integration-react@1.2.2
+ - @backstage/types@1.2.0
+ - @backstage/plugin-catalog-common@1.1.2
+ - @backstage/plugin-catalog-react@1.15.0
+ - @backstage/plugin-permission-react@0.4.29
+ - @backstage/plugin-scaffolder-common@1.5.8
+
## 1.27.2
### Patch Changes
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index 549c47da7b..0790f6178f 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-scaffolder",
- "version": "1.27.2",
+ "version": "1.27.4-next.2",
"description": "The Backstage plugin that helps you create new things",
"backstage": {
"role": "frontend-plugin",
@@ -81,10 +81,10 @@
"@material-ui/lab": "4.0.0-alpha.61",
"@microsoft/fetch-event-source": "^2.0.1",
"@react-hookz/web": "^24.0.0",
- "@rjsf/core": "5.23.1",
- "@rjsf/material-ui": "5.23.1",
- "@rjsf/utils": "5.23.1",
- "@rjsf/validator-ajv8": "5.23.1",
+ "@rjsf/core": "5.23.2",
+ "@rjsf/material-ui": "5.23.2",
+ "@rjsf/utils": "5.23.2",
+ "@rjsf/validator-ajv8": "5.23.2",
"@uiw/react-codemirror": "^4.9.3",
"classnames": "^2.2.6",
"git-url-parse": "^15.0.0",
diff --git a/plugins/scaffolder/src/alpha/hooks/useFormDecorators.test.tsx b/plugins/scaffolder/src/alpha/hooks/useFormDecorators.test.tsx
index 92475c3eea..8f486bbba1 100644
--- a/plugins/scaffolder/src/alpha/hooks/useFormDecorators.test.tsx
+++ b/plugins/scaffolder/src/alpha/hooks/useFormDecorators.test.tsx
@@ -81,4 +81,75 @@ describe('useFormDecorators', () => {
expect(mockApiImplementation.test).toHaveBeenCalledWith('hello');
});
});
+
+ it('should return existing secrets and formstate', async () => {
+ const renderedHook = renderHook(() => useFormDecorators({ manifest }), {
+ wrapper: ({ children }) => (
+ {} }],
+ ]}
+ >
+ {children}
+
+ ),
+ });
+ await waitFor(async () => {
+ const result = renderedHook.result.current!;
+
+ const { secrets, formState } = await result.run({
+ formState: { test: 'formState' },
+ secrets: { test: 'hello' },
+ });
+
+ expect(secrets).toEqual({ test: 'hello' });
+ expect(formState).toEqual({ test: 'formState' });
+ });
+ });
+
+ it('should allow merging of existing secrets and formstate', async () => {
+ const secretAndFormDataModifier = createScaffolderFormDecorator({
+ id: 'test',
+ async decorator({ setFormState, setSecrets }) {
+ setFormState(state => ({ ...state, new: 'formState' }));
+ setSecrets(state => ({ ...state, new: 'hello' }));
+ },
+ });
+ const renderedHook = renderHook(() => useFormDecorators({ manifest }), {
+ wrapper: ({ children }) => (
+ {} }],
+ ]}
+ >
+ {children}
+
+ ),
+ });
+ await waitFor(async () => {
+ const result = renderedHook.result.current!;
+
+ const { secrets, formState } = await result.run({
+ formState: { test: 'formState' },
+ secrets: { test: 'hello' },
+ });
+
+ expect(secrets).toEqual({ test: 'hello', new: 'hello' });
+ expect(formState).toEqual({ test: 'formState', new: 'formState' });
+ });
+ });
});
diff --git a/plugins/scaffolder/src/alpha/hooks/useFormDecorators.ts b/plugins/scaffolder/src/alpha/hooks/useFormDecorators.ts
index 8469a89bec..d74c4a9823 100644
--- a/plugins/scaffolder/src/alpha/hooks/useFormDecorators.ts
+++ b/plugins/scaffolder/src/alpha/hooks/useFormDecorators.ts
@@ -75,7 +75,7 @@ export const useFormDecorators = ({
secrets: Record;
}) => {
let formState: Record = { ...opts.formState };
- let secrets: Record = {};
+ let secrets: Record = { ...opts.secrets };
if (manifest?.EXPERIMENTAL_formDecorators) {
// for each of the form decorators, go and call the decorator with the context
diff --git a/plugins/search-backend-module-catalog/CHANGELOG.md b/plugins/search-backend-module-catalog/CHANGELOG.md
index c74de3d7ae..8886563f06 100644
--- a/plugins/search-backend-module-catalog/CHANGELOG.md
+++ b/plugins/search-backend-module-catalog/CHANGELOG.md
@@ -1,5 +1,44 @@
# @backstage/plugin-search-backend-module-catalog
+## 0.3.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-catalog-node@1.15.1-next.1
+ - @backstage/plugin-permission-common@0.8.4-next.0
+ - @backstage/plugin-search-common@1.2.17-next.0
+ - @backstage/plugin-search-backend-node@1.3.7-next.1
+ - @backstage/catalog-client@1.9.1-next.0
+ - @backstage/plugin-catalog-common@1.1.3-next.0
+
+## 0.3.0-next.0
+
+### Minor Changes
+
+- dd515e3: **BREAKING**: Removed support for the old backend system. Please [migrate to the new backend system](https://backstage.io/docs/backend-system/) and enable [the catalog collator](https://backstage.io/docs/features/search/collators#catalog) there.
+
+ As part of this, the `/alpha` export path is gone too. Just import the module from the root of the package as usual instead.
+
+### Patch Changes
+
+- 1e09b06: Internal refactor to use cursor based pagination
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-client@1.9.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/plugin-catalog-common@1.1.2
+ - @backstage/plugin-catalog-node@1.15.1-next.0
+ - @backstage/plugin-permission-common@0.8.3
+ - @backstage/plugin-search-backend-node@1.3.7-next.0
+ - @backstage/plugin-search-common@1.2.16
+
## 0.2.6
### Patch Changes
diff --git a/plugins/search-backend-module-catalog/package.json b/plugins/search-backend-module-catalog/package.json
index 9a6cc9f2bc..4e7b30893d 100644
--- a/plugins/search-backend-module-catalog/package.json
+++ b/plugins/search-backend-module-catalog/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-search-backend-module-catalog",
- "version": "0.2.6",
+ "version": "0.3.0-next.1",
"description": "A module for the search backend that exports catalog modules",
"backstage": {
"role": "backend-plugin-module",
@@ -8,7 +8,9 @@
"pluginPackage": "@backstage/plugin-search-backend"
},
"publishConfig": {
- "access": "public"
+ "access": "public",
+ "main": "dist/index.cjs.js",
+ "types": "dist/index.d.ts"
},
"homepage": "https://backstage.io",
"repository": {
@@ -17,23 +19,8 @@
"directory": "plugins/search-backend-module-catalog"
},
"license": "Apache-2.0",
- "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",
"config.d.ts"
@@ -48,7 +35,6 @@
"test": "backstage-cli package test"
},
"dependencies": {
- "@backstage/backend-common": "^0.25.0",
"@backstage/backend-plugin-api": "workspace:^",
"@backstage/catalog-client": "workspace:^",
"@backstage/catalog-model": "workspace:^",
diff --git a/plugins/search-backend-module-catalog/report-alpha.api.md b/plugins/search-backend-module-catalog/report-alpha.api.md
deleted file mode 100644
index a622e05a3e..0000000000
--- a/plugins/search-backend-module-catalog/report-alpha.api.md
+++ /dev/null
@@ -1,13 +0,0 @@
-## API Report File for "@backstage/plugin-search-backend-module-catalog"
-
-> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
-
-```ts
-import { BackendFeature } from '@backstage/backend-plugin-api';
-
-// @alpha (undocumented)
-const _feature: BackendFeature;
-export default _feature;
-
-// (No @packageDocumentation comment for this package)
-```
diff --git a/plugins/search-backend-module-catalog/report.api.md b/plugins/search-backend-module-catalog/report.api.md
index 76314dcdf5..ab20ea29d3 100644
--- a/plugins/search-backend-module-catalog/report.api.md
+++ b/plugins/search-backend-module-catalog/report.api.md
@@ -3,22 +3,10 @@
> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
```ts
-/// ;
-// @public
-const _default: BackendFeature;
-export default _default;
-
// @public (undocumented)
export const defaultCatalogCollatorEntityTransformer: CatalogCollatorEntityTransformer;
-// @public @deprecated
-export class DefaultCatalogCollatorFactory implements DocumentCollatorFactory {
- // (undocumented)
- static fromConfig(
- configRoot: Config,
- options: DefaultCatalogCollatorFactoryOptions,
- ): DefaultCatalogCollatorFactory;
- // (undocumented)
- getCollator(): Promise;
- // (undocumented)
- readonly type = 'software-catalog';
- // (undocumented)
- readonly visibilityPermission: Permission;
-}
-
-// @public @deprecated (undocumented)
-export type DefaultCatalogCollatorFactoryOptions = {
- auth?: AuthService;
- discovery: DiscoveryService;
- tokenManager?: TokenManager;
- locationTemplate?: string;
- filter?: GetEntitiesRequest['filter'];
- batchSize?: number;
- catalogClient?: CatalogApi;
- entityTransformer?: CatalogCollatorEntityTransformer;
-};
+// @public
+const searchModuleCatalogCollator: BackendFeature;
+export default searchModuleCatalogCollator;
```
diff --git a/plugins/search-backend-module-catalog/src/collators/DefaultCatalogCollatorFactory.test.ts b/plugins/search-backend-module-catalog/src/collators/DefaultCatalogCollatorFactory.test.ts
index d4c77c617d..68aedbdef8 100644
--- a/plugins/search-backend-module-catalog/src/collators/DefaultCatalogCollatorFactory.test.ts
+++ b/plugins/search-backend-module-catalog/src/collators/DefaultCatalogCollatorFactory.test.ts
@@ -16,7 +16,6 @@
import { mockServices } from '@backstage/backend-test-utils';
import { Entity } from '@backstage/catalog-model';
-import { ConfigReader } from '@backstage/config';
import { catalogServiceMock } from '@backstage/plugin-catalog-node/testUtils';
import { TestPipeline } from '@backstage/plugin-search-backend-node';
import { Readable } from 'stream';
@@ -54,9 +53,7 @@ const expectedEntities: Entity[] = [
describe('DefaultCatalogCollatorFactory', () => {
const config = mockServices.rootConfig();
- const discovery = mockServices.discovery.mock({
- getBaseUrl: async () => 'http://localhost:7007',
- });
+ const auth = mockServices.auth();
const catalog = catalogServiceMock({ entities: expectedEntities });
describe('getCollator', () => {
@@ -65,8 +62,8 @@ describe('DefaultCatalogCollatorFactory', () => {
beforeEach(async () => {
factory = DefaultCatalogCollatorFactory.fromConfig(config, {
- discovery,
- catalogClient: catalog,
+ auth,
+ catalog,
});
collator = await factory.getCollator();
});
@@ -117,8 +114,8 @@ describe('DefaultCatalogCollatorFactory', () => {
it('maps a returned entity to an expected CatalogEntityDocument with custom transformer', async () => {
const customFactory = DefaultCatalogCollatorFactory.fromConfig(config, {
- discovery,
- catalogClient: catalog,
+ auth,
+ catalog,
entityTransformer: entity => ({
title: `custom-title-${
entity.metadata.title ?? entity.metadata.name
@@ -173,11 +170,19 @@ describe('DefaultCatalogCollatorFactory', () => {
it('maps a returned entity with a custom locationTemplate', async () => {
// Provide an alternate location template.
- factory = DefaultCatalogCollatorFactory.fromConfig(new ConfigReader({}), {
- discovery: discovery,
- catalogClient: catalog,
- locationTemplate: '/software/:name',
- });
+ factory = DefaultCatalogCollatorFactory.fromConfig(
+ mockServices.rootConfig({
+ data: {
+ search: {
+ collators: { catalog: { locationTemplate: '/software/:name' } },
+ },
+ },
+ }),
+ {
+ auth,
+ catalog,
+ },
+ );
collator = await factory.getCollator();
const pipeline = TestPipeline.fromCollator(collator);
@@ -189,13 +194,19 @@ describe('DefaultCatalogCollatorFactory', () => {
it('allows filtering of the retrieved catalog entities', async () => {
// Provide a custom filter.
- factory = DefaultCatalogCollatorFactory.fromConfig(new ConfigReader({}), {
- discovery: discovery,
- catalogClient: catalog,
- filter: {
- kind: ['Foo', 'Bar'],
+ factory = DefaultCatalogCollatorFactory.fromConfig(
+ mockServices.rootConfig({
+ data: {
+ search: {
+ collators: { catalog: { filter: { kind: ['Foo', 'Bar'] } } },
+ },
+ },
+ }),
+ {
+ auth,
+ catalog,
},
- });
+ );
collator = await factory.getCollator();
const pipeline = TestPipeline.fromCollator(collator);
@@ -206,11 +217,19 @@ describe('DefaultCatalogCollatorFactory', () => {
});
it('paginates through catalog entities using batchSize', async () => {
- factory = DefaultCatalogCollatorFactory.fromConfig(config, {
- discovery,
- catalogClient: catalog,
- batchSize: 1,
- });
+ factory = DefaultCatalogCollatorFactory.fromConfig(
+ mockServices.rootConfig({
+ data: {
+ search: {
+ collators: { catalog: { batchSize: 1 } },
+ },
+ },
+ }),
+ {
+ auth,
+ catalog,
+ },
+ );
collator = await factory.getCollator();
const pipeline = TestPipeline.fromCollator(collator);
diff --git a/plugins/search-backend-module-catalog/src/collators/DefaultCatalogCollatorFactory.ts b/plugins/search-backend-module-catalog/src/collators/DefaultCatalogCollatorFactory.ts
index ff3e81843b..1cef2e21df 100644
--- a/plugins/search-backend-module-catalog/src/collators/DefaultCatalogCollatorFactory.ts
+++ b/plugins/search-backend-module-catalog/src/collators/DefaultCatalogCollatorFactory.ts
@@ -14,20 +14,13 @@
* limitations under the License.
*/
-import {
- TokenManager,
- createLegacyAuthAdapters,
-} from '@backstage/backend-common';
-import { AuthService, DiscoveryService } from '@backstage/backend-plugin-api';
-import {
- CatalogApi,
- CatalogClient,
- GetEntitiesRequest,
-} from '@backstage/catalog-client';
+import { AuthService } from '@backstage/backend-plugin-api';
+import { QueryEntitiesInitialRequest } from '@backstage/catalog-client';
import { stringifyEntityRef } from '@backstage/catalog-model';
import { Config } from '@backstage/config';
import { CatalogEntityDocument } from '@backstage/plugin-catalog-common';
import { catalogEntityReadPermission } from '@backstage/plugin-catalog-common/alpha';
+import { CatalogService } from '@backstage/plugin-catalog-node';
import { Permission } from '@backstage/plugin-permission-common';
import { DocumentCollatorFactory } from '@backstage/plugin-search-common';
import { Readable } from 'stream';
@@ -35,29 +28,10 @@ import { CatalogCollatorEntityTransformer } from './CatalogCollatorEntityTransfo
import { readCollatorConfigOptions } from './config';
import { defaultCatalogCollatorEntityTransformer } from './defaultCatalogCollatorEntityTransformer';
-/**
- * @public
- * @deprecated This type is deprecated along with the {@link DefaultCatalogCollatorFactory}.
- */
export type DefaultCatalogCollatorFactoryOptions = {
- auth?: AuthService;
- discovery: DiscoveryService;
- tokenManager?: TokenManager;
- /**
- * @deprecated Use the config key `search.collators.catalog.locationTemplate` instead.
- */
- locationTemplate?: string;
- /**
- * @deprecated Use the config key `search.collators.catalog.filter` instead.
- */
- filter?: GetEntitiesRequest['filter'];
- /**
- * @deprecated Use the config key `search.collators.catalog.batchSize` instead.
- */
- batchSize?: number;
- // TODO(freben): Change to required CatalogService instead when fully migrated to the new backend system.
- catalogClient?: CatalogApi;
- /**
+ auth: AuthService;
+ catalog: CatalogService;
+ /*
* Allows you to customize how entities are shaped into documents.
*/
entityTransformer?: CatalogCollatorEntityTransformer;
@@ -65,9 +39,6 @@ export type DefaultCatalogCollatorFactoryOptions = {
/**
* Collates entities from the Catalog into documents for the search backend.
- *
- * @public
- * @deprecated Migrate to the {@link https://backstage.io/docs/backend-system/building-backends/migrating | new backend system} and install this collator via module instead (see {@link https://github.com/backstage/backstage/blob/nbs10/search-deprecate-create-router/plugins/search-backend-module-catalog/README.md#installation | here} for more installation details).
*/
export class DefaultCatalogCollatorFactory implements DocumentCollatorFactory {
public readonly type = 'software-catalog';
@@ -75,9 +46,9 @@ export class DefaultCatalogCollatorFactory implements DocumentCollatorFactory {
catalogEntityReadPermission;
private locationTemplate: string;
- private filter?: GetEntitiesRequest['filter'];
+ private filter?: QueryEntitiesInitialRequest['filter'];
private batchSize: number;
- private readonly catalogClient: CatalogApi;
+ private readonly catalog: CatalogService;
private entityTransformer: CatalogCollatorEntityTransformer;
private auth: AuthService;
@@ -86,47 +57,37 @@ export class DefaultCatalogCollatorFactory implements DocumentCollatorFactory {
options: DefaultCatalogCollatorFactoryOptions,
) {
const configOptions = readCollatorConfigOptions(configRoot);
- const { auth: adaptedAuth } = createLegacyAuthAdapters({
- auth: options.auth,
- discovery: options.discovery,
- tokenManager: options.tokenManager,
- });
return new DefaultCatalogCollatorFactory({
- locationTemplate:
- options.locationTemplate ?? configOptions.locationTemplate,
- filter: options.filter ?? configOptions.filter,
- batchSize: options.batchSize ?? configOptions.batchSize,
+ locationTemplate: configOptions.locationTemplate,
+ filter: configOptions.filter,
+ batchSize: configOptions.batchSize,
entityTransformer: options.entityTransformer,
- auth: adaptedAuth,
- discovery: options.discovery,
- catalogClient: options.catalogClient,
+ auth: options.auth,
+ catalog: options.catalog,
});
}
private constructor(options: {
locationTemplate: string;
- filter: GetEntitiesRequest['filter'];
+ filter: QueryEntitiesInitialRequest['filter'];
batchSize: number;
entityTransformer?: CatalogCollatorEntityTransformer;
auth: AuthService;
- discovery: DiscoveryService;
- catalogClient?: CatalogApi;
+ catalog: CatalogService;
}) {
const {
auth,
batchSize,
- discovery,
locationTemplate,
filter,
- catalogClient,
+ catalog,
entityTransformer,
} = options;
this.locationTemplate = locationTemplate;
this.filter = filter;
this.batchSize = batchSize;
- this.catalogClient =
- catalogClient || new CatalogClient({ discoveryApi: discovery });
+ this.catalog = catalog;
this.entityTransformer =
entityTransformer ?? defaultCatalogCollatorEntityTransformer;
this.auth = auth;
@@ -141,17 +102,13 @@ export class DefaultCatalogCollatorFactory implements DocumentCollatorFactory {
let cursor: string | undefined = undefined;
do {
- const { token } = await this.auth.getPluginRequestToken({
- onBehalfOf: await this.auth.getOwnServiceCredentials(),
- targetPluginId: 'catalog',
- });
- const response = await this.catalogClient.queryEntities(
+ const response = await this.catalog.queryEntities(
{
filter: this.filter,
limit: this.batchSize,
...(cursor ? { cursor } : {}),
},
- { token },
+ { credentials: await this.auth.getOwnServiceCredentials() },
);
cursor = response.pageInfo.nextCursor;
entitiesRetrieved += response.items.length;
diff --git a/plugins/search-backend-module-catalog/src/collators/index.ts b/plugins/search-backend-module-catalog/src/collators/index.ts
index 5876e71a02..d4fbbab760 100644
--- a/plugins/search-backend-module-catalog/src/collators/index.ts
+++ b/plugins/search-backend-module-catalog/src/collators/index.ts
@@ -14,8 +14,5 @@
* limitations under the License.
*/
-export { DefaultCatalogCollatorFactory } from './DefaultCatalogCollatorFactory';
-export type { DefaultCatalogCollatorFactoryOptions } from './DefaultCatalogCollatorFactory';
-
export { defaultCatalogCollatorEntityTransformer } from './defaultCatalogCollatorEntityTransformer';
export type { CatalogCollatorEntityTransformer } from './CatalogCollatorEntityTransformer';
diff --git a/plugins/search-backend-module-catalog/src/index.ts b/plugins/search-backend-module-catalog/src/index.ts
index 3e0ec59cc0..e6c5b96173 100644
--- a/plugins/search-backend-module-catalog/src/index.ts
+++ b/plugins/search-backend-module-catalog/src/index.ts
@@ -16,9 +16,13 @@
/**
* @packageDocumentation
+ *
* A module for the search backend that exports Catalog modules.
*/
-export * from './module';
-export { default } from './module';
+export {
+ type CatalogCollatorExtensionPoint,
+ catalogCollatorExtensionPoint,
+ searchModuleCatalogCollator as default,
+} from './module';
export * from './collators';
diff --git a/plugins/search-backend-module-catalog/src/module.test.ts b/plugins/search-backend-module-catalog/src/module.test.ts
index d05c96c8ec..5056f70f9c 100644
--- a/plugins/search-backend-module-catalog/src/module.test.ts
+++ b/plugins/search-backend-module-catalog/src/module.test.ts
@@ -16,7 +16,7 @@
import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
import { searchIndexRegistryExtensionPoint } from '@backstage/plugin-search-backend-node/alpha';
-import searchModuleCatalogCollator from './module';
+import { searchModuleCatalogCollator } from './module';
describe('searchModuleCatalogCollator', () => {
it('should register the catalog collator to the search index registry extension point with factory and schedule', async () => {
diff --git a/plugins/search-backend-module-catalog/src/module.ts b/plugins/search-backend-module-catalog/src/module.ts
index 3256a2b32f..32fe4e4728 100644
--- a/plugins/search-backend-module-catalog/src/module.ts
+++ b/plugins/search-backend-module-catalog/src/module.ts
@@ -16,7 +16,8 @@
/**
* @packageDocumentation
- * A module for the search backend that exports Catalog modules.
+ *
+ * A collator module for the search backend that indexes your software catalog.
*/
import {
@@ -24,13 +25,11 @@ import {
createBackendModule,
createExtensionPoint,
} from '@backstage/backend-plugin-api';
-import { catalogServiceRef } from '@backstage/plugin-catalog-node/alpha';
-import {
- CatalogCollatorEntityTransformer,
- DefaultCatalogCollatorFactory,
-} from '@backstage/plugin-search-backend-module-catalog';
+import { catalogServiceRef } from '@backstage/plugin-catalog-node';
import { searchIndexRegistryExtensionPoint } from '@backstage/plugin-search-backend-node/alpha';
import { readScheduleConfigOptions } from './collators/config';
+import { CatalogCollatorEntityTransformer } from './collators';
+import { DefaultCatalogCollatorFactory } from './collators/DefaultCatalogCollatorFactory';
/**
* Options for {@link catalogCollatorExtensionPoint}.
@@ -60,7 +59,7 @@ export const catalogCollatorExtensionPoint =
*
* @public
*/
-export default createBackendModule({
+export const searchModuleCatalogCollator = createBackendModule({
pluginId: 'search',
moduleId: 'catalog-collator',
register(env) {
@@ -79,28 +78,19 @@ export default createBackendModule({
deps: {
auth: coreServices.auth,
config: coreServices.rootConfig,
- discovery: coreServices.discovery,
scheduler: coreServices.scheduler,
indexRegistry: searchIndexRegistryExtensionPoint,
catalog: catalogServiceRef,
},
- async init({
- auth,
- config,
- discovery,
- scheduler,
- indexRegistry,
- catalog,
- }) {
+ async init({ auth, config, scheduler, indexRegistry, catalog }) {
indexRegistry.addCollator({
schedule: scheduler.createScheduledTaskRunner(
readScheduleConfigOptions(config),
),
factory: DefaultCatalogCollatorFactory.fromConfig(config, {
auth,
+ catalog,
entityTransformer,
- discovery,
- catalogClient: catalog,
}),
});
},
diff --git a/plugins/search-backend-module-elasticsearch/CHANGELOG.md b/plugins/search-backend-module-elasticsearch/CHANGELOG.md
index 57feaf7559..06baf7d157 100644
--- a/plugins/search-backend-module-elasticsearch/CHANGELOG.md
+++ b/plugins/search-backend-module-elasticsearch/CHANGELOG.md
@@ -1,5 +1,27 @@
# @backstage/plugin-search-backend-module-elasticsearch
+## 1.6.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/plugin-search-common@1.2.17-next.0
+ - @backstage/integration-aws-node@0.1.15-next.0
+ - @backstage/plugin-search-backend-node@1.3.7-next.1
+
+## 1.6.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/integration-aws-node@0.1.14
+ - @backstage/plugin-search-backend-node@1.3.7-next.0
+ - @backstage/plugin-search-common@1.2.16
+
## 1.6.3
### Patch Changes
diff --git a/plugins/search-backend-module-elasticsearch/package.json b/plugins/search-backend-module-elasticsearch/package.json
index cff47913a7..9b1a9e6766 100644
--- a/plugins/search-backend-module-elasticsearch/package.json
+++ b/plugins/search-backend-module-elasticsearch/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-search-backend-module-elasticsearch",
- "version": "1.6.3",
+ "version": "1.6.4-next.1",
"description": "A module for the search backend that implements search using ElasticSearch",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/search-backend-module-explore/CHANGELOG.md b/plugins/search-backend-module-explore/CHANGELOG.md
index 8cdc5aa65d..f0c58e4b11 100644
--- a/plugins/search-backend-module-explore/CHANGELOG.md
+++ b/plugins/search-backend-module-explore/CHANGELOG.md
@@ -1,5 +1,25 @@
# @backstage/plugin-search-backend-module-explore
+## 0.2.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/plugin-search-common@1.2.17-next.0
+ - @backstage/plugin-search-backend-node@1.3.7-next.1
+
+## 0.2.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/plugin-search-backend-node@1.3.7-next.0
+ - @backstage/plugin-search-common@1.2.16
+
## 0.2.6
### Patch Changes
diff --git a/plugins/search-backend-module-explore/package.json b/plugins/search-backend-module-explore/package.json
index 32e16a876a..dce0052feb 100644
--- a/plugins/search-backend-module-explore/package.json
+++ b/plugins/search-backend-module-explore/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-search-backend-module-explore",
- "version": "0.2.6",
+ "version": "0.2.7-next.1",
"description": "A module for the search backend that exports explore modules",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/search-backend-module-pg/CHANGELOG.md b/plugins/search-backend-module-pg/CHANGELOG.md
index 5a5a90eb11..eea0caf86a 100644
--- a/plugins/search-backend-module-pg/CHANGELOG.md
+++ b/plugins/search-backend-module-pg/CHANGELOG.md
@@ -1,5 +1,25 @@
# @backstage/plugin-search-backend-module-pg
+## 0.5.40-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/plugin-search-common@1.2.17-next.0
+ - @backstage/plugin-search-backend-node@1.3.7-next.1
+
+## 0.5.40-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/plugin-search-backend-node@1.3.7-next.0
+ - @backstage/plugin-search-common@1.2.16
+
## 0.5.39
### Patch Changes
diff --git a/plugins/search-backend-module-pg/package.json b/plugins/search-backend-module-pg/package.json
index eaa3c64f49..ef7517a9f0 100644
--- a/plugins/search-backend-module-pg/package.json
+++ b/plugins/search-backend-module-pg/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-search-backend-module-pg",
- "version": "0.5.39",
+ "version": "0.5.40-next.1",
"description": "A module for the search backend that implements search using PostgreSQL",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/search-backend-module-stack-overflow-collator/CHANGELOG.md b/plugins/search-backend-module-stack-overflow-collator/CHANGELOG.md
index 6db9454536..75c0ae5219 100644
--- a/plugins/search-backend-module-stack-overflow-collator/CHANGELOG.md
+++ b/plugins/search-backend-module-stack-overflow-collator/CHANGELOG.md
@@ -1,5 +1,25 @@
# @backstage/plugin-search-backend-module-stack-overflow-collator
+## 0.3.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/plugin-search-common@1.2.17-next.0
+ - @backstage/plugin-search-backend-node@1.3.7-next.1
+
+## 0.3.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/plugin-search-backend-node@1.3.7-next.0
+ - @backstage/plugin-search-common@1.2.16
+
## 0.3.4
### Patch Changes
diff --git a/plugins/search-backend-module-stack-overflow-collator/package.json b/plugins/search-backend-module-stack-overflow-collator/package.json
index 98f662ed33..bfec24bc88 100644
--- a/plugins/search-backend-module-stack-overflow-collator/package.json
+++ b/plugins/search-backend-module-stack-overflow-collator/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-search-backend-module-stack-overflow-collator",
- "version": "0.3.4",
+ "version": "0.3.5-next.1",
"description": "A module for the search backend that exports stack overflow modules",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/search-backend-module-techdocs/CHANGELOG.md b/plugins/search-backend-module-techdocs/CHANGELOG.md
index f27e5b812b..4493c30ac2 100644
--- a/plugins/search-backend-module-techdocs/CHANGELOG.md
+++ b/plugins/search-backend-module-techdocs/CHANGELOG.md
@@ -1,5 +1,37 @@
# @backstage/plugin-search-backend-module-techdocs
+## 0.3.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/plugin-catalog-node@1.15.1-next.1
+ - @backstage/plugin-permission-common@0.8.4-next.0
+ - @backstage/plugin-search-common@1.2.17-next.0
+ - @backstage/plugin-search-backend-node@1.3.7-next.1
+ - @backstage/plugin-techdocs-node@1.12.16-next.1
+ - @backstage/catalog-client@1.9.1-next.0
+ - @backstage/plugin-catalog-common@1.1.3-next.0
+
+## 0.3.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-client@1.9.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/config@1.3.1
+ - @backstage/plugin-catalog-common@1.1.2
+ - @backstage/plugin-catalog-node@1.15.1-next.0
+ - @backstage/plugin-permission-common@0.8.3
+ - @backstage/plugin-search-backend-node@1.3.7-next.0
+ - @backstage/plugin-search-common@1.2.16
+ - @backstage/plugin-techdocs-node@1.12.16-next.0
+
## 0.3.4
### Patch Changes
diff --git a/plugins/search-backend-module-techdocs/package.json b/plugins/search-backend-module-techdocs/package.json
index 52afe24cf0..4c41a38900 100644
--- a/plugins/search-backend-module-techdocs/package.json
+++ b/plugins/search-backend-module-techdocs/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-search-backend-module-techdocs",
- "version": "0.3.4",
+ "version": "0.3.5-next.1",
"description": "A module for the search backend that exports techdocs modules",
"backstage": {
"role": "backend-plugin-module",
diff --git a/plugins/search-backend-node/CHANGELOG.md b/plugins/search-backend-node/CHANGELOG.md
index e10364cbcf..c66a6ddb5b 100644
--- a/plugins/search-backend-node/CHANGELOG.md
+++ b/plugins/search-backend-node/CHANGELOG.md
@@ -1,5 +1,27 @@
# @backstage/plugin-search-backend-node
+## 1.3.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-permission-common@0.8.4-next.0
+ - @backstage/plugin-search-common@1.2.17-next.0
+
+## 1.3.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/plugin-permission-common@0.8.3
+ - @backstage/plugin-search-common@1.2.16
+
## 1.3.6
### Patch Changes
diff --git a/plugins/search-backend-node/package.json b/plugins/search-backend-node/package.json
index 4a5b8100ac..8429d677f2 100644
--- a/plugins/search-backend-node/package.json
+++ b/plugins/search-backend-node/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-search-backend-node",
- "version": "1.3.6",
+ "version": "1.3.7-next.1",
"description": "A library for Backstage backend plugins that want to interact with the search backend plugin",
"backstage": {
"role": "node-library",
diff --git a/plugins/search-backend/CHANGELOG.md b/plugins/search-backend/CHANGELOG.md
index 66e9bdb559..7d976d3d38 100644
--- a/plugins/search-backend/CHANGELOG.md
+++ b/plugins/search-backend/CHANGELOG.md
@@ -1,5 +1,37 @@
# @backstage/plugin-search-backend
+## 1.8.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/backend-defaults@0.7.0-next.1
+ - @backstage/backend-openapi-utils@0.4.1-next.1
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-permission-common@0.8.4-next.0
+ - @backstage/plugin-search-common@1.2.17-next.0
+ - @backstage/plugin-permission-node@0.8.7-next.1
+ - @backstage/plugin-search-backend-node@1.3.7-next.1
+
+## 1.8.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-defaults@0.7.0-next.0
+ - @backstage/plugin-permission-node@0.8.7-next.0
+ - @backstage/backend-openapi-utils@0.4.1-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/types@1.2.0
+ - @backstage/plugin-permission-common@0.8.3
+ - @backstage/plugin-search-backend-node@1.3.7-next.0
+ - @backstage/plugin-search-common@1.2.16
+
## 1.8.0
### Minor Changes
diff --git a/plugins/search-backend/package.json b/plugins/search-backend/package.json
index d64bceefff..ce5be47a5f 100644
--- a/plugins/search-backend/package.json
+++ b/plugins/search-backend/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-search-backend",
- "version": "1.8.0",
+ "version": "1.8.1-next.1",
"description": "The Backstage backend plugin that provides your backstage app with search",
"backstage": {
"role": "backend-plugin",
diff --git a/plugins/search-common/CHANGELOG.md b/plugins/search-common/CHANGELOG.md
index 05685e1e45..5b57dc49cd 100644
--- a/plugins/search-common/CHANGELOG.md
+++ b/plugins/search-common/CHANGELOG.md
@@ -1,5 +1,13 @@
# @backstage/plugin-search-common
+## 1.2.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/plugin-permission-common@0.8.4-next.0
+
## 1.2.16
### Patch Changes
diff --git a/plugins/search-common/package.json b/plugins/search-common/package.json
index 5403c65a71..b57849d9d1 100644
--- a/plugins/search-common/package.json
+++ b/plugins/search-common/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-search-common",
- "version": "1.2.16",
+ "version": "1.2.17-next.0",
"description": "Common functionalities for Search, to be shared between various search-enabled plugins",
"backstage": {
"role": "common-library",
diff --git a/plugins/search-react/CHANGELOG.md b/plugins/search-react/CHANGELOG.md
index bfd6bae457..026d7e841e 100644
--- a/plugins/search-react/CHANGELOG.md
+++ b/plugins/search-react/CHANGELOG.md
@@ -1,5 +1,18 @@
# @backstage/plugin-search-react
+## 1.8.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.9.4-next.0
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/types@1.2.1-next.0
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/plugin-search-common@1.2.17-next.0
+ - @backstage/theme@0.6.3
+ - @backstage/version-bridge@1.0.10
+
## 1.8.4
### Patch Changes
diff --git a/plugins/search-react/package.json b/plugins/search-react/package.json
index af461c29d4..8d284e3331 100644
--- a/plugins/search-react/package.json
+++ b/plugins/search-react/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-search-react",
- "version": "1.8.4",
+ "version": "1.8.5-next.0",
"backstage": {
"role": "web-library",
"pluginId": "search",
diff --git a/plugins/search/CHANGELOG.md b/plugins/search/CHANGELOG.md
index 09350982fc..05087516fd 100644
--- a/plugins/search/CHANGELOG.md
+++ b/plugins/search/CHANGELOG.md
@@ -1,5 +1,29 @@
# @backstage/plugin-search
+## 1.4.22-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.9.4-next.0
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/types@1.2.1-next.0
+ - @backstage/core-compat-api@0.3.5-next.0
+ - @backstage/plugin-catalog-react@1.15.1-next.1
+ - @backstage/plugin-search-react@1.8.5-next.0
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-search-common@1.2.17-next.0
+ - @backstage/version-bridge@1.0.10
+
+## 1.4.22-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-catalog-react@1.15.1-next.0
+ - @backstage/core-compat-api@0.3.4
+
## 1.4.21
### Patch Changes
diff --git a/plugins/search/package.json b/plugins/search/package.json
index 811a701511..66a68b8a1b 100644
--- a/plugins/search/package.json
+++ b/plugins/search/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-search",
- "version": "1.4.21",
+ "version": "1.4.22-next.1",
"description": "The Backstage plugin that provides your backstage app with search",
"backstage": {
"role": "frontend-plugin",
diff --git a/plugins/signals-backend/CHANGELOG.md b/plugins/signals-backend/CHANGELOG.md
index df874b54ec..711e27e620 100644
--- a/plugins/signals-backend/CHANGELOG.md
+++ b/plugins/signals-backend/CHANGELOG.md
@@ -1,5 +1,35 @@
# @backstage/plugin-signals-backend
+## 0.3.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/plugin-auth-node@0.5.6-next.1
+ - @backstage/plugin-events-node@0.4.7-next.1
+ - @backstage/plugin-signals-node@0.1.16-next.1
+
+## 0.3.0-next.1
+
+### Minor Changes
+
+- f59ea1d: Removed support for the old backend system. If you were using the old `createRouter` export, please migrate to [the new backend system](https://backstage.io/docs/backend-system/).
+
+## 0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.5.6-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/types@1.2.0
+ - @backstage/plugin-events-node@0.4.7-next.0
+ - @backstage/plugin-signals-node@0.1.16-next.0
+
## 0.2.4
### Patch Changes
diff --git a/plugins/signals-backend/package.json b/plugins/signals-backend/package.json
index 117947e6f5..6a2f9f99a0 100644
--- a/plugins/signals-backend/package.json
+++ b/plugins/signals-backend/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-signals-backend",
- "version": "0.2.4",
+ "version": "0.3.0-next.2",
"backstage": {
"role": "backend-plugin",
"pluginId": "signals",
@@ -37,14 +37,12 @@
"test": "backstage-cli package test"
},
"dependencies": {
- "@backstage/backend-common": "^0.25.0",
"@backstage/backend-plugin-api": "workspace:^",
"@backstage/config": "workspace:^",
"@backstage/plugin-auth-node": "workspace:^",
"@backstage/plugin-events-node": "workspace:^",
"@backstage/plugin-signals-node": "workspace:^",
"@backstage/types": "workspace:^",
- "@types/express": "^4.17.6",
"express": "^4.17.1",
"express-promise-router": "^4.1.0",
"http-proxy-middleware": "^2.0.0",
@@ -60,6 +58,7 @@
"@backstage/plugin-auth-backend": "workspace:^",
"@backstage/plugin-auth-backend-module-guest-provider": "workspace:^",
"@backstage/plugin-events-backend": "workspace:^",
+ "@types/express": "^4.17.6",
"@types/supertest": "^2.0.8",
"@types/ws": "^8.5.10",
"msw": "^1.0.0",
diff --git a/plugins/signals-backend/report.api.md b/plugins/signals-backend/report.api.md
index 10f74ba37e..2b27ef2b3c 100644
--- a/plugins/signals-backend/report.api.md
+++ b/plugins/signals-backend/report.api.md
@@ -3,39 +3,7 @@
> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
```ts
-import { AuthService } from '@backstage/backend-plugin-api';
import { BackendFeature } from '@backstage/backend-plugin-api';
-import { Config } from '@backstage/config';
-import { DiscoveryService } from '@backstage/backend-plugin-api';
-import { EventsService } from '@backstage/plugin-events-node';
-import express from 'express';
-import { IdentityApi } from '@backstage/plugin-auth-node';
-import { LifecycleService } from '@backstage/backend-plugin-api';
-import { LoggerService } from '@backstage/backend-plugin-api';
-import { UserInfoService } from '@backstage/backend-plugin-api';
-
-// @public @deprecated (undocumented)
-export function createRouter(options: RouterOptions): Promise;
-
-// @public @deprecated (undocumented)
-export interface RouterOptions {
- // (undocumented)
- auth?: AuthService;
- // (undocumented)
- config: Config;
- // (undocumented)
- discovery: DiscoveryService;
- // (undocumented)
- events: EventsService;
- // (undocumented)
- identity?: IdentityApi;
- // (undocumented)
- lifecycle?: LifecycleService;
- // (undocumented)
- logger: LoggerService;
- // (undocumented)
- userInfo?: UserInfoService;
-}
// @public
const signalsPlugin: BackendFeature;
diff --git a/plugins/signals-backend/src/deprecated.ts b/plugins/signals-backend/src/deprecated.ts
deleted file mode 100644
index d33c9a06b9..0000000000
--- a/plugins/signals-backend/src/deprecated.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2024 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 express from 'express';
-
-import { Config } from '@backstage/config';
-import {
- AuthService,
- DiscoveryService,
- LifecycleService,
- LoggerService,
- UserInfoService,
-} from '@backstage/backend-plugin-api';
-import { createLegacyAuthAdapters } from '@backstage/backend-common';
-
-import { IdentityApi } from '@backstage/plugin-auth-node';
-import { EventsService } from '@backstage/plugin-events-node';
-
-import { createRouter as _createRouter } from './service/router';
-
-/**
- * @public
- * @deprecated Please migrate to the new backend system as this will be removed in the future.
- */
-export interface RouterOptions {
- logger: LoggerService;
- events: EventsService;
- identity?: IdentityApi;
- discovery: DiscoveryService;
- config: Config;
- lifecycle?: LifecycleService;
- auth?: AuthService;
- userInfo?: UserInfoService;
-}
-
-/**
- * @public
- * @deprecated Please migrate to the new backend system as this will be removed in the future.
- */
-export async function createRouter(
- options: RouterOptions,
-): Promise {
- return _createRouter({
- ...options,
- ...createLegacyAuthAdapters(options),
- });
-}
diff --git a/plugins/signals-backend/src/index.ts b/plugins/signals-backend/src/index.ts
index c852c81518..c5b3fe692a 100644
--- a/plugins/signals-backend/src/index.ts
+++ b/plugins/signals-backend/src/index.ts
@@ -14,5 +14,4 @@
* limitations under the License.
*/
-export * from './deprecated';
export { signalsPlugin as default } from './plugin';
diff --git a/plugins/signals-backend/src/plugin.ts b/plugins/signals-backend/src/plugin.ts
index 3ca10f46d1..f01777b4fc 100644
--- a/plugins/signals-backend/src/plugin.ts
+++ b/plugins/signals-backend/src/plugin.ts
@@ -13,12 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
import {
coreServices,
createBackendPlugin,
} from '@backstage/backend-plugin-api';
-import { createRouter } from './deprecated';
import { eventsServiceRef } from '@backstage/plugin-events-node';
+import { createRouter } from './service/router';
/**
* Signals backend plugin
diff --git a/plugins/signals-backend/src/service/SignalManager.test.ts b/plugins/signals-backend/src/service/SignalManager.test.ts
index eccc715d1b..642c00a7d7 100644
--- a/plugins/signals-backend/src/service/SignalManager.test.ts
+++ b/plugins/signals-backend/src/service/SignalManager.test.ts
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
import { WebSocket } from 'ws';
import { EventsServiceSubscribeOptions } from '@backstage/plugin-events-node';
import { SignalManager } from './SignalManager';
-import { ConfigReader } from '@backstage/config';
import { mockServices } from '@backstage/backend-test-utils';
class MockWebSocket {
@@ -70,15 +70,15 @@ describe('SignalManager', () => {
};
const shutdownHooks: Function[] = [];
- const mockLifecycle = {
+ const mockLifecycle = mockServices.lifecycle.mock({
addShutdownHook: (hook: Function) => shutdownHooks.push(hook),
- };
+ });
const manager = SignalManager.create({
events: mockEvents,
logger: mockServices.logger.mock(),
- config: new ConfigReader({}),
- lifecycle: mockLifecycle as any,
+ config: mockServices.rootConfig(),
+ lifecycle: mockLifecycle,
});
it('should close all connections when server is closed', () => {
diff --git a/plugins/signals-backend/src/service/SignalManager.ts b/plugins/signals-backend/src/service/SignalManager.ts
index bf20d6a8c4..ec9cb57900 100644
--- a/plugins/signals-backend/src/service/SignalManager.ts
+++ b/plugins/signals-backend/src/service/SignalManager.ts
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
import { EventParams, EventsService } from '@backstage/plugin-events-node';
import { SignalPayload } from '@backstage/plugin-signals-node';
import crypto from 'crypto';
@@ -45,7 +46,7 @@ export type SignalManagerOptions = {
events: EventsService;
config: Config;
logger: LoggerService;
- lifecycle?: LifecycleService;
+ lifecycle: LifecycleService;
};
/** @internal */
@@ -79,7 +80,7 @@ export class SignalManager {
this.onEventBrokerEvent(params.eventPayload as SignalPayload),
});
- options.lifecycle?.addShutdownHook(() => this.onShutdown());
+ options.lifecycle.addShutdownHook(() => this.onShutdown());
}
private ping() {
diff --git a/plugins/signals-backend/src/service/router.test.ts b/plugins/signals-backend/src/service/router.test.ts
index acc49739b8..0138a1a5d3 100644
--- a/plugins/signals-backend/src/service/router.test.ts
+++ b/plugins/signals-backend/src/service/router.test.ts
@@ -16,9 +16,7 @@
import express from 'express';
import request from 'supertest';
-
import { createRouter } from './router';
-import { ConfigReader } from '@backstage/config';
import { mockErrorHandler, mockServices } from '@backstage/backend-test-utils';
const eventsServiceMock = mockServices.events.mock();
@@ -36,7 +34,8 @@ describe('createRouter', () => {
events: eventsServiceMock,
discovery,
userInfo,
- config: new ConfigReader({}),
+ config: mockServices.rootConfig(),
+ lifecycle: mockServices.lifecycle.mock(),
auth: mockServices.auth(),
});
app = express().use(router).use(mockErrorHandler());
diff --git a/plugins/signals-backend/src/service/router.ts b/plugins/signals-backend/src/service/router.ts
index 0633e5fb8d..eb1c24f383 100644
--- a/plugins/signals-backend/src/service/router.ts
+++ b/plugins/signals-backend/src/service/router.ts
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
import express, { NextFunction, Request, Response } from 'express';
import Router from 'express-promise-router';
import {
@@ -36,7 +37,7 @@ export interface RouterOptions {
events: EventsService;
discovery: DiscoveryService;
config: Config;
- lifecycle?: LifecycleService;
+ lifecycle: LifecycleService;
userInfo: UserInfoService;
auth: AuthService;
}
diff --git a/plugins/signals-node/CHANGELOG.md b/plugins/signals-node/CHANGELOG.md
index 50039d0ccf..4c79504e66 100644
--- a/plugins/signals-node/CHANGELOG.md
+++ b/plugins/signals-node/CHANGELOG.md
@@ -1,5 +1,27 @@
# @backstage/plugin-signals-node
+## 0.1.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/types@1.2.1-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/config@1.3.2-next.0
+ - @backstage/plugin-auth-node@0.5.6-next.1
+ - @backstage/plugin-events-node@0.4.7-next.1
+
+## 0.1.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-auth-node@0.5.6-next.0
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/config@1.3.1
+ - @backstage/types@1.2.0
+ - @backstage/plugin-events-node@0.4.7-next.0
+
## 0.1.15
### Patch Changes
diff --git a/plugins/signals-node/package.json b/plugins/signals-node/package.json
index e91acf7da0..291029a6f9 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.15",
+ "version": "0.1.16-next.1",
"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 7c3f7660ba..605cff0ef4 100644
--- a/plugins/signals-react/CHANGELOG.md
+++ b/plugins/signals-react/CHANGELOG.md
@@ -1,5 +1,13 @@
# @backstage/plugin-signals-react
+## 0.0.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/types@1.2.1-next.0
+
## 0.0.8
### Patch Changes
diff --git a/plugins/signals-react/package.json b/plugins/signals-react/package.json
index c0e8952d3a..0fb36a0306 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.8",
+ "version": "0.0.9-next.0",
"description": "Web library for the signals plugin",
"backstage": {
"role": "web-library",
diff --git a/plugins/signals/CHANGELOG.md b/plugins/signals/CHANGELOG.md
index 723e2b9551..1b302c6276 100644
--- a/plugins/signals/CHANGELOG.md
+++ b/plugins/signals/CHANGELOG.md
@@ -1,5 +1,16 @@
# @backstage/plugin-signals
+## 0.0.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/types@1.2.1-next.0
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/plugin-signals-react@0.0.9-next.0
+ - @backstage/theme@0.6.3
+
## 0.0.14
### Patch Changes
diff --git a/plugins/signals/package.json b/plugins/signals/package.json
index 2248d18c34..1427195ff4 100644
--- a/plugins/signals/package.json
+++ b/plugins/signals/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-signals",
- "version": "0.0.14",
+ "version": "0.0.15-next.0",
"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 4f2392717b..6cb2897873 100644
--- a/plugins/techdocs-addons-test-utils/CHANGELOG.md
+++ b/plugins/techdocs-addons-test-utils/CHANGELOG.md
@@ -1,5 +1,30 @@
# @backstage/plugin-techdocs-addons-test-utils
+## 1.0.44-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-techdocs@1.12.1-next.1
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/plugin-catalog@1.26.1-next.1
+ - @backstage/plugin-catalog-react@1.15.1-next.1
+ - @backstage/plugin-search-react@1.8.5-next.0
+ - @backstage/core-app-api@1.15.4-next.0
+ - @backstage/integration-react@1.2.3-next.0
+ - @backstage/test-utils@1.7.4-next.0
+ - @backstage/plugin-techdocs-react@1.2.13-next.0
+
+## 1.0.44-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-catalog-react@1.15.1-next.0
+ - @backstage/plugin-catalog@1.26.1-next.0
+ - @backstage/plugin-techdocs@1.12.1-next.0
+ - @backstage/integration-react@1.2.2
+
## 1.0.43
### Patch Changes
diff --git a/plugins/techdocs-addons-test-utils/package.json b/plugins/techdocs-addons-test-utils/package.json
index 9a684e14ca..6540ab0b64 100644
--- a/plugins/techdocs-addons-test-utils/package.json
+++ b/plugins/techdocs-addons-test-utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-techdocs-addons-test-utils",
- "version": "1.0.43",
+ "version": "1.0.44-next.1",
"backstage": {
"role": "web-library",
"pluginId": "techdocs-addons",
diff --git a/plugins/techdocs-backend/CHANGELOG.md b/plugins/techdocs-backend/CHANGELOG.md
index 1150c86d34..b452601b0f 100644
--- a/plugins/techdocs-backend/CHANGELOG.md
+++ b/plugins/techdocs-backend/CHANGELOG.md
@@ -1,5 +1,47 @@
# @backstage/plugin-techdocs-backend
+## 1.11.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-catalog-node@1.15.1-next.1
+ - @backstage/plugin-permission-common@0.8.4-next.0
+ - @backstage/plugin-search-backend-module-techdocs@0.3.5-next.1
+ - @backstage/plugin-techdocs-node@1.12.16-next.1
+ - @backstage/catalog-client@1.9.1-next.0
+ - @backstage/plugin-catalog-common@1.1.3-next.0
+ - @backstage/integration@1.16.1-next.0
+ - @backstage/plugin-techdocs-common@0.1.0
+
+## 1.11.5-next.1
+
+### Patch Changes
+
+- 29a4aa8: fix(config): add missing parameters in config schema
+
+## 1.11.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-client@1.9.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/integration@1.16.0
+ - @backstage/plugin-catalog-common@1.1.2
+ - @backstage/plugin-catalog-node@1.15.1-next.0
+ - @backstage/plugin-permission-common@0.8.3
+ - @backstage/plugin-search-backend-module-techdocs@0.3.5-next.0
+ - @backstage/plugin-techdocs-common@0.1.0
+ - @backstage/plugin-techdocs-node@1.12.16-next.0
+
## 1.11.4
### Patch Changes
diff --git a/plugins/techdocs-backend/config.d.ts b/plugins/techdocs-backend/config.d.ts
index 4910d8d76e..c220717ddb 100644
--- a/plugins/techdocs-backend/config.d.ts
+++ b/plugins/techdocs-backend/config.d.ts
@@ -263,6 +263,11 @@ export interface Config {
* the credentials belongs to a different project to the bucket.
*/
projectId?: string;
+ /**
+ * (Optional) Location in storage bucket to save files
+ * If not set, the default location will be the root of the storage bucket
+ */
+ bucketRootPath?: string;
};
};
diff --git a/plugins/techdocs-backend/package.json b/plugins/techdocs-backend/package.json
index 6c1eca55ee..6e70fad10a 100644
--- a/plugins/techdocs-backend/package.json
+++ b/plugins/techdocs-backend/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-techdocs-backend",
- "version": "1.11.4",
+ "version": "1.11.5-next.2",
"description": "The Backstage backend plugin that renders technical documentation for your components",
"backstage": {
"role": "backend-plugin",
diff --git a/plugins/techdocs-module-addons-contrib/CHANGELOG.md b/plugins/techdocs-module-addons-contrib/CHANGELOG.md
index 3b4dd38135..02b7912e61 100644
--- a/plugins/techdocs-module-addons-contrib/CHANGELOG.md
+++ b/plugins/techdocs-module-addons-contrib/CHANGELOG.md
@@ -1,5 +1,28 @@
# @backstage/plugin-techdocs-module-addons-contrib
+## 1.1.20-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/integration-react@1.2.3-next.0
+ - @backstage/plugin-techdocs-react@1.2.13-next.0
+ - @backstage/integration@1.16.1-next.0
+
+## 1.1.20-next.0
+
+### Patch Changes
+
+- b664b2a: Internal refactor for safer handling of possible null value.
+- Updated dependencies
+ - @backstage/core-components@0.16.2
+ - @backstage/core-plugin-api@1.10.2
+ - @backstage/integration@1.16.0
+ - @backstage/integration-react@1.2.2
+ - @backstage/plugin-techdocs-react@1.2.12
+
## 1.1.19
### Patch Changes
diff --git a/plugins/techdocs-module-addons-contrib/package.json b/plugins/techdocs-module-addons-contrib/package.json
index ca918b7b7c..05a0f9a37b 100644
--- a/plugins/techdocs-module-addons-contrib/package.json
+++ b/plugins/techdocs-module-addons-contrib/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-techdocs-module-addons-contrib",
- "version": "1.1.19",
+ "version": "1.1.20-next.1",
"description": "Plugin module for contributed TechDocs Addons",
"backstage": {
"role": "frontend-plugin-module",
diff --git a/plugins/techdocs-module-addons-contrib/src/LigthBox/LightBox.tsx b/plugins/techdocs-module-addons-contrib/src/LigthBox/LightBox.tsx
index 38269e6245..47409f47c7 100644
--- a/plugins/techdocs-module-addons-contrib/src/LigthBox/LightBox.tsx
+++ b/plugins/techdocs-module-addons-contrib/src/LigthBox/LightBox.tsx
@@ -28,7 +28,7 @@ export const LightBoxAddon = () => {
useEffect(() => {
let dataSourceImages: DataSource | null = null;
- let lightbox = new PhotoSwipeLightbox({
+ let lightbox: PhotoSwipeLightbox | null = new PhotoSwipeLightbox({
pswpModule: PhotoSwipe,
initialZoomLevel: 1,
secondaryZoomLevel: (zoomLevelObject: ZoomLevel) => {
@@ -71,14 +71,14 @@ export const LightBoxAddon = () => {
};
});
}
- lightbox.loadAndOpen(index, dataSourceImages);
+ lightbox?.loadAndOpen(index, dataSourceImages);
return false;
};
});
lightbox.init();
return () => {
- lightbox.destroy();
+ lightbox?.destroy();
lightbox = null;
};
}, [images]);
diff --git a/plugins/techdocs-node/CHANGELOG.md b/plugins/techdocs-node/CHANGELOG.md
index 8c129bb544..1c2db14fac 100644
--- a/plugins/techdocs-node/CHANGELOG.md
+++ b/plugins/techdocs-node/CHANGELOG.md
@@ -1,5 +1,33 @@
# @backstage/plugin-techdocs-node
+## 1.12.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.1
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-search-common@1.2.17-next.0
+ - @backstage/integration-aws-node@0.1.15-next.0
+ - @backstage/integration@1.16.1-next.0
+ - @backstage/plugin-techdocs-common@0.1.0
+
+## 1.12.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/backend-plugin-api@1.1.1-next.0
+ - @backstage/catalog-model@1.7.2
+ - @backstage/config@1.3.1
+ - @backstage/errors@1.2.6
+ - @backstage/integration@1.16.0
+ - @backstage/integration-aws-node@0.1.14
+ - @backstage/plugin-search-common@1.2.16
+ - @backstage/plugin-techdocs-common@0.1.0
+
## 1.12.15
### Patch Changes
diff --git a/plugins/techdocs-node/package.json b/plugins/techdocs-node/package.json
index 48739ef070..d530760d92 100644
--- a/plugins/techdocs-node/package.json
+++ b/plugins/techdocs-node/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-techdocs-node",
- "version": "1.12.15",
+ "version": "1.12.16-next.1",
"description": "Common node.js functionalities for TechDocs, to be shared between techdocs-backend plugin and techdocs-cli",
"backstage": {
"role": "node-library",
diff --git a/plugins/techdocs-react/CHANGELOG.md b/plugins/techdocs-react/CHANGELOG.md
index 4e665147c3..af153d63f2 100644
--- a/plugins/techdocs-react/CHANGELOG.md
+++ b/plugins/techdocs-react/CHANGELOG.md
@@ -1,5 +1,16 @@
# @backstage/plugin-techdocs-react
+## 1.2.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/version-bridge@1.0.10
+
## 1.2.12
### Patch Changes
diff --git a/plugins/techdocs-react/package.json b/plugins/techdocs-react/package.json
index 1873be7b7a..6e27c91f14 100644
--- a/plugins/techdocs-react/package.json
+++ b/plugins/techdocs-react/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-techdocs-react",
- "version": "1.2.12",
+ "version": "1.2.13-next.0",
"description": "Shared frontend utilities for TechDocs and Addons",
"backstage": {
"role": "web-library",
diff --git a/plugins/techdocs/CHANGELOG.md b/plugins/techdocs/CHANGELOG.md
index ed48829f67..ccb8b037c2 100644
--- a/plugins/techdocs/CHANGELOG.md
+++ b/plugins/techdocs/CHANGELOG.md
@@ -1,5 +1,37 @@
# @backstage/plugin-techdocs
+## 1.12.1-next.1
+
+### Patch Changes
+
+- 3710b35: Allow passing down `withSearch` prop to `EntityTechdocsContent` component since it was `true` by default, now user can use the `EntityTechdocsContent` component _without_ showing the search field on top of the content.
+- Updated dependencies
+ - @backstage/frontend-plugin-api@0.9.4-next.0
+ - @backstage/core-plugin-api@1.10.3-next.0
+ - @backstage/core-compat-api@0.3.5-next.0
+ - @backstage/plugin-catalog-react@1.15.1-next.1
+ - @backstage/plugin-search-react@1.8.5-next.0
+ - @backstage/core-components@0.16.3-next.0
+ - @backstage/integration-react@1.2.3-next.0
+ - @backstage/plugin-auth-react@0.1.11-next.0
+ - @backstage/plugin-techdocs-react@1.2.13-next.0
+ - @backstage/catalog-model@1.7.3-next.0
+ - @backstage/config@1.3.2-next.0
+ - @backstage/errors@1.2.7-next.0
+ - @backstage/plugin-search-common@1.2.17-next.0
+ - @backstage/integration@1.16.1-next.0
+ - @backstage/theme@0.6.3
+ - @backstage/plugin-techdocs-common@0.1.0
+
+## 1.12.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+ - @backstage/plugin-catalog-react@1.15.1-next.0
+ - @backstage/integration-react@1.2.2
+ - @backstage/core-compat-api@0.3.4
+
## 1.12.0
### Minor Changes
diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json
index 59bc2d4890..65df90ea77 100644
--- a/plugins/techdocs/package.json
+++ b/plugins/techdocs/package.json
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-techdocs",
- "version": "1.12.0",
+ "version": "1.12.1-next.1",
"description": "The Backstage plugin that renders technical documentation for your components",
"backstage": {
"role": "frontend-plugin",
diff --git a/plugins/techdocs/report.api.md b/plugins/techdocs/report.api.md
index c577de5eac..196fef5f35 100644
--- a/plugins/techdocs/report.api.md
+++ b/plugins/techdocs/report.api.md
@@ -133,9 +133,12 @@ export type DocsTableRow = {
};
// @public
-export const EmbeddedDocsRouter: (
- props: PropsWithChildren<{}>,
-) => React_2.JSX.Element;
+export const EmbeddedDocsRouter: ({
+ children,
+ withSearch,
+}: React_2.PropsWithChildren<{
+ withSearch?: boolean | undefined;
+}>) => React_2.JSX.Element;
// @public
export const EntityListDocsGrid: (
@@ -191,9 +194,12 @@ export type EntityListDocsTableProps = {
};
// @public
-export const EntityTechdocsContent: (props: {
- children?: ReactNode;
-}) => JSX_2.Element;
+export const EntityTechdocsContent: ({
+ children,
+ withSearch,
+}: PropsWithChildren<{
+ withSearch?: boolean | undefined;
+}>) => JSX_2.Element;
// @public
export const isTechDocsAvailable: (entity: Entity) => boolean;
diff --git a/plugins/techdocs/src/Router.tsx b/plugins/techdocs/src/Router.tsx
index 352c9f5b73..6a0bc0e08e 100644
--- a/plugins/techdocs/src/Router.tsx
+++ b/plugins/techdocs/src/Router.tsx
@@ -57,16 +57,19 @@ export const Router = () => {
};
export const EmbeddedDocsRouter = (
- props: PropsWithChildren<{ emptyState?: React.ReactElement }>,
+ props: PropsWithChildren<{
+ emptyState?: React.ReactElement;
+ withSearch?: boolean;
+ }>,
) => {
- const { children, emptyState } = props;
+ const { children, emptyState, withSearch = true } = props;
const { entity } = useEntity();
// Using objects instead of elements, otherwise "outlet" will be null on sub-pages and add-ons won't render
const element = useRoutes([
{
path: '/*',
- element: 
+
+Welcome to the Canon, the new design library for Backstage plugins. This
+project is still under active development but we will make sure to document
+the API as we go. We are aiming to improve the general UI of Backstage and
+plugins across Backstage. This new library will take time to build but we are
+building it incrementally with not conflict with the existing theming system.
+
+## Installation
+
+### 1. Install canon
+
+Install Canon using a package manager.
+
+