Skip to content

Commit

Permalink
Merge pull request #12937 from storybookjs/core/react-dom-17x
Browse files Browse the repository at this point in the history 
Core: Allow React-DOM 17.x
  • Loading branch information
@shilman
shilman authored Oct 30, 2020
2 parents db9b0bd + d152532 commit 4353bc3
Show file tree
Hide file tree
Showing 48 changed files with 60 additions and 53 deletions.
2 changes: 1 addition & 1 deletion addons/a11y/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"global": "^4.3.2",
"lodash": "^4.17.15",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"react-sizeme": "^2.5.2",
"regenerator-runtime": "^0.13.7",
"ts-dedent": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion addons/actions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"polished": "^3.4.4",
"prop-types": "^15.7.2",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"react-inspector": "^5.0.1",
"regenerator-runtime": "^0.13.7",
"ts-dedent": "^2.0.0",
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 @@ -42,7 +42,7 @@
"global": "^4.3.2",
"memoizerific": "^1.11.3",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"regenerator-runtime": "^0.13.7",
"ts-dedent": "^2.0.0",
"util-deprecate": "^1.0.2"
Expand Down
2 changes: 1 addition & 1 deletion addons/controls/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@storybook/theming": "6.1.0-alpha.32",
"core-js": "^3.0.1",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"ts-dedent": "^2.0.0"
},
"publishConfig": {
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 @@ -40,7 +40,7 @@
"core-js": "^3.0.1",
"global": "^4.3.2",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"regenerator-runtime": "^0.13.7"
},
"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 @@ -43,7 +43,7 @@
"core-js": "^3.0.1",
"global": "^4.3.2",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"regenerator-runtime": "^0.13.7",
"ts-dedent": "^2.0.0",
"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 @@ -74,7 +74,7 @@
"prettier": "~2.0.5",
"prop-types": "^15.7.2",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"react-element-to-jsx-string": "^14.3.1",
"regenerator-runtime": "^0.13.7",
"remark-external-links": "^6.0.0",
Expand Down
2 changes: 1 addition & 1 deletion addons/essentials/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@storybook/node-logger": "6.1.0-alpha.32",
"core-js": "^3.0.1",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"regenerator-runtime": "^0.13.7",
"ts-dedent": "^2.0.0"
},
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 @@ -41,7 +41,7 @@
"lodash": "^4.17.15",
"prop-types": "^15.7.2",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"react-lifecycles-compat": "^3.0.4",
"react-textarea-autosize": "^8.1.1",
"regenerator-runtime": "^0.13.7"
Expand Down
2 changes: 1 addition & 1 deletion addons/google-analytics/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"core-js": "^3.0.1",
"global": "^4.3.2",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"react-ga": "^2.5.7",
"regenerator-runtime": "^0.13.7"
},
Expand Down
2 changes: 1 addition & 1 deletion addons/graphql/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"graphql": "^15.0.0",
"prop-types": "^15.7.2",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"regenerator-runtime": "^0.13.7",
"webpack": "^4.43.0"
},
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 @@ -43,7 +43,7 @@
"core-js": "^3.0.1",
"global": "^4.3.2",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"react-sizeme": "^2.5.2",
"regenerator-runtime": "^0.13.7",
"upath": "^1.1.0"
Expand Down
2 changes: 1 addition & 1 deletion addons/knobs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"qs": "^6.6.0",
"react": "^16.8.3 || ^17.0.0",
"react-color": "^2.17.0",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"react-lifecycles-compat": "^3.0.4",
"react-select": "^3.0.8",
"regenerator-runtime": "^0.13.7"
Expand Down
2 changes: 1 addition & 1 deletion addons/links/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"prop-types": "^15.7.2",
"qs": "^6.6.0",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"regenerator-runtime": "^0.13.7",
"ts-dedent": "^2.0.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 @@ -40,7 +40,7 @@
"global": "^4.3.2",
"qs": "^6.6.0",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"regenerator-runtime": "^0.13.7",
"ts-dedent": "^2.0.0"
},
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 @@ -46,7 +46,7 @@
"jest-specific-snapshot": "^4.0.0",
"pretty-format": "^26.4.0",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"react-test-renderer": "^16.8.3",
"read-pkg-up": "^7.0.0",
"regenerator-runtime": "^0.13.7",
Expand Down
2 changes: 1 addition & 1 deletion addons/storysource/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"prettier": "~2.0.5",
"prop-types": "^15.7.2",
"react": "^16.9.17",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"react-syntax-highlighter": "^13.5.0",
"regenerator-runtime": "^0.13.7"
},
Expand Down
2 changes: 1 addition & 1 deletion addons/toolbars/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@storybook/components": "6.1.0-alpha.32",
"core-js": "^3.0.1",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3"
"react-dom": "^16.8.3 || ^17.0.0"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion addons/viewport/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"memoizerific": "^1.11.3",
"prop-types": "^15.7.2",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"regenerator-runtime": "^0.13.7"
},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion app/react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"react": "^16.8.3",
"react-dev-utils": "^10.0.0",
"react-docgen-typescript-plugin": "^0.6.0",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"react-refresh": "^0.8.3",
"regenerator-runtime": "^0.13.7",
"ts-dedent": "^2.0.0",
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 @@ -14,7 +14,7 @@
"global": "^4.3.2",
"prop-types": "^15.7.2",
"react": "^16.8.3",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"react-lifecycles-compat": "^3.0.4"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/cra-ts-essentials/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@types/react-dom": "16.9.8",
"global": "^4.3.2",
"react": "^16.8.3",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"react-scripts": "3.4.1",
"typescript": "^3.9.3"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/cra-ts-kitchen-sink/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@types/react-dom": "16.9.8",
"prop-types": "^15.7.2",
"react": "^16.8.3",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"react-scripts": "3.4.1",
"typescript": "^3.9.3"
},
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 @@ -33,7 +33,7 @@
"paths.macro": "^2.0.2",
"prop-types": "^15.7.2",
"react": "^16.8.3",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"ts-loader": "^6.2.0",
"uuid": "^8.0.0",
"webpack": "^4.33.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 @@ -56,7 +56,7 @@
"paths.macro": "^2.0.2",
"prop-types": "^15.7.2",
"react": "^16.8.3",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"terser-webpack-plugin": "^3.0.0",
"ts-loader": "^6.0.0",
"uuid": "^8.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/react-ts/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@types/react-dom": "^16.9.8",
"prop-types": "15.7.2",
"react": "^16.8.3",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"typescript": "^3.9.3",
"webpack": "^4.43.0"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/standalone-preview/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"@storybook/react": "6.1.0-alpha.32",
"parcel": "^1.12.3",
"react": "^16.8.3",
"react-dom": "^16.8.3"
"react-dom": "^16.8.3 || ^17.0.0"
}
}
2 changes: 1 addition & 1 deletion lib/addons/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"core-js": "^3.0.1",
"global": "^4.3.2",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"regenerator-runtime": "^0.13.7"
},
"publishConfig": {
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 @@ -43,7 +43,7 @@
"lodash": "^4.17.15",
"memoizerific": "^1.11.3",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"regenerator-runtime": "^0.13.7",
"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 @@ -8,7 +8,7 @@
},
"dependencies": {
"react": "^16.8.3",
"react-dom": "^16.8.3"
"react-dom": "^16.8.3 || ^17.0.0"
},
"devDependencies": {
"@babel/plugin-external-helpers": "7.2.0",
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 @@ -9,7 +9,7 @@
},
"dependencies": {
"react": "^16.8.3",
"react-dom": "^16.8.3"
"react-dom": "^16.8.3 || ^17.0.0"
},
"devDependencies": {
"@babel/core": "^7.3.4",
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 @@ -9,7 +9,7 @@
},
"dependencies": {
"react": "^16.8.3",
"react-dom": "^16.8.3"
"react-dom": "^16.8.3 || ^17.0.0"
},
"devDependencies": {
"@babel/core": "^7.3.4",
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 @@ -14,7 +14,7 @@
},
"dependencies": {
"react": "^16.8.3",
"react-dom": "^16.8.3"
"react-dom": "^16.8.3 || ^17.0.0"
},
"devDependencies": {
"@babel/core": "^7.3.4",
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 @@ -9,7 +9,7 @@
},
"dependencies": {
"react": "^16.8.3",
"react-dom": "^16.8.3"
"react-dom": "^16.8.3 || ^17.0.0"
},
"devDependencies": {
"@babel/core": "^7.3.4",
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 @@ -9,7 +9,7 @@
},
"dependencies": {
"react": "^16.8.3",
"react-dom": "^16.8.3"
"react-dom": "^16.8.3 || ^17.0.0"
},
"devDependencies": {
"@babel/core": "^7.3.4",
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 @@ -11,6 +11,6 @@
"@babel/preset-env": "^7.4.1",
"@babel/preset-react": "7.0.0",
"react": "^16.8.3",
"react-dom": "^16.8.3"
"react-dom": "^16.8.3 || ^17.0.0"
}
}
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 @@ -12,7 +12,7 @@
"dependencies": {
"axios": "^0.18.0",
"react": "^16.8.3",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"react-hot-loader": "^4.7.2",
"react-router": "^4.3.1",
"react-static": "^6.3.6"
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 @@ -12,7 +12,7 @@
},
"dependencies": {
"react": "^16.8.3",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"react-scripts": "0.9.x"
},
"devDependencies": {
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 @@ -8,7 +8,7 @@
},
"dependencies": {
"react": "^16.8.3",
"react-dom": "^16.8.3"
"react-dom": "^16.8.3 || ^17.0.0"
},
"devDependencies": {
"@babel/core": "^7.3.4",
Expand Down
2 changes: 1 addition & 1 deletion lib/client-api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"memoizerific": "^1.11.3",
"qs": "^6.6.0",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"regenerator-runtime": "^0.13.7",
"stable": "^0.1.8",
"store2": "^2.7.1",
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 @@ -45,7 +45,7 @@
"polished": "^3.4.4",
"react": "^16.8.3 || ^17.0.0",
"react-color": "^2.17.0",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"react-popper-tooltip": "^3.1.0",
"react-syntax-highlighter": "^13.5.0",
"react-textarea-autosize": "^8.1.1",
Expand Down
2 changes: 1 addition & 1 deletion lib/core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
"raw-loader": "^4.0.1",
"react": "^16.8.3 || ^17.0.0",
"react-dev-utils": "^10.0.0",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"regenerator-runtime": "^0.13.7",
"resolve-from": "^5.0.0",
"serve-favicon": "^2.5.0",
Expand Down
2 changes: 1 addition & 1 deletion lib/router/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"memoizerific": "^1.11.3",
"qs": "^6.6.0",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3"
"react-dom": "^16.8.3 || ^17.0.0"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion lib/source-loader/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"lodash": "^4.17.15",
"prettier": "~2.0.5",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3",
"react-dom": "^16.8.3 || ^17.0.0",
"regenerator-runtime": "^0.13.7",
"source-map": "^0.7.3"
},
Expand Down
Loading

0 comments on commit 4353bc3

Please sign in to comment.