From dc9d3acc874435844fb83068c6430a9e2457759f Mon Sep 17 00:00:00 2001 From: aramissennyeydd Date: Tue, 18 Jun 2024 22:14:31 -0400 Subject: [PATCH 01/21] move react types to a dev dependency and peer dependency Signed-off-by: aramissennyeydd --- packages/app-defaults/package.json | 8 +++++++- packages/core-app-api/package.json | 18 ++++++++++++------ packages/core-compat-api/package.json | 13 +++++++++---- packages/core-components/package.json | 8 +++++++- packages/core-plugin-api/package.json | 9 ++------- packages/dev-utils/package.json | 5 +++++ packages/frontend-app-api/package.json | 5 +++++ packages/frontend-plugin-api/package.json | 8 +++++++- packages/frontend-test-utils/package.json | 8 +++++++- packages/integration-react/package.json | 10 ++++++++-- .../techdocs-cli-embedded-app/package.json | 4 ++-- packages/test-utils/package.json | 8 +++++++- packages/theme/package.json | 7 ++++++- packages/version-bridge/package.json | 12 ++++++++---- .../package.json | 10 ++++++++-- plugins/api-docs/package.json | 8 +++++++- plugins/app-visualizer/package.json | 12 +++++++++--- plugins/auth-react/package.json | 10 ++++++++-- plugins/catalog-graph/package.json | 10 ++++++++-- plugins/catalog-import/package.json | 8 +++++++- plugins/catalog-react/package.json | 18 ++++++++++++------ .../catalog-unprocessed-entities/package.json | 10 ++++++++-- plugins/catalog/package.json | 8 +++++++- plugins/config-schema/package.json | 10 ++++++++-- plugins/devtools/package.json | 14 ++++++++++---- plugins/example-todo-list/package.json | 8 +++++++- plugins/home-react/package.json | 10 ++++++++-- plugins/home/package.json | 8 +++++++- plugins/kubernetes-cluster/package.json | 10 ++++++++-- plugins/kubernetes-react/package.json | 14 ++++++++++---- plugins/kubernetes/package.json | 10 ++++++++-- plugins/notifications/package.json | 8 +++++++- plugins/org-react/package.json | 10 ++++++++-- plugins/org/package.json | 10 ++++++++-- plugins/permission-react/package.json | 10 ++++++++-- .../scaffolder-node-test-utils/package.json | 3 +-- plugins/scaffolder-react/package.json | 8 +++++++- plugins/scaffolder/package.json | 8 +++++++- plugins/search-react/package.json | 10 ++++++++-- plugins/search/package.json | 8 +++++++- .../techdocs-addons-test-utils/package.json | 10 ++++++++-- .../package.json | 8 +++++++- plugins/techdocs-react/package.json | 10 ++++++++-- plugins/techdocs/package.json | 9 ++++++++- plugins/user-settings/package.json | 8 +++++++- 45 files changed, 331 insertions(+), 90 deletions(-) diff --git a/packages/app-defaults/package.json b/packages/app-defaults/package.json index dac7cebeaa..0641cd7096 100644 --- a/packages/app-defaults/package.json +++ b/packages/app-defaults/package.json @@ -49,9 +49,15 @@ "@backstage/test-utils": "workspace:^", "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", - "@types/react": "^16.13.1 || ^17.0.0" + "@types/react": "^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/packages/core-app-api/package.json b/packages/core-app-api/package.json index a410836f27..b5a173ce0d 100644 --- a/packages/core-app-api/package.json +++ b/packages/core-app-api/package.json @@ -51,7 +51,7 @@ "@backstage/types": "workspace:^", "@backstage/version-bridge": "workspace:^", "@types/prop-types": "^15.7.3", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "@types/react": "^18.0.0", "history": "^5.0.0", "i18next": "^22.4.15", "lodash": "^4.17.21", @@ -60,6 +60,17 @@ "zen-observable": "^0.10.0", "zod": "^3.22.4" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, + "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, "devDependencies": { "@backstage/cli": "workspace:^", "@backstage/test-utils": "workspace:^", @@ -75,10 +86,5 @@ "react-router-dom-stable": "npm:react-router-dom@^6.3.0", "react-router-stable": "npm:react-router@^6.3.0" }, - "peerDependencies": { - "react": "^16.13.1 || ^17.0.0 || ^18.0.0", - "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", - "react-router-dom": "6.0.0-beta.0 || ^6.3.0" - }, "configSchema": "config.d.ts" } diff --git a/packages/core-compat-api/package.json b/packages/core-compat-api/package.json index eea6e65717..76e925bd34 100644 --- a/packages/core-compat-api/package.json +++ b/packages/core-compat-api/package.json @@ -33,9 +33,7 @@ "dependencies": { "@backstage/core-plugin-api": "workspace:^", "@backstage/frontend-plugin-api": "workspace:^", - "@backstage/version-bridge": "workspace:^", - "@types/react": "^16.13.1 || ^17.0.0", - "lodash": "^4.17.21" + "@backstage/version-bridge": "workspace:^" }, "devDependencies": { "@backstage-community/plugin-puppetdb": "^0.1.18", @@ -50,9 +48,16 @@ "@oriflame/backstage-plugin-score-card": "^0.8.0", "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", - "zod": "^3.22.4" + "zod": "^3.22.4", + "@types/react": "^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" } diff --git a/packages/core-components/package.json b/packages/core-components/package.json index 4390c2eaf1..69ac146f1a 100644 --- a/packages/core-components/package.json +++ b/packages/core-components/package.json @@ -65,7 +65,6 @@ "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.61", "@react-hookz/web": "^24.0.0", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "@types/react-sparklines": "^1.7.0", "ansi-regex": "^6.0.1", "classnames": "^2.2.6", @@ -108,6 +107,7 @@ "@types/d3-zoom": "^3.0.1", "@types/dagre": "^0.7.44", "@types/google-protobuf": "^3.7.2", + "@types/react": "^18.0.0", "@types/react-helmet": "^6.1.0", "@types/react-syntax-highlighter": "^15.0.0", "@types/react-virtualized-auto-sizer": "^1.0.1", @@ -117,7 +117,13 @@ "history": "^5.0.0", "msw": "^1.0.0" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/packages/core-plugin-api/package.json b/packages/core-plugin-api/package.json index 7d0e2925ae..5f91bae603 100644 --- a/packages/core-plugin-api/package.json +++ b/packages/core-plugin-api/package.json @@ -53,7 +53,6 @@ "@backstage/errors": "workspace:^", "@backstage/types": "workspace:^", "@backstage/version-bridge": "workspace:^", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "history": "^5.0.0" }, "devDependencies": { @@ -63,11 +62,7 @@ "@testing-library/dom": "^10.0.0", "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", - "@testing-library/user-event": "^14.0.0" - }, - "peerDependencies": { - "react": "^16.13.1 || ^17.0.0 || ^18.0.0", - "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", - "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + "@testing-library/user-event": "^14.0.0", + "@types/react": "^18.0.0" } } diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index fbdbd454f2..7a087657e8 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -58,6 +58,11 @@ "@testing-library/user-event": "^14.0.0", "zen-observable": "^0.10.0" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "peerDependencies": { "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/packages/frontend-app-api/package.json b/packages/frontend-app-api/package.json index 1a7ac69820..e14867fecb 100644 --- a/packages/frontend-app-api/package.json +++ b/packages/frontend-app-api/package.json @@ -44,6 +44,11 @@ "lodash": "^4.17.21", "zod": "^3.22.4" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "devDependencies": { "@backstage/cli": "workspace:^", "@backstage/plugin-app": "workspace:^", diff --git a/packages/frontend-plugin-api/package.json b/packages/frontend-plugin-api/package.json index 9595d6670f..0a64f9222c 100644 --- a/packages/frontend-plugin-api/package.json +++ b/packages/frontend-plugin-api/package.json @@ -36,7 +36,6 @@ "@backstage/types": "workspace:^", "@backstage/version-bridge": "workspace:^", "@material-ui/core": "^4.12.4", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "lodash": "^4.17.21", "zod": "^3.22.4", "zod-to-json-schema": "^3.21.4" @@ -48,9 +47,16 @@ "@backstage/test-utils": "workspace:^", "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", + "@types/react": "^18.0.0", "history": "^5.3.0" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" } diff --git a/packages/frontend-test-utils/package.json b/packages/frontend-test-utils/package.json index f6ecd28a97..0661c0df95 100644 --- a/packages/frontend-test-utils/package.json +++ b/packages/frontend-test-utils/package.json @@ -43,10 +43,16 @@ "devDependencies": { "@backstage/cli": "workspace:^", "@testing-library/jest-dom": "^6.0.0", - "@types/react": "*" + "@types/react": "^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } }, "peerDependencies": { "@testing-library/react": "^16.0.0", + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" } diff --git a/packages/integration-react/package.json b/packages/integration-react/package.json index 610ce6f02f..c4e920cc91 100644 --- a/packages/integration-react/package.json +++ b/packages/integration-react/package.json @@ -37,8 +37,7 @@ "@backstage/core-plugin-api": "workspace:^", "@backstage/integration": "workspace:^", "@material-ui/core": "^4.12.2", - "@material-ui/icons": "^4.9.1", - "@types/react": "^16.13.1 || ^17.0.0" + "@material-ui/icons": "^4.9.1" }, "devDependencies": { "@backstage/cli": "workspace:^", @@ -47,9 +46,16 @@ "@backstage/test-utils": "workspace:^", "@testing-library/dom": "^10.0.0", "@testing-library/jest-dom": "^6.0.0", + "@types/react": "^18.0.0", "msw": "^1.0.0" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/packages/techdocs-cli-embedded-app/package.json b/packages/techdocs-cli-embedded-app/package.json index 249ec2f062..00baa817d6 100644 --- a/packages/techdocs-cli-embedded-app/package.json +++ b/packages/techdocs-cli-embedded-app/package.json @@ -59,8 +59,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", - "@types/react": "*", - "@types/react-dom": "*", + "@types/react": "^18.0.0", + "@types/react-dom": "^18.0.0", "cross-env": "^7.0.0" }, "bundled": true diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index b504419e76..857652cb62 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -58,7 +58,6 @@ "@backstage/types": "workspace:^", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "cross-fetch": "^4.0.0", "i18next": "^22.4.15", "zen-observable": "^0.10.0" @@ -66,10 +65,17 @@ "devDependencies": { "@backstage/cli": "workspace:^", "@testing-library/jest-dom": "^6.0.0", + "@types/react": "^18.0.0", "msw": "^1.0.0" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "peerDependencies": { "@testing-library/react": "^16.0.0", + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/packages/theme/package.json b/packages/theme/package.json index e0c1d049d9..6d46e96ec0 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json @@ -45,7 +45,12 @@ "@mui/styles": "^5.14.18", "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", - "@types/react": "^16.13.1 || ^17.0.0" + "@types/react": "^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } }, "peerDependencies": { "@material-ui/core": "^4.12.2", diff --git a/packages/version-bridge/package.json b/packages/version-bridge/package.json index e69fb3b364..ce68394e6d 100644 --- a/packages/version-bridge/package.json +++ b/packages/version-bridge/package.json @@ -35,15 +35,19 @@ "start": "backstage-cli package start", "test": "backstage-cli package test" }, - "dependencies": { - "@types/react": "^16.13.1 || ^17.0.0" - }, "devDependencies": { "@backstage/cli": "workspace:^", "@testing-library/jest-dom": "^6.0.0", - "@testing-library/react": "^16.0.0" + "@testing-library/react": "^16.0.0", + "@types/react": "^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/plugins/api-docs-module-protoc-gen-doc/package.json b/plugins/api-docs-module-protoc-gen-doc/package.json index ce2758e528..260491d620 100644 --- a/plugins/api-docs-module-protoc-gen-doc/package.json +++ b/plugins/api-docs-module-protoc-gen-doc/package.json @@ -37,14 +37,20 @@ "test": "backstage-cli package test" }, "dependencies": { - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "grpc-docs": "^1.1.2" }, "devDependencies": { "@backstage/cli": "workspace:^", - "@testing-library/jest-dom": "^6.0.0" + "@testing-library/jest-dom": "^6.0.0", + "@types/react": "^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json index 9adaf2319d..5da52d0bb2 100644 --- a/plugins/api-docs/package.json +++ b/plugins/api-docs/package.json @@ -67,7 +67,6 @@ "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.61", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "graphiql": "3.1.1", "graphql": "^16.0.0", "graphql-config": "^5.0.2", @@ -85,9 +84,16 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/highlightjs": "^10.1.0", + "@types/react": "^18.0.0", "@types/swagger-ui-react": "^4.18.0" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/plugins/app-visualizer/package.json b/plugins/app-visualizer/package.json index b25b27d60c..945b6e3e76 100644 --- a/plugins/app-visualizer/package.json +++ b/plugins/app-visualizer/package.json @@ -38,13 +38,19 @@ "@backstage/core-plugin-api": "workspace:^", "@backstage/frontend-plugin-api": "workspace:^", "@material-ui/core": "^4.12.2", - "@material-ui/icons": "^4.9.1", - "@types/react": "^16.13.1 || ^17.0.0" + "@material-ui/icons": "^4.9.1" }, "devDependencies": { - "@backstage/cli": "workspace:^" + "@backstage/cli": "workspace:^", + "@types/react": "^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/plugins/auth-react/package.json b/plugins/auth-react/package.json index 0fc89df74c..17923097dc 100644 --- a/plugins/auth-react/package.json +++ b/plugins/auth-react/package.json @@ -42,8 +42,7 @@ "@backstage/core-plugin-api": "workspace:^", "@backstage/errors": "workspace:^", "@material-ui/core": "^4.9.13", - "@react-hookz/web": "^24.0.0", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0" + "@react-hookz/web": "^24.0.0" }, "devDependencies": { "@backstage/cli": "workspace:^", @@ -51,9 +50,16 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", + "@types/react": "^18.0.0", "msw": "^1.0.0" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0" } } diff --git a/plugins/catalog-graph/package.json b/plugins/catalog-graph/package.json index d9c0198853..2d26a57ab6 100644 --- a/plugins/catalog-graph/package.json +++ b/plugins/catalog-graph/package.json @@ -60,7 +60,6 @@ "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.61", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "classnames": "^2.3.1", "lodash": "^4.17.15", "p-limit": "^3.1.0", @@ -76,9 +75,16 @@ "@testing-library/dom": "^10.0.0", "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", - "@testing-library/user-event": "^14.0.0" + "@testing-library/user-event": "^14.0.0", + "@types/react": "^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json index aeddafc06f..bf0630b989 100644 --- a/plugins/catalog-import/package.json +++ b/plugins/catalog-import/package.json @@ -70,7 +70,6 @@ "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.61", "@octokit/rest": "^19.0.3", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "git-url-parse": "^14.0.0", "js-base64": "^3.6.0", "lodash": "^4.17.21", @@ -88,9 +87,16 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", + "@types/react": "^18.0.0", "msw": "^1.0.0" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json index 974a6e1817..330c3ad191 100644 --- a/plugins/catalog-react/package.json +++ b/plugins/catalog-react/package.json @@ -74,7 +74,6 @@ "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.61", "@react-hookz/web": "^24.0.0", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "classnames": "^2.2.6", "lodash": "^4.17.21", "material-ui-popup-state": "^1.9.3", @@ -83,6 +82,17 @@ "yaml": "^2.0.0", "zen-observable": "^0.10.0" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, + "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, "devDependencies": { "@backstage/cli": "workspace:^", "@backstage/core-app-api": "workspace:^", @@ -94,12 +104,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", + "@types/react": "^18.0.0", "@types/zen-observable": "^0.8.0", "react-test-renderer": "^16.13.1" - }, - "peerDependencies": { - "react": "^16.13.1 || ^17.0.0 || ^18.0.0", - "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", - "react-router-dom": "6.0.0-beta.0 || ^6.3.0" } } diff --git a/plugins/catalog-unprocessed-entities/package.json b/plugins/catalog-unprocessed-entities/package.json index 038cee37fc..c019eee3fa 100644 --- a/plugins/catalog-unprocessed-entities/package.json +++ b/plugins/catalog-unprocessed-entities/package.json @@ -44,7 +44,6 @@ "@material-ui/core": "^4.9.13", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "^4.0.0-alpha.60", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "luxon": "^3.5.0", "react-use": "^17.2.4" }, @@ -52,9 +51,16 @@ "@backstage/cli": "workspace:^", "@backstage/dev-utils": "workspace:^", "@testing-library/jest-dom": "^6.0.0", - "@testing-library/react": "^16.0.0" + "@testing-library/react": "^16.0.0", + "@types/react": "^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json index e6cfb9ca47..ffd0480f29 100644 --- a/plugins/catalog/package.json +++ b/plugins/catalog/package.json @@ -77,7 +77,6 @@ "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.61", "@mui/utils": "^5.14.15", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "dataloader": "^2.0.0", "expiry-map": "^2.0.0", "history": "^5.0.0", @@ -98,9 +97,16 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/pluralize": "^0.0.33", + "@types/react": "^18.0.0", "swr": "^2.2.5" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/plugins/config-schema/package.json b/plugins/config-schema/package.json index 5739b187b7..28e294ab3d 100644 --- a/plugins/config-schema/package.json +++ b/plugins/config-schema/package.json @@ -44,7 +44,6 @@ "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.61", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "jsonschema": "^1.2.6", "react-use": "^17.2.4", "zen-observable": "^0.10.0" @@ -54,9 +53,16 @@ "@backstage/dev-utils": "workspace:^", "@testing-library/dom": "^10.0.0", "@testing-library/jest-dom": "^6.0.0", - "@testing-library/react": "^16.0.0" + "@testing-library/react": "^16.0.0", + "@types/react": "^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/plugins/devtools/package.json b/plugins/devtools/package.json index 3bcb6d5c64..ee42a2943c 100644 --- a/plugins/devtools/package.json +++ b/plugins/devtools/package.json @@ -64,15 +64,21 @@ "react-json-view": "^1.21.3", "react-use": "^17.2.4" }, - "devDependencies": { - "@backstage/cli": "workspace:^", - "@backstage/dev-utils": "workspace:^", - "@testing-library/jest-dom": "^6.0.0" + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "devDependencies": { + "@backstage/cli": "workspace:^", + "@backstage/dev-utils": "workspace:^", + "@testing-library/jest-dom": "^6.0.0", + "@types/react": "^18.0.0" } } diff --git a/plugins/example-todo-list/package.json b/plugins/example-todo-list/package.json index bcf4ee435e..f24678ad0b 100644 --- a/plugins/example-todo-list/package.json +++ b/plugins/example-todo-list/package.json @@ -50,9 +50,15 @@ "@testing-library/dom": "^10.0.0", "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", - "@types/react": "^16.13.1 || ^17.0.0" + "@types/react": "^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/plugins/home-react/package.json b/plugins/home-react/package.json index db5a59467c..16b806e172 100644 --- a/plugins/home-react/package.json +++ b/plugins/home-react/package.json @@ -46,14 +46,20 @@ "@backstage/core-plugin-api": "workspace:^", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", - "@rjsf/utils": "5.21.1", - "@types/react": "^16.13.1 || ^17.0.0" + "@rjsf/utils": "5.21.1" }, "devDependencies": { "@backstage/cli": "workspace:^", + "@types/react": "^18.0.0", "@types/react-grid-layout": "^1.3.2" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/plugins/home/package.json b/plugins/home/package.json index e135e53892..f850720745 100644 --- a/plugins/home/package.json +++ b/plugins/home/package.json @@ -74,7 +74,6 @@ "@rjsf/material-ui": "5.21.1", "@rjsf/utils": "5.21.1", "@rjsf/validator-ajv8": "5.21.1", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "lodash": "^4.17.21", "luxon": "^3.4.3", "react-grid-layout": "1.3.4", @@ -90,9 +89,16 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", + "@types/react": "^18.0.0", "@types/react-grid-layout": "^1.3.2" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/plugins/kubernetes-cluster/package.json b/plugins/kubernetes-cluster/package.json index 9134d428af..405231899b 100644 --- a/plugins/kubernetes-cluster/package.json +++ b/plugins/kubernetes-cluster/package.json @@ -51,7 +51,6 @@ "@kubernetes-models/base": "^4.0.1", "@material-ui/core": "^4.12.2", "@material-ui/lab": "4.0.0-alpha.61", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "cronstrue": "^2.2.0", "js-yaml": "^4.0.0", "kubernetes-models": "^4.1.0", @@ -65,9 +64,16 @@ "@testing-library/dom": "^10.0.0", "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", - "@types/node": "^16.11.26" + "@types/node": "^16.11.26", + "@types/react": "^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/plugins/kubernetes-react/package.json b/plugins/kubernetes-react/package.json index 68ccce1b88..7c5217424d 100644 --- a/plugins/kubernetes-react/package.json +++ b/plugins/kubernetes-react/package.json @@ -53,7 +53,6 @@ "@material-ui/core": "^4.9.13", "@material-ui/icons": "^4.11.3", "@material-ui/lab": "^4.0.0-alpha.61", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "cronstrue": "^2.32.0", "js-yaml": "^4.1.0", "kubernetes-models": "^4.3.1", @@ -64,17 +63,24 @@ "xterm-addon-attach": "^0.9.0", "xterm-addon-fit": "^0.8.0" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, + "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react": "^16.13.1 || ^17.0.0 || ^18.0.0" + }, "devDependencies": { "@backstage/cli": "workspace:^", "@backstage/core-app-api": "workspace:^", "@backstage/test-utils": "workspace:^", "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", + "@types/react": "^18.0.0", "jest-websocket-mock": "^2.5.0", "msw": "^1.3.1" }, - "peerDependencies": { - "react": "^16.13.1 || ^17.0.0 || ^18.0.0" - }, "configSchema": "config.d.ts" } diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json index 775a8dd82e..f24b695964 100644 --- a/plugins/kubernetes/package.json +++ b/plugins/kubernetes/package.json @@ -70,7 +70,6 @@ "@kubernetes-models/base": "^4.0.1", "@kubernetes/client-node": "0.20.0", "@material-ui/core": "^4.12.2", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "cronstrue": "^2.2.0", "js-yaml": "^4.0.0", "kubernetes-models": "^4.1.0", @@ -80,6 +79,11 @@ "xterm-addon-attach": "^0.9.0", "xterm-addon-fit": "^0.8.0" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "devDependencies": { "@backstage/cli": "workspace:^", "@backstage/dev-utils": "workspace:^", @@ -91,6 +95,8 @@ "peerDependencies": { "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", - "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + "react-router-dom": "6.0.0-beta.0 || ^6.3.0", + "@testing-library/react": "^16.0.0", + "@types/react": "^18.0.0" } } diff --git a/plugins/notifications/package.json b/plugins/notifications/package.json index 4307e48756..b96f06c3a1 100644 --- a/plugins/notifications/package.json +++ b/plugins/notifications/package.json @@ -48,7 +48,6 @@ "@material-ui/core": "^4.9.13", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "^4.0.0-alpha.61", - "@types/react": "^16.13.1 || ^17.0.0", "lodash": "^4.17.21", "material-ui-confirm": "^3.0.12", "notistack": "^3.0.1", @@ -64,9 +63,16 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", + "@types/react": "^18.0.0", "msw": "^1.0.0" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" } diff --git a/plugins/org-react/package.json b/plugins/org-react/package.json index f6d700cce3..376b3b9784 100644 --- a/plugins/org-react/package.json +++ b/plugins/org-react/package.json @@ -48,7 +48,6 @@ "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.61", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-use": "^17.2.4" }, "devDependencies": { @@ -58,9 +57,16 @@ "@testing-library/dom": "^10.0.0", "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", - "@testing-library/user-event": "^14.0.0" + "@testing-library/user-event": "^14.0.0", + "@types/react": "^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/plugins/org/package.json b/plugins/org/package.json index e35d4bdfa2..22e1dca1a2 100644 --- a/plugins/org/package.json +++ b/plugins/org/package.json @@ -61,7 +61,6 @@ "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.61", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "lodash": "^4.17.21", "p-limit": "^3.1.0", "pluralize": "^8.0.0", @@ -81,9 +80,16 @@ "@testing-library/dom": "^10.0.0", "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", - "@testing-library/user-event": "^14.0.0" + "@testing-library/user-event": "^14.0.0", + "@types/react": "^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/plugins/permission-react/package.json b/plugins/permission-react/package.json index fc60a9fc1f..29ebe15125 100644 --- a/plugins/permission-react/package.json +++ b/plugins/permission-react/package.json @@ -45,16 +45,22 @@ "@backstage/config": "workspace:^", "@backstage/core-plugin-api": "workspace:^", "@backstage/plugin-permission-common": "workspace:^", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "swr": "^2.0.0" }, "devDependencies": { "@backstage/cli": "workspace:^", "@backstage/test-utils": "workspace:^", "@testing-library/jest-dom": "^6.0.0", - "@testing-library/react": "^16.0.0" + "@testing-library/react": "^16.0.0", + "@types/react": "^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/plugins/scaffolder-node-test-utils/package.json b/plugins/scaffolder-node-test-utils/package.json index 0fc95260a7..dc71447bd9 100644 --- a/plugins/scaffolder-node-test-utils/package.json +++ b/plugins/scaffolder-node-test-utils/package.json @@ -46,7 +46,6 @@ "@backstage/types": "workspace:^" }, "devDependencies": { - "@backstage/cli": "workspace:^", - "@types/react": "*" + "@backstage/cli": "workspace:^" } } diff --git a/plugins/scaffolder-react/package.json b/plugins/scaffolder-react/package.json index 99dd7cf949..50e37f36a2 100644 --- a/plugins/scaffolder-react/package.json +++ b/plugins/scaffolder-react/package.json @@ -78,7 +78,6 @@ "@rjsf/utils": "5.21.1", "@rjsf/validator-ajv8": "5.21.1", "@types/json-schema": "^7.0.9", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "ajv-errors": "^3.0.0", "classnames": "^2.2.6", "flatted": "3.3.1", @@ -107,9 +106,16 @@ "@testing-library/user-event": "^14.0.0", "@types/humanize-duration": "^3.18.1", "@types/luxon": "^3.0.0", + "@types/react": "^18.0.0", "swr": "^2.0.0" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json index f73082cd22..cd7616ea43 100644 --- a/plugins/scaffolder/package.json +++ b/plugins/scaffolder/package.json @@ -85,7 +85,6 @@ "@rjsf/material-ui": "5.21.1", "@rjsf/utils": "5.21.1", "@rjsf/validator-ajv8": "5.21.1", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "@uiw/react-codemirror": "^4.9.3", "classnames": "^2.2.6", "git-url-parse": "^14.0.0", @@ -120,10 +119,17 @@ "@types/json-schema": "^7.0.9", "@types/react-resizable": "^3.0.8", "@types/react-window": "^1.8.8", + "@types/react": "^18.0.0", "msw": "^1.0.0", "swr": "^2.0.0" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/plugins/search-react/package.json b/plugins/search-react/package.json index 2b4f5de145..5b8d478320 100644 --- a/plugins/search-react/package.json +++ b/plugins/search-react/package.json @@ -66,7 +66,6 @@ "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.61", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "lodash": "^4.17.21", "qs": "^6.9.4", "react-use": "^17.3.2" @@ -80,9 +79,16 @@ "@testing-library/dom": "^10.0.0", "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", - "@testing-library/user-event": "^14.0.0" + "@testing-library/user-event": "^14.0.0", + "@types/react": "^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/plugins/search/package.json b/plugins/search/package.json index cc9e8df9b7..ce733d7a8b 100644 --- a/plugins/search/package.json +++ b/plugins/search/package.json @@ -70,7 +70,6 @@ "@backstage/version-bridge": "workspace:^", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "qs": "^6.9.4", "react-use": "^17.2.4" }, @@ -83,9 +82,16 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", + "@types/react": "^18.0.0", "history": "^5.0.0" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/plugins/techdocs-addons-test-utils/package.json b/plugins/techdocs-addons-test-utils/package.json index ea61f6d6d4..986cbf0d55 100644 --- a/plugins/techdocs-addons-test-utils/package.json +++ b/plugins/techdocs-addons-test-utils/package.json @@ -49,16 +49,22 @@ "@backstage/plugin-techdocs": "workspace:^", "@backstage/plugin-techdocs-react": "workspace:^", "@backstage/test-utils": "workspace:^", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "testing-library__dom": "^7.29.4-beta.1" }, "devDependencies": { "@backstage/cli": "workspace:^", "@testing-library/dom": "^10.0.0", - "@testing-library/jest-dom": "^6.0.0" + "@testing-library/jest-dom": "^6.0.0", + "@types/react": "^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } }, "peerDependencies": { "@testing-library/react": "^16.0.0", + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/plugins/techdocs-module-addons-contrib/package.json b/plugins/techdocs-module-addons-contrib/package.json index a4a58184d5..4551e95c2b 100644 --- a/plugins/techdocs-module-addons-contrib/package.json +++ b/plugins/techdocs-module-addons-contrib/package.json @@ -57,9 +57,15 @@ "@testing-library/dom": "^10.0.0", "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", - "@types/react": "^16.13.1 || ^17.0.0" + "@types/react": "^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/plugins/techdocs-react/package.json b/plugins/techdocs-react/package.json index 0c196707f0..af5e0c7377 100644 --- a/plugins/techdocs-react/package.json +++ b/plugins/techdocs-react/package.json @@ -52,7 +52,6 @@ "@backstage/version-bridge": "workspace:^", "@material-ui/core": "^4.12.2", "@material-ui/styles": "^4.11.0", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "jss": "~10.10.0", "lodash": "^4.17.21", "react-helmet": "6.1.0", @@ -63,9 +62,16 @@ "@backstage/test-utils": "workspace:^", "@backstage/theme": "workspace:^", "@testing-library/jest-dom": "^6.0.0", - "@testing-library/react": "^16.0.0" + "@testing-library/react": "^16.0.0", + "@types/react": "^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json index a6e6179c87..bde33b3c1e 100644 --- a/plugins/techdocs/package.json +++ b/plugins/techdocs/package.json @@ -80,7 +80,6 @@ "@material-ui/lab": "4.0.0-alpha.61", "@material-ui/styles": "^4.10.0", "@microsoft/fetch-event-source": "^2.0.1", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "dompurify": "^3.0.0", "git-url-parse": "^14.0.0", "jss": "~10.10.0", @@ -99,9 +98,17 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/dompurify": "^3.0.0", + "@types/event-source-polyfill": "^1.0.0", + "@types/react": "^18.0.0", "canvas": "^2.10.2" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json index 4c20c2f0f3..beab130693 100644 --- a/plugins/user-settings/package.json +++ b/plugins/user-settings/package.json @@ -69,7 +69,6 @@ "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.61", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-use": "^17.2.4", "zen-observable": "^0.10.0" }, @@ -82,9 +81,16 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", + "@types/react": "^18.0.0", "msw": "^1.0.0" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" From e969dc7dc8f3d654b941fad27899b4551f3608f4 Mon Sep 17 00:00:00 2001 From: aramissennyeydd Date: Tue, 18 Jun 2024 22:27:15 -0400 Subject: [PATCH 02/21] add changeset Signed-off-by: aramissennyeydd --- .changeset/early-sloths-cross.md | 180 +++++++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) create mode 100644 .changeset/early-sloths-cross.md diff --git a/.changeset/early-sloths-cross.md b/.changeset/early-sloths-cross.md new file mode 100644 index 0000000000..4683bbaf8d --- /dev/null +++ b/.changeset/early-sloths-cross.md @@ -0,0 +1,180 @@ +--- +'@backstage/plugin-scaffolder-backend-module-confluence-to-markdown': patch +'@backstage/plugin-auth-backend-module-cloudflare-access-provider': patch +'@backstage/plugin-catalog-backend-module-scaffolder-entity-model': patch +'@backstage/plugin-search-backend-module-stack-overflow-collator': patch +'@backstage/plugin-catalog-backend-module-incremental-ingestion': patch +'@backstage/plugin-auth-backend-module-azure-easyauth-provider': patch +'@backstage/plugin-permission-backend-module-allow-all-policy': patch +'@backstage/plugin-scaffolder-backend-module-bitbucket-server': patch +'@backstage/plugin-auth-backend-module-oauth2-proxy-provider': patch +'@backstage/plugin-auth-backend-module-vmware-cloud-provider': patch +'@backstage/plugin-scaffolder-backend-module-bitbucket-cloud': patch +'@backstage/plugin-catalog-backend-module-backstage-openapi': patch +'@backstage/plugin-catalog-backend-module-bitbucket-server': patch +'@backstage/plugin-scaffolder-backend-module-notifications': patch +'@backstage/plugin-auth-backend-module-atlassian-provider': patch +'@backstage/plugin-auth-backend-module-bitbucket-provider': patch +'@backstage/plugin-auth-backend-module-microsoft-provider': patch +'@backstage/plugin-catalog-backend-module-bitbucket-cloud': patch +'@backstage/plugin-scaffolder-backend-module-cookiecutter': patch +'@backstage/plugin-auth-backend-module-onelogin-provider': patch +'@backstage/plugin-auth-backend-module-pinniped-provider': patch +'@backstage/plugin-events-backend-module-bitbucket-cloud': patch +'@backstage/plugin-auth-backend-module-aws-alb-provider': patch +'@backstage/plugin-auth-backend-module-gcp-iap-provider': patch +'@backstage/plugin-auth-backend-module-github-provider': patch +'@backstage/plugin-auth-backend-module-gitlab-provider': patch +'@backstage/plugin-auth-backend-module-google-provider': patch +'@backstage/plugin-auth-backend-module-oauth2-provider': patch +'@backstage/plugin-catalog-unprocessed-entities-common': patch +'@backstage/plugin-scaffolder-backend-module-bitbucket': patch +'@backstage/plugin-search-backend-module-elasticsearch': patch +'@backstage/plugin-auth-backend-module-guest-provider': patch +'@backstage/plugin-catalog-backend-module-unprocessed': patch +'@backstage/plugin-notifications-backend-module-email': patch +'@backstage/plugin-auth-backend-module-oidc-provider': patch +'@backstage/plugin-auth-backend-module-okta-provider': patch +'@backstage/plugin-catalog-backend-module-github-org': patch +'@backstage/plugin-catalog-backend-module-gitlab-org': patch +'@backstage/backend-dynamic-feature-service': patch +'@backstage/plugin-scaffolder-backend-module-gerrit': patch +'@backstage/plugin-scaffolder-backend-module-github': patch +'@backstage/plugin-scaffolder-backend-module-gitlab': patch +'@backstage/plugin-scaffolder-backend-module-sentry': patch +'@backstage/plugin-scaffolder-backend-module-yeoman': patch +'@backstage/plugin-catalog-backend-module-puppetdb': patch +'@backstage/plugin-scaffolder-backend-module-azure': patch +'@backstage/plugin-scaffolder-backend-module-gitea': patch +'@backstage/plugin-scaffolder-backend-module-rails': patch +'@backstage/plugin-api-docs-module-protoc-gen-doc': patch +'@backstage/plugin-catalog-backend-module-msgraph': patch +'@backstage/plugin-catalog-backend-module-openapi': patch +'@backstage/plugin-search-backend-module-techdocs': patch +'@backstage/plugin-techdocs-module-addons-contrib': patch +'@backstage/plugin-catalog-backend-module-gerrit': patch +'@backstage/plugin-catalog-backend-module-github': patch +'@backstage/plugin-catalog-backend-module-gitlab': patch +'@backstage/plugin-events-backend-module-aws-sqs': patch +'@backstage/plugin-search-backend-module-catalog': patch +'@backstage/plugin-search-backend-module-explore': patch +'@backstage/plugin-catalog-backend-module-azure': patch +'@backstage/plugin-catalog-unprocessed-entities': patch +'@backstage/plugin-events-backend-module-gerrit': patch +'@backstage/plugin-events-backend-module-github': patch +'@backstage/plugin-events-backend-module-gitlab': patch +'@backstage/plugin-catalog-backend-module-ldap': patch +'@backstage/plugin-events-backend-module-azure': patch +'techdocs-cli-embedded-app': patch +'@backstage/plugin-catalog-backend-module-aws': patch +'@backstage/plugin-catalog-backend-module-gcp': patch +'@backstage/plugin-scaffolder-node-test-utils': patch +'@backstage/plugin-techdocs-addons-test-utils': patch +'@backstage/plugin-events-backend-test-utils': patch +'@internal/plugin-todo-list-backend': patch +'app-next-example-plugin': patch +'@internal/plugin-todo-list-common': patch +'@backstage/plugin-search-backend-module-pg': patch +'@backstage/backend-openapi-utils': patch +'@backstage/plugin-bitbucket-cloud-common': patch +'@backstage/plugin-notifications-backend': patch +'@backstage/plugin-user-settings-backend': patch +'@backstage/frontend-plugin-api': patch +'@backstage/frontend-test-utils': patch +'@backstage/plugin-notifications-common': patch +'@backstage/plugin-user-settings-common': patch +'@backstage/backend-plugin-api': patch +'@backstage/backend-test-utils': patch +'@backstage/plugin-search-backend-node': patch +'@backstage/integration-react': patch +'@backstage/plugin-kubernetes-backend': patch +'@backstage/plugin-kubernetes-cluster': patch +'@backstage/plugin-notifications-node': patch +'@backstage/plugin-permission-backend': patch +'@backstage/plugin-scaffolder-backend': patch +'@backstage/backend-defaults': patch +'@backstage/frontend-app-api': patch +'@internal/plugin-todo-list': patch +'@backstage/plugin-kubernetes-common': patch +'@backstage/plugin-permission-common': patch +'@backstage/plugin-scaffolder-common': patch +'@backstage/backend-app-api': patch +'@backstage/core-compat-api': patch +'@backstage/core-components': patch +'@backstage/core-plugin-api': patch +'@backstage/plugin-devtools-backend': patch +'@backstage/plugin-kubernetes-react': patch +'@backstage/plugin-permission-react': patch +'@backstage/plugin-scaffolder-react': patch +'@backstage/plugin-techdocs-backend': patch +'@backstage/backend-common': patch +'example-backend-legacy': patch +'@backstage/catalog-client': patch +'@backstage/version-bridge': patch +'@backstage/plugin-catalog-backend': patch +'@backstage/plugin-devtools-common': patch +'@backstage/plugin-kubernetes-node': patch +'@backstage/plugin-permission-node': patch +'@backstage/plugin-scaffolder-node': patch +'@backstage/plugin-signals-backend': patch +'@backstage/backend-tasks': patch +'@backstage/catalog-model': patch +'@backstage/config-loader': patch +'@backstage/eslint-plugin': patch +'@backstage/plugin-app-visualizer': patch +'@backstage/plugin-catalog-common': patch +'@backstage/plugin-catalog-import': patch +'@backstage/plugin-events-backend': patch +'@backstage/plugin-search-backend': patch +'@backstage/plugin-techdocs-react': patch +'@backstage/app-defaults': patch +'@backstage/core-app-api': patch +'@techdocs/cli': patch +'@backstage/plugin-catalog-graph': patch +'@backstage/plugin-catalog-react': patch +'@backstage/plugin-config-schema': patch +'@backstage/plugin-notifications': patch +'@backstage/plugin-proxy-backend': patch +'@backstage/plugin-search-common': patch +'@backstage/plugin-signals-react': patch +'@backstage/plugin-techdocs-node': patch +'@backstage/plugin-user-settings': patch +'@backstage/integration': patch +'yarn-plugin-backstage': patch +'@backstage/plugin-auth-backend': patch +'@backstage/plugin-catalog-node': patch +'@backstage/plugin-search-react': patch +'@backstage/plugin-signals-node': patch +'@backstage/cli-common': patch +'@backstage/create-app': patch +'@backstage/repo-tools': patch +'@backstage/test-utils': patch +'@backstage/plugin-app-backend': patch +'@backstage/plugin-events-node': patch +'@backstage/dev-utils': patch +'@backstage/plugin-auth-react': patch +'@backstage/plugin-home-react': patch +'@backstage/plugin-kubernetes': patch +'@backstage/plugin-scaffolder': patch +'example-app-next': patch +'@backstage/cli-node': patch +'@backstage/codemods': patch +'e2e-test': patch +'@backstage/plugin-auth-node': patch +'@backstage/plugin-org-react': patch +'example-backend': patch +'@backstage/plugin-api-docs': patch +'@backstage/plugin-app-node': patch +'@backstage/plugin-devtools': patch +'@backstage/plugin-techdocs': patch +'@backstage/plugin-catalog': patch +'@backstage/plugin-signals': patch +'@backstage/theme': patch +'@backstage/plugin-search': patch +'example-app': patch +'@backstage/cli': patch +'@backstage/plugin-home': patch +'@backstage/plugin-org': patch +--- + +Move `@types/react` to a peer dependency. From d54e7b6fdbb7b23902daa4f441629bc13302df8f Mon Sep 17 00:00:00 2001 From: aramissennyeydd Date: Tue, 18 Jun 2024 22:35:31 -0400 Subject: [PATCH 03/21] adjust changeset Signed-off-by: aramissennyeydd --- .changeset/early-sloths-cross.md | 84 -------------------------------- 1 file changed, 84 deletions(-) diff --git a/.changeset/early-sloths-cross.md b/.changeset/early-sloths-cross.md index 4683bbaf8d..0fbf528a9c 100644 --- a/.changeset/early-sloths-cross.md +++ b/.changeset/early-sloths-cross.md @@ -1,97 +1,24 @@ --- -'@backstage/plugin-scaffolder-backend-module-confluence-to-markdown': patch -'@backstage/plugin-auth-backend-module-cloudflare-access-provider': patch -'@backstage/plugin-catalog-backend-module-scaffolder-entity-model': patch -'@backstage/plugin-search-backend-module-stack-overflow-collator': patch -'@backstage/plugin-catalog-backend-module-incremental-ingestion': patch -'@backstage/plugin-auth-backend-module-azure-easyauth-provider': patch -'@backstage/plugin-permission-backend-module-allow-all-policy': patch -'@backstage/plugin-scaffolder-backend-module-bitbucket-server': patch -'@backstage/plugin-auth-backend-module-oauth2-proxy-provider': patch -'@backstage/plugin-auth-backend-module-vmware-cloud-provider': patch -'@backstage/plugin-scaffolder-backend-module-bitbucket-cloud': patch -'@backstage/plugin-catalog-backend-module-backstage-openapi': patch -'@backstage/plugin-catalog-backend-module-bitbucket-server': patch -'@backstage/plugin-scaffolder-backend-module-notifications': patch -'@backstage/plugin-auth-backend-module-atlassian-provider': patch -'@backstage/plugin-auth-backend-module-bitbucket-provider': patch -'@backstage/plugin-auth-backend-module-microsoft-provider': patch -'@backstage/plugin-catalog-backend-module-bitbucket-cloud': patch -'@backstage/plugin-scaffolder-backend-module-cookiecutter': patch -'@backstage/plugin-auth-backend-module-onelogin-provider': patch -'@backstage/plugin-auth-backend-module-pinniped-provider': patch -'@backstage/plugin-events-backend-module-bitbucket-cloud': patch -'@backstage/plugin-auth-backend-module-aws-alb-provider': patch -'@backstage/plugin-auth-backend-module-gcp-iap-provider': patch -'@backstage/plugin-auth-backend-module-github-provider': patch -'@backstage/plugin-auth-backend-module-gitlab-provider': patch -'@backstage/plugin-auth-backend-module-google-provider': patch -'@backstage/plugin-auth-backend-module-oauth2-provider': patch '@backstage/plugin-catalog-unprocessed-entities-common': patch -'@backstage/plugin-scaffolder-backend-module-bitbucket': patch -'@backstage/plugin-search-backend-module-elasticsearch': patch -'@backstage/plugin-auth-backend-module-guest-provider': patch -'@backstage/plugin-catalog-backend-module-unprocessed': patch -'@backstage/plugin-notifications-backend-module-email': patch -'@backstage/plugin-auth-backend-module-oidc-provider': patch -'@backstage/plugin-auth-backend-module-okta-provider': patch -'@backstage/plugin-catalog-backend-module-github-org': patch -'@backstage/plugin-catalog-backend-module-gitlab-org': patch '@backstage/backend-dynamic-feature-service': patch -'@backstage/plugin-scaffolder-backend-module-gerrit': patch -'@backstage/plugin-scaffolder-backend-module-github': patch -'@backstage/plugin-scaffolder-backend-module-gitlab': patch -'@backstage/plugin-scaffolder-backend-module-sentry': patch -'@backstage/plugin-scaffolder-backend-module-yeoman': patch -'@backstage/plugin-catalog-backend-module-puppetdb': patch -'@backstage/plugin-scaffolder-backend-module-azure': patch -'@backstage/plugin-scaffolder-backend-module-gitea': patch -'@backstage/plugin-scaffolder-backend-module-rails': patch -'@backstage/plugin-api-docs-module-protoc-gen-doc': patch -'@backstage/plugin-catalog-backend-module-msgraph': patch -'@backstage/plugin-catalog-backend-module-openapi': patch -'@backstage/plugin-search-backend-module-techdocs': patch '@backstage/plugin-techdocs-module-addons-contrib': patch -'@backstage/plugin-catalog-backend-module-gerrit': patch -'@backstage/plugin-catalog-backend-module-github': patch -'@backstage/plugin-catalog-backend-module-gitlab': patch -'@backstage/plugin-events-backend-module-aws-sqs': patch -'@backstage/plugin-search-backend-module-catalog': patch -'@backstage/plugin-search-backend-module-explore': patch -'@backstage/plugin-catalog-backend-module-azure': patch '@backstage/plugin-catalog-unprocessed-entities': patch -'@backstage/plugin-events-backend-module-gerrit': patch -'@backstage/plugin-events-backend-module-github': patch -'@backstage/plugin-events-backend-module-gitlab': patch -'@backstage/plugin-catalog-backend-module-ldap': patch -'@backstage/plugin-events-backend-module-azure': patch 'techdocs-cli-embedded-app': patch -'@backstage/plugin-catalog-backend-module-aws': patch -'@backstage/plugin-catalog-backend-module-gcp': patch '@backstage/plugin-scaffolder-node-test-utils': patch '@backstage/plugin-techdocs-addons-test-utils': patch -'@backstage/plugin-events-backend-test-utils': patch -'@internal/plugin-todo-list-backend': patch 'app-next-example-plugin': patch '@internal/plugin-todo-list-common': patch -'@backstage/plugin-search-backend-module-pg': patch '@backstage/backend-openapi-utils': patch '@backstage/plugin-bitbucket-cloud-common': patch -'@backstage/plugin-notifications-backend': patch -'@backstage/plugin-user-settings-backend': patch '@backstage/frontend-plugin-api': patch '@backstage/frontend-test-utils': patch '@backstage/plugin-notifications-common': patch '@backstage/plugin-user-settings-common': patch '@backstage/backend-plugin-api': patch '@backstage/backend-test-utils': patch -'@backstage/plugin-search-backend-node': patch '@backstage/integration-react': patch -'@backstage/plugin-kubernetes-backend': patch '@backstage/plugin-kubernetes-cluster': patch '@backstage/plugin-notifications-node': patch -'@backstage/plugin-permission-backend': patch -'@backstage/plugin-scaffolder-backend': patch '@backstage/backend-defaults': patch '@backstage/frontend-app-api': patch '@internal/plugin-todo-list': patch @@ -102,21 +29,16 @@ '@backstage/core-compat-api': patch '@backstage/core-components': patch '@backstage/core-plugin-api': patch -'@backstage/plugin-devtools-backend': patch '@backstage/plugin-kubernetes-react': patch '@backstage/plugin-permission-react': patch '@backstage/plugin-scaffolder-react': patch -'@backstage/plugin-techdocs-backend': patch '@backstage/backend-common': patch -'example-backend-legacy': patch '@backstage/catalog-client': patch '@backstage/version-bridge': patch -'@backstage/plugin-catalog-backend': patch '@backstage/plugin-devtools-common': patch '@backstage/plugin-kubernetes-node': patch '@backstage/plugin-permission-node': patch '@backstage/plugin-scaffolder-node': patch -'@backstage/plugin-signals-backend': patch '@backstage/backend-tasks': patch '@backstage/catalog-model': patch '@backstage/config-loader': patch @@ -124,8 +46,6 @@ '@backstage/plugin-app-visualizer': patch '@backstage/plugin-catalog-common': patch '@backstage/plugin-catalog-import': patch -'@backstage/plugin-events-backend': patch -'@backstage/plugin-search-backend': patch '@backstage/plugin-techdocs-react': patch '@backstage/app-defaults': patch '@backstage/core-app-api': patch @@ -134,14 +54,12 @@ '@backstage/plugin-catalog-react': patch '@backstage/plugin-config-schema': patch '@backstage/plugin-notifications': patch -'@backstage/plugin-proxy-backend': patch '@backstage/plugin-search-common': patch '@backstage/plugin-signals-react': patch '@backstage/plugin-techdocs-node': patch '@backstage/plugin-user-settings': patch '@backstage/integration': patch 'yarn-plugin-backstage': patch -'@backstage/plugin-auth-backend': patch '@backstage/plugin-catalog-node': patch '@backstage/plugin-search-react': patch '@backstage/plugin-signals-node': patch @@ -149,7 +67,6 @@ '@backstage/create-app': patch '@backstage/repo-tools': patch '@backstage/test-utils': patch -'@backstage/plugin-app-backend': patch '@backstage/plugin-events-node': patch '@backstage/dev-utils': patch '@backstage/plugin-auth-react': patch @@ -162,7 +79,6 @@ 'e2e-test': patch '@backstage/plugin-auth-node': patch '@backstage/plugin-org-react': patch -'example-backend': patch '@backstage/plugin-api-docs': patch '@backstage/plugin-app-node': patch '@backstage/plugin-devtools': patch From 2c8532c322f8f2f630922f1f8fad8400ceeb389c Mon Sep 17 00:00:00 2001 From: aramissennyeydd Date: Tue, 18 Jun 2024 22:36:08 -0400 Subject: [PATCH 04/21] more adjustments Signed-off-by: aramissennyeydd --- .changeset/early-sloths-cross.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/.changeset/early-sloths-cross.md b/.changeset/early-sloths-cross.md index 0fbf528a9c..60b5dc8e91 100644 --- a/.changeset/early-sloths-cross.md +++ b/.changeset/early-sloths-cross.md @@ -3,7 +3,6 @@ '@backstage/backend-dynamic-feature-service': patch '@backstage/plugin-techdocs-module-addons-contrib': patch '@backstage/plugin-catalog-unprocessed-entities': patch -'techdocs-cli-embedded-app': patch '@backstage/plugin-scaffolder-node-test-utils': patch '@backstage/plugin-techdocs-addons-test-utils': patch 'app-next-example-plugin': patch @@ -76,7 +75,6 @@ 'example-app-next': patch '@backstage/cli-node': patch '@backstage/codemods': patch -'e2e-test': patch '@backstage/plugin-auth-node': patch '@backstage/plugin-org-react': patch '@backstage/plugin-api-docs': patch From 9d8b440a81eae27c2502c8e3ef2cb202061c411a Mon Sep 17 00:00:00 2001 From: aramissennyeydd Date: Tue, 18 Jun 2024 22:39:06 -0400 Subject: [PATCH 05/21] more fixes Signed-off-by: aramissennyeydd --- .changeset/early-sloths-cross.md | 47 -------------------------------- 1 file changed, 47 deletions(-) diff --git a/.changeset/early-sloths-cross.md b/.changeset/early-sloths-cross.md index 60b5dc8e91..e1d5a5180c 100644 --- a/.changeset/early-sloths-cross.md +++ b/.changeset/early-sloths-cross.md @@ -1,92 +1,45 @@ --- -'@backstage/plugin-catalog-unprocessed-entities-common': patch -'@backstage/backend-dynamic-feature-service': patch '@backstage/plugin-techdocs-module-addons-contrib': patch '@backstage/plugin-catalog-unprocessed-entities': patch '@backstage/plugin-scaffolder-node-test-utils': patch '@backstage/plugin-techdocs-addons-test-utils': patch -'app-next-example-plugin': patch -'@internal/plugin-todo-list-common': patch -'@backstage/backend-openapi-utils': patch -'@backstage/plugin-bitbucket-cloud-common': patch '@backstage/frontend-plugin-api': patch '@backstage/frontend-test-utils': patch -'@backstage/plugin-notifications-common': patch -'@backstage/plugin-user-settings-common': patch -'@backstage/backend-plugin-api': patch -'@backstage/backend-test-utils': patch '@backstage/integration-react': patch '@backstage/plugin-kubernetes-cluster': patch -'@backstage/plugin-notifications-node': patch -'@backstage/backend-defaults': patch '@backstage/frontend-app-api': patch '@internal/plugin-todo-list': patch -'@backstage/plugin-kubernetes-common': patch -'@backstage/plugin-permission-common': patch -'@backstage/plugin-scaffolder-common': patch -'@backstage/backend-app-api': patch '@backstage/core-compat-api': patch '@backstage/core-components': patch '@backstage/core-plugin-api': patch '@backstage/plugin-kubernetes-react': patch '@backstage/plugin-permission-react': patch '@backstage/plugin-scaffolder-react': patch -'@backstage/backend-common': patch -'@backstage/catalog-client': patch '@backstage/version-bridge': patch -'@backstage/plugin-devtools-common': patch -'@backstage/plugin-kubernetes-node': patch -'@backstage/plugin-permission-node': patch -'@backstage/plugin-scaffolder-node': patch -'@backstage/backend-tasks': patch -'@backstage/catalog-model': patch -'@backstage/config-loader': patch -'@backstage/eslint-plugin': patch '@backstage/plugin-app-visualizer': patch -'@backstage/plugin-catalog-common': patch '@backstage/plugin-catalog-import': patch '@backstage/plugin-techdocs-react': patch '@backstage/app-defaults': patch '@backstage/core-app-api': patch -'@techdocs/cli': patch '@backstage/plugin-catalog-graph': patch '@backstage/plugin-catalog-react': patch '@backstage/plugin-config-schema': patch '@backstage/plugin-notifications': patch -'@backstage/plugin-search-common': patch -'@backstage/plugin-signals-react': patch -'@backstage/plugin-techdocs-node': patch '@backstage/plugin-user-settings': patch -'@backstage/integration': patch -'yarn-plugin-backstage': patch -'@backstage/plugin-catalog-node': patch '@backstage/plugin-search-react': patch -'@backstage/plugin-signals-node': patch -'@backstage/cli-common': patch -'@backstage/create-app': patch -'@backstage/repo-tools': patch '@backstage/test-utils': patch -'@backstage/plugin-events-node': patch '@backstage/dev-utils': patch '@backstage/plugin-auth-react': patch '@backstage/plugin-home-react': patch '@backstage/plugin-kubernetes': patch '@backstage/plugin-scaffolder': patch -'example-app-next': patch -'@backstage/cli-node': patch -'@backstage/codemods': patch -'@backstage/plugin-auth-node': patch '@backstage/plugin-org-react': patch '@backstage/plugin-api-docs': patch -'@backstage/plugin-app-node': patch '@backstage/plugin-devtools': patch '@backstage/plugin-techdocs': patch '@backstage/plugin-catalog': patch -'@backstage/plugin-signals': patch '@backstage/theme': patch '@backstage/plugin-search': patch -'example-app': patch -'@backstage/cli': patch '@backstage/plugin-home': patch '@backstage/plugin-org': patch --- From df40a6792b28898fec2113c8e0ed426eec1ccbca Mon Sep 17 00:00:00 2001 From: aramissennyeydd Date: Tue, 18 Jun 2024 22:39:26 -0400 Subject: [PATCH 06/21] and more Signed-off-by: aramissennyeydd --- .changeset/early-sloths-cross.md | 1 - 1 file changed, 1 deletion(-) diff --git a/.changeset/early-sloths-cross.md b/.changeset/early-sloths-cross.md index e1d5a5180c..9267b4012d 100644 --- a/.changeset/early-sloths-cross.md +++ b/.changeset/early-sloths-cross.md @@ -8,7 +8,6 @@ '@backstage/integration-react': patch '@backstage/plugin-kubernetes-cluster': patch '@backstage/frontend-app-api': patch -'@internal/plugin-todo-list': patch '@backstage/core-compat-api': patch '@backstage/core-components': patch '@backstage/core-plugin-api': patch From 7dfdeda9bf4b293cebe640cc9c113259e606d77e Mon Sep 17 00:00:00 2001 From: aramissennyeydd Date: Tue, 18 Jun 2024 22:41:21 -0400 Subject: [PATCH 07/21] add missing package :) Signed-off-by: aramissennyeydd --- .changeset/early-sloths-cross.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.changeset/early-sloths-cross.md b/.changeset/early-sloths-cross.md index 9267b4012d..3e96057b8d 100644 --- a/.changeset/early-sloths-cross.md +++ b/.changeset/early-sloths-cross.md @@ -1,4 +1,5 @@ --- +'@backstage/plugin-api-docs-module-protoc-gen-doc': patch '@backstage/plugin-techdocs-module-addons-contrib': patch '@backstage/plugin-catalog-unprocessed-entities': patch '@backstage/plugin-scaffolder-node-test-utils': patch From e1c89ddd085d18eb11db2ff666bcb9ccbec653f3 Mon Sep 17 00:00:00 2001 From: aramissennyeydd Date: Tue, 18 Jun 2024 23:07:55 -0400 Subject: [PATCH 08/21] add react and react-router as dev dependencies Signed-off-by: aramissennyeydd --- packages/app-defaults/package.json | 14 ++++---- packages/core-app-api/package.json | 24 +++++++------- packages/core-compat-api/package.json | 14 ++++---- packages/core-components/package.json | 14 ++++---- packages/core-plugin-api/package.json | 15 ++++++++- packages/dev-utils/package.json | 15 +++++---- packages/frontend-app-api/package.json | 32 +++++++++++-------- packages/frontend-plugin-api/package.json | 14 ++++---- packages/frontend-test-utils/package.json | 14 ++++---- packages/integration-react/package.json | 14 ++++---- packages/test-utils/package.json | 14 ++++---- packages/theme/package.json | 14 ++++---- packages/version-bridge/package.json | 14 ++++---- .../package.json | 14 ++++---- plugins/api-docs/package.json | 14 ++++---- plugins/app-visualizer/package.json | 14 ++++---- plugins/auth-react/package.json | 12 ++++--- plugins/catalog-graph/package.json | 14 ++++---- plugins/catalog-import/package.json | 14 ++++---- plugins/catalog-react/package.json | 24 +++++++------- .../catalog-unprocessed-entities/package.json | 14 ++++---- plugins/catalog/package.json | 12 ++++--- plugins/config-schema/package.json | 14 ++++---- plugins/devtools/package.json | 20 ++++++------ plugins/example-todo-list/package.json | 14 ++++---- plugins/home-react/package.json | 14 ++++---- plugins/home/package.json | 14 ++++---- plugins/kubernetes-cluster/package.json | 14 ++++---- plugins/kubernetes-react/package.json | 22 +++++++------ plugins/kubernetes/package.json | 17 ++++++---- plugins/notifications/package.json | 14 ++++---- plugins/org-react/package.json | 14 ++++---- plugins/org/package.json | 14 ++++---- plugins/permission-react/package.json | 14 ++++---- plugins/scaffolder-react/package.json | 12 ++++--- plugins/scaffolder/package.json | 12 ++++--- plugins/search-react/package.json | 14 ++++---- plugins/search/package.json | 14 ++++---- .../techdocs-addons-test-utils/package.json | 14 ++++---- .../package.json | 14 ++++---- plugins/techdocs-react/package.json | 14 ++++---- plugins/techdocs/package.json | 14 ++++---- plugins/user-settings/package.json | 14 ++++---- 43 files changed, 377 insertions(+), 274 deletions(-) diff --git a/packages/app-defaults/package.json b/packages/app-defaults/package.json index 0641cd7096..0dabc3d3e9 100644 --- a/packages/app-defaults/package.json +++ b/packages/app-defaults/package.json @@ -49,17 +49,19 @@ "@backstage/test-utils": "workspace:^", "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", - "@types/react": "^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/packages/core-app-api/package.json b/packages/core-app-api/package.json index b5a173ce0d..c1adf50cd9 100644 --- a/packages/core-app-api/package.json +++ b/packages/core-app-api/package.json @@ -56,21 +56,12 @@ "i18next": "^22.4.15", "lodash": "^4.17.21", "prop-types": "^15.7.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-use": "^17.2.4", "zen-observable": "^0.10.0", "zod": "^3.22.4" }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - }, - "peerDependencies": { - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", - "react": "^16.13.1 || ^17.0.0 || ^18.0.0", - "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", - "react-router-dom": "6.0.0-beta.0 || ^6.3.0" - }, "devDependencies": { "@backstage/cli": "workspace:^", "@backstage/test-utils": "workspace:^", @@ -86,5 +77,16 @@ "react-router-dom-stable": "npm:react-router-dom@^6.3.0", "react-router-stable": "npm:react-router@^6.3.0" }, + "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "configSchema": "config.d.ts" } diff --git a/packages/core-compat-api/package.json b/packages/core-compat-api/package.json index 76e925bd34..d782afcc5d 100644 --- a/packages/core-compat-api/package.json +++ b/packages/core-compat-api/package.json @@ -49,16 +49,18 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "zod": "^3.22.4", - "@types/react": "^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/packages/core-components/package.json b/packages/core-components/package.json index 69ac146f1a..407e7e791a 100644 --- a/packages/core-components/package.json +++ b/packages/core-components/package.json @@ -115,12 +115,9 @@ "@types/zen-observable": "^0.8.0", "cross-fetch": "^4.0.0", "history": "^5.0.0", - "msw": "^1.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "msw": "^1.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", @@ -128,5 +125,10 @@ "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "configSchema": "config.d.ts" } diff --git a/packages/core-plugin-api/package.json b/packages/core-plugin-api/package.json index 5f91bae603..4c51f60555 100644 --- a/packages/core-plugin-api/package.json +++ b/packages/core-plugin-api/package.json @@ -63,6 +63,19 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", - "@types/react": "^18.0.0" + "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" + }, + "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 7a087657e8..5ca2e55a36 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -46,7 +46,6 @@ "@backstage/theme": "workspace:^", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-use": "^17.2.4" }, "devDependencies": { @@ -56,16 +55,20 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", + "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0", "zen-observable": "^0.10.0" }, + "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, "peerDependenciesMeta": { "@types/react": { "optional": true } - }, - "peerDependencies": { - "react": "^16.13.1 || ^17.0.0 || ^18.0.0", - "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", - "react-router-dom": "6.0.0-beta.0 || ^6.3.0" } } diff --git a/packages/frontend-app-api/package.json b/packages/frontend-app-api/package.json index e14867fecb..23639e0af7 100644 --- a/packages/frontend-app-api/package.json +++ b/packages/frontend-app-api/package.json @@ -41,24 +41,30 @@ "@backstage/types": "workspace:^", "@backstage/version-bridge": "workspace:^", "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", - "lodash": "^4.17.21", - "zod": "^3.22.4" + "zod": "^3.22.4", + "@material-ui/core": "^4.12.4", + "@material-ui/icons": "^4.11.3", + "lodash": "^4.17.21" + }, + "devDependencies": { + "@backstage/cli": "workspace:^", + "@backstage/test-utils": "workspace:^", + "@testing-library/jest-dom": "^6.0.0", + "@testing-library/react": "^15.0.0", + "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" + }, + "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-router-dom": "6.0.0-beta.0 || ^6.3.0" }, "peerDependenciesMeta": { "@types/react": { "optional": true } }, - "devDependencies": { - "@backstage/cli": "workspace:^", - "@backstage/plugin-app": "workspace:^", - "@backstage/test-utils": "workspace:^", - "@testing-library/jest-dom": "^6.0.0", - "@testing-library/react": "^16.0.0" - }, - "peerDependencies": { - "react": "^16.13.1 || ^17.0.0 || ^18.0.0", - "react-router-dom": "6.0.0-beta.0 || ^6.3.0" - }, "configSchema": "config.d.ts" } diff --git a/packages/frontend-plugin-api/package.json b/packages/frontend-plugin-api/package.json index 0a64f9222c..3bcad42a9d 100644 --- a/packages/frontend-plugin-api/package.json +++ b/packages/frontend-plugin-api/package.json @@ -48,16 +48,18 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "history": "^5.3.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "history": "^5.3.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/packages/frontend-test-utils/package.json b/packages/frontend-test-utils/package.json index 0661c0df95..ab98e8d4e1 100644 --- a/packages/frontend-test-utils/package.json +++ b/packages/frontend-test-utils/package.json @@ -43,17 +43,19 @@ "devDependencies": { "@backstage/cli": "workspace:^", "@testing-library/jest-dom": "^6.0.0", - "@types/react": "^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@testing-library/react": "^16.0.0", "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/packages/integration-react/package.json b/packages/integration-react/package.json index c4e920cc91..98cf89bd24 100644 --- a/packages/integration-react/package.json +++ b/packages/integration-react/package.json @@ -47,17 +47,19 @@ "@testing-library/dom": "^10.0.0", "@testing-library/jest-dom": "^6.0.0", "@types/react": "^18.0.0", - "msw": "^1.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "msw": "^1.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 857652cb62..a99028fdf7 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -66,12 +66,9 @@ "@backstage/cli": "workspace:^", "@testing-library/jest-dom": "^6.0.0", "@types/react": "^18.0.0", - "msw": "^1.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "msw": "^1.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@testing-library/react": "^16.0.0", @@ -79,5 +76,10 @@ "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/packages/theme/package.json b/packages/theme/package.json index 6d46e96ec0..e875ad7963 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json @@ -45,17 +45,19 @@ "@mui/styles": "^5.14.18", "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", - "@types/react": "^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@material-ui/core": "^4.12.2", "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/packages/version-bridge/package.json b/packages/version-bridge/package.json index ce68394e6d..524b5545a0 100644 --- a/packages/version-bridge/package.json +++ b/packages/version-bridge/package.json @@ -39,17 +39,19 @@ "@backstage/cli": "workspace:^", "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", - "@types/react": "^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/api-docs-module-protoc-gen-doc/package.json b/plugins/api-docs-module-protoc-gen-doc/package.json index 260491d620..e5877f468c 100644 --- a/plugins/api-docs-module-protoc-gen-doc/package.json +++ b/plugins/api-docs-module-protoc-gen-doc/package.json @@ -42,17 +42,19 @@ "devDependencies": { "@backstage/cli": "workspace:^", "@testing-library/jest-dom": "^6.0.0", - "@types/react": "^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json index 5da52d0bb2..3597f9468e 100644 --- a/plugins/api-docs/package.json +++ b/plugins/api-docs/package.json @@ -85,17 +85,19 @@ "@testing-library/user-event": "^14.0.0", "@types/highlightjs": "^10.1.0", "@types/react": "^18.0.0", - "@types/swagger-ui-react": "^4.18.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "@types/swagger-ui-react": "^4.18.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/app-visualizer/package.json b/plugins/app-visualizer/package.json index 945b6e3e76..6d4fd47661 100644 --- a/plugins/app-visualizer/package.json +++ b/plugins/app-visualizer/package.json @@ -42,17 +42,19 @@ }, "devDependencies": { "@backstage/cli": "workspace:^", - "@types/react": "^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/auth-react/package.json b/plugins/auth-react/package.json index 17923097dc..58c3f58e5b 100644 --- a/plugins/auth-react/package.json +++ b/plugins/auth-react/package.json @@ -51,15 +51,17 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", - "msw": "^1.0.0" + "msw": "^1.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" + }, + "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react": "^16.13.1 || ^17.0.0 || ^18.0.0" }, "peerDependenciesMeta": { "@types/react": { "optional": true } - }, - "peerDependencies": { - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", - "react": "^16.13.1 || ^17.0.0 || ^18.0.0" } } diff --git a/plugins/catalog-graph/package.json b/plugins/catalog-graph/package.json index 2d26a57ab6..4f2161141f 100644 --- a/plugins/catalog-graph/package.json +++ b/plugins/catalog-graph/package.json @@ -76,17 +76,19 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", - "@types/react": "^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json index bf0630b989..ca3175a46b 100644 --- a/plugins/catalog-import/package.json +++ b/plugins/catalog-import/package.json @@ -88,12 +88,9 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", - "msw": "^1.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "msw": "^1.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", @@ -101,5 +98,10 @@ "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "configSchema": "config.d.ts" } diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json index 330c3ad191..eed14b2589 100644 --- a/plugins/catalog-react/package.json +++ b/plugins/catalog-react/package.json @@ -82,17 +82,6 @@ "yaml": "^2.0.0", "zen-observable": "^0.10.0" }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - }, - "peerDependencies": { - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", - "react": "^16.13.1 || ^17.0.0 || ^18.0.0", - "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", - "react-router-dom": "6.0.0-beta.0 || ^6.3.0" - }, "devDependencies": { "@backstage/cli": "workspace:^", "@backstage/core-app-api": "workspace:^", @@ -106,6 +95,19 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "@types/zen-observable": "^0.8.0", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-test-renderer": "^16.13.1" + }, + "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/catalog-unprocessed-entities/package.json b/plugins/catalog-unprocessed-entities/package.json index c019eee3fa..64f4441cb9 100644 --- a/plugins/catalog-unprocessed-entities/package.json +++ b/plugins/catalog-unprocessed-entities/package.json @@ -52,17 +52,19 @@ "@backstage/dev-utils": "workspace:^", "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", - "@types/react": "^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json index ffd0480f29..1247d14ca3 100644 --- a/plugins/catalog/package.json +++ b/plugins/catalog/package.json @@ -98,18 +98,20 @@ "@testing-library/user-event": "^14.0.0", "@types/pluralize": "^0.0.33", "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0", "swr": "^2.2.5" }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "configSchema": "config.d.ts" } diff --git a/plugins/config-schema/package.json b/plugins/config-schema/package.json index 28e294ab3d..a7ddec3885 100644 --- a/plugins/config-schema/package.json +++ b/plugins/config-schema/package.json @@ -54,17 +54,19 @@ "@testing-library/dom": "^10.0.0", "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", - "@types/react": "^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/devtools/package.json b/plugins/devtools/package.json index ee42a2943c..e20cda27eb 100644 --- a/plugins/devtools/package.json +++ b/plugins/devtools/package.json @@ -64,10 +64,13 @@ "react-json-view": "^1.21.3", "react-use": "^17.2.4" }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "devDependencies": { + "@backstage/cli": "workspace:^", + "@backstage/dev-utils": "workspace:^", + "@testing-library/jest-dom": "^6.0.0", + "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", @@ -75,10 +78,9 @@ "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" }, - "devDependencies": { - "@backstage/cli": "workspace:^", - "@backstage/dev-utils": "workspace:^", - "@testing-library/jest-dom": "^6.0.0", - "@types/react": "^18.0.0" + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/example-todo-list/package.json b/plugins/example-todo-list/package.json index f24678ad0b..1190b29363 100644 --- a/plugins/example-todo-list/package.json +++ b/plugins/example-todo-list/package.json @@ -50,17 +50,19 @@ "@testing-library/dom": "^10.0.0", "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", - "@types/react": "^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/home-react/package.json b/plugins/home-react/package.json index 16b806e172..1389386075 100644 --- a/plugins/home-react/package.json +++ b/plugins/home-react/package.json @@ -51,17 +51,19 @@ "devDependencies": { "@backstage/cli": "workspace:^", "@types/react": "^18.0.0", - "@types/react-grid-layout": "^1.3.2" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "@types/react-grid-layout": "^1.3.2", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/home/package.json b/plugins/home/package.json index f850720745..8a57f31bbe 100644 --- a/plugins/home/package.json +++ b/plugins/home/package.json @@ -90,12 +90,9 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", - "@types/react-grid-layout": "^1.3.2" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "@types/react-grid-layout": "^1.3.2", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", @@ -103,5 +100,10 @@ "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "configSchema": "config.d.ts" } diff --git a/plugins/kubernetes-cluster/package.json b/plugins/kubernetes-cluster/package.json index 405231899b..d7054f33a7 100644 --- a/plugins/kubernetes-cluster/package.json +++ b/plugins/kubernetes-cluster/package.json @@ -65,17 +65,19 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/node": "^16.11.26", - "@types/react": "^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/kubernetes-react/package.json b/plugins/kubernetes-react/package.json index 7c5217424d..6231807ceb 100644 --- a/plugins/kubernetes-react/package.json +++ b/plugins/kubernetes-react/package.json @@ -63,15 +63,6 @@ "xterm-addon-attach": "^0.9.0", "xterm-addon-fit": "^0.8.0" }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - }, - "peerDependencies": { - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", - "react": "^16.13.1 || ^17.0.0 || ^18.0.0" - }, "devDependencies": { "@backstage/cli": "workspace:^", "@backstage/core-app-api": "workspace:^", @@ -80,7 +71,18 @@ "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", "jest-websocket-mock": "^2.5.0", - "msw": "^1.3.1" + "msw": "^1.3.1", + "react": "^18.0.0", + "react-dom": "^18.0.0" + }, + "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react": "^16.13.1 || ^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } }, "configSchema": "config.d.ts" } diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json index f24b695964..fb653cbc62 100644 --- a/plugins/kubernetes/package.json +++ b/plugins/kubernetes/package.json @@ -79,24 +79,27 @@ "xterm-addon-attach": "^0.9.0", "xterm-addon-fit": "^0.8.0" }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - }, "devDependencies": { "@backstage/cli": "workspace:^", "@backstage/dev-utils": "workspace:^", "@backstage/test-utils": "workspace:^", "@testing-library/dom": "^10.0.0", "@testing-library/jest-dom": "^6.0.0", - "@testing-library/react": "^16.0.0" + "@testing-library/react": "^16.0.0", + "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0", "@testing-library/react": "^16.0.0", - "@types/react": "^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/notifications/package.json b/plugins/notifications/package.json index b96f06c3a1..e3acc0d667 100644 --- a/plugins/notifications/package.json +++ b/plugins/notifications/package.json @@ -64,16 +64,18 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", - "msw": "^1.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "msw": "^1.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/org-react/package.json b/plugins/org-react/package.json index 376b3b9784..3685e78ff8 100644 --- a/plugins/org-react/package.json +++ b/plugins/org-react/package.json @@ -58,17 +58,19 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", - "@types/react": "^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/org/package.json b/plugins/org/package.json index 22e1dca1a2..a02533a455 100644 --- a/plugins/org/package.json +++ b/plugins/org/package.json @@ -81,17 +81,19 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", - "@types/react": "^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/permission-react/package.json b/plugins/permission-react/package.json index 29ebe15125..3dbed0beaa 100644 --- a/plugins/permission-react/package.json +++ b/plugins/permission-react/package.json @@ -52,17 +52,19 @@ "@backstage/test-utils": "workspace:^", "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", - "@types/react": "^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/scaffolder-react/package.json b/plugins/scaffolder-react/package.json index 50e37f36a2..ed1a587100 100644 --- a/plugins/scaffolder-react/package.json +++ b/plugins/scaffolder-react/package.json @@ -107,17 +107,19 @@ "@types/humanize-duration": "^3.18.1", "@types/luxon": "^3.0.0", "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0", "swr": "^2.0.0" }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json index cd7616ea43..e708cd6f89 100644 --- a/plugins/scaffolder/package.json +++ b/plugins/scaffolder/package.json @@ -121,17 +121,19 @@ "@types/react-window": "^1.8.8", "@types/react": "^18.0.0", "msw": "^1.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0", "swr": "^2.0.0" }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/search-react/package.json b/plugins/search-react/package.json index 5b8d478320..b5bd4f2b27 100644 --- a/plugins/search-react/package.json +++ b/plugins/search-react/package.json @@ -80,17 +80,19 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", - "@types/react": "^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/search/package.json b/plugins/search/package.json index ce733d7a8b..f7516ccee0 100644 --- a/plugins/search/package.json +++ b/plugins/search/package.json @@ -83,12 +83,9 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", - "history": "^5.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "history": "^5.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", @@ -96,5 +93,10 @@ "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "configSchema": "config.d.ts" } diff --git a/plugins/techdocs-addons-test-utils/package.json b/plugins/techdocs-addons-test-utils/package.json index 986cbf0d55..14693e104e 100644 --- a/plugins/techdocs-addons-test-utils/package.json +++ b/plugins/techdocs-addons-test-utils/package.json @@ -55,12 +55,9 @@ "@backstage/cli": "workspace:^", "@testing-library/dom": "^10.0.0", "@testing-library/jest-dom": "^6.0.0", - "@types/react": "^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@testing-library/react": "^16.0.0", @@ -68,5 +65,10 @@ "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/techdocs-module-addons-contrib/package.json b/plugins/techdocs-module-addons-contrib/package.json index 4551e95c2b..b2fb21e930 100644 --- a/plugins/techdocs-module-addons-contrib/package.json +++ b/plugins/techdocs-module-addons-contrib/package.json @@ -57,17 +57,19 @@ "@testing-library/dom": "^10.0.0", "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", - "@types/react": "^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/techdocs-react/package.json b/plugins/techdocs-react/package.json index af5e0c7377..7e28a64e9d 100644 --- a/plugins/techdocs-react/package.json +++ b/plugins/techdocs-react/package.json @@ -63,17 +63,19 @@ "@backstage/theme": "workspace:^", "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", - "@types/react": "^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json index bde33b3c1e..365cae46ad 100644 --- a/plugins/techdocs/package.json +++ b/plugins/techdocs/package.json @@ -100,12 +100,9 @@ "@types/dompurify": "^3.0.0", "@types/event-source-polyfill": "^1.0.0", "@types/react": "^18.0.0", - "canvas": "^2.10.2" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "canvas": "^2.10.2", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", @@ -113,5 +110,10 @@ "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "configSchema": "config.d.ts" } diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json index beab130693..1b7797c03c 100644 --- a/plugins/user-settings/package.json +++ b/plugins/user-settings/package.json @@ -82,12 +82,9 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", - "msw": "^1.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } + "msw": "^1.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", @@ -95,6 +92,11 @@ "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + }, "configSchema": { "$schema": "https://backstage.io/schema/config-v1", "title": "@backstage/user-settings", From 6bc061b0ff5507a0053c2e7e1a14a592e4b81b4b Mon Sep 17 00:00:00 2001 From: aramissennyeydd Date: Tue, 18 Jun 2024 23:22:11 -0400 Subject: [PATCH 09/21] skip react in type dep check Signed-off-by: aramissennyeydd --- packages/repo-tools/src/commands/type-deps/type-deps.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/repo-tools/src/commands/type-deps/type-deps.ts b/packages/repo-tools/src/commands/type-deps/type-deps.ts index 7b75ac37ee..877228a238 100644 --- a/packages/repo-tools/src/commands/type-deps/type-deps.ts +++ b/packages/repo-tools/src/commands/type-deps/type-deps.ts @@ -202,6 +202,14 @@ function findTypeDepErrors(typeDeps: string[], pkg: Package) { } for (const dep of deps) { + // Allow implicit declarations of these dependencies. For some packages, they may + // not be declared as a `reference types="..."` or `import ... from '@types/...' + // in the declaration file. + // Example being app-visualizer, it exports a plugin which comes from `@backstage/frontend-plugin-api`, + // the react types come from that package, but are not explicitly declared in the declaration file. + if (['@types/react'].includes(dep)) { + continue; + } errors.push( mkErr('WrongDepError', `Should be dev dep ${dep}`, { dep, From 264f5379776c36570f2a1485d532d11b38bd2406 Mon Sep 17 00:00:00 2001 From: aramissennyeydd Date: Wed, 19 Jun 2024 00:11:02 -0400 Subject: [PATCH 10/21] add linting for peer deps Signed-off-by: aramissennyeydd --- .github/workflows/ci.yml | 3 + package.json | 1 + packages/app-defaults/package.json | 3 +- packages/app-next-example-plugin/package.json | 12 +- packages/core-app-api/package.json | 7 +- packages/core-compat-api/package.json | 6 +- packages/core-components/package.json | 3 +- packages/core-plugin-api/package.json | 3 +- packages/dev-utils/package.json | 1 + packages/frontend-app-api/package.json | 9 +- packages/frontend-plugin-api/package.json | 4 +- packages/frontend-test-utils/package.json | 4 +- packages/integration-react/package.json | 3 +- packages/repo-tools/src/commands/index.ts | 8 + .../src/commands/peer-deps/peer-deps.ts | 203 ++++++++ packages/test-utils/package.json | 3 +- packages/theme/package.json | 6 +- packages/version-bridge/package.json | 3 +- .../package.json | 3 +- plugins/api-docs/package.json | 3 +- plugins/app-visualizer/package.json | 3 +- plugins/auth-react/package.json | 7 +- plugins/catalog-graph/package.json | 3 +- plugins/catalog-import/package.json | 3 +- plugins/catalog-react/package.json | 1 + .../catalog-unprocessed-entities/package.json | 3 +- plugins/catalog/package.json | 1 + plugins/config-schema/package.json | 3 +- plugins/devtools/package.json | 3 +- plugins/example-todo-list/package.json | 3 +- plugins/home-react/package.json | 3 +- plugins/home/package.json | 3 +- plugins/kubernetes-cluster/package.json | 3 +- plugins/kubernetes-react/package.json | 7 +- plugins/kubernetes/package.json | 7 +- plugins/notifications/package.json | 6 +- plugins/org-react/package.json | 3 +- plugins/org/package.json | 3 +- plugins/permission-react/package.json | 3 +- plugins/scaffolder-react/package.json | 1 + plugins/scaffolder/package.json | 3 +- plugins/search-react/package.json | 3 +- plugins/search/package.json | 3 +- plugins/signals-react/package.json | 16 +- plugins/signals/package.json | 16 +- .../techdocs-addons-test-utils/package.json | 3 +- .../package.json | 3 +- plugins/techdocs-react/package.json | 3 +- plugins/techdocs/package.json | 3 +- plugins/user-settings/package.json | 3 +- yarn.lock | 470 ++++++++++++++++-- 51 files changed, 774 insertions(+), 109 deletions(-) create mode 100644 packages/repo-tools/src/commands/peer-deps/peer-deps.ts diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 18a401d479..2a94c6f857 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,6 +90,9 @@ jobs: - name: verify local dependency ranges run: node scripts/verify-local-dependencies.js + - name: verify peer dependency ranges + run: yarn lint:peer-deps + - name: check for missing repo fixes run: yarn fix --check diff --git a/package.json b/package.json index 72f7113331..a00c7fd721 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "lint": "backstage-cli repo lint --since origin/master", "lint:all": "backstage-cli repo lint", "lint:docs": "node ./scripts/check-docs-quality", + "lint:peer-deps": "backstage-repo-tools peer-deps", "lint:type-deps": "backstage-repo-tools type-deps", "new": "backstage-cli new --scope backstage --baseVersion 0.0.0 --no-private", "prepare": "husky", diff --git a/packages/app-defaults/package.json b/packages/app-defaults/package.json index 0dabc3d3e9..5865cb3f43 100644 --- a/packages/app-defaults/package.json +++ b/packages/app-defaults/package.json @@ -51,7 +51,8 @@ "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/packages/app-next-example-plugin/package.json b/packages/app-next-example-plugin/package.json index 4f3342c100..dc477e31ec 100644 --- a/packages/app-next-example-plugin/package.json +++ b/packages/app-next-example-plugin/package.json @@ -47,12 +47,22 @@ }, "devDependencies": { "@backstage/cli": "workspace:^", + "@types/react": "^18.0.0", "cross-fetch": "^4.0.0", - "msw": "^1.0.0" + "msw": "^1.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/packages/core-app-api/package.json b/packages/core-app-api/package.json index c1adf50cd9..d1c9f0a053 100644 --- a/packages/core-app-api/package.json +++ b/packages/core-app-api/package.json @@ -51,13 +51,10 @@ "@backstage/types": "workspace:^", "@backstage/version-bridge": "workspace:^", "@types/prop-types": "^15.7.3", - "@types/react": "^18.0.0", "history": "^5.0.0", "i18next": "^22.4.15", "lodash": "^4.17.21", "prop-types": "^15.7.2", - "react": "^18.0.0", - "react-dom": "^18.0.0", "react-use": "^17.2.4", "zen-observable": "^0.10.0", "zod": "^3.22.4" @@ -70,9 +67,13 @@ "@testing-library/react": "^16.0.0", "@testing-library/react-hooks": "^8.0.0", "@testing-library/user-event": "^14.0.0", + "@types/react": "^18.0.0", "@types/zen-observable": "^0.8.0", "msw": "^1.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-beta": "npm:react-router@6.0.0-beta.0", + "react-router-dom": "^6.3.0", "react-router-dom-beta": "npm:react-router-dom@6.0.0-beta.0", "react-router-dom-stable": "npm:react-router-dom@^6.3.0", "react-router-stable": "npm:react-router@^6.3.0" diff --git a/packages/core-compat-api/package.json b/packages/core-compat-api/package.json index d782afcc5d..d7f4848c4a 100644 --- a/packages/core-compat-api/package.json +++ b/packages/core-compat-api/package.json @@ -48,14 +48,16 @@ "@oriflame/backstage-plugin-score-card": "^0.8.0", "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", - "zod": "^3.22.4", "@types/react": "^18.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0", + "zod": "^3.22.4" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" }, "peerDependenciesMeta": { diff --git a/packages/core-components/package.json b/packages/core-components/package.json index 407e7e791a..fc9ebc30e5 100644 --- a/packages/core-components/package.json +++ b/packages/core-components/package.json @@ -117,7 +117,8 @@ "history": "^5.0.0", "msw": "^1.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/packages/core-plugin-api/package.json b/packages/core-plugin-api/package.json index 4c51f60555..e9e46a8064 100644 --- a/packages/core-plugin-api/package.json +++ b/packages/core-plugin-api/package.json @@ -65,7 +65,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 5ca2e55a36..d8fa50b1ee 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -58,6 +58,7 @@ "@types/react": "^18.0.0", "react": "^18.0.0", "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0", "zen-observable": "^0.10.0" }, "peerDependencies": { diff --git a/packages/frontend-app-api/package.json b/packages/frontend-app-api/package.json index 23639e0af7..26473d0dea 100644 --- a/packages/frontend-app-api/package.json +++ b/packages/frontend-app-api/package.json @@ -40,11 +40,11 @@ "@backstage/frontend-plugin-api": "workspace:^", "@backstage/types": "workspace:^", "@backstage/version-bridge": "workspace:^", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", - "zod": "^3.22.4", "@material-ui/core": "^4.12.4", "@material-ui/icons": "^4.11.3", - "lodash": "^4.17.21" + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "lodash": "^4.17.21", + "zod": "^3.22.4" }, "devDependencies": { "@backstage/cli": "workspace:^", @@ -53,7 +53,8 @@ "@testing-library/react": "^15.0.0", "@types/react": "^18.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/packages/frontend-plugin-api/package.json b/packages/frontend-plugin-api/package.json index 3bcad42a9d..43509a6132 100644 --- a/packages/frontend-plugin-api/package.json +++ b/packages/frontend-plugin-api/package.json @@ -50,11 +50,13 @@ "@types/react": "^18.0.0", "history": "^5.3.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" }, "peerDependenciesMeta": { diff --git a/packages/frontend-test-utils/package.json b/packages/frontend-test-utils/package.json index ab98e8d4e1..7ebf1eb4f0 100644 --- a/packages/frontend-test-utils/package.json +++ b/packages/frontend-test-utils/package.json @@ -45,12 +45,14 @@ "@testing-library/jest-dom": "^6.0.0", "@types/react": "^18.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@testing-library/react": "^16.0.0", "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" }, "peerDependenciesMeta": { diff --git a/packages/integration-react/package.json b/packages/integration-react/package.json index 98cf89bd24..f426ec4a01 100644 --- a/packages/integration-react/package.json +++ b/packages/integration-react/package.json @@ -49,7 +49,8 @@ "@types/react": "^18.0.0", "msw": "^1.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/packages/repo-tools/src/commands/index.ts b/packages/repo-tools/src/commands/index.ts index 5116326eea..5a69a74ff3 100644 --- a/packages/repo-tools/src/commands/index.ts +++ b/packages/repo-tools/src/commands/index.ts @@ -224,6 +224,14 @@ export function registerCommands(program: Command) { .description('Find inconsistencies in types of all packages and plugins') .action(lazy(() => import('./type-deps/type-deps').then(m => m.default))); + program + .command('peer-deps') + .description( + 'Ensure your packages are using the correct peer dependency format.', + ) + .option('--fix', 'Fix the issues found') + .action(lazy(() => import('./peer-deps/peer-deps').then(m => m.default))); + program .command('generate-catalog-info') .option( diff --git a/packages/repo-tools/src/commands/peer-deps/peer-deps.ts b/packages/repo-tools/src/commands/peer-deps/peer-deps.ts new file mode 100644 index 0000000000..9544b3b457 --- /dev/null +++ b/packages/repo-tools/src/commands/peer-deps/peer-deps.ts @@ -0,0 +1,203 @@ +/* + * Copyright 2024 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { resolve as resolvePath } from 'path'; +import { getPackages, Package } from '@manypkg/get-packages'; +import { writeFileSync } from 'fs'; + +type ExtendedPackageJSON = Package['packageJson'] & { + peerDependenciesMeta?: Record; + backstage?: { + role: string; + }; +}; + +const desiredLocalVersionsOfDependencies = { + '@types/react': '^18.0.0', + react: '^18.0.0', + 'react-dom': '^18.0.0', + 'react-router-dom': '^6.3.0', +}; + +const peerDependencies = { + '@types/react': '^16.13.1 || ^17.0.0 || ^18.0.0', + react: '^16.13.1 || ^17.0.0 || ^18.0.0', + 'react-dom': '^16.13.1 || ^17.0.0 || ^18.0.0', + 'react-router-dom': '6.0.0-beta.0 || ^6.3.0', +}; + +const groupsOfPeerDependencies = [['@types/react', 'react', 'react-dom']]; + +const optionalPeerDependencies = new Set(['@types/react']); + +const isOptional = (dep: string) => { + return optionalPeerDependencies.has(dep); +}; + +const isMarkedAsOptional = (dep: string, packageJson: ExtendedPackageJSON) => { + return packageJson.peerDependenciesMeta?.[dep]?.optional; +}; + +const isDevDependency = (dep: string, packageJson: ExtendedPackageJSON) => { + return !!packageJson.devDependencies?.[dep]; +}; + +const isPeerDependency = (dep: string, packageJson: ExtendedPackageJSON) => { + return !!packageJson.peerDependencies?.[dep]; +}; + +const isStandaloneApplication = (packageJson: ExtendedPackageJSON) => { + return ['cli', 'frontend', 'backend'].includes( + packageJson.backstage?.role || '', + ); +}; + +const matchesPeerDependency = ( + dep: string, + packageJson: ExtendedPackageJSON, +) => { + return ( + packageJson.peerDependencies && + packageJson.peerDependencies[dep] === + peerDependencies[dep as keyof typeof peerDependencies] + ); +}; + +export default async ({ fix }: { fix: boolean }) => { + let failed = false; + const attemptToApplyFix = (fn: () => void) => { + if (fix) { + fn(); + } else { + failed = true; + } + }; + const { packages } = await getPackages(resolvePath('.')); + + const packagesWithRelevantDependencies = []; + + for (const pkg of packages) { + if (isStandaloneApplication(pkg.packageJson as ExtendedPackageJSON)) { + // Standalone applications are not expected to have peer dependencies. + continue; + } + + const dependencies = { + ...pkg.packageJson.dependencies, + ...pkg.packageJson.devDependencies, + ...pkg.packageJson.peerDependencies, + }; + for (const dep in peerDependencies) { + // Check against all packages that use dependencies that are in the peerDependencies list. + if (dependencies?.[dep]) { + packagesWithRelevantDependencies.push(pkg); + break; + } + } + } + + for (const pkg of packagesWithRelevantDependencies) { + const packageJson = pkg.packageJson as ExtendedPackageJSON; + for (const dep of Object.keys(peerDependencies)) { + // Validate that the peer dependencies are present. + if (isPeerDependency(dep, packageJson)) { + if (isOptional(dep) && !isMarkedAsOptional(dep, packageJson)) { + console.error( + `Optional peer dependency ${dep} in ${pkg.packageJson.name} is not marked as optional`, + ); + attemptToApplyFix(() => { + packageJson.peerDependenciesMeta = + packageJson.peerDependenciesMeta || {}; + packageJson.peerDependenciesMeta[dep] = { optional: true }; + }); + } else if (!isOptional(dep) && isMarkedAsOptional(dep, packageJson)) { + console.error( + `Peer dependency ${dep} in ${pkg.packageJson.name} is marked as optional but should not be`, + ); + attemptToApplyFix(() => { + packageJson.peerDependenciesMeta = + packageJson.peerDependenciesMeta || {}; + delete packageJson.peerDependenciesMeta[dep]; + }); + } + if (!isDevDependency(dep, packageJson)) { + console.error( + `Peer dependency ${dep} in ${pkg.packageJson.name} is not listed as a devDependency`, + ); + attemptToApplyFix(() => { + packageJson.devDependencies = packageJson.devDependencies || {}; + packageJson.devDependencies[dep] = + desiredLocalVersionsOfDependencies[ + dep as keyof typeof desiredLocalVersionsOfDependencies + ]; + }); + } + + const groups = groupsOfPeerDependencies.filter(group => + group.includes(dep), + ); + if (groups.length) { + for (const group of groups) { + for (const groupDep of group) { + if (!isPeerDependency(groupDep, packageJson)) { + console.error( + `Peer dependency ${groupDep} in ${pkg.packageJson.name} is missing`, + ); + attemptToApplyFix(() => { + packageJson.peerDependencies = + packageJson.peerDependencies || {}; + packageJson.peerDependencies[groupDep] = + peerDependencies[groupDep as keyof typeof peerDependencies]; + }); + } + } + } + } + + if (!matchesPeerDependency(dep, packageJson)) { + console.error( + `Incorrect peer dependency ${dep} in ${pkg.packageJson.name}`, + ); + attemptToApplyFix(() => { + packageJson.peerDependencies = packageJson.peerDependencies || {}; + packageJson.peerDependencies[dep] = + peerDependencies[dep as keyof typeof peerDependencies]; + }); + } + } else { + console.error( + `Missing peer dependency ${dep} in ${pkg.packageJson.name}`, + ); + attemptToApplyFix(() => { + packageJson.peerDependencies = packageJson.peerDependencies || {}; + packageJson.peerDependencies[dep] = + peerDependencies[dep as keyof typeof peerDependencies]; + }); + } + } + if (fix) { + writeFileSync( + resolvePath(pkg.dir, 'package.json'), + JSON.stringify(packageJson, null, 4), + ); + } + } + + if (failed) { + console.error('Some packages have incorrect peer dependencies'); + process.exit(1); + } +}; diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index a99028fdf7..dc2713ff09 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -68,7 +68,8 @@ "@types/react": "^18.0.0", "msw": "^1.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@testing-library/react": "^16.0.0", diff --git a/packages/theme/package.json b/packages/theme/package.json index e875ad7963..435f517326 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json @@ -47,13 +47,15 @@ "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@material-ui/core": "^4.12.2", "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", - "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0" + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-router-dom": "6.0.0-beta.0 || ^6.3.0" }, "peerDependenciesMeta": { "@types/react": { diff --git a/packages/version-bridge/package.json b/packages/version-bridge/package.json index 524b5545a0..50a5883b15 100644 --- a/packages/version-bridge/package.json +++ b/packages/version-bridge/package.json @@ -41,7 +41,8 @@ "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/plugins/api-docs-module-protoc-gen-doc/package.json b/plugins/api-docs-module-protoc-gen-doc/package.json index e5877f468c..f41fe2f9fb 100644 --- a/plugins/api-docs-module-protoc-gen-doc/package.json +++ b/plugins/api-docs-module-protoc-gen-doc/package.json @@ -44,7 +44,8 @@ "@testing-library/jest-dom": "^6.0.0", "@types/react": "^18.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json index 3597f9468e..f9888ed99c 100644 --- a/plugins/api-docs/package.json +++ b/plugins/api-docs/package.json @@ -87,7 +87,8 @@ "@types/react": "^18.0.0", "@types/swagger-ui-react": "^4.18.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/plugins/app-visualizer/package.json b/plugins/app-visualizer/package.json index 6d4fd47661..53720d560a 100644 --- a/plugins/app-visualizer/package.json +++ b/plugins/app-visualizer/package.json @@ -44,7 +44,8 @@ "@backstage/cli": "workspace:^", "@types/react": "^18.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/plugins/auth-react/package.json b/plugins/auth-react/package.json index 58c3f58e5b..995d9adecf 100644 --- a/plugins/auth-react/package.json +++ b/plugins/auth-react/package.json @@ -53,11 +53,14 @@ "@types/react": "^18.0.0", "msw": "^1.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", - "react": "^16.13.1 || ^17.0.0 || ^18.0.0" + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-router-dom": "6.0.0-beta.0 || ^6.3.0" }, "peerDependenciesMeta": { "@types/react": { diff --git a/plugins/catalog-graph/package.json b/plugins/catalog-graph/package.json index 4f2161141f..e6e4b5651d 100644 --- a/plugins/catalog-graph/package.json +++ b/plugins/catalog-graph/package.json @@ -78,7 +78,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json index ca3175a46b..1dbfac3179 100644 --- a/plugins/catalog-import/package.json +++ b/plugins/catalog-import/package.json @@ -90,7 +90,8 @@ "@types/react": "^18.0.0", "msw": "^1.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json index eed14b2589..5d8d0e7da6 100644 --- a/plugins/catalog-react/package.json +++ b/plugins/catalog-react/package.json @@ -97,6 +97,7 @@ "@types/zen-observable": "^0.8.0", "react": "^18.0.0", "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0", "react-test-renderer": "^16.13.1" }, "peerDependencies": { diff --git a/plugins/catalog-unprocessed-entities/package.json b/plugins/catalog-unprocessed-entities/package.json index 64f4441cb9..a0e652bc03 100644 --- a/plugins/catalog-unprocessed-entities/package.json +++ b/plugins/catalog-unprocessed-entities/package.json @@ -54,7 +54,8 @@ "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json index 1247d14ca3..2b8e0484b7 100644 --- a/plugins/catalog/package.json +++ b/plugins/catalog/package.json @@ -100,6 +100,7 @@ "@types/react": "^18.0.0", "react": "^18.0.0", "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0", "swr": "^2.2.5" }, "peerDependencies": { diff --git a/plugins/config-schema/package.json b/plugins/config-schema/package.json index a7ddec3885..643f7ac765 100644 --- a/plugins/config-schema/package.json +++ b/plugins/config-schema/package.json @@ -56,7 +56,8 @@ "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/plugins/devtools/package.json b/plugins/devtools/package.json index e20cda27eb..62a838f8fa 100644 --- a/plugins/devtools/package.json +++ b/plugins/devtools/package.json @@ -70,7 +70,8 @@ "@testing-library/jest-dom": "^6.0.0", "@types/react": "^18.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/plugins/example-todo-list/package.json b/plugins/example-todo-list/package.json index 1190b29363..4776fc2553 100644 --- a/plugins/example-todo-list/package.json +++ b/plugins/example-todo-list/package.json @@ -52,7 +52,8 @@ "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/plugins/home-react/package.json b/plugins/home-react/package.json index 1389386075..0a3edf65d4 100644 --- a/plugins/home-react/package.json +++ b/plugins/home-react/package.json @@ -53,7 +53,8 @@ "@types/react": "^18.0.0", "@types/react-grid-layout": "^1.3.2", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/plugins/home/package.json b/plugins/home/package.json index 8a57f31bbe..8dc5bc3b68 100644 --- a/plugins/home/package.json +++ b/plugins/home/package.json @@ -92,7 +92,8 @@ "@types/react": "^18.0.0", "@types/react-grid-layout": "^1.3.2", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/plugins/kubernetes-cluster/package.json b/plugins/kubernetes-cluster/package.json index d7054f33a7..21087fd0b7 100644 --- a/plugins/kubernetes-cluster/package.json +++ b/plugins/kubernetes-cluster/package.json @@ -67,7 +67,8 @@ "@types/node": "^16.11.26", "@types/react": "^18.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/plugins/kubernetes-react/package.json b/plugins/kubernetes-react/package.json index 6231807ceb..879507fbe4 100644 --- a/plugins/kubernetes-react/package.json +++ b/plugins/kubernetes-react/package.json @@ -73,11 +73,14 @@ "jest-websocket-mock": "^2.5.0", "msw": "^1.3.1", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", - "react": "^16.13.1 || ^17.0.0 || ^18.0.0" + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-router-dom": "6.0.0-beta.0 || ^6.3.0" }, "peerDependenciesMeta": { "@types/react": { diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json index fb653cbc62..940054aa65 100644 --- a/plugins/kubernetes/package.json +++ b/plugins/kubernetes/package.json @@ -88,14 +88,15 @@ "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { + "@testing-library/react": "^16.0.0", "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", - "react-router-dom": "6.0.0-beta.0 || ^6.3.0", - "@testing-library/react": "^16.0.0", + "react-router-dom": "6.0.0-beta.0 || ^6.3.0" }, "peerDependenciesMeta": { "@types/react": { diff --git a/plugins/notifications/package.json b/plugins/notifications/package.json index e3acc0d667..aafdf2476e 100644 --- a/plugins/notifications/package.json +++ b/plugins/notifications/package.json @@ -66,11 +66,13 @@ "@types/react": "^18.0.0", "msw": "^1.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", - "react": "^16.13.1 || ^17.0.0", + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" }, "peerDependenciesMeta": { diff --git a/plugins/org-react/package.json b/plugins/org-react/package.json index 3685e78ff8..e31864e158 100644 --- a/plugins/org-react/package.json +++ b/plugins/org-react/package.json @@ -60,7 +60,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/plugins/org/package.json b/plugins/org/package.json index a02533a455..cae8a2d11a 100644 --- a/plugins/org/package.json +++ b/plugins/org/package.json @@ -83,7 +83,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/plugins/permission-react/package.json b/plugins/permission-react/package.json index 3dbed0beaa..65732d8c89 100644 --- a/plugins/permission-react/package.json +++ b/plugins/permission-react/package.json @@ -54,7 +54,8 @@ "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/plugins/scaffolder-react/package.json b/plugins/scaffolder-react/package.json index ed1a587100..f3e8eccdbb 100644 --- a/plugins/scaffolder-react/package.json +++ b/plugins/scaffolder-react/package.json @@ -109,6 +109,7 @@ "@types/react": "^18.0.0", "react": "^18.0.0", "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0", "swr": "^2.0.0" }, "peerDependencies": { diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json index e708cd6f89..e69cf0e223 100644 --- a/plugins/scaffolder/package.json +++ b/plugins/scaffolder/package.json @@ -117,12 +117,13 @@ "@testing-library/user-event": "^14.0.0", "@types/humanize-duration": "^3.18.1", "@types/json-schema": "^7.0.9", + "@types/react": "^18.0.0", "@types/react-resizable": "^3.0.8", "@types/react-window": "^1.8.8", - "@types/react": "^18.0.0", "msw": "^1.0.0", "react": "^18.0.0", "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0", "swr": "^2.0.0" }, "peerDependencies": { diff --git a/plugins/search-react/package.json b/plugins/search-react/package.json index b5bd4f2b27..6df72cee7d 100644 --- a/plugins/search-react/package.json +++ b/plugins/search-react/package.json @@ -82,7 +82,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/plugins/search/package.json b/plugins/search/package.json index f7516ccee0..dba2742ca2 100644 --- a/plugins/search/package.json +++ b/plugins/search/package.json @@ -85,7 +85,8 @@ "@types/react": "^18.0.0", "history": "^5.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/plugins/signals-react/package.json b/plugins/signals-react/package.json index 96a54b3fed..dad70cff02 100644 --- a/plugins/signals-react/package.json +++ b/plugins/signals-react/package.json @@ -47,9 +47,21 @@ "@backstage/cli": "workspace:^", "@backstage/test-utils": "workspace:^", "@testing-library/jest-dom": "^6.0.0", - "@testing-library/react": "^16.0.0" + "@testing-library/react": "^16.0.0", + "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { - "react": "^16.13.1 || ^17.0.0" + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/signals/package.json b/plugins/signals/package.json index 471aecc4eb..f87647d356 100644 --- a/plugins/signals/package.json +++ b/plugins/signals/package.json @@ -57,10 +57,22 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", + "@types/react": "^18.0.0", "jest-websocket-mock": "^2.5.0", - "msw": "^1.0.0" + "msw": "^1.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { - "react": "^16.13.1 || ^17.0.0" + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/techdocs-addons-test-utils/package.json b/plugins/techdocs-addons-test-utils/package.json index 14693e104e..4984bbdced 100644 --- a/plugins/techdocs-addons-test-utils/package.json +++ b/plugins/techdocs-addons-test-utils/package.json @@ -57,7 +57,8 @@ "@testing-library/jest-dom": "^6.0.0", "@types/react": "^18.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@testing-library/react": "^16.0.0", diff --git a/plugins/techdocs-module-addons-contrib/package.json b/plugins/techdocs-module-addons-contrib/package.json index b2fb21e930..59976dde8c 100644 --- a/plugins/techdocs-module-addons-contrib/package.json +++ b/plugins/techdocs-module-addons-contrib/package.json @@ -59,7 +59,8 @@ "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/plugins/techdocs-react/package.json b/plugins/techdocs-react/package.json index 7e28a64e9d..73cab1645e 100644 --- a/plugins/techdocs-react/package.json +++ b/plugins/techdocs-react/package.json @@ -65,7 +65,8 @@ "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json index 365cae46ad..dec637779c 100644 --- a/plugins/techdocs/package.json +++ b/plugins/techdocs/package.json @@ -102,7 +102,8 @@ "@types/react": "^18.0.0", "canvas": "^2.10.2", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json index 1b7797c03c..ee79710815 100644 --- a/plugins/user-settings/package.json +++ b/plugins/user-settings/package.json @@ -84,7 +84,8 @@ "@types/react": "^18.0.0", "msw": "^1.0.0", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/yarn.lock b/yarn.lock index 57d2d1539c..f449544643 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3451,11 +3451,18 @@ __metadata: "@material-ui/icons": ^4.9.1 "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 - "@types/react": ^16.13.1 || ^17.0.0 + "@types/react": ^18.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -4121,14 +4128,17 @@ __metadata: "@testing-library/react-hooks": ^8.0.0 "@testing-library/user-event": ^14.0.0 "@types/prop-types": ^15.7.3 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 "@types/zen-observable": ^0.8.0 history: ^5.0.0 i18next: ^22.4.15 lodash: ^4.17.21 msw: ^1.0.0 prop-types: ^15.7.2 + react: ^18.0.0 + react-dom: ^18.0.0 react-router-beta: "npm:react-router@6.0.0-beta.0" + react-router-dom: ^6.3.0 react-router-dom-beta: "npm:react-router-dom@6.0.0-beta.0" react-router-dom-stable: "npm:react-router-dom@^6.3.0" react-router-stable: "npm:react-router@^6.3.0" @@ -4136,9 +4146,13 @@ __metadata: zen-observable: ^0.10.0 zod: ^3.22.4 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -4177,12 +4191,19 @@ __metadata: "@oriflame/backstage-plugin-score-card": ^0.8.0 "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 - "@types/react": ^16.13.1 || ^17.0.0 - lodash: ^4.17.21 + "@types/react": ^18.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 zod: ^3.22.4 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 + react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -4365,7 +4386,7 @@ __metadata: "@types/d3-zoom": ^3.0.1 "@types/dagre": ^0.7.44 "@types/google-protobuf": ^3.7.2 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 "@types/react-helmet": ^6.1.0 "@types/react-sparklines": ^1.7.0 "@types/react-syntax-highlighter": ^15.0.0 @@ -4387,10 +4408,13 @@ __metadata: pluralize: ^8.0.0 qs: ^6.9.4 rc-progress: 3.5.1 + react: ^18.0.0 + react-dom: ^18.0.0 react-helmet: 6.1.0 react-hook-form: ^7.12.2 react-idle-timer: 5.7.2 react-markdown: ^8.0.0 + react-router-dom: ^6.3.0 react-sparklines: ^1.7.0 react-syntax-highlighter: ^15.4.5 react-use: ^17.3.2 @@ -4400,9 +4424,13 @@ __metadata: zen-observable: ^0.10.0 zod: ^3.22.4 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -4439,12 +4467,19 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 "@testing-library/user-event": ^14.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 history: ^5.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -4495,13 +4530,20 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 "@testing-library/user-event": ^14.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 react-use: ^17.2.4 zen-observable: ^0.10.0 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -4555,18 +4597,27 @@ __metadata: "@backstage/errors": "workspace:^" "@backstage/frontend-defaults": "workspace:^" "@backstage/frontend-plugin-api": "workspace:^" - "@backstage/plugin-app": "workspace:^" "@backstage/test-utils": "workspace:^" "@backstage/types": "workspace:^" "@backstage/version-bridge": "workspace:^" + "@material-ui/core": ^4.12.4 + "@material-ui/icons": ^4.11.3 "@testing-library/jest-dom": ^6.0.0 - "@testing-library/react": ^16.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@testing-library/react": ^15.0.0 + "@types/react": ^18.0.0 lodash: ^4.17.21 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 zod: ^3.22.4 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 + react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -4626,14 +4677,22 @@ __metadata: "@material-ui/core": ^4.12.4 "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 history: ^5.3.0 lodash: ^4.17.21 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 zod: ^3.22.4 zod-to-json-schema: ^3.21.4 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 + react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -4650,12 +4709,20 @@ __metadata: "@backstage/types": "workspace:^" "@backstage/version-bridge": "workspace:^" "@testing-library/jest-dom": ^6.0.0 - "@types/react": "*" + "@types/react": ^18.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 zod: ^3.22.4 peerDependencies: "@testing-library/react": ^16.0.0 + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 + react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -4711,12 +4778,19 @@ __metadata: "@material-ui/icons": ^4.9.1 "@testing-library/dom": ^10.0.0 "@testing-library/jest-dom": ^6.0.0 - "@types/react": ^16.13.1 || ^17.0.0 + "@types/react": ^18.0.0 msw: ^1.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -4746,12 +4820,19 @@ __metadata: dependencies: "@backstage/cli": "workspace:^" "@testing-library/jest-dom": ^6.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 grpc-docs: ^1.1.2 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -4782,18 +4863,25 @@ __metadata: "@testing-library/react": ^16.0.0 "@testing-library/user-event": ^14.0.0 "@types/highlightjs": ^10.1.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 "@types/swagger-ui-react": ^4.18.0 graphiql: 3.1.1 graphql: ^16.0.0 graphql-config: ^5.0.2 graphql-ws: ^5.4.1 isomorphic-form-data: ^2.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 swagger-ui-react: ^5.0.0 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -4852,11 +4940,18 @@ __metadata: "@backstage/frontend-plugin-api": "workspace:^" "@material-ui/core": ^4.12.2 "@material-ui/icons": ^4.9.1 - "@types/react": ^16.13.1 || ^17.0.0 + "@types/react": ^18.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -5401,10 +5496,19 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 "@testing-library/user-event": ^14.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 msw: ^1.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 + react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 + react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -5907,16 +6011,23 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 "@testing-library/user-event": ^14.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 classnames: ^2.3.1 lodash: ^4.17.15 p-limit: ^3.1.0 qs: ^6.9.4 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 react-use: ^17.2.4 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -5949,18 +6060,25 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 "@testing-library/user-event": ^14.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 git-url-parse: ^14.0.0 js-base64: ^3.6.0 lodash: ^4.17.21 msw: ^1.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 react-hook-form: ^7.12.2 + react-router-dom: ^6.3.0 react-use: ^17.2.4 yaml: ^2.0.0 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -6048,20 +6166,27 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 "@testing-library/user-event": ^14.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 "@types/zen-observable": ^0.8.0 classnames: ^2.2.6 lodash: ^4.17.21 material-ui-popup-state: ^1.9.3 qs: ^6.9.4 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 react-test-renderer: ^16.13.1 react-use: ^17.2.4 yaml: ^2.0.0 zen-observable: ^0.10.0 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -6089,13 +6214,20 @@ __metadata: "@material-ui/lab": ^4.0.0-alpha.60 "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 luxon: ^3.5.0 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 react-use: ^17.2.4 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -6133,19 +6265,26 @@ __metadata: "@testing-library/react": ^16.0.0 "@testing-library/user-event": ^14.0.0 "@types/pluralize": ^0.0.33 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 dataloader: ^2.0.0 expiry-map: ^2.0.0 history: ^5.0.0 lodash: ^4.17.21 pluralize: ^8.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 react-use: ^17.2.4 swr: ^2.2.5 zen-observable: ^0.10.0 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -6165,14 +6304,21 @@ __metadata: "@testing-library/dom": ^10.0.0 "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 jsonschema: ^1.2.6 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 react-use: ^17.2.4 zen-observable: ^0.10.0 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -6239,13 +6385,20 @@ __metadata: "@material-ui/icons": ^4.9.1 "@material-ui/lab": ^4.0.0-alpha.57 "@testing-library/jest-dom": ^6.0.0 + "@types/react": ^18.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 react-json-view: ^1.21.3 + react-router-dom: ^6.3.0 react-use: ^17.2.4 peerDependencies: "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -6390,12 +6543,19 @@ __metadata: "@material-ui/core": ^4.12.2 "@material-ui/icons": ^4.9.1 "@rjsf/utils": 5.21.1 - "@types/react": ^16.13.1 || ^17.0.0 + "@types/react": ^18.0.0 "@types/react-grid-layout": ^1.3.2 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -6428,18 +6588,25 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 "@testing-library/user-event": ^14.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 "@types/react-grid-layout": ^1.3.2 lodash: ^4.17.21 luxon: ^3.4.3 + react: ^18.0.0 + react-dom: ^18.0.0 react-grid-layout: 1.3.4 react-resizable: ^3.0.4 + react-router-dom: ^6.3.0 react-use: ^17.2.4 zod: ^3.22.4 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -6518,17 +6685,24 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 "@types/node": ^16.11.26 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 cronstrue: ^2.2.0 js-yaml: ^4.0.0 kubernetes-models: ^4.1.0 lodash: ^4.17.21 luxon: ^3.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 react-use: ^17.2.4 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -6590,7 +6764,7 @@ __metadata: "@material-ui/lab": ^4.0.0-alpha.61 "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 cronstrue: ^2.32.0 jest-websocket-mock: ^2.5.0 js-yaml: ^4.1.0 @@ -6598,12 +6772,21 @@ __metadata: lodash: ^4.17.21 luxon: ^3.0.0 msw: ^1.3.1 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 react-use: ^17.4.0 xterm: ^5.3.0 xterm-addon-attach: ^0.9.0 xterm-addon-fit: ^0.8.0 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 + react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 + react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -6629,19 +6812,27 @@ __metadata: "@testing-library/dom": ^10.0.0 "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 cronstrue: ^2.2.0 js-yaml: ^4.0.0 kubernetes-models: ^4.1.0 lodash: ^4.17.21 luxon: ^3.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 xterm: ^5.2.1 xterm-addon-attach: ^0.9.0 xterm-addon-fit: ^0.8.0 peerDependencies: + "@testing-library/react": ^16.0.0 + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -6759,16 +6950,24 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 "@testing-library/user-event": ^14.0.0 - "@types/react": ^16.13.1 || ^17.0.0 + "@types/react": ^18.0.0 lodash: ^4.17.21 material-ui-confirm: ^3.0.12 msw: ^1.0.0 notistack: ^3.0.1 + react: ^18.0.0 + react-dom: ^18.0.0 react-relative-time: ^0.0.9 + react-router-dom: ^6.3.0 react-use: ^17.2.4 peerDependencies: - react: ^16.13.1 || ^17.0.0 + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + react: ^16.13.1 || ^17.0.0 || ^18.0.0 + react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -6791,12 +6990,19 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 "@testing-library/user-event": ^14.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 react-use: ^17.2.4 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -6827,16 +7033,23 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 "@testing-library/user-event": ^14.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 lodash: ^4.17.21 p-limit: ^3.1.0 pluralize: ^8.0.0 qs: ^6.10.1 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 react-use: ^17.2.4 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -6948,12 +7161,19 @@ __metadata: "@backstage/test-utils": "workspace:^" "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 swr: ^2.0.0 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -7378,7 +7598,6 @@ __metadata: "@backstage/cli": "workspace:^" "@backstage/plugin-scaffolder-node": "workspace:^" "@backstage/types": "workspace:^" - "@types/react": "*" languageName: unknown linkType: soft @@ -7445,7 +7664,7 @@ __metadata: "@types/humanize-duration": ^3.18.1 "@types/json-schema": ^7.0.9 "@types/luxon": ^3.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 ajv-errors: ^3.0.0 classnames: ^2.2.6 flatted: 3.3.1 @@ -7455,6 +7674,9 @@ __metadata: lodash: ^4.17.21 luxon: ^3.0.0 qs: ^6.9.4 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 react-use: ^17.2.4 swr: ^2.0.0 use-immer: ^0.10.0 @@ -7462,9 +7684,13 @@ __metadata: zod: ^3.22.4 zod-to-json-schema: ^3.20.4 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -7511,7 +7737,7 @@ __metadata: "@testing-library/user-event": ^14.0.0 "@types/humanize-duration": ^3.18.1 "@types/json-schema": ^7.0.9 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 "@types/react-resizable": ^3.0.8 "@types/react-window": ^1.8.8 "@uiw/react-codemirror": ^4.9.3 @@ -7526,7 +7752,10 @@ __metadata: luxon: ^3.0.0 msw: ^1.0.0 qs: ^6.9.4 + react: ^18.0.0 + react-dom: ^18.0.0 react-resizable: ^3.0.5 + react-router-dom: ^6.3.0 react-use: ^17.2.4 react-window: ^1.8.10 swr: ^2.0.0 @@ -7535,9 +7764,13 @@ __metadata: zod: ^3.22.4 zod-to-json-schema: ^3.20.4 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -7744,14 +7977,21 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 "@testing-library/user-event": ^14.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 lodash: ^4.17.21 qs: ^6.9.4 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 react-use: ^17.3.2 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -7779,14 +8019,21 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 "@testing-library/user-event": ^14.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 history: ^5.0.0 qs: ^6.9.4 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 react-use: ^17.2.4 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -7852,8 +8099,18 @@ __metadata: "@material-ui/core": ^4.12.4 "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 + "@types/react": ^18.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 peerDependencies: - react: ^16.13.1 || ^17.0.0 + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + react: ^16.13.1 || ^17.0.0 || ^18.0.0 + react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 + react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -7876,12 +8133,22 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 "@testing-library/user-event": ^14.0.0 + "@types/react": ^18.0.0 jest-websocket-mock: ^2.5.0 msw: ^1.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 react-use: ^17.2.4 uuid: ^9.0.0 peerDependencies: - react: ^16.13.1 || ^17.0.0 + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + react: ^16.13.1 || ^17.0.0 || ^18.0.0 + react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 + react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -7901,13 +8168,20 @@ __metadata: "@backstage/test-utils": "workspace:^" "@testing-library/dom": ^10.0.0 "@testing-library/jest-dom": ^6.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 testing-library__dom: ^7.29.4-beta.1 peerDependencies: "@testing-library/react": ^16.0.0 + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -7971,13 +8245,20 @@ __metadata: "@testing-library/dom": ^10.0.0 "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 - "@types/react": ^16.13.1 || ^17.0.0 + "@types/react": ^18.0.0 git-url-parse: ^14.0.0 photoswipe: ^5.3.7 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -8042,15 +8323,22 @@ __metadata: "@material-ui/styles": ^4.11.0 "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 jss: ~10.10.0 lodash: ^4.17.21 + react: ^18.0.0 + react-dom: ^18.0.0 react-helmet: 6.1.0 + react-router-dom: ^6.3.0 react-use: ^17.2.4 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -8089,18 +8377,26 @@ __metadata: "@testing-library/react": ^16.0.0 "@testing-library/user-event": ^14.0.0 "@types/dompurify": ^3.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/event-source-polyfill": ^1.0.0 + "@types/react": ^18.0.0 canvas: ^2.10.2 dompurify: ^3.0.0 git-url-parse: ^14.0.0 jss: ~10.10.0 lodash: ^4.17.21 + react: ^18.0.0 + react-dom: ^18.0.0 react-helmet: 6.1.0 + react-router-dom: ^6.3.0 react-use: ^17.2.4 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -8162,14 +8458,21 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 "@testing-library/user-event": ^14.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 msw: ^1.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 react-use: ^17.2.4 zen-observable: ^0.10.0 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -8258,16 +8561,23 @@ __metadata: "@material-ui/core": ^4.12.2 "@material-ui/icons": ^4.9.1 "@testing-library/jest-dom": ^6.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 cross-fetch: ^4.0.0 i18next: ^22.4.15 msw: ^1.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 zen-observable: ^0.10.0 peerDependencies: "@testing-library/react": ^16.0.0 + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -8282,12 +8592,19 @@ __metadata: "@mui/styles": ^5.14.18 "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 - "@types/react": ^16.13.1 || ^17.0.0 + "@types/react": ^18.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 peerDependencies: "@material-ui/core": ^4.12.2 "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 + react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -8309,11 +8626,18 @@ __metadata: "@backstage/cli": "workspace:^" "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 - "@types/react": ^16.13.1 || ^17.0.0 + "@types/react": ^18.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -10158,12 +10482,19 @@ __metadata: "@testing-library/dom": ^10.0.0 "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 - "@types/react": ^16.13.1 || ^17.0.0 + "@types/react": ^18.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 react-use: ^17.2.4 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -16875,6 +17206,24 @@ __metadata: languageName: node linkType: hard +"@testing-library/react@npm:^15.0.0": + version: 15.0.7 + resolution: "@testing-library/react@npm:15.0.7" + dependencies: + "@babel/runtime": ^7.12.5 + "@testing-library/dom": ^10.0.0 + "@types/react-dom": ^18.0.0 + peerDependencies: + "@types/react": ^18.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 + peerDependenciesMeta: + "@types/react": + optional: true + checksum: eb33fd82eb811bb8612aa154e430a2c1c251d5ed45a477ef57fe20095db494ea7dcfa6b1e1e2bffb0c7ee10c86e408745d95a879be8ca8fbe301bb91e5f2e5db + languageName: node + linkType: hard + "@testing-library/react@npm:^16.0.0": version: 16.0.1 resolution: "@testing-library/react@npm:16.0.1" @@ -17448,6 +17797,13 @@ __metadata: languageName: node linkType: hard +"@types/event-source-polyfill@npm:^1.0.0": + version: 1.0.5 + resolution: "@types/event-source-polyfill@npm:1.0.5" + checksum: f506b68710162f2ade1bccbc5691b8c67e5a703e565df2bc0b7b5be2637ba838ef81ec6c10b03248fe4d054386d95a6e827c7aace6e924986c2b9985f77b55de + languageName: node + linkType: hard + "@types/expect@npm:^1.20.4": version: 1.20.4 resolution: "@types/expect@npm:1.20.4" @@ -20654,12 +21010,20 @@ __metadata: "@backstage/core-components": "workspace:^" "@backstage/frontend-plugin-api": "workspace:^" "@material-ui/icons": ^4.9.1 + "@types/react": ^18.0.0 cross-fetch: ^4.0.0 msw: ^1.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 + react-router-dom: ^6.3.0 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -38138,7 +38502,7 @@ __metadata: languageName: node linkType: hard -"react-dom@npm:^18.0.2": +"react-dom@npm:^18.0.0, react-dom@npm:^18.0.2": version: 18.3.1 resolution: "react-dom@npm:18.3.1" dependencies: @@ -38722,7 +39086,7 @@ __metadata: languageName: node linkType: hard -"react@npm:^16.13.1 || ^17.0.0 || ^18.0.0, react@npm:^18.0.2": +"react@npm:^16.13.1 || ^17.0.0 || ^18.0.0, react@npm:^18.0.0, react@npm:^18.0.2": version: 18.3.1 resolution: "react@npm:18.3.1" dependencies: @@ -41954,8 +42318,8 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 "@testing-library/user-event": ^14.0.0 - "@types/react": "*" - "@types/react-dom": "*" + "@types/react": ^18.0.0 + "@types/react-dom": ^18.0.0 cross-env: ^7.0.0 history: ^5.0.0 react: ^18.0.2 From 3c81a1ce3e7d585de8face1901564b4075a1b750 Mon Sep 17 00:00:00 2001 From: aramissennyeydd Date: Wed, 19 Jun 2024 00:16:44 -0400 Subject: [PATCH 11/21] adjust changeset Signed-off-by: aramissennyeydd --- .changeset/early-sloths-cross.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.changeset/early-sloths-cross.md b/.changeset/early-sloths-cross.md index 3e96057b8d..7f4a563918 100644 --- a/.changeset/early-sloths-cross.md +++ b/.changeset/early-sloths-cross.md @@ -1,4 +1,6 @@ --- +'@backstage/plugin-signals-react': patch +'@backstage/plugin-signals': patch '@backstage/plugin-api-docs-module-protoc-gen-doc': patch '@backstage/plugin-techdocs-module-addons-contrib': patch '@backstage/plugin-catalog-unprocessed-entities': patch From 8eb3033f7063836deb7cdce88fbb83d514038799 Mon Sep 17 00:00:00 2001 From: aramissennyeydd Date: Wed, 19 Jun 2024 00:17:57 -0400 Subject: [PATCH 12/21] add changeset for cli Signed-off-by: aramissennyeydd --- .changeset/nice-badgers-travel.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/nice-badgers-travel.md diff --git a/.changeset/nice-badgers-travel.md b/.changeset/nice-badgers-travel.md new file mode 100644 index 0000000000..7ec79b56d8 --- /dev/null +++ b/.changeset/nice-badgers-travel.md @@ -0,0 +1,5 @@ +--- +'@backstage/repo-tools': minor +--- + +Adds a new command `backstage-repo-tools peer-deps` for validating your usage of peer dependencies in your plugins. It currently supports react related peer dependencies. It also has a `--fix` mode for quickly fixing any issues that it finds. From afc413d5c0a44523f8f4239aaf35d48c5294b5ff Mon Sep 17 00:00:00 2001 From: aramissennyeydd Date: Wed, 19 Jun 2024 09:53:35 -0400 Subject: [PATCH 13/21] fix test case failing with react error and update api reports Signed-off-by: aramissennyeydd --- .../src/layout/ErrorBoundary/ErrorBoundary.test.tsx | 5 ++++- packages/repo-tools/cli-report.md | 11 +++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx b/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx index c96ab67782..72b8e4dc95 100644 --- a/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx +++ b/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx @@ -77,7 +77,10 @@ describe('', () => { /^The above error occurred in the component:/, ), expect.stringMatching(/^ErrorBoundary/), - expect.stringMatching(/Warning: findDOMNode/), // React warning, unfortunate but currently true + // React 18.3.0 added error messages for findDOMNode deprecation, https://github.com/facebook/react/commit/c3b283964108b0e8dbcf1f9eb2e7e67815e39dfb. + expect.stringContaining( + 'Warning: findDOMNode is deprecated and will be removed in the next major release. Instead, add a ref directly to the element you want to reference. Learn more about using refs safely here: https://reactjs.org/link/strict-mode-find-node%s', + ), ]); expect(error.length).toEqual(5); }); diff --git a/packages/repo-tools/cli-report.md b/packages/repo-tools/cli-report.md index 6e0e4c9b85..9266957886 100644 --- a/packages/repo-tools/cli-report.md +++ b/packages/repo-tools/cli-report.md @@ -14,6 +14,7 @@ Options: Commands: api-reports [options] [paths...] type-deps + peer-deps [options] generate-catalog-info [options] knip-reports [options] [paths...] package [command] @@ -156,6 +157,16 @@ Options: -h, --help ``` +### `backstage-repo-tools peer-deps` + +``` +Usage: backstage-repo-tools peer-deps [options] + +Options: + --fix + -h, --help +``` + ### `backstage-repo-tools repo` ``` From a99bf141a00d9d541c06089129f6e517138c865d Mon Sep 17 00:00:00 2001 From: aramissennyeydd Date: Wed, 19 Jun 2024 11:40:42 -0400 Subject: [PATCH 14/21] use common react version Signed-off-by: aramissennyeydd --- microsite/package.json | 4 +- packages/app-defaults/package.json | 4 +- packages/app-next-example-plugin/package.json | 4 +- packages/core-app-api/package.json | 4 +- packages/core-components/package.json | 4 +- packages/core-plugin-api/package.json | 4 +- packages/dev-utils/package.json | 4 +- packages/frontend-app-api/package.json | 4 +- packages/frontend-plugin-api/package.json | 4 +- packages/frontend-test-utils/package.json | 4 +- packages/integration-react/package.json | 4 +- packages/test-utils/package.json | 4 +- packages/theme/package.json | 4 +- packages/version-bridge/package.json | 4 +- .../package.json | 4 +- plugins/api-docs/package.json | 4 +- plugins/app-visualizer/package.json | 4 +- plugins/auth-react/package.json | 4 +- plugins/catalog-graph/package.json | 4 +- plugins/catalog-import/package.json | 4 +- plugins/catalog-react/package.json | 4 +- .../catalog-unprocessed-entities/package.json | 4 +- plugins/catalog/package.json | 4 +- plugins/config-schema/package.json | 4 +- plugins/devtools/package.json | 4 +- plugins/example-todo-list/package.json | 4 +- plugins/home-react/package.json | 4 +- plugins/home/package.json | 4 +- plugins/kubernetes-cluster/package.json | 4 +- plugins/kubernetes-react/package.json | 4 +- plugins/kubernetes/package.json | 4 +- plugins/notifications/package.json | 4 +- plugins/org-react/package.json | 4 +- plugins/org/package.json | 4 +- plugins/permission-react/package.json | 4 +- plugins/scaffolder-react/package.json | 4 +- plugins/scaffolder/package.json | 4 +- plugins/search-react/package.json | 4 +- plugins/search/package.json | 4 +- plugins/signals-react/package.json | 4 +- plugins/signals/package.json | 4 +- .../techdocs-addons-test-utils/package.json | 4 +- .../package.json | 4 +- plugins/techdocs-react/package.json | 4 +- plugins/techdocs/package.json | 4 +- plugins/user-settings/package.json | 4 +- yarn.lock | 180 +++++++++--------- 47 files changed, 182 insertions(+), 182 deletions(-) diff --git a/microsite/package.json b/microsite/package.json index fc3405c744..728cef0d96 100644 --- a/microsite/package.json +++ b/microsite/package.json @@ -30,8 +30,8 @@ "docusaurus-pushfeedback": "^1.0.0", "luxon": "^3.0.0", "prism-react-renderer": "^2.1.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "sass": "^1.57.1", "swc-loader": "^0.2.3" }, diff --git a/packages/app-defaults/package.json b/packages/app-defaults/package.json index 5865cb3f43..1865c856b7 100644 --- a/packages/app-defaults/package.json +++ b/packages/app-defaults/package.json @@ -50,8 +50,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/app-next-example-plugin/package.json b/packages/app-next-example-plugin/package.json index dc477e31ec..56374b384c 100644 --- a/packages/app-next-example-plugin/package.json +++ b/packages/app-next-example-plugin/package.json @@ -50,8 +50,8 @@ "@types/react": "^18.0.0", "cross-fetch": "^4.0.0", "msw": "^1.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/core-app-api/package.json b/packages/core-app-api/package.json index d1c9f0a053..6d443606b0 100644 --- a/packages/core-app-api/package.json +++ b/packages/core-app-api/package.json @@ -70,8 +70,8 @@ "@types/react": "^18.0.0", "@types/zen-observable": "^0.8.0", "msw": "^1.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-beta": "npm:react-router@6.0.0-beta.0", "react-router-dom": "^6.3.0", "react-router-dom-beta": "npm:react-router-dom@6.0.0-beta.0", diff --git a/packages/core-components/package.json b/packages/core-components/package.json index fc9ebc30e5..30699ad7a1 100644 --- a/packages/core-components/package.json +++ b/packages/core-components/package.json @@ -116,8 +116,8 @@ "cross-fetch": "^4.0.0", "history": "^5.0.0", "msw": "^1.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/core-plugin-api/package.json b/packages/core-plugin-api/package.json index e9e46a8064..876457b939 100644 --- a/packages/core-plugin-api/package.json +++ b/packages/core-plugin-api/package.json @@ -64,8 +64,8 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index d8fa50b1ee..a45f63324e 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -56,8 +56,8 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0", "zen-observable": "^0.10.0" }, diff --git a/packages/frontend-app-api/package.json b/packages/frontend-app-api/package.json index 26473d0dea..ec5463642b 100644 --- a/packages/frontend-app-api/package.json +++ b/packages/frontend-app-api/package.json @@ -52,8 +52,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^15.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/frontend-plugin-api/package.json b/packages/frontend-plugin-api/package.json index 43509a6132..309ebacc04 100644 --- a/packages/frontend-plugin-api/package.json +++ b/packages/frontend-plugin-api/package.json @@ -49,8 +49,8 @@ "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", "history": "^5.3.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/frontend-test-utils/package.json b/packages/frontend-test-utils/package.json index 7ebf1eb4f0..b8973bc5bd 100644 --- a/packages/frontend-test-utils/package.json +++ b/packages/frontend-test-utils/package.json @@ -44,8 +44,8 @@ "@backstage/cli": "workspace:^", "@testing-library/jest-dom": "^6.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/integration-react/package.json b/packages/integration-react/package.json index f426ec4a01..5911006c7e 100644 --- a/packages/integration-react/package.json +++ b/packages/integration-react/package.json @@ -48,8 +48,8 @@ "@testing-library/jest-dom": "^6.0.0", "@types/react": "^18.0.0", "msw": "^1.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index dc2713ff09..f31595084c 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -67,8 +67,8 @@ "@testing-library/jest-dom": "^6.0.0", "@types/react": "^18.0.0", "msw": "^1.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/theme/package.json b/packages/theme/package.json index 435f517326..17b655ca52 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json @@ -46,8 +46,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/version-bridge/package.json b/packages/version-bridge/package.json index 50a5883b15..aea9d122bf 100644 --- a/packages/version-bridge/package.json +++ b/packages/version-bridge/package.json @@ -40,8 +40,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/api-docs-module-protoc-gen-doc/package.json b/plugins/api-docs-module-protoc-gen-doc/package.json index f41fe2f9fb..1c533b7885 100644 --- a/plugins/api-docs-module-protoc-gen-doc/package.json +++ b/plugins/api-docs-module-protoc-gen-doc/package.json @@ -43,8 +43,8 @@ "@backstage/cli": "workspace:^", "@testing-library/jest-dom": "^6.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json index f9888ed99c..79c2320563 100644 --- a/plugins/api-docs/package.json +++ b/plugins/api-docs/package.json @@ -86,8 +86,8 @@ "@types/highlightjs": "^10.1.0", "@types/react": "^18.0.0", "@types/swagger-ui-react": "^4.18.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/app-visualizer/package.json b/plugins/app-visualizer/package.json index 53720d560a..e9e6568210 100644 --- a/plugins/app-visualizer/package.json +++ b/plugins/app-visualizer/package.json @@ -43,8 +43,8 @@ "devDependencies": { "@backstage/cli": "workspace:^", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/auth-react/package.json b/plugins/auth-react/package.json index 995d9adecf..5bb99f0c8d 100644 --- a/plugins/auth-react/package.json +++ b/plugins/auth-react/package.json @@ -52,8 +52,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "msw": "^1.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/catalog-graph/package.json b/plugins/catalog-graph/package.json index e6e4b5651d..c444cd755f 100644 --- a/plugins/catalog-graph/package.json +++ b/plugins/catalog-graph/package.json @@ -77,8 +77,8 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json index 1dbfac3179..277e259458 100644 --- a/plugins/catalog-import/package.json +++ b/plugins/catalog-import/package.json @@ -89,8 +89,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "msw": "^1.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json index 5d8d0e7da6..34728f38a0 100644 --- a/plugins/catalog-react/package.json +++ b/plugins/catalog-react/package.json @@ -95,8 +95,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "@types/zen-observable": "^0.8.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0", "react-test-renderer": "^16.13.1" }, diff --git a/plugins/catalog-unprocessed-entities/package.json b/plugins/catalog-unprocessed-entities/package.json index a0e652bc03..fe7857091a 100644 --- a/plugins/catalog-unprocessed-entities/package.json +++ b/plugins/catalog-unprocessed-entities/package.json @@ -53,8 +53,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json index 2b8e0484b7..1c159af6ce 100644 --- a/plugins/catalog/package.json +++ b/plugins/catalog/package.json @@ -98,8 +98,8 @@ "@testing-library/user-event": "^14.0.0", "@types/pluralize": "^0.0.33", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0", "swr": "^2.2.5" }, diff --git a/plugins/config-schema/package.json b/plugins/config-schema/package.json index 643f7ac765..bd29c74543 100644 --- a/plugins/config-schema/package.json +++ b/plugins/config-schema/package.json @@ -55,8 +55,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/devtools/package.json b/plugins/devtools/package.json index 62a838f8fa..66679a712d 100644 --- a/plugins/devtools/package.json +++ b/plugins/devtools/package.json @@ -69,8 +69,8 @@ "@backstage/dev-utils": "workspace:^", "@testing-library/jest-dom": "^6.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/example-todo-list/package.json b/plugins/example-todo-list/package.json index 4776fc2553..feda571385 100644 --- a/plugins/example-todo-list/package.json +++ b/plugins/example-todo-list/package.json @@ -51,8 +51,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/home-react/package.json b/plugins/home-react/package.json index 0a3edf65d4..e68f20c51e 100644 --- a/plugins/home-react/package.json +++ b/plugins/home-react/package.json @@ -52,8 +52,8 @@ "@backstage/cli": "workspace:^", "@types/react": "^18.0.0", "@types/react-grid-layout": "^1.3.2", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/home/package.json b/plugins/home/package.json index 8dc5bc3b68..38a12f7fcc 100644 --- a/plugins/home/package.json +++ b/plugins/home/package.json @@ -91,8 +91,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "@types/react-grid-layout": "^1.3.2", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/kubernetes-cluster/package.json b/plugins/kubernetes-cluster/package.json index 21087fd0b7..4f4796007d 100644 --- a/plugins/kubernetes-cluster/package.json +++ b/plugins/kubernetes-cluster/package.json @@ -66,8 +66,8 @@ "@testing-library/react": "^16.0.0", "@types/node": "^16.11.26", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/kubernetes-react/package.json b/plugins/kubernetes-react/package.json index 879507fbe4..b18794f564 100644 --- a/plugins/kubernetes-react/package.json +++ b/plugins/kubernetes-react/package.json @@ -72,8 +72,8 @@ "@types/react": "^18.0.0", "jest-websocket-mock": "^2.5.0", "msw": "^1.3.1", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json index 940054aa65..f28b4d248a 100644 --- a/plugins/kubernetes/package.json +++ b/plugins/kubernetes/package.json @@ -87,8 +87,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/notifications/package.json b/plugins/notifications/package.json index aafdf2476e..cb16e1cb96 100644 --- a/plugins/notifications/package.json +++ b/plugins/notifications/package.json @@ -65,8 +65,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "msw": "^1.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/org-react/package.json b/plugins/org-react/package.json index e31864e158..b96a6f8e27 100644 --- a/plugins/org-react/package.json +++ b/plugins/org-react/package.json @@ -59,8 +59,8 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/org/package.json b/plugins/org/package.json index cae8a2d11a..f44b6900da 100644 --- a/plugins/org/package.json +++ b/plugins/org/package.json @@ -82,8 +82,8 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/permission-react/package.json b/plugins/permission-react/package.json index 65732d8c89..cf012d1ead 100644 --- a/plugins/permission-react/package.json +++ b/plugins/permission-react/package.json @@ -53,8 +53,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/scaffolder-react/package.json b/plugins/scaffolder-react/package.json index f3e8eccdbb..96c3907c46 100644 --- a/plugins/scaffolder-react/package.json +++ b/plugins/scaffolder-react/package.json @@ -107,8 +107,8 @@ "@types/humanize-duration": "^3.18.1", "@types/luxon": "^3.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0", "swr": "^2.0.0" }, diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json index e69cf0e223..01c7dacf66 100644 --- a/plugins/scaffolder/package.json +++ b/plugins/scaffolder/package.json @@ -121,8 +121,8 @@ "@types/react-resizable": "^3.0.8", "@types/react-window": "^1.8.8", "msw": "^1.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0", "swr": "^2.0.0" }, diff --git a/plugins/search-react/package.json b/plugins/search-react/package.json index 6df72cee7d..6e942e1dbb 100644 --- a/plugins/search-react/package.json +++ b/plugins/search-react/package.json @@ -81,8 +81,8 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/search/package.json b/plugins/search/package.json index dba2742ca2..657ea72def 100644 --- a/plugins/search/package.json +++ b/plugins/search/package.json @@ -84,8 +84,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "history": "^5.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/signals-react/package.json b/plugins/signals-react/package.json index dad70cff02..bd9d862fd4 100644 --- a/plugins/signals-react/package.json +++ b/plugins/signals-react/package.json @@ -49,8 +49,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/signals/package.json b/plugins/signals/package.json index f87647d356..51913117a2 100644 --- a/plugins/signals/package.json +++ b/plugins/signals/package.json @@ -60,8 +60,8 @@ "@types/react": "^18.0.0", "jest-websocket-mock": "^2.5.0", "msw": "^1.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/techdocs-addons-test-utils/package.json b/plugins/techdocs-addons-test-utils/package.json index 4984bbdced..949c9addf3 100644 --- a/plugins/techdocs-addons-test-utils/package.json +++ b/plugins/techdocs-addons-test-utils/package.json @@ -56,8 +56,8 @@ "@testing-library/dom": "^10.0.0", "@testing-library/jest-dom": "^6.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/techdocs-module-addons-contrib/package.json b/plugins/techdocs-module-addons-contrib/package.json index 59976dde8c..951bd8f432 100644 --- a/plugins/techdocs-module-addons-contrib/package.json +++ b/plugins/techdocs-module-addons-contrib/package.json @@ -58,8 +58,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/techdocs-react/package.json b/plugins/techdocs-react/package.json index 73cab1645e..370c1ff110 100644 --- a/plugins/techdocs-react/package.json +++ b/plugins/techdocs-react/package.json @@ -64,8 +64,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json index dec637779c..86a491ab24 100644 --- a/plugins/techdocs/package.json +++ b/plugins/techdocs/package.json @@ -101,8 +101,8 @@ "@types/event-source-polyfill": "^1.0.0", "@types/react": "^18.0.0", "canvas": "^2.10.2", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json index ee79710815..5322e813fa 100644 --- a/plugins/user-settings/package.json +++ b/plugins/user-settings/package.json @@ -83,8 +83,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "msw": "^1.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/yarn.lock b/yarn.lock index f449544643..f7eb3d310b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3452,8 +3452,8 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 "@types/react": ^18.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 peerDependencies: "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 @@ -4135,8 +4135,8 @@ __metadata: lodash: ^4.17.21 msw: ^1.0.0 prop-types: ^15.7.2 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-beta: "npm:react-router@6.0.0-beta.0" react-router-dom: ^6.3.0 react-router-dom-beta: "npm:react-router-dom@6.0.0-beta.0" @@ -4408,8 +4408,8 @@ __metadata: pluralize: ^8.0.0 qs: ^6.9.4 rc-progress: 3.5.1 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-helmet: 6.1.0 react-hook-form: ^7.12.2 react-idle-timer: 5.7.2 @@ -4469,8 +4469,8 @@ __metadata: "@testing-library/user-event": ^14.0.0 "@types/react": ^18.0.0 history: ^5.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 peerDependencies: "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 @@ -4531,8 +4531,8 @@ __metadata: "@testing-library/react": ^16.0.0 "@testing-library/user-event": ^14.0.0 "@types/react": ^18.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 react-use: ^17.2.4 zen-observable: ^0.10.0 @@ -4606,8 +4606,8 @@ __metadata: "@testing-library/react": ^15.0.0 "@types/react": ^18.0.0 lodash: ^4.17.21 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 zod: ^3.22.4 peerDependencies: @@ -4680,8 +4680,8 @@ __metadata: "@types/react": ^18.0.0 history: ^5.3.0 lodash: ^4.17.21 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 zod: ^3.22.4 zod-to-json-schema: ^3.21.4 @@ -4710,8 +4710,8 @@ __metadata: "@backstage/version-bridge": "workspace:^" "@testing-library/jest-dom": ^6.0.0 "@types/react": ^18.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 zod: ^3.22.4 peerDependencies: @@ -4780,8 +4780,8 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@types/react": ^18.0.0 msw: ^1.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 peerDependencies: "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 @@ -4822,8 +4822,8 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@types/react": ^18.0.0 grpc-docs: ^1.1.2 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 peerDependencies: "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 @@ -4870,8 +4870,8 @@ __metadata: graphql-config: ^5.0.2 graphql-ws: ^5.4.1 isomorphic-form-data: ^2.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 swagger-ui-react: ^5.0.0 peerDependencies: @@ -4941,8 +4941,8 @@ __metadata: "@material-ui/core": ^4.12.2 "@material-ui/icons": ^4.9.1 "@types/react": ^18.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 peerDependencies: "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 @@ -5498,8 +5498,8 @@ __metadata: "@testing-library/user-event": ^14.0.0 "@types/react": ^18.0.0 msw: ^1.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 peerDependencies: "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 @@ -6016,8 +6016,8 @@ __metadata: lodash: ^4.17.15 p-limit: ^3.1.0 qs: ^6.9.4 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 react-use: ^17.2.4 peerDependencies: @@ -6065,8 +6065,8 @@ __metadata: js-base64: ^3.6.0 lodash: ^4.17.21 msw: ^1.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-hook-form: ^7.12.2 react-router-dom: ^6.3.0 react-use: ^17.2.4 @@ -6172,8 +6172,8 @@ __metadata: lodash: ^4.17.21 material-ui-popup-state: ^1.9.3 qs: ^6.9.4 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 react-test-renderer: ^16.13.1 react-use: ^17.2.4 @@ -6216,8 +6216,8 @@ __metadata: "@testing-library/react": ^16.0.0 "@types/react": ^18.0.0 luxon: ^3.5.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 react-use: ^17.2.4 peerDependencies: @@ -6271,8 +6271,8 @@ __metadata: history: ^5.0.0 lodash: ^4.17.21 pluralize: ^8.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 react-use: ^17.2.4 swr: ^2.2.5 @@ -6306,8 +6306,8 @@ __metadata: "@testing-library/react": ^16.0.0 "@types/react": ^18.0.0 jsonschema: ^1.2.6 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 react-use: ^17.2.4 zen-observable: ^0.10.0 @@ -6386,8 +6386,8 @@ __metadata: "@material-ui/lab": ^4.0.0-alpha.57 "@testing-library/jest-dom": ^6.0.0 "@types/react": ^18.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-json-view: ^1.21.3 react-router-dom: ^6.3.0 react-use: ^17.2.4 @@ -6545,8 +6545,8 @@ __metadata: "@rjsf/utils": 5.21.1 "@types/react": ^18.0.0 "@types/react-grid-layout": ^1.3.2 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 peerDependencies: "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 @@ -6592,8 +6592,8 @@ __metadata: "@types/react-grid-layout": ^1.3.2 lodash: ^4.17.21 luxon: ^3.4.3 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-grid-layout: 1.3.4 react-resizable: ^3.0.4 react-router-dom: ^6.3.0 @@ -6691,8 +6691,8 @@ __metadata: kubernetes-models: ^4.1.0 lodash: ^4.17.21 luxon: ^3.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 react-use: ^17.2.4 peerDependencies: @@ -6772,8 +6772,8 @@ __metadata: lodash: ^4.17.21 luxon: ^3.0.0 msw: ^1.3.1 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 react-use: ^17.4.0 xterm: ^5.3.0 @@ -6818,8 +6818,8 @@ __metadata: kubernetes-models: ^4.1.0 lodash: ^4.17.21 luxon: ^3.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 xterm: ^5.2.1 xterm-addon-attach: ^0.9.0 @@ -6955,8 +6955,8 @@ __metadata: material-ui-confirm: ^3.0.12 msw: ^1.0.0 notistack: ^3.0.1 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-relative-time: ^0.0.9 react-router-dom: ^6.3.0 react-use: ^17.2.4 @@ -6991,8 +6991,8 @@ __metadata: "@testing-library/react": ^16.0.0 "@testing-library/user-event": ^14.0.0 "@types/react": ^18.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 react-use: ^17.2.4 peerDependencies: @@ -7038,8 +7038,8 @@ __metadata: p-limit: ^3.1.0 pluralize: ^8.0.0 qs: ^6.10.1 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 react-use: ^17.2.4 peerDependencies: @@ -7162,8 +7162,8 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 "@types/react": ^18.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 swr: ^2.0.0 peerDependencies: @@ -7674,8 +7674,8 @@ __metadata: lodash: ^4.17.21 luxon: ^3.0.0 qs: ^6.9.4 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 react-use: ^17.2.4 swr: ^2.0.0 @@ -7752,8 +7752,8 @@ __metadata: luxon: ^3.0.0 msw: ^1.0.0 qs: ^6.9.4 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-resizable: ^3.0.5 react-router-dom: ^6.3.0 react-use: ^17.2.4 @@ -7980,8 +7980,8 @@ __metadata: "@types/react": ^18.0.0 lodash: ^4.17.21 qs: ^6.9.4 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 react-use: ^17.3.2 peerDependencies: @@ -8022,8 +8022,8 @@ __metadata: "@types/react": ^18.0.0 history: ^5.0.0 qs: ^6.9.4 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 react-use: ^17.2.4 peerDependencies: @@ -8100,8 +8100,8 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 "@types/react": ^18.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 peerDependencies: "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 @@ -8136,8 +8136,8 @@ __metadata: "@types/react": ^18.0.0 jest-websocket-mock: ^2.5.0 msw: ^1.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 react-use: ^17.2.4 uuid: ^9.0.0 @@ -8169,8 +8169,8 @@ __metadata: "@testing-library/dom": ^10.0.0 "@testing-library/jest-dom": ^6.0.0 "@types/react": ^18.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 testing-library__dom: ^7.29.4-beta.1 peerDependencies: @@ -8248,8 +8248,8 @@ __metadata: "@types/react": ^18.0.0 git-url-parse: ^14.0.0 photoswipe: ^5.3.7 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 peerDependencies: "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 @@ -8326,8 +8326,8 @@ __metadata: "@types/react": ^18.0.0 jss: ~10.10.0 lodash: ^4.17.21 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-helmet: 6.1.0 react-router-dom: ^6.3.0 react-use: ^17.2.4 @@ -8384,8 +8384,8 @@ __metadata: git-url-parse: ^14.0.0 jss: ~10.10.0 lodash: ^4.17.21 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-helmet: 6.1.0 react-router-dom: ^6.3.0 react-use: ^17.2.4 @@ -8460,8 +8460,8 @@ __metadata: "@testing-library/user-event": ^14.0.0 "@types/react": ^18.0.0 msw: ^1.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 react-use: ^17.2.4 zen-observable: ^0.10.0 @@ -8565,8 +8565,8 @@ __metadata: cross-fetch: ^4.0.0 i18next: ^22.4.15 msw: ^1.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 zen-observable: ^0.10.0 peerDependencies: @@ -8593,8 +8593,8 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 "@types/react": ^18.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 peerDependencies: "@material-ui/core": ^4.12.2 @@ -8627,8 +8627,8 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 "@types/react": ^18.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 peerDependencies: "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 @@ -10483,8 +10483,8 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 "@types/react": ^18.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 react-use: ^17.2.4 peerDependencies: @@ -21013,8 +21013,8 @@ __metadata: "@types/react": ^18.0.0 cross-fetch: ^4.0.0 msw: ^1.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 peerDependencies: "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 From c781772b0a6b3b3bb1a7a8575d03eefcf4fff2e2 Mon Sep 17 00:00:00 2001 From: aramissennyeydd Date: Wed, 19 Jun 2024 11:50:54 -0400 Subject: [PATCH 15/21] revert react version upgrade Signed-off-by: aramissennyeydd --- .../src/layout/ErrorBoundary/ErrorBoundary.test.tsx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx b/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx index 72b8e4dc95..99419a9109 100644 --- a/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx +++ b/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx @@ -77,10 +77,6 @@ describe('', () => { /^The above error occurred in the component:/, ), expect.stringMatching(/^ErrorBoundary/), - // React 18.3.0 added error messages for findDOMNode deprecation, https://github.com/facebook/react/commit/c3b283964108b0e8dbcf1f9eb2e7e67815e39dfb. - expect.stringContaining( - 'Warning: findDOMNode is deprecated and will be removed in the next major release. Instead, add a ref directly to the element you want to reference. Learn more about using refs safely here: https://reactjs.org/link/strict-mode-find-node%s', - ), ]); expect(error.length).toEqual(5); }); From 1376af866853f75ca88b47df07f4906124f16442 Mon Sep 17 00:00:00 2001 From: aramissennyeydd Date: Wed, 19 Jun 2024 12:03:48 -0400 Subject: [PATCH 16/21] revert microsite react bump Signed-off-by: aramissennyeydd --- microsite/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/microsite/package.json b/microsite/package.json index 728cef0d96..fc3405c744 100644 --- a/microsite/package.json +++ b/microsite/package.json @@ -30,8 +30,8 @@ "docusaurus-pushfeedback": "^1.0.0", "luxon": "^3.0.0", "prism-react-renderer": "^2.1.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "sass": "^1.57.1", "swc-loader": "^0.2.3" }, From 7d9580643a0cd37f5bb01930393d48957b8f9dd5 Mon Sep 17 00:00:00 2001 From: aramissennyeydd Date: Wed, 19 Jun 2024 13:28:35 -0400 Subject: [PATCH 17/21] revert length check Signed-off-by: aramissennyeydd --- .../src/layout/ErrorBoundary/ErrorBoundary.test.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx b/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx index 99419a9109..8bfb228f53 100644 --- a/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx +++ b/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx @@ -78,6 +78,6 @@ describe('', () => { ), expect.stringMatching(/^ErrorBoundary/), ]); - expect(error.length).toEqual(5); + expect(error.length).toEqual(4); }); }); From 4958c01d14cf511ebf586b98aecb45e26b95de36 Mon Sep 17 00:00:00 2001 From: aramissennyeydd Date: Tue, 24 Sep 2024 21:08:37 -0400 Subject: [PATCH 18/21] revert version of react and fix merge conflicts Signed-off-by: aramissennyeydd --- packages/app-defaults/package.json | 4 ++-- packages/app-next-example-plugin/package.json | 4 ++-- packages/app-next/package.json | 4 ++-- packages/app/package.json | 4 ++-- packages/core-app-api/package.json | 4 ++-- packages/core-components/package.json | 4 ++-- packages/core-plugin-api/package.json | 4 ++-- .../default-app/packages/app/package.json.hbs | 4 ++-- packages/dev-utils/package.json | 4 ++-- packages/frontend-app-api/package.json | 4 ++-- packages/frontend-defaults/package.json | 16 ++++++++++++++-- packages/frontend-plugin-api/package.json | 4 ++-- packages/frontend-test-utils/package.json | 4 ++-- packages/integration-react/package.json | 4 ++-- .../src/commands/peer-deps/peer-deps.ts | 2 +- packages/techdocs-cli-embedded-app/package.json | 4 ++-- packages/test-utils/package.json | 4 ++-- packages/theme/package.json | 4 ++-- packages/version-bridge/package.json | 4 ++-- .../api-docs-module-protoc-gen-doc/package.json | 4 ++-- plugins/api-docs/package.json | 4 ++-- plugins/app-visualizer/package.json | 4 ++-- plugins/app/package.json | 12 +++++++++++- plugins/auth-react/package.json | 4 ++-- plugins/catalog-graph/package.json | 4 ++-- plugins/catalog-import/package.json | 4 ++-- plugins/catalog-react/package.json | 4 ++-- .../catalog-unprocessed-entities/package.json | 4 ++-- plugins/catalog/package.json | 4 ++-- plugins/config-schema/package.json | 4 ++-- plugins/devtools/package.json | 4 ++-- plugins/example-todo-list/package.json | 4 ++-- plugins/home-react/package.json | 4 ++-- plugins/home/package.json | 4 ++-- plugins/kubernetes-cluster/package.json | 4 ++-- plugins/kubernetes-react/package.json | 4 ++-- plugins/kubernetes/package.json | 4 ++-- plugins/notifications/package.json | 4 ++-- plugins/org-react/package.json | 4 ++-- plugins/org/package.json | 4 ++-- plugins/permission-react/package.json | 4 ++-- plugins/scaffolder-react/package.json | 4 ++-- plugins/scaffolder/package.json | 4 ++-- plugins/search-react/package.json | 4 ++-- plugins/search/package.json | 4 ++-- plugins/signals-react/package.json | 4 ++-- plugins/signals/package.json | 4 ++-- plugins/techdocs-addons-test-utils/package.json | 4 ++-- .../techdocs-module-addons-contrib/package.json | 4 ++-- plugins/techdocs-react/package.json | 4 ++-- plugins/techdocs/package.json | 4 ++-- plugins/user-settings/package.json | 4 ++-- storybook/package.json | 4 ++-- 53 files changed, 126 insertions(+), 104 deletions(-) diff --git a/packages/app-defaults/package.json b/packages/app-defaults/package.json index 1865c856b7..5865cb3f43 100644 --- a/packages/app-defaults/package.json +++ b/packages/app-defaults/package.json @@ -50,8 +50,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/app-next-example-plugin/package.json b/packages/app-next-example-plugin/package.json index 56374b384c..dc477e31ec 100644 --- a/packages/app-next-example-plugin/package.json +++ b/packages/app-next-example-plugin/package.json @@ -50,8 +50,8 @@ "@types/react": "^18.0.0", "cross-fetch": "^4.0.0", "msw": "^1.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/app-next/package.json b/packages/app-next/package.json index 29f9105031..da3ab3d184 100644 --- a/packages/app-next/package.json +++ b/packages/app-next/package.json @@ -78,8 +78,8 @@ "@material-ui/lab": "4.0.0-alpha.61", "@octokit/rest": "^19.0.3", "history": "^5.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router": "^6.3.0", "react-router-dom": "^6.3.0", "react-use": "^17.2.4", diff --git a/packages/app/package.json b/packages/app/package.json index 15cdd85d32..02e6a8673b 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -76,8 +76,8 @@ "@octokit/rest": "^19.0.3", "@vitejs/plugin-react": "^4.3.1", "history": "^5.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router": "^6.3.0", "react-router-dom": "^6.3.0", "react-use": "^17.2.4", diff --git a/packages/core-app-api/package.json b/packages/core-app-api/package.json index 6d443606b0..d1c9f0a053 100644 --- a/packages/core-app-api/package.json +++ b/packages/core-app-api/package.json @@ -70,8 +70,8 @@ "@types/react": "^18.0.0", "@types/zen-observable": "^0.8.0", "msw": "^1.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-beta": "npm:react-router@6.0.0-beta.0", "react-router-dom": "^6.3.0", "react-router-dom-beta": "npm:react-router-dom@6.0.0-beta.0", diff --git a/packages/core-components/package.json b/packages/core-components/package.json index 30699ad7a1..fc9ebc30e5 100644 --- a/packages/core-components/package.json +++ b/packages/core-components/package.json @@ -116,8 +116,8 @@ "cross-fetch": "^4.0.0", "history": "^5.0.0", "msw": "^1.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/core-plugin-api/package.json b/packages/core-plugin-api/package.json index 876457b939..e9e46a8064 100644 --- a/packages/core-plugin-api/package.json +++ b/packages/core-plugin-api/package.json @@ -64,8 +64,8 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/create-app/templates/default-app/packages/app/package.json.hbs b/packages/create-app/templates/default-app/packages/app/package.json.hbs index 0601a3a4e3..6415b25771 100644 --- a/packages/create-app/templates/default-app/packages/app/package.json.hbs +++ b/packages/create-app/templates/default-app/packages/app/package.json.hbs @@ -41,8 +41,8 @@ "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "history": "^5.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router": "^6.3.0", "react-router-dom": "^6.3.0", "react-use": "^17.2.4" diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index a45f63324e..d8fa50b1ee 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -56,8 +56,8 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0", "zen-observable": "^0.10.0" }, diff --git a/packages/frontend-app-api/package.json b/packages/frontend-app-api/package.json index ec5463642b..26473d0dea 100644 --- a/packages/frontend-app-api/package.json +++ b/packages/frontend-app-api/package.json @@ -52,8 +52,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^15.0.0", "@types/react": "^18.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/frontend-defaults/package.json b/packages/frontend-defaults/package.json index 7d78dc5410..9443f63f66 100644 --- a/packages/frontend-defaults/package.json +++ b/packages/frontend-defaults/package.json @@ -44,9 +44,21 @@ "@backstage/core-plugin-api": "workspace:^", "@backstage/test-utils": "workspace:^", "@testing-library/jest-dom": "^6.0.0", - "@testing-library/react": "^16.0.0" + "@testing-library/react": "^16.0.0", + "@types/react": "^18.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { - "react": "^16.13.1 || ^17.0.0 || ^18.0.0" + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/packages/frontend-plugin-api/package.json b/packages/frontend-plugin-api/package.json index 309ebacc04..43509a6132 100644 --- a/packages/frontend-plugin-api/package.json +++ b/packages/frontend-plugin-api/package.json @@ -49,8 +49,8 @@ "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", "history": "^5.3.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/frontend-test-utils/package.json b/packages/frontend-test-utils/package.json index b8973bc5bd..7ebf1eb4f0 100644 --- a/packages/frontend-test-utils/package.json +++ b/packages/frontend-test-utils/package.json @@ -44,8 +44,8 @@ "@backstage/cli": "workspace:^", "@testing-library/jest-dom": "^6.0.0", "@types/react": "^18.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/integration-react/package.json b/packages/integration-react/package.json index 5911006c7e..f426ec4a01 100644 --- a/packages/integration-react/package.json +++ b/packages/integration-react/package.json @@ -48,8 +48,8 @@ "@testing-library/jest-dom": "^6.0.0", "@types/react": "^18.0.0", "msw": "^1.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/repo-tools/src/commands/peer-deps/peer-deps.ts b/packages/repo-tools/src/commands/peer-deps/peer-deps.ts index 9544b3b457..c433dd8581 100644 --- a/packages/repo-tools/src/commands/peer-deps/peer-deps.ts +++ b/packages/repo-tools/src/commands/peer-deps/peer-deps.ts @@ -191,7 +191,7 @@ export default async ({ fix }: { fix: boolean }) => { if (fix) { writeFileSync( resolvePath(pkg.dir, 'package.json'), - JSON.stringify(packageJson, null, 4), + `${JSON.stringify(packageJson, null, 2)}\n`, ); } } diff --git a/packages/techdocs-cli-embedded-app/package.json b/packages/techdocs-cli-embedded-app/package.json index 00baa817d6..5a6d51bad3 100644 --- a/packages/techdocs-cli-embedded-app/package.json +++ b/packages/techdocs-cli-embedded-app/package.json @@ -48,8 +48,8 @@ "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "history": "^5.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0", "react-use": "^17.2.4" }, diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index f31595084c..dc2713ff09 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -67,8 +67,8 @@ "@testing-library/jest-dom": "^6.0.0", "@types/react": "^18.0.0", "msw": "^1.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/theme/package.json b/packages/theme/package.json index 17b655ca52..435f517326 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json @@ -46,8 +46,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/version-bridge/package.json b/packages/version-bridge/package.json index aea9d122bf..50a5883b15 100644 --- a/packages/version-bridge/package.json +++ b/packages/version-bridge/package.json @@ -40,8 +40,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/api-docs-module-protoc-gen-doc/package.json b/plugins/api-docs-module-protoc-gen-doc/package.json index 1c533b7885..f41fe2f9fb 100644 --- a/plugins/api-docs-module-protoc-gen-doc/package.json +++ b/plugins/api-docs-module-protoc-gen-doc/package.json @@ -43,8 +43,8 @@ "@backstage/cli": "workspace:^", "@testing-library/jest-dom": "^6.0.0", "@types/react": "^18.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json index 79c2320563..f9888ed99c 100644 --- a/plugins/api-docs/package.json +++ b/plugins/api-docs/package.json @@ -86,8 +86,8 @@ "@types/highlightjs": "^10.1.0", "@types/react": "^18.0.0", "@types/swagger-ui-react": "^4.18.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/app-visualizer/package.json b/plugins/app-visualizer/package.json index e9e6568210..53720d560a 100644 --- a/plugins/app-visualizer/package.json +++ b/plugins/app-visualizer/package.json @@ -43,8 +43,8 @@ "devDependencies": { "@backstage/cli": "workspace:^", "@types/react": "^18.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/app/package.json b/plugins/app/package.json index 39459854d0..14854539b0 100644 --- a/plugins/app/package.json +++ b/plugins/app/package.json @@ -55,11 +55,21 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", + "@types/react": "^18.0.0", "msw": "^1.0.0", - "react": "^16.13.1 || ^17.0.0 || ^18.0.0" + "react": "^^18.0.0", + "react-dom": "^18.0.0", + "react-router-dom": "^6.3.0" }, "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/auth-react/package.json b/plugins/auth-react/package.json index 5bb99f0c8d..995d9adecf 100644 --- a/plugins/auth-react/package.json +++ b/plugins/auth-react/package.json @@ -52,8 +52,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "msw": "^1.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/catalog-graph/package.json b/plugins/catalog-graph/package.json index c444cd755f..e6e4b5651d 100644 --- a/plugins/catalog-graph/package.json +++ b/plugins/catalog-graph/package.json @@ -77,8 +77,8 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json index 277e259458..1dbfac3179 100644 --- a/plugins/catalog-import/package.json +++ b/plugins/catalog-import/package.json @@ -89,8 +89,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "msw": "^1.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json index 34728f38a0..5d8d0e7da6 100644 --- a/plugins/catalog-react/package.json +++ b/plugins/catalog-react/package.json @@ -95,8 +95,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "@types/zen-observable": "^0.8.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0", "react-test-renderer": "^16.13.1" }, diff --git a/plugins/catalog-unprocessed-entities/package.json b/plugins/catalog-unprocessed-entities/package.json index fe7857091a..a0e652bc03 100644 --- a/plugins/catalog-unprocessed-entities/package.json +++ b/plugins/catalog-unprocessed-entities/package.json @@ -53,8 +53,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json index 1c159af6ce..2b8e0484b7 100644 --- a/plugins/catalog/package.json +++ b/plugins/catalog/package.json @@ -98,8 +98,8 @@ "@testing-library/user-event": "^14.0.0", "@types/pluralize": "^0.0.33", "@types/react": "^18.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0", "swr": "^2.2.5" }, diff --git a/plugins/config-schema/package.json b/plugins/config-schema/package.json index bd29c74543..643f7ac765 100644 --- a/plugins/config-schema/package.json +++ b/plugins/config-schema/package.json @@ -55,8 +55,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/devtools/package.json b/plugins/devtools/package.json index 66679a712d..62a838f8fa 100644 --- a/plugins/devtools/package.json +++ b/plugins/devtools/package.json @@ -69,8 +69,8 @@ "@backstage/dev-utils": "workspace:^", "@testing-library/jest-dom": "^6.0.0", "@types/react": "^18.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/example-todo-list/package.json b/plugins/example-todo-list/package.json index feda571385..4776fc2553 100644 --- a/plugins/example-todo-list/package.json +++ b/plugins/example-todo-list/package.json @@ -51,8 +51,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/home-react/package.json b/plugins/home-react/package.json index e68f20c51e..0a3edf65d4 100644 --- a/plugins/home-react/package.json +++ b/plugins/home-react/package.json @@ -52,8 +52,8 @@ "@backstage/cli": "workspace:^", "@types/react": "^18.0.0", "@types/react-grid-layout": "^1.3.2", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/home/package.json b/plugins/home/package.json index 38a12f7fcc..8dc5bc3b68 100644 --- a/plugins/home/package.json +++ b/plugins/home/package.json @@ -91,8 +91,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "@types/react-grid-layout": "^1.3.2", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/kubernetes-cluster/package.json b/plugins/kubernetes-cluster/package.json index 4f4796007d..21087fd0b7 100644 --- a/plugins/kubernetes-cluster/package.json +++ b/plugins/kubernetes-cluster/package.json @@ -66,8 +66,8 @@ "@testing-library/react": "^16.0.0", "@types/node": "^16.11.26", "@types/react": "^18.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/kubernetes-react/package.json b/plugins/kubernetes-react/package.json index b18794f564..879507fbe4 100644 --- a/plugins/kubernetes-react/package.json +++ b/plugins/kubernetes-react/package.json @@ -72,8 +72,8 @@ "@types/react": "^18.0.0", "jest-websocket-mock": "^2.5.0", "msw": "^1.3.1", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json index f28b4d248a..940054aa65 100644 --- a/plugins/kubernetes/package.json +++ b/plugins/kubernetes/package.json @@ -87,8 +87,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/notifications/package.json b/plugins/notifications/package.json index cb16e1cb96..aafdf2476e 100644 --- a/plugins/notifications/package.json +++ b/plugins/notifications/package.json @@ -65,8 +65,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "msw": "^1.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/org-react/package.json b/plugins/org-react/package.json index b96a6f8e27..e31864e158 100644 --- a/plugins/org-react/package.json +++ b/plugins/org-react/package.json @@ -59,8 +59,8 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/org/package.json b/plugins/org/package.json index f44b6900da..cae8a2d11a 100644 --- a/plugins/org/package.json +++ b/plugins/org/package.json @@ -82,8 +82,8 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/permission-react/package.json b/plugins/permission-react/package.json index cf012d1ead..65732d8c89 100644 --- a/plugins/permission-react/package.json +++ b/plugins/permission-react/package.json @@ -53,8 +53,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/scaffolder-react/package.json b/plugins/scaffolder-react/package.json index 96c3907c46..f3e8eccdbb 100644 --- a/plugins/scaffolder-react/package.json +++ b/plugins/scaffolder-react/package.json @@ -107,8 +107,8 @@ "@types/humanize-duration": "^3.18.1", "@types/luxon": "^3.0.0", "@types/react": "^18.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0", "swr": "^2.0.0" }, diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json index 01c7dacf66..e69cf0e223 100644 --- a/plugins/scaffolder/package.json +++ b/plugins/scaffolder/package.json @@ -121,8 +121,8 @@ "@types/react-resizable": "^3.0.8", "@types/react-window": "^1.8.8", "msw": "^1.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0", "swr": "^2.0.0" }, diff --git a/plugins/search-react/package.json b/plugins/search-react/package.json index 6e942e1dbb..6df72cee7d 100644 --- a/plugins/search-react/package.json +++ b/plugins/search-react/package.json @@ -81,8 +81,8 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/search/package.json b/plugins/search/package.json index 657ea72def..dba2742ca2 100644 --- a/plugins/search/package.json +++ b/plugins/search/package.json @@ -84,8 +84,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "history": "^5.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/signals-react/package.json b/plugins/signals-react/package.json index bd9d862fd4..dad70cff02 100644 --- a/plugins/signals-react/package.json +++ b/plugins/signals-react/package.json @@ -49,8 +49,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/signals/package.json b/plugins/signals/package.json index 51913117a2..f87647d356 100644 --- a/plugins/signals/package.json +++ b/plugins/signals/package.json @@ -60,8 +60,8 @@ "@types/react": "^18.0.0", "jest-websocket-mock": "^2.5.0", "msw": "^1.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/techdocs-addons-test-utils/package.json b/plugins/techdocs-addons-test-utils/package.json index 949c9addf3..4984bbdced 100644 --- a/plugins/techdocs-addons-test-utils/package.json +++ b/plugins/techdocs-addons-test-utils/package.json @@ -56,8 +56,8 @@ "@testing-library/dom": "^10.0.0", "@testing-library/jest-dom": "^6.0.0", "@types/react": "^18.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/techdocs-module-addons-contrib/package.json b/plugins/techdocs-module-addons-contrib/package.json index 951bd8f432..59976dde8c 100644 --- a/plugins/techdocs-module-addons-contrib/package.json +++ b/plugins/techdocs-module-addons-contrib/package.json @@ -58,8 +58,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/techdocs-react/package.json b/plugins/techdocs-react/package.json index 370c1ff110..73cab1645e 100644 --- a/plugins/techdocs-react/package.json +++ b/plugins/techdocs-react/package.json @@ -64,8 +64,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json index 86a491ab24..dec637779c 100644 --- a/plugins/techdocs/package.json +++ b/plugins/techdocs/package.json @@ -101,8 +101,8 @@ "@types/event-source-polyfill": "^1.0.0", "@types/react": "^18.0.0", "canvas": "^2.10.2", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json index 5322e813fa..ee79710815 100644 --- a/plugins/user-settings/package.json +++ b/plugins/user-settings/package.json @@ -83,8 +83,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "msw": "^1.0.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/storybook/package.json b/storybook/package.json index 60ccd0d4ea..43c7b60130 100644 --- a/storybook/package.json +++ b/storybook/package.json @@ -12,8 +12,8 @@ }, "dependencies": { "@swc/core": "^1.3.46", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-hot-loader": "^4.13.0", "react-router-dom": "^6.25.1", "swc-loader": "^0.2.3" From 5129ad066936e954191cf90fcd880be9dd115cd0 Mon Sep 17 00:00:00 2001 From: aramissennyeydd Date: Tue, 24 Sep 2024 21:12:19 -0400 Subject: [PATCH 19/21] standard react version Signed-off-by: aramissennyeydd --- microsite/package.json | 4 ++-- packages/app-defaults/package.json | 4 ++-- packages/app-next-example-plugin/package.json | 4 ++-- packages/app-next/package.json | 4 ++-- packages/app/package.json | 4 ++-- packages/core-app-api/package.json | 4 ++-- packages/core-compat-api/package.json | 4 ++-- packages/core-components/package.json | 4 ++-- packages/core-plugin-api/package.json | 4 ++-- .../templates/default-app/packages/app/package.json.hbs | 4 ++-- packages/dev-utils/package.json | 4 ++-- packages/frontend-app-api/package.json | 4 ++-- packages/frontend-defaults/package.json | 4 ++-- packages/frontend-plugin-api/package.json | 4 ++-- packages/frontend-test-utils/package.json | 4 ++-- packages/integration-react/package.json | 4 ++-- packages/techdocs-cli-embedded-app/package.json | 4 ++-- packages/test-utils/package.json | 4 ++-- packages/theme/package.json | 4 ++-- packages/version-bridge/package.json | 4 ++-- plugins/api-docs-module-protoc-gen-doc/package.json | 4 ++-- plugins/api-docs/package.json | 4 ++-- plugins/app-visualizer/package.json | 4 ++-- plugins/auth-react/package.json | 4 ++-- plugins/catalog-graph/package.json | 4 ++-- plugins/catalog-import/package.json | 4 ++-- plugins/catalog-react/package.json | 4 ++-- plugins/catalog-unprocessed-entities/package.json | 4 ++-- plugins/catalog/package.json | 4 ++-- plugins/config-schema/package.json | 4 ++-- plugins/devtools/package.json | 4 ++-- plugins/example-todo-list/package.json | 4 ++-- plugins/home-react/package.json | 4 ++-- plugins/home/package.json | 4 ++-- plugins/kubernetes-cluster/package.json | 4 ++-- plugins/kubernetes-react/package.json | 4 ++-- plugins/kubernetes/package.json | 4 ++-- plugins/notifications/package.json | 4 ++-- plugins/org-react/package.json | 4 ++-- plugins/org/package.json | 4 ++-- plugins/permission-react/package.json | 4 ++-- plugins/scaffolder-react/package.json | 4 ++-- plugins/scaffolder/package.json | 4 ++-- plugins/search-react/package.json | 4 ++-- plugins/search/package.json | 4 ++-- plugins/signals-react/package.json | 4 ++-- plugins/signals/package.json | 4 ++-- plugins/techdocs-addons-test-utils/package.json | 4 ++-- plugins/techdocs-module-addons-contrib/package.json | 4 ++-- plugins/techdocs-react/package.json | 4 ++-- plugins/techdocs/package.json | 4 ++-- plugins/user-settings/package.json | 4 ++-- storybook/package.json | 4 ++-- 53 files changed, 106 insertions(+), 106 deletions(-) diff --git a/microsite/package.json b/microsite/package.json index fc3405c744..728cef0d96 100644 --- a/microsite/package.json +++ b/microsite/package.json @@ -30,8 +30,8 @@ "docusaurus-pushfeedback": "^1.0.0", "luxon": "^3.0.0", "prism-react-renderer": "^2.1.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "sass": "^1.57.1", "swc-loader": "^0.2.3" }, diff --git a/packages/app-defaults/package.json b/packages/app-defaults/package.json index 5865cb3f43..1865c856b7 100644 --- a/packages/app-defaults/package.json +++ b/packages/app-defaults/package.json @@ -50,8 +50,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/app-next-example-plugin/package.json b/packages/app-next-example-plugin/package.json index dc477e31ec..56374b384c 100644 --- a/packages/app-next-example-plugin/package.json +++ b/packages/app-next-example-plugin/package.json @@ -50,8 +50,8 @@ "@types/react": "^18.0.0", "cross-fetch": "^4.0.0", "msw": "^1.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/app-next/package.json b/packages/app-next/package.json index da3ab3d184..29f9105031 100644 --- a/packages/app-next/package.json +++ b/packages/app-next/package.json @@ -78,8 +78,8 @@ "@material-ui/lab": "4.0.0-alpha.61", "@octokit/rest": "^19.0.3", "history": "^5.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router": "^6.3.0", "react-router-dom": "^6.3.0", "react-use": "^17.2.4", diff --git a/packages/app/package.json b/packages/app/package.json index 02e6a8673b..15cdd85d32 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -76,8 +76,8 @@ "@octokit/rest": "^19.0.3", "@vitejs/plugin-react": "^4.3.1", "history": "^5.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router": "^6.3.0", "react-router-dom": "^6.3.0", "react-use": "^17.2.4", diff --git a/packages/core-app-api/package.json b/packages/core-app-api/package.json index d1c9f0a053..6d443606b0 100644 --- a/packages/core-app-api/package.json +++ b/packages/core-app-api/package.json @@ -70,8 +70,8 @@ "@types/react": "^18.0.0", "@types/zen-observable": "^0.8.0", "msw": "^1.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-beta": "npm:react-router@6.0.0-beta.0", "react-router-dom": "^6.3.0", "react-router-dom-beta": "npm:react-router-dom@6.0.0-beta.0", diff --git a/packages/core-compat-api/package.json b/packages/core-compat-api/package.json index d7f4848c4a..cbb8fc3592 100644 --- a/packages/core-compat-api/package.json +++ b/packages/core-compat-api/package.json @@ -49,8 +49,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0", "zod": "^3.22.4" }, diff --git a/packages/core-components/package.json b/packages/core-components/package.json index fc9ebc30e5..30699ad7a1 100644 --- a/packages/core-components/package.json +++ b/packages/core-components/package.json @@ -116,8 +116,8 @@ "cross-fetch": "^4.0.0", "history": "^5.0.0", "msw": "^1.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/core-plugin-api/package.json b/packages/core-plugin-api/package.json index e9e46a8064..876457b939 100644 --- a/packages/core-plugin-api/package.json +++ b/packages/core-plugin-api/package.json @@ -64,8 +64,8 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/create-app/templates/default-app/packages/app/package.json.hbs b/packages/create-app/templates/default-app/packages/app/package.json.hbs index 6415b25771..0601a3a4e3 100644 --- a/packages/create-app/templates/default-app/packages/app/package.json.hbs +++ b/packages/create-app/templates/default-app/packages/app/package.json.hbs @@ -41,8 +41,8 @@ "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "history": "^5.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router": "^6.3.0", "react-router-dom": "^6.3.0", "react-use": "^17.2.4" diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index d8fa50b1ee..a45f63324e 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -56,8 +56,8 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0", "zen-observable": "^0.10.0" }, diff --git a/packages/frontend-app-api/package.json b/packages/frontend-app-api/package.json index 26473d0dea..ec5463642b 100644 --- a/packages/frontend-app-api/package.json +++ b/packages/frontend-app-api/package.json @@ -52,8 +52,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^15.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/frontend-defaults/package.json b/packages/frontend-defaults/package.json index 9443f63f66..651b04258d 100644 --- a/packages/frontend-defaults/package.json +++ b/packages/frontend-defaults/package.json @@ -46,8 +46,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/frontend-plugin-api/package.json b/packages/frontend-plugin-api/package.json index 43509a6132..309ebacc04 100644 --- a/packages/frontend-plugin-api/package.json +++ b/packages/frontend-plugin-api/package.json @@ -49,8 +49,8 @@ "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", "history": "^5.3.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/frontend-test-utils/package.json b/packages/frontend-test-utils/package.json index 7ebf1eb4f0..b8973bc5bd 100644 --- a/packages/frontend-test-utils/package.json +++ b/packages/frontend-test-utils/package.json @@ -44,8 +44,8 @@ "@backstage/cli": "workspace:^", "@testing-library/jest-dom": "^6.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/integration-react/package.json b/packages/integration-react/package.json index f426ec4a01..5911006c7e 100644 --- a/packages/integration-react/package.json +++ b/packages/integration-react/package.json @@ -48,8 +48,8 @@ "@testing-library/jest-dom": "^6.0.0", "@types/react": "^18.0.0", "msw": "^1.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/techdocs-cli-embedded-app/package.json b/packages/techdocs-cli-embedded-app/package.json index 5a6d51bad3..00baa817d6 100644 --- a/packages/techdocs-cli-embedded-app/package.json +++ b/packages/techdocs-cli-embedded-app/package.json @@ -48,8 +48,8 @@ "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "history": "^5.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0", "react-use": "^17.2.4" }, diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index dc2713ff09..f31595084c 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -67,8 +67,8 @@ "@testing-library/jest-dom": "^6.0.0", "@types/react": "^18.0.0", "msw": "^1.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/theme/package.json b/packages/theme/package.json index 435f517326..17b655ca52 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json @@ -46,8 +46,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/packages/version-bridge/package.json b/packages/version-bridge/package.json index 50a5883b15..aea9d122bf 100644 --- a/packages/version-bridge/package.json +++ b/packages/version-bridge/package.json @@ -40,8 +40,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/api-docs-module-protoc-gen-doc/package.json b/plugins/api-docs-module-protoc-gen-doc/package.json index f41fe2f9fb..1c533b7885 100644 --- a/plugins/api-docs-module-protoc-gen-doc/package.json +++ b/plugins/api-docs-module-protoc-gen-doc/package.json @@ -43,8 +43,8 @@ "@backstage/cli": "workspace:^", "@testing-library/jest-dom": "^6.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json index f9888ed99c..79c2320563 100644 --- a/plugins/api-docs/package.json +++ b/plugins/api-docs/package.json @@ -86,8 +86,8 @@ "@types/highlightjs": "^10.1.0", "@types/react": "^18.0.0", "@types/swagger-ui-react": "^4.18.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/app-visualizer/package.json b/plugins/app-visualizer/package.json index 53720d560a..e9e6568210 100644 --- a/plugins/app-visualizer/package.json +++ b/plugins/app-visualizer/package.json @@ -43,8 +43,8 @@ "devDependencies": { "@backstage/cli": "workspace:^", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/auth-react/package.json b/plugins/auth-react/package.json index 995d9adecf..5bb99f0c8d 100644 --- a/plugins/auth-react/package.json +++ b/plugins/auth-react/package.json @@ -52,8 +52,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "msw": "^1.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/catalog-graph/package.json b/plugins/catalog-graph/package.json index e6e4b5651d..c444cd755f 100644 --- a/plugins/catalog-graph/package.json +++ b/plugins/catalog-graph/package.json @@ -77,8 +77,8 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json index 1dbfac3179..277e259458 100644 --- a/plugins/catalog-import/package.json +++ b/plugins/catalog-import/package.json @@ -89,8 +89,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "msw": "^1.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json index 5d8d0e7da6..34728f38a0 100644 --- a/plugins/catalog-react/package.json +++ b/plugins/catalog-react/package.json @@ -95,8 +95,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "@types/zen-observable": "^0.8.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0", "react-test-renderer": "^16.13.1" }, diff --git a/plugins/catalog-unprocessed-entities/package.json b/plugins/catalog-unprocessed-entities/package.json index a0e652bc03..fe7857091a 100644 --- a/plugins/catalog-unprocessed-entities/package.json +++ b/plugins/catalog-unprocessed-entities/package.json @@ -53,8 +53,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json index 2b8e0484b7..1c159af6ce 100644 --- a/plugins/catalog/package.json +++ b/plugins/catalog/package.json @@ -98,8 +98,8 @@ "@testing-library/user-event": "^14.0.0", "@types/pluralize": "^0.0.33", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0", "swr": "^2.2.5" }, diff --git a/plugins/config-schema/package.json b/plugins/config-schema/package.json index 643f7ac765..bd29c74543 100644 --- a/plugins/config-schema/package.json +++ b/plugins/config-schema/package.json @@ -55,8 +55,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/devtools/package.json b/plugins/devtools/package.json index 62a838f8fa..66679a712d 100644 --- a/plugins/devtools/package.json +++ b/plugins/devtools/package.json @@ -69,8 +69,8 @@ "@backstage/dev-utils": "workspace:^", "@testing-library/jest-dom": "^6.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/example-todo-list/package.json b/plugins/example-todo-list/package.json index 4776fc2553..feda571385 100644 --- a/plugins/example-todo-list/package.json +++ b/plugins/example-todo-list/package.json @@ -51,8 +51,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/home-react/package.json b/plugins/home-react/package.json index 0a3edf65d4..e68f20c51e 100644 --- a/plugins/home-react/package.json +++ b/plugins/home-react/package.json @@ -52,8 +52,8 @@ "@backstage/cli": "workspace:^", "@types/react": "^18.0.0", "@types/react-grid-layout": "^1.3.2", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/home/package.json b/plugins/home/package.json index 8dc5bc3b68..38a12f7fcc 100644 --- a/plugins/home/package.json +++ b/plugins/home/package.json @@ -91,8 +91,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "@types/react-grid-layout": "^1.3.2", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/kubernetes-cluster/package.json b/plugins/kubernetes-cluster/package.json index 21087fd0b7..4f4796007d 100644 --- a/plugins/kubernetes-cluster/package.json +++ b/plugins/kubernetes-cluster/package.json @@ -66,8 +66,8 @@ "@testing-library/react": "^16.0.0", "@types/node": "^16.11.26", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/kubernetes-react/package.json b/plugins/kubernetes-react/package.json index 879507fbe4..b18794f564 100644 --- a/plugins/kubernetes-react/package.json +++ b/plugins/kubernetes-react/package.json @@ -72,8 +72,8 @@ "@types/react": "^18.0.0", "jest-websocket-mock": "^2.5.0", "msw": "^1.3.1", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json index 940054aa65..f28b4d248a 100644 --- a/plugins/kubernetes/package.json +++ b/plugins/kubernetes/package.json @@ -87,8 +87,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/notifications/package.json b/plugins/notifications/package.json index aafdf2476e..cb16e1cb96 100644 --- a/plugins/notifications/package.json +++ b/plugins/notifications/package.json @@ -65,8 +65,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "msw": "^1.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/org-react/package.json b/plugins/org-react/package.json index e31864e158..b96a6f8e27 100644 --- a/plugins/org-react/package.json +++ b/plugins/org-react/package.json @@ -59,8 +59,8 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/org/package.json b/plugins/org/package.json index cae8a2d11a..f44b6900da 100644 --- a/plugins/org/package.json +++ b/plugins/org/package.json @@ -82,8 +82,8 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/permission-react/package.json b/plugins/permission-react/package.json index 65732d8c89..cf012d1ead 100644 --- a/plugins/permission-react/package.json +++ b/plugins/permission-react/package.json @@ -53,8 +53,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/scaffolder-react/package.json b/plugins/scaffolder-react/package.json index f3e8eccdbb..96c3907c46 100644 --- a/plugins/scaffolder-react/package.json +++ b/plugins/scaffolder-react/package.json @@ -107,8 +107,8 @@ "@types/humanize-duration": "^3.18.1", "@types/luxon": "^3.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0", "swr": "^2.0.0" }, diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json index e69cf0e223..01c7dacf66 100644 --- a/plugins/scaffolder/package.json +++ b/plugins/scaffolder/package.json @@ -121,8 +121,8 @@ "@types/react-resizable": "^3.0.8", "@types/react-window": "^1.8.8", "msw": "^1.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0", "swr": "^2.0.0" }, diff --git a/plugins/search-react/package.json b/plugins/search-react/package.json index 6df72cee7d..6e942e1dbb 100644 --- a/plugins/search-react/package.json +++ b/plugins/search-react/package.json @@ -81,8 +81,8 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/search/package.json b/plugins/search/package.json index dba2742ca2..657ea72def 100644 --- a/plugins/search/package.json +++ b/plugins/search/package.json @@ -84,8 +84,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "history": "^5.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/signals-react/package.json b/plugins/signals-react/package.json index dad70cff02..bd9d862fd4 100644 --- a/plugins/signals-react/package.json +++ b/plugins/signals-react/package.json @@ -49,8 +49,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/signals/package.json b/plugins/signals/package.json index f87647d356..51913117a2 100644 --- a/plugins/signals/package.json +++ b/plugins/signals/package.json @@ -60,8 +60,8 @@ "@types/react": "^18.0.0", "jest-websocket-mock": "^2.5.0", "msw": "^1.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/techdocs-addons-test-utils/package.json b/plugins/techdocs-addons-test-utils/package.json index 4984bbdced..949c9addf3 100644 --- a/plugins/techdocs-addons-test-utils/package.json +++ b/plugins/techdocs-addons-test-utils/package.json @@ -56,8 +56,8 @@ "@testing-library/dom": "^10.0.0", "@testing-library/jest-dom": "^6.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/techdocs-module-addons-contrib/package.json b/plugins/techdocs-module-addons-contrib/package.json index 59976dde8c..951bd8f432 100644 --- a/plugins/techdocs-module-addons-contrib/package.json +++ b/plugins/techdocs-module-addons-contrib/package.json @@ -58,8 +58,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/techdocs-react/package.json b/plugins/techdocs-react/package.json index 73cab1645e..370c1ff110 100644 --- a/plugins/techdocs-react/package.json +++ b/plugins/techdocs-react/package.json @@ -64,8 +64,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json index dec637779c..86a491ab24 100644 --- a/plugins/techdocs/package.json +++ b/plugins/techdocs/package.json @@ -101,8 +101,8 @@ "@types/event-source-polyfill": "^1.0.0", "@types/react": "^18.0.0", "canvas": "^2.10.2", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json index ee79710815..5322e813fa 100644 --- a/plugins/user-settings/package.json +++ b/plugins/user-settings/package.json @@ -83,8 +83,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "msw": "^1.0.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/storybook/package.json b/storybook/package.json index 43c7b60130..60ccd0d4ea 100644 --- a/storybook/package.json +++ b/storybook/package.json @@ -12,8 +12,8 @@ }, "dependencies": { "@swc/core": "^1.3.46", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-hot-loader": "^4.13.0", "react-router-dom": "^6.25.1", "swc-loader": "^0.2.3" From 727c717f92d49998e77f8a35372b0598dca85217 Mon Sep 17 00:00:00 2001 From: aramissennyeydd Date: Tue, 24 Sep 2024 21:32:06 -0400 Subject: [PATCH 20/21] ensure changes work with latest master Signed-off-by: aramissennyeydd --- microsite/package.json | 4 +- packages/core-compat-api/package.json | 3 +- .../ErrorBoundary/ErrorBoundary.test.tsx | 3 +- packages/frontend-app-api/package.json | 6 +-- packages/frontend-defaults/package.json | 3 +- .../src/commands/peer-deps/peer-deps.ts | 39 ++++++++++++++++++- .../techdocs-cli-embedded-app/package.json | 4 +- packages/version-bridge/package.json | 1 + plugins/app/package.json | 5 +-- plugins/kubernetes/package.json | 1 - .../scaffolder-node-test-utils/package.json | 17 +++++++- plugins/techdocs/package.json | 1 - 12 files changed, 67 insertions(+), 20 deletions(-) diff --git a/microsite/package.json b/microsite/package.json index 728cef0d96..fc3405c744 100644 --- a/microsite/package.json +++ b/microsite/package.json @@ -30,8 +30,8 @@ "docusaurus-pushfeedback": "^1.0.0", "luxon": "^3.0.0", "prism-react-renderer": "^2.1.0", - "react": "^18.0.2", - "react-dom": "^18.0.2", + "react": "^18.0.0", + "react-dom": "^18.0.0", "sass": "^1.57.1", "swc-loader": "^0.2.3" }, diff --git a/packages/core-compat-api/package.json b/packages/core-compat-api/package.json index cbb8fc3592..6863f65a0c 100644 --- a/packages/core-compat-api/package.json +++ b/packages/core-compat-api/package.json @@ -33,7 +33,8 @@ "dependencies": { "@backstage/core-plugin-api": "workspace:^", "@backstage/frontend-plugin-api": "workspace:^", - "@backstage/version-bridge": "workspace:^" + "@backstage/version-bridge": "workspace:^", + "lodash": "^4.17.21" }, "devDependencies": { "@backstage-community/plugin-puppetdb": "^0.1.18", diff --git a/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx b/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx index 8bfb228f53..c96ab67782 100644 --- a/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx +++ b/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.test.tsx @@ -77,7 +77,8 @@ describe('', () => { /^The above error occurred in the component:/, ), expect.stringMatching(/^ErrorBoundary/), + expect.stringMatching(/Warning: findDOMNode/), // React warning, unfortunate but currently true ]); - expect(error.length).toEqual(4); + expect(error.length).toEqual(5); }); }); diff --git a/packages/frontend-app-api/package.json b/packages/frontend-app-api/package.json index ec5463642b..674556d144 100644 --- a/packages/frontend-app-api/package.json +++ b/packages/frontend-app-api/package.json @@ -40,17 +40,15 @@ "@backstage/frontend-plugin-api": "workspace:^", "@backstage/types": "workspace:^", "@backstage/version-bridge": "workspace:^", - "@material-ui/core": "^4.12.4", - "@material-ui/icons": "^4.11.3", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "lodash": "^4.17.21", "zod": "^3.22.4" }, "devDependencies": { "@backstage/cli": "workspace:^", + "@backstage/plugin-app": "workspace:^", "@backstage/test-utils": "workspace:^", "@testing-library/jest-dom": "^6.0.0", - "@testing-library/react": "^15.0.0", + "@testing-library/react": "^16.0.0", "@types/react": "^18.0.0", "react": "^18.0.2", "react-dom": "^18.0.2", diff --git a/packages/frontend-defaults/package.json b/packages/frontend-defaults/package.json index 651b04258d..8f8abb0512 100644 --- a/packages/frontend-defaults/package.json +++ b/packages/frontend-defaults/package.json @@ -36,8 +36,7 @@ "@backstage/frontend-app-api": "workspace:^", "@backstage/frontend-plugin-api": "workspace:^", "@backstage/plugin-app": "workspace:^", - "@react-hookz/web": "^24.0.0", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0" + "@react-hookz/web": "^24.0.0" }, "devDependencies": { "@backstage/cli": "workspace:^", diff --git a/packages/repo-tools/src/commands/peer-deps/peer-deps.ts b/packages/repo-tools/src/commands/peer-deps/peer-deps.ts index c433dd8581..70e566dd32 100644 --- a/packages/repo-tools/src/commands/peer-deps/peer-deps.ts +++ b/packages/repo-tools/src/commands/peer-deps/peer-deps.ts @@ -27,8 +27,8 @@ type ExtendedPackageJSON = Package['packageJson'] & { const desiredLocalVersionsOfDependencies = { '@types/react': '^18.0.0', - react: '^18.0.0', - 'react-dom': '^18.0.0', + react: '^18.0.2', + 'react-dom': '^18.0.2', 'react-router-dom': '^6.3.0', }; @@ -55,6 +55,10 @@ const isDevDependency = (dep: string, packageJson: ExtendedPackageJSON) => { return !!packageJson.devDependencies?.[dep]; }; +const isProdDependency = (dep: string, packageJson: ExtendedPackageJSON) => { + return !!packageJson.dependencies?.[dep]; +}; + const isPeerDependency = (dep: string, packageJson: ExtendedPackageJSON) => { return !!packageJson.peerDependencies?.[dep]; }; @@ -65,6 +69,16 @@ const isStandaloneApplication = (packageJson: ExtendedPackageJSON) => { ); }; +const matchesDependency = (dep: string, packageJson: ExtendedPackageJSON) => { + return ( + packageJson.devDependencies && + packageJson.devDependencies[dep] === + desiredLocalVersionsOfDependencies[ + dep as keyof typeof desiredLocalVersionsOfDependencies + ] + ); +}; + const matchesPeerDependency = ( dep: string, packageJson: ExtendedPackageJSON, @@ -138,12 +152,20 @@ export default async ({ fix }: { fix: boolean }) => { `Peer dependency ${dep} in ${pkg.packageJson.name} is not listed as a devDependency`, ); attemptToApplyFix(() => { + delete packageJson.dependencies?.[dep]; packageJson.devDependencies = packageJson.devDependencies || {}; packageJson.devDependencies[dep] = desiredLocalVersionsOfDependencies[ dep as keyof typeof desiredLocalVersionsOfDependencies ]; }); + } else if (isProdDependency(dep, packageJson)) { + console.error( + `Peer dependency ${dep} in ${pkg.packageJson.name} is listed as a dependency`, + ); + attemptToApplyFix(() => { + delete packageJson.dependencies?.[dep]; + }); } const groups = groupsOfPeerDependencies.filter(group => @@ -167,6 +189,19 @@ export default async ({ fix }: { fix: boolean }) => { } } + if (!matchesDependency(dep, packageJson)) { + console.error( + `Incorrect dependency ${dep} in ${pkg.packageJson.name}`, + ); + attemptToApplyFix(() => { + packageJson.devDependencies = packageJson.devDependencies || {}; + packageJson.devDependencies[dep] = + desiredLocalVersionsOfDependencies[ + dep as keyof typeof desiredLocalVersionsOfDependencies + ]; + }); + } + if (!matchesPeerDependency(dep, packageJson)) { console.error( `Incorrect peer dependency ${dep} in ${pkg.packageJson.name}`, diff --git a/packages/techdocs-cli-embedded-app/package.json b/packages/techdocs-cli-embedded-app/package.json index 00baa817d6..249ec2f062 100644 --- a/packages/techdocs-cli-embedded-app/package.json +++ b/packages/techdocs-cli-embedded-app/package.json @@ -59,8 +59,8 @@ "@testing-library/jest-dom": "^6.0.0", "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", - "@types/react": "^18.0.0", - "@types/react-dom": "^18.0.0", + "@types/react": "*", + "@types/react-dom": "*", "cross-env": "^7.0.0" }, "bundled": true diff --git a/packages/version-bridge/package.json b/packages/version-bridge/package.json index aea9d122bf..b7aaab34f8 100644 --- a/packages/version-bridge/package.json +++ b/packages/version-bridge/package.json @@ -35,6 +35,7 @@ "start": "backstage-cli package start", "test": "backstage-cli package test" }, + "dependencies": {}, "devDependencies": { "@backstage/cli": "workspace:^", "@testing-library/jest-dom": "^6.0.0", diff --git a/plugins/app/package.json b/plugins/app/package.json index 14854539b0..ed33051043 100644 --- a/plugins/app/package.json +++ b/plugins/app/package.json @@ -45,7 +45,6 @@ "@material-ui/core": "^4.9.13", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "^4.0.0-alpha.61", - "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-use": "^17.2.4" }, "devDependencies": { @@ -57,8 +56,8 @@ "@testing-library/user-event": "^14.0.0", "@types/react": "^18.0.0", "msw": "^1.0.0", - "react": "^^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", "react-router-dom": "^6.3.0" }, "peerDependencies": { diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json index f28b4d248a..b8ef59db90 100644 --- a/plugins/kubernetes/package.json +++ b/plugins/kubernetes/package.json @@ -92,7 +92,6 @@ "react-router-dom": "^6.3.0" }, "peerDependencies": { - "@testing-library/react": "^16.0.0", "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react": "^16.13.1 || ^17.0.0 || ^18.0.0", "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", diff --git a/plugins/scaffolder-node-test-utils/package.json b/plugins/scaffolder-node-test-utils/package.json index dc71447bd9..a372dbc317 100644 --- a/plugins/scaffolder-node-test-utils/package.json +++ b/plugins/scaffolder-node-test-utils/package.json @@ -46,6 +46,21 @@ "@backstage/types": "workspace:^" }, "devDependencies": { - "@backstage/cli": "workspace:^" + "@backstage/cli": "workspace:^", + "@types/react": "^18.0.0", + "react": "^18.0.2", + "react-dom": "^18.0.2", + "react-router-dom": "^6.3.0" + }, + "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0", + "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } } diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json index 86a491ab24..8fe9b71c1c 100644 --- a/plugins/techdocs/package.json +++ b/plugins/techdocs/package.json @@ -98,7 +98,6 @@ "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.0.0", "@types/dompurify": "^3.0.0", - "@types/event-source-polyfill": "^1.0.0", "@types/react": "^18.0.0", "canvas": "^2.10.2", "react": "^18.0.2", From 866c7c44240b1b7c0ec908cbb5b1e4c7c0dba1c1 Mon Sep 17 00:00:00 2001 From: aramissennyeydd Date: Tue, 24 Sep 2024 21:43:32 -0400 Subject: [PATCH 21/21] update lockfile Signed-off-by: aramissennyeydd --- packages/version-bridge/package.json | 1 - yarn.lock | 79 ++++++++++++++-------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/packages/version-bridge/package.json b/packages/version-bridge/package.json index b7aaab34f8..aea9d122bf 100644 --- a/packages/version-bridge/package.json +++ b/packages/version-bridge/package.json @@ -35,7 +35,6 @@ "start": "backstage-cli package start", "test": "backstage-cli package test" }, - "dependencies": {}, "devDependencies": { "@backstage/cli": "workspace:^", "@testing-library/jest-dom": "^6.0.0", diff --git a/yarn.lock b/yarn.lock index f7eb3d310b..4fbf2e2ad1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4192,8 +4192,9 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 "@types/react": ^18.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + lodash: ^4.17.21 + react: ^18.0.2 + react-dom: ^18.0.2 react-router-dom: ^6.3.0 zod: ^3.22.4 peerDependencies: @@ -4597,13 +4598,12 @@ __metadata: "@backstage/errors": "workspace:^" "@backstage/frontend-defaults": "workspace:^" "@backstage/frontend-plugin-api": "workspace:^" + "@backstage/plugin-app": "workspace:^" "@backstage/test-utils": "workspace:^" "@backstage/types": "workspace:^" "@backstage/version-bridge": "workspace:^" - "@material-ui/core": ^4.12.4 - "@material-ui/icons": ^4.11.3 "@testing-library/jest-dom": ^6.0.0 - "@testing-library/react": ^15.0.0 + "@testing-library/react": ^16.0.0 "@types/react": ^18.0.0 lodash: ^4.17.21 react: ^18.0.2 @@ -4636,9 +4636,18 @@ __metadata: "@react-hookz/web": ^24.0.0 "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 + react-router-dom: ^6.3.0 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 + react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 + react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -4973,13 +4982,20 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 "@testing-library/user-event": ^14.0.0 - "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + "@types/react": ^18.0.0 msw: ^1.0.0 - react: ^16.13.1 || ^17.0.0 || ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 + react-router-dom: ^6.3.0 react-use: ^17.2.4 peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 + react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -6825,7 +6841,6 @@ __metadata: xterm-addon-attach: ^0.9.0 xterm-addon-fit: ^0.8.0 peerDependencies: - "@testing-library/react": ^16.0.0 "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 react: ^16.13.1 || ^17.0.0 || ^18.0.0 react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 @@ -7598,6 +7613,18 @@ __metadata: "@backstage/cli": "workspace:^" "@backstage/plugin-scaffolder-node": "workspace:^" "@backstage/types": "workspace:^" + "@types/react": ^18.0.0 + react: ^18.0.2 + react-dom: ^18.0.2 + react-router-dom: ^6.3.0 + peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0 + react: ^16.13.1 || ^17.0.0 || ^18.0.0 + react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 + react-router-dom: 6.0.0-beta.0 || ^6.3.0 + peerDependenciesMeta: + "@types/react": + optional: true languageName: unknown linkType: soft @@ -8377,7 +8404,6 @@ __metadata: "@testing-library/react": ^16.0.0 "@testing-library/user-event": ^14.0.0 "@types/dompurify": ^3.0.0 - "@types/event-source-polyfill": ^1.0.0 "@types/react": ^18.0.0 canvas: ^2.10.2 dompurify: ^3.0.0 @@ -17206,24 +17232,6 @@ __metadata: languageName: node linkType: hard -"@testing-library/react@npm:^15.0.0": - version: 15.0.7 - resolution: "@testing-library/react@npm:15.0.7" - dependencies: - "@babel/runtime": ^7.12.5 - "@testing-library/dom": ^10.0.0 - "@types/react-dom": ^18.0.0 - peerDependencies: - "@types/react": ^18.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 - peerDependenciesMeta: - "@types/react": - optional: true - checksum: eb33fd82eb811bb8612aa154e430a2c1c251d5ed45a477ef57fe20095db494ea7dcfa6b1e1e2bffb0c7ee10c86e408745d95a879be8ca8fbe301bb91e5f2e5db - languageName: node - linkType: hard - "@testing-library/react@npm:^16.0.0": version: 16.0.1 resolution: "@testing-library/react@npm:16.0.1" @@ -17797,13 +17805,6 @@ __metadata: languageName: node linkType: hard -"@types/event-source-polyfill@npm:^1.0.0": - version: 1.0.5 - resolution: "@types/event-source-polyfill@npm:1.0.5" - checksum: f506b68710162f2ade1bccbc5691b8c67e5a703e565df2bc0b7b5be2637ba838ef81ec6c10b03248fe4d054386d95a6e827c7aace6e924986c2b9985f77b55de - languageName: node - linkType: hard - "@types/expect@npm:^1.20.4": version: 1.20.4 resolution: "@types/expect@npm:1.20.4" @@ -38502,7 +38503,7 @@ __metadata: languageName: node linkType: hard -"react-dom@npm:^18.0.0, react-dom@npm:^18.0.2": +"react-dom@npm:^18.0.2": version: 18.3.1 resolution: "react-dom@npm:18.3.1" dependencies: @@ -39086,7 +39087,7 @@ __metadata: languageName: node linkType: hard -"react@npm:^16.13.1 || ^17.0.0 || ^18.0.0, react@npm:^18.0.0, react@npm:^18.0.2": +"react@npm:^18.0.2": version: 18.3.1 resolution: "react@npm:18.3.1" dependencies: @@ -42318,8 +42319,8 @@ __metadata: "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^16.0.0 "@testing-library/user-event": ^14.0.0 - "@types/react": ^18.0.0 - "@types/react-dom": ^18.0.0 + "@types/react": "*" + "@types/react-dom": "*" cross-env: ^7.0.0 history: ^5.0.0 react: ^18.0.2