Update UrlReader imports

See backstage-common 0.24.0 changelog
DiamondLightSource · Jan 24, 2025 · a27e10b · a27e10b
1 parent 1d97ed0
commit a27e10b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/backstage/packages/backend/package.json b/backstage/packages/backend/package.json
@@ -17,6 +17,8 @@
   },
   "dependencies": {
     "@backstage/backend-common": "^0.25.0",
+    "@backstage/backend-defaults": "^0.7.0",
+    "@backstage/backend-plugin-api": "^1.1.1",
     "@backstage/backend-tasks": "^0.6.1",
     "@backstage/catalog-client": "^1.9.1",
     "@backstage/catalog-model": "^1.7.3",

diff --git a/backstage/packages/backend/src/index.ts b/backstage/packages/backend/src/index.ts
@@ -7,9 +7,9 @@ import {
   notFoundHandler,
   ServerTokenManager,
   SingleHostDiscovery,
-  UrlReaders,
   useHotMemoize,
 } from '@backstage/backend-common';
+import { UrlReaders } from '@backstage/backend-defaults/urlReader';
 import { TaskScheduler } from '@backstage/backend-tasks';
 import { Config } from '@backstage/config';
 import { DefaultIdentityClient } from '@backstage/plugin-auth-node';

diff --git a/backstage/packages/backend/src/types.ts b/backstage/packages/backend/src/types.ts
@@ -1,22 +1,22 @@
-import { Logger } from 'winston';
-import { Config } from '@backstage/config';
 import {
   PluginCacheManager,
   PluginDatabaseManager,
   PluginEndpointDiscovery,
   TokenManager,
-  UrlReader,
 } from '@backstage/backend-common';
+import { UrlReaderService } from '@backstage/backend-plugin-api';
 import { PluginTaskScheduler } from '@backstage/backend-tasks';
-import { PermissionEvaluator } from '@backstage/plugin-permission-common';
+import { Config } from '@backstage/config';
 import { IdentityApi } from '@backstage/plugin-auth-node';
+import { PermissionEvaluator } from '@backstage/plugin-permission-common';
+import { Logger } from 'winston';
 
 export type PluginEnvironment = {
   logger: Logger;
   database: PluginDatabaseManager;
   cache: PluginCacheManager;
   config: Config;
-  reader: UrlReader;
+  reader: UrlReaderService;
   discovery: PluginEndpointDiscovery;
   tokenManager: TokenManager;
   scheduler: PluginTaskScheduler;

diff --git a/backstage/yarn.lock b/backstage/yarn.lock
@@ -11112,7 +11112,7 @@
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb"
   integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==
 
-"@types/react-dom@*", "@types/react-dom@<18.0.0", "@types/react-dom@^17":
+"@types/react-dom@*", "@types/react-dom@<18.0.0":
   version "17.0.25"
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.25.tgz#e0e5b3571e1069625b3a3da2b279379aa33a0cb5"
   integrity sha512-urx7A7UxkZQmThYA4So0NelOVjx3V4rNFVJwp0WZlbIK5eM4rNJDiN3R/E9ix0MBh6kAEojk/9YL+Te6D9zHNA==
@@ -27233,7 +27233,7 @@ swagger-client@^3.24.6:
     qs "^6.10.2"
     traverse "~0.6.6"
 
-swagger-ui-react@<5.11.0, swagger-ui-react@^5.0.0:
+swagger-ui-react@^5.0.0:
   version "5.10.5"
   resolved "https://registry.yarnpkg.com/swagger-ui-react/-/swagger-ui-react-5.10.5.tgz#a9da3c452599530b1df4e1c7860c2888f683c617"
   integrity sha512-uBQLku4j3L1NC4/xE3HTgz1EcFisBphh8AnGqbj9LMxeGGcpKOlx/ZDigRAeVXWr9jOnZZbeGBzMe4NVHxPZrQ==