Skip to content

Commit

Permalink
Merge pull request #79 from spreadshirt/backstage-1.21.1
Browse files Browse the repository at this point in the history
Bump to Backstage 1.21.1
  • Loading branch information
ivangonzalezacuna authored Jan 10, 2024
2 parents 7069d7c + 6a8666a commit f859406
Show file tree
Hide file tree
Showing 11 changed files with 792 additions and 706 deletions.
6 changes: 6 additions & 0 deletions .changeset/nine-buckets-sneeze.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@spreadshirt/backstage-plugin-s3-viewer-backend': patch
---

Add legacy flag for local development. This flag can be removed once the
migration to the new backend-system is done.
7 changes: 7 additions & 0 deletions .changeset/purple-bugs-wave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@spreadshirt/backstage-plugin-s3-viewer': patch
'@spreadshirt/backstage-plugin-s3-viewer-backend': patch
'@spreadshirt/backstage-plugin-s3-viewer-common': patch
---

Bump backstage dependencies to version 1.21.1
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Install Node.js
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 20.x
- run: yarn install
- run: yarn ci
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
# This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
fetch-depth: 0

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

- name: Install Dependencies
run: yarn
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upgrade-backstage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 20.x

- name: Upgrade plugins
run: |
Expand Down
2 changes: 1 addition & 1 deletion backstage.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "1.20.2"
"version": "1.21.1"
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"npm:release": "yarn install && tsc && yarn build:all && changeset publish"
},
"devDependencies": {
"@backstage/cli": "^0.24.0",
"@backstage/cli": "^0.25.0",
"@changesets/cli": "^2.24.4",
"@spotify/prettier-config": "^12.0.0",
"@types/react": "^17.0.0",
Expand Down
20 changes: 10 additions & 10 deletions plugins/s3-viewer-backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"role": "backend-plugin"
},
"scripts": {
"start": "backstage-cli package start",
"start": "LEGACY_BACKEND_START=1 backstage-cli package start",
"build": "backstage-cli package build",
"lint": "backstage-cli package lint",
"test": "backstage-cli package test",
Expand All @@ -34,15 +34,15 @@
"@aws-sdk/client-s3": "^3.350.0",
"@aws-sdk/protocol-http": "^3.347.0",
"@aws-sdk/signature-v4": "^3.347.0",
"@backstage/backend-common": "^0.19.9",
"@backstage/backend-plugin-api": "^0.6.7",
"@backstage/backend-tasks": "^0.5.12",
"@backstage/backend-common": "^0.20.0",
"@backstage/backend-plugin-api": "^0.6.8",
"@backstage/backend-tasks": "^0.5.13",
"@backstage/config": "^1.1.1",
"@backstage/errors": "^1.2.3",
"@backstage/plugin-auth-node": "^0.4.1",
"@backstage/plugin-permission-backend": "^0.5.30",
"@backstage/plugin-permission-common": "^0.7.10",
"@backstage/plugin-permission-node": "^0.7.18",
"@backstage/plugin-auth-node": "^0.4.2",
"@backstage/plugin-permission-backend": "^0.5.31",
"@backstage/plugin-permission-common": "^0.7.11",
"@backstage/plugin-permission-node": "^0.7.19",
"@backstage/types": "^1.1.1",
"@spreadshirt/backstage-plugin-s3-viewer-common": "^0.3.6",
"@types/express": "*",
Expand All @@ -58,8 +58,8 @@
"zod": "^3.21.4"
},
"devDependencies": {
"@backstage/cli": "^0.24.0",
"@backstage/test-utils": "^1.4.5",
"@backstage/cli": "^0.25.0",
"@backstage/test-utils": "^1.4.6",
"@types/cookie-parser": "^1.4.3",
"@types/jest": "*",
"@types/supertest": "^2.0.8",
Expand Down
4 changes: 2 additions & 2 deletions plugins/s3-viewer-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
"postpack": "backstage-cli package postpack"
},
"devDependencies": {
"@backstage/cli": "^0.24.0"
"@backstage/cli": "^0.25.0"
},
"files": [
"dist"
],
"dependencies": {
"@aws-sdk/client-s3": "^3.350.0",
"@backstage/plugin-permission-common": "^0.7.10"
"@backstage/plugin-permission-common": "^0.7.11"
}
}
14 changes: 7 additions & 7 deletions plugins/s3-viewer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"postpack": "backstage-cli package postpack"
},
"dependencies": {
"@backstage/core-components": "^0.13.8",
"@backstage/core-plugin-api": "^1.8.0",
"@backstage/core-components": "^0.13.9",
"@backstage/core-plugin-api": "^1.8.1",
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "^4.0.0-alpha.61",
Expand All @@ -41,13 +41,13 @@
},
"peerDependencies": {
"react": "^16.13.1 || ^17.0.0",
"react-router": "6.0.0-beta.0 || ^6.3.0"
"react-router": "^6.3.0"
},
"devDependencies": {
"@backstage/cli": "^0.24.0",
"@backstage/core-app-api": "^1.11.1",
"@backstage/dev-utils": "^1.0.23",
"@backstage/test-utils": "^1.4.5",
"@backstage/cli": "^0.25.0",
"@backstage/core-app-api": "^1.11.2",
"@backstage/dev-utils": "^1.0.25",
"@backstage/test-utils": "^1.4.6",
"@testing-library/jest-dom": "^6.0.0",
"@testing-library/react": "^12.1.3",
"@testing-library/user-event": "^14.0.0",
Expand Down
Loading

0 comments on commit f859406

Please sign in to comment.