From 0860768a271396146a86e3f5a1bd9a35a37d4806 Mon Sep 17 00:00:00 2001 From: Elizabeth Craig Date: Wed, 13 Apr 2022 08:01:44 -0700 Subject: [PATCH] Hoist more react-related deps to root (#22438) --- ...ormance-7ccd36eb-51ca-4638-ac5c-f46821025f54.json | 7 +++++++ ...elector-4a29f9cc-e28a-45d6-8d43-fe5e2eea48d1.json | 7 +++++++ ...ponents-d09ed0cf-b232-4d25-a9a9-098c27bd0264.json | 7 +++++++ ...ns-mdl2-f6ce0ba4-b7eb-47c1-9a83-3aeffb31901f.json | 7 +++++++ package.json | 3 +++ packages/fluentui/react-component-ref/package.json | 1 - packages/fluentui/react-icons-northstar/package.json | 4 +--- packages/fluentui/react-northstar/package.json | 1 - packages/react-conformance/package.json | 3 +-- packages/react-context-selector/package.json | 3 +-- packages/react-docsite-components/package.json | 3 +-- packages/react-icons-mdl2/package.json | 4 +--- yarn.lock | 12 ++++++------ 13 files changed, 42 insertions(+), 20 deletions(-) create mode 100644 change/@fluentui-react-conformance-7ccd36eb-51ca-4638-ac5c-f46821025f54.json create mode 100644 change/@fluentui-react-context-selector-4a29f9cc-e28a-45d6-8d43-fe5e2eea48d1.json create mode 100644 change/@fluentui-react-docsite-components-d09ed0cf-b232-4d25-a9a9-098c27bd0264.json create mode 100644 change/@fluentui-react-icons-mdl2-f6ce0ba4-b7eb-47c1-9a83-3aeffb31901f.json diff --git a/change/@fluentui-react-conformance-7ccd36eb-51ca-4638-ac5c-f46821025f54.json b/change/@fluentui-react-conformance-7ccd36eb-51ca-4638-ac5c-f46821025f54.json new file mode 100644 index 00000000000000..d64cebcc294fa3 --- /dev/null +++ b/change/@fluentui-react-conformance-7ccd36eb-51ca-4638-ac5c-f46821025f54.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "Hoist react-is devDependencies to the repo root", + "packageName": "@fluentui/react-conformance", + "email": "elcraig@microsoft.com", + "dependentChangeType": "none" +} diff --git a/change/@fluentui-react-context-selector-4a29f9cc-e28a-45d6-8d43-fe5e2eea48d1.json b/change/@fluentui-react-context-selector-4a29f9cc-e28a-45d6-8d43-fe5e2eea48d1.json new file mode 100644 index 00000000000000..9e8eb114e31c4c --- /dev/null +++ b/change/@fluentui-react-context-selector-4a29f9cc-e28a-45d6-8d43-fe5e2eea48d1.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "Hoist react-is devDependencies to the repo root", + "packageName": "@fluentui/react-context-selector", + "email": "elcraig@microsoft.com", + "dependentChangeType": "none" +} diff --git a/change/@fluentui-react-docsite-components-d09ed0cf-b232-4d25-a9a9-098c27bd0264.json b/change/@fluentui-react-docsite-components-d09ed0cf-b232-4d25-a9a9-098c27bd0264.json new file mode 100644 index 00000000000000..55fe920c91935f --- /dev/null +++ b/change/@fluentui-react-docsite-components-d09ed0cf-b232-4d25-a9a9-098c27bd0264.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "Hoist react-is devDependencies to the repo root", + "packageName": "@fluentui/react-docsite-components", + "email": "elcraig@microsoft.com", + "dependentChangeType": "none" +} diff --git a/change/@fluentui-react-icons-mdl2-f6ce0ba4-b7eb-47c1-9a83-3aeffb31901f.json b/change/@fluentui-react-icons-mdl2-f6ce0ba4-b7eb-47c1-9a83-3aeffb31901f.json new file mode 100644 index 00000000000000..ddd8b0e7349aa4 --- /dev/null +++ b/change/@fluentui-react-icons-mdl2-f6ce0ba4-b7eb-47c1-9a83-3aeffb31901f.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "Hoist react-is devDependencies to the repo root", + "packageName": "@fluentui/react-icons-mdl2", + "email": "elcraig@microsoft.com", + "dependentChangeType": "none" +} diff --git a/package.json b/package.json index 28cbeebc5e68e2..81408dec26b2f3 100644 --- a/package.json +++ b/package.json @@ -138,6 +138,7 @@ "@types/prettier": "2.2.3", "@types/react": "16.14.23", "@types/react-dom": "16.9.14", + "@types/react-is": "16.7.1", "@types/react-test-renderer": "16.9.5", "@types/scheduler": "0.16.2", "@types/semver": "^5.5.0", @@ -220,6 +221,7 @@ "react": "16.14.0", "react-app-polyfill": "2.0.0", "react-dom": "16.14.0", + "react-is": "16.12.0", "react-test-renderer": "16.14.0", "sass": "1.49.11", "sass-loader": "12.4.0", @@ -337,6 +339,7 @@ "loader-utils", "pretty-bytes", "schema-utils", + "react-is", "react-test-renderer", "tslib", "terser", diff --git a/packages/fluentui/react-component-ref/package.json b/packages/fluentui/react-component-ref/package.json index 2367c09748758a..ddfc5a83741aeb 100644 --- a/packages/fluentui/react-component-ref/package.json +++ b/packages/fluentui/react-component-ref/package.json @@ -11,7 +11,6 @@ "devDependencies": { "@fluentui/eslint-plugin": "*", "@fluentui/scripts": "^1.0.0", - "@types/react-is": "^16.7.1", "lerna-alias": "^3.0.3-0" }, "files": [ diff --git a/packages/fluentui/react-icons-northstar/package.json b/packages/fluentui/react-icons-northstar/package.json index b39e2e485e81f3..2f96fa7b1ae6c5 100644 --- a/packages/fluentui/react-icons-northstar/package.json +++ b/packages/fluentui/react-icons-northstar/package.json @@ -14,9 +14,7 @@ "@fluentui/eslint-plugin": "*", "@fluentui/scripts": "^1.0.0", "@types/classnames": "^2.2.9", - "@types/react-is": "^16.7.1", - "lerna-alias": "^3.0.3-0", - "react-is": "^16.6.3" + "lerna-alias": "^3.0.3-0" }, "files": [ "dist" diff --git a/packages/fluentui/react-northstar/package.json b/packages/fluentui/react-northstar/package.json index 32965fc4d169fc..508a7fe3cd7178 100644 --- a/packages/fluentui/react-northstar/package.json +++ b/packages/fluentui/react-northstar/package.json @@ -36,7 +36,6 @@ "@types/classnames": "^2.2.9", "@types/faker": "^4.1.3", "@types/gulp": "^4.0.6", - "@types/react-is": "^16.7.1", "@types/simulant": "^0.2.0", "csstype": "^3.0.2", "faker": "^4.1.0", diff --git a/packages/react-conformance/package.json b/packages/react-conformance/package.json index ff2c0b2fd9123c..e37ee04c774b26 100644 --- a/packages/react-conformance/package.json +++ b/packages/react-conformance/package.json @@ -19,8 +19,7 @@ }, "devDependencies": { "@fluentui/eslint-plugin": "*", - "@fluentui/scripts": "^1.0.0", - "@types/react-is": "^16.7.1" + "@fluentui/scripts": "^1.0.0" }, "dependencies": { "lodash": "^4.17.15", diff --git a/packages/react-context-selector/package.json b/packages/react-context-selector/package.json index e5879f88391db7..1e5381675dbbd8 100644 --- a/packages/react-context-selector/package.json +++ b/packages/react-context-selector/package.json @@ -24,8 +24,7 @@ }, "devDependencies": { "@fluentui/eslint-plugin": "*", - "@fluentui/scripts": "^1.0.0", - "react-is": "^16.6.3" + "@fluentui/scripts": "^1.0.0" }, "dependencies": { "@fluentui/react-utilities": "9.0.0-rc.5", diff --git a/packages/react-docsite-components/package.json b/packages/react-docsite-components/package.json index bcac68c176f540..223cabcd78131b 100644 --- a/packages/react-docsite-components/package.json +++ b/packages/react-docsite-components/package.json @@ -24,8 +24,7 @@ "@fluentui/eslint-plugin": "*", "@fluentui/scripts": "^1.0.0", "@types/color-check": "0.0.0", - "@types/react-custom-scrollbars": "^4.0.5", - "@types/react-dom": "16.9.14" + "@types/react-custom-scrollbars": "^4.0.5" }, "peerDependencies": { "@types/react": ">=16.8.0 <18.0.0", diff --git a/packages/react-icons-mdl2/package.json b/packages/react-icons-mdl2/package.json index c613b526039900..32cc56eb91dfdb 100644 --- a/packages/react-icons-mdl2/package.json +++ b/packages/react-icons-mdl2/package.json @@ -26,9 +26,7 @@ }, "devDependencies": { "@fluentui/eslint-plugin": "*", - "@types/react-is": "^16.7.1", - "@fluentui/scripts": "^1.0.0", - "react-is": "^16.6.3" + "@fluentui/scripts": "^1.0.0" }, "dependencies": { "@microsoft/load-themed-styles": "^1.10.26", diff --git a/yarn.lock b/yarn.lock index 74a9dcd3f134c4..c5c614d743aea6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5520,7 +5520,7 @@ dependencies: "@types/react" "*" -"@types/react-is@^16.7.1": +"@types/react-is@16.7.1": version "16.7.1" resolved "https://registry.yarnpkg.com/@types/react-is/-/react-is-16.7.1.tgz#d3f1c68c358c00ce116b55ef5410cf486dd08539" integrity sha512-dMLFD2cCsxtDgMkTydQCM0PxDq8vwc6uN5M/jRktDfYvH3nQj6pjC9OrCXS2lKlYoYTNJorI/dI8x9dpLshexQ== @@ -21647,16 +21647,16 @@ react-inspector@^5.1.0: is-dom "^1.0.0" prop-types "^15.0.0" +react-is@16.12.0, react-is@^16.12.0, react-is@^16.6.0, react-is@^16.6.3, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.6, react-is@^16.9.0: + version "16.12.0" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c" + integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q== + react-is@17.0.2, react-is@^17.0.1, react-is@^17.0.2: version "17.0.2" resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== -react-is@^16.12.0, react-is@^16.6.0, react-is@^16.6.3, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.6, react-is@^16.9.0: - version "16.12.0" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c" - integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q== - react-lifecycles-compat@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"