paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 34 Packages Projects Releases Wiki Activity

Merge pull request #13802 from backstage/freben/align

Browse Source 
align some versions
This commit is contained in:
Fredrik Adelöw
2022-09-22 14:24:28 +02:00
committed by GitHub
parent aa5679b64f 58c2264325
commit 97051bbe52
17 changed files with 59 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.changeset/clean-camels-sneeze.md
+12
View File
@@ -0,0 +1,12 @@
---
'@backstage/create-app': patch
---
Newly created Backstage repositories now use the stable version 6 of
`react-router`, just like the main repo does. Please let us know if you find any
issues with this.
Migrating to the stable version of `react-router` is optional for the time
being. But if you want to do the same for your existing repository, please
follow [this
guide](https://backstage.io/docs/tutorials/react-router-stable-migration).
.changeset/curvy-kiwis-fold.md
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/create-app': patch
---
Update versions of packages used in the create-app template, to match those in the main repo
.changeset/old-cobras-suffer.md
+6
View File
@@ -0,0 +1,6 @@
---
'@backstage/test-utils': patch
'@backstage/plugin-cicd-statistics': patch
---
Align on the version of `@material-ui/icons` used, to `^4.9.1` like other packages in the main repo
packages/app/src/App.tsx
+1 -1
View File
@@ -148,7 +148,7 @@ const AppRouter = app.getRouter();
const routes = (
<FlatRoutes>
<Navigate key="/" to="catalog" />
<Route path="/" element={<Navigate to="/catalog" />} />
{/* TODO(rubenl): Move this to / once its more mature and components exist */}
<Route path="/home" element={<HomepageCompositionRoot />}>
{homePage}
packages/create-app/package.json
+2 -1
View File
@@ -29,7 +29,7 @@
"clean": "backstage-cli package clean",
"prepack": "node scripts/prepack.js",
"postpack": "node scripts/postpack.js",
"start": "nodemon --"
"start": "yarn nodemon --"
},
"dependencies": {
"@backstage/cli-common": "workspace:^",
@@ -48,6 +48,7 @@
"@types/node": "^16.11.26",
"@types/recursive-readdir": "^2.2.0",
"mock-fs": "^5.1.1",
"nodemon": "^2.0.2",
"ts-node": "^10.0.0"
},
"nodemonConfig": {
packages/create-app/templates/default-app/packages/app/package.json.hbs
+16 -16
View File
@@ -6,6 +6,17 @@
"backstage": {
"role": "frontend"
},
"scripts": {
"start": "backstage-cli package start",
"build": "backstage-cli package build",
"clean": "backstage-cli package clean",
"test": "backstage-cli package test",
"lint": "backstage-cli package lint",
"test:e2e": "cross-env PORT=3001 start-server-and-test start http://localhost:3001 cy:dev",
"test:e2e:ci": "cross-env PORT=3001 start-server-and-test start http://localhost:3001 cy:run",
"cy:dev": "cypress open",
"cy:run": "cypress run --browser chrome"
},
"dependencies": {
"@backstage/app-defaults": "^{{version '@backstage/app-defaults'}}",
"@backstage/catalog-model": "^{{version '@backstage/catalog-model'}}",
@@ -37,33 +48,22 @@
"history": "^5.0.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-router": "6.0.0-beta.0",
"react-router-dom": "6.0.0-beta.0",
"react-use": "^15.3.3"
"react-router": "^6.3.0",
"react-router-dom": "^6.3.0",
"react-use": "^17.2.4"
},
"devDependencies": {
"@backstage/test-utils": "^{{version '@backstage/test-utils'}}",
"@testing-library/jest-dom": "^5.10.1",
"@testing-library/react": "^12.1.3",
"@testing-library/user-event": "^12.0.7",
"@types/node": "^14.14.32",
"@testing-library/user-event": "^14.0.0",
"@types/node": "^16.11.26",
"@types/react-dom": "*",
"cross-env": "^7.0.0",
"cypress": "^9.7.0",
"eslint-plugin-cypress": "^2.10.3",
"start-server-and-test": "^1.10.11"
},
"scripts": {
"start": "backstage-cli package start",
"build": "backstage-cli package build",
"clean": "backstage-cli package clean",
"test": "backstage-cli package test",
"lint": "backstage-cli package lint",
"test:e2e": "cross-env PORT=3001 start-server-and-test start http://localhost:3001 cy:dev",
"test:e2e:ci": "cross-env PORT=3001 start-server-and-test start http://localhost:3001 cy:run",
"cy:dev": "cypress open",
"cy:run": "cypress run --browser chrome"
},
"browserslist": {
"production": [
">0.2%",
packages/create-app/templates/default-app/packages/app/src/App.tsx
+8 -5
View File
@@ -31,7 +31,7 @@ import { AlertDisplay, OAuthRequestDialog } from '@backstage/core-components';
import { createApp } from '@backstage/app-defaults';
import { FlatRoutes } from '@backstage/core-app-api';
import { CatalogGraphPage } from '@backstage/plugin-catalog-graph';
import { PermissionedRoute } from '@backstage/plugin-permission-react';
import { RequirePermission } from '@backstage/plugin-permission-react';
import { catalogEntityCreatePermission } from '@backstage/plugin-catalog-common/alpha';
const app = createApp({
@@ -58,7 +58,7 @@ const AppRouter = app.getRouter();
const routes = (
<FlatRoutes>
<Navigate key="/" to="catalog" />
<Route path="/" element={<Navigate to="/catalog" />} />
<Route path="/catalog" element={<CatalogIndexPage />} />
<Route
path="/catalog/:namespace/:kind/:name"
@@ -81,10 +81,13 @@ const routes = (
path="/tech-radar"
element={<TechRadarPage width={1500} height={800} />}
/>
<PermissionedRoute
<Route
path="/catalog-import"
permission={catalogEntityCreatePermission}
element={<CatalogImportPage />}
element={
<RequirePermission permission={catalogEntityCreatePermission}>
<CatalogImportPage />
</RequirePermission>
}
/>
<Route path="/search" element={<SearchPage />}>
{searchPage}
packages/create-app/templates/default-app/packages/app/src/components/Root/LogoFull.tsx
-16
View File
@@ -1,19 +1,3 @@
/*
* 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 React from 'react';
import { makeStyles } from '@material-ui/core';
packages/create-app/templates/default-app/packages/app/src/components/Root/LogoIcon.tsx
-16
View File
@@ -1,19 +1,3 @@
/*
* 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 React from 'react';
import { makeStyles } from '@material-ui/core';
packages/create-app/templates/default-app/packages/app/src/components/Root/Root.tsx
-16
View File
@@ -1,19 +1,3 @@
/*
* 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 React, { PropsWithChildren } from 'react';
import { Link, makeStyles } from '@material-ui/core';
import HomeIcon from '@material-ui/icons/Home';
packages/create-app/templates/default-app/packages/app/src/components/Root/index.ts
-16
View File
@@ -1,17 +1 @@
/*
* 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.
*/
export { Root } from './Root';
packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx
-15
View File
@@ -1,18 +1,3 @@
/*
* 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 React from 'react';
import { Button, Grid } from '@material-ui/core';
import {
packages/create-app/templates/default-app/yarn.lock
+1
View File
@@ -0,0 +1 @@
# intentionally left empty
packages/e2e-test/package.json
+2 -1
View File
@@ -18,7 +18,7 @@
"license": "Apache-2.0",
"main": "src/index.ts",
"scripts": {
"start": "nodemon --",
"start": "yarn nodemon --",
"lint": "backstage-cli package lint",
"test": "backstage-cli package test",
"test:e2e": "yarn start",
@@ -38,6 +38,7 @@
"cross-fetch": "^3.1.5",
"fs-extra": "10.1.0",
"handlebars": "^4.7.3",
"nodemon": "^2.0.2",
"pgtools": "^0.3.0",
"puppeteer": "^17.0.0",
"tree-kill": "^1.2.2",
packages/test-utils/package.json
+1 -1
View File
@@ -40,7 +40,7 @@
"@backstage/theme": "workspace:^",
"@backstage/types": "workspace:^",
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.11.2",
"@material-ui/icons": "^4.9.1",
"@testing-library/jest-dom": "^5.10.1",
"@testing-library/react": "^12.1.3",
"@testing-library/user-event": "^14.0.0",
plugins/cicd-statistics/package.json
+1 -1
View File
@@ -42,7 +42,7 @@
"@backstage/plugin-catalog-react": "workspace:^",
"@date-io/luxon": "^1.3.13",
"@material-ui/core": "^4.9.13",
"@material-ui/icons": "^4.11.2",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
"@material-ui/pickers": "^3.3.10",
"already": "^3.2.0",
yarn.lock
+4 -2
View File
@@ -3542,6 +3542,7 @@ __metadata:
handlebars: ^4.7.3
inquirer: ^8.2.0
mock-fs: ^5.1.1
nodemon: ^2.0.2
ora: ^5.3.0
recursive-readdir: ^2.2.2
ts-node: ^10.0.0
@@ -4778,7 +4779,7 @@ __metadata:
"@backstage/plugin-catalog-react": "workspace:^"
"@date-io/luxon": ^1.3.13
"@material-ui/core": ^4.9.13
"@material-ui/icons": ^4.11.2
"@material-ui/icons": ^4.9.1
"@material-ui/lab": 4.0.0-alpha.57
"@material-ui/pickers": ^3.3.10
"@types/luxon": ^3.0.0
@@ -7415,7 +7416,7 @@ __metadata:
"@backstage/theme": "workspace:^"
"@backstage/types": "workspace:^"
"@material-ui/core": ^4.12.2
"@material-ui/icons": ^4.11.2
"@material-ui/icons": ^4.9.1
"@testing-library/jest-dom": ^5.10.1
"@testing-library/react": ^12.1.3
"@testing-library/user-event": ^14.0.0
@@ -20200,6 +20201,7 @@ __metadata:
cross-fetch: ^3.1.5
fs-extra: 10.1.0
handlebars: ^4.7.3
nodemon: ^2.0.2
pgtools: ^0.3.0
puppeteer: ^17.0.0
tree-kill: ^1.2.2