From 2949a8154fbe189673cafd419ca548bf75b6effa Mon Sep 17 00:00:00 2001 From: Johan Haals Date: Mon, 11 Sep 2023 16:26:58 +0200 Subject: [PATCH] frontend-app-api: Internal restructure Co-authored-by: Patrik Oldsberg Co-authored-by: Philipp Hugenroth Signed-off-by: Johan Haals --- packages/frontend-app-api/src/index.ts | 2 +- .../src/{ => wiring}/createApp.tsx | 26 +++++++++---------- .../{ => wiring}/createExtensionInstance.ts | 0 packages/frontend-app-api/src/wiring/index.ts | 17 ++++++++++++ 4 files changed, 31 insertions(+), 14 deletions(-) rename packages/frontend-app-api/src/{ => wiring}/createApp.tsx (91%) rename packages/frontend-app-api/src/{ => wiring}/createExtensionInstance.ts (100%) create mode 100644 packages/frontend-app-api/src/wiring/index.ts diff --git a/packages/frontend-app-api/src/index.ts b/packages/frontend-app-api/src/index.ts index 9674eb345d..f2dfa0f029 100644 --- a/packages/frontend-app-api/src/index.ts +++ b/packages/frontend-app-api/src/index.ts @@ -20,4 +20,4 @@ * @packageDocumentation */ -export { createApp } from './createApp'; +export * from './wiring'; diff --git a/packages/frontend-app-api/src/createApp.tsx b/packages/frontend-app-api/src/wiring/createApp.tsx similarity index 91% rename from packages/frontend-app-api/src/createApp.tsx rename to packages/frontend-app-api/src/wiring/createApp.tsx index 4882191206..decf0a657e 100644 --- a/packages/frontend-app-api/src/createApp.tsx +++ b/packages/frontend-app-api/src/wiring/createApp.tsx @@ -20,10 +20,10 @@ import { BackstagePlugin, coreExtensionData, } from '@backstage/frontend-plugin-api'; -import { Core } from './extensions/Core'; -import { CoreRoutes } from './extensions/CoreRoutes'; -import { CoreLayout } from './extensions/CoreLayout'; -import { CoreNav } from './extensions/CoreNav'; +import { Core } from '../extensions/Core'; +import { CoreRoutes } from '../extensions/CoreRoutes'; +import { CoreLayout } from '../extensions/CoreLayout'; +import { CoreNav } from '../extensions/CoreNav'; import { createExtensionInstance, ExtensionInstance, @@ -32,8 +32,8 @@ import { ExtensionInstanceParameters, mergeExtensionParameters, readAppExtensionParameters, -} from './wiring/parameters'; -import { RoutingProvider } from './routing/RoutingContext'; +} from './parameters'; +import { RoutingProvider } from '../routing/RoutingContext'; import { AnyApiFactory, ApiHolder, @@ -47,7 +47,7 @@ import { BackstagePlugin as LegacyBackstagePlugin, featureFlagsApiRef, } from '@backstage/core-plugin-api'; -import { getAvailablePlugins } from './wiring/discovery'; +import { getAvailablePlugins } from './discovery'; import { ApiFactoryRegistry, ApiProvider, @@ -57,22 +57,22 @@ import { // TODO: Get rid of all of these // eslint-disable-next-line @backstage/no-relative-monorepo-imports -import { AppThemeProvider } from '../../core-app-api/src/app/AppThemeProvider'; +import { AppThemeProvider } from '../../../core-app-api/src/app/AppThemeProvider'; // eslint-disable-next-line @backstage/no-relative-monorepo-imports -import { AppContextProvider } from '../../core-app-api/src/app/AppContext'; +import { AppContextProvider } from '../../../core-app-api/src/app/AppContext'; // eslint-disable-next-line @backstage/no-relative-monorepo-imports -import { LocalStorageFeatureFlags } from '../../core-app-api/src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags'; +import { LocalStorageFeatureFlags } from '../../../core-app-api/src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags'; // eslint-disable-next-line @backstage/no-relative-monorepo-imports -import { defaultConfigLoaderSync } from '../../core-app-api/src/app/defaultConfigLoader'; +import { defaultConfigLoaderSync } from '../../../core-app-api/src/app/defaultConfigLoader'; // eslint-disable-next-line @backstage/no-relative-monorepo-imports -import { overrideBaseUrlConfigs } from '../../core-app-api/src/app/overrideBaseUrlConfigs'; +import { overrideBaseUrlConfigs } from '../../../core-app-api/src/app/overrideBaseUrlConfigs'; // eslint-disable-next-line @backstage/no-relative-monorepo-imports import { apis as defaultApis, components as defaultComponents, icons as defaultIcons, themes as defaultThemes, -} from '../../app-defaults/src/defaults'; +} from '../../../app-defaults/src/defaults'; import { BrowserRouter } from 'react-router-dom'; /** @public */ diff --git a/packages/frontend-app-api/src/createExtensionInstance.ts b/packages/frontend-app-api/src/wiring/createExtensionInstance.ts similarity index 100% rename from packages/frontend-app-api/src/createExtensionInstance.ts rename to packages/frontend-app-api/src/wiring/createExtensionInstance.ts diff --git a/packages/frontend-app-api/src/wiring/index.ts b/packages/frontend-app-api/src/wiring/index.ts new file mode 100644 index 0000000000..a43cd73df2 --- /dev/null +++ b/packages/frontend-app-api/src/wiring/index.ts @@ -0,0 +1,17 @@ +/* + * Copyright 2023 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export { createApp } from './createApp';