Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

React: Apply React 17 and CRA4 fixes to master #12925

Closed
wants to merge 22 commits into from
Closed

React: Apply React 17 and CRA4 fixes to master #12925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c805b58
React JSX transform support per #12899
shilman Oct 27, 2020
5164f5e
Allow Storybook packages to use React 17.x per #12908
shilman Oct 27, 2020
ff35a94
6.0.28-alpha.0 changelog
shilman Oct 28, 2020
0ff249a
Update root, peer deps, version.ts/json to 6.0.28-alpha.0
shilman Oct 28, 2020
3a6f8ed
v6.0.28-alpha.0
shilman Oct 28, 2020
5cc3c63
Update git head to 6.0.28-alpha.0
shilman Oct 28, 2020
ad2dfae
Core: Relax version constraints for react-dom 17
shilman Oct 29, 2020
5df5380
Disable DLL by default in template
shilman Oct 29, 2020
568b05e
Update root, peer deps, version.ts/json to 6.0.28-alpha.1
shilman Oct 29, 2020
d20615d
v6.0.28-alpha.1
shilman Oct 29, 2020
6f739ca
Update git head to 6.0.28-alpha.1
shilman Oct 29, 2020
ee2aabe
Revert "Disable DLL by default in template"
shilman Oct 29, 2020
f9f49bd
Update root, peer deps, version.ts/json to 6.0.28-alpha.2
shilman Oct 29, 2020
8fff3dc
v6.0.28-alpha.2
shilman Oct 29, 2020
35b0e7f
Update git head to 6.0.28-alpha.2
shilman Oct 29, 2020
f8fba93
Make react/react-dom peer deps across the board
shilman Oct 29, 2020
c0ab93d
Update root, peer deps, version.ts/json to 6.0.28-alpha.3
shilman Oct 29, 2020
b0d9001
v6.0.28-alpha.3
shilman Oct 29, 2020
97f3dec
Update git head to 6.0.28-alpha.3
shilman Oct 29, 2020
375bb01
Add react/react-dom dev dependencies for tests
shilman Oct 29, 2020
0e101f2
Add missing react-dom dep
shilman Oct 29, 2020
41e1a28
Make react a direct dep for non-react frameworks
shilman Oct 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 6.0.28-alpha.0 (October 28, 2020)

- React: Allow Storybook packages to use React 17.x ([#12908](https://github.com/storybookjs/storybook/pull/12908))
- React: Support JSX react transform introduced in 16.14.0 ([#12899](https://github.com/storybookjs/storybook/pull/12899))

## 6.0.27 (October 23, 2020)

### Bug Fixes
Expand Down
24 changes: 12 additions & 12 deletions addons/a11y/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-a11y",
"version": "6.0.27",
"version": "6.0.28-alpha.3",
"description": "a11y addon for storybook",
"keywords": [
"a11y",
Expand Down Expand Up @@ -33,14 +33,14 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.0.27",
"@storybook/api": "6.0.27",
"@storybook/channels": "6.0.27",
"@storybook/client-api": "6.0.27",
"@storybook/client-logger": "6.0.27",
"@storybook/components": "6.0.27",
"@storybook/core-events": "6.0.27",
"@storybook/theming": "6.0.27",
"@storybook/addons": "6.0.28-alpha.3",
"@storybook/api": "6.0.28-alpha.3",
"@storybook/channels": "6.0.28-alpha.3",
"@storybook/client-api": "6.0.28-alpha.3",
"@storybook/client-logger": "6.0.28-alpha.3",
"@storybook/components": "6.0.28-alpha.3",
"@storybook/core-events": "6.0.28-alpha.3",
"@storybook/theming": "6.0.28-alpha.3",
"axe-core": "^3.5.2",
"core-js": "^3.0.1",
"global": "^4.3.2",
Expand All @@ -53,8 +53,8 @@
"devDependencies": {
"@testing-library/react": "^10.0.4",
"@types/webpack-env": "^1.15.2",
"react": "^16.13.1",
"react-dom": "^16.13.1"
"react": "^16.8.3 || ^17.0.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's probably no point of using || in devDependencies

"react-dom": "^16.8.3 || ^17.0.0"
},
"peerDependencies": {
"react": "*",
Expand All @@ -63,7 +63,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "1aa25de4b1a9eb5570f3e4814780378810b6ca04",
"gitHead": "b0d900146b8146ecb446d29083f95cf2a37a445b",
"typesVersions": {
"<=3.5": {
"*": [
Expand Down
22 changes: 12 additions & 10 deletions addons/actions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-actions",
"version": "6.0.27",
"version": "6.0.28-alpha.3",
"description": "Action Logger addon for storybook",
"keywords": [
"storybook"
Expand Down Expand Up @@ -28,19 +28,18 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.0.27",
"@storybook/api": "6.0.27",
"@storybook/client-api": "6.0.27",
"@storybook/components": "6.0.27",
"@storybook/core-events": "6.0.27",
"@storybook/theming": "6.0.27",
"@storybook/addons": "6.0.28-alpha.3",
"@storybook/api": "6.0.28-alpha.3",
"@storybook/client-api": "6.0.28-alpha.3",
"@storybook/components": "6.0.28-alpha.3",
"@storybook/core-events": "6.0.28-alpha.3",
"@storybook/theming": "6.0.28-alpha.3",
"core-js": "^3.0.1",
"fast-deep-equal": "^3.1.1",
"global": "^4.3.2",
"lodash": "^4.17.15",
"polished": "^3.4.4",
"prop-types": "^15.7.2",
"react": "^16.8.3",
"react-inspector": "^5.0.1",
"regenerator-runtime": "^0.13.3",
"ts-dedent": "^1.1.1",
Expand All @@ -50,15 +49,18 @@
"devDependencies": {
"@types/lodash": "^4.14.150",
"@types/uuid": "^7.0.3",
"@types/webpack-env": "^1.15.2"
"@types/webpack-env": "^1.15.2",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3 || ^17.0.0"
},
"peerDependencies": {
"react": "^16.8.3 || ^17.0.0",
"react-dom": "*"
},
"publishConfig": {
"access": "public"
},
"gitHead": "1aa25de4b1a9eb5570f3e4814780378810b6ca04",
"gitHead": "b0d900146b8146ecb446d29083f95cf2a37a445b",
"typesVersions": {
"<=3.5": {
"*": [
Expand Down
22 changes: 12 additions & 10 deletions addons/backgrounds/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-backgrounds",
"version": "6.0.27",
"version": "6.0.28-alpha.3",
"description": "A storybook addon to show different backgrounds for your preview",
"keywords": [
"addon",
Expand Down Expand Up @@ -32,27 +32,29 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.0.27",
"@storybook/api": "6.0.27",
"@storybook/client-logger": "6.0.27",
"@storybook/components": "6.0.27",
"@storybook/core-events": "6.0.27",
"@storybook/theming": "6.0.27",
"@storybook/addons": "6.0.28-alpha.3",
"@storybook/api": "6.0.28-alpha.3",
"@storybook/client-logger": "6.0.28-alpha.3",
"@storybook/components": "6.0.28-alpha.3",
"@storybook/core-events": "6.0.28-alpha.3",
"@storybook/theming": "6.0.28-alpha.3",
"core-js": "^3.0.1",
"memoizerific": "^1.11.3",
"react": "^16.8.3",
"regenerator-runtime": "^0.13.3"
},
"devDependencies": {
"@types/webpack-env": "^1.15.2"
"@types/webpack-env": "^1.15.2",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3 || ^17.0.0"
},
"peerDependencies": {
"react": "^16.8.3 || ^17.0.0",
"react-dom": "*"
},
"publishConfig": {
"access": "public"
},
"gitHead": "1aa25de4b1a9eb5570f3e4814780378810b6ca04",
"gitHead": "b0d900146b8146ecb446d29083f95cf2a37a445b",
"typesVersions": {
"<=3.5": {
"*": [
Expand Down
16 changes: 8 additions & 8 deletions addons/controls/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-controls",
"version": "6.0.27",
"version": "6.0.28-alpha.3",
"description": "Controls for component properties",
"keywords": [
"addon",
Expand Down Expand Up @@ -30,12 +30,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.0.27",
"@storybook/api": "6.0.27",
"@storybook/client-api": "6.0.27",
"@storybook/components": "6.0.27",
"@storybook/node-logger": "6.0.27",
"@storybook/theming": "6.0.27",
"@storybook/addons": "6.0.28-alpha.3",
"@storybook/api": "6.0.28-alpha.3",
"@storybook/client-api": "6.0.28-alpha.3",
"@storybook/components": "6.0.28-alpha.3",
"@storybook/node-logger": "6.0.28-alpha.3",
"@storybook/theming": "6.0.28-alpha.3",
"core-js": "^3.0.1",
"ts-dedent": "^1.1.1"
},
Expand All @@ -46,5 +46,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "1aa25de4b1a9eb5570f3e4814780378810b6ca04"
"gitHead": "b0d900146b8146ecb446d29083f95cf2a37a445b"
}
16 changes: 8 additions & 8 deletions addons/cssresources/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-cssresources",
"version": "6.0.27",
"version": "6.0.28-alpha.3",
"description": "A storybook addon to switch between css resources at runtime for your story",
"keywords": [
"addon",
Expand Down Expand Up @@ -32,14 +32,14 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.0.27",
"@storybook/api": "6.0.27",
"@storybook/components": "6.0.27",
"@storybook/core-events": "6.0.27",
"@storybook/theming": "6.0.27",
"@storybook/addons": "6.0.28-alpha.3",
"@storybook/api": "6.0.28-alpha.3",
"@storybook/components": "6.0.28-alpha.3",
"@storybook/core-events": "6.0.28-alpha.3",
"@storybook/theming": "6.0.28-alpha.3",
"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 All @@ -55,7 +55,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "1aa25de4b1a9eb5570f3e4814780378810b6ca04",
"gitHead": "b0d900146b8146ecb446d29083f95cf2a37a445b",
"typesVersions": {
"<=3.5": {
"*": [
Expand Down
18 changes: 9 additions & 9 deletions addons/design-assets/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-design-assets",
"version": "6.0.27",
"version": "6.0.28-alpha.3",
"description": "Design asset preview for storybook",
"keywords": [
"addon",
Expand Down Expand Up @@ -34,15 +34,15 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.0.27",
"@storybook/api": "6.0.27",
"@storybook/client-logger": "6.0.27",
"@storybook/components": "6.0.27",
"@storybook/core-events": "6.0.27",
"@storybook/theming": "6.0.27",
"@storybook/addons": "6.0.28-alpha.3",
"@storybook/api": "6.0.28-alpha.3",
"@storybook/client-logger": "6.0.28-alpha.3",
"@storybook/components": "6.0.28-alpha.3",
"@storybook/core-events": "6.0.28-alpha.3",
"@storybook/theming": "6.0.28-alpha.3",
"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 All @@ -53,7 +53,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "1aa25de4b1a9eb5570f3e4814780378810b6ca04",
"gitHead": "b0d900146b8146ecb446d29083f95cf2a37a445b",
"typesVersions": {
"<=3.5": {
"*": [
Expand Down
34 changes: 17 additions & 17 deletions addons/docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-docs",
"version": "6.0.27",
"version": "6.0.28-alpha.3",
"description": "Superior documentation for your components",
"keywords": [
"addon",
Expand Down Expand Up @@ -47,18 +47,18 @@
"@mdx-js/loader": "^1.5.1",
"@mdx-js/mdx": "^1.5.1",
"@mdx-js/react": "^1.5.1",
"@storybook/addons": "6.0.27",
"@storybook/api": "6.0.27",
"@storybook/client-api": "6.0.27",
"@storybook/client-logger": "6.0.27",
"@storybook/components": "6.0.27",
"@storybook/core": "6.0.27",
"@storybook/core-events": "6.0.27",
"@storybook/addons": "6.0.28-alpha.3",
"@storybook/api": "6.0.28-alpha.3",
"@storybook/client-api": "6.0.28-alpha.3",
"@storybook/client-logger": "6.0.28-alpha.3",
"@storybook/components": "6.0.28-alpha.3",
"@storybook/core": "6.0.28-alpha.3",
"@storybook/core-events": "6.0.28-alpha.3",
"@storybook/csf": "0.0.1",
"@storybook/node-logger": "6.0.27",
"@storybook/postinstall": "6.0.27",
"@storybook/source-loader": "6.0.27",
"@storybook/theming": "6.0.27",
"@storybook/node-logger": "6.0.28-alpha.3",
"@storybook/postinstall": "6.0.28-alpha.3",
"@storybook/source-loader": "6.0.28-alpha.3",
"@storybook/theming": "6.0.28-alpha.3",
"acorn": "^7.1.0",
"acorn-jsx": "^5.1.0",
"acorn-walk": "^7.0.0",
Expand All @@ -83,8 +83,8 @@
"@babel/core": "^7.9.6",
"@emotion/core": "^10.0.20",
"@emotion/styled": "^10.0.17",
"@storybook/react": "6.0.27",
"@storybook/web-components": "6.0.27",
"@storybook/react": "6.0.28-alpha.3",
"@storybook/web-components": "6.0.28-alpha.3",
"@types/cross-spawn": "^6.0.1",
"@types/doctrine": "^0.0.3",
"@types/enzyme": "^3.10.3",
Expand All @@ -103,8 +103,8 @@
"lit-element": "^2.2.1",
"lit-html": "^1.0.0",
"prettier": "~2.0.5",
"react": "^16.8.3",
"react-dom": "^16.8.3",
"react": "^16.8.3 || ^17.0.0",
"react-dom": "^16.8.3 || ^17.0.0",
"react-is": "^16.12.0",
"require-from-string": "^2.0.2",
"rxjs": "^6.5.4",
Expand Down Expand Up @@ -144,7 +144,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "1aa25de4b1a9eb5570f3e4814780378810b6ca04",
"gitHead": "b0d900146b8146ecb446d29083f95cf2a37a445b",
"typesVersions": {
"<=3.5": {
"*": [
Expand Down
22 changes: 11 additions & 11 deletions addons/essentials/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-essentials",
"version": "6.0.27",
"version": "6.0.28-alpha.3",
"description": "Curated addons to bring out the best of Storybook",
"keywords": [
"addon",
Expand Down Expand Up @@ -28,15 +28,15 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addon-actions": "6.0.27",
"@storybook/addon-backgrounds": "6.0.27",
"@storybook/addon-controls": "6.0.27",
"@storybook/addon-docs": "6.0.27",
"@storybook/addon-toolbars": "6.0.27",
"@storybook/addon-viewport": "6.0.27",
"@storybook/addons": "6.0.27",
"@storybook/api": "6.0.27",
"@storybook/node-logger": "6.0.27",
"@storybook/addon-actions": "6.0.28-alpha.3",
"@storybook/addon-backgrounds": "6.0.28-alpha.3",
"@storybook/addon-controls": "6.0.28-alpha.3",
"@storybook/addon-docs": "6.0.28-alpha.3",
"@storybook/addon-toolbars": "6.0.28-alpha.3",
"@storybook/addon-viewport": "6.0.28-alpha.3",
"@storybook/addons": "6.0.28-alpha.3",
"@storybook/api": "6.0.28-alpha.3",
"@storybook/node-logger": "6.0.28-alpha.3",
"core-js": "^3.0.1",
"regenerator-runtime": "^0.13.3",
"ts-dedent": "^1.1.1"
Expand All @@ -54,7 +54,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "1aa25de4b1a9eb5570f3e4814780378810b6ca04",
"gitHead": "b0d900146b8146ecb446d29083f95cf2a37a445b",
"typesVersions": {
"<=3.5": {
"*": [
Expand Down
Loading