Skip to content

Commit

Permalink
Merge branch 'next' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
ndelangen committed Feb 3, 2020
2 parents 3a36f38 + 107d813 commit 5e8070c
Show file tree
Hide file tree
Showing 142 changed files with 4,738 additions and 1,606 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
## 6.0.0-alpha.4 (February 3, 2020)

### Bug Fixes

* Angular: Emit decorator metadata by default ([#9701](https://github.com/storybookjs/storybook/pull/9701))
* Addon-centered: Fix clash with addon-docs for react ([#8388](https://github.com/storybookjs/storybook/pull/8388))

### Maintenance

* Add angular 8 and 9 cli fixtures ([#8769](https://github.com/storybookjs/storybook/pull/8769))

### Dependency Upgrades

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

## 5.3.10 (February 2, 2020)

### Bug Fixes
Expand Down
22 changes: 11 additions & 11 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.0.0-alpha.3",
"version": "6.0.0-alpha.4",
"description": "a11y addon for storybook",
"keywords": [
"a11y",
Expand All @@ -20,24 +20,24 @@
"directory": "addons/a11y"
},
"license": "MIT",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"files": [
"dist/**/*",
"README.md",
"*.js",
"*.d.ts"
],
"main": "dist/index.js",
"types": "dist/index.d.ts",
"scripts": {
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.0.0-alpha.3",
"@storybook/api": "6.0.0-alpha.3",
"@storybook/client-logger": "6.0.0-alpha.3",
"@storybook/components": "6.0.0-alpha.3",
"@storybook/core-events": "6.0.0-alpha.3",
"@storybook/theming": "6.0.0-alpha.3",
"@storybook/addons": "6.0.0-alpha.4",
"@storybook/api": "6.0.0-alpha.4",
"@storybook/client-logger": "6.0.0-alpha.4",
"@storybook/components": "6.0.0-alpha.4",
"@storybook/core-events": "6.0.0-alpha.4",
"@storybook/theming": "6.0.0-alpha.4",
"axe-core": "^3.3.2",
"core-js": "^3.0.1",
"global": "^4.3.2",
Expand All @@ -46,12 +46,12 @@
"react-redux": "^7.0.2",
"react-sizeme": "^2.5.2",
"redux": "^4.0.1",
"ts-dedent": "^1.1.0",
"ts-dedent": "^1.1.1",
"util-deprecate": "^1.0.2"
},
"devDependencies": {
"@types/react-redux": "^7.0.6",
"@types/webpack-env": "^1.15.0"
"@types/webpack-env": "^1.15.1"
},
"publishConfig": {
"access": "public"
Expand Down
26 changes: 13 additions & 13 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.0.0-alpha.3",
"version": "6.0.0-alpha.4",
"description": "Action Logger addon for storybook",
"keywords": [
"storybook"
Expand All @@ -15,37 +15,37 @@
"directory": "addons/actions"
},
"license": "MIT",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"files": [
"dist/**/*",
"README.md",
"*.js",
"*.d.ts"
],
"main": "dist/index.js",
"types": "dist/index.d.ts",
"scripts": {
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.0.0-alpha.3",
"@storybook/api": "6.0.0-alpha.3",
"@storybook/client-api": "6.0.0-alpha.3",
"@storybook/components": "6.0.0-alpha.3",
"@storybook/core-events": "6.0.0-alpha.3",
"@storybook/theming": "6.0.0-alpha.3",
"@storybook/addons": "6.0.0-alpha.4",
"@storybook/api": "6.0.0-alpha.4",
"@storybook/client-api": "6.0.0-alpha.4",
"@storybook/components": "6.0.0-alpha.4",
"@storybook/core-events": "6.0.0-alpha.4",
"@storybook/theming": "6.0.0-alpha.4",
"core-js": "^3.0.1",
"fast-deep-equal": "^2.0.1",
"fast-deep-equal": "^3.1.1",
"global": "^4.3.2",
"polished": "^3.3.1",
"polished": "^3.4.4",
"prop-types": "^15.7.2",
"react": "^16.8.3",
"react-inspector": "^4.0.0",
"uuid": "^3.3.2"
},
"devDependencies": {
"@types/lodash": "^4.14.149",
"@types/uuid": "^3.4.4",
"@types/webpack-env": "^1.15.0"
"@types/uuid": "^3.4.7",
"@types/webpack-env": "^1.15.1"
},
"publishConfig": {
"access": "public"
Expand Down
20 changes: 10 additions & 10 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.0.0-alpha.3",
"version": "6.0.0-alpha.4",
"description": "A storybook addon to show different backgrounds for your preview",
"keywords": [
"addon",
Expand All @@ -19,32 +19,32 @@
},
"license": "MIT",
"author": "jbaxleyiii",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"files": [
"dist/**/*",
"README.md",
"*.js",
"*.d.ts"
],
"main": "dist/index.js",
"types": "dist/index.d.ts",
"scripts": {
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.0.0-alpha.3",
"@storybook/api": "6.0.0-alpha.3",
"@storybook/client-logger": "6.0.0-alpha.3",
"@storybook/components": "6.0.0-alpha.3",
"@storybook/core-events": "6.0.0-alpha.3",
"@storybook/theming": "6.0.0-alpha.3",
"@storybook/addons": "6.0.0-alpha.4",
"@storybook/api": "6.0.0-alpha.4",
"@storybook/client-logger": "6.0.0-alpha.4",
"@storybook/components": "6.0.0-alpha.4",
"@storybook/core-events": "6.0.0-alpha.4",
"@storybook/theming": "6.0.0-alpha.4",
"core-js": "^3.0.1",
"memoizerific": "^1.11.3",
"react": "^16.8.3",
"util-deprecate": "^1.0.2"
},
"devDependencies": {
"@types/util-deprecate": "^1.0.0",
"@types/webpack-env": "^1.15.0"
"@types/webpack-env": "^1.15.1"
},
"publishConfig": {
"access": "public"
Expand Down
10 changes: 5 additions & 5 deletions addons/centered/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-centered",
"version": "6.0.0-alpha.3",
"version": "6.0.0-alpha.4",
"description": "Storybook decorator to center components",
"keywords": [
"addon",
Expand All @@ -17,26 +17,26 @@
},
"license": "MIT",
"author": "Muhammed Thanish <mnmtanish@gmail.com>",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"files": [
"dist/**/*",
"README.md",
"*.js",
"*.d.ts"
],
"main": "dist/index.js",
"types": "dist/index.d.ts",
"scripts": {
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.0.0-alpha.3",
"@storybook/addons": "6.0.0-alpha.4",
"core-js": "^3.0.1",
"global": "^4.3.2",
"util-deprecate": "^1.0.2"
},
"devDependencies": {
"@types/mithril": "^1.1.16",
"@types/webpack-env": "^1.15.0",
"@types/webpack-env": "^1.15.1",
"mithril": "*",
"preact": "*",
"react": "*"
Expand Down
11 changes: 11 additions & 0 deletions addons/centered/src/react.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,17 @@ import parameters from './parameters';
import styles from './styles';

function centered(storyFn: () => ReactNode) {
/* eslint-disable no-undef */
if (window) {
const params = new URL(window.location.href).search;
const isInDocsView = params.includes('viewMode=docs');

if (isInDocsView) {
return storyFn();
}
}
/* eslint-enable no-undef */

return (
<div style={styles.style}>
<div style={styles.innerStyle}>{storyFn()}</div>
Expand Down
12 changes: 6 additions & 6 deletions addons/contexts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-contexts",
"version": "6.0.0-alpha.3",
"version": "6.0.0-alpha.4",
"description": "Storybook Addon Contexts",
"keywords": [
"preact",
Expand All @@ -15,22 +15,22 @@
},
"license": "MIT",
"author": "Leo Y. Li",
"main": "dist/register.js",
"files": [
"dist/**/*",
"README.md",
"*.js",
"*.d.ts"
],
"main": "dist/register.js",
"scripts": {
"dev:check-types": "tsc --noEmit",
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.0.0-alpha.3",
"@storybook/api": "6.0.0-alpha.3",
"@storybook/components": "6.0.0-alpha.3",
"@storybook/core-events": "6.0.0-alpha.3",
"@storybook/addons": "6.0.0-alpha.4",
"@storybook/api": "6.0.0-alpha.4",
"@storybook/components": "6.0.0-alpha.4",
"@storybook/core-events": "6.0.0-alpha.4",
"core-js": "^3.0.1",
"global": "^4.3.2",
"qs": "^6.6.0"
Expand Down
18 changes: 9 additions & 9 deletions addons/cssresources/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-cssresources",
"version": "6.0.0-alpha.3",
"version": "6.0.0-alpha.4",
"description": "A storybook addon to switch between css resources at runtime for your story",
"keywords": [
"addon",
Expand All @@ -19,29 +19,29 @@
},
"license": "MIT",
"author": "nm123github",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"files": [
"dist/**/*",
"README.md",
"*.js",
"*.d.ts"
],
"main": "dist/index.js",
"types": "dist/index.d.ts",
"scripts": {
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.0.0-alpha.3",
"@storybook/api": "6.0.0-alpha.3",
"@storybook/components": "6.0.0-alpha.3",
"@storybook/core-events": "6.0.0-alpha.3",
"@storybook/theming": "6.0.0-alpha.3",
"@storybook/addons": "6.0.0-alpha.4",
"@storybook/api": "6.0.0-alpha.4",
"@storybook/components": "6.0.0-alpha.4",
"@storybook/core-events": "6.0.0-alpha.4",
"@storybook/theming": "6.0.0-alpha.4",
"core-js": "^3.0.1",
"global": "^4.3.2",
"react": "^16.8.3"
},
"devDependencies": {
"@types/webpack-env": "^1.15.0"
"@types/webpack-env": "^1.15.1"
},
"peerDependencies": {
"react": "*"
Expand Down
20 changes: 10 additions & 10 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": "6.0.0-alpha.3",
"version": "6.0.0-alpha.4",
"description": "Design asset preview for storybook",
"keywords": [
"addon",
Expand All @@ -21,28 +21,28 @@
"directory": "addons/design-assets"
},
"license": "MIT",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"files": [
"dist/**/*",
"README.md",
"*.js",
"*.d.ts"
],
"main": "dist/index.js",
"types": "dist/index.d.ts",
"scripts": {
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.0.0-alpha.3",
"@storybook/api": "6.0.0-alpha.3",
"@storybook/client-logger": "6.0.0-alpha.3",
"@storybook/components": "6.0.0-alpha.3",
"@storybook/core-events": "6.0.0-alpha.3",
"@storybook/theming": "6.0.0-alpha.3",
"@storybook/addons": "6.0.0-alpha.4",
"@storybook/api": "6.0.0-alpha.4",
"@storybook/client-logger": "6.0.0-alpha.4",
"@storybook/components": "6.0.0-alpha.4",
"@storybook/core-events": "6.0.0-alpha.4",
"@storybook/theming": "6.0.0-alpha.4",
"core-js": "^3.0.1",
"global": "^4.3.2",
"react": "^16.8.3",
"ts-dedent": "^1.1.0",
"ts-dedent": "^1.1.1",
"use-image": "^1.0.3"
},
"publishConfig": {
Expand Down

0 comments on commit 5e8070c

Please sign in to comment.