Skip to content

Commit

Permalink
Allow Storybook packages to use React 17.x per #12908
Browse files Browse the repository at this point in the history
  • Loading branch information
@shilman
shilman committed Oct 27, 2020
1 parent c805b58 commit 5164f5e
Show file tree
Hide file tree
Showing 30 changed files with 38 additions and 30 deletions.
2 changes: 1 addition & 1 deletion addons/actions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"lodash": "^4.17.15",
"polished": "^3.4.4",
"prop-types": "^15.7.2",
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"react-inspector": "^5.0.1",
"regenerator-runtime": "^0.13.3",
"ts-dedent": "^1.1.1",
Expand Down
2 changes: 1 addition & 1 deletion addons/backgrounds/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@storybook/theming": "6.0.27",
"core-js": "^3.0.1",
"memoizerific": "^1.11.3",
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"regenerator-runtime": "^0.13.3"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion addons/cssresources/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@storybook/theming": "6.0.27",
"core-js": "^3.0.1",
"global": "^4.3.2",
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"regenerator-runtime": "^0.13.3"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion addons/design-assets/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@storybook/theming": "6.0.27",
"core-js": "^3.0.1",
"global": "^4.3.2",
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"regenerator-runtime": "^0.13.3",
"ts-dedent": "^1.1.1",
"use-image": "^1.0.3"
Expand Down
2 changes: 1 addition & 1 deletion addons/docs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"lit-element": "^2.2.1",
"lit-html": "^1.0.0",
"prettier": "~2.0.5",
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"react-is": "^16.12.0",
"require-from-string": "^2.0.2",
Expand Down
2 changes: 1 addition & 1 deletion addons/events/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"format-json": "^1.0.3",
"lodash": "^4.17.15",
"prop-types": "^15.7.2",
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"react-lifecycles-compat": "^3.0.4",
"react-textarea-autosize": "^8.1.1",
"regenerator-runtime": "^0.13.3"
Expand Down
2 changes: 1 addition & 1 deletion addons/jest/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@storybook/theming": "6.0.27",
"core-js": "^3.0.1",
"global": "^4.3.2",
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"react-sizeme": "^2.5.2",
"regenerator-runtime": "^0.13.3",
"upath": "^1.1.0"
Expand Down
2 changes: 1 addition & 1 deletion addons/queryparams/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"core-js": "^3.0.1",
"global": "^4.3.2",
"qs": "^6.6.0",
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"regenerator-runtime": "^0.13.3",
"ts-dedent": "^1.1.1"
},
Expand Down
2 changes: 1 addition & 1 deletion addons/storyshots/storyshots-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"enzyme": "^3.11.0",
"enzyme-to-json": "^3.4.1",
"jest-emotion": "^10.0.17",
"react": "^16.8.3"
"react": "^16.8.3 || ^17.0.0"
},
"peerDependencies": {
"react-dom": "*"
Expand Down
2 changes: 1 addition & 1 deletion dev-kits/addon-parameter/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@storybook/theming": "6.0.27",
"core-js": "^3.0.1",
"global": "^4.3.2",
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"ts-dedent": "^1.1.1"
},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion dev-kits/addon-preview-wrapper/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"dependencies": {
"@storybook/addons": "6.0.27",
"react": "^16.8.3"
"react": "^16.8.3 || ^17.0.0"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion dev-kits/addon-roundtrip/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@storybook/theming": "6.0.27",
"core-js": "^3.0.1",
"global": "^4.3.2",
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"ts-dedent": "^1.1.1"
},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion examples/cra-kitchen-sink/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"global": "^4.3.2",
"prop-types": "^15.7.2",
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"react-lifecycles-compat": "^3.0.4"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/dev-kits/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"jest-emotion": "^10.0.17",
"paths.macro": "^2.0.2",
"prop-types": "^15.7.2",
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"ts-loader": "^6.2.0",
"uuid": "^8.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/official-storybook/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"lodash": "^4.17.15",
"paths.macro": "^2.0.2",
"prop-types": "^15.7.2",
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"terser-webpack-plugin": "^3.0.0",
"ts-loader": "^6.0.0",
Expand Down
2 changes: 1 addition & 1 deletion lib/api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"global": "^4.3.2",
"lodash": "^4.17.15",
"memoizerific": "^1.11.3",
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"regenerator-runtime": "^0.13.3",
"store2": "^2.7.1",
"telejson": "^5.0.2",
Expand Down
2 changes: 1 addition & 1 deletion lib/cli/test/fixtures/react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "rollup -c"
},
"dependencies": {
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion lib/cli/test/fixtures/react_babel_config_js/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"storybook": "start-storybook -p 6006"
},
"dependencies": {
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion lib/cli/test/fixtures/react_babel_custom_preset/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"storybook": "start-storybook -p 6006"
},
"dependencies": {
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion lib/cli/test/fixtures/react_babel_pkg_json/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
]
},
"dependencies": {
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion lib/cli/test/fixtures/react_babelrc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"storybook": "start-storybook -p 6006"
},
"dependencies": {
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion lib/cli/test/fixtures/react_babelrc_js/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"storybook": "start-storybook -p 6006"
},
"dependencies": {
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion lib/cli/test/fixtures/react_project/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@babel/cli": "^7.2.3",
"@babel/preset-env": "^7.4.1",
"@babel/preset-react": "7.0.0",
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion lib/cli/test/fixtures/react_static_next/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"dependencies": {
"axios": "^0.18.0",
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"react-hot-loader": "^4.7.2",
"react-router": "^4.3.1",
Expand Down
2 changes: 1 addition & 1 deletion lib/cli/test/fixtures/update_package_organisations/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"test": "react-scripts test --env=jsdom"
},
"dependencies": {
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"react-scripts": "0.9.x"
},
Expand Down
2 changes: 1 addition & 1 deletion lib/cli/test/fixtures/webpack_react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "webpack"
},
"dependencies": {
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion lib/components/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"overlayscrollbars": "^1.10.2",
"polished": "^3.4.4",
"popper.js": "^1.14.7",
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"react-color": "^2.17.0",
"react-dom": "^16.8.3",
"react-popper-tooltip": "^2.11.0",
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"memoizerific": "^1.11.3",
"polished": "^3.4.4",
"qs": "^6.6.0",
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"react-draggable": "^4.0.3",
"react-helmet-async": "^1.0.2",
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@
"p-limit": "^2.3.0",
"prettier": "~2.0.5",
"raf": "^3.4.0",
"react": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"react-test-renderer": "^16.8.3",
"recursive-copy": "^2.0.10",
Expand Down
10 changes: 9 additions & 1 deletion yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26546,7 +26546,7 @@ react@^15.4.2:
object-assign "^4.1.0"
prop-types "^15.5.10"

react@^16.0.0, react@^16.10.2, react@^16.13.1, react@^16.8.3, react@^16.8.4, react@^16.9.17:
react@^16.0.0, react@^16.10.2, react@^16.13.1, react@^16.8.4, react@^16.9.17:
version "16.13.1"
resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"
integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==
Expand All @@ -26555,6 +26555,14 @@ react@^16.0.0, react@^16.10.2, react@^16.13.1, react@^16.8.3, react@^16.8.4, rea
object-assign "^4.1.1"
prop-types "^15.6.2"

"react@^16.8.3 || ^17.0.0":
version "17.0.1"
resolved "https://registry.yarnpkg.com/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127"
integrity sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"

reactcss@^1.2.0:
version "1.2.3"
resolved "https://registry.yarnpkg.com/reactcss/-/reactcss-1.2.3.tgz#c00013875e557b1cf0dfd9a368a1c3dab3b548dd"
Expand Down

0 comments on commit 5164f5e

Please sign in to comment.