From dfe817cb742c737ce773234c6e38f98633bff283 Mon Sep 17 00:00:00 2001 From: Ivan Shmidt Date: Tue, 2 Jun 2020 13:55:17 +0200 Subject: [PATCH] Fix linting and tsc --- packages/app/package.json | 3 ++- packages/backend/src/index.ts | 12 ++++----- plugins/catalog/package.json | 9 ++++--- plugins/catalog/src/routes.ts | 26 ++++++++++++++++++- plugins/register-component/package.json | 3 +++ .../RegisterComponentForm.test.tsx | 13 +++------- .../RegisterComponentPage.tsx | 4 +-- plugins/scaffolder/package.json | 1 + 8 files changed, 48 insertions(+), 23 deletions(-) diff --git a/packages/app/package.json b/packages/app/package.json index 0af25d6f3a..15681d0548 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -12,15 +12,16 @@ "@backstage/plugin-lighthouse": "^0.1.1-alpha.6", "@backstage/plugin-register-component": "^0.1.1-alpha.6", "@backstage/plugin-scaffolder": "^0.1.1-alpha.6", + "@backstage/plugin-sentry": "^0.1.1-alpha.6", "@backstage/plugin-tech-radar": "^0.1.1-alpha.6", "@backstage/plugin-welcome": "^0.1.1-alpha.6", "@backstage/theme": "^0.1.1-alpha.6", - "@backstage/plugin-sentry": "^0.1.1-alpha.6", "@material-ui/core": "^4.9.1", "@material-ui/icons": "^4.9.1", "prop-types": "^15.7.2", "react": "^16.12.0", "react-dom": "^16.12.0", + "react-hot-loader": "^4.12.21", "react-router-dom": "^5.2.0", "react-use": "^14.2.0", "zen-observable": "^0.8.15" diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts index a6299ca829..5b1fc54330 100644 --- a/packages/backend/src/index.ts +++ b/packages/backend/src/index.ts @@ -70,12 +70,12 @@ async function main() { app.use(requestLoggingHandler()); app.use('/catalog', await catalog(createEnv('catalog'))); app.use('/scaffolder', await scaffolder(createEnv('scaffolder'))); - // app.use( - // '/sentry', - // await sentry(getRootLogger().child({ type: 'plugin', plugin: 'sentry' })), - // ); - // app.use('/auth', await auth(createEnv('auth'))); - // app.use('/identity', await identity(createEnv('identity'))); + app.use( + '/sentry', + await sentry(getRootLogger().child({ type: 'plugin', plugin: 'sentry' })), + ); + app.use('/auth', await auth(createEnv('auth'))); + app.use('/identity', await identity(createEnv('identity'))); app.use(notFoundHandler()); app.use(errorHandler()); diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json index 0cdc5d2618..5445fffb32 100644 --- a/plugins/catalog/package.json +++ b/plugins/catalog/package.json @@ -17,15 +17,18 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/core": "^0.1.1-alpha.6", - "@backstage/theme": "^0.1.1-alpha.6", "@backstage/catalog-model": "^0.1.1-alpha.6", + "@backstage/core": "^0.1.1-alpha.6", + "@backstage/plugin-scaffolder": "^0.1.1-alpha.6", + "@backstage/plugin-sentry": "^0.1.1-alpha.6", + "@backstage/theme": "^0.1.1-alpha.6", "@material-ui/core": "^4.9.1", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", - "@backstage/plugin-sentry": "^0.1.1-alpha.6", "react": "^16.13.1", "react-dom": "^16.13.1", + "react-router": "^5.2.0", + "react-router-dom": "^5.2.0", "react-use": "^14.2.0" }, "devDependencies": { diff --git a/plugins/catalog/src/routes.ts b/plugins/catalog/src/routes.ts index 79d02fefe1..830dc6d48f 100644 --- a/plugins/catalog/src/routes.ts +++ b/plugins/catalog/src/routes.ts @@ -1,4 +1,28 @@ -import { createRouteRef } from '@backstage/core'; +/* + * Copyright 2020 Spotify AB + * + * 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. + */ + +/* + * Hi! + * + * Note that this is an EXAMPLE Backstage backend. Please check the README. + * + * Happy hacking! + */ + + import { createRouteRef } from '@backstage/core'; const NoIcon = () => null; diff --git a/plugins/register-component/package.json b/plugins/register-component/package.json index 053af6bb51..c2d8408f1f 100644 --- a/plugins/register-component/package.json +++ b/plugins/register-component/package.json @@ -18,6 +18,7 @@ }, "dependencies": { "@backstage/core": "^0.1.1-alpha.6", + "@backstage/plugin-catalog": "^0.1.1-alpha.6", "@backstage/theme": "^0.1.1-alpha.6", "@material-ui/core": "^4.9.1", "@material-ui/icons": "^4.9.1", @@ -25,6 +26,8 @@ "react": "^16.13.1", "react-dom": "^16.13.1", "react-hook-form": "^5.7.2", + "react-router": "^5.2.0", + "react-router-dom": "^5.2.0", "react-use": "^14.2.0" }, "devDependencies": { diff --git a/plugins/register-component/src/components/RegisterComponentForm/RegisterComponentForm.test.tsx b/plugins/register-component/src/components/RegisterComponentForm/RegisterComponentForm.test.tsx index 9203093d48..3b8b7f9dcf 100644 --- a/plugins/register-component/src/components/RegisterComponentForm/RegisterComponentForm.test.tsx +++ b/plugins/register-component/src/components/RegisterComponentForm/RegisterComponentForm.test.tsx @@ -18,11 +18,10 @@ import React from 'react'; import { render, fireEvent } from '@testing-library/react'; import RegisterComponentForm from './RegisterComponentForm'; +// TODO(ishmidt): rewrite tests describe('RegisterComponentForm', () => { it('should initially render a disabled button', async () => { - const rendered = render( - , - ); + const rendered = render(); expect( await rendered.findByText( 'Enter the full path to the service-info.yaml file in GHE to start tracking your component. It must be in a public repo, on the master branch.', @@ -34,9 +33,7 @@ describe('RegisterComponentForm', () => { }); it('should enable a submit form when data when component url is set ', async () => { - const rendered = render( - , - ); + const rendered = render(); const input = (await rendered.getByRole('textbox')) as HTMLInputElement; fireEvent.change(input, { target: { value: 'https://example.com/blob/master/service.yaml' }, @@ -47,9 +44,7 @@ describe('RegisterComponentForm', () => { }); it('should hide input on submission ', async () => { - const rendered = render( - , - ); + const rendered = render(); expect( await rendered.findByText( diff --git a/plugins/register-component/src/components/RegisterComponentPage/RegisterComponentPage.tsx b/plugins/register-component/src/components/RegisterComponentPage/RegisterComponentPage.tsx index d0189ba7f8..6d01fc469e 100644 --- a/plugins/register-component/src/components/RegisterComponentPage/RegisterComponentPage.tsx +++ b/plugins/register-component/src/components/RegisterComponentPage/RegisterComponentPage.tsx @@ -36,18 +36,16 @@ import { Page, pageTheme, Content, - ContentHeader, - SupportButton, useApi, errorApiRef, StructuredMetadataTable, Header, } from '@backstage/core'; import RegisterComponentForm from '../RegisterComponentForm'; -import { catalogApiRef } from '@backstage/plugin-catalog'; import { entityRoute, rootRoute as catalogRootRoute, + catalogApiRef } from '@backstage/plugin-catalog'; import { generatePath } from 'react-router'; diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json index 7f453fde48..ad44e06986 100644 --- a/plugins/scaffolder/package.json +++ b/plugins/scaffolder/package.json @@ -24,6 +24,7 @@ "@material-ui/lab": "4.0.0-alpha.45", "react": "^16.13.1", "react-dom": "^16.13.1", + "react-router-dom": "^5.2.0", "react-use": "^14.2.0" }, "devDependencies": {