Merge pull request #438 from backstage/topic/v1.28.0-next.0

v1.28.0-next.0 version bump
backstage · May 22, 2024 · 7e0e322 · 7e0e322
2 parents 15b0c9a + 73eb978
commit 7e0e322
Show file tree

Hide file tree

Showing 9 changed files with 992 additions and 555 deletions.
diff --git a/backstage.json b/backstage.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.27.2"
+  "version": "1.28.0-next.0"
 }
diff --git a/package.json b/package.json
@@ -41,7 +41,7 @@
     "recharts": "2.12.7"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.5",
+    "@backstage/cli": "^0.26.6-next.0",
     "@backstage/e2e-test-utils": "^0.1.1",
     "@playwright/test": "^1.32.3",
     "@spotify/prettier-config": "^15.0.0",

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -14,25 +14,25 @@
     "@backstage-community/plugin-graphiql": "^0.3.8",
     "@backstage-community/plugin-tech-radar": "^0.7.4",
     "@backstage-community/plugin-todo": "^0.2.39",
-    "@backstage/app-defaults": "^1.5.5",
-    "@backstage/cli": "^0.26.5",
+    "@backstage/app-defaults": "^1.5.6-next.0",
+    "@backstage/cli": "^0.26.6-next.0",
     "@backstage/core-app-api": "^1.12.5",
-    "@backstage/core-components": "^0.14.7",
+    "@backstage/core-components": "^0.14.8-next.0",
     "@backstage/core-plugin-api": "^1.9.2",
     "@backstage/integration-react": "^1.1.27",
-    "@backstage/plugin-api-docs": "^0.11.5",
-    "@backstage/plugin-catalog": "^1.20.0",
-    "@backstage/plugin-catalog-graph": "^0.4.5",
-    "@backstage/plugin-catalog-react": "^1.12.0",
-    "@backstage/plugin-home": "^0.7.4",
-    "@backstage/plugin-kubernetes": "^0.11.10",
-    "@backstage/plugin-org": "^0.6.25",
-    "@backstage/plugin-scaffolder": "^1.20.0",
-    "@backstage/plugin-search": "^1.4.11",
-    "@backstage/plugin-search-react": "^1.7.11",
-    "@backstage/plugin-techdocs": "^1.10.5",
-    "@backstage/plugin-user-settings": "^0.8.6",
-    "@backstage/theme": "^0.5.5",
+    "@backstage/plugin-api-docs": "^0.11.6-next.0",
+    "@backstage/plugin-catalog": "^1.20.1-next.0",
+    "@backstage/plugin-catalog-graph": "^0.4.6-next.0",
+    "@backstage/plugin-catalog-react": "^1.12.1-next.0",
+    "@backstage/plugin-home": "^0.7.5-next.0",
+    "@backstage/plugin-kubernetes": "^0.11.11-next.0",
+    "@backstage/plugin-org": "^0.6.26-next.0",
+    "@backstage/plugin-scaffolder": "^1.20.1-next.0",
+    "@backstage/plugin-search": "^1.4.12-next.0",
+    "@backstage/plugin-search-react": "^1.7.12-next.0",
+    "@backstage/plugin-techdocs": "^1.10.6-next.0",
+    "@backstage/plugin-user-settings": "^0.8.7-next.0",
+    "@backstage/theme": "^0.5.6-next.0",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "react": "^18.2.0",

diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -19,23 +19,23 @@
     "@backstage-community/plugin-badges-backend": "^0.4.1",
     "@backstage-community/plugin-explore-backend": "^0.0.28",
     "@backstage-community/plugin-todo-backend": "^0.3.17",
-    "@backstage/backend-defaults": "^0.2.18",
-    "@backstage/backend-plugin-api": "^0.6.18",
-    "@backstage/plugin-app-backend": "^0.3.67",
-    "@backstage/plugin-auth-backend": "^0.22.5",
-    "@backstage/plugin-auth-backend-module-github-provider": "^0.1.15",
-    "@backstage/plugin-auth-backend-module-guest-provider": "^0.1.4",
-    "@backstage/plugin-catalog-backend": "^1.22.0",
-    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.16",
-    "@backstage/plugin-kubernetes-backend": "^0.17.1",
-    "@backstage/plugin-proxy-backend": "^0.4.16",
-    "@backstage/plugin-scaffolder-backend": "^1.22.7",
-    "@backstage/plugin-scaffolder-backend-module-github": "^0.2.8",
-    "@backstage/plugin-search-backend": "^1.5.9",
-    "@backstage/plugin-search-backend-module-catalog": "^0.1.24",
-    "@backstage/plugin-search-backend-module-explore": "^0.1.24",
-    "@backstage/plugin-techdocs-backend": "^1.10.5",
-    "@backstage/plugin-techdocs-node": "^1.12.4",
+    "@backstage/backend-defaults": "^0.2.19-next.0",
+    "@backstage/backend-plugin-api": "^0.6.19-next.0",
+    "@backstage/plugin-app-backend": "^0.3.68-next.0",
+    "@backstage/plugin-auth-backend": "^0.22.6-next.0",
+    "@backstage/plugin-auth-backend-module-github-provider": "^0.1.16-next.0",
+    "@backstage/plugin-auth-backend-module-guest-provider": "^0.1.5-next.0",
+    "@backstage/plugin-catalog-backend": "^1.23.0-next.0",
+    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.17-next.0",
+    "@backstage/plugin-kubernetes-backend": "^0.17.2-next.0",
+    "@backstage/plugin-proxy-backend": "^0.5.0-next.0",
+    "@backstage/plugin-scaffolder-backend": "^1.22.8-next.0",
+    "@backstage/plugin-scaffolder-backend-module-github": "^0.2.9-next.0",
+    "@backstage/plugin-search-backend": "^1.5.10-next.0",
+    "@backstage/plugin-search-backend-module-catalog": "^0.1.25-next.0",
+    "@backstage/plugin-search-backend-module-explore": "^0.1.25-next.0",
+    "@backstage/plugin-techdocs-backend": "^1.10.6-next.0",
+    "@backstage/plugin-techdocs-node": "^1.12.5-next.0",
     "@frontside/backstage-plugin-graphql-backend": "^0.1.2",
     "@frontside/backstage-plugin-graphql-backend-module-catalog": "^0.3.0",
     "@internal/plugin-catalog-backend-module-backstage": "workspace:^",
@@ -44,6 +44,6 @@
     "better-sqlite3": "^9.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.5"
+    "@backstage/cli": "^0.26.6-next.0"
   }
 }
diff --git a/plugins/catalog-backend-module-backstage/config.d.ts b/plugins/catalog-backend-module-backstage/config.d.ts
@@ -1,4 +1,4 @@
-import { TaskScheduleDefinitionConfig } from '@backstage/backend-tasks';
+import { SchedulerServiceTaskScheduleDefinitionConfig } from '@backstage/backend-plugin-api';
 
 export interface Config {
   catalog?: {
@@ -17,7 +17,7 @@ export interface Config {
         /**
          * TaskScheduleDefinition for the refresh.
          */
-        schedule: TaskScheduleDefinitionConfig;
+        schedule: SchedulerServiceTaskScheduleDefinitionConfig;
       };
     };
   };

diff --git a/plugins/catalog-backend-module-backstage/package.json b/plugins/catalog-backend-module-backstage/package.json
@@ -24,13 +24,12 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.22.0",
-    "@backstage/backend-plugin-api": "^0.6.18",
-    "@backstage/backend-tasks": "^0.5.23",
+    "@backstage/backend-common": "^0.22.1-next.0",
+    "@backstage/backend-plugin-api": "^0.6.19-next.0",
     "@backstage/catalog-model": "^1.5.0",
     "@backstage/config": "^1.2.0",
     "@backstage/integration": "^1.11.0",
-    "@backstage/plugin-catalog-node": "^1.12.0",
+    "@backstage/plugin-catalog-node": "^1.12.1-next.0",
     "fs-extra": "^11.2.0",
     "glob": "^10.3.10",
     "lodash": "^4.17.21",
@@ -39,7 +38,7 @@
     "yaml": "^2.3.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.5",
+    "@backstage/cli": "^0.26.6-next.0",
     "@types/fs-extra": "^11.0.4",
     "@types/glob": "^8.1.0",
     "@types/uuid": "^9.0.7"

diff --git a/plugins/catalog-backend-module-backstage/src/provider/BackstageEntityProvider.ts b/plugins/catalog-backend-module-backstage/src/provider/BackstageEntityProvider.ts
@@ -1,8 +1,3 @@
-import {
-  PluginTaskScheduler,
-  TaskRunner,
-  readTaskScheduleDefinitionFromConfig,
-} from '@backstage/backend-tasks';
 import { Config } from '@backstage/config';
 import {
   GithubCredentialsProvider,
@@ -26,7 +21,12 @@ import { sync as globSync } from 'glob';
 import fs from 'fs-extra';
 import path from 'path';
 import { defaults } from '../constants';
-import { LoggerService } from '@backstage/backend-plugin-api';
+import {
+  LoggerService,
+  SchedulerService,
+  SchedulerServiceTaskRunner,
+  readSchedulerServiceTaskScheduleDefinitionFromConfig,
+} from '@backstage/backend-plugin-api';
 
 export class BackstageEntityProvider implements EntityProvider {
   private readonly logger: LoggerService;
@@ -42,7 +42,7 @@ export class BackstageEntityProvider implements EntityProvider {
     options: {
       logger: LoggerService;
       urlReader: UrlReader;
-      scheduler: PluginTaskScheduler;
+      scheduler: SchedulerService;
     },
   ): BackstageEntityProvider {
     const integrations = ScmIntegrations.fromConfig(config);
@@ -54,7 +54,7 @@ export class BackstageEntityProvider implements EntityProvider {
       );
     }
 
-    const configSchedule = readTaskScheduleDefinitionFromConfig(
+    const configSchedule = readSchedulerServiceTaskScheduleDefinitionFromConfig(
       config.getConfig('catalog.providers.backstage.schedule'),
     );
 
@@ -73,7 +73,7 @@ export class BackstageEntityProvider implements EntityProvider {
   private constructor(
     integration: GithubIntegration,
     logger: LoggerService,
-    taskRunner: TaskRunner,
+    taskRunner: SchedulerServiceTaskRunner,
     urlReader: UrlReader,
     config: Config,
   ) {
@@ -97,7 +97,9 @@ export class BackstageEntityProvider implements EntityProvider {
     return await this.scheduleFn();
   }
 
-  private createScheduleFn(taskRunner: TaskRunner): () => Promise<void> {
+  private createScheduleFn(
+    taskRunner: SchedulerServiceTaskRunner,
+  ): () => Promise<void> {
     return async () => {
       const taskId = `${this.getProviderName()}:refresh`;
       return taskRunner.run({

diff --git a/plugins/scaffolder-backend-module-github-pages/package.json b/plugins/scaffolder-backend-module-github-pages/package.json
@@ -24,16 +24,16 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/backend-plugin-api": "^0.6.18",
+    "@backstage/backend-plugin-api": "^0.6.19-next.0",
     "@backstage/errors": "^1.2.4",
     "@backstage/integration": "^1.11.0",
-    "@backstage/plugin-scaffolder-backend-module-github": "^0.2.8",
-    "@backstage/plugin-scaffolder-node": "^0.4.4",
+    "@backstage/plugin-scaffolder-backend-module-github": "^0.2.9-next.0",
+    "@backstage/plugin-scaffolder-node": "^0.4.5-next.0",
     "octokit": "^3.1.2",
     "yaml": "^2.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.5"
+    "@backstage/cli": "^0.26.6-next.0"
   },
   "files": [
     "dist"