Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

strategy:
matrix:
node-version: [20.x]
node-version: [22.x]

steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify-build-and-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false # dont have failures in one node version cancel tests in another
matrix:
node-version: [20.x] # TODO: add 22.x after upgrade to backstage 1.33 https://github.com/backstage/backstage/issues/27626#issuecomment-2476133326
node-version: [22.x, 24.x]

steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
Expand Down
2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
registry=https://registry.npmjs.org/

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be the internal twilio registry?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mcullenmeyer-twilio negative, not for OSS

min-release-age=2
1 change: 1 addition & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodejs 22.21.1
2 changes: 1 addition & 1 deletion backstage.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "1.40.2"
"version": "1.53.1"
}
21 changes: 18 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "1.0.0",
"private": true,
"engines": {
"node": "20"
"node": "22 || 24"
},
"scripts": {
"start": "NODE_OPTIONS=--no-node-snapshot backstage-cli repo start",
Expand Down Expand Up @@ -35,12 +35,15 @@
]
},
"devDependencies": {
"@backstage/cli": "^0.33.0",
"@backstage/e2e-test-utils": "^0.1.1",
"@backstage/cli": "^0.36.4",
"@backstage/e2e-test-utils": "^0.1.2",
"@jest/environment-jsdom-abstract": "~30.2.0",
"@playwright/test": "^1.32.3",
"@types/jest": "^30.0.0",
"concurrently": "^8.0.0",
"husky": "^8.0.3",
"lerna": "^9.0.0",
"jest": "~30.2.0",
"lint-staged": "^15.0.2",
"node-gyp": "^10.0.0",
"prettier": "^2.3.2",
Expand All @@ -61,5 +64,17 @@
"prettier --write"
]
},
"backstage": {
"cli": {
"new": {
"globals": {
"license": "Apache-2.0",
"private": false,
"namePrefix": "@segment/",
"namePluginInfix": "backstage-plugin-"
}
}
}
},
"packageManager": "yarn@1.22.21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
}
55 changes: 27 additions & 28 deletions packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,42 +16,41 @@
"dependencies": {
"@backstage-community/plugin-github-actions": "^0.6.16",
"@backstage-community/plugin-tech-radar": "^0.7.4",
"@backstage/app-defaults": "^1.6.3",
"@backstage/canon": "^0.5.0",
"@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.2",
"@backstage/plugin-catalog-react": "^1.19.0",
"@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",
"@backstage/app-defaults": "^1.7.10",
"@backstage/catalog-model": "^1.9.0",
"@backstage/cli": "^0.36.4",
"@backstage/core-app-api": "^1.20.3",
"@backstage/core-components": "^0.18.12",
"@backstage/core-plugin-api": "^1.12.8",
"@backstage/integration-react": "^1.2.20",
"@backstage/plugin-api-docs": "^0.14.3",
"@backstage/plugin-catalog": "^2.0.7",
"@backstage/plugin-catalog-common": "^1.1.10",
"@backstage/plugin-catalog-graph": "^0.6.6",
"@backstage/plugin-catalog-import": "^0.13.15",
"@backstage/plugin-catalog-react": "^3.2.0",
"@backstage/plugin-org": "^0.7.6",
"@backstage/plugin-permission-react": "^0.5.3",
"@backstage/plugin-scaffolder": "^1.38.1",
"@backstage/plugin-search": "^1.7.6",
"@backstage/plugin-search-react": "^1.11.6",
"@backstage/plugin-techdocs": "^1.17.8",
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.38",
"@backstage/plugin-techdocs-react": "^1.3.13",
"@backstage/plugin-user-settings": "^0.9.5",
"@backstage/theme": "^0.7.3",
"@backstage/ui": "^0.17.0",
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@segment/backstage-plugin-analytics-module-segment": "link:../../plugins/analytics-module-segment",
"history": "^5.0.0",
"react": "^18.0.2",
"react-dom": "^18.0.2",
"react-router": "^6.3.0",
"react-router-dom": "^6.3.0",
"react-router": "^6.30.2",
"react-router-dom": "^6.30.2",
"react-use": "^17.2.4"
},
"devDependencies": {
"@backstage/test-utils": "^1.7.9",
"@backstage/frontend-test-utils": "^0.6.2",
"@playwright/test": "^1.32.3",
"@testing-library/dom": "^8.0.0",
"@testing-library/jest-dom": "^5.10.1",
Expand Down
41 changes: 20 additions & 21 deletions packages/app/src/components/catalog/EntityPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -124,17 +124,17 @@ const overviewContent = (
<Grid container spacing={3} alignItems="stretch">
{entityWarningContent}
<Grid item md={6}>
<EntityAboutCard variant="gridItem" />
<EntityAboutCard />
</Grid>
<Grid item md={6} xs={12}>
<EntityCatalogGraphCard variant="gridItem" height={400} />
<EntityCatalogGraphCard height={400} />
</Grid>

<Grid item md={4} xs={12}>
<EntityLinksCard />
</Grid>
<Grid item md={8} xs={12}>
<EntityHasSubcomponentsCard variant="gridItem" />
<EntityHasSubcomponentsCard />
</Grid>
</Grid>
);
Expand Down Expand Up @@ -163,10 +163,10 @@ const serviceEntityPage = (
<EntityLayout.Route path="/dependencies" title="Dependencies">
<Grid container spacing={3} alignItems="stretch">
<Grid item md={6}>
<EntityDependsOnComponentsCard variant="gridItem" />
<EntityDependsOnComponentsCard />
</Grid>
<Grid item md={6}>
<EntityDependsOnResourcesCard variant="gridItem" />
<EntityDependsOnResourcesCard />
</Grid>
</Grid>
</EntityLayout.Route>
Expand All @@ -190,10 +190,10 @@ const websiteEntityPage = (
<EntityLayout.Route path="/dependencies" title="Dependencies">
<Grid container spacing={3} alignItems="stretch">
<Grid item md={6}>
<EntityDependsOnComponentsCard variant="gridItem" />
<EntityDependsOnComponentsCard />
</Grid>
<Grid item md={6}>
<EntityDependsOnResourcesCard variant="gridItem" />
<EntityDependsOnResourcesCard />
</Grid>
</Grid>
</EntityLayout.Route>
Expand Down Expand Up @@ -246,7 +246,7 @@ const apiPage = (
<EntityAboutCard />
</Grid>
<Grid item md={6} xs={12}>
<EntityCatalogGraphCard variant="gridItem" height={400} />
<EntityCatalogGraphCard height={400} />
</Grid>
<Grid item md={4} xs={12}>
<EntityLinksCard />
Expand Down Expand Up @@ -278,10 +278,10 @@ const userPage = (
<Grid container spacing={3}>
{entityWarningContent}
<Grid item xs={12} md={6}>
<EntityUserProfileCard variant="gridItem" />
<EntityUserProfileCard />
</Grid>
<Grid item xs={12} md={6}>
<EntityOwnershipCard variant="gridItem" />
<EntityOwnershipCard />
</Grid>
</Grid>
</EntityLayout.Route>
Expand All @@ -294,10 +294,10 @@ const groupPage = (
<Grid container spacing={3}>
{entityWarningContent}
<Grid item xs={12} md={6}>
<EntityGroupProfileCard variant="gridItem" />
<EntityGroupProfileCard />
</Grid>
<Grid item xs={12} md={6}>
<EntityOwnershipCard variant="gridItem" />
<EntityOwnershipCard />
</Grid>
<Grid item xs={12} md={6}>
<EntityMembersListCard />
Expand All @@ -316,28 +316,27 @@ const systemPage = (
<Grid container spacing={3} alignItems="stretch">
{entityWarningContent}
<Grid item md={6}>
<EntityAboutCard variant="gridItem" />
<EntityAboutCard />
</Grid>
<Grid item md={6} xs={12}>
<EntityCatalogGraphCard variant="gridItem" height={400} />
<EntityCatalogGraphCard height={400} />
</Grid>
<Grid item md={4} xs={12}>
<EntityLinksCard />
</Grid>
<Grid item md={8}>
<EntityHasComponentsCard variant="gridItem" />
<EntityHasComponentsCard />
</Grid>
<Grid item md={6}>
<EntityHasApisCard variant="gridItem" />
<EntityHasApisCard />
</Grid>
<Grid item md={6}>
<EntityHasResourcesCard variant="gridItem" />
<EntityHasResourcesCard />
</Grid>
</Grid>
</EntityLayout.Route>
<EntityLayout.Route path="/diagram" title="Diagram">
<EntityCatalogGraphCard
variant="gridItem"
direction={Direction.TOP_BOTTOM}
title="System Diagram"
height={700}
Expand All @@ -363,13 +362,13 @@ const domainPage = (
<Grid container spacing={3} alignItems="stretch">
{entityWarningContent}
<Grid item md={6}>
<EntityAboutCard variant="gridItem" />
<EntityAboutCard />
</Grid>
<Grid item md={6} xs={12}>
<EntityCatalogGraphCard variant="gridItem" height={400} />
<EntityCatalogGraphCard height={400} />
</Grid>
<Grid item md={6}>
<EntityHasSystemsCard variant="gridItem" />
<EntityHasSystemsCard />
</Grid>
</Grid>
</EntityLayout.Route>
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import '@backstage/cli/asset-types';
import ReactDOM from 'react-dom/client';
import App from './App';
import '@backstage/canon/css/styles.css';
import '@backstage/ui/css/styles.css';

ReactDOM.createRoot(document.getElementById('root')!).render(<App />);
2 changes: 1 addition & 1 deletion packages/backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#
# Once the commands have been run, you can build the image using `yarn build-image`

FROM node:20-bookworm-slim
FROM node:24-trixie-slim

# Install isolate-vm dependencies, these are needed by the @backstage/plugin-scaffolder-backend.
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
Expand Down
39 changes: 15 additions & 24 deletions packages/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,33 +16,24 @@
"build-image": "docker build ../.. -f Dockerfile --tag backstage"
},
"dependencies": {
"@backstage/backend-defaults": "^0.11.0",
"@backstage/backend-plugin-api": "^1.4.0",
"@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-catalog-backend": "^2.1.0",
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.9",
"@backstage/plugin-proxy-backend": "^0.6.3",
"@backstage/plugin-scaffolder-backend": "^2.0.0",
"@backstage/plugin-search-backend": "^2.0.3",
"@backstage/plugin-search-backend-module-catalog": "^0.3.5",
"@backstage/plugin-search-backend-module-techdocs": "^0.4.3",
"@backstage/plugin-techdocs-backend": "^2.0.3",
"@backstage/backend-defaults": "^0.17.6",
"@backstage/backend-plugin-api": "^1.9.3",
"@backstage/plugin-app-backend": "^0.5.16",
"@backstage/plugin-auth-backend": "^0.29.2",
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.21",
"@backstage/plugin-catalog-backend": "^3.8.1",
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.22",
"@backstage/plugin-proxy-backend": "^0.6.15",
"@backstage/plugin-scaffolder-backend": "^4.0.2",
"@backstage/plugin-search-backend": "^2.1.4",
"@backstage/plugin-search-backend-module-catalog": "^0.3.17",
"@backstage/plugin-search-backend-module-techdocs": "^0.4.16",
"@backstage/plugin-techdocs-backend": "^2.2.2",
"@segment/backstage-plugin-proxy-sigv4-backend": "link:../../plugins/proxy-sigv4-backend",
"app": "link:../app",
"better-sqlite3": "^8.0.0",
"dockerode": "^3.3.1",
"express": "^4.17.1",
"express-promise-router": "^4.1.0",
"winston": "^3.2.1"
"app": "link:../app"
},
"devDependencies": {
"@backstage/cli": "^0.33.0",
"@types/dockerode": "^3.3.0",
"@types/express": "^4.17.6",
"@types/express-serve-static-core": "^4.17.5",
"@types/luxon": "^2.0.4"
"@backstage/cli": "^0.36.4"
},
"files": [
"dist"
Expand Down
14 changes: 7 additions & 7 deletions plugins/analytics-module-segment/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
"react": "^16.13.1 || ^17.0.0 || ^18.0.0"
},
"devDependencies": {
"@backstage/cli": "^0.33.0",
"@backstage/config": "^1.3.2",
"@backstage/core-app-api": "^1.17.1",
"@backstage/core-components": "^0.17.3",
"@backstage/core-plugin-api": "^1.10.8",
"@backstage/dev-utils": "^1.1.11",
"@backstage/frontend-plugin-api": "^0.10.3",
"@backstage/cli": "^0.36.4",
"@backstage/config": "^1.3.8",
"@backstage/core-app-api": "^1.20.3",
"@backstage/core-components": "^0.18.12",
"@backstage/core-plugin-api": "^1.12.8",
"@backstage/dev-utils": "^1.1.25",
"@backstage/frontend-plugin-api": "^0.17.3",
"react": "^16.13.1 || ^17.0.0 || ^18.0.0"
},
"files": [
Expand Down
8 changes: 4 additions & 4 deletions plugins/proxy-sigv4-backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,17 @@
},
"dependencies": {
"@aws-sdk/credential-providers": "^3.637.0",
"@backstage/backend-plugin-api": "^1.4.0",
"@backstage/backend-plugin-api": "^1.9.3",
"agentkeepalive": "^4.2.1",
"aws4": "^1.13.1",
"express": "^4.17.1",
"express-promise-router": "^4.1.0",
"node-fetch": "^2.6.7"
},
"devDependencies": {
"@backstage/backend-defaults": "^0.11.0",
"@backstage/backend-test-utils": "^1.6.0",
"@backstage/cli": "^0.33.0",
"@backstage/backend-defaults": "^0.17.6",
"@backstage/backend-test-utils": "^1.11.5",
"@backstage/cli": "^0.36.4",
"@backstage/test-utils": "^1.7.9",
"@smithy/types": "^3.3.0",
"@types/aws4": "^1.11.6",
Expand Down
Loading