Skip to content

Commit

Permalink
Fix releases for plugins
Browse files Browse the repository at this point in the history
The plugins were not able to be discovered anymore due to the
workspace usage we implemented in the last PRs. Let's try reverting
that change and make sure the packages can be found again.

This could potentially lead to the releases needing a local `yarn install`
to make sure the pipelines pass. But that's better than nothing.
  • Loading branch information
ivangonzalezacuna committed Oct 23, 2024
1 parent 5c55c52 commit 56350c5
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 32 deletions.
11 changes: 11 additions & 0 deletions .changeset/heavy-bears-impress.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
'@spreadshirt/backstage-plugin-s3-viewer-backend': patch
'@spreadshirt/backstage-plugin-s3-viewer-common': patch
'@spreadshirt/backstage-plugin-s3-viewer-node': patch
'@spreadshirt/backstage-plugin-s3-viewer': patch
'app': patch
---

Fix release process due to 'workspace' references not being resolved.
To do that, the previous setup using the exact version in the `package.json`
has been brought back.
8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"private": true,
"workspaces": {
"packages": [
"packages/**",
"plugins/**"
"packages/*",
"plugins/*"
]
},
"scripts": {
Expand Down Expand Up @@ -48,6 +48,10 @@
"react-router-dom": "^6.3.0",
"typescript": "~5.4.0"
},
"resolutions": {
"@types/react": "^18",
"@types/react-dom": "^18"
},
"prettier": "@spotify/prettier-config",
"lint-staged": {
"*.{js,jsx,ts,tsx,mjs,cjs}": [
Expand Down
2 changes: 1 addition & 1 deletion packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@backstage/theme": "^0.6.0",
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@spreadshirt/backstage-plugin-s3-viewer": "workspace:^",
"@spreadshirt/backstage-plugin-s3-viewer": "^0.5.9",
"react-dom": "^18.0.2",
"react-use": "^17.2.4"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@backstage/plugin-permission-common": "^0.8.1",
"@backstage/plugin-permission-node": "^0.8.4",
"@backstage/plugin-user-settings-backend": "^0.2.26",
"@spreadshirt/backstage-plugin-s3-viewer-backend": "workspace:^",
"@spreadshirt/backstage-plugin-s3-viewer-backend": "^0.10.0",
"app": "link:../app",
"better-sqlite3": "^9.0.0",
"node-gyp": "^9.0.0"
Expand Down
6 changes: 3 additions & 3 deletions plugins/s3-viewer-backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
]
},
"scripts": {
"start": "LEGACY_BACKEND_START=1 backstage-cli package start",
"start": "backstage-cli package start",
"build": "backstage-cli package build",
"lint": "backstage-cli package lint",
"test": "backstage-cli package test",
Expand All @@ -50,8 +50,8 @@
"@backstage/types": "^1.1.1",
"@smithy/protocol-http": "^4.1.0",
"@smithy/signature-v4": "^4.1.0",
"@spreadshirt/backstage-plugin-s3-viewer-common": "workspace:^",
"@spreadshirt/backstage-plugin-s3-viewer-node": "workspace:^",
"@spreadshirt/backstage-plugin-s3-viewer-common": "^0.5.8",
"@spreadshirt/backstage-plugin-s3-viewer-node": "^0.2.8",
"@types/express": "*",
"cookie-parser": "^1.4.5",
"cross-fetch": "^4.0.0",
Expand Down
8 changes: 0 additions & 8 deletions plugins/s3-viewer-backend/tsconfig.json

This file was deleted.

2 changes: 1 addition & 1 deletion plugins/s3-viewer-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
],
"dependencies": {
"@backstage/backend-plugin-api": "^1.0.1",
"@spreadshirt/backstage-plugin-s3-viewer-common": "workspace:^",
"@spreadshirt/backstage-plugin-s3-viewer-common": "^0.5.8",
"@types/express": "*",
"express": "^4.17.1",
"stream": "^0.0.2"
Expand Down
2 changes: 1 addition & 1 deletion plugins/s3-viewer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "^4.0.0-alpha.61",
"@spreadshirt/backstage-plugin-s3-viewer-common": "workspace:^",
"@spreadshirt/backstage-plugin-s3-viewer-common": "^0.5.8",
"react-use": "^17.2.4"
},
"peerDependencies": {
Expand Down
30 changes: 15 additions & 15 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9030,7 +9030,7 @@ __metadata:
languageName: node
linkType: hard

"@spreadshirt/backstage-plugin-s3-viewer-backend@workspace:^, @spreadshirt/backstage-plugin-s3-viewer-backend@workspace:plugins/s3-viewer-backend":
"@spreadshirt/backstage-plugin-s3-viewer-backend@npm:^0.10.0, @spreadshirt/backstage-plugin-s3-viewer-backend@workspace:plugins/s3-viewer-backend":
version: 0.0.0-use.local
resolution: "@spreadshirt/backstage-plugin-s3-viewer-backend@workspace:plugins/s3-viewer-backend"
dependencies:
Expand All @@ -9050,8 +9050,8 @@ __metadata:
"@backstage/types": "npm:^1.1.1"
"@smithy/protocol-http": "npm:^4.1.0"
"@smithy/signature-v4": "npm:^4.1.0"
"@spreadshirt/backstage-plugin-s3-viewer-common": "workspace:^"
"@spreadshirt/backstage-plugin-s3-viewer-node": "workspace:^"
"@spreadshirt/backstage-plugin-s3-viewer-common": "npm:^0.5.8"
"@spreadshirt/backstage-plugin-s3-viewer-node": "npm:^0.2.8"
"@types/cookie-parser": "npm:^1.4.3"
"@types/express": "npm:*"
"@types/jest": "npm:*"
Expand All @@ -9070,7 +9070,7 @@ __metadata:
languageName: unknown
linkType: soft

"@spreadshirt/backstage-plugin-s3-viewer-common@workspace:^, @spreadshirt/backstage-plugin-s3-viewer-common@workspace:plugins/s3-viewer-common":
"@spreadshirt/backstage-plugin-s3-viewer-common@npm:^0.5.8, @spreadshirt/backstage-plugin-s3-viewer-common@workspace:plugins/s3-viewer-common":
version: 0.0.0-use.local
resolution: "@spreadshirt/backstage-plugin-s3-viewer-common@workspace:plugins/s3-viewer-common"
dependencies:
Expand All @@ -9080,20 +9080,20 @@ __metadata:
languageName: unknown
linkType: soft

"@spreadshirt/backstage-plugin-s3-viewer-node@workspace:^, @spreadshirt/backstage-plugin-s3-viewer-node@workspace:plugins/s3-viewer-node":
"@spreadshirt/backstage-plugin-s3-viewer-node@npm:^0.2.8, @spreadshirt/backstage-plugin-s3-viewer-node@workspace:plugins/s3-viewer-node":
version: 0.0.0-use.local
resolution: "@spreadshirt/backstage-plugin-s3-viewer-node@workspace:plugins/s3-viewer-node"
dependencies:
"@backstage/backend-plugin-api": "npm:^1.0.1"
"@backstage/cli": "npm:^0.28.0"
"@spreadshirt/backstage-plugin-s3-viewer-common": "workspace:^"
"@spreadshirt/backstage-plugin-s3-viewer-common": "npm:^0.5.8"
"@types/express": "npm:*"
express: "npm:^4.17.1"
stream: "npm:^0.0.2"
languageName: unknown
linkType: soft

"@spreadshirt/backstage-plugin-s3-viewer@workspace:^, @spreadshirt/backstage-plugin-s3-viewer@workspace:plugins/s3-viewer":
"@spreadshirt/backstage-plugin-s3-viewer@npm:^0.5.9, @spreadshirt/backstage-plugin-s3-viewer@workspace:plugins/s3-viewer":
version: 0.0.0-use.local
resolution: "@spreadshirt/backstage-plugin-s3-viewer@workspace:plugins/s3-viewer"
dependencies:
Expand All @@ -9106,7 +9106,7 @@ __metadata:
"@material-ui/core": "npm:^4.12.2"
"@material-ui/icons": "npm:^4.9.1"
"@material-ui/lab": "npm:^4.0.0-alpha.61"
"@spreadshirt/backstage-plugin-s3-viewer-common": "workspace:^"
"@spreadshirt/backstage-plugin-s3-viewer-common": "npm:^0.5.8"
"@testing-library/jest-dom": "npm:^6.0.0"
"@testing-library/react": "npm:^16.0.0"
"@testing-library/user-event": "npm:^14.0.0"
Expand Down Expand Up @@ -10947,7 +10947,7 @@ __metadata:
languageName: node
linkType: hard

"@types/react-dom@npm:*":
"@types/react-dom@npm:^18":
version: 18.3.1
resolution: "@types/react-dom@npm:18.3.1"
dependencies:
Expand Down Expand Up @@ -10986,13 +10986,13 @@ __metadata:
languageName: node
linkType: hard

"@types/react@npm:*":
version: 18.3.9
resolution: "@types/react@npm:18.3.9"
"@types/react@npm:^18":
version: 18.3.12
resolution: "@types/react@npm:18.3.12"
dependencies:
"@types/prop-types": "npm:*"
csstype: "npm:^3.0.2"
checksum: 10c0/a92b8e061d0c833e096254782c56a802316593f4a907fb834b557cabe848a0829b9eb6056404ea239eb4d5ec5ac7b7724309761516c0a7a277916fa04dd4f805
checksum: 10c0/8bae8d9a41619804561574792e29112b413044eb0d53746dde2b9720c1f9a59f71c895bbd7987cd8ce9500b00786e53bc032dced38cddf42910458e145675290
languageName: node
linkType: hard

Expand Down Expand Up @@ -12153,7 +12153,7 @@ __metadata:
"@material-ui/core": "npm:^4.12.2"
"@material-ui/icons": "npm:^4.9.1"
"@playwright/test": "npm:^1.32.3"
"@spreadshirt/backstage-plugin-s3-viewer": "workspace:^"
"@spreadshirt/backstage-plugin-s3-viewer": "npm:^0.5.9"
"@testing-library/dom": "npm:^9.0.0"
"@testing-library/jest-dom": "npm:^6.0.0"
"@testing-library/react": "npm:^16.0.0"
Expand Down Expand Up @@ -12764,7 +12764,7 @@ __metadata:
"@backstage/plugin-permission-common": "npm:^0.8.1"
"@backstage/plugin-permission-node": "npm:^0.8.4"
"@backstage/plugin-user-settings-backend": "npm:^0.2.26"
"@spreadshirt/backstage-plugin-s3-viewer-backend": "workspace:^"
"@spreadshirt/backstage-plugin-s3-viewer-backend": "npm:^0.10.0"
"@types/express": "npm:^4.17.6"
app: "link:../app"
better-sqlite3: "npm:^9.0.0"
Expand Down

0 comments on commit 56350c5

Please sign in to comment.