Skip to content

Commit 6e3ee7e

Browse files
CryptoRodeoCryptoRodeo
authored
Merge branch 'main' into chore/bump-tekton
2 parents 7e8c499 + 244bdcf commit 6e3ee7e

File tree

8 files changed

+226
-174
lines changed

8 files changed

+226
-174
lines changed

‎dynamic-plugins.default.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -899,6 +899,10 @@ plugins:
899899
dynamicPlugins:
900900
frontend:
901901
backstage-community.plugin-rbac:
902+
translationResources:
903+
- importName: rbacTranslations
904+
ref: rbacTranslationRef
905+
module: Alpha
902906
appIcons:
903907
- name: rbacIcon
904908
importName: RbacIcon

‎dynamic-plugins/wrappers/backstage-community-plugin-rbac/package.json‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "backstage-community-plugin-rbac",
3-
"version": "1.42.1",
3+
"version": "1.45.1",
44
"main": "src/index.ts",
55
"types": "src/index.ts",
66
"license": "Apache-2.0",
@@ -18,6 +18,21 @@
1818
]
1919
},
2020
"sideEffects": false,
21+
"exports": {
22+
".": "./src/index.ts",
23+
"./alpha": "./src/alpha.ts",
24+
"./package.json": "./package.json"
25+
},
26+
"typesVersions": {
27+
"*": {
28+
"alpha": [
29+
"src/alpha.ts"
30+
],
31+
"package.json": [
32+
"package.json"
33+
]
34+
}
35+
},
2136
"scripts": {
2237
"tsc": "tsc",
2338
"build": "backstage-cli package build",
@@ -28,7 +43,7 @@
2843
"export-dynamic:clean": "run export-dynamic --clean"
2944
},
3045
"dependencies": {
31-
"@backstage-community/plugin-rbac": "1.42.1",
46+
"@backstage-community/plugin-rbac": "1.45.1",
3247
"@mui/material": "5.18.0"
3348
},
3449
"devDependencies": {
@@ -43,7 +58,8 @@
4358
"scalprum": {
4459
"name": "backstage-community.plugin-rbac",
4560
"exposedModules": {
46-
"PluginRoot": "./src/index.ts"
61+
"PluginRoot": "./src/index.ts",
62+
"Alpha": "./src/alpha.ts"
4763
}
4864
},
4965
"repository": {

‎dynamic-plugins/wrappers/backstage-community-plugin-rbac/src/alpha.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from '@backstage-community/plugin-rbac/alpha';

‎dynamic-plugins/yarn.lock‎

Lines changed: 77 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3639,7 +3639,7 @@ __metadata:
36393639
languageName: node
36403640
linkType: hard
36413641

3642-
"@backstage-community/plugin-rbac-common@npm:^1.18.0, @backstage-community/plugin-rbac-common@npm:^1.19.0":
3642+
"@backstage-community/plugin-rbac-common@npm:^1.19.0":
36433643
version: 1.19.0
36443644
resolution: "@backstage-community/plugin-rbac-common@npm:1.19.0"
36453645
peerDependencies:
@@ -3649,20 +3649,30 @@ __metadata:
36493649
languageName: node
36503650
linkType: hard
36513651

3652-
"@backstage-community/plugin-rbac@npm:1.42.1":
3653-
version: 1.42.1
3654-
resolution: "@backstage-community/plugin-rbac@npm:1.42.1"
3652+
"@backstage-community/plugin-rbac-common@npm:^1.20.0":
3653+
version: 1.20.0
3654+
resolution: "@backstage-community/plugin-rbac-common@npm:1.20.0"
3655+
peerDependencies:
3656+
"@backstage/errors": ^1.2.7
3657+
"@backstage/plugin-permission-common": ^0.9.1
3658+
checksum: 8547d5a7a9ed24db008e4cd042330af4876549f226373b44ea09fee6fd5348e33de061fd97d45b5e979f22cbdff2b98c7cd048f1cb83496cfa8f86df96ddbb18
3659+
languageName: node
3660+
linkType: hard
3661+
3662+
"@backstage-community/plugin-rbac@npm:1.45.1":
3663+
version: 1.45.1
3664+
resolution: "@backstage-community/plugin-rbac@npm:1.45.1"
36553665
dependencies:
3656-
"@backstage-community/plugin-rbac-common": ^1.18.0
3657-
"@backstage/catalog-model": ^1.7.4
3658-
"@backstage/core-components": ^0.17.2
3659-
"@backstage/core-plugin-api": ^1.10.7
3660-
"@backstage/plugin-catalog": ^1.30.0
3661-
"@backstage/plugin-catalog-common": ^1.1.4
3662-
"@backstage/plugin-permission-common": ^0.9.0
3663-
"@backstage/plugin-permission-react": ^0.4.34
3664-
"@backstage/theme": ^0.6.6
3665-
"@mui/icons-material": 5.16.14
3666+
"@backstage-community/plugin-rbac-common": ^1.20.0
3667+
"@backstage/catalog-model": ^1.7.5
3668+
"@backstage/core-components": ^0.17.5
3669+
"@backstage/core-plugin-api": ^1.10.9
3670+
"@backstage/plugin-catalog": ^1.31.2
3671+
"@backstage/plugin-catalog-common": ^1.1.5
3672+
"@backstage/plugin-permission-common": ^0.9.1
3673+
"@backstage/plugin-permission-react": ^0.4.36
3674+
"@backstage/theme": ^0.6.8
3675+
"@mui/icons-material": 5.18.0
36663676
"@mui/material": ^5.14.18
36673677
"@mui/styles": ^6.1.7
36683678
"@rjsf/core": ^5.21.2
@@ -3676,7 +3686,7 @@ __metadata:
36763686
peerDependencies:
36773687
react: ^16.13.1 || ^17.0.0 || ^18.0.0
36783688
react-router-dom: ^6.0.0
3679-
checksum: 2afcb58e58b96f02b455a5114e6cc00e9c68e540bf0a29c70603de9f60f79669ea14fa1305b3382e44bbf66b08f3d7955cad73e11edf6923bf51862a2f77629a
3689+
checksum: a24f62cb2751e78466f19948a25fbcddacf623f64b2602961e70ced024541da817324970fc0d60dccaeb98c8d78be9ce5f9d1e8bc291eb88b483856c7b6c81ba
36803690
languageName: node
36813691
linkType: hard
36823692

@@ -6482,27 +6492,27 @@ __metadata:
64826492
languageName: node
64836493
linkType: hard
64846494

6485-
"@backstage/plugin-catalog@npm:^1.30.0":
6486-
version: 1.31.0
6487-
resolution: "@backstage/plugin-catalog@npm:1.31.0"
6495+
"@backstage/plugin-catalog@npm:^1.31.2":
6496+
version: 1.31.3
6497+
resolution: "@backstage/plugin-catalog@npm:1.31.3"
64886498
dependencies:
6489-
"@backstage/catalog-client": ^1.10.1
6490-
"@backstage/catalog-model": ^1.7.4
6491-
"@backstage/core-compat-api": ^0.4.3
6492-
"@backstage/core-components": ^0.17.3
6493-
"@backstage/core-plugin-api": ^1.10.8
6499+
"@backstage/catalog-client": ^1.12.0
6500+
"@backstage/catalog-model": ^1.7.5
6501+
"@backstage/core-compat-api": ^0.5.2
6502+
"@backstage/core-components": ^0.18.0
6503+
"@backstage/core-plugin-api": ^1.11.0
64946504
"@backstage/errors": ^1.2.7
6495-
"@backstage/frontend-plugin-api": ^0.10.3
6496-
"@backstage/integration-react": ^1.2.8
6497-
"@backstage/plugin-catalog-common": ^1.1.4
6498-
"@backstage/plugin-catalog-react": ^1.19.0
6499-
"@backstage/plugin-permission-react": ^0.4.35
6500-
"@backstage/plugin-scaffolder-common": ^1.5.11
6501-
"@backstage/plugin-search-common": ^1.2.18
6502-
"@backstage/plugin-search-react": ^1.9.1
6505+
"@backstage/frontend-plugin-api": ^0.12.0
6506+
"@backstage/integration-react": ^1.2.10
6507+
"@backstage/plugin-catalog-common": ^1.1.5
6508+
"@backstage/plugin-catalog-react": ^1.21.0
6509+
"@backstage/plugin-permission-react": ^0.4.36
6510+
"@backstage/plugin-scaffolder-common": ^1.7.1
6511+
"@backstage/plugin-search-common": ^1.2.19
6512+
"@backstage/plugin-search-react": ^1.9.4
65036513
"@backstage/plugin-techdocs-common": ^0.1.1
6504-
"@backstage/plugin-techdocs-react": ^1.3.0
6505-
"@backstage/types": ^1.2.1
6514+
"@backstage/plugin-techdocs-react": ^1.3.3
6515+
"@backstage/types": ^1.2.2
65066516
"@backstage/version-bridge": ^1.0.11
65076517
"@material-ui/core": ^4.12.2
65086518
"@material-ui/icons": ^4.9.1
@@ -6524,7 +6534,7 @@ __metadata:
65246534
peerDependenciesMeta:
65256535
"@types/react":
65266536
optional: true
6527-
checksum: 6ca4735f2a0263609c4aebeb64e529f2b392987f02584d3eb6d14a37c6b796d7937778053290012981891600097131d5ef1231271385dede6cbc56ab8d41875a
6537+
checksum: 75a21174cadcf5e3fb5c28e769fabd81aba1a3b7e514ec48dfafdd8104ef8440a8504a1617687fef375bcaaaa03ba7a16829a0f07babda1abfd4926beb9681e0
65286538
languageName: node
65296539
linkType: hard
65306540

@@ -7519,7 +7529,7 @@ __metadata:
75197529
languageName: node
75207530
linkType: hard
75217531

7522-
"@backstage/plugin-search-common@npm:^1.2.18, @backstage/plugin-search-common@npm:^1.2.19":
7532+
"@backstage/plugin-search-common@npm:^1.2.19":
75237533
version: 1.2.19
75247534
resolution: "@backstage/plugin-search-common@npm:1.2.19"
75257535
dependencies:
@@ -7529,7 +7539,7 @@ __metadata:
75297539
languageName: node
75307540
linkType: hard
75317541

7532-
"@backstage/plugin-search-react@npm:^1.9.1, @backstage/plugin-search-react@npm:^1.9.3":
7542+
"@backstage/plugin-search-react@npm:^1.9.3":
75337543
version: 1.9.3
75347544
resolution: "@backstage/plugin-search-react@npm:1.9.3"
75357545
dependencies:
@@ -7802,7 +7812,7 @@ __metadata:
78027812
languageName: node
78037813
linkType: hard
78047814

7805-
"@backstage/plugin-techdocs-react@npm:^1.3.0, @backstage/plugin-techdocs-react@npm:^1.3.2":
7815+
"@backstage/plugin-techdocs-react@npm:^1.3.2":
78067816
version: 1.3.2
78077817
resolution: "@backstage/plugin-techdocs-react@npm:1.3.2"
78087818
dependencies:
@@ -7831,6 +7841,35 @@ __metadata:
78317841
languageName: node
78327842
linkType: hard
78337843

7844+
"@backstage/plugin-techdocs-react@npm:^1.3.3":
7845+
version: 1.3.3
7846+
resolution: "@backstage/plugin-techdocs-react@npm:1.3.3"
7847+
dependencies:
7848+
"@backstage/catalog-model": ^1.7.5
7849+
"@backstage/config": ^1.3.3
7850+
"@backstage/core-components": ^0.18.0
7851+
"@backstage/core-plugin-api": ^1.11.0
7852+
"@backstage/frontend-plugin-api": ^0.12.0
7853+
"@backstage/plugin-techdocs-common": ^0.1.1
7854+
"@backstage/version-bridge": ^1.0.11
7855+
"@material-ui/core": ^4.12.2
7856+
"@material-ui/styles": ^4.11.0
7857+
jss: ~10.10.0
7858+
lodash: ^4.17.21
7859+
react-helmet: 6.1.0
7860+
react-use: ^17.2.4
7861+
peerDependencies:
7862+
"@types/react": ^17.0.0 || ^18.0.0
7863+
react: ^17.0.0 || ^18.0.0
7864+
react-dom: ^17.0.0 || ^18.0.0
7865+
react-router-dom: ^6.3.0
7866+
peerDependenciesMeta:
7867+
"@types/react":
7868+
optional: true
7869+
checksum: 2d2db27ca65f5fed40df6fb3b7b4b823296a79fa6d1c98180fae52ce56ab9a80b30ee59837ac6c5ba561bf7dd6b77b91a0f355b1fd51a84ed5a19d244689d189
7870+
languageName: node
7871+
linkType: hard
7872+
78347873
"@backstage/plugin-techdocs@npm:^1.14.1":
78357874
version: 1.14.1
78367875
resolution: "@backstage/plugin-techdocs@npm:1.14.1"
@@ -18806,7 +18845,7 @@ __metadata:
1880618845
version: 0.0.0-use.local
1880718846
resolution: "backstage-community-plugin-rbac@workspace:wrappers/backstage-community-plugin-rbac"
1880818847
dependencies:
18809-
"@backstage-community/plugin-rbac": 1.42.1
18848+
"@backstage-community/plugin-rbac": 1.45.1
1881018849
"@backstage/cli": ^0.34.1
1881118850
"@janus-idp/cli": 3.6.1
1881218851
"@mui/material": 5.18.0

‎packages/app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"prettier:fix": "prettier --ignore-unknown --write ."
1919
},
2020
"dependencies": {
21-
"@backstage-community/plugin-rbac-common": "1.18.0",
21+
"@backstage-community/plugin-rbac-common": "1.20.0",
2222
"@backstage/app-defaults": "1.6.5",
2323
"@backstage/catalog-model": "1.7.5",
2424
"@backstage/config": "1.3.3",

‎packages/backend/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"prettier:fix": "prettier --ignore-unknown --write ."
2222
},
2323
"dependencies": {
24-
"@backstage-community/plugin-rbac-backend": "7.0.0",
25-
"@backstage-community/plugin-rbac-node": "1.12.0",
24+
"@backstage-community/plugin-rbac-backend": "7.4.0",
25+
"@backstage-community/plugin-rbac-node": "1.14.0",
2626
"@backstage-community/plugin-scaffolder-backend-module-annotator": "2.8.0",
2727
"@backstage/backend-app-api": "1.2.6",
2828
"@backstage/backend-defaults": "0.12.0",

‎plugins/licensed-users-info-backend/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"prettier:fix": "prettier --ignore-unknown --write ."
3232
},
3333
"dependencies": {
34-
"@backstage-community/plugin-rbac-common": "1.18.0",
34+
"@backstage-community/plugin-rbac-common": "1.20.0",
3535
"@backstage/backend-defaults": "0.12.0",
3636
"@backstage/backend-plugin-api": "1.4.2",
3737
"@backstage/catalog-client": "1.11.0",

0 commit comments

Comments
 (0)