Merge remote-tracking branch 'origin/master' into upgrade-vue-loader

# Conflicts: # examples/vue-kitchen-sink/package.json
storybookjs · Feb 27, 2018 · 11ca8f8 · 11ca8f8
2 parents 1e2eb1c + e000d4a
commit 11ca8f8
Show file tree

Hide file tree

Showing 47 changed files with 313 additions and 325 deletions.
diff --git a/ADDONS_SUPPORT.md b/ADDONS_SUPPORT.md
@@ -11,7 +11,7 @@
 |[info](addons/info)              |+| | | | |
 |[jest](addons/jest)              |+| | | | |
 |[knobs](addons/knobs)            |+|+|+|+|+|
-|[links](addons/links)            |+|+|+|+| |
+|[links](addons/links)            |+|+|+|+|+|
 |[notes](addons/notes)            |+| |+|+|+|
 |[options](addons/options)        |+|+|+|+|+|
 |[storyshots](addons/storyshots)  |+|+|+|+| |

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![Build Status on CircleCI](https://circleci.com/gh/storybooks/storybook.svg?style=shield)](https://circleci.com/gh/storybooks/storybook)
 [![CodeFactor](https://www.codefactor.io/repository/github/storybooks/storybook/badge)](https://www.codefactor.io/repository/github/storybooks/storybook)
 [![Known Vulnerabilities](https://snyk.io/test/github/storybooks/storybook/8f36abfd6697e58cd76df3526b52e4b9dc894847/badge.svg)](https://snyk.io/test/github/storybooks/storybook/8f36abfd6697e58cd76df3526b52e4b9dc894847)
-[![BCH compliance](https://bettercodehub.com/edge/badge/storybooks/storybook)](https://bettercodehub.com/results/storybooks/storybook) [![codecov](https://codecov.io/gh/storybooks/storybook/branch/master/graph/badge.svg)](https://codecov.io/gh/storybooks/storybook)  
+[![BCH compliance](https://bettercodehub.com/edge/badge/storybooks/storybook)](https://bettercodehub.com/results/storybooks/storybook) [![codecov](https://codecov.io/gh/storybooks/storybook/branch/master/graph/badge.svg)](https://codecov.io/gh/storybooks/storybook)
 [![Storybook Slack](https://now-examples-slackin-rrirkqohko.now.sh/badge.svg)](https://now-examples-slackin-rrirkqohko.now.sh/)
 [![Backers on Open Collective](https://opencollective.com/storybook/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/storybook/sponsors/badge.svg)](#sponsors)
 
@@ -80,15 +80,21 @@ For additional help, join us [in our Slack](https://now-examples-slackin-rrirkqo
 
 ### Addons
 
--   [storyshots](addons/storyshots) - Easy snapshot testing for storybook
--   [actions](addons/actions/) - Log actions as users interact with components in storybook
--   [links](addons/links/) - Create links between stories
--   [comments](addons/comments/) - Comment on storybook stories
+-   [a11y](addons/a11y/) - Test components for user accessibility in Storybook
+-   [actions](addons/actions/) - Log actions as users interact with components in the Storybook UI
+-   [background](addons/background/) - Let users choose backgrounds in the Storybook UI
+-   [centered](addons/centered/) - Center the alignment of your components within the Storybook UI
+-   [events](addons/events/) - Interactively fire events to components that respond to EventEmitter
 -   [graphql](addons/graphql/) - Query a GraphQL server within Storybook stories
 -   [info](addons/info/) - Annotate stories with extra component usage information
+-   [jest](addons/jest/) - View the results of components' unit tests in Storybook
 -   [knobs](addons/knobs/) - Interactively edit component prop data in the Storybook UI
--   [notes](addons/notes/) - Annotate storybook stories with notes
--   [options](addons/options/) - Customize the storybook UI in code
+-   [links](addons/links/) - Create links between stories
+-   [notes](addons/notes/) - Annotate Storybook stories with notes
+-   [options](addons/options/) - Customize the Storybook UI in code
+-   [storyshots](addons/storyshots/) - Easy snapshot testing for components in Storybook
+-   [storysource](addons/storysource/) - View the code of your stories within the Storybook UI
+-   [viewport](addons/viewport/) - Change display sizes and layouts for responsive components using Storybook
 
 See [Addon / Framework Support Table](ADDONS_SUPPORT.md)
 

diff --git a/addons/a11y/package.json b/addons/a11y/package.json
@@ -30,7 +30,7 @@
     "babel-runtime": "^6.26.0",
     "glamor": "^2.20.40",
     "glamorous": "^4.11.6",
-    "prop-types": "^15.6.0"
+    "prop-types": "^15.6.1"
   },
   "devDependencies": {
     "@storybook/react": "^3.4.0-alpha.9",

diff --git a/addons/actions/package.json b/addons/actions/package.json
@@ -27,7 +27,7 @@
     "glamorous": "^4.11.6",
     "global": "^4.3.2",
     "make-error": "^1.3.4",
-    "prop-types": "^15.6.0",
+    "prop-types": "^15.6.1",
     "react-inspector": "^2.2.2",
     "uuid": "^3.2.1"
   },

diff --git a/addons/background/package.json b/addons/background/package.json
@@ -26,7 +26,7 @@
   "dependencies": {
     "babel-runtime": "^6.26.0",
     "global": "^4.3.2",
-    "prop-types": "^15.6.0"
+    "prop-types": "^15.6.1"
   },
   "peerDependencies": {
     "@storybook/addons": "^3.3.0",

diff --git a/addons/events/package.json b/addons/events/package.json
@@ -23,7 +23,7 @@
   "dependencies": {
     "babel-runtime": "^6.26.0",
     "format-json": "^1.0.3",
-    "prop-types": "^15.6.0",
+    "prop-types": "^15.6.1",
     "react-textarea-autosize": "^5.2.1"
   },
   "peerDependencies": {

diff --git a/addons/events/src/components/Panel.js b/addons/events/src/components/Panel.js
@@ -66,7 +66,7 @@ export default class Events extends Component {
     const { events } = this.state;
     return (
       <div style={styles.wrapper}>
-        {events.map(event => <Event key={event.id} {...event} onEmit={this.onEmit} />)}
+        {events.map(event => <Event key={event.name} {...event} onEmit={this.onEmit} />)}
       </div>
     );
   }

diff --git a/addons/graphql/package.json b/addons/graphql/package.json
@@ -26,7 +26,7 @@
     "global": "^4.3.2",
     "graphiql": "^0.11.11",
     "graphql": "^0.13.1",
-    "prop-types": "^15.6.0"
+    "prop-types": "^15.6.1"
   },
   "devDependencies": {
     "@storybook/react": "^3.4.0-alpha.9"

diff --git a/addons/info/package.json b/addons/info/package.json
@@ -23,7 +23,7 @@
     "global": "^4.3.2",
     "marksy": "^6.0.3",
     "nested-object-assign": "^1.0.1",
-    "prop-types": "^15.6.0",
+    "prop-types": "^15.6.1",
     "react-addons-create-fragment": "^15.5.3",
     "util-deprecate": "^1.0.2"
   },

diff --git a/addons/jest/package.json b/addons/jest/package.json
@@ -30,7 +30,7 @@
     "glamor": "^2.20.40",
     "glamorous": "^4.11.6",
     "global": "^4.3.2",
-    "prop-types": "^15.6.0"
+    "prop-types": "^15.6.1"
   },
   "peerDependencies": {
     "@storybook/addons": "^3.3.0",

diff --git a/addons/knobs/package.json b/addons/knobs/package.json
@@ -22,7 +22,7 @@
     "insert-css": "^2.0.0",
     "lodash.debounce": "^4.0.8",
     "moment": "^2.20.1",
-    "prop-types": "^15.6.0",
+    "prop-types": "^15.6.1",
     "react-color": "^2.11.4",
     "react-datetime": "^2.14.0",
     "react-textarea-autosize": "^5.2.1",

diff --git a/addons/links/package.json b/addons/links/package.json
@@ -25,7 +25,7 @@
     "@storybook/components": "^3.4.0-alpha.9",
     "babel-runtime": "^6.26.0",
     "global": "^4.3.2",
-    "prop-types": "^15.5.10"
+    "prop-types": "^15.6.1"
   },
   "devDependencies": {
     "@storybook/react": "^3.4.0-alpha.9",

diff --git a/addons/notes/package.json b/addons/notes/package.json
@@ -21,8 +21,8 @@
   },
   "dependencies": {
     "babel-runtime": "^6.26.0",
-    "marked": "^0.3.16",
-    "prop-types": "^15.6.0",
+    "marked": "^0.3.17",
+    "prop-types": "^15.6.1",
     "util-deprecate": "^1.0.2"
   },
   "devDependencies": {

diff --git a/addons/storysource/package.json b/addons/storysource/package.json
@@ -20,15 +20,15 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "acorn": "^5.3.0",
+    "acorn": "^5.5.0",
     "acorn-es7": "^0.1.0",
     "acorn-jsx": "^4.1.1",
-    "acorn-stage3": "^0.5.0",
+    "acorn-stage3": "^0.6.0",
     "babel-runtime": "^6.26.0",
     "estraverse": "^4.2.0",
     "loader-utils": "^1.1.0",
-    "prettier": "^1.10.2",
-    "prop-types": "^15.5.10",
+    "prettier": "^1.11.0",
+    "prop-types": "^15.6.1",
     "react-syntax-highlighter": "^7.0.1"
   },
   "peerDependencies": {

diff --git a/addons/viewport/package.json b/addons/viewport/package.json
@@ -14,7 +14,7 @@
     "@storybook/components": "^3.4.0-alpha.9",
     "babel-runtime": "^6.26.0",
     "global": "^4.3.2",
-    "prop-types": "^15.5.10"
+    "prop-types": "^15.6.1"
   },
   "peerDependencies": {
     "@storybook/addons": "^3.3.0",

diff --git a/app/angular/package.json b/app/angular/package.json
@@ -30,15 +30,15 @@
     "@storybook/ui": "^3.4.0-alpha.9",
     "airbnb-js-shims": "^1.4.1",
     "angular2-template-loader": "^0.6.2",
-    "babel-loader": "^7.0.0",
+    "babel-loader": "^7.1.3",
     "babel-plugin-macros": "^2.1.0",
     "babel-preset-env": "^1.6.0",
     "babel-preset-stage-0": "^6.24.1",
     "babel-runtime": "^6.23.0",
     "case-sensitive-paths-webpack-plugin": "^2.0.0",
     "core-js": "^2.4.1",
     "cross-env": "^5.1.1",
-    "dotenv-webpack": "^1.5.4",
+    "dotenv-webpack": "^1.5.5",
     "global": "^4.3.2",
     "html-loader": "^0.5.5",
     "html-webpack-plugin": "^2.30.1",

diff --git a/app/angular/src/demo/welcome.component.ts b/app/angular/src/demo/welcome.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, Output, EventEmitter } from '@angular/core';
 
 @Component({
   selector: 'storybook-welcome-component',
@@ -15,7 +15,7 @@ import { Component } from '@angular/core';
           (Basically a story is like a visual test case.)
         </p>
         <p>
-          See these sample <a (click)="showApp();" role="button" tabIndex="0">stories</a> for a component called
+          See these sample <a (click)="showApp.emit($event);" role="button" tabIndex="0">stories</a> for a component called
           <span class="inline-code">Button</span> .
         </p>
         <p>
@@ -77,5 +77,5 @@ import { Component } from '@angular/core';
   ],
 })
 export default class WelcomeComponent {
-  displayName = 'Welcome';
+  @Output() showApp = new EventEmitter<any>();
 }
diff --git a/app/polymer/package.json b/app/polymer/package.json
@@ -30,7 +30,7 @@
     "@storybook/ui": "^3.4.0-alpha.9",
     "@webcomponents/webcomponentsjs": "^1.1.0",
     "airbnb-js-shims": "^1.4.1",
-    "babel-loader": "^7.1.2",
+    "babel-loader": "^7.1.3",
     "babel-plugin-macros": "^2.1.0",
     "babel-plugin-transform-regenerator": "^6.26.0",
     "babel-plugin-transform-runtime": "^6.23.0",
@@ -43,7 +43,7 @@
     "common-tags": "^1.4.0",
     "copy-webpack-plugin": "^4.4.2",
     "core-js": "^2.5.1",
-    "dotenv-webpack": "^1.5.4",
+    "dotenv-webpack": "^1.5.5",
     "find-cache-dir": "^1.0.0",
     "global": "^4.3.2",
     "html-webpack-plugin": "^2.30.1",

diff --git a/app/react-native/package.json b/app/react-native/package.json
@@ -31,7 +31,7 @@
     "@storybook/channel-websocket": "^3.4.0-alpha.9",
     "@storybook/core": "^3.4.0-alpha.9",
     "@storybook/ui": "^3.4.0-alpha.9",
-    "babel-loader": "^7.1.2",
+    "babel-loader": "^7.1.3",
     "babel-plugin-macros": "^2.1.0",
     "babel-plugin-syntax-async-functions": "^6.13.0",
     "babel-plugin-syntax-trailing-function-commas": "^6.22.0",
@@ -52,7 +52,7 @@
     "html-webpack-plugin": "^2.30.1",
     "json5": "^0.5.1",
     "markdown-loader": "^2.0.2",
-    "prop-types": "^15.6.0",
+    "prop-types": "^15.6.1",
     "react-native-compat": "^1.0.0",
     "react-native-iphone-x-helper": "^1.0.2",
     "shelljs": "^0.8.1",
@@ -63,7 +63,7 @@
     "webpack": "^3.11.0",
     "webpack-dev-middleware": "^1.12.2",
     "webpack-hot-middleware": "^2.21.0",
-    "ws": "^3.3.3"
+    "ws": "^4.1.0"
   },
   "devDependencies": {
     "react-native": "^0.52.2"
@@ -72,6 +72,6 @@
     "babel-core": "^6.26.0 || ^7.0.0-0",
     "babel-runtime": ">=6.0.0",
     "react": "*",
-    "react-native": "0.52.2"
+    "react-native": ">=0.51.0"
   }
 }
diff --git a/app/react/package.json b/app/react/package.json
@@ -32,7 +32,7 @@
     "@storybook/node-logger": "^3.4.0-alpha.9",
     "@storybook/ui": "^3.4.0-alpha.9",
     "airbnb-js-shims": "^1.4.1",
-    "babel-loader": "^7.1.2",
+    "babel-loader": "^7.1.3",
     "babel-plugin-macros": "^2.1.0",
     "babel-plugin-react-docgen": "^1.8.2",
     "babel-plugin-transform-regenerator": "^6.26.0",
@@ -45,7 +45,7 @@
     "case-sensitive-paths-webpack-plugin": "^2.1.1",
     "common-tags": "^1.7.2",
     "core-js": "^2.5.3",
-    "dotenv-webpack": "^1.5.4",
+    "dotenv-webpack": "^1.5.5",
     "find-cache-dir": "^1.0.0",
     "glamor": "^2.20.40",
     "glamorous": "^4.11.6",
@@ -55,7 +55,7 @@
     "json5": "^0.5.1",
     "lodash.flattendeep": "^4.4.0",
     "markdown-loader": "^2.0.2",
-    "prop-types": "^15.6.0",
+    "prop-types": "^15.6.1",
     "react-dev-utils": "^5.0.0",
     "redux": "^3.7.2",
     "uglifyjs-webpack-plugin": "^1.2.2",

diff --git a/app/vue/package.json b/app/vue/package.json
@@ -28,7 +28,7 @@
     "@storybook/core": "^3.4.0-alpha.9",
     "@storybook/ui": "^3.4.0-alpha.9",
     "airbnb-js-shims": "^1.4.1",
-    "babel-loader": "^7.1.2",
+    "babel-loader": "^7.1.3",
     "babel-plugin-macros": "^2.1.0",
     "babel-plugin-transform-regenerator": "^6.26.0",
     "babel-plugin-transform-runtime": "^6.23.0",
@@ -39,7 +39,7 @@
     "case-sensitive-paths-webpack-plugin": "^2.1.1",
     "common-tags": "^1.7.2",
     "core-js": "^2.5.3",
-    "dotenv-webpack": "^1.5.4",
+    "dotenv-webpack": "^1.5.5",
     "find-cache-dir": "^1.0.0",
     "global": "^4.3.2",
     "html-loader": "^0.5.5",
@@ -64,8 +64,8 @@
   "peerDependencies": {
     "babel-core": "^6.26.0 || ^7.0.0-0",
     "babel-runtime": ">=6.0.0",
-    "vue": "2.5.13",
-    "vue-loader": "13.7.1",
-    "vue-template-compiler": "2.5.13"
+    "vue": ">=2.0.0",
+    "vue-loader": ">=13.0.0",
+    "vue-template-compiler": ">=2.0.0"
   }
 }
diff --git a/docs/package.json b/docs/package.json
@@ -24,21 +24,21 @@
     "@storybook/react": "^3.3.14",
     "babel-loader": "^6.4.1",
     "bootstrap": "^3.3.7",
-    "gatsby": "^1.9.212",
+    "gatsby": "^1.9.216",
     "gatsby-link": "^1.6.37",
-    "gatsby-plugin-sharp": "^1.6.34",
+    "gatsby-plugin-sharp": "^1.6.35",
     "gatsby-remark-autolink-headers": "^1.4.12",
     "gatsby-remark-copy-linked-files": "^1.5.28",
-    "gatsby-remark-images": "^1.5.50",
+    "gatsby-remark-images": "^1.5.51",
     "gatsby-remark-smartypants": "^1.4.11",
-    "gatsby-source-filesystem": "^1.5.23",
+    "gatsby-source-filesystem": "^1.5.24",
     "gatsby-transformer-remark": "^1.7.33",
     "gh-pages": "^1.1.0",
     "global": "^4.3.2",
     "highlight.js": "^9.12.0",
     "lodash": "^4.17.5",
-    "marked": "^0.3.16",
-    "prop-types": "^15.6.0",
+    "marked": "^0.3.17",
+    "prop-types": "^15.6.1",
     "react": "^15.6.1",
     "react-document-title": "^2.0.3",
     "react-dom": "^15.6.1",

diff --git a/docs/src/pages/addons/addon-gallery/index.md b/docs/src/pages/addons/addon-gallery/index.md
@@ -46,6 +46,10 @@ Redirects console output (logs, errors, warnings) into Action Logger Panel. `wit
 
 With this addon, you can switch between background colors and background images for your preview components. It is really helpful for styleguides.
 
+### [Viewport](https://github.com/storybooks/storybook/tree/master/addons/viewport)
+
+Viewport allows your stories to be displayed in different sizes and layouts in [Storybook](https://storybookjs.org).  This helps build responsive components inside of Storybook.
+
 ## Community Addons
 
 You need to install these addons directly from NPM in order to use them.