From d49430f4757b4d42578ac43d05bbd548d54003e5 Mon Sep 17 00:00:00 2001 From: Jennifer Stern Date: Mon, 23 Jul 2018 10:41:47 -0500 Subject: [PATCH] fix(*): add React,React-DOM 16 to dependencies To prevent duplicates in consumer bundles Change-Id: I5aceb0f151654efebd8d8b86e30e28cac11d37e2 Reviewed-on: https://gerrit.instructure.com/158300 Tested-by: Jenkins Reviewed-by: Ryan Shaw Product-Review: Jennifer Stern QA-Review: Jennifer Stern --- packages/__docs__/package.json | 4 ++-- packages/__examples__/package.json | 6 +++--- packages/media-capture/package.json | 2 +- packages/ui-a11y/package.json | 2 +- packages/ui-alerts/package.json | 4 ++-- packages/ui-billboard/package.json | 2 +- packages/ui-breadcrumb/package.json | 2 +- packages/ui-buttons/package.json | 2 +- packages/ui-code-editor/package.json | 2 +- packages/ui-container/package.json | 2 +- packages/ui-core/package.json | 2 +- packages/ui-docs-client/package.json | 4 ++-- packages/ui-elements/package.json | 2 +- packages/ui-focusable/package.json | 2 +- packages/ui-forms/package.json | 2 +- packages/ui-i18n/package.json | 2 +- packages/ui-icons/package.json | 2 +- packages/ui-layout/package.json | 2 +- packages/ui-media-player/package.json | 2 +- packages/ui-menu/package.json | 2 +- packages/ui-motion/package.json | 2 +- packages/ui-navigation/package.json | 2 +- packages/ui-overlays/package.json | 2 +- packages/ui-pages/package.json | 2 +- packages/ui-pagination/package.json | 2 +- packages/ui-portal/package.json | 4 ++-- packages/ui-svg-images/package.json | 2 +- packages/ui-tabs/package.json | 2 +- packages/ui-themeable/package.json | 2 +- packages/ui-toggle-details/package.json | 2 +- packages/ui-tree-browser/package.json | 2 +- packages/ui-utils/package.json | 4 ++-- scripts/templates/package/package.json | 2 +- yarn.lock | 4 ++-- 34 files changed, 42 insertions(+), 42 deletions(-) diff --git a/packages/__docs__/package.json b/packages/__docs__/package.json index bd34f0e27c..47155dd352 100644 --- a/packages/__docs__/package.json +++ b/packages/__docs__/package.json @@ -61,7 +61,7 @@ "@instructure/ui-utils": "^5.20.1", "lorem-ipsum": "^1.0.5", "moment": "^2.22.2", - "react": "^15.6.2", - "react-dom": "^15.6.2" + "react": "^0.14.9 || ^15 || ^16", + "react-dom": "^0.14.9 || ^15 || ^16" } } diff --git a/packages/__examples__/package.json b/packages/__examples__/package.json index e706f7f6e5..53f04c2e94 100644 --- a/packages/__examples__/package.json +++ b/packages/__examples__/package.json @@ -18,7 +18,7 @@ "review:screenshots": "happo review" }, "license": "MIT", - "devDependencies": { + "dependencies": { "@instructure/ui-presets": "^5.20.1", "@instructure/ui-themes": "^5.20.1", "@storybook/addon-links": "^3.4.6", @@ -27,8 +27,8 @@ "@storybook/react": "^3.4.6", "happo": "^5.0.0", "happo-target-firefox": "^5.0.2", - "react": "^15.6.2", - "react-dom": "^15.6.2", + "react": "^0.14.9 || ^15 || ^16", + "react-dom": "^0.14.9 || ^15 || ^16", "story2sketch": "^1.1.0", "storybook-addon-rtl": "^0.1.1" } diff --git a/packages/media-capture/package.json b/packages/media-capture/package.json index 6795aab625..47046826d9 100644 --- a/packages/media-capture/package.json +++ b/packages/media-capture/package.json @@ -42,7 +42,7 @@ "classnames": "^2", "luxon": "^0.3.1", "prop-types": "^15", - "react": "^0.14.9 || ^15", + "react": "^0.14.9 || ^15 || ^16", "react-redux": "^5.0.6", "redux": "^3.7.2", "redux-thunk": "^2.2.0", diff --git a/packages/ui-a11y/package.json b/packages/ui-a11y/package.json index 5a7763f3c8..72b0f1c855 100644 --- a/packages/ui-a11y/package.json +++ b/packages/ui-a11y/package.json @@ -31,7 +31,7 @@ "@instructure/ui-utils": "^5", "keycode": "^2", "prop-types": "^15", - "react": "^0.14.9 || ^15" + "react": "^0.14.9 || ^15 || ^16" }, "publishConfig": { "access": "public" diff --git a/packages/ui-alerts/package.json b/packages/ui-alerts/package.json index d18dccdc69..e89df69c44 100644 --- a/packages/ui-alerts/package.json +++ b/packages/ui-alerts/package.json @@ -37,8 +37,8 @@ "classnames": "^2", "keycode": "^2", "prop-types": "^15", - "react": "^0.14.9 || ^15", - "react-dom": "^0.14.9 || ^15" + "react": "^0.14.9 || ^15 || ^16", + "react-dom": "^0.14.9 || ^15 || ^16" }, "publishConfig": { "access": "public" diff --git a/packages/ui-billboard/package.json b/packages/ui-billboard/package.json index c9818d1195..b8e18043a9 100644 --- a/packages/ui-billboard/package.json +++ b/packages/ui-billboard/package.json @@ -34,7 +34,7 @@ "@instructure/ui-utils": "^5", "classnames": "^2", "prop-types": "^15", - "react": "^0.14.9 || ^15" + "react": "^0.14.9 || ^15 || ^16" }, "publishConfig": { "access": "public" diff --git a/packages/ui-breadcrumb/package.json b/packages/ui-breadcrumb/package.json index 230924d643..052768749c 100644 --- a/packages/ui-breadcrumb/package.json +++ b/packages/ui-breadcrumb/package.json @@ -34,7 +34,7 @@ "@instructure/ui-utils": "^5", "classnames": "^2", "prop-types": "^15", - "react": "^0.14.9 || ^15" + "react": "^0.14.9 || ^15 || ^16" }, "publishConfig": { "access": "public" diff --git a/packages/ui-buttons/package.json b/packages/ui-buttons/package.json index 995165721b..4e903d074a 100644 --- a/packages/ui-buttons/package.json +++ b/packages/ui-buttons/package.json @@ -35,7 +35,7 @@ "classnames": "^2", "keycode": "^2", "prop-types": "^15", - "react": "^0.14.9 || ^15" + "react": "^0.14.9 || ^15 || ^16" }, "publishConfig": { "access": "public" diff --git a/packages/ui-code-editor/package.json b/packages/ui-code-editor/package.json index f7c0e1fba7..4e66a5dcb8 100644 --- a/packages/ui-code-editor/package.json +++ b/packages/ui-code-editor/package.json @@ -33,7 +33,7 @@ "classnames": "^2", "codemirror": "^5.39.0", "prop-types": "^15", - "react": "^0.14.9 || ^15", + "react": "^0.14.9 || ^15 || ^16", "react-codemirror2": "^5.1.0" }, "publishConfig": { diff --git a/packages/ui-container/package.json b/packages/ui-container/package.json index 002eeb8211..05b6087a0e 100644 --- a/packages/ui-container/package.json +++ b/packages/ui-container/package.json @@ -31,7 +31,7 @@ "@instructure/ui-utils": "^5", "classnames": "^2", "prop-types": "^15", - "react": "^0.14.9 || ^15" + "react": "^0.14.9 || ^15 || ^16" }, "publishConfig": { "access": "public" diff --git a/packages/ui-core/package.json b/packages/ui-core/package.json index 5be508eae9..5ec0369f20 100644 --- a/packages/ui-core/package.json +++ b/packages/ui-core/package.json @@ -52,7 +52,7 @@ "classnames": "^2", "keycode": "^2.1.8", "prop-types": "^15", - "react": "^0.14.9 || ^15" + "react": "^0.14.9 || ^15 || ^16" }, "publishConfig": { "access": "public" diff --git a/packages/ui-docs-client/package.json b/packages/ui-docs-client/package.json index e2a8dfdacd..109267457b 100644 --- a/packages/ui-docs-client/package.json +++ b/packages/ui-docs-client/package.json @@ -44,8 +44,8 @@ "he": "^1.1.1", "marked": "^0.4.0", "prop-types": "^15", - "react": "^0.14.9 || ^15", - "react-dom": "^0.14.9 || ^15", + "react": "^0.14.9 || ^15 || ^16", + "react-dom": "^0.14.9 || ^15 || ^16", "react-github-corner": "^2.1.0" }, "publishConfig": { diff --git a/packages/ui-elements/package.json b/packages/ui-elements/package.json index d548e0ed5a..45a1e93730 100644 --- a/packages/ui-elements/package.json +++ b/packages/ui-elements/package.json @@ -36,7 +36,7 @@ "@instructure/ui-utils": "^5", "classnames": "^2", "prop-types": "^15", - "react": "^0.14.9 || ^15" + "react": "^0.14.9 || ^15 || ^16" }, "publishConfig": { "access": "public" diff --git a/packages/ui-focusable/package.json b/packages/ui-focusable/package.json index e4e14e23ba..ba409b70f1 100644 --- a/packages/ui-focusable/package.json +++ b/packages/ui-focusable/package.json @@ -33,7 +33,7 @@ "@instructure/ui-utils": "^5", "classnames": "^2", "prop-types": "^15", - "react": "^0.14.9 || ^15" + "react": "^0.14.9 || ^15 || ^16" }, "publishConfig": { "access": "public" diff --git a/packages/ui-forms/package.json b/packages/ui-forms/package.json index b04ba470ae..8211717392 100644 --- a/packages/ui-forms/package.json +++ b/packages/ui-forms/package.json @@ -41,7 +41,7 @@ "classnames": "^2", "keycode": "^2", "prop-types": "^15", - "react": "^0.14.9 || ^15" + "react": "^0.14.9 || ^15 || ^16" }, "publishConfig": { "access": "public" diff --git a/packages/ui-i18n/package.json b/packages/ui-i18n/package.json index 411b63518b..3760c1c088 100644 --- a/packages/ui-i18n/package.json +++ b/packages/ui-i18n/package.json @@ -31,7 +31,7 @@ "decimal.js": "^10", "moment-timezone": "^0.5", "prop-types": "^15", - "react": "^0.14.9 || ^15" + "react": "^0.14.9 || ^15 || ^16" }, "publishConfig": { "access": "public" diff --git a/packages/ui-icons/package.json b/packages/ui-icons/package.json index 837d0b70cd..5cccfa65b4 100644 --- a/packages/ui-icons/package.json +++ b/packages/ui-icons/package.json @@ -26,7 +26,7 @@ "dependencies": { "@instructure/ui-svg-images": "^5", "prop-types": "^15", - "react": "^0.14.9 || ^15" + "react": "^0.14.9 || ^15 || ^16" }, "publishConfig": { "access": "public" diff --git a/packages/ui-layout/package.json b/packages/ui-layout/package.json index e660771bc8..533e5d28ac 100644 --- a/packages/ui-layout/package.json +++ b/packages/ui-layout/package.json @@ -37,7 +37,7 @@ "@instructure/ui-utils": "^5", "classnames": "^2", "prop-types": "^15", - "react": "^0.14.9 || ^15" + "react": "^0.14.9 || ^15 || ^16" }, "publishConfig": { "access": "public" diff --git a/packages/ui-media-player/package.json b/packages/ui-media-player/package.json index 8b933349bc..a33a595a5c 100644 --- a/packages/ui-media-player/package.json +++ b/packages/ui-media-player/package.json @@ -38,7 +38,7 @@ "@instructure/ui-utils": "^5", "classnames": "^2", "prop-types": "^15", - "react": "^0.14.9 || ^15", + "react": "^0.14.9 || ^15 || ^16", "screenfull": "^3.3.2" }, "publishConfig": { diff --git a/packages/ui-menu/package.json b/packages/ui-menu/package.json index ba3538e74d..1aad507fe9 100644 --- a/packages/ui-menu/package.json +++ b/packages/ui-menu/package.json @@ -37,7 +37,7 @@ "classnames": "^2", "keycode": "^2", "prop-types": "^15", - "react": "^0.14.9 || ^15" + "react": "^0.14.9 || ^15 || ^16" }, "publishConfig": { "access": "public" diff --git a/packages/ui-motion/package.json b/packages/ui-motion/package.json index e909ee1bc7..3ddf41d7ad 100644 --- a/packages/ui-motion/package.json +++ b/packages/ui-motion/package.json @@ -30,7 +30,7 @@ "@instructure/ui-themeable": "^5", "@instructure/ui-utils": "^5", "prop-types": "^15", - "react": "^0.14.9 || ^15" + "react": "^0.14.9 || ^15 || ^16" }, "publishConfig": { "access": "public" diff --git a/packages/ui-navigation/package.json b/packages/ui-navigation/package.json index 499bc46adb..06501970cf 100644 --- a/packages/ui-navigation/package.json +++ b/packages/ui-navigation/package.json @@ -35,7 +35,7 @@ "@instructure/ui-utils": "^5", "classnames": "^2", "prop-types": "^15", - "react": "^0.14.9 || ^15" + "react": "^0.14.9 || ^15 || ^16" }, "publishConfig": { "access": "public" diff --git a/packages/ui-overlays/package.json b/packages/ui-overlays/package.json index 9220fa51c1..331b099a5f 100644 --- a/packages/ui-overlays/package.json +++ b/packages/ui-overlays/package.json @@ -39,7 +39,7 @@ "classnames": "^2", "no-scroll": "^2.1.0", "prop-types": "^15", - "react": "^0.14.9 || ^15" + "react": "^0.14.9 || ^15 || ^16" }, "publishConfig": { "access": "public" diff --git a/packages/ui-pages/package.json b/packages/ui-pages/package.json index d129cbe0c1..68fe0741b2 100644 --- a/packages/ui-pages/package.json +++ b/packages/ui-pages/package.json @@ -34,7 +34,7 @@ "@instructure/ui-themeable": "^5", "@instructure/ui-utils": "^5", "prop-types": "^15", - "react": "^0.14.9 || ^15" + "react": "^0.14.9 || ^15 || ^16" }, "publishConfig": { "access": "public" diff --git a/packages/ui-pagination/package.json b/packages/ui-pagination/package.json index 1ddeab6ce3..d48d824086 100644 --- a/packages/ui-pagination/package.json +++ b/packages/ui-pagination/package.json @@ -35,7 +35,7 @@ "@instructure/ui-themeable": "^5", "@instructure/ui-utils": "^5", "prop-types": "^15", - "react": "^0.14.9 || ^15" + "react": "^0.14.9 || ^15 || ^16" }, "publishConfig": { "access": "public" diff --git a/packages/ui-portal/package.json b/packages/ui-portal/package.json index 38d2bd638a..707684fddd 100644 --- a/packages/ui-portal/package.json +++ b/packages/ui-portal/package.json @@ -29,8 +29,8 @@ "@instructure/ui-i18n": "^5", "@instructure/ui-utils": "^5", "prop-types": "^15", - "react": "^0.14.9 || ^15", - "react-dom": "^0.14.9 || ^15" + "react": "^0.14.9 || ^15 || ^16", + "react-dom": "^0.14.9 || ^15 || ^16" }, "publishConfig": { "access": "public" diff --git a/packages/ui-svg-images/package.json b/packages/ui-svg-images/package.json index 4a350f7395..617e959103 100644 --- a/packages/ui-svg-images/package.json +++ b/packages/ui-svg-images/package.json @@ -31,7 +31,7 @@ "@instructure/ui-utils": "^5", "classnames": "^2", "prop-types": "^15", - "react": "^0.14.9 || ^15" + "react": "^0.14.9 || ^15 || ^16" }, "publishConfig": { "access": "public" diff --git a/packages/ui-tabs/package.json b/packages/ui-tabs/package.json index 4c4d614d50..2585f1342f 100644 --- a/packages/ui-tabs/package.json +++ b/packages/ui-tabs/package.json @@ -34,7 +34,7 @@ "classnames": "^2", "keycode": "^2", "prop-types": "^15", - "react": "^0.14.9 || ^15" + "react": "^0.14.9 || ^15 || ^16" }, "publishConfig": { "access": "public" diff --git a/packages/ui-themeable/package.json b/packages/ui-themeable/package.json index 0b736df5d0..e67dec2a75 100644 --- a/packages/ui-themeable/package.json +++ b/packages/ui-themeable/package.json @@ -29,7 +29,7 @@ "@instructure/ui-utils": "^5", "glamor": "^2.20.37", "prop-types": "^15", - "react": "^0.14.9 || ^15", + "react": "^0.14.9 || ^15 || ^16", "tinycolor2": "^1.4.1" }, "publishConfig": { diff --git a/packages/ui-toggle-details/package.json b/packages/ui-toggle-details/package.json index ec17548806..1088098c0f 100644 --- a/packages/ui-toggle-details/package.json +++ b/packages/ui-toggle-details/package.json @@ -38,7 +38,7 @@ "@instructure/ui-utils": "^5", "classnames": "^2", "prop-types": "^15", - "react": "^0.14.9 || ^15" + "react": "^0.14.9 || ^15 || ^16" }, "publishConfig": { "access": "public" diff --git a/packages/ui-tree-browser/package.json b/packages/ui-tree-browser/package.json index 25b4583cd4..b5174c042e 100644 --- a/packages/ui-tree-browser/package.json +++ b/packages/ui-tree-browser/package.json @@ -33,7 +33,7 @@ "classnames": "^2", "keycode": "^2", "prop-types": "^15", - "react": "^0.14.9 || ^15" + "react": "^0.14.9 || ^15 || ^16" }, "publishConfig": { "access": "public" diff --git a/packages/ui-utils/package.json b/packages/ui-utils/package.json index 1d8d34b2cb..9e6776267f 100644 --- a/packages/ui-utils/package.json +++ b/packages/ui-utils/package.json @@ -35,8 +35,8 @@ "object.omit": "^3", "object.pick": "^1.2.0", "prop-types": "^15", - "react": "^0.14.9 || ^15", - "react-dom": "^0.14.9 || ^15" + "react": "^0.14.9 || ^15 || ^16", + "react-dom": "^0.14.9 || ^15 || ^16" }, "publishConfig": { "access": "public" diff --git a/scripts/templates/package/package.json b/scripts/templates/package/package.json index c4787039fb..e6fef497b2 100644 --- a/scripts/templates/package/package.json +++ b/scripts/templates/package/package.json @@ -29,7 +29,7 @@ "dependencies": { "@instructure/ui-themeable": "^5", "prop-types": "^15", - "react": "^0.14.9 || ^15" + "react": "^0.14.9 || ^15 || ^16" }, "publishConfig": { "access": "public" diff --git a/yarn.lock b/yarn.lock index 4731b95220..870f90191e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11837,7 +11837,7 @@ react-dom@15.4.1: loose-envify "^1.1.0" object-assign "^4.1.0" -"react-dom@^0.14.9 || ^15", react-dom@^15.6.2: +"react-dom@^0.14.9 || ^15", "react-dom@^0.14.9 || ^15 || ^16": version "15.6.2" resolved "https://registry.npmjs.org/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730" dependencies: @@ -11986,7 +11986,7 @@ react@15.4.1: loose-envify "^1.1.0" object-assign "^4.1.0" -"react@^0.14.9 || ^15", react@^15.6.2: +"react@^0.14.9 || ^15", "react@^0.14.9 || ^15 || ^16": version "15.6.2" resolved "https://registry.npmjs.org/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72" dependencies: