Skip to content

Commit

Permalink
Merge branch 'next' into addon-info-forward-ref-opt-in
Browse files Browse the repository at this point in the history
  • Loading branch information
ndelangen authored Mar 25, 2019
2 parents 7cc3b07 + 187c559 commit a121c44
Show file tree
Hide file tree
Showing 111 changed files with 1,140 additions and 615 deletions.
27 changes: 14 additions & 13 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
.circleci/ @hypnosphi @ndelangen
.circleci/ @ndelangen
.teamcity/ @hypnosphi
.github/ @danielduan

/addons/a11y/ @jbovenschen
/addons/actions/ @rhalff
/addons/backgrounds/ @ndelangen @hypnosphi
/addons/backgrounds/ @ndelangen
/addons/centered/ @kazupon
/addons/events/ @z4o4z @ndelangen
/addons/graphql/ @mnmtanish
/addons/info/ @theinterned @z4o4z @UsulPro @hypnosphi @dangreenisrael @danielduan
/addons/info/ @theinterned @z4o4z @UsulPro @dangreenisrael @danielduan
/addons/jest/ @renaudtertrais
/addons/knobs/ @alexandrebodin @theinterned @leonrodenburg @alterx @hypnosphi
/addons/links/ @hypnosphi @ndelangen
/addons/knobs/ @alexandrebodin @theinterned @leonrodenburg @alterx
/addons/links/ @ndelangen
/addons/notes/ @alexandrebodin
/addons/options/ @danielduan @UsulPro
/addons/storyshots/ @igor-dv @thomasbertet @hypnosphi
/addons/storyshots/ @igor-dv @thomasbertet
/addons/storysource/ @igor-dv
/addons/viewport/ @saponifi3d

Expand All @@ -24,12 +25,12 @@
/app/vue/ @thomasbertet @kazupon
/app/svelte/ @plumpNation

/docs/ @ndelangen @shilman @hypnosphi
/docs/ @ndelangen @shilman

/examples/angular-cli/ @igor-dv @alterx
/examples/cra-kitchen-sink/ @ndelangen @UsulPro @hypnosphi
/examples/cra-kitchen-sink/ @ndelangen @UsulPro
/examples/cra-ts-kitchen-sink/ @mucsi96
/examples/official-storybook/ @hypnosphi @danielduan @UsulPro
/examples/official-storybook/ @danielduan @UsulPro
/examples/polymer-cli/ @naipath @igor-dv
/examples/vue-kitchen-sink/ @igor-dv @alexandrebodin
/examples/svelte-kitchen-sink/ @plumpNation
Expand All @@ -40,12 +41,12 @@
/lib/channel-postmessage/ @mnmtanish @ndelangen
/lib/channel-websocket/ @mnmtanish @ndelangen
/lib/channels/ @mnmtanish @ndelangen
/lib/cli/ @hypnosphi @ndelangen @shilman @stijnkoopal
/lib/cli/ @ndelangen @shilman @stijnkoopal
/lib/client-logger/ @dangreenisrael
/lib/codemod/ @aaronmcadam @ndelangen
/lib/components/ @ndelangen @hypnosphi @tmeasday
/lib/components/ @ndelangen @tmeasday
/lib/core/ @tmeasday @igor-dv @alterx
/lib/node-logger/ @dangreenisrael
/lib/ui/ @tmeasday @igor-dv @hypnosphi @ndelangen
/lib/ui/ @tmeasday @igor-dv @ndelangen

/scripts/ @ndelangen @igor-dv @hypnosphi
/scripts/ @ndelangen @igor-dv
94 changes: 94 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,87 @@
## 5.1.0-alpha.14 (March 25, 2019)

### Features

* Addon-backgrounds: Add custom grid size ([#6252](https://github.com/storybooks/storybook/pull/6252))
* Addon-viewport: Show active viewport dimensions & rotate button ([#6045](https://github.com/storybooks/storybook/pull/6045))

### Bug Fixes

* UI: Use Fuse.js package for search ([#6244](https://github.com/storybooks/storybook/pull/6244))
* React: Use node-logger instead of console ([#6245](https://github.com/storybooks/storybook/pull/6245))

### Maintenance

* Addon-links: Migrate to Typescript ([#6246](https://github.com/storybooks/storybook/pull/6246))

### Dependency Upgrades

* Bump react-resize-detector from 4.0.2 to 4.0.5 ([#6229](https://github.com/storybooks/storybook/pull/6229))

## 5.0.5 (March 25, 2019)

Bump version number (same as 5.0.4, but need to make this `latest` again!)

## 3.4.12 (March 24, 2019)

### Bug Fixes

* UI: Workaround broken treebeard animations ([#6249](https://github.com/storybooks/storybook/pull/6249))

## 5.0.4 (March 24, 2019)

### Bug Fixes

* UI: Fix tooltip event bindings, logger import ([#6238](https://github.com/storybooks/storybook/pull/6238))
* CLI: Fix stories regexp in config.js ([#6180](https://github.com/storybooks/storybook/pull/6180))
* Accessibilty: Add missing button titles ([#6124](https://github.com/storybooks/storybook/pull/6124))
* React: Fix forked CRA support on Windows ([#6236](https://github.com/storybooks/storybook/pull/6236))
* Addon-knkobs: Fix color type button z-index ([#6203](https://github.com/storybooks/storybook/pull/6203))
* Angular: Fix typo in demo example ([#6193](https://github.com/storybooks/storybook/pull/6193))
* Addon-Info: Restore fonts and color styling ([#6186](https://github.com/storybooks/storybook/pull/6186))
* Addon-knobs: Fix ObjectType knob react warning ([#6159](https://github.com/storybooks/storybook/pull/6159))
* Core: Add core-js as a dep to client-api ([#6209](https://github.com/storybooks/storybook/pull/6209))
* React: Fix logging in cra-config ([#6245](https://github.com/storybooks/storybook/pull/6245))

## 4.1.16 (March 24, 2019)

### Bug Fixes

* UI: Workaround broken treebeard animations ([#6249](https://github.com/storybooks/storybook/pull/6249))

## 4.1.15 (March 24, 2019)

NPM publish failed

## 5.1.0-alpha.13 (March 23, 2019)

### Features

* Svelte: add svelte cli generator ([#6132](https://github.com/storybooks/storybook/pull/6132))

### Bug Fixes

* Addon-knobs: Fix ObjectType knob react warning ([#6159](https://github.com/storybooks/storybook/pull/6159))
* React: Fix forked CRA support on Windows ([#6236](https://github.com/storybooks/storybook/pull/6236))
* UI: Fix tooltip event bindings, logger import ([#6238](https://github.com/storybooks/storybook/pull/6238))

## 5.1.0-alpha.12 (March 22, 2019)

### Bug Fixes

* CLI: Fix stories regexp in config.js ([#6180](https://github.com/storybooks/storybook/pull/6180))
* Addon-Info: Restore fonts and color styling ([#6186](https://github.com/storybooks/storybook/pull/6186))
* Core: Add core-js as a dep to client-api ([#6209](https://github.com/storybooks/storybook/pull/6209))

### Dependency Upgrades

* Bump eslint-plugin-jest from 22.3.2 to 22.4.1 ([#6168](https://github.com/storybooks/storybook/pull/6168))
* Bump ember-cli-babel from 7.5.0 to 7.6.0 ([#6165](https://github.com/storybooks/storybook/pull/6165))
* Bump danger from 7.0.14 to 7.0.15 ([#6164](https://github.com/storybooks/storybook/pull/6164))
* Bump babel-preset-expo from 5.0.0 to 5.1.1 ([#6167](https://github.com/storybooks/storybook/pull/6167))
* Bump @emotion/core from 10.0.7 to 10.0.9 ([#6169](https://github.com/storybooks/storybook/pull/6169))
* Bump marko from 4.15.4 to 4.16.2 ([#6205](https://github.com/storybooks/storybook/pull/6205))

## 5.1.0-alpha.11 (March 21, 2019)

### Features
Expand Down Expand Up @@ -34,6 +118,16 @@
* Bump ember-cli from 3.7.1 to 3.8.1 ([#6142](https://github.com/storybooks/storybook/pull/6142))
* Bump markdown-to-jsx from 6.9.1 to 6.9.3 ([#6139](https://github.com/storybooks/storybook/pull/6139))

## 5.0.3 (March 18, 2019)

### Bug Fixes

* Accessibility: Add missing button titles ([#6124](https://github.com/storybooks/storybook/pull/6124))

### Maintenance

* UI: Make update notifications much less aggressive ([#6143](https://github.com/storybooks/storybook/pull/6143))

## 5.1.0-alpha.9 (March 18, 2019)

### Maintenance
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.1.0-alpha.11",
"version": "5.1.0-alpha.14",
"description": "a11y addon for storybook",
"keywords": [
"a11y",
Expand All @@ -26,12 +26,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.1.0-alpha.11",
"@storybook/api": "5.1.0-alpha.11",
"@storybook/client-logger": "5.1.0-alpha.11",
"@storybook/components": "5.1.0-alpha.11",
"@storybook/core-events": "5.1.0-alpha.11",
"@storybook/theming": "5.1.0-alpha.11",
"@storybook/addons": "5.1.0-alpha.14",
"@storybook/api": "5.1.0-alpha.14",
"@storybook/client-logger": "5.1.0-alpha.14",
"@storybook/components": "5.1.0-alpha.14",
"@storybook/core-events": "5.1.0-alpha.14",
"@storybook/theming": "5.1.0-alpha.14",
"axe-core": "^3.2.2",
"common-tags": "^1.8.0",
"core-js": "^2.6.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,7 @@ exports[`A11YPanel should render report 1`] = `
horizontal={true}
vertical={true}
>
<r
<l
className="emotion-10"
>
<div
Expand Down Expand Up @@ -1107,7 +1107,7 @@ exports[`A11YPanel should render report 1`] = `
/>
</div>
</div>
</r>
</l>
</Component>
</Styled(Component)>
</ScrollArea>
Expand Down
12 changes: 6 additions & 6 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.1.0-alpha.11",
"version": "5.1.0-alpha.14",
"description": "Action Logger addon for storybook",
"keywords": [
"storybook"
Expand All @@ -21,11 +21,11 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.1.0-alpha.11",
"@storybook/api": "5.1.0-alpha.11",
"@storybook/components": "5.1.0-alpha.11",
"@storybook/core-events": "5.1.0-alpha.11",
"@storybook/theming": "5.1.0-alpha.11",
"@storybook/addons": "5.1.0-alpha.14",
"@storybook/api": "5.1.0-alpha.14",
"@storybook/components": "5.1.0-alpha.14",
"@storybook/core-events": "5.1.0-alpha.14",
"@storybook/theming": "5.1.0-alpha.14",
"core-js": "^2.6.5",
"fast-deep-equal": "^2.0.1",
"global": "^4.3.2",
Expand Down
31 changes: 19 additions & 12 deletions addons/actions/src/containers/ActionLogger/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@ interface ActionLoggerState {
actions: ActionDisplay[];
}

const safeDeepEqual = (a: any, b: any): boolean => {
try {
return deepEqual(a, b);
} catch (e) {
return false;
}
};

export default class ActionLogger extends Component<ActionLoggerProps, ActionLoggerState> {
private mounted: boolean;

Expand Down Expand Up @@ -50,18 +58,17 @@ export default class ActionLogger extends Component<ActionLoggerProps, ActionLog
};

addAction = (action: ActionDisplay) => {
let { actions = [] } = this.state;
actions = [...actions];

const previous = actions.length && actions[0];

if (previous && deepEqual(previous.data, action.data)) {
previous.count++; // eslint-disable-line
} else {
action.count = 1; // eslint-disable-line
actions.unshift(action);
}
this.setState({ actions: actions.slice(0, action.options.limit) });
this.setState((prevState: ActionLoggerState) => {
const actions = [...prevState.actions];
const previous = actions.length && actions[0];
if (previous && safeDeepEqual(previous.data, action.data)) {
previous.count++; // eslint-disable-line
} else {
action.count = 1; // eslint-disable-line
actions.unshift(action);
}
return { actions: actions.slice(0, action.options.limit) };
});
};

clearActions = () => {
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.1.0-alpha.11",
"version": "5.1.0-alpha.14",
"description": "A storybook addon to show different backgrounds for your preview",
"keywords": [
"addon",
Expand All @@ -25,12 +25,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.1.0-alpha.11",
"@storybook/api": "5.1.0-alpha.11",
"@storybook/client-logger": "5.1.0-alpha.11",
"@storybook/components": "5.1.0-alpha.11",
"@storybook/core-events": "5.1.0-alpha.11",
"@storybook/theming": "5.1.0-alpha.11",
"@storybook/addons": "5.1.0-alpha.14",
"@storybook/api": "5.1.0-alpha.14",
"@storybook/client-logger": "5.1.0-alpha.14",
"@storybook/components": "5.1.0-alpha.14",
"@storybook/core-events": "5.1.0-alpha.14",
"@storybook/theming": "5.1.0-alpha.14",
"core-js": "^2.6.5",
"memoizerific": "^1.11.3",
"react": "^16.8.4",
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.1.0-alpha.11",
"version": "5.1.0-alpha.14",
"description": "Storybook decorator to center components",
"keywords": [
"addon",
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.1.0-alpha.11",
"version": "5.1.0-alpha.14",
"description": "A storybook addon to switch between css resources at runtime for your story",
"keywords": [
"addon",
Expand All @@ -25,10 +25,10 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.1.0-alpha.11",
"@storybook/api": "5.1.0-alpha.11",
"@storybook/components": "5.1.0-alpha.11",
"@storybook/core-events": "5.1.0-alpha.11",
"@storybook/addons": "5.1.0-alpha.14",
"@storybook/api": "5.1.0-alpha.14",
"@storybook/components": "5.1.0-alpha.14",
"@storybook/core-events": "5.1.0-alpha.14",
"core-js": "^2.6.5",
"global": "^4.3.2",
"react": "^16.8.4"
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.1.0-alpha.11",
"version": "5.1.0-alpha.14",
"description": "Add events to your Storybook stories.",
"keywords": [
"addon",
Expand All @@ -24,9 +24,9 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.1.0-alpha.11",
"@storybook/core-events": "5.1.0-alpha.11",
"@storybook/theming": "5.1.0-alpha.11",
"@storybook/addons": "5.1.0-alpha.14",
"@storybook/core-events": "5.1.0-alpha.14",
"@storybook/theming": "5.1.0-alpha.14",
"core-js": "^2.6.5",
"format-json": "^1.0.3",
"prop-types": "^15.7.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.1.0-alpha.11",
"version": "5.1.0-alpha.14",
"description": "Storybook addon for google analytics",
"keywords": [
"addon",
Expand All @@ -20,8 +20,8 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.1.0-alpha.11",
"@storybook/core-events": "5.1.0-alpha.11",
"@storybook/addons": "5.1.0-alpha.14",
"@storybook/core-events": "5.1.0-alpha.14",
"core-js": "^2.6.5",
"global": "^4.3.2",
"react-ga": "^2.5.7"
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.1.0-alpha.11",
"version": "5.1.0-alpha.14",
"description": "Storybook addon to display the GraphiQL IDE",
"keywords": [
"addon",
Expand Down
Loading

0 comments on commit a121c44

Please sign in to comment.