Skip to content

Commit

Permalink
Merge pull request #2 from storybookjs/next
Browse files Browse the repository at this point in the history
merge
  • Loading branch information
BlackFenix2 committed Aug 31, 2020
2 parents 2f47267 + 6b3e2fb commit 5e982b6
Show file tree
Hide file tree
Showing 126 changed files with 1,283 additions and 819 deletions.
47 changes: 47 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,50 @@
## 6.1.0-alpha.1 (August 31, 2020)

### Features

- Components: Add additionalActions prop to Preview block ([#12274](https://github.com/storybookjs/storybook/pull/12274))

### Maintenance

- Addon-docs: Add transformSource for jsxDecorator, deprecated onBeforeRender ([#12178](https://github.com/storybookjs/storybook/pull/12178))

### Dependency Upgrades

- Update the axe version in addon-a11y to 4.0 ([#12150](https://github.com/storybookjs/storybook/pull/12150))
- Upgrade react-popper-tooltip to 3.1.0 ([#11827](https://github.com/storybookjs/storybook/pull/11827))

## 6.1.0-alpha.0 (August 31, 2020)

### Features

- SyntaxHighlighter: Put formatted code to clipboard ([#11276](https://github.com/storybookjs/storybook/pull/11276))
- Addon-docs: Add inline rendering for svelte ([#12313](https://github.com/storybookjs/storybook/pull/12313))

### Bug Fixes

- UI: Remove scrolling attribute from iFrame ([#12223](https://github.com/storybookjs/storybook/pull/12223))

### Maintenance

- CLI: Add HTML components and stories ([#12286](https://github.com/storybookjs/storybook/pull/12286))
- Vue: Add basic CSF types ([#12037](https://github.com/storybookjs/storybook/pull/12037))
- CLI: Add Aurelia detection ([#12181](https://github.com/storybookjs/storybook/pull/12181))
- Storyshots: Remove needless iteration testStorySnapshots ([#12321](https://github.com/storybookjs/storybook/pull/12321))

### Dependency Upgrades

- Bump react-syntax-highlighter to 13.2.1 ([#11838](https://github.com/storybookjs/storybook/pull/11838))

## 6.0.21 (August 31, 2020)

### Bug Fixes

- Addon-controls: Fix uncontrolled to controlled warning for booleans ([#12322](https://github.com/storybookjs/storybook/pull/12322))

### Maintenance

- Build: Add CRA benchmark ([#12209](https://github.com/storybookjs/storybook/pull/12209))

## 6.0.20 (August 28, 2020)

### Bug Fixes
Expand Down
13 changes: 13 additions & 0 deletions MIGRATION.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<h1>Migration</h1>

- [From version 6.0.x to 6.1.0](#from-version-60x-to-610)
- [6.1 deprecations](#61-deprecations)
- [Deprecated onBeforeRender](#deprecated-onbeforerender)
- [From version 5.3.x to 6.0.x](#from-version-53x-to-60x)
- [Hoisted CSF annotations](#hoisted-csf-annotations)
- [Zero config typescript](#zero-config-typescript)
Expand Down Expand Up @@ -129,6 +132,16 @@
- [Packages renaming](#packages-renaming)
- [Deprecated embedded addons](#deprecated-embedded-addons)

## From version 6.0.x to 6.1.0

### 6.1 deprecations

#### Deprecated onBeforeRender

The `@storybook/addon-docs` previously accepted a `jsx` option called `onBeforeRender`, which was unfortunately named as it was called after the render.

We've renamed it `transformSource` and also allowed it to receive the `StoryContext` in case source rendering requires additional information.

## From version 5.3.x to 6.0.x

### Hoisted CSF annotations
Expand Down
22 changes: 11 additions & 11 deletions addons/a11y/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-a11y",
"version": "6.0.20",
"version": "6.1.0-alpha.1",
"description": "a11y addon for storybook",
"keywords": [
"a11y",
Expand Down Expand Up @@ -33,15 +33,15 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.0.20",
"@storybook/api": "6.0.20",
"@storybook/channels": "6.0.20",
"@storybook/client-api": "6.0.20",
"@storybook/client-logger": "6.0.20",
"@storybook/components": "6.0.20",
"@storybook/core-events": "6.0.20",
"@storybook/theming": "6.0.20",
"axe-core": "^3.5.2",
"@storybook/addons": "6.1.0-alpha.1",
"@storybook/api": "6.1.0-alpha.1",
"@storybook/channels": "6.1.0-alpha.1",
"@storybook/client-api": "6.1.0-alpha.1",
"@storybook/client-logger": "6.1.0-alpha.1",
"@storybook/components": "6.1.0-alpha.1",
"@storybook/core-events": "6.1.0-alpha.1",
"@storybook/theming": "6.1.0-alpha.1",
"axe-core": "^4.0.1",
"core-js": "^3.0.1",
"global": "^4.3.2",
"lodash": "^4.17.15",
Expand All @@ -63,7 +63,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "d8b9d25b69b8bee488265829beddbd0ebd38fe8f",
"gitHead": "238a06299305d9b52e868ec7791ea76675310ddd",
"typesVersions": {
"<=3.5": {
"*": [
Expand Down
8 changes: 1 addition & 7 deletions addons/a11y/src/a11yRunner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,7 @@ const run = async (storyId: string) => {
active = true;
channel.emit(EVENTS.RUNNING);

const {
element = getElement(),
config,
options = {
restoreScroll: true,
},
} = input;
const { element = getElement(), config, options = {} } = input;
axe.reset();
if (config) {
axe.configure(config);
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": "6.0.20",
"version": "6.1.0-alpha.1",
"description": "Action Logger addon for storybook",
"keywords": [
"storybook"
Expand Down Expand Up @@ -28,12 +28,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.0.20",
"@storybook/api": "6.0.20",
"@storybook/client-api": "6.0.20",
"@storybook/components": "6.0.20",
"@storybook/core-events": "6.0.20",
"@storybook/theming": "6.0.20",
"@storybook/addons": "6.1.0-alpha.1",
"@storybook/api": "6.1.0-alpha.1",
"@storybook/client-api": "6.1.0-alpha.1",
"@storybook/components": "6.1.0-alpha.1",
"@storybook/core-events": "6.1.0-alpha.1",
"@storybook/theming": "6.1.0-alpha.1",
"core-js": "^3.0.1",
"fast-deep-equal": "^3.1.1",
"global": "^4.3.2",
Expand All @@ -58,7 +58,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "d8b9d25b69b8bee488265829beddbd0ebd38fe8f",
"gitHead": "238a06299305d9b52e868ec7791ea76675310ddd",
"typesVersions": {
"<=3.5": {
"*": [
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": "6.0.20",
"version": "6.1.0-alpha.1",
"description": "A storybook addon to show different backgrounds for your preview",
"keywords": [
"addon",
Expand Down Expand Up @@ -32,12 +32,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.0.20",
"@storybook/api": "6.0.20",
"@storybook/client-logger": "6.0.20",
"@storybook/components": "6.0.20",
"@storybook/core-events": "6.0.20",
"@storybook/theming": "6.0.20",
"@storybook/addons": "6.1.0-alpha.1",
"@storybook/api": "6.1.0-alpha.1",
"@storybook/client-logger": "6.1.0-alpha.1",
"@storybook/components": "6.1.0-alpha.1",
"@storybook/core-events": "6.1.0-alpha.1",
"@storybook/theming": "6.1.0-alpha.1",
"core-js": "^3.0.1",
"memoizerific": "^1.11.3",
"react": "^16.8.3",
Expand All @@ -52,7 +52,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "d8b9d25b69b8bee488265829beddbd0ebd38fe8f",
"gitHead": "238a06299305d9b52e868ec7791ea76675310ddd",
"typesVersions": {
"<=3.5": {
"*": [
Expand Down
16 changes: 8 additions & 8 deletions addons/controls/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-controls",
"version": "6.0.20",
"version": "6.1.0-alpha.1",
"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.20",
"@storybook/api": "6.0.20",
"@storybook/client-api": "6.0.20",
"@storybook/components": "6.0.20",
"@storybook/node-logger": "6.0.20",
"@storybook/theming": "6.0.20",
"@storybook/addons": "6.1.0-alpha.1",
"@storybook/api": "6.1.0-alpha.1",
"@storybook/client-api": "6.1.0-alpha.1",
"@storybook/components": "6.1.0-alpha.1",
"@storybook/node-logger": "6.1.0-alpha.1",
"@storybook/theming": "6.1.0-alpha.1",
"core-js": "^3.0.1",
"ts-dedent": "^1.1.1"
},
Expand All @@ -46,5 +46,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "d8b9d25b69b8bee488265829beddbd0ebd38fe8f"
"gitHead": "238a06299305d9b52e868ec7791ea76675310ddd"
}
14 changes: 7 additions & 7 deletions addons/cssresources/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-cssresources",
"version": "6.0.20",
"version": "6.1.0-alpha.1",
"description": "A storybook addon to switch between css resources at runtime for your story",
"keywords": [
"addon",
Expand Down Expand Up @@ -32,11 +32,11 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.0.20",
"@storybook/api": "6.0.20",
"@storybook/components": "6.0.20",
"@storybook/core-events": "6.0.20",
"@storybook/theming": "6.0.20",
"@storybook/addons": "6.1.0-alpha.1",
"@storybook/api": "6.1.0-alpha.1",
"@storybook/components": "6.1.0-alpha.1",
"@storybook/core-events": "6.1.0-alpha.1",
"@storybook/theming": "6.1.0-alpha.1",
"core-js": "^3.0.1",
"global": "^4.3.2",
"react": "^16.8.3",
Expand All @@ -55,7 +55,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "d8b9d25b69b8bee488265829beddbd0ebd38fe8f",
"gitHead": "238a06299305d9b52e868ec7791ea76675310ddd",
"typesVersions": {
"<=3.5": {
"*": [
Expand Down
16 changes: 8 additions & 8 deletions addons/design-assets/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-design-assets",
"version": "6.0.20",
"version": "6.1.0-alpha.1",
"description": "Design asset preview for storybook",
"keywords": [
"addon",
Expand Down Expand Up @@ -34,12 +34,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.0.20",
"@storybook/api": "6.0.20",
"@storybook/client-logger": "6.0.20",
"@storybook/components": "6.0.20",
"@storybook/core-events": "6.0.20",
"@storybook/theming": "6.0.20",
"@storybook/addons": "6.1.0-alpha.1",
"@storybook/api": "6.1.0-alpha.1",
"@storybook/client-logger": "6.1.0-alpha.1",
"@storybook/components": "6.1.0-alpha.1",
"@storybook/core-events": "6.1.0-alpha.1",
"@storybook/theming": "6.1.0-alpha.1",
"core-js": "^3.0.1",
"global": "^4.3.2",
"react": "^16.8.3",
Expand All @@ -53,7 +53,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "d8b9d25b69b8bee488265829beddbd0ebd38fe8f",
"gitHead": "238a06299305d9b52e868ec7791ea76675310ddd",
"typesVersions": {
"<=3.5": {
"*": [
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": "6.0.20",
"version": "6.1.0-alpha.1",
"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.20",
"@storybook/api": "6.0.20",
"@storybook/client-api": "6.0.20",
"@storybook/client-logger": "6.0.20",
"@storybook/components": "6.0.20",
"@storybook/core": "6.0.20",
"@storybook/core-events": "6.0.20",
"@storybook/addons": "6.1.0-alpha.1",
"@storybook/api": "6.1.0-alpha.1",
"@storybook/client-api": "6.1.0-alpha.1",
"@storybook/client-logger": "6.1.0-alpha.1",
"@storybook/components": "6.1.0-alpha.1",
"@storybook/core": "6.1.0-alpha.1",
"@storybook/core-events": "6.1.0-alpha.1",
"@storybook/csf": "0.0.1",
"@storybook/node-logger": "6.0.20",
"@storybook/postinstall": "6.0.20",
"@storybook/source-loader": "6.0.20",
"@storybook/theming": "6.0.20",
"@storybook/node-logger": "6.1.0-alpha.1",
"@storybook/postinstall": "6.1.0-alpha.1",
"@storybook/source-loader": "6.1.0-alpha.1",
"@storybook/theming": "6.1.0-alpha.1",
"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.20",
"@storybook/web-components": "6.0.20",
"@storybook/react": "6.1.0-alpha.1",
"@storybook/web-components": "6.1.0-alpha.1",
"@types/cross-spawn": "^6.0.1",
"@types/doctrine": "^0.0.3",
"@types/enzyme": "^3.10.3",
Expand Down Expand Up @@ -144,7 +144,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "d8b9d25b69b8bee488265829beddbd0ebd38fe8f",
"gitHead": "238a06299305d9b52e868ec7791ea76675310ddd",
"typesVersions": {
"<=3.5": {
"*": [
Expand Down
Loading

0 comments on commit 5e982b6

Please sign in to comment.