8000 Merge pull request #22539 from fshowalter/patch-3 · backstage/backstage@19922cf · GitHub
[go: up one dir, main page]

Skip to content

Commit 19922cf

Browse files
authored
Merge pull request #22539 from fshowalter/patch-3
Allow @types/react 18 as a peer dep for @backstage/theme
2 parents 7ff2e42 + 89bb6cc commit 19922cf

File tree

91 files changed

+271
-178
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+271
-178
lines changed

.changeset/olive-boats-agree.md

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
---
2+
'@backstage/core-app-api': patch
3+
'@backstage/core-components': patch
4+
'@backstage/core-plugin-api': patch
5+
'@backstage/dev-utils': patch
6+
'@backstage/frontend-app-api': patch
7+
'@backstage/frontend-plugin-api': patch
8+
'@backstage/plugin-adr': patch
9+
'@backstage/plugin-airbrake': patch
10+
'@backstage/plugin-allure': patch
11+
'@backstage/plugin-apache-airflow': patch
12+
'@backstage/plugin-api-docs-module-protoc-gen-doc': patch
13+
'@backstage/plugin-api-docs': patch
14+
'@backstage/plugin-apollo-explorer': patch
15+
'@backstage/plugin-azure-devops': patch
16+
'@backstage/plugin-azure-sites': patch
17+
'@backstage/plugin-badges': patch
18+
'@backstage/plugin-bazaar': patch
19+
'@backstage/plugin-bitrise': patch
20+
'@backstage/plugin-catalog-graph': patch
21+
'@backstage/plugin-catalog-import': patch
22+
'@backst 57AE age/plugin-catalog-react': patch
23+
'@backstage/plugin-catalog-unprocessed-entities': patch
24+
'@backstage/plugin-catalog': patch
25+
'@backstage/plugin-circleci': patch
26+
'@backstage/plugin-cloudbuild': patch
27+
'@backstage/plugin-code-climate': patch
28+
'@backstage/plugin-code-coverage': patch
29+
'@backstage/plugin-codescene': patch
30+
'@backstage/plugin-config-schema': patch
31+
'@backstage/plugin-cost-insights': patch
32+
'@backstage/plugin-devtools': patch
33+
'@backstage/plugin-dynatrace': patch
34+
'@backstage/plugin-entity-feedback': patch
35+
'@backstage/plugin-entity-validation': patch
36+
'@backstage/plugin-explore': patch
37+
'@backstage/plugin-firehydrant': patch
38+
'@backstage/plugin-fossa': patch
39+
'@backstage/plugin-gcalendar': patch
40+
'@backstage/plugin-git-release-manager': patch
41+
'@backstage/plugin-github-actions': patch
42+
'@backstage/plugin-github-deployments': patch
43+
'@backstage/plugin-github-issues': patch
44+
'@backstage/plugin-github-pull-requests-board': patch
45+
'@backstage/plugin-gitops-profiles': patch
46+
'@backstage/plugin-graphiql': patch
47+
'@backstage/plugin-graphql-voyager': patch
48+
'@backstage/plugin-home': patch
49+
'@backstage/plugin-ilert': patch
50+
'@backstage/plugin-jenkins': patch
51+
'@backstage/plugin-kafka': patch
52+
'@backstage/plugin-kubernetes-cluster': patch
53+
'@backstage/plugin-kubernetes-react': patch
54+
'@backstage/plugin-kubernetes': patch
55+
'@backstage/plugin-lighthouse': patch
56+
'@backstage/plugin-linguist': patch
57+
'@backstage/plugin-microsoft-calendar': patch
58+
'@backstage/plugin-newrelic-dashboard': patch
59+
'@backstage/plugin-newrelic': patch
60+
'@backstage/plugin-nomad': patch
61+
'@backstage/plugin-octopus-deploy': patch
62+
'@backstage/plugin-opencost': patch
63+
'@backstage/plugin-org-react': patch
64+
'@backstage/plugin-org': patch
65+
'@backstage/plugin-pagerduty': patch
66+
'@backstage/plugin-periskop': patch
67+
'@backstage/plugin-permission-react': patch
68+
'@backstage/plugin-playlist': patch
69+
'@backstage/plugin-puppetdb': patch
70+
'@backstage/plugin-rollbar': patch
71+
'@backstage/plugin-scaffolder-react': patch
72+
'@backstage/plugin-scaffolder': patch
73+
'@backstage/plugin-search-react': patch
74+
'@backstage/plugin-search': patch
75+
'@backstage/plugin-sentry': patch
76+
'@backstage/plugin-shortcuts': patch
77+
'@backstage/plugin-sonarqube': patch
78+
'@backstage/plugin-splunk-on-call': patch
79+
'@backstage/plugin-stack-overflow': patch
80+
'@backstage/plugin-stackstorm': patch
81+
'@backstage/plugin-tech-insights': patch
82+
'@backstage/plugin-tech-radar': patch
83+
'@backstage/plugin-techdocs-addons-test-utils': patch
84+
'@backstage/plugin-techdocs-react': patch
85+
'@backstage/plugin-techdocs': patch
86+
'@backstage/plugin-user-settings': patch
87+
'@backstage/plugin-vault': patch
88+
'@backstage/plugin-xcmetrics': patch
89+
'@backstage/test-utils': patch
90+
'@backstage/theme': patch
91+
---
92+
93+
Widen `@types/react` dependency range to include version 18.

packages/core-app-api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"@backstage/types": "workspace:^",
4848
"@backstage/version-bridge": "workspace:^",
4949
"@types/prop-types": "^15.7.3",
50-
"@types/react": "^16.13.1 || ^17.0.0",
50+
"@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0",
5151
"history": "^5.0.0",
5252
"i18next": "^22.4.15",
5353
"lodash": "^4.17.21",

packages/core-components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"@material-ui/icons": "^4.9.1",
5858
"@material-ui/lab": "4.0.0-alpha.61",
5959
"@react-hookz/web": "^23.0.0",
60-
"@types/react": "^16.13.1 || ^17.0.0",
60+
"@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0",
6161
"@types/react-sparklines": "^1.7.0",
6262
"@types/react-text-truncate": "^0.14.0",
6363
"ansi-regex": "^6.0.1",

packages/core-plugin-api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@backstage/errors": "workspace:^",
5151
"@backstage/types": "workspace:^",
5252
"@backstage/version-bridge": "workspace:^",
53-
"@types/react": "^16.13.1 || ^17.0.0",
53+
"@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0",
5454
"history": "^5.0.0"
5555
},
5656
"peerDependencies": {

packages/dev-utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"@backstage/theme": "workspace:^",
4444
"@material-ui/core": "^4.12.2",
4545
"@material-ui/icons": "^4.9.1",
46-
"@types/react": "^16.13.1 || ^17.0.0",
46+
"@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0",
4747
"react-use": "^17.2.4"
4848
},
4949
"peerDependencies": {

packages/frontend-app-api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"@backstage/version-bridge": "workspace:^",
4646
"@material-ui/core": "^4.12.4",
4747
"@material-ui/icons": "^4.11.3",
48-
"@types/react": "^16.13.1 || ^17.0.0",
48+
"@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0",
4949
"lodash": "^4.17.21"
5050
},
5151
"peerDependencies": {

packages/frontend-plugin-api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"@backstage/types": "workspace:^",
2929
"@backstage/version-bridge": "workspace:^",
3030
"@material-ui/core": "^4.12.4",
31-
"@types/react": "^16.13.1 || ^17.0.0",
31+
"@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0",
3232
"lodash": "^4.17.21",
3333
"zod": "^3.22.4",
3434
"zod-to-json-schema": "^3.21.4"

packages/test-utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"@backstage/types": "workspace:^",
5656
"@material-ui/core": "^4.12.2",
5757
"@material-ui/icons": "^4.9.1",
58-
"@types/react": "^16.13.1 || ^17.0.0",
58+
"@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0",
5959
"cross-fetch": "^4.0.0",
6060
"i18next": "^22.4.15",
6161
"zen-observable": "^0.10.0"

packages/theme/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
},
4040
"peerDependencies": {
4141
"@material-ui/core": "^4.12.2",
42-
"@types/react": "^16.13.1 || ^17.0.0",
42+
"@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0",
4343
"react": "^16.13.1 || ^17.0.0 || ^18.0.0",
4444
"react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0"
4545
},

plugins/adr/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"@backstage/plugin-search-react": "workspace:^",
5454
"@material-ui/core": "^4.12.2",
5555
"@material-ui/icons": "^4.9.1",
56-
"@types/react": "^16.13.1 || ^17.0.0",
56+
"@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0",
5757
"lodash": "^4.17.21",
5858
"react-markdown": "^8.0.0",
5959
"react-use": "^17.2.4",

0 commit comments

Comments
 (0)
0