Skip to content

Commit

Permalink
Merge pull request #2 from storybookjs/next
Browse files Browse the repository at this point in the history
update
  • Loading branch information
crubier committed Nov 25, 2019
2 parents 2f1b16c + d844fda commit 9b6e82a
Show file tree
Hide file tree
Showing 103 changed files with 1,537 additions and 1,426 deletions.
27 changes: 25 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
## 5.3.0-beta.5 (November 23, 2019)
## 5.3.0-beta.7 (November 26, 2019)

### Features

* Storyshots-puppeteer: Add afterScreenshot handler ([#8092](https://github.com/storybookjs/storybook/pull/8092))

### Bug Fixes

* Core: Upgrade telejson to fix cross-origin frame error ([#8940](https://github.com/storybookjs/storybook/pull/8940))

### Maintenance

* Build: Fix image snapshots setup in official-storybook ([#8932](https://github.com/storybookjs/storybook/pull/8932))

### Dependency Upgrades

* Core: Add @babel/core peer dependency to @storybook/core ([#8933](https://github.com/storybookjs/storybook/pull/8933))

## 5.3.0-beta.6 (November 24, 2019)

### Features

Expand All @@ -11,12 +29,17 @@

### Maintenance

* Addon-docs: base code to improve the props table for TS ([#8905](https://github.com/storybookjs/storybook/pull/8905))
* Addon-docs: Base code to improve the props table for TS ([#8905](https://github.com/storybookjs/storybook/pull/8905))
* Build: Fix now deploy ([#8929](https://github.com/storybookjs/storybook/pull/8929))

### Dependency Upgrades

* Miscellaneous upgrades ([#8912](https://github.com/storybookjs/storybook/pull/8912))

## 5.3.0-beta.5 (November 23, 2019)

Failed npm publish

## 5.3.0-beta.4 (November 23, 2019)

Failed npm publish
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ If you've made a change to storybook's codebase and would want this change to be

### Updating Tests

Before any contributes are submitted in a PR, make sure to add or update meaningful tests. A PR that has failing tests will be regarded as a “Work in Progress” and will not be merged until all tests pass.
Before any contributions are submitted in a PR, make sure to add or update meaningful tests. A PR that has failing tests will be regarded as a “Work in Progress” and will not be merged until all tests pass.
When creating new unit test files, the tests should adhere to a particular folder structure and naming convention, as defined below.

```sh
Expand All @@ -205,7 +205,7 @@ Before you submit a new PR, make sure you run `yarn test`. Do not submit a PR if

### Reviewing PRs

**As a PR submitter**, you should reference the issue if there is one, include a short description of what you contributed and, if it is a code change, instructions for how to manually test out the change. This is informally enforced by our [PR template](https://github.com/storybookjs/storybook/blob/master/.github/PULL_REQUEST_TEMPLATE.md). If your PR is reviewed as only needing trivial changes (e.g. small typos etc), and you have commit access, then you can merge the PR after making those changes.
**As a PR submitter**, you should reference the issue if there is one, include a short description of what you contributed and, if it is a code change, instructions for how to manually test out the change. This is informally enforced by our [PR template](https://github.com/storybookjs/storybook/blob/master/.github/PULL_REQUEST_TEMPLATE.md). If your PR is reviewed as only needing trivial changes (e.g. small typos etc), and you have commit access then you can merge the PR after making those changes.

**As a PR reviewer**, you should read through the changes and comment on any potential problems. If you see something cool, a kind word never hurts either! Additionally, you should follow the testing instructions and manually test the changes. If the instructions are missing, unclear, or overly complex, feel free to request better instructions from the submitter. Unless the PR is tagged with the `do not merge` label, if you approve the review and there is no other required discussion or changes, you should also go ahead and merge the PR.

Expand All @@ -215,7 +215,7 @@ If you are looking for a way to help the project, triaging issues is a great pla

### Responding to issues

Issues that are tagged `question / support` or `needs reproduction` are great places to help. If you can answer a question, it will help the asker as well as anyone searching. If an issue needs reproduction, you may be able to guide the reporter toward one, or even reproduce it yourself using [this technique](https://github.com/storybookjs/storybook/blob/master/CONTRIBUTING.md#reproductions).
Issues that are tagged `question / support` or `needs reproduction` are great places to help. If you can answer a question, it will help the asker as well as anyone who has a similar question. Also in the future if anyone has that same question they can easily find it by searching. If an issue needs reproduction, you may be able to guide the reporter toward one, or even reproduce it yourself using [this technique](https://github.com/storybookjs/storybook/blob/master/CONTRIBUTING.md#reproductions).

### Triaging issues

Expand Down
14 changes: 7 additions & 7 deletions addons/a11y/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-a11y",
"version": "5.3.0-beta.5",
"version": "5.3.0-beta.6",
"description": "a11y addon for storybook",
"keywords": [
"a11y",
Expand Down Expand Up @@ -33,12 +33,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.3.0-beta.5",
"@storybook/api": "5.3.0-beta.5",
"@storybook/client-logger": "5.3.0-beta.5",
"@storybook/components": "5.3.0-beta.5",
"@storybook/core-events": "5.3.0-beta.5",
"@storybook/theming": "5.3.0-beta.5",
"@storybook/addons": "5.3.0-beta.6",
"@storybook/api": "5.3.0-beta.6",
"@storybook/client-logger": "5.3.0-beta.6",
"@storybook/components": "5.3.0-beta.6",
"@storybook/core-events": "5.3.0-beta.6",
"@storybook/theming": "5.3.0-beta.6",
"axe-core": "^3.3.2",
"core-js": "^3.0.1",
"global": "^4.3.2",
Expand Down
14 changes: 7 additions & 7 deletions addons/actions/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-actions",
"version": "5.3.0-beta.5",
"version": "5.3.0-beta.6",
"description": "Action Logger addon for storybook",
"keywords": [
"storybook"
Expand Down Expand Up @@ -28,12 +28,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.3.0-beta.5",
"@storybook/api": "5.3.0-beta.5",
"@storybook/client-api": "5.3.0-beta.5",
"@storybook/components": "5.3.0-beta.5",
"@storybook/core-events": "5.3.0-beta.5",
"@storybook/theming": "5.3.0-beta.5",
"@storybook/addons": "5.3.0-beta.6",
"@storybook/api": "5.3.0-beta.6",
"@storybook/client-api": "5.3.0-beta.6",
"@storybook/components": "5.3.0-beta.6",
"@storybook/core-events": "5.3.0-beta.6",
"@storybook/theming": "5.3.0-beta.6",
"core-js": "^3.0.1",
"fast-deep-equal": "^2.0.1",
"global": "^4.3.2",
Expand Down
14 changes: 7 additions & 7 deletions addons/backgrounds/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-backgrounds",
"version": "5.3.0-beta.5",
"version": "5.3.0-beta.6",
"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": "5.3.0-beta.5",
"@storybook/api": "5.3.0-beta.5",
"@storybook/client-logger": "5.3.0-beta.5",
"@storybook/components": "5.3.0-beta.5",
"@storybook/core-events": "5.3.0-beta.5",
"@storybook/theming": "5.3.0-beta.5",
"@storybook/addons": "5.3.0-beta.6",
"@storybook/api": "5.3.0-beta.6",
"@storybook/client-logger": "5.3.0-beta.6",
"@storybook/components": "5.3.0-beta.6",
"@storybook/core-events": "5.3.0-beta.6",
"@storybook/theming": "5.3.0-beta.6",
"core-js": "^3.0.1",
"memoizerific": "^1.11.3",
"react": "^16.8.3",
Expand Down
4 changes: 2 additions & 2 deletions addons/centered/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-centered",
"version": "5.3.0-beta.5",
"version": "5.3.0-beta.6",
"description": "Storybook decorator to center components",
"keywords": [
"addon",
Expand Down Expand Up @@ -29,7 +29,7 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.3.0-beta.5",
"@storybook/addons": "5.3.0-beta.6",
"core-js": "^3.0.1",
"global": "^4.3.2",
"util-deprecate": "^1.0.2"
Expand Down
10 changes: 5 additions & 5 deletions addons/contexts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-contexts",
"version": "5.3.0-beta.5",
"version": "5.3.0-beta.6",
"description": "Storybook Addon Contexts",
"keywords": [
"preact",
Expand All @@ -27,10 +27,10 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.3.0-beta.5",
"@storybook/api": "5.3.0-beta.5",
"@storybook/components": "5.3.0-beta.5",
"@storybook/core-events": "5.3.0-beta.5",
"@storybook/addons": "5.3.0-beta.6",
"@storybook/api": "5.3.0-beta.6",
"@storybook/components": "5.3.0-beta.6",
"@storybook/core-events": "5.3.0-beta.6",
"core-js": "^3.0.1",
"global": "^4.3.2",
"qs": "^6.6.0"
Expand Down
10 changes: 5 additions & 5 deletions addons/cssresources/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-cssresources",
"version": "5.3.0-beta.5",
"version": "5.3.0-beta.6",
"description": "A storybook addon to switch between css resources at runtime for your story",
"keywords": [
"addon",
Expand Down Expand Up @@ -32,10 +32,10 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.3.0-beta.5",
"@storybook/api": "5.3.0-beta.5",
"@storybook/components": "5.3.0-beta.5",
"@storybook/core-events": "5.3.0-beta.5",
"@storybook/addons": "5.3.0-beta.6",
"@storybook/api": "5.3.0-beta.6",
"@storybook/components": "5.3.0-beta.6",
"@storybook/core-events": "5.3.0-beta.6",
"core-js": "^3.0.1",
"global": "^4.3.2",
"react": "^16.8.3"
Expand Down
14 changes: 7 additions & 7 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": "5.3.0-beta.5",
"version": "5.3.0-beta.6",
"description": "Design asset preview for storybook",
"keywords": [
"addon",
Expand Down Expand Up @@ -34,12 +34,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.3.0-beta.5",
"@storybook/api": "5.3.0-beta.5",
"@storybook/client-logger": "5.3.0-beta.5",
"@storybook/components": "5.3.0-beta.5",
"@storybook/core-events": "5.3.0-beta.5",
"@storybook/theming": "5.3.0-beta.5",
"@storybook/addons": "5.3.0-beta.6",
"@storybook/api": "5.3.0-beta.6",
"@storybook/client-logger": "5.3.0-beta.6",
"@storybook/components": "5.3.0-beta.6",
"@storybook/core-events": "5.3.0-beta.6",
"@storybook/theming": "5.3.0-beta.6",
"core-js": "^3.0.1",
"global": "^4.3.2",
"react": "^16.8.3",
Expand Down
16 changes: 8 additions & 8 deletions addons/docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-docs",
"version": "5.3.0-beta.5",
"version": "5.3.0-beta.6",
"description": "Superior documentation for your components",
"keywords": [
"addon",
Expand Down Expand Up @@ -45,13 +45,13 @@
"@mdx-js/loader": "^1.1.0",
"@mdx-js/mdx": "^1.1.0",
"@mdx-js/react": "^1.0.27",
"@storybook/addons": "5.3.0-beta.5",
"@storybook/api": "5.3.0-beta.5",
"@storybook/components": "5.3.0-beta.5",
"@storybook/postinstall": "5.3.0-beta.5",
"@storybook/router": "5.3.0-beta.5",
"@storybook/source-loader": "5.3.0-beta.5",
"@storybook/theming": "5.3.0-beta.5",
"@storybook/addons": "5.3.0-beta.6",
"@storybook/api": "5.3.0-beta.6",
"@storybook/components": "5.3.0-beta.6",
"@storybook/postinstall": "5.3.0-beta.6",
"@storybook/router": "5.3.0-beta.6",
"@storybook/source-loader": "5.3.0-beta.6",
"@storybook/theming": "5.3.0-beta.6",
"acorn": "^7.1.0",
"acorn-jsx": "^5.1.0",
"acorn-walk": "^7.0.0",
Expand Down
12 changes: 6 additions & 6 deletions addons/events/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-events",
"version": "5.3.0-beta.5",
"version": "5.3.0-beta.6",
"description": "Add events to your Storybook stories.",
"keywords": [
"addon",
Expand Down Expand Up @@ -31,11 +31,11 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.3.0-beta.5",
"@storybook/api": "5.3.0-beta.5",
"@storybook/client-api": "5.3.0-beta.5",
"@storybook/core-events": "5.3.0-beta.5",
"@storybook/theming": "5.3.0-beta.5",
"@storybook/addons": "5.3.0-beta.6",
"@storybook/api": "5.3.0-beta.6",
"@storybook/client-api": "5.3.0-beta.6",
"@storybook/core-events": "5.3.0-beta.6",
"@storybook/theming": "5.3.0-beta.6",
"core-js": "^3.0.1",
"format-json": "^1.0.3",
"lodash": "^4.17.15",
Expand Down
6 changes: 3 additions & 3 deletions addons/google-analytics/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-google-analytics",
"version": "5.3.0-beta.5",
"version": "5.3.0-beta.6",
"description": "Storybook addon for google analytics",
"keywords": [
"addon",
Expand All @@ -20,8 +20,8 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.3.0-beta.5",
"@storybook/core-events": "5.3.0-beta.5",
"@storybook/addons": "5.3.0-beta.6",
"@storybook/core-events": "5.3.0-beta.6",
"core-js": "^3.0.1",
"global": "^4.3.2",
"react-ga": "^2.5.7"
Expand Down
6 changes: 3 additions & 3 deletions addons/graphql/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-graphql",
"version": "5.3.0-beta.5",
"version": "5.3.0-beta.6",
"description": "Storybook addon to display the GraphiQL IDE",
"keywords": [
"addon",
Expand Down Expand Up @@ -29,8 +29,8 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.3.0-beta.5",
"@storybook/api": "5.3.0-beta.5",
"@storybook/addons": "5.3.0-beta.6",
"@storybook/api": "5.3.0-beta.6",
"core-js": "^3.0.1",
"global": "^4.3.2",
"graphiql": "^0.16.0",
Expand Down
10 changes: 5 additions & 5 deletions addons/info/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-info",
"version": "5.3.0-beta.5",
"version": "5.3.0-beta.6",
"description": "A Storybook addon to show additional information for your stories.",
"keywords": [
"addon",
Expand Down Expand Up @@ -28,10 +28,10 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.3.0-beta.5",
"@storybook/client-logger": "5.3.0-beta.5",
"@storybook/components": "5.3.0-beta.5",
"@storybook/theming": "5.3.0-beta.5",
"@storybook/addons": "5.3.0-beta.6",
"@storybook/client-logger": "5.3.0-beta.6",
"@storybook/components": "5.3.0-beta.6",
"@storybook/theming": "5.3.0-beta.6",
"core-js": "^3.0.1",
"global": "^4.3.2",
"marksy": "^7.0.0",
Expand Down
12 changes: 6 additions & 6 deletions addons/jest/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-jest",
"version": "5.3.0-beta.5",
"version": "5.3.0-beta.6",
"description": "React storybook addon that show component jest report",
"keywords": [
"addon",
Expand Down Expand Up @@ -35,11 +35,11 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.3.0-beta.5",
"@storybook/api": "5.3.0-beta.5",
"@storybook/components": "5.3.0-beta.5",
"@storybook/core-events": "5.3.0-beta.5",
"@storybook/theming": "5.3.0-beta.5",
"@storybook/addons": "5.3.0-beta.6",
"@storybook/api": "5.3.0-beta.6",
"@storybook/components": "5.3.0-beta.6",
"@storybook/core-events": "5.3.0-beta.6",
"@storybook/theming": "5.3.0-beta.6",
"core-js": "^3.0.1",
"global": "^4.3.2",
"react": "^16.8.3",
Expand Down
Loading

1 comment on commit 9b6e82a

@shilman
Copy link
Member

@shilman shilman commented on 9b6e82a Nov 26, 2019

Choose a reason for hiding this comment

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

@crubier Please don't use github PRs to merge updates from storybook into your copy of the repo. It creates unnecessary changelog entries in our release process. 😅

Please sign in to comment.