From 0a953764d70a8d87779bcf7ecc84ecb4d698b8b7 Mon Sep 17 00:00:00 2001 From: Sebastian Silbermann Date: Mon, 10 Feb 2020 10:46:57 +0100 Subject: [PATCH 1/2] fix: missing peer dep warning when installing worktree --- package.json | 1 + packages/material-ui/package.json | 4 +--- yarn.lock | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index a1f0167f7d9daf..192d2f3e2e7643 100644 --- a/package.json +++ b/package.json @@ -119,6 +119,7 @@ "puppeteer": "^2.0.0", "react": "^16.12.0", "react-dom": "^16.12.0", + "react-test-renderer": "^16.12.0", "rimraf": "^3.0.0", "rollup": "^1.21.4", "rollup-plugin-babel": "^4.3.3", diff --git a/packages/material-ui/package.json b/packages/material-ui/package.json index c7063d02230886..a39f9f9a789218 100644 --- a/packages/material-ui/package.json +++ b/packages/material-ui/package.json @@ -62,9 +62,7 @@ "react-is": "^16.8.0", "react-transition-group": "^4.3.0" }, - "devDependencies": { - "react-test-renderer": "^16.11.0" - }, + "devDependencies": {}, "sideEffects": false, "publishConfig": { "access": "public" diff --git a/yarn.lock b/yarn.lock index ebe37fe0441637..234d5b37617eb9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12521,7 +12521,7 @@ react-swipeable-views@^0.13.3: react-swipeable-views-utils "^0.13.7" warning "^4.0.1" -react-test-renderer@^16.0.0-0, react-test-renderer@^16.11.0: +react-test-renderer@^16.0.0-0, react-test-renderer@^16.12.0: version "16.12.0" resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.12.0.tgz#11417ffda579306d4e841a794d32140f3da1b43f" integrity sha512-Vj/teSqt2oayaWxkbhQ6gKis+t5JrknXfPVo+aIJ8QwYAqMPH77uptOdrlphyxl8eQI/rtkOYg86i/UWkpFu0w== From df11d918e7b69eb234f1a73c66e63414341d5395 Mon Sep 17 00:00:00 2001 From: Sebastian Silbermann Date: Mon, 10 Feb 2020 11:21:56 +0100 Subject: [PATCH 2/2] fix: various yarn/doctor issues --- docs/package.json | 2 +- examples/gatsby/package.json | 1 + framer/Material-UI.framerfx/package.json | 9 ++++++++- package.json | 3 +++ yarn.lock | 18 +++++++++--------- 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/docs/package.json b/docs/package.json index d568b40a540795..2bcb517afb9127 100644 --- a/docs/package.json +++ b/docs/package.json @@ -61,7 +61,7 @@ "clean-css": "^4.1.11", "clipboard-copy": "^3.0.0", "clsx": "^1.0.2", - "core-js": "^2.6.5", + "core-js": "^2.6.11", "cross-env": "^7.0.0", "css-loader": "^3.1.0", "css-mediaquery": "^0.1.2", diff --git a/examples/gatsby/package.json b/examples/gatsby/package.json index 7f3eb6858d96f2..fcb304f19ef662 100644 --- a/examples/gatsby/package.json +++ b/examples/gatsby/package.json @@ -4,6 +4,7 @@ "private": true, "dependencies": { "@material-ui/core": "latest", + "@material-ui/styles": "latest", "gatsby": "latest", "gatsby-plugin-material-ui": "latest", "gatsby-plugin-react-helmet": "latest", diff --git a/framer/Material-UI.framerfx/package.json b/framer/Material-UI.framerfx/package.json index ef977e7f800451..174cd8a50087a6 100644 --- a/framer/Material-UI.framerfx/package.json +++ b/framer/Material-UI.framerfx/package.json @@ -22,8 +22,15 @@ "naming-style": "^1.0.0" }, "peerDependencies": { + "@types/react": "^16.8.6", "framer": "^1.0.0", - "react": "^16.8.0" + "react": "^16.8.0", + "react-dom": "^16.8.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } }, "framer": { "displayName": "Material-UI", diff --git a/package.json b/package.json index 192d2f3e2e7643..589ebd65be0a4e 100644 --- a/package.json +++ b/package.json @@ -82,6 +82,7 @@ "chalk": "^3.0.0", "compression-webpack-plugin": "^3.0.0", "confusing-browser-globals": "^1.0.9", + "core-js": "^2.6.11", "cross-env": "^7.0.0", "danger": "^9.1.8", "dom-accessibility-api": "^0.3.0", @@ -102,6 +103,7 @@ "fs-extra": "^8.1.0", "glob": "^7.1.2", "glob-gitignore": "^1.0.11", + "lodash": "^4.17.15", "jsdom": "^16.0.0", "karma": "^4.3.0", "karma-browserstack-launcher": "~1.4.0", @@ -112,6 +114,7 @@ "karma-webpack": "^4.0.2", "lerna": "^3.16.4", "mocha": "^7.0.0", + "node-fetch": "^ 2.6.0", "nyc": "^15.0.0", "prettier": "1.17.0", "pretty-bytes": "^5.3.0", diff --git a/yarn.lock b/yarn.lock index 234d5b37617eb9..cee6dc34252802 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4894,10 +4894,10 @@ core-js@^1.0.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY= -core-js@^2.4.0, core-js@^2.6.10, core-js@^2.6.5: - version "2.6.10" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.10.tgz#8a5b8391f8cc7013da703411ce5b585706300d7f" - integrity sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA== +core-js@^2.4.0, core-js@^2.6.10, core-js@^2.6.11, core-js@^2.6.5: + version "2.6.11" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c" + integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg== core-js@^3.2.1: version "3.4.2" @@ -10518,6 +10518,11 @@ node-fetch@2.3.0: resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.3.0.tgz#1a1d940bbfb916a1d3e0219f037e89e71f8c5fa5" integrity sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA== +"node-fetch@^ 2.6.0", node-fetch@^2.3.0, node-fetch@^2.5.0, node-fetch@^2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" + integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== + node-fetch@^1.0.1: version "1.7.3" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef" @@ -10526,11 +10531,6 @@ node-fetch@^1.0.1: encoding "^0.1.11" is-stream "^1.0.1" -node-fetch@^2.3.0, node-fetch@^2.5.0, node-fetch@^2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" - integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== - node-gyp@^5.0.2: version "5.0.3" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.0.3.tgz#80d64c23790244991b6d44532f0a351bedd3dd45"