Skip to content

Commit d49430f

Browse files
junyperjunyper
committed
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 <[email protected]> Product-Review: Jennifer Stern <[email protected]> QA-Review: Jennifer Stern <[email protected]>
1 parent 5681198 commit d49430f

File tree

34 files changed

+42
-42
lines changed

34 files changed

+42
-42
lines changed

‎packages/__docs__/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"@instructure/ui-utils": "^5.20.1",
6262
"lorem-ipsum": "^1.0.5",
6363
"moment": "^2.22.2",
64-
"react": "^15.6.2",
65-
"react-dom": "^15.6.2"
64+
"react": "^0.14.9 || ^15 || ^16",
65+
"react-dom": "^0.14.9 || ^15 || ^16"
6666
}
6767
}

‎packages/__examples__/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"review:screenshots": "happo review"
1919
},
2020
"license": "MIT",
21-
"devDependencies": {
21+
"dependencies": {
2222
"@instructure/ui-presets": "^5.20.1",
2323
"@instructure/ui-themes": "^5.20.1",
2424
"@storybook/addon-links": "^3.4.6",
@@ -27,8 +27,8 @@
2727
"@storybook/react": "^3.4.6",
2828
"happo": "^5.0.0",
2929
"happo-target-firefox": "^5.0.2",
30-
"react": "^15.6.2",
31-
"react-dom": "^15.6.2",
30+
"react": "^0.14.9 || ^15 || ^16",
31+
"react-dom": "^0.14.9 || ^15 || ^16",
3232
"story2sketch": "^1.1.0",
3333
"storybook-addon-rtl": "^0.1.1"
3434
}

‎packages/media-capture/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"classnames": "^2",
4343
"luxon": "^0.3.1",
4444
"prop-types": "^15",
45-
"react": "^0.14.9 || ^15",
45+
"react": "^0.14.9 || ^15 || ^16",
4646
"react-redux": "^5.0.6",
4747
"redux": "^3.7.2",
4848
"redux-thunk": "^2.2.0",

‎packages/ui-a11y/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"@instructure/ui-utils": "^5",
3232
"keycode": "^2",
3333
"prop-types": "^15",
34-
"react": "^0.14.9 || ^15"
34+
"react": "^0.14.9 || ^15 || ^16"
3535
},
3636
"publishConfig": {
3737
"access": "public"

‎packages/ui-alerts/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
"classnames": "^2",
3838
"keycode": "^2",
3939
"prop-types": "^15",
40-
"react": "^0.14.9 || ^15",
41-
"react-dom": "^0.14.9 || ^15"
40+
"react": "^0.14.9 || ^15 || ^16",
41+
"react-dom": "^0.14.9 || ^15 || ^16"
4242
},
4343
"publishConfig": {
4444
"access": "public"

‎packages/ui-billboard/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"@instructure/ui-utils": "^5",
3535
"classnames": "^2",
3636
"prop-types": "^15",
37-
"react": "^0.14.9 || ^15"
37+
"react": "^0.14.9 || ^15 || ^16"
3838
},
3939
"publishConfig": {
4040
"access": "public"

‎packages/ui-breadcrumb/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"@instructure/ui-utils": "^5",
3535
"classnames": "^2",
3636
"prop-types": "^15",
37-
"react": "^0.14.9 || ^15"
37+
"react": "^0.14.9 || ^15 || ^16"
3838
},
3939
"publishConfig": {
4040
"access": "public"

‎packages/ui-buttons/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"classnames": "^2",
3636
"keycode": "^2",
3737
"prop-types": "^15",
38-
"react": "^0.14.9 || ^15"
38+
"react": "^0.14.9 || ^15 || ^16"
3939
},
4040
"publishConfig": {
4141
"access": "public"

‎packages/ui-code-editor/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"classnames": "^2",
3434
"codemirror": "^5.39.0",
3535
"prop-types": "^15",
36-
"react": "^0.14.9 || ^15",
36+
"react": "^0.14.9 || ^15 || ^16",
3737
"react-codemirror2": "^5.1.0"
3838
},
3939
"publishConfig": {

‎packages/ui-container/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"@instructure/ui-utils": "^5",
3232
"classnames": "^2",
3333
"prop-types": "^15",
34-
"react": "^0.14.9 || ^15"
34+
"react": "^0.14.9 || ^15 || ^16"
3535
},
3636
"publishConfig": {
3737
"access": "public"

‎packages/ui-core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"classnames": "^2",
5353
"keycode": "^2.1.8",
5454
"prop-types": "^15",
55-
"react": "^0.14.9 || ^15"
55+
"react": "^0.14.9 || ^15 || ^16"
5656
},
5757
"publishConfig": {
5858
"access": "public"

‎packages/ui-docs-client/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
"he": "^1.1.1",
4545
"marked": "^0.4.0",
4646
"prop-types": "^15",
47-
"react": "^0.14.9 || ^15",
48-
"react-dom": "^0.14.9 || ^15",
47+
"react": "^0.14.9 || ^15 || ^16",
48+
"react-dom": "^0.14.9 || ^15 || ^16",
4949
"react-github-corner": "^2.1.0"
5050
},
5151
"publishConfig": {

‎packages/ui-elements/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"@instructure/ui-utils": "^5",
3737
"classnames": "^2",
3838
"prop-types": "^15",
39-
"react": "^0.14.9 || ^15"
39+
"react": "^0.14.9 || ^15 || ^16"
4040
},
4141
"publishConfig": {
4242
"access": "public"

‎packages/ui-focusable/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"@instructure/ui-utils": "^5",
3434
"classnames": "^2",
3535
"prop-types": "^15",
36-
"react": "^0.14.9 || ^15"
36+
"react": "^0.14.9 || ^15 || ^16"
3737
},
3838
"publishConfig": {
3939
"access": "public"

‎packages/ui-forms/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"classnames": "^2",
4242
"keycode": "^2",
4343
"prop-types": "^15",
44-
"react": "^0.14.9 || ^15"
44+
"react": "^0.14.9 || ^15 || ^16"
4545
},
4646
"publishConfig": {
4747
"access": "public"

‎packages/ui-i18n/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"decimal.js": "^10",
3232
"moment-timezone": "^0.5",
3333
"prop-types": "^15",
34-
"react": "^0.14.9 || ^15"
34+
"react": "^0.14.9 || ^15 || ^16"
3535
},
3636
"publishConfig": {
3737
"access": "public"

‎packages/ui-icons/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"dependencies": {
2727
"@instructure/ui-svg-images": "^5",
2828
"prop-types": "^15",
29-
"react": "^0.14.9 || ^15"
29+
"react": "^0.14.9 || ^15 || ^16"
3030
},
3131
"publishConfig": {
3232
"access": "public"

‎packages/ui-layout/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"@instructure/ui-utils": "^5",
3838
"classnames": "^2",
3939
"prop-types": "^15",
40-
"react": "^0.14.9 || ^15"
40+
"react": "^0.14.9 || ^15 || ^16"
4141
},
4242
"publishConfig": {
4343
"access": "public"

‎packages/ui-media-player/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"@instructure/ui-utils": "^5",
3939
"classnames": "^2",
4040
"prop-types": "^15",
41-
"react": "^0.14.9 || ^15",
41+
"react": "^0.14.9 || ^15 || ^16",
4242
"screenfull": "^3.3.2"
4343
},
4444
"publishConfig": {

‎packages/ui-menu/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"classnames": "^2",
3838
"keycode": "^2",
3939
"prop-types": "^15",
40-
"react": "^0.14.9 || ^15"
40+
"react": "^0.14.9 || ^15 || ^16"
4141
},
4242
"publishConfig": {
4343
"access": "public"

‎packages/ui-motion/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"@instructure/ui-themeable": "^5",
3131
"@instructure/ui-utils": "^5",
3232
"prop-types": "^15",
33-
"react": "^0.14.9 || ^15"
33+
"react": "^0.14.9 || ^15 || ^16"
3434
},
3535
"publishConfig": {
3636
"access": "public"

‎packages/ui-navigation/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"@instructure/ui-utils": "^5",
3636
"classnames": "^2",
3737
"prop-types": "^15",
38-
"react": "^0.14.9 || ^15"
38+
"react": "^0.14.9 || ^15 || ^16"
3939
},
4040
"publishConfig": {
4141
"access": "public"

‎packages/ui-overlays/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"classnames": "^2",
4040
"no-scroll": "^2.1.0",
4141
"prop-types": "^15",
42-
"react": "^0.14.9 || ^15"
42+
"react": "^0.14.9 || ^15 || ^16"
4343
},
4444
"publishConfig": {
4545
"access": "public"

‎packages/ui-pages/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"@instructure/ui-themeable": "^5",
3535
"@instructure/ui-utils": "^5",
3636
"prop-types": "^15",
37-
"react": "^0.14.9 || ^15"
37+
"react": "^0.14.9 || ^15 || ^16"
3838
},
3939
"publishConfig": {
4040
"access": "public"

‎packages/ui-pagination/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"@instructure/ui-themeable": "^5",
3636
"@instructure/ui-utils": "^5",
3737
"prop-types": "^15",
38-
"react": "^0.14.9 || ^15"
38+
"react": "^0.14.9 || ^15 || ^16"
3939
},
4040
"publishConfig": {
4141
"access": "public"

‎packages/ui-portal/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
"@instructure/ui-i18n": "^5",
3030
"@instructure/ui-utils": "^5",
3131
"prop-types": "^15",
32-
"react": "^0.14.9 || ^15",
33-
"react-dom": "^0.14.9 || ^15"
32+
"react": "^0.14.9 || ^15 || ^16",
33+
"react-dom": "^0.14.9 || ^15 || ^16"
3434
},
3535
"publishConfig": {
3636
"access": "public"

‎packages/ui-svg-images/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"@instructure/ui-utils": "^5",
3232
"classnames": "^2",
3333
"prop-types": "^15",
34-
"react": "^0.14.9 || ^15"
34+
"react": "^0.14.9 || ^15 || ^16"
3535
},
3636
"publishConfig": {
3737
"access": "public"

‎packages/ui-tabs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"classnames": "^2",
3535
"keycode": "^2",
3636
"prop-types": "^15",
37-
"react": "^0.14.9 || ^15"
37+
"react": "^0.14.9 || ^15 || ^16"
3838
},
3939
"publishConfig": {
4040
"access": "public"

‎packages/ui-themeable/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"@instructure/ui-utils": "^5",
3030
"glamor": "^2.20.37",
3131
"prop-types": "^15",
32-
"react": "^0.14.9 || ^15",
32+
"react": "^0.14.9 || ^15 || ^16",
3333
"tinycolor2": "^1.4.1"
3434
},
3535
"publishConfig": {

‎packages/ui-toggle-details/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"@instructure/ui-utils": "^5",
3939
"classnames": "^2",
4040
"prop-types": "^15",
41-
"react": "^0.14.9 || ^15"
41+
"react": "^0.14.9 || ^15 || ^16"
4242
},
4343
"publishConfig": {
4444
"access": "public"

‎packages/ui-tree-browser/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"classnames": "^2",
3434
"keycode": "^2",
3535
"prop-types": "^15",
36-
"react": "^0.14.9 || ^15"
36+
"react": "^0.14.9 || ^15 || ^16"
3737
},
3838
"publishConfig": {
3939
"access": "public"

‎packages/ui-utils/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
"object.omit": "^3",
3636
"object.pick": "^1.2.0",
3737
"prop-types": "^15",
38-
"react": "^0.14.9 || ^15",
39-
"react-dom": "^0.14.9 || ^15"
38+
"react": "^0.14.9 || ^15 || ^16",
39+
"react-dom": "^0.14.9 || ^15 || ^16"
4040
},
4141
"publishConfig": {
4242
"access": "public"

‎scripts/templates/package/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"dependencies": {
3030
"@instructure/ui-themeable": "^5",
3131
"prop-types": "^15",
32-
"react": "^0.14.9 || ^15"
32+
"react": "^0.14.9 || ^15 || ^16"
3333
},
3434
"publishConfig": {
3535
"access": "public"

‎yarn.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11837,7 +11837,7 @@ [email protected]:
1183711837
loose-envify "^1.1.0"
1183811838
object-assign "^4.1.0"
1183911839

11840-
"react-dom@^0.14.9 || ^15", react-dom@^15.6.2:
11840+
"react-dom@^0.14.9 || ^15", "react-dom@^0.14.9 || ^15 || ^16":
1184111841
version "15.6.2"
1184211842
resolved "https://registry.npmjs.org/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730"
1184311843
dependencies:
@@ -11986,7 +11986,7 @@ [email protected]:
1198611986
loose-envify "^1.1.0"
1198711987
object-assign "^4.1.0"
1198811988

11989-
"react@^0.14.9 || ^15", react@^15.6.2:
11989+
"react@^0.14.9 || ^15", "react@^0.14.9 || ^15 || ^16":
1199011990
version "15.6.2"
1199111991
resolved "https://registry.npmjs.org/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72"
1199211992
dependencies:

0 commit comments

Comments
 (0)