From c6abe12e45507621202de1123caa9b84eec41d16 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Mon, 1 Jun 2020 12:27:29 +0200 Subject: [PATCH] packages,plugins: fix incorrect type dependencies --- packages/core-api/package.json | 7 ++++--- packages/core-api/src/routing/index.ts | 1 + packages/core/package.json | 13 +++++++------ packages/dev-utils/package.json | 7 +++++-- packages/test-utils-core/package.json | 7 +++++-- packages/test-utils/package.json | 7 +++++-- plugins/tech-radar/package.json | 1 + yarn.lock | 2 +- 8 files changed, 29 insertions(+), 16 deletions(-) diff --git a/packages/core-api/package.json b/packages/core-api/package.json index 73e7a18d33..a8c2b939ac 100644 --- a/packages/core-api/package.json +++ b/packages/core-api/package.json @@ -31,9 +31,7 @@ "@backstage/theme": "^0.1.1-alpha.6", "@material-ui/core": "^4.9.1", "@material-ui/icons": "^4.9.1", - "@types/jest": "^25.2.2", - "@types/node": "^12.0.0", - "@types/zen-observable": "^0.8.0", + "@types/react": "^16.9", "prop-types": "^15.7.2", "react": "^16.12.0", "react-router-dom": "^5.2.0", @@ -46,6 +44,9 @@ "@testing-library/jest-dom": "^5.7.0", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^10.2.4", + "@types/jest": "^25.2.2", + "@types/node": "^12.0.0", + "@types/zen-observable": "^0.8.0", "jest-fetch-mock": "^3.0.3" }, "files": [ diff --git a/packages/core-api/src/routing/index.ts b/packages/core-api/src/routing/index.ts index 98e4f46d98..67d4c82167 100644 --- a/packages/core-api/src/routing/index.ts +++ b/packages/core-api/src/routing/index.ts @@ -16,3 +16,4 @@ export * from './types'; export { createRouteRef } from './RouteRef'; +export type { MutableRouteRef } from './RouteRef'; diff --git a/packages/core/package.json b/packages/core/package.json index a89ffc0b92..452633a4e5 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -33,13 +33,8 @@ "@material-ui/core": "^4.9.1", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", - "@types/classnames": "^2.2.9", - "@types/google-protobuf": "^3.7.2", - "@types/jest": "^25.2.2", - "@types/node": "^12.0.0", - "@types/react-helmet": "^5.0.15", + "@types/react": "^16.9", "@types/react-sparklines": "^1.7.0", - "@types/zen-observable": "^0.8.0", "classnames": "^2.2.6", "clsx": "^1.1.0", "lodash": "^4.17.15", @@ -61,6 +56,12 @@ "@testing-library/jest-dom": "^5.7.0", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^10.2.4", + "@types/classnames": "^2.2.9", + "@types/google-protobuf": "^3.7.2", + "@types/jest": "^25.2.2", + "@types/node": "^12.0.0", + "@types/react-helmet": "^5.0.15", + "@types/zen-observable": "^0.8.0", "jest-fetch-mock": "^3.0.3" }, "files": [ diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 8c4b960ebb..fc77298371 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -37,14 +37,17 @@ "@testing-library/jest-dom": "^5.7.0", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^10.2.4", - "@types/jest": "^25.2.2", - "@types/node": "^12.0.0", + "@types/react": "^16.9", "react": "^16.12.0", "react-dom": "^16.12.0", "react-hot-loader": "^4.12.21", "react-router": "^5.2.0", "react-router-dom": "^5.2.0" }, + "devDependencies": { + "@types/jest": "^25.2.2", + "@types/node": "^12.0.0" + }, "files": [ "dist/**/*.{js,d.ts}" ] diff --git a/packages/test-utils-core/package.json b/packages/test-utils-core/package.json index ad4bbc95c9..f629877a65 100644 --- a/packages/test-utils-core/package.json +++ b/packages/test-utils-core/package.json @@ -30,11 +30,14 @@ "dependencies": { "@testing-library/jest-dom": "^5.7.0", "@testing-library/react": "^9.3.2", - "@types/jest": "^25.2.2", - "@types/node": "^12.0.0", + "@types/react": "^16.9", "react": "^16.12.0", "react-dom": "^16.12.0" }, + "devDependencies": { + "@types/jest": "^25.2.2", + "@types/node": "^12.0.0" + }, "files": [ "dist/**/*.{js,d.ts}" ] diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index fd893f8c8c..4bb7305671 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -35,13 +35,16 @@ "@testing-library/jest-dom": "^5.7.0", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^10.2.4", - "@types/jest": "^25.2.2", - "@types/node": "^12.0.0", + "@types/react": "^16.9", "react": "^16.12.0", "react-dom": "^16.12.0", "react-router": "^5.2.0", "react-router-dom": "^5.2.0" }, + "devDependencies": { + "@types/jest": "^25.2.2", + "@types/node": "^12.0.0" + }, "files": [ "dist/**/*.{js,d.ts}" ] diff --git a/plugins/tech-radar/package.json b/plugins/tech-radar/package.json index 3a9c75a3f7..22568f8b97 100644 --- a/plugins/tech-radar/package.json +++ b/plugins/tech-radar/package.json @@ -26,6 +26,7 @@ "@material-ui/core": "^4.9.1", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", + "@types/react": "^16.9", "color": "^3.1.2", "d3-force": "^2.0.1", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index b115b0bf9f..80e3916f53 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4417,7 +4417,7 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^16.8.19": +"@types/react@*", "@types/react@^16.8.19", "@types/react@^16.9": version "16.9.25" resolved "https://registry.npmjs.org/@types/react/-/react-16.9.25.tgz#6ae2159b40138c792058a23c3c04fd3db49e929e" integrity sha512-Dlj2V72cfYLPNscIG3/SMUOzhzj7GK3bpSrfefwt2YT9GLynvLCCZjbhyF6VsT0q0+aRACRX03TDJGb7cA0cqg==