import fixes

Signed-off-by: Fredrik Adelöw <freben@gmail.com>

.changeset/modern-buses-change.md

@@ -0,0 +1,13 @@
+---
+'@backstage/plugin-auth-backend-module-aws-alb-provider': patch
+'@backstage/backend-dynamic-feature-service': patch
+'@backstage/core-plugin-api': patch
+'@backstage/plugin-catalog-backend': patch
+'@backstage/plugin-events-backend': patch
+'@backstage/plugin-search-backend': patch
+'@backstage/plugin-user-settings': patch
+'@backstage/repo-tools': patch
+'@backstage/plugin-home-react': patch
+---
+
+Fixed some circular or otherwise unclear imports

packages/backend-dynamic-feature-service/src/schema/openapi/generated/router.ts

@@ -18,7 +18,7 @@
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 import { createValidatedOpenApiRouterFromGeneratedEndpointMap } from '@backstage/backend-openapi-utils';
-import { EndpointMap } from './';
+import { EndpointMap } from './apis';
 
 export const spec = {
   openapi: '3.0.3',

packages/canon/src/components/Collapsible/Collapsible.stories.tsx

@@ -15,7 +15,7 @@
  */
 
 import type { Meta, StoryObj } from '@storybook/react';
-import { Collapsible } from './';
+import { Collapsible } from './Collapsible';
 import { Button } from '../Button';
 import { Box } from '../Box';
 import { Text } from '../Text';

packages/core-plugin-api/src/analytics/Tracker.ts

@@ -20,7 +20,7 @@ import {
   AnalyticsEventAttributes,
   AnalyticsTracker,
 } from '../apis';
-import { AnalyticsContextValue } from './';
+import { AnalyticsContextValue } from './types';
 
 type TempGlobalEvents = {
   /**

packages/repo-tools/src/commands/package/schema/openapi/generate/server.ts

@@ -60,7 +60,7 @@ async function generateSpecFile() {
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 import {createValidatedOpenApiRouterFromGeneratedEndpointMap} from '@backstage/backend-openapi-utils';
-import {EndpointMap} from './';
+import {EndpointMap} from './apis';
 export const spec = ${JSON.stringify(yaml, null, 2)} as const;
 export const createOpenApiRouter = async (
   options?: Parameters<typeof createValidatedOpenApiRouterFromGeneratedEndpointMap>['1'],

plugins/auth-backend-module-aws-alb-provider/report.api.md

@@ -6,7 +6,7 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 import { JWTHeaderParameters } from 'jose';
 import { KeyObject } from 'crypto';
-import type { PassportProfile } from '@backstage/plugin-auth-node/';
+import type { PassportProfile } from '@backstage/plugin-auth-node';
 import { ProxyAuthenticator } from '@backstage/plugin-auth-node';
 import { SignInResolverFactory } from '@backstage/plugin-auth-node';
 

plugins/auth-backend-module-aws-alb-provider/src/types.ts

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import type { PassportProfile } from '@backstage/plugin-auth-node/';
+import type { PassportProfile } from '@backstage/plugin-auth-node';
+
 /**
  * JWT header extraction result, containing the raw value and the parsed JWT
  * payload.
@@ -26,6 +27,7 @@ export type AwsAlbResult = {
   expiresInSeconds?: number;
   accessToken: string;
 };
+
 /**
  * @public
  */
@@ -39,6 +41,7 @@ export type AwsAlbClaims = {
   exp: number;
   iss: string;
 };
+
 /**
  * @internal
  */

plugins/catalog-backend/src/schema/openapi/generated/router.ts

@@ -18,7 +18,7 @@
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 import { createValidatedOpenApiRouterFromGeneratedEndpointMap } from '@backstage/backend-openapi-utils';
-import { EndpointMap } from './';
+import { EndpointMap } from './apis';
 
 export const spec = {
   openapi: '3.0.3',

plugins/catalog-import/src/components/StepInitAnalyzeUrl/StepInitAnalyzeUrl.test.tsx

@@ -19,8 +19,8 @@ import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { ReactNode } from 'react';
-import { AnalyzeResult, catalogImportApiRef } from '../../api/';
 import { StepInitAnalyzeUrl } from './StepInitAnalyzeUrl';
+import { AnalyzeResult, catalogImportApiRef } from '../../api/CatalogImportApi';
 
 describe('<StepInitAnalyzeUrl />', () => {
   const catalogImportApi: jest.Mocked<typeof catalogImportApiRef.T> = {

plugins/events-backend/src/schema/openapi/generated/router.ts

@@ -18,7 +18,7 @@
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 import { createValidatedOpenApiRouterFromGeneratedEndpointMap } from '@backstage/backend-openapi-utils';
-import { EndpointMap } from './';
+import { EndpointMap } from './apis';
 
 export const spec = {
   openapi: '3.0.3',

plugins/home-react/src/overridableComponents.ts

@@ -16,7 +16,7 @@
 
 import { Overrides } from '@material-ui/core/styles/overrides';
 import { StyleRules } from '@material-ui/core/styles/withStyles';
-import { PluginHomeContentModalClassKey } from './';
+import { PluginHomeContentModalClassKey } from './components/ContentModal';
 
 /** @public */
 export type PluginHomeComponentsNameToClassKey = {

plugins/search-backend/src/schema/openapi/generated/router.ts

@@ -18,7 +18,7 @@
 // * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. *
 // ******************************************************************
 import { createValidatedOpenApiRouterFromGeneratedEndpointMap } from '@backstage/backend-openapi-utils';
-import { EndpointMap } from './';
+import { EndpointMap } from './apis';
 
 export const spec = {
   openapi: '3.0.3',

plugins/user-settings/src/index.ts

@@ -26,4 +26,4 @@ export {
   userSettingsPlugin as plugin,
   UserSettingsPage,
 } from './plugin';
-export * from './components/';
+export * from './components';