Skip to content

Commit

Permalink
Merge pull request #131 from spreadshirt/fix/releases
Browse files Browse the repository at this point in the history
Fix releases for plugins
  • Loading branch information
ivangonzalezacuna authored Oct 23, 2024
2 parents 5c55c52 + d0ff3e0 commit 4792c10
Show file tree
Hide file tree
Showing 9 changed files with 202 additions and 660 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.
10 changes: 7 additions & 3 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 All @@ -39,7 +39,7 @@
},
"devDependencies": {
"@backstage/cli": "^0.28.0",
"@changesets/cli": "^2.24.4",
"@changesets/cli": "^2.27.9",
"@spotify/prettier-config": "^15.0.0",
"concurrently": "^8.0.0",
"prettier": "^2.4.1",
Expand All @@ -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
Loading

0 comments on commit 4792c10

Please sign in to comment.