update /alpha imports to fix all type issues

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>

docs/local-dev/cli-commands.md

@@ -120,7 +120,6 @@ Build a package for production deployment or publishing
 Options:
   --role <name>              Run the command with an explicit package role
   --minify                   Minify the generated code. Does not apply to app or backend packages.
-  --experimental-type-build  Enable experimental type build. Does not apply to app or backend packages.
   --skip-build-dependencies  Skip the automatic building of local dependencies. Applies to backend packages only.
   --stats                    If bundle stats are available, write them to the output directory. Applies to app packages only.
   --config <path>            Config files to load instead of app-config.yaml. Applies to app packages only. (default: [])

packages/app/src/App.tsx

@@ -59,9 +59,9 @@ import { GraphiQLPage } from '@backstage/plugin-graphiql';
 import { HomepageCompositionRoot } from '@backstage/plugin-home';
 import { LighthousePage } from '@backstage/plugin-lighthouse';
 import { NewRelicPage } from '@backstage/plugin-newrelic';
+import { NextScaffolderPage } from '@backstage/plugin-scaffolder/alpha';
 import {
   ScaffolderPage,
-  NextScaffolderPage,
   scaffolderPlugin,
   ScaffolderLayouts,
 } from '@backstage/plugin-scaffolder';
@@ -104,7 +104,7 @@ import * as plugins from './plugins';
 import { techDocsPage } from './components/techdocs/TechDocsPage';
 import { ApacheAirflowPage } from '@backstage/plugin-apache-airflow';
 import { RequirePermission } from '@backstage/plugin-permission-react';
-import { catalogEntityCreatePermission } from '@backstage/plugin-catalog-common';
+import { catalogEntityCreatePermission } from '@backstage/plugin-catalog-common/alpha';
 import { PlaylistIndexPage } from '@backstage/plugin-playlist';
 import { TwoColumnLayout } from './components/scaffolder/customScaffolderLayouts';
 import { ScoreBoardPage } from '@oriflame/backstage-plugin-score-card';

packages/app/src/components/scaffolder/customScaffolderExtensions.tsx

@@ -17,10 +17,11 @@ import React from 'react';
 import type { FieldValidation } from '@rjsf/utils';
 import { scaffolderPlugin } from '@backstage/plugin-scaffolder';
 import { TextField } from '@material-ui/core';
-
 import {
   NextFieldExtensionComponentProps,
   createNextScaffolderFieldExtension,
+} from '@backstage/plugin-scaffolder-react/alpha';
+import {
   createScaffolderFieldExtension,
   FieldExtensionComponentProps,
 } from '@backstage/plugin-scaffolder-react';

packages/backend-defaults/src/CreateBackend.test.ts

@@ -21,7 +21,7 @@ import {
   createServiceRef,
   createSharedEnvironment,
 } from '@backstage/backend-plugin-api';
-import { mockServices } from '@backstage/backend-test-utils';
+import { mockServices } from '@backstage/backend-test-utils/alpha';
 import { createBackend } from './CreateBackend';
 
 const fooServiceRef = createServiceRef<string>({ id: 'foo', scope: 'root' });

packages/backend-next/src/index.ts

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import { catalogPlugin } from '@backstage/plugin-catalog-backend';
-import { catalogModuleTemplateKind } from '@backstage/plugin-scaffolder-backend';
+import { catalogPlugin } from '@backstage/plugin-catalog-backend/alpha';
+import { catalogModuleTemplateKind } from '@backstage/plugin-scaffolder-backend/alpha';
 import { createBackend } from '@backstage/backend-defaults';
-import { appPlugin } from '@backstage/plugin-app-backend';
+import { appPlugin } from '@backstage/plugin-app-backend/alpha';
 import { todoPlugin } from '@backstage/plugin-todo-backend';
 
 const backend = createBackend();

packages/cli/src/commands/index.ts

@@ -116,7 +116,7 @@ export function registerScriptCommand(program: Command) {
     )
     .option(
       '--experimental-type-build',
-      'Enable experimental type build. Does not apply to app or backend packages.',
+      'Enable experimental type build. Does not apply to app or backend packages. [DEPRECATED]',
     )
     .option(
       '--skip-build-dependencies',

packages/test-utils/src/testUtils/MockPluginProvider.tsx

@@ -15,7 +15,8 @@
  */
 
 import React, { PropsWithChildren } from 'react';
-import { createPlugin, PluginProvider } from '@backstage/core-plugin-api';
+import { PluginProvider } from '@backstage/core-plugin-api/alpha';
+import { createPlugin } from '@backstage/core-plugin-api';
 
 /**
  * Mock for PluginProvider to use in unit tests

plugins/catalog-backend-module-bitbucket-cloud/src/service/BitbucketCloudEntityProviderCatalogModule.test.ts

@@ -19,7 +19,10 @@ import {
   PluginTaskScheduler,
   TaskScheduleDefinition,
 } from '@backstage/backend-tasks';
-import { startTestBackend, mockServices } from '@backstage/backend-test-utils';
+import {
+  startTestBackend,
+  mockServices,
+} from '@backstage/backend-test-utils/alpha';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
 import { eventsExtensionPoint } from '@backstage/plugin-events-node/alpha';
 import { Duration } from 'luxon';

plugins/catalog-backend-module-incremental-ingestion/src/run.ts

@@ -19,7 +19,7 @@ import {
   createServiceFactory,
 } from '@backstage/backend-plugin-api';
 import { ConfigReader } from '@backstage/config';
-import { catalogPlugin } from '@backstage/plugin-catalog-backend';
+import { catalogPlugin } from '@backstage/plugin-catalog-backend/alpha';
 import { IncrementalEntityProvider } from '.';
 import { incrementalIngestionEntityProviderCatalogModule } from './alpha';
 

plugins/catalog-backend/src/stitching/Stitcher.ts

@@ -15,12 +15,11 @@
  */
 
 import { ENTITY_STATUS_CATALOG_PROCESSING_TYPE } from '@backstage/catalog-client';
+import { AlphaEntity, EntityStatusItem } from '@backstage/catalog-model/alpha';
 import {
-  AlphaEntity,
   ANNOTATION_EDIT_URL,
   ANNOTATION_VIEW_URL,
   EntityRelation,
-  EntityStatusItem,
 } from '@backstage/catalog-model';
 import { SerializedError, stringifyError } from '@backstage/errors';
 import { Knex } from 'knex';

plugins/catalog-react/src/components/InspectEntityDialog/components/OverviewPage.tsx

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { AlphaEntity } from '@backstage/catalog-model';
+import { AlphaEntity } from '@backstage/catalog-model/alpha';
 import {
   Box,
   DialogContentText,

plugins/catalog-react/src/filters.test.ts

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { AlphaEntity, Entity } from '@backstage/catalog-model';
+import { AlphaEntity } from '@backstage/catalog-model/alpha';
+import { Entity } from '@backstage/catalog-model';
 import { TemplateEntityV1beta3 } from '@backstage/plugin-scaffolder-common';
 import {
   EntityErrorFilter,

plugins/catalog-react/src/filters.ts

@@ -14,11 +14,8 @@
  * limitations under the License.
  */
 
-import {
-  AlphaEntity,
-  Entity,
-  RELATION_OWNED_BY,
-} from '@backstage/catalog-model';
+import { Entity, RELATION_OWNED_BY } from '@backstage/catalog-model';
+import { AlphaEntity } from '@backstage/catalog-model/alpha';
 import { humanizeEntityRef } from './components/EntityRefLink';
 import { EntityFilter, UserListFilterKind } from './types';
 import { getEntityRelations } from './utils';

plugins/catalog-react/src/hooks/useEntityPermission.test.tsx

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { catalogEntityDeletePermission } from '@backstage/plugin-catalog-common';
+import { catalogEntityDeletePermission } from '@backstage/plugin-catalog-common/alpha';
 import { renderHook } from '@testing-library/react-hooks';
 import { useEntityPermission } from './useEntityPermission';
 import { useAsyncEntity } from './useEntity';

plugins/catalog/src/components/CatalogPage/DefaultCatalogPage.test.tsx

@@ -34,9 +34,9 @@ import {
   MockStarredEntitiesApi,
   starredEntitiesApiRef,
 } from '@backstage/plugin-catalog-react';
+import { MockPluginProvider } from '@backstage/test-utils/alpha';
 import {
   mockBreakpoint,
-  MockPluginProvider,
   MockStorageApi,
   renderWithEffects,
   TestApiProvider,

plugins/catalog/src/components/EntityContextMenu/EntityContextMenu.tsx

@@ -30,8 +30,8 @@ import MoreVert from '@material-ui/icons/MoreVert';
 import FileCopyTwoToneIcon from '@material-ui/icons/FileCopyTwoTone';
 import React, { useCallback, useState } from 'react';
 import { IconComponent } from '@backstage/core-plugin-api';
-import { useEntityPermission } from '@backstage/plugin-catalog-react';
-import { catalogEntityDeletePermission } from '@backstage/plugin-catalog-common';
+import { useEntityPermission } from '@backstage/plugin-catalog-react/alpha';
+import { catalogEntityDeletePermission } from '@backstage/plugin-catalog-common/alpha';
 import { BackstageTheme } from '@backstage/theme';
 import { UnregisterEntity, UnregisterEntityOptions } from './UnregisterEntity';
 import { useApi, alertApiRef } from '@backstage/core-plugin-api';

plugins/catalog/src/components/EntityProcessingErrorsPanel/EntityProcessingErrorsPanel.test.tsx

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { AlphaEntity, stringifyEntityRef } from '@backstage/catalog-model';
+import { AlphaEntity } from '@backstage/catalog-model/alpha';
+import { stringifyEntityRef } from '@backstage/catalog-model';
 import { ApiProvider } from '@backstage/core-app-api';
 import {
   CatalogApi,

plugins/catalog/src/components/EntityProcessingErrorsPanel/EntityProcessingErrorsPanel.tsx

@@ -14,12 +14,8 @@
  * limitations under the License.
  */
 
-import {
-  Entity,
-  AlphaEntity,
-  stringifyEntityRef,
-  EntityStatusItem,
-} from '@backstage/catalog-model';
+import { AlphaEntity, EntityStatusItem } from '@backstage/catalog-model/alpha';
+import { Entity, stringifyEntityRef } from '@backstage/catalog-model';
 import {
   catalogApiRef,
   EntityRefLink,

plugins/catalog/src/options.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { usePluginOptions } from '@backstage/core-plugin-api';
+import { usePluginOptions } from '@backstage/core-plugin-api/alpha';
 
 export type CatalogPluginOptions = {
   createButtonTitle: string;

plugins/cost-insights/src/components/CostOverviewCard/CostOverviewCard.test.tsx

@@ -15,7 +15,8 @@
  */
 import React from 'react';
 import { fireEvent } from '@testing-library/react';
-import { MockPluginProvider, renderInTestApp } from '@backstage/test-utils';
+import { MockPluginProvider } from '@backstage/test-utils/alpha';
+import { renderInTestApp } from '@backstage/test-utils';
 import { CostOverviewCard } from './CostOverviewCard';
 import { Cost } from '@backstage/plugin-cost-insights-common';
 import {

plugins/cost-insights/src/components/EntityCosts/EntityCost.test.tsx

@@ -14,11 +14,8 @@
  * limitations under the License.
  */
 import React from 'react';
-import {
-  MockPluginProvider,
-  renderInTestApp,
-  TestApiProvider,
-} from '@backstage/test-utils';
+import { MockPluginProvider } from '@backstage/test-utils/alpha';
+import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import {
   changeOf,
   MockAggregatedDailyCosts,

plugins/cost-insights/src/options.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { usePluginOptions } from '@backstage/core-plugin-api';
+import { usePluginOptions } from '@backstage/core-plugin-api/alpha';
 
 export type CostInsightsPluginOptions = {
   hideTrendLine?: boolean;

plugins/jenkins-common/src/permissions.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { RESOURCE_TYPE_CATALOG_ENTITY } from '@backstage/plugin-catalog-common';
+import { RESOURCE_TYPE_CATALOG_ENTITY } from '@backstage/plugin-catalog-common/alpha';
 import { createPermission } from '@backstage/plugin-permission-common';
 
 /**

plugins/jenkins/src/components/BuildsPage/lib/CITable/CITable.tsx

@@ -15,7 +15,7 @@
  */
 import { Link, Progress, Table, TableColumn } from '@backstage/core-components';
 import { alertApiRef, useApi, useRouteRef } from '@backstage/core-plugin-api';
-import { useEntityPermission } from '@backstage/plugin-catalog-react';
+import { useEntityPermission } from '@backstage/plugin-catalog-react/alpha';
 import { Box, IconButton, Tooltip, Typography } from '@material-ui/core';
 import RetryIcon from '@material-ui/icons/Replay';
 import { default as React, useState } from 'react';

plugins/scaffolder-backend/src/ScaffolderPlugin.ts

@@ -20,7 +20,7 @@ import {
 } from '@backstage/backend-plugin-api';
 import { loggerToWinstonLogger } from '@backstage/backend-common';
 import { ScmIntegrations } from '@backstage/integration';
-import { catalogServiceRef } from '@backstage/plugin-catalog-node';
+import { catalogServiceRef } from '@backstage/plugin-catalog-node/alpha';
 import {
   scaffolderActionsExtensionPoint,
   ScaffolderActionsExtensionPoint,

plugins/scaffolder-backend/src/modules/catalogModuleTemplateKind.test.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node';
+import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
 import { ScaffolderEntitiesProcessor } from '../processor';
 import { catalogModuleTemplateKind } from './catalogModuleTemplateKind';
 import { startTestBackend } from '@backstage/backend-test-utils';

plugins/scaffolder-backend/src/modules/catalogModuleTemplateKind.ts

@@ -15,7 +15,7 @@
  */
 
 import { createBackendModule } from '@backstage/backend-plugin-api';
-import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node';
+import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
 import { ScaffolderEntitiesProcessor } from '../processor';
 
 /**

plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx

@@ -36,7 +36,7 @@ import {
 import React, { ComponentType } from 'react';
 import { TemplateList } from '../TemplateList';
 import { TemplateTypePicker } from '../TemplateTypePicker';
-import { catalogEntityCreatePermission } from '@backstage/plugin-catalog-common';
+import { catalogEntityCreatePermission } from '@backstage/plugin-catalog-common/alpha';
 import { usePermission } from '@backstage/plugin-permission-react';
 import { ScaffolderPageContextMenu } from './ScaffolderPageContextMenu';
 import { registerComponentRouteRef } from '../../routes';

plugins/scaffolder/src/next/TemplateListPage/RegisterExistingButton.tsx

@@ -21,7 +21,7 @@ import useMediaQuery from '@material-ui/core/useMediaQuery';
 import React from 'react';
 import { Link as RouterLink, LinkProps } from 'react-router-dom';
 import AddCircleOutline from '@material-ui/icons/AddCircleOutline';
-import { catalogEntityCreatePermission } from '@backstage/plugin-catalog-common';
+import { catalogEntityCreatePermission } from '@backstage/plugin-catalog-common/alpha';
 import { usePermission } from '@backstage/plugin-permission-react';
 
 /**

plugins/sonarqube/dev/index.tsx

@@ -22,10 +22,10 @@ import { EntitySonarQubeCard, sonarQubePlugin } from '../src';
 import { Content, Header, Page } from '@backstage/core-components';
 import {
   FindingSummary,
-  SONARQUBE_PROJECT_KEY_ANNOTATION,
   SonarQubeApi,
   sonarQubeApiRef,
-} from '@backstage/plugin-sonarqube-react';
+} from '@backstage/plugin-sonarqube-react/alpha';
+import { SONARQUBE_PROJECT_KEY_ANNOTATION } from '@backstage/plugin-sonarqube-react';
 
 const entity = (name?: string) =>
   ({

plugins/sonarqube/src/api/SonarQubeClient.test.ts

@@ -21,7 +21,7 @@ import { SonarQubeClient } from './index';
 import { InstanceUrlWrapper, FindingsWrapper } from './types';
 import { UrlPatternDiscovery } from '@backstage/core-app-api';
 import { IdentityApi } from '@backstage/core-plugin-api';
-import { FindingSummary } from '@backstage/plugin-sonarqube-react';
+import { FindingSummary } from '@backstage/plugin-sonarqube-react/alpha';
 
 const server = setupServer();
 

plugins/sonarqube/src/api/SonarQubeClient.ts

@@ -19,7 +19,7 @@ import {
   FindingSummary,
   Metrics,
   SonarQubeApi,
-} from '@backstage/plugin-sonarqube-react';
+} from '@backstage/plugin-sonarqube-react/alpha';
 import { InstanceUrlWrapper, FindingsWrapper } from './types';
 import { DiscoveryApi, IdentityApi } from '@backstage/core-plugin-api';
 

plugins/sonarqube/src/api/types.ts

@@ -14,8 +14,10 @@
  * limitations under the License.
  */
 
-import { MetricKey as NonDeprecatedMetricKey } from '@backstage/plugin-sonarqube-react';
-import { SonarUrlProcessorFunc as NonDeprecatedSonarUrlProcessorFunc } from '@backstage/plugin-sonarqube-react';
+import {
+  MetricKey as NonDeprecatedMetricKey,
+  SonarUrlProcessorFunc as NonDeprecatedSonarUrlProcessorFunc,
+} from '@backstage/plugin-sonarqube-react/alpha';
 
 export interface InstanceUrlWrapper {
   instanceUrl: string;

plugins/sonarqube/src/components/SonarQubeCard/SonarQubeCard.tsx

@@ -16,10 +16,10 @@
 
 import { useEntity } from '@backstage/plugin-catalog-react';
 import {
-  SONARQUBE_PROJECT_KEY_ANNOTATION,
   sonarQubeApiRef,
   useProjectInfo,
-} from '@backstage/plugin-sonarqube-react';
+} from '@backstage/plugin-sonarqube-react/alpha';
+import { SONARQUBE_PROJECT_KEY_ANNOTATION } from '@backstage/plugin-sonarqube-react';
 import { Chip, Grid } from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
 import BugReport from '@material-ui/icons/BugReport';

plugins/sonarqube/src/components/SonarQubeContentPage/SonarQubeContentPage.test.tsx

@@ -18,10 +18,12 @@ import { EntityProvider } from '@backstage/plugin-catalog-react';
 import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import React from 'react';
 import {
-  isSonarQubeAvailable,
-  SONARQUBE_PROJECT_KEY_ANNOTATION,
   SonarQubeApi,
   sonarQubeApiRef,
+} from '@backstage/plugin-sonarqube-react/alpha';
+import {
+  isSonarQubeAvailable,
+  SONARQUBE_PROJECT_KEY_ANNOTATION,
 } from '@backstage/plugin-sonarqube-react';
 
 const Providers = ({

plugins/sonarqube/src/plugin.ts

@@ -22,7 +22,7 @@ import {
   discoveryApiRef,
   identityApiRef,
 } from '@backstage/core-plugin-api';
-import { sonarQubeApiRef } from '@backstage/plugin-sonarqube-react';
+import { sonarQubeApiRef } from '@backstage/plugin-sonarqube-react/alpha';
 
 /** @public */
 export const sonarQubePlugin = createPlugin({

plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts

@@ -29,7 +29,7 @@ import unescape from 'lodash/unescape';
 import { Logger } from 'winston';
 import pLimit from 'p-limit';
 import { Config } from '@backstage/config';
-import { catalogEntityReadPermission } from '@backstage/plugin-catalog-common';
+import { catalogEntityReadPermission } from '@backstage/plugin-catalog-common/alpha';
 import { Permission } from '@backstage/plugin-permission-common';
 import {
   CatalogApi,

plugins/techdocs-backend/src/search/DefaultTechDocsCollatorFactory.ts

@@ -30,7 +30,7 @@ import {
   stringifyEntityRef,
 } from '@backstage/catalog-model';
 import { Config } from '@backstage/config';
-import { catalogEntityReadPermission } from '@backstage/plugin-catalog-common';
+import { catalogEntityReadPermission } from '@backstage/plugin-catalog-common/alpha';
 import { Permission } from '@backstage/plugin-permission-common';
 import { DocumentCollatorFactory } from '@backstage/plugin-search-common';
 import { TechDocsDocument } from '@backstage/plugin-techdocs-node';