Skip to content

Commit

Permalink
Merge branch 'next' of https://github.com/storybookjs/storybook into …
Browse files Browse the repository at this point in the history
…11358-render-newlines-in-markdown-code-blocks-in-argtables
  • Loading branch information
niklasmh committed Aug 17, 2021
2 parents c7cd395 + 99521a7 commit bd5889f
Show file tree
Hide file tree
Showing 321 changed files with 6,874 additions and 1,988 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ jobs:
destination: cypress
e2e-tests-core:
executor:
class: medium
class: large
name: sb_cypress_6_node_12
parallelism: 2
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ Issue:

## How to test

- Is this testable with Jest or Chromatic screenshots?
- Does this need a new example in the kitchen sink apps?
- Does this need an update to the documentation?
- [ ] Is this testable with Jest or Chromatic screenshots?
- [ ] Does this need a new example in the kitchen sink apps?
- [ ] Does this need an update to the documentation?

If your answer is yes to any of these, please make sure to include it in your PR.

Expand Down
55 changes: 55 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,58 @@
## 6.4.0-alpha.30 (August 14, 2021)

### Maintenance

- CLI: Improve typings of Angular components ([#15832](https://github.com/storybookjs/storybook/pull/15832))
- Controls: Fix `esm is not defined` error with built Storybook ([#15812](https://github.com/storybookjs/storybook/pull/15812))

## 6.4.0-alpha.29 (August 10, 2021)

### Features

- Addon-docs/Angular: Render user defined template as source if it exists ([#15743](https://github.com/storybookjs/storybook/pull/15743))
- Core: Add MDX support to built-in stories.json generation ([#15808](https://github.com/storybookjs/storybook/pull/15808))

### Maintenance

- Controls: Add better icon for reset button ([#15737](https://github.com/storybookjs/storybook/pull/15737))
- Add checkboxes to pull request template ([#15799](https://github.com/storybookjs/storybook/pull/15799))

## 6.4.0-alpha.28 (August 10, 2021)

Fix bad publish of `6.4.0-alpha.27` to the `latest` tag

## 6.3.7 (August 10, 2021)

Fix bad publish of `6.4.0-alpha.27` to the `latest` tag

## 6.4.0-alpha.26 (August 9, 2021)

### Maintenance

- Server: Update example to use options and labels for options controls ([#15789](https://github.com/storybookjs/storybook/pull/15789))
- Controls: Remove ArrayControl ([#15788](https://github.com/storybookjs/storybook/pull/15788))

## 6.4.0-alpha.25 (August 8, 2021)

### Features

- Angular: Add global CSF3 renderer ([#15742](https://github.com/storybookjs/storybook/pull/15742))

### Bug Fixes

- Addon-docs/Angular: Use compodoc rawdescription where available ([#15774](https://github.com/storybookjs/storybook/pull/15774))
- Core: Fix main.js glob resolution for direct paths in stories ([#15775](https://github.com/storybookjs/storybook/pull/15775))

### Maintenance

- CSF: Optionally pass Args generic type from BaseAnnotations to ArgTypes ([#14356](https://github.com/storybookjs/storybook/pull/14356))

## 6.4.0-alpha.24 (August 4, 2021)

### Features

- HTML: Dynamic source snippets ([#15748](https://github.com/storybookjs/storybook/pull/15748))

## 6.4.0-alpha.23 (August 3, 2021)

### Features
Expand Down
20 changes: 10 additions & 10 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.4.0-alpha.23",
"version": "6.4.0-alpha.30",
"description": "Test component compliance with web accessibility standards",
"keywords": [
"a11y",
Expand Down Expand Up @@ -45,14 +45,14 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.4.0-alpha.23",
"@storybook/api": "6.4.0-alpha.23",
"@storybook/channels": "6.4.0-alpha.23",
"@storybook/client-api": "6.4.0-alpha.23",
"@storybook/client-logger": "6.4.0-alpha.23",
"@storybook/components": "6.4.0-alpha.23",
"@storybook/core-events": "6.4.0-alpha.23",
"@storybook/theming": "6.4.0-alpha.23",
"@storybook/addons": "6.4.0-alpha.30",
"@storybook/api": "6.4.0-alpha.30",
"@storybook/channels": "6.4.0-alpha.30",
"@storybook/client-api": "6.4.0-alpha.30",
"@storybook/client-logger": "6.4.0-alpha.30",
"@storybook/components": "6.4.0-alpha.30",
"@storybook/core-events": "6.4.0-alpha.30",
"@storybook/theming": "6.4.0-alpha.30",
"axe-core": "^4.2.0",
"core-js": "^3.8.2",
"global": "^4.4.0",
Expand Down Expand Up @@ -81,7 +81,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "691fc1f7155bd50179573b146c45f9528d2dc7df",
"gitHead": "271665e76bd5ef0287fe0651831f771e693b3b1c",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Accessibility",
Expand Down
2 changes: 1 addition & 1 deletion addons/actions/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Storybook Addon Actions can be used to display data received by event handlers i

[Framework Support](https://storybook.js.org/docs/react/api/frameworks-feature-support)

![Screenshot](https://raw.githubusercontent.com/storybookjs/storybook/HEAD/addons/actions/docs/screenshot.png)
![Screenshot](https://raw.githubusercontent.com/storybookjs/storybook/next/addons/actions/docs/screenshot.png)

## Installation

Expand Down
Binary file modified addons/actions/docs/screenshot.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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.4.0-alpha.23",
"version": "6.4.0-alpha.30",
"description": "Get UI feedback when an action is performed on an interactive element",
"keywords": [
"storybook",
Expand Down Expand Up @@ -41,12 +41,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.4.0-alpha.23",
"@storybook/api": "6.4.0-alpha.23",
"@storybook/client-api": "6.4.0-alpha.23",
"@storybook/components": "6.4.0-alpha.23",
"@storybook/core-events": "6.4.0-alpha.23",
"@storybook/theming": "6.4.0-alpha.23",
"@storybook/addons": "6.4.0-alpha.30",
"@storybook/api": "6.4.0-alpha.30",
"@storybook/client-api": "6.4.0-alpha.30",
"@storybook/components": "6.4.0-alpha.30",
"@storybook/core-events": "6.4.0-alpha.30",
"@storybook/theming": "6.4.0-alpha.30",
"core-js": "^3.8.2",
"fast-deep-equal": "^3.1.3",
"global": "^4.4.0",
Expand Down Expand Up @@ -78,7 +78,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "691fc1f7155bd50179573b146c45f9528d2dc7df",
"gitHead": "271665e76bd5ef0287fe0651831f771e693b3b1c",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Actions",
Expand Down
2 changes: 1 addition & 1 deletion addons/backgrounds/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Storybook Addon Backgrounds can be used to change background colors inside the p

[Framework Support](https://storybook.js.org/docs/react/api/frameworks-feature-support)

![React Storybook Screenshot](https://raw.githubusercontent.com/storybookjs/storybook/main/docs/static/img/addon-backgrounds.gif)
![React Storybook Screenshot](https://raw.githubusercontent.com/storybookjs/storybook/next/addons/backgrounds/docs/addon-backgrounds.gif)

## Installation

Expand Down
Binary file added addons/backgrounds/docs/addon-backgrounds.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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.4.0-alpha.23",
"version": "6.4.0-alpha.30",
"description": "Switch backgrounds to view components in different settings",
"keywords": [
"addon",
Expand Down Expand Up @@ -45,12 +45,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.4.0-alpha.23",
"@storybook/api": "6.4.0-alpha.23",
"@storybook/client-logger": "6.4.0-alpha.23",
"@storybook/components": "6.4.0-alpha.23",
"@storybook/core-events": "6.4.0-alpha.23",
"@storybook/theming": "6.4.0-alpha.23",
"@storybook/addons": "6.4.0-alpha.30",
"@storybook/api": "6.4.0-alpha.30",
"@storybook/client-logger": "6.4.0-alpha.30",
"@storybook/components": "6.4.0-alpha.30",
"@storybook/core-events": "6.4.0-alpha.30",
"@storybook/theming": "6.4.0-alpha.30",
"core-js": "^3.8.2",
"global": "^4.4.0",
"memoizerific": "^1.11.3",
Expand All @@ -76,7 +76,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "691fc1f7155bd50179573b146c45f9528d2dc7df",
"gitHead": "271665e76bd5ef0287fe0651831f771e693b3b1c",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Backgrounds",
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.4.0-alpha.23",
"version": "6.4.0-alpha.30",
"description": "Interact with component inputs dynamically in the Storybook UI",
"keywords": [
"addon",
Expand Down Expand Up @@ -45,12 +45,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.4.0-alpha.23",
"@storybook/api": "6.4.0-alpha.23",
"@storybook/client-api": "6.4.0-alpha.23",
"@storybook/components": "6.4.0-alpha.23",
"@storybook/node-logger": "6.4.0-alpha.23",
"@storybook/theming": "6.4.0-alpha.23",
"@storybook/addons": "6.4.0-alpha.30",
"@storybook/api": "6.4.0-alpha.30",
"@storybook/client-api": "6.4.0-alpha.30",
"@storybook/components": "6.4.0-alpha.30",
"@storybook/node-logger": "6.4.0-alpha.30",
"@storybook/theming": "6.4.0-alpha.30",
"core-js": "^3.8.2",
"ts-dedent": "^2.0.0"
},
Expand All @@ -69,7 +69,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "691fc1f7155bd50179573b146c45f9528d2dc7df",
"gitHead": "271665e76bd5ef0287fe0651831f771e693b3b1c",
"sbmodern": "dist/modern/register.js",
"storybook": {
"displayName": "Controls",
Expand Down
2 changes: 1 addition & 1 deletion addons/docs/docs/recipes.md
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ const Example = () => <Button />;
Example.parameters = {
docs: {
description: {
story: "Individiual story description, may conatin `markdown` markup"
story: "Individual story description, may contain `markdown` markup"
},
},
};
Expand Down
46 changes: 23 additions & 23 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.4.0-alpha.23",
"version": "6.4.0-alpha.30",
"description": "Document component usage and properties in Markdown",
"keywords": [
"addon",
Expand Down Expand Up @@ -63,20 +63,20 @@
"@mdx-js/loader": "^1.6.22",
"@mdx-js/mdx": "^1.6.22",
"@mdx-js/react": "^1.6.22",
"@storybook/addons": "6.4.0-alpha.23",
"@storybook/api": "6.4.0-alpha.23",
"@storybook/builder-webpack4": "6.4.0-alpha.23",
"@storybook/client-api": "6.4.0-alpha.23",
"@storybook/client-logger": "6.4.0-alpha.23",
"@storybook/components": "6.4.0-alpha.23",
"@storybook/core": "6.4.0-alpha.23",
"@storybook/core-events": "6.4.0-alpha.23",
"@storybook/addons": "6.4.0-alpha.30",
"@storybook/api": "6.4.0-alpha.30",
"@storybook/builder-webpack4": "6.4.0-alpha.30",
"@storybook/client-api": "6.4.0-alpha.30",
"@storybook/client-logger": "6.4.0-alpha.30",
"@storybook/components": "6.4.0-alpha.30",
"@storybook/core": "6.4.0-alpha.30",
"@storybook/core-events": "6.4.0-alpha.30",
"@storybook/csf": "0.0.1",
"@storybook/csf-tools": "6.4.0-alpha.23",
"@storybook/node-logger": "6.4.0-alpha.23",
"@storybook/postinstall": "6.4.0-alpha.23",
"@storybook/source-loader": "6.4.0-alpha.23",
"@storybook/theming": "6.4.0-alpha.23",
"@storybook/csf-tools": "6.4.0-alpha.30",
"@storybook/node-logger": "6.4.0-alpha.30",
"@storybook/postinstall": "6.4.0-alpha.30",
"@storybook/source-loader": "6.4.0-alpha.30",
"@storybook/theming": "6.4.0-alpha.30",
"acorn": "^7.4.1",
"acorn-jsx": "^5.3.1",
"acorn-walk": "^7.2.0",
Expand Down Expand Up @@ -105,10 +105,10 @@
"@babel/core": "^7.12.10",
"@emotion/core": "^10.1.1",
"@emotion/styled": "^10.0.27",
"@storybook/angular": "6.4.0-alpha.23",
"@storybook/react": "6.4.0-alpha.23",
"@storybook/vue": "6.4.0-alpha.23",
"@storybook/web-components": "6.4.0-alpha.23",
"@storybook/angular": "6.4.0-alpha.30",
"@storybook/react": "6.4.0-alpha.30",
"@storybook/vue": "6.4.0-alpha.30",
"@storybook/web-components": "6.4.0-alpha.30",
"@types/cross-spawn": "^6.0.2",
"@types/doctrine": "^0.0.3",
"@types/enzyme": "^3.10.8",
Expand Down Expand Up @@ -138,10 +138,10 @@
"zone.js": "^0.11.3"
},
"peerDependencies": {
"@storybook/angular": "6.4.0-alpha.23",
"@storybook/vue": "6.4.0-alpha.23",
"@storybook/vue3": "6.4.0-alpha.23",
"@storybook/web-components": "6.4.0-alpha.23",
"@storybook/angular": "6.4.0-alpha.30",
"@storybook/vue": "6.4.0-alpha.30",
"@storybook/vue3": "6.4.0-alpha.30",
"@storybook/web-components": "6.4.0-alpha.30",
"lit": "^2.0.0-rc.1",
"lit-html": "^1.4.1 || ^2.0.0-rc.3",
"react": "^16.8.0 || ^17.0.0",
Expand Down Expand Up @@ -192,7 +192,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "691fc1f7155bd50179573b146c45f9528d2dc7df",
"gitHead": "271665e76bd5ef0287fe0651831f771e693b3b1c",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Docs",
Expand Down

0 comments on commit bd5889f

Please sign in to comment.