Merge branch 'master' into feat-storyshots-screenshots-options

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",

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"
   },

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",

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": {

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>
     );
   }

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"

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"
   },

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",

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",

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",

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": {

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": {

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",

app/angular/package.json

@@ -38,7 +38,7 @@
     "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",

app/polymer/package.json

@@ -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",

app/react-native/package.json

@@ -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"
   }
 }

app/react/package.json

@@ -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",

app/vue/package.json

@@ -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",
@@ -58,14 +58,14 @@
   "devDependencies": {
     "nodemon": "^1.15.1",
     "vue": "^2.5.13",
-    "vue-loader": "^13.7.1",
+    "vue-loader": "^14.1.1",
     "vue-template-compiler": "^2.5.13"
   },
   "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"
   }
 }

docs/package.json

@@ -24,21 +24,21 @@
     "@storybook/react": "^3.3.14",
     "babel-loader": "^6.4.1",
     "bootstrap": "^3.3.7",
-    "gatsby": "^1.9.214",
+    "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",

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.