Skip to content

Commit

Permalink
Merge master into next after 5.0.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
shilman committed Mar 5, 2019
1 parent c7f6f89 commit f2b625b
Show file tree
Hide file tree
Showing 74 changed files with 536 additions and 454 deletions.
20 changes: 20 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,25 @@ jobs:
command: |
cd examples-native/crna-kitchen-sink
yarn storybook --smoke-test
frontpage:
<<: *defaults
steps:
- checkout
- restore_cache:
name: Restore core dependencies cache
keys:
- core-dependencies-v3-{{ checksum "yarn.lock" }}
- run:
name: Install dependencies
command: yarn install
- run:
name: Trigger build
command: ./scripts/build-frontpage.js
- save_cache:
name: Cache core dependencies
key: core-dependencies-v3-{{ checksum "yarn.lock" }}
paths:
- ~/.cache/yarn
docs:
<<: *defaults
steps:
Expand Down Expand Up @@ -288,6 +307,7 @@ workflows:
jobs:
- build
- docs
- frontpage
- lint:
requires:
- docs
Expand Down
5 changes: 5 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,8 @@ lib/cli/test
!.eslintrc-markdown.js
!.jest.config.js
!.storybook

REACT_NATIVE
examples-native
react-native
ondevice-*
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
## 5.0.0 (March 5, 2019)

Storybook 5.0 is a completely new UI with the following improvements:

- 🌓 New design with light and dark themes
- 🛠 Canvas toolbar for easy access to addons
- 🗺 Overhauled navigation sidebar with an intuitive menu
- 🗜 Redesigned addons panel with handy buttons to toggle visibility and orientation
- ⌨️ Improved keyboard shortcuts that are user configurable
- 🌍 New URL structure that eliminates long strings of query parameters

5.0 contains hundreds more fixes, features, and tweaks. Browse the changelogs matching `5.0.0-alpha.*`, `5.0.0-beta.*`, and `5.0.0-rc.*` for the full list of changes. See [MIGRATION.md](https://github.com/storybooks/storybook/blob/next/MIGRATION.md) to ugprade from `4.x`.

## 5.0.0-rc.11 (March 5, 2019)

### Bug Fixes
Expand Down Expand Up @@ -126,6 +139,7 @@
### Features

* UI: Allow collapsing active story and use separate expansion for filtered ([#5625](https://github.com/storybooks/storybook/pull/5625))
* UI: Handle prerelease versions in version check ([#5641](https://github.com/storybooks/storybook/pull/5641))

### Bug Fixes

Expand Down
12 changes: 6 additions & 6 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.0.0-beta.3",
"version": "5.0.0",
"description": "a11y addon for storybook",
"keywords": [
"a11y",
Expand All @@ -26,11 +26,11 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.0.0-beta.3",
"@storybook/client-logger": "5.0.0-beta.3",
"@storybook/components": "5.0.0-beta.3",
"@storybook/core-events": "5.0.0-beta.3",
"@storybook/theming": "5.0.0-beta.3",
"@storybook/addons": "5.0.0",
"@storybook/client-logger": "5.0.0",
"@storybook/components": "5.0.0",
"@storybook/core-events": "5.0.0",
"@storybook/theming": "5.0.0",
"axe-core": "^3.1.2",
"common-tags": "^1.8.0",
"core-js": "^2.6.2",
Expand Down
10 changes: 5 additions & 5 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.0.0-beta.3",
"version": "5.0.0",
"description": "Action Logger addon for storybook",
"keywords": [
"storybook"
Expand All @@ -21,10 +21,10 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.0.0-beta.3",
"@storybook/components": "5.0.0-beta.3",
"@storybook/core-events": "5.0.0-beta.3",
"@storybook/theming": "5.0.0-beta.3",
"@storybook/addons": "5.0.0",
"@storybook/components": "5.0.0",
"@storybook/core-events": "5.0.0",
"@storybook/theming": "5.0.0",
"core-js": "^2.6.2",
"fast-deep-equal": "^2.0.1",
"global": "^4.3.2",
Expand Down
1 change: 0 additions & 1 deletion addons/actions/src/components/ActionLogger/style.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { styled } from '@storybook/theming';
import { opacify } from 'polished';
import { ActionBar } from '@storybook/components';

export const Action = styled.div({
display: 'flex',
Expand Down
12 changes: 6 additions & 6 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.0.0-beta.3",
"version": "5.0.0",
"description": "A storybook addon to show different backgrounds for your preview",
"keywords": [
"addon",
Expand All @@ -25,11 +25,11 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.0.0-beta.3",
"@storybook/client-logger": "5.0.0-beta.3",
"@storybook/components": "5.0.0-beta.3",
"@storybook/core-events": "5.0.0-beta.3",
"@storybook/theming": "5.0.0-beta.3",
"@storybook/addons": "5.0.0",
"@storybook/client-logger": "5.0.0",
"@storybook/components": "5.0.0",
"@storybook/core-events": "5.0.0",
"@storybook/theming": "5.0.0",
"core-js": "^2.6.2",
"global": "^4.3.2",
"memoizerific": "^1.11.3",
Expand Down
2 changes: 1 addition & 1 deletion addons/centered/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-centered",
"version": "5.0.0-beta.3",
"version": "5.0.0",
"description": "Storybook decorator to center components",
"keywords": [
"addon",
Expand Down
8 changes: 4 additions & 4 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.0.0-beta.3",
"version": "5.0.0",
"description": "A storybook addon to switch between css resources at runtime for your story",
"keywords": [
"addon",
Expand All @@ -25,9 +25,9 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.0.0-beta.3",
"@storybook/components": "5.0.0-beta.3",
"@storybook/core-events": "5.0.0-beta.3",
"@storybook/addons": "5.0.0",
"@storybook/components": "5.0.0",
"@storybook/core-events": "5.0.0",
"core-js": "^2.6.2",
"global": "^4.3.2",
"react": "^16.8.2"
Expand Down
8 changes: 4 additions & 4 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.0.0-beta.3",
"version": "5.0.0",
"description": "Add events to your Storybook stories.",
"keywords": [
"addon",
Expand All @@ -24,9 +24,9 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.0.0-beta.3",
"@storybook/core-events": "5.0.0-beta.3",
"@storybook/theming": "5.0.0-beta.3",
"@storybook/addons": "5.0.0",
"@storybook/core-events": "5.0.0",
"@storybook/theming": "5.0.0",
"core-js": "^2.6.2",
"format-json": "^1.0.3",
"prop-types": "^15.6.2",
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.0.0-beta.3",
"version": "5.0.0",
"description": "Storybook addon for google analytics",
"keywords": [
"addon",
Expand All @@ -20,8 +20,8 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.0.0-beta.3",
"@storybook/core-events": "5.0.0-beta.3",
"@storybook/addons": "5.0.0",
"@storybook/core-events": "5.0.0",
"core-js": "^2.6.2",
"global": "^4.3.2",
"react-ga": "^2.5.3"
Expand Down
2 changes: 1 addition & 1 deletion addons/graphql/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-graphql",
"version": "5.0.0-beta.3",
"version": "5.0.0",
"description": "Storybook addon to display the GraphiQL IDE",
"keywords": [
"addon",
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.0.0-beta.3",
"version": "5.0.0",
"description": "A Storybook addon to show additional information for your stories.",
"keywords": [
"addon",
Expand All @@ -22,10 +22,10 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.0.0-beta.3",
"@storybook/client-logger": "5.0.0-beta.3",
"@storybook/components": "5.0.0-beta.3",
"@storybook/theming": "5.0.0-beta.3",
"@storybook/addons": "5.0.0",
"@storybook/client-logger": "5.0.0",
"@storybook/components": "5.0.0",
"@storybook/theming": "5.0.0",
"core-js": "^2.6.2",
"global": "^4.3.2",
"marksy": "^6.1.0",
Expand Down
10 changes: 5 additions & 5 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.0.0-beta.3",
"version": "5.0.0",
"description": "React storybook addon that show component jest report",
"keywords": [
"addon",
Expand Down Expand Up @@ -28,10 +28,10 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.0.0-beta.3",
"@storybook/core-events": "5.0.0-beta.3",
"@storybook/theming": "5.0.0-beta.3",
"@storybook/components": "5.0.0-beta.3",
"@storybook/addons": "5.0.0",
"@storybook/components": "5.0.0",
"@storybook/core-events": "5.0.0",
"@storybook/theming": "5.0.0",
"core-js": "^2.6.2",
"global": "^4.3.2",
"prop-types": "^15.6.2",
Expand Down
10 changes: 5 additions & 5 deletions addons/knobs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-knobs",
"version": "5.0.0-beta.3",
"version": "5.0.0",
"description": "Storybook Addon Prop Editor Component",
"keywords": [
"addon",
Expand All @@ -22,10 +22,10 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.0.0-beta.3",
"@storybook/components": "5.0.0-beta.3",
"@storybook/core-events": "5.0.0-beta.3",
"@storybook/theming": "5.0.0-beta.3",
"@storybook/addons": "5.0.0",
"@storybook/components": "5.0.0",
"@storybook/core-events": "5.0.0",
"@storybook/theming": "5.0.0",
"copy-to-clipboard": "^3.0.8",
"core-js": "^2.6.2",
"escape-html": "^1.0.3",
Expand Down
1 change: 1 addition & 0 deletions addons/knobs/src/components/Panel.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export default class KnobPanel extends PureComponent {
}

componentDidMount() {
console.log('mounted');
this.mounted = true;
const { channel, api } = this.props;
channel.on(SET, this.setKnobs);
Expand Down
6 changes: 3 additions & 3 deletions addons/links/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-links",
"version": "5.0.0-beta.3",
"version": "5.0.0",
"description": "Story Links addon for storybook",
"keywords": [
"addon",
Expand All @@ -22,8 +22,8 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.0.0-beta.3",
"@storybook/core-events": "5.0.0-beta.3",
"@storybook/addons": "5.0.0",
"@storybook/core-events": "5.0.0",
"common-tags": "^1.8.0",
"core-js": "^2.6.2",
"global": "^4.3.2",
Expand Down
12 changes: 6 additions & 6 deletions addons/notes/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-notes",
"version": "5.0.0-beta.3",
"version": "5.0.0",
"description": "Write notes for your Storybook stories.",
"keywords": [
"addon",
Expand All @@ -23,11 +23,11 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.0.0-beta.3",
"@storybook/client-logger": "5.0.0-beta.3",
"@storybook/components": "5.0.0-beta.3",
"@storybook/core-events": "5.0.0-beta.3",
"@storybook/theming": "5.0.0-beta.3",
"@storybook/addons": "5.0.0",
"@storybook/client-logger": "5.0.0",
"@storybook/components": "5.0.0",
"@storybook/core-events": "5.0.0",
"@storybook/theming": "5.0.0",
"markdown-to-jsx": "^6.9.1",
"prop-types": "^15.6.2",
"util-deprecate": "^1.0.2"
Expand Down
5 changes: 3 additions & 2 deletions addons/ondevice-backgrounds/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "@storybook/addon-ondevice-backgrounds",
"version": "5.0.0-beta.3",
"private": true,
"version": "5.0.0",
"description": "A storybook addon to show different backgrounds for your preview",
"keywords": [
"addon",
Expand All @@ -24,7 +25,7 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.0.0-beta.3",
"@storybook/addons": "5.0.0",
"core-js": "^2.6.2",
"prop-types": "^15.6.2"
},
Expand Down
5 changes: 3 additions & 2 deletions addons/ondevice-knobs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "@storybook/addon-ondevice-knobs",
"version": "5.0.0-beta.3",
"private": true,
"version": "5.0.0",
"description": "Display storybook story knobs on your deviced.",
"keywords": [
"addon",
Expand All @@ -21,7 +22,7 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.0.0-beta.3",
"@storybook/addons": "5.0.0",
"core-js": "^2.6.2",
"deep-equal": "^1.0.1",
"prop-types": "^15.6.2",
Expand Down
Loading

0 comments on commit f2b625b

Please sign in to comment.