Skip to content

Commit

Permalink
Merge branch 'next' into svelteTypescriptMigration
Browse files Browse the repository at this point in the history
  • Loading branch information
aromanarguello authored Nov 9, 2019
2 parents e67b92e + be32fad commit c1ea4b1
Show file tree
Hide file tree
Showing 103 changed files with 748 additions and 614 deletions.
5 changes: 5 additions & 0 deletions .babelrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ module.exports = {
test: withTests,
},
},
{
test: './app/react-native',
presets: ['module:metro-react-native-babel-preset'],
plugins: ['babel-plugin-macros', ['emotion', { sourceMap: true, autoLabel: true }]],
},
{
test: [
'./lib/node-logger',
Expand Down
41 changes: 41 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,44 @@
## 5.2.6 (November 9, 2019)

### Bug Fixes

* Addon-info: Remove jsnext:main ([#8764](https://github.com/storybookjs/storybook/pull/8764))
* Addon-info: Fix "The prop 'children' is marked as required in 'Td'" ([#8745](https://github.com/storybookjs/storybook/pull/8745))
* UI: Fix unmount components on Canvas/Docs tab switch ([#8625](https://github.com/storybookjs/storybook/pull/8625))
* Addon-docs: Fix code style inside LI ([#8708](https://github.com/storybookjs/storybook/pull/8708))
* Remove min-height CSS rule from DocsPage wrapper ([#8366](https://github.com/storybookjs/storybook/pull/8366))
* Core: Revert webpack rebuild changes in node_modules ([#8657](https://github.com/storybookjs/storybook/pull/8657))
* Addon-notes: Add key to render function ([#8633](https://github.com/storybookjs/storybook/pull/8633))
* Addon-docs: Fix story scroll-to heuristics ([#8629](https://github.com/storybookjs/storybook/pull/8629))
* React-native-server: Changed default port to number in CLI options ([#8584](https://github.com/storybookjs/storybook/pull/8584))
* Increase TooltipLinkList max-height to accommodate more links ([#8545](https://github.com/storybookjs/storybook/pull/8545))
* Prevent form submission as search is done while typing ([#8546](https://github.com/storybookjs/storybook/pull/8546))
* Ondevice-knobs: Fix peer dep ([#8644](https://github.com/storybookjs/storybook/pull/8644))

## 5.3.0-alpha.42 (November 9, 2019)

### Bug Fixes

* Addon-info: Remove jsnext:main ([#8764](https://github.com/storybookjs/storybook/pull/8764))
* Addon-info: Fix "The prop 'children' is marked as required in 'Td'" ([#8745](https://github.com/storybookjs/storybook/pull/8745))

### Maintenance

* React-native: Update compilation target - it was compiled for old browsers ([#8698](https://github.com/storybookjs/storybook/pull/8698))

## 5.3.0-alpha.41 (November 7, 2019)

### Features

* Addon-docs: Render array of shape properly in props table ([#8707](https://github.com/storybookjs/storybook/pull/8707))
* Addon-docs: Render params description in props table, support @ignore ([#8702](https://github.com/storybookjs/storybook/pull/8702))

### Bug Fixes

* Addon-docs: Fix "Cannot read property 'props'" ([#8731](https://github.com/storybookjs/storybook/pull/8731))
* UI: Fix unmount components on Canvas/Docs tab switch ([#8625](https://github.com/storybookjs/storybook/pull/8625))
* Angular: Fix loading baseConfig if no angular.json found ([#8727](https://github.com/storybookjs/storybook/pull/8727))

## 5.3.0-alpha.40 (November 6, 2019)

### Features
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-alpha.40",
"version": "5.3.0-alpha.42",
"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-alpha.40",
"@storybook/api": "5.3.0-alpha.40",
"@storybook/client-logger": "5.3.0-alpha.40",
"@storybook/components": "5.3.0-alpha.40",
"@storybook/core-events": "5.3.0-alpha.40",
"@storybook/theming": "5.3.0-alpha.40",
"@storybook/addons": "5.3.0-alpha.42",
"@storybook/api": "5.3.0-alpha.42",
"@storybook/client-logger": "5.3.0-alpha.42",
"@storybook/components": "5.3.0-alpha.42",
"@storybook/core-events": "5.3.0-alpha.42",
"@storybook/theming": "5.3.0-alpha.42",
"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-alpha.40",
"version": "5.3.0-alpha.42",
"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-alpha.40",
"@storybook/api": "5.3.0-alpha.40",
"@storybook/client-api": "5.3.0-alpha.40",
"@storybook/components": "5.3.0-alpha.40",
"@storybook/core-events": "5.3.0-alpha.40",
"@storybook/theming": "5.3.0-alpha.40",
"@storybook/addons": "5.3.0-alpha.42",
"@storybook/api": "5.3.0-alpha.42",
"@storybook/client-api": "5.3.0-alpha.42",
"@storybook/components": "5.3.0-alpha.42",
"@storybook/core-events": "5.3.0-alpha.42",
"@storybook/theming": "5.3.0-alpha.42",
"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-alpha.40",
"version": "5.3.0-alpha.42",
"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-alpha.40",
"@storybook/api": "5.3.0-alpha.40",
"@storybook/client-logger": "5.3.0-alpha.40",
"@storybook/components": "5.3.0-alpha.40",
"@storybook/core-events": "5.3.0-alpha.40",
"@storybook/theming": "5.3.0-alpha.40",
"@storybook/addons": "5.3.0-alpha.42",
"@storybook/api": "5.3.0-alpha.42",
"@storybook/client-logger": "5.3.0-alpha.42",
"@storybook/components": "5.3.0-alpha.42",
"@storybook/core-events": "5.3.0-alpha.42",
"@storybook/theming": "5.3.0-alpha.42",
"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-alpha.40",
"version": "5.3.0-alpha.42",
"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-alpha.40",
"@storybook/addons": "5.3.0-alpha.42",
"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-alpha.40",
"version": "5.3.0-alpha.42",
"description": "Storybook Addon Contexts",
"keywords": [
"preact",
Expand All @@ -27,10 +27,10 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.3.0-alpha.40",
"@storybook/api": "5.3.0-alpha.40",
"@storybook/components": "5.3.0-alpha.40",
"@storybook/core-events": "5.3.0-alpha.40",
"@storybook/addons": "5.3.0-alpha.42",
"@storybook/api": "5.3.0-alpha.42",
"@storybook/components": "5.3.0-alpha.42",
"@storybook/core-events": "5.3.0-alpha.42",
"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-alpha.40",
"version": "5.3.0-alpha.42",
"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-alpha.40",
"@storybook/api": "5.3.0-alpha.40",
"@storybook/components": "5.3.0-alpha.40",
"@storybook/core-events": "5.3.0-alpha.40",
"@storybook/addons": "5.3.0-alpha.42",
"@storybook/api": "5.3.0-alpha.42",
"@storybook/components": "5.3.0-alpha.42",
"@storybook/core-events": "5.3.0-alpha.42",
"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-alpha.40",
"version": "5.3.0-alpha.42",
"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-alpha.40",
"@storybook/api": "5.3.0-alpha.40",
"@storybook/client-logger": "5.3.0-alpha.40",
"@storybook/components": "5.3.0-alpha.40",
"@storybook/core-events": "5.3.0-alpha.40",
"@storybook/theming": "5.3.0-alpha.40",
"@storybook/addons": "5.3.0-alpha.42",
"@storybook/api": "5.3.0-alpha.42",
"@storybook/client-logger": "5.3.0-alpha.42",
"@storybook/components": "5.3.0-alpha.42",
"@storybook/core-events": "5.3.0-alpha.42",
"@storybook/theming": "5.3.0-alpha.42",
"core-js": "^3.0.1",
"global": "^4.3.2",
"react": "^16.8.3",
Expand Down
2 changes: 1 addition & 1 deletion addons/docs/angular/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ configure(require.context('../src/stories', true, /\.stories\.(ts|mdx)$/), modul
Finally, you can create MDX files like this:

```md
import { Meta, Story, Props } from '@storybook/docs/blocks';
import { Meta, Story, Props } from '@storybook/addon-docs/blocks';
import { AppComponent } from './app.component';

<Meta title='App Component' component={AppComponent} />
Expand Down
14 changes: 7 additions & 7 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-alpha.40",
"version": "5.3.0-alpha.42",
"description": "Superior documentation for your components",
"keywords": [
"addon",
Expand Down Expand Up @@ -44,12 +44,12 @@
"@mdx-js/loader": "^1.1.0",
"@mdx-js/mdx": "^1.1.0",
"@mdx-js/react": "^1.0.27",
"@storybook/addons": "5.3.0-alpha.40",
"@storybook/api": "5.3.0-alpha.40",
"@storybook/components": "5.3.0-alpha.40",
"@storybook/router": "5.3.0-alpha.40",
"@storybook/source-loader": "5.3.0-alpha.40",
"@storybook/theming": "5.3.0-alpha.40",
"@storybook/addons": "5.3.0-alpha.42",
"@storybook/api": "5.3.0-alpha.42",
"@storybook/components": "5.3.0-alpha.42",
"@storybook/router": "5.3.0-alpha.42",
"@storybook/source-loader": "5.3.0-alpha.42",
"@storybook/theming": "5.3.0-alpha.42",
"core-js": "^3.0.1",
"doctrine": "^3.0.0",
"global": "^4.3.2",
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-alpha.40",
"version": "5.3.0-alpha.42",
"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-alpha.40",
"@storybook/api": "5.3.0-alpha.40",
"@storybook/client-api": "5.3.0-alpha.40",
"@storybook/core-events": "5.3.0-alpha.40",
"@storybook/theming": "5.3.0-alpha.40",
"@storybook/addons": "5.3.0-alpha.42",
"@storybook/api": "5.3.0-alpha.42",
"@storybook/client-api": "5.3.0-alpha.42",
"@storybook/core-events": "5.3.0-alpha.42",
"@storybook/theming": "5.3.0-alpha.42",
"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-alpha.40",
"version": "5.3.0-alpha.42",
"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-alpha.40",
"@storybook/core-events": "5.3.0-alpha.40",
"@storybook/addons": "5.3.0-alpha.42",
"@storybook/core-events": "5.3.0-alpha.42",
"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-alpha.40",
"version": "5.3.0-alpha.42",
"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-alpha.40",
"@storybook/api": "5.3.0-alpha.40",
"@storybook/addons": "5.3.0-alpha.42",
"@storybook/api": "5.3.0-alpha.42",
"core-js": "^3.0.1",
"global": "^4.3.2",
"graphiql": "^0.16.0",
Expand Down
11 changes: 5 additions & 6 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-alpha.40",
"version": "5.3.0-alpha.42",
"description": "A Storybook addon to show additional information for your stories.",
"keywords": [
"addon",
Expand All @@ -24,15 +24,14 @@
"*.d.ts"
],
"main": "dist/index.js",
"jsnext:main": "src/index.js",
"scripts": {
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "5.3.0-alpha.40",
"@storybook/client-logger": "5.3.0-alpha.40",
"@storybook/components": "5.3.0-alpha.40",
"@storybook/theming": "5.3.0-alpha.40",
"@storybook/addons": "5.3.0-alpha.42",
"@storybook/client-logger": "5.3.0-alpha.42",
"@storybook/components": "5.3.0-alpha.42",
"@storybook/theming": "5.3.0-alpha.42",
"core-js": "^3.0.1",
"global": "^4.3.2",
"marksy": "^7.0.0",
Expand Down
3 changes: 2 additions & 1 deletion addons/info/src/components/PropTable/components/Td.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ Td.propTypes = {
PropTypes.element,
PropTypes.arrayOf(PropTypes.node),
PropTypes.arrayOf(PropTypes.element),
]).isRequired,
]),
isMonospace: PropTypes.bool,
};

Td.defaultProps = {
isMonospace: false,
children: null,
};

export default Td;
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-alpha.40",
"version": "5.3.0-alpha.42",
"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-alpha.40",
"@storybook/api": "5.3.0-alpha.40",
"@storybook/components": "5.3.0-alpha.40",
"@storybook/core-events": "5.3.0-alpha.40",
"@storybook/theming": "5.3.0-alpha.40",
"@storybook/addons": "5.3.0-alpha.42",
"@storybook/api": "5.3.0-alpha.42",
"@storybook/components": "5.3.0-alpha.42",
"@storybook/core-events": "5.3.0-alpha.42",
"@storybook/theming": "5.3.0-alpha.42",
"core-js": "^3.0.1",
"global": "^4.3.2",
"react": "^16.8.3",
Expand Down
Loading

0 comments on commit c1ea4b1

Please sign in to comment.