From 5f7c8c45f4d84d4763fbcda0516c79e1eab56a0a Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Fri, 8 Jul 2022 14:15:15 +0200 Subject: [PATCH] backend: move additions to new backend-next package Co-authored-by: Johan Haals Signed-off-by: Patrik Oldsberg --- packages/backend-next/.eslintrc.js | 1 + packages/backend-next/README.md | 5 +++ packages/backend-next/package.json | 38 +++++++++++++++++++ packages/backend-next/src/index.test.ts | 24 ++++++++++++ .../src/next => backend-next/src}/index.ts | 24 ------------ packages/backend/package.json | 2 - 6 files changed, 68 insertions(+), 26 deletions(-) create mode 100644 packages/backend-next/.eslintrc.js create mode 100644 packages/backend-next/README.md create mode 100644 packages/backend-next/package.json create mode 100644 packages/backend-next/src/index.test.ts rename packages/{backend/src/next => backend-next/src}/index.ts (58%) diff --git a/packages/backend-next/.eslintrc.js b/packages/backend-next/.eslintrc.js new file mode 100644 index 0000000000..e2a53a6ad2 --- /dev/null +++ b/packages/backend-next/.eslintrc.js @@ -0,0 +1 @@ +module.exports = require('@backstage/cli/config/eslint-factory')(__dirname); diff --git a/packages/backend-next/README.md b/packages/backend-next/README.md new file mode 100644 index 0000000000..94fc0767c4 --- /dev/null +++ b/packages/backend-next/README.md @@ -0,0 +1,5 @@ +# example-backend-next + +This is an example backend for the new **EXPERIMENTAL** Backstage backend system. + +Do not use this in your own projects. diff --git a/packages/backend-next/package.json b/packages/backend-next/package.json new file mode 100644 index 0000000000..6feaf5ad97 --- /dev/null +++ b/packages/backend-next/package.json @@ -0,0 +1,38 @@ +{ + "name": "example-backend-next", + "version": "0.2.73-next.2", + "main": "dist/index.cjs.js", + "types": "src/index.ts", + "license": "Apache-2.0", + "private": true, + "backstage": { + "role": "backend" + }, + "homepage": "https://backstage.io", + "repository": { + "type": "git", + "url": "https://github.com/backstage/backstage", + "directory": "packages/backend-next" + }, + "keywords": [ + "backstage" + ], + "scripts": { + "start": "backstage-cli package start", + "build": "backstage-cli package build", + "lint": "backstage-cli package lint", + "test": "backstage-cli package test", + "clean": "backstage-cli package clean" + }, + "dependencies": { + "@backstage/backend-app-api": "^0.0.0", + "@backstage/plugin-catalog-backend": "^1.2.1-next.2", + "@backstage/plugin-scaffolder-backend": "^1.4.0-next.2" + }, + "devDependencies": { + "@backstage/cli": "^0.18.0-next.2" + }, + "files": [ + "dist" + ] +} diff --git a/packages/backend-next/src/index.test.ts b/packages/backend-next/src/index.test.ts new file mode 100644 index 0000000000..8b41455b27 --- /dev/null +++ b/packages/backend-next/src/index.test.ts @@ -0,0 +1,24 @@ +/* + * Copyright 2020 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 { PluginEnvironment } from './types'; + +describe('test', () => { + it('unbreaks the test runner', () => { + const unbreaker = {} as PluginEnvironment; + expect(unbreaker).toBeTruthy(); + }); +}); diff --git a/packages/backend/src/next/index.ts b/packages/backend-next/src/index.ts similarity index 58% rename from packages/backend/src/next/index.ts rename to packages/backend-next/src/index.ts index cda7ae4007..6463dc7ed5 100644 --- a/packages/backend/src/next/index.ts +++ b/packages/backend-next/src/index.ts @@ -18,30 +18,6 @@ import { createBackend } from '@backstage/backend-app-api'; import { catalogPlugin } from '@backstage/plugin-catalog-backend'; import { scaffolderCatalogModule } from '@backstage/plugin-scaffolder-backend'; -// export const appPlugin = createBackendPlugin({ -// id: 'app', -// register(env) { -// env.registerInit({ -// deps: { -// httpRouter: httpRouterServiceRef, -// database: databaseServiceRef, -// logger: loggerServiceRef, -// config: configServiceRef, -// }, -// async init({ httpRouter, config, logger, database }) { -// console.log('App plugin init'); - -// const appBackendRoute = await createAppBackendRouter({ -// appPackageName: 'example-app', -// config, -// logger: loggerToWinstonLogger(logger), -// database, -// }); -// }, -// }); -// }, -// }); - const backend = createBackend({ apis: [], }); diff --git a/packages/backend/package.json b/packages/backend/package.json index 7604f1e609..df6fe5ec3b 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -26,8 +26,6 @@ "build-image": "docker build ../.. -f Dockerfile --tag example-backend" }, "dependencies": { - "@backstage/backend-plugin-api": "^0.0.0", - "@backstage/backend-app-api": "^0.0.0", "@backstage/backend-common": "^0.14.1-next.2", "@backstage/backend-tasks": "^0.3.3-next.2", "@backstage/catalog-client": "^1.0.4-next.1",