diff --git a/frontend/packages/app/package.json b/frontend/packages/app/package.json index b0bba2ac32..d6f9bda5f5 100644 --- a/frontend/packages/app/package.json +++ b/frontend/packages/app/package.json @@ -5,7 +5,7 @@ "dependencies": { "@material-ui/core": "^4.9.1", "@material-ui/icons": "^4.9.1", - "@backstage/core": "0.0.0", + "@spotify-backstage/core": "1.0.0", "@backstage/plugin-github-actions": "0.0.0", "@backstage/plugin-hello-world": "0.0.0", "@backstage/plugin-home-page": "0.0.0", diff --git a/frontend/packages/app/src/App.tsx b/frontend/packages/app/src/App.tsx index 3bf40cf430..ccf1a9f1e5 100644 --- a/frontend/packages/app/src/App.tsx +++ b/frontend/packages/app/src/App.tsx @@ -1,4 +1,4 @@ -import { BackstageTheme, createApp, InfoCard } from '@backstage/core'; +import { BackstageTheme, createApp, InfoCard } from '@spotify-backstage/core'; //import PageHeader from './components/PageHeader'; import { LoginComponent } from '@backstage/plugin-login'; import HomePagePlugin from '@backstage/plugin-home-page'; diff --git a/frontend/packages/app/src/entities/MockEntityCard.tsx b/frontend/packages/app/src/entities/MockEntityCard.tsx index 97a3f4073d..3f61d45877 100644 --- a/frontend/packages/app/src/entities/MockEntityCard.tsx +++ b/frontend/packages/app/src/entities/MockEntityCard.tsx @@ -1,5 +1,5 @@ import React, { FC } from 'react'; -import { useEntityUri } from '@backstage/core'; +import { useEntityUri } from '@spotify-backstage/core'; const MockEntityPage: FC<{}> = () => { const uri = useEntityUri(); diff --git a/frontend/packages/app/src/entities/index.ts b/frontend/packages/app/src/entities/index.ts index 099bb1f3b0..9ed79cfcf3 100644 --- a/frontend/packages/app/src/entities/index.ts +++ b/frontend/packages/app/src/entities/index.ts @@ -2,7 +2,7 @@ import { createEntityKind, createWidgetView, createEntityPage, -} from '@backstage/core'; +} from '@spotify-backstage/core'; import ComputerIcon from '@material-ui/icons/Computer'; import WebIcon from '@material-ui/icons/Web'; import VerifiedUserIcon from '@material-ui/icons/VerifiedUser'; diff --git a/frontend/packages/core/.npmrc b/frontend/packages/core/.npmrc new file mode 100644 index 0000000000..214c29d139 --- /dev/null +++ b/frontend/packages/core/.npmrc @@ -0,0 +1 @@ +registry=https://registry.npmjs.org/ diff --git a/frontend/packages/core/package.json b/frontend/packages/core/package.json index 57f938c2a8..4f89a47162 100644 --- a/frontend/packages/core/package.json +++ b/frontend/packages/core/package.json @@ -1,15 +1,19 @@ { - "name": "@backstage/core", - "version": "0.0.0", + "name": "@spotify-backstage/core", + "version": "1.0.0", + "license": "Apache-2.0", + "private": false, "main": "src/index.ts", "main:src": "src/index.ts", - "devDependencies": { + "scripts": { + "build": "web-scripts build", + "lint": "web-scripts lint", + "test": "web-scripts test" + }, + "dependencies": { "@material-ui/core": "^4.9.1", "@material-ui/icons": "^4.9.1", - "@spotify/web-scripts": "^6.0.0", - "@testing-library/jest-dom": "^4.2.4", - "@testing-library/react": "^9.3.2", - "@testing-library/user-event": "^7.1.2", + "@types/google-protobuf": "^3.7.2", "@types/jest": "^24.0.0", "@types/node": "^12.0.0", "@types/react": "^16.9.0", @@ -18,15 +22,16 @@ "classnames": "^2.2.6", "rc-progress": "^2.5.2", "react": "^16.12.0", + "react-addons-text-content": "0.0.4", "react-dom": "^16.12.0", "react-helmet": "5.2.1", - "react-addons-text-content": "0.0.4", "react-router-dom": "^5.1.2", "recompose": "0.30.0" }, - "scripts": { - "lint": "web-scripts lint", - "test": "web-scripts test" - }, - "license": "Apache-2.0" + "devDependencies": { + "@spotify/web-scripts": "^6.0.0", + "@testing-library/jest-dom": "^4.2.4", + "@testing-library/react": "^9.3.2", + "@testing-library/user-event": "^7.1.2" + } } diff --git a/frontend/packages/core/src/api/app/AppBuilder.tsx b/frontend/packages/core/src/api/app/AppBuilder.tsx index 1d2f9deb4d..5605dd4d40 100644 --- a/frontend/packages/core/src/api/app/AppBuilder.tsx +++ b/frontend/packages/core/src/api/app/AppBuilder.tsx @@ -120,6 +120,8 @@ export default class AppBuilder { ); break; } + default: + break; } } } diff --git a/frontend/packages/core/src/components/CircleProgress.js b/frontend/packages/core/src/components/CircleProgress.js index 271896702d..4d4b3dc8d9 100644 --- a/frontend/packages/core/src/components/CircleProgress.js +++ b/frontend/packages/core/src/components/CircleProgress.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { withStyles } from '@material-ui/core'; import { Circle } from 'rc-progress'; -import { COLORS } from '@backstage/core'; +import { COLORS } from '@spotify-backstage/core'; const styles = theme => ({ root: { diff --git a/frontend/packages/core/src/components/CircleProgress.test.js b/frontend/packages/core/src/components/CircleProgress.test.js index 3eaa1828ec..10917029fc 100644 --- a/frontend/packages/core/src/components/CircleProgress.test.js +++ b/frontend/packages/core/src/components/CircleProgress.test.js @@ -2,7 +2,7 @@ import React from 'react'; import { render } from '@testing-library/react'; import { wrapInThemedTestApp } from '../testUtils'; import CircleProgress from './CircleProgress'; -//import { COLORS, V1 } from 'core/app/Themes'; +// import { COLORS, V1 } from 'core/app/Themes'; describe('', () => { it('renders without exploding', () => { @@ -34,13 +34,14 @@ describe('', () => { getByText('10m'); }); - xit('colors the progress correct', () => { + /* + it('colors the progress correct', () => { expect(CircleProgress.getProgressColor()).toBe(V1.palette.textVerySubtle); expect(CircleProgress.getProgressColor(10)).toBe(COLORS.STATUS.ERROR); expect(CircleProgress.getProgressColor(50)).toBe(COLORS.STATUS.WARNING); expect(CircleProgress.getProgressColor(90)).toBe(COLORS.STATUS.OK); }); - xit('colors the inverse progress correct', () => { + it('colors the inverse progress correct', () => { expect(CircleProgress.getProgressColor()).toBe(V1.palette.textVerySubtle); expect(CircleProgress.getProgressColor(10, true)).toBe(COLORS.STATUS.OK); expect(CircleProgress.getProgressColor(50, true)).toBe( @@ -48,4 +49,5 @@ describe('', () => { ); expect(CircleProgress.getProgressColor(90, true)).toBe(COLORS.STATUS.ERROR); }); + */ }); diff --git a/frontend/packages/core/src/components/ProgressCard.js b/frontend/packages/core/src/components/ProgressCard.js index 0182e34b73..cc8e739b00 100644 --- a/frontend/packages/core/src/components/ProgressCard.js +++ b/frontend/packages/core/src/components/ProgressCard.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { withStyles } from '@material-ui/core'; -import { InfoCard, CircleProgress } from '@backstage/core'; +import { InfoCard, CircleProgress } from '@spotify-backstage/core'; const styles = { root: { diff --git a/frontend/packages/core/src/layout/HeaderLabel/OwnerHeaderLabel.test.js b/frontend/packages/core/src/layout/HeaderLabel/OwnerHeaderLabel.test.js index 8ced9035e0..e7b84e8a01 100644 --- a/frontend/packages/core/src/layout/HeaderLabel/OwnerHeaderLabel.test.js +++ b/frontend/packages/core/src/layout/HeaderLabel/OwnerHeaderLabel.test.js @@ -1,5 +1,5 @@ import React from 'react'; -import { render, prettyDOM } from '@testing-library/react'; +import { render } from '@testing-library/react'; import OwnerHeaderLabel from './OwnerHeaderLabel'; import { wrapInThemedTestApp } from '../../testUtils'; @@ -8,30 +8,40 @@ const badOwner = { id: 'tools-xxx', name: 'tools-xxx' }; describe('', () => { it('should have a label', () => { - const rendered = render(wrapInThemedTestApp()); + const rendered = render( + wrapInThemedTestApp(), + ); expect(rendered.getByText('Owner')).toBeInTheDocument(); expect(rendered.getByText('tools')).toBeInTheDocument(); expect(rendered.queryByText('Squad not verified!')).not.toBeInTheDocument(); }); it('should have an org link', () => { - const rendered = render(wrapInThemedTestApp()); + const rendered = render( + wrapInThemedTestApp(), + ); const anchor = rendered.container.querySelector('a'); expect(anchor.href).toBe('http://localhost/org/tools'); }); it('should have WARNING label', () => { - const rendered = render(wrapInThemedTestApp()); + const rendered = render( + wrapInThemedTestApp(), + ); expect(rendered.getByText('Squad not verified!')).toBeInTheDocument(); }); it('should have status error label', () => { - const rendered = render(wrapInThemedTestApp()); + const rendered = render( + wrapInThemedTestApp(), + ); expect(rendered.getByLabelText('Status error')).toBeInTheDocument(); }); it('should handle empty input', () => { - const rendered = render(wrapInThemedTestApp()); + const rendered = render( + wrapInThemedTestApp(), + ); expect(rendered.getByLabelText('Status error')).toBeInTheDocument(); }); }); diff --git a/frontend/packages/core/src/testUtils/index.js b/frontend/packages/core/src/testUtils/index.js index 9e5506e0b7..da4798e880 100644 --- a/frontend/packages/core/src/testUtils/index.js +++ b/frontend/packages/core/src/testUtils/index.js @@ -2,7 +2,6 @@ * Helpers for testing components */ import React from 'react'; -import { MuiThemeProvider } from '@material-ui/core'; import { ThemeProvider } from '@material-ui/styles'; import { MemoryRouter } from 'react-router'; diff --git a/frontend/packages/plugins/_template/{{ cookiecutter.plugin_name }}/package.json b/frontend/packages/plugins/_template/{{ cookiecutter.plugin_name }}/package.json index 85f56f7fa0..65c76f4df7 100644 --- a/frontend/packages/plugins/_template/{{ cookiecutter.plugin_name }}/package.json +++ b/frontend/packages/plugins/_template/{{ cookiecutter.plugin_name }}/package.json @@ -4,7 +4,7 @@ "main": "src/index.ts", "main:src": "src/index.ts", "devDependencies": { - "@backstage/core": "0.0.0", + "@spotify-backstage/core": "1.0.0", "@spotify/web-scripts": "^6.0.0", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", diff --git a/frontend/packages/plugins/_template/{{ cookiecutter.plugin_name }}/src/plugin.ts b/frontend/packages/plugins/_template/{{ cookiecutter.plugin_name }}/src/plugin.ts index 0424b5d999..ebf526a6ea 100644 --- a/frontend/packages/plugins/_template/{{ cookiecutter.plugin_name }}/src/plugin.ts +++ b/frontend/packages/plugins/_template/{{ cookiecutter.plugin_name }}/src/plugin.ts @@ -1,4 +1,4 @@ -import { createPlugin } from '@backstage/core'; +import { createPlugin } from '@spotify-backstage/core'; export default createPlugin({ id: '{{ cookiecutter.plugin_name }}', diff --git a/frontend/packages/plugins/create-entity/package.json b/frontend/packages/plugins/create-entity/package.json index bfac679ec1..9970272e96 100644 --- a/frontend/packages/plugins/create-entity/package.json +++ b/frontend/packages/plugins/create-entity/package.json @@ -4,7 +4,7 @@ "main": "src/index.ts", "main:src": "src/index.ts", "devDependencies": { - "@backstage/core": "0.0.0", + "@spotify-backstage/core": "1.0.0", "@backstage/protobuf-definitions": "0.0.0", "@spotify/web-scripts": "^6.0.0", "@testing-library/jest-dom": "^4.2.4", diff --git a/frontend/packages/plugins/create-entity/src/components/CreateEntityFormPage/CreateEntityFormPage.tsx b/frontend/packages/plugins/create-entity/src/components/CreateEntityFormPage/CreateEntityFormPage.tsx index 6f57698d2d..93f94df3d5 100644 --- a/frontend/packages/plugins/create-entity/src/components/CreateEntityFormPage/CreateEntityFormPage.tsx +++ b/frontend/packages/plugins/create-entity/src/components/CreateEntityFormPage/CreateEntityFormPage.tsx @@ -2,7 +2,7 @@ import React, { Fragment, useState } from 'react'; import { useRouteMatch } from 'react-router-dom'; import { useFormik } from 'formik'; import { Button, TextField, makeStyles } from '@material-ui/core'; -import { InfoCard, Progress } from '@backstage/core'; +import { InfoCard, Progress } from '@spotify-backstage/core'; import { scaffolderV1 } from '@backstage/protobuf-definitions'; const google_protobuf_struct_pb = require('google-protobuf/google/protobuf/struct_pb.js'); // import * as google_protobuf_struct_pb from 'google-protobuf/google/protobuf/struct_pb.js'; @@ -47,43 +47,51 @@ const CreateEntityFormPage = () => { }, }); - if(submitting) { - return ; + if (submitting) { + return ; } - + return ( - {componentCreated ?
{componentCreated} is created! 🎉
: -
-
- + {componentCreated ? ( +
+ {componentCreated} is created!{' '} + + 🎉 +
-
- -
-
- -
- } + ) : ( +
+
+ +
+
+ +
+
+ +
+
+ )} ); diff --git a/frontend/packages/plugins/create-entity/src/components/CreateEntityPage/CreateEntityPage.tsx b/frontend/packages/plugins/create-entity/src/components/CreateEntityPage/CreateEntityPage.tsx index 970267896b..51dc2f7c24 100644 --- a/frontend/packages/plugins/create-entity/src/components/CreateEntityPage/CreateEntityPage.tsx +++ b/frontend/packages/plugins/create-entity/src/components/CreateEntityPage/CreateEntityPage.tsx @@ -1,5 +1,5 @@ import React, { FC, Fragment, useEffect, useState } from 'react'; -import { InfoCard, TemplateList } from '@backstage/core'; +import { InfoCard, TemplateList } from '@spotify-backstage/core'; import { scaffolderV1 } from '@backstage/protobuf-definitions'; const CreateEntityPage: FC<{}> = () => { diff --git a/frontend/packages/plugins/create-entity/src/plugin.ts b/frontend/packages/plugins/create-entity/src/plugin.ts index 627f7da037..2e4328c40a 100644 --- a/frontend/packages/plugins/create-entity/src/plugin.ts +++ b/frontend/packages/plugins/create-entity/src/plugin.ts @@ -1,4 +1,4 @@ -import { createPlugin } from '@backstage/core'; +import { createPlugin } from '@spotify-backstage/core'; import CreateEntityPage from './components/CreateEntityPage'; import CreateEntityFormPage from './components/CreateEntityFormPage'; @@ -8,4 +8,4 @@ export default createPlugin({ router.registerRoute('/create', CreateEntityPage); router.registerRoute('/create/:templateId', CreateEntityFormPage); }, -}); \ No newline at end of file +}); diff --git a/frontend/packages/plugins/github-actions/package.json b/frontend/packages/plugins/github-actions/package.json index f1ad8c30e2..6571892f73 100644 --- a/frontend/packages/plugins/github-actions/package.json +++ b/frontend/packages/plugins/github-actions/package.json @@ -4,7 +4,7 @@ "main": "src/index.ts", "main:src": "src/index.ts", "devDependencies": { - "@backstage/core": "0.0.0", + "@spotify-backstage/core": "1.0.0", "@backstage/protobuf-definitions": "0.0.0", "@spotify/web-scripts": "^6.0.0", "@testing-library/jest-dom": "^4.2.4", diff --git a/frontend/packages/plugins/github-actions/src/components/BuildDetailsPage/BuildDetailsPage.tsx b/frontend/packages/plugins/github-actions/src/components/BuildDetailsPage/BuildDetailsPage.tsx index b21cbab658..27c3f6ef14 100644 --- a/frontend/packages/plugins/github-actions/src/components/BuildDetailsPage/BuildDetailsPage.tsx +++ b/frontend/packages/plugins/github-actions/src/components/BuildDetailsPage/BuildDetailsPage.tsx @@ -17,7 +17,7 @@ import { Button, Theme, } from '@material-ui/core'; -import { RelativeEntityLink } from '@backstage/core'; +import { RelativeEntityLink } from '@spotify-backstage/core'; import BuildStatusIndicator from '../BuildStatusIndicator'; const useStyles = makeStyles(theme => ({ diff --git a/frontend/packages/plugins/github-actions/src/components/BuildInfoCard/BuildInfoCard.tsx b/frontend/packages/plugins/github-actions/src/components/BuildInfoCard/BuildInfoCard.tsx index 6b78460d05..d890c8203d 100644 --- a/frontend/packages/plugins/github-actions/src/components/BuildInfoCard/BuildInfoCard.tsx +++ b/frontend/packages/plugins/github-actions/src/components/BuildInfoCard/BuildInfoCard.tsx @@ -1,5 +1,5 @@ import React, { FC } from 'react'; -import { RelativeEntityLink, useEntity } from '@backstage/core'; +import { RelativeEntityLink, useEntity } from '@spotify-backstage/core'; import { BuildsClient } from '../../apis/builds'; import { useAsync } from 'react-use'; import { diff --git a/frontend/packages/plugins/github-actions/src/components/BuildListPage/BuildListPage.tsx b/frontend/packages/plugins/github-actions/src/components/BuildListPage/BuildListPage.tsx index 5e684060bf..dc46c5caa7 100644 --- a/frontend/packages/plugins/github-actions/src/components/BuildListPage/BuildListPage.tsx +++ b/frontend/packages/plugins/github-actions/src/components/BuildListPage/BuildListPage.tsx @@ -13,7 +13,7 @@ import { makeStyles, Theme, } from '@material-ui/core'; -import { RelativeEntityLink, useEntity } from '@backstage/core'; +import { RelativeEntityLink, useEntity } from '@spotify-backstage/core'; import { BuildsClient } from '../../apis/builds'; import { useAsync } from 'react-use'; import BuildStatusIndicator from '../BuildStatusIndicator'; diff --git a/frontend/packages/plugins/github-actions/src/components/BuildStatusIndicator/BuildStatusIndicator.tsx b/frontend/packages/plugins/github-actions/src/components/BuildStatusIndicator/BuildStatusIndicator.tsx index 642eac350e..071dae4e8f 100644 --- a/frontend/packages/plugins/github-actions/src/components/BuildStatusIndicator/BuildStatusIndicator.tsx +++ b/frontend/packages/plugins/github-actions/src/components/BuildStatusIndicator/BuildStatusIndicator.tsx @@ -5,7 +5,7 @@ import FailureIcon from '@material-ui/icons/Error'; import SuccessIcon from '@material-ui/icons/CheckCircle'; import ProgressIcon from '@material-ui/icons/Autorenew'; import UnknownIcon from '@material-ui/icons/Help'; -import { IconComponent } from '@backstage/core'; +import { IconComponent } from '@spotify-backstage/core'; type Props = { status?: BuildStatus; diff --git a/frontend/packages/plugins/github-actions/src/plugin.ts b/frontend/packages/plugins/github-actions/src/plugin.ts index 0f5a7f9607..8c8f854a34 100644 --- a/frontend/packages/plugins/github-actions/src/plugin.ts +++ b/frontend/packages/plugins/github-actions/src/plugin.ts @@ -1,4 +1,4 @@ -import { createPlugin } from '@backstage/core'; +import { createPlugin } from '@spotify-backstage/core'; import BuildDetailsPage from './components/BuildDetailsPage'; import BuildListPage from './components/BuildListPage'; import BuildIcon from '@material-ui/icons/Build'; diff --git a/frontend/packages/plugins/hello-world/package.json b/frontend/packages/plugins/hello-world/package.json index 5b8b6e3b9f..97f15dbced 100644 --- a/frontend/packages/plugins/hello-world/package.json +++ b/frontend/packages/plugins/hello-world/package.json @@ -4,7 +4,7 @@ "main": "src/index.ts", "main:src": "src/index.ts", "devDependencies": { - "@backstage/core": "0.0.0", + "@spotify-backstage/core": "1.0.0", "@material-ui/core": "^4.9.1", "@material-ui/icons": "^4.9.1", "@spotify/web-scripts": "^6.0.0", diff --git a/frontend/packages/plugins/hello-world/src/plugin.ts b/frontend/packages/plugins/hello-world/src/plugin.ts index 27e04016dd..c3ebca48e8 100644 --- a/frontend/packages/plugins/hello-world/src/plugin.ts +++ b/frontend/packages/plugins/hello-world/src/plugin.ts @@ -1,4 +1,4 @@ -import { createPlugin } from '@backstage/core'; +import { createPlugin } from '@spotify-backstage/core'; export default createPlugin({ id: 'hello-world', diff --git a/frontend/packages/plugins/home-page/package.json b/frontend/packages/plugins/home-page/package.json index bbb77a1ce6..d02cec74d7 100644 --- a/frontend/packages/plugins/home-page/package.json +++ b/frontend/packages/plugins/home-page/package.json @@ -4,7 +4,7 @@ "main": "src/index.ts", "main:src": "src/index.ts", "devDependencies": { - "@backstage/core": "0.0.0", + "@spotify-backstage/core": "1.0.0", "@spotify/web-scripts": "^6.0.0", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", diff --git a/frontend/packages/plugins/home-page/src/components/HomePage/HomePage.test.tsx b/frontend/packages/plugins/home-page/src/components/HomePage/HomePage.test.tsx index fc495d3111..bafe94a923 100644 --- a/frontend/packages/plugins/home-page/src/components/HomePage/HomePage.test.tsx +++ b/frontend/packages/plugins/home-page/src/components/HomePage/HomePage.test.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { render } from '@testing-library/react'; import HomePage from './HomePage'; import { ThemeProvider } from '@material-ui/core'; -import { BackstageTheme } from '@backstage/core'; +import { BackstageTheme } from '@spotify-backstage/core'; describe('HomePage', () => { it('should render', () => { diff --git a/frontend/packages/plugins/home-page/src/components/HomePage/HomePage.tsx b/frontend/packages/plugins/home-page/src/components/HomePage/HomePage.tsx index b9638c7b67..26060f93cd 100644 --- a/frontend/packages/plugins/home-page/src/components/HomePage/HomePage.tsx +++ b/frontend/packages/plugins/home-page/src/components/HomePage/HomePage.tsx @@ -10,7 +10,7 @@ import { theme, Progress, getTimeBasedGreeting, -} from '@backstage/core'; +} from '@spotify-backstage/core'; import SquadTechHealth from './SquadTechHealth'; import { useAsync } from 'react-use'; diff --git a/frontend/packages/plugins/home-page/src/components/HomePage/SquadTechHealth.tsx b/frontend/packages/plugins/home-page/src/components/HomePage/SquadTechHealth.tsx index f20279668e..e13a4e805f 100644 --- a/frontend/packages/plugins/home-page/src/components/HomePage/SquadTechHealth.tsx +++ b/frontend/packages/plugins/home-page/src/components/HomePage/SquadTechHealth.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; import { Grid, Typography } from '@material-ui/core'; -import { HorizontalScrollGrid, ProgressCard } from '@backstage/core'; +import { HorizontalScrollGrid, ProgressCard } from '@spotify-backstage/core'; const SquadTechHealth: FC<{}> = () => { return ( diff --git a/frontend/packages/plugins/home-page/src/components/HomepageTimer/HomepageTimer.tsx b/frontend/packages/plugins/home-page/src/components/HomepageTimer/HomepageTimer.tsx index 54d269bf9c..ad6d81161c 100644 --- a/frontend/packages/plugins/home-page/src/components/HomepageTimer/HomepageTimer.tsx +++ b/frontend/packages/plugins/home-page/src/components/HomepageTimer/HomepageTimer.tsx @@ -1,5 +1,5 @@ import React, { FC } from 'react'; -import { HeaderLabel } from '@backstage/core'; +import { HeaderLabel } from '@spotify-backstage/core'; const timeFormat = { hour: '2-digit', minute: '2-digit' }; const nycOptions = { timeZone: 'America/New_York', ...timeFormat }; diff --git a/frontend/packages/plugins/home-page/src/plugin.ts b/frontend/packages/plugins/home-page/src/plugin.ts index 29d3ec1e6d..f0cd2c612c 100644 --- a/frontend/packages/plugins/home-page/src/plugin.ts +++ b/frontend/packages/plugins/home-page/src/plugin.ts @@ -1,4 +1,4 @@ -import { createPlugin } from '@backstage/core'; +import { createPlugin } from '@spotify-backstage/core'; import HomePage from './components/HomePage'; export default createPlugin({ diff --git a/frontend/packages/plugins/login/package.json b/frontend/packages/plugins/login/package.json index 04c33bda17..f0375ccc57 100644 --- a/frontend/packages/plugins/login/package.json +++ b/frontend/packages/plugins/login/package.json @@ -4,7 +4,7 @@ "main": "src/index.ts", "main:src": "src/index.ts", "devDependencies": { - "@backstage/core": "0.0.0", + "@spotify-backstage/core": "1.0.0", "@spotify/web-scripts": "^6.0.0", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", diff --git a/frontend/packages/plugins/login/src/plugin.ts b/frontend/packages/plugins/login/src/plugin.ts index f09a95ae5b..5edeb2779d 100644 --- a/frontend/packages/plugins/login/src/plugin.ts +++ b/frontend/packages/plugins/login/src/plugin.ts @@ -1,4 +1,4 @@ -import { createPlugin } from '@backstage/core'; +import { createPlugin } from '@spotify-backstage/core'; export default createPlugin({ id: 'login', diff --git a/frontend/yarn.lock b/frontend/yarn.lock index c763a05dd5..6914349288 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -2568,6 +2568,25 @@ inquirer "^7.0.4" recursive-readdir "^2.2.2" replace-in-file "^5.0.2" +"@spotify-backstage/core@file:packages/core": + version "1.0.0" + dependencies: + "@material-ui/core" "^4.9.1" + "@material-ui/icons" "^4.9.1" + "@types/google-protobuf" "^3.7.2" + "@types/jest" "^24.0.0" + "@types/node" "^12.0.0" + "@types/react" "^16.9.0" + "@types/react-dom" "^16.9.0" + "@types/react-router-dom" "^5.1.3" + classnames "^2.2.6" + rc-progress "^2.5.2" + react "^16.12.0" + react-addons-text-content "0.0.4" + react-dom "^16.12.0" + react-helmet "5.2.1" + react-router-dom "^5.1.2" + recompose "0.30.0" "@spotify/eslint-config-base@^6.0.0": version "6.0.0" @@ -2873,6 +2892,11 @@ "@types/minimatch" "*" "@types/node" "*" +"@types/google-protobuf@^3.7.2": + version "3.7.2" + resolved "https://registry.npmjs.org/@types/google-protobuf/-/google-protobuf-3.7.2.tgz#cd8a360c193ce4d672575a20a79f49ba036d38d2" + integrity sha512-ifFemzjNchFBCtHS6bZNhSZCBu7tbtOe0e8qY0z2J4HtFXmPJjm6fXSaQsTG7yhShBEZtt2oP/bkwu5k+emlkQ== + "@types/history@*": version "4.7.5" resolved "https://registry.npmjs.org/@types/history/-/history-4.7.5.tgz#527d20ef68571a4af02ed74350164e7a67544860"