diff --git a/packages/app-api/.eslintrc.js b/packages/core-app-api/.eslintrc.js similarity index 100% rename from packages/app-api/.eslintrc.js rename to packages/core-app-api/.eslintrc.js diff --git a/packages/app-api/README.md b/packages/core-app-api/README.md similarity index 74% rename from packages/app-api/README.md rename to packages/core-app-api/README.md index 1adce23b42..4b8cfaaf93 100644 --- a/packages/app-api/README.md +++ b/packages/core-app-api/README.md @@ -1,17 +1,17 @@ -# @backstage/app-api +# @backstage/core-app-api This package provides the core API used by Backstage plugins and apps. ## Installation ```sh -$ npm install --save @backstage/app-api +$ npm install --save @backstage/core-app-api ``` or ```sh -$ yarn add @backstage/app-api +$ yarn add @backstage/core-app-api ``` ## Documentation diff --git a/packages/app-api/package.json b/packages/core-app-api/package.json similarity index 90% rename from packages/app-api/package.json rename to packages/core-app-api/package.json index cbd745ebce..bab209a708 100644 --- a/packages/app-api/package.json +++ b/packages/core-app-api/package.json @@ -1,5 +1,5 @@ { - "name": "@backstage/app-api", + "name": "@backstage/core-app-api", "description": "Core app API used by Backstage plugins and apps", "version": "0.1.0", "private": false, @@ -12,7 +12,7 @@ "repository": { "type": "git", "url": "https://github.com/backstage/backstage", - "directory": "packages/app-api" + "directory": "packages/core-app-api" }, "keywords": [ "backstage" @@ -29,9 +29,9 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/components": "^0.1.0", + "@backstage/core-components": "^0.1.0", "@backstage/config": "^0.1.3", - "@backstage/plugin-api": "^0.1.0", + "@backstage/core-plugin-api": "^0.1.0", "@backstage/theme": "^0.2.3", "@material-ui/core": "^4.11.0", "@material-ui/icons": "^4.9.1", diff --git a/packages/app-api/src/apis/implementations/AlertApi/AlertApiForwarder.ts b/packages/core-app-api/src/apis/implementations/AlertApi/AlertApiForwarder.ts similarity index 93% rename from packages/app-api/src/apis/implementations/AlertApi/AlertApiForwarder.ts rename to packages/core-app-api/src/apis/implementations/AlertApi/AlertApiForwarder.ts index 43865a4329..8bab1b539d 100644 --- a/packages/app-api/src/apis/implementations/AlertApi/AlertApiForwarder.ts +++ b/packages/core-app-api/src/apis/implementations/AlertApi/AlertApiForwarder.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { AlertApi, AlertMessage } from '@backstage/plugin-api'; +import { AlertApi, AlertMessage } from '@backstage/core-plugin-api'; import { PublishSubject } from '../../../lib/subjects'; import { Observable } from '../../../types'; diff --git a/packages/app-api/src/apis/implementations/AlertApi/index.ts b/packages/core-app-api/src/apis/implementations/AlertApi/index.ts similarity index 100% rename from packages/app-api/src/apis/implementations/AlertApi/index.ts rename to packages/core-app-api/src/apis/implementations/AlertApi/index.ts diff --git a/packages/app-api/src/apis/implementations/AppThemeApi/AppThemeSelector.test.ts b/packages/core-app-api/src/apis/implementations/AppThemeApi/AppThemeSelector.test.ts similarity index 98% rename from packages/app-api/src/apis/implementations/AppThemeApi/AppThemeSelector.test.ts rename to packages/core-app-api/src/apis/implementations/AppThemeApi/AppThemeSelector.test.ts index 80789ff7a6..8d36e6b10e 100644 --- a/packages/app-api/src/apis/implementations/AppThemeApi/AppThemeSelector.test.ts +++ b/packages/core-app-api/src/apis/implementations/AppThemeApi/AppThemeSelector.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { AppTheme } from '@backstage/plugin-api'; +import { AppTheme } from '@backstage/core-plugin-api'; import { AppThemeSelector } from './AppThemeSelector'; describe('AppThemeSelector', () => { diff --git a/packages/app-api/src/apis/implementations/AppThemeApi/AppThemeSelector.ts b/packages/core-app-api/src/apis/implementations/AppThemeApi/AppThemeSelector.ts similarity index 96% rename from packages/app-api/src/apis/implementations/AppThemeApi/AppThemeSelector.ts rename to packages/core-app-api/src/apis/implementations/AppThemeApi/AppThemeSelector.ts index 142d700dd5..6d7adbb03a 100644 --- a/packages/app-api/src/apis/implementations/AppThemeApi/AppThemeSelector.ts +++ b/packages/core-app-api/src/apis/implementations/AppThemeApi/AppThemeSelector.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { AppThemeApi, AppTheme } from '@backstage/plugin-api'; +import { AppThemeApi, AppTheme } from '@backstage/core-plugin-api'; import { BehaviorSubject } from '../../../lib/subjects'; import { Observable } from '../../../types'; diff --git a/packages/app-api/src/apis/implementations/AppThemeApi/index.ts b/packages/core-app-api/src/apis/implementations/AppThemeApi/index.ts similarity index 100% rename from packages/app-api/src/apis/implementations/AppThemeApi/index.ts rename to packages/core-app-api/src/apis/implementations/AppThemeApi/index.ts diff --git a/packages/app-api/src/apis/implementations/ConfigApi/index.ts b/packages/core-app-api/src/apis/implementations/ConfigApi/index.ts similarity index 100% rename from packages/app-api/src/apis/implementations/ConfigApi/index.ts rename to packages/core-app-api/src/apis/implementations/ConfigApi/index.ts diff --git a/packages/app-api/src/apis/implementations/DiscoveryApi/UrlPatternDiscovery.test.ts b/packages/core-app-api/src/apis/implementations/DiscoveryApi/UrlPatternDiscovery.test.ts similarity index 100% rename from packages/app-api/src/apis/implementations/DiscoveryApi/UrlPatternDiscovery.test.ts rename to packages/core-app-api/src/apis/implementations/DiscoveryApi/UrlPatternDiscovery.test.ts diff --git a/packages/app-api/src/apis/implementations/DiscoveryApi/UrlPatternDiscovery.ts b/packages/core-app-api/src/apis/implementations/DiscoveryApi/UrlPatternDiscovery.ts similarity index 96% rename from packages/app-api/src/apis/implementations/DiscoveryApi/UrlPatternDiscovery.ts rename to packages/core-app-api/src/apis/implementations/DiscoveryApi/UrlPatternDiscovery.ts index db9cbfccd5..a9decd9ef9 100644 --- a/packages/app-api/src/apis/implementations/DiscoveryApi/UrlPatternDiscovery.ts +++ b/packages/core-app-api/src/apis/implementations/DiscoveryApi/UrlPatternDiscovery.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { DiscoveryApi } from '@backstage/plugin-api'; +import { DiscoveryApi } from '@backstage/core-plugin-api'; /** * UrlPatternDiscovery is a lightweight DiscoveryApi implementation. diff --git a/packages/app-api/src/apis/implementations/DiscoveryApi/index.ts b/packages/core-app-api/src/apis/implementations/DiscoveryApi/index.ts similarity index 100% rename from packages/app-api/src/apis/implementations/DiscoveryApi/index.ts rename to packages/core-app-api/src/apis/implementations/DiscoveryApi/index.ts diff --git a/packages/app-api/src/apis/implementations/ErrorApi/ErrorAlerter.ts b/packages/core-app-api/src/apis/implementations/ErrorApi/ErrorAlerter.ts similarity index 93% rename from packages/app-api/src/apis/implementations/ErrorApi/ErrorAlerter.ts rename to packages/core-app-api/src/apis/implementations/ErrorApi/ErrorAlerter.ts index 5bbf6e123a..73d5042c11 100644 --- a/packages/app-api/src/apis/implementations/ErrorApi/ErrorAlerter.ts +++ b/packages/core-app-api/src/apis/implementations/ErrorApi/ErrorAlerter.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { ErrorApi, ErrorContext, AlertApi } from '@backstage/plugin-api'; +import { ErrorApi, ErrorContext, AlertApi } from '@backstage/core-plugin-api'; /** * Decorates an ErrorApi by also forwarding error messages diff --git a/packages/app-api/src/apis/implementations/ErrorApi/ErrorApiForwarder.ts b/packages/core-app-api/src/apis/implementations/ErrorApi/ErrorApiForwarder.ts similarity index 94% rename from packages/app-api/src/apis/implementations/ErrorApi/ErrorApiForwarder.ts rename to packages/core-app-api/src/apis/implementations/ErrorApi/ErrorApiForwarder.ts index ef4cd815f3..479fcdf92d 100644 --- a/packages/app-api/src/apis/implementations/ErrorApi/ErrorApiForwarder.ts +++ b/packages/core-app-api/src/apis/implementations/ErrorApi/ErrorApiForwarder.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { ErrorApi, ErrorContext } from '@backstage/plugin-api'; +import { ErrorApi, ErrorContext } from '@backstage/core-plugin-api'; import { PublishSubject } from '../../../lib/subjects'; import { Observable } from '../../../types'; diff --git a/packages/app-api/src/apis/implementations/ErrorApi/index.ts b/packages/core-app-api/src/apis/implementations/ErrorApi/index.ts similarity index 100% rename from packages/app-api/src/apis/implementations/ErrorApi/index.ts rename to packages/core-app-api/src/apis/implementations/ErrorApi/index.ts diff --git a/packages/app-api/src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags.test.tsx b/packages/core-app-api/src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags.test.tsx similarity index 98% rename from packages/app-api/src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags.test.tsx rename to packages/core-app-api/src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags.test.tsx index 590a3b5ce2..a100f01a52 100644 --- a/packages/app-api/src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags.test.tsx +++ b/packages/core-app-api/src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags.test.tsx @@ -15,7 +15,7 @@ */ import { LocalStorageFeatureFlags } from './LocalStorageFeatureFlags'; -import { FeatureFlagState, FeatureFlagsApi } from '@backstage/plugin-api'; +import { FeatureFlagState, FeatureFlagsApi } from '@backstage/core-plugin-api'; describe('FeatureFlags', () => { beforeEach(() => { diff --git a/packages/app-api/src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags.tsx b/packages/core-app-api/src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags.tsx similarity index 98% rename from packages/app-api/src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags.tsx rename to packages/core-app-api/src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags.tsx index 582e85bed9..800ae98f24 100644 --- a/packages/app-api/src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags.tsx +++ b/packages/core-app-api/src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags.tsx @@ -19,7 +19,7 @@ import { FeatureFlagsApi, FeatureFlag, FeatureFlagsSaveOptions, -} from '@backstage/plugin-api'; +} from '@backstage/core-plugin-api'; export function validateFlagName(name: string): void { if (name.length < 3) { diff --git a/packages/app-api/src/apis/implementations/FeatureFlagsApi/index.ts b/packages/core-app-api/src/apis/implementations/FeatureFlagsApi/index.ts similarity index 100% rename from packages/app-api/src/apis/implementations/FeatureFlagsApi/index.ts rename to packages/core-app-api/src/apis/implementations/FeatureFlagsApi/index.ts diff --git a/packages/app-api/src/apis/implementations/OAuthRequestApi/MockOAuthApi.test.ts b/packages/core-app-api/src/apis/implementations/OAuthRequestApi/MockOAuthApi.test.ts similarity index 100% rename from packages/app-api/src/apis/implementations/OAuthRequestApi/MockOAuthApi.test.ts rename to packages/core-app-api/src/apis/implementations/OAuthRequestApi/MockOAuthApi.test.ts diff --git a/packages/app-api/src/apis/implementations/OAuthRequestApi/MockOAuthApi.ts b/packages/core-app-api/src/apis/implementations/OAuthRequestApi/MockOAuthApi.ts similarity index 94% rename from packages/app-api/src/apis/implementations/OAuthRequestApi/MockOAuthApi.ts rename to packages/core-app-api/src/apis/implementations/OAuthRequestApi/MockOAuthApi.ts index ff440ffd51..46d620c329 100644 --- a/packages/app-api/src/apis/implementations/OAuthRequestApi/MockOAuthApi.ts +++ b/packages/core-app-api/src/apis/implementations/OAuthRequestApi/MockOAuthApi.ts @@ -14,7 +14,10 @@ * limitations under the License. */ -import { OAuthRequestApi, AuthRequesterOptions } from '@backstage/plugin-api'; +import { + OAuthRequestApi, + AuthRequesterOptions, +} from '@backstage/core-plugin-api'; import { OAuthRequestManager } from './OAuthRequestManager'; export default class MockOAuthApi implements OAuthRequestApi { diff --git a/packages/app-api/src/apis/implementations/OAuthRequestApi/OAuthPendingRequests.test.ts b/packages/core-app-api/src/apis/implementations/OAuthRequestApi/OAuthPendingRequests.test.ts similarity index 100% rename from packages/app-api/src/apis/implementations/OAuthRequestApi/OAuthPendingRequests.test.ts rename to packages/core-app-api/src/apis/implementations/OAuthRequestApi/OAuthPendingRequests.test.ts diff --git a/packages/app-api/src/apis/implementations/OAuthRequestApi/OAuthPendingRequests.ts b/packages/core-app-api/src/apis/implementations/OAuthRequestApi/OAuthPendingRequests.ts similarity index 100% rename from packages/app-api/src/apis/implementations/OAuthRequestApi/OAuthPendingRequests.ts rename to packages/core-app-api/src/apis/implementations/OAuthRequestApi/OAuthPendingRequests.ts diff --git a/packages/app-api/src/apis/implementations/OAuthRequestApi/OAuthRequestManager.test.ts b/packages/core-app-api/src/apis/implementations/OAuthRequestApi/OAuthRequestManager.test.ts similarity index 100% rename from packages/app-api/src/apis/implementations/OAuthRequestApi/OAuthRequestManager.test.ts rename to packages/core-app-api/src/apis/implementations/OAuthRequestApi/OAuthRequestManager.test.ts diff --git a/packages/app-api/src/apis/implementations/OAuthRequestApi/OAuthRequestManager.ts b/packages/core-app-api/src/apis/implementations/OAuthRequestApi/OAuthRequestManager.ts similarity index 98% rename from packages/app-api/src/apis/implementations/OAuthRequestApi/OAuthRequestManager.ts rename to packages/core-app-api/src/apis/implementations/OAuthRequestApi/OAuthRequestManager.ts index b7c50f7696..7a69e82aab 100644 --- a/packages/app-api/src/apis/implementations/OAuthRequestApi/OAuthRequestManager.ts +++ b/packages/core-app-api/src/apis/implementations/OAuthRequestApi/OAuthRequestManager.ts @@ -19,7 +19,7 @@ import { PendingAuthRequest, AuthRequester, AuthRequesterOptions, -} from '@backstage/plugin-api'; +} from '@backstage/core-plugin-api'; import { OAuthPendingRequests, PendingRequest } from './OAuthPendingRequests'; import { BehaviorSubject } from '../../../lib/subjects'; import { Observable } from '../../../types'; diff --git a/packages/app-api/src/apis/implementations/OAuthRequestApi/index.ts b/packages/core-app-api/src/apis/implementations/OAuthRequestApi/index.ts similarity index 100% rename from packages/app-api/src/apis/implementations/OAuthRequestApi/index.ts rename to packages/core-app-api/src/apis/implementations/OAuthRequestApi/index.ts diff --git a/packages/app-api/src/apis/implementations/StorageApi/WebStorage.test.ts b/packages/core-app-api/src/apis/implementations/StorageApi/WebStorage.test.ts similarity index 99% rename from packages/app-api/src/apis/implementations/StorageApi/WebStorage.test.ts rename to packages/core-app-api/src/apis/implementations/StorageApi/WebStorage.test.ts index 73257fd746..da5b2509db 100644 --- a/packages/app-api/src/apis/implementations/StorageApi/WebStorage.test.ts +++ b/packages/core-app-api/src/apis/implementations/StorageApi/WebStorage.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import { CreateStorageApiOptions, WebStorage } from './WebStorage'; -import { StorageApi } from '@backstage/plugin-api'; +import { StorageApi } from '@backstage/core-plugin-api'; describe('WebStorage Storage API', () => { const mockErrorApi = { post: jest.fn(), error$: jest.fn() }; diff --git a/packages/app-api/src/apis/implementations/StorageApi/WebStorage.ts b/packages/core-app-api/src/apis/implementations/StorageApi/WebStorage.ts similarity index 98% rename from packages/app-api/src/apis/implementations/StorageApi/WebStorage.ts rename to packages/core-app-api/src/apis/implementations/StorageApi/WebStorage.ts index d9bea8d5ee..225bf0ea5e 100644 --- a/packages/app-api/src/apis/implementations/StorageApi/WebStorage.ts +++ b/packages/core-app-api/src/apis/implementations/StorageApi/WebStorage.ts @@ -17,7 +17,7 @@ import { StorageApi, StorageValueChange, ErrorApi, -} from '@backstage/plugin-api'; +} from '@backstage/core-plugin-api'; import { Observable } from '../../../types'; import ObservableImpl from 'zen-observable'; diff --git a/packages/app-api/src/apis/implementations/StorageApi/index.ts b/packages/core-app-api/src/apis/implementations/StorageApi/index.ts similarity index 100% rename from packages/app-api/src/apis/implementations/StorageApi/index.ts rename to packages/core-app-api/src/apis/implementations/StorageApi/index.ts diff --git a/packages/app-api/src/apis/implementations/auth/auth0/Auth0Auth.ts b/packages/core-app-api/src/apis/implementations/auth/auth0/Auth0Auth.ts similarity index 95% rename from packages/app-api/src/apis/implementations/auth/auth0/Auth0Auth.ts rename to packages/core-app-api/src/apis/implementations/auth/auth0/Auth0Auth.ts index bfb244caee..391a709935 100644 --- a/packages/app-api/src/apis/implementations/auth/auth0/Auth0Auth.ts +++ b/packages/core-app-api/src/apis/implementations/auth/auth0/Auth0Auth.ts @@ -15,7 +15,7 @@ */ import Auth0Icon from '@material-ui/icons/AcUnit'; -import { auth0AuthApiRef } from '@backstage/plugin-api'; +import { auth0AuthApiRef } from '@backstage/core-plugin-api'; import { OAuth2 } from '../oauth2'; import { OAuthApiCreateOptions } from '../types'; diff --git a/packages/app-api/src/apis/implementations/auth/auth0/index.ts b/packages/core-app-api/src/apis/implementations/auth/auth0/index.ts similarity index 100% rename from packages/app-api/src/apis/implementations/auth/auth0/index.ts rename to packages/core-app-api/src/apis/implementations/auth/auth0/index.ts diff --git a/packages/app-api/src/apis/implementations/auth/github/GithubAuth.test.ts b/packages/core-app-api/src/apis/implementations/auth/github/GithubAuth.test.ts similarity index 100% rename from packages/app-api/src/apis/implementations/auth/github/GithubAuth.test.ts rename to packages/core-app-api/src/apis/implementations/auth/github/GithubAuth.test.ts diff --git a/packages/app-api/src/apis/implementations/auth/github/GithubAuth.ts b/packages/core-app-api/src/apis/implementations/auth/github/GithubAuth.ts similarity index 99% rename from packages/app-api/src/apis/implementations/auth/github/GithubAuth.ts rename to packages/core-app-api/src/apis/implementations/auth/github/GithubAuth.ts index 810cd7dc44..040fccf0e1 100644 --- a/packages/app-api/src/apis/implementations/auth/github/GithubAuth.ts +++ b/packages/core-app-api/src/apis/implementations/auth/github/GithubAuth.ts @@ -24,7 +24,7 @@ import { ProfileInfo, BackstageIdentity, AuthRequestOptions, -} from '@backstage/plugin-api'; +} from '@backstage/core-plugin-api'; import { SessionManager } from '../../../../lib/AuthSessionManager/types'; import { AuthSessionStore, diff --git a/packages/app-api/src/apis/implementations/auth/github/index.ts b/packages/core-app-api/src/apis/implementations/auth/github/index.ts similarity index 100% rename from packages/app-api/src/apis/implementations/auth/github/index.ts rename to packages/core-app-api/src/apis/implementations/auth/github/index.ts diff --git a/packages/app-api/src/apis/implementations/auth/github/types.ts b/packages/core-app-api/src/apis/implementations/auth/github/types.ts similarity index 91% rename from packages/app-api/src/apis/implementations/auth/github/types.ts rename to packages/core-app-api/src/apis/implementations/auth/github/types.ts index 1360f01100..95beef3668 100644 --- a/packages/app-api/src/apis/implementations/auth/github/types.ts +++ b/packages/core-app-api/src/apis/implementations/auth/github/types.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { ProfileInfo, BackstageIdentity } from '@backstage/plugin-api'; +import { ProfileInfo, BackstageIdentity } from '@backstage/core-plugin-api'; export type GithubSession = { providerInfo: { diff --git a/packages/app-api/src/apis/implementations/auth/gitlab/GitlabAuth.test.ts b/packages/core-app-api/src/apis/implementations/auth/gitlab/GitlabAuth.test.ts similarity index 100% rename from packages/app-api/src/apis/implementations/auth/gitlab/GitlabAuth.test.ts rename to packages/core-app-api/src/apis/implementations/auth/gitlab/GitlabAuth.test.ts diff --git a/packages/app-api/src/apis/implementations/auth/gitlab/GitlabAuth.ts b/packages/core-app-api/src/apis/implementations/auth/gitlab/GitlabAuth.ts similarity index 95% rename from packages/app-api/src/apis/implementations/auth/gitlab/GitlabAuth.ts rename to packages/core-app-api/src/apis/implementations/auth/gitlab/GitlabAuth.ts index 72dadc5cb2..fbb9509e7d 100644 --- a/packages/app-api/src/apis/implementations/auth/gitlab/GitlabAuth.ts +++ b/packages/core-app-api/src/apis/implementations/auth/gitlab/GitlabAuth.ts @@ -15,7 +15,7 @@ */ import GitlabIcon from '@material-ui/icons/AcUnit'; -import { gitlabAuthApiRef } from '@backstage/plugin-api'; +import { gitlabAuthApiRef } from '@backstage/core-plugin-api'; import { OAuth2 } from '../oauth2'; import { OAuthApiCreateOptions } from '../types'; diff --git a/packages/app-api/src/apis/implementations/auth/gitlab/index.ts b/packages/core-app-api/src/apis/implementations/auth/gitlab/index.ts similarity index 100% rename from packages/app-api/src/apis/implementations/auth/gitlab/index.ts rename to packages/core-app-api/src/apis/implementations/auth/gitlab/index.ts diff --git a/packages/app-api/src/apis/implementations/auth/google/GoogleAuth.test.ts b/packages/core-app-api/src/apis/implementations/auth/google/GoogleAuth.test.ts similarity index 100% rename from packages/app-api/src/apis/implementations/auth/google/GoogleAuth.test.ts rename to packages/core-app-api/src/apis/implementations/auth/google/GoogleAuth.test.ts diff --git a/packages/app-api/src/apis/implementations/auth/google/GoogleAuth.ts b/packages/core-app-api/src/apis/implementations/auth/google/GoogleAuth.ts similarity index 96% rename from packages/app-api/src/apis/implementations/auth/google/GoogleAuth.ts rename to packages/core-app-api/src/apis/implementations/auth/google/GoogleAuth.ts index 0d305cbe70..1074a192ef 100644 --- a/packages/app-api/src/apis/implementations/auth/google/GoogleAuth.ts +++ b/packages/core-app-api/src/apis/implementations/auth/google/GoogleAuth.ts @@ -15,7 +15,7 @@ */ import GoogleIcon from '@material-ui/icons/AcUnit'; -import { googleAuthApiRef } from '@backstage/plugin-api'; +import { googleAuthApiRef } from '@backstage/core-plugin-api'; import { OAuth2 } from '../oauth2'; import { OAuthApiCreateOptions } from '../types'; diff --git a/packages/app-api/src/apis/implementations/auth/google/index.ts b/packages/core-app-api/src/apis/implementations/auth/google/index.ts similarity index 100% rename from packages/app-api/src/apis/implementations/auth/google/index.ts rename to packages/core-app-api/src/apis/implementations/auth/google/index.ts diff --git a/packages/app-api/src/apis/implementations/auth/index.ts b/packages/core-app-api/src/apis/implementations/auth/index.ts similarity index 100% rename from packages/app-api/src/apis/implementations/auth/index.ts rename to packages/core-app-api/src/apis/implementations/auth/index.ts diff --git a/packages/app-api/src/apis/implementations/auth/microsoft/MicrosoftAuth.ts b/packages/core-app-api/src/apis/implementations/auth/microsoft/MicrosoftAuth.ts similarity index 95% rename from packages/app-api/src/apis/implementations/auth/microsoft/MicrosoftAuth.ts rename to packages/core-app-api/src/apis/implementations/auth/microsoft/MicrosoftAuth.ts index 7851294e80..490e74b532 100644 --- a/packages/app-api/src/apis/implementations/auth/microsoft/MicrosoftAuth.ts +++ b/packages/core-app-api/src/apis/implementations/auth/microsoft/MicrosoftAuth.ts @@ -15,7 +15,7 @@ */ import MicrosoftIcon from '@material-ui/icons/AcUnit'; -import { microsoftAuthApiRef } from '@backstage/plugin-api'; +import { microsoftAuthApiRef } from '@backstage/core-plugin-api'; import { OAuth2 } from '../oauth2'; import { OAuthApiCreateOptions } from '../types'; diff --git a/packages/app-api/src/apis/implementations/auth/microsoft/index.ts b/packages/core-app-api/src/apis/implementations/auth/microsoft/index.ts similarity index 100% rename from packages/app-api/src/apis/implementations/auth/microsoft/index.ts rename to packages/core-app-api/src/apis/implementations/auth/microsoft/index.ts diff --git a/packages/app-api/src/apis/implementations/auth/oauth2/OAuth2.test.ts b/packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2.test.ts similarity index 100% rename from packages/app-api/src/apis/implementations/auth/oauth2/OAuth2.test.ts rename to packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2.test.ts diff --git a/packages/app-api/src/apis/implementations/auth/oauth2/OAuth2.ts b/packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2.ts similarity index 99% rename from packages/app-api/src/apis/implementations/auth/oauth2/OAuth2.ts rename to packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2.ts index 68e31b3356..a63636b6f1 100644 --- a/packages/app-api/src/apis/implementations/auth/oauth2/OAuth2.ts +++ b/packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2.ts @@ -29,7 +29,7 @@ import { SessionState, SessionApi, BackstageIdentityApi, -} from '@backstage/plugin-api'; +} from '@backstage/core-plugin-api'; import { OAuth2Session } from './types'; import { OAuthApiCreateOptions } from '../types'; diff --git a/packages/app-api/src/apis/implementations/auth/oauth2/index.ts b/packages/core-app-api/src/apis/implementations/auth/oauth2/index.ts similarity index 100% rename from packages/app-api/src/apis/implementations/auth/oauth2/index.ts rename to packages/core-app-api/src/apis/implementations/auth/oauth2/index.ts diff --git a/packages/app-api/src/apis/implementations/auth/oauth2/types.ts b/packages/core-app-api/src/apis/implementations/auth/oauth2/types.ts similarity index 91% rename from packages/app-api/src/apis/implementations/auth/oauth2/types.ts rename to packages/core-app-api/src/apis/implementations/auth/oauth2/types.ts index 8ab6eaf1af..ade0f1a6c6 100644 --- a/packages/app-api/src/apis/implementations/auth/oauth2/types.ts +++ b/packages/core-app-api/src/apis/implementations/auth/oauth2/types.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { ProfileInfo, BackstageIdentity } from '@backstage/plugin-api'; +import { ProfileInfo, BackstageIdentity } from '@backstage/core-plugin-api'; export type OAuth2Session = { providerInfo: { diff --git a/packages/app-api/src/apis/implementations/auth/okta/OktaAuth.test.ts b/packages/core-app-api/src/apis/implementations/auth/okta/OktaAuth.test.ts similarity index 100% rename from packages/app-api/src/apis/implementations/auth/okta/OktaAuth.test.ts rename to packages/core-app-api/src/apis/implementations/auth/okta/OktaAuth.test.ts diff --git a/packages/app-api/src/apis/implementations/auth/okta/OktaAuth.ts b/packages/core-app-api/src/apis/implementations/auth/okta/OktaAuth.ts similarity index 96% rename from packages/app-api/src/apis/implementations/auth/okta/OktaAuth.ts rename to packages/core-app-api/src/apis/implementations/auth/okta/OktaAuth.ts index dba63c9b06..a86e3f272d 100644 --- a/packages/app-api/src/apis/implementations/auth/okta/OktaAuth.ts +++ b/packages/core-app-api/src/apis/implementations/auth/okta/OktaAuth.ts @@ -15,7 +15,7 @@ */ import OktaIcon from '@material-ui/icons/AcUnit'; -import { oktaAuthApiRef } from '@backstage/plugin-api'; +import { oktaAuthApiRef } from '@backstage/core-plugin-api'; import { OAuth2 } from '../oauth2'; import { OAuthApiCreateOptions } from '../types'; diff --git a/packages/app-api/src/apis/implementations/auth/okta/index.ts b/packages/core-app-api/src/apis/implementations/auth/okta/index.ts similarity index 100% rename from packages/app-api/src/apis/implementations/auth/okta/index.ts rename to packages/core-app-api/src/apis/implementations/auth/okta/index.ts diff --git a/packages/app-api/src/apis/implementations/auth/onelogin/OneLoginAuth.ts b/packages/core-app-api/src/apis/implementations/auth/onelogin/OneLoginAuth.ts similarity index 98% rename from packages/app-api/src/apis/implementations/auth/onelogin/OneLoginAuth.ts rename to packages/core-app-api/src/apis/implementations/auth/onelogin/OneLoginAuth.ts index f3ebb0a6f8..2e8c7ac2e8 100644 --- a/packages/app-api/src/apis/implementations/auth/onelogin/OneLoginAuth.ts +++ b/packages/core-app-api/src/apis/implementations/auth/onelogin/OneLoginAuth.ts @@ -20,7 +20,7 @@ import { OAuthRequestApi, AuthProvider, DiscoveryApi, -} from '@backstage/plugin-api'; +} from '@backstage/core-plugin-api'; import { OAuth2 } from '../oauth2'; type CreateOptions = { diff --git a/packages/app-api/src/apis/implementations/auth/onelogin/index.ts b/packages/core-app-api/src/apis/implementations/auth/onelogin/index.ts similarity index 100% rename from packages/app-api/src/apis/implementations/auth/onelogin/index.ts rename to packages/core-app-api/src/apis/implementations/auth/onelogin/index.ts diff --git a/packages/app-api/src/apis/implementations/auth/saml/SamlAuth.ts b/packages/core-app-api/src/apis/implementations/auth/saml/SamlAuth.ts similarity index 98% rename from packages/app-api/src/apis/implementations/auth/saml/SamlAuth.ts rename to packages/core-app-api/src/apis/implementations/auth/saml/SamlAuth.ts index 74c25200e9..4bb887eb80 100644 --- a/packages/app-api/src/apis/implementations/auth/saml/SamlAuth.ts +++ b/packages/core-app-api/src/apis/implementations/auth/saml/SamlAuth.ts @@ -26,7 +26,7 @@ import { ProfileInfoApi, BackstageIdentityApi, SessionApi, -} from '@backstage/plugin-api'; +} from '@backstage/core-plugin-api'; import { SamlSession } from './types'; import { AuthSessionStore, diff --git a/packages/app-api/src/apis/implementations/auth/saml/index.ts b/packages/core-app-api/src/apis/implementations/auth/saml/index.ts similarity index 100% rename from packages/app-api/src/apis/implementations/auth/saml/index.ts rename to packages/core-app-api/src/apis/implementations/auth/saml/index.ts diff --git a/packages/app-api/src/apis/implementations/auth/saml/types.ts b/packages/core-app-api/src/apis/implementations/auth/saml/types.ts similarity index 90% rename from packages/app-api/src/apis/implementations/auth/saml/types.ts rename to packages/core-app-api/src/apis/implementations/auth/saml/types.ts index 49debe2e97..b62826b2ea 100644 --- a/packages/app-api/src/apis/implementations/auth/saml/types.ts +++ b/packages/core-app-api/src/apis/implementations/auth/saml/types.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { ProfileInfo, BackstageIdentity } from '@backstage/plugin-api'; +import { ProfileInfo, BackstageIdentity } from '@backstage/core-plugin-api'; export type SamlSession = { userId: string; diff --git a/packages/app-api/src/apis/implementations/auth/types.ts b/packages/core-app-api/src/apis/implementations/auth/types.ts similarity index 96% rename from packages/app-api/src/apis/implementations/auth/types.ts rename to packages/core-app-api/src/apis/implementations/auth/types.ts index cf13d550fb..a752e68eba 100644 --- a/packages/app-api/src/apis/implementations/auth/types.ts +++ b/packages/core-app-api/src/apis/implementations/auth/types.ts @@ -18,7 +18,7 @@ import { AuthProvider, DiscoveryApi, OAuthRequestApi, -} from '@backstage/plugin-api'; +} from '@backstage/core-plugin-api'; export type OAuthApiCreateOptions = AuthApiCreateOptions & { oauthRequestApi: OAuthRequestApi; diff --git a/packages/app-api/src/apis/implementations/index.ts b/packages/core-app-api/src/apis/implementations/index.ts similarity index 100% rename from packages/app-api/src/apis/implementations/index.ts rename to packages/core-app-api/src/apis/implementations/index.ts diff --git a/packages/app-api/src/apis/index.ts b/packages/core-app-api/src/apis/index.ts similarity index 100% rename from packages/app-api/src/apis/index.ts rename to packages/core-app-api/src/apis/index.ts diff --git a/packages/app-api/src/apis/system/ApiAggregator.test.ts b/packages/core-app-api/src/apis/system/ApiAggregator.test.ts similarity index 95% rename from packages/app-api/src/apis/system/ApiAggregator.test.ts rename to packages/core-app-api/src/apis/system/ApiAggregator.test.ts index a72d6250c0..c38aa08fad 100644 --- a/packages/app-api/src/apis/system/ApiAggregator.test.ts +++ b/packages/core-app-api/src/apis/system/ApiAggregator.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { createApiRef } from '@backstage/plugin-api'; +import { createApiRef } from '@backstage/core-plugin-api'; import { ApiAggregator } from './ApiAggregator'; import { ApiRegistry } from './ApiRegistry'; diff --git a/packages/app-api/src/apis/system/ApiAggregator.ts b/packages/core-app-api/src/apis/system/ApiAggregator.ts similarity index 94% rename from packages/app-api/src/apis/system/ApiAggregator.ts rename to packages/core-app-api/src/apis/system/ApiAggregator.ts index 8224afd8cf..1299e38da0 100644 --- a/packages/app-api/src/apis/system/ApiAggregator.ts +++ b/packages/core-app-api/src/apis/system/ApiAggregator.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { ApiRef, ApiHolder } from '@backstage/plugin-api'; +import { ApiRef, ApiHolder } from '@backstage/core-plugin-api'; /** * An ApiHolder that queries multiple other holders from for diff --git a/packages/app-api/src/apis/system/ApiFactoryRegistry.test.ts b/packages/core-app-api/src/apis/system/ApiFactoryRegistry.test.ts similarity index 98% rename from packages/app-api/src/apis/system/ApiFactoryRegistry.test.ts rename to packages/core-app-api/src/apis/system/ApiFactoryRegistry.test.ts index 3537f0549a..160019604e 100644 --- a/packages/app-api/src/apis/system/ApiFactoryRegistry.test.ts +++ b/packages/core-app-api/src/apis/system/ApiFactoryRegistry.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { createApiRef } from '@backstage/plugin-api'; +import { createApiRef } from '@backstage/core-plugin-api'; import { ApiFactoryRegistry } from './ApiFactoryRegistry'; const aRef = createApiRef({ id: 'a' }); diff --git a/packages/app-api/src/apis/system/ApiFactoryRegistry.ts b/packages/core-app-api/src/apis/system/ApiFactoryRegistry.ts similarity index 98% rename from packages/app-api/src/apis/system/ApiFactoryRegistry.ts rename to packages/core-app-api/src/apis/system/ApiFactoryRegistry.ts index eb09e18a57..fe17f5a600 100644 --- a/packages/app-api/src/apis/system/ApiFactoryRegistry.ts +++ b/packages/core-app-api/src/apis/system/ApiFactoryRegistry.ts @@ -20,7 +20,7 @@ import { ApiFactory, AnyApiRef, AnyApiFactory, -} from '@backstage/plugin-api'; +} from '@backstage/core-plugin-api'; type ApiFactoryScope = | 'default' // Default factories registered by core and plugins diff --git a/packages/app-api/src/apis/system/ApiProvider.test.tsx b/packages/core-app-api/src/apis/system/ApiProvider.test.tsx similarity index 99% rename from packages/app-api/src/apis/system/ApiProvider.test.tsx rename to packages/core-app-api/src/apis/system/ApiProvider.test.tsx index 7786d3176d..7d38ec3cf9 100644 --- a/packages/app-api/src/apis/system/ApiProvider.test.tsx +++ b/packages/core-app-api/src/apis/system/ApiProvider.test.tsx @@ -21,7 +21,7 @@ import { withApis, ApiHolder, ApiRef, -} from '@backstage/plugin-api'; +} from '@backstage/core-plugin-api'; import { ApiProvider } from './ApiProvider'; import { ApiRegistry } from './ApiRegistry'; import { render } from '@testing-library/react'; diff --git a/packages/app-api/src/apis/system/ApiProvider.tsx b/packages/core-app-api/src/apis/system/ApiProvider.tsx similarity index 96% rename from packages/app-api/src/apis/system/ApiProvider.tsx rename to packages/core-app-api/src/apis/system/ApiProvider.tsx index 37e512f20d..93d20b12fc 100644 --- a/packages/app-api/src/apis/system/ApiProvider.tsx +++ b/packages/core-app-api/src/apis/system/ApiProvider.tsx @@ -21,7 +21,7 @@ import React, { PropsWithChildren, } from 'react'; import PropTypes from 'prop-types'; -import { ApiHolder } from '@backstage/plugin-api'; +import { ApiHolder } from '@backstage/core-plugin-api'; import { ApiAggregator } from './ApiAggregator'; import { getOrCreateGlobalSingleton } from '../../lib/globalObject'; import { diff --git a/packages/app-api/src/apis/system/ApiRegistry.test.ts b/packages/core-app-api/src/apis/system/ApiRegistry.test.ts similarity index 97% rename from packages/app-api/src/apis/system/ApiRegistry.test.ts rename to packages/core-app-api/src/apis/system/ApiRegistry.test.ts index 89dd62ca07..0931e2c103 100644 --- a/packages/app-api/src/apis/system/ApiRegistry.test.ts +++ b/packages/core-app-api/src/apis/system/ApiRegistry.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { createApiRef } from '@backstage/plugin-api'; +import { createApiRef } from '@backstage/core-plugin-api'; import { ApiRegistry } from './ApiRegistry'; describe('ApiRegistry', () => { diff --git a/packages/app-api/src/apis/system/ApiRegistry.ts b/packages/core-app-api/src/apis/system/ApiRegistry.ts similarity index 96% rename from packages/app-api/src/apis/system/ApiRegistry.ts rename to packages/core-app-api/src/apis/system/ApiRegistry.ts index ff3f3bb8be..4571d52cce 100644 --- a/packages/app-api/src/apis/system/ApiRegistry.ts +++ b/packages/core-app-api/src/apis/system/ApiRegistry.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { ApiRef, ApiHolder } from '@backstage/plugin-api'; +import { ApiRef, ApiHolder } from '@backstage/core-plugin-api'; type ApiImpl = readonly [ApiRef, T]; diff --git a/packages/app-api/src/apis/system/ApiResolver.test.ts b/packages/core-app-api/src/apis/system/ApiResolver.test.ts similarity index 99% rename from packages/app-api/src/apis/system/ApiResolver.test.ts rename to packages/core-app-api/src/apis/system/ApiResolver.test.ts index 940ffb8b60..af8dbc28c6 100644 --- a/packages/app-api/src/apis/system/ApiResolver.test.ts +++ b/packages/core-app-api/src/apis/system/ApiResolver.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { createApiRef } from '@backstage/plugin-api'; +import { createApiRef } from '@backstage/core-plugin-api'; import { ApiResolver } from './ApiResolver'; import { ApiFactoryRegistry } from './ApiFactoryRegistry'; diff --git a/packages/app-api/src/apis/system/ApiResolver.ts b/packages/core-app-api/src/apis/system/ApiResolver.ts similarity index 98% rename from packages/app-api/src/apis/system/ApiResolver.ts rename to packages/core-app-api/src/apis/system/ApiResolver.ts index 379d7356d1..1fbce4871a 100644 --- a/packages/app-api/src/apis/system/ApiResolver.ts +++ b/packages/core-app-api/src/apis/system/ApiResolver.ts @@ -19,7 +19,7 @@ import { ApiHolder, AnyApiRef, TypesToApiRefs, -} from '@backstage/plugin-api'; +} from '@backstage/core-plugin-api'; import { ApiFactoryHolder } from './types'; export class ApiResolver implements ApiHolder { diff --git a/packages/app-api/src/apis/system/index.ts b/packages/core-app-api/src/apis/system/index.ts similarity index 100% rename from packages/app-api/src/apis/system/index.ts rename to packages/core-app-api/src/apis/system/index.ts diff --git a/packages/app-api/src/apis/system/types.ts b/packages/core-app-api/src/apis/system/types.ts similarity index 91% rename from packages/app-api/src/apis/system/types.ts rename to packages/core-app-api/src/apis/system/types.ts index b20c19c113..f1ba82c21e 100644 --- a/packages/app-api/src/apis/system/types.ts +++ b/packages/core-app-api/src/apis/system/types.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { ApiFactory, ApiRef } from '@backstage/plugin-api'; +import { ApiFactory, ApiRef } from '@backstage/core-plugin-api'; export type ApiFactoryHolder = { get( diff --git a/packages/app-api/src/app/App.test.tsx b/packages/core-app-api/src/app/App.test.tsx similarity index 99% rename from packages/app-api/src/app/App.test.tsx rename to packages/core-app-api/src/app/App.test.tsx index 19cc4ed348..c282ba6b7f 100644 --- a/packages/app-api/src/app/App.test.tsx +++ b/packages/core-app-api/src/app/App.test.tsx @@ -31,7 +31,7 @@ import { createExternalRouteRef, createRouteRef, createSubRouteRef, -} from '@backstage/plugin-api'; +} from '@backstage/core-plugin-api'; import { generateBoundRoutes, PrivateAppImpl } from './App'; describe('generateBoundRoutes', () => { diff --git a/packages/app-api/src/app/App.tsx b/packages/core-app-api/src/app/App.tsx similarity index 99% rename from packages/app-api/src/app/App.tsx rename to packages/core-app-api/src/app/App.tsx index abd6b5a8f4..fa33103652 100644 --- a/packages/app-api/src/app/App.tsx +++ b/packages/core-app-api/src/app/App.tsx @@ -48,7 +48,7 @@ import { RouteRef, SubRouteRef, ExternalRouteRef, -} from '@backstage/plugin-api'; +} from '@backstage/core-plugin-api'; import { ApiFactoryRegistry, ApiResolver } from '../apis/system'; import { childDiscoverer, diff --git a/packages/app-api/src/app/AppContext.test.tsx b/packages/core-app-api/src/app/AppContext.test.tsx similarity index 100% rename from packages/app-api/src/app/AppContext.test.tsx rename to packages/core-app-api/src/app/AppContext.test.tsx diff --git a/packages/app-api/src/app/AppContext.tsx b/packages/core-app-api/src/app/AppContext.tsx similarity index 100% rename from packages/app-api/src/app/AppContext.tsx rename to packages/core-app-api/src/app/AppContext.tsx diff --git a/packages/app-api/src/app/AppIdentity.ts b/packages/core-app-api/src/app/AppIdentity.ts similarity index 97% rename from packages/app-api/src/app/AppIdentity.ts rename to packages/core-app-api/src/app/AppIdentity.ts index b247530064..b2b4a0bcdc 100644 --- a/packages/app-api/src/app/AppIdentity.ts +++ b/packages/core-app-api/src/app/AppIdentity.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { IdentityApi, ProfileInfo } from '@backstage/plugin-api'; +import { IdentityApi, ProfileInfo } from '@backstage/core-plugin-api'; import { SignInResult } from './types'; /** diff --git a/packages/app-api/src/app/AppThemeProvider.tsx b/packages/core-app-api/src/app/AppThemeProvider.tsx similarity index 97% rename from packages/app-api/src/app/AppThemeProvider.tsx rename to packages/core-app-api/src/app/AppThemeProvider.tsx index 86746d7c09..d297b05ced 100644 --- a/packages/app-api/src/app/AppThemeProvider.tsx +++ b/packages/core-app-api/src/app/AppThemeProvider.tsx @@ -16,7 +16,7 @@ import React, { useMemo, useEffect, useState, PropsWithChildren } from 'react'; import { ThemeProvider, CssBaseline } from '@material-ui/core'; -import { useApi, appThemeApiRef, AppTheme } from '@backstage/plugin-api'; +import { useApi, appThemeApiRef, AppTheme } from '@backstage/core-plugin-api'; import { useObservable } from 'react-use'; // This tries to find the most accurate match, but also falls back to less diff --git a/packages/app-api/src/app/createApp.test.tsx b/packages/core-app-api/src/app/createApp.test.tsx similarity index 100% rename from packages/app-api/src/app/createApp.test.tsx rename to packages/core-app-api/src/app/createApp.test.tsx diff --git a/packages/app-api/src/app/createApp.tsx b/packages/core-app-api/src/app/createApp.tsx similarity index 98% rename from packages/app-api/src/app/createApp.tsx rename to packages/core-app-api/src/app/createApp.tsx index a0ef11199a..c11ac840f9 100644 --- a/packages/app-api/src/app/createApp.tsx +++ b/packages/core-app-api/src/app/createApp.tsx @@ -24,7 +24,7 @@ import { } from 'react-router-dom'; import LightIcon from '@material-ui/icons/WbSunny'; import DarkIcon from '@material-ui/icons/Brightness2'; -import { ErrorPage, Progress } from '@backstage/components'; +import { ErrorPage, Progress } from '@backstage/core-components'; import { defaultApis } from './defaultApis'; import { lightTheme, darkTheme } from '@backstage/theme'; import { AppConfig, JsonObject } from '@backstage/config'; diff --git a/packages/app-api/src/app/defaultApis.ts b/packages/core-app-api/src/app/defaultApis.ts similarity index 99% rename from packages/app-api/src/app/defaultApis.ts rename to packages/core-app-api/src/app/defaultApis.ts index cd373543cf..5d84e27f89 100644 --- a/packages/app-api/src/app/defaultApis.ts +++ b/packages/core-app-api/src/app/defaultApis.ts @@ -50,7 +50,7 @@ import { samlAuthApiRef, oneloginAuthApiRef, oidcAuthApiRef, -} from '@backstage/plugin-api'; +} from '@backstage/core-plugin-api'; import OAuth2Icon from '@material-ui/icons/AcUnit'; diff --git a/packages/app-api/src/app/icons.tsx b/packages/core-app-api/src/app/icons.tsx similarity index 96% rename from packages/app-api/src/app/icons.tsx rename to packages/core-app-api/src/app/icons.tsx index f5c8e4e268..9ec278ba7f 100644 --- a/packages/app-api/src/app/icons.tsx +++ b/packages/core-app-api/src/app/icons.tsx @@ -14,7 +14,7 @@ * limitations under the License. */ -import { IconComponent } from '@backstage/plugin-api'; +import { IconComponent } from '@backstage/core-plugin-api'; import MuiMenuBookIcon from '@material-ui/icons/MenuBook'; import MuiBrokenImageIcon from '@material-ui/icons/BrokenImage'; import MuiChatIcon from '@material-ui/icons/Chat'; diff --git a/packages/app-api/src/app/index.ts b/packages/core-app-api/src/app/index.ts similarity index 100% rename from packages/app-api/src/app/index.ts rename to packages/core-app-api/src/app/index.ts diff --git a/packages/app-api/src/app/types.ts b/packages/core-app-api/src/app/types.ts similarity index 99% rename from packages/app-api/src/app/types.ts rename to packages/core-app-api/src/app/types.ts index 746248d736..ceed0fdfef 100644 --- a/packages/app-api/src/app/types.ts +++ b/packages/core-app-api/src/app/types.ts @@ -24,7 +24,7 @@ import { RouteRef, SubRouteRef, ExternalRouteRef, -} from '@backstage/plugin-api'; +} from '@backstage/core-plugin-api'; import { AppConfig } from '@backstage/config'; import { AppIcons } from './icons'; diff --git a/packages/app-api/src/extensions/componentData.test.tsx b/packages/core-app-api/src/extensions/componentData.test.tsx similarity index 100% rename from packages/app-api/src/extensions/componentData.test.tsx rename to packages/core-app-api/src/extensions/componentData.test.tsx diff --git a/packages/app-api/src/extensions/componentData.tsx b/packages/core-app-api/src/extensions/componentData.tsx similarity index 100% rename from packages/app-api/src/extensions/componentData.tsx rename to packages/core-app-api/src/extensions/componentData.tsx diff --git a/packages/app-api/src/extensions/extensions.test.tsx b/packages/core-app-api/src/extensions/extensions.test.tsx similarity index 96% rename from packages/app-api/src/extensions/extensions.test.tsx rename to packages/core-app-api/src/extensions/extensions.test.tsx index 7bb74cc854..e8770dddbb 100644 --- a/packages/app-api/src/extensions/extensions.test.tsx +++ b/packages/core-app-api/src/extensions/extensions.test.tsx @@ -15,7 +15,7 @@ */ import React from 'react'; -import { createPlugin, createRouteRef } from '@backstage/plugin-api'; +import { createPlugin, createRouteRef } from '@backstage/core-plugin-api'; import { getComponentData } from './componentData'; import { createComponentExtension, diff --git a/packages/app-api/src/extensions/extensions.tsx b/packages/core-app-api/src/extensions/extensions.tsx similarity index 99% rename from packages/app-api/src/extensions/extensions.tsx rename to packages/core-app-api/src/extensions/extensions.tsx index 97c4ceb32b..8eab3b905f 100644 --- a/packages/app-api/src/extensions/extensions.tsx +++ b/packages/core-app-api/src/extensions/extensions.tsx @@ -22,7 +22,7 @@ import { RouteRef, useRouteRef, useApp, -} from '@backstage/plugin-api'; +} from '@backstage/core-plugin-api'; type ComponentLoader = | { diff --git a/packages/app-api/src/extensions/index.ts b/packages/core-app-api/src/extensions/index.ts similarity index 100% rename from packages/app-api/src/extensions/index.ts rename to packages/core-app-api/src/extensions/index.ts diff --git a/packages/app-api/src/extensions/traversal.test.tsx b/packages/core-app-api/src/extensions/traversal.test.tsx similarity index 100% rename from packages/app-api/src/extensions/traversal.test.tsx rename to packages/core-app-api/src/extensions/traversal.test.tsx diff --git a/packages/app-api/src/extensions/traversal.ts b/packages/core-app-api/src/extensions/traversal.ts similarity index 100% rename from packages/app-api/src/extensions/traversal.ts rename to packages/core-app-api/src/extensions/traversal.ts diff --git a/packages/app-api/src/index.test.ts b/packages/core-app-api/src/index.test.ts similarity index 100% rename from packages/app-api/src/index.test.ts rename to packages/core-app-api/src/index.test.ts diff --git a/packages/app-api/src/index.ts b/packages/core-app-api/src/index.ts similarity index 100% rename from packages/app-api/src/index.ts rename to packages/core-app-api/src/index.ts diff --git a/packages/app-api/src/lib/AuthConnector/DefaultAuthConnector.test.ts b/packages/core-app-api/src/lib/AuthConnector/DefaultAuthConnector.test.ts similarity index 100% rename from packages/app-api/src/lib/AuthConnector/DefaultAuthConnector.test.ts rename to packages/core-app-api/src/lib/AuthConnector/DefaultAuthConnector.test.ts diff --git a/packages/app-api/src/lib/AuthConnector/DefaultAuthConnector.ts b/packages/core-app-api/src/lib/AuthConnector/DefaultAuthConnector.ts similarity index 99% rename from packages/app-api/src/lib/AuthConnector/DefaultAuthConnector.ts rename to packages/core-app-api/src/lib/AuthConnector/DefaultAuthConnector.ts index 072b617de8..1498657281 100644 --- a/packages/app-api/src/lib/AuthConnector/DefaultAuthConnector.ts +++ b/packages/core-app-api/src/lib/AuthConnector/DefaultAuthConnector.ts @@ -19,7 +19,7 @@ import { OAuthRequestApi, AuthProvider, DiscoveryApi, -} from '@backstage/plugin-api'; +} from '@backstage/core-plugin-api'; import { showLoginPopup } from '../loginPopup'; import { AuthConnector, CreateSessionOptions } from './types'; diff --git a/packages/app-api/src/lib/AuthConnector/DirectAuthConnector.ts b/packages/core-app-api/src/lib/AuthConnector/DirectAuthConnector.ts similarity index 96% rename from packages/app-api/src/lib/AuthConnector/DirectAuthConnector.ts rename to packages/core-app-api/src/lib/AuthConnector/DirectAuthConnector.ts index 85d53caa71..e5b3ca1219 100644 --- a/packages/app-api/src/lib/AuthConnector/DirectAuthConnector.ts +++ b/packages/core-app-api/src/lib/AuthConnector/DirectAuthConnector.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { AuthProvider, DiscoveryApi } from '@backstage/plugin-api'; +import { AuthProvider, DiscoveryApi } from '@backstage/core-plugin-api'; import { showLoginPopup } from '../loginPopup'; type Options = { diff --git a/packages/app-api/src/lib/AuthConnector/MockAuthConnector.test.ts b/packages/core-app-api/src/lib/AuthConnector/MockAuthConnector.test.ts similarity index 100% rename from packages/app-api/src/lib/AuthConnector/MockAuthConnector.test.ts rename to packages/core-app-api/src/lib/AuthConnector/MockAuthConnector.test.ts diff --git a/packages/app-api/src/lib/AuthConnector/MockAuthConnector.ts b/packages/core-app-api/src/lib/AuthConnector/MockAuthConnector.ts similarity index 100% rename from packages/app-api/src/lib/AuthConnector/MockAuthConnector.ts rename to packages/core-app-api/src/lib/AuthConnector/MockAuthConnector.ts diff --git a/packages/app-api/src/lib/AuthConnector/index.ts b/packages/core-app-api/src/lib/AuthConnector/index.ts similarity index 100% rename from packages/app-api/src/lib/AuthConnector/index.ts rename to packages/core-app-api/src/lib/AuthConnector/index.ts diff --git a/packages/app-api/src/lib/AuthConnector/types.ts b/packages/core-app-api/src/lib/AuthConnector/types.ts similarity index 100% rename from packages/app-api/src/lib/AuthConnector/types.ts rename to packages/core-app-api/src/lib/AuthConnector/types.ts diff --git a/packages/app-api/src/lib/AuthSessionManager/AuthSessionStore.test.ts b/packages/core-app-api/src/lib/AuthSessionManager/AuthSessionStore.test.ts similarity index 100% rename from packages/app-api/src/lib/AuthSessionManager/AuthSessionStore.test.ts rename to packages/core-app-api/src/lib/AuthSessionManager/AuthSessionStore.test.ts diff --git a/packages/app-api/src/lib/AuthSessionManager/AuthSessionStore.ts b/packages/core-app-api/src/lib/AuthSessionManager/AuthSessionStore.ts similarity index 100% rename from packages/app-api/src/lib/AuthSessionManager/AuthSessionStore.ts rename to packages/core-app-api/src/lib/AuthSessionManager/AuthSessionStore.ts diff --git a/packages/app-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.test.ts b/packages/core-app-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.test.ts similarity index 99% rename from packages/app-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.test.ts rename to packages/core-app-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.test.ts index 8c21e59dd8..ce273847cd 100644 --- a/packages/app-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.test.ts +++ b/packages/core-app-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.test.ts @@ -15,7 +15,7 @@ */ import { RefreshingAuthSessionManager } from './RefreshingAuthSessionManager'; -import { SessionState } from '@backstage/plugin-api'; +import { SessionState } from '@backstage/core-plugin-api'; const defaultOptions = { sessionScopes: (session: { scopes: Set }) => session.scopes, diff --git a/packages/app-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.ts b/packages/core-app-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.ts similarity index 100% rename from packages/app-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.ts rename to packages/core-app-api/src/lib/AuthSessionManager/RefreshingAuthSessionManager.ts diff --git a/packages/app-api/src/lib/AuthSessionManager/SessionStateTracker.ts b/packages/core-app-api/src/lib/AuthSessionManager/SessionStateTracker.ts similarity index 95% rename from packages/app-api/src/lib/AuthSessionManager/SessionStateTracker.ts rename to packages/core-app-api/src/lib/AuthSessionManager/SessionStateTracker.ts index 73eb4e7904..62cdff44ce 100644 --- a/packages/app-api/src/lib/AuthSessionManager/SessionStateTracker.ts +++ b/packages/core-app-api/src/lib/AuthSessionManager/SessionStateTracker.ts @@ -15,7 +15,7 @@ */ import { BehaviorSubject } from '../subjects'; -import { SessionState } from '@backstage/plugin-api'; +import { SessionState } from '@backstage/core-plugin-api'; import { Observable } from '../../types'; export class SessionStateTracker { diff --git a/packages/app-api/src/lib/AuthSessionManager/StaticAuthSessionManager.test.ts b/packages/core-app-api/src/lib/AuthSessionManager/StaticAuthSessionManager.test.ts similarity index 100% rename from packages/app-api/src/lib/AuthSessionManager/StaticAuthSessionManager.test.ts rename to packages/core-app-api/src/lib/AuthSessionManager/StaticAuthSessionManager.test.ts diff --git a/packages/app-api/src/lib/AuthSessionManager/StaticAuthSessionManager.ts b/packages/core-app-api/src/lib/AuthSessionManager/StaticAuthSessionManager.ts similarity index 100% rename from packages/app-api/src/lib/AuthSessionManager/StaticAuthSessionManager.ts rename to packages/core-app-api/src/lib/AuthSessionManager/StaticAuthSessionManager.ts diff --git a/packages/app-api/src/lib/AuthSessionManager/common.ts b/packages/core-app-api/src/lib/AuthSessionManager/common.ts similarity index 100% rename from packages/app-api/src/lib/AuthSessionManager/common.ts rename to packages/core-app-api/src/lib/AuthSessionManager/common.ts diff --git a/packages/app-api/src/lib/AuthSessionManager/index.ts b/packages/core-app-api/src/lib/AuthSessionManager/index.ts similarity index 100% rename from packages/app-api/src/lib/AuthSessionManager/index.ts rename to packages/core-app-api/src/lib/AuthSessionManager/index.ts diff --git a/packages/app-api/src/lib/AuthSessionManager/types.ts b/packages/core-app-api/src/lib/AuthSessionManager/types.ts similarity index 96% rename from packages/app-api/src/lib/AuthSessionManager/types.ts rename to packages/core-app-api/src/lib/AuthSessionManager/types.ts index 8c614843e0..7b6e5920df 100644 --- a/packages/app-api/src/lib/AuthSessionManager/types.ts +++ b/packages/core-app-api/src/lib/AuthSessionManager/types.ts @@ -15,7 +15,7 @@ */ import { Observable } from '../../types'; -import { SessionState } from '@backstage/plugin-api'; +import { SessionState } from '@backstage/core-plugin-api'; export type GetSessionOptions = { optional?: boolean; diff --git a/packages/app-api/src/lib/globalObject.test.ts b/packages/core-app-api/src/lib/globalObject.test.ts similarity index 100% rename from packages/app-api/src/lib/globalObject.test.ts rename to packages/core-app-api/src/lib/globalObject.test.ts diff --git a/packages/app-api/src/lib/globalObject.ts b/packages/core-app-api/src/lib/globalObject.ts similarity index 100% rename from packages/app-api/src/lib/globalObject.ts rename to packages/core-app-api/src/lib/globalObject.ts diff --git a/packages/app-api/src/lib/index.ts b/packages/core-app-api/src/lib/index.ts similarity index 100% rename from packages/app-api/src/lib/index.ts rename to packages/core-app-api/src/lib/index.ts diff --git a/packages/app-api/src/lib/loginPopup.test.ts b/packages/core-app-api/src/lib/loginPopup.test.ts similarity index 100% rename from packages/app-api/src/lib/loginPopup.test.ts rename to packages/core-app-api/src/lib/loginPopup.test.ts diff --git a/packages/app-api/src/lib/loginPopup.ts b/packages/core-app-api/src/lib/loginPopup.ts similarity index 100% rename from packages/app-api/src/lib/loginPopup.ts rename to packages/core-app-api/src/lib/loginPopup.ts diff --git a/packages/app-api/src/lib/subjects.test.ts b/packages/core-app-api/src/lib/subjects.test.ts similarity index 100% rename from packages/app-api/src/lib/subjects.test.ts rename to packages/core-app-api/src/lib/subjects.test.ts diff --git a/packages/app-api/src/lib/subjects.ts b/packages/core-app-api/src/lib/subjects.ts similarity index 100% rename from packages/app-api/src/lib/subjects.ts rename to packages/core-app-api/src/lib/subjects.ts diff --git a/packages/app-api/src/lib/versionedValues.test.ts b/packages/core-app-api/src/lib/versionedValues.test.ts similarity index 100% rename from packages/app-api/src/lib/versionedValues.test.ts rename to packages/core-app-api/src/lib/versionedValues.test.ts diff --git a/packages/app-api/src/lib/versionedValues.ts b/packages/core-app-api/src/lib/versionedValues.ts similarity index 100% rename from packages/app-api/src/lib/versionedValues.ts rename to packages/core-app-api/src/lib/versionedValues.ts diff --git a/packages/app-api/src/plugins/collectors.test.tsx b/packages/core-app-api/src/plugins/collectors.test.tsx similarity index 97% rename from packages/app-api/src/plugins/collectors.test.tsx rename to packages/core-app-api/src/plugins/collectors.test.tsx index d205df9e8b..220d89690f 100644 --- a/packages/app-api/src/plugins/collectors.test.tsx +++ b/packages/core-app-api/src/plugins/collectors.test.tsx @@ -15,7 +15,7 @@ */ import React, { PropsWithChildren } from 'react'; -import { createPlugin, createRouteRef } from '@backstage/plugin-api'; +import { createPlugin, createRouteRef } from '@backstage/core-plugin-api'; import { createRoutableExtension, createComponentExtension, diff --git a/packages/app-api/src/plugins/collectors.ts b/packages/core-app-api/src/plugins/collectors.ts similarity index 96% rename from packages/app-api/src/plugins/collectors.ts rename to packages/core-app-api/src/plugins/collectors.ts index 10442b757b..8e5b623164 100644 --- a/packages/app-api/src/plugins/collectors.ts +++ b/packages/core-app-api/src/plugins/collectors.ts @@ -29,7 +29,7 @@ * limitations under the License. */ -import { BackstagePlugin } from '@backstage/plugin-api'; +import { BackstagePlugin } from '@backstage/core-plugin-api'; import { getComponentData } from '../extensions'; import { createCollector } from '../extensions/traversal'; diff --git a/packages/app-api/src/plugins/index.ts b/packages/core-app-api/src/plugins/index.ts similarity index 100% rename from packages/app-api/src/plugins/index.ts rename to packages/core-app-api/src/plugins/index.ts diff --git a/packages/app-api/src/routing/FlatRoutes.test.tsx b/packages/core-app-api/src/routing/FlatRoutes.test.tsx similarity index 100% rename from packages/app-api/src/routing/FlatRoutes.test.tsx rename to packages/core-app-api/src/routing/FlatRoutes.test.tsx diff --git a/packages/app-api/src/routing/FlatRoutes.tsx b/packages/core-app-api/src/routing/FlatRoutes.tsx similarity index 97% rename from packages/app-api/src/routing/FlatRoutes.tsx rename to packages/core-app-api/src/routing/FlatRoutes.tsx index bbfd0aef50..54ef092965 100644 --- a/packages/app-api/src/routing/FlatRoutes.tsx +++ b/packages/core-app-api/src/routing/FlatRoutes.tsx @@ -16,7 +16,7 @@ import React, { ReactNode, Children, isValidElement, Fragment } from 'react'; import { useRoutes } from 'react-router-dom'; -import { useApp } from '@backstage/plugin-api'; +import { useApp } from '@backstage/core-plugin-api'; type RouteObject = { path: string; diff --git a/packages/app-api/src/routing/RouteResolver.test.ts b/packages/core-app-api/src/routing/RouteResolver.test.ts similarity index 99% rename from packages/app-api/src/routing/RouteResolver.test.ts rename to packages/core-app-api/src/routing/RouteResolver.test.ts index 0d8b7adc2a..f75617e7a5 100644 --- a/packages/app-api/src/routing/RouteResolver.test.ts +++ b/packages/core-app-api/src/routing/RouteResolver.test.ts @@ -21,7 +21,7 @@ import { ExternalRouteRef, RouteRef, SubRouteRef, -} from '@backstage/plugin-api'; +} from '@backstage/core-plugin-api'; import { RouteResolver } from './RouteResolver'; import { MATCH_ALL_ROUTE } from './collectors'; diff --git a/packages/app-api/src/routing/RouteResolver.ts b/packages/core-app-api/src/routing/RouteResolver.ts similarity index 98% rename from packages/app-api/src/routing/RouteResolver.ts rename to packages/core-app-api/src/routing/RouteResolver.ts index f33c3886e3..38158f750e 100644 --- a/packages/app-api/src/routing/RouteResolver.ts +++ b/packages/core-app-api/src/routing/RouteResolver.ts @@ -25,7 +25,11 @@ import { isSubRouteRef, isExternalRouteRef, } from './types'; -import { RouteRef, ExternalRouteRef, SubRouteRef } from '@backstage/plugin-api'; +import { + RouteRef, + ExternalRouteRef, + SubRouteRef, +} from '@backstage/core-plugin-api'; // Joins a list of paths together, avoiding trailing and duplicate slashes function joinPaths(...paths: string[]): string { diff --git a/packages/app-api/src/routing/RoutingProvider.test.tsx b/packages/core-app-api/src/routing/RoutingProvider.test.tsx similarity index 99% rename from packages/app-api/src/routing/RoutingProvider.test.tsx rename to packages/core-app-api/src/routing/RoutingProvider.test.tsx index 5a0d0026cf..39528fe3a9 100644 --- a/packages/app-api/src/routing/RoutingProvider.test.tsx +++ b/packages/core-app-api/src/routing/RoutingProvider.test.tsx @@ -38,7 +38,7 @@ import { createExternalRouteRef, RouteRef, ExternalRouteRef, -} from '@backstage/plugin-api'; +} from '@backstage/core-plugin-api'; import { RoutingProvider } from './RoutingProvider'; import { routePathCollector, diff --git a/packages/app-api/src/routing/RoutingProvider.tsx b/packages/core-app-api/src/routing/RoutingProvider.tsx similarity index 95% rename from packages/app-api/src/routing/RoutingProvider.tsx rename to packages/core-app-api/src/routing/RoutingProvider.tsx index 882bf91cb0..86507d2ff4 100644 --- a/packages/app-api/src/routing/RoutingProvider.tsx +++ b/packages/core-app-api/src/routing/RoutingProvider.tsx @@ -15,7 +15,11 @@ */ import React, { createContext, ReactNode } from 'react'; -import { ExternalRouteRef, RouteRef, SubRouteRef } from '@backstage/plugin-api'; +import { + ExternalRouteRef, + RouteRef, + SubRouteRef, +} from '@backstage/core-plugin-api'; import { getOrCreateGlobalSingleton } from '../lib/globalObject'; import { createVersionedValueMap, diff --git a/packages/app-api/src/routing/collectors.test.tsx b/packages/core-app-api/src/routing/collectors.test.tsx similarity index 99% rename from packages/app-api/src/routing/collectors.test.tsx rename to packages/core-app-api/src/routing/collectors.test.tsx index 3fe1528ed0..40b57bf25a 100644 --- a/packages/app-api/src/routing/collectors.test.tsx +++ b/packages/core-app-api/src/routing/collectors.test.tsx @@ -26,7 +26,11 @@ import { childDiscoverer, routeElementDiscoverer, } from '../extensions/traversal'; -import { createRouteRef, createPlugin, RouteRef } from '@backstage/plugin-api'; +import { + createRouteRef, + createPlugin, + RouteRef, +} from '@backstage/core-plugin-api'; import { attachComponentData, createRoutableExtension } from '../extensions'; import { MemoryRouter, Routes, Route } from 'react-router-dom'; diff --git a/packages/app-api/src/routing/collectors.tsx b/packages/core-app-api/src/routing/collectors.tsx similarity index 98% rename from packages/app-api/src/routing/collectors.tsx rename to packages/core-app-api/src/routing/collectors.tsx index f74dd3cfd6..e940a2cada 100644 --- a/packages/app-api/src/routing/collectors.tsx +++ b/packages/core-app-api/src/routing/collectors.tsx @@ -15,8 +15,8 @@ */ import { isValidElement, ReactElement, ReactNode } from 'react'; -import { RouteRef } from '@backstage/plugin-api'; -import { BackstageRouteObject } from '../routing/types'; +import { RouteRef } from '@backstage/core-plugin-api'; +import { BackstageRouteObject } from './types'; import { getComponentData } from '../extensions'; import { createCollector } from '../extensions/traversal'; diff --git a/packages/app-api/src/routing/index.ts b/packages/core-app-api/src/routing/index.ts similarity index 100% rename from packages/app-api/src/routing/index.ts rename to packages/core-app-api/src/routing/index.ts diff --git a/packages/app-api/src/routing/types.ts b/packages/core-app-api/src/routing/types.ts similarity index 96% rename from packages/app-api/src/routing/types.ts rename to packages/core-app-api/src/routing/types.ts index 9a2d2cd9d7..128ea37d2c 100644 --- a/packages/app-api/src/routing/types.ts +++ b/packages/core-app-api/src/routing/types.ts @@ -14,7 +14,11 @@ * limitations under the License. */ -import { RouteRef, SubRouteRef, ExternalRouteRef } from '@backstage/plugin-api'; +import { + RouteRef, + SubRouteRef, + ExternalRouteRef, +} from '@backstage/core-plugin-api'; import { getOrCreateGlobalSingleton } from '../lib/globalObject'; type RouteRefType = Exclude; diff --git a/packages/app-api/src/routing/validation.ts b/packages/core-app-api/src/routing/validation.ts similarity index 100% rename from packages/app-api/src/routing/validation.ts rename to packages/core-app-api/src/routing/validation.ts diff --git a/packages/app-api/src/setupTests.ts b/packages/core-app-api/src/setupTests.ts similarity index 100% rename from packages/app-api/src/setupTests.ts rename to packages/core-app-api/src/setupTests.ts diff --git a/packages/app-api/src/types.ts b/packages/core-app-api/src/types.ts similarity index 100% rename from packages/app-api/src/types.ts rename to packages/core-app-api/src/types.ts diff --git a/packages/components/.eslintrc.js b/packages/core-components/.eslintrc.js similarity index 100% rename from packages/components/.eslintrc.js rename to packages/core-components/.eslintrc.js diff --git a/packages/components/.npmrc b/packages/core-components/.npmrc similarity index 100% rename from packages/components/.npmrc rename to packages/core-components/.npmrc diff --git a/packages/components/CHANGELOG.md b/packages/core-components/CHANGELOG.md similarity index 100% rename from packages/components/CHANGELOG.md rename to packages/core-components/CHANGELOG.md diff --git a/packages/components/README.md b/packages/core-components/README.md similarity index 100% rename from packages/components/README.md rename to packages/core-components/README.md diff --git a/packages/components/config.d.ts b/packages/core-components/config.d.ts similarity index 100% rename from packages/components/config.d.ts rename to packages/core-components/config.d.ts diff --git a/packages/components/package.json b/packages/core-components/package.json similarity index 93% rename from packages/components/package.json rename to packages/core-components/package.json index 2a710aafd0..316d81c237 100644 --- a/packages/components/package.json +++ b/packages/core-components/package.json @@ -1,5 +1,5 @@ { - "name": "@backstage/components", + "name": "@backstage/core-components", "description": "Core components used by Backstage plugins and apps", "version": "0.1.0", "private": false, @@ -12,7 +12,7 @@ "repository": { "type": "git", "url": "https://github.com/backstage/backstage", - "directory": "packages/core" + "directory": "packages/core-components" }, "keywords": [ "backstage" @@ -30,7 +30,7 @@ }, "dependencies": { "@backstage/config": "^0.1.5", - "@backstage/plugin-api": "^0.1.0", + "@backstage/core-plugin-api": "^0.1.0", "@backstage/errors": "^0.1.1", "@backstage/theme": "^0.2.7", "@material-ui/core": "^4.11.0", @@ -70,7 +70,7 @@ "zen-observable": "^0.8.15" }, "devDependencies": { - "@backstage/app-api": "^0.1.0", + "@backstage/core-app-api": "^0.1.0", "@backstage/cli": "^0.6.11", "@backstage/test-utils": "^0.1.11", "@testing-library/jest-dom": "^5.10.1", diff --git a/packages/components/src/components/AlertDisplay/AlertDisplay.test.tsx b/packages/core-components/src/components/AlertDisplay/AlertDisplay.test.tsx similarity index 96% rename from packages/components/src/components/AlertDisplay/AlertDisplay.test.tsx rename to packages/core-components/src/components/AlertDisplay/AlertDisplay.test.tsx index 76280522bc..624337c49b 100644 --- a/packages/components/src/components/AlertDisplay/AlertDisplay.test.tsx +++ b/packages/core-components/src/components/AlertDisplay/AlertDisplay.test.tsx @@ -16,12 +16,12 @@ import React from 'react'; import { AlertDisplay } from './AlertDisplay'; -import { alertApiRef } from '@backstage/plugin-api'; +import { alertApiRef } from '@backstage/core-plugin-api'; import { ApiProvider, ApiRegistry, AlertApiForwarder, -} from '@backstage/app-api'; +} from '@backstage/core-app-api'; import Observable from 'zen-observable'; import { renderInTestApp } from '@backstage/test-utils'; diff --git a/packages/components/src/components/AlertDisplay/AlertDisplay.tsx b/packages/core-components/src/components/AlertDisplay/AlertDisplay.tsx similarity index 96% rename from packages/components/src/components/AlertDisplay/AlertDisplay.tsx rename to packages/core-components/src/components/AlertDisplay/AlertDisplay.tsx index a471cf2861..c841d234f6 100644 --- a/packages/components/src/components/AlertDisplay/AlertDisplay.tsx +++ b/packages/core-components/src/components/AlertDisplay/AlertDisplay.tsx @@ -18,7 +18,7 @@ import React, { useEffect, useState } from 'react'; import { Snackbar, IconButton } from '@material-ui/core'; import CloseIcon from '@material-ui/icons/Close'; import { Alert } from '@material-ui/lab'; -import { AlertMessage, useApi, alertApiRef } from '@backstage/plugin-api'; +import { AlertMessage, useApi, alertApiRef } from '@backstage/core-plugin-api'; import pluralize from 'pluralize'; // TODO: improve on this and promote to a shared component for use by all apps. diff --git a/packages/components/src/components/AlertDisplay/index.ts b/packages/core-components/src/components/AlertDisplay/index.ts similarity index 100% rename from packages/components/src/components/AlertDisplay/index.ts rename to packages/core-components/src/components/AlertDisplay/index.ts diff --git a/packages/components/src/components/Avatar/Avatar.stories.tsx b/packages/core-components/src/components/Avatar/Avatar.stories.tsx similarity index 100% rename from packages/components/src/components/Avatar/Avatar.stories.tsx rename to packages/core-components/src/components/Avatar/Avatar.stories.tsx diff --git a/packages/components/src/components/Avatar/Avatar.test.tsx b/packages/core-components/src/components/Avatar/Avatar.test.tsx similarity index 100% rename from packages/components/src/components/Avatar/Avatar.test.tsx rename to packages/core-components/src/components/Avatar/Avatar.test.tsx diff --git a/packages/components/src/components/Avatar/Avatar.tsx b/packages/core-components/src/components/Avatar/Avatar.tsx similarity index 100% rename from packages/components/src/components/Avatar/Avatar.tsx rename to packages/core-components/src/components/Avatar/Avatar.tsx diff --git a/packages/components/src/components/Avatar/index.ts b/packages/core-components/src/components/Avatar/index.ts similarity index 100% rename from packages/components/src/components/Avatar/index.ts rename to packages/core-components/src/components/Avatar/index.ts diff --git a/packages/components/src/components/Avatar/util.test.ts b/packages/core-components/src/components/Avatar/util.test.ts similarity index 100% rename from packages/components/src/components/Avatar/util.test.ts rename to packages/core-components/src/components/Avatar/util.test.ts diff --git a/packages/components/src/components/Avatar/utils.ts b/packages/core-components/src/components/Avatar/utils.ts similarity index 100% rename from packages/components/src/components/Avatar/utils.ts rename to packages/core-components/src/components/Avatar/utils.ts diff --git a/packages/components/src/components/Button/Button.stories.tsx b/packages/core-components/src/components/Button/Button.stories.tsx similarity index 98% rename from packages/components/src/components/Button/Button.stories.tsx rename to packages/core-components/src/components/Button/Button.stories.tsx index e0968040fa..e51a7dc0da 100644 --- a/packages/components/src/components/Button/Button.stories.tsx +++ b/packages/core-components/src/components/Button/Button.stories.tsx @@ -16,7 +16,10 @@ import React, { FunctionComponentFactory } from 'react'; import { Button } from './Button'; import { MemoryRouter, useLocation } from 'react-router-dom'; -import { createExternalRouteRef, useRouteRef } from '@backstage/plugin-api'; +import { + createExternalRouteRef, + useRouteRef, +} from '@backstage/core-plugin-api'; import { Divider, Link, diff --git a/packages/components/src/components/Button/Button.test.tsx b/packages/core-components/src/components/Button/Button.test.tsx similarity index 100% rename from packages/components/src/components/Button/Button.test.tsx rename to packages/core-components/src/components/Button/Button.test.tsx diff --git a/packages/components/src/components/Button/Button.tsx b/packages/core-components/src/components/Button/Button.tsx similarity index 100% rename from packages/components/src/components/Button/Button.tsx rename to packages/core-components/src/components/Button/Button.tsx diff --git a/packages/components/src/components/Button/index.ts b/packages/core-components/src/components/Button/index.ts similarity index 100% rename from packages/components/src/components/Button/index.ts rename to packages/core-components/src/components/Button/index.ts diff --git a/packages/components/src/components/CheckboxTree/CheckboxTree.stories.tsx b/packages/core-components/src/components/CheckboxTree/CheckboxTree.stories.tsx similarity index 100% rename from packages/components/src/components/CheckboxTree/CheckboxTree.stories.tsx rename to packages/core-components/src/components/CheckboxTree/CheckboxTree.stories.tsx diff --git a/packages/components/src/components/CheckboxTree/CheckboxTree.test.tsx b/packages/core-components/src/components/CheckboxTree/CheckboxTree.test.tsx similarity index 100% rename from packages/components/src/components/CheckboxTree/CheckboxTree.test.tsx rename to packages/core-components/src/components/CheckboxTree/CheckboxTree.test.tsx diff --git a/packages/components/src/components/CheckboxTree/CheckboxTree.tsx b/packages/core-components/src/components/CheckboxTree/CheckboxTree.tsx similarity index 100% rename from packages/components/src/components/CheckboxTree/CheckboxTree.tsx rename to packages/core-components/src/components/CheckboxTree/CheckboxTree.tsx diff --git a/packages/components/src/components/CheckboxTree/index.tsx b/packages/core-components/src/components/CheckboxTree/index.tsx similarity index 100% rename from packages/components/src/components/CheckboxTree/index.tsx rename to packages/core-components/src/components/CheckboxTree/index.tsx diff --git a/packages/components/src/components/Chip/Chip.stories.tsx b/packages/core-components/src/components/Chip/Chip.stories.tsx similarity index 100% rename from packages/components/src/components/Chip/Chip.stories.tsx rename to packages/core-components/src/components/Chip/Chip.stories.tsx diff --git a/packages/components/src/components/CodeSnippet/CodeSnippet.stories.tsx b/packages/core-components/src/components/CodeSnippet/CodeSnippet.stories.tsx similarity index 100% rename from packages/components/src/components/CodeSnippet/CodeSnippet.stories.tsx rename to packages/core-components/src/components/CodeSnippet/CodeSnippet.stories.tsx diff --git a/packages/components/src/components/CodeSnippet/CodeSnippet.test.tsx b/packages/core-components/src/components/CodeSnippet/CodeSnippet.test.tsx similarity index 100% rename from packages/components/src/components/CodeSnippet/CodeSnippet.test.tsx rename to packages/core-components/src/components/CodeSnippet/CodeSnippet.test.tsx diff --git a/packages/components/src/components/CodeSnippet/CodeSnippet.tsx b/packages/core-components/src/components/CodeSnippet/CodeSnippet.tsx similarity index 100% rename from packages/components/src/components/CodeSnippet/CodeSnippet.tsx rename to packages/core-components/src/components/CodeSnippet/CodeSnippet.tsx diff --git a/packages/components/src/components/CodeSnippet/index.tsx b/packages/core-components/src/components/CodeSnippet/index.tsx similarity index 100% rename from packages/components/src/components/CodeSnippet/index.tsx rename to packages/core-components/src/components/CodeSnippet/index.tsx diff --git a/packages/components/src/components/CopyTextButton/CopyTextButton.stories.tsx b/packages/core-components/src/components/CopyTextButton/CopyTextButton.stories.tsx similarity index 100% rename from packages/components/src/components/CopyTextButton/CopyTextButton.stories.tsx rename to packages/core-components/src/components/CopyTextButton/CopyTextButton.stories.tsx diff --git a/packages/components/src/components/CopyTextButton/CopyTextButton.test.tsx b/packages/core-components/src/components/CopyTextButton/CopyTextButton.test.tsx similarity index 93% rename from packages/components/src/components/CopyTextButton/CopyTextButton.test.tsx rename to packages/core-components/src/components/CopyTextButton/CopyTextButton.test.tsx index 55b00a8796..39d88d07ce 100644 --- a/packages/components/src/components/CopyTextButton/CopyTextButton.test.tsx +++ b/packages/core-components/src/components/CopyTextButton/CopyTextButton.test.tsx @@ -19,8 +19,8 @@ import { fireEvent } from '@testing-library/react'; import { act } from 'react-dom/test-utils'; import { renderInTestApp } from '@backstage/test-utils'; import { CopyTextButton } from './CopyTextButton'; -import { ApiRegistry, ApiProvider } from '@backstage/app-api'; -import { errorApiRef, ErrorApi } from '@backstage/plugin-api'; +import { ApiRegistry, ApiProvider } from '@backstage/core-app-api'; +import { errorApiRef, ErrorApi } from '@backstage/core-plugin-api'; jest.mock('popper.js', () => { const PopperJS = jest.requireActual('popper.js'); diff --git a/packages/components/src/components/CopyTextButton/CopyTextButton.tsx b/packages/core-components/src/components/CopyTextButton/CopyTextButton.tsx similarity index 97% rename from packages/components/src/components/CopyTextButton/CopyTextButton.tsx rename to packages/core-components/src/components/CopyTextButton/CopyTextButton.tsx index e8c56bd66c..7ccb0371f4 100644 --- a/packages/components/src/components/CopyTextButton/CopyTextButton.tsx +++ b/packages/core-components/src/components/CopyTextButton/CopyTextButton.tsx @@ -14,7 +14,7 @@ * limitations under the License. */ -import { errorApiRef, useApi } from '@backstage/plugin-api'; +import { errorApiRef, useApi } from '@backstage/core-plugin-api'; import { IconButton, Tooltip } from '@material-ui/core'; import CopyIcon from '@material-ui/icons/FileCopy'; import PropTypes from 'prop-types'; diff --git a/packages/components/src/components/CopyTextButton/index.tsx b/packages/core-components/src/components/CopyTextButton/index.tsx similarity index 100% rename from packages/components/src/components/CopyTextButton/index.tsx rename to packages/core-components/src/components/CopyTextButton/index.tsx diff --git a/packages/components/src/components/DependencyGraph/DefaultLabel.tsx b/packages/core-components/src/components/DependencyGraph/DefaultLabel.tsx similarity index 100% rename from packages/components/src/components/DependencyGraph/DefaultLabel.tsx rename to packages/core-components/src/components/DependencyGraph/DefaultLabel.tsx diff --git a/packages/components/src/components/DependencyGraph/DefaultNode.tsx b/packages/core-components/src/components/DependencyGraph/DefaultNode.tsx similarity index 100% rename from packages/components/src/components/DependencyGraph/DefaultNode.tsx rename to packages/core-components/src/components/DependencyGraph/DefaultNode.tsx diff --git a/packages/components/src/components/DependencyGraph/DependencyGraph.stories.tsx b/packages/core-components/src/components/DependencyGraph/DependencyGraph.stories.tsx similarity index 100% rename from packages/components/src/components/DependencyGraph/DependencyGraph.stories.tsx rename to packages/core-components/src/components/DependencyGraph/DependencyGraph.stories.tsx diff --git a/packages/components/src/components/DependencyGraph/DependencyGraph.test.tsx b/packages/core-components/src/components/DependencyGraph/DependencyGraph.test.tsx similarity index 100% rename from packages/components/src/components/DependencyGraph/DependencyGraph.test.tsx rename to packages/core-components/src/components/DependencyGraph/DependencyGraph.test.tsx diff --git a/packages/components/src/components/DependencyGraph/DependencyGraph.tsx b/packages/core-components/src/components/DependencyGraph/DependencyGraph.tsx similarity index 100% rename from packages/components/src/components/DependencyGraph/DependencyGraph.tsx rename to packages/core-components/src/components/DependencyGraph/DependencyGraph.tsx diff --git a/packages/components/src/components/DependencyGraph/Edge.test.tsx b/packages/core-components/src/components/DependencyGraph/Edge.test.tsx similarity index 100% rename from packages/components/src/components/DependencyGraph/Edge.test.tsx rename to packages/core-components/src/components/DependencyGraph/Edge.test.tsx diff --git a/packages/components/src/components/DependencyGraph/Edge.tsx b/packages/core-components/src/components/DependencyGraph/Edge.tsx similarity index 100% rename from packages/components/src/components/DependencyGraph/Edge.tsx rename to packages/core-components/src/components/DependencyGraph/Edge.tsx diff --git a/packages/components/src/components/DependencyGraph/Node.test.tsx b/packages/core-components/src/components/DependencyGraph/Node.test.tsx similarity index 100% rename from packages/components/src/components/DependencyGraph/Node.test.tsx rename to packages/core-components/src/components/DependencyGraph/Node.test.tsx diff --git a/packages/components/src/components/DependencyGraph/Node.tsx b/packages/core-components/src/components/DependencyGraph/Node.tsx similarity index 100% rename from packages/components/src/components/DependencyGraph/Node.tsx rename to packages/core-components/src/components/DependencyGraph/Node.tsx diff --git a/packages/components/src/components/DependencyGraph/constants.ts b/packages/core-components/src/components/DependencyGraph/constants.ts similarity index 100% rename from packages/components/src/components/DependencyGraph/constants.ts rename to packages/core-components/src/components/DependencyGraph/constants.ts diff --git a/packages/components/src/components/DependencyGraph/index.ts b/packages/core-components/src/components/DependencyGraph/index.ts similarity index 100% rename from packages/components/src/components/DependencyGraph/index.ts rename to packages/core-components/src/components/DependencyGraph/index.ts diff --git a/packages/components/src/components/DependencyGraph/types.ts b/packages/core-components/src/components/DependencyGraph/types.ts similarity index 100% rename from packages/components/src/components/DependencyGraph/types.ts rename to packages/core-components/src/components/DependencyGraph/types.ts diff --git a/packages/components/src/components/Dialog/Dialog.stories.tsx b/packages/core-components/src/components/Dialog/Dialog.stories.tsx similarity index 100% rename from packages/components/src/components/Dialog/Dialog.stories.tsx rename to packages/core-components/src/components/Dialog/Dialog.stories.tsx diff --git a/packages/components/src/components/DismissableBanner/DismissableBanner.stories.tsx b/packages/core-components/src/components/DismissableBanner/DismissableBanner.stories.tsx similarity index 96% rename from packages/components/src/components/DismissableBanner/DismissableBanner.stories.tsx rename to packages/core-components/src/components/DismissableBanner/DismissableBanner.stories.tsx index 52d67eb0ca..3a2c9532a5 100644 --- a/packages/components/src/components/DismissableBanner/DismissableBanner.stories.tsx +++ b/packages/core-components/src/components/DismissableBanner/DismissableBanner.stories.tsx @@ -17,8 +17,12 @@ import React from 'react'; import { DismissableBanner } from './DismissableBanner'; import { Link, Typography } from '@material-ui/core'; -import { ApiProvider, ApiRegistry, WebStorage } from '@backstage/app-api'; -import { ErrorApi, storageApiRef, StorageApi } from '@backstage/plugin-api'; +import { ApiProvider, ApiRegistry, WebStorage } from '@backstage/core-app-api'; +import { + ErrorApi, + storageApiRef, + StorageApi, +} from '@backstage/core-plugin-api'; export default { title: 'Feedback/DismissableBanner', diff --git a/packages/components/src/components/DismissableBanner/DismissableBanner.test.tsx b/packages/core-components/src/components/DismissableBanner/DismissableBanner.test.tsx similarity index 96% rename from packages/components/src/components/DismissableBanner/DismissableBanner.test.tsx rename to packages/core-components/src/components/DismissableBanner/DismissableBanner.test.tsx index 773d467cdc..ed8e4f0fff 100644 --- a/packages/components/src/components/DismissableBanner/DismissableBanner.test.tsx +++ b/packages/core-components/src/components/DismissableBanner/DismissableBanner.test.tsx @@ -18,8 +18,8 @@ import React from 'react'; import { fireEvent } from '@testing-library/react'; import { renderWithEffects, wrapInTestApp } from '@backstage/test-utils'; import { DismissableBanner } from './DismissableBanner'; -import { ApiRegistry, ApiProvider, WebStorage } from '@backstage/app-api'; -import { storageApiRef, StorageApi } from '@backstage/plugin-api'; +import { ApiRegistry, ApiProvider, WebStorage } from '@backstage/core-app-api'; +import { storageApiRef, StorageApi } from '@backstage/core-plugin-api'; describe('', () => { let apis: ApiRegistry; diff --git a/packages/components/src/components/DismissableBanner/DismissableBanner.tsx b/packages/core-components/src/components/DismissableBanner/DismissableBanner.tsx similarity index 98% rename from packages/components/src/components/DismissableBanner/DismissableBanner.tsx rename to packages/core-components/src/components/DismissableBanner/DismissableBanner.tsx index 63198f3473..8f222768a8 100644 --- a/packages/components/src/components/DismissableBanner/DismissableBanner.tsx +++ b/packages/core-components/src/components/DismissableBanner/DismissableBanner.tsx @@ -15,7 +15,7 @@ */ import React, { ReactNode, useState, useEffect } from 'react'; -import { useApi, storageApiRef } from '@backstage/plugin-api'; +import { useApi, storageApiRef } from '@backstage/core-plugin-api'; import { useObservable } from 'react-use'; import classNames from 'classnames'; import { makeStyles } from '@material-ui/core'; diff --git a/packages/components/src/components/DismissableBanner/index.ts b/packages/core-components/src/components/DismissableBanner/index.ts similarity index 100% rename from packages/components/src/components/DismissableBanner/index.ts rename to packages/core-components/src/components/DismissableBanner/index.ts diff --git a/packages/components/src/components/Drawer/Drawer.stories.tsx b/packages/core-components/src/components/Drawer/Drawer.stories.tsx similarity index 100% rename from packages/components/src/components/Drawer/Drawer.stories.tsx rename to packages/core-components/src/components/Drawer/Drawer.stories.tsx diff --git a/packages/components/src/components/EmptyState/EmptyState.stories.tsx b/packages/core-components/src/components/EmptyState/EmptyState.stories.tsx similarity index 100% rename from packages/components/src/components/EmptyState/EmptyState.stories.tsx rename to packages/core-components/src/components/EmptyState/EmptyState.stories.tsx diff --git a/packages/components/src/components/EmptyState/EmptyState.test.tsx b/packages/core-components/src/components/EmptyState/EmptyState.test.tsx similarity index 100% rename from packages/components/src/components/EmptyState/EmptyState.test.tsx rename to packages/core-components/src/components/EmptyState/EmptyState.test.tsx diff --git a/packages/components/src/components/EmptyState/EmptyState.tsx b/packages/core-components/src/components/EmptyState/EmptyState.tsx similarity index 100% rename from packages/components/src/components/EmptyState/EmptyState.tsx rename to packages/core-components/src/components/EmptyState/EmptyState.tsx diff --git a/packages/components/src/components/EmptyState/EmptyStateImage.test.tsx b/packages/core-components/src/components/EmptyState/EmptyStateImage.test.tsx similarity index 100% rename from packages/components/src/components/EmptyState/EmptyStateImage.test.tsx rename to packages/core-components/src/components/EmptyState/EmptyStateImage.test.tsx diff --git a/packages/components/src/components/EmptyState/EmptyStateImage.tsx b/packages/core-components/src/components/EmptyState/EmptyStateImage.tsx similarity index 100% rename from packages/components/src/components/EmptyState/EmptyStateImage.tsx rename to packages/core-components/src/components/EmptyState/EmptyStateImage.tsx diff --git a/packages/components/src/components/EmptyState/MissingAnnotationEmptyState.tsx b/packages/core-components/src/components/EmptyState/MissingAnnotationEmptyState.tsx similarity index 100% rename from packages/components/src/components/EmptyState/MissingAnnotationEmptyState.tsx rename to packages/core-components/src/components/EmptyState/MissingAnnotationEmptyState.tsx diff --git a/packages/components/src/components/EmptyState/assets/createComponent.svg b/packages/core-components/src/components/EmptyState/assets/createComponent.svg similarity index 100% rename from packages/components/src/components/EmptyState/assets/createComponent.svg rename to packages/core-components/src/components/EmptyState/assets/createComponent.svg diff --git a/packages/components/src/components/EmptyState/assets/missingAnnotation.svg b/packages/core-components/src/components/EmptyState/assets/missingAnnotation.svg similarity index 100% rename from packages/components/src/components/EmptyState/assets/missingAnnotation.svg rename to packages/core-components/src/components/EmptyState/assets/missingAnnotation.svg diff --git a/packages/components/src/components/EmptyState/assets/noBuild.svg b/packages/core-components/src/components/EmptyState/assets/noBuild.svg similarity index 100% rename from packages/components/src/components/EmptyState/assets/noBuild.svg rename to packages/core-components/src/components/EmptyState/assets/noBuild.svg diff --git a/packages/components/src/components/EmptyState/assets/noInformation.svg b/packages/core-components/src/components/EmptyState/assets/noInformation.svg similarity index 100% rename from packages/components/src/components/EmptyState/assets/noInformation.svg rename to packages/core-components/src/components/EmptyState/assets/noInformation.svg diff --git a/packages/components/src/components/EmptyState/index.ts b/packages/core-components/src/components/EmptyState/index.ts similarity index 100% rename from packages/components/src/components/EmptyState/index.ts rename to packages/core-components/src/components/EmptyState/index.ts diff --git a/packages/components/src/components/FeatureDiscovery/FeatureCalloutCircular.test.tsx b/packages/core-components/src/components/FeatureDiscovery/FeatureCalloutCircular.test.tsx similarity index 100% rename from packages/components/src/components/FeatureDiscovery/FeatureCalloutCircular.test.tsx rename to packages/core-components/src/components/FeatureDiscovery/FeatureCalloutCircular.test.tsx diff --git a/packages/components/src/components/FeatureDiscovery/FeatureCalloutCircular.tsx b/packages/core-components/src/components/FeatureDiscovery/FeatureCalloutCircular.tsx similarity index 100% rename from packages/components/src/components/FeatureDiscovery/FeatureCalloutCircular.tsx rename to packages/core-components/src/components/FeatureDiscovery/FeatureCalloutCircular.tsx diff --git a/packages/components/src/components/FeatureDiscovery/index.ts b/packages/core-components/src/components/FeatureDiscovery/index.ts similarity index 100% rename from packages/components/src/components/FeatureDiscovery/index.ts rename to packages/core-components/src/components/FeatureDiscovery/index.ts diff --git a/packages/components/src/components/FeatureDiscovery/lib/usePortal.ts b/packages/core-components/src/components/FeatureDiscovery/lib/usePortal.ts similarity index 100% rename from packages/components/src/components/FeatureDiscovery/lib/usePortal.ts rename to packages/core-components/src/components/FeatureDiscovery/lib/usePortal.ts diff --git a/packages/components/src/components/FeatureDiscovery/lib/useShowCallout.ts b/packages/core-components/src/components/FeatureDiscovery/lib/useShowCallout.ts similarity index 100% rename from packages/components/src/components/FeatureDiscovery/lib/useShowCallout.ts rename to packages/core-components/src/components/FeatureDiscovery/lib/useShowCallout.ts diff --git a/packages/components/src/components/HeaderIconLinkRow/HeaderIconLinkRow.tsx b/packages/core-components/src/components/HeaderIconLinkRow/HeaderIconLinkRow.tsx similarity index 100% rename from packages/components/src/components/HeaderIconLinkRow/HeaderIconLinkRow.tsx rename to packages/core-components/src/components/HeaderIconLinkRow/HeaderIconLinkRow.tsx diff --git a/packages/components/src/components/HeaderIconLinkRow/IconLinkVertical.tsx b/packages/core-components/src/components/HeaderIconLinkRow/IconLinkVertical.tsx similarity index 100% rename from packages/components/src/components/HeaderIconLinkRow/IconLinkVertical.tsx rename to packages/core-components/src/components/HeaderIconLinkRow/IconLinkVertical.tsx diff --git a/packages/components/src/components/HeaderIconLinkRow/index.ts b/packages/core-components/src/components/HeaderIconLinkRow/index.ts similarity index 100% rename from packages/components/src/components/HeaderIconLinkRow/index.ts rename to packages/core-components/src/components/HeaderIconLinkRow/index.ts diff --git a/packages/components/src/components/HorizontalScrollGrid/HorizontalScrollGrid.stories.tsx b/packages/core-components/src/components/HorizontalScrollGrid/HorizontalScrollGrid.stories.tsx similarity index 100% rename from packages/components/src/components/HorizontalScrollGrid/HorizontalScrollGrid.stories.tsx rename to packages/core-components/src/components/HorizontalScrollGrid/HorizontalScrollGrid.stories.tsx diff --git a/packages/components/src/components/HorizontalScrollGrid/HorizontalScrollGrid.test.tsx b/packages/core-components/src/components/HorizontalScrollGrid/HorizontalScrollGrid.test.tsx similarity index 100% rename from packages/components/src/components/HorizontalScrollGrid/HorizontalScrollGrid.test.tsx rename to packages/core-components/src/components/HorizontalScrollGrid/HorizontalScrollGrid.test.tsx diff --git a/packages/components/src/components/HorizontalScrollGrid/HorizontalScrollGrid.tsx b/packages/core-components/src/components/HorizontalScrollGrid/HorizontalScrollGrid.tsx similarity index 100% rename from packages/components/src/components/HorizontalScrollGrid/HorizontalScrollGrid.tsx rename to packages/core-components/src/components/HorizontalScrollGrid/HorizontalScrollGrid.tsx diff --git a/packages/components/src/components/HorizontalScrollGrid/index.tsx b/packages/core-components/src/components/HorizontalScrollGrid/index.tsx similarity index 100% rename from packages/components/src/components/HorizontalScrollGrid/index.tsx rename to packages/core-components/src/components/HorizontalScrollGrid/index.tsx diff --git a/packages/components/src/components/Lifecycle/Lifecycle.stories.tsx b/packages/core-components/src/components/Lifecycle/Lifecycle.stories.tsx similarity index 100% rename from packages/components/src/components/Lifecycle/Lifecycle.stories.tsx rename to packages/core-components/src/components/Lifecycle/Lifecycle.stories.tsx diff --git a/packages/components/src/components/Lifecycle/Lifecycle.test.tsx b/packages/core-components/src/components/Lifecycle/Lifecycle.test.tsx similarity index 100% rename from packages/components/src/components/Lifecycle/Lifecycle.test.tsx rename to packages/core-components/src/components/Lifecycle/Lifecycle.test.tsx diff --git a/packages/components/src/components/Lifecycle/Lifecycle.tsx b/packages/core-components/src/components/Lifecycle/Lifecycle.tsx similarity index 100% rename from packages/components/src/components/Lifecycle/Lifecycle.tsx rename to packages/core-components/src/components/Lifecycle/Lifecycle.tsx diff --git a/packages/components/src/components/Lifecycle/index.ts b/packages/core-components/src/components/Lifecycle/index.ts similarity index 100% rename from packages/components/src/components/Lifecycle/index.ts rename to packages/core-components/src/components/Lifecycle/index.ts diff --git a/packages/components/src/components/Link/Link.stories.tsx b/packages/core-components/src/components/Link/Link.stories.tsx similarity index 96% rename from packages/components/src/components/Link/Link.stories.tsx rename to packages/core-components/src/components/Link/Link.stories.tsx index 6776c78a92..f0883e0221 100644 --- a/packages/components/src/components/Link/Link.stories.tsx +++ b/packages/core-components/src/components/Link/Link.stories.tsx @@ -21,7 +21,10 @@ import { useLocation, NavLink as RouterNavLink, } from 'react-router-dom'; -import { createExternalRouteRef, useRouteRef } from '@backstage/plugin-api'; +import { + createExternalRouteRef, + useRouteRef, +} from '@backstage/core-plugin-api'; const routeRef = createExternalRouteRef({ id: 'storybook.test-route', diff --git a/packages/components/src/components/Link/Link.test.tsx b/packages/core-components/src/components/Link/Link.test.tsx similarity index 100% rename from packages/components/src/components/Link/Link.test.tsx rename to packages/core-components/src/components/Link/Link.test.tsx diff --git a/packages/components/src/components/Link/Link.tsx b/packages/core-components/src/components/Link/Link.tsx similarity index 100% rename from packages/components/src/components/Link/Link.tsx rename to packages/core-components/src/components/Link/Link.tsx diff --git a/packages/components/src/components/Link/index.ts b/packages/core-components/src/components/Link/index.ts similarity index 100% rename from packages/components/src/components/Link/index.ts rename to packages/core-components/src/components/Link/index.ts diff --git a/packages/components/src/components/MarkdownContent/MarkdownContent.stories.tsx b/packages/core-components/src/components/MarkdownContent/MarkdownContent.stories.tsx similarity index 100% rename from packages/components/src/components/MarkdownContent/MarkdownContent.stories.tsx rename to packages/core-components/src/components/MarkdownContent/MarkdownContent.stories.tsx diff --git a/packages/components/src/components/MarkdownContent/MarkdownContent.test.tsx b/packages/core-components/src/components/MarkdownContent/MarkdownContent.test.tsx similarity index 100% rename from packages/components/src/components/MarkdownContent/MarkdownContent.test.tsx rename to packages/core-components/src/components/MarkdownContent/MarkdownContent.test.tsx diff --git a/packages/components/src/components/MarkdownContent/MarkdownContent.tsx b/packages/core-components/src/components/MarkdownContent/MarkdownContent.tsx similarity index 100% rename from packages/components/src/components/MarkdownContent/MarkdownContent.tsx rename to packages/core-components/src/components/MarkdownContent/MarkdownContent.tsx diff --git a/packages/components/src/components/MarkdownContent/index.ts b/packages/core-components/src/components/MarkdownContent/index.ts similarity index 100% rename from packages/components/src/components/MarkdownContent/index.ts rename to packages/core-components/src/components/MarkdownContent/index.ts diff --git a/packages/components/src/components/OAuthRequestDialog/LoginRequestListItem.tsx b/packages/core-components/src/components/OAuthRequestDialog/LoginRequestListItem.tsx similarity index 96% rename from packages/components/src/components/OAuthRequestDialog/LoginRequestListItem.tsx rename to packages/core-components/src/components/OAuthRequestDialog/LoginRequestListItem.tsx index 5be431bbfb..cbb3705bd6 100644 --- a/packages/components/src/components/OAuthRequestDialog/LoginRequestListItem.tsx +++ b/packages/core-components/src/components/OAuthRequestDialog/LoginRequestListItem.tsx @@ -23,7 +23,7 @@ import { Theme, } from '@material-ui/core'; import React, { useState } from 'react'; -import { PendingAuthRequest } from '@backstage/plugin-api'; +import { PendingAuthRequest } from '@backstage/core-plugin-api'; const useItemStyles = makeStyles(theme => ({ root: { diff --git a/packages/components/src/components/OAuthRequestDialog/OAuthRequestDialog.tsx b/packages/core-components/src/components/OAuthRequestDialog/OAuthRequestDialog.tsx similarity index 96% rename from packages/components/src/components/OAuthRequestDialog/OAuthRequestDialog.tsx rename to packages/core-components/src/components/OAuthRequestDialog/OAuthRequestDialog.tsx index cc77d3ce79..0eb9ac49a9 100644 --- a/packages/components/src/components/OAuthRequestDialog/OAuthRequestDialog.tsx +++ b/packages/core-components/src/components/OAuthRequestDialog/OAuthRequestDialog.tsx @@ -27,7 +27,7 @@ import { import React, { useMemo, useState } from 'react'; import { useObservable } from 'react-use'; import LoginRequestListItem from './LoginRequestListItem'; -import { useApi, oauthRequestApiRef } from '@backstage/plugin-api'; +import { useApi, oauthRequestApiRef } from '@backstage/core-plugin-api'; const useStyles = makeStyles(theme => ({ dialog: { diff --git a/packages/components/src/components/OAuthRequestDialog/index.ts b/packages/core-components/src/components/OAuthRequestDialog/index.ts similarity index 100% rename from packages/components/src/components/OAuthRequestDialog/index.ts rename to packages/core-components/src/components/OAuthRequestDialog/index.ts diff --git a/packages/components/src/components/OverflowTooltip/OverflowTooltip.stories.tsx b/packages/core-components/src/components/OverflowTooltip/OverflowTooltip.stories.tsx similarity index 100% rename from packages/components/src/components/OverflowTooltip/OverflowTooltip.stories.tsx rename to packages/core-components/src/components/OverflowTooltip/OverflowTooltip.stories.tsx diff --git a/packages/components/src/components/OverflowTooltip/OverflowTooltip.test.tsx b/packages/core-components/src/components/OverflowTooltip/OverflowTooltip.test.tsx similarity index 100% rename from packages/components/src/components/OverflowTooltip/OverflowTooltip.test.tsx rename to packages/core-components/src/components/OverflowTooltip/OverflowTooltip.test.tsx diff --git a/packages/components/src/components/OverflowTooltip/OverflowTooltip.tsx b/packages/core-components/src/components/OverflowTooltip/OverflowTooltip.tsx similarity index 100% rename from packages/components/src/components/OverflowTooltip/OverflowTooltip.tsx rename to packages/core-components/src/components/OverflowTooltip/OverflowTooltip.tsx diff --git a/packages/components/src/components/OverflowTooltip/index.ts b/packages/core-components/src/components/OverflowTooltip/index.ts similarity index 100% rename from packages/components/src/components/OverflowTooltip/index.ts rename to packages/core-components/src/components/OverflowTooltip/index.ts diff --git a/packages/components/src/components/Progress/Progress.stories.tsx b/packages/core-components/src/components/Progress/Progress.stories.tsx similarity index 100% rename from packages/components/src/components/Progress/Progress.stories.tsx rename to packages/core-components/src/components/Progress/Progress.stories.tsx diff --git a/packages/components/src/components/Progress/Progress.test.tsx b/packages/core-components/src/components/Progress/Progress.test.tsx similarity index 100% rename from packages/components/src/components/Progress/Progress.test.tsx rename to packages/core-components/src/components/Progress/Progress.test.tsx diff --git a/packages/components/src/components/Progress/Progress.tsx b/packages/core-components/src/components/Progress/Progress.tsx similarity index 100% rename from packages/components/src/components/Progress/Progress.tsx rename to packages/core-components/src/components/Progress/Progress.tsx diff --git a/packages/components/src/components/Progress/index.ts b/packages/core-components/src/components/Progress/index.ts similarity index 100% rename from packages/components/src/components/Progress/index.ts rename to packages/core-components/src/components/Progress/index.ts diff --git a/packages/components/src/components/ProgressBars/Gauge.stories.tsx b/packages/core-components/src/components/ProgressBars/Gauge.stories.tsx similarity index 100% rename from packages/components/src/components/ProgressBars/Gauge.stories.tsx rename to packages/core-components/src/components/ProgressBars/Gauge.stories.tsx diff --git a/packages/components/src/components/ProgressBars/Gauge.test.tsx b/packages/core-components/src/components/ProgressBars/Gauge.test.tsx similarity index 100% rename from packages/components/src/components/ProgressBars/Gauge.test.tsx rename to packages/core-components/src/components/ProgressBars/Gauge.test.tsx diff --git a/packages/components/src/components/ProgressBars/Gauge.tsx b/packages/core-components/src/components/ProgressBars/Gauge.tsx similarity index 100% rename from packages/components/src/components/ProgressBars/Gauge.tsx rename to packages/core-components/src/components/ProgressBars/Gauge.tsx diff --git a/packages/components/src/components/ProgressBars/GaugeCard.stories.tsx b/packages/core-components/src/components/ProgressBars/GaugeCard.stories.tsx similarity index 100% rename from packages/components/src/components/ProgressBars/GaugeCard.stories.tsx rename to packages/core-components/src/components/ProgressBars/GaugeCard.stories.tsx diff --git a/packages/components/src/components/ProgressBars/GaugeCard.test.tsx b/packages/core-components/src/components/ProgressBars/GaugeCard.test.tsx similarity index 100% rename from packages/components/src/components/ProgressBars/GaugeCard.test.tsx rename to packages/core-components/src/components/ProgressBars/GaugeCard.test.tsx diff --git a/packages/components/src/components/ProgressBars/GaugeCard.tsx b/packages/core-components/src/components/ProgressBars/GaugeCard.tsx similarity index 100% rename from packages/components/src/components/ProgressBars/GaugeCard.tsx rename to packages/core-components/src/components/ProgressBars/GaugeCard.tsx diff --git a/packages/components/src/components/ProgressBars/LinearGauge.stories.tsx b/packages/core-components/src/components/ProgressBars/LinearGauge.stories.tsx similarity index 100% rename from packages/components/src/components/ProgressBars/LinearGauge.stories.tsx rename to packages/core-components/src/components/ProgressBars/LinearGauge.stories.tsx diff --git a/packages/components/src/components/ProgressBars/LinearGauge.test.tsx b/packages/core-components/src/components/ProgressBars/LinearGauge.test.tsx similarity index 100% rename from packages/components/src/components/ProgressBars/LinearGauge.test.tsx rename to packages/core-components/src/components/ProgressBars/LinearGauge.test.tsx diff --git a/packages/components/src/components/ProgressBars/LinearGauge.tsx b/packages/core-components/src/components/ProgressBars/LinearGauge.tsx similarity index 100% rename from packages/components/src/components/ProgressBars/LinearGauge.tsx rename to packages/core-components/src/components/ProgressBars/LinearGauge.tsx diff --git a/packages/components/src/components/ProgressBars/index.ts b/packages/core-components/src/components/ProgressBars/index.ts similarity index 100% rename from packages/components/src/components/ProgressBars/index.ts rename to packages/core-components/src/components/ProgressBars/index.ts diff --git a/packages/components/src/components/ResponseErrorPanel/ResponseErrorPanel.tsx b/packages/core-components/src/components/ResponseErrorPanel/ResponseErrorPanel.tsx similarity index 100% rename from packages/components/src/components/ResponseErrorPanel/ResponseErrorPanel.tsx rename to packages/core-components/src/components/ResponseErrorPanel/ResponseErrorPanel.tsx diff --git a/packages/components/src/components/ResponseErrorPanel/index.ts b/packages/core-components/src/components/ResponseErrorPanel/index.ts similarity index 100% rename from packages/components/src/components/ResponseErrorPanel/index.ts rename to packages/core-components/src/components/ResponseErrorPanel/index.ts diff --git a/packages/components/src/components/Select/Select.stories.tsx b/packages/core-components/src/components/Select/Select.stories.tsx similarity index 100% rename from packages/components/src/components/Select/Select.stories.tsx rename to packages/core-components/src/components/Select/Select.stories.tsx diff --git a/packages/components/src/components/Select/Select.test.tsx b/packages/core-components/src/components/Select/Select.test.tsx similarity index 100% rename from packages/components/src/components/Select/Select.test.tsx rename to packages/core-components/src/components/Select/Select.test.tsx diff --git a/packages/components/src/components/Select/Select.tsx b/packages/core-components/src/components/Select/Select.tsx similarity index 100% rename from packages/components/src/components/Select/Select.tsx rename to packages/core-components/src/components/Select/Select.tsx diff --git a/packages/components/src/components/Select/index.tsx b/packages/core-components/src/components/Select/index.tsx similarity index 100% rename from packages/components/src/components/Select/index.tsx rename to packages/core-components/src/components/Select/index.tsx diff --git a/packages/components/src/components/Select/static/ClosedDropdown.tsx b/packages/core-components/src/components/Select/static/ClosedDropdown.tsx similarity index 100% rename from packages/components/src/components/Select/static/ClosedDropdown.tsx rename to packages/core-components/src/components/Select/static/ClosedDropdown.tsx diff --git a/packages/components/src/components/Select/static/OpenedDropdown.tsx b/packages/core-components/src/components/Select/static/OpenedDropdown.tsx similarity index 100% rename from packages/components/src/components/Select/static/OpenedDropdown.tsx rename to packages/core-components/src/components/Select/static/OpenedDropdown.tsx diff --git a/packages/components/src/components/SimpleStepper/SimpleStepper.stories.tsx b/packages/core-components/src/components/SimpleStepper/SimpleStepper.stories.tsx similarity index 100% rename from packages/components/src/components/SimpleStepper/SimpleStepper.stories.tsx rename to packages/core-components/src/components/SimpleStepper/SimpleStepper.stories.tsx diff --git a/packages/components/src/components/SimpleStepper/SimpleStepper.test.tsx b/packages/core-components/src/components/SimpleStepper/SimpleStepper.test.tsx similarity index 100% rename from packages/components/src/components/SimpleStepper/SimpleStepper.test.tsx rename to packages/core-components/src/components/SimpleStepper/SimpleStepper.test.tsx diff --git a/packages/components/src/components/SimpleStepper/SimpleStepper.tsx b/packages/core-components/src/components/SimpleStepper/SimpleStepper.tsx similarity index 100% rename from packages/components/src/components/SimpleStepper/SimpleStepper.tsx rename to packages/core-components/src/components/SimpleStepper/SimpleStepper.tsx diff --git a/packages/components/src/components/SimpleStepper/SimpleStepperFooter.tsx b/packages/core-components/src/components/SimpleStepper/SimpleStepperFooter.tsx similarity index 100% rename from packages/components/src/components/SimpleStepper/SimpleStepperFooter.tsx rename to packages/core-components/src/components/SimpleStepper/SimpleStepperFooter.tsx diff --git a/packages/components/src/components/SimpleStepper/SimpleStepperStep.tsx b/packages/core-components/src/components/SimpleStepper/SimpleStepperStep.tsx similarity index 100% rename from packages/components/src/components/SimpleStepper/SimpleStepperStep.tsx rename to packages/core-components/src/components/SimpleStepper/SimpleStepperStep.tsx diff --git a/packages/components/src/components/SimpleStepper/index.ts b/packages/core-components/src/components/SimpleStepper/index.ts similarity index 100% rename from packages/components/src/components/SimpleStepper/index.ts rename to packages/core-components/src/components/SimpleStepper/index.ts diff --git a/packages/components/src/components/SimpleStepper/types.ts b/packages/core-components/src/components/SimpleStepper/types.ts similarity index 100% rename from packages/components/src/components/SimpleStepper/types.ts rename to packages/core-components/src/components/SimpleStepper/types.ts diff --git a/packages/components/src/components/Status/Status.stories.tsx b/packages/core-components/src/components/Status/Status.stories.tsx similarity index 100% rename from packages/components/src/components/Status/Status.stories.tsx rename to packages/core-components/src/components/Status/Status.stories.tsx diff --git a/packages/components/src/components/Status/Status.test.tsx b/packages/core-components/src/components/Status/Status.test.tsx similarity index 100% rename from packages/components/src/components/Status/Status.test.tsx rename to packages/core-components/src/components/Status/Status.test.tsx diff --git a/packages/components/src/components/Status/Status.tsx b/packages/core-components/src/components/Status/Status.tsx similarity index 100% rename from packages/components/src/components/Status/Status.tsx rename to packages/core-components/src/components/Status/Status.tsx diff --git a/packages/components/src/components/Status/index.ts b/packages/core-components/src/components/Status/index.ts similarity index 100% rename from packages/components/src/components/Status/index.ts rename to packages/core-components/src/components/Status/index.ts diff --git a/packages/components/src/components/StructuredMetadataTable/MetadataTable.tsx b/packages/core-components/src/components/StructuredMetadataTable/MetadataTable.tsx similarity index 100% rename from packages/components/src/components/StructuredMetadataTable/MetadataTable.tsx rename to packages/core-components/src/components/StructuredMetadataTable/MetadataTable.tsx diff --git a/packages/components/src/components/StructuredMetadataTable/README.md b/packages/core-components/src/components/StructuredMetadataTable/README.md similarity index 100% rename from packages/components/src/components/StructuredMetadataTable/README.md rename to packages/core-components/src/components/StructuredMetadataTable/README.md diff --git a/packages/components/src/components/StructuredMetadataTable/StructuredMetadataTable.stories.tsx b/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.stories.tsx similarity index 100% rename from packages/components/src/components/StructuredMetadataTable/StructuredMetadataTable.stories.tsx rename to packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.stories.tsx diff --git a/packages/components/src/components/StructuredMetadataTable/StructuredMetadataTable.test.tsx b/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.test.tsx similarity index 100% rename from packages/components/src/components/StructuredMetadataTable/StructuredMetadataTable.test.tsx rename to packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.test.tsx diff --git a/packages/components/src/components/StructuredMetadataTable/StructuredMetadataTable.tsx b/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.tsx similarity index 100% rename from packages/components/src/components/StructuredMetadataTable/StructuredMetadataTable.tsx rename to packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.tsx diff --git a/packages/components/src/components/StructuredMetadataTable/index.tsx b/packages/core-components/src/components/StructuredMetadataTable/index.tsx similarity index 100% rename from packages/components/src/components/StructuredMetadataTable/index.tsx rename to packages/core-components/src/components/StructuredMetadataTable/index.tsx diff --git a/packages/components/src/components/SupportButton/SupportButton.test.tsx b/packages/core-components/src/components/SupportButton/SupportButton.test.tsx similarity index 100% rename from packages/components/src/components/SupportButton/SupportButton.test.tsx rename to packages/core-components/src/components/SupportButton/SupportButton.test.tsx diff --git a/packages/components/src/components/SupportButton/SupportButton.tsx b/packages/core-components/src/components/SupportButton/SupportButton.tsx similarity index 98% rename from packages/components/src/components/SupportButton/SupportButton.tsx rename to packages/core-components/src/components/SupportButton/SupportButton.tsx index 923ec8cfc0..6c6de8abe3 100644 --- a/packages/components/src/components/SupportButton/SupportButton.tsx +++ b/packages/core-components/src/components/SupportButton/SupportButton.tsx @@ -14,7 +14,7 @@ * limitations under the License. */ -import { useApp } from '@backstage/plugin-api'; +import { useApp } from '@backstage/core-plugin-api'; import { HelpIcon } from '../../icons'; import { Box, diff --git a/packages/components/src/components/SupportButton/index.ts b/packages/core-components/src/components/SupportButton/index.ts similarity index 100% rename from packages/components/src/components/SupportButton/index.ts rename to packages/core-components/src/components/SupportButton/index.ts diff --git a/packages/components/src/components/TabbedLayout/RoutedTabs.test.tsx b/packages/core-components/src/components/TabbedLayout/RoutedTabs.test.tsx similarity index 100% rename from packages/components/src/components/TabbedLayout/RoutedTabs.test.tsx rename to packages/core-components/src/components/TabbedLayout/RoutedTabs.test.tsx diff --git a/packages/components/src/components/TabbedLayout/RoutedTabs.tsx b/packages/core-components/src/components/TabbedLayout/RoutedTabs.tsx similarity index 100% rename from packages/components/src/components/TabbedLayout/RoutedTabs.tsx rename to packages/core-components/src/components/TabbedLayout/RoutedTabs.tsx diff --git a/packages/components/src/components/TabbedLayout/TabbedLayout.stories.tsx b/packages/core-components/src/components/TabbedLayout/TabbedLayout.stories.tsx similarity index 100% rename from packages/components/src/components/TabbedLayout/TabbedLayout.stories.tsx rename to packages/core-components/src/components/TabbedLayout/TabbedLayout.stories.tsx diff --git a/packages/components/src/components/TabbedLayout/TabbedLayout.test.tsx b/packages/core-components/src/components/TabbedLayout/TabbedLayout.test.tsx similarity index 100% rename from packages/components/src/components/TabbedLayout/TabbedLayout.test.tsx rename to packages/core-components/src/components/TabbedLayout/TabbedLayout.test.tsx diff --git a/packages/components/src/components/TabbedLayout/TabbedLayout.tsx b/packages/core-components/src/components/TabbedLayout/TabbedLayout.tsx similarity index 97% rename from packages/components/src/components/TabbedLayout/TabbedLayout.tsx rename to packages/core-components/src/components/TabbedLayout/TabbedLayout.tsx index c68fc916ca..87f9473f15 100644 --- a/packages/components/src/components/TabbedLayout/TabbedLayout.tsx +++ b/packages/core-components/src/components/TabbedLayout/TabbedLayout.tsx @@ -14,7 +14,7 @@ * limitations under the License. */ -import { attachComponentData } from '@backstage/plugin-api'; +import { attachComponentData } from '@backstage/core-plugin-api'; import React, { Children, Fragment, diff --git a/packages/components/src/components/TabbedLayout/index.ts b/packages/core-components/src/components/TabbedLayout/index.ts similarity index 100% rename from packages/components/src/components/TabbedLayout/index.ts rename to packages/core-components/src/components/TabbedLayout/index.ts diff --git a/packages/components/src/components/TabbedLayout/types.ts b/packages/core-components/src/components/TabbedLayout/types.ts similarity index 100% rename from packages/components/src/components/TabbedLayout/types.ts rename to packages/core-components/src/components/TabbedLayout/types.ts diff --git a/packages/components/src/components/Table/Filters.tsx b/packages/core-components/src/components/Table/Filters.tsx similarity index 100% rename from packages/components/src/components/Table/Filters.tsx rename to packages/core-components/src/components/Table/Filters.tsx diff --git a/packages/components/src/components/Table/SubvalueCell.tsx b/packages/core-components/src/components/Table/SubvalueCell.tsx similarity index 100% rename from packages/components/src/components/Table/SubvalueCell.tsx rename to packages/core-components/src/components/Table/SubvalueCell.tsx diff --git a/packages/components/src/components/Table/Table.stories.tsx b/packages/core-components/src/components/Table/Table.stories.tsx similarity index 99% rename from packages/components/src/components/Table/Table.stories.tsx rename to packages/core-components/src/components/Table/Table.stories.tsx index 3e2f73b7cb..518114463d 100644 --- a/packages/components/src/components/Table/Table.stories.tsx +++ b/packages/core-components/src/components/Table/Table.stories.tsx @@ -17,7 +17,7 @@ import { makeStyles } from '@material-ui/core'; import React from 'react'; import { Link } from '../Link'; -import { SubvalueCell, Table, TableColumn } from './'; +import { SubvalueCell, Table, TableColumn } from '.'; import { TableFilter } from './Table'; export default { diff --git a/packages/components/src/components/Table/Table.test.tsx b/packages/core-components/src/components/Table/Table.test.tsx similarity index 100% rename from packages/components/src/components/Table/Table.test.tsx rename to packages/core-components/src/components/Table/Table.test.tsx diff --git a/packages/components/src/components/Table/Table.tsx b/packages/core-components/src/components/Table/Table.tsx similarity index 100% rename from packages/components/src/components/Table/Table.tsx rename to packages/core-components/src/components/Table/Table.tsx diff --git a/packages/components/src/components/Table/index.ts b/packages/core-components/src/components/Table/index.ts similarity index 100% rename from packages/components/src/components/Table/index.ts rename to packages/core-components/src/components/Table/index.ts diff --git a/packages/components/src/components/Tabs/Tab.test.tsx b/packages/core-components/src/components/Tabs/Tab.test.tsx similarity index 100% rename from packages/components/src/components/Tabs/Tab.test.tsx rename to packages/core-components/src/components/Tabs/Tab.test.tsx diff --git a/packages/components/src/components/Tabs/Tab.tsx b/packages/core-components/src/components/Tabs/Tab.tsx similarity index 100% rename from packages/components/src/components/Tabs/Tab.tsx rename to packages/core-components/src/components/Tabs/Tab.tsx diff --git a/packages/components/src/components/Tabs/TabBar.tsx b/packages/core-components/src/components/Tabs/TabBar.tsx similarity index 100% rename from packages/components/src/components/Tabs/TabBar.tsx rename to packages/core-components/src/components/Tabs/TabBar.tsx diff --git a/packages/components/src/components/Tabs/TabIcon.tsx b/packages/core-components/src/components/Tabs/TabIcon.tsx similarity index 100% rename from packages/components/src/components/Tabs/TabIcon.tsx rename to packages/core-components/src/components/Tabs/TabIcon.tsx diff --git a/packages/components/src/components/Tabs/TabPanel.tsx b/packages/core-components/src/components/Tabs/TabPanel.tsx similarity index 100% rename from packages/components/src/components/Tabs/TabPanel.tsx rename to packages/core-components/src/components/Tabs/TabPanel.tsx diff --git a/packages/components/src/components/Tabs/Tabs.stories.tsx b/packages/core-components/src/components/Tabs/Tabs.stories.tsx similarity index 100% rename from packages/components/src/components/Tabs/Tabs.stories.tsx rename to packages/core-components/src/components/Tabs/Tabs.stories.tsx diff --git a/packages/components/src/components/Tabs/Tabs.tsx b/packages/core-components/src/components/Tabs/Tabs.tsx similarity index 100% rename from packages/components/src/components/Tabs/Tabs.tsx rename to packages/core-components/src/components/Tabs/Tabs.tsx diff --git a/packages/components/src/components/Tabs/index.ts b/packages/core-components/src/components/Tabs/index.ts similarity index 100% rename from packages/components/src/components/Tabs/index.ts rename to packages/core-components/src/components/Tabs/index.ts diff --git a/packages/components/src/components/Tabs/utils.ts b/packages/core-components/src/components/Tabs/utils.ts similarity index 100% rename from packages/components/src/components/Tabs/utils.ts rename to packages/core-components/src/components/Tabs/utils.ts diff --git a/packages/components/src/components/TrendLine/TrendLine.stories.tsx b/packages/core-components/src/components/TrendLine/TrendLine.stories.tsx similarity index 100% rename from packages/components/src/components/TrendLine/TrendLine.stories.tsx rename to packages/core-components/src/components/TrendLine/TrendLine.stories.tsx diff --git a/packages/components/src/components/TrendLine/TrendLine.test.tsx b/packages/core-components/src/components/TrendLine/TrendLine.test.tsx similarity index 100% rename from packages/components/src/components/TrendLine/TrendLine.test.tsx rename to packages/core-components/src/components/TrendLine/TrendLine.test.tsx diff --git a/packages/components/src/components/TrendLine/TrendLine.tsx b/packages/core-components/src/components/TrendLine/TrendLine.tsx similarity index 100% rename from packages/components/src/components/TrendLine/TrendLine.tsx rename to packages/core-components/src/components/TrendLine/TrendLine.tsx diff --git a/packages/components/src/components/TrendLine/index.ts b/packages/core-components/src/components/TrendLine/index.ts similarity index 100% rename from packages/components/src/components/TrendLine/index.ts rename to packages/core-components/src/components/TrendLine/index.ts diff --git a/packages/components/src/components/WarningPanel/WarningPanel.stories.tsx b/packages/core-components/src/components/WarningPanel/WarningPanel.stories.tsx similarity index 100% rename from packages/components/src/components/WarningPanel/WarningPanel.stories.tsx rename to packages/core-components/src/components/WarningPanel/WarningPanel.stories.tsx diff --git a/packages/components/src/components/WarningPanel/WarningPanel.test.tsx b/packages/core-components/src/components/WarningPanel/WarningPanel.test.tsx similarity index 100% rename from packages/components/src/components/WarningPanel/WarningPanel.test.tsx rename to packages/core-components/src/components/WarningPanel/WarningPanel.test.tsx diff --git a/packages/components/src/components/WarningPanel/WarningPanel.tsx b/packages/core-components/src/components/WarningPanel/WarningPanel.tsx similarity index 100% rename from packages/components/src/components/WarningPanel/WarningPanel.tsx rename to packages/core-components/src/components/WarningPanel/WarningPanel.tsx diff --git a/packages/components/src/components/WarningPanel/index.ts b/packages/core-components/src/components/WarningPanel/index.ts similarity index 100% rename from packages/components/src/components/WarningPanel/index.ts rename to packages/core-components/src/components/WarningPanel/index.ts diff --git a/packages/components/src/components/index.ts b/packages/core-components/src/components/index.ts similarity index 100% rename from packages/components/src/components/index.ts rename to packages/core-components/src/components/index.ts diff --git a/packages/components/src/hooks/index.ts b/packages/core-components/src/hooks/index.ts similarity index 100% rename from packages/components/src/hooks/index.ts rename to packages/core-components/src/hooks/index.ts diff --git a/packages/components/src/hooks/useQueryParamState.ts b/packages/core-components/src/hooks/useQueryParamState.ts similarity index 100% rename from packages/components/src/hooks/useQueryParamState.ts rename to packages/core-components/src/hooks/useQueryParamState.ts diff --git a/packages/components/src/hooks/useSupportConfig.ts b/packages/core-components/src/hooks/useSupportConfig.ts similarity index 96% rename from packages/components/src/hooks/useSupportConfig.ts rename to packages/core-components/src/hooks/useSupportConfig.ts index cbe543e551..751d5a3b56 100644 --- a/packages/components/src/hooks/useSupportConfig.ts +++ b/packages/core-components/src/hooks/useSupportConfig.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { useApi, configApiRef } from '@backstage/plugin-api'; +import { useApi, configApiRef } from '@backstage/core-plugin-api'; export type SupportItemLink = { url: string; diff --git a/packages/components/src/icons/icons.tsx b/packages/core-components/src/icons/icons.tsx similarity index 95% rename from packages/components/src/icons/icons.tsx rename to packages/core-components/src/icons/icons.tsx index eea24a9b32..59cec61523 100644 --- a/packages/components/src/icons/icons.tsx +++ b/packages/core-components/src/icons/icons.tsx @@ -16,7 +16,7 @@ import MuiBrokenImageIcon from '@material-ui/icons/BrokenImage'; import React from 'react'; -import { useApp, IconComponent } from '@backstage/plugin-api'; +import { useApp, IconComponent } from '@backstage/core-plugin-api'; const overridableSystemIcon = (key: string): IconComponent => { const Component: IconComponent = props => { @@ -27,7 +27,7 @@ const overridableSystemIcon = (key: string): IconComponent => { return Component; }; -// Should match the list of overridable system icon keys in @backstage/app-api +// Should match the list of overridable system icon keys in @backstage/core-app-api export const BrokenImageIcon = overridableSystemIcon('brokenImage'); export const CatalogIcon = overridableSystemIcon('catalog'); export const ChatIcon = overridableSystemIcon('chat'); diff --git a/packages/components/src/icons/index.ts b/packages/core-components/src/icons/index.ts similarity index 100% rename from packages/components/src/icons/index.ts rename to packages/core-components/src/icons/index.ts diff --git a/packages/components/src/index.ts b/packages/core-components/src/index.ts similarity index 100% rename from packages/components/src/index.ts rename to packages/core-components/src/index.ts diff --git a/packages/components/src/layout/BottomLink/BottomLink.test.tsx b/packages/core-components/src/layout/BottomLink/BottomLink.test.tsx similarity index 100% rename from packages/components/src/layout/BottomLink/BottomLink.test.tsx rename to packages/core-components/src/layout/BottomLink/BottomLink.test.tsx diff --git a/packages/components/src/layout/BottomLink/BottomLink.tsx b/packages/core-components/src/layout/BottomLink/BottomLink.tsx similarity index 100% rename from packages/components/src/layout/BottomLink/BottomLink.tsx rename to packages/core-components/src/layout/BottomLink/BottomLink.tsx diff --git a/packages/components/src/layout/BottomLink/index.ts b/packages/core-components/src/layout/BottomLink/index.ts similarity index 100% rename from packages/components/src/layout/BottomLink/index.ts rename to packages/core-components/src/layout/BottomLink/index.ts diff --git a/packages/components/src/layout/Breadcrumbs/Breadcrumbs.stories.tsx b/packages/core-components/src/layout/Breadcrumbs/Breadcrumbs.stories.tsx similarity index 100% rename from packages/components/src/layout/Breadcrumbs/Breadcrumbs.stories.tsx rename to packages/core-components/src/layout/Breadcrumbs/Breadcrumbs.stories.tsx diff --git a/packages/components/src/layout/Breadcrumbs/Breadcrumbs.test.tsx b/packages/core-components/src/layout/Breadcrumbs/Breadcrumbs.test.tsx similarity index 100% rename from packages/components/src/layout/Breadcrumbs/Breadcrumbs.test.tsx rename to packages/core-components/src/layout/Breadcrumbs/Breadcrumbs.test.tsx diff --git a/packages/components/src/layout/Breadcrumbs/Breadcrumbs.tsx b/packages/core-components/src/layout/Breadcrumbs/Breadcrumbs.tsx similarity index 100% rename from packages/components/src/layout/Breadcrumbs/Breadcrumbs.tsx rename to packages/core-components/src/layout/Breadcrumbs/Breadcrumbs.tsx diff --git a/packages/components/src/layout/Breadcrumbs/index.ts b/packages/core-components/src/layout/Breadcrumbs/index.ts similarity index 100% rename from packages/components/src/layout/Breadcrumbs/index.ts rename to packages/core-components/src/layout/Breadcrumbs/index.ts diff --git a/packages/components/src/layout/Content/Content.tsx b/packages/core-components/src/layout/Content/Content.tsx similarity index 100% rename from packages/components/src/layout/Content/Content.tsx rename to packages/core-components/src/layout/Content/Content.tsx diff --git a/packages/components/src/layout/Content/index.ts b/packages/core-components/src/layout/Content/index.ts similarity index 100% rename from packages/components/src/layout/Content/index.ts rename to packages/core-components/src/layout/Content/index.ts diff --git a/packages/components/src/layout/ContentHeader/ContentHeader.test.tsx b/packages/core-components/src/layout/ContentHeader/ContentHeader.test.tsx similarity index 100% rename from packages/components/src/layout/ContentHeader/ContentHeader.test.tsx rename to packages/core-components/src/layout/ContentHeader/ContentHeader.test.tsx diff --git a/packages/components/src/layout/ContentHeader/ContentHeader.tsx b/packages/core-components/src/layout/ContentHeader/ContentHeader.tsx similarity index 100% rename from packages/components/src/layout/ContentHeader/ContentHeader.tsx rename to packages/core-components/src/layout/ContentHeader/ContentHeader.tsx diff --git a/packages/components/src/layout/ContentHeader/index.ts b/packages/core-components/src/layout/ContentHeader/index.ts similarity index 100% rename from packages/components/src/layout/ContentHeader/index.ts rename to packages/core-components/src/layout/ContentHeader/index.ts diff --git a/packages/components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx b/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx similarity index 100% rename from packages/components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx rename to packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx diff --git a/packages/components/src/layout/ErrorBoundary/ErrorBoundary.tsx b/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.tsx similarity index 100% rename from packages/components/src/layout/ErrorBoundary/ErrorBoundary.tsx rename to packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.tsx diff --git a/packages/components/src/layout/ErrorBoundary/index.ts b/packages/core-components/src/layout/ErrorBoundary/index.ts similarity index 100% rename from packages/components/src/layout/ErrorBoundary/index.ts rename to packages/core-components/src/layout/ErrorBoundary/index.ts diff --git a/packages/components/src/layout/ErrorPage/ErrorPage.test.tsx b/packages/core-components/src/layout/ErrorPage/ErrorPage.test.tsx similarity index 100% rename from packages/components/src/layout/ErrorPage/ErrorPage.test.tsx rename to packages/core-components/src/layout/ErrorPage/ErrorPage.test.tsx diff --git a/packages/components/src/layout/ErrorPage/ErrorPage.tsx b/packages/core-components/src/layout/ErrorPage/ErrorPage.tsx similarity index 100% rename from packages/components/src/layout/ErrorPage/ErrorPage.tsx rename to packages/core-components/src/layout/ErrorPage/ErrorPage.tsx diff --git a/packages/components/src/layout/ErrorPage/MicDrop.tsx b/packages/core-components/src/layout/ErrorPage/MicDrop.tsx similarity index 100% rename from packages/components/src/layout/ErrorPage/MicDrop.tsx rename to packages/core-components/src/layout/ErrorPage/MicDrop.tsx diff --git a/packages/components/src/layout/ErrorPage/index.ts b/packages/core-components/src/layout/ErrorPage/index.ts similarity index 100% rename from packages/components/src/layout/ErrorPage/index.ts rename to packages/core-components/src/layout/ErrorPage/index.ts diff --git a/packages/components/src/layout/ErrorPage/mic-drop.svg b/packages/core-components/src/layout/ErrorPage/mic-drop.svg similarity index 100% rename from packages/components/src/layout/ErrorPage/mic-drop.svg rename to packages/core-components/src/layout/ErrorPage/mic-drop.svg diff --git a/packages/components/src/layout/Header/Header.stories.tsx b/packages/core-components/src/layout/Header/Header.stories.tsx similarity index 100% rename from packages/components/src/layout/Header/Header.stories.tsx rename to packages/core-components/src/layout/Header/Header.stories.tsx diff --git a/packages/components/src/layout/Header/Header.test.tsx b/packages/core-components/src/layout/Header/Header.test.tsx similarity index 100% rename from packages/components/src/layout/Header/Header.test.tsx rename to packages/core-components/src/layout/Header/Header.test.tsx diff --git a/packages/components/src/layout/Header/Header.tsx b/packages/core-components/src/layout/Header/Header.tsx similarity index 100% rename from packages/components/src/layout/Header/Header.tsx rename to packages/core-components/src/layout/Header/Header.tsx diff --git a/packages/components/src/layout/Header/index.ts b/packages/core-components/src/layout/Header/index.ts similarity index 100% rename from packages/components/src/layout/Header/index.ts rename to packages/core-components/src/layout/Header/index.ts diff --git a/packages/components/src/layout/HeaderActionMenu/HeaderActionMenu.test.tsx b/packages/core-components/src/layout/HeaderActionMenu/HeaderActionMenu.test.tsx similarity index 100% rename from packages/components/src/layout/HeaderActionMenu/HeaderActionMenu.test.tsx rename to packages/core-components/src/layout/HeaderActionMenu/HeaderActionMenu.test.tsx diff --git a/packages/components/src/layout/HeaderActionMenu/HeaderActionMenu.tsx b/packages/core-components/src/layout/HeaderActionMenu/HeaderActionMenu.tsx similarity index 100% rename from packages/components/src/layout/HeaderActionMenu/HeaderActionMenu.tsx rename to packages/core-components/src/layout/HeaderActionMenu/HeaderActionMenu.tsx diff --git a/packages/components/src/layout/HeaderActionMenu/VerticalMenuIcon.tsx b/packages/core-components/src/layout/HeaderActionMenu/VerticalMenuIcon.tsx similarity index 100% rename from packages/components/src/layout/HeaderActionMenu/VerticalMenuIcon.tsx rename to packages/core-components/src/layout/HeaderActionMenu/VerticalMenuIcon.tsx diff --git a/packages/components/src/layout/HeaderActionMenu/index.ts b/packages/core-components/src/layout/HeaderActionMenu/index.ts similarity index 100% rename from packages/components/src/layout/HeaderActionMenu/index.ts rename to packages/core-components/src/layout/HeaderActionMenu/index.ts diff --git a/packages/components/src/layout/HeaderLabel/HeaderLabel.test.tsx b/packages/core-components/src/layout/HeaderLabel/HeaderLabel.test.tsx similarity index 100% rename from packages/components/src/layout/HeaderLabel/HeaderLabel.test.tsx rename to packages/core-components/src/layout/HeaderLabel/HeaderLabel.test.tsx diff --git a/packages/components/src/layout/HeaderLabel/HeaderLabel.tsx b/packages/core-components/src/layout/HeaderLabel/HeaderLabel.tsx similarity index 100% rename from packages/components/src/layout/HeaderLabel/HeaderLabel.tsx rename to packages/core-components/src/layout/HeaderLabel/HeaderLabel.tsx diff --git a/packages/components/src/layout/HeaderLabel/index.ts b/packages/core-components/src/layout/HeaderLabel/index.ts similarity index 100% rename from packages/components/src/layout/HeaderLabel/index.ts rename to packages/core-components/src/layout/HeaderLabel/index.ts diff --git a/packages/components/src/layout/HeaderTabs/HeaderTabs.test.tsx b/packages/core-components/src/layout/HeaderTabs/HeaderTabs.test.tsx similarity index 98% rename from packages/components/src/layout/HeaderTabs/HeaderTabs.test.tsx rename to packages/core-components/src/layout/HeaderTabs/HeaderTabs.test.tsx index 9a5093f6e9..763dc3ceee 100644 --- a/packages/components/src/layout/HeaderTabs/HeaderTabs.test.tsx +++ b/packages/core-components/src/layout/HeaderTabs/HeaderTabs.test.tsx @@ -16,7 +16,7 @@ import React from 'react'; import { renderInTestApp } from '@backstage/test-utils'; -import { HeaderTabs } from './'; +import { HeaderTabs } from '.'; import { Badge, makeStyles } from '@material-ui/core'; const mockTabs = [ diff --git a/packages/components/src/layout/HeaderTabs/HeaderTabs.tsx b/packages/core-components/src/layout/HeaderTabs/HeaderTabs.tsx similarity index 100% rename from packages/components/src/layout/HeaderTabs/HeaderTabs.tsx rename to packages/core-components/src/layout/HeaderTabs/HeaderTabs.tsx diff --git a/packages/components/src/layout/HeaderTabs/index.tsx b/packages/core-components/src/layout/HeaderTabs/index.tsx similarity index 100% rename from packages/components/src/layout/HeaderTabs/index.tsx rename to packages/core-components/src/layout/HeaderTabs/index.tsx diff --git a/packages/components/src/layout/HomepageTimer/HomepageTimer.test.tsx b/packages/core-components/src/layout/HomepageTimer/HomepageTimer.test.tsx similarity index 89% rename from packages/components/src/layout/HomepageTimer/HomepageTimer.test.tsx rename to packages/core-components/src/layout/HomepageTimer/HomepageTimer.test.tsx index b6e199227d..e3ca55667c 100644 --- a/packages/components/src/layout/HomepageTimer/HomepageTimer.test.tsx +++ b/packages/core-components/src/layout/HomepageTimer/HomepageTimer.test.tsx @@ -19,8 +19,12 @@ import { HomepageTimer } from './HomepageTimer'; import React from 'react'; import { lightTheme } from '@backstage/theme'; import { ThemeProvider } from '@material-ui/core'; -import { ApiProvider, ApiRegistry, ConfigReader } from '@backstage/app-api'; -import { ConfigApi, configApiRef } from '@backstage/plugin-api'; +import { + ApiProvider, + ApiRegistry, + ConfigReader, +} from '@backstage/core-app-api'; +import { ConfigApi, configApiRef } from '@backstage/core-plugin-api'; it('changes default timezone to GMT', async () => { const configApi: ConfigApi = new ConfigReader({ diff --git a/packages/components/src/layout/HomepageTimer/HomepageTimer.tsx b/packages/core-components/src/layout/HomepageTimer/HomepageTimer.tsx similarity index 96% rename from packages/components/src/layout/HomepageTimer/HomepageTimer.tsx rename to packages/core-components/src/layout/HomepageTimer/HomepageTimer.tsx index a9ba95898c..d93d178486 100644 --- a/packages/components/src/layout/HomepageTimer/HomepageTimer.tsx +++ b/packages/core-components/src/layout/HomepageTimer/HomepageTimer.tsx @@ -16,7 +16,7 @@ import React from 'react'; import { HeaderLabel } from '../HeaderLabel'; -import { ConfigApi, useApi, configApiRef } from '@backstage/plugin-api'; +import { ConfigApi, useApi, configApiRef } from '@backstage/core-plugin-api'; const timeFormat: Intl.DateTimeFormatOptions = { hour: '2-digit', diff --git a/packages/components/src/layout/HomepageTimer/index.ts b/packages/core-components/src/layout/HomepageTimer/index.ts similarity index 100% rename from packages/components/src/layout/HomepageTimer/index.ts rename to packages/core-components/src/layout/HomepageTimer/index.ts diff --git a/packages/components/src/layout/InfoCard/InfoCard.stories.tsx b/packages/core-components/src/layout/InfoCard/InfoCard.stories.tsx similarity index 100% rename from packages/components/src/layout/InfoCard/InfoCard.stories.tsx rename to packages/core-components/src/layout/InfoCard/InfoCard.stories.tsx diff --git a/packages/components/src/layout/InfoCard/InfoCard.test.tsx b/packages/core-components/src/layout/InfoCard/InfoCard.test.tsx similarity index 100% rename from packages/components/src/layout/InfoCard/InfoCard.test.tsx rename to packages/core-components/src/layout/InfoCard/InfoCard.test.tsx diff --git a/packages/components/src/layout/InfoCard/InfoCard.tsx b/packages/core-components/src/layout/InfoCard/InfoCard.tsx similarity index 100% rename from packages/components/src/layout/InfoCard/InfoCard.tsx rename to packages/core-components/src/layout/InfoCard/InfoCard.tsx diff --git a/packages/components/src/layout/InfoCard/index.ts b/packages/core-components/src/layout/InfoCard/index.ts similarity index 100% rename from packages/components/src/layout/InfoCard/index.ts rename to packages/core-components/src/layout/InfoCard/index.ts diff --git a/packages/components/src/layout/ItemCard/ItemCard.stories.tsx b/packages/core-components/src/layout/ItemCard/ItemCard.stories.tsx similarity index 100% rename from packages/components/src/layout/ItemCard/ItemCard.stories.tsx rename to packages/core-components/src/layout/ItemCard/ItemCard.stories.tsx diff --git a/packages/components/src/layout/ItemCard/ItemCard.test.tsx b/packages/core-components/src/layout/ItemCard/ItemCard.test.tsx similarity index 100% rename from packages/components/src/layout/ItemCard/ItemCard.test.tsx rename to packages/core-components/src/layout/ItemCard/ItemCard.test.tsx diff --git a/packages/components/src/layout/ItemCard/ItemCard.tsx b/packages/core-components/src/layout/ItemCard/ItemCard.tsx similarity index 100% rename from packages/components/src/layout/ItemCard/ItemCard.tsx rename to packages/core-components/src/layout/ItemCard/ItemCard.tsx diff --git a/packages/components/src/layout/ItemCard/ItemCardGrid.test.tsx b/packages/core-components/src/layout/ItemCard/ItemCardGrid.test.tsx similarity index 100% rename from packages/components/src/layout/ItemCard/ItemCardGrid.test.tsx rename to packages/core-components/src/layout/ItemCard/ItemCardGrid.test.tsx diff --git a/packages/components/src/layout/ItemCard/ItemCardGrid.tsx b/packages/core-components/src/layout/ItemCard/ItemCardGrid.tsx similarity index 100% rename from packages/components/src/layout/ItemCard/ItemCardGrid.tsx rename to packages/core-components/src/layout/ItemCard/ItemCardGrid.tsx diff --git a/packages/components/src/layout/ItemCard/ItemCardHeader.test.tsx b/packages/core-components/src/layout/ItemCard/ItemCardHeader.test.tsx similarity index 100% rename from packages/components/src/layout/ItemCard/ItemCardHeader.test.tsx rename to packages/core-components/src/layout/ItemCard/ItemCardHeader.test.tsx diff --git a/packages/components/src/layout/ItemCard/ItemCardHeader.tsx b/packages/core-components/src/layout/ItemCard/ItemCardHeader.tsx similarity index 100% rename from packages/components/src/layout/ItemCard/ItemCardHeader.tsx rename to packages/core-components/src/layout/ItemCard/ItemCardHeader.tsx diff --git a/packages/components/src/layout/ItemCard/index.ts b/packages/core-components/src/layout/ItemCard/index.ts similarity index 100% rename from packages/components/src/layout/ItemCard/index.ts rename to packages/core-components/src/layout/ItemCard/index.ts diff --git a/packages/components/src/layout/Page/Page.stories.tsx b/packages/core-components/src/layout/Page/Page.stories.tsx similarity index 99% rename from packages/components/src/layout/Page/Page.stories.tsx rename to packages/core-components/src/layout/Page/Page.stories.tsx index c34f2e6eeb..001c0ba853 100644 --- a/packages/components/src/layout/Page/Page.stories.tsx +++ b/packages/core-components/src/layout/Page/Page.stories.tsx @@ -17,7 +17,7 @@ import { Box, Chip, Grid, Link, Typography } from '@material-ui/core'; import React, { useState } from 'react'; import { MemoryRouter } from 'react-router'; -import { createApp } from '@backstage/app-api'; +import { createApp } from '@backstage/core-app-api'; import { Content, ContentHeader, @@ -26,7 +26,7 @@ import { HeaderTabs, InfoCard, Page, -} from '../'; +} from '..'; import { GaugeCard, StatusOK, diff --git a/packages/components/src/layout/Page/Page.tsx b/packages/core-components/src/layout/Page/Page.tsx similarity index 100% rename from packages/components/src/layout/Page/Page.tsx rename to packages/core-components/src/layout/Page/Page.tsx diff --git a/packages/components/src/layout/Page/index.ts b/packages/core-components/src/layout/Page/index.ts similarity index 100% rename from packages/components/src/layout/Page/index.ts rename to packages/core-components/src/layout/Page/index.ts diff --git a/packages/components/src/layout/Sidebar/Bar.tsx b/packages/core-components/src/layout/Sidebar/Bar.tsx similarity index 100% rename from packages/components/src/layout/Sidebar/Bar.tsx rename to packages/core-components/src/layout/Sidebar/Bar.tsx diff --git a/packages/components/src/layout/Sidebar/Intro.tsx b/packages/core-components/src/layout/Sidebar/Intro.tsx similarity index 100% rename from packages/components/src/layout/Sidebar/Intro.tsx rename to packages/core-components/src/layout/Sidebar/Intro.tsx diff --git a/packages/components/src/layout/Sidebar/Items.test.tsx b/packages/core-components/src/layout/Sidebar/Items.test.tsx similarity index 100% rename from packages/components/src/layout/Sidebar/Items.test.tsx rename to packages/core-components/src/layout/Sidebar/Items.test.tsx diff --git a/packages/components/src/layout/Sidebar/Items.tsx b/packages/core-components/src/layout/Sidebar/Items.tsx similarity index 99% rename from packages/components/src/layout/Sidebar/Items.tsx rename to packages/core-components/src/layout/Sidebar/Items.tsx index 1a43a5bb76..f839db56de 100644 --- a/packages/components/src/layout/Sidebar/Items.tsx +++ b/packages/core-components/src/layout/Sidebar/Items.tsx @@ -14,7 +14,7 @@ * limitations under the License. */ -import { IconComponent } from '@backstage/plugin-api'; +import { IconComponent } from '@backstage/core-plugin-api'; import { BackstageTheme } from '@backstage/theme'; import { Badge, diff --git a/packages/components/src/layout/Sidebar/Page.tsx b/packages/core-components/src/layout/Sidebar/Page.tsx similarity index 100% rename from packages/components/src/layout/Sidebar/Page.tsx rename to packages/core-components/src/layout/Sidebar/Page.tsx diff --git a/packages/components/src/layout/Sidebar/Sidebar.stories.tsx b/packages/core-components/src/layout/Sidebar/Sidebar.stories.tsx similarity index 98% rename from packages/components/src/layout/Sidebar/Sidebar.stories.tsx rename to packages/core-components/src/layout/Sidebar/Sidebar.stories.tsx index 1af1320822..d4f1a7a96e 100644 --- a/packages/components/src/layout/Sidebar/Sidebar.stories.tsx +++ b/packages/core-components/src/layout/Sidebar/Sidebar.stories.tsx @@ -25,7 +25,7 @@ import { SidebarItem, SidebarSearchField, SidebarSpace, -} from '../Sidebar'; +} from '.'; export default { title: 'Layout/Sidebar', diff --git a/packages/components/src/layout/Sidebar/config.ts b/packages/core-components/src/layout/Sidebar/config.ts similarity index 100% rename from packages/components/src/layout/Sidebar/config.ts rename to packages/core-components/src/layout/Sidebar/config.ts diff --git a/packages/components/src/layout/Sidebar/index.ts b/packages/core-components/src/layout/Sidebar/index.ts similarity index 100% rename from packages/components/src/layout/Sidebar/index.ts rename to packages/core-components/src/layout/Sidebar/index.ts diff --git a/packages/components/src/layout/Sidebar/localStorage.test.ts b/packages/core-components/src/layout/Sidebar/localStorage.test.ts similarity index 100% rename from packages/components/src/layout/Sidebar/localStorage.test.ts rename to packages/core-components/src/layout/Sidebar/localStorage.test.ts diff --git a/packages/components/src/layout/Sidebar/localStorage.ts b/packages/core-components/src/layout/Sidebar/localStorage.ts similarity index 100% rename from packages/components/src/layout/Sidebar/localStorage.ts rename to packages/core-components/src/layout/Sidebar/localStorage.ts diff --git a/packages/components/src/layout/SignInPage/SignInPage.tsx b/packages/core-components/src/layout/SignInPage/SignInPage.tsx similarity index 98% rename from packages/components/src/layout/SignInPage/SignInPage.tsx rename to packages/core-components/src/layout/SignInPage/SignInPage.tsx index 2cc61f2e5a..3aec8997aa 100644 --- a/packages/components/src/layout/SignInPage/SignInPage.tsx +++ b/packages/core-components/src/layout/SignInPage/SignInPage.tsx @@ -14,7 +14,11 @@ * limitations under the License. */ -import { configApiRef, SignInPageProps, useApi } from '@backstage/plugin-api'; +import { + configApiRef, + SignInPageProps, + useApi, +} from '@backstage/core-plugin-api'; import { Button, Grid, Typography } from '@material-ui/core'; import React, { useEffect, useState } from 'react'; import { Progress } from '../../components/Progress'; diff --git a/packages/components/src/layout/SignInPage/auth0Provider.tsx b/packages/core-components/src/layout/SignInPage/auth0Provider.tsx similarity index 96% rename from packages/components/src/layout/SignInPage/auth0Provider.tsx rename to packages/core-components/src/layout/SignInPage/auth0Provider.tsx index 33c833b151..c0c0ba8e09 100644 --- a/packages/components/src/layout/SignInPage/auth0Provider.tsx +++ b/packages/core-components/src/layout/SignInPage/auth0Provider.tsx @@ -18,7 +18,11 @@ import React from 'react'; import { Grid, Typography, Button } from '@material-ui/core'; import { InfoCard } from '../InfoCard/InfoCard'; import { ProviderComponent, ProviderLoader, SignInProvider } from './types'; -import { useApi, auth0AuthApiRef, errorApiRef } from '@backstage/plugin-api'; +import { + useApi, + auth0AuthApiRef, + errorApiRef, +} from '@backstage/core-plugin-api'; const Component: ProviderComponent = ({ onResult }) => { const auth0AuthApi = useApi(auth0AuthApiRef); diff --git a/packages/components/src/layout/SignInPage/commonProvider.tsx b/packages/core-components/src/layout/SignInPage/commonProvider.tsx similarity index 97% rename from packages/components/src/layout/SignInPage/commonProvider.tsx rename to packages/core-components/src/layout/SignInPage/commonProvider.tsx index df9980274e..389d8caa98 100644 --- a/packages/components/src/layout/SignInPage/commonProvider.tsx +++ b/packages/core-components/src/layout/SignInPage/commonProvider.tsx @@ -23,7 +23,7 @@ import { SignInProvider, SignInProviderConfig, } from './types'; -import { useApi, errorApiRef } from '@backstage/plugin-api'; +import { useApi, errorApiRef } from '@backstage/core-plugin-api'; import { GridItem } from './styles'; const Component: ProviderComponent = ({ config, onResult }) => { diff --git a/packages/components/src/layout/SignInPage/customProvider.tsx b/packages/core-components/src/layout/SignInPage/customProvider.tsx similarity index 100% rename from packages/components/src/layout/SignInPage/customProvider.tsx rename to packages/core-components/src/layout/SignInPage/customProvider.tsx diff --git a/packages/components/src/layout/SignInPage/guestProvider.tsx b/packages/core-components/src/layout/SignInPage/guestProvider.tsx similarity index 100% rename from packages/components/src/layout/SignInPage/guestProvider.tsx rename to packages/core-components/src/layout/SignInPage/guestProvider.tsx diff --git a/packages/components/src/layout/SignInPage/index.ts b/packages/core-components/src/layout/SignInPage/index.ts similarity index 100% rename from packages/components/src/layout/SignInPage/index.ts rename to packages/core-components/src/layout/SignInPage/index.ts diff --git a/packages/components/src/layout/SignInPage/providers.tsx b/packages/core-components/src/layout/SignInPage/providers.tsx similarity index 99% rename from packages/components/src/layout/SignInPage/providers.tsx rename to packages/core-components/src/layout/SignInPage/providers.tsx index 21c1cfcf99..ab9daf373b 100644 --- a/packages/components/src/layout/SignInPage/providers.tsx +++ b/packages/core-components/src/layout/SignInPage/providers.tsx @@ -21,7 +21,7 @@ import { useApi, useApiHolder, errorApiRef, -} from '@backstage/plugin-api'; +} from '@backstage/core-plugin-api'; import { IdentityProviders, SignInProvider, diff --git a/packages/components/src/layout/SignInPage/styles.tsx b/packages/core-components/src/layout/SignInPage/styles.tsx similarity index 100% rename from packages/components/src/layout/SignInPage/styles.tsx rename to packages/core-components/src/layout/SignInPage/styles.tsx diff --git a/packages/components/src/layout/SignInPage/types.ts b/packages/core-components/src/layout/SignInPage/types.ts similarity index 97% rename from packages/components/src/layout/SignInPage/types.ts rename to packages/core-components/src/layout/SignInPage/types.ts index d4c88cfe37..54385d05a3 100644 --- a/packages/components/src/layout/SignInPage/types.ts +++ b/packages/core-components/src/layout/SignInPage/types.ts @@ -23,7 +23,7 @@ import { ProfileInfoApi, BackstageIdentityApi, SessionApi, -} from '@backstage/plugin-api'; +} from '@backstage/core-plugin-api'; export type SignInProviderConfig = { id: string; diff --git a/packages/components/src/layout/TabbedCard/TabbedCard.stories.tsx b/packages/core-components/src/layout/TabbedCard/TabbedCard.stories.tsx similarity index 100% rename from packages/components/src/layout/TabbedCard/TabbedCard.stories.tsx rename to packages/core-components/src/layout/TabbedCard/TabbedCard.stories.tsx diff --git a/packages/components/src/layout/TabbedCard/TabbedCard.test.tsx b/packages/core-components/src/layout/TabbedCard/TabbedCard.test.tsx similarity index 100% rename from packages/components/src/layout/TabbedCard/TabbedCard.test.tsx rename to packages/core-components/src/layout/TabbedCard/TabbedCard.test.tsx diff --git a/packages/components/src/layout/TabbedCard/TabbedCard.tsx b/packages/core-components/src/layout/TabbedCard/TabbedCard.tsx similarity index 100% rename from packages/components/src/layout/TabbedCard/TabbedCard.tsx rename to packages/core-components/src/layout/TabbedCard/TabbedCard.tsx diff --git a/packages/components/src/layout/TabbedCard/index.ts b/packages/core-components/src/layout/TabbedCard/index.ts similarity index 100% rename from packages/components/src/layout/TabbedCard/index.ts rename to packages/core-components/src/layout/TabbedCard/index.ts diff --git a/packages/components/src/layout/index.ts b/packages/core-components/src/layout/index.ts similarity index 100% rename from packages/components/src/layout/index.ts rename to packages/core-components/src/layout/index.ts diff --git a/packages/components/src/setupTests.ts b/packages/core-components/src/setupTests.ts similarity index 100% rename from packages/components/src/setupTests.ts rename to packages/core-components/src/setupTests.ts diff --git a/packages/plugin-api/.eslintrc.js b/packages/core-plugin-api/.eslintrc.js similarity index 100% rename from packages/plugin-api/.eslintrc.js rename to packages/core-plugin-api/.eslintrc.js diff --git a/packages/plugin-api/CHANGELOG.md b/packages/core-plugin-api/CHANGELOG.md similarity index 100% rename from packages/plugin-api/CHANGELOG.md rename to packages/core-plugin-api/CHANGELOG.md diff --git a/packages/plugin-api/README.md b/packages/core-plugin-api/README.md similarity index 100% rename from packages/plugin-api/README.md rename to packages/core-plugin-api/README.md diff --git a/packages/plugin-api/package.json b/packages/core-plugin-api/package.json similarity index 94% rename from packages/plugin-api/package.json rename to packages/core-plugin-api/package.json index c81a56e29b..bb6dfdc4bd 100644 --- a/packages/plugin-api/package.json +++ b/packages/core-plugin-api/package.json @@ -1,5 +1,5 @@ { - "name": "@backstage/plugin-api", + "name": "@backstage/core-plugin-api", "description": "Core API used by Backstage plugins", "version": "0.1.0", "private": false, @@ -12,7 +12,7 @@ "repository": { "type": "git", "url": "https://github.com/backstage/backstage", - "directory": "packages/plugin-api" + "directory": "packages/core-plugin-api" }, "keywords": [ "backstage" diff --git a/packages/plugin-api/src/apis/definitions/AlertApi.ts b/packages/core-plugin-api/src/apis/definitions/AlertApi.ts similarity index 100% rename from packages/plugin-api/src/apis/definitions/AlertApi.ts rename to packages/core-plugin-api/src/apis/definitions/AlertApi.ts diff --git a/packages/plugin-api/src/apis/definitions/AppThemeApi.ts b/packages/core-plugin-api/src/apis/definitions/AppThemeApi.ts similarity index 100% rename from packages/plugin-api/src/apis/definitions/AppThemeApi.ts rename to packages/core-plugin-api/src/apis/definitions/AppThemeApi.ts diff --git a/packages/plugin-api/src/apis/definitions/ConfigApi.ts b/packages/core-plugin-api/src/apis/definitions/ConfigApi.ts similarity index 100% rename from packages/plugin-api/src/apis/definitions/ConfigApi.ts rename to packages/core-plugin-api/src/apis/definitions/ConfigApi.ts diff --git a/packages/plugin-api/src/apis/definitions/DiscoveryApi.ts b/packages/core-plugin-api/src/apis/definitions/DiscoveryApi.ts similarity index 100% rename from packages/plugin-api/src/apis/definitions/DiscoveryApi.ts rename to packages/core-plugin-api/src/apis/definitions/DiscoveryApi.ts diff --git a/packages/plugin-api/src/apis/definitions/ErrorApi.ts b/packages/core-plugin-api/src/apis/definitions/ErrorApi.ts similarity index 100% rename from packages/plugin-api/src/apis/definitions/ErrorApi.ts rename to packages/core-plugin-api/src/apis/definitions/ErrorApi.ts diff --git a/packages/plugin-api/src/apis/definitions/FeatureFlagsApi.ts b/packages/core-plugin-api/src/apis/definitions/FeatureFlagsApi.ts similarity index 100% rename from packages/plugin-api/src/apis/definitions/FeatureFlagsApi.ts rename to packages/core-plugin-api/src/apis/definitions/FeatureFlagsApi.ts diff --git a/packages/plugin-api/src/apis/definitions/IdentityApi.ts b/packages/core-plugin-api/src/apis/definitions/IdentityApi.ts similarity index 100% rename from packages/plugin-api/src/apis/definitions/IdentityApi.ts rename to packages/core-plugin-api/src/apis/definitions/IdentityApi.ts diff --git a/packages/plugin-api/src/apis/definitions/OAuthRequestApi.ts b/packages/core-plugin-api/src/apis/definitions/OAuthRequestApi.ts similarity index 100% rename from packages/plugin-api/src/apis/definitions/OAuthRequestApi.ts rename to packages/core-plugin-api/src/apis/definitions/OAuthRequestApi.ts diff --git a/packages/plugin-api/src/apis/definitions/StorageApi.ts b/packages/core-plugin-api/src/apis/definitions/StorageApi.ts similarity index 100% rename from packages/plugin-api/src/apis/definitions/StorageApi.ts rename to packages/core-plugin-api/src/apis/definitions/StorageApi.ts diff --git a/packages/plugin-api/src/apis/definitions/auth.ts b/packages/core-plugin-api/src/apis/definitions/auth.ts similarity index 100% rename from packages/plugin-api/src/apis/definitions/auth.ts rename to packages/core-plugin-api/src/apis/definitions/auth.ts diff --git a/packages/plugin-api/src/apis/definitions/index.ts b/packages/core-plugin-api/src/apis/definitions/index.ts similarity index 100% rename from packages/plugin-api/src/apis/definitions/index.ts rename to packages/core-plugin-api/src/apis/definitions/index.ts diff --git a/packages/plugin-api/src/apis/index.ts b/packages/core-plugin-api/src/apis/index.ts similarity index 100% rename from packages/plugin-api/src/apis/index.ts rename to packages/core-plugin-api/src/apis/index.ts diff --git a/packages/plugin-api/src/apis/system/ApiRef.test.ts b/packages/core-plugin-api/src/apis/system/ApiRef.test.ts similarity index 100% rename from packages/plugin-api/src/apis/system/ApiRef.test.ts rename to packages/core-plugin-api/src/apis/system/ApiRef.test.ts diff --git a/packages/plugin-api/src/apis/system/ApiRef.ts b/packages/core-plugin-api/src/apis/system/ApiRef.ts similarity index 100% rename from packages/plugin-api/src/apis/system/ApiRef.ts rename to packages/core-plugin-api/src/apis/system/ApiRef.ts diff --git a/packages/plugin-api/src/apis/system/helpers.ts b/packages/core-plugin-api/src/apis/system/helpers.ts similarity index 100% rename from packages/plugin-api/src/apis/system/helpers.ts rename to packages/core-plugin-api/src/apis/system/helpers.ts diff --git a/packages/plugin-api/src/apis/system/index.ts b/packages/core-plugin-api/src/apis/system/index.ts similarity index 100% rename from packages/plugin-api/src/apis/system/index.ts rename to packages/core-plugin-api/src/apis/system/index.ts diff --git a/packages/plugin-api/src/apis/system/types.ts b/packages/core-plugin-api/src/apis/system/types.ts similarity index 100% rename from packages/plugin-api/src/apis/system/types.ts rename to packages/core-plugin-api/src/apis/system/types.ts diff --git a/packages/plugin-api/src/apis/system/useApi.test.tsx b/packages/core-plugin-api/src/apis/system/useApi.test.tsx similarity index 100% rename from packages/plugin-api/src/apis/system/useApi.test.tsx rename to packages/core-plugin-api/src/apis/system/useApi.test.tsx diff --git a/packages/plugin-api/src/apis/system/useApi.tsx b/packages/core-plugin-api/src/apis/system/useApi.tsx similarity index 100% rename from packages/plugin-api/src/apis/system/useApi.tsx rename to packages/core-plugin-api/src/apis/system/useApi.tsx diff --git a/packages/plugin-api/src/app/index.ts b/packages/core-plugin-api/src/app/index.ts similarity index 100% rename from packages/plugin-api/src/app/index.ts rename to packages/core-plugin-api/src/app/index.ts diff --git a/packages/plugin-api/src/app/types.ts b/packages/core-plugin-api/src/app/types.ts similarity index 100% rename from packages/plugin-api/src/app/types.ts rename to packages/core-plugin-api/src/app/types.ts diff --git a/packages/plugin-api/src/app/useApp.test.tsx b/packages/core-plugin-api/src/app/useApp.test.tsx similarity index 100% rename from packages/plugin-api/src/app/useApp.test.tsx rename to packages/core-plugin-api/src/app/useApp.test.tsx diff --git a/packages/plugin-api/src/app/useApp.tsx b/packages/core-plugin-api/src/app/useApp.tsx similarity index 100% rename from packages/plugin-api/src/app/useApp.tsx rename to packages/core-plugin-api/src/app/useApp.tsx diff --git a/packages/plugin-api/src/extensions/componentData.test.tsx b/packages/core-plugin-api/src/extensions/componentData.test.tsx similarity index 100% rename from packages/plugin-api/src/extensions/componentData.test.tsx rename to packages/core-plugin-api/src/extensions/componentData.test.tsx diff --git a/packages/plugin-api/src/extensions/componentData.tsx b/packages/core-plugin-api/src/extensions/componentData.tsx similarity index 100% rename from packages/plugin-api/src/extensions/componentData.tsx rename to packages/core-plugin-api/src/extensions/componentData.tsx diff --git a/packages/plugin-api/src/extensions/extensions.test.tsx b/packages/core-plugin-api/src/extensions/extensions.test.tsx similarity index 100% rename from packages/plugin-api/src/extensions/extensions.test.tsx rename to packages/core-plugin-api/src/extensions/extensions.test.tsx diff --git a/packages/plugin-api/src/extensions/extensions.tsx b/packages/core-plugin-api/src/extensions/extensions.tsx similarity index 100% rename from packages/plugin-api/src/extensions/extensions.tsx rename to packages/core-plugin-api/src/extensions/extensions.tsx diff --git a/packages/plugin-api/src/extensions/index.ts b/packages/core-plugin-api/src/extensions/index.ts similarity index 100% rename from packages/plugin-api/src/extensions/index.ts rename to packages/core-plugin-api/src/extensions/index.ts diff --git a/packages/plugin-api/src/icons/index.ts b/packages/core-plugin-api/src/icons/index.ts similarity index 100% rename from packages/plugin-api/src/icons/index.ts rename to packages/core-plugin-api/src/icons/index.ts diff --git a/packages/plugin-api/src/icons/types.ts b/packages/core-plugin-api/src/icons/types.ts similarity index 100% rename from packages/plugin-api/src/icons/types.ts rename to packages/core-plugin-api/src/icons/types.ts diff --git a/packages/plugin-api/src/index.test.ts b/packages/core-plugin-api/src/index.test.ts similarity index 100% rename from packages/plugin-api/src/index.test.ts rename to packages/core-plugin-api/src/index.test.ts diff --git a/packages/plugin-api/src/index.ts b/packages/core-plugin-api/src/index.ts similarity index 100% rename from packages/plugin-api/src/index.ts rename to packages/core-plugin-api/src/index.ts diff --git a/packages/plugin-api/src/lib/globalObject.test.ts b/packages/core-plugin-api/src/lib/globalObject.test.ts similarity index 100% rename from packages/plugin-api/src/lib/globalObject.test.ts rename to packages/core-plugin-api/src/lib/globalObject.test.ts diff --git a/packages/plugin-api/src/lib/globalObject.ts b/packages/core-plugin-api/src/lib/globalObject.ts similarity index 100% rename from packages/plugin-api/src/lib/globalObject.ts rename to packages/core-plugin-api/src/lib/globalObject.ts diff --git a/packages/plugin-api/src/lib/versionedValues.ts b/packages/core-plugin-api/src/lib/versionedValues.ts similarity index 100% rename from packages/plugin-api/src/lib/versionedValues.ts rename to packages/core-plugin-api/src/lib/versionedValues.ts diff --git a/packages/plugin-api/src/plugin/Plugin.tsx b/packages/core-plugin-api/src/plugin/Plugin.tsx similarity index 100% rename from packages/plugin-api/src/plugin/Plugin.tsx rename to packages/core-plugin-api/src/plugin/Plugin.tsx diff --git a/packages/plugin-api/src/plugin/index.ts b/packages/core-plugin-api/src/plugin/index.ts similarity index 100% rename from packages/plugin-api/src/plugin/index.ts rename to packages/core-plugin-api/src/plugin/index.ts diff --git a/packages/plugin-api/src/plugin/types.ts b/packages/core-plugin-api/src/plugin/types.ts similarity index 100% rename from packages/plugin-api/src/plugin/types.ts rename to packages/core-plugin-api/src/plugin/types.ts diff --git a/packages/plugin-api/src/routing/ExternalRouteRef.test.ts b/packages/core-plugin-api/src/routing/ExternalRouteRef.test.ts similarity index 100% rename from packages/plugin-api/src/routing/ExternalRouteRef.test.ts rename to packages/core-plugin-api/src/routing/ExternalRouteRef.test.ts diff --git a/packages/plugin-api/src/routing/ExternalRouteRef.ts b/packages/core-plugin-api/src/routing/ExternalRouteRef.ts similarity index 100% rename from packages/plugin-api/src/routing/ExternalRouteRef.ts rename to packages/core-plugin-api/src/routing/ExternalRouteRef.ts diff --git a/packages/plugin-api/src/routing/RouteRef.test.ts b/packages/core-plugin-api/src/routing/RouteRef.test.ts similarity index 100% rename from packages/plugin-api/src/routing/RouteRef.test.ts rename to packages/core-plugin-api/src/routing/RouteRef.test.ts diff --git a/packages/plugin-api/src/routing/RouteRef.ts b/packages/core-plugin-api/src/routing/RouteRef.ts similarity index 100% rename from packages/plugin-api/src/routing/RouteRef.ts rename to packages/core-plugin-api/src/routing/RouteRef.ts diff --git a/packages/plugin-api/src/routing/SubRouteRef.test.ts b/packages/core-plugin-api/src/routing/SubRouteRef.test.ts similarity index 100% rename from packages/plugin-api/src/routing/SubRouteRef.test.ts rename to packages/core-plugin-api/src/routing/SubRouteRef.test.ts diff --git a/packages/plugin-api/src/routing/SubRouteRef.ts b/packages/core-plugin-api/src/routing/SubRouteRef.ts similarity index 100% rename from packages/plugin-api/src/routing/SubRouteRef.ts rename to packages/core-plugin-api/src/routing/SubRouteRef.ts diff --git a/packages/plugin-api/src/routing/index.ts b/packages/core-plugin-api/src/routing/index.ts similarity index 100% rename from packages/plugin-api/src/routing/index.ts rename to packages/core-plugin-api/src/routing/index.ts diff --git a/packages/plugin-api/src/routing/types.ts b/packages/core-plugin-api/src/routing/types.ts similarity index 100% rename from packages/plugin-api/src/routing/types.ts rename to packages/core-plugin-api/src/routing/types.ts diff --git a/packages/plugin-api/src/routing/useRouteRef.test.tsx b/packages/core-plugin-api/src/routing/useRouteRef.test.tsx similarity index 100% rename from packages/plugin-api/src/routing/useRouteRef.test.tsx rename to packages/core-plugin-api/src/routing/useRouteRef.test.tsx diff --git a/packages/plugin-api/src/routing/useRouteRef.tsx b/packages/core-plugin-api/src/routing/useRouteRef.tsx similarity index 100% rename from packages/plugin-api/src/routing/useRouteRef.tsx rename to packages/core-plugin-api/src/routing/useRouteRef.tsx diff --git a/packages/plugin-api/src/routing/useRouteRefParams.test.tsx b/packages/core-plugin-api/src/routing/useRouteRefParams.test.tsx similarity index 100% rename from packages/plugin-api/src/routing/useRouteRefParams.test.tsx rename to packages/core-plugin-api/src/routing/useRouteRefParams.test.tsx diff --git a/packages/plugin-api/src/routing/useRouteRefParams.ts b/packages/core-plugin-api/src/routing/useRouteRefParams.ts similarity index 100% rename from packages/plugin-api/src/routing/useRouteRefParams.ts rename to packages/core-plugin-api/src/routing/useRouteRefParams.ts diff --git a/packages/plugin-api/src/setupTests.ts b/packages/core-plugin-api/src/setupTests.ts similarity index 100% rename from packages/plugin-api/src/setupTests.ts rename to packages/core-plugin-api/src/setupTests.ts diff --git a/packages/plugin-api/src/types.ts b/packages/core-plugin-api/src/types.ts similarity index 100% rename from packages/plugin-api/src/types.ts rename to packages/core-plugin-api/src/types.ts diff --git a/packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx b/packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx index 4264c4a4ee..4f67dda235 100644 --- a/packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx +++ b/packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx @@ -85,7 +85,7 @@ const overviewContent = ( - + diff --git a/packages/storybook/README.md b/packages/storybook/README.md index 656fc578c2..f966a358d3 100644 --- a/packages/storybook/README.md +++ b/packages/storybook/README.md @@ -2,6 +2,6 @@ This package provides a Storybook build for Backstage. See https://backstage.io/storybook/. -## Why is this not part of `@backstage/components`? +## Why is this not part of `@backstage/core-components`? -This separate storybook package exists because of dependency conflicts with `@backstage/cli`. It uses `nohoist` to avoid the conflicts, and since you can only use that in private packages it has to be separated out of `@backstage/components`. +This separate storybook package exists because of dependency conflicts with `@backstage/cli`. It uses `nohoist` to avoid the conflicts, and since you can only use that in private packages it has to be separated out of `@backstage/core-components`. diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json index 9763f731af..3d8dcd22c1 100644 --- a/plugins/catalog-react/package.json +++ b/plugins/catalog-react/package.json @@ -31,7 +31,7 @@ "@backstage/catalog-client": "^0.3.12", "@backstage/catalog-model": "^0.8.0", "@backstage/core": "^0.7.11", - "@backstage/plugin-api": "^0.1.0", + "@backstage/core-plugin-api": "^0.1.0", "@material-ui/core": "^4.11.0", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", diff --git a/plugins/catalog-react/src/api.ts b/plugins/catalog-react/src/api.ts index b87957ba5b..0fdfe32f0f 100644 --- a/plugins/catalog-react/src/api.ts +++ b/plugins/catalog-react/src/api.ts @@ -15,7 +15,7 @@ */ import { CatalogApi } from '@backstage/catalog-client'; -import { createApiRef } from '@backstage/plugin-api'; +import { createApiRef } from '@backstage/core-plugin-api'; export const catalogApiRef = createApiRef({ id: 'plugin.catalog.service', diff --git a/plugins/catalog-react/src/hooks/useEntity.ts b/plugins/catalog-react/src/hooks/useEntity.ts index c53b256227..a230ef747a 100644 --- a/plugins/catalog-react/src/hooks/useEntity.ts +++ b/plugins/catalog-react/src/hooks/useEntity.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import { Entity } from '@backstage/catalog-model'; -import { errorApiRef, useApi } from '@backstage/plugin-api'; +import { errorApiRef, useApi } from '@backstage/core-plugin-api'; import { createContext, useContext, useEffect } from 'react'; import { useNavigate } from 'react-router'; import { useAsync } from 'react-use'; diff --git a/plugins/catalog-react/src/hooks/useRelatedEntities.ts b/plugins/catalog-react/src/hooks/useRelatedEntities.ts index 0f58b3aa98..77514ba63e 100644 --- a/plugins/catalog-react/src/hooks/useRelatedEntities.ts +++ b/plugins/catalog-react/src/hooks/useRelatedEntities.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import { Entity, EntityRelation } from '@backstage/catalog-model'; -import { useApi } from '@backstage/plugin-api'; +import { useApi } from '@backstage/core-plugin-api'; import { chunk, groupBy } from 'lodash'; import { useAsync } from 'react-use'; import { catalogApiRef } from '../api'; diff --git a/plugins/catalog-react/src/hooks/useStarredEntities.test.tsx b/plugins/catalog-react/src/hooks/useStarredEntities.test.tsx index ce81fa5792..1541fef9d1 100644 --- a/plugins/catalog-react/src/hooks/useStarredEntities.test.tsx +++ b/plugins/catalog-react/src/hooks/useStarredEntities.test.tsx @@ -18,7 +18,7 @@ import React, { PropsWithChildren } from 'react'; import { renderHook, act } from '@testing-library/react-hooks'; import { useStarredEntities } from './useStarredEntities'; import { ApiProvider, ApiRegistry, WebStorage } from '@backstage/core'; -import { storageApiRef, StorageApi } from '@backstage/plugin-api'; +import { storageApiRef, StorageApi } from '@backstage/core-plugin-api'; import { MockErrorApi } from '@backstage/test-utils'; import { Entity } from '@backstage/catalog-model'; diff --git a/plugins/catalog-react/src/hooks/useStarredEntities.ts b/plugins/catalog-react/src/hooks/useStarredEntities.ts index d959514562..527e7c4109 100644 --- a/plugins/catalog-react/src/hooks/useStarredEntities.ts +++ b/plugins/catalog-react/src/hooks/useStarredEntities.ts @@ -15,7 +15,7 @@ */ import { Entity } from '@backstage/catalog-model'; -import { storageApiRef, useApi } from '@backstage/plugin-api'; +import { storageApiRef, useApi } from '@backstage/core-plugin-api'; import { useCallback, useEffect, useState } from 'react'; import { useObservable } from 'react-use'; diff --git a/plugins/graphiql/dev/index.tsx b/plugins/graphiql/dev/index.tsx index 7a50ed1afc..5a64208b1a 100644 --- a/plugins/graphiql/dev/index.tsx +++ b/plugins/graphiql/dev/index.tsx @@ -16,7 +16,7 @@ import React from 'react'; import { createDevApp } from '@backstage/dev-utils'; -import { githubAuthApiRef, errorApiRef } from '@backstage/plugin-api'; +import { githubAuthApiRef, errorApiRef } from '@backstage/core-plugin-api'; import GraphiQLIcon from '../src/assets/graphiql.icon.svg'; import { graphiqlPlugin, diff --git a/plugins/graphiql/package.json b/plugins/graphiql/package.json index 8e3ec7f4dd..44ac82c3f4 100644 --- a/plugins/graphiql/package.json +++ b/plugins/graphiql/package.json @@ -32,7 +32,7 @@ }, "dependencies": { "@backstage/core": "^0.7.11", - "@backstage/plugin-api": "^0.1.0", + "@backstage/core-plugin-api": "^0.1.0", "@backstage/theme": "^0.2.7", "@material-ui/core": "^4.11.0", "@material-ui/icons": "^4.9.1", diff --git a/plugins/graphiql/src/components/GraphiQLPage/GraphiQLPage.tsx b/plugins/graphiql/src/components/GraphiQLPage/GraphiQLPage.tsx index 37522ebe41..8c3c90fe1d 100644 --- a/plugins/graphiql/src/components/GraphiQLPage/GraphiQLPage.tsx +++ b/plugins/graphiql/src/components/GraphiQLPage/GraphiQLPage.tsx @@ -15,7 +15,7 @@ */ import React from 'react'; import { Content, Header, HeaderLabel, Page, Progress } from '@backstage/core'; -import { useApi } from '@backstage/plugin-api'; +import { useApi } from '@backstage/core-plugin-api'; import { useAsync } from 'react-use'; import 'graphiql/graphiql.css'; import { graphQlBrowseApiRef } from '../../lib/api'; diff --git a/plugins/graphiql/src/lib/api/GraphQLEndpoints.ts b/plugins/graphiql/src/lib/api/GraphQLEndpoints.ts index 2f0e86ca7e..0e5c921e8a 100644 --- a/plugins/graphiql/src/lib/api/GraphQLEndpoints.ts +++ b/plugins/graphiql/src/lib/api/GraphQLEndpoints.ts @@ -15,7 +15,7 @@ */ import { GraphQLBrowseApi, GraphQLEndpoint } from './types'; -import { ErrorApi, OAuthApi } from '@backstage/plugin-api'; +import { ErrorApi, OAuthApi } from '@backstage/core-plugin-api'; // Helper for generic http endpoints export type EndpointConfig = { diff --git a/plugins/graphiql/src/lib/api/types.ts b/plugins/graphiql/src/lib/api/types.ts index b968989d96..4a92872112 100644 --- a/plugins/graphiql/src/lib/api/types.ts +++ b/plugins/graphiql/src/lib/api/types.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { createApiRef } from '@backstage/plugin-api'; +import { createApiRef } from '@backstage/core-plugin-api'; export type GraphQLEndpoint = { // Will be used as unique key for storing history and query data diff --git a/plugins/graphiql/src/plugin.ts b/plugins/graphiql/src/plugin.ts index 7cf9e443c6..f6b3ac8f7c 100644 --- a/plugins/graphiql/src/plugin.ts +++ b/plugins/graphiql/src/plugin.ts @@ -18,7 +18,7 @@ import { createPlugin, createApiFactory, createRoutableExtension, -} from '@backstage/plugin-api'; +} from '@backstage/core-plugin-api'; import { graphQlBrowseApiRef, GraphQLEndpoints } from './lib/api'; import { graphiQLRouteRef } from './route-refs'; diff --git a/plugins/graphiql/src/route-refs.tsx b/plugins/graphiql/src/route-refs.tsx index 8806bed826..8d9707f0de 100644 --- a/plugins/graphiql/src/route-refs.tsx +++ b/plugins/graphiql/src/route-refs.tsx @@ -14,7 +14,7 @@ * limitations under the License. */ -import { createRouteRef } from '@backstage/plugin-api'; +import { createRouteRef } from '@backstage/core-plugin-api'; export const graphiQLRouteRef = createRouteRef({ id: 'graphiql-root',