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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,6 @@ site

# E2E test reports
e2e-test-report/

# Cache
.cache/
2 changes: 1 addition & 1 deletion backstage.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "1.35.0"
"version": "1.40.2"
}
8 changes: 3 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
"node": "20"
},
"scripts": {
"dev": "NODE_OPTIONS=--no-node-snapshot concurrently \"yarn start\" \"yarn start-backend\"",
"dev:ci": "NODE_OPTIONS=--no-node-snapshot concurrently \"http-server --port 3000 --proxy http://localhost:3000? packages/app/dist\" \"yarn start-backend\"",
"start": "yarn workspace app start",
"start": "NODE_OPTIONS=--no-node-snapshot backstage-cli repo start",
"start-backend": "yarn workspace backend start",
"start-backend:ci": "yarn workspace backend backstage-cli package build && node packages/backend",
"start:ci": "concurrently \"yarn start\" \"yarn start-backend:ci\"",
Expand Down Expand Up @@ -37,7 +35,7 @@
]
},
"devDependencies": {
"@backstage/cli": "^0.29.5",
"@backstage/cli": "^0.33.0",
"@backstage/e2e-test-utils": "^0.1.1",
"@playwright/test": "^1.32.3",
"concurrently": "^8.0.0",
Expand All @@ -46,7 +44,7 @@
"lint-staged": "^15.0.2",
"node-gyp": "^10.0.0",
"prettier": "^2.3.2",
"typescript": "~5.2.0"
"typescript": "~5.8.0"
},
"resolutions": {
"@types/react": "^18",
Expand Down
49 changes: 25 additions & 24 deletions packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,30 @@
"dependencies": {
"@backstage-community/plugin-github-actions": "^0.6.16",
"@backstage-community/plugin-tech-radar": "^0.7.4",
"@backstage/app-defaults": "^1.5.16",
"@backstage/catalog-model": "^1.7.3",
"@backstage/cli": "^0.29.5",
"@backstage/core-app-api": "^1.15.4",
"@backstage/core-components": "^0.16.3",
"@backstage/core-plugin-api": "^1.10.3",
"@backstage/integration-react": "^1.2.3",
"@backstage/plugin-api-docs": "^0.12.3",
"@backstage/plugin-catalog": "^1.26.1",
"@backstage/plugin-catalog-common": "^1.1.3",
"@backstage/plugin-catalog-graph": "^0.4.15",
"@backstage/plugin-catalog-import": "^0.12.9",
"@backstage/plugin-catalog-react": "^1.15.1",
"@backstage/plugin-org": "^0.6.35",
"@backstage/plugin-permission-react": "^0.4.30",
"@backstage/plugin-scaffolder": "^1.27.4",
"@backstage/plugin-search": "^1.4.22",
"@backstage/plugin-search-react": "^1.8.5",
"@backstage/plugin-techdocs": "^1.12.1",
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.20",
"@backstage/plugin-techdocs-react": "^1.2.13",
"@backstage/plugin-user-settings": "^0.8.18",
"@backstage/theme": "^0.6.3",
"@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",
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@segment/backstage-plugin-analytics-module-segment": "link:../../plugins/analytics-module-segment",
Expand All @@ -50,7 +51,7 @@
"react-use": "^17.2.4"
},
"devDependencies": {
"@backstage/test-utils": "^1.7.4",
"@backstage/test-utils": "^1.7.9",
"@playwright/test": "^1.32.3",
"@testing-library/dom": "^8.0.0",
"@testing-library/jest-dom": "^5.10.1",
Expand Down
1 change: 0 additions & 1 deletion packages/app/src/App.test.tsx
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
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { Navigate, Route } from 'react-router-dom';
import { apiDocsPlugin, ApiExplorerPage } from '@backstage/plugin-api-docs';
import {
Expand Down
1 change: 0 additions & 1 deletion packages/app/src/components/Root/LogoFull.tsx
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
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
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
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { Button, Grid } from '@material-ui/core';
import {
EntityApiDefinitionCard,
Expand Down
1 change: 0 additions & 1 deletion packages/app/src/components/search/SearchPage.tsx
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
3 changes: 1 addition & 2 deletions packages/app/src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import '@backstage/cli/asset-types';
import React from 'react';
import ReactDOM from 'react-dom/client';

import App from './App';
import '@backstage/canon/css/styles.css';

ReactDOM.createRoot(document.getElementById('root')!).render(<App />);
28 changes: 14 additions & 14 deletions packages/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@
"build-image": "docker build ../.. -f Dockerfile --tag backstage"
},
"dependencies": {
"@backstage/backend-defaults": "^0.7.0",
"@backstage/backend-plugin-api": "^1.1.1",
"@backstage/plugin-app-backend": "^0.4.4",
"@backstage/plugin-auth-backend": "^0.24.2",
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.4",
"@backstage/plugin-catalog-backend": "^1.30.0",
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.4",
"@backstage/plugin-proxy-backend": "^0.5.10",
"@backstage/plugin-scaffolder-backend": "^1.29.0",
"@backstage/plugin-search-backend": "^1.8.1",
"@backstage/plugin-search-backend-module-catalog": "^0.3.0",
"@backstage/plugin-search-backend-module-techdocs": "^0.3.5",
"@backstage/plugin-techdocs-backend": "^1.11.5",
"@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",
"@segment/backstage-plugin-proxy-sigv4-backend": "link:../../plugins/proxy-sigv4-backend",
"app": "link:../app",
"better-sqlite3": "^8.0.0",
Expand All @@ -38,7 +38,7 @@
"winston": "^3.2.1"
},
"devDependencies": {
"@backstage/cli": "^0.29.5",
"@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
2 changes: 1 addition & 1 deletion playwright.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default defineConfig({
? []
: [
{
command: 'yarn dev',
command: 'yarn start',
port: 3000,
reuseExistingServer: true,
timeout: 60_000,
Expand Down
1 change: 0 additions & 1 deletion plugins/analytics-module-segment/dev/Playground.tsx
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-segment/dev/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import {
analyticsApiRef,
configApiRef,
Expand Down
12 changes: 6 additions & 6 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.29.5",
"@backstage/cli": "^0.33.0",
"@backstage/config": "^1.3.2",
"@backstage/core-app-api": "^1.15.4",
"@backstage/core-components": "^0.16.3",
"@backstage/core-plugin-api": "^1.10.3",
"@backstage/dev-utils": "^1.1.6",
"@backstage/frontend-plugin-api": "^0.9.4",
"@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",
"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.1.1",
"@backstage/backend-plugin-api": "^1.4.0",
"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.7.0",
"@backstage/backend-test-utils": "^1.2.1",
"@backstage/cli": "^0.29.5",
"@backstage/backend-defaults": "^0.11.0",
"@backstage/backend-test-utils": "^1.6.0",
"@backstage/cli": "^0.33.0",
"@smithy/types": "^3.3.0",
"@types/aws4": "^1.11.6",
"@types/express": "^4.17.20"
Expand Down
3 changes: 2 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"exclude": ["node_modules"],
"compilerOptions": {
"outDir": "dist-types",
"rootDir": "."
"rootDir": ".",
"jsx": "react-jsx"
}
}
Loading