Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/future/base' into tom/sb-347-seq…
Browse files Browse the repository at this point in the history
…uence-importing-stories-in-parallel
  • Loading branch information
tmeasday committed Jun 21, 2022
2 parents 2895415 + bbb862e commit ca1a7a5
Show file tree
Hide file tree
Showing 109 changed files with 1,655 additions and 1,364 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
## 7.0.0-alpha.5 (June 20, 2022)

### Bug Fixes

- Core: Allow a teardown function to be returned from `renderToDOM` ([#18457](https://github.com/storybookjs/storybook/pull/18457))
- CLI: Add npm7 migration for legacy peer deps ([#18510](https://github.com/storybookjs/storybook/pull/18510))
- Interactions: Fix broken UI on nested interactions ([#18499](https://github.com/storybookjs/storybook/pull/18499))

### Maintenance

- Build: Upgrade yarn to 3.2.1 ([#18511](https://github.com/storybookjs/storybook/pull/18511))

## 7.0.0-alpha.4 (June 19, 2022)

### Breaking Changes
Expand Down
18 changes: 9 additions & 9 deletions addons/a11y/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-a11y",
"version": "7.0.0-alpha.4",
"version": "7.0.0-alpha.5",
"description": "Test component compliance with web accessibility standards",
"keywords": [
"a11y",
Expand Down Expand Up @@ -38,14 +38,14 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "7.0.0-alpha.4",
"@storybook/api": "7.0.0-alpha.4",
"@storybook/channels": "7.0.0-alpha.4",
"@storybook/client-logger": "7.0.0-alpha.4",
"@storybook/components": "7.0.0-alpha.4",
"@storybook/core-events": "7.0.0-alpha.4",
"@storybook/addons": "7.0.0-alpha.5",
"@storybook/api": "7.0.0-alpha.5",
"@storybook/channels": "7.0.0-alpha.5",
"@storybook/client-logger": "7.0.0-alpha.5",
"@storybook/components": "7.0.0-alpha.5",
"@storybook/core-events": "7.0.0-alpha.5",
"@storybook/csf": "0.0.2--canary.4566f4d.1",
"@storybook/theming": "7.0.0-alpha.4",
"@storybook/theming": "7.0.0-alpha.5",
"axe-core": "^4.2.0",
"core-js": "^3.8.2",
"global": "^4.4.0",
Expand All @@ -72,7 +72,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "006ed54452dd7c37a8cbe91a84f5312182f7ca00",
"gitHead": "3dd46982823b34d9f37be917b6247631081feff7",
"storybook": {
"displayName": "Accessibility",
"icon": "https://user-images.githubusercontent.com/263385/101991665-47042f80-3c7c-11eb-8f00-64b5a18f498a.png",
Expand Down
16 changes: 8 additions & 8 deletions addons/actions/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-actions",
"version": "7.0.0-alpha.4",
"version": "7.0.0-alpha.5",
"description": "Get UI feedback when an action is performed on an interactive element",
"keywords": [
"storybook",
Expand Down Expand Up @@ -34,13 +34,13 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "7.0.0-alpha.4",
"@storybook/api": "7.0.0-alpha.4",
"@storybook/client-logger": "7.0.0-alpha.4",
"@storybook/components": "7.0.0-alpha.4",
"@storybook/core-events": "7.0.0-alpha.4",
"@storybook/addons": "7.0.0-alpha.5",
"@storybook/api": "7.0.0-alpha.5",
"@storybook/client-logger": "7.0.0-alpha.5",
"@storybook/components": "7.0.0-alpha.5",
"@storybook/core-events": "7.0.0-alpha.5",
"@storybook/csf": "0.0.2--canary.4566f4d.1",
"@storybook/theming": "7.0.0-alpha.4",
"@storybook/theming": "7.0.0-alpha.5",
"core-js": "^3.8.2",
"fast-deep-equal": "^3.1.3",
"global": "^4.4.0",
Expand Down Expand Up @@ -71,7 +71,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "006ed54452dd7c37a8cbe91a84f5312182f7ca00",
"gitHead": "3dd46982823b34d9f37be917b6247631081feff7",
"storybook": {
"displayName": "Actions",
"unsupportedFrameworks": [
Expand Down
16 changes: 8 additions & 8 deletions addons/backgrounds/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-backgrounds",
"version": "7.0.0-alpha.4",
"version": "7.0.0-alpha.5",
"description": "Switch backgrounds to view components in different settings",
"keywords": [
"addon",
Expand Down Expand Up @@ -38,13 +38,13 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "7.0.0-alpha.4",
"@storybook/api": "7.0.0-alpha.4",
"@storybook/client-logger": "7.0.0-alpha.4",
"@storybook/components": "7.0.0-alpha.4",
"@storybook/core-events": "7.0.0-alpha.4",
"@storybook/addons": "7.0.0-alpha.5",
"@storybook/api": "7.0.0-alpha.5",
"@storybook/client-logger": "7.0.0-alpha.5",
"@storybook/components": "7.0.0-alpha.5",
"@storybook/core-events": "7.0.0-alpha.5",
"@storybook/csf": "0.0.2--canary.4566f4d.1",
"@storybook/theming": "7.0.0-alpha.4",
"@storybook/theming": "7.0.0-alpha.5",
"core-js": "^3.8.2",
"global": "^4.4.0",
"memoizerific": "^1.11.3",
Expand All @@ -66,7 +66,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "006ed54452dd7c37a8cbe91a84f5312182f7ca00",
"gitHead": "3dd46982823b34d9f37be917b6247631081feff7",
"storybook": {
"displayName": "Backgrounds",
"icon": "https://user-images.githubusercontent.com/263385/101991667-479cc600-3c7c-11eb-96d3-410e936252e7.png",
Expand Down
20 changes: 10 additions & 10 deletions addons/controls/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-controls",
"version": "7.0.0-alpha.4",
"version": "7.0.0-alpha.5",
"description": "Interact with component inputs dynamically in the Storybook UI",
"keywords": [
"addon",
Expand Down Expand Up @@ -38,15 +38,15 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "7.0.0-alpha.4",
"@storybook/api": "7.0.0-alpha.4",
"@storybook/client-logger": "7.0.0-alpha.4",
"@storybook/components": "7.0.0-alpha.4",
"@storybook/core-common": "7.0.0-alpha.4",
"@storybook/addons": "7.0.0-alpha.5",
"@storybook/api": "7.0.0-alpha.5",
"@storybook/client-logger": "7.0.0-alpha.5",
"@storybook/components": "7.0.0-alpha.5",
"@storybook/core-common": "7.0.0-alpha.5",
"@storybook/csf": "0.0.2--canary.4566f4d.1",
"@storybook/node-logger": "7.0.0-alpha.4",
"@storybook/store": "7.0.0-alpha.4",
"@storybook/theming": "7.0.0-alpha.4",
"@storybook/node-logger": "7.0.0-alpha.5",
"@storybook/store": "7.0.0-alpha.5",
"@storybook/theming": "7.0.0-alpha.5",
"core-js": "^3.8.2",
"lodash": "^4.17.21",
"ts-dedent": "^2.0.0"
Expand All @@ -66,7 +66,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "006ed54452dd7c37a8cbe91a84f5312182f7ca00",
"gitHead": "3dd46982823b34d9f37be917b6247631081feff7",
"storybook": {
"displayName": "Controls",
"icon": "https://user-images.githubusercontent.com/263385/101991669-479cc600-3c7c-11eb-93d9-38b67e8371f2.png",
Expand Down
30 changes: 15 additions & 15 deletions addons/docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-docs",
"version": "7.0.0-alpha.4",
"version": "7.0.0-alpha.5",
"description": "Document component usage and properties in Markdown",
"keywords": [
"addon",
Expand Down Expand Up @@ -52,21 +52,21 @@
"@babel/preset-env": "^7.12.11",
"@jest/transform": "^26.6.2",
"@mdx-js/react": "^1.6.22",
"@storybook/addons": "7.0.0-alpha.4",
"@storybook/api": "7.0.0-alpha.4",
"@storybook/components": "7.0.0-alpha.4",
"@storybook/core-common": "7.0.0-alpha.4",
"@storybook/core-events": "7.0.0-alpha.4",
"@storybook/addons": "7.0.0-alpha.5",
"@storybook/api": "7.0.0-alpha.5",
"@storybook/components": "7.0.0-alpha.5",
"@storybook/core-common": "7.0.0-alpha.5",
"@storybook/core-events": "7.0.0-alpha.5",
"@storybook/csf": "0.0.2--canary.4566f4d.1",
"@storybook/csf-tools": "7.0.0-alpha.4",
"@storybook/docs-tools": "7.0.0-alpha.4",
"@storybook/csf-tools": "7.0.0-alpha.5",
"@storybook/docs-tools": "7.0.0-alpha.5",
"@storybook/mdx1-csf": "^0.0.1",
"@storybook/node-logger": "7.0.0-alpha.4",
"@storybook/postinstall": "7.0.0-alpha.4",
"@storybook/preview-web": "7.0.0-alpha.4",
"@storybook/source-loader": "7.0.0-alpha.4",
"@storybook/store": "7.0.0-alpha.4",
"@storybook/theming": "7.0.0-alpha.4",
"@storybook/node-logger": "7.0.0-alpha.5",
"@storybook/postinstall": "7.0.0-alpha.5",
"@storybook/preview-web": "7.0.0-alpha.5",
"@storybook/source-loader": "7.0.0-alpha.5",
"@storybook/store": "7.0.0-alpha.5",
"@storybook/theming": "7.0.0-alpha.5",
"babel-loader": "^8.2.5",
"core-js": "^3.8.2",
"fast-deep-equal": "^3.1.3",
Expand Down Expand Up @@ -101,7 +101,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "006ed54452dd7c37a8cbe91a84f5312182f7ca00",
"gitHead": "3dd46982823b34d9f37be917b6247631081feff7",
"storybook": {
"displayName": "Docs",
"icon": "https://user-images.githubusercontent.com/263385/101991672-48355c80-3c7c-11eb-82d9-95fa12438f64.png",
Expand Down
30 changes: 15 additions & 15 deletions addons/essentials/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-essentials",
"version": "7.0.0-alpha.4",
"version": "7.0.0-alpha.5",
"description": "Curated addons to bring out the best of Storybook",
"keywords": [
"addon",
Expand Down Expand Up @@ -32,24 +32,24 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addon-actions": "7.0.0-alpha.4",
"@storybook/addon-backgrounds": "7.0.0-alpha.4",
"@storybook/addon-controls": "7.0.0-alpha.4",
"@storybook/addon-docs": "7.0.0-alpha.4",
"@storybook/addon-measure": "7.0.0-alpha.4",
"@storybook/addon-outline": "7.0.0-alpha.4",
"@storybook/addon-toolbars": "7.0.0-alpha.4",
"@storybook/addon-viewport": "7.0.0-alpha.4",
"@storybook/addons": "7.0.0-alpha.4",
"@storybook/api": "7.0.0-alpha.4",
"@storybook/core-common": "7.0.0-alpha.4",
"@storybook/node-logger": "7.0.0-alpha.4",
"@storybook/addon-actions": "7.0.0-alpha.5",
"@storybook/addon-backgrounds": "7.0.0-alpha.5",
"@storybook/addon-controls": "7.0.0-alpha.5",
"@storybook/addon-docs": "7.0.0-alpha.5",
"@storybook/addon-measure": "7.0.0-alpha.5",
"@storybook/addon-outline": "7.0.0-alpha.5",
"@storybook/addon-toolbars": "7.0.0-alpha.5",
"@storybook/addon-viewport": "7.0.0-alpha.5",
"@storybook/addons": "7.0.0-alpha.5",
"@storybook/api": "7.0.0-alpha.5",
"@storybook/core-common": "7.0.0-alpha.5",
"@storybook/node-logger": "7.0.0-alpha.5",
"core-js": "^3.8.2",
"ts-dedent": "^2.0.0"
},
"devDependencies": {
"@babel/core": "^7.12.10",
"@storybook/vue": "7.0.0-alpha.4",
"@storybook/vue": "7.0.0-alpha.5",
"@types/jest": "^26.0.16"
},
"peerDependencies": {
Expand Down Expand Up @@ -96,5 +96,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "006ed54452dd7c37a8cbe91a84f5312182f7ca00"
"gitHead": "3dd46982823b34d9f37be917b6247631081feff7"
}
20 changes: 10 additions & 10 deletions addons/interactions/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-interactions",
"version": "7.0.0-alpha.4",
"version": "7.0.0-alpha.5",
"description": "Automate, test and debug user interactions",
"keywords": [
"storybook-addons",
Expand Down Expand Up @@ -35,15 +35,15 @@
},
"dependencies": {
"@devtools-ds/object-inspector": "^1.1.2",
"@storybook/addons": "7.0.0-alpha.4",
"@storybook/api": "7.0.0-alpha.4",
"@storybook/client-logger": "7.0.0-alpha.4",
"@storybook/components": "7.0.0-alpha.4",
"@storybook/core-common": "7.0.0-alpha.4",
"@storybook/core-events": "7.0.0-alpha.4",
"@storybook/addons": "7.0.0-alpha.5",
"@storybook/api": "7.0.0-alpha.5",
"@storybook/client-logger": "7.0.0-alpha.5",
"@storybook/components": "7.0.0-alpha.5",
"@storybook/core-common": "7.0.0-alpha.5",
"@storybook/core-events": "7.0.0-alpha.5",
"@storybook/csf": "0.0.2--canary.4566f4d.1",
"@storybook/instrumenter": "7.0.0-alpha.4",
"@storybook/theming": "7.0.0-alpha.4",
"@storybook/instrumenter": "7.0.0-alpha.5",
"@storybook/theming": "7.0.0-alpha.5",
"core-js": "^3.8.2",
"global": "^4.4.0",
"jest-mock": "^27.0.6",
Expand All @@ -70,7 +70,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "006ed54452dd7c37a8cbe91a84f5312182f7ca00",
"gitHead": "3dd46982823b34d9f37be917b6247631081feff7",
"storybook": {
"displayName": "Interactions",
"unsupportedFrameworks": [
Expand Down
16 changes: 8 additions & 8 deletions addons/jest/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-jest",
"version": "7.0.0-alpha.4",
"version": "7.0.0-alpha.5",
"description": "React storybook addon that show component jest report",
"keywords": [
"addon",
Expand Down Expand Up @@ -40,12 +40,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "7.0.0-alpha.4",
"@storybook/api": "7.0.0-alpha.4",
"@storybook/client-logger": "7.0.0-alpha.4",
"@storybook/components": "7.0.0-alpha.4",
"@storybook/core-events": "7.0.0-alpha.4",
"@storybook/theming": "7.0.0-alpha.4",
"@storybook/addons": "7.0.0-alpha.5",
"@storybook/api": "7.0.0-alpha.5",
"@storybook/client-logger": "7.0.0-alpha.5",
"@storybook/components": "7.0.0-alpha.5",
"@storybook/core-events": "7.0.0-alpha.5",
"@storybook/theming": "7.0.0-alpha.5",
"core-js": "^3.8.2",
"global": "^4.4.0",
"react-sizeme": "^3.0.1",
Expand All @@ -66,7 +66,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "006ed54452dd7c37a8cbe91a84f5312182f7ca00",
"gitHead": "3dd46982823b34d9f37be917b6247631081feff7",
"storybook": {
"displayName": "Jest",
"icon": "https://pbs.twimg.com/profile_images/821713465245102080/mMtKIMax_400x400.jpg",
Expand Down
12 changes: 6 additions & 6 deletions addons/links/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-links",
"version": "7.0.0-alpha.4",
"version": "7.0.0-alpha.5",
"description": "Link stories together to build demos and prototypes with your UI components",
"keywords": [
"addon",
Expand Down Expand Up @@ -34,11 +34,11 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "7.0.0-alpha.4",
"@storybook/client-logger": "7.0.0-alpha.4",
"@storybook/core-events": "7.0.0-alpha.4",
"@storybook/addons": "7.0.0-alpha.5",
"@storybook/client-logger": "7.0.0-alpha.5",
"@storybook/core-events": "7.0.0-alpha.5",
"@storybook/csf": "0.0.2--canary.4566f4d.1",
"@storybook/router": "7.0.0-alpha.4",
"@storybook/router": "7.0.0-alpha.5",
"core-js": "^3.8.2",
"global": "^4.4.0",
"prop-types": "^15.7.2",
Expand All @@ -59,7 +59,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "006ed54452dd7c37a8cbe91a84f5312182f7ca00",
"gitHead": "3dd46982823b34d9f37be917b6247631081feff7",
"storybook": {
"displayName": "Links",
"icon": "https://user-images.githubusercontent.com/263385/101991673-48355c80-3c7c-11eb-9b6e-b627c96a75f6.png",
Expand Down
Loading

0 comments on commit ca1a7a5

Please sign in to comment.