From ae261e79d256abb8b83522a8381a6eb942eb4345 Mon Sep 17 00:00:00 2001 From: Andre Wanlin <67169551+awanlin@users.noreply.github.com> Date: Fri, 16 Jun 2023 17:24:23 -0500 Subject: [PATCH 1/7] Added alpha support for new backend system Signed-off-by: Andre Wanlin <67169551+awanlin@users.noreply.github.com> --- .changeset/popular-crabs-deny.md | 7 ++ packages/backend-next/package.json | 4 + packages/backend-next/src/index.ts | 26 ++++++ plugins/azure-devops-backend/README.md | 28 ++++++ .../azure-devops-backend/alpha-api-report.md | 12 +++ plugins/azure-devops-backend/package.json | 16 ++++ plugins/azure-devops-backend/src/alpha.ts | 16 ++++ plugins/azure-devops-backend/src/plugin.ts | 50 +++++++++++ plugins/devtools-backend/README.md | 28 ++++++ plugins/devtools-backend/alpha-api-report.md | 12 +++ plugins/devtools-backend/package.json | 16 ++++ plugins/devtools-backend/src/alpha.ts | 16 ++++ plugins/devtools-backend/src/plugin.ts | 50 +++++++++++ plugins/linguist-backend/README.md | 41 +++++++++ plugins/linguist-backend/alpha-api-report.md | 30 +++++++ plugins/linguist-backend/package.json | 16 ++++ plugins/linguist-backend/src/alpha.ts | 17 ++++ plugins/linguist-backend/src/plugin.ts | 87 +++++++++++++++++++ yarn.lock | 7 ++ 19 files changed, 479 insertions(+) create mode 100644 .changeset/popular-crabs-deny.md create mode 100644 plugins/azure-devops-backend/alpha-api-report.md create mode 100644 plugins/azure-devops-backend/src/alpha.ts create mode 100644 plugins/azure-devops-backend/src/plugin.ts create mode 100644 plugins/devtools-backend/alpha-api-report.md create mode 100644 plugins/devtools-backend/src/alpha.ts create mode 100644 plugins/devtools-backend/src/plugin.ts create mode 100644 plugins/linguist-backend/alpha-api-report.md create mode 100644 plugins/linguist-backend/src/alpha.ts create mode 100644 plugins/linguist-backend/src/plugin.ts diff --git a/.changeset/popular-crabs-deny.md b/.changeset/popular-crabs-deny.md new file mode 100644 index 0000000000..28b8062d48 --- /dev/null +++ b/.changeset/popular-crabs-deny.md @@ -0,0 +1,7 @@ +--- +'@backstage/plugin-azure-devops-backend': patch +'@backstage/plugin-devtools-backend': patch +'@backstage/plugin-linguist-backend': patch +--- + +Added alpha support for the [new backend system](https://backstage.io/docs/backend-system/) diff --git a/packages/backend-next/package.json b/packages/backend-next/package.json index 04dc3e2cf3..b8e363177b 100644 --- a/packages/backend-next/package.json +++ b/packages/backend-next/package.json @@ -26,13 +26,17 @@ }, "dependencies": { "@backstage/backend-defaults": "workspace:^", + "@backstage/backend-tasks": "workspace:^", "@backstage/plugin-app-backend": "workspace:^", "@backstage/plugin-auth-node": "workspace:^", + "@backstage/plugin-azure-devops-backend": "workspace:^", "@backstage/plugin-badges-backend": "workspace:^", "@backstage/plugin-catalog-backend": "workspace:^", "@backstage/plugin-catalog-backend-module-unprocessed": "workspace:^", + "@backstage/plugin-devtools-backend": "workspace:^", "@backstage/plugin-entity-feedback-backend": "workspace:^", "@backstage/plugin-kubernetes-backend": "workspace:^", + "@backstage/plugin-linguist-backend": "workspace:^", "@backstage/plugin-permission-backend": "workspace:^", "@backstage/plugin-permission-common": "workspace:^", "@backstage/plugin-permission-node": "workspace:^", diff --git a/packages/backend-next/src/index.ts b/packages/backend-next/src/index.ts index 60b5315ab0..c064f2acb9 100644 --- a/packages/backend-next/src/index.ts +++ b/packages/backend-next/src/index.ts @@ -33,6 +33,10 @@ import { todoPlugin } from '@backstage/plugin-todo-backend'; import { entityFeedbackPlugin } from '@backstage/plugin-entity-feedback-backend'; import { catalogModuleUnprocessedEntities } from '@backstage/plugin-catalog-backend-module-unprocessed'; import { badgesPlugin } from '@backstage/plugin-badges-backend'; +import { azureDevOpsPlugin } from '@backstage/plugin-azure-devops-backend/alpha'; +import { linguistPlugin } from '@backstage/plugin-linguist-backend/alpha'; +import { devtoolsPlugin } from '@backstage/plugin-devtools-backend/alpha'; +import { TaskScheduleDefinition } from '@backstage/backend-tasks'; const backend = createBackend(); @@ -41,9 +45,31 @@ backend.add(appPlugin({ appPackageName: 'example-app' })); // Badges backend.add(badgesPlugin()); +// Azure DevOps +backend.add(azureDevOpsPlugin()); + +// DevTools +backend.add(devtoolsPlugin()); + // Entity Feedback backend.add(entityFeedbackPlugin()); +// Linguist +const linguistSchedule: TaskScheduleDefinition = { + frequency: { minutes: 2 }, + timeout: { minutes: 15 }, + initialDelay: { seconds: 15 }, +}; + +backend.add( + linguistPlugin({ + schedule: linguistSchedule, + age: { days: 30 }, + batchSize: 2, + useSourceLocation: false, + }), +); + // Todo backend.add(todoPlugin()); diff --git a/plugins/azure-devops-backend/README.md b/plugins/azure-devops-backend/README.md index ba2a847c0a..d51758aec5 100644 --- a/plugins/azure-devops-backend/README.md +++ b/plugins/azure-devops-backend/README.md @@ -70,6 +70,34 @@ Here's how to get the backend up and running: 4. Now run `yarn start-backend` from the repo root 5. Finally open `http://localhost:7007/api/azure-devops/health` in a browser and it should return `{"status":"ok"}` +#### New Backend System + +The Azure DevOps backend plugin has alpha support for the [new backend system](https://backstage.io/docs/backend-system/), here's how you can set that up: + +In your `packages/backend/src/index.ts` make the following changes: + +```diff + import { createBackend } from '@backstage/backend-defaults'; + import { appPlugin } from '@backstage/plugin-app-backend'; + import { catalogPlugin } from '@backstage/plugin-catalog-backend'; + import { + scaffolderPlugin, + catalogModuleTemplateKind, + } from '@backstage/plugin-scaffolder-backend'; ++ import { azureDevOpsPlugin } from '@backstage/plugin-azure-devops-backend/alpha'; + + const backend = createBackend(); + + backend.add(appPlugin()); + backend.add(catalogPlugin()); + backend.add(catalogModuleTemplateKind()); + backend.add(scaffolderPlugin()); + ++ backend.add(azureDevOpsPlugin()); + + backend.start(); +``` + ## Links - [Frontend part of the plugin](https://github.com/backstage/backstage/tree/master/plugins/azure-devops) diff --git a/plugins/azure-devops-backend/alpha-api-report.md b/plugins/azure-devops-backend/alpha-api-report.md new file mode 100644 index 0000000000..e258f51a4f --- /dev/null +++ b/plugins/azure-devops-backend/alpha-api-report.md @@ -0,0 +1,12 @@ +## API Report File for "@backstage/plugin-azure-devops-backend" + +> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). + +```ts +import { BackendFeature } from '@backstage/backend-plugin-api'; + +// @alpha +export const azureDevOpsPlugin: () => BackendFeature; + +// (No @packageDocumentation comment for this package) +``` diff --git a/plugins/azure-devops-backend/package.json b/plugins/azure-devops-backend/package.json index 00af05df92..44b4342cf1 100644 --- a/plugins/azure-devops-backend/package.json +++ b/plugins/azure-devops-backend/package.json @@ -9,6 +9,21 @@ "main": "dist/index.cjs.js", "types": "dist/index.d.ts" }, + "exports": { + ".": "./src/index.ts", + "./alpha": "./src/alpha.ts", + "./package.json": "./package.json" + }, + "typesVersions": { + "*": { + "alpha": [ + "src/alpha.ts" + ], + "package.json": [ + "package.json" + ] + } + }, "backstage": { "role": "backend-plugin" }, @@ -23,6 +38,7 @@ }, "dependencies": { "@backstage/backend-common": "workspace:^", + "@backstage/backend-plugin-api": "workspace:^", "@backstage/config": "workspace:^", "@backstage/plugin-azure-devops-common": "workspace:^", "@types/express": "^4.17.6", diff --git a/plugins/azure-devops-backend/src/alpha.ts b/plugins/azure-devops-backend/src/alpha.ts new file mode 100644 index 0000000000..dc321ef4de --- /dev/null +++ b/plugins/azure-devops-backend/src/alpha.ts @@ -0,0 +1,16 @@ +/* + * 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 { azureDevOpsPlugin } from './plugin'; diff --git a/plugins/azure-devops-backend/src/plugin.ts b/plugins/azure-devops-backend/src/plugin.ts new file mode 100644 index 0000000000..e6cf01b182 --- /dev/null +++ b/plugins/azure-devops-backend/src/plugin.ts @@ -0,0 +1,50 @@ +/* + * 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. + */ + +import { loggerToWinstonLogger } from '@backstage/backend-common'; +import { + coreServices, + createBackendPlugin, +} from '@backstage/backend-plugin-api'; +import { createRouter } from './service/router'; + +/** + * Azure DevOps backend plugin + * + * @alpha + */ +export const azureDevOpsPlugin = createBackendPlugin({ + pluginId: 'azure-devops', + register(env) { + env.registerInit({ + deps: { + config: coreServices.config, + logger: coreServices.logger, + reader: coreServices.urlReader, + httpRouter: coreServices.httpRouter, + }, + async init({ config, logger, reader, httpRouter }) { + httpRouter.use( + await createRouter({ + config, + logger: loggerToWinstonLogger(logger), + reader, + }), + ); + }, + }); + }, +}); diff --git a/plugins/devtools-backend/README.md b/plugins/devtools-backend/README.md index 7304ce33d7..7a8ca3104a 100644 --- a/plugins/devtools-backend/README.md +++ b/plugins/devtools-backend/README.md @@ -49,6 +49,34 @@ Here's how to get the DevTools Backend up and running: 4. Now run `yarn start-backend` from the repo root 5. Finally open `http://localhost:7007/api/devtools/health` in a browser and it should return `{"status":"ok"}` +### New Backend System + +The DevTools backend plugin has alpha support for the [new backend system](https://backstage.io/docs/backend-system/), here's how you can set that up: + +In your `packages/backend/src/index.ts` make the following changes: + +```diff + import { createBackend } from '@backstage/backend-defaults'; + import { appPlugin } from '@backstage/plugin-app-backend'; + import { catalogPlugin } from '@backstage/plugin-catalog-backend'; + import { + scaffolderPlugin, + catalogModuleTemplateKind, + } from '@backstage/plugin-scaffolder-backend'; ++ import { devtoolsPlugin } from '@backstage/plugin-devtools-backend/alpha'; + + const backend = createBackend(); + + backend.add(appPlugin()); + backend.add(catalogPlugin()); + backend.add(catalogModuleTemplateKind()); + backend.add(scaffolderPlugin()); + ++ backend.add(devtoolsPlugin()); + + backend.start(); +``` + ## Links - [Frontend part of the plugin](../devtools/README.md) diff --git a/plugins/devtools-backend/alpha-api-report.md b/plugins/devtools-backend/alpha-api-report.md new file mode 100644 index 0000000000..0be1ac4891 --- /dev/null +++ b/plugins/devtools-backend/alpha-api-report.md @@ -0,0 +1,12 @@ +## API Report File for "@backstage/plugin-devtools-backend" + +> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). + +```ts +import { BackendFeature } from '@backstage/backend-plugin-api'; + +// @alpha +export const devtoolsPlugin: () => BackendFeature; + +// (No @packageDocumentation comment for this package) +``` diff --git a/plugins/devtools-backend/package.json b/plugins/devtools-backend/package.json index ba8529e650..bc71e58493 100644 --- a/plugins/devtools-backend/package.json +++ b/plugins/devtools-backend/package.json @@ -9,6 +9,21 @@ "main": "dist/index.cjs.js", "types": "dist/index.d.ts" }, + "exports": { + ".": "./src/index.ts", + "./alpha": "./src/alpha.ts", + "./package.json": "./package.json" + }, + "typesVersions": { + "*": { + "alpha": [ + "src/alpha.ts" + ], + "package.json": [ + "package.json" + ] + } + }, "backstage": { "role": "backend-plugin" }, @@ -23,6 +38,7 @@ }, "dependencies": { "@backstage/backend-common": "workspace:^", + "@backstage/backend-plugin-api": "workspace:^", "@backstage/cli-common": "workspace:^", "@backstage/config": "workspace:^", "@backstage/config-loader": "workspace:^", diff --git a/plugins/devtools-backend/src/alpha.ts b/plugins/devtools-backend/src/alpha.ts new file mode 100644 index 0000000000..fa4c290fb8 --- /dev/null +++ b/plugins/devtools-backend/src/alpha.ts @@ -0,0 +1,16 @@ +/* + * 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 { devtoolsPlugin } from './plugin'; diff --git a/plugins/devtools-backend/src/plugin.ts b/plugins/devtools-backend/src/plugin.ts new file mode 100644 index 0000000000..530ad74292 --- /dev/null +++ b/plugins/devtools-backend/src/plugin.ts @@ -0,0 +1,50 @@ +/* + * 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. + */ + +import { loggerToWinstonLogger } from '@backstage/backend-common'; +import { + coreServices, + createBackendPlugin, +} from '@backstage/backend-plugin-api'; +import { createRouter } from './service/router'; + +/** + * Azure DevOps backend plugin + * + * @alpha + */ +export const devtoolsPlugin = createBackendPlugin({ + pluginId: 'devtools', + register(env) { + env.registerInit({ + deps: { + config: coreServices.config, + logger: coreServices.logger, + permissions: coreServices.permissions, + httpRouter: coreServices.httpRouter, + }, + async init({ config, logger, permissions, httpRouter }) { + httpRouter.use( + await createRouter({ + config, + logger: loggerToWinstonLogger(logger), + permissions, + }), + ); + }, + }); + }, +}); diff --git a/plugins/linguist-backend/README.md b/plugins/linguist-backend/README.md index 6cfd3800b6..462adc495e 100644 --- a/plugins/linguist-backend/README.md +++ b/plugins/linguist-backend/README.md @@ -56,6 +56,47 @@ Here's how to get the backend up and running: 4. Now run `yarn start-backend` from the repo root 5. Finally open `http://localhost:7007/api/linguist/health` in a browser and it should return `{"status":"ok"}` +#### New Backend System + +The Linguist backend plugin has alpha support for the [new backend system](https://backstage.io/docs/backend-system/), here's how you can set that up: + +In your `packages/backend/src/index.ts` make the following changes: + +```diff + import { createBackend } from '@backstage/backend-defaults'; + import { appPlugin } from '@backstage/plugin-app-backend'; + import { catalogPlugin } from '@backstage/plugin-catalog-backend'; + import { + scaffolderPlugin, + catalogModuleTemplateKind, + } from '@backstage/plugin-scaffolder-backend'; ++ import { linguistPlugin } from '@backstage/plugin-linguist-backend/alpha'; + + const backend = createBackend(); + + backend.add(appPlugin()); + backend.add(catalogPlugin()); + backend.add(catalogModuleTemplateKind()); + backend.add(scaffolderPlugin()); + ++ const linguistSchedule: TaskScheduleDefinition = { ++ frequency: { minutes: 2 }, ++ timeout: { minutes: 15 }, ++ initialDelay: { seconds: 15 }, ++ }; + ++ backend.add( ++ linguistPlugin({ ++ schedule: linguistSchedule, ++ age: { days: 30 }, ++ batchSize: 2, ++ useSourceLocation: false, ++ }), ++ ); + + backend.start(); +``` + ## Plugin Option The Linguist backend has various plugin options that you can provide to the `createRouter` function in your `packages/backend/src/plugins/linguist.ts` file that will allow you to configure various aspects of how it works. The following sections go into the details of these options diff --git a/plugins/linguist-backend/alpha-api-report.md b/plugins/linguist-backend/alpha-api-report.md new file mode 100644 index 0000000000..fb0e906f64 --- /dev/null +++ b/plugins/linguist-backend/alpha-api-report.md @@ -0,0 +1,30 @@ +## API Report File for "@backstage/plugin-linguist-backend" + +> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). + +```ts +import { BackendFeature } from '@backstage/backend-plugin-api'; +import { HumanDuration } from '@backstage/types'; +import { TaskScheduleDefinition } from '@backstage/backend-tasks'; + +// @alpha +export const linguistPlugin: (options: LinguistPluginOptions) => BackendFeature; + +// @alpha +export interface LinguistPluginOptions { + // (undocumented) + age?: HumanDuration; + // (undocumented) + batchSize?: number; + // (undocumented) + kind?: string[]; + // (undocumented) + linguistJsOptions?: Record; + // (undocumented) + schedule?: TaskScheduleDefinition; + // (undocumented) + useSourceLocation?: boolean; +} + +// (No @packageDocumentation comment for this package) +``` diff --git a/plugins/linguist-backend/package.json b/plugins/linguist-backend/package.json index e4eaeb337a..1e75aa6303 100644 --- a/plugins/linguist-backend/package.json +++ b/plugins/linguist-backend/package.json @@ -9,6 +9,21 @@ "main": "dist/index.cjs.js", "types": "dist/index.d.ts" }, + "exports": { + ".": "./src/index.ts", + "./alpha": "./src/alpha.ts", + "./package.json": "./package.json" + }, + "typesVersions": { + "*": { + "alpha": [ + "src/alpha.ts" + ], + "package.json": [ + "package.json" + ] + } + }, "backstage": { "role": "backend-plugin" }, @@ -23,6 +38,7 @@ }, "dependencies": { "@backstage/backend-common": "workspace:^", + "@backstage/backend-plugin-api": "workspace:^", "@backstage/backend-tasks": "workspace:^", "@backstage/catalog-client": "workspace:^", "@backstage/catalog-model": "workspace:^", diff --git a/plugins/linguist-backend/src/alpha.ts b/plugins/linguist-backend/src/alpha.ts new file mode 100644 index 0000000000..c149e2b179 --- /dev/null +++ b/plugins/linguist-backend/src/alpha.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 { linguistPlugin } from './plugin'; +export type { LinguistPluginOptions } from './plugin'; diff --git a/plugins/linguist-backend/src/plugin.ts b/plugins/linguist-backend/src/plugin.ts new file mode 100644 index 0000000000..8f038a563a --- /dev/null +++ b/plugins/linguist-backend/src/plugin.ts @@ -0,0 +1,87 @@ +/* + * 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. + */ + +import { loggerToWinstonLogger } from '@backstage/backend-common'; +import { + coreServices, + createBackendPlugin, +} from '@backstage/backend-plugin-api'; +import { createRouter } from './service/router'; +import { TaskScheduleDefinition } from '@backstage/backend-tasks'; +import { HumanDuration } from '@backstage/types'; + +/** + * Options for Linguist backend plugin + * + * @alpha + */ +export interface LinguistPluginOptions { + schedule?: TaskScheduleDefinition; + age?: HumanDuration; + batchSize?: number; + useSourceLocation?: boolean; + linguistJsOptions?: Record; + kind?: string[]; +} + +/** + * Linguist backend plugin + * + * @alpha + */ +export const linguistPlugin = createBackendPlugin( + (options: LinguistPluginOptions) => ({ + pluginId: 'linguist', + register(env) { + env.registerInit({ + deps: { + logger: coreServices.logger, + reader: coreServices.urlReader, + database: coreServices.database, + discovery: coreServices.discovery, + scheduler: coreServices.scheduler, + tokenManager: coreServices.tokenManager, + httpRouter: coreServices.httpRouter, + }, + async init({ + logger, + reader, + database, + discovery, + scheduler, + tokenManager, + httpRouter, + }) { + httpRouter.use( + await createRouter( + { + ...options, + }, + { + logger: loggerToWinstonLogger(logger), + reader, + database, + discovery, + scheduler, + tokenManager, + }, + ), + ); + }, + }); + }, + }), +); diff --git a/yarn.lock b/yarn.lock index 79561514f7..bb795ca564 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5011,6 +5011,7 @@ __metadata: resolution: "@backstage/plugin-azure-devops-backend@workspace:plugins/azure-devops-backend" dependencies: "@backstage/backend-common": "workspace:^" + "@backstage/backend-plugin-api": "workspace:^" "@backstage/cli": "workspace:^" "@backstage/config": "workspace:^" "@backstage/plugin-azure-devops-common": "workspace:^" @@ -6353,6 +6354,7 @@ __metadata: resolution: "@backstage/plugin-devtools-backend@workspace:plugins/devtools-backend" dependencies: "@backstage/backend-common": "workspace:^" + "@backstage/backend-plugin-api": "workspace:^" "@backstage/cli": "workspace:^" "@backstage/cli-common": "workspace:^" "@backstage/config": "workspace:^" @@ -7723,6 +7725,7 @@ __metadata: resolution: "@backstage/plugin-linguist-backend@workspace:plugins/linguist-backend" dependencies: "@backstage/backend-common": "workspace:^" + "@backstage/backend-plugin-api": "workspace:^" "@backstage/backend-tasks": "workspace:^" "@backstage/backend-test-utils": "workspace:^" "@backstage/catalog-client": "workspace:^" @@ -24925,14 +24928,18 @@ __metadata: resolution: "example-backend-next@workspace:packages/backend-next" dependencies: "@backstage/backend-defaults": "workspace:^" + "@backstage/backend-tasks": "workspace:^" "@backstage/cli": "workspace:^" "@backstage/plugin-app-backend": "workspace:^" "@backstage/plugin-auth-node": "workspace:^" + "@backstage/plugin-azure-devops-backend": "workspace:^" "@backstage/plugin-badges-backend": "workspace:^" "@backstage/plugin-catalog-backend": "workspace:^" "@backstage/plugin-catalog-backend-module-unprocessed": "workspace:^" + "@backstage/plugin-devtools-backend": "workspace:^" "@backstage/plugin-entity-feedback-backend": "workspace:^" "@backstage/plugin-kubernetes-backend": "workspace:^" + "@backstage/plugin-linguist-backend": "workspace:^" "@backstage/plugin-permission-backend": "workspace:^" "@backstage/plugin-permission-common": "workspace:^" "@backstage/plugin-permission-node": "workspace:^" From c7f5324fa0e43bd62cd8b9df2b9bfe8092c8fca4 Mon Sep 17 00:00:00 2001 From: Andre Wanlin <67169551+awanlin@users.noreply.github.com> Date: Fri, 23 Jun 2023 12:46:23 -0500 Subject: [PATCH 2/7] Changed @alpha to @public Signed-off-by: Andre Wanlin <67169551+awanlin@users.noreply.github.com> --- packages/backend-next/src/index.ts | 6 ++-- .../azure-devops-backend/alpha-api-report.md | 12 -------- plugins/azure-devops-backend/api-report.md | 6 ++-- plugins/azure-devops-backend/package.json | 4 --- plugins/azure-devops-backend/src/alpha.ts | 16 ---------- plugins/azure-devops-backend/src/index.ts | 8 +++++ plugins/azure-devops-backend/src/plugin.ts | 2 +- plugins/devtools-backend/alpha-api-report.md | 12 -------- plugins/devtools-backend/api-report.md | 4 +++ plugins/devtools-backend/package.json | 4 --- plugins/devtools-backend/src/alpha.ts | 16 ---------- plugins/devtools-backend/src/index.ts | 1 + plugins/devtools-backend/src/plugin.ts | 4 +-- plugins/linguist-backend/alpha-api-report.md | 30 ------------------- plugins/linguist-backend/package.json | 4 --- plugins/linguist-backend/src/alpha.ts | 17 ----------- plugins/linguist-backend/src/index.ts | 8 +++++ plugins/linguist-backend/src/plugin.ts | 4 +-- 18 files changed, 33 insertions(+), 125 deletions(-) delete mode 100644 plugins/azure-devops-backend/alpha-api-report.md delete mode 100644 plugins/azure-devops-backend/src/alpha.ts delete mode 100644 plugins/devtools-backend/alpha-api-report.md delete mode 100644 plugins/devtools-backend/src/alpha.ts delete mode 100644 plugins/linguist-backend/alpha-api-report.md delete mode 100644 plugins/linguist-backend/src/alpha.ts diff --git a/packages/backend-next/src/index.ts b/packages/backend-next/src/index.ts index c064f2acb9..7f21b23a85 100644 --- a/packages/backend-next/src/index.ts +++ b/packages/backend-next/src/index.ts @@ -33,9 +33,9 @@ import { todoPlugin } from '@backstage/plugin-todo-backend'; import { entityFeedbackPlugin } from '@backstage/plugin-entity-feedback-backend'; import { catalogModuleUnprocessedEntities } from '@backstage/plugin-catalog-backend-module-unprocessed'; import { badgesPlugin } from '@backstage/plugin-badges-backend'; -import { azureDevOpsPlugin } from '@backstage/plugin-azure-devops-backend/alpha'; -import { linguistPlugin } from '@backstage/plugin-linguist-backend/alpha'; -import { devtoolsPlugin } from '@backstage/plugin-devtools-backend/alpha'; +import { azureDevOpsPlugin } from '@backstage/plugin-azure-devops-backend'; +import { linguistPlugin } from '@backstage/plugin-linguist-backend'; +import { devtoolsPlugin } from '@backstage/plugin-devtools-backend'; import { TaskScheduleDefinition } from '@backstage/backend-tasks'; const backend = createBackend(); diff --git a/plugins/azure-devops-backend/alpha-api-report.md b/plugins/azure-devops-backend/alpha-api-report.md deleted file mode 100644 index e258f51a4f..0000000000 --- a/plugins/azure-devops-backend/alpha-api-report.md +++ /dev/null @@ -1,12 +0,0 @@ -## API Report File for "@backstage/plugin-azure-devops-backend" - -> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). - -```ts -import { BackendFeature } from '@backstage/backend-plugin-api'; - -// @alpha -export const azureDevOpsPlugin: () => BackendFeature; - -// (No @packageDocumentation comment for this package) -``` diff --git a/plugins/azure-devops-backend/api-report.md b/plugins/azure-devops-backend/api-report.md index 900b3c3d12..a2a43cd6af 100644 --- a/plugins/azure-devops-backend/api-report.md +++ b/plugins/azure-devops-backend/api-report.md @@ -3,6 +3,7 @@ > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). ```ts +import { BackendFeature } from '@backstage/backend-plugin-api'; import { Build } from 'azure-devops-node-api/interfaces/BuildInterfaces'; import { BuildDefinitionReference } from 'azure-devops-node-api/interfaces/BuildInterfaces'; import { BuildRun } from '@backstage/plugin-azure-devops-common'; @@ -94,6 +95,9 @@ export class AzureDevOpsApi { }): Promise; } +// @public +export const azureDevOpsPlugin: () => BackendFeature; + // @public (undocumented) export function createRouter(options: RouterOptions): Promise; @@ -108,6 +112,4 @@ export interface RouterOptions { // (undocumented) reader: UrlReader; } - -// (No @packageDocumentation comment for this package) ``` diff --git a/plugins/azure-devops-backend/package.json b/plugins/azure-devops-backend/package.json index 44b4342cf1..87b02e9298 100644 --- a/plugins/azure-devops-backend/package.json +++ b/plugins/azure-devops-backend/package.json @@ -11,14 +11,10 @@ }, "exports": { ".": "./src/index.ts", - "./alpha": "./src/alpha.ts", "./package.json": "./package.json" }, "typesVersions": { "*": { - "alpha": [ - "src/alpha.ts" - ], "package.json": [ "package.json" ] diff --git a/plugins/azure-devops-backend/src/alpha.ts b/plugins/azure-devops-backend/src/alpha.ts deleted file mode 100644 index dc321ef4de..0000000000 --- a/plugins/azure-devops-backend/src/alpha.ts +++ /dev/null @@ -1,16 +0,0 @@ -/* - * 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 { azureDevOpsPlugin } from './plugin'; diff --git a/plugins/azure-devops-backend/src/index.ts b/plugins/azure-devops-backend/src/index.ts index 6977d3580f..c0b1276acf 100644 --- a/plugins/azure-devops-backend/src/index.ts +++ b/plugins/azure-devops-backend/src/index.ts @@ -13,5 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +/** + * Azure DevOps backend plugin that contains the API for retrieving builds, pull requests, etc. which is used by the Azure DevOps frontend plugin. + * + * @packageDocumentation + */ + export { AzureDevOpsApi } from './api'; export * from './service/router'; +export { azureDevOpsPlugin } from './plugin'; diff --git a/plugins/azure-devops-backend/src/plugin.ts b/plugins/azure-devops-backend/src/plugin.ts index e6cf01b182..808bdfa248 100644 --- a/plugins/azure-devops-backend/src/plugin.ts +++ b/plugins/azure-devops-backend/src/plugin.ts @@ -24,7 +24,7 @@ import { createRouter } from './service/router'; /** * Azure DevOps backend plugin * - * @alpha + * @public */ export const azureDevOpsPlugin = createBackendPlugin({ pluginId: 'azure-devops', diff --git a/plugins/devtools-backend/alpha-api-report.md b/plugins/devtools-backend/alpha-api-report.md deleted file mode 100644 index 0be1ac4891..0000000000 --- a/plugins/devtools-backend/alpha-api-report.md +++ /dev/null @@ -1,12 +0,0 @@ -## API Report File for "@backstage/plugin-devtools-backend" - -> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). - -```ts -import { BackendFeature } from '@backstage/backend-plugin-api'; - -// @alpha -export const devtoolsPlugin: () => BackendFeature; - -// (No @packageDocumentation comment for this package) -``` diff --git a/plugins/devtools-backend/api-report.md b/plugins/devtools-backend/api-report.md index e28f0697ab..dc51fc8387 100644 --- a/plugins/devtools-backend/api-report.md +++ b/plugins/devtools-backend/api-report.md @@ -3,6 +3,7 @@ > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). ```ts +import { BackendFeature } from '@backstage/backend-plugin-api'; import { Config } from '@backstage/config'; import { ConfigInfo } from '@backstage/plugin-devtools-common'; import { DevToolsInfo } from '@backstage/plugin-devtools-common'; @@ -25,6 +26,9 @@ export class DevToolsBackendApi { listInfo(): Promise; } +// @public +export const devtoolsPlugin: () => BackendFeature; + // @public (undocumented) export interface RouterOptions { // (undocumented) diff --git a/plugins/devtools-backend/package.json b/plugins/devtools-backend/package.json index bc71e58493..14d59b0715 100644 --- a/plugins/devtools-backend/package.json +++ b/plugins/devtools-backend/package.json @@ -11,14 +11,10 @@ }, "exports": { ".": "./src/index.ts", - "./alpha": "./src/alpha.ts", "./package.json": "./package.json" }, "typesVersions": { "*": { - "alpha": [ - "src/alpha.ts" - ], "package.json": [ "package.json" ] diff --git a/plugins/devtools-backend/src/alpha.ts b/plugins/devtools-backend/src/alpha.ts deleted file mode 100644 index fa4c290fb8..0000000000 --- a/plugins/devtools-backend/src/alpha.ts +++ /dev/null @@ -1,16 +0,0 @@ -/* - * 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 { devtoolsPlugin } from './plugin'; diff --git a/plugins/devtools-backend/src/index.ts b/plugins/devtools-backend/src/index.ts index e1545e0022..57c1739c34 100644 --- a/plugins/devtools-backend/src/index.ts +++ b/plugins/devtools-backend/src/index.ts @@ -22,3 +22,4 @@ export { DevToolsBackendApi } from './api'; export * from './service/router'; +export { devtoolsPlugin } from './plugin'; diff --git a/plugins/devtools-backend/src/plugin.ts b/plugins/devtools-backend/src/plugin.ts index 530ad74292..01e03e3609 100644 --- a/plugins/devtools-backend/src/plugin.ts +++ b/plugins/devtools-backend/src/plugin.ts @@ -22,9 +22,9 @@ import { import { createRouter } from './service/router'; /** - * Azure DevOps backend plugin + * DevTools backend plugin * - * @alpha + * @public */ export const devtoolsPlugin = createBackendPlugin({ pluginId: 'devtools', diff --git a/plugins/linguist-backend/alpha-api-report.md b/plugins/linguist-backend/alpha-api-report.md deleted file mode 100644 index fb0e906f64..0000000000 --- a/plugins/linguist-backend/alpha-api-report.md +++ /dev/null @@ -1,30 +0,0 @@ -## API Report File for "@backstage/plugin-linguist-backend" - -> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). - -```ts -import { BackendFeature } from '@backstage/backend-plugin-api'; -import { HumanDuration } from '@backstage/types'; -import { TaskScheduleDefinition } from '@backstage/backend-tasks'; - -// @alpha -export const linguistPlugin: (options: LinguistPluginOptions) => BackendFeature; - -// @alpha -export interface LinguistPluginOptions { - // (undocumented) - age?: HumanDuration; - // (undocumented) - batchSize?: number; - // (undocumented) - kind?: string[]; - // (undocumented) - linguistJsOptions?: Record; - // (undocumented) - schedule?: TaskScheduleDefinition; - // (undocumented) - useSourceLocation?: boolean; -} - -// (No @packageDocumentation comment for this package) -``` diff --git a/plugins/linguist-backend/package.json b/plugins/linguist-backend/package.json index 1e75aa6303..55e19b443d 100644 --- a/plugins/linguist-backend/package.json +++ b/plugins/linguist-backend/package.json @@ -11,14 +11,10 @@ }, "exports": { ".": "./src/index.ts", - "./alpha": "./src/alpha.ts", "./package.json": "./package.json" }, "typesVersions": { "*": { - "alpha": [ - "src/alpha.ts" - ], "package.json": [ "package.json" ] diff --git a/plugins/linguist-backend/src/alpha.ts b/plugins/linguist-backend/src/alpha.ts deleted file mode 100644 index c149e2b179..0000000000 --- a/plugins/linguist-backend/src/alpha.ts +++ /dev/null @@ -1,17 +0,0 @@ -/* - * 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 { linguistPlugin } from './plugin'; -export type { LinguistPluginOptions } from './plugin'; diff --git a/plugins/linguist-backend/src/index.ts b/plugins/linguist-backend/src/index.ts index 37ecf2d47f..6ac1c3770a 100644 --- a/plugins/linguist-backend/src/index.ts +++ b/plugins/linguist-backend/src/index.ts @@ -14,5 +14,13 @@ * limitations under the License. */ +/** + * Linguist backend plugin that contains the API for generating and retrieving language breakdown which is used by the Linguist frontend plugin. + * + * @packageDocumentation + */ + export * from './service/router'; export type { LinguistBackendApi } from './api'; +export { linguistPlugin } from './plugin'; +export type { LinguistPluginOptions } from './plugin'; diff --git a/plugins/linguist-backend/src/plugin.ts b/plugins/linguist-backend/src/plugin.ts index 8f038a563a..f655d6a1f4 100644 --- a/plugins/linguist-backend/src/plugin.ts +++ b/plugins/linguist-backend/src/plugin.ts @@ -26,7 +26,7 @@ import { HumanDuration } from '@backstage/types'; /** * Options for Linguist backend plugin * - * @alpha + * @public */ export interface LinguistPluginOptions { schedule?: TaskScheduleDefinition; @@ -40,7 +40,7 @@ export interface LinguistPluginOptions { /** * Linguist backend plugin * - * @alpha + * @public */ export const linguistPlugin = createBackendPlugin( (options: LinguistPluginOptions) => ({ From a9cadcc634be283c508761dc560b7e33d7de3b29 Mon Sep 17 00:00:00 2001 From: Andre Wanlin <67169551+awanlin@users.noreply.github.com> Date: Fri, 23 Jun 2023 12:56:31 -0500 Subject: [PATCH 3/7] Updated READMEs Signed-off-by: Andre Wanlin <67169551+awanlin@users.noreply.github.com> --- plugins/azure-devops-backend/README.md | 13 ++----------- plugins/devtools-backend/README.md | 15 +++------------ plugins/linguist-backend/README.md | 15 +++------------ 3 files changed, 8 insertions(+), 35 deletions(-) diff --git a/plugins/azure-devops-backend/README.md b/plugins/azure-devops-backend/README.md index d51758aec5..3bc17e32e7 100644 --- a/plugins/azure-devops-backend/README.md +++ b/plugins/azure-devops-backend/README.md @@ -72,26 +72,17 @@ Here's how to get the backend up and running: #### New Backend System -The Azure DevOps backend plugin has alpha support for the [new backend system](https://backstage.io/docs/backend-system/), here's how you can set that up: +The Azure DevOps backend plugin has support for the [new backend system](https://backstage.io/docs/backend-system/), here's how you can set that up: In your `packages/backend/src/index.ts` make the following changes: ```diff import { createBackend } from '@backstage/backend-defaults'; - import { appPlugin } from '@backstage/plugin-app-backend'; - import { catalogPlugin } from '@backstage/plugin-catalog-backend'; - import { - scaffolderPlugin, - catalogModuleTemplateKind, - } from '@backstage/plugin-scaffolder-backend'; + import { azureDevOpsPlugin } from '@backstage/plugin-azure-devops-backend/alpha'; const backend = createBackend(); - backend.add(appPlugin()); - backend.add(catalogPlugin()); - backend.add(catalogModuleTemplateKind()); - backend.add(scaffolderPlugin()); + // ... other feature additions + backend.add(azureDevOpsPlugin()); diff --git a/plugins/devtools-backend/README.md b/plugins/devtools-backend/README.md index 7a8ca3104a..5290e76f58 100644 --- a/plugins/devtools-backend/README.md +++ b/plugins/devtools-backend/README.md @@ -51,26 +51,17 @@ Here's how to get the DevTools Backend up and running: ### New Backend System -The DevTools backend plugin has alpha support for the [new backend system](https://backstage.io/docs/backend-system/), here's how you can set that up: +The DevTools backend plugin has support for the [new backend system](https://backstage.io/docs/backend-system/), here's how you can set that up: In your `packages/backend/src/index.ts` make the following changes: ```diff import { createBackend } from '@backstage/backend-defaults'; - import { appPlugin } from '@backstage/plugin-app-backend'; - import { catalogPlugin } from '@backstage/plugin-catalog-backend'; - import { - scaffolderPlugin, - catalogModuleTemplateKind, - } from '@backstage/plugin-scaffolder-backend'; + import { devtoolsPlugin } from '@backstage/plugin-devtools-backend/alpha'; const backend = createBackend(); - backend.add(appPlugin()); - backend.add(catalogPlugin()); - backend.add(catalogModuleTemplateKind()); - backend.add(scaffolderPlugin()); + // ... other feature additions + backend.add(devtoolsPlugin()); @@ -79,5 +70,5 @@ In your `packages/backend/src/index.ts` make the following changes: ## Links -- [Frontend part of the plugin](../devtools/README.md) +- [Frontend part of the plugin](https://github.com/backstage/backstage/tree/master/plugins/devtools) - [The Backstage homepage](https://backstage.io) diff --git a/plugins/linguist-backend/README.md b/plugins/linguist-backend/README.md index 462adc495e..543fe192fe 100644 --- a/plugins/linguist-backend/README.md +++ b/plugins/linguist-backend/README.md @@ -58,26 +58,17 @@ Here's how to get the backend up and running: #### New Backend System -The Linguist backend plugin has alpha support for the [new backend system](https://backstage.io/docs/backend-system/), here's how you can set that up: +The Linguist backend plugin has support for the [new backend system](https://backstage.io/docs/backend-system/), here's how you can set that up: In your `packages/backend/src/index.ts` make the following changes: ```diff import { createBackend } from '@backstage/backend-defaults'; - import { appPlugin } from '@backstage/plugin-app-backend'; - import { catalogPlugin } from '@backstage/plugin-catalog-backend'; - import { - scaffolderPlugin, - catalogModuleTemplateKind, - } from '@backstage/plugin-scaffolder-backend'; + import { linguistPlugin } from '@backstage/plugin-linguist-backend/alpha'; const backend = createBackend(); - backend.add(appPlugin()); - backend.add(catalogPlugin()); - backend.add(catalogModuleTemplateKind()); - backend.add(scaffolderPlugin()); + // ... other feature additions + const linguistSchedule: TaskScheduleDefinition = { + frequency: { minutes: 2 }, @@ -155,5 +146,5 @@ return createRouter( ## Links -- [Frontend part of the plugin](../linguist/README.md) +- [Frontend part of the plugin](https://github.com/backstage/backstage/tree/master/linguist) - [The Backstage homepage](https://backstage.io) From cb336721001f7d2d9d0767abcb321dfe6eac724f Mon Sep 17 00:00:00 2001 From: Andre Wanlin <67169551+awanlin@users.noreply.github.com> Date: Tue, 27 Jun 2023 11:29:52 -0500 Subject: [PATCH 4/7] Udpated api-report Signed-off-by: Andre Wanlin <67169551+awanlin@users.noreply.github.com> --- plugins/linguist-backend/api-report.md | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/plugins/linguist-backend/api-report.md b/plugins/linguist-backend/api-report.md index 294d569ff7..cd2c9cb3f3 100644 --- a/plugins/linguist-backend/api-report.md +++ b/plugins/linguist-backend/api-report.md @@ -3,6 +3,7 @@ > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). ```ts +import { BackendFeature } from '@backstage/backend-plugin-api'; import express from 'express'; import { HumanDuration } from '@backstage/types'; import { Languages } from '@backstage/plugin-linguist-common'; @@ -28,6 +29,25 @@ export interface LinguistBackendApi { processEntities(): Promise; } +// @public +export const linguistPlugin: (options: LinguistPluginOptions) => BackendFeature; + +// @public +export interface LinguistPluginOptions { + // (undocumented) + age?: HumanDuration; + // (undocumented) + batchSize?: number; + // (undocumented) + kind?: string[]; + // (undocumented) + linguistJsOptions?: Record; + // (undocumented) + schedule?: TaskScheduleDefinition; + // (undocumented) + useSourceLocation?: boolean; +} + // @public (undocumented) export interface PluginOptions { // (undocumented) @@ -61,6 +81,4 @@ export interface RouterOptions { // (undocumented) tokenManager: TokenManager; } - -// (No @packageDocumentation comment for this package) ``` From 18520c459626a3012dfe7d40b4942ab27610ed81 Mon Sep 17 00:00:00 2001 From: Andre Wanlin <67169551+awanlin@users.noreply.github.com> Date: Tue, 27 Jun 2023 14:16:30 -0500 Subject: [PATCH 5/7] Fixed broken link Signed-off-by: Andre Wanlin <67169551+awanlin@users.noreply.github.com> --- plugins/linguist-backend/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/linguist-backend/README.md b/plugins/linguist-backend/README.md index 543fe192fe..ee6e995ec8 100644 --- a/plugins/linguist-backend/README.md +++ b/plugins/linguist-backend/README.md @@ -146,5 +146,5 @@ return createRouter( ## Links -- [Frontend part of the plugin](https://github.com/backstage/backstage/tree/master/linguist) +- [Frontend part of the plugin](https://github.com/backstage/backstage/tree/master/plugins/linguist) - [The Backstage homepage](https://backstage.io) From 3a861eb0ab226f25c4dc7e504a60107ae7fdcec5 Mon Sep 17 00:00:00 2001 From: Andre Wanlin <67169551+awanlin@users.noreply.github.com> Date: Wed, 28 Jun 2023 06:48:51 -0500 Subject: [PATCH 6/7] Corrected README imports not to be from alpha Signed-off-by: Andre Wanlin <67169551+awanlin@users.noreply.github.com> --- plugins/azure-devops-backend/README.md | 2 +- plugins/devtools-backend/README.md | 2 +- plugins/linguist-backend/README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/azure-devops-backend/README.md b/plugins/azure-devops-backend/README.md index 3bc17e32e7..e892b84dd1 100644 --- a/plugins/azure-devops-backend/README.md +++ b/plugins/azure-devops-backend/README.md @@ -78,7 +78,7 @@ In your `packages/backend/src/index.ts` make the following changes: ```diff import { createBackend } from '@backstage/backend-defaults'; -+ import { azureDevOpsPlugin } from '@backstage/plugin-azure-devops-backend/alpha'; ++ import { azureDevOpsPlugin } from '@backstage/plugin-azure-devops-backend'; const backend = createBackend(); diff --git a/plugins/devtools-backend/README.md b/plugins/devtools-backend/README.md index 5290e76f58..528e864783 100644 --- a/plugins/devtools-backend/README.md +++ b/plugins/devtools-backend/README.md @@ -57,7 +57,7 @@ In your `packages/backend/src/index.ts` make the following changes: ```diff import { createBackend } from '@backstage/backend-defaults'; -+ import { devtoolsPlugin } from '@backstage/plugin-devtools-backend/alpha'; ++ import { devtoolsPlugin } from '@backstage/plugin-devtools-backend'; const backend = createBackend(); diff --git a/plugins/linguist-backend/README.md b/plugins/linguist-backend/README.md index ee6e995ec8..6e2a20cf2d 100644 --- a/plugins/linguist-backend/README.md +++ b/plugins/linguist-backend/README.md @@ -64,7 +64,7 @@ In your `packages/backend/src/index.ts` make the following changes: ```diff import { createBackend } from '@backstage/backend-defaults'; -+ import { linguistPlugin } from '@backstage/plugin-linguist-backend/alpha'; ++ import { linguistPlugin } from '@backstage/plugin-linguist-backend'; const backend = createBackend(); From 4716ef6c603aec2b4eb3e4186347d40de3839ac9 Mon Sep 17 00:00:00 2001 From: Andre Wanlin <67169551+awanlin@users.noreply.github.com> Date: Wed, 28 Jun 2023 07:57:24 -0500 Subject: [PATCH 7/7] Removed package.json exports changes Signed-off-by: Andre Wanlin <67169551+awanlin@users.noreply.github.com> --- plugins/azure-devops-backend/package.json | 11 ----------- plugins/devtools-backend/package.json | 11 ----------- plugins/linguist-backend/package.json | 11 ----------- 3 files changed, 33 deletions(-) diff --git a/plugins/azure-devops-backend/package.json b/plugins/azure-devops-backend/package.json index 87b02e9298..08411a3079 100644 --- a/plugins/azure-devops-backend/package.json +++ b/plugins/azure-devops-backend/package.json @@ -9,17 +9,6 @@ "main": "dist/index.cjs.js", "types": "dist/index.d.ts" }, - "exports": { - ".": "./src/index.ts", - "./package.json": "./package.json" - }, - "typesVersions": { - "*": { - "package.json": [ - "package.json" - ] - } - }, "backstage": { "role": "backend-plugin" }, diff --git a/plugins/devtools-backend/package.json b/plugins/devtools-backend/package.json index 14d59b0715..388eccfa9e 100644 --- a/plugins/devtools-backend/package.json +++ b/plugins/devtools-backend/package.json @@ -9,17 +9,6 @@ "main": "dist/index.cjs.js", "types": "dist/index.d.ts" }, - "exports": { - ".": "./src/index.ts", - "./package.json": "./package.json" - }, - "typesVersions": { - "*": { - "package.json": [ - "package.json" - ] - } - }, "backstage": { "role": "backend-plugin" }, diff --git a/plugins/linguist-backend/package.json b/plugins/linguist-backend/package.json index 55e19b443d..0239b241d3 100644 --- a/plugins/linguist-backend/package.json +++ b/plugins/linguist-backend/package.json @@ -9,17 +9,6 @@ "main": "dist/index.cjs.js", "types": "dist/index.d.ts" }, - "exports": { - ".": "./src/index.ts", - "./package.json": "./package.json" - }, - "typesVersions": { - "*": { - "package.json": [ - "package.json" - ] - } - }, "backstage": { "role": "backend-plugin" },