Skip to content

Commit

Permalink
Merge branch 'main' into dl/entities-query
Browse files Browse the repository at this point in the history
  • Loading branch information
wKich authored Mar 20, 2024
2 parents 82f7c78 + 836228a commit 1663a5b
Showing 21 changed files with 8,093 additions and 7,182 deletions.
21 changes: 21 additions & 0 deletions .changeset/itchy-badgers-unite.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
'@frontside/backstage-plugin-graphql-backend-module-catalog': patch
'@frontside/backstage-plugin-incremental-ingestion-backend': patch
'@frontside/backstage-plugin-incremental-ingestion-github': patch
'@frontside/backstage-plugin-scaffolder-workflow': patch
'@frontside/backstage-plugin-effection-inspector-backend': patch
'@frontside/scaffolder-yaml-actions': patch
'@frontside/backstage-plugin-graphql-backend-node': patch
'@frontside/backstage-plugin-effection-inspector': patch
'@frontside/backstage-plugin-humanitec-backend': patch
'@frontside/backstage-ingestion-tests': patch
'@frontside/backstage-plugin-humanitec-common': patch
'@frontside/backstage-plugin-graphql-backend': patch
'@frontside/backstage-plugin-batch-loader': patch
'@internal/plugin-healthcheck': patch
'@frontside/backstage-plugin-humanitec': patch
'backend': patch
'app': patch
---

Update backstage dependencies
1 change: 0 additions & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"packages": ["packages/*", "plugins/*", "graphgen/*"],
"npmClient": "yarn",
"useWorkspaces": true,
"version": "0.1.0"
}
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -35,13 +35,12 @@
]
},
"devDependencies": {
"@backstage/cli": "^0.24.0",
"@backstage/cli": "^0.25.2",
"@changesets/cli": "^2.22.0",
"@spotify/prettier-config": "^12.0.0",
"concurrently": "^7.5.0",
"eslint-plugin-prettier": "^4.2.1",
"lerna": "^4.0.0",
"node-gyp": "^9.0.0",
"lerna": "^8.1.2",
"prettier": "^2.3.2",
"typescript": "~5.2.2"
},
20 changes: 10 additions & 10 deletions packages/app/package.json
Original file line number Diff line number Diff line change
@@ -9,14 +9,14 @@
"dependencies": {
"@backstage/app-defaults": "^1.4.5",
"@backstage/catalog-model": "^1.4.3",
"@backstage/cli": "^0.24.0",
"@backstage/cli": "^0.25.2",
"@backstage/core-app-api": "^1.11.1",
"@backstage/core-components": "^0.13.8",
"@backstage/core-components": "^0.14.0",
"@backstage/core-plugin-api": "^1.8.0",
"@backstage/integration-react": "^1.1.21",
"@backstage/plugin-api-docs": "^0.10.1",
"@backstage/plugin-api-docs": "^0.11.0",
"@backstage/plugin-catalog": "^1.15.1",
"@backstage/plugin-catalog-graph": "^0.3.1",
"@backstage/plugin-catalog-graph": "^0.4.0",
"@backstage/plugin-catalog-import": "^0.10.3",
"@backstage/plugin-catalog-react": "^1.9.1",
"@backstage/plugin-catalog-unprocessed-entities": "^0.1.5",
@@ -31,8 +31,8 @@
"@backstage/plugin-techdocs": "^1.9.1",
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.2",
"@backstage/plugin-techdocs-react": "^1.1.13",
"@backstage/plugin-user-settings": "^0.7.13",
"@backstage/theme": "^0.4.4",
"@backstage/plugin-user-settings": "^0.8.1",
"@backstage/theme": "^0.5.1",
"@backstage/types": "^1.1.1",
"@frontside/backstage-plugin-effection-inspector": "^0.1.11",
"@frontside/backstage-plugin-humanitec": "^0.3.12",
@@ -43,20 +43,20 @@
"assert-ts": "^0.3.4",
"classnames": "^2.3.2",
"history": "^5.0.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router": "^6.3.0",
"react-router-dom": "^6.3.0",
"react-use": "^17.2.4"
},
"devDependencies": {
"@backstage/test-utils": "^1.4.5",
"@backstage/test-utils": "^1.5.0",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^12.1.3",
"@testing-library/user-event": "^14.5.1",
"@types/jest": "^29.2.0",
"@types/node": "^16.11.26",
"@types/react-dom": "*",
"@types/react-dom": "18.2.22",
"cross-env": "^7.0.0",
"cypress": "^9.7.0",
"eslint-plugin-cypress": "^2.10.3",
12 changes: 6 additions & 6 deletions packages/backend/package.json
Original file line number Diff line number Diff line change
@@ -17,25 +17,25 @@
"migrate:create": "knex migrate:make -x ts"
},
"dependencies": {
"@backstage/backend-common": "^0.19.9",
"@backstage/backend-common": "^0.21.3",
"@backstage/backend-tasks": "^0.5.12",
"@backstage/catalog-client": "^1.4.6",
"@backstage/catalog-model": "^1.4.3",
"@backstage/config": "^1.1.1",
"@backstage/errors": "^1.2.3",
"@backstage/integration": "^1.7.2",
"@backstage/plugin-app-backend": "^0.3.55",
"@backstage/plugin-auth-backend": "^0.20.0",
"@backstage/plugin-auth-backend": "^0.21.3",
"@backstage/plugin-auth-node": "^0.4.1",
"@backstage/plugin-catalog-backend": "^1.15.0",
"@backstage/plugin-catalog-backend-module-github": "^0.4.5",
"@backstage/plugin-catalog-backend-module-github": "^0.5.3",
"@backstage/plugin-catalog-backend-module-unprocessed": "^0.3.4",
"@backstage/plugin-catalog-graph": "^0.3.1",
"@backstage/plugin-catalog-graph": "^0.4.0",
"@backstage/plugin-permission-common": "^0.7.10",
"@backstage/plugin-permission-node": "^0.7.18",
"@backstage/plugin-proxy-backend": "^0.4.5",
"@backstage/plugin-scaffolder-backend": "^1.19.1",
"@backstage/plugin-scaffolder-node": "^0.2.8",
"@backstage/plugin-scaffolder-node": "^0.3.3",
"@backstage/plugin-search-backend": "^1.4.7",
"@backstage/plugin-search-backend-module-pg": "^0.5.16",
"@backstage/plugin-search-backend-node": "^1.2.11",
@@ -71,7 +71,7 @@
"zod": "^3.21.4"
},
"devDependencies": {
"@backstage/cli": "^0.24.0",
"@backstage/cli": "^0.25.2",
"@octokit/types": "^6.34.0",
"@types/dockerode": "^3.3.0",
"@types/express": "^4.17.6",
4 changes: 2 additions & 2 deletions packages/ingestion-tests/package.json
Original file line number Diff line number Diff line change
@@ -21,9 +21,9 @@
"role": "common-library"
},
"dependencies": {
"@backstage/backend-common": "^0.19.9",
"@backstage/backend-common": "^0.21.3",
"@backstage/catalog-client": "^1.4.6",
"@backstage/cli": "^0.24.0",
"@backstage/cli": "^0.25.2",
"@backstage/config": "^1.1.1",
"@backstage/integration": "^1.7.2",
"@effection/process": "^2.0.4",
4 changes: 2 additions & 2 deletions plugins/batch-loader/package.json
Original file line number Diff line number Diff line change
@@ -23,13 +23,13 @@
"clean": "backstage-cli clean"
},
"dependencies": {
"@backstage/backend-common": "^0.19.9",
"@backstage/backend-common": "^0.21.3",
"@backstage/catalog-model": "^1.4.3",
"knex": "^3.0.1",
"winston": "^3.2.1"
},
"devDependencies": {
"@backstage/cli": "^0.24.0",
"@backstage/cli": "^0.25.2",
"@backstage/config": "^1.1.1",
"@backstage/integration": "^1.7.2",
"@backstage/plugin-catalog-backend": "^1.15.0",
4 changes: 2 additions & 2 deletions plugins/effection-inspector-backend/package.json
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
"postpack": "backstage-cli package postpack"
},
"dependencies": {
"@backstage/backend-common": "^0.19.9",
"@backstage/backend-common": "^0.21.3",
"@backstage/config": "^1.1.1",
"@effection/inspect-utils": "^2.1.6",
"@types/express": "*",
@@ -34,7 +34,7 @@
"yn": "^4.0.0"
},
"devDependencies": {
"@backstage/cli": "^0.24.0",
"@backstage/cli": "^0.25.2",
"@types/supertest": "^2.0.8",
"msw": "^0.35.0",
"supertest": "^4.0.2"
10 changes: 5 additions & 5 deletions plugins/effection-inspector/package.json
Original file line number Diff line number Diff line change
@@ -22,9 +22,9 @@
"postpack": "backstage-cli package postpack"
},
"dependencies": {
"@backstage/core-components": "^0.13.8",
"@backstage/core-components": "^0.14.0",
"@backstage/core-plugin-api": "^1.8.0",
"@backstage/theme": "^0.4.4",
"@backstage/theme": "^0.5.1",
"@effection/inspect-ui": "^2.3.2",
"@effection/react": "^2.2.2",
"@material-ui/core": "^4.12.2",
@@ -36,10 +36,10 @@
"react": "^16.13.1 || ^17.0.0"
},
"devDependencies": {
"@backstage/cli": "^0.24.0",
"@backstage/cli": "^0.25.2",
"@backstage/core-app-api": "^1.11.1",
"@backstage/dev-utils": "^1.0.24",
"@backstage/test-utils": "^1.4.5",
"@backstage/dev-utils": "^1.0.27",
"@backstage/test-utils": "^1.5.0",
"@effection/atom": "^2.0.6",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^12.1.3",
4 changes: 2 additions & 2 deletions plugins/graphql-backend-module-catalog/package.json
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@
"clean": "backstage-cli package clean"
},
"dependencies": {
"@backstage/backend-common": "^0.19.9",
"@backstage/backend-common": "^0.21.3",
"@backstage/backend-plugin-api": "^0.6.7",
"@backstage/catalog-client": "^1.4.6",
"@backstage/catalog-model": "^1.4.3",
@@ -58,7 +58,7 @@
"lodash": "^4.17.21"
},
"devDependencies": {
"@backstage/cli": "^0.24.0",
"@backstage/cli": "^0.25.2",
"@envelop/core": "^4.0.0",
"@envelop/dataloader": "^5.0.0",
"@envelop/graphql-modules": "^5.0.0",
2 changes: 1 addition & 1 deletion plugins/graphql-backend-node/package.json
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@
"graphql-yoga": "^4.0.3"
},
"devDependencies": {
"@backstage/cli": "^0.24.0"
"@backstage/cli": "^0.25.2"
},
"files": [
"dist"
4 changes: 2 additions & 2 deletions plugins/graphql-backend/package.json
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@
"clean": "backstage-cli package clean"
},
"dependencies": {
"@backstage/backend-common": "^0.19.9",
"@backstage/backend-common": "^0.21.3",
"@backstage/backend-plugin-api": "^0.6.7",
"@envelop/core": "^4.0.0",
"@envelop/dataloader": "^5.0.0",
@@ -50,7 +50,7 @@
"winston": "^3.2.1"
},
"devDependencies": {
"@backstage/cli": "^0.24.0",
"@backstage/cli": "^0.25.2",
"@types/supertest": "^2.0.8",
"supertest": "^6.1.3"
},
4 changes: 2 additions & 2 deletions plugins/healthcheck/package.json
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
"clean": "backstage-cli package clean"
},
"dependencies": {
"@backstage/backend-common": "^0.19.9",
"@backstage/backend-common": "^0.21.3",
"@backstage/config": "^1.1.1",
"@types/express": "*",
"cross-fetch": "^3.0.6",
@@ -33,7 +33,7 @@
"yn": "^4.0.0"
},
"devDependencies": {
"@backstage/cli": "^0.24.0",
"@backstage/cli": "^0.25.2",
"@types/supertest": "^2.0.8",
"msw": "^0.35.0",
"supertest": "^4.0.2"
4 changes: 2 additions & 2 deletions plugins/humanitec-backend/package.json
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
"postpack": "backstage-cli package postpack"
},
"dependencies": {
"@backstage/backend-common": "^0.19.9",
"@backstage/backend-common": "^0.21.3",
"@backstage/config": "^1.1.1",
"@backstage/plugin-scaffolder-backend": "^1.19.1",
"@frontside/backstage-plugin-humanitec-common": "^0.3.12",
@@ -36,7 +36,7 @@
"yn": "^4.0.0"
},
"devDependencies": {
"@backstage/cli": "^0.24.0",
"@backstage/cli": "^0.25.2",
"@types/js-yaml": "^4.0.5",
"@types/supertest": "^2.0.8",
"msw": "^0.35.0",
2 changes: 1 addition & 1 deletion plugins/humanitec-common/package.json
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@
"zod": "^3.17.3"
},
"devDependencies": {
"@backstage/cli": "^0.24.0"
"@backstage/cli": "^0.25.2"
},
"files": [
"dist"
10 changes: 5 additions & 5 deletions plugins/humanitec/package.json
Original file line number Diff line number Diff line change
@@ -23,10 +23,10 @@
},
"dependencies": {
"@backstage/catalog-model": "^1.4.3",
"@backstage/core-components": "^0.13.8",
"@backstage/core-components": "^0.14.0",
"@backstage/core-plugin-api": "^1.8.0",
"@backstage/plugin-catalog-react": "^1.9.1",
"@backstage/theme": "^0.4.4",
"@backstage/theme": "^0.5.1",
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.57",
@@ -39,10 +39,10 @@
"react": "^16.13.1 || ^17.0.0"
},
"devDependencies": {
"@backstage/cli": "^0.24.0",
"@backstage/cli": "^0.25.2",
"@backstage/core-app-api": "^1.11.1",
"@backstage/dev-utils": "^1.0.24",
"@backstage/test-utils": "^1.4.5",
"@backstage/dev-utils": "^1.0.27",
"@backstage/test-utils": "^1.5.0",
"@frontside/backstage-plugin-humanitec-common": "^0.3.12",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^12.1.3",
4 changes: 2 additions & 2 deletions plugins/incremental-ingestion-backend/package.json
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
"postpack": "backstage-cli package postpack"
},
"dependencies": {
"@backstage/backend-common": "^0.19.9",
"@backstage/backend-common": "^0.21.3",
"@backstage/catalog-model": "^1.4.3",
"@backstage/config": "^1.1.1",
"@backstage/plugin-catalog-backend": "^1.15.0",
@@ -38,7 +38,7 @@
"yn": "^4.0.0"
},
"devDependencies": {
"@backstage/cli": "^0.24.0",
"@backstage/cli": "^0.25.2",
"@types/luxon": "^2.0.4",
"@types/supertest": "^2.0.8",
"@types/uuid": "^8.3.4",
4 changes: 2 additions & 2 deletions plugins/incremental-ingestion-github/package.json
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
"generate": "graphql-codegen --config codegen.yml"
},
"dependencies": {
"@backstage/backend-common": "^0.19.9",
"@backstage/backend-common": "^0.21.3",
"@backstage/config": "^1.1.1",
"@backstage/integration": "^1.7.2",
"@frontside/backstage-plugin-incremental-ingestion-backend": "*",
@@ -41,7 +41,7 @@
"yn": "^4.0.0"
},
"devDependencies": {
"@backstage/cli": "^0.24.0",
"@backstage/cli": "^0.25.2",
"@graphql-codegen/cli": "^4.0.0",
"@graphql-codegen/typescript": "^4.0.0",
"@graphql-codegen/typescript-document-nodes": "^4.0.0",
10 changes: 5 additions & 5 deletions plugins/scaffolder-frontend-workflow/package.json
Original file line number Diff line number Diff line change
@@ -23,10 +23,10 @@
},
"dependencies": {
"@backstage/catalog-model": "^1.4.3",
"@backstage/core-components": "^0.13.8",
"@backstage/core-components": "^0.14.0",
"@backstage/core-plugin-api": "^1.8.0",
"@backstage/plugin-scaffolder-react": "^1.6.1",
"@backstage/theme": "^0.4.4",
"@backstage/theme": "^0.5.1",
"@backstage/types": "^1.1.1",
"@material-ui/core": "^4.9.13",
"@material-ui/icons": "^4.9.1",
@@ -49,10 +49,10 @@
"react-router-dom": "^6.x.x"
},
"devDependencies": {
"@backstage/cli": "^0.24.0",
"@backstage/cli": "^0.25.2",
"@backstage/core-app-api": "^1.11.1",
"@backstage/dev-utils": "^1.0.24",
"@backstage/test-utils": "^1.4.5",
"@backstage/dev-utils": "^1.0.27",
"@backstage/test-utils": "^1.5.0",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^12.1.3",
"@testing-library/react-hooks": "^8.0.1",
Loading

0 comments on commit 1663a5b

Please sign in to comment.