Merge branch 'master' into webpack-4

# Conflicts:
#	app/angular/package.json
#	app/polymer/package.json
#	app/react-native/package.json
#	app/react/package.json
#	app/vue/package.json
#	examples/polymer-cli/package.json
#	lib/core/package.json
#	yarn.lock

.circleci/config.yml

@@ -45,6 +45,21 @@ jobs:
             - addons
             - app
             - lib
+  danger:
+    <<: *defaults
+    environment:
+      - TOKEN_HEAD: 49aa9a6549007391dfcef9c76fca32a73560fd8
+    steps:
+      - checkout
+      - restore_cache:
+          name: "Restore core dependencies cache"
+          keys:
+            - core-dependencies-{{ checksum "yarn.lock" }}
+      - run:
+          name: "Danger"
+          command: |
+            echo $DANGER_GITHUB_API_TOKEN
+            DANGER_GITHUB_API_TOKEN=${TOKEN_HEAD}3 yarn danger ci
   example-kitchen-sinks:
     <<: *defaults
     steps:
@@ -57,6 +72,9 @@ jobs:
           name: "Restore core dist cache"
           keys:
             - core-dist-{{ .Revision }}
+      - run:
+          name: Workaround for https://github.com/GoogleChrome/puppeteer/issues/290
+          command: sh ./scripts/workaround-puppeteer-issue-290.sh
       - run:
           name: "Build react kitchen-sink"
           command: |
@@ -273,6 +291,9 @@ workflows:
   build_accept_deploy:
     jobs:
       - build
+      - danger:
+          requires:
+            - build
       - example-kitchen-sinks:
           requires:
             - build

CHANGELOG.md

@@ -1,3 +1,96 @@
+# 3.4.0-rc.2
+
+2018-March-13
+
+Fix publishing options to use exact versions for cross-dependencies per this change:
+
+-   use exact versions for cross-dependencies between our own packages [#3183](https://github.com/storybooks/storybook/pull/3183)
+
+# 3.4.0-rc.1
+
+2018-March-13
+
+#### Features
+
+-   Fix screenshots tests & add getScreenshotOption to storyshots [#3102](https://github.com/storybooks/storybook/pull/3102)
+
+#### Bug Fixes
+
+-   Delaying update of height and width in Layout [#3180](https://github.com/storybooks/storybook/pull/3180)
+-   Add 'waitUntil' option to puppeteer of storyshots [#3156](https://github.com/storybooks/storybook/pull/3156)
+-   Move polymer loader to peerDependencies [#3161](https://github.com/storybooks/storybook/pull/3161)
+
+#### Maintenance
+
+-   Feature-freeze master [#3149](https://github.com/storybooks/storybook/pull/3149)
+
+#### Dependency Upgrades
+
+<details>
+<summary>
+57 updates
+</summary>
+
+-   Update danger in / from 3.1.7 to 3.1.8 [#3191](https://github.com/storybooks/storybook/pull/3191)
+-   Upgraded `polymer-webpack-loader` in `/` from "2.0.1" to "2.0.2" [#3184](https://github.com/storybooks/storybook/pull/3184)
+-   Upgraded `uglifyjs-webpack-plugin` in `app/react` from "1.2.2" to "1.2.3" [#3184](https://github.com/storybooks/storybook/pull/3184)
+-   Upgraded `vue` in `addons/knobs` from "2.5.14" to "2.5.15" [#3184](https://github.com/storybooks/storybook/pull/3184)
+-   Upgraded `node-sass` in `app/angular` from "4.7.2" to "4.8.1" [#3184](https://github.com/storybooks/storybook/pull/3184)
+-   Upgraded `uglifyjs-webpack-plugin` in `app/angular` from "1.2.2" to "1.2.3" [#3184](https://github.com/storybooks/storybook/pull/3184)
+-   Upgraded `uglifyjs-webpack-plugin` in `app/polymer` from "1.2.2" to "1.2.3" [#3184](https://github.com/storybooks/storybook/pull/3184)
+-   Upgraded `polymer-webpack-loader` in `app/polymer` from "2.0.1" to "2.0.2" [#3184](https://github.com/storybooks/storybook/pull/3184)
+-   Upgraded `uglifyjs-webpack-plugin` in `app/react-native` from "1.2.2" to "1.2.3" [#3184](https://github.com/storybooks/storybook/pull/3184)
+-   Upgraded `uglifyjs-webpack-plugin` in `app/vue` from "1.2.2" to "1.2.3" [#3184](https://github.com/storybooks/storybook/pull/3184)
+-   Upgraded `vue` in `app/vue` from "2.5.14" to "2.5.15" [#3184](https://github.com/storybooks/storybook/pull/3184)
+-   Upgraded `vue-template-compiler` in `app/vue` from "2.5.14" to "2.5.15" [#3184](https://github.com/storybooks/storybook/pull/3184)
+-   Upgraded `polymer-webpack-loader` in `examples/polymer-cli` from "2.0.1" to "2.0.2" [#3184](https://github.com/storybooks/storybook/pull/3184)
+-   Upgraded `vue` in `examples/vue-kitchen-sink` from "2.5.14" to "2.5.15" [#3184](https://github.com/storybooks/storybook/pull/3184)
+-   Update eslint-plugin-jest in / from 21.13.0 to 21.14.0 [#3182](https://github.com/storybooks/storybook/pull/3182)
+-   Upgraded `cross-env` in `/` from "5.1.3" to "5.1.4" [#3179](https://github.com/storybooks/storybook/pull/3179)
+-   Upgraded `jest-preset-angular` in `/` from "5.2.0" to "5.2.1" [#3179](https://github.com/storybooks/storybook/pull/3179)
+-   Upgraded `@types/react` in `addons/notes` from "16.0.34" to "16.0.40" [#3179](https://github.com/storybooks/storybook/pull/3179)
+-   Upgraded `style-loader` in `addons/knobs` from "0.20.2" to "0.20.3" [#3179](https://github.com/storybooks/storybook/pull/3179)
+-   Upgraded `vue` in `addons/knobs` from "2.5.13" to "2.5.14" [#3179](https://github.com/storybooks/storybook/pull/3179)
+-   Upgraded `style-loader` in `lib/core` from "0.20.2" to "0.20.3" [#3179](https://github.com/storybooks/storybook/pull/3179)
+-   Upgraded `cross-env` in `app/angular` from "5.1.3" to "5.1.4" [#3179](https://github.com/storybooks/storybook/pull/3179)
+-   Upgraded `copy-webpack-plugin` in `app/polymer` from "4.5.0" to "4.5.1" [#3179](https://github.com/storybooks/storybook/pull/3179)
+-   Upgraded `vue` in `app/vue` from "2.5.13" to "2.5.14" [#3179](https://github.com/storybooks/storybook/pull/3179)
+-   Upgraded `vue-template-compiler` in `app/vue` from "2.5.13" to "2.5.14" [#3179](https://github.com/storybooks/storybook/pull/3179)
+-   Upgraded `@types/node` in `examples/angular-cli` from "9.4.6" to "9.4.7" [#3179](https://github.com/storybooks/storybook/pull/3179)
+-   Upgraded `copy-webpack-plugin` in `examples/polymer-cli` from "4.5.0" to "4.5.1" [#3179](https://github.com/storybooks/storybook/pull/3179)
+-   Upgraded `vue` in `examples/vue-kitchen-sink` from "2.5.13" to "2.5.14" [#3179](https://github.com/storybooks/storybook/pull/3179)
+-   Upgraded `cross-env` in `examples/vue-kitchen-sink` from "5.1.3" to "5.1.4" [#3179](https://github.com/storybooks/storybook/pull/3179)
+-   Upgraded `gatsby-link` in `/docs` from "1.6.38" to "1.6.39" [#3171](https://github.com/storybooks/storybook/pull/3171)
+-   Upgraded `gatsby-plugin-sharp` in `/docs` from "1.6.39" to "1.6.41" [#3171](https://github.com/storybooks/storybook/pull/3171)
+-   Upgraded `gatsby-source-filesystem` in `/docs` from "1.5.26" to "1.5.27" [#3171](https://github.com/storybooks/storybook/pull/3171)
+-   Upgraded `gatsby` in `/docs` from "1.9.225" to "1.9.231" [#3171](https://github.com/storybooks/storybook/pull/3171)
+-   Upgraded `@angular/common` in `/` from "5.2.7" to "5.2.8" [#3170](https://github.com/storybooks/storybook/pull/3170)
+-   Upgraded `@angular/compiler` in `/` from "5.2.7" to "5.2.8" [#3170](https://github.com/storybooks/storybook/pull/3170)
+-   Upgraded `@angular/core` in `/` from "5.2.7" to "5.2.8" [#3170](https://github.com/storybooks/storybook/pull/3170)
+-   Upgraded `@angular/forms` in `/` from "5.2.7" to "5.2.8" [#3170](https://github.com/storybooks/storybook/pull/3170)
+-   Upgraded `@angular/platform-browser` in `/` from "5.2.7" to "5.2.8" [#3170](https://github.com/storybooks/storybook/pull/3170)
+-   Upgraded `@angular/platform-browser-dynamic` in `/` from "5.2.7" to "5.2.8" [#3170](https://github.com/storybooks/storybook/pull/3170)
+-   Upgraded `commander` in `/` from "2.14.1" to "2.15.0" [#3170](https://github.com/storybooks/storybook/pull/3170)
+-   Upgraded `acorn` in `addons/storysource` from "5.5.1" to "5.5.3" [#3170](https://github.com/storybooks/storybook/pull/3170)
+-   Upgraded `enzyme-to-json` in `addons/storyshots` from "3.3.1" to "3.3.2" [#3170](https://github.com/storybooks/storybook/pull/3170)
+-   Upgraded `commander` in `lib/core` from "2.14.1" to "2.15.0" [#3170](https://github.com/storybooks/storybook/pull/3170)
+-   Upgraded `commander` in `app/react-native` from "2.14.1" to "2.15.0" [#3170](https://github.com/storybooks/storybook/pull/3170)
+-   Upgraded `enzyme-to-json` in `examples/cra-kitchen-sink` from "3.3.1" to "3.3.2" [#3170](https://github.com/storybooks/storybook/pull/3170)
+-   Upgraded `enzyme-to-json` in `examples/official-storybook` from "3.3.1" to "3.3.2" [#3170](https://github.com/storybooks/storybook/pull/3170)
+-   Upgraded `commander` in `lib/cli` from "2.14.1" to "2.15.0" [#3170](https://github.com/storybooks/storybook/pull/3170)
+-   Upgraded `@angular/common` in `examples/angular-cli` from "5.2.7" to "5.2.8" [#3170](https://github.com/storybooks/storybook/pull/3170)
+-   Upgraded `@angular/compiler` in `examples/angular-cli` from "5.2.7" to "5.2.8" [#3170](https://github.com/storybooks/storybook/pull/3170)
+-   Upgraded `@angular/core` in `examples/angular-cli` from "5.2.7" to "5.2.8" [#3170](https://github.com/storybooks/storybook/pull/3170)
+-   Upgraded `@angular/forms` in `examples/angular-cli` from "5.2.7" to "5.2.8" [#3170](https://github.com/storybooks/storybook/pull/3170)
+-   Upgraded `@angular/platform-browser` in `examples/angular-cli` from "5.2.7" to "5.2.8" [#3170](https://github.com/storybooks/storybook/pull/3170)
+-   Upgraded `@angular/platform-browser-dynamic` in `examples/angular-cli` from "5.2.7" to "5.2.8" [#3170](https://github.com/storybooks/storybook/pull/3170)
+-   Upgraded `@angular/cli` in `examples/angular-cli` from "1.7.2" to "1.7.3" [#3170](https://github.com/storybooks/storybook/pull/3170)
+-   Upgraded `@angular/compiler-cli` in `examples/angular-cli` from "5.2.7" to "5.2.8" [#3170](https://github.com/storybooks/storybook/pull/3170)
+-   use exact versions for cross-dependencies between our own packages [#3183](https://github.com/storybooks/storybook/pull/3183)
+-   Move "@types/react" to dev dependencies [#3169](https://github.com/storybooks/storybook/pull/3169)
+
+</details>
+
 # 3.4.0-rc.0
 
 2018-March-08

README.md

@@ -2,7 +2,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)
+[![Known Vulnerabilities](https://snyk.io/test/github/storybooks/storybook/badge.svg)](https://snyk.io/test/github/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)

addons/a11y/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "3.4.0-rc.0",
+  "version": "3.4.0-rc.2",
   "description": "a11y addon for storybook",
   "keywords": [
     "a11y",
@@ -25,15 +25,15 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/components": "^3.4.0-rc.0",
+    "@storybook/components": "3.4.0-rc.2",
     "axe-core": "^2.6.1",
     "babel-runtime": "^6.26.0",
     "glamor": "^2.20.40",
-    "glamorous": "^4.12.0",
+    "glamorous": "^4.12.1",
     "prop-types": "^15.6.1"
   },
   "devDependencies": {
-    "@storybook/react": "^3.4.0-rc.0",
+    "@storybook/react": "3.4.0-rc.2",
     "faker": "^4.1.0"
   },
   "peerDependencies": {

addons/actions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "3.4.0-rc.0",
+  "version": "3.4.0-rc.2",
   "description": "Action Logger addon for storybook",
   "keywords": [
     "storybook"
@@ -20,11 +20,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/components": "^3.4.0-rc.0",
+    "@storybook/components": "3.4.0-rc.2",
     "babel-runtime": "^6.26.0",
     "deep-equal": "^1.0.1",
     "glamor": "^2.20.40",
-    "glamorous": "^4.12.0",
+    "glamorous": "^4.12.1",
     "global": "^4.3.2",
     "make-error": "^1.3.4",
     "prop-types": "^15.6.1",

addons/background/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "3.4.0-rc.0",
+  "version": "3.4.0-rc.2",
   "description": "A storybook addon to show different backgrounds for your preview",
   "keywords": [
     "addon",

addons/centered/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-centered",
-  "version": "3.4.0-rc.0",
+  "version": "3.4.0-rc.2",
   "description": "Storybook decorator to center components",
   "license": "MIT",
   "author": "Muhammed Thanish <mnmtanish@gmail.com>",

addons/events/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-events",
-  "version": "3.4.0-rc.0",
+  "version": "3.4.0-rc.2",
   "description": "Add events to your Storybook stories.",
   "keywords": [
     "addon",

addons/graphql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-graphql",
-  "version": "3.4.0-rc.0",
+  "version": "3.4.0-rc.2",
   "description": "Storybook addon to display the GraphiQL IDE",
   "keywords": [
     "storybook"
@@ -29,7 +29,7 @@
     "prop-types": "^15.6.1"
   },
   "devDependencies": {
-    "@storybook/react": "^3.4.0-rc.0"
+    "@storybook/react": "3.4.0-rc.2"
   },
   "peerDependencies": {
     "react": "*"

addons/info/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-info",
-  "version": "3.4.0-rc.0",
+  "version": "3.4.0-rc.2",
   "description": "A Storybook addon to show additional information for your stories.",
   "license": "MIT",
   "main": "dist/index.js",
@@ -15,11 +15,11 @@
     "storybook": "start-storybook -p 9010"
   },
   "dependencies": {
-    "@storybook/client-logger": "^3.4.0-rc.0",
-    "@storybook/components": "^3.4.0-rc.0",
+    "@storybook/client-logger": "3.4.0-rc.2",
+    "@storybook/components": "3.4.0-rc.2",
     "babel-runtime": "^6.26.0",
     "glamor": "^2.20.40",
-    "glamorous": "^4.12.0",
+    "glamorous": "^4.12.1",
     "global": "^4.3.2",
     "marksy": "^6.0.3",
     "nested-object-assign": "^1.0.1",
@@ -28,8 +28,8 @@
     "util-deprecate": "^1.0.2"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "^3.4.0-rc.0",
-    "@storybook/react": "^3.4.0-rc.0",
+    "@storybook/addon-actions": "3.4.0-rc.2",
+    "@storybook/react": "3.4.0-rc.2",
     "react-test-renderer": "^16.1.0"
   },
   "peerDependencies": {

addons/jest/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-jest",
-  "version": "3.4.0-rc.0",
+  "version": "3.4.0-rc.2",
   "description": "React storybook addon that show component jest report",
   "keywords": [
     "addon",
@@ -25,10 +25,10 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/components": "^3.4.0-rc.0",
+    "@storybook/components": "3.4.0-rc.2",
     "babel-runtime": "^6.26.0",
     "glamor": "^2.20.40",
-    "glamorous": "^4.12.0",
+    "glamorous": "^4.12.1",
     "global": "^4.3.2",
     "prop-types": "^15.6.1"
   },

addons/knobs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-knobs",
-  "version": "3.4.0-rc.0",
+  "version": "3.4.0-rc.2",
   "description": "Storybook Addon Prop Editor Component",
   "license": "MIT",
   "main": "dist/index.js",
@@ -15,7 +15,7 @@
     "storybook": "start-storybook -p 9010"
   },
   "dependencies": {
-    "@storybook/components": "^3.4.0-rc.0",
+    "@storybook/components": "3.4.0-rc.2",
     "babel-runtime": "^6.26.0",
     "deep-equal": "^1.0.1",
     "global": "^4.3.2",
@@ -29,10 +29,10 @@
     "util-deprecate": "^1.0.2"
   },
   "devDependencies": {
-    "@storybook/react": "^3.4.0-rc.0",
+    "@storybook/react": "3.4.0-rc.2",
     "raw-loader": "^0.5.1",
-    "style-loader": "^0.20.2",
-    "vue": "^2.5.13"
+    "style-loader": "^0.20.3",
+    "vue": "^2.5.16"
   },
   "peerDependencies": {
     "@storybook/addons": "^3.3.0",

addons/links/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-links",
-  "version": "3.4.0-rc.0",
+  "version": "3.4.0-rc.2",
   "description": "Story Links addon for storybook",
   "keywords": [
     "storybook"
@@ -22,13 +22,13 @@
     "storybook": "start-storybook -p 9001"
   },
   "dependencies": {
-    "@storybook/components": "^3.4.0-rc.0",
+    "@storybook/components": "3.4.0-rc.2",
     "babel-runtime": "^6.26.0",
     "global": "^4.3.2",
     "prop-types": "^15.6.1"
   },
   "devDependencies": {
-    "@storybook/react": "^3.4.0-rc.0",
+    "@storybook/react": "3.4.0-rc.2",
     "enzyme": "^3.3.0",
     "react": "^16.1.0",
     "react-dom": "^16.1.0"

addons/notes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-notes",
-  "version": "3.4.0-rc.0",
+  "version": "3.4.0-rc.2",
   "description": "Write notes for your Storybook stories.",
   "keywords": [
     "addon",
@@ -26,8 +26,8 @@
     "util-deprecate": "^1.0.2"
   },
   "devDependencies": {
-    "@storybook/react": "^3.4.0-rc.0",
-    "@types/react": "^16.0.20"
+    "@storybook/react": "3.4.0-rc.2",
+    "@types/react": "^16.0.40"
   },
   "peerDependencies": {
     "@storybook/addons": "^3.3.0",

addons/options/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-options",
-  "version": "3.4.0-rc.0",
+  "version": "3.4.0-rc.2",
   "description": "Options addon for storybook",
   "keywords": [
     "storybook"
@@ -23,7 +23,7 @@
     "babel-runtime": "^6.26.0"
   },
   "devDependencies": {
-    "@storybook/react": "^3.4.0-rc.0"
+    "@storybook/react": "3.4.0-rc.2"
   },
   "peerDependencies": {
     "@storybook/addons": "^3.3.0",

addons/storyshots/README.md

@@ -210,6 +210,22 @@ initStoryshots({suite: 'Image storyshots', test: imageSnapshot({storybookUrl: 'h
 
 `beforeScreenshot` receives the [Puppeteer page instance](https://github.com/GoogleChrome/puppeteer/blob/master/docs/api.md#class-page) and an object: `{ context: {kind, story}, url}`. _kind_ is the kind of the story and the _story_ its name. _url_ is the URL the browser will use to screenshot. `beforeScreenshot` is part of the promise chain and is called after the browser navigation is completed but before the screenshot is taken. It allows for triggering events on the page elements and delaying the screenshot and can be used avoid regressions due to mounting animations.
 
+### Specifying options to _screenshot()_
+
+You might use `getScreenshotOptions` to specify options for screenshot. Will be passed to [Puppeteer .screenshot() fn](https://github.com/GoogleChrome/puppeteer/blob/master/docs/api.md#pagescreenshotoptions)
+
+```js
+import initStoryshots, { imageSnapshot } from '@storybook/addon-storyshots';
+const getScreenshotOptions = ({context, url}) {
+  return {
+    fullPage: false // Do not take the full page screenshot. Default is 'true' in Storyshots.
+  }
+}
+initStoryshots({suite: 'Image storyshots', test: imageSnapshot({storybookUrl: 'http://localhost:6006', getScreenshotOptions})});
+```
+
+`getScreenshotOptions` receives an object `{ context: {kind, story}, url}`. _kind_ is the kind of the story and the _story_ its name. _url_ is the URL the browser will use to screenshot.
+
 ### Integrate image storyshots with regular app
 
 You may want to use another Jest project to run your image snapshots as they require more resources: Chrome and Storybook built/served.

addons/storyshots/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-storyshots",
-  "version": "3.4.0-rc.0",
+  "version": "3.4.0-rc.2",
   "description": "StoryShots is a Jest Snapshot Testing Addon for Storybook.",
   "license": "MIT",
   "main": "dist/index.js",
@@ -16,27 +16,27 @@
     "storybook": "start-storybook -p 6006"
   },
   "dependencies": {
-    "@storybook/channels": "^3.4.0-rc.0",
-    "@storybook/node-logger": "^3.4.0-rc.0",
+    "@storybook/channels": "3.4.0-rc.2",
+    "@storybook/node-logger": "3.4.0-rc.2",
     "babel-runtime": "^6.26.0",
     "glob": "^7.1.2",
     "global": "^4.3.2",
-    "jest-image-snapshot": "^2.3.0",
+    "jest-image-snapshot": "^2.4.0",
     "jest-specific-snapshot": "^0.5.0",
-    "puppeteer": "^1.1.1",
+    "puppeteer": "^1.2.0",
     "read-pkg-up": "^3.0.0"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "^3.4.0-rc.0",
-    "@storybook/addon-links": "^3.4.0-rc.0",
-    "@storybook/addons": "^3.4.0-rc.0",
-    "@storybook/react": "^3.4.0-rc.0",
-    "enzyme-to-json": "^3.3.1",
+    "@storybook/addon-actions": "3.4.0-rc.2",
+    "@storybook/addon-links": "3.4.0-rc.2",
+    "@storybook/addons": "3.4.0-rc.2",
+    "@storybook/react": "3.4.0-rc.2",
+    "enzyme-to-json": "^3.3.3",
     "react": "^16.1.0",
     "react-dom": "^16.1.0"
   },
   "peerDependencies": {
-    "@storybook/addons": "^3.4.0-rc.0",
+    "@storybook/addons": "3.4.0-rc.2",
     "babel-core": "^6.26.0 || ^7.0.0-0"
   }
 }

addons/storyshots/src/index.js

@@ -1,6 +1,6 @@
 import fs from 'fs';
 import glob from 'glob';
-import global, { describe, it, beforeEach, afterEach } from 'global';
+import global, { describe, it } from 'global';
 import addons from '@storybook/addons';
 import loadFramework from './frameworkLoader';
 import createChannel from './storybook-channel-mock';
@@ -27,6 +27,8 @@ export {
   imageSnapshot,
 };
 
+const methods = ['beforeAll', 'beforeEach', 'afterEach', 'afterAll'];
+
 export default function testStorySnapshots(options = {}) {
   if (typeof describe !== 'function') {
     throw new Error('testStorySnapshots is intended only to be used inside jest');
@@ -53,6 +55,12 @@ export default function testStorySnapshots(options = {}) {
 
   const testMethod = options.test || snapshotWithOptions({ options: snapshotOptions });
 
+  methods.forEach(method => {
+    if (typeof testMethod[method] === 'function') {
+      global[method](testMethod[method]);
+    }
+  });
+
   // eslint-disable-next-line
   for (const group of stories) {
     const { fileName, kind } = group;
@@ -63,20 +71,6 @@ export default function testStorySnapshots(options = {}) {
     }
 
     describe(suite, () => {
-      beforeEach(() => {
-        if (typeof testMethod.beforeEach === 'function') {
-          return testMethod.beforeEach();
-        }
-        return Promise.resolve();
-      });
-
-      afterEach(() => {
-        if (typeof testMethod.afterEach === 'function') {
-          return testMethod.afterEach();
-        }
-        return Promise.resolve();
-      });
-
       describe(kind, () => {
         // eslint-disable-next-line
         for (const story of group.stories) {

addons/storyshots/src/test-body-image-snapshot.js

@@ -4,10 +4,16 @@ import { logger } from '@storybook/node-logger';
 
 expect.extend({ toMatchImageSnapshot });
 
+// We consider taking the full page is a reasonnable default.
+const defaultScreenshotOptions = () => ({ fullPage: true });
+
+const noop = () => {};
+
 export const imageSnapshot = ({
   storybookUrl = 'http://localhost:6006',
-  getMatchOptions = () => {},
-  beforeScreenshot = () => {},
+  getMatchOptions = noop,
+  getScreenshotOptions = defaultScreenshotOptions,
+  beforeScreenshot = noop,
 }) => {
   let browser; // holds ref to browser. (ie. Chrome)
   let page; // Hold ref to the page to screenshot.
@@ -36,7 +42,7 @@ export const imageSnapshot = ({
 
     expect.assertions(1);
     return page
-      .goto(url)
+      .goto(url, { waitUntil: 'networkidle0' })
       .catch(e => {
         logger.error(
           `ERROR WHILE CONNECTING TO ${url}, did you start or build the storybook first ? A storybook instance should be running or a static version should be built when using image snapshot feature.`,
@@ -45,14 +51,13 @@ export const imageSnapshot = ({
         throw e;
       })
       .then(() => beforeScreenshot(page, { context, url }))
-      .then(() =>
-        page.screenshot().then(image => {
-          expect(image).toMatchImageSnapshot(getMatchOptions({ context, url }));
-        })
-      );
+      .then(() => page.screenshot(getScreenshotOptions({ context, url })))
+      .then(image => {
+        expect(image).toMatchImageSnapshot(getMatchOptions({ context, url }));
+      });
   };
 
-  testFn.beforeEach = () =>
+  testFn.beforeAll = () =>
     puppeteer
       // add some options "no-sandbox" to make it work properly on some Linux systems as proposed here: https://github.com/Googlechrome/puppeteer/issues/290#issuecomment-322851507
       .launch({ args: ['--no-sandbox ', '--disable-setuid-sandbox'] })
@@ -64,7 +69,7 @@ export const imageSnapshot = ({
         page = p;
       });
 
-  testFn.afterEach = () => browser.close();
+  testFn.afterAll = () => browser.close();
 
   return testFn;
 };

addons/storysource/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-storysource",
-  "version": "3.4.0-rc.0",
+  "version": "3.4.0-rc.2",
   "description": "Stories addon for storybook",
   "keywords": [
     "storybook"
@@ -20,7 +20,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/components": "^3.4.0-rc.0",
+    "@storybook/components": "3.4.0-rc.2",
     "acorn": "^5.5.3",
     "acorn-es7": "^0.1.0",
     "acorn-jsx": "^4.1.1",

addons/viewport/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-viewport",
-  "version": "3.4.0-rc.0",
+  "version": "3.4.0-rc.2",
   "description": "Storybook addon to change the viewport size to mobile",
   "keywords": [
     "storybook"
@@ -11,7 +11,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/components": "^3.4.0-rc.0",
+    "@storybook/components": "3.4.0-rc.2",
     "babel-runtime": "^6.26.0",
     "global": "^4.3.2",
     "prop-types": "^15.6.1"

app/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/angular",
-  "version": "3.4.0-rc.0",
+  "version": "3.4.0-rc.2",
   "description": "Storybook for Angular: Develop Angular Components in isolation with Hot Reloading.",
   "homepage": "https://github.com/storybooks/storybook/tree/master/apps/angular",
   "bugs": {
@@ -23,11 +23,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "^3.4.0-rc.0",
-    "@storybook/channel-postmessage": "^3.4.0-rc.0",
-    "@storybook/core": "^3.4.0-rc.0",
-    "@storybook/node-logger": "^3.4.0-rc.0",
-    "@storybook/ui": "^3.4.0-rc.0",
+    "@storybook/addons": "3.4.0-rc.2",
+    "@storybook/channel-postmessage": "3.4.0-rc.2",
+    "@storybook/core": "3.4.0-rc.2",
+    "@storybook/node-logger": "3.4.0-rc.2",
+    "@storybook/ui": "3.4.0-rc.2",
     "airbnb-js-shims": "^1.4.1",
     "angular2-template-loader": "^0.6.2",
     "babel-loader": "^7.1.4",
@@ -37,14 +37,14 @@
     "babel-runtime": "^6.23.0",
     "case-sensitive-paths-webpack-plugin": "^2.1.2",
     "core-js": "^2.4.1",
-    "cross-env": "^5.1.1",
+    "cross-env": "^5.1.4",
     "dotenv-webpack": "^1.5.5",
     "global": "^4.3.2",
     "html-loader": "^0.5.5",
     "html-webpack-plugin": "^3.0.6",
     "json5": "^0.5.1",
     "markdown-loader": "^2.0.2",
-    "node-sass": "^4.7.2",
+    "node-sass": "^4.8.2",
     "raw-loader": "^0.5.1",
     "react": "^16.0.0",
     "react-dev-utils": "^5.0.0",
@@ -59,7 +59,7 @@
   },
   "devDependencies": {
     "mock-fs": "^4.3.0",
-    "nodemon": "^1.17.1"
+    "nodemon": "^1.17.2"
   },
   "peerDependencies": {
     "@angular/common": ">=4.0.0",

app/polymer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/polymer",
-  "version": "3.4.0-rc.0",
+  "version": "3.4.0-rc.2",
   "description": "Storybook for Polymer: Develop Polymer components in isolation with Hot Reloading.",
   "homepage": "https://github.com/storybooks/storybook/tree/master/apps/polymer",
   "bugs": {
@@ -22,12 +22,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "^3.4.0-rc.0",
-    "@storybook/channel-postmessage": "^3.4.0-rc.0",
-    "@storybook/client-logger": "^3.4.0-rc.0",
-    "@storybook/core": "^3.4.0-rc.0",
-    "@storybook/node-logger": "^3.4.0-rc.0",
-    "@storybook/ui": "^3.4.0-rc.0",
+    "@storybook/addons": "3.4.0-rc.2",
+    "@storybook/channel-postmessage": "3.4.0-rc.2",
+    "@storybook/client-logger": "3.4.0-rc.2",
+    "@storybook/core": "3.4.0-rc.2",
+    "@storybook/node-logger": "3.4.0-rc.2",
+    "@storybook/ui": "3.4.0-rc.2",
     "@webcomponents/webcomponentsjs": "^1.1.0",
     "airbnb-js-shims": "^1.4.1",
     "babel-loader": "^7.1.4",
@@ -41,7 +41,7 @@
     "babel-runtime": "^6.26.0",
     "case-sensitive-paths-webpack-plugin": "^2.1.2",
     "common-tags": "^1.4.0",
-    "copy-webpack-plugin": "^4.5.0",
+    "copy-webpack-plugin": "^4.5.1",
     "core-js": "^2.5.1",
     "dotenv-webpack": "^1.5.5",
     "find-cache-dir": "^1.0.0",
@@ -57,12 +57,12 @@
     "webpack-hot-middleware": "^2.21.2"
   },
   "devDependencies": {
-    "nodemon": "^1.17.1",
-    "polymer-webpack-loader": "^2.0.1"
+    "nodemon": "^1.17.2",
+    "polymer-webpack-loader": "^2.0.2"
   },
   "peerDependencies": {
     "babel-core": "^6.26.0 || ^7.0.0-0",
     "babel-runtime": ">=6.0.0",
-    "polymer-webpack-loader": ">=2.0.0"
+    "polymer-webpack-loader": "2.0.2"
   }
 }

app/react-native/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react-native",
-  "version": "3.4.0-rc.0",
+  "version": "3.4.0-rc.2",
   "description": "A better way to develop React Native Components for your app",
   "keywords": [
     "react",
@@ -25,12 +25,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addon-actions": "^3.4.0-rc.0",
-    "@storybook/addon-links": "^3.4.0-rc.0",
-    "@storybook/addons": "^3.4.0-rc.0",
-    "@storybook/channel-websocket": "^3.4.0-rc.0",
-    "@storybook/core": "^3.4.0-rc.0",
-    "@storybook/ui": "^3.4.0-rc.0",
+    "@storybook/addon-actions": "3.4.0-rc.2",
+    "@storybook/addon-links": "3.4.0-rc.2",
+    "@storybook/addons": "3.4.0-rc.2",
+    "@storybook/channel-websocket": "3.4.0-rc.2",
+    "@storybook/core": "3.4.0-rc.2",
+    "@storybook/ui": "3.4.0-rc.2",
     "babel-loader": "^7.1.4",
     "babel-plugin-macros": "^2.2.0",
     "babel-plugin-syntax-async-functions": "^6.13.0",
@@ -45,7 +45,7 @@
     "babel-runtime": "^6.26.0",
     "case-sensitive-paths-webpack-plugin": "^2.1.2",
     "commander": "^2.15.0",
-    "express": "^4.16.2",
+    "express": "^4.16.3",
     "find-cache-dir": "^1.0.0",
     "global": "^4.3.2",
     "html-loader": "^0.5.5",

app/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react",
-  "version": "3.4.0-rc.0",
+  "version": "3.4.0-rc.2",
   "description": "Storybook for React: Develop React Component in isolation with Hot Reloading.",
   "homepage": "https://github.com/storybooks/storybook/tree/master/app/react",
   "bugs": {
@@ -23,14 +23,14 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addon-actions": "^3.4.0-rc.0",
-    "@storybook/addon-links": "^3.4.0-rc.0",
-    "@storybook/addons": "^3.4.0-rc.0",
-    "@storybook/channel-postmessage": "^3.4.0-rc.0",
-    "@storybook/client-logger": "^3.4.0-rc.0",
-    "@storybook/core": "^3.4.0-rc.0",
-    "@storybook/node-logger": "^3.4.0-rc.0",
-    "@storybook/ui": "^3.4.0-rc.0",
+    "@storybook/addon-actions": "3.4.0-rc.2",
+    "@storybook/addon-links": "3.4.0-rc.2",
+    "@storybook/addons": "3.4.0-rc.2",
+    "@storybook/channel-postmessage": "3.4.0-rc.2",
+    "@storybook/client-logger": "3.4.0-rc.2",
+    "@storybook/core": "3.4.0-rc.2",
+    "@storybook/node-logger": "3.4.0-rc.2",
+    "@storybook/ui": "3.4.0-rc.2",
     "airbnb-js-shims": "^1.4.1",
     "babel-loader": "^7.1.4",
     "babel-plugin-macros": "^2.2.0",
@@ -48,7 +48,7 @@
     "dotenv-webpack": "^1.5.5",
     "find-cache-dir": "^1.0.0",
     "glamor": "^2.20.40",
-    "glamorous": "^4.12.0",
+    "glamorous": "^4.12.1",
     "global": "^4.3.2",
     "html-loader": "^0.5.5",
     "html-webpack-plugin": "^3.0.6",
@@ -63,7 +63,7 @@
     "webpack-hot-middleware": "^2.21.2"
   },
   "devDependencies": {
-    "nodemon": "^1.17.1"
+    "nodemon": "^1.17.2"
   },
   "peerDependencies": {
     "babel-core": "^6.26.0 || ^7.0.0-0",

app/vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/vue",
-  "version": "3.4.0-rc.0",
+  "version": "3.4.0-rc.2",
   "description": "Storybook for Vue: Develop Vue Component in isolation with Hot Reloading.",
   "homepage": "https://github.com/storybooks/storybook/tree/master/apps/vue",
   "bugs": {
@@ -23,10 +23,10 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "^3.4.0-rc.0",
-    "@storybook/channel-postmessage": "^3.4.0-rc.0",
-    "@storybook/core": "^3.4.0-rc.0",
-    "@storybook/ui": "^3.4.0-rc.0",
+    "@storybook/addons": "3.4.0-rc.2",
+    "@storybook/channel-postmessage": "3.4.0-rc.2",
+    "@storybook/core": "3.4.0-rc.2",
+    "@storybook/ui": "3.4.0-rc.2",
     "airbnb-js-shims": "^1.4.1",
     "babel-loader": "^7.1.4",
     "babel-plugin-macros": "^2.2.0",
@@ -55,16 +55,16 @@
     "webpack-hot-middleware": "^2.21.2"
   },
   "devDependencies": {
-    "nodemon": "^1.17.1",
-    "vue": "^2.5.13",
+    "nodemon": "^1.17.2",
+    "vue": "^2.5.16",
     "vue-loader": "^14.2.1",
-    "vue-template-compiler": "^2.5.13"
+    "vue-template-compiler": "^2.5.16"
   },
   "peerDependencies": {
     "babel-core": "^6.26.0 || ^7.0.0-0",
     "babel-runtime": ">=6.0.0",
-    "vue": ">=2.0.0",
+    "vue": "2.5.16",
     "vue-loader": "14.2.1",
-    "vue-template-compiler": ">=2.0.0"
+    "vue-template-compiler": "2.5.16"
   }
 }

dangerfile.js

@@ -1,17 +1,37 @@
 import { fail, danger } from 'danger';
-import { flatten, intersection, isEmpty, includes } from 'lodash';
+import { flatten, intersection, isEmpty } from 'lodash';
 
 const pkg = require('./package.json'); // eslint-disable-line import/newline-after-import
 const prLogConfig = pkg['pr-log'];
 
+const Versions = {
+  PATCH: 'PATCH',
+  MINOR: 'MINOR',
+  MAJOR: 'MAJOR',
+};
+
+const branchVersion = Versions.PATCH;
+
 const checkRequiredLabels = labels => {
+  const forbiddenLabels = flatten([
+    'do not merge',
+    'in progress',
+    branchVersion !== Versions.MAJOR ? 'BREAKING CHANGE' : [],
+    branchVersion === Versions.PATCH ? 'feature request' : [],
+  ]);
+
   const requiredLabels = flatten([
     prLogConfig.skipLabels || [],
     Object.keys(prLogConfig.validLabels || {}),
   ]);
 
-  if (includes(labels, 'do not merge')) {
-    fail('PR is marked with "do not merge" label.');
+  const blockingLabels = intersection(forbiddenLabels, labels);
+  if (!isEmpty(blockingLabels)) {
+    fail(
+      `PR is marked with ${blockingLabels.map(label => `"${label}"`).join(', ')} label${
+        blockingLabels.length > 1 ? 's' : ''
+      }.`
+    );
   }
 
   const foundLabels = intersection(requiredLabels, labels);

docs/package.json

@@ -24,7 +24,7 @@
     "@storybook/react": "^3.3.15",
     "babel-loader": "^6.4.1",
     "bootstrap": "^3.3.7",
-    "gatsby": "^1.9.231",
+    "gatsby": "^1.9.236",
     "gatsby-link": "^1.6.39",
     "gatsby-plugin-sharp": "^1.6.41",
     "gatsby-remark-autolink-headers": "^1.4.13",
@@ -32,7 +32,7 @@
     "gatsby-remark-images": "^1.5.56",
     "gatsby-remark-smartypants": "^1.4.12",
     "gatsby-source-filesystem": "^1.5.27",
-    "gatsby-transformer-remark": "^1.7.36",
+    "gatsby-transformer-remark": "^1.7.37",
     "gh-pages": "^1.1.0",
     "global": "^4.3.2",
     "highlight.js": "^9.12.0",

docs/src/pages/basics/guide-angular/index.md

@@ -165,3 +165,19 @@ storiesOf('My Panel', module)
     }
   }));
 ```
+## Trouble Shooting
+
+If you have problems running @angular/cli using "ng serve" after install specifically the following error: 
+
+```ERROR in node_modules/@storybook/angular/index.d.ts(31,44): error TS2304: Cannot find name 'NodeRequire'.```
+
+You may need to exclude your stories from being compiled when running your angular dev environment.  To do this add "stories", "\*\*/\*.stories.ts" to the exclude section in src/app/tsconfig.app.json:
+
+```json
+{
+  "exclude": [
+    "stories",
+    "**/*.stories.ts"
+  ]
+}
+```

docs/src/pages/testing/react-ui-testing/index.md

@@ -19,7 +19,7 @@ Specifically, testing is important when working with teams since it allows diffe
 
 ## Different Aspects of UI Testing
 
-We refer UI for many things. To put this in focus, let's narrow it down to React based user interfaces.
+We refer to UI for many things. To put this in focus, let's narrow it down to React based user interfaces.
 
 ### 1. Structural Testing
 
@@ -30,7 +30,7 @@ For an example, let's say we have a "login component" as shown below:
 
 For structural testing, we are testing whether or not it has following content:
 
--   A title with "Login in to Facebook"
+-   A title with "Log in to Facebook"
 -   Two inputs for the username and password.
 -   A submit button.
 -   An error screen to show errors.

docs/yarn.lock

@@ -184,6 +184,30 @@
     react-treebeard "^2.1.0"
     redux "^3.7.2"
 
+"@types/configstore@^2.1.1":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@types/configstore/-/configstore-2.1.1.tgz#cd1e8553633ad3185c3f2f239ecff5d2643e92b6"
+
+"@types/debug@^0.0.29":
+  version "0.0.29"
+  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-0.0.29.tgz#a1e514adfbd92f03a224ba54d693111dbf1f3754"
+
+"@types/events@*":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86"
+
+"@types/get-port@^0.0.4":
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/@types/get-port/-/get-port-0.0.4.tgz#eb6bb7423d9f888b632660dc7d2fd3e69a35643e"
+
+"@types/glob@^5.0.30":
+  version "5.0.35"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.35.tgz#1ae151c802cece940443b5ac246925c85189f32a"
+  dependencies:
+    "@types/events" "*"
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
 "@types/history@*", "@types/history@^4.6.2":
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/@types/history/-/history-4.6.2.tgz#12cfaba693ba20f114ed5765467ff25fdf67ddb0"
@@ -192,6 +216,14 @@
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@types/inline-style-prefixer/-/inline-style-prefixer-3.0.1.tgz#8541e636b029124b747952e9a28848286d2b5bf6"
 
+"@types/minimatch@*":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+
+"@types/mkdirp@^0.3.29":
+  version "0.3.29"
+  resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-0.3.29.tgz#7f2ad7ec55f914482fc9b1ec4bb1ae6028d46066"
+
 "@types/node@*":
   version "9.4.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-9.4.0.tgz#b85a0bcf1e1cc84eb4901b7e96966aedc6f078d1"
@@ -200,6 +232,10 @@
   version "6.0.90"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.90.tgz#0ed74833fa1b73dcdb9409dcb1c97ec0a8b13b02"
 
+"@types/node@^7.0.11":
+  version "7.0.56"
+  resolved "http://registry.npmjs.org/@types/node/-/node-7.0.56.tgz#b6b659049191822be43c14610c1785d4b9cddecf"
+
 "@types/react-router-dom@^4.2.2":
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-4.2.3.tgz#06e0b67ff536adc0681dffdbe592ae91fb85887d"
@@ -223,6 +259,10 @@
   version "16.0.22"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.22.tgz#19ad106e124aceebd2b4d430a278d55413ee8759"
 
+"@types/tmp@^0.0.32":
+  version "0.0.32"
+  resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.0.32.tgz#0d3cb31022f8427ea58c008af32b80da126ca4e3"
+
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -2559,6 +2599,10 @@ comma-separated-tokens@^1.0.0, comma-separated-tokens@^1.0.1:
   dependencies:
     trim "0.0.1"
 
+command-exists@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/command-exists/-/command-exists-1.2.2.tgz#12819c64faf95446ec0ae07fe6cafb6eb3708b22"
+
 commander@2.11.0, commander@^2.11.0, commander@^2.9.0:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
@@ -3036,7 +3080,7 @@ death@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/death/-/death-1.1.0.tgz#01aa9c401edd92750514470b8266390c66c67318"
 
-debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.6, debug@^2.6.8, debug@~2.6.4, debug@~2.6.6, debug@~2.6.9:
+debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.3, debug@^2.6.6, debug@^2.6.8, debug@~2.6.4, debug@~2.6.6, debug@~2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
@@ -3229,6 +3273,27 @@ detect-port@1.2.1, detect-port@^1.2.1:
     address "^1.0.1"
     debug "^2.6.0"
 
+devcert-san@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/devcert-san/-/devcert-san-0.3.3.tgz#aa77244741b2d831771c011f22ee25e396ad4ba9"
+  dependencies:
+    "@types/configstore" "^2.1.1"
+    "@types/debug" "^0.0.29"
+    "@types/get-port" "^0.0.4"
+    "@types/glob" "^5.0.30"
+    "@types/mkdirp" "^0.3.29"
+    "@types/node" "^7.0.11"
+    "@types/tmp" "^0.0.32"
+    command-exists "^1.2.2"
+    configstore "^3.0.0"
+    debug "^2.6.3"
+    eol "^0.8.1"
+    get-port "^3.0.0"
+    glob "^7.1.1"
+    mkdirp "^0.5.1"
+    tmp "^0.0.31"
+    tslib "^1.6.0"
+
 diffie-hellman@^5.0.0:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
@@ -3511,6 +3576,10 @@ entities@^1.1.1, entities@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
 
+eol@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/eol/-/eol-0.8.1.tgz#defc3224990c7eca73bb34461a56cf9dc24761d0"
+
 err-code@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
@@ -4379,9 +4448,16 @@ gatsby-1-config-css-modules@^1.0.10:
   dependencies:
     babel-runtime "^6.26.0"
 
-gatsby-cli@^1.1.45:
-  version "1.1.45"
-  resolved "https://registry.yarnpkg.com/gatsby-cli/-/gatsby-cli-1.1.45.tgz#d68f780bc861130c9afe7dae7cd5bdb665b0f05a"
+gatsby-1-config-extract-plugin@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/gatsby-1-config-extract-plugin/-/gatsby-1-config-extract-plugin-1.0.2.tgz#2ca0779f212009d06e444cb084d182f957b7190c"
+  dependencies:
+    babel-runtime "^6.26.0"
+    extract-text-webpack-plugin "^1.0.1"
+
+gatsby-cli@^1.1.46:
+  version "1.1.46"
+  resolved "https://registry.yarnpkg.com/gatsby-cli/-/gatsby-cli-1.1.46.tgz#ebbca830805c63f6ef5be0a0c4d308dd597ad10b"
   dependencies:
     babel-code-frame "^6.26.0"
     babel-runtime "^6.26.0"
@@ -4519,9 +4595,9 @@ gatsby-source-filesystem@^1.5.27:
     slash "^1.0.0"
     valid-url "^1.0.9"
 
-gatsby-transformer-remark@^1.7.36:
-  version "1.7.36"
-  resolved "https://registry.yarnpkg.com/gatsby-transformer-remark/-/gatsby-transformer-remark-1.7.36.tgz#896a1d0fffc624f5a7b75692ba1e92c0347944b5"
+gatsby-transformer-remark@^1.7.37:
+  version "1.7.37"
+  resolved "https://registry.yarnpkg.com/gatsby-transformer-remark/-/gatsby-transformer-remark-1.7.37.tgz#30ad37403a7dd647e69fc7696e024dade526a12f"
   dependencies:
     babel-runtime "^6.26.0"
     bluebird "^3.5.0"
@@ -4544,9 +4620,9 @@ gatsby-transformer-remark@^1.7.36:
     unist-util-select "^1.5.0"
     unist-util-visit "^1.1.1"
 
-gatsby@^1.9.231:
-  version "1.9.231"
-  resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-1.9.231.tgz#869698acea98e633700a639104dd0e1b31d036ef"
+gatsby@^1.9.236:
+  version "1.9.236"
+  resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-1.9.236.tgz#ece3784aac05be3ade58e6eb2e99c5557464e65c"
   dependencies:
     async "^2.1.2"
     babel-code-frame "^6.22.0"
@@ -4575,11 +4651,11 @@ gatsby@^1.9.231:
     debug "^2.6.0"
     del "^3.0.0"
     detect-port "^1.2.1"
+    devcert-san "^0.3.3"
     domready "^1.0.8"
     dotenv "^4.0.0"
     express "^4.14.0"
     express-graphql "^0.6.6"
-    extract-text-webpack-plugin "^1.0.1"
     fast-levenshtein "~2.0.4"
     file-loader "^0.9.0"
     flat "^2.0.1"
@@ -4587,7 +4663,8 @@ gatsby@^1.9.231:
     front-matter "^2.1.0"
     fs-extra "^4.0.1"
     gatsby-1-config-css-modules "^1.0.10"
-    gatsby-cli "^1.1.45"
+    gatsby-1-config-extract-plugin "^1.0.2"
+    gatsby-cli "^1.1.46"
     gatsby-link "^1.6.39"
     gatsby-module-loader "^1.0.11"
     gatsby-react-router-scroll "^1.0.13"
@@ -4688,6 +4765,10 @@ get-params@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/get-params/-/get-params-0.1.2.tgz#bae0dfaba588a0c60d7834c0d8dc2ff60eeef2fe"
 
+get-port@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc"
+
 get-proxy@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/get-proxy/-/get-proxy-1.1.0.tgz#894854491bc591b0f147d7ae570f5c678b7256eb"
@@ -7559,7 +7640,7 @@ os-locale@^2.0.0:
     lcid "^1.0.0"
     mem "^1.1.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
@@ -10773,6 +10854,12 @@ tinycolor2@^1.1.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8"
 
+tmp@^0.0.31:
+  version "0.0.31"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"
+  dependencies:
+    os-tmpdir "~1.0.1"
+
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -10878,6 +10965,10 @@ trough@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.1.tgz#a9fd8b0394b0ae8fff82e0633a0a36ccad5b5f86"
 
+tslib@^1.6.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
+
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"

examples/angular-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-cli",
-  "version": "3.4.0-rc.0",
+  "version": "3.4.0-rc.2",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -13,30 +13,30 @@
     "test": "ng test"
   },
   "dependencies": {
-    "@angular/common": "^5.2.8",
-    "@angular/compiler": "^5.2.8",
-    "@angular/core": "^5.2.8",
-    "@angular/forms": "^5.2.8",
-    "@angular/platform-browser": "^5.2.8",
-    "@angular/platform-browser-dynamic": "^5.2.8",
+    "@angular/common": "^5.2.9",
+    "@angular/compiler": "^5.2.9",
+    "@angular/core": "^5.2.9",
+    "@angular/forms": "^5.2.9",
+    "@angular/platform-browser": "^5.2.9",
+    "@angular/platform-browser-dynamic": "^5.2.9",
     "core-js": "^2.4.1",
-    "rxjs": "^5.4.2",
+    "rxjs": "^5.5.7",
     "zone.js": "^0.8.20"
   },
   "devDependencies": {
     "@angular/cli": "1.7.3",
-    "@angular/compiler-cli": "^5.2.8",
-    "@storybook/addon-actions": "^3.4.0-rc.0",
-    "@storybook/addon-knobs": "^3.4.0-rc.0",
-    "@storybook/addon-links": "^3.4.0-rc.0",
-    "@storybook/addon-notes": "^3.4.0-rc.0",
-    "@storybook/addon-options": "^3.4.0-rc.0",
-    "@storybook/addon-storyshots": "^3.4.0-rc.0",
-    "@storybook/addon-storysource": "^3.4.0-rc.0",
-    "@storybook/addons": "^3.4.0-rc.0",
-    "@storybook/angular": "^3.4.0-rc.0",
+    "@angular/compiler-cli": "^5.2.9",
+    "@storybook/addon-actions": "3.4.0-rc.2",
+    "@storybook/addon-knobs": "3.4.0-rc.2",
+    "@storybook/addon-links": "3.4.0-rc.2",
+    "@storybook/addon-notes": "3.4.0-rc.2",
+    "@storybook/addon-options": "3.4.0-rc.2",
+    "@storybook/addon-storyshots": "3.4.0-rc.2",
+    "@storybook/addon-storysource": "3.4.0-rc.2",
+    "@storybook/addons": "3.4.0-rc.2",
+    "@storybook/angular": "3.4.0-rc.2",
     "@types/jasmine": "~2.8.6",
-    "@types/node": "~9.4.6",
+    "@types/node": "~9.4.7",
     "global": "^4.3.2",
     "jasmine-core": "~2.99.1",
     "jasmine-spec-reporter": "~4.2.1",

examples/angular-cli/src/stories/__snapshots__/metadata-individual.stories.storyshot

@@ -7,7 +7,41 @@ exports[`Storyshots Metadata|Individual Individual 1 1`] = `
   target={[Function ViewContainerRef_]}
 >
   <ng-component>
-    <storybook-simple-token-component />
+    <storybook-simple-token-component
+      ng-reflect-name="Prop Name"
+    >
+      
+      
+      <h3>
+        Prop Name
+      </h3>
+      
+      
+      <p>
+        Items:
+      </p>
+      
+      
+      <ul>
+        
+        
+        
+        <li>
+          
+          Joe
+        
+        </li>
+        <li>
+          
+          Jane
+        
+        </li>
+        
+      
+      </ul>
+      
+    
+    </storybook-simple-token-component>
   </ng-component>
 </storybook-dynamic-app-root>
 `;

examples/angular-cli/src/stories/metadata-individual.stories.ts

@@ -9,7 +9,7 @@ storiesOf('Metadata|Individual', module)
     },
     moduleMetadata: {
       imports: [],
-      declarations: [],
+      declarations: [TokenComponent],
       providers: [
         {
           provide: ITEMS,

examples/cra-kitchen-sink/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cra-kitchen-sink",
-  "version": "3.4.0-rc.0",
+  "version": "3.4.0-rc.2",
   "private": true,
   "scripts": {
     "build": "react-scripts build",
@@ -17,25 +17,25 @@
     "react-dom": "^16.2.0"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "^3.4.0-rc.0",
-    "@storybook/addon-actions": "^3.4.0-rc.0",
-    "@storybook/addon-backgrounds": "^3.4.0-rc.0",
-    "@storybook/addon-centered": "^3.4.0-rc.0",
-    "@storybook/addon-events": "^3.4.0-rc.0",
-    "@storybook/addon-info": "^3.4.0-rc.0",
-    "@storybook/addon-jest": "^3.4.0-rc.0",
-    "@storybook/addon-knobs": "^3.4.0-rc.0",
-    "@storybook/addon-links": "^3.4.0-rc.0",
-    "@storybook/addon-notes": "^3.4.0-rc.0",
-    "@storybook/addon-options": "^3.4.0-rc.0",
-    "@storybook/addon-storyshots": "^3.4.0-rc.0",
-    "@storybook/addons": "^3.4.0-rc.0",
-    "@storybook/client-logger": "^3.4.0-rc.0",
-    "@storybook/react": "^3.4.0-rc.0",
+    "@storybook/addon-a11y": "3.4.0-rc.2",
+    "@storybook/addon-actions": "3.4.0-rc.2",
+    "@storybook/addon-backgrounds": "3.4.0-rc.2",
+    "@storybook/addon-centered": "3.4.0-rc.2",
+    "@storybook/addon-events": "3.4.0-rc.2",
+    "@storybook/addon-info": "3.4.0-rc.2",
+    "@storybook/addon-jest": "3.4.0-rc.2",
+    "@storybook/addon-knobs": "3.4.0-rc.2",
+    "@storybook/addon-links": "3.4.0-rc.2",
+    "@storybook/addon-notes": "3.4.0-rc.2",
+    "@storybook/addon-options": "3.4.0-rc.2",
+    "@storybook/addon-storyshots": "3.4.0-rc.2",
+    "@storybook/addons": "3.4.0-rc.2",
+    "@storybook/client-logger": "3.4.0-rc.2",
+    "@storybook/react": "3.4.0-rc.2",
     "babel-runtime": "^6.26.0",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.0",
-    "enzyme-to-json": "^3.3.1",
+    "enzyme-to-json": "^3.3.3",
     "jest": "^20.0.4",
     "react-scripts": "^1.1.1",
     "webpack": "^4.1.1"