Skip to content

Bumped to Backstage 1.40 #295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anicke merged 1 commit into from
Aug 7, 2025
Merged

Bumped to Backstage 1.40 #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .changeset/chatty-masks-kneel.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
'@axis-backstage/plugin-analytics-module-umami': minor
'@axis-backstage/plugin-jira-dashboard-backend': minor
'@axis-backstage/plugin-jira-dashboard-common': minor
'@axis-backstage/plugin-statuspage-backend': minor
'@axis-backstage/plugin-statuspage-common': minor
'@axis-backstage/plugin-vacation-calendar': minor
'@axis-backstage/plugin-jira-dashboard': minor
'@axis-backstage/plugin-readme-backend': minor
'@axis-backstage/plugin-statuspage': minor
'app-next': minor
'backend': minor
'@axis-backstage/plugin-readme': minor
'app': minor
---

Bumped to Backstage 1.40
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20.x
node-version: 22.x

- name: Install dependencies
run: yarn install
Expand All @@ -31,7 +31,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20.x
node-version: 22.x

- name: Install dependencies
run: yarn install
Expand All @@ -49,7 +49,7 @@ jobs:

- uses: actions/setup-node@v4
with:
node-version: 20.x
node-version: 22.x

- name: Install dependencies
run: yarn install
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
- name: Checkout Repo
uses: actions/checkout@v4

- name: Setup Node.js 20.x
- name: Setup Node.js 22.x
uses: actions/setup-node@v4
with:
node-version: 20.x
node-version: 22.x

- name: Install Dependencies
run: yarn install
Expand Down
893 changes: 0 additions & 893 deletions .yarn/releases/yarn-4.0.2.cjs
View file
Open in desktop

This file was deleted.

935 changes: 935 additions & 0 deletions .yarn/releases/yarn-4.8.1.cjs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.0.2.cjs
yarnPath: .yarn/releases/yarn-4.8.1.cjs
2 changes: 1 addition & 1 deletion backstage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "1.36.1"
"version": "1.40.1"
}
13 changes: 8 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,13 @@
"plugins/*"
]
},
"dependencies": {
"@useoptic/optic": "^1.0.0"
},
"devDependencies": {
"@backstage/cli": "^0.30.0",
"@backstage/cli": "^0.33.0",
"@backstage/e2e-test-utils": "^0.1.1",
"@backstage/repo-tools": "^0.13.0",
"@backstage/repo-tools": "^0.14.0",
"@changesets/cli": "^2.28.1",
"@playwright/test": "^1.32.3",
"@spotify/prettier-config": "^15.0.0",
Expand All @@ -51,8 +54,8 @@
"typescript": "~5.2.0"
},
"resolutions": {
"@types/react": "^18",
"@types/react-dom": "^18",
"@types/react": "^18.3",
"@types/react-dom": "^18.3",
"@stoplight/spectral-core@npm:1.19.4/jsonpath-plus": "^10.3.0",
"@kubernetes/client-node@npm:0.20.0/jsonpath-plus": "^10.3.0"
},
Expand All @@ -66,5 +69,5 @@
"prettier --write"
]
},
"packageManager": "yarn@4.0.2"
"packageManager": "yarn@4.8.1"
}
50 changes: 25 additions & 25 deletions packages/app-next/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,43 +16,43 @@
"dependencies": {
"@axis-backstage/plugin-jira-dashboard": "workspace:^",
"@axis-backstage/plugin-jira-dashboard-common": "workspace:^",
"@backstage/app-defaults": "^1.5.17",
"@backstage/catalog-model": "^1.7.3",
"@backstage/cli": "^0.30.0",
"@backstage/core-compat-api": "^0.3.6",
"@backstage/core-components": "^0.16.4",
"@backstage/core-plugin-api": "^1.10.4",
"@backstage/frontend-app-api": "^0.10.5",
"@backstage/frontend-defaults": "^0.1.6",
"@backstage/frontend-plugin-api": "^0.9.5",
"@backstage/integration-react": "^1.2.4",
"@backstage/plugin-api-docs": "^0.12.4",
"@backstage/plugin-catalog": "^1.27.0",
"@backstage/plugin-catalog-common": "^1.1.3",
"@backstage/plugin-catalog-graph": "^0.4.16",
"@backstage/plugin-catalog-import": "^0.12.10",
"@backstage/plugin-catalog-react": "^1.15.2",
"@backstage/plugin-org": "^0.6.36",
"@backstage/plugin-user-settings": "^0.8.19",
"@backstage/theme": "^0.6.4",
"@backstage/app-defaults": "^1.6.3",
"@backstage/catalog-model": "^1.7.4",
"@backstage/cli": "^0.33.0",
"@backstage/core-compat-api": "^0.4.3",
"@backstage/core-components": "^0.17.3",
"@backstage/core-plugin-api": "^1.10.8",
"@backstage/frontend-app-api": "^0.11.3",
"@backstage/frontend-defaults": "^0.2.3",
"@backstage/frontend-plugin-api": "^0.10.3",
"@backstage/integration-react": "^1.2.8",
"@backstage/plugin-api-docs": "^0.12.8",
"@backstage/plugin-catalog": "^1.31.0",
"@backstage/plugin-catalog-common": "^1.1.4",
"@backstage/plugin-catalog-graph": "^0.4.20",
"@backstage/plugin-catalog-import": "^0.13.1",
"@backstage/plugin-catalog-react": "^1.19.0",
"@backstage/plugin-org": "^0.6.40",
"@backstage/plugin-user-settings": "^0.8.23",
"@backstage/theme": "^0.6.6",
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"history": "^5.0.0",
"react": "^18.0.2",
"react-dom": "^18.0.2",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-router": "^6.3.0",
"react-router-dom": "^6.3.0",
"react-use": "^17.2.4",
"styled-components": "^6.1.8"
},
"devDependencies": {
"@backstage/test-utils": "^1.7.5",
"@backstage/test-utils": "^1.7.9",
"@playwright/test": "^1.32.3",
"@testing-library/dom": "^9.0.0",
"@testing-library/dom": "^10.0.0",
"@testing-library/jest-dom": "^6.0.0",
"@testing-library/react": "^14.0.0",
"@testing-library/react": "^16.0.0",
"@testing-library/user-event": "^14.0.0",
"@types/react-dom": "*",
"@types/react-dom": "^18.3.1",
"cross-env": "^7.0.0"
},
"browserslist": {
Expand Down
1 change: 0 additions & 1 deletion packages/app-next/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { createApp } from '@backstage/frontend-defaults';
import {
configApiRef,
Expand Down
61 changes: 31 additions & 30 deletions packages/app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,49 +20,50 @@
"@axis-backstage/plugin-readme": "workspace:^",
"@axis-backstage/plugin-statuspage": "workspace:^",
"@axis-backstage/plugin-vacation-calendar": "workspace:^",
"@backstage/app-defaults": "^1.5.17",
"@backstage/catalog-model": "^1.7.3",
"@backstage/cli": "^0.30.0",
"@backstage/core-app-api": "^1.15.5",
"@backstage/core-components": "^0.16.4",
"@backstage/core-plugin-api": "^1.10.4",
"@backstage/integration-react": "^1.2.4",
"@backstage/plugin-api-docs": "^0.12.4",
"@backstage/plugin-catalog": "^1.27.0",
"@backstage/plugin-catalog-common": "^1.1.3",
"@backstage/plugin-catalog-graph": "^0.4.16",
"@backstage/plugin-catalog-import": "^0.12.10",
"@backstage/plugin-catalog-react": "^1.15.2",
"@backstage/plugin-home": "^0.8.5",
"@backstage/plugin-org": "^0.6.36",
"@backstage/plugin-permission-react": "^0.4.31",
"@backstage/plugin-scaffolder": "^1.28.0",
"@backstage/plugin-search": "^1.4.23",
"@backstage/plugin-search-react": "^1.8.6",
"@backstage/plugin-techdocs": "^1.12.3",
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.21",
"@backstage/plugin-techdocs-react": "^1.2.14",
"@backstage/plugin-user-settings": "^0.8.19",
"@backstage/theme": "^0.6.4",
"@backstage/app-defaults": "^1.6.3",
"@backstage/catalog-model": "^1.7.4",
"@backstage/cli": "^0.33.0",
"@backstage/core-app-api": "^1.17.1",
"@backstage/core-components": "^0.17.3",
"@backstage/core-plugin-api": "^1.10.8",
"@backstage/integration-react": "^1.2.8",
"@backstage/plugin-api-docs": "^0.12.8",
"@backstage/plugin-catalog": "^1.31.0",
"@backstage/plugin-catalog-common": "^1.1.4",
"@backstage/plugin-catalog-graph": "^0.4.20",
"@backstage/plugin-catalog-import": "^0.13.1",
"@backstage/plugin-catalog-react": "^1.19.0",
"@backstage/plugin-home": "^0.8.9",
"@backstage/plugin-org": "^0.6.40",
"@backstage/plugin-permission-react": "^0.4.35",
"@backstage/plugin-scaffolder": "^1.32.0",
"@backstage/plugin-search": "^1.4.27",
"@backstage/plugin-search-react": "^1.9.1",
"@backstage/plugin-techdocs": "^1.13.1",
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.25",
"@backstage/plugin-techdocs-react": "^1.3.0",
"@backstage/plugin-user-settings": "^0.8.23",
"@backstage/theme": "^0.6.6",
"@material-ui/core": "^4.12.4",
"@material-ui/icons": "^4.11.3",
"@mui/material": "^5.15.7",
"history": "^5.0.0",
"msw": "^2.7.3",
"react": "^18.0.2",
"react-dom": "^18.0.2",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-router": "^6.3.0",
"react-router-dom": "^6.3.0",
"react-use": "^17.2.4"
},
"devDependencies": {
"@backstage/test-utils": "^1.7.5",
"@backstage/test-utils": "^1.7.9",
"@playwright/test": "^1.32.3",
"@testing-library/dom": "^9.0.0",
"@testing-library/dom": "^10.0.0",
"@testing-library/jest-dom": "^6.0.0",
"@testing-library/react": "^14.0.0",
"@testing-library/react": "^16.0.0",
"@testing-library/user-event": "^14.0.0",
"@types/react-dom": "*",
"@types/react": "^18.3.23",
"@types/react-dom": "^18.3.1",
"cross-env": "^7.0.0"
},
"browserslist": {
Expand Down
1 change: 0 additions & 1 deletion packages/app/src/App.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { render, waitFor } from '@testing-library/react';
import App from './App';

Expand Down
1 change: 0 additions & 1 deletion packages/app/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { Route } from 'react-router-dom';
import { apiDocsPlugin, ApiExplorerPage } from '@backstage/plugin-api-docs';
import { HomepageCompositionRoot } from '@backstage/plugin-home';
Expand Down
1 change: 0 additions & 1 deletion packages/app/src/components/Root/LogoFull.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { makeStyles } from '@material-ui/core';

const useStyles = makeStyles({
Expand Down
1 change: 0 additions & 1 deletion packages/app/src/components/Root/LogoIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { makeStyles } from '@material-ui/core';

const useStyles = makeStyles({
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/components/Root/Root.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { PropsWithChildren } from 'react';
import { PropsWithChildren } from 'react';
import { makeStyles } from '@material-ui/core';
import HomeIcon from '@material-ui/icons/Home';
import ExtensionIcon from '@material-ui/icons/Extension';
Expand Down
1 change: 0 additions & 1 deletion packages/app/src/components/catalog/EntityPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import Grid from '@mui/material/Unstable_Grid2';
import {
EntityApiDefinitionCard,
Expand Down
1 change: 0 additions & 1 deletion packages/app/src/components/home/HomePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import {
WelcomeTitle,
} from '@backstage/plugin-home';
import { Content, Header, Page } from '@backstage/core-components';
import React from 'react';
import Grid from '@mui/material/Unstable_Grid2';
import {
SearchBar,
Expand Down
1 change: 0 additions & 1 deletion packages/app/src/components/search/SearchPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { makeStyles, Theme, Grid, Paper } from '@material-ui/core';

import { CatalogSearchResultListItem } from '@backstage/plugin-catalog';
Expand Down
1 change: 0 additions & 1 deletion packages/app/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import '@backstage/cli/asset-types';
import React from 'react';
import ReactDOM from 'react-dom/client';
import App from './App';

Expand Down
35 changes: 17 additions & 18 deletions packages/backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,33 +19,32 @@
"@axis-backstage/plugin-jira-dashboard-backend": "workspace:^",
"@axis-backstage/plugin-readme-backend": "workspace:^",
"@axis-backstage/plugin-statuspage-backend": "workspace:^",
"@backstage/backend-defaults": "^0.8.1",
"@backstage/backend-plugin-api": "^1.2.0",
"@backstage/catalog-client": "^1.9.1",
"@backstage/catalog-model": "^1.7.3",
"@backstage/backend-defaults": "^0.11.0",
"@backstage/backend-plugin-api": "^1.4.0",
"@backstage/catalog-client": "^1.10.1",
"@backstage/catalog-model": "^1.7.4",
"@backstage/config": "^1.3.2",
"@backstage/plugin-app-backend": "^0.4.5",
"@backstage/plugin-auth-backend": "^0.24.3",
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.5",
"@backstage/plugin-auth-backend-module-microsoft-provider": "^0.3.0",
"@backstage/plugin-auth-node": "^0.6.0",
"@backstage/plugin-catalog-backend": "^1.31.0",
"@backstage/plugin-permission-common": "^0.8.4",
"@backstage/plugin-permission-node": "^0.8.8",
"@backstage/plugin-search-backend": "^1.8.2",
"@backstage/plugin-search-backend-module-pg": "^0.5.41",
"@backstage/plugin-search-backend-node": "^1.3.8",
"@backstage/plugin-techdocs-backend": "^1.11.6",
"@backstage/plugin-app-backend": "^0.5.3",
"@backstage/plugin-auth-backend": "^0.25.1",
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.9",
"@backstage/plugin-auth-backend-module-microsoft-provider": "^0.3.4",
"@backstage/plugin-auth-node": "^0.6.4",
"@backstage/plugin-catalog-backend": "^2.1.0",
"@backstage/plugin-permission-common": "^0.9.0",
"@backstage/plugin-permission-node": "^0.10.1",
"@backstage/plugin-search-backend": "^2.0.3",
"@backstage/plugin-search-backend-module-pg": "^0.5.45",
"@backstage/plugin-search-backend-node": "^1.3.12",
"@backstage/plugin-techdocs-backend": "^2.0.3",
"app": "workspace:^",
"better-sqlite3": "^8.0.0",
"dockerode": "^3.3.1",
"express": "^4.17.1",
"express-promise-router": "^4.1.0",
"pg": "^8.3.0",
"winston": "^3.2.1"
},
"devDependencies": {
"@backstage/cli": "^0.30.0",
"@backstage/cli": "^0.33.0",
"@types/dockerode": "^3.3.0",
"@types/express": "^4.17.6",
"@types/express-serve-static-core": "^4.17.5",
Expand Down
1 change: 0 additions & 1 deletion plugins/analytics-module-umami/dev/Playground.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { Link } from '@backstage/core-components';

export const Playground = () => {
Expand Down
1 change: 0 additions & 1 deletion plugins/analytics-module-umami/dev/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {
fetchApiRef,
} from '@backstage/core-plugin-api';
import { createDevApp } from '@backstage/dev-utils';
import React from 'react';

import { UmamiAnalytics } from '../src';
import { Playground } from './Playground';
Expand Down
14 changes: 7 additions & 7 deletions plugins/analytics-module-umami/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,21 @@
},
"dependencies": {
"@backstage/config": "^1.3.2",
"@backstage/core-components": "^0.16.4",
"@backstage/core-plugin-api": "^1.10.4"
"@backstage/core-components": "^0.17.3",
"@backstage/core-plugin-api": "^1.10.8"
},
"peerDependencies": {
"react": "^17.0.0 || ^18.0.0",
"react-dom": "^17.0.0 || ^18.0.0",
"react-router-dom": "^6.3.0"
},
"devDependencies": {
"@backstage/cli": "^0.30.0",
"@backstage/dev-utils": "^1.1.7",
"@backstage/test-utils": "^1.7.5",
"@testing-library/dom": "^9.0.0",
"@backstage/cli": "^0.33.0",
"@backstage/dev-utils": "^1.1.11",
"@backstage/test-utils": "^1.7.9",
"@testing-library/dom": "^10.0.0",
"@testing-library/jest-dom": "^6.0.0",
"@testing-library/react": "^14.0.0",
"@testing-library/react": "^16.0.0",
"@testing-library/user-event": "^14.5.2"
},
"files": [
Expand Down
Loading