Skip to content

Commit

Permalink
rebase with latest changes from janus (#20)
Browse files Browse the repository at this point in the history
* rebase with latest changes from janus

Signed-off-by: Kashish Mittal <[email protected]>

* regen yarn

Signed-off-by: Kashish Mittal <[email protected]>

* add changeset

Signed-off-by: Kashish Mittal <[email protected]>

* rebase changes

Signed-off-by: Kashish Mittal <[email protected]>

* rebase changes

Signed-off-by: Kashish Mittal <[email protected]>

---------

Signed-off-by: Kashish Mittal <[email protected]>
  • Loading branch information
04kash authored Nov 4, 2024
1 parent 5ce7d26 commit 919f996
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 9 deletions.
7 changes: 7 additions & 0 deletions workspaces/bulk-import/.changeset/lemon-kids-unite.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@red-hat-developer-hub/backstage-plugin-bulk-import-backend': minor
'@red-hat-developer-hub/backstage-plugin-bulk-import-common': minor
'@red-hat-developer-hub/backstage-plugin-bulk-import': minor
---

rebase with latest changes from janus
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"backstage": {
"role": "backend-plugin",
"supported-versions": "1.32.4",
"supported-versions": "1.32.5",
"pluginId": "bulk-import",
"pluginPackages": [
"@red-hat-developer-hub/backstage-plugin-bulk-import",
Expand Down Expand Up @@ -68,7 +68,7 @@
"@backstage/cli": "0.28.2",
"@backstage/config": "1.2.0",
"@backstage/plugin-catalog-backend": "1.27.1",
"@janus-idp/backstage-plugin-audit-log-node": "^1.7.0",
"@janus-idp/backstage-plugin-audit-log-node": "^1.7.1",
"@openapitools/openapi-generator-cli": "2.13.4",
"@spotify/prettier-config": "^15.0.0",
"@types/express": "4.17.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"backstage": {
"role": "common-library",
"supported-versions": "1.32.4",
"supported-versions": "1.32.5",
"pluginId": "bulk-import",
"pluginPackages": [
"@red-hat-developer-hub/backstage-plugin-bulk-import",
Expand Down
4 changes: 2 additions & 2 deletions workspaces/bulk-import/plugins/bulk-import/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"backstage": {
"role": "frontend-plugin",
"supported-versions": "1.32.4",
"supported-versions": "1.32.5",
"pluginId": "bulk-import",
"pluginPackages": [
"@red-hat-developer-hub/backstage-plugin-bulk-import",
Expand Down Expand Up @@ -42,7 +42,7 @@
"@backstage/plugin-catalog-react": "^1.14.0",
"@backstage/plugin-permission-react": "^0.4.27",
"@backstage/theme": "^0.6.0",
"@janus-idp/shared-react": "^2.13.0",
"@janus-idp/shared-react": "^2.13.1",
"@material-ui/core": "^4.9.13",
"@material-ui/icons": "^4.11.3",
"@material-ui/lab": "^4.0.0-alpha.61",
Expand Down
8 changes: 4 additions & 4 deletions workspaces/bulk-import/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5295,7 +5295,7 @@ __metadata:
languageName: node
linkType: hard

"@janus-idp/backstage-plugin-audit-log-node@npm:^1.7.0":
"@janus-idp/backstage-plugin-audit-log-node@npm:^1.7.1":
version: 1.7.1
resolution: "@janus-idp/backstage-plugin-audit-log-node@npm:1.7.1"
dependencies:
Expand All @@ -5304,7 +5304,7 @@ __metadata:
languageName: node
linkType: hard

"@janus-idp/shared-react@npm:^2.13.0":
"@janus-idp/shared-react@npm:^2.13.1":
version: 2.13.1
resolution: "@janus-idp/shared-react@npm:2.13.1"
dependencies:
Expand Down Expand Up @@ -7839,7 +7839,7 @@ __metadata:
"@backstage/plugin-catalog-node": ^1.13.1
"@backstage/plugin-permission-common": ^0.8.1
"@backstage/plugin-permission-node": ^0.8.4
"@janus-idp/backstage-plugin-audit-log-node": ^1.7.0
"@janus-idp/backstage-plugin-audit-log-node": ^1.7.1
"@octokit/auth-app": ^6.0.3
"@octokit/rest": ^20.0.2
"@openapitools/openapi-generator-cli": 2.13.4
Expand Down Expand Up @@ -7894,7 +7894,7 @@ __metadata:
"@backstage/plugin-permission-react": ^0.4.27
"@backstage/test-utils": 1.7.0
"@backstage/theme": ^0.6.0
"@janus-idp/shared-react": ^2.13.0
"@janus-idp/shared-react": ^2.13.1
"@material-ui/core": ^4.9.13
"@material-ui/icons": ^4.11.3
"@material-ui/lab": ^4.0.0-alpha.61
Expand Down

0 comments on commit 919f996

Please sign in to comment.