Skip to content

Commit 25ca068

Browse files
committed
feat: updated local backstage version, fix issues with collator plugin and UI issues for frontend plugin
fix: updated setup node version to v6 fix: release automation fix: automation fix: automation fix: automation fix: adding missing changeset dependency fix: github token permissions fix: github token permissions
1 parent f5d92ef commit 25ca068

File tree

20 files changed

+10003
-2206
lines changed

20 files changed

+10003
-2206
lines changed

.changeset/moody-mails-nail.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
'@stackoverflow/backstage-stack-overflow-teams-collator': minor
3+
'@stackoverflow/backstage-plugin-stack-overflow-teams': minor
4+
'backend': minor
5+
'app': minor
6+
---
7+
8+
Fixed issue with collator NPM package, fixed UI issue with frontend plugin, updated backend and app local dev environments to the latest backstage version

.github/workflows/release.yml

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,41 @@
11
name: Release
2+
23
on:
34
push:
45
branches:
56
- main
67
paths:
78
- 'plugins/**'
8-
workflow_dispatch:
9-
10-
# Required for trusted publishing
11-
permissions:
12-
contents: read
13-
id-token: write # Needed for provenance and trusted publishing
9+
workflow_dispatch:
1410

1511
concurrency: ${{ github.workflow }}-${{ github.ref }}
1612

1713
jobs:
1814
release:
1915
name: Release
2016
runs-on: ubuntu-latest
17+
2118
steps:
2219
- name: Checkout Repo
2320
uses: actions/checkout@v3
2421

25-
- name: Setup Node.js 20.x
26-
uses: actions/setup-node@v3
22+
- name: Setup Python
23+
uses: actions/setup-python@v4
2724
with:
28-
node-version: 20.x
25+
python-version: '3.11'
26+
27+
- name: Setup Node.js 24 LTS
28+
uses: actions/setup-node@v6
29+
with:
30+
node-version: 24.12.0
2931
cache: 'yarn'
3032
registry-url: 'https://registry.npmjs.org'
3133

34+
- name: Install system dependencies
35+
run: |
36+
sudo apt-get update
37+
sudo apt-get install -y build-essential g++ make python3-dev
38+
3239
- name: Install Dependencies
3340
run: yarn install
3441

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ logs
77
npm-debug.log*
88
yarn-debug.log*
99
yarn-error.log*
10-
lerna-debug.log*
1110

1211
# Coverage directory generated when running tests with coverage
1312
coverage
@@ -52,3 +51,6 @@ site
5251

5352
# E2E test reports
5453
e2e-test-report/
54+
55+
# Cache
56+
.cache/

backstage.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"version": "1.34.0"
2+
"version": "1.46.0"
33
}

package.json

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
"version": "1.0.0",
44
"private": true,
55
"engines": {
6-
"node": "20 || 22"
6+
"node": "22 || 24"
77
},
88
"scripts": {
9-
"dev": "yarn workspaces foreach -A --include backend --include app --parallel -v -i run start",
10-
"start": "yarn workspace app start",
11-
"start-backend": "yarn workspace backend start",
9+
"start": "backstage-cli repo start",
1210
"build:backend": "yarn workspace backend build",
1311
"build:all": "backstage-cli repo build --all",
1412
"build-image": "yarn workspace backend build-image",
@@ -22,7 +20,7 @@
2220
"lint": "backstage-cli repo lint --since origin/master",
2321
"lint:all": "backstage-cli repo lint",
2422
"prettier:check": "prettier --check .",
25-
"new": "backstage-cli new --scope internal"
23+
"new": "backstage-cli new"
2624
},
2725
"workspaces": {
2826
"packages": [
@@ -31,23 +29,20 @@
3129
]
3230
},
3331
"devDependencies": {
34-
"@backstage/cli": "^0.29.4",
32+
"@backstage/cli": "^0.35.0",
3533
"@backstage/e2e-test-utils": "^0.1.1",
34+
"@jest/environment-jsdom-abstract": "^30.0.0",
3635
"@playwright/test": "^1.32.3",
36+
"@types/jest": "^30.0.0",
37+
"jest": "^30.2.0",
38+
"jsdom": "^27.1.0",
3739
"node-gyp": "^10.0.0",
3840
"prettier": "^2.3.2",
39-
"typescript": "~5.4.0"
41+
"typescript": "~5.8.0"
4042
},
4143
"resolutions": {
4244
"@types/react": "^18",
43-
"@types/react-dom": "^18",
44-
"@backstage/backend-defaults": "0.13.0",
45-
"@backstage/plugin-catalog-backend": "3.1.2",
46-
"@backstage/plugin-auth-backend": "0.25.5",
47-
"@backstage/plugin-scaffolder-backend": "1.33.0",
48-
"@backstage/backend-plugin-api": "1.4.4",
49-
"@backstage/config": "1.3.5",
50-
"@backstage/cli": "0.34.4"
45+
"@types/react-dom": "^18"
5146
},
5247
"prettier": "@backstage/cli/config/prettier",
5348
"lint-staged": {
@@ -59,8 +54,9 @@
5954
"prettier --write"
6055
]
6156
},
62-
"packageManager": "yarn@4.6.0",
57+
"packageManager": "yarn@4.4.1",
6358
"dependencies": {
64-
"@changesets/cli": "^2.29.5"
59+
"@changesets/cli": "^2.29.8",
60+
"dotenv": "^17.2.3"
6561
}
6662
}

packages/app/package.json

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,33 @@
1414
"lint": "backstage-cli package lint"
1515
},
1616
"dependencies": {
17-
"@backstage/app-defaults": "^1.5.15",
18-
"@backstage/catalog-model": "^1.7.2",
19-
"@backstage/cli": "^0.29.4",
20-
"@backstage/core-app-api": "^1.15.3",
21-
"@backstage/core-components": "^0.16.2",
22-
"@backstage/core-plugin-api": "^1.10.2",
23-
"@backstage/integration-react": "^1.2.2",
24-
"@backstage/plugin-api-docs": "^0.12.2",
25-
"@backstage/plugin-catalog": "^1.26.0",
26-
"@backstage/plugin-catalog-common": "^1.1.2",
27-
"@backstage/plugin-catalog-graph": "^0.4.14",
28-
"@backstage/plugin-catalog-import": "^0.12.8",
29-
"@backstage/plugin-catalog-react": "^1.15.0",
30-
"@backstage/plugin-kubernetes": "^0.12.2",
31-
"@backstage/plugin-org": "^0.6.34",
32-
"@backstage/plugin-permission-react": "^0.4.29",
33-
"@backstage/plugin-scaffolder": "^1.27.2",
34-
"@backstage/plugin-search": "^1.4.21",
35-
"@backstage/plugin-search-react": "^1.8.4",
36-
"@backstage/plugin-techdocs": "^1.12.0",
37-
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.19",
38-
"@backstage/plugin-techdocs-react": "^1.2.12",
39-
"@backstage/plugin-user-settings": "^0.8.17",
40-
"@backstage/theme": "^0.6.3",
17+
"@backstage/app-defaults": "^1.7.3",
18+
"@backstage/catalog-model": "^1.7.6",
19+
"@backstage/cli": "^0.35.0",
20+
"@backstage/core-app-api": "^1.19.3",
21+
"@backstage/core-components": "^0.18.4",
22+
"@backstage/core-plugin-api": "^1.12.1",
23+
"@backstage/integration-react": "^1.2.13",
24+
"@backstage/plugin-api-docs": "^0.13.2",
25+
"@backstage/plugin-catalog": "^1.32.1",
26+
"@backstage/plugin-catalog-common": "^1.1.7",
27+
"@backstage/plugin-catalog-graph": "^0.5.4",
28+
"@backstage/plugin-catalog-import": "^0.13.8",
29+
"@backstage/plugin-catalog-react": "^1.21.4",
30+
"@backstage/plugin-kubernetes": "^0.12.14",
31+
"@backstage/plugin-notifications": "^0.5.12",
32+
"@backstage/plugin-org": "^0.6.47",
33+
"@backstage/plugin-permission-react": "^0.4.39",
34+
"@backstage/plugin-scaffolder": "^1.35.0",
35+
"@backstage/plugin-search": "^1.5.1",
36+
"@backstage/plugin-search-react": "^1.10.1",
37+
"@backstage/plugin-signals": "^0.0.26",
38+
"@backstage/plugin-techdocs": "^1.16.1",
39+
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.31",
40+
"@backstage/plugin-techdocs-react": "^1.3.6",
41+
"@backstage/plugin-user-settings": "^0.8.30",
42+
"@backstage/theme": "^0.7.1",
43+
"@backstage/ui": "^0.10.0",
4144
"@material-ui/core": "^4.12.2",
4245
"@material-ui/icons": "^4.9.1",
4346
"@stackoverflow/backstage-plugin-stack-overflow-teams": "workspace:*",
@@ -47,7 +50,7 @@
4750
"react-router-dom": "^6.3.0"
4851
},
4952
"devDependencies": {
50-
"@backstage/test-utils": "^1.7.3",
53+
"@backstage/test-utils": "^1.7.14",
5154
"@playwright/test": "^1.32.3",
5255
"@testing-library/dom": "^9.0.0",
5356
"@testing-library/jest-dom": "^6.0.0",

packages/app/src/App.test.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import React from 'react';
21
import { render, waitFor } from '@testing-library/react';
32
import App from './App';
43

packages/app/src/App.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import React from 'react';
21
import { Navigate, Route } from 'react-router-dom';
32
import { apiDocsPlugin, ApiExplorerPage } from '@backstage/plugin-api-docs';
43
import {

packages/app/src/components/Root/LogoFull.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import React from 'react';
21
import { makeStyles } from '@material-ui/core';
32

43
const useStyles = makeStyles({

packages/app/src/components/Root/LogoIcon.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import React from 'react';
21
import { makeStyles } from '@material-ui/core';
32

43
const useStyles = makeStyles({

0 commit comments

Comments
 (0)