diff --git a/.babelrc b/.babelrc
index b4f96f58d19..9911a5be17c 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,6 +1,7 @@
 {
   "presets": ["env", "stage-0", "react"],
   "plugins": [
+    "babel-plugin-macros",
     ["transform-runtime", {
       "polyfill": false,
       "regenerator": true
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 75c806da2c7..7a0d7d28aa8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -33,8 +33,11 @@ jobs:
           key: core-dependencies-{{ checksum "yarn.lock" }}
           paths:
             - node_modules
-            - example/cra-kitchen-sink/node_modules
-            - example/vue-kitchen-sink/node_modules
+            - examples/angular-cli/node_modules
+            - examples/cra-kitchen-sink/node_modules
+            - examples/official-storybook/node_modules
+            - examples/polymer-cli/node_modules
+            - examples/vue-kitchen-sink/node_modules
       - save_cache:
           name: "Cache core dist"
           key: core-dist-{{ .Revision }}
@@ -54,10 +57,6 @@ jobs:
           name: "Restore core dist cache"
           keys:
             - core-dist-{{ .Revision }}
-      - run:
-          name: "Link packages"
-          command: |
-            yarn install
       - run:
           name: "Build react kitchen-sink"
           command: |
@@ -73,34 +72,64 @@ jobs:
           command: |
             cd examples/angular-cli
             yarn build-storybook
+      - run:
+          name: "Build polymer-cli"
+          command: |
+            cd examples/polymer-cli
+            yarn build-storybook
+      - run:
+          name: "Build official-storybook"
+          command: |
+            cd examples/official-storybook
+            yarn build-storybook
+      - run:
+          name: "Visually test storybook"
+          command: |
+            yarn chromatic
+      - run:
+          name: "Run image snapshots"
+          command: yarn test --image
+      - store_artifacts:
+          path: examples/official-storybook/image-snapshots/__image_snapshots__
+          destination: official_storybook_image_snapshots
+  smoke-tests:
+    <<: *defaults
+    steps:
+      - checkout
+      - restore_cache:
+          name: "Restore core dependencies cache"
+          keys:
+            - core-dependencies-{{ checksum "yarn.lock" }}
+      - restore_cache:
+          name: "Restore core dist cache"
+          keys:
+            - core-dist-{{ .Revision }}
 
       - run:
-          name: "Run react kitchen-sink"
+          name: "Run react kitchen-sink (smoke test)"
           command: |
             cd examples/cra-kitchen-sink
-            yarn storybook
-          background: true
+            yarn storybook --smoke-test
       - run:
-          name: "Run vue kitchen-sink"
+          name: "Run vue kitchen-sink (smoke test)"
           command: |
             cd examples/vue-kitchen-sink
-            yarn storybook
-          background: true
+            yarn storybook --smoke-test
       - run:
-          name: "Run angular-cli"
+          name: "Run angular-cli (smoke test)"
           command: |
             cd examples/angular-cli
-            yarn storybook
-          background: true
+            yarn storybook --smoke-test
       - run:
-          name: Workaround for https://github.com/GoogleChrome/puppeteer/issues/290
-          command: sh ./scripts/workaround-puppeteer-issue-290.sh
+          name: "Run polymer-cli (smoke test)"
+          command: |
+            cd examples/polymer-cli
+            yarn storybook --smoke-test
       - run:
-          name: Integration Test - Kichen sinks
-          command: yarn test --integration
-      - store_artifacts:
-          path: integration/__image_snapshots__
-          destination: integration_image_snapshots
+          name: "Run official-storybook (smoke test)"
+          command: |
+            cd examples/official-storybook
+            yarn storybook --smoke-test
   react-native:
     <<: *defaults
     steps:
@@ -171,10 +200,6 @@ jobs:
           name: "Restore core dist cache"
           keys:
             - core-dist-{{ .Revision }}
-      - run:
-          name: "Link packages"
-          command: |
-            yarn install
       - run:
           name: "Lint"
           command: |
@@ -191,35 +216,11 @@ jobs:
           name: "Restore core dist cache"
           keys:
             - core-dist-{{ .Revision }}
-      - run:
-          name: "Link packages"
-          command: |
-            yarn install
       - run:
           name: "Run unit tests"
           command: |
             yarn test --coverage --runInBand --core
             yarn coverage
-  storybook:
-    <<: *defaults
-    steps:
-      - checkout
-      - restore_cache:
-          name: "Restore core dependencies cache"
-          keys:
-            - core-dependencies-{{ checksum "yarn.lock" }}
-      - restore_cache:
-          name: "Restore core dist cache"
-          keys:
-            - core-dist-{{ .Revision }}
-      - run:
-          name: "Link packages"
-          command: |
-            yarn install
-      - run:
-          name: "Visually test storybook"
-          command: |
-            yarn chromatic
   cli:
     working_directory: /tmp/storybook
     docker:
@@ -275,19 +276,20 @@ workflows:
       - example-kitchen-sinks:
           requires:
             - build
+      - smoke-tests:
+          requires:
+            - build
       - react-native:
           requires:
             - build
       - docs
       - lint:
           requires:
+            - docs
             - build
       - unit-test:
           requires:
             - build
-      - storybook:
-          requires:
-            - build
       - cli:
           requires:
             - build
diff --git a/.editorconfig b/.editorconfig
index 641825cc12a..86c7d17c788 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,6 +3,6 @@ root = true
 [*]
 end_of_line = lf
 
-[*.{js,json,ts}]
+[*.{js,json,ts,vue,html}]
 indent_style = space
 indent_size = 2
diff --git a/.eslintignore b/.eslintignore
index d04728ab519..d68999f1779 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -2,8 +2,6 @@ dist
 build
 coverage
 node_modules
-addons/**/example/**
-app/**/demo/**
 docs/public
 lib/cli/test
 *.bundle.js
@@ -13,3 +11,4 @@ lib/cli/test
 !.eslintrc.js
 !.eslintrc-markdown.js
 !.jest.config.js
+!.storybook
diff --git a/.eslintrc-markdown.js b/.eslintrc-markdown.js
deleted file mode 100644
index c9ddcbe65f4..00000000000
--- a/.eslintrc-markdown.js
+++ /dev/null
@@ -1,59 +0,0 @@
-const error = 2;
-const warn = 1;
-const ignore = 0;
-
-module.exports = {
-  root: true,
-  extends: ['eslint-config-airbnb', 'plugin:jest/recommended', 'prettier'],
-  plugins: ['prettier', 'jest', 'react'],
-  parser: 'babel-eslint',
-  parserOptions: {
-    sourceType: 'module',
-  },
-  env: {
-    es6: true,
-    node: true,
-    'jest/globals': true,
-  },
-  globals: {
-    storiesOf: true,
-    addonAPI: true,
-    __DEV__: true,
-    fetch: true,
-  },
-  rules: {
-    strict: [error, 'never'],
-    'prettier/prettier': [
-      warn,
-      {
-        printWidth: 100,
-        tabWidth: 2,
-        bracketSpacing: true,
-        trailingComma: 'es5',
-        singleQuote: true,
-      },
-    ],
-    'no-console': ignore,
-    'global-require': ignore,
-    quotes: [warn, 'single'],
-    'no-unused-vars': ignore,
-    'class-methods-use-this': ignore,
-    'arrow-parens': [warn, 'as-needed'],
-    'space-before-function-paren': ignore,
-    'import/no-unresolved': ignore,
-    'import/extensions': ignore,
-    'import/no-extraneous-dependencies': ignore,
-    'import/prefer-default-export': ignore,
-    'react/prop-types': ignore,
-    'react/jsx-wrap-multilines': ignore,
-    'react/jsx-uses-react': error,
-    'react/jsx-uses-vars': error,
-    'react/react-in-jsx-scope': ignore,
-    'react/jsx-filename-extension': ignore,
-    'jsx-a11y/accessible-emoji': ignore,
-    'jsx-a11y/href-no-hash': ignore,
-    'jsx-a11y/label-has-for': ignore,
-    'jsx-a11y/anchor-is-valid': ['warn', { aspects: ['invalidHref'] }],
-    'react/no-unescaped-entities': ignore,
-  },
-};
diff --git a/.eslintrc.js b/.eslintrc.js
index ec55d7a4630..66def470455 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -4,8 +4,14 @@ const ignore = 0;
 
 module.exports = {
   root: true,
-  extends: ['eslint-config-airbnb', 'plugin:jest/recommended', 'prettier'],
-  plugins: ['prettier', 'jest', 'react', 'json'],
+  extends: [
+    'airbnb',
+    'plugin:jest/recommended',
+    'plugin:import/react-native',
+    'prettier',
+    'prettier/react',
+  ],
+  plugins: ['prettier', 'jest', 'import', 'react', 'jsx-a11y', 'json'],
   parser: 'babel-eslint',
   parserOptions: {
     sourceType: 'module',
@@ -18,9 +24,13 @@ module.exports = {
   settings: {
     'import/core-modules': ['enzyme'],
     'import/ignore': ['node_modules\\/(?!@storybook)'],
+    'import/resolver': {
+      node: {
+        extensions: ['.js', '.ts'],
+      },
+    },
   },
   rules: {
-    strict: [error, 'never'],
     'prettier/prettier': [
       warn,
       {
@@ -32,16 +42,13 @@ module.exports = {
       },
     ],
     'no-debugger': process.env.NODE_ENV === 'production' ? error : ignore,
-    quotes: [warn, 'single', { avoidEscape: true }],
     'class-methods-use-this': ignore,
-    'arrow-parens': [warn, 'as-needed'],
-    'space-before-function-paren': ignore,
-    'import/no-unresolved': error,
     'import/extensions': [
       error,
+      'always',
       {
         js: 'never',
-        json: 'always',
+        ts: 'never',
       },
     ],
     'import/no-extraneous-dependencies': [
@@ -56,6 +63,7 @@ module.exports = {
           '**/scripts/*.js',
           '**/stories/**/*.js',
           '**/__tests__/**/*.js',
+          '**/.storybook/**/*.js',
         ],
         peerDependencies: true,
       },
@@ -64,24 +72,47 @@ module.exports = {
     'import/default': error,
     'import/named': error,
     'import/namespace': error,
-    'react/jsx-wrap-multilines': ignore,
-    'react/jsx-indent': ignore,
-    'react/jsx-indent-props': ignore,
-    'react/jsx-closing-bracket-location': ignore,
-    'react/jsx-uses-react': error,
-    'react/jsx-uses-vars': error,
-    'react/react-in-jsx-scope': error,
     'react/jsx-filename-extension': [
       warn,
       {
         extensions: ['.js', '.jsx'],
       },
     ],
-    'jsx-a11y/accessible-emoji': ignore,
-    'jsx-a11y/href-no-hash': ignore,
-    'jsx-a11y/label-has-for': ignore,
-    'jsx-a11y/click-events-have-key-events': error,
-    'jsx-a11y/anchor-is-valid': [warn, { aspects: ['invalidHref'] }],
     'react/no-unescaped-entities': ignore,
+    'jsx-a11y/label-has-for': [
+      error,
+      {
+        required: {
+          some: ['nesting', 'id'],
+        },
+      },
+    ],
+    'jsx-a11y/anchor-is-valid': [
+      error,
+      {
+        components: ['RoutedLink', 'MenuLink', 'LinkTo', 'Link'],
+        specialLink: ['overrideParams', 'kind', 'story', 'to'],
+      },
+    ],
+    'no-underscore-dangle': [
+      error,
+      {
+        allow: ['__STORYBOOK_CLIENT_API__'],
+      },
+    ],
   },
+  overrides: [
+    {
+      files: ['**/react-native*/**', '**/REACT_NATIVE*/**', '**/crna*/**'],
+      rules: {
+        'jsx-a11y/accessible-emoji': ignore,
+      },
+    },
+    {
+      files: '**/.storybook/config.js',
+      rules: {
+        'global-require': ignore,
+      },
+    },
+  ],
 };
diff --git a/.github/autolabeler.yml b/.github/autolabeler.yml
new file mode 100644
index 00000000000..956c243397a
--- /dev/null
+++ b/.github/autolabeler.yml
@@ -0,0 +1,24 @@
+'addon: a11y': ["addons/a11y/**"]
+'addon: actions': ["addons/actions/**"]
+'addon: backgrounds': ["addons/backgrounds/**"]
+'addon: centered': ["addons/centered/**"]
+'addon: events ': ["addons/events/**"]
+'addon: graphql ': ["addons/graphql/**"]
+'addon: info': ["addons/info/**"]
+'addon: jest': ["addons/jest/**"]
+'addon: knobs': ["addons/knobs/**"]
+'addon: links': ["addons/links/**"]
+'addon: notes': ["addons/notes/**"]
+'addon: options': ["addons/options/**"]
+'addon: storyshots': ["addons/storyshots/**"]
+'addon: viewport': ["addons/viewport/**"]
+'app: angular': ["app/angular/**"]
+'app: polymer ': ["app/polymer/**"]
+'app: react-native': ["app/react-native/**"]
+'app: react': ["app/react/**"]
+'app: vue': ["app/vue/**"]
+'babel / webpack': ["webpack", "babel"]
+'cli': ["lib/cli/**"]
+'compatibility with other tools': []
+'documentation': ["docs", "*.md"]
+'ui': ["lib/ui"]
diff --git a/.github/stale.yml b/.github/stale.yml
index 29f1395531b..efba9956a07 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -10,6 +10,7 @@ exemptLabels:
   - 'do not merge'
   - 'needs review'
   - 'high priority'
+  - dependencies:update
 
 # Label to use when marking an issue as stale
 staleLabel: inactive
diff --git a/.gitignore b/.gitignore
index 27c697ea921..e9f5cedff94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ package-lock.json
 storybook-static
 integration/__image_snapshots__/__diff_output__
 .jest-test-results.json
+/examples/cra-kitchen-sink/src/__image_snapshots__/__diff_output__/
diff --git a/.remarkrc.js b/.remarkrc.js
index 9a2b8e63e7e..2c78f5c6727 100644
--- a/.remarkrc.js
+++ b/.remarkrc.js
@@ -1,18 +1,3 @@
 module.exports = {
-  plugins: [
-    'remark-preset-lint-recommended',
-    ['remark-lint-list-item-indent', false],
-    [
-      'remark-lint-code',
-      {
-        js: {
-          module: 'node_modules/remark-lint-code-eslint',
-          options: {
-            fix: true,
-            configFile: '.eslintrc-markdown.js',
-          },
-        },
-      },
-    ],
-  ],
+  plugins: ['remark-preset-lint-recommended', ['remark-lint-list-item-indent', false]],
 };
diff --git a/ADDONS_SUPPORT.md b/ADDONS_SUPPORT.md
new file mode 100644
index 00000000000..19303b2ae30
--- /dev/null
+++ b/ADDONS_SUPPORT.md
@@ -0,0 +1,19 @@
+## Addon / Framework Support Table
+
+| |[React](app/react)|[React Native](app/react-native)|[Vue](app/vue)|[Angular](app/angular)| [Polymer](app/polymer)|
+| ----------- |:-------:|:-------:|:-------:|:-------:|:-------:|
+|[a11y](addons/a11y)              |+| | | | |
+|[actions](addons/actions)        |+|+|+|+|+|
+|[background](addons/background)  |+| | | | |
+|[centered](addons/centered)      |+| |+| | |
+|[events](addons/events)          |+| | | | |
+|[graphql](addons/graphql)        |+| | | | |
+|[info](addons/info)              |+| | | | |
+|[jest](addons/jest)              |+| | | | |
+|[knobs](addons/knobs)            |+|+|+|+|+|
+|[links](addons/links)            |+|+|+|+|+|
+|[notes](addons/notes)            |+| |+|+|+|
+|[options](addons/options)        |+|+|+|+|+|
+|[storyshots](addons/storyshots)  |+|+|+|+| |
+|[storysource](addons/storysource)|+| |+|+|+|
+|[viewport](addons/viewport)      |+| |+|+|+|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6de702303d..0f6f5992383 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,1008 @@
+# 3.4.0-alpha.9
+
+2018-February-22
+
+#### Features
+
+-   Addon-storysource: story source in addon pane [#2885](https://github.com/storybooks/storybook/pull/2885)
+
+#### Bug Fixes
+
+-   Fix problem with RN on latest `master` build [#3045](https://github.com/storybooks/storybook/pull/3045)
+
+#### Documentation
+
+-   Revisit addon/framework support [#3046](https://github.com/storybooks/storybook/pull/3046)
+-   Docs live examples [#3019](https://github.com/storybooks/storybook/pull/3019)
+-   Mention new supported frameworks [#2895](https://github.com/storybooks/storybook/pull/2895)
+
+#### Maintenance
+
+-   Use core client api in react native [#3036](https://github.com/storybooks/storybook/pull/3036)
+-   Optimize CI workflow [#3016](https://github.com/storybooks/storybook/pull/3016)
+-   Integration tests: wait until stories appear [#3027](https://github.com/storybooks/storybook/pull/3027)
+-   Add netlify for polymer [#3004](https://github.com/storybooks/storybook/pull/3004)
+-   Add built storybooks to official storybook [#2958](https://github.com/storybooks/storybook/pull/2958)
+
+#### Dependency Upgrades
+
+<details>
+<summary>
+169 Updates
+</summary>
+
+-   Upgraded `@storybook/addon-actions` in `/docs` from "3.3.13" to "3.3.14" [#3051](https://github.com/storybooks/storybook/pull/3051)
+-   Upgraded `@storybook/addon-links` in `/docs` from "3.3.13" to "3.3.14" [#3051](https://github.com/storybooks/storybook/pull/3051)
+-   Upgraded `@storybook/addons` in `/docs` from "3.3.13" to "3.3.14" [#3051](https://github.com/storybooks/storybook/pull/3051)
+-   Upgraded `@storybook/react` in `/docs` from "3.3.13" to "3.3.14" [#3051](https://github.com/storybooks/storybook/pull/3051)
+-   Upgraded `gatsby-source-filesystem` in `/docs` from "1.5.20" to "1.5.21" [#3051](https://github.com/storybooks/storybook/pull/3051)
+-   Upgraded `gatsby` in `/docs` from "1.9.203" to "1.9.204" [#3051](https://github.com/storybooks/storybook/pull/3051)
+-   Upgraded `marked` in `/docs` from "0.3.15" to "0.3.16" [#3051](https://github.com/storybooks/storybook/pull/3051)
+-   Upgraded `eslint` in `/` from "4.18.0" to "4.18.1" [#3050](https://github.com/storybooks/storybook/pull/3050)
+-   Upgraded `jscodeshift` in `lib/codemod` from "0.4.0" to "0.4.1" [#3050](https://github.com/storybooks/storybook/pull/3050)
+-   Upgraded `file-loader` in `app/react` from "1.1.7" to "1.1.8" [#3050](https://github.com/storybooks/storybook/pull/3050)
+-   Upgraded `marked` in `addons/notes` from "0.3.15" to "0.3.16" [#3050](https://github.com/storybooks/storybook/pull/3050)
+-   Upgraded `react-modal` in `lib/ui` from "3.2.1" to "3.3.1" [#3050](https://github.com/storybooks/storybook/pull/3050)
+-   Upgraded `file-loader` in `lib/core` from "1.1.7" to "1.1.8" [#3050](https://github.com/storybooks/storybook/pull/3050)
+-   Upgraded `file-loader` in `app/angular` from "1.1.7" to "1.1.8" [#3050](https://github.com/storybooks/storybook/pull/3050)
+-   Upgraded `react-modal` in `app/angular` from "3.2.1" to "3.3.1" [#3050](https://github.com/storybooks/storybook/pull/3050)
+-   Upgraded `ts-loader` in `app/angular` from "3.3.1" to "3.5.0" [#3050](https://github.com/storybooks/storybook/pull/3050)
+-   Upgraded `file-loader` in `app/polymer` from "1.1.7" to "1.1.8" [#3050](https://github.com/storybooks/storybook/pull/3050)
+-   Upgraded `react-modal` in `app/polymer` from "3.2.1" to "3.3.1" [#3050](https://github.com/storybooks/storybook/pull/3050)
+-   Upgraded `file-loader` in `app/react-native` from "1.1.7" to "1.1.8" [#3050](https://github.com/storybooks/storybook/pull/3050)
+-   Upgraded `file-loader` in `app/vue` from "1.1.7" to "1.1.8" [#3050](https://github.com/storybooks/storybook/pull/3050)
+-   Upgraded `vue-hot-reload-api` in `app/vue` from "2.2.4" to "2.3.0" [#3050](https://github.com/storybooks/storybook/pull/3050)
+-   Upgraded `jscodeshift` in `lib/cli` from "0.4.0" to "0.4.1" [#3050](https://github.com/storybooks/storybook/pull/3050)
+-   Upgraded `file-loader` in `examples/vue-kitchen-sink` from "1.1.7" to "1.1.8" [#3050](https://github.com/storybooks/storybook/pull/3050)
+-   Upgraded `vue-hot-reload-api` in `examples/vue-kitchen-sink` from "2.2.4" to "2.3.0" [#3050](https://github.com/storybooks/storybook/pull/3050)
+-   Upgraded `babel-eslint` in `/` from "8.2.1" to "8.2.2" [#3041](https://github.com/storybooks/storybook/pull/3041)
+-   Upgraded `jest` in `/` from "22.3.0" to "22.4.0" [#3041](https://github.com/storybooks/storybook/pull/3041)
+-   Upgraded `jest-cli` in `/` from "22.3.0" to "22.4.0" [#3041](https://github.com/storybooks/storybook/pull/3041)
+-   Upgraded `jest-config` in `/` from "22.3.0" to "22.4.0" [#3041](https://github.com/storybooks/storybook/pull/3041)
+-   Upgraded `jest-diff` in `/` from "22.1.0" to "22.4.0" [#3041](https://github.com/storybooks/storybook/pull/3041)
+-   Upgraded `jest-environment-jsdom` in `/` from "22.3.0" to "22.4.0" [#3041](https://github.com/storybooks/storybook/pull/3041)
+-   Upgraded `jest-jasmine2` in `/` from "22.3.0" to "22.4.0" [#3041](https://github.com/storybooks/storybook/pull/3041)
+-   Upgraded `babel-jest` in `addons/storyshots` from "22.1.0" to "22.4.0" [#3041](https://github.com/storybooks/storybook/pull/3041)
+-   Upgraded `jest` in `addons/storyshots` from "22.3.0" to "22.4.0" [#3041](https://github.com/storybooks/storybook/pull/3041)
+-   Upgraded `jest-cli` in `addons/storyshots` from "22.3.0" to "22.4.0" [#3041](https://github.com/storybooks/storybook/pull/3041)
+-   Upgraded `babel-jest` in `examples/cra-kitchen-sink` from "22.2.2" to "22.4.0" [#3041](https://github.com/storybooks/storybook/pull/3041)
+-   Upgraded `jest` in `examples/cra-kitchen-sink` from "22.3.0" to "22.4.0" [#3041](https://github.com/storybooks/storybook/pull/3041)
+-   Upgraded `babel-jest` in `examples/official-storybook` from "22.1.0" to "22.4.0" [#3041](https://github.com/storybooks/storybook/pull/3041)
+-   Upgraded `jest` in `examples/official-storybook` from "22.3.0" to "22.4.0" [#3041](https://github.com/storybooks/storybook/pull/3041)
+-   Addon-storyshots: upgrade puppeteer to 1.0.0 [#2853](https://github.com/storybooks/storybook/pull/2853)
+-   App-angular: upgrade ts-loader to 3.3.1 [#2855](https://github.com/storybooks/storybook/pull/2855)
+-   Update cross-spawn in lib/cli from 6.0.3 to 6.0.4 [#3039](https://github.com/storybooks/storybook/pull/3039)
+-   Update eslint-plugin-react in / from 7.6.1 to 7.7.0 [#3037](https://github.com/storybooks/storybook/pull/3037)
+-   CLI: upgrade cross-spawn to 6.0.3 [#2854](https://github.com/storybooks/storybook/pull/2854)
+-   Update gatsby in /docs from 1.9.202 to 1.9.203 [#3034](https://github.com/storybooks/storybook/pull/3034)
+-   Upgraded `gatsby-plugin-sharp` in `/docs` from "1.6.30" to "1.6.31" [#3030](https://github.com/storybooks/storybook/pull/3030)
+-   Upgraded `gatsby-remark-images` in `/docs` from "1.5.46" to "1.5.47" [#3030](https://github.com/storybooks/storybook/pull/3030)
+-   Upgraded `gatsby-transformer-remark` in `/docs` from "1.7.32" to "1.7.33" [#3030](https://github.com/storybooks/storybook/pull/3030)
+-   Upgraded `nodemon` in `/` from "1.15.0" to "1.15.1" [#3028](https://github.com/storybooks/storybook/pull/3028)
+-   Upgraded `file-loader` in `app/react` from "1.1.6" to "1.1.7" [#3028](https://github.com/storybooks/storybook/pull/3028)
+-   Upgraded `nodemon` in `app/react` from "1.15.0" to "1.15.1" [#3028](https://github.com/storybooks/storybook/pull/3028)
+-   Upgraded `file-loader` in `lib/core` from "1.1.6" to "1.1.7" [#3028](https://github.com/storybooks/storybook/pull/3028)
+-   Upgraded `file-loader` in `app/angular` from "1.1.6" to "1.1.7" [#3028](https://github.com/storybooks/storybook/pull/3028)
+-   Upgraded `nodemon` in `app/angular` from "1.15.0" to "1.15.1" [#3028](https://github.com/storybooks/storybook/pull/3028)
+-   Upgraded `file-loader` in `app/polymer` from "1.1.6" to "1.1.7" [#3028](https://github.com/storybooks/storybook/pull/3028)
+-   Upgraded `nodemon` in `app/polymer` from "1.15.0" to "1.15.1" [#3028](https://github.com/storybooks/storybook/pull/3028)
+-   Upgraded `file-loader` in `app/react-native` from "1.1.6" to "1.1.7" [#3028](https://github.com/storybooks/storybook/pull/3028)
+-   Upgraded `file-loader` in `app/vue` from "1.1.6" to "1.1.7" [#3028](https://github.com/storybooks/storybook/pull/3028)
+-   Upgraded `nodemon` in `app/vue` from "1.15.0" to "1.15.1" [#3028](https://github.com/storybooks/storybook/pull/3028)
+-   Upgraded `file-loader` in `examples/vue-kitchen-sink` from "1.1.6" to "1.1.7" [#3028](https://github.com/storybooks/storybook/pull/3028)
+-   Update marked in /docs from 0.3.14 to 0.3.15 [#3021](https://github.com/storybooks/storybook/pull/3021)
+-   Core: upgrade dotenv to 5.0.0 [#2878](https://github.com/storybooks/storybook/pull/2878)
+-   Update acorn-stage3 in addons/storysource from 0.4.0 to 0.5.0 [#3014](https://github.com/storybooks/storybook/pull/3014)
+-   Update gatsby in /docs from 1.9.201 to 1.9.202 [#3012](https://github.com/storybooks/storybook/pull/3012)
+-   Update marked in addons/notes from 0.3.12 to 0.3.14 [#3015](https://github.com/storybooks/storybook/pull/3015)
+-   Upgraded `danger` in `/` from "3.1.6" to "3.1.7" [#3013](https://github.com/storybooks/storybook/pull/3013)
+-   Upgraded `eslint-plugin-jest` in `/` from "21.12.1" to "21.12.2" [#3013](https://github.com/storybooks/storybook/pull/3013)
+-   Upgraded `glamorous` in `lib/components` from "4.11.5" to "4.11.6" [#3009](https://github.com/storybooks/storybook/pull/3009)
+-   Upgraded `glamorous` in `addons/a11y` from "4.11.5" to "4.11.6" [#3009](https://github.com/storybooks/storybook/pull/3009)
+-   Upgraded `glamorous` in `addons/info` from "4.11.5" to "4.11.6" [#3009](https://github.com/storybooks/storybook/pull/3009)
+-   Upgraded `glamorous` in `addons/jest` from "4.11.5" to "4.11.6" [#3009](https://github.com/storybooks/storybook/pull/3009)
+-   Upgraded `glamorous` in `app/react` from "4.11.5" to "4.11.6" [#3009](https://github.com/storybooks/storybook/pull/3009)
+-   Upgraded `glamorous` in `examples/cra-kitchen-sink` from "4.11.5" to "4.11.6" [#3009](https://github.com/storybooks/storybook/pull/3009)
+-   Upgraded `gatsby-plugin-sharp` in `/docs` from "1.6.29" to "1.6.30" [#3008](https://github.com/storybooks/storybook/pull/3008)
+-   Upgraded `gatsby-remark-images` in `/docs` from "1.5.45" to "1.5.46" [#3008](https://github.com/storybooks/storybook/pull/3008)
+-   Upgraded `eslint` in `/` from "4.17.0" to "4.18.0" [#3006](https://github.com/storybooks/storybook/pull/3006)
+-   Upgraded `uglifyjs-webpack-plugin` in `app/angular` from "1.1.8" to "1.2.0" [#3006](https://github.com/storybooks/storybook/pull/3006)
+-   Upgraded `uglifyjs-webpack-plugin` in `app/polymer` from "1.1.8" to "1.2.0" [#3006](https://github.com/storybooks/storybook/pull/3006)
+-   Upgraded `uglifyjs-webpack-plugin` in `app/react-native` from "1.1.8" to "1.2.0" [#3006](https://github.com/storybooks/storybook/pull/3006)
+-   Upgraded `uglifyjs-webpack-plugin` in `app/react` from "1.1.8" to "1.2.0" [#3006](https://github.com/storybooks/storybook/pull/3006)
+-   Upgraded `uglifyjs-webpack-plugin` in `app/vue` from "1.1.8" to "1.2.0" [#3006](https://github.com/storybooks/storybook/pull/3006)
+-   Upgraded `gatsby-plugin-sharp` in `/docs` from "1.6.28" to "1.6.29" [#3005](https://github.com/storybooks/storybook/pull/3005)
+-   Upgraded `gatsby-remark-images` in `/docs` from "1.5.44" to "1.5.45" [#3005](https://github.com/storybooks/storybook/pull/3005)
+-   Upgraded `gatsby-source-filesystem` in `/docs` from "1.5.19" to "1.5.20" [#3005](https://github.com/storybooks/storybook/pull/3005)
+-   Upgraded `gatsby` in `/docs` from "1.9.200" to "1.9.201" [#3005](https://github.com/storybooks/storybook/pull/3005)
+-   Upgraded `lint-staged` in `/` from "6.1.0" to "6.1.1" [#3003](https://github.com/storybooks/storybook/pull/3003)
+-   Upgraded `nodemon` in `/` from "1.14.12" to "1.15.0" [#3003](https://github.com/storybooks/storybook/pull/3003)
+-   Upgraded `puppeteer` in `/` from "1.0.0" to "1.1.0" [#3003](https://github.com/storybooks/storybook/pull/3003)
+-   Upgraded `typescript` in `/` from "2.7.1" to "2.7.2" [#3003](https://github.com/storybooks/storybook/pull/3003)
+-   Upgraded `graphql` in `addons/graphql` from "0.13.0" to "0.13.1" [#3003](https://github.com/storybooks/storybook/pull/3003)
+-   Upgraded `style-loader` in `addons/knobs` from "0.20.1" to "0.20.2" [#3003](https://github.com/storybooks/storybook/pull/3003)
+-   Upgraded `glamorous` in `lib/components` from "4.11.4" to "4.11.5" [#3003](https://github.com/storybooks/storybook/pull/3003)
+-   Upgraded `glamorous` in `addons/a11y` from "4.11.4" to "4.11.5" [#3003](https://github.com/storybooks/storybook/pull/3003)
+-   Upgraded `glamorous` in `addons/info` from "4.11.4" to "4.11.5" [#3003](https://github.com/storybooks/storybook/pull/3003)
+-   Upgraded `glamorous` in `addons/jest` from "4.11.4" to "4.11.5" [#3003](https://github.com/storybooks/storybook/pull/3003)
+-   Upgraded `style-loader` in `lib/core` from "0.20.1" to "0.20.2" [#3003](https://github.com/storybooks/storybook/pull/3003)
+-   Upgraded `style-loader` in `app/angular` from "0.20.1" to "0.20.2" [#3003](https://github.com/storybooks/storybook/pull/3003)
+-   Upgraded `nodemon` in `app/angular` from "1.14.12" to "1.15.0" [#3003](https://github.com/storybooks/storybook/pull/3003)
+-   Upgraded `typescript` in `app/angular` from "2.7.1" to "2.7.2" [#3003](https://github.com/storybooks/storybook/pull/3003)
+-   Upgraded `style-loader` in `app/polymer` from "0.20.1" to "0.20.2" [#3003](https://github.com/storybooks/storybook/pull/3003)
+-   Upgraded `nodemon` in `app/polymer` from "1.14.12" to "1.15.0" [#3003](https://github.com/storybooks/storybook/pull/3003)
+-   Upgraded `style-loader` in `app/react-native` from "0.20.1" to "0.20.2" [#3003](https://github.com/storybooks/storybook/pull/3003)
+-   Upgraded `glamorous` in `app/react` from "4.11.4" to "4.11.5" [#3003](https://github.com/storybooks/storybook/pull/3003)
+-   Upgraded `style-loader` in `app/react` from "0.20.1" to "0.20.2" [#3003](https://github.com/storybooks/storybook/pull/3003)
+-   Upgraded `nodemon` in `app/react` from "1.14.12" to "1.15.0" [#3003](https://github.com/storybooks/storybook/pull/3003)
+-   Upgraded `style-loader` in `app/vue` from "0.20.1" to "0.20.2" [#3003](https://github.com/storybooks/storybook/pull/3003)
+-   Upgraded `nodemon` in `app/vue` from "1.14.12" to "1.15.0" [#3003](https://github.com/storybooks/storybook/pull/3003)
+-   Upgraded `@angular/cli` in `examples/angular-cli` from "1.6.8" to "1.7.0" [#3003](https://github.com/storybooks/storybook/pull/3003)
+-   Upgraded `typescript` in `examples/angular-cli` from "2.7.1" to "2.7.2" [#3003](https://github.com/storybooks/storybook/pull/3003)
+-   Upgraded `glamorous` in `examples/cra-kitchen-sink` from "4.11.4" to "4.11.5" [#3003](https://github.com/storybooks/storybook/pull/3003)
+-   Update gatsby in /docs from 1.9.199 to 1.9.200 [#3001](https://github.com/storybooks/storybook/pull/3001)
+-   Update marked in /docs from 0.3.12 to 0.3.14 [#2999](https://github.com/storybooks/storybook/pull/2999)
+-   Upgraded `react-modal` in `lib/ui` from "3.1.13" to "3.2.1" [#2992](https://github.com/storybooks/storybook/pull/2992)
+-   Upgraded `react-modal` in `app/angular` from "3.1.13" to "3.2.1" [#2992](https://github.com/storybooks/storybook/pull/2992)
+-   Upgraded `react-modal` in `app/polymer` from "3.1.13" to "3.2.1" [#2992](https://github.com/storybooks/storybook/pull/2992)
+-   Update 8 dependencies from npm [#2978](https://github.com/storybooks/storybook/pull/2978)
+-   Update make-error in addons/actions from 1.3.3 to 1.3.4 [#2991](https://github.com/storybooks/storybook/pull/2991)
+-   Update 2 dependencies from npm [#2712](https://github.com/storybooks/storybook/pull/2712)
+-   Update tslint-config-prettier in / from 1.7.0 to 1.8.0 [#2990](https://github.com/storybooks/storybook/pull/2990)
+-   Update lerna in / from 2.8.0 to 2.9.0 [#2987](https://github.com/storybooks/storybook/pull/2987)
+-   Update `eslint-plugin-react` in `/` from "7.6.0" to "7.6.1" [#2864](https://github.com/storybooks/storybook/pull/2864)
+-   Upgraded `@angular/common` in `/` from "5.2.4" to "5.2.5" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Upgraded `@angular/compiler` in `/` from "5.2.4" to "5.2.5" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Upgraded `@angular/core` in `/` from "5.2.4" to "5.2.5" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Upgraded `@angular/forms` in `/` from "5.2.4" to "5.2.5" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Upgraded `@angular/platform-browser` in `/` from "5.2.4" to "5.2.5" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Upgraded `@angular/platform-browser-dynamic` in `/` from "5.2.4" to "5.2.5" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Upgraded `jest` in `/` from "22.2.1" to "22.3.0" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Upgraded `jest-cli` in `/` from "22.2.2" to "22.3.0" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Upgraded `jest-config` in `/` from "22.2.2" to "22.3.0" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Upgraded `jest-environment-jsdom` in `/` from "22.2.2" to "22.3.0" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Upgraded `jest-jasmine2` in `/` from "22.2.2" to "22.3.0" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Upgraded `jest` in `addons/storyshots` from "22.1.4" to "22.3.0" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Upgraded `jest-cli` in `addons/storyshots` from "22.1.4" to "22.3.0" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Upgraded `@angular/animations` in `examples/angular-cli` from "5.2.4" to "5.2.5" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Upgraded `@angular/common` in `examples/angular-cli` from "5.2.4" to "5.2.5" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Upgraded `@angular/compiler` in `examples/angular-cli` from "5.2.4" to "5.2.5" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Upgraded `@angular/core` in `examples/angular-cli` from "5.2.4" to "5.2.5" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Upgraded `@angular/forms` in `examples/angular-cli` from "5.2.4" to "5.2.5" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Upgraded `@angular/http` in `examples/angular-cli` from "5.2.4" to "5.2.5" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Upgraded `@angular/platform-browser` in `examples/angular-cli` from "5.2.4" to "5.2.5" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Upgraded `@angular/platform-browser-dynamic` in `examples/angular-cli` from "5.2.4" to "5.2.5" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Upgraded `@angular/router` in `examples/angular-cli` from "5.2.4" to "5.2.5" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Upgraded `@angular/compiler-cli` in `examples/angular-cli` from "5.2.4" to "5.2.5" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Upgraded `@angular/language-service` in `examples/angular-cli` from "5.2.4" to "5.2.5" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Upgraded `@types/node` in `examples/angular-cli` from "9.4.5" to "9.4.6" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Upgraded `jest` in `examples/cra-kitchen-sink` from "22.2.2" to "22.3.0" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Upgraded `jest` in `examples/official-storybook` from "22.1.4" to "22.3.0" [#2986](https://github.com/storybooks/storybook/pull/2986)
+-   Update gatsby in /docs from 1.9.198 to 1.9.199 [#2988](https://github.com/storybooks/storybook/pull/2988)
+-   Update gatsby in /docs from 1.9.197 to 1.9.198 [#2985](https://github.com/storybooks/storybook/pull/2985)
+-   Update gatsby in /docs from 1.9.193 to 1.9.197 [#2983](https://github.com/storybooks/storybook/pull/2983)
+-   Upgraded `danger` in `/` from "3.1.3" to "3.1.6" [#2977](https://github.com/storybooks/storybook/pull/2977)
+-   Upgraded `eslint-plugin-jest` in `/` from "21.12.0" to "21.12.1" [#2977](https://github.com/storybooks/storybook/pull/2977)
+-   Upgraded `inquirer` in `/` from "5.0.1" to "5.1.0" [#2977](https://github.com/storybooks/storybook/pull/2977)
+-   Upgraded `react-fuzzy` in `lib/ui` from "0.5.1" to "0.5.2" [#2977](https://github.com/storybooks/storybook/pull/2977)
+-   Upgraded `@types/node` in `examples/angular-cli` from "9.4.0" to "9.4.5" [#2977](https://github.com/storybooks/storybook/pull/2977)
+-   Upgraded `babel-preset-vue` in `examples/vue-kitchen-sink` from "2.0.0" to "2.0.1" [#2977](https://github.com/storybooks/storybook/pull/2977)
+-   Update gatsby in /docs from 1.9.188 to 1.9.193 [#2973](https://github.com/storybooks/storybook/pull/2973)
+-   Upgraded `eslint-plugin-jest` in `/` from "21.8.0" to "21.12.0" [#2975](https://github.com/storybooks/storybook/pull/2975)
+-   Upgraded `ts-jest` in `/` from "22.0.3" to "22.0.4" [#2975](https://github.com/storybooks/storybook/pull/2975)
+-   Upgraded `react-datetime` in `addons/knobs` from "2.13.0" to "2.14.0" [#2975](https://github.com/storybooks/storybook/pull/2975)
+-   Upgraded `@storybook/addon-actions` in `/docs` from "3.3.12" to "3.3.13" [#2960](https://github.com/storybooks/storybook/pull/2960)
+-   Upgraded `@storybook/addon-links` in `/docs` from "3.3.12" to "3.3.13" [#2960](https://github.com/storybooks/storybook/pull/2960)
+-   Upgraded `@storybook/addons` in `/docs` from "3.3.12" to "3.3.13" [#2960](https://github.com/storybooks/storybook/pull/2960)
+-   Upgraded `@storybook/react` in `/docs` from "3.3.12" to "3.3.13" [#2960](https://github.com/storybooks/storybook/pull/2960)
+-   Upgraded `chalk` in `/` from "2.3.0" to "2.3.1" [#2961](https://github.com/storybooks/storybook/pull/2961)
+-   Upgraded `chalk` in `lib/node-logger` from "2.3.0" to "2.3.1" [#2961](https://github.com/storybooks/storybook/pull/2961)
+-   Upgraded `react-split-pane` in `lib/ui` from "0.1.76" to "0.1.77" [#2961](https://github.com/storybooks/storybook/pull/2961)
+-   Upgraded `chalk` in `lib/core` from "2.3.0" to "2.3.1" [#2961](https://github.com/storybooks/storybook/pull/2961)
+-   Upgraded `chalk` in `lib/cli` from "2.3.0" to "2.3.1" [#2961](https://github.com/storybooks/storybook/pull/2961)
+
+</details>
+
+#### Other
+
+-   Addon Storysource improvements [#3040](https://github.com/storybooks/storybook/pull/3040)
+-   #3029 use @storybook/podda to fix npm engine version in podda [#3033](https://github.com/storybooks/storybook/pull/3033)
+-   Add moduleMetdata decorator for supplying common Angular metadata [#2959](https://github.com/storybooks/storybook/pull/2959)
+-   `Addon Storysource` Add auto scrolling to the selected story [#3025](https://github.com/storybooks/storybook/pull/3025)
+-   add GitHub flavored markdown notes [#2946](https://github.com/storybooks/storybook/pull/2946)
+-   Added beforeScreenshot config option to addons/storyshots, to allow testing of components with mounting animations [#2972](https://github.com/storybooks/storybook/pull/2972)
+-   Enable groupId option for knobs to be organized into sub panels. [#2661](https://github.com/storybooks/storybook/pull/2661)
+
+# 3.3.14
+
+2018-February-21
+
+#### Bug Fixes
+
+-   RN: Add error handler on WS to fix crashing on page reload [#3002](https://github.com/storybooks/storybook/pull/3002)
+-   Added safety net preventing storybook Jest addon from throwing. [#3023](https://github.com/storybooks/storybook/pull/3023)
+-   Added "key" prop to list items inside test failure message. [#2867](https://github.com/storybooks/storybook/pull/2867)
+-   Addon-info: Add type check to PropType on OneOf [#2653](https://github.com/storybooks/storybook/pull/2653)
+-   Use @storybook/podda to fix npm engine version in podda [#3033](https://github.com/storybooks/storybook/pull/3033)
+-   Addon-backgrounds: set background on iframe instead of adding a wrapper in preview [#2807](https://github.com/storybooks/storybook/pull/3033)
+
+# 3.4.0-alpha.8
+
+2018-February-11
+
+#### Bug Fixes
+
+-   React-Native: Fix by moving managerPath export to `server.js` [#2947](https://github.com/storybooks/storybook/pull/2947)
+-   Addon-Info: Add type check to PropType on OneOf [#2653](https://github.com/storybooks/storybook/pull/2653)
+-   Vue: Support .vue extension resolving [#2896](https://github.com/storybooks/storybook/pull/2896)
+
+#### Documentation
+
+-   Update writing addons documentation [#2951](https://github.com/storybooks/storybook/pull/2951)
+-   Update docs on LinkTo in addon-links [#2926](https://github.com/storybooks/storybook/pull/2926)
+
+#### Maintenance
+
+-   Fix "dev" script to be cross-platform [#2922](https://github.com/storybooks/storybook/pull/2922)
+
+#### Dependency Upgrades
+
+<details>
+<summary>
+98 Updates
+</summary>
+
+-   Upgraded `jest-cli` in `/` from "22.2.1" to "22.2.2" [#2957](https://github.com/storybooks/storybook/pull/2957)
+-   Upgraded `jest-config` in `/` from "22.2.1" to "22.2.2" [#2957](https://github.com/storybooks/storybook/pull/2957)
+-   Upgraded `jest-environment-jsdom` in `/` from "22.2.0" to "22.2.2" [#2957](https://github.com/storybooks/storybook/pull/2957)
+-   Upgraded `jest-jasmine2` in `/` from "22.2.1" to "22.2.2" [#2957](https://github.com/storybooks/storybook/pull/2957)
+-   Upgraded `autoprefixer` in `lib/core` from "7.2.5" to "7.2.6" [#2957](https://github.com/storybooks/storybook/pull/2957)
+-   Upgraded `webpack` in `lib/core` from "3.10.0" to "3.11.0" [#2957](https://github.com/storybooks/storybook/pull/2957)
+-   Upgraded `autoprefixer` in `app/angular` from "7.2.5" to "7.2.6" [#2957](https://github.com/storybooks/storybook/pull/2957)
+-   Upgraded `webpack` in `app/angular` from "3.10.0" to "3.11.0" [#2957](https://github.com/storybooks/storybook/pull/2957)
+-   Upgraded `autoprefixer` in `app/polymer` from "7.2.5" to "7.2.6" [#2957](https://github.com/storybooks/storybook/pull/2957)
+-   Upgraded `webpack` in `app/polymer` from "3.10.0" to "3.11.0" [#2957](https://github.com/storybooks/storybook/pull/2957)
+-   Upgraded `autoprefixer` in `app/react-native` from "7.2.5" to "7.2.6" [#2957](https://github.com/storybooks/storybook/pull/2957)
+-   Upgraded `webpack` in `app/react-native` from "3.10.0" to "3.11.0" [#2957](https://github.com/storybooks/storybook/pull/2957)
+-   Upgraded `autoprefixer` in `app/react` from "7.2.5" to "7.2.6" [#2957](https://github.com/storybooks/storybook/pull/2957)
+-   Upgraded `webpack` in `app/react` from "3.10.0" to "3.11.0" [#2957](https://github.com/storybooks/storybook/pull/2957)
+-   Upgraded `autoprefixer` in `app/vue` from "7.2.5" to "7.2.6" [#2957](https://github.com/storybooks/storybook/pull/2957)
+-   Upgraded `webpack` in `app/vue` from "3.10.0" to "3.11.0" [#2957](https://github.com/storybooks/storybook/pull/2957)
+-   Upgraded `webpack` in `examples/polymer-cli` from "3.10.0" to "3.11.0" [#2957](https://github.com/storybooks/storybook/pull/2957)
+-   Upgraded `@types/node` in `examples/angular-cli` from "6.0.99" to "6.0.100" [#2957](https://github.com/storybooks/storybook/pull/2957)
+-   Upgraded `webpack` in `examples/vue-kitchen-sink` from "3.10.0" to "3.11.0" [#2957](https://github.com/storybooks/storybook/pull/2957)
+-   Upgraded `eslint-plugin-jest` in `/` from "21.7.0" to "21.8.0" [#2952](https://github.com/storybooks/storybook/pull/2952)
+-   Upgraded `react-datetime` in `addons/knobs` from "2.12.0" to "2.13.0" [#2952](https://github.com/storybooks/storybook/pull/2952)
+-   Upgraded `react-modal` in `lib/ui` from "3.1.12" to "3.1.13" [#2952](https://github.com/storybooks/storybook/pull/2952)
+-   Upgraded `react-modal` in `app/angular` from "3.1.12" to "3.1.13" [#2952](https://github.com/storybooks/storybook/pull/2952)
+-   Upgraded `react-modal` in `app/polymer` from "3.1.12" to "3.1.13" [#2952](https://github.com/storybooks/storybook/pull/2952)
+-   Upgraded `babel-jest` in `examples/cra-kitchen-sink` from "22.2.0" to "22.2.2" [#2952](https://github.com/storybooks/storybook/pull/2952)
+-   Upgraded `jest` in `examples/cra-kitchen-sink` from "22.2.1" to "22.2.2" [#2952](https://github.com/storybooks/storybook/pull/2952)
+-   Upgraded `react-scripts` in `examples/cra-kitchen-sink` from "1.1.0" to "1.1.1" [#2952](https://github.com/storybooks/storybook/pull/2952)
+-   Update gatsby in /docs from 1.9.184 to 1.9.187 [#2950](https://github.com/storybooks/storybook/pull/2950)
+-   Upgraded `copy-webpack-plugin` in `app/polymer` from "4.3.1" to "4.4.0" [#2945](https://github.com/storybooks/storybook/pull/2945)
+-   Upgraded `copy-webpack-plugin` in `examples/polymer-cli` from "4.3.1" to "4.4.0" [#2945](https://github.com/storybooks/storybook/pull/2945)
+-   Upgraded `@angular/cli` in `examples/angular-cli` from "1.6.7" to "1.6.8" [#2945](https://github.com/storybooks/storybook/pull/2945)
+-   Upgraded `@types/node` in `examples/angular-cli` from "6.0.97" to "6.0.99" [#2945](https://github.com/storybooks/storybook/pull/2945)
+-   Upgraded `jasmine-core` in `examples/angular-cli` from "2.99.0" to "2.99.1" [#2945](https://github.com/storybooks/storybook/pull/2945)
+-   Upgraded `gatsby-remark-images` in `/docs` from "1.5.42" to "1.5.43" [#2944](https://github.com/storybooks/storybook/pull/2944)
+-   Upgraded `gatsby-transformer-remark` in `/docs` from "1.7.30" to "1.7.31" [#2944](https://github.com/storybooks/storybook/pull/2944)
+-   Upgraded `gatsby-remark-images` in `/docs` from "1.5.41" to "1.5.42" [#2939](https://github.com/storybooks/storybook/pull/2939)
+-   Upgraded `gatsby` in `/docs` from "1.9.183" to "1.9.184" [#2939](https://github.com/storybooks/storybook/pull/2939)
+-   Upgraded `@angular/common` in `/` from "5.2.3" to "5.2.4" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `@angular/compiler` in `/` from "5.2.3" to "5.2.4" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `@angular/core` in `/` from "5.2.3" to "5.2.4" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `@angular/forms` in `/` from "5.2.3" to "5.2.4" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `@angular/platform-browser` in `/` from "5.2.3" to "5.2.4" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `@angular/platform-browser-dynamic` in `/` from "5.2.3" to "5.2.4" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `commander` in `/` from "2.14.0" to "2.14.1" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `jest` in `/` from "22.1.4" to "22.2.0" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `jest-cli` in `/` from "22.1.4" to "22.2.0" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `jest-config` in `/` from "22.1.4" to "22.2.0" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `jest-environment-jsdom` in `/` from "22.1.4" to "22.2.0" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `jest-jasmine2` in `/` from "22.1.4" to "22.2.0" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `graphql` in `addons/graphql` from "0.12.3" to "0.13.0" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `commander` in `lib/core` from "2.14.0" to "2.14.1" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `commander` in `app/react-native` from "2.14.0" to "2.14.1" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `commander` in `lib/cli` from "2.14.0" to "2.14.1" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `@angular/animations` in `examples/angular-cli` from "5.2.3" to "5.2.4" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `@angular/common` in `examples/angular-cli` from "5.2.3" to "5.2.4" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `@angular/compiler` in `examples/angular-cli` from "5.2.3" to "5.2.4" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `@angular/core` in `examples/angular-cli` from "5.2.3" to "5.2.4" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `@angular/forms` in `examples/angular-cli` from "5.2.3" to "5.2.4" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `@angular/http` in `examples/angular-cli` from "5.2.3" to "5.2.4" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `@angular/platform-browser` in `examples/angular-cli` from "5.2.3" to "5.2.4" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `@angular/platform-browser-dynamic` in `examples/angular-cli` from "5.2.3" to "5.2.4" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `@angular/router` in `examples/angular-cli` from "5.2.3" to "5.2.4" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `@angular/compiler-cli` in `examples/angular-cli` from "5.2.3" to "5.2.4" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `@angular/language-service` in `examples/angular-cli` from "5.2.3" to "5.2.4" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `babel-jest` in `examples/cra-kitchen-sink` from "22.1.0" to "22.2.0" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `jest` in `examples/cra-kitchen-sink` from "22.1.4" to "22.2.0" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Upgraded `eventemitter3` in `examples/official-storybook` from "3.0.0" to "3.0.1" [#2938](https://github.com/storybooks/storybook/pull/2938)
+-   Update @types/node in examples/angular-cli from 6.0.96 to 6.0.97 [#2932](https://github.com/storybooks/storybook/pull/2932)
+-   Update gatsby in /docs from 1.9.181 to 1.9.182 [#2929](https://github.com/storybooks/storybook/pull/2929)
+-   Update jasmine-core in examples/angular-cli from 2.9.1 to 2.99.0 [#2930](https://github.com/storybooks/storybook/pull/2930)
+-   Upgraded `commander` in `/` from "2.13.0" to "2.14.0" [#2928](https://github.com/storybooks/storybook/pull/2928)
+-   Upgraded `make-error` in `addons/actions` from "1.3.2" to "1.3.3" [#2928](https://github.com/storybooks/storybook/pull/2928)
+-   Upgraded `commander` in `app/angular` from "2.13.0" to "2.14.0" [#2928](https://github.com/storybooks/storybook/pull/2928)
+-   Upgraded `commander` in `app/polymer` from "2.13.0" to "2.14.0" [#2928](https://github.com/storybooks/storybook/pull/2928)
+-   Upgraded `commander` in `app/react-native` from "2.13.0" to "2.14.0" [#2928](https://github.com/storybooks/storybook/pull/2928)
+-   Upgraded `react-native` in `app/react-native` from "0.52.2" to "0.53.0" [#2928](https://github.com/storybooks/storybook/pull/2928)
+-   Upgraded `commander` in `app/react` from "2.13.0" to "2.14.0" [#2928](https://github.com/storybooks/storybook/pull/2928)
+-   Upgraded `commander` in `app/vue` from "2.13.0" to "2.14.0" [#2928](https://github.com/storybooks/storybook/pull/2928)
+-   Upgraded `commander` in `lib/cli` from "2.13.0" to "2.14.0" [#2928](https://github.com/storybooks/storybook/pull/2928)
+-   Upgraded `jest-enzyme` in `/` from "4.1.1" to "4.2.0" [#2919](https://github.com/storybooks/storybook/pull/2919)
+-   Upgraded `react-modal` in `lib/ui` from "3.1.11" to "3.1.12" [#2919](https://github.com/storybooks/storybook/pull/2919)
+-   Upgraded `react-modal` in `app/angular` from "3.1.11" to "3.1.12" [#2919](https://github.com/storybooks/storybook/pull/2919)
+-   Upgraded `react-modal` in `app/polymer` from "3.1.11" to "3.1.12" [#2919](https://github.com/storybooks/storybook/pull/2919)
+-   Upgraded `gatsby-remark-copy-linked-files` in `/docs` from "1.5.25" to "1.5.26" [#2927](https://github.com/storybooks/storybook/pull/2927)
+-   Upgraded `gatsby-source-filesystem` in `/docs` from "1.5.16" to "1.5.18" [#2927](https://github.com/storybooks/storybook/pull/2927)
+-   Upgraded `gatsby` in `/docs` from "1.9.178" to "1.9.179" [#2927](https://github.com/storybooks/storybook/pull/2927)
+-   Update lodash in /docs from 4.17.4 to 4.17.5 [#2914](https://github.com/storybooks/storybook/pull/2914)
+-   Update lodash in / from 4.17.4 to 4.17.5 [#2915](https://github.com/storybooks/storybook/pull/2915)
+-   Upgraded `gatsby-link` in `/docs` from "1.6.35" to "1.6.36" [#2908](https://github.com/storybooks/storybook/pull/2908)
+-   Upgraded `gatsby` in `/docs` from "1.9.175" to "1.9.177" [#2908](https://github.com/storybooks/storybook/pull/2908)
+-   Upgraded `@storybook/addon-actions` in `/docs` from "3.3.11" to "3.3.12" [#2911](https://github.com/storybooks/storybook/pull/2911)
+-   Upgraded `@storybook/addon-links` in `/docs` from "3.3.11" to "3.3.12" [#2911](https://github.com/storybooks/storybook/pull/2911)
+-   Upgraded `@storybook/addons` in `/docs` from "3.3.11" to "3.3.12" [#2911](https://github.com/storybooks/storybook/pull/2911)
+-   Upgraded `@storybook/react` in `/docs` from "3.3.11" to "3.3.12" [#2911](https://github.com/storybooks/storybook/pull/2911)
+-   Upgraded `gatsby` in `/docs` from "1.9.175" to "1.9.178" [#2911](https://github.com/storybooks/storybook/pull/2911)
+-   Upgraded `eslint` in `/` from "4.16.0" to "4.17.0" [#2912](https://github.com/storybooks/storybook/pull/2912)
+-   Upgraded `ts-jest` in `/` from "22.0.1" to "22.0.3" [#2912](https://github.com/storybooks/storybook/pull/2912)
+-   Upgraded `@polymer/polymer` in `examples/polymer-cli` from "2.4.0" to "2.5.0" [#2912](https://github.com/storybooks/storybook/pull/2912)
+
+</details>
+
+# 3.3.13
+
+2018-February-11
+
+#### Bug Fixes
+
+-   Angular: add rule for .md to webpack.config.prod.js [#2924](https://github.com/storybooks/storybook/pull/2924)
+-   Check for correct props in Flow or prop-types [#2902](https://github.com/storybooks/storybook/pull/2902)
+
+# 3.4.0-alpha.7
+
+2018-February-03
+
+#### Features
+
+-   Storyshots: env.NODE_PATH support [#2873](https://github.com/storybooks/storybook/pull/2873)
+-   Knobs: Select knob key/value ordering [#1745](https://github.com/storybooks/storybook/pull/1745)
+-   Angular: Add option to pass custom styles for ng components [#2856](https://github.com/storybooks/storybook/pull/2856)
+-   Core: Add watch mode for build-storybook [#2866](https://github.com/storybooks/storybook/pull/2866)
+-   Core: Add `__dirname` support [#2791](https://github.com/storybooks/storybook/pull/2791)
+
+#### Bug Fixes
+
+-   UI: remove zero on story loading [#2857](https://github.com/storybooks/storybook/pull/2857)
+
+#### Documentation
+
+-   StoryShots: Document ref mocking [#2869](https://github.com/storybooks/storybook/pull/2869)
+
+#### Maintenance
+
+-   Typescript distribution [#2846](https://github.com/storybooks/storybook/pull/2846)
+-   Use UTC timezone in formatting too for knobs test [#2861](https://github.com/storybooks/storybook/pull/2861)
+
+#### Dependency Upgrades
+
+<details>
+<summary>
+76 Upgrades
+</summary>
+
+-   Upgraded `eslint-plugin-prettier` in `/` from "2.5.0" to "2.6.0" [#2910](https://github.com/storybooks/storybook/pull/2910)
+-   Upgraded `nodemon` in `/` from "1.14.11" to "1.14.12" [#2910](https://github.com/storybooks/storybook/pull/2910)
+-   Upgraded `postcss-loader` in `lib/core` from "2.0.10" to "2.1.0" [#2910](https://github.com/storybooks/storybook/pull/2910)
+-   Upgraded `postcss-loader` in `app/angular` from "2.0.10" to "2.1.0" [#2910](https://github.com/storybooks/storybook/pull/2910)
+-   Upgraded `nodemon` in `app/angular` from "1.14.11" to "1.14.12" [#2910](https://github.com/storybooks/storybook/pull/2910)
+-   Upgraded `postcss-loader` in `app/polymer` from "2.0.10" to "2.1.0" [#2910](https://github.com/storybooks/storybook/pull/2910)
+-   Upgraded `nodemon` in `app/polymer` from "1.14.11" to "1.14.12" [#2910](https://github.com/storybooks/storybook/pull/2910)
+-   Upgraded `postcss-loader` in `app/react-native` from "2.0.10" to "2.1.0" [#2910](https://github.com/storybooks/storybook/pull/2910)
+-   Upgraded `postcss-loader` in `app/react` from "2.0.10" to "2.1.0" [#2910](https://github.com/storybooks/storybook/pull/2910)
+-   Upgraded `nodemon` in `app/react` from "1.14.11" to "1.14.12" [#2910](https://github.com/storybooks/storybook/pull/2910)
+-   Upgraded `postcss-loader` in `app/vue` from "2.0.10" to "2.1.0" [#2910](https://github.com/storybooks/storybook/pull/2910)
+-   Upgraded `nodemon` in `app/vue` from "1.14.11" to "1.14.12" [#2910](https://github.com/storybooks/storybook/pull/2910)
+-   Upgraded `@angular/common` in `/` from "5.2.2" to "5.2.3" [#2901](https://github.com/storybooks/storybook/pull/2901)
+-   Upgraded `@angular/compiler` in `/` from "5.2.2" to "5.2.3" [#2901](https://github.com/storybooks/storybook/pull/2901)
+-   Upgraded `@angular/core` in `/` from "5.2.2" to "5.2.3" [#2901](https://github.com/storybooks/storybook/pull/2901)
+-   Upgraded `@angular/forms` in `/` from "5.2.2" to "5.2.3" [#2901](https://github.com/storybooks/storybook/pull/2901)
+-   Upgraded `@angular/platform-browser` in `/` from "5.2.2" to "5.2.3" [#2901](https://github.com/storybooks/storybook/pull/2901)
+-   Upgraded `@angular/platform-browser-dynamic` in `/` from "5.2.2" to "5.2.3" [#2901](https://github.com/storybooks/storybook/pull/2901)
+-   Upgraded `tslint-config-prettier` in `/` from "1.6.0" to "1.7.0" [#2901](https://github.com/storybooks/storybook/pull/2901)
+-   Upgraded `react-split-pane` in `lib/ui` from "0.1.74" to "0.1.75" [#2901](https://github.com/storybooks/storybook/pull/2901)
+-   Upgraded `@angular/animations` in `examples/angular-cli` from "5.2.2" to "5.2.3" [#2901](https://github.com/storybooks/storybook/pull/2901)
+-   Upgraded `@angular/common` in `examples/angular-cli` from "5.2.2" to "5.2.3" [#2901](https://github.com/storybooks/storybook/pull/2901)
+-   Upgraded `@angular/compiler` in `examples/angular-cli` from "5.2.2" to "5.2.3" [#2901](https://github.com/storybooks/storybook/pull/2901)
+-   Upgraded `@angular/core` in `examples/angular-cli` from "5.2.2" to "5.2.3" [#2901](https://github.com/storybooks/storybook/pull/2901)
+-   Upgraded `@angular/forms` in `examples/angular-cli` from "5.2.2" to "5.2.3" [#2901](https://github.com/storybooks/storybook/pull/2901)
+-   Upgraded `@angular/http` in `examples/angular-cli` from "5.2.2" to "5.2.3" [#2901](https://github.com/storybooks/storybook/pull/2901)
+-   Upgraded `@angular/platform-browser` in `examples/angular-cli` from "5.2.2" to "5.2.3" [#2901](https://github.com/storybooks/storybook/pull/2901)
+-   Upgraded `@angular/platform-browser-dynamic` in `examples/angular-cli` from "5.2.2" to "5.2.3" [#2901](https://github.com/storybooks/storybook/pull/2901)
+-   Upgraded `@angular/router` in `examples/angular-cli` from "5.2.2" to "5.2.3" [#2901](https://github.com/storybooks/storybook/pull/2901)
+-   Upgraded `@angular/cli` in `examples/angular-cli` from "1.6.6" to "1.6.7" [#2901](https://github.com/storybooks/storybook/pull/2901)
+-   Upgraded `@angular/compiler-cli` in `examples/angular-cli` from "5.2.2" to "5.2.3" [#2901](https://github.com/storybooks/storybook/pull/2901)
+-   Upgraded `@angular/language-service` in `examples/angular-cli` from "5.2.2" to "5.2.3" [#2901](https://github.com/storybooks/storybook/pull/2901)
+-   Upgraded `babel-plugin-macros` in `/` from "2.0.0" to "2.1.0" [#2891](https://github.com/storybooks/storybook/pull/2891)
+-   Upgraded `babel-plugin-macros` in `app/angular` from "2.0.0" to "2.1.0" [#2891](https://github.com/storybooks/storybook/pull/2891)
+-   Upgraded `typescript` in `app/angular` from "2.6.2" to "2.7.1" [#2891](https://github.com/storybooks/storybook/pull/2891)
+-   Upgraded `babel-plugin-macros` in `app/polymer` from "2.0.0" to "2.1.0" [#2891](https://github.com/storybooks/storybook/pull/2891)
+-   Upgraded `babel-preset-minify` in `app/polymer` from "0.2.0" to "0.3.0" [#2891](https://github.com/storybooks/storybook/pull/2891)
+-   Upgraded `babel-plugin-macros` in `app/react-native` from "2.0.0" to "2.1.0" [#2891](https://github.com/storybooks/storybook/pull/2891)
+-   Upgraded `babel-preset-minify` in `app/react-native` from "0.2.0" to "0.3.0" [#2891](https://github.com/storybooks/storybook/pull/2891)
+-   Upgraded `babel-plugin-macros` in `app/react` from "2.0.0" to "2.1.0" [#2891](https://github.com/storybooks/storybook/pull/2891)
+-   Upgraded `babel-preset-minify` in `app/react` from "0.2.0" to "0.3.0" [#2891](https://github.com/storybooks/storybook/pull/2891)
+-   Upgraded `babel-plugin-macros` in `app/vue` from "2.0.0" to "2.1.0" [#2891](https://github.com/storybooks/storybook/pull/2891)
+-   Upgraded `babel-preset-minify` in `app/vue` from "0.2.0" to "0.3.0" [#2891](https://github.com/storybooks/storybook/pull/2891)
+-   Upgraded `vue-style-loader` in `app/vue` from "3.1.1" to "3.1.2" [#2891](https://github.com/storybooks/storybook/pull/2891)
+-   Upgraded `vue-loader` in `app/vue` from "13.7.0" to "13.7.1" [#2891](https://github.com/storybooks/storybook/pull/2891)
+-   Upgraded `typescript` in `examples/angular-cli` from "2.6.2" to "2.7.1" [#2891](https://github.com/storybooks/storybook/pull/2891)
+-   Upgraded `vue-loader` in `examples/vue-kitchen-sink` from "13.7.0" to "13.7.1" [#2891](https://github.com/storybooks/storybook/pull/2891)
+-   Upgraded `vue-style-loader` in `examples/vue-kitchen-sink` from "3.1.1" to "3.1.2" [#2891](https://github.com/storybooks/storybook/pull/2891)
+-   Upgraded `gatsby-source-filesystem` in `/docs` from "1.5.15" to "1.5.16" [#2875](https://github.com/storybooks/storybook/pull/2875)
+-   Upgraded `gatsby` in `/docs` from "1.9.172" to "1.9.174" [#2875](https://github.com/storybooks/storybook/pull/2875)
+-   Upgraded `@types/lodash` in `/` from "4.14.97" to "4.14.98" [#2876](https://github.com/storybooks/storybook/pull/2876)
+-   Upgraded `jest-enzyme` in `/` from "4.0.2" to "4.1.0" [#2876](https://github.com/storybooks/storybook/pull/2876)
+-   Upgraded `uglifyjs-webpack-plugin` in `app/angular` from "1.1.6" to "1.1.7" [#2876](https://github.com/storybooks/storybook/pull/2876)
+-   Upgraded `uglifyjs-webpack-plugin` in `app/react-native` from "1.1.6" to "1.1.7" [#2876](https://github.com/storybooks/storybook/pull/2876)
+-   Upgraded `uglifyjs-webpack-plugin` in `app/react` from "1.1.6" to "1.1.7" [#2876](https://github.com/storybooks/storybook/pull/2876)
+-   Upgraded `uglifyjs-webpack-plugin` in `app/vue` from "1.1.6" to "1.1.7" [#2876](https://github.com/storybooks/storybook/pull/2876)
+-   Upgraded `gatsby-link` in `/docs` from "1.6.34" to "1.6.35" [#2858](https://github.com/storybooks/storybook/pull/2858)
+-   Upgraded `gatsby-transformer-remark` in `/docs` from "1.7.29" to "1.7.30" [#2858](https://github.com/storybooks/storybook/pull/2858)
+-   Upgraded `gatsby` in `/docs` from "1.9.169" to "1.9.171" [#2858](https://github.com/storybooks/storybook/pull/2858)
+-   Make dependencies in polymer & angular up to date with other apps [#2852](https://github.com/storybooks/storybook/pull/2852)
+-   Upgraded `@types/lodash` in `/` from "4.14.96" to "4.14.97" [#2850](https://github.com/storybooks/storybook/pull/2850)
+-   Upgraded `react-datetime` in `addons/knobs` from "2.11.1" to "2.12.0" [#2850](https://github.com/storybooks/storybook/pull/2850)
+-   Upgraded `style-loader` in `addons/knobs` from "0.19.1" to "0.20.1" [#2850](https://github.com/storybooks/storybook/pull/2850)
+-   Upgraded `style-loader` in `lib/core` from "0.19.1" to "0.20.1" [#2850](https://github.com/storybooks/storybook/pull/2850)
+-   Upgraded `style-loader` in `app/angular` from "0.18.2" to "0.20.1" [#2850](https://github.com/storybooks/storybook/pull/2850)
+-   Upgraded `style-loader` in `app/polymer` from "0.18.2" to "0.20.1" [#2850](https://github.com/storybooks/storybook/pull/2850)
+-   Upgraded `style-loader` in `app/react-native` from "0.19.1" to "0.20.1" [#2850](https://github.com/storybooks/storybook/pull/2850)
+-   Upgraded `style-loader` in `app/react` from "0.19.1" to "0.20.1" [#2850](https://github.com/storybooks/storybook/pull/2850)
+-   Upgraded `style-loader` in `app/vue` from "0.19.1" to "0.20.1" [#2850](https://github.com/storybooks/storybook/pull/2850)
+-   Upgraded `@polymer/polymer` in `examples/polymer-cli` from "2.3.1" to "2.4.0" [#2850](https://github.com/storybooks/storybook/pull/2850)
+-   Upgraded `@types/jasmine` in `examples/angular-cli` from "2.8.5" to "2.8.6" [#2850](https://github.com/storybooks/storybook/pull/2850)
+-   Upgraded `@storybook/addon-actions` in `/docs` from "3.3.10" to "3.3.11" [#2849](https://github.com/storybooks/storybook/pull/2849)
+-   Upgraded `@storybook/addon-links` in `/docs` from "3.3.10" to "3.3.11" [#2849](https://github.com/storybooks/storybook/pull/2849)
+-   Upgraded `@storybook/addons` in `/docs` from "3.3.10" to "3.3.11" [#2849](https://github.com/storybooks/storybook/pull/2849)
+-   Upgraded `@storybook/react` in `/docs` from "3.3.10" to "3.3.11" [#2849](https://github.com/storybooks/storybook/pull/2849)
+-   Update url-loader from 0.5.8 to 0.6.2 in app/angular [#2847](https://github.com/storybooks/storybook/pull/2847)
+
+</details>
+
+# 3.3.12
+
+2018-February-02
+
+#### Bug Fixes
+
+-   Fix browser navigation again [#2870](https://github.com/storybooks/storybook/pull/2870)
+
+#### Dependency Upgrades
+
+-   Update url-loader from 0.5.8 to 0.6.2 in app/angular [#2847](https://github.com/storybooks/storybook/pull/2847)
+
+# 3.4.0-alpha.6
+
+2018-January-27
+
+#### Features
+
+-   Pass default webpack config as third argument in Full Control Mode [#2796](https://github.com/storybooks/storybook/pull/2796)
+
+#### Bug Fixes
+
+-   Angular: remove entryComponents prop from metadata [#2790](https://github.com/storybooks/storybook/pull/2790)
+-   Use process.exitCode instead of process.exit() [#2717](https://github.com/storybooks/storybook/pull/2717)
+
+#### Documentation
+
+-   Extending webpack section is no longer needed for the common usage [#2826](https://github.com/storybooks/storybook/pull/2826)
+-   Updating Vue Jest Config [#2821](https://github.com/storybooks/storybook/pull/2821)
+-   Angular inheritance example [#2787](https://github.com/storybooks/storybook/pull/2787)
+
+#### Maintenance
+
+-   ADD autolabeler.yml for <https://github.com/probot/autolabeler> [#2809](https://github.com/storybooks/storybook/pull/2809)
+-   Fix css warning in angular-cli example [#2789](https://github.com/storybooks/storybook/pull/2789)
+-   Move more things to core [#2788](https://github.com/storybooks/storybook/pull/2788)
+
+#### Dependency Upgrades
+
+<details>
+<summary>
+76 Upgrades
+</summary>
+
+-   Upgraded `eslint-plugin-react` in `/` from "7.5.1" to "7.6.0" [#2844](https://github.com/storybooks/storybook/pull/2844)
+-   Upgraded `lint-staged` in `/` from "6.0.1" to "6.1.0" [#2844](https://github.com/storybooks/storybook/pull/2844)
+-   Upgraded `react-native` in `app/react-native` from "0.52.1" to "0.52.2" [#2844](https://github.com/storybooks/storybook/pull/2844)
+-   Upgraded `@angular/cli` in `examples/angular-cli` from "1.6.5" to "1.6.6" [#2844](https://github.com/storybooks/storybook/pull/2844)
+-   Upgraded `protractor` in `examples/angular-cli` from "5.2.2" to "5.3.0" [#2844](https://github.com/storybooks/storybook/pull/2844)
+-   Upgraded `gatsby-plugin-sharp` in `/docs` from "1.6.26" to "1.6.27" [#2843](https://github.com/storybooks/storybook/pull/2843)
+-   Upgraded `gatsby-remark-images` in `/docs` from "1.5.40" to "1.5.41" [#2843](https://github.com/storybooks/storybook/pull/2843)
+-   Upgraded `gatsby-source-filesystem` in `/docs` from "1.5.14" to "1.5.15" [#2843](https://github.com/storybooks/storybook/pull/2843)
+-   Upgraded `gatsby` in `/docs` from "1.9.166" to "1.9.169" [#2843](https://github.com/storybooks/storybook/pull/2843)
+-   Upgraded `@types/lodash` in `/` from "4.14.95" to "4.14.96" [#2840](https://github.com/storybooks/storybook/pull/2840)
+-   Upgraded `airbnb-js-shims` in `app/angular` from "1.4.0" to "1.4.1" [#2840](https://github.com/storybooks/storybook/pull/2840)
+-   Upgraded `airbnb-js-shims` in `app/polymer` from "1.4.0" to "1.4.1" [#2840](https://github.com/storybooks/storybook/pull/2840)
+-   Upgraded `airbnb-js-shims` in `app/react` from "1.4.0" to "1.4.1" [#2840](https://github.com/storybooks/storybook/pull/2840)
+-   Upgraded `airbnb-js-shims` in `app/vue` from "1.4.0" to "1.4.1" [#2840](https://github.com/storybooks/storybook/pull/2840)
+-   Upgraded `@angular/animations` in `examples/angular-cli` from "5.2.1" to "5.2.2" [#2840](https://github.com/storybooks/storybook/pull/2840)
+-   Upgraded `@angular/common` in `examples/angular-cli` from "5.2.1" to "5.2.2" [#2840](https://github.com/storybooks/storybook/pull/2840)
+-   Upgraded `@angular/compiler` in `examples/angular-cli` from "5.2.1" to "5.2.2" [#2840](https://github.com/storybooks/storybook/pull/2840)
+-   Upgraded `@angular/core` in `examples/angular-cli` from "5.2.1" to "5.2.2" [#2840](https://github.com/storybooks/storybook/pull/2840)
+-   Upgraded `@angular/forms` in `examples/angular-cli` from "5.2.1" to "5.2.2" [#2840](https://github.com/storybooks/storybook/pull/2840)
+-   Upgraded `@angular/http` in `examples/angular-cli` from "5.2.1" to "5.2.2" [#2840](https://github.com/storybooks/storybook/pull/2840)
+-   Upgraded `@angular/platform-browser` in `examples/angular-cli` from "5.2.1" to "5.2.2" [#2840](https://github.com/storybooks/storybook/pull/2840)
+-   Upgraded `@angular/platform-browser-dynamic` in `examples/angular-cli` from "5.2.1" to "5.2.2" [#2840](https://github.com/storybooks/storybook/pull/2840)
+-   Upgraded `@angular/router` in `examples/angular-cli` from "5.2.1" to "5.2.2" [#2840](https://github.com/storybooks/storybook/pull/2840)
+-   Upgraded `@angular/compiler-cli` in `examples/angular-cli` from "5.2.1" to "5.2.2" [#2840](https://github.com/storybooks/storybook/pull/2840)
+-   Upgraded `@angular/language-service` in `examples/angular-cli` from "5.2.1" to "5.2.2" [#2840](https://github.com/storybooks/storybook/pull/2840)
+-   Upgraded `gatsby-plugin-sharp` in `/docs` from "1.6.25" to "1.6.26" [#2828](https://github.com/storybooks/storybook/pull/2828)
+-   Upgraded `gatsby-remark-images` in `/docs` from "1.5.39" to "1.5.40" [#2828](https://github.com/storybooks/storybook/pull/2828)
+-   Upgraded `gatsby` in `/docs` from "1.9.165" to "1.9.166" [#2828](https://github.com/storybooks/storybook/pull/2828)
+-   Upgraded `@types/lodash` in `/` from "4.14.93" to "4.14.95" [#2829](https://github.com/storybooks/storybook/pull/2829)
+-   Upgraded `vue-style-loader` in `app/vue` from "3.0.3" to "3.1.1" [#2829](https://github.com/storybooks/storybook/pull/2829)
+-   Upgraded `karma-coverage-istanbul-reporter` in `examples/angular-cli` from "1.3.3" to "1.4.1" [#2829](https://github.com/storybooks/storybook/pull/2829)
+-   Upgraded `vue-style-loader` in `examples/vue-kitchen-sink` from "3.0.3" to "3.1.1" [#2829](https://github.com/storybooks/storybook/pull/2829)
+-   Upgraded `@webcomponents/webcomponentsjs` in `app/polymer` from "1.0.22" to "1.1.0" [#2818](https://github.com/storybooks/storybook/pull/2818)
+-   Upgraded `enzyme-to-json` in `addons/storyshots` from "3.3.0" to "3.3.1" [#2818](https://github.com/storybooks/storybook/pull/2818)
+-   Upgraded `@webcomponents/webcomponentsjs` in `examples/polymer-cli` from "1.0.22" to "1.1.0" [#2818](https://github.com/storybooks/storybook/pull/2818)
+-   Upgraded `@types/jasmine` in `examples/angular-cli` from "2.8.4" to "2.8.5" [#2818](https://github.com/storybooks/storybook/pull/2818)
+-   Upgraded `enzyme-to-json` in `examples/cra-kitchen-sink` from "3.3.0" to "3.3.1" [#2818](https://github.com/storybooks/storybook/pull/2818)
+-   Upgraded `enzyme-to-json` in `examples/official-storybook` from "3.3.0" to "3.3.1" [#2818](https://github.com/storybooks/storybook/pull/2818)
+-   Upgraded `react-chromatic` in `examples/official-storybook` from "0.7.8" to "0.7.9" [#2818](https://github.com/storybooks/storybook/pull/2818)
+-   Upgraded `gatsby-transformer-remark` in `/docs` from "1.7.28" to "1.7.29" [#2816](https://github.com/storybooks/storybook/pull/2816)
+-   Upgraded `gatsby` in `/docs` from "1.9.164" to "1.9.165" [#2816](https://github.com/storybooks/storybook/pull/2816)
+-   Upgraded `eslint` in `/` from "4.15.0" to "4.16.0" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `github-release-from-changelog` in `/` from "1.3.0" to "1.3.1" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `jest` in `/` from "22.1.3" to "22.1.4" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `jest-cli` in `/` from "22.1.3" to "22.1.4" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `jest-config` in `/` from "22.1.3" to "22.1.4" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `jest-environment-jsdom` in `/` from "22.1.2" to "22.1.4" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `jest-jasmine2` in `/` from "22.1.3" to "22.1.4" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `lerna` in `/` from "2.6.0" to "2.8.0" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `lint-staged` in `/` from "6.0.0" to "6.0.1" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `shelljs` in `/` from "0.8.0" to "0.8.1" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `shelljs` in `addons/links` from "0.8.0" to "0.8.1" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `glamorous` in `lib/components` from "4.11.3" to "4.11.4" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `glamorous` in `addons/a11y` from "4.11.3" to "4.11.4" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `glamorous` in `addons/info` from "4.11.3" to "4.11.4" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `glamorous` in `addons/jest` from "4.11.3" to "4.11.4" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `shelljs` in `app/angular` from "0.8.0" to "0.8.1" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `shelljs` in `app/polymer` from "0.7.8" to "0.8.1" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `shelljs` in `app/react-native` from "0.8.0" to "0.8.1" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `react-native` in `app/react-native` from "0.52.0" to "0.52.1" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `glamorous` in `app/react` from "4.11.3" to "4.11.4" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `shelljs` in `app/react` from "0.8.0" to "0.8.1" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `shelljs` in `app/vue` from "0.8.0" to "0.8.1" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `webpack-dev-server` in `examples/polymer-cli` from "2.11.0" to "2.11.1" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `shelljs` in `lib/cli` from "0.8.0" to "0.8.1" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `jasmine-core` in `examples/angular-cli` from "2.9.0" to "2.9.1" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `glamorous` in `examples/cra-kitchen-sink` from "4.11.3" to "4.11.4" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `jest` in `examples/cra-kitchen-sink` from "22.1.3" to "22.1.4" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `webpack-dev-server` in `examples/vue-kitchen-sink` from "2.11.0" to "2.11.1" [#2806](https://github.com/storybooks/storybook/pull/2806)
+-   Upgraded `@storybook/addon-actions` in `/docs` from "3.3.9" to "3.3.10" [#2799](https://github.com/storybooks/storybook/pull/2799)
+-   Upgraded `@storybook/addon-links` in `/docs` from "3.3.9" to "3.3.10" [#2799](https://github.com/storybooks/storybook/pull/2799)
+-   Upgraded `@storybook/addons` in `/docs` from "3.3.9" to "3.3.10" [#2799](https://github.com/storybooks/storybook/pull/2799)
+-   Upgraded `@storybook/react` in `/docs` from "3.3.9" to "3.3.10" [#2799](https://github.com/storybooks/storybook/pull/2799)
+-   Upgraded `gatsby-remark-images` in `/docs` from "1.5.37" to "1.5.39" [#2799](https://github.com/storybooks/storybook/pull/2799)
+-   Upgraded `gatsby-source-filesystem` in `/docs` from "1.5.11" to "1.5.14" [#2799](https://github.com/storybooks/storybook/pull/2799)
+-   Upgraded `gatsby` in `/docs` from "1.9.158" to "1.9.164" [#2799](https://github.com/storybooks/storybook/pull/2799)
+
+</details>
+
+# 3.3.11
+
+2018-January-26
+
+#### Bug Fixes
+
+-   Angular: update helpers.ts [#2777](https://github.com/storybooks/storybook/pull/2777)
+
+# 3.4.0-alpha.5
+
+2018-January-19
+
+#### Features
+
+-   Angular and Vue storyshots [#2564](https://github.com/storybooks/storybook/pull/2564)
+-   Addon-info: Added "Copy button" for code example [#2713](https://github.com/storybooks/storybook/pull/2713)
+-   Angular: Serve styles and assets using .angular-cli webpack configuration [#2735](https://github.com/storybooks/storybook/pull/2735)
+-   API: Added an event that is emitted when a channel is created. [#2711](https://github.com/storybooks/storybook/pull/2711)
+-   Addon-a11y: Handle components with delayed rendering [#2651](https://github.com/storybooks/storybook/pull/2651)
+
+#### Bug Fixes
+
+-   Angular: knobs with template [#2766](https://github.com/storybooks/storybook/pull/2766)
+
+#### Documentation
+
+<details>
+<summary>
+4 PRs
+</summary>
+
+-   Updating css-style testing docs to mention StoryShots image snapshots feature [#2767](https://github.com/storybooks/storybook/pull/2767)
+-   Fix introduction page header [#2757](https://github.com/storybooks/storybook/pull/2757)
+-   fix Storyshots README, add missing export for image snapshots [#2759](https://github.com/storybooks/storybook/pull/2759)
+-   Update MIGRATION.md [#2709](https://github.com/storybooks/storybook/pull/2709)
+
+</details>
+
+#### Dependency Upgrades
+
+<details>
+<summary>
+91 upgrades
+</summary>
+
+-   Upgraded `@types/lodash` in `/` from "4.14.92" to "4.14.93" [#2783](https://github.com/storybooks/storybook/pull/2783)
+-   Upgraded `jest` in `/` from "22.1.2" to "22.1.3" [#2783](https://github.com/storybooks/storybook/pull/2783)
+-   Upgraded `jest-cli` in `/` from "22.1.2" to "22.1.3" [#2783](https://github.com/storybooks/storybook/pull/2783)
+-   Upgraded `jest-config` in `/` from "22.1.2" to "22.1.3" [#2783](https://github.com/storybooks/storybook/pull/2783)
+-   Upgraded `jest-jasmine2` in `/` from "22.1.2" to "22.1.3" [#2783](https://github.com/storybooks/storybook/pull/2783)
+-   Upgraded `postcss-flexbugs-fixes` in `app/angular` from "3.2.0" to "3.3.0" [#2783](https://github.com/storybooks/storybook/pull/2783)
+-   Upgraded `postcss-flexbugs-fixes` in `app/polymer` from "3.2.0" to "3.3.0" [#2783](https://github.com/storybooks/storybook/pull/2783)
+-   Upgraded `postcss-flexbugs-fixes` in `app/react` from "3.2.0" to "3.3.0" [#2783](https://github.com/storybooks/storybook/pull/2783)
+-   Upgraded `postcss-flexbugs-fixes` in `app/vue` from "3.2.0" to "3.3.0" [#2783](https://github.com/storybooks/storybook/pull/2783)
+-   Upgraded `@angular/cli` in `examples/angular-cli` from "1.6.4" to "1.6.5" [#2783](https://github.com/storybooks/storybook/pull/2783)
+-   Upgraded `jest` in `examples/cra-kitchen-sink` from "22.1.2" to "22.1.3" [#2783](https://github.com/storybooks/storybook/pull/2783)
+-   Update gatsby in /docs from 1.9.157 to 1.9.158 [#2779](https://github.com/storybooks/storybook/pull/2779)
+-   Upgraded `jasmine-core` in `examples/angular-cli` from "2.8.0" to "2.9.0" [#2780](https://github.com/storybooks/storybook/pull/2780)
+-   Upgraded `react-chromatic` in `examples/official-storybook` from "0.7.7" to "0.7.8" [#2780](https://github.com/storybooks/storybook/pull/2780)
+-   Upgraded `eslint-plugin-jest` in `/` from "21.6.2" to "21.7.0" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `jest` in `/` from "22.1.1" to "22.1.2" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `jest-cli` in `/` from "22.1.1" to "22.1.2" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `jest-config` in `/` from "22.1.1" to "22.1.2" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `jest-environment-jsdom` in `/` from "22.1.0" to "22.1.2" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `jest-jasmine2` in `/` from "22.1.1" to "22.1.2" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `uuid` in `addons/actions` from "3.2.0" to "3.2.1" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `uuid` in `addons/events` from "3.2.0" to "3.2.1" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `glamorous` in `lib/components` from "4.11.2" to "4.11.3" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `glamorous` in `addons/a11y` from "4.11.2" to "4.11.3" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `glamorous` in `addons/info` from "4.11.2" to "4.11.3" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `glamorous` in `addons/jest` from "4.11.2" to "4.11.3" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `css-loader` in `app/angular` from "0.28.8" to "0.28.9" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `html-loader` in `app/angular` from "0.5.4" to "0.5.5" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `uuid` in `app/angular` from "3.2.0" to "3.2.1" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `css-loader` in `app/polymer` from "0.28.8" to "0.28.9" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `uuid` in `app/polymer` from "3.2.0" to "3.2.1" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `css-loader` in `app/react-native` from "0.28.8" to "0.28.9" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `uuid` in `app/react-native` from "3.2.0" to "3.2.1" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `css-loader` in `app/react` from "0.28.8" to "0.28.9" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `glamorous` in `app/react` from "4.11.2" to "4.11.3" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `html-loader` in `app/react` from "0.5.4" to "0.5.5" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `uuid` in `app/react` from "3.2.0" to "3.2.1" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `css-loader` in `app/vue` from "0.28.8" to "0.28.9" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `html-loader` in `app/vue` from "0.5.4" to "0.5.5" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `uuid` in `app/vue` from "3.2.0" to "3.2.1" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `semver` in `lib/cli` from "5.4.1" to "5.5.0" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `@angular/animations` in `examples/angular-cli` from "5.2.0" to "5.2.1" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `@angular/common` in `examples/angular-cli` from "5.2.0" to "5.2.1" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `@angular/compiler` in `examples/angular-cli` from "5.2.0" to "5.2.1" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `@angular/core` in `examples/angular-cli` from "5.2.0" to "5.2.1" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `@angular/forms` in `examples/angular-cli` from "5.2.0" to "5.2.1" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `@angular/http` in `examples/angular-cli` from "5.2.0" to "5.2.1" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `@angular/platform-browser` in `examples/angular-cli` from "5.2.0" to "5.2.1" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `@angular/platform-browser-dynamic` in `examples/angular-cli` from "5.2.0" to "5.2.1" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `@angular/router` in `examples/angular-cli` from "5.2.0" to "5.2.1" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `@angular/compiler-cli` in `examples/angular-cli` from "5.2.0" to "5.2.1" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `@angular/language-service` in `examples/angular-cli` from "5.2.0" to "5.2.1" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `glamorous` in `examples/cra-kitchen-sink` from "4.11.2" to "4.11.3" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `jest` in `examples/cra-kitchen-sink` from "22.1.1" to "22.1.2" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `css-loader` in `examples/vue-kitchen-sink` from "0.28.8" to "0.28.9" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `uuid` in `examples/official-storybook` from "3.2.0" to "3.2.1" [#2770](https://github.com/storybooks/storybook/pull/2770)
+-   Upgraded `gatsby-plugin-sharp` in `/docs` from "1.6.24" to "1.6.25" [#2768](https://github.com/storybooks/storybook/pull/2768)
+-   Upgraded `gatsby-remark-images` in `/docs` from "1.5.36" to "1.5.37" [#2768](https://github.com/storybooks/storybook/pull/2768)
+-   Upgraded `eslint-plugin-prettier` in `/` from "2.4.0" to "2.5.0" [#2764](https://github.com/storybooks/storybook/pull/2764)
+-   Upgraded `lerna` in `/` from "2.7.0" to "2.7.1" [#2764](https://github.com/storybooks/storybook/pull/2764)
+-   Upgraded `uuid` in `addons/actions` from "3.1.0" to "3.2.0" [#2764](https://github.com/storybooks/storybook/pull/2764)
+-   Upgraded `uuid` in `addons/events` from "3.1.0" to "3.2.0" [#2764](https://github.com/storybooks/storybook/pull/2764)
+-   Upgraded `react-modal` in `lib/ui` from "3.1.10" to "3.1.11" [#2764](https://github.com/storybooks/storybook/pull/2764)
+-   Upgraded `uuid` in `app/angular` from "3.1.0" to "3.2.0" [#2764](https://github.com/storybooks/storybook/pull/2764)
+-   Upgraded `uuid` in `app/polymer` from "3.1.0" to "3.2.0" [#2764](https://github.com/storybooks/storybook/pull/2764)
+-   Upgraded `uuid` in `app/react-native` from "3.1.0" to "3.2.0" [#2764](https://github.com/storybooks/storybook/pull/2764)
+-   Upgraded `uuid` in `app/react` from "3.1.0" to "3.2.0" [#2764](https://github.com/storybooks/storybook/pull/2764)
+-   Upgraded `uuid` in `app/vue` from "3.1.0" to "3.2.0" [#2764](https://github.com/storybooks/storybook/pull/2764)
+-   Upgraded `uuid` in `examples/official-storybook` from "3.1.0" to "3.2.0" [#2764](https://github.com/storybooks/storybook/pull/2764)
+-   Update gatsby in /docs from 1.9.155 to 1.9.157 [#2763](https://github.com/storybooks/storybook/pull/2763)
+-   Upgraded `jest` in `/` from "22.0.6" to "22.1.1" [#2754](https://github.com/storybooks/storybook/pull/2754)
+-   Upgraded `jest-cli` in `/` from "22.0.6" to "22.1.1" [#2754](https://github.com/storybooks/storybook/pull/2754)
+-   Upgraded `jest-config` in `/` from "22.0.6" to "22.1.1" [#2754](https://github.com/storybooks/storybook/pull/2754)
+-   Upgraded `jest-diff` in `/` from "22.0.6" to "22.1.0" [#2754](https://github.com/storybooks/storybook/pull/2754)
+-   Upgraded `jest-environment-jsdom` in `/` from "22.0.6" to "22.1.0" [#2754](https://github.com/storybooks/storybook/pull/2754)
+-   Upgraded `jest-jasmine2` in `/` from "22.0.6" to "22.1.1" [#2754](https://github.com/storybooks/storybook/pull/2754)
+-   Upgraded `babel-plugin-react-docgen` in `app/angular` from "1.8.1" to "1.8.2" [#2754](https://github.com/storybooks/storybook/pull/2754)
+-   Upgraded `babel-preset-react-app` in `app/angular` from "3.1.0" to "3.1.1" [#2754](https://github.com/storybooks/storybook/pull/2754)
+-   Upgraded `babel-plugin-react-docgen` in `app/polymer` from "1.8.1" to "1.8.2" [#2754](https://github.com/storybooks/storybook/pull/2754)
+-   Upgraded `babel-preset-react-app` in `app/polymer` from "3.1.0" to "3.1.1" [#2754](https://github.com/storybooks/storybook/pull/2754)
+-   Upgraded `babel-plugin-react-docgen` in `app/react` from "1.8.1" to "1.8.2" [#2754](https://github.com/storybooks/storybook/pull/2754)
+-   Upgraded `babel-preset-react-app` in `app/react` from "3.1.0" to "3.1.1" [#2754](https://github.com/storybooks/storybook/pull/2754)
+-   Upgraded `babel-plugin-react-docgen` in `app/vue` from "1.8.1" to "1.8.2" [#2754](https://github.com/storybooks/storybook/pull/2754)
+-   Upgraded `babel-preset-react-app` in `app/vue` from "3.1.0" to "3.1.1" [#2754](https://github.com/storybooks/storybook/pull/2754)
+-   Upgraded `babel-jest` in `examples/cra-kitchen-sink` from "22.0.6" to "22.1.0" [#2754](https://github.com/storybooks/storybook/pull/2754)
+-   Upgraded `jest` in `examples/cra-kitchen-sink` from "22.0.6" to "22.1.1" [#2754](https://github.com/storybooks/storybook/pull/2754)
+-   Upgraded `react-scripts` in `examples/cra-kitchen-sink` from "1.0.17" to "1.1.0" [#2754](https://github.com/storybooks/storybook/pull/2754)
+-   Upgraded `eslint-plugin-jest` in `/` from "21.6.1" to "21.6.2" [#2746](https://github.com/storybooks/storybook/pull/2746)
+-   Upgraded `webpack-dev-server` in `examples/polymer-cli` from "2.10.1" to "2.11.0" [#2746](https://github.com/storybooks/storybook/pull/2746)
+-   Upgraded `webpack-dev-server` in `examples/vue-kitchen-sink` from "2.10.1" to "2.11.0" [#2746](https://github.com/storybooks/storybook/pull/2746)
+-   Upgraded `jest-image-snapshot` in `/` from "2.2.1" to "2.3.0" [#2740](https://github.com/storybooks/storybook/pull/2740)
+-   Upgraded `polymer-webpack-loader` in `app/polymer` from "2.0.0" to "2.0.1"
+
+</details>
+
+# 3.3.10
+
+2018-January-19
+
+#### Bug Fixes
+
+-   Addon-backgrounds: remove redundant scrollbars [#2744](https://github.com/storybooks/storybook/pull/2744)
+-   Addon-info: add keys for separator spans in OneOfType [#2743](https://github.com/storybooks/storybook/pull/2743)
+
+# 3.4.0-alpha.4
+
+2018-January-13
+
+Republish `3.4.0-alpha.3` due to potential publishing errors
+
+# 3.4.0-alpha.3
+
+2018-January-13
+
+#### Features
+
+-   Polymer 2 support [#2225](https://github.com/storybooks/storybook/pull/2225)
+-   Add image snapshots to addon-storyshots [#2413](https://github.com/storybooks/storybook/pull/2413)
+-   Angular template support for Storybook [#2690](https://github.com/storybooks/storybook/pull/2690)
+
+#### Bug Fixes
+
+-   Remove polymer-cli dependency [#2741](https://github.com/storybooks/storybook/pull/2741)
+-   Add scss for components in angular apps by default. [#2703](https://github.com/storybooks/storybook/pull/2703)
+
+#### Maintenance
+
+-   Change ng stories dir [#2672](https://github.com/storybooks/storybook/pull/2672)
+
+#### Dependency Upgrades
+
+<details>
+<summary>
+54 Upgrades
+</summary>
+
+-   Upgraded `jest-image-snapshot` in `/` from "2.2.1" to "2.3.0" [#2740](https://github.com/storybooks/storybook/pull/2740)
+-   Upgraded `polymer-webpack-loader` in `app/polymer` from "2.0.0" to "2.0.1" [#2740](https://github.com/storybooks/storybook/pull/2740)
+-   Upgraded `jest-image-snapshot` in `addons/storyshots` from "2.2.1" to "2.3.0" [#2740](https://github.com/storybooks/storybook/pull/2740)
+-   Upgraded `shelljs` in `/` from "0.7.8" to "0.8.0" [#2734](https://github.com/storybooks/storybook/pull/2734)
+-   Upgraded `shelljs` in `addons/links` from "0.7.8" to "0.8.0" [#2734](https://github.com/storybooks/storybook/pull/2734)
+-   Upgraded `autoprefixer` in `app/react` from "7.2.4" to "7.2.5" [#2734](https://github.com/storybooks/storybook/pull/2734)
+-   Upgraded `shelljs` in `app/react` from "0.7.8" to "0.8.0" [#2734](https://github.com/storybooks/storybook/pull/2734)
+-   Upgraded `autoprefixer` in `app/angular` from "7.2.4" to "7.2.5" [#2734](https://github.com/storybooks/storybook/pull/2734)
+-   Upgraded `shelljs` in `app/angular` from "0.7.8" to "0.8.0" [#2734](https://github.com/storybooks/storybook/pull/2734)
+-   Upgraded `autoprefixer` in `app/react-native` from "7.2.4" to "7.2.5" [#2734](https://github.com/storybooks/storybook/pull/2734)
+-   Upgraded `shelljs` in `app/react-native` from "0.7.8" to "0.8.0" [#2734](https://github.com/storybooks/storybook/pull/2734)
+-   Upgraded `autoprefixer` in `app/vue` from "7.2.4" to "7.2.5" [#2734](https://github.com/storybooks/storybook/pull/2734)
+-   Upgraded `shelljs` in `app/vue` from "0.7.8" to "0.8.0" [#2734](https://github.com/storybooks/storybook/pull/2734)
+-   Upgraded `shelljs` in `lib/cli` from "0.7.8" to "0.8.0" [#2734](https://github.com/storybooks/storybook/pull/2734)
+-   Update gatsby in /docs from 1.9.153 to 1.9.154 [#2733](https://github.com/storybooks/storybook/pull/2733)
+-   Update @angular/cli in examples/angular-cli from 1.6.3 to 1.6.4 [#2726](https://github.com/storybooks/storybook/pull/2726)
+-   Upgraded `commander` in `/` from "2.12.2" to "2.13.0" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `jest` in `/` from "22.0.5" to "22.0.6" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `jest-cli` in `/` from "22.0.5" to "22.0.6" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `jest-config` in `/` from "22.0.5" to "22.0.6" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `jest-diff` in `/` from "22.0.5" to "22.0.6" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `jest-environment-jsdom` in `/` from "22.0.5" to "22.0.6" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `jest-jasmine2` in `/` from "22.0.5" to "22.0.6" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `nodemon` in `/` from "1.14.10" to "1.14.11" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `prettier` in `/` from "1.9.2" to "1.10.2" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `tslint` in `/` from "5.8.0" to "5.9.1" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `commander` in `app/react` from "2.12.2" to "2.13.0" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `common-tags` in `app/react` from "1.7.0" to "1.7.2" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `nodemon` in `app/react` from "1.14.10" to "1.14.11" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `commander` in `app/angular` from "2.12.2" to "2.13.0" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `common-tags` in `app/angular` from "1.7.0" to "1.7.2" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `zone.js` in `app/angular` from "0.8.19" to "0.8.20" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `nodemon` in `app/angular` from "1.14.10" to "1.14.11" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `commander` in `app/react-native` from "2.12.2" to "2.13.0" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `commander` in `app/vue` from "2.12.2" to "2.13.0" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `common-tags` in `app/vue` from "1.7.0" to "1.7.2" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `nodemon` in `app/vue` from "1.14.10" to "1.14.11" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `babel-jest` in `examples/cra-kitchen-sink` from "22.0.4" to "22.0.6" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `jest` in `examples/cra-kitchen-sink` from "22.0.5" to "22.0.6" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `commander` in `lib/cli` from "2.12.2" to "2.13.0" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `zone.js` in `examples/angular-cli` from "0.8.19" to "0.8.20" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `@storybook/addon-actions` in `/docs` from "3.3.7" to "3.3.8" [#2722](https://github.com/storybooks/storybook/pull/2722)
+-   Upgraded `@storybook/addon-links` in `/docs` from "3.3.7" to "3.3.8" [#2722](https://github.com/storybooks/storybook/pull/2722)
+-   Upgraded `@storybook/addons` in `/docs` from "3.3.7" to "3.3.8" [#2722](https://github.com/storybooks/storybook/pull/2722)
+-   Upgraded `@storybook/react` in `/docs` from "3.3.7" to "3.3.8" [#2722](https://github.com/storybooks/storybook/pull/2722)
+-   Upgraded `gatsby-transformer-remark` in `/docs` from "1.7.27" to "1.7.28" [#2722](https://github.com/storybooks/storybook/pull/2722)
+-   Upgraded `gatsby` in `/docs` from "1.9.151" to "1.9.153" [#2722](https://github.com/storybooks/storybook/pull/2722)
+-   Upgraded `@storybook/addon-actions` in `/docs` from "3.3.6" to "3.3.7" [#2710](https://github.com/storybooks/storybook/pull/2710)
+-   Upgraded `@storybook/addon-links` in `/docs` from "3.3.6" to "3.3.7" [#2710](https://github.com/storybooks/storybook/pull/2710)
+-   Upgraded `@storybook/addons` in `/docs` from "3.3.6" to "3.3.7" [#2710](https://github.com/storybooks/storybook/pull/2710)
+-   Upgraded `@storybook/react` in `/docs` from "3.3.6" to "3.3.7" [#2710](https://github.com/storybooks/storybook/pull/2710)
+-   Upgraded `gatsby-link` in `/docs` from "1.6.33" to "1.6.34" [#2710](https://github.com/storybooks/storybook/pull/2710)
+-   Upgraded `gatsby-transformer-remark` in `/docs` from "1.7.26" to "1.7.27" [#2710](https://github.com/storybooks/storybook/pull/2710)
+-   Upgraded `gatsby` in `/docs` from "1.9.150" to "1.9.151" [#2710](https://github.com/storybooks/storybook/pull/2710)
+
+</details>
+
+# 3.3.9
+
+2018-January-13
+
+#### Bug Fixes
+
+-   Start haul/react-native using named binaries instead of cli.js [#2715](https://github.com/storybooks/storybook/pull/2715)
+-   Reflect the new peer dependencies in docs and CLI templates [#2714](https://github.com/storybooks/storybook/pull/2714)
+-   Don't mangle function names for production builds [#2705](https://github.com/storybooks/storybook/pull/2705)
+
+# 3.4.0-alpha.2
+
+2018-January-11
+
+This is a duplicate of `3.4.0-alpha.1`, re-published because I accidentally published `3.4.0-alpha.1` on the `latest` NPM tag.
+
+# 3.3.8
+
+2018-January-11
+
+This is a duplicate of `3.3.7`, re-published because I accidentally published `3.4.0-alpha.1` on the `latest` NPM tag.
+
+# 3.4.0-alpha.1
+
+2018-January-10
+
+In addition to the changes listed here, also contains fixes from [3.3.5](#335) and [3.3.6](#336) and [3.3.7](#337).
+
+#### Features
+
+-   Custom tsconfig.json for angular apps. [#2669](https://github.com/storybooks/storybook/pull/2669)
+
+#### Dependency Upgrades
+
+<details>
+<summary>
+105 Upgrades
+</summary>
+
+-   Upgraded `babel-eslint` in `/` from "8.1.2" to "8.2.1" [#2700](https://github.com/storybooks/storybook/pull/2700)
+-   Upgraded `eslint-plugin-jest` in `/` from "21.5.0" to "21.6.1" [#2700](https://github.com/storybooks/storybook/pull/2700)
+-   Upgraded `jest` in `/` from "22.0.4" to "22.0.5" [#2700](https://github.com/storybooks/storybook/pull/2700)
+-   Upgraded `jest-cli` in `/` from "22.0.4" to "22.0.5" [#2700](https://github.com/storybooks/storybook/pull/2700)
+-   Upgraded `jest-config` in `/` from "22.0.4" to "22.0.5" [#2700](https://github.com/storybooks/storybook/pull/2700)
+-   Upgraded `jest-diff` in `/` from "22.0.3" to "22.0.5" [#2700](https://github.com/storybooks/storybook/pull/2700)
+-   Upgraded `jest-environment-jsdom` in `/` from "22.0.4" to "22.0.5" [#2700](https://github.com/storybooks/storybook/pull/2700)
+-   Upgraded `jest-jasmine2` in `/` from "22.0.4" to "22.0.5" [#2700](https://github.com/storybooks/storybook/pull/2700)
+-   Upgraded `lerna` in `/` from "2.5.1" to "2.6.0" [#2700](https://github.com/storybooks/storybook/pull/2700)
+-   Upgraded `nodemon` in `/` from "1.14.9" to "1.14.10" [#2700](https://github.com/storybooks/storybook/pull/2700)
+-   Upgraded `common-tags` in `app/react` from "1.6.0" to "1.7.0" [#2700](https://github.com/storybooks/storybook/pull/2700)
+-   Upgraded `nodemon` in `app/react` from "1.14.9" to "1.14.10" [#2700](https://github.com/storybooks/storybook/pull/2700)
+-   Upgraded `common-tags` in `app/angular` from "1.6.0" to "1.7.0" [#2700](https://github.com/storybooks/storybook/pull/2700)
+-   Upgraded `nodemon` in `app/angular` from "1.14.9" to "1.14.10" [#2700](https://github.com/storybooks/storybook/pull/2700)
+-   Upgraded `common-tags` in `app/vue` from "1.6.0" to "1.7.0" [#2700](https://github.com/storybooks/storybook/pull/2700)
+-   Upgraded `nodemon` in `app/vue` from "1.14.9" to "1.14.10" [#2700](https://github.com/storybooks/storybook/pull/2700)
+-   Upgraded `vue-loader` in `app/vue` from "13.6.2" to "13.7.0" [#2700](https://github.com/storybooks/storybook/pull/2700)
+-   Upgraded `jest` in `examples/cra-kitchen-sink` from "22.0.4" to "22.0.5" [#2700](https://github.com/storybooks/storybook/pull/2700)
+-   Upgraded `vue-loader` in `examples/vue-kitchen-sink` from "13.6.2" to "13.7.0" [#2700](https://github.com/storybooks/storybook/pull/2700)
+-   Upgraded `webpack-dev-server` in `examples/vue-kitchen-sink` from "2.10.0" to "2.10.1" [#2700](https://github.com/storybooks/storybook/pull/2700)
+-   Upgraded `marked` in `/docs` from "0.3.7" to "0.3.12" [#2699](https://github.com/storybooks/storybook/pull/2699)
+-   Upgraded `react-stack-grid` in `/docs` from "0.7.0" to "0.7.1" [#2699](https://github.com/storybooks/storybook/pull/2699)
+-   Upgraded `@storybook/addon-actions` in `/docs` from "3.3.4" to "3.3.6" [#2686](https://github.com/storybooks/storybook/pull/2686)
+-   Upgraded `@storybook/addon-links` in `/docs` from "3.3.4" to "3.3.6" [#2686](https://github.com/storybooks/storybook/pull/2686)
+-   Upgraded `@storybook/addons` in `/docs` from "3.3.4" to "3.3.6" [#2686](https://github.com/storybooks/storybook/pull/2686)
+-   Upgraded `@storybook/react` in `/docs` from "3.3.4" to "3.3.6" [#2686](https://github.com/storybooks/storybook/pull/2686)
+-   Upgraded `gatsby-link` in `/docs` from "1.6.32" to "1.6.33" [#2686](https://github.com/storybooks/storybook/pull/2686)
+-   Upgraded `gatsby` in `/docs` from "1.9.149" to "1.9.150" [#2686](https://github.com/storybooks/storybook/pull/2686)
+-   Upgraded `nodemon` in `/` from "1.14.8" to "1.14.9" [#2687](https://github.com/storybooks/storybook/pull/2687)
+-   Upgraded `markdown-loader` in `app/react` from "2.0.1" to "2.0.2" [#2687](https://github.com/storybooks/storybook/pull/2687)
+-   Upgraded `nodemon` in `app/react` from "1.14.8" to "1.14.9" [#2687](https://github.com/storybooks/storybook/pull/2687)
+-   Upgraded `nodemon` in `app/angular` from "1.14.8" to "1.14.9" [#2687](https://github.com/storybooks/storybook/pull/2687)
+-   Upgraded `react-native` in `app/react-native` from "0.51.0" to "0.52.0" [#2687](https://github.com/storybooks/storybook/pull/2687)
+-   Upgraded `nodemon` in `app/vue` from "1.14.8" to "1.14.9" [#2687](https://github.com/storybooks/storybook/pull/2687)
+-   Upgraded `@storybook/addon-actions` in `/docs` from "3.3.3" to "3.3.4" [#2674](https://github.com/storybooks/storybook/pull/2674)
+-   Upgraded `@storybook/addon-links` in `/docs` from "3.3.3" to "3.3.4" [#2674](https://github.com/storybooks/storybook/pull/2674)
+-   Upgraded `@storybook/addons` in `/docs` from "3.3.3" to "3.3.4" [#2674](https://github.com/storybooks/storybook/pull/2674)
+-   Upgraded `@storybook/react` in `/docs` from "3.3.3" to "3.3.4" [#2674](https://github.com/storybooks/storybook/pull/2674)
+-   Update eslint in / from 4.14.0 to 4.15.0 [#2673](https://github.com/storybooks/storybook/pull/2673)
+-   Upgraded `nodemon` in `/` from "1.14.7" to "1.14.8" [#2664](https://github.com/storybooks/storybook/pull/2664)
+-   Upgraded `marksy` in `addons/info` from "6.0.2" to "6.0.3" [#2664](https://github.com/storybooks/storybook/pull/2664)
+-   Upgraded `nodemon` in `app/react` from "1.14.7" to "1.14.8" [#2664](https://github.com/storybooks/storybook/pull/2664)
+-   Upgraded `nodemon` in `app/angular` from "1.14.7" to "1.14.8" [#2664](https://github.com/storybooks/storybook/pull/2664)
+-   Upgraded `nodemon` in `app/vue` from "1.14.7" to "1.14.8" [#2664](https://github.com/storybooks/storybook/pull/2664)
+-   Upgraded `webpack-dev-server` in `examples/vue-kitchen-sink` from "2.9.7" to "2.10.0" [#2664](https://github.com/storybooks/storybook/pull/2664)
+-   Upgraded `@types/lodash` in `/` from "4.14.91" to "4.14.92" [#2659](https://github.com/storybooks/storybook/pull/2659)
+-   Upgraded `marksy` in `addons/info` from "6.0.1" to "6.0.2" [#2659](https://github.com/storybooks/storybook/pull/2659)
+-   Upgraded `css-loader` in `app/react` from "0.28.7" to "0.28.8" [#2659](https://github.com/storybooks/storybook/pull/2659)
+-   Upgraded `html-loader` in `app/react` from "0.5.1" to "0.5.4" [#2659](https://github.com/storybooks/storybook/pull/2659)
+-   Upgraded `uglifyjs-webpack-plugin` in `app/react` from "1.1.5" to "1.1.6" [#2659](https://github.com/storybooks/storybook/pull/2659)
+-   Upgraded `css-loader` in `app/angular` from "0.28.7" to "0.28.8" [#2659](https://github.com/storybooks/storybook/pull/2659)
+-   Upgraded `uglifyjs-webpack-plugin` in `app/angular` from "1.1.5" to "1.1.6" [#2659](https://github.com/storybooks/storybook/pull/2659)
+-   Upgraded `css-loader` in `app/react-native` from "0.28.7" to "0.28.8" [#2659](https://github.com/storybooks/storybook/pull/2659)
+-   Upgraded `uglifyjs-webpack-plugin` in `app/react-native` from "1.1.5" to "1.1.6" [#2659](https://github.com/storybooks/storybook/pull/2659)
+-   Upgraded `css-loader` in `app/vue` from "0.28.7" to "0.28.8" [#2659](https://github.com/storybooks/storybook/pull/2659)
+-   Upgraded `uglifyjs-webpack-plugin` in `app/vue` from "1.1.5" to "1.1.6" [#2659](https://github.com/storybooks/storybook/pull/2659)
+-   Upgraded `@types/node` in `examples/angular-cli` from "6.0.95" to "6.0.96" [#2659](https://github.com/storybooks/storybook/pull/2659)
+-   Upgraded `css-loader` in `examples/vue-kitchen-sink` from "0.28.7" to "0.28.8" [#2659](https://github.com/storybooks/storybook/pull/2659)
+-   Upgraded `@angular/animations` in `examples/angular-cli` from "5.1.2" to "5.1.3" [#2648](https://github.com/storybooks/storybook/pull/2648)
+-   Upgraded `@angular/common` in `examples/angular-cli` from "5.1.2" to "5.1.3" [#2648](https://github.com/storybooks/storybook/pull/2648)
+-   Upgraded `@angular/compiler` in `examples/angular-cli` from "5.1.2" to "5.1.3" [#2648](https://github.com/storybooks/storybook/pull/2648)
+-   Upgraded `@angular/core` in `examples/angular-cli` from "5.1.2" to "5.1.3" [#2648](https://github.com/storybooks/storybook/pull/2648)
+-   Upgraded `@angular/forms` in `examples/angular-cli` from "5.1.2" to "5.1.3" [#2648](https://github.com/storybooks/storybook/pull/2648)
+-   Upgraded `@angular/http` in `examples/angular-cli` from "5.1.2" to "5.1.3" [#2648](https://github.com/storybooks/storybook/pull/2648)
+-   Upgraded `@angular/platform-browser` in `examples/angular-cli` from "5.1.2" to "5.1.3" [#2648](https://github.com/storybooks/storybook/pull/2648)
+-   Upgraded `@angular/platform-browser-dynamic` in `examples/angular-cli` from "5.1.2" to "5.1.3" [#2648](https://github.com/storybooks/storybook/pull/2648)
+-   Upgraded `@angular/router` in `examples/angular-cli` from "5.1.2" to "5.1.3" [#2648](https://github.com/storybooks/storybook/pull/2648)
+-   Upgraded `@angular/compiler-cli` in `examples/angular-cli` from "5.1.2" to "5.1.3" [#2648](https://github.com/storybooks/storybook/pull/2648)
+-   Upgraded `@angular/language-service` in `examples/angular-cli` from "5.1.2" to "5.1.3" [#2648](https://github.com/storybooks/storybook/pull/2648)
+-   Upgraded `postcss-loader` in `app/react` from "2.0.9" to "2.0.10" [#2637](https://github.com/storybooks/storybook/pull/2637)
+-   Upgraded `postcss-loader` in `app/angular` from "2.0.9" to "2.0.10" [#2637](https://github.com/storybooks/storybook/pull/2637)
+-   Upgraded `postcss-loader` in `app/react-native` from "2.0.9" to "2.0.10" [#2637](https://github.com/storybooks/storybook/pull/2637)
+-   Upgraded `postcss-loader` in `app/vue` from "2.0.9" to "2.0.10" [#2637](https://github.com/storybooks/storybook/pull/2637)
+-   Update inquirer in / from 4.0.1 to 4.0.2 [#2632](https://github.com/storybooks/storybook/pull/2632)
+-   Upgraded `danger` in `/` from "2.1.8" to "2.1.10" [#2618](https://github.com/storybooks/storybook/pull/2618)
+-   Upgraded `autoprefixer` in `app/react` from "7.2.3" to "7.2.4" [#2618](https://github.com/storybooks/storybook/pull/2618)
+-   Upgraded `autoprefixer` in `app/angular` from "7.2.3" to "7.2.4" [#2618](https://github.com/storybooks/storybook/pull/2618)
+-   Upgraded `autoprefixer` in `app/react-native` from "7.2.3" to "7.2.4" [#2618](https://github.com/storybooks/storybook/pull/2618)
+-   Upgraded `autoprefixer` in `app/vue` from "7.2.3" to "7.2.4" [#2618](https://github.com/storybooks/storybook/pull/2618)
+-   Upgraded `nodemon` in `/` from "1.14.6" to "1.14.7" [#2612](https://github.com/storybooks/storybook/pull/2612)
+-   Upgraded `nodemon` in `app/react` from "1.14.6" to "1.14.7" [#2612](https://github.com/storybooks/storybook/pull/2612)
+-   Upgraded `nodemon` in `app/angular` from "1.14.6" to "1.14.7" [#2612](https://github.com/storybooks/storybook/pull/2612)
+-   Upgraded `nodemon` in `app/vue` from "1.14.6" to "1.14.7" [#2612](https://github.com/storybooks/storybook/pull/2612)
+-   Upgraded `vue-loader` in `app/vue` from "13.6.1" to "13.6.2" [#2611](https://github.com/storybooks/storybook/pull/2611)
+-   Upgraded `vue-loader` in `examples/vue-kitchen-sink` from "13.6.1" to "13.6.2" [#2611](https://github.com/storybooks/storybook/pull/2611)
+-   Upgraded `nodemon` in `/` from "1.14.5" to "1.14.6" [#2609](https://github.com/storybooks/storybook/pull/2609)
+-   Upgraded `nodemon` in `app/react` from "1.14.5" to "1.14.6" [#2609](https://github.com/storybooks/storybook/pull/2609)
+-   Upgraded `nodemon` in `app/angular` from "1.14.5" to "1.14.6" [#2609](https://github.com/storybooks/storybook/pull/2609)
+-   Upgraded `nodemon` in `app/vue` from "1.14.5" to "1.14.6" [#2609](https://github.com/storybooks/storybook/pull/2609)
+-   Upgraded `enzyme` in `/` from "3.2.0" to "3.3.0" [#2608](https://github.com/storybooks/storybook/pull/2608)
+-   Upgraded `nodemon` in `/` from "1.14.3" to "1.14.5" [#2608](https://github.com/storybooks/storybook/pull/2608)
+-   Upgraded `graphiql` in `addons/graphql` from "0.11.10" to "0.11.11" [#2608](https://github.com/storybooks/storybook/pull/2608)
+-   Upgraded `enzyme` in `addons/links` from "3.2.0" to "3.3.0" [#2608](https://github.com/storybooks/storybook/pull/2608)
+-   Upgraded `nodemon` in `app/react` from "1.14.3" to "1.14.5" [#2608](https://github.com/storybooks/storybook/pull/2608)
+-   Upgraded `nodemon` in `app/angular` from "1.14.3" to "1.14.5" [#2608](https://github.com/storybooks/storybook/pull/2608)
+-   Upgraded `nodemon` in `app/vue` from "1.14.3" to "1.14.5" [#2608](https://github.com/storybooks/storybook/pull/2608)
+-   Upgraded `enzyme` in `examples/cra-kitchen-sink` from "3.2.0" to "3.3.0" [#2608](https://github.com/storybooks/storybook/pull/2608)
+-   Upgraded `enzyme` in `examples/official-storybook` from "3.2.0" to "3.3.0" [#2608](https://github.com/storybooks/storybook/pull/2608)
+-   Update 2 dependencies from npm [#2597](https://github.com/storybooks/storybook/pull/2597)
+-   Upgraded `@storybook/addon-actions` in `/docs` from "3.3.1" to "3.3.3" [#2598](https://github.com/storybooks/storybook/pull/2598)
+-   Upgraded `@storybook/addon-links` in `/docs` from "3.3.1" to "3.3.3" [#2598](https://github.com/storybooks/storybook/pull/2598)
+-   Upgraded `@storybook/addons` in `/docs` from "3.3.1" to "3.3.3" [#2598](https://github.com/storybooks/storybook/pull/2598)
+-   Upgraded `@storybook/react` in `/docs` from "3.3.1" to "3.3.3" [#2598](https://github.com/storybooks/storybook/pull/2598)
+-   Upgraded `danger` in `/` from "2.1.6" to "2.1.8" [#2599](https://github.com/storybooks/storybook/pull/2599)
+-   Upgraded `axe-core` in `addons/a11y` from "2.6.0" to "2.6.1" [#2599](https://github.com/storybooks/storybook/pull/2599)
+
+</details>
+
+# 3.3.7
+
+2018-January-10
+
+#### Maintenance
+
+-   Extract tslint exclusions out of package.json scripts [#2684](https://github.com/storybooks/storybook/pull/2684)
+-   Add tslint to the linting pipe [#2682](https://github.com/storybooks/storybook/pull/2682)
+
+#### Bug Fixes
+
+-   Angular: add entry components to modulemetadata - #2701 [#2702](https://github.com/storybooks/storybook/pull/2702)
+-   Add html and markup loaders to angular and vue apps [#2692](https://github.com/storybooks/storybook/pull/2692)
+
+# 3.3.6
+
+2018-January-08
+
+#### Bug Fixes
+
+-   Remove `src/` from remaining `.npmignore`s [#2678](https://github.com/storybooks/storybook/pull/2678)
+
 # 3.3.5
 
 2018-January-08
@@ -174,7 +1179,7 @@
 
 #### Bug Fixes
 
--   [app:angular] Fixed dependency injection for components [#2566](https://github.com/storybooks/storybook/pull/2566)
+-   `app:angular` Fixed dependency injection for components [#2566](https://github.com/storybooks/storybook/pull/2566)
 -   Revert "Move everything from lodash to lodash-es" [#2591](https://github.com/storybooks/storybook/pull/2591)
 
 #### Maintenance
@@ -260,7 +1265,7 @@ We'll do a better job of getting out smaller releases next time around. ;-)
 -   Added type annotation to helpers, added ts declaration files for angu… [#2459](https://github.com/storybooks/storybook/pull/2459)
 -   Adding extra metadata to module/components [#2526](https://github.com/storybooks/storybook/pull/2526)
 -   Fix ng component prop output override [#2456](https://github.com/storybooks/storybook/pull/2456)
--   [WIP] Angular versions support [#2467](https://github.com/storybooks/storybook/pull/2467)
+-   `WIP` Angular versions support [#2467](https://github.com/storybooks/storybook/pull/2467)
 -   Angular Add custom pipes support [#2518](https://github.com/storybooks/storybook/pull/2518)
 -   Add angular support: Storybook for Angular [#1474](https://github.com/storybooks/storybook/pull/1474)
 -   Fix addon Knobs: add array in Object PropTypes [#2227](https://github.com/storybooks/storybook/pull/2227)
@@ -517,7 +1522,7 @@ We'll do a better job of getting out smaller releases next time around. ;-)
 -   Added type annotation to helpers, added ts declaration files for angu… [#2459](https://github.com/storybooks/storybook/pull/2459)
 -   Adding extra metadata to module/components [#2526](https://github.com/storybooks/storybook/pull/2526)
 -   Fix ng component prop output override [#2456](https://github.com/storybooks/storybook/pull/2456)
--   [WIP] Angular versions support [#2467](https://github.com/storybooks/storybook/pull/2467)
+-   `WIP` Angular versions support [#2467](https://github.com/storybooks/storybook/pull/2467)
 -   Angular Add custom pipes support [#2518](https://github.com/storybooks/storybook/pull/2518)
 
 #### Bug Fixes
@@ -833,7 +1838,7 @@ We'll do a better job of getting out smaller releases next time around. ;-)
 #### Bug Fixes
 
 -   Number knob: apply default min/max/step values only in range mode [#2437](https://github.com/storybooks/storybook/pull/2437)
--   [addon-actions] Check result of getPropertyDescriptor for IE11 [#2428](https://github.com/storybooks/storybook/pull/2428)
+-   `addon-actions` Check result of getPropertyDescriptor for IE11 [#2428](https://github.com/storybooks/storybook/pull/2428)
 -   Edited template of search box result item to fix overflow text in row [#2419](https://github.com/storybooks/storybook/pull/2419)
 -   Fix missing supported extension check in case when asset is a string [#2468](https://github.com/storybooks/storybook/pull/2468)
 
@@ -1877,7 +2882,7 @@ Minor bug fixes and documentation updates post 3.0.0 release.
 
 -   Fixed typo in react-native browser instructions [#1189](https://github.com/storybooks/storybook/pull/1189)
 -   Add instruction for npm install with -D for development dependency [#1168](https://github.com/storybooks/storybook/pull/1168)
--   Fix broken link for [addons] in README [#1167](https://github.com/storybooks/storybook/pull/1167)
+-   Fix broken link for `addons` in README [#1167](https://github.com/storybooks/storybook/pull/1167)
 -   Refreshed logo in docs [#1149](https://github.com/storybooks/storybook/pull/1149)
 -   fix addon broken links in documentation [#1165](https://github.com/storybooks/storybook/pull/1165)
 -   start-storybook cli - expand commands descriptions [#1161](https://github.com/storybooks/storybook/pull/1161)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 90ae635db01..975d3d50656 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -41,7 +41,7 @@ You can also pick directly from CLI:
 
 You can use one of the example projects in `examples/` to develop on.
 
-This command will list all the suites and options for running tests. 
+This command will list all the suites and options for running tests.
 
 ```sh
 yarn test
@@ -58,7 +58,7 @@ You can also pick suites from CLI.  Suites available are listed below.
 `yarn test --core`
 
 This option executes test from `<rootdir>/app/react`, `<rootdir>/app/vue`, and `<rootdir>/lib`.
-Before the tests are ran, the project must be bootstrapped with core. You can accomplish this with `yarn bootstrap --core` 
+Before the tests are ran, the project must be bootstrapped with core. You can accomplish this with `yarn bootstrap --core`
 
 ##### React-Native example Tests
 
@@ -67,15 +67,14 @@ Before the tests are ran, the project must be bootstrapped with core. You can ac
 This option executes tests from `<rootdir>/app/react-native`.
 Before these tests are ran, the project must be bootstrapped with the React Native example enabled.  You can accomplish this by running `yarn bootstrap --reactnative`
 
-##### Integration Tests (Screenshots of running apps)
+##### CRA-kitchen-sink - Image snapshots using Storyshots
 
-`yarn test --integration`
+`yarn test --image`
 
-This option executes tests from `<rootdir>/integration`.
-In order for the snapshot-integration tests to be executed properly, examples being tested must be running on their defaults ports, as declared in `integration/examples.test.js`
-
-Puppeteer is used to launch and grab screenshots of example pages, while jest is used to assert matching images.
+This option executes tests from `<rootdir>/examples/cra-kitchen-sink`
+In order for the image snapshots to be correctly generated, you must have static build of the storybook up-to-date.
 
+Puppeteer is used to launch and grab screenshots of example pages, while jest is used to assert matching images. (just like integration tests)
 
 #### 2b. Run e2e tests for CLI
 
@@ -265,7 +264,7 @@ _Make sure `yarn dev` is running_
 
 ##### 1. Setup storybook in your project
 
-First we are going to install storyboook, then we are going to link `@storybook/react` into our project. This will replace `node_modules/@storybook/react` with a symlink to our local version of storybook. 
+First we are going to install storyboook, then we are going to link `@storybook/react` into our project. This will replace `node_modules/@storybook/react` with a symlink to our local version of storybook.
 
 1.  `getstorybook`
 2.  `yarn storybook`
@@ -275,7 +274,7 @@ First we are going to install storyboook, then we are going to link `@storybook/
 
 **_Note_**: This process is the same for `@storybook/vue`, `@storybook/addon-foo`, etc
 
-1.  Go to your storybook _root_ directory 
+1.  Go to your storybook _root_ directory
 2.  `yarn dev`
 3.  Wait until the output stops (changes you make will be transpiled into dist and logged here)
 4.  Go to your storybook-sandbox-app directory
diff --git a/MIGRATION.md b/MIGRATION.md
index e331a988902..91151df1c7e 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -18,7 +18,20 @@
 
 ## From version 3.2.x to 3.3.x
 
-There should be no breaking changes in this release, but read on if you're using `addon-knobs`: we advise an update to your code for efficiency's sake.
+There wasn't expected be any breaking changes in this release, but unfortunately it turned out that there are some. We're revisiting our [release strategy](https://github.com/storybooks/storybook/blob/master/RELEASES.md) to follow semver more strictly.
+Also read on if you're using `addon-knobs`: we advise an update to your code for efficiency's sake.
+
+### `babel-core` is now a peer dependency ([#2494](https://github.com/storybooks/storybook/pull/2494))
+
+This affects you if you don't use babel in your project. You may need to add `babel-core` as dev dependency:
+```
+npm install --save-dev babel-core
+```
+This was done to support different major versions of babel.
+
+### Base webpack config now contains vital plugins ([#1775](https://github.com/storybooks/storybook/pull/1775))
+
+This affects you if you use custom webpack config in [Full Control Mode](https://storybook.js.org/configurations/custom-webpack-config/#full-control-mode) while not preserving the plugins from `storybookBaseConfig`. Before `3.3`, preserving them was just a reccomendation, but now it [became](https://github.com/storybooks/storybook/pull/2578) a requirement.
 
 ### Refactored Knobs
 
diff --git a/README.md b/README.md
index 24abb639329..e9eb1544ac6 100644
--- 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)
 
@@ -26,9 +26,10 @@ Storybook comes with a lot of [addons](https://storybook.js.org/addons/introduct
 
 -   [Getting Started](#getting-started)
 -   [Projects](#projects)
-    -   [Main Projects](#main-projects)
+    -   [Supported Frameworks](#supported-frameworks)
     -   [Sub Projects](#sub-projects)
     -   [Addons](#addons)
+-   [Live Examples](#live-examples) 💪
 -   [Contributing](#contributing)
     -   [Development scripts](#development-scripts)
     -   [Backers](#backers)
@@ -60,14 +61,17 @@ It runs a codemod to update all package names. Read all migration details in our
 
 For full documentation on using Storybook visit: [storybook.js.org](https://storybook.js.org)
 
+For additional help, join us [in our Slack](https://now-examples-slackin-rrirkqohko.now.sh/)
+
 ## Projects
 
-### Main Projects
+### Supported Frameworks
 
--   [Storybook for react](app/react) - Storybook for React components
--   [Storybook for vue](app/vue) - Storybook for Vue components
--   [Storybook for angular](app/angular) - Storybook for Angular components
--   [Storybook for react-native](app/react-native) - Storybook for React-Native components
+-   [React](app/react)
+-   [React Native](app/react-native)
+-   [Vue](app/vue)
+-   [Angular](app/angular)
+-   [Polymer](app/polymer) <sup>alpha</sup>
 
 ### Sub Projects
 
@@ -76,15 +80,38 @@ For full documentation on using Storybook visit: [storybook.js.org](https://stor
 
 ### 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)
+
+## Live Examples
+
+### 3.4.alpha
+> Note, this is an Alpha version. Some of the features still might not be released
+
+- [React Official](https://storybooks-official.netlify.com)
+- [Vue](https://storybooks-vue.netlify.com/)
+- [Angular](https://storybooks-angular.netlify.com/)
+- [Polymer](https://storybooks-polymer.netlify.com/)
+
+### 3.3
+- [React Official](https://release-3-3--storybooks-official.netlify.com)
+- [Vue](https://release-3-3--storybooks-vue.netlify.com/)
+- [Angular](https://release-3-3--storybooks-angular.netlify.com/)
 
 ## Contributing
 
diff --git a/RELEASES.md b/RELEASES.md
index 1ba156817a8..e4cf86c82d4 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -86,7 +86,7 @@ addressed before a release can go out by adding them to the milestone. For examp
 Adding bugs to the milestone helps people looking for good ways to contribute,
 or to understand what is blocking the release so they can actually do something
 about it. Discussion about which bugs are critical happens in the `#maintenance`
-channel [in our Slack](https://now-examples-slackin-rrirkqohko.now.sh/) [![Storybook Slack](https://now-examples-slackin-rrirkqohko.now.sh/badge.svg)].(https://now-examples-slackin-rrirkqohko.now.sh/)
+channel [in our Slack](https://now-examples-slackin-rrirkqohko.now.sh/) [![Storybook Slack](https://now-examples-slackin-rrirkqohko.now.sh/badge.svg)](https://now-examples-slackin-rrirkqohko.now.sh/)
 
 
 If you're experiencing a bug, the best way to make sure that it gets attention
@@ -116,3 +116,4 @@ in a patch release.
 
 -   For PATCH PR's, any maintainer can review, test, approve, and merge it.
 -   For MINOR/MAJOR PR's, once a maintainer reviews, tests, and approves it, s/he should clear it with the other maintainers before merging it into the release branch.
+
diff --git a/ROADMAP.md b/ROADMAP.md
index cae6888ac4c..7ee33e46251 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -2,22 +2,22 @@
 
 ## Table of contents
 
-  * [New features](#new-features)
-    + [Responsive + multi-device viewports preview.](#responsive--multi-device-viewports-preview)
-    + [Automatic story detection](#automatic-story-detection)
-    + [Theme ability and override core UI components](#theme-ability-and-override-core-ui-components)
-    + [Add a playground addon](#add-a-playground-addon)
-    + [See multiple (or all) stories in 1 preview.](#see-multiple--or-all--stories-in-1-preview)
-  * [Supporting other frameworks and libraries](#supporting-other-frameworks-and-libraries)
-    + [Polymer & Webcomponents](#polymer---webcomponents)
-    + [Aurelia](#aurelia)
-    + [Ember](#ember)
-  * [Breaking changes](#breaking-changes)
-    + [Addon API](#addon-api)
-    + [API for adding stories](#api-for-adding-stories)
-  * [Documentation](#documentation)
-    + [Better design](#better-design)
-    + [Record videos and write blog post on how to use, tweak & develop storybook](#record-videos-and-write-blog-post-on-how-to-use--tweak---develop-storybook)
+* [New features](#new-features)
+  + [Responsive + multi-device viewports preview.](#responsive--multi-device-viewports-preview)
+  + [Automatic story detection](#automatic-story-detection)
+  + [Theme ability and override core UI components](#theme-ability-and-override-core-ui-components)
+  + [Add a playground addon](#add-a-playground-addon)
+  + [See multiple (or all) stories in 1 preview.](#see-multiple--or-all--stories-in-1-preview)
+* [Supporting other frameworks and libraries](#supporting-other-frameworks-and-libraries)
+  + [Polymer & Webcomponents](#polymer---webcomponents)
+  + [Aurelia](#aurelia)
+  + [Ember](#ember)
+* [Breaking changes](#breaking-changes)
+  + [Addon API](#addon-api)
+  + [API for adding stories](#api-for-adding-stories)
+* [Documentation](#documentation)
+  + [Better design](#better-design)
+  + [Record videos and write blog post on how to use, tweak & develop storybook](#record-videos-and-write-blog-post-on-how-to-use--tweak---develop-storybook)
 
 ## New features
 
@@ -57,7 +57,7 @@ That way you can write your stories how they are best, and preview them how you
 
 We believe in the power of react, and think it's the right choice for a lot of projects.
 But it's up to you and your team to decide your stack.
-Unfortunately if you choose anything other then React or React-Native you can not use storybook.
+Unfortunately if you choose anything not from the list of [supported frameworks](README.md#supported-frameworks) you can not use storybook.
 
 We want you to be able to use storybook with the framework / library of your choice.
 
diff --git a/__mocks__/inject-decorator.angular-stories.txt b/__mocks__/inject-decorator.angular-stories.txt
new file mode 100644
index 00000000000..5baa440d797
--- /dev/null
+++ b/__mocks__/inject-decorator.angular-stories.txt
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { storiesOf } from '@storybook/angular';
+
+@Component({
+  selector: 'storybook-with-ng-content',
+  template: `<div style="color: #1e88e5;"><ng-content></ng-content></div>`,
+})
+class WithNgContentComponent {}
+
+storiesOf('Custom|ng-content', module).add('Default', () => ({
+  template: `<storybook-with-ng-content><h1>This is rendered in ng-content</h1></storybook-with-ng-content>`,
+  moduleMetadata: {
+    declarations: [WithNgContentComponent],
+  },
+}));
diff --git a/__mocks__/inject-decorator.no-stories.txt b/__mocks__/inject-decorator.no-stories.txt
new file mode 100644
index 00000000000..f0124e61691
--- /dev/null
+++ b/__mocks__/inject-decorator.no-stories.txt
@@ -0,0 +1,3 @@
+while(true) {
+  console.log("it's a kind of magic");
+}
\ No newline at end of file
diff --git a/__mocks__/inject-decorator.stories.txt b/__mocks__/inject-decorator.stories.txt
new file mode 100644
index 00000000000..c4f0c4d53e5
--- /dev/null
+++ b/__mocks__/inject-decorator.stories.txt
@@ -0,0 +1,153 @@
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { withInfo } from '@storybook/addon-info';
+import { action } from '@storybook/addon-actions';
+
+import DocgenButton from '../components/DocgenButton';
+import FlowTypeButton from '../components/FlowTypeButton';
+import BaseButton from '../components/BaseButton';
+import TableComponent from '../components/TableComponent';
+
+storiesOf('Addons|Info.React Docgen', module)
+  .add(
+    'Comments from PropType declarations',
+    withInfo(
+      'Comments above the PropType declarations should be extracted from the React component file itself and rendered in the Info Addon prop table'
+    )(() => <DocgenButton onClick={action('clicked')} label="Docgen Button" />)
+  )
+  .add(
+    'Comments from Flow declarations',
+    withInfo(
+      'Comments above the Flow declarations should be extracted from the React component file itself and rendered in the Info Addon prop table'
+    )(() => <FlowTypeButton onClick={action('clicked')} label="Flow Typed Button" />)
+  )
+  .add(
+    'Comments from component declaration',
+    withInfo(
+      'Comments above the component declaration should be extracted from the React component file itself and rendered below the Info Addon heading'
+    )(() => <BaseButton onClick={action('clicked')} label="Button" />)
+  );
+
+const markdownDescription = `
+#### You can use markdown in your withInfo() description.
+
+Sometimes you might want to manually include some code examples:
+~~~js
+const Button = () => <button />;
+~~~
+
+Maybe include a [link](http://storybook.js.org) to your project as well.
+`;
+
+storiesOf('Addons|Info.Markdown', module).add(
+  'Displays Markdown in description',
+  withInfo(markdownDescription)(() => <BaseButton onClick={action('clicked')} label="Button" />)
+);
+
+storiesOf('Addons|Info.Options.inline', module).add(
+  'Inlines component inside story',
+  withInfo({
+    text: 'Component should be inlined between description and PropType table',
+    inline: true, // Displays info inline vs click button to view
+  })(() => <BaseButton label="Button" />)
+);
+
+storiesOf('Addons|Info.Options.header', module).add(
+  'Shows or hides Info Addon header',
+  withInfo({
+    text: 'The Info Addon header should be hidden',
+    header: false, // Toggles display of header with component name and description
+  })(() => <BaseButton label="Button" />)
+);
+
+storiesOf('Addons|Info.Options.source', module).add(
+  'Shows or hides Info Addon source',
+  withInfo({
+    text: 'The Info Addon source section should be hidden',
+    source: false, // Displays the source of story Component
+  })(() => <BaseButton label="Button" />)
+);
+
+storiesOf('Addons|Info.Options.propTables', module).add(
+  'Shows additional component prop tables',
+  withInfo({
+    text: 'There should be a prop table added for a component not included in the story',
+    propTables: [FlowTypeButton],
+  })(() => <BaseButton label="Button" />)
+);
+
+storiesOf('Addons|Info.Options.propTablesExclude', module).add(
+  'Exclude component from prop tables',
+  withInfo({
+    text: 'This can exclude extraneous components from being displayed in prop tables.',
+    propTablesExclude: [FlowTypeButton],
+  })(() => (
+    <div>
+      <BaseButton label="Button" />
+      <FlowTypeButton label="Flow Typed Button" />
+    </div>
+  ))
+);
+
+storiesOf('Addons|Info.Options.styles', module)
+  .add(
+    'Extend info styles with an object',
+    withInfo({
+      styles: {
+        button: {
+          base: {
+            background: 'purple',
+          },
+        },
+        header: {
+          h1: {
+            color: 'green',
+          },
+        },
+      },
+    })(() => <BaseButton label="Button" />)
+  )
+  .add(
+    'Full control over styles using a function',
+    withInfo({
+      styles: stylesheet => ({
+        ...stylesheet,
+        header: {
+          ...stylesheet.header,
+          h1: {
+            ...stylesheet.header.h1,
+            color: 'red',
+          },
+        },
+      }),
+    })(() => <BaseButton label="Button" />)
+  );
+
+storiesOf('Addons|Info.Options.TableComponent', module).add(
+  'Use a custom component for the table',
+  withInfo({
+    TableComponent,
+  })(() => <BaseButton label="Button" />)
+);
+
+storiesOf('Addons|Info.Decorator', module)
+  .addDecorator((story, context) =>
+    withInfo('Info could be used as a global or local decorator as well.')(story)(context)
+  )
+  .add('Use Info as story decorator', () => <BaseButton label="Button" />);
+
+const hoc = WrapComponent => ({ ...props }) => <WrapComponent {...props} />;
+
+const Input = hoc(() => <input type="text" />);
+
+const TextArea = hoc(({ children }) => <textarea>{children}</textarea>);
+
+storiesOf('Addons|Info.GitHub issues', module).add(
+  '#1814',
+  withInfo('Allow Duplicate DisplayNames for HOC #1814')(() => (
+    <div>
+      <Input />
+      <TextArea />
+    </div>
+  ))
+);
diff --git a/__mocks__/inject-decorator.ugly-comments-stories.txt b/__mocks__/inject-decorator.ugly-comments-stories.txt
new file mode 100644
index 00000000000..926e8cd5e97
--- /dev/null
+++ b/__mocks__/inject-decorator.ugly-comments-stories.txt
@@ -0,0 +1,23 @@
+/* global window */
+/* eslint-disable global-require, import/no-dynamic-require */
+
+import React from 'react';
+
+/*
+ eslint-disable some kind
+ of multi line ignore, though
+ I'm not sure it's possible.
+*/
+
+import { storiesOf } from '@storybook/react';
+
+/* eslint-disable-line */ const x = 0;
+
+// eslint-disable-line
+storiesOf('Foo', module)
+  .add('bar', () => <div>baz</div>);
+
+/*
+ This is actually a good comment that will help
+ users to understand what's going on here.
+*/
\ No newline at end of file
diff --git a/addons/a11y/.storybook/components/Button/component.js b/addons/a11y/.storybook/components/Button/component.js
index cef6111d522..d9c58bd13ac 100644
--- a/addons/a11y/.storybook/components/Button/component.js
+++ b/addons/a11y/.storybook/components/Button/component.js
@@ -15,10 +15,10 @@ const styles = {
   wrong: {
     color: '#ffffff',
     backgroundColor: '#4caf50',
-  }
-}
+  },
+};
 
-function Button({ label, content, disabled, contrast }) {
+function Button({ content, disabled, contrast }) {
   return (
     <button
       style={{
@@ -27,19 +27,19 @@ function Button({ label, content, disabled, contrast }) {
       }}
       disabled={disabled}
     >
-      { content }
+      {content}
     </button>
-  )
+  );
 }
 
 Button.propTypes = {
-  label: PropTypes.string,
   content: PropTypes.string,
   disabled: PropTypes.bool,
-  contrast: PropTypes.oneOf(['ok', 'wrong'])
+  contrast: PropTypes.oneOf(['ok', 'wrong']),
 };
 
 Button.defaultProps = {
+  content: 'null',
   disabled: false,
   contrast: 'ok',
 };
diff --git a/addons/a11y/.storybook/components/Button/stories.js b/addons/a11y/.storybook/components/Button/stories.js
index 269e5cab100..5972b9ea145 100644
--- a/addons/a11y/.storybook/components/Button/stories.js
+++ b/addons/a11y/.storybook/components/Button/stories.js
@@ -1,34 +1,17 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
+import Faker from 'faker';
 
 import { checkA11y } from './../../../src';
 
 import Button from './component';
 
-import Faker from 'faker';
-
 const text = Faker.lorem.words();
 
 storiesOf('<Button />', module)
   .addDecorator(checkA11y)
-  .add('Default', () => (
-    <Button />
-  ))
-  .add('Content', () => (
-    <Button content={text} />
-  ))
-  .add('Label', () => (
-    <Button label={text} />
-  ))
-  .add('Disabled', () => (
-    <Button
-      disabled
-      content={text}
-    />
-  ))
-  .add('Invalid contrast', () => (
-    <Button
-      contrast="wrong"
-      content={Faker.lorem.words()}
-    />
-  ));
+  .add('Default', () => <Button />)
+  .add('Content', () => <Button content={text} />)
+  .add('Label', () => <Button label={text} />)
+  .add('Disabled', () => <Button disabled content={text} />)
+  .add('Invalid contrast', () => <Button contrast="wrong" content={Faker.lorem.words()} />);
diff --git a/addons/a11y/.storybook/components/Form/components/Input.js b/addons/a11y/.storybook/components/Form/components/Input.js
index bee6d133726..f5fca29664d 100644
--- a/addons/a11y/.storybook/components/Form/components/Input.js
+++ b/addons/a11y/.storybook/components/Form/components/Input.js
@@ -2,14 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 function Input({ id, value, type, placeholder }) {
-  return (
-    <input
-      id={id}
-      value={value}
-      placeholder={placeholder}
-      type={type}
-    />
-  );
+  return <input id={id} value={value} placeholder={placeholder} type={type} />;
 }
 
 Input.propTypes = {
@@ -17,6 +10,13 @@ Input.propTypes = {
   id: PropTypes.string,
   value: PropTypes.string,
   placeholder: PropTypes.string,
-}
+};
+
+Input.defaultProps = {
+  type: null,
+  id: null,
+  value: null,
+  placeholder: null,
+};
 
 export default Input;
diff --git a/addons/a11y/.storybook/components/Form/components/Label.js b/addons/a11y/.storybook/components/Form/components/Label.js
index cdae59704b2..5f3799a6ac6 100644
--- a/addons/a11y/.storybook/components/Form/components/Label.js
+++ b/addons/a11y/.storybook/components/Form/components/Label.js
@@ -5,22 +5,19 @@ const styles = {
   label: {
     padding: '0 6px',
   },
-}
+};
 
 function Label({ id, content }) {
   return (
-    <label
-      style={styles.label}
-      htmlFor={id}
-    >
-      { content }
+    <label style={styles.label} htmlFor={id}>
+      {content}
     </label>
-  )
+  );
 }
 
 Label.propTypes = {
-  content: PropTypes.string,
-  id: PropTypes.string,
+  content: PropTypes.string.isRequired,
+  id: PropTypes.string.isRequired,
 };
 
 export default Label;
diff --git a/addons/a11y/.storybook/components/Form/components/Row.js b/addons/a11y/.storybook/components/Form/components/Row.js
index 3cc62011201..ed223814759 100644
--- a/addons/a11y/.storybook/components/Form/components/Row.js
+++ b/addons/a11y/.storybook/components/Form/components/Row.js
@@ -15,7 +15,11 @@ function Row({ label, input }) {
 
 Row.propTypes = {
   label: PropTypes.instanceOf(Label),
-  input: PropTypes.instanceOf(Input),
-}
+  input: PropTypes.instanceOf(Input).isRequired,
+};
+
+Row.defaultProps = {
+  label: null,
+};
 
 export default Row;
diff --git a/addons/a11y/.storybook/components/Form/components/index.js b/addons/a11y/.storybook/components/Form/components/index.js
index 0a9ea851f8e..c893c0a55dd 100644
--- a/addons/a11y/.storybook/components/Form/components/index.js
+++ b/addons/a11y/.storybook/components/Form/components/index.js
@@ -2,8 +2,4 @@ import Input from './Input';
 import Label from './Label';
 import Row from './Row';
 
-export {
-  Input,
-  Label,
-  Row,
-};
+export { Input, Label, Row };
diff --git a/addons/a11y/.storybook/components/Form/stories.js b/addons/a11y/.storybook/components/Form/stories.js
index 9cee34f84a4..2136b4fa8cf 100644
--- a/addons/a11y/.storybook/components/Form/stories.js
+++ b/addons/a11y/.storybook/components/Form/stories.js
@@ -1,36 +1,20 @@
 import React from 'react';
+import { storiesOf } from '@storybook/react';
+import Faker from 'faker';
 
 import * as Form from './components';
 
-import { storiesOf } from '@storybook/react';
 import { checkA11y } from './../../../src';
 
-import Faker from 'faker';
-
 const label = Faker.lorem.word();
 const placeholder = Faker.lorem.word();
 
 storiesOf('<Form />', module)
   .addDecorator(checkA11y)
-  .add('Without Label', () => (
-    <Form.Row
-      input={<Form.Input />}
-    />
-  ))
-  .add ('With label', () => (
-    <Form.Row
-      label={<Form.Label
-        content={label}
-        id="1"
-      />}
-      input={<Form.Input id="1" />}
-    />
-  ))
-  .add ('With placeholder', () => (
-    <Form.Row
-      input={<Form.Input
-        id="1"
-        placeholder={placeholder}
-      />}
-    />
+  .add('Without Label', () => <Form.Row input={<Form.Input />} />)
+  .add('With label', () => (
+    <Form.Row label={<Form.Label content={label} id="1" />} input={<Form.Input id="1" />} />
   ))
+  .add('With placeholder', () => (
+    <Form.Row input={<Form.Input id="1" placeholder={placeholder} />} />
+  ));
diff --git a/addons/a11y/.storybook/components/Image/component.js b/addons/a11y/.storybook/components/Image/component.js
index 62a51a77c1e..43faa4516dd 100644
--- a/addons/a11y/.storybook/components/Image/component.js
+++ b/addons/a11y/.storybook/components/Image/component.js
@@ -2,13 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 function Image({ src, alt, presentation }) {
-  return (
-    <img
-      src={src}
-      alt={alt}
-      role={presentation && 'presentation'}
-    />
-  );
+  return <img src={src} alt={alt} role={presentation && 'presentation'} />;
 }
 
 Image.propTypes = {
@@ -17,4 +11,9 @@ Image.propTypes = {
   presentation: PropTypes.bool,
 };
 
+Image.defaultProps = {
+  alt: null,
+  presentation: false,
+};
+
 export default Image;
diff --git a/addons/a11y/.storybook/components/Image/stories.js b/addons/a11y/.storybook/components/Image/stories.js
index f878d38fe41..93cd73a9005 100644
--- a/addons/a11y/.storybook/components/Image/stories.js
+++ b/addons/a11y/.storybook/components/Image/stories.js
@@ -1,29 +1,16 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
+import Faker from 'faker';
 
 import { checkA11y } from './../../../src';
 
 import Image from './component';
 
-import Faker from 'faker';
-
 const image = Faker.image.animals();
 const alt = Faker.lorem.words();
 
 storiesOf('<Image />', module)
   .addDecorator(checkA11y)
-  .add('Without alt', () => (
-    <Image src={image} />
-  ))
-  .add('With alt', () => (
-    <Image
-      src={image}
-      alt={alt}
-    />
-  ))
-  .add('Presentation', () => (
-    <Image
-      presentation
-      src={image}
-    />
-  ));
+  .add('Without alt', () => <Image src={image} />)
+  .add('With alt', () => <Image src={image} alt={alt} />)
+  .add('Presentation', () => <Image presentation src={image} />);
diff --git a/addons/a11y/.storybook/components/Typography/components/Heading.js b/addons/a11y/.storybook/components/Typography/components/Heading.js
index c338fc3ae4d..980015cd91f 100644
--- a/addons/a11y/.storybook/components/Typography/components/Heading.js
+++ b/addons/a11y/.storybook/components/Typography/components/Heading.js
@@ -1,20 +1,20 @@
-import React, { cloneElement } from 'react';
+import { createElement } from 'react';
 import PropTypes from 'prop-types';
 
 const headings = {
-  1: (<h1 />),
-  2: (<h2 />),
-  3: (<h3 />),
-  4: (<h4 />),
+  1: 'h1',
+  2: 'h2',
+  3: 'h3',
+  4: 'h4',
 };
 
 function Heading({ level, children }) {
-  return cloneElement(headings[level], {}, children)
+  return createElement(headings[level], {}, children);
 }
 
 Heading.propTypes = {
   level: PropTypes.oneOf([1, 2, 3, 4]),
-  children: PropTypes.any,
+  children: PropTypes.node,
 };
 
 Heading.defaultProps = {
diff --git a/addons/a11y/.storybook/components/Typography/components/Link.js b/addons/a11y/.storybook/components/Typography/components/Link.js
index 10085c6896a..6dc7887705f 100644
--- a/addons/a11y/.storybook/components/Typography/components/Link.js
+++ b/addons/a11y/.storybook/components/Typography/components/Link.js
@@ -2,16 +2,12 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 function Link({ href, content }) {
-  return (
-    <a href={href}>
-      { content }
-    </a>
-  );
+  return <a href={href}>{content}</a>;
 }
 
 Link.propTypes = {
-  href: PropTypes.string,
-  content: PropTypes.string,
+  href: PropTypes.string.isRequired,
+  content: PropTypes.string.isRequired,
 };
 
 export default Link;
diff --git a/addons/a11y/.storybook/components/Typography/components/Text.js b/addons/a11y/.storybook/components/Typography/components/Text.js
index e7228d71c10..50407f577e8 100644
--- a/addons/a11y/.storybook/components/Typography/components/Text.js
+++ b/addons/a11y/.storybook/components/Typography/components/Text.js
@@ -2,15 +2,11 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 function Text({ children }) {
-  return (
-    <p>
-      {children}
-    </p>
-  );
+  return <p>{children}</p>;
 }
 
 Text.propTypes = {
-  children: PropTypes.any,
+  children: PropTypes.node.isRequired,
 };
 
 export default Text;
diff --git a/addons/a11y/.storybook/components/Typography/components/index.js b/addons/a11y/.storybook/components/Typography/components/index.js
index 2b5d7e62598..0fea22bde1e 100644
--- a/addons/a11y/.storybook/components/Typography/components/index.js
+++ b/addons/a11y/.storybook/components/Typography/components/index.js
@@ -2,8 +2,4 @@ import Heading from './Heading';
 import Link from './Link';
 import Text from './Text';
 
-export {
-  Heading,
-  Link,
-  Text,
-};
+export { Heading, Link, Text };
diff --git a/addons/a11y/.storybook/components/Typography/stories.js b/addons/a11y/.storybook/components/Typography/stories.js
index caa3d3e49a3..6c4a50b82ca 100644
--- a/addons/a11y/.storybook/components/Typography/stories.js
+++ b/addons/a11y/.storybook/components/Typography/stories.js
@@ -1,41 +1,26 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
+import Faker from 'faker';
 
 import { checkA11y } from './../../../src';
 
 import * as Typography from './components';
 
-import Faker from 'faker';
-
-const href = "javascript:void 0";
+// eslint-disable-next-line no-script-url
+const href = 'javascript:void 0';
 
 storiesOf('<Typography />', module)
   .addDecorator(checkA11y)
   .add('Correct', () => (
     <div>
-      <Typography.Heading level={1}>
-        {Faker.lorem.sentence()}
-      </Typography.Heading>
+      <Typography.Heading level={1}>{Faker.lorem.sentence()}</Typography.Heading>
 
-      <Typography.Text>
-        {Faker.lorem.paragraph()}
-      </Typography.Text>
+      <Typography.Text>{Faker.lorem.paragraph()}</Typography.Text>
 
-      <Typography.Link
-        content={`${Faker.lorem.words(4)}...`}
-        href={href}
-      />
+      <Typography.Link content={`${Faker.lorem.words(4)}...`} href={href} />
     </div>
   ))
-  .add('Empty Heading', () => (
-    <Typography.Heading level={2} />
-  ))
-  .add('Empty Paragraph', () => (
-    <Typography.Text />
-  ))
-  .add('Empty Link', () => (
-    <Typography.Link href={href} />
-  ))
-  .add('Link without href', () => (
-    <Typography.Link content={`${Faker.lorem.words(4)}...`} />
-  ));
+  .add('Empty Heading', () => <Typography.Heading level={2} />)
+  .add('Empty Paragraph', () => <Typography.Text />)
+  .add('Empty Link', () => <Typography.Link href={href} />)
+  .add('Link without href', () => <Typography.Link content={`${Faker.lorem.words(4)}...`} />);
diff --git a/addons/a11y/.storybook/config.js b/addons/a11y/.storybook/config.js
index a5f560d3f48..f7c1e980257 100755
--- a/addons/a11y/.storybook/config.js
+++ b/addons/a11y/.storybook/config.js
@@ -1,9 +1,7 @@
 import * as storybook from '@storybook/react';
 
-const req = require.context('./components/', true, /stories\.js$/)
+const req = require.context('./components/', true, /stories\.js$/);
 
-const loadStories = () =>
-  req.keys().forEach(req);
+const loadStories = () => req.keys().forEach(req);
 
-
-storybook.configure(loadStories, module)
+storybook.configure(loadStories, module);
diff --git a/addons/a11y/README.md b/addons/a11y/README.md
index 91d05131266..91753e7658a 100755
--- a/addons/a11y/README.md
+++ b/addons/a11y/README.md
@@ -2,6 +2,8 @@
 
 This storybook addon can be helpfull to make your UI components more accessibile.
 
+[Framework Support](https://github.com/storybooks/storybook/blob/master/ADDONS_SUPPORT.md)
+
 ![](docs/screenshot.png)
 
 ## Getting started
diff --git a/addons/a11y/package.json b/addons/a11y/package.json
index 9d37046cf0f..9f1a5b4bb36 100644
--- a/addons/a11y/package.json
+++ b/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "a11y addon for storybook",
   "keywords": [
     "a11y",
@@ -25,9 +25,16 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/components": "^3.4.0-alpha.0",
+    "@storybook/components": "^3.4.0-alpha.9",
     "axe-core": "^2.6.1",
-    "prop-types": "^15.6.0"
+    "babel-runtime": "^6.26.0",
+    "glamor": "^2.20.40",
+    "glamorous": "^4.11.6",
+    "prop-types": "^15.6.1"
+  },
+  "devDependencies": {
+    "@storybook/react": "^3.4.0-alpha.9",
+    "faker": "^4.1.0"
   },
   "peerDependencies": {
     "@storybook/addons": "^3.3.0",
diff --git a/addons/a11y/src/components/Panel.js b/addons/a11y/src/components/Panel.js
index 8b7b0416a88..191b214afc4 100644
--- a/addons/a11y/src/components/Panel.js
+++ b/addons/a11y/src/components/Panel.js
@@ -6,10 +6,10 @@ import Report from './Report';
 
 const styles = {
   passes: {
-    color: '#2ecc71',
+    color: '#0D6731',
   },
   violations: {
-    color: '#e74c3c',
+    color: '#AC2300',
   },
 };
 
@@ -47,11 +47,11 @@ class Panel extends Component {
       <Tabs
         tabs={[
           {
-            label: <span style={styles.violations}>Violations</span>,
+            label: <span style={styles.violations}>{violations.length} Violations</span>,
             panel: <Report passes={false} items={violations} empty="No a11y violations found." />,
           },
           {
-            label: <span style={styles.passes}>Passes</span>,
+            label: <span style={styles.passes}>{passes.length} Passes</span>,
             panel: <Report passes items={passes} empty="No a11y check passed" />,
           },
         ]}
diff --git a/addons/a11y/src/components/Report/RerunButton.js b/addons/a11y/src/components/Report/RerunButton.js
new file mode 100644
index 00000000000..659f1417ffa
--- /dev/null
+++ b/addons/a11y/src/components/Report/RerunButton.js
@@ -0,0 +1,17 @@
+import glamorous from 'glamorous';
+
+const RerunButton = glamorous.button({
+  position: 'absolute',
+  bottom: 0,
+  right: 0,
+  border: 'none',
+  borderTop: 'solid 1px rgba(0, 0, 0, 0.2)',
+  borderLeft: 'solid 1px rgba(0, 0, 0, 0.2)',
+  background: 'rgba(255, 255, 255, 0.5)',
+  padding: '5px 10px',
+  borderRadius: '4px 0 0 0',
+  color: 'rgba(0, 0, 0, 0.5)',
+  textTransform: 'uppercase',
+});
+
+export default RerunButton;
diff --git a/addons/a11y/src/components/Report/index.js b/addons/a11y/src/components/Report/index.js
index f92cb13a635..28b10047b03 100644
--- a/addons/a11y/src/components/Report/index.js
+++ b/addons/a11y/src/components/Report/index.js
@@ -1,6 +1,7 @@
-import React from 'react';
+import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
-
+import addons from '@storybook/addons';
+import RerunButton from './RerunButton';
 import Item from './Item';
 
 const styles = {
@@ -17,17 +18,23 @@ const styles = {
   },
 };
 
-function Report({ items, empty, passes }) {
-  if (items.length) {
-    return (
+function onRerunClick() {
+  const channel = addons.getChannel();
+  channel.emit('addon:a11y:rerun');
+}
+
+const Report = ({ items, empty, passes }) => (
+  <Fragment>
+    {items.length ? (
       <div style={styles.container}>
         {items.map(item => <Item passes={passes} item={item} key={item.id} />)}
       </div>
-    );
-  }
-
-  return <span style={styles.empty}>{empty}</span>;
-}
+    ) : (
+      <span style={styles.empty}>{empty}</span>
+    )}
+    <RerunButton onClick={onRerunClick}>Re-run tests</RerunButton>
+  </Fragment>
+);
 
 Report.propTypes = {
   items: PropTypes.arrayOf(
diff --git a/addons/a11y/src/components/Tabs.js b/addons/a11y/src/components/Tabs.js
index 12f8b27dea2..d52fcf54746 100644
--- a/addons/a11y/src/components/Tabs.js
+++ b/addons/a11y/src/components/Tabs.js
@@ -5,6 +5,7 @@ import { baseFonts } from '@storybook/components';
 const styles = {
   container: {
     width: '100%',
+    position: 'relative',
     ...baseFonts,
   },
   tabs: {
diff --git a/addons/a11y/src/components/WrapStory.js b/addons/a11y/src/components/WrapStory.js
index ffb43cee017..c21db1925fd 100644
--- a/addons/a11y/src/components/WrapStory.js
+++ b/addons/a11y/src/components/WrapStory.js
@@ -15,8 +15,24 @@ class WrapStory extends Component {
     channel: {},
   };
 
-  /* eslint-disable react/no-find-dom-node */
+  constructor(props) {
+    super(props);
+    this.runA11yCheck = this.runA11yCheck.bind(this);
+  }
+
   componentDidMount() {
+    const { channel } = this.props;
+    channel.on('addon:a11y:rerun', this.runA11yCheck);
+    this.runA11yCheck();
+  }
+
+  componentWillUnmount() {
+    const { channel } = this.props;
+    channel.removeListener('addon:a11y:rerun', this.runA11yCheck);
+  }
+
+  /* eslint-disable react/no-find-dom-node */
+  runA11yCheck() {
     const { channel } = this.props;
     const wrapper = findDOMNode(this);
 
diff --git a/addons/actions/README.md b/addons/actions/README.md
index b7706c71cd5..4d6d3ea1583 100644
--- a/addons/actions/README.md
+++ b/addons/actions/README.md
@@ -11,10 +11,7 @@
 
 Storybook Addon Actions can be used to display data received by event handlers in [Storybook](https://storybook.js.org).
 
-This addon works with Storybook for:
-- [React](https://github.com/storybooks/storybook/tree/master/app/react)
-- [React Native](https://github.com/storybooks/storybook/tree/master/app/react-native)
-- [Vue](https://github.com/storybooks/storybook/tree/master/app/vue).
+[Framework Support](https://github.com/storybooks/storybook/blob/master/ADDONS_SUPPORT.md)
 
 ![Screenshot](docs/screenshot.png)
 
diff --git a/addons/actions/package.json b/addons/actions/package.json
index 78a5791f838..ffb4c61f69a 100644
--- a/addons/actions/package.json
+++ b/addons/actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "Action Logger addon for storybook",
   "keywords": [
     "storybook"
@@ -20,12 +20,16 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
+    "@storybook/components": "^3.4.0-alpha.9",
+    "babel-runtime": "^6.26.0",
     "deep-equal": "^1.0.1",
+    "glamor": "^2.20.40",
+    "glamorous": "^4.11.6",
     "global": "^4.3.2",
-    "make-error": "^1.3.2",
-    "prop-types": "^15.6.0",
+    "make-error": "^1.3.4",
+    "prop-types": "^15.6.1",
     "react-inspector": "^2.2.2",
-    "uuid": "^3.1.0"
+    "uuid": "^3.2.1"
   },
   "peerDependencies": {
     "@storybook/addons": "^3.3.0",
diff --git a/addons/actions/register.js b/addons/actions/register.js
index e69edbea3ed..9232e6c069d 100644
--- a/addons/actions/register.js
+++ b/addons/actions/register.js
@@ -1 +1 @@
-require('./dist').register();
+require('./dist/manager').register();
diff --git a/addons/actions/src/components/ActionLogger/index.js b/addons/actions/src/components/ActionLogger/index.js
index 80d6c6369d0..a22ec9e703a 100644
--- a/addons/actions/src/components/ActionLogger/index.js
+++ b/addons/actions/src/components/ActionLogger/index.js
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Inspector from 'react-inspector';
-import style from './style';
+import { Actions, Action, Button, Wrapper, InspectorContainer, Countwrap, Counter } from './style';
 
 class ActionLogger extends Component {
   getActionData() {
@@ -9,30 +9,28 @@ class ActionLogger extends Component {
   }
 
   renderAction(action) {
-    const counter = <div style={style.counter}>{action.count}</div>;
+    const counter = <Counter>{action.count}</Counter>;
     return (
-      <div key={action.id} style={style.action}>
-        <div style={style.countwrap}>{action.count > 1 && counter}</div>
-        <div style={style.inspector}>
+      <Action key={action.id}>
+        <Countwrap>{action.count > 1 && counter}</Countwrap>
+        <InspectorContainer>
           <Inspector
             sortObjectKeys
             showNonenumerable={false}
             name={action.data.name}
             data={action.data.args || action.data}
           />
-        </div>
-      </div>
+        </InspectorContainer>
+      </Action>
     );
   }
 
   render() {
     return (
-      <div style={style.wrapper}>
-        <pre style={style.actions}>{this.getActionData()}</pre>
-        <button style={style.button} onClick={this.props.onClear}>
-          CLEAR
-        </button>
-      </div>
+      <Wrapper>
+        <Actions>{this.getActionData()}</Actions>
+        <Button onClick={this.props.onClear}>Clear</Button>
+      </Wrapper>
     );
   }
 }
diff --git a/addons/actions/src/components/ActionLogger/style.js b/addons/actions/src/components/ActionLogger/style.js
index b7afc052405..1784321bb82 100644
--- a/addons/actions/src/components/ActionLogger/style.js
+++ b/addons/actions/src/components/ActionLogger/style.js
@@ -1,49 +1,53 @@
-export default {
-  wrapper: {
-    flex: 1,
-    display: 'flex',
-    position: 'relative',
-  },
-  actions: {
-    flex: 1,
-    margin: 0,
-    padding: '8px 2px 20px 0',
-    overflowY: 'auto',
-    color: '#666',
-  },
-  action: {
-    display: 'flex',
-    padding: '3px 3px 3px 0',
-    borderLeft: '5px solid white',
-    borderBottom: '1px solid #fafafa',
-    transition: 'all 0.1s',
-    alignItems: 'start',
-  },
-  countwrap: {
-    paddingBottom: 2,
-  },
-  counter: {
-    margin: '0 5px 0 5px',
-    backgroundColor: '#777777',
-    color: '#ffffff',
-    padding: '1px 5px',
-    borderRadius: '20px',
-  },
-  inspector: {
-    flex: 1,
-    padding: '0 0 0 5px',
-  },
-  button: {
-    position: 'absolute',
-    bottom: 0,
-    right: 0,
-    border: 'none',
-    borderTop: 'solid 1px rgba(0, 0, 0, 0.2)',
-    borderLeft: 'solid 1px rgba(0, 0, 0, 0.2)',
-    background: 'rgba(255, 255, 255, 0.5)',
-    padding: '5px 10px',
-    borderRadius: '4px 0 0 0',
-    color: 'rgba(0, 0, 0, 0.5)',
-    outline: 'none',
-  },
-};
+import glamorous from 'glamorous';
+import { Button as BaseButton } from '@storybook/components';
+
+export const Actions = glamorous.pre({
+  flex: 1,
+  margin: 0,
+  padding: '8px 2px 20px 0',
+  overflowY: 'auto',
+  color: '#666',
+});
+
+export const Action = glamorous.div({
+  display: 'flex',
+  padding: '3px 3px 3px 0',
+  borderLeft: '5px solid white',
+  borderBottom: '1px solid #fafafa',
+  transition: 'all 0.1s',
+  alignItems: 'start',
+});
+
+export const Button = glamorous(BaseButton)({
+  position: 'absolute',
+  bottom: 0,
+  right: 0,
+  borderRadius: '4px 0 0 0',
+  textTransform: 'uppercase',
+  letterSpacing: 1,
+  paddingTop: 5,
+  paddingBootom: 5,
+});
+
+export const Counter = glamorous.div({
+  margin: '0 5px 0 5px',
+  backgroundColor: '#777777',
+  color: '#ffffff',
+  padding: '1px 5px',
+  borderRadius: '20px',
+});
+
+export const Countwrap = glamorous.div({
+  paddingBottom: 2,
+});
+
+export const InspectorContainer = glamorous.div({
+  flex: 1,
+  padding: '0 0 0 5px',
+});
+
+export const Wrapper = glamorous.div({
+  flex: 1,
+  display: 'flex',
+  position: 'relative',
+});
diff --git a/addons/actions/src/index.js b/addons/actions/src/index.js
index 549b155e9c1..2634da6e8a3 100644
--- a/addons/actions/src/index.js
+++ b/addons/actions/src/index.js
@@ -3,5 +3,4 @@ export const ADDON_ID = 'storybook/actions';
 export const PANEL_ID = `${ADDON_ID}/actions-panel`;
 export const EVENT_ID = `${ADDON_ID}/action-event`;
 
-export { register } from './manager';
 export { action, decorateAction } from './preview';
diff --git a/addons/actions/src/lib/util/index.js b/addons/actions/src/lib/util/index.js
index 1876a07678b..f10fd4416c6 100644
--- a/addons/actions/src/lib/util/index.js
+++ b/addons/actions/src/lib/util/index.js
@@ -1,7 +1,7 @@
-export canConfigureName from './canConfigureName.js';
-export getPropertiesList from './getPropertiesList.js';
-export isObject from './isObject.js';
-export muteProperty from './muteProperty.js';
+export canConfigureName from './canConfigureName';
+export getPropertiesList from './getPropertiesList';
+export isObject from './isObject';
+export muteProperty from './muteProperty';
 export prepareArguments from './prepareArguments';
-export typeReviver from './typeReviver.js';
-export typeReplacer from './typeReplacer.js';
+export typeReviver from './typeReviver';
+export typeReplacer from './typeReplacer';
diff --git a/addons/actions/src/preview.js b/addons/actions/src/preview.js
index fc2457b3260..1df9c39c291 100644
--- a/addons/actions/src/preview.js
+++ b/addons/actions/src/preview.js
@@ -1,5 +1,3 @@
-/* eslint-disable no-underscore-dangle */
-
 import addons from '@storybook/addons';
 import uuid from 'uuid/v1';
 import { EVENT_ID } from './';
@@ -24,11 +22,9 @@ export function action(name) {
 }
 
 export function decorateAction(decorators) {
-  // eslint-disable-next-line no-unused-vars, func-names
-  return function(name) {
+  return name => {
     const callAction = action(name);
-    // eslint-disable-next-line no-unused-vars, func-names
-    return function(..._args) {
+    return (..._args) => {
       const decorated = decorators.reduce((args, fn) => fn(args), _args);
       callAction(...decorated);
     };
diff --git a/addons/background/README.md b/addons/background/README.md
index fbb60721d43..0dae593a512 100644
--- a/addons/background/README.md
+++ b/addons/background/README.md
@@ -3,24 +3,22 @@
 [![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)
 
 * * *
 
-Storybook Centered Decorator can be used to center components inside the preview in [Storybook](https://storybook.js.org).
+Storybook Background Addon can be used to change background colors inside the preview in [Storybook](https://storybook.js.org).
 
-This addon works with Storybook for:
-
--   [React](https://github.com/storybooks/storybook/tree/master/app/react)
+[Framework Support](https://github.com/storybooks/storybook/blob/master/ADDONS_SUPPORT.md)
 
 ![React Storybook Screenshot](https://storybook.js.org/img/addon-backgrounds.gif)
 
 ## Installation
 
 ```sh
-npm i --save @storybook/addon-backgrounds
+npm i -D @storybook/addon-backgrounds
 ```
 
 ## Configuration
diff --git a/addons/background/package.json b/addons/background/package.json
index 973c56189de..24643928a4d 100644
--- a/addons/background/package.json
+++ b/addons/background/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "A storybook addon to show different backgrounds for your preview",
   "keywords": [
     "addon",
@@ -24,7 +24,9 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "prop-types": "^15.6.0"
+    "babel-runtime": "^6.26.0",
+    "global": "^4.3.2",
+    "prop-types": "^15.6.1"
   },
   "peerDependencies": {
     "@storybook/addons": "^3.3.0",
diff --git a/addons/background/src/BackgroundPanel.js b/addons/background/src/BackgroundPanel.js
index c5c8984215b..de06c23e0f6 100644
--- a/addons/background/src/BackgroundPanel.js
+++ b/addons/background/src/BackgroundPanel.js
@@ -1,15 +1,21 @@
+import { document } from 'global';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import addons from '@storybook/addons';
 
 import Swatch from './Swatch';
 
+const storybookIframe = 'storybook-preview-iframe';
+
 const style = {
   font: {
     fontFamily:
       "-apple-system,'.SFNSText-Regular', 'San Francisco', Roboto, 'Segoe UI', 'Helvetica Neue', 'Lucida Grande', sans-serif",
     fontSize: '14px',
   },
+  iframe: {
+    transition: 'background 0.25s ease-in-out',
+  },
 };
 
 const defaultBackground = {
@@ -73,10 +79,10 @@ export default class BackgroundPanel extends Component {
       const currentBackground = api.getQueryParam('background');
 
       if (currentBackground) {
-        this.setBackgroundInPreview(currentBackground);
+        this.updateIframe(currentBackground);
       } else if (backgrounds.filter(x => x.default).length) {
         const defaultBgs = backgrounds.filter(x => x.default);
-        this.setBackgroundInPreview(defaultBgs[0].value);
+        this.updateIframe(defaultBgs[0].value);
       }
     });
 
@@ -86,13 +92,27 @@ export default class BackgroundPanel extends Component {
     });
   }
 
-  setBackgroundInPreview = background => this.channel.emit('background', background);
+  componentDidMount() {
+    this.iframe = document.getElementById(storybookIframe);
+
+    if (!this.iframe) {
+      throw new Error('Cannot find Storybook iframe');
+    }
+
+    Object.keys(style.iframe).forEach(prop => {
+      this.iframe.style[prop] = style.iframe[prop];
+    });
+  }
 
   setBackgroundFromSwatch = background => {
-    this.setBackgroundInPreview(background);
+    this.updateIframe(background);
     this.props.api.setQueryParams({ background });
   };
 
+  updateIframe(background) {
+    this.iframe.style.background = background;
+  }
+
   render() {
     const backgrounds = [...this.state.backgrounds];
 
diff --git a/addons/background/src/__tests__/BackgroundPanel.js b/addons/background/src/__tests__/BackgroundPanel.js
index dd37d25380c..2489d4c9d01 100644
--- a/addons/background/src/__tests__/BackgroundPanel.js
+++ b/addons/background/src/__tests__/BackgroundPanel.js
@@ -17,6 +17,16 @@ const mockedApi = {
 };
 const channel = new EventEmitter();
 
+jest.mock('global', () => ({
+  document: {
+    getElementById() {
+      return {
+        style: {},
+      };
+    },
+  },
+}));
+
 describe('Background Panel', () => {
   it('should exist', () => {
     const backgroundPanel = shallow(<BackgroundPanel channel={channel} api={mockedApi} />);
@@ -105,19 +115,18 @@ describe('Background Panel', () => {
     expect(backgroundPanel.state('backgrounds')).toHaveLength(0);
   });
 
-  it('should pass the event from swatch clicks through the provided channel', () => {
+  it('should set iframe background', () => {
     const SpiedChannel = new EventEmitter();
     const backgroundPanel = mount(<BackgroundPanel channel={SpiedChannel} api={mockedApi} />);
     backgroundPanel.setState({ backgrounds }); // force re-render
 
-    const spy = jest.fn();
-    SpiedChannel.on('background', spy);
-
     backgroundPanel
       .find('h4')
       .first()
       .simulate('click');
 
-    expect(spy).toBeCalledWith(backgrounds[0].value);
+    expect(backgroundPanel.instance().iframe.style).toMatchObject({
+      background: backgrounds[0].value,
+    });
   });
 });
diff --git a/addons/background/src/__tests__/index.js b/addons/background/src/__tests__/index.js
index d097228959c..1a3fdb5c52f 100644
--- a/addons/background/src/__tests__/index.js
+++ b/addons/background/src/__tests__/index.js
@@ -16,34 +16,6 @@ describe('Background Decorator', () => {
     expect(backgroundDecorator).toBeDefined();
   });
 
-  it('should initially have a transparent background state', () => {
-    const SpiedChannel = new EventEmitter();
-    const backgroundDecorator = shallow(
-      <BackgroundDecorator story={testStory} channel={SpiedChannel} />
-    );
-
-    expect(backgroundDecorator.state().background).toBe('transparent');
-  });
-
-  it('should have a background matching its state', () => {
-    const SpiedChannel = new EventEmitter();
-    const backgroundDecorator = shallow(
-      <BackgroundDecorator story={testStory} channel={SpiedChannel} />
-    );
-
-    expect(backgroundDecorator.html().match(/background:transparent/gim)).toHaveLength(1);
-  });
-
-  it('should set internal state when background event called', () => {
-    const SpiedChannel = new EventEmitter();
-    const backgroundDecorator = shallow(
-      <BackgroundDecorator story={testStory} channel={SpiedChannel} />
-    );
-
-    SpiedChannel.emit('background', '#123456');
-    expect(backgroundDecorator.state().background).toBe('#123456');
-  });
-
   it('should send background-unset event when the component unmounts', () => {
     const SpiedChannel = new EventEmitter();
     const backgroundDecorator = shallow(
diff --git a/addons/background/src/index.js b/addons/background/src/index.js
index ac0c1a65f59..d74e08d6da5 100644
--- a/addons/background/src/index.js
+++ b/addons/background/src/index.js
@@ -3,21 +3,6 @@ import PropTypes from 'prop-types';
 
 import addons from '@storybook/addons';
 
-const style = {
-  wrapper: {
-    overflow: 'scroll',
-    position: 'fixed',
-    top: 0,
-    bottom: 0,
-    right: 0,
-    left: 0,
-    transition: 'background 0.25s ease-in-out',
-    backgroundPosition: 'center',
-    backgroundSize: 'cover',
-    background: 'transparent',
-  },
-};
-
 export class BackgroundDecorator extends React.Component {
   constructor(props) {
     super(props);
@@ -31,13 +16,10 @@ export class BackgroundDecorator extends React.Component {
       this.channel = addons.getChannel();
     }
 
-    this.state = { background: 'transparent' };
-
     this.story = story();
   }
 
   componentWillMount() {
-    this.channel.on('background', this.setBackground);
     this.channel.emit('background-set', this.props.backgrounds);
   }
 
@@ -48,16 +30,11 @@ export class BackgroundDecorator extends React.Component {
   }
 
   componentWillUnmount() {
-    this.channel.removeListener('background', this.setBackground);
     this.channel.emit('background-unset');
   }
 
-  setBackground = background => this.setState({ background });
-
   render() {
-    const styles = style.wrapper;
-    styles.background = this.state.background;
-    return <div style={Object.assign({}, styles)}>{this.story}</div>;
+    return this.story;
   }
 }
 BackgroundDecorator.propTypes = {
diff --git a/addons/centered/README.md b/addons/centered/README.md
index 45e7dedde70..f7298db3288 100644
--- a/addons/centered/README.md
+++ b/addons/centered/README.md
@@ -11,10 +11,7 @@
 
 Storybook Centered Decorator can be used to center components inside the preview in [Storybook](https://storybook.js.org).
 
-This addon works with Storybook for:
-
--   [React](https://github.com/storybooks/storybook/tree/master/app/react)
--   [Vue](https://github.com/storybooks/storybook/tree/master/app/vue)
+[Framework Support](https://github.com/storybooks/storybook/blob/master/ADDONS_SUPPORT.md)
 
 ### Usage
 
diff --git a/addons/centered/example/index.js b/addons/centered/example/index.js
index 85507ca3f1f..cdefc6801ed 100644
--- a/addons/centered/example/index.js
+++ b/addons/centered/example/index.js
@@ -1,6 +1,7 @@
-import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
-import decorator from '../index';
+import { document } from 'global';
+
+import decorator from '../src';
 
 const content = decorator(() => 'Hello World!');
 const wrapper = document.querySelector('#content');
diff --git a/addons/centered/package.json b/addons/centered/package.json
index 9b3a906345c..b76680ad85f 100644
--- a/addons/centered/package.json
+++ b/addons/centered/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-centered",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "Storybook decorator to center components",
   "license": "MIT",
   "author": "Muhammed Thanish <mnmtanish@gmail.com>",
@@ -10,8 +10,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
+    "babel-runtime": "^6.26.0",
     "global": "^4.3.2"
   },
+  "devDependencies": {
+    "react-dom": "^16.2.0"
+  },
   "peerDependencies": {
     "react": "*"
   }
diff --git a/addons/events/README.md b/addons/events/README.md
index 2d472c4eb45..81636b354b0 100644
--- a/addons/events/README.md
+++ b/addons/events/README.md
@@ -11,6 +11,8 @@
 
 This [storybook](https://storybooks.js.org) ([source](https://github.com/storybooks/storybook)) addon allows you to add events for your stories.
 
+[Framework Support](https://github.com/storybooks/storybook/blob/master/ADDONS_SUPPORT.md)
+
 ![Storybook Addon Events Example](docs/demo1.png)
 [Storybook Addon Events Live Demo](https://z4o4z.github.io/storybook-addon-events/index.html)
 
@@ -25,8 +27,8 @@ Then create a file called `addons.js` in your storybook config.
 Add following content to it:
 
 ```js
-import '@storybook/addon-actions';
-import '@storybook/addon-links';
+import '@storybook/addon-actions/register';
+import '@storybook/addon-links/register';
 import '@storybook/addon-events/register';
 ```
 
diff --git a/addons/events/docs/.DS_Store b/addons/events/docs/.DS_Store
deleted file mode 100644
index 817e5e65edf..00000000000
Binary files a/addons/events/docs/.DS_Store and /dev/null differ
diff --git a/addons/events/package.json b/addons/events/package.json
index 79ea6761e5f..44ff92d2c02 100644
--- a/addons/events/package.json
+++ b/addons/events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-events",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "Add events to your Storybook stories.",
   "keywords": [
     "addon",
@@ -23,9 +23,8 @@
   "dependencies": {
     "babel-runtime": "^6.26.0",
     "format-json": "^1.0.3",
-    "prop-types": "^15.6.0",
-    "react-textarea-autosize": "^5.2.1",
-    "uuid": "^3.1.0"
+    "prop-types": "^15.6.1",
+    "react-textarea-autosize": "^5.2.1"
   },
   "peerDependencies": {
     "@storybook/addons": "^3.3.0",
diff --git a/addons/events/register.js b/addons/events/register.js
index e69edbea3ed..9232e6c069d 100644
--- a/addons/events/register.js
+++ b/addons/events/register.js
@@ -1 +1 @@
-require('./dist').register();
+require('./dist/manager').register();
diff --git a/addons/events/src/components/Event.js b/addons/events/src/components/Event.js
index 100624c47e5..33165b96d7d 100644
--- a/addons/events/src/components/Event.js
+++ b/addons/events/src/components/Event.js
@@ -145,7 +145,9 @@ export default class Item extends Component {
           disabled={failed}
           title="Submit event"
         >
-          📢
+          <span role="img" aria-label="loudspeaker">
+            📢
+          </span>
         </button>
         <Textarea
           id={`addon-event-${name}`}
@@ -155,11 +157,15 @@ export default class Item extends Component {
         />
         {isTextAreaShowed ? (
           <button style={styles.button} onClick={this.onToggleEditClick} title="Close editing">
-            ❌
+            <span role="img" aria-label="cross">
+              ❌
+            </span>
           </button>
         ) : (
           <button style={styles.button} onClick={this.onToggleEditClick} title="Edit event payload">
-            ✏️
+            <span role="img" aria-label="pencil">
+              ✏️
+            </span>
           </button>
         )}
       </div>
diff --git a/addons/events/src/components/Panel.js b/addons/events/src/components/Panel.js
index a243893d2ae..dd4c8beff30 100644
--- 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/events/src/index.js b/addons/events/src/index.js
index a4dcd63b708..48358fbf138 100644
--- a/addons/events/src/index.js
+++ b/addons/events/src/index.js
@@ -1,3 +1 @@
 export default from './preview';
-
-export { register } from './manager';
diff --git a/addons/graphql/.storybook/config.js b/addons/graphql/.storybook/config.js
index 29599c59b5d..9c18e1bf514 100644
--- a/addons/graphql/.storybook/config.js
+++ b/addons/graphql/.storybook/config.js
@@ -1,2 +1,3 @@
 import * as storybook from '@storybook/react';
+
 storybook.configure(() => require('./stories'), module);
diff --git a/addons/graphql/.storybook/stories.js b/addons/graphql/.storybook/stories.js
index e92ed79d4b1..8e92226b510 100644
--- a/addons/graphql/.storybook/stories.js
+++ b/addons/graphql/.storybook/stories.js
@@ -1,13 +1,14 @@
-import React from 'react';
-import { storiesOf } from '@storybook/react'
-import { setupGraphiQL } from '../src'
+import { storiesOf } from '@storybook/react';
+import { setupGraphiQL } from '../src';
 
 // setup the graphiql helper which can be used with the add method later
 const graphiql = setupGraphiQL({ url: 'http://localhost:3000/graphql' });
 
-storiesOf('GraphQL Demo', module)
-  .add('get user info', graphiql(`{
+storiesOf('GraphQL Demo', module).add(
+  'get user info',
+  graphiql(`{
     user(id: "1") {
       name
     }
-  }`));
+  }`)
+);
diff --git a/addons/graphql/README.md b/addons/graphql/README.md
index 689bc9e6d22..e530d937e88 100644
--- a/addons/graphql/README.md
+++ b/addons/graphql/README.md
@@ -11,8 +11,7 @@
 
 Storybook GraphQL Addon can be used to display the GraphiQL IDE with example queries in [Storybook](https://storybook.js.org).
 
-This addon works with Storybook for:
-- [React](https://github.com/storybooks/storybook/tree/master/app/react)
+[Framework Support](https://github.com/storybooks/storybook/blob/master/ADDONS_SUPPORT.md)
 
 ![Screenshot](docs/screenshot.png)
 
diff --git a/addons/graphql/package.json b/addons/graphql/package.json
index 318487bd0d3..e1f460517c6 100644
--- a/addons/graphql/package.json
+++ b/addons/graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-graphql",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "Storybook addon to display the GraphiQL IDE",
   "keywords": [
     "storybook"
@@ -22,10 +22,14 @@
     "storybook": "start-storybook -p 9001"
   },
   "dependencies": {
+    "babel-runtime": "^6.26.0",
     "global": "^4.3.2",
     "graphiql": "^0.11.11",
-    "graphql": "^0.12.3",
-    "prop-types": "^15.6.0"
+    "graphql": "^0.13.1",
+    "prop-types": "^15.6.1"
+  },
+  "devDependencies": {
+    "@storybook/react": "^3.4.0-alpha.9"
   },
   "peerDependencies": {
     "react": "*"
diff --git a/addons/info/.storybook/config.js b/addons/info/.storybook/config.js
index 85ac9515b63..bfb85e5f9f1 100644
--- a/addons/info/.storybook/config.js
+++ b/addons/info/.storybook/config.js
@@ -2,14 +2,10 @@ import React from 'react';
 import { configure, setAddon, addDecorator } from '@storybook/react';
 import InfoAddon from '../src/';
 
-addDecorator((story) => (
-  <div style={{padding: 20}}>
-    {story()}
-  </div>
-));
+addDecorator(story => <div style={{ padding: 20 }}>{story()}</div>);
 
 setAddon(InfoAddon);
 
-configure(function () {
+configure(() => {
   require('../example/story');
 }, module);
diff --git a/addons/info/.storybook/user/modify_webpack_config.js b/addons/info/.storybook/user/modify_webpack_config.js
index 2716de914d5..75e95783687 100644
--- a/addons/info/.storybook/user/modify_webpack_config.js
+++ b/addons/info/.storybook/user/modify_webpack_config.js
@@ -1,4 +1,4 @@
-module.exports = function (config) {
+module.exports = () => {
   // This is the default webpack config defined in the `../webpack.config.js`
   // modify as you need.
 };
diff --git a/addons/info/.storybook/webpack.config.js b/addons/info/.storybook/webpack.config.js
index 115532575ea..e2343550bf3 100644
--- a/addons/info/.storybook/webpack.config.js
+++ b/addons/info/.storybook/webpack.config.js
@@ -19,7 +19,7 @@ const config = {
         test: /\.json?$/,
         loaders: ['json'],
         include: path.resolve(__dirname, '../'),
-      }
+      },
     ],
   },
 };
diff --git a/addons/info/README.md b/addons/info/README.md
index 176eab32b44..73d67032f3d 100644
--- a/addons/info/README.md
+++ b/addons/info/README.md
@@ -12,8 +12,7 @@
 Storybook Info Addon will show additional information for your stories in [Storybook](https://storybook.js.org).
 Useful when you want to display usage or other types of documentation alongside your story.
 
-This addon works with Storybook for:
-- [React](https://github.com/storybooks/storybook/tree/master/app/react)
+[Framework Support](https://github.com/storybooks/storybook/blob/master/ADDONS_SUPPORT.md)
 
 ![Screenshot](docs/home-screenshot.png)
 
diff --git a/addons/info/docs/home-screenshot.png b/addons/info/docs/home-screenshot.png
index 65e7a787c12..a590bc0a6f1 100644
Binary files a/addons/info/docs/home-screenshot.png and b/addons/info/docs/home-screenshot.png differ
diff --git a/addons/info/example/Button.js b/addons/info/example/Button.js
index df7c34c0128..70bf2aabe2a 100644
--- a/addons/info/example/Button.js
+++ b/addons/info/example/Button.js
@@ -1,20 +1,21 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 
-const Button = ({ disabled, label, style, onClick }) => (
+const Button = ({ disabled, label, onClick }) => (
   <button disabled={disabled} onClick={onClick}>
     {label}
   </button>
 );
 
-Object.assign(Button, {
-  displayName: 'Button',
-  propTypes: {
-    label: PropTypes.string.isRequired,
-    style: PropTypes.object,
-    disabled: PropTypes.bool,
-    onClick: PropTypes.func,
-  },
-});
+Button.propTypes = {
+  label: PropTypes.string.isRequired,
+  disabled: PropTypes.bool,
+  onClick: PropTypes.func,
+};
+
+Button.defaultProps = {
+  disabled: false,
+  onClick() {},
+};
 
 export default Button;
diff --git a/addons/info/example/story.js b/addons/info/example/story.js
index e927751d892..2b6be297537 100644
--- a/addons/info/example/story.js
+++ b/addons/info/example/story.js
@@ -1,21 +1,18 @@
 import React from 'react';
-import Button from './Button';
 
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
 
-storiesOf(
-  'Button'
-).addWithInfo(
+import Button from './Button';
+
+storiesOf('Button').addWithInfo(
   'simple usage',
   'This is the basic usage with the button with providing a label to show the text.',
   () => (
     <div>
       <Button label="The Button" onClick={action('onClick')} />
       <br />
-      <p>
-        Click the "?" mark at top-right to view the info.
-      </p>
+      <p>Click the "?" mark at top-right to view the info.</p>
     </div>
   )
 );
@@ -88,27 +85,22 @@ storiesOf('Button').addWithInfo(
   <div>
     <h2>This is a JSX info section</h2>
     <p>
-      Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-      Sed ornare massa rutrum metus commodo, a mattis velit dignissim.
-      Fusce vestibulum turpis sed massa egestas pharetra. Sed at libero
-      nulla.
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed ornare massa rutrum metus
+      commodo, a mattis velit dignissim. Fusce vestibulum turpis sed massa egestas pharetra. Sed at
+      libero nulla.
     </p>
     <p>
-      <a href="https://github.com/storybooks/react-storybook-addon-info">
-        This is a link
-      </a>
+      <a href="https://github.com/storybooks/react-storybook-addon-info">This is a link</a>
     </p>
     <p>
-      <img src="http://placehold.it/350x150" />
+      <img alt="350x150" src="http://placehold.it/350x150" />
     </p>
   </div>,
   () => (
     <div>
       <Button label="The Button" onClick={action('onClick')} />
       <br />
-      <p>
-        Click the "?" mark at top-right to view the info.
-      </p>
+      <p>Click the "?" mark at top-right to view the info.</p>
     </div>
   )
 );
@@ -118,18 +110,15 @@ storiesOf('Button').addWithInfo(
   <div>
     <h2>This is a JSX info section</h2>
     <p>
-      Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-      Sed ornare massa rutrum metus commodo, a mattis velit dignissim.
-      Fusce vestibulum turpis sed massa egestas pharetra. Sed at libero
-      nulla.
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed ornare massa rutrum metus
+      commodo, a mattis velit dignissim. Fusce vestibulum turpis sed massa egestas pharetra. Sed at
+      libero nulla.
     </p>
     <p>
-      <a href="https://github.com/storybooks/react-storybook-addon-info">
-        This is a link
-      </a>
+      <a href="https://github.com/storybooks/react-storybook-addon-info">This is a link</a>
     </p>
     <p>
-      <img src="http://placehold.it/350x150" />
+      <img alt="350x150" src="http://placehold.it/350x150" />
     </p>
   </div>,
   () => <Button label="The Button" onClick={action('onClick')} />,
@@ -182,11 +171,11 @@ storiesOf('Button').addWithInfo(
   () => <Button label="The Button" onClick={action('onClick')} />,
   {
     inline: true,
-    styles: stylesheet => {
-      stylesheet.infoPage = {
+    styles: stylesheet => ({
+      ...stylesheet,
+      infoPage: {
         backgroundColor: '#ccc',
-      };
-      return stylesheet;
-    },
+      },
+    }),
   }
 );
diff --git a/addons/info/package.json b/addons/info/package.json
index ab09a5323fa..fca2d2e43b0 100644
--- a/addons/info/package.json
+++ b/addons/info/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-info",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "A Storybook addon to show additional information for your stories.",
   "license": "MIT",
   "main": "dist/index.js",
@@ -15,17 +15,21 @@
     "storybook": "start-storybook -p 9010"
   },
   "dependencies": {
-    "@storybook/client-logger": "^3.4.0-alpha.0",
-    "@storybook/components": "^3.4.0-alpha.0",
+    "@storybook/client-logger": "^3.4.0-alpha.9",
+    "@storybook/components": "^3.4.0-alpha.9",
     "babel-runtime": "^6.26.0",
+    "glamor": "^2.20.40",
+    "glamorous": "^4.11.6",
     "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"
   },
   "devDependencies": {
+    "@storybook/addon-actions": "^3.4.0-alpha.9",
+    "@storybook/react": "^3.4.0-alpha.9",
     "react-test-renderer": "^16.1.0"
   },
   "peerDependencies": {
diff --git a/addons/info/src/__snapshots__/index.test.js.snap b/addons/info/src/__snapshots__/index.test.js.snap
index 2a7a1b87cfa..baccb582c91 100644
--- a/addons/info/src/__snapshots__/index.test.js.snap
+++ b/addons/info/src/__snapshots__/index.test.js.snap
@@ -34,107 +34,52 @@ containing **bold**, *cursive* text, \`code\` and [a link](https://github.com)"
     showSource={true}
     styles={[Function]}
   >
-    <div>
-      <div
-        style={
-          Object {
+    <ThemeProvider
+      theme={
+        Object {
+          "button": Object {
+            "base": Object {
+              "background": "#28c",
+              "border": "none",
+              "color": "#fff",
+              "cursor": "pointer",
+              "display": "block",
+              "fontFamily": "sans-serif",
+              "fontSize": "12px",
+              "padding": "5px 15px",
+              "position": "fixed",
+            },
+            "topRight": Object {
+              "borderRadius": "0 0 0 5px",
+              "right": 0,
+              "top": 0,
+            },
+          },
+          "children": Object {
             "position": "relative",
             "zIndex": 0,
-          }
-        }
-      >
-        <div>
-          It's a 
-           story:
-          <TestComponent
-            array={
-              Array [
-                1,
-                2,
-                3,
-              ]
-            }
-            bool={true}
-            func={[Function]}
-            number={7}
-            obj={
-              Object {
-                "a": "a",
-                "b": "b",
-              }
-            }
-            string="seven"
-          >
-            <div>
-              <h1>
-                function func(x) {return x + 1;}
-              </h1>
-              <h2>
-                [object Object]
-              </h2>
-              <h3>
-                1,2,3
-              </h3>
-              <h4>
-                7
-              </h4>
-              <h5>
-                seven
-              </h5>
-              <h6>
-                true
-              </h6>
-              <p>
-                undefined
-              </p>
-              <a
-                href="#"
-              >
-                test
-              </a>
-              <code>
-                storiesOf
-              </code>
-              <ul>
-                <li>
-                  1
-                </li>
-                <li>
-                  2
-                </li>
-              </ul>
-            </div>
-          </TestComponent>
-        </div>
-      </div>
-      <button
-        onClick={[Function]}
-        style={
-          Object {
-            "background": "#28c",
-            "border": "none",
-            "borderRadius": "0 0 0 5px",
-            "color": "#fff",
-            "cursor": "pointer",
-            "display": "block",
-            "fontFamily": "sans-serif",
-            "fontSize": "12px",
-            "padding": "5px 15px",
-            "position": "fixed",
-            "right": 0,
-            "top": 0,
-          }
-        }
-        type="button"
-      >
-        Show Info
-      </button>
-      <div
-        style={
-          Object {
+          },
+          "header": Object {
+            "body": Object {
+              "borderBottom": "1px solid #eee",
+              "marginBottom": 10,
+              "paddingTop": 10,
+            },
+            "h1": Object {
+              "fontSize": "35px",
+              "margin": 0,
+              "padding": 0,
+            },
+            "h2": Object {
+              "fontSize": "22px",
+              "fontWeight": 400,
+              "margin": "0 0 10px 0",
+              "padding": 0,
+            },
+          },
+          "info": Object {
             "background": "white",
             "bottom": 0,
-            "display": "none",
             "left": 0,
             "overflow": "auto",
             "padding": "0 40px",
@@ -142,9 +87,117 @@ containing **bold**, *cursive* text, \`code\` and [a link](https://github.com)"
             "right": 0,
             "top": 0,
             "zIndex": 99999,
-          }
+          },
+          "infoBody": Object {
+            "WebkitFontSmoothing": "antialiased",
+            "backgroundColor": "#fff",
+            "border": "1px solid #eee",
+            "borderRadius": "2px",
+            "boxShadow": "0px 2px 3px rgba(0, 0, 0, 0.05)",
+            "color": "#444",
+            "fontFamily": "-apple-system, \\".SFNSText-Regular\\", \\"San Francisco\\", BlinkMacSystemFont, \\"Segoe UI\\", \\"Roboto\\", \\"Oxygen\\", \\"Ubuntu\\", \\"Cantarell\\", \\"Fira Sans\\", \\"Droid Sans\\", \\"Helvetica Neue\\", \\"Lucida Grande\\", \\"Arial\\", sans-serif",
+            "fontSize": "15px",
+            "fontWeight": 300,
+            "lineHeight": 1.45,
+            "marginBottom": "20px",
+            "marginTop": "20px",
+            "padding": "20px 40px 40px",
+          },
+          "infoContent": Object {
+            "marginBottom": 0,
+          },
+          "infoStory": Object {},
+          "jsxInfoContent": Object {
+            "borderTop": "1px solid #eee",
+            "margin": "20px 0 0 0",
+          },
+          "propTableHead": Object {
+            "margin": "20px 0 0 0",
+          },
+          "source": Object {
+            "h1": Object {
+              "borderBottom": "1px solid #EEE",
+              "fontSize": "25px",
+              "margin": "20px 0 0 0",
+              "padding": "0 0 5px 0",
+            },
+          },
         }
-      >
+      }
+    >
+      <div>
+        <div
+          style={
+            Object {
+              "position": "relative",
+              "zIndex": 0,
+            }
+          }
+        >
+          <div>
+            It's a 
+             story:
+            <TestComponent
+              array={
+                Array [
+                  1,
+                  2,
+                  3,
+                ]
+              }
+              bool={true}
+              func={[Function]}
+              number={7}
+              obj={
+                Object {
+                  "a": "a",
+                  "b": "b",
+                }
+              }
+              string="seven"
+            >
+              <div>
+                <h1>
+                  function func(x) {return x + 1;}
+                </h1>
+                <h2>
+                  [object Object]
+                </h2>
+                <h3>
+                  1,2,3
+                </h3>
+                <h4>
+                  7
+                </h4>
+                <h5>
+                  seven
+                </h5>
+                <h6>
+                  true
+                </h6>
+                <p>
+                  undefined
+                </p>
+                <a
+                  href="#"
+                >
+                  test
+                </a>
+                <code>
+                  storiesOf
+                </code>
+                <ul>
+                  <li>
+                    1
+                  </li>
+                  <li>
+                    2
+                  </li>
+                </ul>
+              </div>
+            </TestComponent>
+          </div>
+        </div>
         <button
           onClick={[Function]}
           style={
@@ -165,887 +218,1788 @@ containing **bold**, *cursive* text, \`code\` and [a link](https://github.com)"
           }
           type="button"
         >
-          ×
+          Show Info
         </button>
-        <div>
-          <div
+        <div
+          style={
+            Object {
+              "background": "white",
+              "bottom": 0,
+              "display": "none",
+              "left": 0,
+              "overflow": "auto",
+              "padding": "0 40px",
+              "position": "fixed",
+              "right": 0,
+              "top": 0,
+              "zIndex": 99999,
+            }
+          }
+        >
+          <button
+            onClick={[Function]}
             style={
               Object {
-                "WebkitFontSmoothing": "antialiased",
-                "backgroundColor": "#fff",
-                "border": "1px solid #eee",
-                "borderRadius": "2px",
-                "boxShadow": "0px 2px 3px rgba(0, 0, 0, 0.05)",
-                "color": "#444",
-                "fontFamily": "-apple-system, \\".SFNSText-Regular\\", \\"San Francisco\\", BlinkMacSystemFont, \\"Segoe UI\\", \\"Roboto\\", \\"Oxygen\\", \\"Ubuntu\\", \\"Cantarell\\", \\"Fira Sans\\", \\"Droid Sans\\", \\"Helvetica Neue\\", \\"Lucida Grande\\", \\"Arial\\", sans-serif",
-                "fontSize": "15px",
-                "fontWeight": 300,
-                "lineHeight": 1.45,
-                "marginBottom": "20px",
-                "marginTop": "20px",
-                "padding": "20px 40px 40px",
+                "background": "#28c",
+                "border": "none",
+                "borderRadius": "0 0 0 5px",
+                "color": "#fff",
+                "cursor": "pointer",
+                "display": "block",
+                "fontFamily": "sans-serif",
+                "fontSize": "12px",
+                "padding": "5px 15px",
+                "position": "fixed",
+                "right": 0,
+                "top": 0,
               }
             }
+            type="button"
           >
+            ×
+          </button>
+          <div>
             <div
               style={
                 Object {
-                  "borderBottom": "1px solid #eee",
-                  "marginBottom": 10,
-                  "paddingTop": 10,
+                  "WebkitFontSmoothing": "antialiased",
+                  "backgroundColor": "#fff",
+                  "border": "1px solid #eee",
+                  "borderRadius": "2px",
+                  "boxShadow": "0px 2px 3px rgba(0, 0, 0, 0.05)",
+                  "color": "#444",
+                  "fontFamily": "-apple-system, \\".SFNSText-Regular\\", \\"San Francisco\\", BlinkMacSystemFont, \\"Segoe UI\\", \\"Roboto\\", \\"Oxygen\\", \\"Ubuntu\\", \\"Cantarell\\", \\"Fira Sans\\", \\"Droid Sans\\", \\"Helvetica Neue\\", \\"Lucida Grande\\", \\"Arial\\", sans-serif",
+                  "fontSize": "15px",
+                  "fontWeight": 300,
+                  "lineHeight": 1.45,
+                  "marginBottom": "20px",
+                  "marginTop": "20px",
+                  "padding": "20px 40px 40px",
                 }
               }
             >
-              <h1
+              <div
                 style={
                   Object {
-                    "fontSize": "35px",
-                    "margin": 0,
-                    "padding": 0,
+                    "borderBottom": "1px solid #eee",
+                    "marginBottom": 10,
+                    "paddingTop": 10,
                   }
                 }
-              />
-              <h2
-                style={
-                  Object {
-                    "fontSize": "22px",
-                    "fontWeight": 400,
-                    "margin": "0 0 10px 0",
-                    "padding": 0,
-                  }
-                }
-              />
-            </div>
-            <div
-              style={
-                Object {
-                  "marginBottom": 0,
-                }
-              }
-            >
-              <H1
-                context={Object {}}
-                id="test-story"
-                key="0"
               >
                 <h1
-                  id="test-story"
                   style={
                     Object {
-                      "WebkitFontSmoothing": "antialiased",
-                      "borderBottom": "1px solid #eee",
-                      "color": "#444",
-                      "fontFamily": "-apple-system, \\".SFNSText-Regular\\", \\"San Francisco\\", BlinkMacSystemFont, \\"Segoe UI\\", \\"Roboto\\", \\"Oxygen\\", \\"Ubuntu\\", \\"Cantarell\\", \\"Fira Sans\\", \\"Droid Sans\\", \\"Helvetica Neue\\", \\"Lucida Grande\\", \\"Arial\\", sans-serif",
-                      "fontSize": "40px",
-                      "fontWeight": 600,
+                      "fontSize": "35px",
                       "margin": 0,
                       "padding": 0,
                     }
                   }
-                >
-                  Test story
-                </h1>
-              </H1>
-              <H2
-                context={Object {}}
-                id="test-story-with-markdown-info"
-                key="1"
-              >
+                />
                 <h2
-                  id="test-story-with-markdown-info"
                   style={
                     Object {
-                      "WebkitFontSmoothing": "antialiased",
-                      "color": "#444",
-                      "fontFamily": "-apple-system, \\".SFNSText-Regular\\", \\"San Francisco\\", BlinkMacSystemFont, \\"Segoe UI\\", \\"Roboto\\", \\"Oxygen\\", \\"Ubuntu\\", \\"Cantarell\\", \\"Fira Sans\\", \\"Droid Sans\\", \\"Helvetica Neue\\", \\"Lucida Grande\\", \\"Arial\\", sans-serif",
-                      "fontSize": "30px",
-                      "fontWeight": 600,
-                      "margin": 0,
+                      "fontSize": "22px",
+                      "fontWeight": 400,
+                      "margin": "0 0 10px 0",
                       "padding": 0,
                     }
                   }
-                >
-                  with markdown info
-                </h2>
-              </H2>
-              <P
-                context={Object {}}
-                key="6"
-              >
-                <div
-                  style={
-                    Object {
-                      "WebkitFontSmoothing": "antialiased",
-                      "color": "#444",
-                      "fontFamily": "-apple-system, \\".SFNSText-Regular\\", \\"San Francisco\\", BlinkMacSystemFont, \\"Segoe UI\\", \\"Roboto\\", \\"Oxygen\\", \\"Ubuntu\\", \\"Cantarell\\", \\"Fira Sans\\", \\"Droid Sans\\", \\"Helvetica Neue\\", \\"Lucida Grande\\", \\"Arial\\", sans-serif",
-                      "fontSize": "15px",
-                    }
-                  }
-                >
-                  containing 
-                  <strong
-                    key="2"
-                  >
-                    bold
-                  </strong>
-                  , 
-                  <em
-                    key="3"
-                  >
-                    cursive
-                  </em>
-                   text, 
-                  <code
-                    key="4"
-                  >
-                    code
-                  </code>
-                   and 
-                  <A
-                    context={Object {}}
-                    href="https://github.com"
-                    key="5"
-                    title={null}
-                  >
-                    <a
-                      href="https://github.com"
-                      rel="noopener noreferrer"
-                      style={
-                        Object {
-                          "color": "#3498db",
-                        }
-                      }
-                      target="_blank"
-                    >
-                      a link
-                    </a>
-                  </A>
-                </div>
-              </P>
-            </div>
-            <div>
-              <h1
+                />
+              </div>
+              <div
                 style={
                   Object {
-                    "borderBottom": "1px solid #EEE",
-                    "fontSize": "25px",
-                    "margin": "20px 0 0 0",
-                    "padding": "0 0 5px 0",
+                    "marginBottom": 0,
                   }
                 }
               >
-                Story Source
-              </h1>
-              <Pre>
-                <pre
+                <H1
+                  context={Object {}}
+                  id="test-story"
+                  key="0"
+                >
+                  <h1
+                    id="test-story"
+                    style={
+                      Object {
+                        "WebkitFontSmoothing": "antialiased",
+                        "borderBottom": "1px solid #eee",
+                        "color": "#444",
+                        "fontFamily": "-apple-system, \\".SFNSText-Regular\\", \\"San Francisco\\", BlinkMacSystemFont, \\"Segoe UI\\", \\"Roboto\\", \\"Oxygen\\", \\"Ubuntu\\", \\"Cantarell\\", \\"Fira Sans\\", \\"Droid Sans\\", \\"Helvetica Neue\\", \\"Lucida Grande\\", \\"Arial\\", sans-serif",
+                        "fontSize": "40px",
+                        "fontWeight": 600,
+                        "margin": 0,
+                        "padding": 0,
+                      }
+                    }
+                  >
+                    Test story
+                  </h1>
+                </H1>
+                <H2
+                  context={Object {}}
+                  id="test-story-with-markdown-info"
+                  key="1"
+                >
+                  <h2
+                    id="test-story-with-markdown-info"
+                    style={
+                      Object {
+                        "WebkitFontSmoothing": "antialiased",
+                        "color": "#444",
+                        "fontFamily": "-apple-system, \\".SFNSText-Regular\\", \\"San Francisco\\", BlinkMacSystemFont, \\"Segoe UI\\", \\"Roboto\\", \\"Oxygen\\", \\"Ubuntu\\", \\"Cantarell\\", \\"Fira Sans\\", \\"Droid Sans\\", \\"Helvetica Neue\\", \\"Lucida Grande\\", \\"Arial\\", sans-serif",
+                        "fontSize": "30px",
+                        "fontWeight": 600,
+                        "margin": 0,
+                        "padding": 0,
+                      }
+                    }
+                  >
+                    with markdown info
+                  </h2>
+                </H2>
+                <P
+                  context={Object {}}
+                  key="6"
+                >
+                  <div
+                    style={
+                      Object {
+                        "WebkitFontSmoothing": "antialiased",
+                        "color": "#444",
+                        "fontFamily": "-apple-system, \\".SFNSText-Regular\\", \\"San Francisco\\", BlinkMacSystemFont, \\"Segoe UI\\", \\"Roboto\\", \\"Oxygen\\", \\"Ubuntu\\", \\"Cantarell\\", \\"Fira Sans\\", \\"Droid Sans\\", \\"Helvetica Neue\\", \\"Lucida Grande\\", \\"Arial\\", sans-serif",
+                        "fontSize": "15px",
+                      }
+                    }
+                  >
+                    containing 
+                    <strong
+                      key="2"
+                    >
+                      bold
+                    </strong>
+                    , 
+                    <em
+                      key="3"
+                    >
+                      cursive
+                    </em>
+                     text, 
+                    <code
+                      key="4"
+                    >
+                      code
+                    </code>
+                     and 
+                    <A
+                      context={Object {}}
+                      href="https://github.com"
+                      key="5"
+                      title={null}
+                    >
+                      <a
+                        href="https://github.com"
+                        rel="noopener noreferrer"
+                        style={
+                          Object {
+                            "color": "#3498db",
+                          }
+                        }
+                        target="_blank"
+                      >
+                        a link
+                      </a>
+                    </A>
+                  </div>
+                </P>
+              </div>
+              <div>
+                <h1
                   style={
                     Object {
-                      "backgroundColor": "#fafafa",
-                      "fontFamily": "Menlo, Monaco, \\"Courier New\\", monospace",
-                      "fontSize": ".88em",
-                      "lineHeight": 1.5,
-                      "overflowX": "scroll",
-                      "padding": ".5rem",
+                      "borderBottom": "1px solid #EEE",
+                      "fontSize": "25px",
+                      "margin": "20px 0 0 0",
+                      "padding": "0 0 5px 0",
                     }
                   }
                 >
-                  <Node
-                    depth={0}
-                    key="0/.0"
-                    maxPropArrayLength={3}
-                    maxPropObjectKeys={3}
-                    maxPropStringLength={50}
-                    maxPropsIntoLine={3}
-                    node={
-                      <div>
-                        It's a 
-                         story:
-                        <TestComponent
-                          array={
-                            Array [
-                              1,
-                              2,
-                              3,
-                            ]
-                          }
-                          bool={true}
-                          func={[Function]}
-                          number={7}
-                          obj={
-                            Object {
-                              "a": "a",
-                              "b": "b",
-                            }
-                          }
-                          string="seven"
-                        />
-                      </div>
+                  Story Source
+                </h1>
+                <ThemedComponent>
+                  <Pre
+                    theme={
+                      Object {
+                        "button": Object {
+                          "base": Object {
+                            "background": "#28c",
+                            "border": "none",
+                            "color": "#fff",
+                            "cursor": "pointer",
+                            "display": "block",
+                            "fontFamily": "sans-serif",
+                            "fontSize": "12px",
+                            "padding": "5px 15px",
+                            "position": "fixed",
+                          },
+                          "topRight": Object {
+                            "borderRadius": "0 0 0 5px",
+                            "right": 0,
+                            "top": 0,
+                          },
+                        },
+                        "children": Object {
+                          "position": "relative",
+                          "zIndex": 0,
+                        },
+                        "header": Object {
+                          "body": Object {
+                            "borderBottom": "1px solid #eee",
+                            "marginBottom": 10,
+                            "paddingTop": 10,
+                          },
+                          "h1": Object {
+                            "fontSize": "35px",
+                            "margin": 0,
+                            "padding": 0,
+                          },
+                          "h2": Object {
+                            "fontSize": "22px",
+                            "fontWeight": 400,
+                            "margin": "0 0 10px 0",
+                            "padding": 0,
+                          },
+                        },
+                        "info": Object {
+                          "background": "white",
+                          "bottom": 0,
+                          "left": 0,
+                          "overflow": "auto",
+                          "padding": "0 40px",
+                          "position": "fixed",
+                          "right": 0,
+                          "top": 0,
+                          "zIndex": 99999,
+                        },
+                        "infoBody": Object {
+                          "WebkitFontSmoothing": "antialiased",
+                          "backgroundColor": "#fff",
+                          "border": "1px solid #eee",
+                          "borderRadius": "2px",
+                          "boxShadow": "0px 2px 3px rgba(0, 0, 0, 0.05)",
+                          "color": "#444",
+                          "fontFamily": "-apple-system, \\".SFNSText-Regular\\", \\"San Francisco\\", BlinkMacSystemFont, \\"Segoe UI\\", \\"Roboto\\", \\"Oxygen\\", \\"Ubuntu\\", \\"Cantarell\\", \\"Fira Sans\\", \\"Droid Sans\\", \\"Helvetica Neue\\", \\"Lucida Grande\\", \\"Arial\\", sans-serif",
+                          "fontSize": "15px",
+                          "fontWeight": 300,
+                          "lineHeight": 1.45,
+                          "marginBottom": "20px",
+                          "marginTop": "20px",
+                          "padding": "20px 40px 40px",
+                        },
+                        "infoContent": Object {
+                          "marginBottom": 0,
+                        },
+                        "infoStory": Object {},
+                        "jsxInfoContent": Object {
+                          "borderTop": "1px solid #eee",
+                          "margin": "20px 0 0 0",
+                        },
+                        "propTableHead": Object {
+                          "margin": "20px 0 0 0",
+                        },
+                        "source": Object {
+                          "h1": Object {
+                            "borderBottom": "1px solid #EEE",
+                            "fontSize": "25px",
+                            "margin": "20px 0 0 0",
+                            "padding": "0 0 5px 0",
+                          },
+                        },
+                      }
                     }
                   >
-                    <div>
-                      <div
-                        style={
-                          Object {
-                            "paddingLeft": 18,
-                            "paddingRight": 3,
-                          }
-                        }
+                    <glamorous(pre)>
+                      <pre
+                        className="css-4akams"
                       >
-                        <span
-                          style={
-                            Object {
-                              "color": "#777",
-                            }
-                          }
-                        >
-                          &lt;
-                          div
-                        </span>
-                        <Props
-                          maxPropArrayLength={3}
-                          maxPropObjectKeys={3}
-                          maxPropStringLength={50}
-                          maxPropsIntoLine={3}
-                          node={
-                            <div>
-                              It's a 
-                               story:
-                              <TestComponent
-                                array={
-                                  Array [
-                                    1,
-                                    2,
-                                    3,
-                                  ]
-                                }
-                                bool={true}
-                                func={[Function]}
-                                number={7}
-                                obj={
-                                  Object {
-                                    "a": "a",
-                                    "b": "b",
-                                  }
-                                }
-                                string="seven"
-                              />
-                            </div>
-                          }
-                          singleLine={false}
-                        >
-                          <span />
-                        </Props>
-                        <span
-                          style={
-                            Object {
-                              "color": "#777",
-                            }
-                          }
-                        >
-                          &gt;
-                        </span>
-                      </div>
-                      <Node
-                        depth={1}
-                        key=".0"
-                        maxPropArrayLength={3}
-                        maxPropObjectKeys={3}
-                        maxPropStringLength={50}
-                        maxPropsIntoLine={3}
-                        node="It's a "
-                      >
-                        <div
-                          style={
-                            Object {
-                              "paddingLeft": 33,
-                              "paddingRight": 3,
-                            }
-                          }
-                        >
-                          <span
-                            style={
-                              Object {
-                                "color": "#777",
-                              }
-                            }
-                          >
-                            It's a 
-                          </span>
-                        </div>
-                      </Node>
-                      <Node
-                        depth={1}
-                        key=".1"
-                        maxPropArrayLength={3}
-                        maxPropObjectKeys={3}
-                        maxPropStringLength={50}
-                        maxPropsIntoLine={3}
-                        node={null}
-                      >
-                        <div
-                          style={
-                            Object {
-                              "paddingLeft": 33,
-                              "paddingRight": 3,
-                            }
-                          }
-                        >
-                          <span
-                            style={
-                              Object {
-                                "color": "#777",
-                              }
-                            }
-                          />
-                        </div>
-                      </Node>
-                      <Node
-                        depth={1}
-                        key=".2"
-                        maxPropArrayLength={3}
-                        maxPropObjectKeys={3}
-                        maxPropStringLength={50}
-                        maxPropsIntoLine={3}
-                        node=" story:"
-                      >
-                        <div
-                          style={
-                            Object {
-                              "paddingLeft": 33,
-                              "paddingRight": 3,
-                            }
-                          }
-                        >
-                          <span
-                            style={
-                              Object {
-                                "color": "#777",
-                              }
-                            }
-                          >
-                             story:
-                          </span>
-                        </div>
-                      </Node>
-                      <Node
-                        depth={1}
-                        key=".3"
-                        maxPropArrayLength={3}
-                        maxPropObjectKeys={3}
-                        maxPropStringLength={50}
-                        maxPropsIntoLine={3}
-                        node={
-                          <TestComponent
-                            array={
-                              Array [
-                                1,
-                                2,
-                                3,
-                              ]
-                            }
-                            bool={true}
-                            func={[Function]}
-                            number={7}
-                            obj={
-                              Object {
-                                "a": "a",
-                                "b": "b",
-                              }
-                            }
-                            string="seven"
-                          />
-                        }
-                      >
-                        <div
-                          style={
-                            Object {
-                              "paddingLeft": 33,
-                              "paddingRight": 3,
-                            }
-                          }
-                        >
-                          <span
-                            style={
-                              Object {
-                                "color": "#777",
-                              }
-                            }
-                          >
-                            &lt;
-                            TestComponent
-                          </span>
-                          <Props
+                        <div>
+                          <Node
+                            depth={0}
+                            key="0/.0"
                             maxPropArrayLength={3}
                             maxPropObjectKeys={3}
                             maxPropStringLength={50}
                             maxPropsIntoLine={3}
                             node={
-                              <TestComponent
-                                array={
-                                  Array [
-                                    1,
-                                    2,
-                                    3,
-                                  ]
-                                }
-                                bool={true}
-                                func={[Function]}
-                                number={7}
-                                obj={
+                              <div>
+                                It's a 
+                                 story:
+                                <TestComponent
+                                  array={
+                                    Array [
+                                      1,
+                                      2,
+                                      3,
+                                    ]
+                                  }
+                                  bool={true}
+                                  func={[Function]}
+                                  number={7}
+                                  obj={
+                                    Object {
+                                      "a": "a",
+                                      "b": "b",
+                                    }
+                                  }
+                                  string="seven"
+                                />
+                              </div>
+                            }
+                          >
+                            <div>
+                              <div
+                                style={
                                   Object {
-                                    "a": "a",
-                                    "b": "b",
+                                    "paddingLeft": 18,
+                                    "paddingRight": 3,
                                   }
                                 }
-                                string="seven"
-                              />
-                            }
-                            singleLine={true}
-                          >
-                            <span>
-                              <span
-                                key="func"
                               >
-                                <span>
-                                  <br />
-                                    
-                                </span>
                                 <span
-                                  style={Object {}}
+                                  style={
+                                    Object {
+                                      "color": "#777",
+                                    }
+                                  }
                                 >
-                                  func
+                                  &lt;
+                                  div
                                 </span>
-                                <span>
-                                  =
-                                  <span
-                                    style={Object {}}
-                                  >
-                                    <PropVal
-                                      maxPropArrayLength={3}
-                                      maxPropObjectKeys={3}
-                                      maxPropStringLength={50}
-                                      val={[Function]}
-                                    >
-                                      <span>
-                                        {
-                                        <span
-                                          style={
-                                            Object {
-                                              "color": "#170",
-                                            }
-                                          }
-                                        >
-                                          func()
-                                        </span>
-                                        }
-                                      </span>
-                                    </PropVal>
-                                  </span>
-                                </span>
-                              </span>
-                              <span
-                                key="obj"
-                              >
-                                <span>
-                                  <br />
-                                    
-                                </span>
-                                <span
-                                  style={Object {}}
-                                >
-                                  obj
-                                </span>
-                                <span>
-                                  =
-                                  <span
-                                    style={Object {}}
-                                  >
-                                    <PropVal
-                                      maxPropArrayLength={3}
-                                      maxPropObjectKeys={3}
-                                      maxPropStringLength={50}
-                                      val={
-                                        Object {
-                                          "a": "a",
-                                          "b": "b",
-                                        }
-                                      }
-                                    >
-                                      <span>
-                                        {
-                                        <span
-                                          style={
-                                            Object {
-                                              "color": "#666",
-                                            }
-                                          }
-                                        >
-                                          {
-                                          <span
-                                            key="k0/.0"
-                                            style={
-                                              Object {
-                                                "color": "#666",
-                                              }
-                                            }
-                                          >
-                                            a
-                                          </span>
-                                          : 
-                                          <PropVal
-                                            key="v0/.0"
-                                            maxPropArrayLength={3}
-                                            maxPropObjectKeys={3}
-                                            maxPropStringLength={50}
-                                            val="a"
-                                          >
-                                            <span
-                                              style={
-                                                Object {
-                                                  "color": "#22a",
-                                                  "wordBreak": "break-word",
-                                                }
-                                              }
-                                            >
-                                              "
-                                              a
-                                              "
-                                            </span>
-                                          </PropVal>
-                                          , 
-                                          <span
-                                            key="k1/.0"
-                                            style={
-                                              Object {
-                                                "color": "#666",
-                                              }
-                                            }
-                                          >
-                                            b
-                                          </span>
-                                          : 
-                                          <PropVal
-                                            key="v1/.0"
-                                            maxPropArrayLength={3}
-                                            maxPropObjectKeys={3}
-                                            maxPropStringLength={50}
-                                            val="b"
-                                          >
-                                            <span
-                                              style={
-                                                Object {
-                                                  "color": "#22a",
-                                                  "wordBreak": "break-word",
-                                                }
-                                              }
-                                            >
-                                              "
-                                              b
-                                              "
-                                            </span>
-                                          </PropVal>
-                                          }
-                                        </span>
-                                        }
-                                      </span>
-                                    </PropVal>
-                                  </span>
-                                </span>
-                              </span>
-                              <span
-                                key="array"
-                              >
-                                <span>
-                                  <br />
-                                    
-                                </span>
-                                <span
-                                  style={Object {}}
-                                >
-                                  array
-                                </span>
-                                <span>
-                                  =
-                                  <span
-                                    style={Object {}}
-                                  >
-                                    <PropVal
-                                      maxPropArrayLength={3}
-                                      maxPropObjectKeys={3}
-                                      maxPropStringLength={50}
-                                      val={
-                                        Array [
-                                          1,
-                                          2,
-                                          3,
-                                        ]
-                                      }
-                                    >
-                                      <span>
-                                        {
-                                        <span
-                                          style={
-                                            Object {
-                                              "color": "#666",
-                                            }
-                                          }
-                                        >
-                                          [
-                                          <PropVal
-                                            key="n0/.0"
-                                            maxPropArrayLength={3}
-                                            maxPropObjectKeys={3}
-                                            maxPropStringLength={50}
-                                            val={1}
-                                          >
-                                            <span>
-                                              {
-                                              <span
-                                                style={
-                                                  Object {
-                                                    "color": "#a11",
-                                                  }
-                                                }
-                                              >
-                                                1
-                                              </span>
-                                              }
-                                            </span>
-                                          </PropVal>
-                                          , 
-                                          <PropVal
-                                            key="n1/.0"
-                                            maxPropArrayLength={3}
-                                            maxPropObjectKeys={3}
-                                            maxPropStringLength={50}
-                                            val={2}
-                                          >
-                                            <span>
-                                              {
-                                              <span
-                                                style={
-                                                  Object {
-                                                    "color": "#a11",
-                                                  }
-                                                }
-                                              >
-                                                2
-                                              </span>
-                                              }
-                                            </span>
-                                          </PropVal>
-                                          , 
-                                          <PropVal
-                                            key="n2/.0"
-                                            maxPropArrayLength={3}
-                                            maxPropObjectKeys={3}
-                                            maxPropStringLength={50}
-                                            val={3}
-                                          >
-                                            <span>
-                                              {
-                                              <span
-                                                style={
-                                                  Object {
-                                                    "color": "#a11",
-                                                  }
-                                                }
-                                              >
-                                                3
-                                              </span>
-                                              }
-                                            </span>
-                                          </PropVal>
+                                <Props
+                                  maxPropArrayLength={3}
+                                  maxPropObjectKeys={3}
+                                  maxPropStringLength={50}
+                                  maxPropsIntoLine={3}
+                                  node={
+                                    <div>
+                                      It's a 
+                                       story:
+                                      <TestComponent
+                                        array={
+                                          Array [
+                                            1,
+                                            2,
+                                            3,
                                           ]
-                                        </span>
                                         }
-                                      </span>
-                                    </PropVal>
-                                  </span>
-                                </span>
-                              </span>
-                              <span
-                                key="number"
-                              >
-                                <span>
-                                  <br />
-                                    
-                                </span>
-                                <span
-                                  style={Object {}}
-                                >
-                                  number
-                                </span>
-                                <span>
-                                  =
-                                  <span
-                                    style={Object {}}
-                                  >
-                                    <PropVal
-                                      maxPropArrayLength={3}
-                                      maxPropObjectKeys={3}
-                                      maxPropStringLength={50}
-                                      val={7}
-                                    >
-                                      <span>
-                                        {
-                                        <span
-                                          style={
-                                            Object {
-                                              "color": "#a11",
-                                            }
-                                          }
-                                        >
-                                          7
-                                        </span>
-                                        }
-                                      </span>
-                                    </PropVal>
-                                  </span>
-                                </span>
-                              </span>
-                              <span
-                                key="string"
-                              >
-                                <span>
-                                  <br />
-                                    
-                                </span>
-                                <span
-                                  style={Object {}}
-                                >
-                                  string
-                                </span>
-                                <span>
-                                  =
-                                  <span
-                                    style={Object {}}
-                                  >
-                                    <PropVal
-                                      maxPropArrayLength={3}
-                                      maxPropObjectKeys={3}
-                                      maxPropStringLength={50}
-                                      val="seven"
-                                    >
-                                      <span
-                                        style={
+                                        bool={true}
+                                        func={[Function]}
+                                        number={7}
+                                        obj={
                                           Object {
-                                            "color": "#22a",
-                                            "wordBreak": "break-word",
+                                            "a": "a",
+                                            "b": "b",
                                           }
                                         }
-                                      >
-                                        "
-                                        seven
-                                        "
-                                      </span>
-                                    </PropVal>
-                                  </span>
-                                </span>
-                              </span>
-                              <span
-                                key="bool"
-                              >
-                                <span>
-                                  <br />
-                                    
-                                </span>
-                                <span
-                                  style={Object {}}
+                                        string="seven"
+                                      />
+                                    </div>
+                                  }
+                                  singleLine={false}
                                 >
-                                  bool
+                                  <span />
+                                </Props>
+                                <span
+                                  style={
+                                    Object {
+                                      "color": "#777",
+                                    }
+                                  }
+                                >
+                                  &gt;
                                 </span>
-                                <br />
-                              </span>
-                            </span>
-                          </Props>
-                          <span
-                            style={
+                              </div>
+                              <Node
+                                depth={1}
+                                key=".0"
+                                maxPropArrayLength={3}
+                                maxPropObjectKeys={3}
+                                maxPropStringLength={50}
+                                maxPropsIntoLine={3}
+                                node="It's a "
+                              >
+                                <div
+                                  style={
+                                    Object {
+                                      "paddingLeft": 33,
+                                      "paddingRight": 3,
+                                    }
+                                  }
+                                >
+                                  <span
+                                    style={
+                                      Object {
+                                        "color": "#777",
+                                      }
+                                    }
+                                  >
+                                    It's a 
+                                  </span>
+                                </div>
+                              </Node>
+                              <Node
+                                depth={1}
+                                key=".1"
+                                maxPropArrayLength={3}
+                                maxPropObjectKeys={3}
+                                maxPropStringLength={50}
+                                maxPropsIntoLine={3}
+                                node={null}
+                              >
+                                <div
+                                  style={
+                                    Object {
+                                      "paddingLeft": 33,
+                                      "paddingRight": 3,
+                                    }
+                                  }
+                                >
+                                  <span
+                                    style={
+                                      Object {
+                                        "color": "#777",
+                                      }
+                                    }
+                                  />
+                                </div>
+                              </Node>
+                              <Node
+                                depth={1}
+                                key=".2"
+                                maxPropArrayLength={3}
+                                maxPropObjectKeys={3}
+                                maxPropStringLength={50}
+                                maxPropsIntoLine={3}
+                                node=" story:"
+                              >
+                                <div
+                                  style={
+                                    Object {
+                                      "paddingLeft": 33,
+                                      "paddingRight": 3,
+                                    }
+                                  }
+                                >
+                                  <span
+                                    style={
+                                      Object {
+                                        "color": "#777",
+                                      }
+                                    }
+                                  >
+                                     story:
+                                  </span>
+                                </div>
+                              </Node>
+                              <Node
+                                depth={1}
+                                key=".3"
+                                maxPropArrayLength={3}
+                                maxPropObjectKeys={3}
+                                maxPropStringLength={50}
+                                maxPropsIntoLine={3}
+                                node={
+                                  <TestComponent
+                                    array={
+                                      Array [
+                                        1,
+                                        2,
+                                        3,
+                                      ]
+                                    }
+                                    bool={true}
+                                    func={[Function]}
+                                    number={7}
+                                    obj={
+                                      Object {
+                                        "a": "a",
+                                        "b": "b",
+                                      }
+                                    }
+                                    string="seven"
+                                  />
+                                }
+                              >
+                                <div
+                                  style={
+                                    Object {
+                                      "paddingLeft": 33,
+                                      "paddingRight": 3,
+                                    }
+                                  }
+                                >
+                                  <span
+                                    style={
+                                      Object {
+                                        "color": "#777",
+                                      }
+                                    }
+                                  >
+                                    &lt;
+                                    TestComponent
+                                  </span>
+                                  <Props
+                                    maxPropArrayLength={3}
+                                    maxPropObjectKeys={3}
+                                    maxPropStringLength={50}
+                                    maxPropsIntoLine={3}
+                                    node={
+                                      <TestComponent
+                                        array={
+                                          Array [
+                                            1,
+                                            2,
+                                            3,
+                                          ]
+                                        }
+                                        bool={true}
+                                        func={[Function]}
+                                        number={7}
+                                        obj={
+                                          Object {
+                                            "a": "a",
+                                            "b": "b",
+                                          }
+                                        }
+                                        string="seven"
+                                      />
+                                    }
+                                    singleLine={true}
+                                  >
+                                    <span>
+                                      <span
+                                        key="func"
+                                      >
+                                        <span>
+                                          <br />
+                                            
+                                        </span>
+                                        <span
+                                          style={Object {}}
+                                        >
+                                          func
+                                        </span>
+                                        <span>
+                                          =
+                                          <span
+                                            style={Object {}}
+                                          >
+                                            <ThemedComponent
+                                              maxPropArrayLength={3}
+                                              maxPropObjectKeys={3}
+                                              maxPropStringLength={50}
+                                              val={[Function]}
+                                            >
+                                              <PropVal
+                                                maxPropArrayLength={3}
+                                                maxPropObjectKeys={3}
+                                                maxPropStringLength={50}
+                                                theme={
+                                                  Object {
+                                                    "button": Object {
+                                                      "base": Object {
+                                                        "background": "#28c",
+                                                        "border": "none",
+                                                        "color": "#fff",
+                                                        "cursor": "pointer",
+                                                        "display": "block",
+                                                        "fontFamily": "sans-serif",
+                                                        "fontSize": "12px",
+                                                        "padding": "5px 15px",
+                                                        "position": "fixed",
+                                                      },
+                                                      "topRight": Object {
+                                                        "borderRadius": "0 0 0 5px",
+                                                        "right": 0,
+                                                        "top": 0,
+                                                      },
+                                                    },
+                                                    "children": Object {
+                                                      "position": "relative",
+                                                      "zIndex": 0,
+                                                    },
+                                                    "header": Object {
+                                                      "body": Object {
+                                                        "borderBottom": "1px solid #eee",
+                                                        "marginBottom": 10,
+                                                        "paddingTop": 10,
+                                                      },
+                                                      "h1": Object {
+                                                        "fontSize": "35px",
+                                                        "margin": 0,
+                                                        "padding": 0,
+                                                      },
+                                                      "h2": Object {
+                                                        "fontSize": "22px",
+                                                        "fontWeight": 400,
+                                                        "margin": "0 0 10px 0",
+                                                        "padding": 0,
+                                                      },
+                                                    },
+                                                    "info": Object {
+                                                      "background": "white",
+                                                      "bottom": 0,
+                                                      "left": 0,
+                                                      "overflow": "auto",
+                                                      "padding": "0 40px",
+                                                      "position": "fixed",
+                                                      "right": 0,
+                                                      "top": 0,
+                                                      "zIndex": 99999,
+                                                    },
+                                                    "infoBody": Object {
+                                                      "WebkitFontSmoothing": "antialiased",
+                                                      "backgroundColor": "#fff",
+                                                      "border": "1px solid #eee",
+                                                      "borderRadius": "2px",
+                                                      "boxShadow": "0px 2px 3px rgba(0, 0, 0, 0.05)",
+                                                      "color": "#444",
+                                                      "fontFamily": "-apple-system, \\".SFNSText-Regular\\", \\"San Francisco\\", BlinkMacSystemFont, \\"Segoe UI\\", \\"Roboto\\", \\"Oxygen\\", \\"Ubuntu\\", \\"Cantarell\\", \\"Fira Sans\\", \\"Droid Sans\\", \\"Helvetica Neue\\", \\"Lucida Grande\\", \\"Arial\\", sans-serif",
+                                                      "fontSize": "15px",
+                                                      "fontWeight": 300,
+                                                      "lineHeight": 1.45,
+                                                      "marginBottom": "20px",
+                                                      "marginTop": "20px",
+                                                      "padding": "20px 40px 40px",
+                                                    },
+                                                    "infoContent": Object {
+                                                      "marginBottom": 0,
+                                                    },
+                                                    "infoStory": Object {},
+                                                    "jsxInfoContent": Object {
+                                                      "borderTop": "1px solid #eee",
+                                                      "margin": "20px 0 0 0",
+                                                    },
+                                                    "propTableHead": Object {
+                                                      "margin": "20px 0 0 0",
+                                                    },
+                                                    "source": Object {
+                                                      "h1": Object {
+                                                        "borderBottom": "1px solid #EEE",
+                                                        "fontSize": "25px",
+                                                        "margin": "20px 0 0 0",
+                                                        "padding": "0 0 5px 0",
+                                                      },
+                                                    },
+                                                  }
+                                                }
+                                                val={[Function]}
+                                                valueStyles={null}
+                                              >
+                                                <span>
+                                                  {
+                                                  <span
+                                                    style={
+                                                      Object {
+                                                        "color": "#170",
+                                                      }
+                                                    }
+                                                  >
+                                                    func()
+                                                  </span>
+                                                  }
+                                                </span>
+                                              </PropVal>
+                                            </ThemedComponent>
+                                          </span>
+                                        </span>
+                                      </span>
+                                      <span
+                                        key="obj"
+                                      >
+                                        <span>
+                                          <br />
+                                            
+                                        </span>
+                                        <span
+                                          style={Object {}}
+                                        >
+                                          obj
+                                        </span>
+                                        <span>
+                                          =
+                                          <span
+                                            style={Object {}}
+                                          >
+                                            <ThemedComponent
+                                              maxPropArrayLength={3}
+                                              maxPropObjectKeys={3}
+                                              maxPropStringLength={50}
+                                              val={
+                                                Object {
+                                                  "a": "a",
+                                                  "b": "b",
+                                                }
+                                              }
+                                            >
+                                              <PropVal
+                                                maxPropArrayLength={3}
+                                                maxPropObjectKeys={3}
+                                                maxPropStringLength={50}
+                                                theme={
+                                                  Object {
+                                                    "button": Object {
+                                                      "base": Object {
+                                                        "background": "#28c",
+                                                        "border": "none",
+                                                        "color": "#fff",
+                                                        "cursor": "pointer",
+                                                        "display": "block",
+                                                        "fontFamily": "sans-serif",
+                                                        "fontSize": "12px",
+                                                        "padding": "5px 15px",
+                                                        "position": "fixed",
+                                                      },
+                                                      "topRight": Object {
+                                                        "borderRadius": "0 0 0 5px",
+                                                        "right": 0,
+                                                        "top": 0,
+                                                      },
+                                                    },
+                                                    "children": Object {
+                                                      "position": "relative",
+                                                      "zIndex": 0,
+                                                    },
+                                                    "header": Object {
+                                                      "body": Object {
+                                                        "borderBottom": "1px solid #eee",
+                                                        "marginBottom": 10,
+                                                        "paddingTop": 10,
+                                                      },
+                                                      "h1": Object {
+                                                        "fontSize": "35px",
+                                                        "margin": 0,
+                                                        "padding": 0,
+                                                      },
+                                                      "h2": Object {
+                                                        "fontSize": "22px",
+                                                        "fontWeight": 400,
+                                                        "margin": "0 0 10px 0",
+                                                        "padding": 0,
+                                                      },
+                                                    },
+                                                    "info": Object {
+                                                      "background": "white",
+                                                      "bottom": 0,
+                                                      "left": 0,
+                                                      "overflow": "auto",
+                                                      "padding": "0 40px",
+                                                      "position": "fixed",
+                                                      "right": 0,
+                                                      "top": 0,
+                                                      "zIndex": 99999,
+                                                    },
+                                                    "infoBody": Object {
+                                                      "WebkitFontSmoothing": "antialiased",
+                                                      "backgroundColor": "#fff",
+                                                      "border": "1px solid #eee",
+                                                      "borderRadius": "2px",
+                                                      "boxShadow": "0px 2px 3px rgba(0, 0, 0, 0.05)",
+                                                      "color": "#444",
+                                                      "fontFamily": "-apple-system, \\".SFNSText-Regular\\", \\"San Francisco\\", BlinkMacSystemFont, \\"Segoe UI\\", \\"Roboto\\", \\"Oxygen\\", \\"Ubuntu\\", \\"Cantarell\\", \\"Fira Sans\\", \\"Droid Sans\\", \\"Helvetica Neue\\", \\"Lucida Grande\\", \\"Arial\\", sans-serif",
+                                                      "fontSize": "15px",
+                                                      "fontWeight": 300,
+                                                      "lineHeight": 1.45,
+                                                      "marginBottom": "20px",
+                                                      "marginTop": "20px",
+                                                      "padding": "20px 40px 40px",
+                                                    },
+                                                    "infoContent": Object {
+                                                      "marginBottom": 0,
+                                                    },
+                                                    "infoStory": Object {},
+                                                    "jsxInfoContent": Object {
+                                                      "borderTop": "1px solid #eee",
+                                                      "margin": "20px 0 0 0",
+                                                    },
+                                                    "propTableHead": Object {
+                                                      "margin": "20px 0 0 0",
+                                                    },
+                                                    "source": Object {
+                                                      "h1": Object {
+                                                        "borderBottom": "1px solid #EEE",
+                                                        "fontSize": "25px",
+                                                        "margin": "20px 0 0 0",
+                                                        "padding": "0 0 5px 0",
+                                                      },
+                                                    },
+                                                  }
+                                                }
+                                                val={
+                                                  Object {
+                                                    "a": "a",
+                                                    "b": "b",
+                                                  }
+                                                }
+                                                valueStyles={null}
+                                              >
+                                                <span>
+                                                  {
+                                                  <span
+                                                    style={
+                                                      Object {
+                                                        "color": "#666",
+                                                      }
+                                                    }
+                                                  >
+                                                    {
+                                                    <span
+                                                      key="k0/.0"
+                                                      style={
+                                                        Object {
+                                                          "color": "#666",
+                                                        }
+                                                      }
+                                                    >
+                                                      a
+                                                    </span>
+                                                    : 
+                                                    <PropVal
+                                                      key="v0/.0"
+                                                      maxPropArrayLength={3}
+                                                      maxPropObjectKeys={3}
+                                                      maxPropStringLength={50}
+                                                      theme={Object {}}
+                                                      val="a"
+                                                      valueStyles={
+                                                        Object {
+                                                          "array": Object {
+                                                            "color": "#666",
+                                                          },
+                                                          "attr": Object {
+                                                            "color": "#666",
+                                                          },
+                                                          "bool": Object {
+                                                            "color": "#a11",
+                                                          },
+                                                          "empty": Object {
+                                                            "color": "#777",
+                                                          },
+                                                          "func": Object {
+                                                            "color": "#170",
+                                                          },
+                                                          "number": Object {
+                                                            "color": "#a11",
+                                                          },
+                                                          "object": Object {
+                                                            "color": "#666",
+                                                          },
+                                                          "string": Object {
+                                                            "color": "#22a",
+                                                            "wordBreak": "break-word",
+                                                          },
+                                                        }
+                                                      }
+                                                    >
+                                                      <span
+                                                        style={
+                                                          Object {
+                                                            "color": "#22a",
+                                                            "wordBreak": "break-word",
+                                                          }
+                                                        }
+                                                      >
+                                                        "
+                                                        a
+                                                        "
+                                                      </span>
+                                                    </PropVal>
+                                                    , 
+                                                    <span
+                                                      key="k1/.0"
+                                                      style={
+                                                        Object {
+                                                          "color": "#666",
+                                                        }
+                                                      }
+                                                    >
+                                                      b
+                                                    </span>
+                                                    : 
+                                                    <PropVal
+                                                      key="v1/.0"
+                                                      maxPropArrayLength={3}
+                                                      maxPropObjectKeys={3}
+                                                      maxPropStringLength={50}
+                                                      theme={Object {}}
+                                                      val="b"
+                                                      valueStyles={
+                                                        Object {
+                                                          "array": Object {
+                                                            "color": "#666",
+                                                          },
+                                                          "attr": Object {
+                                                            "color": "#666",
+                                                          },
+                                                          "bool": Object {
+                                                            "color": "#a11",
+                                                          },
+                                                          "empty": Object {
+                                                            "color": "#777",
+                                                          },
+                                                          "func": Object {
+                                                            "color": "#170",
+                                                          },
+                                                          "number": Object {
+                                                            "color": "#a11",
+                                                          },
+                                                          "object": Object {
+                                                            "color": "#666",
+                                                          },
+                                                          "string": Object {
+                                                            "color": "#22a",
+                                                            "wordBreak": "break-word",
+                                                          },
+                                                        }
+                                                      }
+                                                    >
+                                                      <span
+                                                        style={
+                                                          Object {
+                                                            "color": "#22a",
+                                                            "wordBreak": "break-word",
+                                                          }
+                                                        }
+                                                      >
+                                                        "
+                                                        b
+                                                        "
+                                                      </span>
+                                                    </PropVal>
+                                                    }
+                                                  </span>
+                                                  }
+                                                </span>
+                                              </PropVal>
+                                            </ThemedComponent>
+                                          </span>
+                                        </span>
+                                      </span>
+                                      <span
+                                        key="array"
+                                      >
+                                        <span>
+                                          <br />
+                                            
+                                        </span>
+                                        <span
+                                          style={Object {}}
+                                        >
+                                          array
+                                        </span>
+                                        <span>
+                                          =
+                                          <span
+                                            style={Object {}}
+                                          >
+                                            <ThemedComponent
+                                              maxPropArrayLength={3}
+                                              maxPropObjectKeys={3}
+                                              maxPropStringLength={50}
+                                              val={
+                                                Array [
+                                                  1,
+                                                  2,
+                                                  3,
+                                                ]
+                                              }
+                                            >
+                                              <PropVal
+                                                maxPropArrayLength={3}
+                                                maxPropObjectKeys={3}
+                                                maxPropStringLength={50}
+                                                theme={
+                                                  Object {
+                                                    "button": Object {
+                                                      "base": Object {
+                                                        "background": "#28c",
+                                                        "border": "none",
+                                                        "color": "#fff",
+                                                        "cursor": "pointer",
+                                                        "display": "block",
+                                                        "fontFamily": "sans-serif",
+                                                        "fontSize": "12px",
+                                                        "padding": "5px 15px",
+                                                        "position": "fixed",
+                                                      },
+                                                      "topRight": Object {
+                                                        "borderRadius": "0 0 0 5px",
+                                                        "right": 0,
+                                                        "top": 0,
+                                                      },
+                                                    },
+                                                    "children": Object {
+                                                      "position": "relative",
+                                                      "zIndex": 0,
+                                                    },
+                                                    "header": Object {
+                                                      "body": Object {
+                                                        "borderBottom": "1px solid #eee",
+                                                        "marginBottom": 10,
+                                                        "paddingTop": 10,
+                                                      },
+                                                      "h1": Object {
+                                                        "fontSize": "35px",
+                                                        "margin": 0,
+                                                        "padding": 0,
+                                                      },
+                                                      "h2": Object {
+                                                        "fontSize": "22px",
+                                                        "fontWeight": 400,
+                                                        "margin": "0 0 10px 0",
+                                                        "padding": 0,
+                                                      },
+                                                    },
+                                                    "info": Object {
+                                                      "background": "white",
+                                                      "bottom": 0,
+                                                      "left": 0,
+                                                      "overflow": "auto",
+                                                      "padding": "0 40px",
+                                                      "position": "fixed",
+                                                      "right": 0,
+                                                      "top": 0,
+                                                      "zIndex": 99999,
+                                                    },
+                                                    "infoBody": Object {
+                                                      "WebkitFontSmoothing": "antialiased",
+                                                      "backgroundColor": "#fff",
+                                                      "border": "1px solid #eee",
+                                                      "borderRadius": "2px",
+                                                      "boxShadow": "0px 2px 3px rgba(0, 0, 0, 0.05)",
+                                                      "color": "#444",
+                                                      "fontFamily": "-apple-system, \\".SFNSText-Regular\\", \\"San Francisco\\", BlinkMacSystemFont, \\"Segoe UI\\", \\"Roboto\\", \\"Oxygen\\", \\"Ubuntu\\", \\"Cantarell\\", \\"Fira Sans\\", \\"Droid Sans\\", \\"Helvetica Neue\\", \\"Lucida Grande\\", \\"Arial\\", sans-serif",
+                                                      "fontSize": "15px",
+                                                      "fontWeight": 300,
+                                                      "lineHeight": 1.45,
+                                                      "marginBottom": "20px",
+                                                      "marginTop": "20px",
+                                                      "padding": "20px 40px 40px",
+                                                    },
+                                                    "infoContent": Object {
+                                                      "marginBottom": 0,
+                                                    },
+                                                    "infoStory": Object {},
+                                                    "jsxInfoContent": Object {
+                                                      "borderTop": "1px solid #eee",
+                                                      "margin": "20px 0 0 0",
+                                                    },
+                                                    "propTableHead": Object {
+                                                      "margin": "20px 0 0 0",
+                                                    },
+                                                    "source": Object {
+                                                      "h1": Object {
+                                                        "borderBottom": "1px solid #EEE",
+                                                        "fontSize": "25px",
+                                                        "margin": "20px 0 0 0",
+                                                        "padding": "0 0 5px 0",
+                                                      },
+                                                    },
+                                                  }
+                                                }
+                                                val={
+                                                  Array [
+                                                    1,
+                                                    2,
+                                                    3,
+                                                  ]
+                                                }
+                                                valueStyles={null}
+                                              >
+                                                <span>
+                                                  {
+                                                  <span
+                                                    style={
+                                                      Object {
+                                                        "color": "#666",
+                                                      }
+                                                    }
+                                                  >
+                                                    [
+                                                    <PropVal
+                                                      key="n0/.0"
+                                                      maxPropArrayLength={3}
+                                                      maxPropObjectKeys={3}
+                                                      maxPropStringLength={50}
+                                                      theme={Object {}}
+                                                      val={1}
+                                                      valueStyles={
+                                                        Object {
+                                                          "array": Object {
+                                                            "color": "#666",
+                                                          },
+                                                          "attr": Object {
+                                                            "color": "#666",
+                                                          },
+                                                          "bool": Object {
+                                                            "color": "#a11",
+                                                          },
+                                                          "empty": Object {
+                                                            "color": "#777",
+                                                          },
+                                                          "func": Object {
+                                                            "color": "#170",
+                                                          },
+                                                          "number": Object {
+                                                            "color": "#a11",
+                                                          },
+                                                          "object": Object {
+                                                            "color": "#666",
+                                                          },
+                                                          "string": Object {
+                                                            "color": "#22a",
+                                                            "wordBreak": "break-word",
+                                                          },
+                                                        }
+                                                      }
+                                                    >
+                                                      <span>
+                                                        {
+                                                        <span
+                                                          style={
+                                                            Object {
+                                                              "color": "#a11",
+                                                            }
+                                                          }
+                                                        >
+                                                          1
+                                                        </span>
+                                                        }
+                                                      </span>
+                                                    </PropVal>
+                                                    , 
+                                                    <PropVal
+                                                      key="n1/.0"
+                                                      maxPropArrayLength={3}
+                                                      maxPropObjectKeys={3}
+                                                      maxPropStringLength={50}
+                                                      theme={Object {}}
+                                                      val={2}
+                                                      valueStyles={
+                                                        Object {
+                                                          "array": Object {
+                                                            "color": "#666",
+                                                          },
+                                                          "attr": Object {
+                                                            "color": "#666",
+                                                          },
+                                                          "bool": Object {
+                                                            "color": "#a11",
+                                                          },
+                                                          "empty": Object {
+                                                            "color": "#777",
+                                                          },
+                                                          "func": Object {
+                                                            "color": "#170",
+                                                          },
+                                                          "number": Object {
+                                                            "color": "#a11",
+                                                          },
+                                                          "object": Object {
+                                                            "color": "#666",
+                                                          },
+                                                          "string": Object {
+                                                            "color": "#22a",
+                                                            "wordBreak": "break-word",
+                                                          },
+                                                        }
+                                                      }
+                                                    >
+                                                      <span>
+                                                        {
+                                                        <span
+                                                          style={
+                                                            Object {
+                                                              "color": "#a11",
+                                                            }
+                                                          }
+                                                        >
+                                                          2
+                                                        </span>
+                                                        }
+                                                      </span>
+                                                    </PropVal>
+                                                    , 
+                                                    <PropVal
+                                                      key="n2/.0"
+                                                      maxPropArrayLength={3}
+                                                      maxPropObjectKeys={3}
+                                                      maxPropStringLength={50}
+                                                      theme={Object {}}
+                                                      val={3}
+                                                      valueStyles={
+                                                        Object {
+                                                          "array": Object {
+                                                            "color": "#666",
+                                                          },
+                                                          "attr": Object {
+                                                            "color": "#666",
+                                                          },
+                                                          "bool": Object {
+                                                            "color": "#a11",
+                                                          },
+                                                          "empty": Object {
+                                                            "color": "#777",
+                                                          },
+                                                          "func": Object {
+                                                            "color": "#170",
+                                                          },
+                                                          "number": Object {
+                                                            "color": "#a11",
+                                                          },
+                                                          "object": Object {
+                                                            "color": "#666",
+                                                          },
+                                                          "string": Object {
+                                                            "color": "#22a",
+                                                            "wordBreak": "break-word",
+                                                          },
+                                                        }
+                                                      }
+                                                    >
+                                                      <span>
+                                                        {
+                                                        <span
+                                                          style={
+                                                            Object {
+                                                              "color": "#a11",
+                                                            }
+                                                          }
+                                                        >
+                                                          3
+                                                        </span>
+                                                        }
+                                                      </span>
+                                                    </PropVal>
+                                                    ]
+                                                  </span>
+                                                  }
+                                                </span>
+                                              </PropVal>
+                                            </ThemedComponent>
+                                          </span>
+                                        </span>
+                                      </span>
+                                      <span
+                                        key="number"
+                                      >
+                                        <span>
+                                          <br />
+                                            
+                                        </span>
+                                        <span
+                                          style={Object {}}
+                                        >
+                                          number
+                                        </span>
+                                        <span>
+                                          =
+                                          <span
+                                            style={Object {}}
+                                          >
+                                            <ThemedComponent
+                                              maxPropArrayLength={3}
+                                              maxPropObjectKeys={3}
+                                              maxPropStringLength={50}
+                                              val={7}
+                                            >
+                                              <PropVal
+                                                maxPropArrayLength={3}
+                                                maxPropObjectKeys={3}
+                                                maxPropStringLength={50}
+                                                theme={
+                                                  Object {
+                                                    "button": Object {
+                                                      "base": Object {
+                                                        "background": "#28c",
+                                                        "border": "none",
+                                                        "color": "#fff",
+                                                        "cursor": "pointer",
+                                                        "display": "block",
+                                                        "fontFamily": "sans-serif",
+                                                        "fontSize": "12px",
+                                                        "padding": "5px 15px",
+                                                        "position": "fixed",
+                                                      },
+                                                      "topRight": Object {
+                                                        "borderRadius": "0 0 0 5px",
+                                                        "right": 0,
+                                                        "top": 0,
+                                                      },
+                                                    },
+                                                    "children": Object {
+                                                      "position": "relative",
+                                                      "zIndex": 0,
+                                                    },
+                                                    "header": Object {
+                                                      "body": Object {
+                                                        "borderBottom": "1px solid #eee",
+                                                        "marginBottom": 10,
+                                                        "paddingTop": 10,
+                                                      },
+                                                      "h1": Object {
+                                                        "fontSize": "35px",
+                                                        "margin": 0,
+                                                        "padding": 0,
+                                                      },
+                                                      "h2": Object {
+                                                        "fontSize": "22px",
+                                                        "fontWeight": 400,
+                                                        "margin": "0 0 10px 0",
+                                                        "padding": 0,
+                                                      },
+                                                    },
+                                                    "info": Object {
+                                                      "background": "white",
+                                                      "bottom": 0,
+                                                      "left": 0,
+                                                      "overflow": "auto",
+                                                      "padding": "0 40px",
+                                                      "position": "fixed",
+                                                      "right": 0,
+                                                      "top": 0,
+                                                      "zIndex": 99999,
+                                                    },
+                                                    "infoBody": Object {
+                                                      "WebkitFontSmoothing": "antialiased",
+                                                      "backgroundColor": "#fff",
+                                                      "border": "1px solid #eee",
+                                                      "borderRadius": "2px",
+                                                      "boxShadow": "0px 2px 3px rgba(0, 0, 0, 0.05)",
+                                                      "color": "#444",
+                                                      "fontFamily": "-apple-system, \\".SFNSText-Regular\\", \\"San Francisco\\", BlinkMacSystemFont, \\"Segoe UI\\", \\"Roboto\\", \\"Oxygen\\", \\"Ubuntu\\", \\"Cantarell\\", \\"Fira Sans\\", \\"Droid Sans\\", \\"Helvetica Neue\\", \\"Lucida Grande\\", \\"Arial\\", sans-serif",
+                                                      "fontSize": "15px",
+                                                      "fontWeight": 300,
+                                                      "lineHeight": 1.45,
+                                                      "marginBottom": "20px",
+                                                      "marginTop": "20px",
+                                                      "padding": "20px 40px 40px",
+                                                    },
+                                                    "infoContent": Object {
+                                                      "marginBottom": 0,
+                                                    },
+                                                    "infoStory": Object {},
+                                                    "jsxInfoContent": Object {
+                                                      "borderTop": "1px solid #eee",
+                                                      "margin": "20px 0 0 0",
+                                                    },
+                                                    "propTableHead": Object {
+                                                      "margin": "20px 0 0 0",
+                                                    },
+                                                    "source": Object {
+                                                      "h1": Object {
+                                                        "borderBottom": "1px solid #EEE",
+                                                        "fontSize": "25px",
+                                                        "margin": "20px 0 0 0",
+                                                        "padding": "0 0 5px 0",
+                                                      },
+                                                    },
+                                                  }
+                                                }
+                                                val={7}
+                                                valueStyles={null}
+                                              >
+                                                <span>
+                                                  {
+                                                  <span
+                                                    style={
+                                                      Object {
+                                                        "color": "#a11",
+                                                      }
+                                                    }
+                                                  >
+                                                    7
+                                                  </span>
+                                                  }
+                                                </span>
+                                              </PropVal>
+                                            </ThemedComponent>
+                                          </span>
+                                        </span>
+                                      </span>
+                                      <span
+                                        key="string"
+                                      >
+                                        <span>
+                                          <br />
+                                            
+                                        </span>
+                                        <span
+                                          style={Object {}}
+                                        >
+                                          string
+                                        </span>
+                                        <span>
+                                          =
+                                          <span
+                                            style={Object {}}
+                                          >
+                                            <ThemedComponent
+                                              maxPropArrayLength={3}
+                                              maxPropObjectKeys={3}
+                                              maxPropStringLength={50}
+                                              val="seven"
+                                            >
+                                              <PropVal
+                                                maxPropArrayLength={3}
+                                                maxPropObjectKeys={3}
+                                                maxPropStringLength={50}
+                                                theme={
+                                                  Object {
+                                                    "button": Object {
+                                                      "base": Object {
+                                                        "background": "#28c",
+                                                        "border": "none",
+                                                        "color": "#fff",
+                                                        "cursor": "pointer",
+                                                        "display": "block",
+                                                        "fontFamily": "sans-serif",
+                                                        "fontSize": "12px",
+                                                        "padding": "5px 15px",
+                                                        "position": "fixed",
+                                                      },
+                                                      "topRight": Object {
+                                                        "borderRadius": "0 0 0 5px",
+                                                        "right": 0,
+                                                        "top": 0,
+                                                      },
+                                                    },
+                                                    "children": Object {
+                                                      "position": "relative",
+                                                      "zIndex": 0,
+                                                    },
+                                                    "header": Object {
+                                                      "body": Object {
+                                                        "borderBottom": "1px solid #eee",
+                                                        "marginBottom": 10,
+                                                        "paddingTop": 10,
+                                                      },
+                                                      "h1": Object {
+                                                        "fontSize": "35px",
+                                                        "margin": 0,
+                                                        "padding": 0,
+                                                      },
+                                                      "h2": Object {
+                                                        "fontSize": "22px",
+                                                        "fontWeight": 400,
+                                                        "margin": "0 0 10px 0",
+                                                        "padding": 0,
+                                                      },
+                                                    },
+                                                    "info": Object {
+                                                      "background": "white",
+                                                      "bottom": 0,
+                                                      "left": 0,
+                                                      "overflow": "auto",
+                                                      "padding": "0 40px",
+                                                      "position": "fixed",
+                                                      "right": 0,
+                                                      "top": 0,
+                                                      "zIndex": 99999,
+                                                    },
+                                                    "infoBody": Object {
+                                                      "WebkitFontSmoothing": "antialiased",
+                                                      "backgroundColor": "#fff",
+                                                      "border": "1px solid #eee",
+                                                      "borderRadius": "2px",
+                                                      "boxShadow": "0px 2px 3px rgba(0, 0, 0, 0.05)",
+                                                      "color": "#444",
+                                                      "fontFamily": "-apple-system, \\".SFNSText-Regular\\", \\"San Francisco\\", BlinkMacSystemFont, \\"Segoe UI\\", \\"Roboto\\", \\"Oxygen\\", \\"Ubuntu\\", \\"Cantarell\\", \\"Fira Sans\\", \\"Droid Sans\\", \\"Helvetica Neue\\", \\"Lucida Grande\\", \\"Arial\\", sans-serif",
+                                                      "fontSize": "15px",
+                                                      "fontWeight": 300,
+                                                      "lineHeight": 1.45,
+                                                      "marginBottom": "20px",
+                                                      "marginTop": "20px",
+                                                      "padding": "20px 40px 40px",
+                                                    },
+                                                    "infoContent": Object {
+                                                      "marginBottom": 0,
+                                                    },
+                                                    "infoStory": Object {},
+                                                    "jsxInfoContent": Object {
+                                                      "borderTop": "1px solid #eee",
+                                                      "margin": "20px 0 0 0",
+                                                    },
+                                                    "propTableHead": Object {
+                                                      "margin": "20px 0 0 0",
+                                                    },
+                                                    "source": Object {
+                                                      "h1": Object {
+                                                        "borderBottom": "1px solid #EEE",
+                                                        "fontSize": "25px",
+                                                        "margin": "20px 0 0 0",
+                                                        "padding": "0 0 5px 0",
+                                                      },
+                                                    },
+                                                  }
+                                                }
+                                                val="seven"
+                                                valueStyles={null}
+                                              >
+                                                <span
+                                                  style={
+                                                    Object {
+                                                      "color": "#22a",
+                                                      "wordBreak": "break-word",
+                                                    }
+                                                  }
+                                                >
+                                                  "
+                                                  seven
+                                                  "
+                                                </span>
+                                              </PropVal>
+                                            </ThemedComponent>
+                                          </span>
+                                        </span>
+                                      </span>
+                                      <span
+                                        key="bool"
+                                      >
+                                        <span>
+                                          <br />
+                                            
+                                        </span>
+                                        <span
+                                          style={Object {}}
+                                        >
+                                          bool
+                                        </span>
+                                        <br />
+                                      </span>
+                                    </span>
+                                  </Props>
+                                  <span
+                                    style={
+                                      Object {
+                                        "color": "#777",
+                                      }
+                                    }
+                                  >
+                                    /&gt;
+                                  </span>
+                                </div>
+                              </Node>
+                              <div
+                                style={
+                                  Object {
+                                    "paddingLeft": 18,
+                                    "paddingRight": 3,
+                                  }
+                                }
+                              >
+                                <span
+                                  style={
+                                    Object {
+                                      "color": "#777",
+                                    }
+                                  }
+                                >
+                                  &lt;/
+                                  div
+                                  &gt;
+                                </span>
+                              </div>
+                            </div>
+                          </Node>
+                        </div>
+                        <ThemedComponent
+                          onClick={[Function]}
+                          toggled={false}
+                        >
+                          <CopyButton
+                            onClick={[Function]}
+                            theme={
                               Object {
-                                "color": "#777",
+                                "button": Object {
+                                  "base": Object {
+                                    "background": "#28c",
+                                    "border": "none",
+                                    "color": "#fff",
+                                    "cursor": "pointer",
+                                    "display": "block",
+                                    "fontFamily": "sans-serif",
+                                    "fontSize": "12px",
+                                    "padding": "5px 15px",
+                                    "position": "fixed",
+                                  },
+                                  "topRight": Object {
+                                    "borderRadius": "0 0 0 5px",
+                                    "right": 0,
+                                    "top": 0,
+                                  },
+                                },
+                                "children": Object {
+                                  "position": "relative",
+                                  "zIndex": 0,
+                                },
+                                "header": Object {
+                                  "body": Object {
+                                    "borderBottom": "1px solid #eee",
+                                    "marginBottom": 10,
+                                    "paddingTop": 10,
+                                  },
+                                  "h1": Object {
+                                    "fontSize": "35px",
+                                    "margin": 0,
+                                    "padding": 0,
+                                  },
+                                  "h2": Object {
+                                    "fontSize": "22px",
+                                    "fontWeight": 400,
+                                    "margin": "0 0 10px 0",
+                                    "padding": 0,
+                                  },
+                                },
+                                "info": Object {
+                                  "background": "white",
+                                  "bottom": 0,
+                                  "left": 0,
+                                  "overflow": "auto",
+                                  "padding": "0 40px",
+                                  "position": "fixed",
+                                  "right": 0,
+                                  "top": 0,
+                                  "zIndex": 99999,
+                                },
+                                "infoBody": Object {
+                                  "WebkitFontSmoothing": "antialiased",
+                                  "backgroundColor": "#fff",
+                                  "border": "1px solid #eee",
+                                  "borderRadius": "2px",
+                                  "boxShadow": "0px 2px 3px rgba(0, 0, 0, 0.05)",
+                                  "color": "#444",
+                                  "fontFamily": "-apple-system, \\".SFNSText-Regular\\", \\"San Francisco\\", BlinkMacSystemFont, \\"Segoe UI\\", \\"Roboto\\", \\"Oxygen\\", \\"Ubuntu\\", \\"Cantarell\\", \\"Fira Sans\\", \\"Droid Sans\\", \\"Helvetica Neue\\", \\"Lucida Grande\\", \\"Arial\\", sans-serif",
+                                  "fontSize": "15px",
+                                  "fontWeight": 300,
+                                  "lineHeight": 1.45,
+                                  "marginBottom": "20px",
+                                  "marginTop": "20px",
+                                  "padding": "20px 40px 40px",
+                                },
+                                "infoContent": Object {
+                                  "marginBottom": 0,
+                                },
+                                "infoStory": Object {},
+                                "jsxInfoContent": Object {
+                                  "borderTop": "1px solid #eee",
+                                  "margin": "20px 0 0 0",
+                                },
+                                "propTableHead": Object {
+                                  "margin": "20px 0 0 0",
+                                },
+                                "source": Object {
+                                  "h1": Object {
+                                    "borderBottom": "1px solid #EEE",
+                                    "fontSize": "25px",
+                                    "margin": "20px 0 0 0",
+                                    "padding": "0 0 5px 0",
+                                  },
+                                },
                               }
                             }
+                            toggled={false}
                           >
-                            /&gt;
-                          </span>
-                        </div>
-                      </Node>
-                      <div
-                        style={
-                          Object {
-                            "paddingLeft": 18,
-                            "paddingRight": 3,
-                          }
-                        }
-                      >
-                        <span
-                          style={
-                            Object {
-                              "color": "#777",
-                            }
-                          }
-                        >
-                          &lt;/
-                          div
-                          &gt;
-                        </span>
-                      </div>
-                    </div>
-                  </Node>
-                </pre>
-              </Pre>
-            </div>
-            <div>
-              <h1
-                style={
-                  Object {
-                    "borderBottom": "1px solid #EEE",
-                    "fontSize": "25px",
-                    "margin": "20px 0 0 0",
-                    "padding": "0 0 5px 0",
-                  }
-                }
-              >
-                Prop Types
-              </h1>
-              <div
-                key="TestComponent_0"
-              >
-                <h2
+                            <glamorous(button)
+                              onClick={[Function]}
+                              styles={Object {}}
+                            >
+                              <button
+                                className="css-gydez8"
+                                onClick={[Function]}
+                              >
+                                <glamorous(div)
+                                  toggled={false}
+                                >
+                                  <div
+                                    className="css-kv47nt"
+                                  >
+                                    <div
+                                      style={
+                                        Object {
+                                          "marginBottom": 6,
+                                        }
+                                      }
+                                    >
+                                      Copied!
+                                    </div>
+                                    <div>
+                                      Copy
+                                    </div>
+                                  </div>
+                                </glamorous(div)>
+                              </button>
+                            </glamorous(button)>
+                          </CopyButton>
+                        </ThemedComponent>
+                      </pre>
+                    </glamorous(pre)>
+                  </Pre>
+                </ThemedComponent>
+              </div>
+              <div>
+                <h1
                   style={
                     Object {
+                      "borderBottom": "1px solid #EEE",
+                      "fontSize": "25px",
                       "margin": "20px 0 0 0",
+                      "padding": "0 0 5px 0",
                     }
                   }
                 >
-                  "
-                  TestComponent
-                  " Component
-                </h2>
-                <Component
-                  maxPropArrayLength={3}
-                  maxPropObjectKeys={3}
-                  maxPropStringLength={50}
-                  type={[Function]}
+                  Prop Types
+                </h1>
+                <div
+                  key="TestComponent_0"
                 >
-                  <PropTable
+                  <h2
+                    style={
+                      Object {
+                        "margin": "20px 0 0 0",
+                      }
+                    }
+                  >
+                    "
+                    TestComponent
+                    " Component
+                  </h2>
+                  <Component
                     maxPropArrayLength={3}
                     maxPropObjectKeys={3}
                     maxPropStringLength={50}
-                    propDefinitions={Array []}
                     type={[Function]}
                   >
-                    <small>
-                      No propTypes defined!
-                    </small>
-                  </PropTable>
-                </Component>
+                    <PropTable
+                      maxPropArrayLength={3}
+                      maxPropObjectKeys={3}
+                      maxPropStringLength={50}
+                      propDefinitions={Array []}
+                      type={[Function]}
+                    >
+                      <small>
+                        No propTypes defined!
+                      </small>
+                    </PropTable>
+                  </Component>
+                </div>
               </div>
             </div>
           </div>
         </div>
       </div>
-    </div>
+    </ThemeProvider>
   </Story>
 </Component>
 `;
diff --git a/addons/info/src/components/PropTable.js b/addons/info/src/components/PropTable.js
index c2e9ef81c31..3f03e240084 100644
--- a/addons/info/src/components/PropTable.js
+++ b/addons/info/src/components/PropTable.js
@@ -1,5 +1,3 @@
-/* eslint-disable no-underscore-dangle */
-
 import PropTypes from 'prop-types';
 import React from 'react';
 
diff --git a/addons/info/src/components/PropVal.js b/addons/info/src/components/PropVal.js
index 361dd6b0055..db935e709d7 100644
--- a/addons/info/src/components/PropVal.js
+++ b/addons/info/src/components/PropVal.js
@@ -1,46 +1,47 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { withTheme } from 'glamorous';
 import createFragment from 'react-addons-create-fragment';
 
-const valueStyles = {
+const getValueStyles = (codeColors = {}) => ({
   func: {
-    color: '#170',
+    color: codeColors.func || '#170',
   },
 
   attr: {
-    color: '#666',
+    color: codeColors.attr || '#666',
   },
 
   object: {
-    color: '#666',
+    color: codeColors.object || '#666',
   },
 
   array: {
-    color: '#666',
+    color: codeColors.array || '#666',
   },
 
   number: {
-    color: '#a11',
+    color: codeColors.number || '#a11',
   },
 
   string: {
-    color: '#22a',
+    color: codeColors.string || '#22a',
     wordBreak: 'break-word',
   },
 
   bool: {
-    color: '#a11',
+    color: codeColors.bool || '#a11',
   },
 
   empty: {
     color: '#777',
   },
-};
+});
 
-function previewArray(val, maxPropArrayLength) {
+function previewArray(val, maxPropArrayLength, valueStyles) {
   const items = {};
   val.slice(0, maxPropArrayLength).forEach((item, i) => {
-    items[`n${i}`] = <PropVal val={item} />;
+    items[`n${i}`] = <PropVal val={item} valueStyles={valueStyles} />;
     items[`c${i}`] = ', ';
   });
   if (val.length > maxPropArrayLength) {
@@ -51,13 +52,13 @@ function previewArray(val, maxPropArrayLength) {
   return <span style={valueStyles.array}>[{createFragment(items)}]</span>;
 }
 
-function previewObject(val, maxPropObjectKeys) {
+function previewObject(val, maxPropObjectKeys, valueStyles) {
   const names = Object.keys(val);
   const items = {};
   names.slice(0, maxPropObjectKeys).forEach((name, i) => {
     items[`k${i}`] = <span style={valueStyles.attr}>{name}</span>;
     items[`c${i}`] = ': ';
-    items[`v${i}`] = <PropVal val={val[name]} />;
+    items[`v${i}`] = <PropVal val={val[name]} valueStyles={valueStyles} />;
     items[`m${i}`] = ', ';
   });
   if (names.length > maxPropObjectKeys) {
@@ -74,11 +75,13 @@ function previewObject(val, maxPropObjectKeys) {
   );
 }
 
-export default function PropVal(props) {
-  const { maxPropObjectKeys, maxPropArrayLength, maxPropStringLength } = props;
+function PropVal(props) {
+  const { maxPropObjectKeys, maxPropArrayLength, maxPropStringLength, theme } = props;
   let { val } = props;
+  const { codeColors } = theme || {};
   let braceWrap = true;
   let content = null;
+  const valueStyles = props.valueStyles || getValueStyles(codeColors);
 
   if (typeof val === 'number') {
     content = <span style={valueStyles.number}>{val}</span>;
@@ -91,7 +94,7 @@ export default function PropVal(props) {
   } else if (typeof val === 'boolean') {
     content = <span style={valueStyles.bool}>{`${val}`}</span>;
   } else if (Array.isArray(val)) {
-    content = previewArray(val, maxPropArrayLength);
+    content = previewArray(val, maxPropArrayLength, valueStyles);
   } else if (typeof val === 'function') {
     content = <span style={valueStyles.func}>{val.name ? `${val.name}()` : 'anonymous()'}</span>;
   } else if (!val) {
@@ -105,7 +108,7 @@ export default function PropVal(props) {
       </span>
     );
   } else {
-    content = previewObject(val, maxPropObjectKeys);
+    content = previewObject(val, maxPropObjectKeys, valueStyles);
   }
 
   if (!braceWrap) return content;
@@ -118,6 +121,8 @@ PropVal.defaultProps = {
   maxPropObjectKeys: 3,
   maxPropArrayLength: 3,
   maxPropStringLength: 50,
+  theme: {},
+  valueStyles: null,
 };
 
 PropVal.propTypes = {
@@ -125,4 +130,19 @@ PropVal.propTypes = {
   maxPropObjectKeys: PropTypes.number,
   maxPropArrayLength: PropTypes.number,
   maxPropStringLength: PropTypes.number,
+  theme: PropTypes.shape({
+    codeColors: PropTypes.object,
+  }),
+  valueStyles: PropTypes.shape({
+    func: PropTypes.object,
+    attr: PropTypes.object,
+    object: PropTypes.object,
+    array: PropTypes.object,
+    number: PropTypes.object,
+    string: PropTypes.object,
+    bool: PropTypes.object,
+    empty: PropTypes.object,
+  }),
 };
+
+export default withTheme(PropVal);
diff --git a/addons/info/src/components/Story.js b/addons/info/src/components/Story.js
index 3dd4bf83437..1021f180531 100644
--- a/addons/info/src/components/Story.js
+++ b/addons/info/src/components/Story.js
@@ -4,6 +4,7 @@ import React, { createElement } from 'react';
 import PropTypes from 'prop-types';
 import global from 'global';
 import { baseFonts } from '@storybook/components';
+import { ThemeProvider } from 'glamorous';
 
 import marksy from 'marksy';
 
@@ -364,11 +365,11 @@ export default class Story extends React.Component {
   }
 
   render() {
-    if (this.props.showInline) {
-      return this._renderInline();
-    }
-
-    return this._renderOverlay();
+    return (
+      <ThemeProvider theme={this.state.stylesheet}>
+        {this.props.showInline ? this._renderInline() : this._renderOverlay()}
+      </ThemeProvider>
+    );
   }
 }
 
diff --git a/addons/info/src/components/markdown/code.js b/addons/info/src/components/markdown/code.js
index f43d67955b8..db17696ca94 100644
--- a/addons/info/src/components/markdown/code.js
+++ b/addons/info/src/components/markdown/code.js
@@ -52,21 +52,6 @@ Code.defaultProps = {
   code: null,
 };
 
-export function Pre(props) {
-  const style = {
-    fontSize: '.88em',
-    fontFamily: 'Menlo, Monaco, "Courier New", monospace',
-    backgroundColor: '#fafafa',
-    padding: '.5rem',
-    lineHeight: 1.5,
-    overflowX: 'scroll',
-  };
-  return <pre style={style}>{props.children}</pre>;
-}
-
-Pre.propTypes = { children: PropTypes.node };
-Pre.defaultProps = { children: null };
-
 export function Blockquote(props) {
   const style = {
     fontSize: '1.88em',
@@ -79,3 +64,5 @@ export function Blockquote(props) {
 
 Blockquote.propTypes = { children: PropTypes.node };
 Blockquote.defaultProps = { children: null };
+
+export { default as Pre } from './pre/pre';
diff --git a/addons/info/src/components/markdown/pre/copy.js b/addons/info/src/components/markdown/pre/copy.js
new file mode 100644
index 00000000000..8142b089573
--- /dev/null
+++ b/addons/info/src/components/markdown/pre/copy.js
@@ -0,0 +1,13 @@
+/* eslint-disable no-undef */
+export default function copy(str) {
+  const tmp = document.createElement('TEXTAREA');
+  const focus = document.activeElement;
+
+  tmp.value = str;
+
+  document.body.appendChild(tmp);
+  tmp.select();
+  document.execCommand('copy');
+  document.body.removeChild(tmp);
+  focus.focus();
+}
diff --git a/addons/info/src/components/markdown/pre/copyButton.js b/addons/info/src/components/markdown/pre/copyButton.js
new file mode 100644
index 00000000000..0daf4db7990
--- /dev/null
+++ b/addons/info/src/components/markdown/pre/copyButton.js
@@ -0,0 +1,68 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import glamorous, { withTheme } from 'glamorous';
+
+const Button = glamorous.button(
+  {
+    overflow: 'hidden',
+    border: '1px solid #eee',
+    borderRadius: 3,
+    backgroundColor: '#FFFFFF',
+    cursor: 'pointer',
+    fontSize: 13,
+    padding: '3px 10px',
+    alignSelf: 'flex-start',
+
+    ':hover': {
+      backgroundColor: '#f4f7fa',
+      borderColor: '#ddd',
+    },
+
+    ':active': {
+      backgroundColor: '#e9ecef',
+      borderColor: '#ccc',
+    },
+  },
+  props => props.styles
+);
+
+const ContentWrapper = glamorous.div(
+  {
+    transition: 'transform .2s ease',
+    height: 16,
+  },
+  props => ({
+    ...props.styles,
+    transform: props.toggled ? 'translateY(0px)' : 'translateY(-100%) translateY(-6px)',
+  })
+);
+
+function CopyButton(props) {
+  const { copyButton = {}, copyButtonContent } = props.theme;
+  const { toggleText = 'Copied!', text = 'Copy', ...copyButtonStyles } = copyButton;
+
+  return (
+    <Button onClick={props.onClick} styles={copyButtonStyles}>
+      <ContentWrapper styles={copyButtonContent} toggled={props.toggled}>
+        <div style={{ marginBottom: 6 }}>{toggleText}</div>
+        <div>{text}</div>
+      </ContentWrapper>
+    </Button>
+  );
+}
+
+CopyButton.propTypes = {
+  onClick: PropTypes.func,
+  toggled: PropTypes.bool,
+  theme: PropTypes.shape({
+    copyButton: PropTypes.object,
+  }),
+};
+
+CopyButton.defaultProps = {
+  onClick: () => {},
+  toggled: false,
+  theme: {},
+};
+
+export default withTheme(CopyButton);
diff --git a/addons/info/src/components/markdown/pre/pre.js b/addons/info/src/components/markdown/pre/pre.js
new file mode 100644
index 00000000000..c8c4a45633c
--- /dev/null
+++ b/addons/info/src/components/markdown/pre/pre.js
@@ -0,0 +1,75 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import glamorous, { withTheme } from 'glamorous';
+
+import CopyButton from './copyButton';
+import copy from './copy';
+
+const TOGGLE_TIMEOUT = 1800;
+
+const StyledPre = glamorous.pre(
+  {
+    display: 'flex',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    fontSize: '.88em',
+    fontFamily: 'Menlo, Monaco, "Courier New", monospace',
+    backgroundColor: '#fafafa',
+    padding: '.5rem',
+    lineHeight: 1.5,
+    overflowX: 'scroll',
+  },
+  props => props.styles
+);
+
+class Pre extends React.Component {
+  state = {
+    copied: false,
+  };
+
+  setRef = elem => {
+    this.pre = elem;
+  };
+
+  handleClick = () => {
+    const text = this.pre && this.pre.innerText;
+
+    if (!text) {
+      return;
+    }
+
+    copy(text);
+    this.setState({ copied: true });
+
+    clearTimeout(this.timeout);
+
+    this.timeout = setTimeout(() => {
+      this.setState({ copied: false });
+    }, TOGGLE_TIMEOUT);
+  };
+
+  render() {
+    const { pre } = this.props.theme;
+
+    return (
+      <StyledPre styles={pre}>
+        <div ref={this.setRef}>{this.props.children}</div>
+        <CopyButton onClick={this.handleClick} toggled={this.state.copied} />
+      </StyledPre>
+    );
+  }
+}
+
+Pre.propTypes = {
+  children: PropTypes.node,
+  theme: PropTypes.shape({
+    pre: PropTypes.object,
+  }),
+};
+
+Pre.defaultProps = {
+  children: null,
+  theme: {},
+};
+
+export default withTheme(Pre);
diff --git a/addons/info/src/components/types/.eslintrc.js b/addons/info/src/components/types/.eslintrc.js
deleted file mode 100644
index 9f8a1d5f1b6..00000000000
--- a/addons/info/src/components/types/.eslintrc.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// TODO remove this file once https://github.com/yannickcr/eslint-plugin-react/issues/1389 is solved
-const warn = 1;
-
-module.exports = {
-  rules: { 'react/no-typos': warn },
-};
diff --git a/addons/info/src/components/types/ArrayOf.js b/addons/info/src/components/types/ArrayOf.js
index ce78fc6fb65..81834331ced 100644
--- a/addons/info/src/components/types/ArrayOf.js
+++ b/addons/info/src/components/types/ArrayOf.js
@@ -1,13 +1,13 @@
 import React from 'react';
 
 import PrettyPropType from './PrettyPropType';
-import { TypeInfo } from './proptypes';
+import { TypeInfo, getPropTypes } from './proptypes';
 
 const ArrayOf = ({ propType }) => (
   <span>
     <span>[</span>
     <span>
-      <PrettyPropType propType={propType.value} />
+      <PrettyPropType propType={getPropTypes(propType)} />
     </span>
     <span>]</span>
   </span>
diff --git a/addons/info/src/components/types/Enum.js b/addons/info/src/components/types/Enum.js
index 83b017eed92..2de8d4830a8 100644
--- a/addons/info/src/components/types/Enum.js
+++ b/addons/info/src/components/types/Enum.js
@@ -1,7 +1,13 @@
 import React from 'react';
-import { TypeInfo } from './proptypes';
+import { TypeInfo, getPropTypes } from './proptypes';
 
-const Enum = ({ propType }) => <span>{propType.value.map(({ value }) => value).join(' | ')}</span>;
+const Enum = ({ propType }) => (
+  <span>
+    {getPropTypes(propType)
+      .map(({ value }) => value)
+      .join(' | ')}
+  </span>
+);
 
 Enum.propTypes = {
   propType: TypeInfo.isRequired,
diff --git a/addons/info/src/components/types/InstanceOf.js b/addons/info/src/components/types/InstanceOf.js
index 94577c95095..786c77fdd39 100644
--- a/addons/info/src/components/types/InstanceOf.js
+++ b/addons/info/src/components/types/InstanceOf.js
@@ -1,7 +1,7 @@
 import React from 'react';
-import { TypeInfo } from './proptypes';
+import { TypeInfo, getPropTypes } from './proptypes';
 
-const InstanceOf = ({ propType }) => <span>{propType.value}</span>;
+const InstanceOf = ({ propType }) => <span>{getPropTypes(propType)}</span>;
 
 InstanceOf.propTypes = {
   propType: TypeInfo.isRequired,
diff --git a/addons/info/src/components/types/Literal.js b/addons/info/src/components/types/Literal.js
new file mode 100644
index 00000000000..83b222e4078
--- /dev/null
+++ b/addons/info/src/components/types/Literal.js
@@ -0,0 +1,10 @@
+import React from 'react';
+import { TypeInfo } from './proptypes';
+
+const Literal = ({ propType }) => <span>{propType.value}</span>;
+
+Literal.propTypes = {
+  propType: TypeInfo.isRequired,
+};
+
+export default Literal;
diff --git a/addons/info/src/components/types/ObjectOf.js b/addons/info/src/components/types/ObjectOf.js
index c9604d29901..e27908d814a 100644
--- a/addons/info/src/components/types/ObjectOf.js
+++ b/addons/info/src/components/types/ObjectOf.js
@@ -1,12 +1,12 @@
 import React from 'react';
 
 import PrettyPropType from './PrettyPropType';
-import { TypeInfo } from './proptypes';
+import { TypeInfo, getPropTypes } from './proptypes';
 
 const ObjectOf = ({ propType }) => (
   <span>
     {'{[<key>]: '}
-    <PrettyPropType propType={propType.value} />
+    <PrettyPropType propType={getPropTypes(propType)} />
     {'}'}
   </span>
 );
diff --git a/addons/info/src/components/types/OneOf.js b/addons/info/src/components/types/OneOf.js
index a771772d8e1..deacfa4633e 100644
--- a/addons/info/src/components/types/OneOf.js
+++ b/addons/info/src/components/types/OneOf.js
@@ -1,7 +1,12 @@
 import React from 'react';
-import { TypeInfo } from './proptypes';
+import { TypeInfo, getPropTypes } from './proptypes';
 
-const OneOf = ({ propType }) => <span>{propType.value.map(({ value }) => value).join(' | ')}</span>;
+const joinValues = propTypes => propTypes.map(({ value }) => value).join(' | ');
+
+const OneOf = ({ propType }) => {
+  const propTypes = getPropTypes(propType);
+  return <span>{`oneOf ${Array.isArray(propTypes) ? joinValues(propTypes) : propTypes}`}</span>;
+};
 
 OneOf.propTypes = {
   propType: TypeInfo.isRequired,
diff --git a/addons/info/src/components/types/OneOfType.js b/addons/info/src/components/types/OneOfType.js
index 3c10aa68df4..8b04c5fb484 100644
--- a/addons/info/src/components/types/OneOfType.js
+++ b/addons/info/src/components/types/OneOfType.js
@@ -1,20 +1,20 @@
 import React from 'react';
 
 import PrettyPropType from './PrettyPropType';
-import { TypeInfo } from './proptypes';
+import { TypeInfo, getPropTypes } from './proptypes';
 
 const OneOfType = ({ propType }) => {
-  const { length } = propType.value;
+  const propTypes = getPropTypes(propType);
   return (
     <span>
-      {propType.value
-        .map((value, i) => [
-          <PrettyPropType
-            key={`${value.name}${value.value ? `-${value.value}` : ''}`}
-            propType={value}
-          />,
-          i < length - 1 ? <span> | </span> : null,
-        ])
+      {propTypes
+        .map((value, i) => {
+          const key = `${value.name}${value.value ? `-${value.value}` : ''}`;
+          return [
+            <PrettyPropType key={key} propType={value} />,
+            i < propTypes.length - 1 ? <span key={`${key}-separator`}> | </span> : null,
+          ];
+        })
         .reduce((acc, tuple) => acc.concat(tuple), [])}
     </span>
   );
diff --git a/addons/info/src/components/types/PrettyPropType.js b/addons/info/src/components/types/PrettyPropType.js
index 846842ffc13..d725edcb841 100644
--- a/addons/info/src/components/types/PrettyPropType.js
+++ b/addons/info/src/components/types/PrettyPropType.js
@@ -9,6 +9,7 @@ import ObjectOf from './ObjectOf';
 import OneOf from './OneOf';
 import InstanceOf from './InstanceOf';
 import Signature from './Signature';
+import Literal from './Literal';
 
 import { TypeInfo } from './proptypes';
 
@@ -20,6 +21,7 @@ const propTypeComponentMap = new Map([
   ['objectOf', ObjectOf],
   // Might be overkill to have below proptypes  as separate components *shrug*
   ['object', ObjectType],
+  ['literal', Literal],
   ['enum', OneOf],
   ['instanceOf', InstanceOf],
   ['signature', Signature],
diff --git a/addons/info/src/components/types/Shape.js b/addons/info/src/components/types/Shape.js
index fc366b935a7..3349c96a147 100644
--- a/addons/info/src/components/types/Shape.js
+++ b/addons/info/src/components/types/Shape.js
@@ -5,7 +5,7 @@ import { HighlightButton } from '@storybook/components';
 import PrettyPropType from './PrettyPropType';
 import PropertyLabel from './PropertyLabel';
 
-import { TypeInfo } from './proptypes';
+import { TypeInfo, getPropTypes } from './proptypes';
 
 const MARGIN_SIZE = 15;
 
@@ -33,6 +33,7 @@ class Shape extends React.Component {
 
   render() {
     const { propType, depth } = this.props;
+    const propTypes = getPropTypes(propType);
     return (
       <span>
         <HighlightButton
@@ -45,13 +46,13 @@ class Shape extends React.Component {
         </HighlightButton>
         <HighlightButton onClick={this.handleToggle}>...</HighlightButton>
         {!this.state.minimized &&
-          Object.keys(propType.value).map(childProperty => (
+          Object.keys(propTypes).map(childProperty => (
             <div key={childProperty} style={{ marginLeft: depth * MARGIN_SIZE }}>
               <PropertyLabel
                 property={childProperty}
-                required={propType.value[childProperty].required}
+                required={propTypes[childProperty].required}
               />
-              <PrettyPropType depth={depth + 1} propType={propType.value[childProperty]} />
+              <PrettyPropType depth={depth + 1} propType={propTypes[childProperty]} />
               ,
             </div>
           ))}
diff --git a/addons/info/src/components/types/proptypes.js b/addons/info/src/components/types/proptypes.js
index 03b101ae76b..5aee013bed1 100644
--- a/addons/info/src/components/types/proptypes.js
+++ b/addons/info/src/components/types/proptypes.js
@@ -7,3 +7,5 @@ export const TypeInfo = oneOfType([
   }),
   PropTypes.string,
 ]);
+
+export const getPropTypes = propType => propType.value || propType.elements;
diff --git a/addons/jest/README.md b/addons/jest/README.md
index 40555e3ade0..8ea2358927b 100644
--- a/addons/jest/README.md
+++ b/addons/jest/README.md
@@ -2,6 +2,8 @@
 
 Brings Jest results in storybook.
 
+[Framework Support](https://github.com/storybooks/storybook/blob/master/ADDONS_SUPPORT.md)
+
 [![Storybook Jest Addon Demo](@storybook/addon-jest.gif)](https://storybook-addon-jest-example.herokuapp.com/)
 
 > Checkout the above [Live Storybook](https://storybook-addon-jest-example.herokuapp.com/).
@@ -113,8 +115,8 @@ storiesOf('MyComponent', module)
 
 ### withTests(options)
 
-- **options.results**: [OBJECT] jest output results. *mandatory*
-- **filteExt**: [STRING] test file extention. *optionnal*. This allow you to write "MyComponent" and not "MyComponent.test.js". It will be used as regex to find your file results. Default value is `((\\.specs?)|(\\.tests?))?(\\.js)?$`. That mean it will match: MyComponent.js, MyComponent.test.js, MyComponent.tests.js, MyComponent.spec.js, MyComponent.specs.js...
+- **options.results**: OBJECT jest output results. *mandatory*
+- **filteExt**: STRING test file extention. *optionnal*. This allow you to write "MyComponent" and not "MyComponent.test.js". It will be used as regex to find your file results. Default value is `((\\.specs?)|(\\.tests?))?(\\.js)?$`. That mean it will match: MyComponent.js, MyComponent.test.js, MyComponent.tests.js, MyComponent.spec.js, MyComponent.specs.js...
 
 ## TODO
 
diff --git a/addons/jest/package.json b/addons/jest/package.json
index bcad4189f19..c79ef5d1029 100644
--- a/addons/jest/package.json
+++ b/addons/jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-jest",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "React storybook addon that show component jest report",
   "keywords": [
     "addon",
@@ -25,11 +25,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/components": "^3.4.0-alpha.0",
+    "@storybook/components": "^3.4.0-alpha.9",
+    "babel-runtime": "^6.26.0",
     "glamor": "^2.20.40",
-    "glamorous": "^4.11.2",
+    "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/jest/src/components/Panel.js b/addons/jest/src/components/Panel.js
index 9c277c3c101..245d63743b2 100644
--- a/addons/jest/src/components/Panel.js
+++ b/addons/jest/src/components/Panel.js
@@ -98,7 +98,7 @@ const Content = glamorous(({ tests, className }) => (
   <div className={className}>
     {tests.map(({ name, result }) => {
       if (!result) {
-        return <NoTests>This story has tests configured, but no file was found</NoTests>;
+        return <NoTests key={name}>This story has tests configured, but no file was found</NoTests>;
       }
 
       const successNumber = result.assertionResults.filter(({ status }) => status === 'passed')
diff --git a/addons/jest/src/components/Result.js b/addons/jest/src/components/Result.js
index fa71b0b17d3..6effc16179a 100644
--- a/addons/jest/src/components/Result.js
+++ b/addons/jest/src/components/Result.js
@@ -35,7 +35,8 @@ const StackTrace = glamorous(({ trace, className }) => (
       .join('')
       .trim()
       .split(/\n/)
-      .map(i => <div>{i.trim()}</div>)}
+      // eslint-disable-next-line react/no-array-index-key
+      .map((traceLine, traceLineIndex) => <div key={traceLineIndex}>{traceLine.trim()}</div>)}
   </details>
 ))({
   background: 'silver',
@@ -80,6 +81,11 @@ const createSubgroup = (acc, item, i, list) => {
   if (!acc.grouped) {
     acc.grouped = [];
   }
+  if (!('grouperIndex' in acc)) {
+    acc.grouperIndex = 0;
+  } else {
+    acc.grouperIndex += 1;
+  }
 
   // start or stop extraction
   if (acc.startTrigger(item)) {
@@ -100,15 +106,22 @@ const createSubgroup = (acc, item, i, list) => {
 
   // on last iteration inject at detected injectionpoint, and group
   if (i === list.length - 1) {
+    // Provide a "safety net" when Jest returns a partially recognized "group"
+    // (recognized by acc.startTrigger but acc.endTrigger was never found) and
+    // it's the only group in output for a test result. In that case, acc.list
+    // will be empty, so return whatever was found, even if it will be unstyled
+    // and prevent next createSubgroup calls from throwing due to empty lists.
+    acc.list.push(null);
+
     return acc.list.reduce((eacc, el, ei) => {
       switch (true) {
         case acc.injectionPoint === 0 && ei === 0: {
           // at index 0, inject before
-          return eacc.concat(acc.grouper(acc.grouped)).concat(el);
+          return eacc.concat(acc.grouper(acc.grouped, acc.grouperIndex)).concat(el);
         }
         case acc.injectionPoint > 0 && acc.injectionPoint === ei + 1: {
           // at index > 0, and next index WOULD BE injectionPoint, inject after
-          return eacc.concat(el).concat(acc.grouper(acc.grouped));
+          return eacc.concat(el).concat(acc.grouper(acc.grouped, acc.grouperIndex));
         }
         default: {
           // do not inject
@@ -150,7 +163,7 @@ const Message = ({ msg }) => {
     .reduce(createSubgroup, {
       startTrigger: e => typeof e === 'string' && e.indexOf('Error: ') === 0,
       endTrigger: e => typeof e === 'string' && e.match('Expected '),
-      grouper: list => <Main msg={list} />,
+      grouper: (list, key) => <Main key={key} msg={list} />,
     })
     .reduce(
       (acc, it) =>
@@ -161,12 +174,12 @@ const Message = ({ msg }) => {
     .reduce(createSubgroup, {
       startTrigger: e => typeof e === 'string' && e.indexOf('Expected ') !== -1,
       endTrigger: e => typeof e === 'string' && e.match(/^at/),
-      grouper: list => <Sub msg={list} />,
+      grouper: (list, key) => <Sub key={key} msg={list} />,
     })
     .reduce(createSubgroup, {
       startTrigger: e => typeof e === 'string' && e.match(/at(.|\n)+\d+:\d+\)/),
       endTrigger: () => false,
-      grouper: list => <StackTrace trace={list} />,
+      grouper: (list, key) => <StackTrace key={key} trace={list} />,
     });
 
   return <Pre>{data}</Pre>;
diff --git a/addons/jest/src/register.js b/addons/jest/src/register.js
index 8abcc1b9dfe..66639bb3b40 100644
--- a/addons/jest/src/register.js
+++ b/addons/jest/src/register.js
@@ -1,4 +1,3 @@
-/* eslint-disable react/no-danger */
 import React from 'react';
 import addons from '@storybook/addons';
 
diff --git a/addons/knobs/.storybook/user/modify_webpack_config.js b/addons/knobs/.storybook/user/modify_webpack_config.js
index 2716de914d5..75e95783687 100644
--- a/addons/knobs/.storybook/user/modify_webpack_config.js
+++ b/addons/knobs/.storybook/user/modify_webpack_config.js
@@ -1,4 +1,4 @@
-module.exports = function (config) {
+module.exports = () => {
   // This is the default webpack config defined in the `../webpack.config.js`
   // modify as you need.
 };
diff --git a/addons/knobs/README.md b/addons/knobs/README.md
index 78b5039f760..b181cf7487b 100644
--- a/addons/knobs/README.md
+++ b/addons/knobs/README.md
@@ -7,20 +7,12 @@
 [![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)
 
-This addon works with Storybook for:
-[React](https://github.com/storybooks/storybook/tree/master/app/react).
-[React Native](https://github.com/storybooks/storybook/tree/master/app/react-native).
-[Vue](https://github.com/storybooks/storybook/tree/master/app/vue).
-
 * * *
 
 Storybook Addon Knobs allow you to edit React props dynamically using the Storybook UI.
 You can also use Knobs as a dynamic variable inside stories in [Storybook](https://storybook.js.org).
 
-This addon works with Storybook for:
-- [React](https://github.com/storybooks/storybook/tree/master/app/react)
-- [React Native](https://github.com/storybooks/storybook/tree/master/app/react-native)
-- [Vue](https://github.com/storybooks/storybook/tree/master/app/vue)
+[Framework Support](https://github.com/storybooks/storybook/blob/master/ADDONS_SUPPORT.md)
 
 This is how Knobs look like:
 
@@ -71,6 +63,18 @@ stories.add('as dynamic variables', () => {
 });
 ```
 
+Categorize your knobs by assigning them a `groupId`. When a `groupId` exists, tabs will appear in the knobs storybook panel to filter between the groups. Knobs without a `groupId` are automatically categorized into the `ALL` group.
+```
+// Knob assigned a groupId.
+stories.add('as dynamic variables', () => {
+  const groupId = 'GROUP-ID1'
+  const name = text('Name', 'Arunoda Susiripala', groupId);
+
+  const content = `My name is ${name}.`;
+  return (<div>{content}</div>);
+});
+```
+
 > In the case of Vue, use these imports:
 >
 > ```js
@@ -123,10 +127,10 @@ import { text } from '@storybook/addon-knobs/react';
 
 const label = 'Your Name';
 const defaultValue = 'Arunoda Susiripala';
+const groupId = 'GROUP-ID1';
 
-const value = text(label, defaultValue);
+const value = text(label, defaultValue, groupId);
 ```
-
 ### boolean
 
 Allows you to get a boolean value from the user.
@@ -136,10 +140,10 @@ import { boolean } from '@storybook/addon-knobs/react';
 
 const label = 'Agree?';
 const defaultValue = false;
+const groupId = 'GROUP-ID1';
 
-const value = boolean(label, defaultValue);
+const value = boolean(label, defaultValue, groupId);
 ```
-
 ### number
 
 Allows you to get a number from the user.
@@ -149,10 +153,15 @@ import { number } from '@storybook/addon-knobs/react';
 
 const label = 'Age';
 const defaultValue = 78;
+const groupId = 'GROUP-ID1';
 
 const value = number(label, defaultValue);
 ```
 
+For use with `groupId`, pass the default `options` as the third argument
+```
+const value = number(label, defaultValue, {}, groupId);
+```
 ### number bound by range
 
 Allows you to get a number from the user using a range slider.
@@ -168,8 +177,9 @@ const options = {
    max: 90,
    step: 1,
 };
+const groupId = 'GROUP-ID1';
 
-const value = number(label, defaultValue, options);
+const value = number(label, defaultValue, options, groupId);
 ```
 
 ### color
@@ -181,8 +191,9 @@ import { color } from '@storybook/addon-knobs/react';
 
 const label = 'Color';
 const defaultValue = '#ff00ff';
+const groupId = 'GROUP-ID1';
 
-const value = color(label, defaultValue);
+const value = color(label, defaultValue, groupId);
 ```
 
 ### object
@@ -196,8 +207,9 @@ const label = 'Styles';
 const defaultValue = {
   backgroundColor: 'red'
 };
+const groupId = 'GROUP-ID1';
 
-const value = object(label, defaultValue);
+const value = object(label, defaultValue, groupId);
 ```
 
 > Make sure to enter valid JSON syntax while editing values inside the knob.
@@ -210,7 +222,8 @@ Allows you to get an array of strings from the user.
 import { array } from '@storybook/addon-knobs/react';
 
 const label = 'Styles';
-const defaultValue = ['Red']
+const defaultValue = ['Red'];
+const groupId = 'GROUP-ID1';
 
 const value = array(label, defaultValue);
 ```
@@ -227,6 +240,11 @@ const value = array(label, defaultValue);
 > const value = array(label, defaultValue, separator);
 > ```
 
+For use with `groupId`, pass the default `separator` as the third argument
+```
+const value = array(label, defaultValue, ',', groupId);
+```
+
 ### select
 
 Allows you to get a value from a select box from the user.
@@ -241,12 +259,34 @@ const options = {
   yellow: 'Yellow',
 };
 const defaultValue = 'red';
+const groupId = 'GROUP-ID1';
 
-const value = select(label, options, defaultValue);
+const value = select(label, options, defaultValue, groupId);
 ```
 
 > You can also provide options as an array like this: `['red', 'blue', 'yellow']`
 
+### selectV2
+
+In v4 this will replace `select`. The value from the select now uses the values from the `options` object.
+
+```js
+import { selectV2 } from '@storybook/addon-knobs';
+
+const label = 'Colors';
+const options = {
+  Red: 'red',
+  Blue: 'blue',
+  Yellow: 'yellow',
+  Rainbow: ['red', 'orange', 'etc'],
+  None: null,
+};
+const defaultValue = 'Red';
+const groupId = 'GROUP-ID1';
+
+const value = selectV2(label, options, defaultValue, groupId);
+```
+
 ### date
 
 Allow you to get date (and time) from the user.
@@ -256,7 +296,9 @@ import { date } from '@storybook/addon-knobs/react';
 
 const label = 'Event Date';
 const defaultValue = new Date('Jan 20 2017');
-const value = date(label, defaultValue);
+const groupId = 'GROUP-ID1';
+
+const value = date(label, defaultValue, groupId);
 ```
 
 > Note: the default value must not change - e.g., do not do `date('Label', new Date())` or `date('Label')`
@@ -264,7 +306,7 @@ const value = date(label, defaultValue);
 The `date` knob returns the selected date as stringified Unix timestamp (e.g. `"1510913096516"`).
 If your component needs the date in a different form you can wrap the `date` function:
 
-```
+```js
 function myDateKnob(name, defaultValue) {
   const stringTimestamp = date(name, defaultValue)
   return new Date(stringTimestamp)
@@ -280,7 +322,9 @@ import { button } from '@storybook/addon-knobs';
 
 const label = 'Do Something';
 const handler = () => doSomething('foobar');
-button(label, handler);
+const groupId = 'GROUP-ID1';
+
+button(label, handler, groupId);
 ```
 
 ### withKnobs vs withKnobsOptions
diff --git a/addons/knobs/example/stories/index.js b/addons/knobs/example/stories/index.js
index c295f90f995..3c98a04f8db 100644
--- a/addons/knobs/example/stories/index.js
+++ b/addons/knobs/example/stories/index.js
@@ -34,8 +34,8 @@ stories.add('with all knobs', () => {
 
   return (
     <div style={style}>
-      I'm {name} and I was born on "{moment(dob).format('DD MMM YYYY')}"
-      I like: <ul>{passions.map((p, i) => <li key={i}>{p}</li>)}</ul>
+      I'm {name} and I was born on "{moment(dob).format('DD MMM YYYY')}" I like:{' '}
+      <ul>{passions.map(p => <li key={p}>{p}</li>)}</ul>
       <p>My favorite number is {favoriteNumber}.</p>
       <p>My most comfortable room temperature is {comfortTemp} degrees Fahrenheit.</p>
     </div>
@@ -50,25 +50,33 @@ stories.add('dates Knob', () => {
   return (
     <ul style={{ listStyleType: 'none', listStyle: 'none', paddingLeft: '15px' }}>
       <li>
-        <p><b>Javascript Date</b> default value, passes date value</p>
+        <p>
+          <b>Javascript Date</b> default value, passes date value
+        </p>
         <blockquote>
           <code>const myDob = date('My DOB', new Date('July 07 1993'));</code>
-          <pre>// I was born in: "{moment(myDob).format('DD MMM YYYY')}"</pre>
+          <pre>{`// I was born in: "${moment(myDob).format('DD MMM YYYY')}"`}</pre>
         </blockquote>
       </li>
       <li>
-        <p><b>undefined</b> default value passes today's date</p>
+        <p>
+          <b>undefined</b> default value passes today's date
+        </p>
         <blockquote>
           <code>const today = date('today');</code>
-          <pre>// Today's date is: "{moment(today).format('DD MMM YYYY')}"</pre>
+          <pre>{`// Today's date is: "${moment(today).format('DD MMM YYYY')}"`}</pre>
         </blockquote>
       </li>
       <li>
-        <p><b>null</b> default value passes null value</p>
+        <p>
+          <b>null</b> default value passes null value
+        </p>
         <blockquote>
           <code>const dob = date('DOB', null);</code>
           <pre>
-            // You were born in: "{dob ? moment(dob).format('DD MMM YYYY') : 'Please select date.'}"
+            {`// You were born in: "${
+              dob ? moment(dob).format('DD MMM YYYY') : 'Please select date.'
+            }"`}
           </pre>
         </blockquote>
       </li>
@@ -80,9 +88,7 @@ stories.add('dynamic knobs', () => {
   const showOptional = select('Show optional', ['yes', 'no'], 'yes');
   return (
     <div>
-      <div>
-        {text('compulsary', 'I must be here')}
-      </div>
+      <div>{text('compulsary', 'I must be here')}</div>
       {showOptional === 'yes' ? <div>{text('optional', 'I can disapear')}</div> : null}
     </div>
   );
diff --git a/addons/knobs/package.json b/addons/knobs/package.json
index d79141a7f57..e1576f37aba 100644
--- a/addons/knobs/package.json
+++ b/addons/knobs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-knobs",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "Storybook Addon Prop Editor Component",
   "license": "MIT",
   "main": "dist/index.js",
@@ -15,21 +15,23 @@
     "storybook": "start-storybook -p 9010"
   },
   "dependencies": {
+    "@storybook/components": "^3.4.0-alpha.9",
     "babel-runtime": "^6.26.0",
     "deep-equal": "^1.0.1",
     "global": "^4.3.2",
     "insert-css": "^2.0.0",
     "lodash.debounce": "^4.0.8",
     "moment": "^2.20.1",
-    "prop-types": "^15.6.0",
-    "react-color": "^2.11.4",
-    "react-datetime": "^2.11.1",
+    "prop-types": "^15.6.1",
+    "react-color": "^2.14.0",
+    "react-datetime": "^2.14.0",
     "react-textarea-autosize": "^5.2.1",
     "util-deprecate": "^1.0.2"
   },
   "devDependencies": {
+    "@storybook/react": "^3.4.0-alpha.9",
     "raw-loader": "^0.5.1",
-    "style-loader": "^0.19.1",
+    "style-loader": "^0.20.2",
     "vue": "^2.5.13"
   },
   "peerDependencies": {
diff --git a/addons/knobs/polymer.js b/addons/knobs/polymer.js
new file mode 100644
index 00000000000..b3cfb782c79
--- /dev/null
+++ b/addons/knobs/polymer.js
@@ -0,0 +1 @@
+module.exports = require('./dist/polymer');
diff --git a/addons/knobs/src/KnobStore.js b/addons/knobs/src/KnobStore.js
index b3a365c6af6..6474abfb79e 100644
--- a/addons/knobs/src/KnobStore.js
+++ b/addons/knobs/src/KnobStore.js
@@ -11,6 +11,7 @@ export default class KnobStore {
   set(key, value) {
     this.store[key] = value;
     this.store[key].used = true;
+    this.store[key].groupId = value.groupId;
     this.callbacks.forEach(cb => cb());
   }
 
diff --git a/addons/knobs/src/angular/helpers.js b/addons/knobs/src/angular/helpers.js
index 1fdc7d7f5b9..3b05496d41d 100644
--- a/addons/knobs/src/angular/helpers.js
+++ b/addons/knobs/src/angular/helpers.js
@@ -1,20 +1,18 @@
 /* eslint no-underscore-dangle: 0 */
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { Component, SimpleChange, ChangeDetectorRef } from '@angular/core';
-import { getParameters, getAnnotations, getPropMetadata } from './utils';
+import { getParameters, getAnnotations } from './utils';
 
 const getComponentMetadata = ({ component, props = {}, moduleMetadata = {} }) => {
   if (!component || typeof component !== 'function') throw new Error('No valid component provided');
 
   const componentMeta = getAnnotations(component)[0] || {};
-  const propsMeta = getPropMetadata(component);
   const paramsMetadata = getParameters(component);
 
   return {
     component,
     props,
     componentMeta,
-    propsMeta,
     moduleMetadata,
     params: paramsMetadata,
   };
@@ -29,8 +27,8 @@ const getAnnotatedComponent = ({ componentMeta, component, params, knobStore, ch
   };
 
   KnobWrapperComponent.prototype = Object.create(component.prototype);
-  KnobWrapperComponent.__annotations__ = [new Component(componentMeta)];
-  KnobWrapperComponent.__parameters__ = [[ChangeDetectorRef], ...params];
+  KnobWrapperComponent.annotations = [new Component(componentMeta)];
+  KnobWrapperComponent.parameters = [[ChangeDetectorRef], ...params];
 
   KnobWrapperComponent.prototype.constructor = KnobWrapperComponent;
   KnobWrapperComponent.prototype.ngOnInit = function onInit() {
@@ -88,6 +86,15 @@ const getAnnotatedComponent = ({ componentMeta, component, params, knobStore, ch
   return KnobWrapperComponent;
 };
 
+const createComponentFromTemplate = (template, styles) => {
+  const componentClass = class DynamicComponent {};
+
+  return Component({
+    template,
+    styles,
+  })(componentClass);
+};
+
 const resetKnobs = (knobStore, channel) => {
   knobStore.reset();
   channel.emit('addon:knobs:setKnobs', {
@@ -98,16 +105,20 @@ const resetKnobs = (knobStore, channel) => {
 
 export function prepareComponent({ getStory, context, channel, knobStore }) {
   resetKnobs(knobStore, channel);
-  const {
-    component,
-    componentMeta,
-    props,
-    propsMeta,
-    params,
-    moduleMetadata,
-  } = getComponentMetadata(getStory(context));
+  const story = getStory(context);
+  let { component } = story;
+  const { template, styles } = story;
 
-  if (!componentMeta) throw new Error('No component metadata available');
+  if (!component) {
+    component = createComponentFromTemplate(template, styles);
+  }
+
+  const { componentMeta, props, params, moduleMetadata } = getComponentMetadata({
+    ...story,
+    component,
+  });
+
+  if (!componentMeta && component) throw new Error('No component metadata available');
 
   const AnnotatedComponent = getAnnotatedComponent({
     componentMeta,
@@ -120,7 +131,6 @@ export function prepareComponent({ getStory, context, channel, knobStore }) {
   return {
     component: AnnotatedComponent,
     props,
-    propsMeta,
     moduleMetadata,
   };
 }
diff --git a/addons/knobs/src/angular/index.js b/addons/knobs/src/angular/index.js
index 03b581dfd11..3d5666ea205 100644
--- a/addons/knobs/src/angular/index.js
+++ b/addons/knobs/src/angular/index.js
@@ -12,11 +12,12 @@ import {
   array,
   date,
   select,
+  selectV2,
   button,
   manager,
 } from '../base';
 
-export { knob, text, boolean, number, color, object, array, date, select, button };
+export { knob, text, boolean, number, color, object, array, date, select, selectV2, button };
 
 export const angularHandler = (channel, knobStore) => getStory => context =>
   prepareComponent({ getStory, context, channel, knobStore });
diff --git a/addons/knobs/src/angular/utils.js b/addons/knobs/src/angular/utils.js
index 6f308ac964b..ddb2abe543c 100644
--- a/addons/knobs/src/angular/utils.js
+++ b/addons/knobs/src/angular/utils.js
@@ -27,10 +27,6 @@ export function getAnnotations(component) {
   return getMeta(component, ['annotations'], []);
 }
 
-export function getPropMetadata(component) {
-  return getMeta(component, ['__prop__metadata__', 'propMetadata'], {});
-}
-
 export function getParameters(component) {
   const params = reflectionCapabilities.parameters(component);
 
diff --git a/addons/knobs/src/base.js b/addons/knobs/src/base.js
index 41597325b2b..9c3a7749520 100644
--- a/addons/knobs/src/base.js
+++ b/addons/knobs/src/base.js
@@ -1,3 +1,4 @@
+import deprecate from 'util-deprecate';
 import KnobManager from './KnobManager';
 
 export const manager = new KnobManager();
@@ -6,15 +7,15 @@ export function knob(name, options) {
   return manager.knob(name, options);
 }
 
-export function text(name, value) {
-  return manager.knob(name, { type: 'text', value });
+export function text(name, value, groupId) {
+  return manager.knob(name, { type: 'text', value, groupId });
 }
 
-export function boolean(name, value) {
-  return manager.knob(name, { type: 'boolean', value });
+export function boolean(name, value, groupId) {
+  return manager.knob(name, { type: 'boolean', value, groupId });
 }
 
-export function number(name, value, options = {}) {
+export function number(name, value, options = {}, groupId) {
   const rangeDefaults = {
     min: 0,
     max: 10,
@@ -32,32 +33,39 @@ export function number(name, value, options = {}) {
     ...mergedOptions,
     type: 'number',
     value,
+    groupId,
   };
 
   return manager.knob(name, finalOptions);
 }
 
-export function color(name, value) {
-  return manager.knob(name, { type: 'color', value });
+export function color(name, value, groupId) {
+  return manager.knob(name, { type: 'color', value, groupId });
 }
 
-export function object(name, value) {
-  return manager.knob(name, { type: 'object', value });
+export function object(name, value, groupId) {
+  return manager.knob(name, { type: 'object', value, groupId });
 }
 
-export function select(name, options, value) {
-  return manager.knob(name, { type: 'select', options, value });
+export const select = deprecate(
+  (name, options, value, groupId) =>
+    manager.knob(name, { type: 'select', options, value, groupId }),
+  'in v4 keys/values of the options argument are reversed'
+);
+
+export function selectV2(name, options, value, groupId) {
+  return manager.knob(name, { type: 'select', selectV2: true, options, value, groupId });
 }
 
-export function array(name, value, separator = ',') {
-  return manager.knob(name, { type: 'array', value, separator });
+export function array(name, value, separator = ',', groupId) {
+  return manager.knob(name, { type: 'array', value, separator, groupId });
 }
 
-export function date(name, value = new Date()) {
+export function date(name, value = new Date(), groupId) {
   const proxyValue = value ? value.getTime() : null;
-  return manager.knob(name, { type: 'date', value: proxyValue });
+  return manager.knob(name, { type: 'date', value: proxyValue, groupId });
 }
 
-export function button(name, callback) {
-  return manager.knob(name, { type: 'button', callback, hideLabel: true });
+export function button(name, callback, groupId) {
+  return manager.knob(name, { type: 'button', callback, hideLabel: true, groupId });
 }
diff --git a/addons/knobs/src/components/GroupTabs.js b/addons/knobs/src/components/GroupTabs.js
new file mode 100644
index 00000000000..23bf6c1a247
--- /dev/null
+++ b/addons/knobs/src/components/GroupTabs.js
@@ -0,0 +1,141 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { baseFonts } from '@storybook/components';
+
+const styles = {
+  empty: {
+    flex: 1,
+    display: 'flex',
+    ...baseFonts,
+    fontSize: 11,
+    letterSpacing: '1px',
+    textTransform: 'uppercase',
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+
+  wrapper: {
+    flex: '1 1 auto',
+    display: 'flex',
+    flexDirection: 'column',
+    background: 'white',
+    borderRadius: 4,
+    border: 'solid 1px rgb(236, 236, 236)',
+    width: '100%',
+  },
+
+  tabbar: {
+    display: 'flex',
+    flexWrap: 'wrap',
+    flexDirection: 'row',
+    justifyContent: 'flex-start',
+    alignItems: 'center',
+    borderBottom: 'solid 1px #eaeaea',
+  },
+
+  content: {
+    flex: '1 1 0',
+    display: 'flex',
+    overflow: 'auto',
+  },
+
+  tablink: {
+    ...baseFonts,
+    fontSize: 11,
+    letterSpacing: '1px',
+    padding: '10px 15px',
+    textTransform: 'uppercase',
+    transition: 'opacity 0.3s',
+    opacity: 0.5,
+    maxHeight: 60,
+    overflow: 'hidden',
+    cursor: 'pointer',
+    background: 'transparent',
+    border: 'none',
+  },
+
+  activetab: {
+    opacity: 1,
+  },
+};
+
+class GroupTabs extends Component {
+  renderTab(name, group) {
+    let tabStyle = styles.tablink;
+    if (this.props.selectedGroup === name) {
+      tabStyle = Object.assign({}, styles.tablink, styles.activetab);
+    }
+
+    const onClick = e => {
+      e.preventDefault();
+      this.props.onGroupSelect(name);
+    };
+
+    let { title } = group;
+    if (typeof title === 'function') {
+      title = title();
+    }
+
+    return (
+      <button type="button" key={name} style={tabStyle} onClick={onClick} role="tab">
+        {title}
+      </button>
+    );
+  }
+
+  renderTabs() {
+    return Object.keys(this.props.groups).map(name => {
+      const group = this.props.groups[name];
+      return this.renderTab(name, group);
+    });
+  }
+
+  renderGroups() {
+    return Object.keys(this.props.groups)
+      .sort()
+      .map(name => {
+        const groupStyle = { display: 'none' };
+        const group = this.props.groups[name];
+        if (name === this.props.selectedGroup) {
+          Object.assign(groupStyle, { flex: 1, display: 'flex' });
+        }
+        return (
+          <div key={name} style={groupStyle}>
+            {group.render()}
+          </div>
+        );
+      });
+  }
+
+  renderEmpty() {
+    return <div style={styles.empty}>no groups available</div>;
+  }
+
+  render() {
+    if (!this.props.groups || !Object.keys(this.props.groups).length) {
+      return this.renderEmpty();
+    }
+    return (
+      <div style={styles.wrapper}>
+        <div style={styles.tabbar} role="tablist">
+          {this.renderTabs()}
+        </div>
+        <div style={styles.content}>{this.renderGroups()}</div>
+      </div>
+    );
+  }
+}
+
+GroupTabs.defaultProps = {
+  groups: {},
+  onGroupSelect: () => {},
+  selectedGroup: null,
+};
+
+GroupTabs.propTypes = {
+  groups: PropTypes.object, // eslint-disable-line react/forbid-prop-types
+  onGroupSelect: PropTypes.func,
+  selectedGroup: PropTypes.string,
+};
+
+export default GroupTabs;
diff --git a/addons/knobs/src/components/Panel.js b/addons/knobs/src/components/Panel.js
index 062f660c23a..dcfd959d121 100644
--- a/addons/knobs/src/components/Panel.js
+++ b/addons/knobs/src/components/Panel.js
@@ -2,11 +2,14 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import debounce from 'lodash.debounce';
 
+import GroupTabs from './GroupTabs';
 import PropForm from './PropForm';
 import Types from './types';
 
 const getTimestamp = () => +new Date();
 
+const DEFAULT_GROUP_ID = 'ALL';
+
 const styles = {
   panelWrapper: {
     width: '100%',
@@ -50,8 +53,9 @@ export default class Panel extends React.Component {
     this.setKnobs = this.setKnobs.bind(this);
     this.reset = this.reset.bind(this);
     this.setOptions = this.setOptions.bind(this);
+    this.onGroupSelect = this.onGroupSelect.bind(this);
 
-    this.state = { knobs: {} };
+    this.state = { knobs: {}, groupId: DEFAULT_GROUP_ID };
     this.options = {};
 
     this.lastEdit = getTimestamp();
@@ -60,7 +64,7 @@ export default class Panel extends React.Component {
     this.props.channel.on('addon:knobs:setOptions', this.setOptions);
 
     this.stopListeningOnStory = this.props.api.onStory(() => {
-      this.setState({ knobs: [] });
+      this.setState({ knobs: [], groupId: DEFAULT_GROUP_ID });
       this.props.channel.emit('addon:knobs:reset');
     });
   }
@@ -70,6 +74,10 @@ export default class Panel extends React.Component {
     this.stopListeningOnStory();
   }
 
+  onGroupSelect(name) {
+    this.setState({ groupId: name });
+  }
+
   setOptions(options = { debounce: false, timestamps: false }) {
     this.options = options;
 
@@ -139,10 +147,39 @@ export default class Panel extends React.Component {
   }
 
   render() {
-    const { knobs } = this.state;
-    const knobsArray = Object.keys(knobs)
-      .filter(key => knobs[key].used)
-      .map(key => knobs[key]);
+    const { knobs, groupId } = this.state;
+
+    const groups = {};
+    const groupIds = [];
+
+    Object.keys(knobs)
+      .filter(key => knobs[key].used && knobs[key].groupId)
+      .forEach(key => {
+        const knobKeyGroupId = knobs[key].groupId;
+        groupIds.push(knobKeyGroupId);
+        groups[knobKeyGroupId] = {
+          render: () => <div id={knobKeyGroupId}>{knobKeyGroupId}</div>,
+          title: knobKeyGroupId,
+        };
+      });
+
+    let knobsArray = Object.keys(knobs);
+
+    if (groupIds.length > 0) {
+      groups[DEFAULT_GROUP_ID] = {
+        render: () => <div id={DEFAULT_GROUP_ID}>{DEFAULT_GROUP_ID}</div>,
+        title: DEFAULT_GROUP_ID,
+      };
+      knobsArray = knobsArray.filter(key => {
+        const filter =
+          groupId === DEFAULT_GROUP_ID
+            ? knobs[key].used
+            : knobs[key].used && knobs[key].groupId === groupId;
+        return filter;
+      });
+    }
+
+    knobsArray = knobsArray.map(key => knobs[key]);
 
     if (knobsArray.length === 0) {
       return <div style={styles.noKnobs}>NO KNOBS</div>;
@@ -150,6 +187,13 @@ export default class Panel extends React.Component {
 
     return (
       <div style={styles.panelWrapper}>
+        {groupIds.length > 0 && (
+          <GroupTabs
+            groups={groups}
+            onGroupSelect={this.onGroupSelect}
+            selectedGroup={this.state.groupId}
+          />
+        )}
         <div style={styles.panel}>
           <PropForm
             knobs={knobsArray}
diff --git a/addons/knobs/src/components/__tests__/Array.js b/addons/knobs/src/components/__tests__/Array.js
index 88af1cb5ba6..74bad56442e 100644
--- a/addons/knobs/src/components/__tests__/Array.js
+++ b/addons/knobs/src/components/__tests__/Array.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { shallow } from 'enzyme'; // eslint-disable-line
+import { shallow } from 'enzyme';
 import ArrayType from '../types/Array';
 
 describe('Array', () => {
diff --git a/addons/knobs/src/components/__tests__/GroupTabs.js b/addons/knobs/src/components/__tests__/GroupTabs.js
new file mode 100644
index 00000000000..9915657b5e1
--- /dev/null
+++ b/addons/knobs/src/components/__tests__/GroupTabs.js
@@ -0,0 +1,58 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import GroupTabs from '../GroupTabs';
+
+describe('GroupTabs', () => {
+  test('should render only the selected group with display set other than "none"', () => {
+    const groups = {
+      test1: {
+        render() {
+          return <div id="test1">TEST 1</div>;
+        },
+      },
+      test2: {
+        render() {
+          return <div id="test2">TEST 2</div>;
+        },
+      },
+    };
+
+    const onGroupSelect = () => 'onGroupSelect';
+
+    const wrapper = shallow(
+      <GroupTabs groups={groups} onGroupSelect={onGroupSelect} selectedGroup="test2" />
+    );
+
+    expect(wrapper.find('#test1').parent()).toHaveStyle('display', 'none');
+    expect(wrapper.find('#test2').parent()).not.toHaveStyle('display', 'none');
+  });
+
+  test('should set onGroupSelected as onClick handlers of tabs', () => {
+    const groups = {
+      test1: {
+        render() {
+          return <div>TEST 1</div>;
+        },
+      },
+    };
+    const onGroupSelect = jest.fn();
+    const preventDefault = jest.fn();
+    const wrapper = shallow(
+      <GroupTabs groups={groups} onGroupSelect={onGroupSelect} selectedGroup="test1" />
+    );
+    wrapper.find('button').simulate('click', { preventDefault });
+
+    expect(onGroupSelect).toHaveBeenCalled();
+    expect(preventDefault).toHaveBeenCalled();
+  });
+
+  describe('when no groups are given', () => {
+    test('should render "no groups available"', () => {
+      const groups = {};
+      const onGroupSelect = () => 'onGroupSelect';
+      const wrapper = shallow(<GroupTabs groups={groups} onGroupSelect={onGroupSelect} />);
+
+      expect(wrapper.contains('no groups available')).toBe(true);
+    });
+  });
+});
diff --git a/addons/knobs/src/components/__tests__/Panel.js b/addons/knobs/src/components/__tests__/Panel.js
index 6994937e810..ef0389705b6 100644
--- a/addons/knobs/src/components/__tests__/Panel.js
+++ b/addons/knobs/src/components/__tests__/Panel.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { shallow } from 'enzyme'; // eslint-disable-line
+import { shallow } from 'enzyme';
 import Panel from '../Panel';
 
 describe('Panel', () => {
diff --git a/addons/knobs/src/components/__tests__/Select.js b/addons/knobs/src/components/__tests__/Select.js
new file mode 100644
index 00000000000..71dd7825196
--- /dev/null
+++ b/addons/knobs/src/components/__tests__/Select.js
@@ -0,0 +1,40 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import SelectType from '../types/Select';
+
+describe('Select', () => {
+  let knob;
+
+  beforeEach(() => {
+    knob = {
+      name: 'Colors',
+      value: '#00ff00',
+      options: {
+        Green: '#00ff00',
+        Red: '#ff0000',
+      },
+    };
+  });
+
+  it('displays value', () => {
+    const wrapper = shallow(<SelectType knob={knob} />);
+
+    const green = wrapper.find('option').first();
+    expect(green.text()).toEqual('#00ff00');
+    expect(green.prop('value')).toEqual('Green');
+  });
+
+  describe('selectV2', () => {
+    beforeEach(() => {
+      knob.selectV2 = true;
+    });
+
+    it('correctly maps option keys and values', () => {
+      const wrapper = shallow(<SelectType knob={knob} />);
+
+      const green = wrapper.find('option').first();
+      expect(green.text()).toEqual('Green');
+      expect(green.prop('value')).toEqual('#00ff00');
+    });
+  });
+});
diff --git a/addons/knobs/src/components/types/Select.js b/addons/knobs/src/components/types/Select.js
index a0a5366af62..bad3d398ce6 100644
--- a/addons/knobs/src/components/types/Select.js
+++ b/addons/knobs/src/components/types/Select.js
@@ -18,20 +18,27 @@ const styles = {
 };
 
 class SelectType extends React.Component {
-  _makeOpt(key, val) {
+  _makeOpt(key, value, selectV2) {
     const opts = {
       key,
       value: key,
     };
 
-    return <option {...opts}>{val}</option>;
+    let display = value;
+
+    if (selectV2) {
+      opts.value = value;
+      display = key;
+    }
+
+    return <option {...opts}>{display}</option>;
   }
-  _options(values) {
+  _options({ options, selectV2 }) {
     let data = [];
-    if (Array.isArray(values)) {
-      data = values.map(val => this._makeOpt(val, val));
+    if (Array.isArray(options)) {
+      data = options.map(val => this._makeOpt(val, val));
     } else {
-      data = Object.keys(values).map(key => this._makeOpt(key, values[key]));
+      data = Object.keys(options).map(key => this._makeOpt(key, options[key], selectV2));
     }
 
     return data;
@@ -49,7 +56,7 @@ class SelectType extends React.Component {
         value={knob.value}
         onChange={e => onChange(e.target.value)}
       >
-        {this._options(knob.options)}
+        {this._options(knob)}
       </select>
     );
   }
@@ -64,6 +71,8 @@ SelectType.propTypes = {
   knob: PropTypes.shape({
     name: PropTypes.string,
     value: PropTypes.string,
+    options: PropTypes.oneOfType([PropTypes.array, PropTypes.object]),
+    selectV2: PropTypes.bool,
   }),
   onChange: PropTypes.func,
 };
diff --git a/addons/knobs/src/index.js b/addons/knobs/src/index.js
index 7a4109270d0..51c13caacd4 100644
--- a/addons/knobs/src/index.js
+++ b/addons/knobs/src/index.js
@@ -16,10 +16,11 @@ import {
   number,
   object,
   select,
+  selectV2,
   text,
 } from './base';
 
-export { knob, text, boolean, number, color, object, array, date, button, select };
+export { knob, text, boolean, number, color, object, array, date, button, select, selectV2 };
 
 deprecate(() => {},
 'Using @storybook/addon-knobs directly is discouraged, please use @storybook/addon-knobs/{{framework}}');
diff --git a/addons/knobs/src/polymer/WrapStory.html b/addons/knobs/src/polymer/WrapStory.html
new file mode 100644
index 00000000000..ec233fb8744
--- /dev/null
+++ b/addons/knobs/src/polymer/WrapStory.html
@@ -0,0 +1,87 @@
+<dom-module id="wrap-story">
+  <script>
+    class WrapStory extends HTMLElement {
+      static get is() {
+        return 'wrap-story';
+      }
+
+      constructor(component, channel, context, storyFn, knobStore) {
+        super();
+
+        this.attachShadow({ mode: 'open' });
+        this.shadowRoot.innerHTML = '<div id="wrapper"></div>';
+
+        this.channel = channel;
+        this.context = context;
+        this.storyFn = storyFn;
+        this.knobStore = knobStore;
+
+        this.knobChanged = this.knobChanged.bind(this);
+        this.knobClicked = this.knobClicked.bind(this);
+        this.resetKnobs = this.resetKnobs.bind(this);
+        this.setPaneKnobs = this.setPaneKnobs.bind(this);
+
+        this.connectChannel(this.channel);
+        this.knobStore.subscribe(this.setPaneKnobs);
+        this.render(component);
+      }
+
+      disconnectedCallback() {
+        this.disconnectChannel(this.channel);
+        this.knobStore.unsubscribe(this.setPaneKnobs);
+      }
+
+      connectChannel(channel) {
+        channel.on('addon:knobs:knobChange', this.knobChanged);
+        channel.on('addon:knobs:knobClick', this.knobClicked);
+        channel.on('addon:knobs:reset', this.resetKnobs);
+      }
+
+      disconnectChannel(channel) {
+        channel.removeListener('addon:knobs:knobChange', this.knobChanged);
+        channel.removeListener('addon:knobs:knobClick', this.knobClicked);
+        channel.removeListener('addon:knobs:reset', this.resetKnobs);
+      }
+
+      knobChanged(change) {
+        const { name, value } = change;
+        const { knobStore, storyFn, context } = this;
+        // Update the related knob and it's value.
+        const knobOptions = knobStore.get(name);
+
+        knobOptions.value = value;
+        knobStore.markAllUnused();
+        this.render(storyFn(context));
+      }
+
+      knobClicked(clicked) {
+        const knobOptions = this.knobStore.get(clicked.name);
+        knobOptions.callback();
+      }
+
+      resetKnobs() {
+        const { knobStore, storyFn, context } = this;
+        knobStore.reset();
+        this.render(storyFn(context));
+        this.setPaneKnobs(this.channel, this.knobStore, false);
+      }
+
+      setPaneKnobs(timestamp = +new Date()) {
+        const { channel, knobStore } = this;
+        channel.emit('addon:knobs:setKnobs', { knobs: knobStore.getAll(), timestamp });
+      }
+
+      render(component) {
+        const wrapper = this.shadowRoot.querySelector('div#wrapper');
+        if (typeof component === 'string') {
+          wrapper.innerHTML = component;
+        } else {
+          wrapper.innerHTML = '';
+          wrapper.appendChild(component);
+        }
+      }
+    }
+
+    customElements.define(WrapStory.is, WrapStory);
+  </script>
+</dom-module>
diff --git a/addons/knobs/src/polymer/index.js b/addons/knobs/src/polymer/index.js
new file mode 100644
index 00000000000..5bb16a89065
--- /dev/null
+++ b/addons/knobs/src/polymer/index.js
@@ -0,0 +1,36 @@
+import addons from '@storybook/addons';
+import window from 'global';
+import './WrapStory.html';
+
+import { knob, text, boolean, number, color, object, array, date, select, manager } from '../base';
+
+export { knob, text, boolean, number, color, object, array, date, select };
+
+export function button(name, callback) {
+  return manager.knob(name, { type: 'button', value: Date.now(), callback, hideLabel: true });
+}
+
+function prepareComponent({ getStory, context, channel, knobStore }) {
+  const WrapStory = window.customElements.get('wrap-story');
+  return new WrapStory(getStory(context), channel, context, getStory, knobStore);
+}
+
+export const polymerHandler = (channel, knobStore) => getStory => context =>
+  prepareComponent({ getStory, context, channel, knobStore });
+
+function wrapperKnobs(options) {
+  const channel = addons.getChannel();
+  manager.setChannel(channel);
+
+  if (options) channel.emit('addon:knobs:setOptions', options);
+
+  return polymerHandler(channel, manager.knobStore);
+}
+
+export function withKnobs(storyFn, context) {
+  return wrapperKnobs()(storyFn)(context);
+}
+
+export function withKnobsOptions(options = {}) {
+  return (storyFn, context) => wrapperKnobs(options)(storyFn)(context);
+}
diff --git a/addons/knobs/src/react/index.js b/addons/knobs/src/react/index.js
index f4f2ddccc0b..71c0b7d792f 100644
--- a/addons/knobs/src/react/index.js
+++ b/addons/knobs/src/react/index.js
@@ -13,11 +13,12 @@ import {
   array,
   date,
   select,
+  selectV2,
   button,
   manager,
 } from '../base';
 
-export { knob, text, boolean, number, color, object, array, date, select, button };
+export { knob, text, boolean, number, color, object, array, date, select, selectV2, button };
 
 export const reactHandler = (channel, knobStore) => getStory => context => {
   const initialContent = getStory(context);
diff --git a/addons/knobs/src/vue/index.js b/addons/knobs/src/vue/index.js
index d5cddbf0f79..df66a1036db 100644
--- a/addons/knobs/src/vue/index.js
+++ b/addons/knobs/src/vue/index.js
@@ -10,11 +10,12 @@ import {
   array,
   date,
   select,
+  selectV2,
   button,
   manager,
 } from '../base';
 
-export { knob, text, boolean, number, color, object, array, date, select, button };
+export { knob, text, boolean, number, color, object, array, date, select, selectV2, button };
 
 export const vueHandler = (channel, knobStore) => getStory => context => ({
   data() {
diff --git a/addons/links/.storybook/config.js b/addons/links/.storybook/config.js
index 29599c59b5d..9c18e1bf514 100644
--- a/addons/links/.storybook/config.js
+++ b/addons/links/.storybook/config.js
@@ -1,2 +1,3 @@
 import * as storybook from '@storybook/react';
+
 storybook.configure(() => require('./stories'), module);
diff --git a/addons/links/.storybook/stories.js b/addons/links/.storybook/stories.js
index 0385d9ac2c5..183d44449f9 100644
--- a/addons/links/.storybook/stories.js
+++ b/addons/links/.storybook/stories.js
@@ -1,4 +1,5 @@
-import React from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { storiesOf } from '@storybook/react';
 import { linkTo } from '../src';
 
@@ -10,15 +11,36 @@ storiesOf('Button', module)
     <button onClick={linkTo('Button', 'First Story')}>Go to "First Story"</button>
   ))
   .add('Multiple Selection', () => (
-    <MultipleStories onClick={linkTo('Button', (filter) => {
-      return filter === 'First' ? 'First Story' : 'Second Story';
-    })}/>
+    <MultipleStories
+      onClick={linkTo('Button', filter => (filter === 'First' ? 'First Story' : 'Second Story'))}
+    />
   ));
 
-const MultipleStories = ({onClick}) => {
-  return (
-  <ul>
-    <button onClick={onClick.bind(null, 'First')}>Go to "First Story"</button>
-    <button onClick={onClick.bind(null, 'Second')}>Go to "Second Story"</button>
-  </ul>);
+class MultipleStories extends Component {
+  constructor(...args) {
+    super(...args);
+    this.onFirstClick = this.onFirstClick.bind(this);
+    this.onSecondClick = this.onSecondClick.bind(this);
+  }
+
+  onFirstClick() {
+    this.props.onClick('First');
+  }
+
+  onSecondClick() {
+    this.props.onClick('Second');
+  }
+
+  render() {
+    return (
+      <ul>
+        <button onClick={this.onFirstClick}>Go to "First Story"</button>
+        <button onClick={this.onSecondClick}>Go to "Second Story"</button>
+      </ul>
+    );
+  }
 }
+
+MultipleStories.propTypes = {
+  onClick: PropTypes.func.isRequired,
+};
diff --git a/addons/links/README.md b/addons/links/README.md
index 9598fe24fc5..4fd95ec68c5 100644
--- a/addons/links/README.md
+++ b/addons/links/README.md
@@ -11,10 +11,7 @@
 
 The Storybook Links addon can be used to create links that navigate between stories in [Storybook](https://storybook.js.org).
 
-This addon works with Storybook for:
-- [React](https://github.com/storybooks/storybook/tree/master/app/react)
-- [React Native](https://github.com/storybooks/storybook/tree/master/app/react-native)
-- [Vue](https://github.com/storybooks/storybook/tree/master/app/vue)
+[Framework Support](https://github.com/storybooks/storybook/blob/master/ADDONS_SUPPORT.md)
 
 ## Getting Started
 
@@ -105,7 +102,7 @@ A React implementation of such a component can be imported from `@storybook/addo
 
 ```js
 import { storiesOf } from '@storybook/react';
-import { LinkTo } from '@storybook/addon-links';
+import LinkTo from '@storybook/addon-links/react';
 
 storiesOf('Link', module)
   .add('First', () => (
diff --git a/addons/links/package.json b/addons/links/package.json
index 717ddbb4642..29bfb2e3b06 100644
--- a/addons/links/package.json
+++ b/addons/links/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-links",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "Story Links addon for storybook",
   "keywords": [
     "storybook"
@@ -22,15 +22,16 @@
     "storybook": "start-storybook -p 9001"
   },
   "dependencies": {
-    "@storybook/components": "^3.4.0-alpha.0",
+    "@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",
     "enzyme": "^3.3.0",
     "react": "^16.1.0",
-    "react-dom": "^16.1.0",
-    "shelljs": "^0.7.8"
+    "react-dom": "^16.1.0"
   },
   "peerDependencies": {
     "@storybook/addons": "^3.3.0",
diff --git a/addons/links/register.js b/addons/links/register.js
index e69edbea3ed..9232e6c069d 100644
--- a/addons/links/register.js
+++ b/addons/links/register.js
@@ -1 +1 @@
-require('./dist').register();
+require('./dist/manager').register();
diff --git a/addons/links/src/index.js b/addons/links/src/index.js
index 3093e702709..1f8a4f52daf 100644
--- a/addons/links/src/index.js
+++ b/addons/links/src/index.js
@@ -3,7 +3,6 @@ export const EVENT_ID = `${ADDON_ID}/link-event`;
 export const REQUEST_HREF_EVENT_ID = `${ADDON_ID}/request-href-event`;
 export const RECEIVE_HREF_EVENT_ID = `${ADDON_ID}/receive-href-event`;
 
-export { register } from './manager';
 export { linkTo, hrefTo } from './preview';
 
 let hasWarned = false;
diff --git a/addons/notes/README.md b/addons/notes/README.md
index e25274eb412..767aa945af3 100644
--- a/addons/notes/README.md
+++ b/addons/notes/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)
 
@@ -11,10 +11,7 @@
 
 Storybook Addon Notes allows you to write notes (text or HTML) for your stories in [Storybook](https://storybook.js.org).
 
-This addon works with Storybook for:
-- [React](https://github.com/storybooks/storybook/tree/master/app/react)
-- [React Native](https://github.com/storybooks/storybook/tree/master/app/react-native)
-- [Vue](https://github.com/storybooks/storybook/tree/master/app/vue)
+[Framework Support](https://github.com/storybooks/storybook/blob/master/ADDONS_SUPPORT.md)
 
 ![Storybook Addon Notes Demo](docs/demo.png)
 
@@ -41,7 +38,7 @@ import { withNotes } from '@storybook/addon-notes';
 import Component from './Component';
 
 storiesOf('Component', module)
-  .add('with some emoji', withNotes('A very simple component')(() => </Component>>));
+  .add('with some emoji', withNotes('A very simple component')(() => </Component>));
 ```
 
 #### Using Markdown
@@ -58,6 +55,30 @@ storiesOf('Component', module)
   .add('With Markdown', withNotes(someMarkdownText)(() => <Component/>));
 
 ```
+
+If you want to use Github flavored markdown inline, use `withMarkdownNotes`:
+
+```js
+import { storiesOf } from '@storybook/react';
+import { withMarkdownNotes } from '@storybook/addon-notes';
+import Component from './Component';
+
+storiesOf('Component', module)
+  .add('With Markdown', withMarkdownNotes(`
+# Hello World
+
+This is some code showing usage of the component and other inline documentation
+
+~~~js
+<div>
+  hello world!
+  <Component/>
+</div>
+~~~
+  `)(() => <Component/>));
+
+```
+
 ### Deprecated API
 This API is slated for removal in 4.0
 
diff --git a/addons/notes/package.json b/addons/notes/package.json
index 2fc44a2811b..a33ca6c5ec9 100644
--- a/addons/notes/package.json
+++ b/addons/notes/package.json
@@ -1,11 +1,11 @@
 {
   "name": "@storybook/addon-notes",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "Write notes for your Storybook stories.",
   "keywords": [
     "addon",
-    "storybook",
-    "notes"
+    "notes",
+    "storybook"
   ],
   "license": "MIT",
   "main": "dist/index.js",
@@ -21,9 +21,13 @@
   },
   "dependencies": {
     "babel-runtime": "^6.26.0",
-    "prop-types": "^15.6.0",
+    "marked": "^0.3.17",
+    "prop-types": "^15.6.1",
     "util-deprecate": "^1.0.2"
   },
+  "devDependencies": {
+    "@storybook/react": "^3.4.0-alpha.9"
+  },
   "peerDependencies": {
     "@storybook/addons": "^3.3.0",
     "react": "*"
diff --git a/addons/notes/src/__tests__/index.js b/addons/notes/src/__tests__/index.js
new file mode 100644
index 00000000000..a21aec2a7f2
--- /dev/null
+++ b/addons/notes/src/__tests__/index.js
@@ -0,0 +1,19 @@
+import addons from '@storybook/addons';
+import { withNotes } from '..';
+
+jest.mock('@storybook/addons');
+
+describe('Storybook Addon Notes', () => {
+  it('should inject info', () => {
+    const channel = { emit: jest.fn() };
+    addons.getChannel.mockReturnValue(channel);
+
+    const getStory = jest.fn();
+    const context = {};
+
+    const decoratedStory = withNotes('hello')(getStory);
+    decoratedStory(context);
+    expect(channel.emit).toHaveBeenCalledWith('storybook/notes/add_notes', 'hello');
+    expect(getStory).toHaveBeenCalledWith(context);
+  });
+});
diff --git a/addons/notes/src/index.js b/addons/notes/src/index.js
index 1fd5d328fcb..247210ab1e3 100644
--- a/addons/notes/src/index.js
+++ b/addons/notes/src/index.js
@@ -1,7 +1,18 @@
 import deprecate from 'util-deprecate';
 import addons from '@storybook/addons';
+import marked from 'marked';
 import { WithNotes as ReactWithNotes } from './react';
 
+export const withMarkdownNotes = text => {
+  const channel = addons.getChannel();
+
+  return getStory => context => {
+    // send the notes to the channel before the story is rendered
+    channel.emit('storybook/notes/add_notes', marked(text));
+    return getStory(context);
+  };
+};
+
 export const withNotes = textOrOptions => {
   const channel = addons.getChannel();
   const options = typeof textOrOptions === 'string' ? { text: textOrOptions } : textOrOptions;
diff --git a/addons/notes/src/tests/index.js b/addons/notes/src/tests/index.js
deleted file mode 100644
index d06c3dd0874..00000000000
--- a/addons/notes/src/tests/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const { describe, it } = global;
-
-describe('Storybook Addon Notes', () => {
-  it('should have some tests');
-});
diff --git a/addons/options/.storybook/stories.js b/addons/options/.storybook/stories.js
index f9a2300173b..ef3c262e668 100644
--- a/addons/options/.storybook/stories.js
+++ b/addons/options/.storybook/stories.js
@@ -2,9 +2,5 @@ import React from 'react';
 import { storiesOf } from '@storybook/react';
 
 storiesOf('Hello', module)
-  .add('Hello World', () => (
-    <pre>Hello World</pre>
-  ))
-  .add('Hello Earth', () => (
-    <pre>Hello Earth</pre>
-  ));
+  .add('Hello World', () => <pre>Hello World</pre>)
+  .add('Hello Earth', () => <pre>Hello Earth</pre>);
diff --git a/addons/options/README.md b/addons/options/README.md
index 92dcb099570..e4a12e73634 100644
--- a/addons/options/README.md
+++ b/addons/options/README.md
@@ -11,10 +11,7 @@
 
 The Options addon can be used to (re-)configure the [Storybook](https://storybook.js.org) UI at runtime.
 
-This addon works with Storybook for:
-- [React](https://github.com/storybooks/storybook/tree/master/app/react)
-- [React Native](https://github.com/storybooks/storybook/tree/master/app/react-native)
-- [Vue](https://github.com/storybooks/storybook/tree/master/app/vue)
+[Framework Support](https://github.com/storybooks/storybook/blob/master/ADDONS_SUPPORT.md)
 
 ![Screenshot](docs/screenshot.png)
 
diff --git a/addons/options/package.json b/addons/options/package.json
index e418fd46b05..d7063ca82d0 100644
--- a/addons/options/package.json
+++ b/addons/options/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-options",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "Options addon for storybook",
   "keywords": [
     "storybook"
@@ -19,6 +19,12 @@
     "prepare": "node ../../scripts/prepare.js",
     "storybook": "start-storybook -p 9001"
   },
+  "dependencies": {
+    "babel-runtime": "^6.26.0"
+  },
+  "devDependencies": {
+    "@storybook/react": "^3.4.0-alpha.9"
+  },
   "peerDependencies": {
     "@storybook/addons": "^3.3.0",
     "react": "*",
diff --git a/addons/storyshots/.babelrc b/addons/storyshots/.babelrc
deleted file mode 100644
index 7ecf0273a6b..00000000000
--- a/addons/storyshots/.babelrc
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "presets": ["env", "stage-0", "react"],
-  "plugins": [
-    "transform-runtime"
-  ]
-}
diff --git a/addons/storyshots/.storybook/config.js b/addons/storyshots/.storybook/config.js
index e56acc7f9c2..e3f08b8cfe9 100644
--- a/addons/storyshots/.storybook/config.js
+++ b/addons/storyshots/.storybook/config.js
@@ -1,10 +1,10 @@
 import { configure } from '@storybook/react';
 
-const req = require.context('../stories/required_with_context', true, /.stories.js$/)
+const req = require.context('../stories/required_with_context', true, /.stories.js$/);
 
 function loadStories() {
-  req.keys().forEach((filename) => req(filename))
-  require('../stories/directly_required')
+  req.keys().forEach(filename => req(filename));
+  require('../stories/directly_required');
 }
 
 configure(loadStories, module);
diff --git a/addons/storyshots/README.md b/addons/storyshots/README.md
index 0505b724b24..8bd9556c0a7 100644
--- a/addons/storyshots/README.md
+++ b/addons/storyshots/README.md
@@ -11,9 +11,7 @@
 
 StoryShots adds automatic Jest Snapshot Testing for [Storybook](https://storybook.js.org/).
 
-This addon works with Storybook for:
-- [React](https://github.com/storybooks/storybook/tree/master/app/react)
-- [React Native](https://github.com/storybooks/storybook/tree/master/app/react-native)
+[Framework Support](https://github.com/storybooks/storybook/blob/master/ADDONS_SUPPORT.md)
 
 ![StoryShots In Action](docs/storyshots-fail.png)
 
@@ -36,7 +34,73 @@ Usually, you might already have completed this step. If not, here are some resou
 
 > Note: If you use React 16, you'll need to follow [these additional instructions](https://github.com/facebook/react/issues/9102#issuecomment-283873039).
 
-## Configure Storyshots
+### Configure Jest for React
+StoryShots addon for React is dependent on [react-test-renderer](https://github.com/facebook/react/tree/master/packages/react-test-renderer), but 
+[doesn't](#deps-issue) install it, so you need to install it separately.
+
+```sh
+npm install --save-dev react-test-renderer
+```
+
+### Configure Jest for Angular
+StoryShots addon for Angular is dependent on [jest-preset-angular](https://github.com/thymikee/jest-preset-angular), but 
+[doesn't](#deps-issue) install it, so you need to install it separately.
+
+```sh
+npm install --save-dev jest-preset-angular
+```
+
+If you already use Jest for testing your angular app - probably you already have the needed jest configuration.
+Anyway you can add these lines to your jest config:
+```js
+module.exports = {
+  globals: {
+    __TRANSFORM_HTML__: true,
+  },
+  transform: {
+    '^.+\\.jsx?$': 'babel-jest',
+    '^.+\\.(ts|html)$': '<rootDir>/node_modules/jest-preset-angular/preprocessor.js',
+  },
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node', '.html'],
+};
+```
+### Configure Jest for Vue
+StoryShots addon for Vue is dependent on [jest-vue-preprocessor](https://github.com/vire/jest-vue-preprocessor), but 
+[doesn't](#deps-issue) install it, so you need to install it separately.
+ 
+ ```sh
+ npm install --save-dev jest-vue-preprocessor
+ ```
+ 
+If you already use Jest for testing your vue app - probably you already have the needed jest configuration.
+Anyway you can add these lines to your jest config:
+```js
+module.exports = {
+  transform: {
+    '^.+\\.jsx?$': 'babel-jest',
+    '.*\\.(vue)$': '<rootDir>/node_modules/jest-vue-preprocessor',
+  },
+  transformIgnorePatterns: [
+    '/node_modules/(?!(@storybook/.*\\.vue$))',
+  ],
+  moduleFileExtensions: ['vue', 'js', 'jsx', 'json', 'node'],
+};
+```
+
+### <a name="deps-issue"></a>Why don't we install dependencies of each framework ?
+Storyshots addon is currently supporting React, Angular and Vue. Each framework needs its own packages to be integrated with Jest. We don't want people that use only React will need to bring other dependencies that do not make sense for them. 
+
+`dependencies` - will installed an exact version of the particular dep - Storyshots can work with different versions of the same framework (let's say React v16 and React v15), that have to be compatible with a version of its plugin (react-test-renderer).
+
+`optionalDependencies` - behaves like a regular dependency, but do not fail the installation in case there is a problem to bring the dep.
+
+`peerDependencies` - listing all the deps in peer will trigger warnings during the installation - we don't want users to install unneeded deps by hand.
+
+`optionalPeerDependencies` - unfortunately there is nothing like this =(
+    
+For more information read npm [docs](https://docs.npmjs.com/files/package.json#dependencies)
+
+## Configure Storyshots for HTML snapshots
 
 Create a new test file with the name `Storyshots.test.js`. (Or whatever the name you prefer, as long as it matches Jest's config [`testMatch`](http://facebook.github.io/jest/docs/en/configuration.html#testmatch-array-string)).
 Then add following content to it:
@@ -53,6 +117,138 @@ Now run your Jest test command. (Usually, `npm test`.) Then you can see all of y
 
 ![Screenshot](docs/storyshots.png)
 
+
+### Using `createNodeMock` to mock refs
+
+`react-test-renderer` doesn't provide refs for rendered components. By
+default, it returns null when the refs are referenced. In order to mock
+out elements that rely on refs, you will have to use the
+`createNodeMock` option [added to React](https://reactjs.org/blog/2016/11/16/react-v15.4.0.html#mocking-refs-for-snapshot-testing) starting with version 15.4.0.
+
+Here is an example of how to specify the `createNodeMock` option in Storyshots:
+
+```js
+import initStoryshots, { snapshotWithOptions } from '@storybook/addon-storyshots'
+import TextareaThatUsesRefs from '../component/TextareaThatUsesRefs'
+
+initStoryshots({
+  test: snapshotWithOptions({
+    createNodeMock: (element) => {
+      if (element.type === TextareaThatUsesRefs) {
+        return document.createElement('textarea')
+      }
+    },
+  }),
+})
+```
+
+## Configure Storyshots for image snapshots ( alpha )
+
+/*\ **React-native** is **not supported** by this test function.
+
+Internally, it uses [jest-image-snapshot](https://github.com/americanexpress/jest-image-snapshot).
+
+When willing to generate and compare image snapshots for your stories, you have two options: 
+- Have a storybook running (ie. accessible via http(s), for instance using `yarn run storybook`)
+- Have a static build of the storybook (for instance, using `yarn run build-storybook`)
+
+Then you will need to reference the storybook URL (`file://...` if local, `http(s)://...` if served)
+
+### Using default values for _imageSnapshots_
+
+Then you can either create a new Storyshots instance or edit the one you previously used: 
+```js
+import initStoryshots, { imageSnapshot } from '@storybook/addon-storyshots';
+
+initStoryshots({suite: 'Image storyshots', test: imageSnapshot});
+```
+This will assume you have a storybook running on at _<http://localhost:6006>_.
+Internally here are the steps:  
+- Launches a Chrome headless using [puppeteer](https://github.com/GoogleChrome/puppeteer)
+- Browses each stories (calling _<http://localhost:6006/iframe.html?...>_ URL),
+- Take screenshots & save all images under _\_image_snapshots\__ folder.
+
+### Specifying the storybook URL
+
+If you want to set specific storybook URL, you can specify via the `storybookUrl` parameter, see below: 
+```js
+import initStoryshots, { imageSnapshot } from '@storybook/addon-storyshots';
+
+initStoryshots({suite: 'Image storyshots', test: imageSnapshot({storybookUrl: 'http://my-specific-domain.com:9010'})});
+```
+The above config will use _<https://my-specific-domain.com:9010>_ for screenshots.
+
+
+You may also use a local static build of storybook if you do not want to run the webpack dev-server:
+```js
+import initStoryshots, { imageSnapshot } from '@storybook/addon-storyshots';
+
+initStoryshots({suite: 'Image storyshots', test: imageSnapshot({storybookUrl: 'file:///path/to/my/storybook-static'})});
+```
+
+### Specifying options to _jest-image-snapshots_
+
+If you wish to customize [jest-image-snapshot](https://github.com/americanexpress/jest-image-snapshot), then you can provide a `getMatchOptions` parameter that should return the options config object. Additionally, you can provide `beforeScreenshot` which is called before the screenshot is captured.
+```js
+import initStoryshots, { imageSnapshot } from '@storybook/addon-storyshots';
+const getMatchOptions = ({context : {kind, story}, url}) => {
+  return {
+    failureThreshold: 0.2,
+    failureThresholdType: 'percent',
+  }
+}
+const beforeScreenshot = (page, {context : {kind, story}, url}) => {
+  return new Promise(resolve =>
+      setTimeout(() => {
+          resolve();
+      }, 600)
+  )
+}
+initStoryshots({suite: 'Image storyshots', test: imageSnapshot({storybookUrl: 'http://localhost:6006', getMatchOptions, beforeScreenshot})});
+```
+`getMatchOptions` 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.
+
+`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.
+
+### 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.
+You can find a working example of this in the [official-storybook](https://github.com/storybooks/storybook/tree/master/examples/official-storybook) example.
+
+### Integrate image storyshots with [Create React App](https://github.com/facebookincubator/create-react-app)
+
+You have two options here, you can either: 
+
+- Simply add the storyshots configuration inside any of your `test.js` file. You must ensure you have either a running storybook or a static build available.
+
+- Create a custom test file using Jest outside of the CRA scope:
+
+    A more robust approach would be to separate existing test files ran by create-react-app (anything `(test|spec).js` suffixed files) from the test files to run storyshots with image snapshots.
+    This use case can be achieved by using a custom name for the test file, ie something like `image-storyshots.runner.js`. This file will contains the `initStoryshots` call with image snapshots configuration.
+    Then you will create a separate script entry in your package.json, for instance 
+    ```json
+    {
+        "scripts": { 
+            "image-snapshots" : "jest image-storyshots.runner.js --config path/to/custom/jest.config.json"
+        }
+    }
+    ```
+    Note that you will certainly need a custom config file for Jest as you run it outside of the CRA scope and thus you do not have the built-in config.
+
+    Once that's setup, you can run `yarn run image-snapshots` (or `npm run image-snapshots`).
+
+### Reminder
+
+An image snapshot is simply a screenshot taken by a web browser (in our case, Chrome).
+
+The browser opens a page (either using the static build of storybook or a running instance of Storybook)
+
+If you run your test without either the static build or a running instance, this wont work.
+
+To make sure your screenshots are taken from latest changes of your Storybook, you must keep your static build or running Storybook up-to-date. 
+This can be achieved by adding a step before running the test ie: `yarn run build-storybook && yarn run image-snapshots`.
+If you run the image snapshots against a running Storybook in dev mode, you don't have to care about being up-to-date because the dev-server is watching changes and rebuilds automatically.
+
 ## Options
 
 ### `configPath`
@@ -203,6 +399,10 @@ Take a snapshot of a shallow-rendered version of the component. Note that this o
 
 Utility function used in `multiSnapshotWithOptions`. This is made available for users who implement custom test functions that also want to take advantage of multi-file storyshots.
 
+### `imageSnapshot` ( alpha )
+
+Render the story and take Jest snapshots as images. see [Configure image snapshots](#configure-storyshots-for-image-snapshots)
+
 ###### Example:
 
 Let's say we wanted to create a test function for shallow && multi-file snapshots:
diff --git a/addons/storyshots/package.json b/addons/storyshots/package.json
index 0b2c0b5290c..52e91d2b05c 100644
--- a/addons/storyshots/package.json
+++ b/addons/storyshots/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-storyshots",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "StoryShots is a Jest Snapshot Testing Addon for Storybook.",
   "license": "MIT",
   "main": "dist/index.js",
@@ -11,38 +11,32 @@
   },
   "scripts": {
     "build-storybook": "build-storybook",
-    "prepare": "babel ./src --out-dir ./dist",
-    "storybook": "start-storybook -p 6006",
-    "example": "jest storyshot.test"
+    "example": "jest storyshot.test",
+    "prepare": "node ../../scripts/prepare.js",
+    "storybook": "start-storybook -p 6006"
   },
   "dependencies": {
-    "@storybook/channels": "^3.4.0-alpha.0",
+    "@storybook/channels": "^3.4.0-alpha.9",
+    "@storybook/node-logger": "^3.4.0-alpha.9",
     "babel-runtime": "^6.26.0",
     "glob": "^7.1.2",
     "global": "^4.3.2",
-    "jest-specific-snapshot": "^0.3.0",
-    "prop-types": "^15.6.0",
+    "jest-image-snapshot": "^2.3.0",
+    "jest-specific-snapshot": "^0.4.0",
+    "puppeteer": "^1.1.1",
     "read-pkg-up": "^3.0.0"
   },
   "devDependencies": {
-    "@storybook/addons": "^3.4.0-alpha.0",
-    "@storybook/react": "^3.4.0-alpha.0",
-    "babel-cli": "^6.26.0",
-    "babel-jest": "^20.0.3",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-env": "^1.6.0",
-    "babel-preset-react": "^6.24.1",
-    "babel-preset-stage-0": "^6.24.1",
-    "enzyme-to-json": "^3.2.2",
-    "jest": "^20.0.4",
-    "jest-cli": "^20.0.4",
+    "@storybook/addon-actions": "^3.4.0-alpha.9",
+    "@storybook/addon-links": "^3.4.0-alpha.9",
+    "@storybook/addons": "^3.4.0-alpha.9",
+    "@storybook/react": "^3.4.0-alpha.9",
+    "enzyme-to-json": "^3.3.1",
     "react": "^16.1.0",
     "react-dom": "^16.1.0"
   },
   "peerDependencies": {
-    "@storybook/addons": "^3.4.0-alpha.0",
-    "babel-core": "^6.26.0 || ^7.0.0-0",
-    "react": "*",
-    "react-test-renderer": "*"
+    "@storybook/addons": "^3.4.0-alpha.9",
+    "babel-core": "^6.26.0 || ^7.0.0-0"
   }
 }
diff --git a/addons/storyshots/src/angular/app.component.ts b/addons/storyshots/src/angular/app.component.ts
new file mode 100644
index 00000000000..297624ac8b7
--- /dev/null
+++ b/addons/storyshots/src/angular/app.component.ts
@@ -0,0 +1,92 @@
+// We could use NgComponentOutlet here but there's currently no easy way
+// to provide @Inputs and subscribe to @Outputs, see
+// https://github.com/angular/angular/issues/15360
+// For the time being, the ViewContainerRef approach works pretty well.
+import {
+  Component,
+  Inject,
+  OnInit,
+  ViewChild,
+  ViewContainerRef,
+  ComponentFactoryResolver,
+  OnDestroy,
+  EventEmitter,
+  SimpleChanges,
+  SimpleChange,
+} from '@angular/core';
+import { STORY } from './app.token';
+import { NgStory, ICollection } from './types';
+
+@Component({
+  selector: 'storybook-dynamic-app-root',
+  template: '<ng-template #target></ng-template>',
+})
+export class AppComponent implements OnInit, OnDestroy {
+  @ViewChild('target', { read: ViewContainerRef })
+  target: ViewContainerRef;
+  constructor(private cfr: ComponentFactoryResolver, @Inject(STORY) private data: NgStory) {}
+
+  ngOnInit(): void {
+    this.putInMyHtml();
+  }
+
+  ngOnDestroy(): void {
+    this.target.clear();
+  }
+
+  private putInMyHtml(): void {
+    this.target.clear();
+    const compFactory = this.cfr.resolveComponentFactory(this.data.component);
+    const instance = this.target.createComponent(compFactory).instance;
+
+    this.setProps(instance, this.data);
+  }
+
+  /**
+   * Set inputs and outputs
+   */
+  private setProps(instance: any, { props = {} }: NgStory): void {
+    const changes: SimpleChanges = {};
+    const hasNgOnChangesHook = !!instance['ngOnChanges'];
+
+    Object.keys(props).map((key: string) => {
+      const value = props[key];
+      const instanceProperty = instance[key];
+
+      if (!(instanceProperty instanceof EventEmitter) && !!value) {
+        instance[key] = value;
+        if (hasNgOnChangesHook) {
+          changes[key] = new SimpleChange(undefined, value, instanceProperty === undefined);
+        }
+      } else if (typeof value === 'function' && key !== 'ngModelChange') {
+        instanceProperty.subscribe(value);
+      }
+    });
+
+    this.callNgOnChangesHook(instance, changes);
+    this.setNgModel(instance, props);
+  }
+
+  /**
+   * Manually call 'ngOnChanges' hook because angular doesn't do that for dynamic components
+   * Issue: [https://github.com/angular/angular/issues/8903]
+   */
+  private callNgOnChangesHook(instance: any, changes: SimpleChanges): void {
+    if (!!Object.keys(changes).length) {
+      instance.ngOnChanges(changes);
+    }
+  }
+
+  /**
+   * If component implements ControlValueAccessor interface try to set ngModel
+   */
+  private setNgModel(instance: any, props: ICollection): void {
+    if (!!props['ngModel']) {
+      instance.writeValue(props.ngModel);
+    }
+
+    if (typeof props.ngModelChange === 'function') {
+      instance.registerOnChange(props.ngModelChange);
+    }
+  }
+}
diff --git a/addons/storyshots/src/angular/app.token.ts b/addons/storyshots/src/angular/app.token.ts
new file mode 100644
index 00000000000..3e4753b21c1
--- /dev/null
+++ b/addons/storyshots/src/angular/app.token.ts
@@ -0,0 +1,4 @@
+import { InjectionToken } from '@angular/core';
+import { NgStory } from './types';
+
+export const STORY = new InjectionToken<NgStory>('story');
diff --git a/addons/storyshots/src/angular/helpers.ts b/addons/storyshots/src/angular/helpers.ts
new file mode 100644
index 00000000000..d1d42e74643
--- /dev/null
+++ b/addons/storyshots/src/angular/helpers.ts
@@ -0,0 +1,64 @@
+import { Component, Type } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { BrowserModule } from '@angular/platform-browser';
+import { AppComponent } from './app.component';
+import { STORY } from './app.token';
+import { NgStory } from './types';
+
+const getModuleMeta = (
+  declarations: Array<Type<any> | any[]>,
+  entryComponents: Array<Type<any> | any[]>,
+  bootstrap: Array<Type<any> | any[]>,
+  data: NgStory,
+  moduleMetadata: any
+) => {
+  return {
+    declarations: [...declarations, ...(moduleMetadata.declarations || [])],
+    imports: [BrowserModule, FormsModule, ...(moduleMetadata.imports || [])],
+    providers: [
+      { provide: STORY, useValue: Object.assign({}, data) },
+      ...(moduleMetadata.providers || []),
+    ],
+    entryComponents: [...entryComponents, ...(moduleMetadata.entryComponents || [])],
+    schemas: [...(moduleMetadata.schemas || [])],
+    bootstrap: [...bootstrap],
+  };
+};
+
+const createComponentFromTemplate = (template: string): Function => {
+  const componentClass = class DynamicComponent {};
+
+  return Component({
+    template: template,
+  })(componentClass);
+};
+
+export const initModuleData = (storyObj: NgStory): any => {
+  const { component, template, props, moduleMetadata = {} } = storyObj;
+
+  let AnnotatedComponent;
+
+  if (template) {
+    AnnotatedComponent = createComponentFromTemplate(template);
+  } else {
+    AnnotatedComponent = component;
+  }
+
+  const story = {
+    component: AnnotatedComponent,
+    props,
+  };
+
+  const moduleMeta = getModuleMeta(
+    [AppComponent, AnnotatedComponent],
+    [AnnotatedComponent],
+    [AppComponent],
+    story,
+    moduleMetadata
+  );
+
+  return {
+    AppComponent,
+    moduleMeta,
+  };
+};
diff --git a/addons/storyshots/src/angular/loader.js b/addons/storyshots/src/angular/loader.js
new file mode 100644
index 00000000000..aae9bb4a3cf
--- /dev/null
+++ b/addons/storyshots/src/angular/loader.js
@@ -0,0 +1,43 @@
+import runWithRequireContext from '../require_context';
+import hasDependency from '../hasDependency';
+import loadConfig from '../config-loader';
+
+function setupAngularJestPreset() {
+  // Angular + Jest + Storyshots = Crazy Shit:
+  // We need to require 'jest-preset-angular/setupJest' before any storybook code
+  // is running inside jest -  one of the things that `jest-preset-angular/setupJest` does is
+  // extending the `window.Reflect` with all the needed metadata functions, that are required
+  // for emission of the TS decorations like 'design:paramtypes'
+  require.requireActual('jest-preset-angular/setupJest');
+}
+
+function test(options) {
+  return (
+    options.framework === 'angular' || (!options.framework && hasDependency('@storybook/angular'))
+  );
+}
+
+function load(options) {
+  setupAngularJestPreset();
+
+  const { content, contextOpts } = loadConfig({
+    configDirPath: options.configPath,
+    babelConfigPath: '@storybook/angular/dist/server/babel_config',
+  });
+
+  runWithRequireContext(content, contextOpts);
+
+  return {
+    framework: 'angular',
+    renderTree: require.requireActual('./renderTree').default,
+    renderShallowTree: () => {
+      throw new Error('Shallow renderer is not supported for angular');
+    },
+    storybook: require.requireActual('@storybook/angular'),
+  };
+}
+
+export default {
+  load,
+  test,
+};
diff --git a/addons/storyshots/src/angular/renderTree.js b/addons/storyshots/src/angular/renderTree.js
new file mode 100644
index 00000000000..81d22e8d0b0
--- /dev/null
+++ b/addons/storyshots/src/angular/renderTree.js
@@ -0,0 +1,44 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
+import AngularSnapshotSerializer from 'jest-preset-angular/AngularSnapshotSerializer';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import HTMLCommentSerializer from 'jest-preset-angular/HTMLCommentSerializer';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { TestBed } from '@angular/core/testing';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { addSerializer } from 'jest-specific-snapshot';
+import { initModuleData } from './helpers';
+
+addSerializer(HTMLCommentSerializer);
+addSerializer(AngularSnapshotSerializer);
+
+function getRenderedTree(story, context) {
+  const currentStory = story.render(context);
+
+  const { moduleMeta, AppComponent } = initModuleData(currentStory);
+
+  TestBed.configureTestingModule({
+    imports: [...moduleMeta.imports],
+    declarations: [...moduleMeta.declarations],
+    providers: [...moduleMeta.providers],
+    schemas: [NO_ERRORS_SCHEMA, ...moduleMeta.schemas],
+    bootstrap: [...moduleMeta.bootstrap],
+  });
+
+  TestBed.overrideModule(BrowserDynamicTestingModule, {
+    set: {
+      entryComponents: [...moduleMeta.entryComponents],
+    },
+  });
+
+  return TestBed.compileComponents().then(() => {
+    const tree = TestBed.createComponent(AppComponent);
+    tree.detectChanges();
+
+    return tree;
+  });
+}
+
+export default getRenderedTree;
diff --git a/addons/storyshots/src/angular/types.ts b/addons/storyshots/src/angular/types.ts
new file mode 100644
index 00000000000..191d2ed44c0
--- /dev/null
+++ b/addons/storyshots/src/angular/types.ts
@@ -0,0 +1,19 @@
+export interface NgModuleMetadata {
+  declarations?: Array<any>;
+  entryComponents?: Array<any>;
+  imports?: Array<any>;
+  schemas?: Array<any>;
+  providers?: Array<any>;
+}
+
+export interface ICollection {
+  [p: string]: any;
+}
+
+export interface NgStory {
+  component?: any;
+  props: ICollection;
+  propsMeta?: ICollection;
+  moduleMetadata?: NgModuleMetadata;
+  template?: string;
+}
diff --git a/addons/storyshots/src/config-loader.js b/addons/storyshots/src/config-loader.js
new file mode 100644
index 00000000000..a5d6b36b521
--- /dev/null
+++ b/addons/storyshots/src/config-loader.js
@@ -0,0 +1,24 @@
+import path from 'path';
+
+const babel = require('babel-core');
+
+function getConfigContent({ resolvedConfigDirPath, configPath, babelConfigPath }) {
+  const loadBabelConfig = require.requireActual(babelConfigPath).default;
+  const babelConfig = loadBabelConfig(resolvedConfigDirPath);
+  return babel.transformFileSync(configPath, babelConfig).code;
+}
+
+function load({ configDirPath, babelConfigPath }) {
+  const resolvedConfigDirPath = path.resolve(configDirPath || '.storybook');
+  const configPath = path.join(resolvedConfigDirPath, 'config.js');
+
+  const content = getConfigContent({ resolvedConfigDirPath, configPath, babelConfigPath });
+  const contextOpts = { filename: configPath, dirname: resolvedConfigDirPath };
+
+  return {
+    content,
+    contextOpts,
+  };
+}
+
+export default load;
diff --git a/addons/storyshots/src/frameworkLoader.js b/addons/storyshots/src/frameworkLoader.js
new file mode 100644
index 00000000000..047759ec3a9
--- /dev/null
+++ b/addons/storyshots/src/frameworkLoader.js
@@ -0,0 +1,18 @@
+import loaderReact from './react/loader';
+import loaderRn from './rn/loader';
+import loaderAngular from './angular/loader';
+import loaderVue from './vue/loader';
+
+const loaders = [loaderReact, loaderAngular, loaderRn, loaderVue];
+
+function loadFramework(options) {
+  const loader = loaders.find(frameworkLoader => frameworkLoader.test(options));
+
+  if (!loader) {
+    throw new Error('storyshots is intended only to be used with storybook');
+  }
+
+  return loader.load(options);
+}
+
+export default loadFramework;
diff --git a/addons/storyshots/src/hasDependency.js b/addons/storyshots/src/hasDependency.js
new file mode 100644
index 00000000000..673ff614221
--- /dev/null
+++ b/addons/storyshots/src/hasDependency.js
@@ -0,0 +1,13 @@
+import fs from 'fs';
+import path from 'path';
+import readPkgUp from 'read-pkg-up';
+
+const { pkg } = readPkgUp.sync();
+
+export default function hasDependency(name) {
+  return (
+    (pkg.devDependencies && pkg.devDependencies[name]) ||
+    (pkg.dependencies && pkg.dependencies[name]) ||
+    fs.existsSync(path.join('node_modules', name, 'package.json'))
+  );
+}
diff --git a/addons/storyshots/src/index.js b/addons/storyshots/src/index.js
index c43acb30182..1a127cde9eb 100644
--- a/addons/storyshots/src/index.js
+++ b/addons/storyshots/src/index.js
@@ -1,94 +1,57 @@
-import path from 'path';
 import fs from 'fs';
 import glob from 'glob';
-import global, { describe, it } from 'global';
-import readPkgUp from 'read-pkg-up';
+import global, { describe, it, beforeEach, afterEach } from 'global';
 import addons from '@storybook/addons';
-
-import runWithRequireContext from './require_context';
+import loadFramework from './frameworkLoader';
 import createChannel from './storybook-channel-mock';
-import { snapshotWithOptions } from './test-bodies';
 import { getPossibleStoriesFiles, getSnapshotFileName } from './utils';
+import { imageSnapshot } from './test-body-image-snapshot';
+
+import {
+  multiSnapshotWithOptions,
+  snapshotWithOptions,
+  snapshot,
+  shallowSnapshot,
+  renderOnly,
+} from './test-bodies';
+
+global.STORYBOOK_REACT_CLASSES = global.STORYBOOK_REACT_CLASSES || {};
 
 export {
+  getSnapshotFileName,
   snapshot,
   multiSnapshotWithOptions,
   snapshotWithOptions,
   shallowSnapshot,
   renderOnly,
-} from './test-bodies';
-
-export { getSnapshotFileName };
-
-let storybook;
-let configPath;
-global.STORYBOOK_REACT_CLASSES = global.STORYBOOK_REACT_CLASSES || {};
-
-const babel = require('babel-core');
-
-const { pkg } = readPkgUp.sync();
-
-const hasDependency = name =>
-  (pkg.devDependencies && pkg.devDependencies[name]) ||
-  (pkg.dependencies && pkg.dependencies[name]) ||
-  fs.existsSync(path.join('node_modules', name, 'package.json'));
+  imageSnapshot,
+};
 
 export default function testStorySnapshots(options = {}) {
-  addons.setChannel(createChannel());
-
-  const isStorybook =
-    options.framework === 'react' || (!options.framework && hasDependency('@storybook/react'));
-  const isRNStorybook =
-    options.framework === 'react-native' ||
-    (!options.framework && hasDependency('@storybook/react-native'));
-
-  if (isStorybook) {
-    storybook = require.requireActual('@storybook/react');
-    // eslint-disable-next-line
-    const loadBabelConfig = require('@storybook/react/dist/server/babel_config')
-      .default;
-    const configDirPath = path.resolve(options.configPath || '.storybook');
-    configPath = path.join(configDirPath, 'config.js');
-
-    const babelConfig = loadBabelConfig(configDirPath);
-    const content = babel.transformFileSync(configPath, babelConfig).code;
-    const contextOpts = {
-      filename: configPath,
-      dirname: configDirPath,
-    };
-
-    runWithRequireContext(content, contextOpts);
-  } else if (isRNStorybook) {
-    storybook = require.requireActual('@storybook/react-native');
-
-    configPath = path.resolve(options.configPath || 'storybook');
-    require.requireActual(configPath);
-  } else {
-    throw new Error('storyshots is intended only to be used with storybook');
-  }
-
   if (typeof describe !== 'function') {
     throw new Error('testStorySnapshots is intended only to be used inside jest');
   }
 
-  // NOTE: keep `suit` typo for backwards compatibility
-  const suite = options.suite || options.suit || 'Storyshots';
+  addons.setChannel(createChannel());
+
+  const { storybook, framework, renderTree, renderShallowTree } = loadFramework(options);
   const stories = storybook.getStorybook();
 
   if (stories.length === 0) {
     throw new Error('storyshots found 0 stories');
   }
 
-  // Added not to break existing storyshots configs (can be removed in a future major release)
-  // eslint-disable-next-line
-  options.storyNameRegex = options.storyNameRegex || options.storyRegex;
+  // NOTE: keep `suit` typo for backwards compatibility
+  const suite = options.suite || options.suit || 'Storyshots';
+  // NOTE: Added not to break existing storyshots configs (can be removed in a future major release)
+  const storyNameRegex = options.storyNameRegex || options.storyRegex;
+
   const snapshotOptions = {
     renderer: options.renderer,
     serializer: options.serializer,
   };
-  // eslint-disable-next-line
-  options.test =
-    options.test || snapshotWithOptions({ options: snapshotOptions });
+
+  const testMethod = options.test || snapshotWithOptions({ options: snapshotOptions });
 
   // eslint-disable-next-line
   for (const group of stories) {
@@ -100,19 +63,35 @@ 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) {
-          if (options.storyNameRegex && !story.name.match(options.storyNameRegex)) {
+          if (storyNameRegex && !story.name.match(storyNameRegex)) {
             // eslint-disable-next-line
             continue;
           }
 
           it(story.name, () => {
-            const context = { fileName, kind, story: story.name };
-            return options.test({
+            const context = { fileName, kind, story: story.name, framework };
+            return testMethod({
               story,
               context,
+              renderTree,
+              renderShallowTree,
             });
           });
         }
@@ -122,14 +101,13 @@ export default function testStorySnapshots(options = {}) {
 }
 
 describe('Storyshots Integrity', () => {
-  describe('Abandoned Storyshots', () => {
+  test('Abandoned Storyshots', () => {
     const storyshots = glob.sync('**/*.storyshot');
 
     const abandonedStoryshots = storyshots.filter(fileName => {
       const possibleStoriesFiles = getPossibleStoriesFiles(fileName);
       return !possibleStoriesFiles.some(fs.existsSync);
     });
-
     expect(abandonedStoryshots).toHaveLength(0);
   });
 });
diff --git a/addons/storyshots/src/react/loader.js b/addons/storyshots/src/react/loader.js
new file mode 100644
index 00000000000..552ed5b5ea8
--- /dev/null
+++ b/addons/storyshots/src/react/loader.js
@@ -0,0 +1,28 @@
+import runWithRequireContext from '../require_context';
+import hasDependency from '../hasDependency';
+import loadConfig from '../config-loader';
+
+function test(options) {
+  return options.framework === 'react' || (!options.framework && hasDependency('@storybook/react'));
+}
+
+function load(options) {
+  const { content, contextOpts } = loadConfig({
+    configDirPath: options.configPath,
+    babelConfigPath: '@storybook/react/dist/server/babel_config',
+  });
+
+  runWithRequireContext(content, contextOpts);
+
+  return {
+    framework: 'react',
+    renderTree: require.requireActual('./renderTree').default,
+    renderShallowTree: require.requireActual('./renderShallowTree').default,
+    storybook: require.requireActual('@storybook/react'),
+  };
+}
+
+export default {
+  load,
+  test,
+};
diff --git a/addons/storyshots/src/react/renderShallowTree.js b/addons/storyshots/src/react/renderShallowTree.js
new file mode 100644
index 00000000000..022b7c9ae0a
--- /dev/null
+++ b/addons/storyshots/src/react/renderShallowTree.js
@@ -0,0 +1,11 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
+import shallow from 'react-test-renderer/shallow';
+
+function getRenderedTree(story, context, { renderer, serializer }) {
+  const storyElement = story.render(context);
+  const shallowRenderer = renderer || shallow.createRenderer();
+  const tree = shallowRenderer.render(storyElement);
+  return serializer ? serializer(tree) : tree;
+}
+
+export default getRenderedTree;
diff --git a/addons/storyshots/src/react/renderTree.js b/addons/storyshots/src/react/renderTree.js
new file mode 100644
index 00000000000..3ad4b81b9eb
--- /dev/null
+++ b/addons/storyshots/src/react/renderTree.js
@@ -0,0 +1,11 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
+import reactTestRenderer from 'react-test-renderer';
+
+function getRenderedTree(story, context, { renderer, serializer, ...rendererOptions }) {
+  const storyElement = story.render(context);
+  const currentRenderer = renderer || reactTestRenderer.create;
+  const tree = currentRenderer(storyElement, rendererOptions);
+  return serializer ? serializer(tree) : tree;
+}
+
+export default getRenderedTree;
diff --git a/addons/storyshots/src/require_context.js b/addons/storyshots/src/require_context.js
index ff77a6902e8..c4af4335127 100644
--- a/addons/storyshots/src/require_context.js
+++ b/addons/storyshots/src/require_context.js
@@ -1,3 +1,4 @@
+import { process } from 'global';
 import vm from 'vm';
 import fs from 'fs';
 import path from 'path';
@@ -40,6 +41,14 @@ function isRelativeRequest(request) {
   );
 }
 
+function getFullPath(dirname, request) {
+  if (isRelativeRequest(request) || !process.env.NODE_PATH) {
+    return path.resolve(dirname, request);
+  }
+
+  return path.resolve(process.env.NODE_PATH, request);
+}
+
 export default function runWithRequireContext(content, options) {
   const { filename, dirname } = options;
 
@@ -57,7 +66,8 @@ export default function runWithRequireContext(content, options) {
   newRequire.cache = require.cache;
 
   newRequire.context = (directory, useSubdirectories = false, regExp = /^\.\//) => {
-    const fullPath = path.resolve(dirname, directory);
+    const fullPath = getFullPath(dirname, directory);
+
     const keys = {};
     requireModules(keys, fullPath, '.', regExp, useSubdirectories);
 
diff --git a/addons/storyshots/src/rn/loader.js b/addons/storyshots/src/rn/loader.js
new file mode 100644
index 00000000000..5d0d3a92534
--- /dev/null
+++ b/addons/storyshots/src/rn/loader.js
@@ -0,0 +1,29 @@
+/* eslint-disable global-require */
+import path from 'path';
+import hasDependency from '../hasDependency';
+
+function test(options) {
+  return (
+    options.framework === 'react-native' ||
+    (!options.framework && hasDependency('@storybook/react-native'))
+  );
+}
+
+function load(options) {
+  const storybook = require.requireActual('@storybook/react-native');
+
+  const configPath = path.resolve(options.configPath || 'storybook');
+  require.requireActual(configPath);
+
+  return {
+    renderTree: require('../react/renderTree').default,
+    renderShallowTree: require('../react/renderShallowTree').default,
+    framework: 'rn',
+    storybook,
+  };
+}
+
+export default {
+  load,
+  test,
+};
diff --git a/addons/storyshots/src/test-bodies.js b/addons/storyshots/src/test-bodies.js
index 7380e72ac0d..2cc98c8c72b 100644
--- a/addons/storyshots/src/test-bodies.js
+++ b/addons/storyshots/src/test-bodies.js
@@ -1,43 +1,54 @@
-import reactTestRenderer from 'react-test-renderer';
-import shallow from 'react-test-renderer/shallow';
 import 'jest-specific-snapshot';
 import { getSnapshotFileName } from './utils';
 
-function getRenderedTree(story, context, { renderer, serializer, ...rendererOptions }) {
-  const currentRenderer = renderer || reactTestRenderer.create;
-  const storyElement = story.render(context);
-  const tree = currentRenderer(storyElement, rendererOptions);
-  return serializer ? serializer(tree) : tree;
+export const snapshotWithOptions = options => ({
+  story,
+  context,
+  renderTree,
+  snapshotFileName,
+}) => {
+  const result = renderTree(story, context, options);
+
+  function match(tree) {
+    if (snapshotFileName) {
+      expect(tree).toMatchSpecificSnapshot(snapshotFileName);
+    } else {
+      expect(tree).toMatchSnapshot();
+    }
+
+    if (typeof tree.unmount === 'function') {
+      tree.unmount();
+    }
+  }
+
+  if (typeof result.then === 'function') {
+    return result.then(match);
+  }
+
+  return match(result);
+};
+
+export const multiSnapshotWithOptions = options => ({ story, context, renderTree }) =>
+  snapshotWithOptions(options)({
+    story,
+    context,
+    renderTree,
+    snapshotFileName: getSnapshotFileName(context),
+  });
+
+export function shallowSnapshot({ story, context, renderShallowTree, options = {} }) {
+  const result = renderShallowTree(story, context, options);
+  expect(result).toMatchSnapshot();
 }
 
-export const snapshotWithOptions = options => ({ story, context, snapshotFileName }) => {
-  const tree = getRenderedTree(story, context, options);
+export function renderOnly({ story, context, renderTree }) {
+  const result = renderTree(story, context, {});
 
-  if (snapshotFileName) {
-    expect(tree).toMatchSpecificSnapshot(snapshotFileName);
-  } else {
-    expect(tree).toMatchSnapshot();
+  if (typeof result.then === 'function') {
+    return result;
   }
 
-  if (typeof tree.unmount === 'function') {
-    tree.unmount();
-  }
-};
-
-export const multiSnapshotWithOptions = options => ({ story, context }) => {
-  snapshotWithOptions(options)({ story, context, snapshotFileName: getSnapshotFileName(context) });
-};
+  return undefined;
+}
 
 export const snapshot = snapshotWithOptions({});
-
-export function shallowSnapshot({ story, context, options: { renderer, serializer } }) {
-  const shallowRenderer = renderer || shallow.createRenderer();
-  const tree = shallowRenderer.render(story.render(context));
-  const serializedTree = serializer ? serializer(tree) : tree;
-  expect(serializedTree).toMatchSnapshot();
-}
-
-export function renderOnly({ story, context }) {
-  const storyElement = story.render(context);
-  reactTestRenderer.create(storyElement);
-}
diff --git a/addons/storyshots/src/test-body-image-snapshot.js b/addons/storyshots/src/test-body-image-snapshot.js
new file mode 100644
index 00000000000..5f95c5666ef
--- /dev/null
+++ b/addons/storyshots/src/test-body-image-snapshot.js
@@ -0,0 +1,70 @@
+import puppeteer from 'puppeteer';
+import { toMatchImageSnapshot } from 'jest-image-snapshot';
+import { logger } from '@storybook/node-logger';
+
+expect.extend({ toMatchImageSnapshot });
+
+export const imageSnapshot = ({
+  storybookUrl = 'http://localhost:6006',
+  getMatchOptions = () => {},
+  beforeScreenshot = () => {},
+}) => {
+  let browser; // holds ref to browser. (ie. Chrome)
+  let page; // Hold ref to the page to screenshot.
+
+  const testFn = ({ context }) => {
+    if (context.framework === 'rn') {
+      // Skip tests since we de not support RN image snapshots.
+      logger.error(
+        "It seems you are running imageSnapshot on RN app and it's not supported. Skipping test."
+      );
+      return Promise.resolve();
+    }
+
+    const encodedKind = encodeURIComponent(context.kind);
+    const encodedStoryName = encodeURIComponent(context.story);
+    const storyUrl = `/iframe.html?selectedKind=${encodedKind}&selectedStory=${encodedStoryName}`;
+    const url = storybookUrl + storyUrl;
+    if (!browser || !page) {
+      logger.error(
+        `Error when generating image snapshot for test ${context.kind} - ${
+          context.story
+        } : It seems the headless browser is not running.`
+      );
+      return Promise.reject(new Error('no-headless-browser-running'));
+    }
+
+    expect.assertions(1);
+    return page
+      .goto(url)
+      .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.`,
+          e
+        );
+        throw e;
+      })
+      .then(() => beforeScreenshot(page, { context, url }))
+      .then(() =>
+        page.screenshot().then(image => {
+          expect(image).toMatchImageSnapshot(getMatchOptions({ context, url }));
+        })
+      );
+  };
+
+  testFn.beforeEach = () =>
+    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'] })
+      .then(b => {
+        browser = b;
+      })
+      .then(() => browser.newPage())
+      .then(p => {
+        page = p;
+      });
+
+  testFn.afterEach = () => browser.close();
+
+  return testFn;
+};
diff --git a/addons/storyshots/src/utils.test.js b/addons/storyshots/src/utils.test.js
new file mode 100644
index 00000000000..1bd20e07eff
--- /dev/null
+++ b/addons/storyshots/src/utils.test.js
@@ -0,0 +1,46 @@
+import { getPossibleStoriesFiles, getSnapshotFileName } from './utils';
+
+describe('getSnapshotFileName', () => {
+  it('fileName is provided - snapshot is stored in __snapshots__ dir', () => {
+    const context = { fileName: 'foo.js' };
+
+    const result = getSnapshotFileName(context);
+    const platformAgnosticResult = result.replace(/\\|\//g, '/');
+
+    expect(platformAgnosticResult).toBe('__snapshots__/foo.storyshot');
+  });
+
+  it('fileName with multiple extensions is provided - only the last extension is replaced', () => {
+    const context = { fileName: 'foo.web.stories.js' };
+
+    const result = getSnapshotFileName(context);
+    const platformAgnosticResult = result.replace(/\\|\//g, '/');
+
+    expect(platformAgnosticResult).toBe('__snapshots__/foo.web.stories.storyshot');
+  });
+
+  it('fileName with dir is provided - __snapshots__ dir is created inside another dir', () => {
+    const context = { fileName: 'test/foo.js' };
+
+    const result = getSnapshotFileName(context);
+    const platformAgnosticResult = result.replace(/\\|\//g, '/');
+
+    expect(platformAgnosticResult).toBe('test/__snapshots__/foo.storyshot');
+  });
+});
+
+describe('getPossibleStoriesFiles', () => {
+  it('storyshots is provided and all the posible stories file names are returned', () => {
+    const storyshots = 'test/__snapshots__/foo.web.stories.storyshot';
+
+    const result = getPossibleStoriesFiles(storyshots);
+    const platformAgnosticResult = result.map(path => path.replace(/\\|\//g, '/'));
+
+    expect(platformAgnosticResult).toEqual([
+      'test/foo.web.stories.js',
+      'test/foo.web.stories.jsx',
+      'test/foo.web.stories.ts',
+      'test/foo.web.stories.tsx',
+    ]);
+  });
+});
diff --git a/addons/storyshots/src/vue/loader.js b/addons/storyshots/src/vue/loader.js
new file mode 100644
index 00000000000..4b8e3342943
--- /dev/null
+++ b/addons/storyshots/src/vue/loader.js
@@ -0,0 +1,38 @@
+import global from 'global';
+import runWithRequireContext from '../require_context';
+import hasDependency from '../hasDependency';
+import loadConfig from '../config-loader';
+
+function mockVueToIncludeCompiler() {
+  jest.mock('vue', () => require.requireActual('vue/dist/vue.common.js'));
+}
+
+function test(options) {
+  return options.framework === 'vue' || (!options.framework && hasDependency('@storybook/vue'));
+}
+
+function load(options) {
+  global.STORYBOOK_ENV = 'vue';
+  mockVueToIncludeCompiler();
+
+  const { content, contextOpts } = loadConfig({
+    configDirPath: options.configPath,
+    babelConfigPath: '@storybook/vue/dist/server/babel_config',
+  });
+
+  runWithRequireContext(content, contextOpts);
+
+  return {
+    framework: 'vue',
+    renderTree: require.requireActual('./renderTree').default,
+    renderShallowTree: () => {
+      throw new Error('Shallow renderer is not supported for vue');
+    },
+    storybook: require.requireActual('@storybook/vue'),
+  };
+}
+
+export default {
+  load,
+  test,
+};
diff --git a/addons/storyshots/src/vue/renderTree.js b/addons/storyshots/src/vue/renderTree.js
new file mode 100644
index 00000000000..888c9820365
--- /dev/null
+++ b/addons/storyshots/src/vue/renderTree.js
@@ -0,0 +1,13 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
+import Vue from 'vue';
+
+function getRenderedTree(story, context) {
+  const storyElement = story.render(context);
+
+  const Constructor = Vue.extend(storyElement);
+  const vm = new Constructor().$mount();
+
+  return vm.$el;
+}
+
+export default getRenderedTree;
diff --git a/addons/storyshots/stories/__snapshots__/storyshot.enzyme.test.js.snap b/addons/storyshots/stories/__snapshots__/storyshot.enzyme.test.js.snap
index a54673b29e9..4457ca09552 100644
--- a/addons/storyshots/stories/__snapshots__/storyshot.enzyme.test.js.snap
+++ b/addons/storyshots/stories/__snapshots__/storyshot.enzyme.test.js.snap
@@ -5,7 +5,12 @@ exports[`Storyshots Another Button with some emoji 1`] = `
   className="css-1yjiefr"
   onClick={[Function]}
 >
-  😀 😎 👍 💯
+  <span
+    aria-label="so cool"
+    role="img"
+  >
+    😀 😎 👍 💯
+  </span>
 </button>
 `;
 
@@ -23,7 +28,12 @@ exports[`Storyshots Button with some emoji 1`] = `
   className="css-1yjiefr"
   onClick={[Function]}
 >
-  😀 😎 👍 💯
+  <span
+    aria-label="so cool"
+    role="img"
+  >
+    😀 😎 👍 💯
+  </span>
 </button>
 `;
 
@@ -49,15 +59,13 @@ exports[`Storyshots Welcome to Storybook 1`] = `
     This is a UI component dev environment for your app.
   </p>
   <p>
-    We've added some basic stories inside the
-     
+    We've added some basic stories inside the 
     <code
       className="css-mteq83"
     >
       src/stories
     </code>
-     
-    directory.
+     directory.
     <br />
     A story is a single state of one or more UI components. You can have as many stories as you want.
     <br />
@@ -66,17 +74,14 @@ exports[`Storyshots Welcome to Storybook 1`] = `
   <p>
     See these sample
      
-    <a
-      className="css-ca0824"
+    <button
+      className="css-1opliz7"
       onClick={[Function]}
-      role="button"
-      tabIndex="0"
     >
       stories
-    </a>
-     
-    for a component called
+    </button>
      
+    for a component called 
     <code
       className="css-mteq83"
     >
@@ -95,7 +100,8 @@ exports[`Storyshots Welcome to Storybook 1`] = `
     >
       Button
     </code>
-     stories located at 
+     stories located at
+     
     <code
       className="css-mteq83"
     >
@@ -126,15 +132,13 @@ exports[`Storyshots Welcome to Storybook 1`] = `
       NOTE:
     </b>
     <br />
-    Have a look at the
-     
+    Have a look at the 
     <code
       className="css-mteq83"
     >
       .storybook/webpack.config.js
     </code>
-     
-    to add webpack loaders and plugins you are using in this project.
+     to add webpack loaders and plugins you are using in this project.
   </p>
 </article>
 `;
diff --git a/addons/storyshots/stories/__snapshots__/storyshot.shallow.test.js.snap b/addons/storyshots/stories/__snapshots__/storyshot.shallow.test.js.snap
new file mode 100644
index 00000000000..e6ab111a8a4
--- /dev/null
+++ b/addons/storyshots/stories/__snapshots__/storyshot.shallow.test.js.snap
@@ -0,0 +1,126 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Another Button with some emoji 1`] = `
+<Unknown
+  className="css-1yjiefr"
+  onClick={[Function]}
+>
+  <span
+    aria-label="so cool"
+    role="img"
+  >
+    😀 😎 👍 💯
+  </span>
+</Unknown>
+`;
+
+exports[`Storyshots Another Button with text 1`] = `
+<Unknown
+  className="css-1yjiefr"
+  onClick={[Function]}
+>
+  Hello Button
+</Unknown>
+`;
+
+exports[`Storyshots Button with some emoji 1`] = `
+<Unknown
+  className="css-1yjiefr"
+  onClick={[Function]}
+>
+  <span
+    aria-label="so cool"
+    role="img"
+  >
+    😀 😎 👍 💯
+  </span>
+</Unknown>
+`;
+
+exports[`Storyshots Button with text 1`] = `
+<Unknown
+  className="css-1yjiefr"
+  onClick={[Function]}
+>
+  Hello Button
+</Unknown>
+`;
+
+exports[`Storyshots Welcome to Storybook 1`] = `
+<glamorous(article)>
+  <glamorous(h1)>
+    Welcome to storybook
+  </glamorous(h1)>
+  <p>
+    This is a UI component dev environment for your app.
+  </p>
+  <p>
+    We've added some basic stories inside the 
+    <glamorous(code)>
+      src/stories
+    </glamorous(code)>
+     directory.
+    <br />
+    A story is a single state of one or more UI components. You can have as many stories as you want.
+    <br />
+    (Basically a story is like a visual test case.)
+  </p>
+  <p>
+    See these sample
+     
+    <glamorous(glamorous(glamorous(a)))
+      onClick={[Function]}
+    >
+      stories
+    </glamorous(glamorous(glamorous(a)))>
+     
+    for a component called 
+    <glamorous(code)>
+      Button
+    </glamorous(code)>
+    .
+  </p>
+  <p>
+    Just like that, you can add your own components as stories.
+    <br />
+    You can also edit those components and see changes right away.
+    <br />
+    (Try editing the 
+    <glamorous(code)>
+      Button
+    </glamorous(code)>
+     stories located at
+     
+    <glamorous(code)>
+      src/stories/index.js
+    </glamorous(code)>
+    .)
+  </p>
+  <p>
+    Usually we create stories with smaller UI components in the app.
+    <br />
+    Have a look at the
+     
+    <glamorous(a)
+      href="https://storybook.js.org/basics/writing-stories"
+      rel="noopener noreferrer"
+      target="_blank"
+    >
+      Writing Stories
+    </glamorous(a)>
+     
+    section in our documentation.
+  </p>
+  <glamorous(p)>
+    <b>
+      NOTE:
+    </b>
+    <br />
+    Have a look at the 
+    <glamorous(code)>
+      .storybook/webpack.config.js
+    </glamorous(code)>
+     to add webpack loaders and plugins you are using in this project.
+  </glamorous(p)>
+</glamorous(article)>
+`;
diff --git a/addons/storyshots/stories/__snapshots__/storyshot.shallowWithOptions.test.js.snap b/addons/storyshots/stories/__snapshots__/storyshot.shallowWithOptions.test.js.snap
new file mode 100644
index 00000000000..e810d1782d1
--- /dev/null
+++ b/addons/storyshots/stories/__snapshots__/storyshot.shallowWithOptions.test.js.snap
@@ -0,0 +1,11 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Another Button with some emoji 1`] = `"{\\"key\\":null,\\"ref\\":null,\\"props\\":{\\"children\\":{\\"type\\":\\"span\\",\\"key\\":null,\\"ref\\":null,\\"props\\":{\\"role\\":\\"img\\",\\"aria-label\\":\\"so cool\\",\\"children\\":\\"😀 😎 👍 💯\\"},\\"_owner\\":null,\\"_store\\":{}},\\"className\\":\\"css-1yjiefr\\"},\\"_owner\\":null,\\"_store\\":{}}"`;
+
+exports[`Storyshots Another Button with text 1`] = `"{\\"key\\":null,\\"ref\\":null,\\"props\\":{\\"children\\":\\"Hello Button\\",\\"className\\":\\"css-1yjiefr\\"},\\"_owner\\":null,\\"_store\\":{}}"`;
+
+exports[`Storyshots Button with some emoji 1`] = `"{\\"key\\":null,\\"ref\\":null,\\"props\\":{\\"children\\":{\\"type\\":\\"span\\",\\"key\\":null,\\"ref\\":null,\\"props\\":{\\"role\\":\\"img\\",\\"aria-label\\":\\"so cool\\",\\"children\\":\\"😀 😎 👍 💯\\"},\\"_owner\\":null,\\"_store\\":{}},\\"className\\":\\"css-1yjiefr\\"},\\"_owner\\":null,\\"_store\\":{}}"`;
+
+exports[`Storyshots Button with text 1`] = `"{\\"key\\":null,\\"ref\\":null,\\"props\\":{\\"children\\":\\"Hello Button\\",\\"className\\":\\"css-1yjiefr\\"},\\"_owner\\":null,\\"_store\\":{}}"`;
+
+exports[`Storyshots Welcome to Storybook 1`] = `"{\\"key\\":null,\\"ref\\":null,\\"props\\":{\\"children\\":[{\\"key\\":null,\\"ref\\":null,\\"props\\":{\\"children\\":\\"Welcome to storybook\\"},\\"_owner\\":null,\\"_store\\":{}},{\\"type\\":\\"p\\",\\"key\\":null,\\"ref\\":null,\\"props\\":{\\"children\\":\\"This is a UI component dev environment for your app.\\"},\\"_owner\\":null,\\"_store\\":{}},{\\"type\\":\\"p\\",\\"key\\":null,\\"ref\\":null,\\"props\\":{\\"children\\":[\\"We've added some basic stories inside the \\",{\\"key\\":null,\\"ref\\":null,\\"props\\":{\\"children\\":\\"src/stories\\"},\\"_owner\\":null,\\"_store\\":{}},\\" directory.\\",{\\"type\\":\\"br\\",\\"key\\":null,\\"ref\\":null,\\"props\\":{},\\"_owner\\":null,\\"_store\\":{}},\\"A story is a single state of one or more UI components. You can have as many stories as you want.\\",{\\"type\\":\\"br\\",\\"key\\":null,\\"ref\\":null,\\"props\\":{},\\"_owner\\":null,\\"_store\\":{}},\\"(Basically a story is like a visual test case.)\\"]},\\"_owner\\":null,\\"_store\\":{}},{\\"type\\":\\"p\\",\\"key\\":null,\\"ref\\":null,\\"props\\":{\\"children\\":[\\"See these sample\\",\\" \\",{\\"key\\":null,\\"ref\\":null,\\"props\\":{\\"children\\":\\"stories\\"},\\"_owner\\":null,\\"_store\\":{}},\\" \\",\\"for a component called \\",{\\"key\\":null,\\"ref\\":null,\\"props\\":{\\"children\\":\\"Button\\"},\\"_owner\\":null,\\"_store\\":{}},\\".\\"]},\\"_owner\\":null,\\"_store\\":{}},{\\"type\\":\\"p\\",\\"key\\":null,\\"ref\\":null,\\"props\\":{\\"children\\":[\\"Just like that, you can add your own components as stories.\\",{\\"type\\":\\"br\\",\\"key\\":null,\\"ref\\":null,\\"props\\":{},\\"_owner\\":null,\\"_store\\":{}},\\"You can also edit those components and see changes right away.\\",{\\"type\\":\\"br\\",\\"key\\":null,\\"ref\\":null,\\"props\\":{},\\"_owner\\":null,\\"_store\\":{}},\\"(Try editing the \\",{\\"key\\":null,\\"ref\\":null,\\"props\\":{\\"children\\":\\"Button\\"},\\"_owner\\":null,\\"_store\\":{}},\\" stories located at\\",\\" \\",{\\"key\\":null,\\"ref\\":null,\\"props\\":{\\"children\\":\\"src/stories/index.js\\"},\\"_owner\\":null,\\"_store\\":{}},\\".)\\"]},\\"_owner\\":null,\\"_store\\":{}},{\\"type\\":\\"p\\",\\"key\\":null,\\"ref\\":null,\\"props\\":{\\"children\\":[\\"Usually we create stories with smaller UI components in the app.\\",{\\"type\\":\\"br\\",\\"key\\":null,\\"ref\\":null,\\"props\\":{},\\"_owner\\":null,\\"_store\\":{}},\\"Have a look at the\\",\\" \\",{\\"key\\":null,\\"ref\\":null,\\"props\\":{\\"href\\":\\"https://storybook.js.org/basics/writing-stories\\",\\"target\\":\\"_blank\\",\\"rel\\":\\"noopener noreferrer\\",\\"children\\":\\"Writing Stories\\"},\\"_owner\\":null,\\"_store\\":{}},\\" \\",\\"section in our documentation.\\"]},\\"_owner\\":null,\\"_store\\":{}},{\\"key\\":null,\\"ref\\":null,\\"props\\":{\\"children\\":[{\\"type\\":\\"b\\",\\"key\\":null,\\"ref\\":null,\\"props\\":{\\"children\\":\\"NOTE:\\"},\\"_owner\\":null,\\"_store\\":{}},{\\"type\\":\\"br\\",\\"key\\":null,\\"ref\\":null,\\"props\\":{},\\"_owner\\":null,\\"_store\\":{}},\\"Have a look at the \\",{\\"key\\":null,\\"ref\\":null,\\"props\\":{\\"children\\":\\".storybook/webpack.config.js\\"},\\"_owner\\":null,\\"_store\\":{}},\\" to add webpack loaders and plugins you are using in this project.\\"]},\\"_owner\\":null,\\"_store\\":{}}]},\\"_owner\\":null,\\"_store\\":{}}"`;
diff --git a/addons/storyshots/stories/directly_required/__snapshots__/index.storyshot b/addons/storyshots/stories/directly_required/__snapshots__/index.storyshot
index 354841be656..154165f33e0 100644
--- a/addons/storyshots/stories/directly_required/__snapshots__/index.storyshot
+++ b/addons/storyshots/stories/directly_required/__snapshots__/index.storyshot
@@ -5,7 +5,12 @@ exports[`Storyshots Another Button with some emoji 1`] = `
   className="css-1yjiefr"
   onClick={[Function]}
 >
-  😀 😎 👍 💯
+  <span
+    aria-label="so cool"
+    role="img"
+  >
+    😀 😎 👍 💯
+  </span>
 </button>
 `;
 
diff --git a/addons/storyshots/stories/directly_required/index.js b/addons/storyshots/stories/directly_required/index.js
index 0b6cb2f94f9..7bc4dc08f9d 100644
--- a/addons/storyshots/stories/directly_required/index.js
+++ b/addons/storyshots/stories/directly_required/index.js
@@ -1,9 +1,15 @@
 import React from 'react';
 
-import { storiesOf } from '@storybook/react'; // eslint-disable-line
-import { action } from '@storybook/addon-actions'; // eslint-disable-line
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
 import { Button } from '@storybook/react/demo';
 
 storiesOf('Another Button', module)
   .add('with text', () => <Button onClick={action('clicked')}>Hello Button</Button>)
-  .add('with some emoji', () => <Button onClick={action('clicked')}>😀 😎 👍 💯</Button>);
+  .add('with some emoji', () => (
+    <Button onClick={action('clicked')}>
+      <span role="img" aria-label="so cool">
+        😀 😎 👍 💯
+      </span>
+    </Button>
+  ));
diff --git a/addons/storyshots/stories/required_with_context/Button.stories.js b/addons/storyshots/stories/required_with_context/Button.stories.js
index 27496bf316c..e63d097b98b 100644
--- a/addons/storyshots/stories/required_with_context/Button.stories.js
+++ b/addons/storyshots/stories/required_with_context/Button.stories.js
@@ -1,9 +1,15 @@
 import React from 'react';
 
-import { storiesOf } from '@storybook/react'; // eslint-disable-line
-import { action } from '@storybook/addon-actions'; // eslint-disable-line
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
 import { Button } from '@storybook/react/demo';
 
 storiesOf('Button', module)
   .add('with text', () => <Button onClick={action('clicked')}>Hello Button</Button>)
-  .add('with some emoji', () => <Button onClick={action('clicked')}>😀 😎 👍 💯</Button>);
+  .add('with some emoji', () => (
+    <Button onClick={action('clicked')}>
+      <span role="img" aria-label="so cool">
+        😀 😎 👍 💯
+      </span>
+    </Button>
+  ));
diff --git a/addons/storyshots/stories/required_with_context/Welcome.stories.js b/addons/storyshots/stories/required_with_context/Welcome.stories.js
index bec79b78a25..2837b632c0a 100644
--- a/addons/storyshots/stories/required_with_context/Welcome.stories.js
+++ b/addons/storyshots/stories/required_with_context/Welcome.stories.js
@@ -1,7 +1,7 @@
 import React from 'react';
 
-import { storiesOf } from '@storybook/react';  // eslint-disable-line
-import { linkTo } from '@storybook/addon-links'; // eslint-disable-line
+import { storiesOf } from '@storybook/react';
+import { linkTo } from '@storybook/addon-links';
 import { Welcome } from '@storybook/react/demo';
 
 storiesOf('Welcome', module).add('to Storybook', () => <Welcome showApp={linkTo('Button')} />);
diff --git a/addons/storyshots/stories/required_with_context/__snapshots__/Button.stories.storyshot b/addons/storyshots/stories/required_with_context/__snapshots__/Button.stories.storyshot
index 56b21f7fdec..8494c5343f2 100644
--- a/addons/storyshots/stories/required_with_context/__snapshots__/Button.stories.storyshot
+++ b/addons/storyshots/stories/required_with_context/__snapshots__/Button.stories.storyshot
@@ -5,7 +5,12 @@ exports[`Storyshots Button with some emoji 1`] = `
   className="css-1yjiefr"
   onClick={[Function]}
 >
-  😀 😎 👍 💯
+  <span
+    aria-label="so cool"
+    role="img"
+  >
+    😀 😎 👍 💯
+  </span>
 </button>
 `;
 
diff --git a/addons/storyshots/stories/required_with_context/__snapshots__/Welcome.stories.storyshot b/addons/storyshots/stories/required_with_context/__snapshots__/Welcome.stories.storyshot
index bc6abe86a6e..68c15539e1f 100644
--- a/addons/storyshots/stories/required_with_context/__snapshots__/Welcome.stories.storyshot
+++ b/addons/storyshots/stories/required_with_context/__snapshots__/Welcome.stories.storyshot
@@ -13,15 +13,13 @@ exports[`Storyshots Welcome to Storybook 1`] = `
     This is a UI component dev environment for your app.
   </p>
   <p>
-    We've added some basic stories inside the
-     
+    We've added some basic stories inside the 
     <code
       className="css-mteq83"
     >
       src/stories
     </code>
-     
-    directory.
+     directory.
     <br />
     A story is a single state of one or more UI components. You can have as many stories as you want.
     <br />
@@ -30,17 +28,14 @@ exports[`Storyshots Welcome to Storybook 1`] = `
   <p>
     See these sample
      
-    <a
-      className="css-ca0824"
+    <button
+      className="css-1opliz7"
       onClick={[Function]}
-      role="button"
-      tabIndex="0"
     >
       stories
-    </a>
-     
-    for a component called
+    </button>
      
+    for a component called 
     <code
       className="css-mteq83"
     >
@@ -59,7 +54,8 @@ exports[`Storyshots Welcome to Storybook 1`] = `
     >
       Button
     </code>
-     stories located at 
+     stories located at
+     
     <code
       className="css-mteq83"
     >
@@ -90,15 +86,13 @@ exports[`Storyshots Welcome to Storybook 1`] = `
       NOTE:
     </b>
     <br />
-    Have a look at the
-     
+    Have a look at the 
     <code
       className="css-mteq83"
     >
       .storybook/webpack.config.js
     </code>
-     
-    to add webpack loaders and plugins you are using in this project.
+     to add webpack loaders and plugins you are using in this project.
   </p>
 </article>
 `;
diff --git a/addons/storyshots/stories/storyshot.renderOnly.test.js b/addons/storyshots/stories/storyshot.renderOnly.test.js
new file mode 100644
index 00000000000..e620764ed58
--- /dev/null
+++ b/addons/storyshots/stories/storyshot.renderOnly.test.js
@@ -0,0 +1,8 @@
+import path from 'path';
+import initStoryshots, { renderOnly } from '../src';
+
+initStoryshots({
+  framework: 'react',
+  configPath: path.join(__dirname, '..', '.storybook'),
+  test: renderOnly,
+});
diff --git a/addons/storyshots/stories/storyshot.shallow.test.js b/addons/storyshots/stories/storyshot.shallow.test.js
new file mode 100644
index 00000000000..ade88a49a69
--- /dev/null
+++ b/addons/storyshots/stories/storyshot.shallow.test.js
@@ -0,0 +1,8 @@
+import path from 'path';
+import initStoryshots, { shallowSnapshot } from '../src';
+
+initStoryshots({
+  framework: 'react',
+  configPath: path.join(__dirname, '..', '.storybook'),
+  test: shallowSnapshot,
+});
diff --git a/addons/storyshots/stories/storyshot.shallowWithOptions.test.js b/addons/storyshots/stories/storyshot.shallowWithOptions.test.js
new file mode 100644
index 00000000000..c5c9a79871c
--- /dev/null
+++ b/addons/storyshots/stories/storyshot.shallowWithOptions.test.js
@@ -0,0 +1,14 @@
+import path from 'path';
+import initStoryshots, { shallowSnapshot } from '../src';
+
+initStoryshots({
+  framework: 'react',
+  configPath: path.join(__dirname, '..', '.storybook'),
+  test: data =>
+    shallowSnapshot({
+      ...data,
+      options: {
+        serializer: JSON.stringify,
+      },
+    }),
+});
diff --git a/addons/storyshots/tsconfig.json b/addons/storyshots/tsconfig.json
new file mode 100644
index 00000000000..84fb13689ad
--- /dev/null
+++ b/addons/storyshots/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.json",
+  "include": [
+    "src/**/*.ts"
+  ],
+  "compileOnSave": false,
+  "compilerOptions": {
+    "rootDir": "./src"
+  }
+}
diff --git a/addons/storysource/README.md b/addons/storysource/README.md
new file mode 100644
index 00000000000..6bea0d95ecb
--- /dev/null
+++ b/addons/storysource/README.md
@@ -0,0 +1,117 @@
+# Storybook Storysource Addon
+
+This addon is used to show stories source in the addon panel. 
+
+[Framework Support](https://github.com/storybooks/storybook/blob/master/ADDONS_SUPPORT.md)
+
+![Storysource Demo](demo.gif)
+
+## Getting Started
+
+First, install the addon
+
+```sh
+npm install -D @storybook/addon-storysource
+```
+
+Add this line to your `addons.js` file
+
+```js
+import '@storybook/addon-storysource/register';
+```
+
+Use this hook to a custom webpack.config. This will generate a decorator call in every story:
+
+```js
+module.exports = {
+  module: {
+    rules: [
+      {
+        test: /\.stories\.jsx?$/,
+        loaders: [require.resolve('@storybook/addon-storysource/loader')],
+        enforce: 'pre',
+      },
+    ],
+  },
+};
+```
+
+## Loader Options
+
+The loader can be customized with the following options:
+
+### prettierConfig
+
+The prettier configuration that will be used to format the story source in the addon panel.
+
+Defaults:
+```js
+{
+  printWidth: 120,
+  tabWidth: 2,
+  bracketSpacing: true,
+  trailingComma: 'es5',
+  singleQuote: true,
+}
+```
+
+Usage: 
+
+```js
+module.exports = {
+  module: {
+    rules: [
+      {
+        test: /\.stories\.jsx?$/,
+        loaders: [
+          {
+            loader: require.resolve('@storybook/addon-storysource/loader'),
+            options: {
+              prettierConfig: {
+                printWidth: 80,
+                singleQuote: false,
+              }
+            }
+          }
+        ],
+        enforce: 'pre',
+      },
+    ],
+  },
+};
+```
+
+### uglyCommentsRegex
+
+The array of regex that is used to remove "ugly" comments.
+
+Defaults:
+```js
+[/^eslint-.*/, /^global.*/]
+```
+
+Usage:
+
+```js
+module.exports = {
+  module: {
+    rules: [
+      {
+        test: /\.stories\.jsx?$/,
+        loaders: [
+          {
+            loader: require.resolve('@storybook/addon-storysource/loader'),
+            options: {
+              uglyCommentsRegex: [
+                /^eslint-.*/, 
+                /^global.*/,
+              ]
+            }
+          }
+        ],
+        enforce: 'pre',
+      },
+    ],
+  },
+};
+```
diff --git a/addons/storysource/demo.gif b/addons/storysource/demo.gif
new file mode 100644
index 00000000000..34077ebb939
Binary files /dev/null and b/addons/storysource/demo.gif differ
diff --git a/addons/storysource/loader.js b/addons/storysource/loader.js
new file mode 100644
index 00000000000..6cc4e38b8d1
--- /dev/null
+++ b/addons/storysource/loader.js
@@ -0,0 +1 @@
+module.exports = require('./dist/loader');
diff --git a/addons/storysource/package.json b/addons/storysource/package.json
new file mode 100644
index 00000000000..7454ff29c85
--- /dev/null
+++ b/addons/storysource/package.json
@@ -0,0 +1,39 @@
+{
+  "name": "@storybook/addon-storysource",
+  "version": "3.4.0-alpha.9",
+  "description": "Stories addon for storybook",
+  "keywords": [
+    "storybook"
+  ],
+  "homepage": "https://github.com/storybooks/storybook/tree/master/addons/storysource",
+  "bugs": {
+    "url": "https://github.com/storybooks/storybook/issues"
+  },
+  "license": "MIT",
+  "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/storybooks/storybook.git"
+  },
+  "scripts": {
+    "prepare": "node ../../scripts/prepare.js"
+  },
+  "dependencies": {
+    "acorn": "^5.5.0",
+    "acorn-es7": "^0.1.0",
+    "acorn-jsx": "^4.1.1",
+    "acorn-stage3": "^0.6.0",
+    "babel-runtime": "^6.26.0",
+    "estraverse": "^4.2.0",
+    "loader-utils": "^1.1.0",
+    "prettier": "^1.11.1",
+    "prop-types": "^15.6.1",
+    "react-syntax-highlighter": "^7.0.1"
+  },
+  "peerDependencies": {
+    "@storybook/addons": "^3.3.0",
+    "react": "*",
+    "react-dom": "*"
+  }
+}
diff --git a/addons/storysource/register.js b/addons/storysource/register.js
new file mode 100644
index 00000000000..9232e6c069d
--- /dev/null
+++ b/addons/storysource/register.js
@@ -0,0 +1 @@
+require('./dist/manager').register();
diff --git a/addons/storysource/src/StoryPanel.js b/addons/storysource/src/StoryPanel.js
new file mode 100644
index 00000000000..52a19547170
--- /dev/null
+++ b/addons/storysource/src/StoryPanel.js
@@ -0,0 +1,106 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import jsx from 'react-syntax-highlighter/languages/prism/jsx';
+import { darcula } from 'react-syntax-highlighter/styles/prism';
+import SyntaxHighlighter, { registerLanguage } from 'react-syntax-highlighter/prism-light';
+import { createElement } from 'react-syntax-highlighter';
+import { EVENT_ID } from './';
+
+registerLanguage('jsx', jsx);
+
+const styles = {
+  selections: {
+    backgroundColor: 'rgba(255, 242, 60, 0.2)',
+  },
+  panel: {
+    width: '100%',
+  },
+};
+
+export default class StoryPanel extends Component {
+  constructor(props) {
+    super(props);
+
+    this.state = { source: '// Here will be dragons 🐉' };
+
+    const { channel } = props;
+
+    channel.on(EVENT_ID, ({ source, location }) => {
+      this.setState({
+        source,
+        location,
+      });
+    });
+
+    this.setSelectedStoryRef = this.setSelectedStoryRef.bind(this);
+    this.lineRenderer = this.lineRenderer.bind(this);
+  }
+
+  componentDidUpdate() {
+    if (this.selectedStoryRef) {
+      this.selectedStoryRef.scrollIntoView();
+    }
+  }
+
+  setSelectedStoryRef(ref) {
+    this.selectedStoryRef = ref;
+  }
+
+  createPart(rows, stylesheet, useInlineStyles) {
+    return rows.map((node, i) =>
+      createElement({
+        node,
+        stylesheet,
+        useInlineStyles,
+        key: `code-segement${i}`,
+      })
+    );
+  }
+
+  lineRenderer({ rows, stylesheet, useInlineStyles }) {
+    const { location } = this.state;
+
+    if (location) {
+      const first = location.startLoc.line - 1;
+      const last = location.endLoc.line;
+
+      const start = this.createPart(rows.slice(0, first), stylesheet, useInlineStyles);
+      const selected = this.createPart(rows.slice(first, last), stylesheet, useInlineStyles);
+      const end = this.createPart(rows.slice(last), stylesheet, useInlineStyles);
+
+      return (
+        <span>
+          {start}
+          <div ref={this.setSelectedStoryRef} style={styles.selections}>
+            {selected}
+          </div>
+          {end}
+        </span>
+      );
+    }
+
+    return this.createPart(rows, stylesheet, useInlineStyles);
+  }
+
+  render() {
+    return (
+      <SyntaxHighlighter
+        language="jsx"
+        showLineNumbers="true"
+        style={darcula}
+        renderer={this.lineRenderer}
+        customStyle={styles.panel}
+      >
+        {this.state.source}
+      </SyntaxHighlighter>
+    );
+  }
+}
+
+StoryPanel.propTypes = {
+  channel: PropTypes.shape({
+    emit: PropTypes.func,
+    on: PropTypes.func,
+    removeListener: PropTypes.func,
+  }).isRequired,
+};
diff --git a/addons/storysource/src/index.js b/addons/storysource/src/index.js
new file mode 100644
index 00000000000..2108940dd14
--- /dev/null
+++ b/addons/storysource/src/index.js
@@ -0,0 +1,5 @@
+export const ADDON_ID = 'storybook/stories';
+export const PANEL_ID = `${ADDON_ID}/stories-panel`;
+export const EVENT_ID = `${ADDON_ID}/story-event`;
+
+export { withStorySource } from './preview';
diff --git a/addons/storysource/src/loader/__snapshots__/inject-decorator.test.js.snap b/addons/storysource/src/loader/__snapshots__/inject-decorator.test.js.snap
new file mode 100644
index 00000000000..ac8cc9de27c
--- /dev/null
+++ b/addons/storysource/src/loader/__snapshots__/inject-decorator.test.js.snap
@@ -0,0 +1,359 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`inject-decorator positive - angular calculates "adds" map 1`] = `
+Object {
+  "Custom|ng-content@Default": Object {
+    "endLoc": Object {
+      "col": 2,
+      "line": 15,
+    },
+    "startLoc": Object {
+      "col": 43,
+      "line": 10,
+    },
+  },
+}
+`;
+
+exports[`inject-decorator positive - angular injects stories decorator after the all "storiesOf" functions 1`] = `
+"import { Component } from '@angular/core';
+import { storiesOf } from '@storybook/angular';
+
+@Component({
+  selector: 'storybook-with-ng-content',
+  template: \`<div style=\\"color: #1e88e5;\\"><ng-content></ng-content></div>\`,
+})
+class WithNgContentComponent {}
+
+storiesOf('Custom|ng-content', module).addDecorator(withStorySource(__STORY__, __ADDS_MAP__)).add('Default', () => ({
+  template: \`<storybook-with-ng-content><h1>This is rendered in ng-content</h1></storybook-with-ng-content>\`,
+  moduleMetadata: {
+    declarations: [WithNgContentComponent],
+  },
+}));
+"
+`;
+
+exports[`inject-decorator positive calculates "adds" map 1`] = `
+Object {
+  "Addons|Info.Decorator@Use Info as story decorator": Object {
+    "endLoc": Object {
+      "col": 73,
+      "line": 137,
+    },
+    "startLoc": Object {
+      "col": 7,
+      "line": 137,
+    },
+  },
+  "Addons|Info.GitHub issues@#1814": Object {
+    "endLoc": Object {
+      "col": 4,
+      "line": 152,
+    },
+    "startLoc": Object {
+      "col": 2,
+      "line": 146,
+    },
+  },
+  "Addons|Info.Markdown@Displays Markdown in description": Object {
+    "endLoc": Object {
+      "col": 96,
+      "line": 44,
+    },
+    "startLoc": Object {
+      "col": 2,
+      "line": 43,
+    },
+  },
+  "Addons|Info.Options.TableComponent@Use a custom component for the table": Object {
+    "endLoc": Object {
+      "col": 41,
+      "line": 130,
+    },
+    "startLoc": Object {
+      "col": 2,
+      "line": 127,
+    },
+  },
+  "Addons|Info.Options.header@Shows or hides Info Addon header": Object {
+    "endLoc": Object {
+      "col": 41,
+      "line": 60,
+    },
+    "startLoc": Object {
+      "col": 2,
+      "line": 56,
+    },
+  },
+  "Addons|Info.Options.inline@Inlines component inside story": Object {
+    "endLoc": Object {
+      "col": 41,
+      "line": 52,
+    },
+    "startLoc": Object {
+      "col": 2,
+      "line": 48,
+    },
+  },
+  "Addons|Info.Options.propTables@Shows additional component prop tables": Object {
+    "endLoc": Object {
+      "col": 41,
+      "line": 76,
+    },
+    "startLoc": Object {
+      "col": 2,
+      "line": 72,
+    },
+  },
+  "Addons|Info.Options.propTablesExclude@Exclude component from prop tables": Object {
+    "endLoc": Object {
+      "col": 4,
+      "line": 89,
+    },
+    "startLoc": Object {
+      "col": 2,
+      "line": 80,
+    },
+  },
+  "Addons|Info.Options.source@Shows or hides Info Addon source": Object {
+    "endLoc": Object {
+      "col": 41,
+      "line": 68,
+    },
+    "startLoc": Object {
+      "col": 2,
+      "line": 64,
+    },
+  },
+  "Addons|Info.Options.styles@Extend info styles with an object": Object {
+    "endLoc": Object {
+      "col": 43,
+      "line": 108,
+    },
+    "startLoc": Object {
+      "col": 4,
+      "line": 94,
+    },
+  },
+  "Addons|Info.Options.styles@Full control over styles using a function": Object {
+    "endLoc": Object {
+      "col": 43,
+      "line": 123,
+    },
+    "startLoc": Object {
+      "col": 4,
+      "line": 111,
+    },
+  },
+  "Addons|Info.React Docgen@Comments from Flow declarations": Object {
+    "endLoc": Object {
+      "col": 85,
+      "line": 22,
+    },
+    "startLoc": Object {
+      "col": 4,
+      "line": 19,
+    },
+  },
+  "Addons|Info.React Docgen@Comments from PropType declarations": Object {
+    "endLoc": Object {
+      "col": 79,
+      "line": 16,
+    },
+    "startLoc": Object {
+      "col": 4,
+      "line": 13,
+    },
+  },
+  "Addons|Info.React Docgen@Comments from component declaration": Object {
+    "endLoc": Object {
+      "col": 70,
+      "line": 28,
+    },
+    "startLoc": Object {
+      "col": 4,
+      "line": 25,
+    },
+  },
+}
+`;
+
+exports[`inject-decorator positive injects stories decorator after the all "storiesOf" functions 1`] = `
+"import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { withInfo } from '@storybook/addon-info';
+import { action } from '@storybook/addon-actions';
+
+import DocgenButton from '../components/DocgenButton';
+import FlowTypeButton from '../components/FlowTypeButton';
+import BaseButton from '../components/BaseButton';
+import TableComponent from '../components/TableComponent';
+
+storiesOf('Addons|Info.React Docgen', module).addDecorator(withStorySource(__STORY__, __ADDS_MAP__))
+  .add(
+    'Comments from PropType declarations',
+    withInfo(
+      'Comments above the PropType declarations should be extracted from the React component file itself and rendered in the Info Addon prop table'
+    )(() => <DocgenButton onClick={action('clicked')} label=\\"Docgen Button\\" />)
+  )
+  .add(
+    'Comments from Flow declarations',
+    withInfo(
+      'Comments above the Flow declarations should be extracted from the React component file itself and rendered in the Info Addon prop table'
+    )(() => <FlowTypeButton onClick={action('clicked')} label=\\"Flow Typed Button\\" />)
+  )
+  .add(
+    'Comments from component declaration',
+    withInfo(
+      'Comments above the component declaration should be extracted from the React component file itself and rendered below the Info Addon heading'
+    )(() => <BaseButton onClick={action('clicked')} label=\\"Button\\" />)
+  );
+
+const markdownDescription = \`
+#### You can use markdown in your withInfo() description.
+
+Sometimes you might want to manually include some code examples:
+~~~js
+const Button = () => <button />;
+~~~
+
+Maybe include a [link](http://storybook.js.org) to your project as well.
+\`;
+
+storiesOf('Addons|Info.Markdown', module).addDecorator(withStorySource(__STORY__, __ADDS_MAP__)).add(
+  'Displays Markdown in description',
+  withInfo(markdownDescription)(() => <BaseButton onClick={action('clicked')} label=\\"Button\\" />)
+);
+
+storiesOf('Addons|Info.Options.inline', module).addDecorator(withStorySource(__STORY__, __ADDS_MAP__)).add(
+  'Inlines component inside story',
+  withInfo({
+    text: 'Component should be inlined between description and PropType table',
+    inline: true, // Displays info inline vs click button to view
+  })(() => <BaseButton label=\\"Button\\" />)
+);
+
+storiesOf('Addons|Info.Options.header', module).addDecorator(withStorySource(__STORY__, __ADDS_MAP__)).add(
+  'Shows or hides Info Addon header',
+  withInfo({
+    text: 'The Info Addon header should be hidden',
+    header: false, // Toggles display of header with component name and description
+  })(() => <BaseButton label=\\"Button\\" />)
+);
+
+storiesOf('Addons|Info.Options.source', module).addDecorator(withStorySource(__STORY__, __ADDS_MAP__)).add(
+  'Shows or hides Info Addon source',
+  withInfo({
+    text: 'The Info Addon source section should be hidden',
+    source: false, // Displays the source of story Component
+  })(() => <BaseButton label=\\"Button\\" />)
+);
+
+storiesOf('Addons|Info.Options.propTables', module).addDecorator(withStorySource(__STORY__, __ADDS_MAP__)).add(
+  'Shows additional component prop tables',
+  withInfo({
+    text: 'There should be a prop table added for a component not included in the story',
+    propTables: [FlowTypeButton],
+  })(() => <BaseButton label=\\"Button\\" />)
+);
+
+storiesOf('Addons|Info.Options.propTablesExclude', module).addDecorator(withStorySource(__STORY__, __ADDS_MAP__)).add(
+  'Exclude component from prop tables',
+  withInfo({
+    text: 'This can exclude extraneous components from being displayed in prop tables.',
+    propTablesExclude: [FlowTypeButton],
+  })(() => (
+    <div>
+      <BaseButton label=\\"Button\\" />
+      <FlowTypeButton label=\\"Flow Typed Button\\" />
+    </div>
+  ))
+);
+
+storiesOf('Addons|Info.Options.styles', module).addDecorator(withStorySource(__STORY__, __ADDS_MAP__))
+  .add(
+    'Extend info styles with an object',
+    withInfo({
+      styles: {
+        button: {
+          base: {
+            background: 'purple',
+          },
+        },
+        header: {
+          h1: {
+            color: 'green',
+          },
+        },
+      },
+    })(() => <BaseButton label=\\"Button\\" />)
+  )
+  .add(
+    'Full control over styles using a function',
+    withInfo({
+      styles: stylesheet => ({
+        ...stylesheet,
+        header: {
+          ...stylesheet.header,
+          h1: {
+            ...stylesheet.header.h1,
+            color: 'red',
+          },
+        },
+      }),
+    })(() => <BaseButton label=\\"Button\\" />)
+  );
+
+storiesOf('Addons|Info.Options.TableComponent', module).addDecorator(withStorySource(__STORY__, __ADDS_MAP__)).add(
+  'Use a custom component for the table',
+  withInfo({
+    TableComponent,
+  })(() => <BaseButton label=\\"Button\\" />)
+);
+
+storiesOf('Addons|Info.Decorator', module).addDecorator(withStorySource(__STORY__, __ADDS_MAP__))
+  .addDecorator((story, context) =>
+    withInfo('Info could be used as a global or local decorator as well.')(story)(context)
+  )
+  .add('Use Info as story decorator', () => <BaseButton label=\\"Button\\" />);
+
+const hoc = WrapComponent => ({ ...props }) => <WrapComponent {...props} />;
+
+const Input = hoc(() => <input type=\\"text\\" />);
+
+const TextArea = hoc(({ children }) => <textarea>{children}</textarea>);
+
+storiesOf('Addons|Info.GitHub issues', module).addDecorator(withStorySource(__STORY__, __ADDS_MAP__)).add(
+  '#1814',
+  withInfo('Allow Duplicate DisplayNames for HOC #1814')(() => (
+    <div>
+      <Input />
+      <TextArea />
+    </div>
+  ))
+);
+"
+`;
+
+exports[`inject-decorator stories with ugly comments should delete ugly comments from the generated story source 1`] = `
+"import React from 'react';
+
+import { storiesOf } from '@storybook/react';
+
+const x = 0;
+
+storiesOf('Foo', module).add('bar', () => <div>baz</div>);
+
+/*
+ This is actually a good comment that will help
+ users to understand what's going on here.
+*/
+"
+`;
+
+exports[`inject-decorator will not change the source when there are no "storiesOf" functions 1`] = `
+"while(true) {
+  console.log(\\"it's a kind of magic\\");
+}"
+`;
diff --git a/addons/storysource/src/loader/default-options.js b/addons/storysource/src/loader/default-options.js
new file mode 100644
index 00000000000..97a58bd808d
--- /dev/null
+++ b/addons/storysource/src/loader/default-options.js
@@ -0,0 +1,12 @@
+const defaultOptions = {
+  prettierConfig: {
+    printWidth: 120,
+    tabWidth: 2,
+    bracketSpacing: true,
+    trailingComma: 'es5',
+    singleQuote: true,
+  },
+  uglyCommentsRegex: [/^eslint-.*/, /^global.*/],
+};
+
+export default defaultOptions;
diff --git a/addons/storysource/src/loader/generate-helpers.js b/addons/storysource/src/loader/generate-helpers.js
new file mode 100644
index 00000000000..4ad25a2e91d
--- /dev/null
+++ b/addons/storysource/src/loader/generate-helpers.js
@@ -0,0 +1,104 @@
+import prettier from 'prettier';
+import { handleADD, handleSTORYOF } from './parse-helpers';
+
+const estraverse = require('estraverse');
+const acorn = require('acorn');
+
+require('acorn-stage3/inject')(acorn);
+require('acorn-jsx/inject')(acorn);
+require('acorn-es7')(acorn);
+
+const acornConfig = {
+  ecmaVersion: '9',
+  sourceType: 'module',
+  ranges: true,
+  locations: true,
+  plugins: {
+    jsx: true,
+    stage3: true,
+    es7: true,
+  },
+};
+
+function isUglyComment(comment, uglyCommentsRegex) {
+  return uglyCommentsRegex.some(regex => regex.test(comment));
+}
+
+function generateSourceWithoutUglyComments(source, { comments, uglyCommentsRegex }) {
+  let lastIndex = 0;
+  const parts = [source];
+
+  comments
+    .filter(comment => isUglyComment(comment.value.trim(), uglyCommentsRegex))
+    .forEach(comment => {
+      parts.pop();
+
+      const start = source.slice(lastIndex, comment.start);
+      const end = source.slice(comment.end);
+
+      parts.push(start, end);
+      lastIndex = comment.end;
+    });
+
+  return parts.join('');
+}
+
+function prettifyCode(source, { prettierConfig }) {
+  return prettier.format(source, prettierConfig);
+}
+
+export function generateSourceWithDecorators(source, decorator) {
+  const comments = [];
+
+  const config = {
+    ...acornConfig,
+    onComment: comments,
+  };
+
+  const ast = acorn.parse(source, config);
+
+  let lastIndex = 0;
+  const parts = [source];
+
+  estraverse.traverse(ast, {
+    fallback: 'iteration',
+    enter: node => {
+      if (node.type === 'CallExpression') {
+        lastIndex = handleSTORYOF(node, parts, source, lastIndex);
+      }
+    },
+  });
+
+  const newSource = parts.join(decorator);
+
+  return {
+    changed: lastIndex > 0,
+    source: newSource,
+    comments,
+  };
+}
+
+export function generateAddsMap(source) {
+  const ast = acorn.parse(source, acornConfig);
+  const adds = {};
+
+  estraverse.traverse(ast, {
+    fallback: 'iteration',
+    enter: (node, parent) => {
+      if (node.type === 'MemberExpression') {
+        handleADD(node, parent, adds);
+      }
+    },
+  });
+
+  return adds;
+}
+
+export function generateStorySource({ source, ...options }) {
+  let storySource = source;
+
+  storySource = generateSourceWithoutUglyComments(storySource, options);
+  storySource = prettifyCode(storySource, options);
+
+  return storySource;
+}
diff --git a/addons/storysource/src/loader/index.js b/addons/storysource/src/loader/index.js
new file mode 100644
index 00000000000..23cf57820af
--- /dev/null
+++ b/addons/storysource/src/loader/index.js
@@ -0,0 +1,29 @@
+import { getOptions } from 'loader-utils';
+import injectDecorator from './inject-decorator';
+
+const ADD_DECORATOR_STATEMENT = '.addDecorator(withStorySource(__STORY__, __ADDS_MAP__))';
+
+function transform(source) {
+  const options = getOptions(this) || {};
+  const result = injectDecorator(source, ADD_DECORATOR_STATEMENT, options);
+
+  if (!result.changed) {
+    return source;
+  }
+
+  const sourceJson = JSON.stringify(result.storySource)
+    .replace(/\u2028/g, '\\u2028')
+    .replace(/\u2029/g, '\\u2029');
+
+  const addsMap = JSON.stringify(result.addsMap);
+
+  return `
+  var withStorySource = require('@storybook/addon-storysource').withStorySource;
+  var __STORY__ = ${sourceJson};
+  var __ADDS_MAP__ = ${addsMap};
+  
+  ${result.source}
+  `;
+}
+
+export default transform;
diff --git a/addons/storysource/src/loader/inject-decorator.js b/addons/storysource/src/loader/inject-decorator.js
new file mode 100644
index 00000000000..6a83617013f
--- /dev/null
+++ b/addons/storysource/src/loader/inject-decorator.js
@@ -0,0 +1,40 @@
+import defaultOptions from './default-options';
+
+import {
+  generateSourceWithDecorators,
+  generateStorySource,
+  generateAddsMap,
+} from './generate-helpers';
+
+function extendOptions(source, comments, options) {
+  return {
+    ...defaultOptions,
+    ...options,
+    source,
+    comments,
+  };
+}
+
+function inject(source, decorator, options = {}) {
+  const { changed, source: newSource, comments } = generateSourceWithDecorators(source, decorator);
+
+  if (!changed) {
+    return {
+      source: newSource,
+      addsMap: {},
+      changed,
+    };
+  }
+
+  const storySource = generateStorySource(extendOptions(source, comments, options));
+  const addsMap = generateAddsMap(storySource);
+
+  return {
+    source: newSource,
+    storySource,
+    addsMap,
+    changed,
+  };
+}
+
+export default inject;
diff --git a/addons/storysource/src/loader/inject-decorator.test.js b/addons/storysource/src/loader/inject-decorator.test.js
new file mode 100644
index 00000000000..18bd8a1acda
--- /dev/null
+++ b/addons/storysource/src/loader/inject-decorator.test.js
@@ -0,0 +1,62 @@
+import fs from 'fs';
+import injectDecorator from './inject-decorator';
+
+const ADD_DECORATOR_STATEMENT = '.addDecorator(withStorySource(__STORY__, __ADDS_MAP__))';
+
+describe('inject-decorator', () => {
+  describe('positive', () => {
+    const source = fs.readFileSync('./__mocks__/inject-decorator.stories.txt', 'utf-8');
+    const result = injectDecorator(source, ADD_DECORATOR_STATEMENT);
+
+    it('returns "changed" flag', () => {
+      expect(result.changed).toBeTruthy();
+    });
+
+    it('injects stories decorator after the all "storiesOf" functions', () => {
+      expect(result.source).toMatchSnapshot();
+    });
+
+    it('calculates "adds" map', () => {
+      expect(result.addsMap).toMatchSnapshot();
+    });
+  });
+
+  describe('positive - angular', () => {
+    const source = fs.readFileSync('./__mocks__/inject-decorator.angular-stories.txt', 'utf-8');
+    const result = injectDecorator(source, ADD_DECORATOR_STATEMENT);
+
+    it('returns "changed" flag', () => {
+      expect(result.changed).toBeTruthy();
+    });
+
+    it('injects stories decorator after the all "storiesOf" functions', () => {
+      expect(result.source).toMatchSnapshot();
+    });
+
+    it('calculates "adds" map', () => {
+      expect(result.addsMap).toMatchSnapshot();
+    });
+  });
+
+  describe('stories with ugly comments', () => {
+    const source = fs.readFileSync(
+      './__mocks__/inject-decorator.ugly-comments-stories.txt',
+      'utf-8'
+    );
+    const result = injectDecorator(source, ADD_DECORATOR_STATEMENT);
+
+    it('should delete ugly comments from the generated story source', () => {
+      expect(result.storySource).toMatchSnapshot();
+    });
+  });
+
+  it('will not change the source when there are no "storiesOf" functions', () => {
+    const source = fs.readFileSync('./__mocks__/inject-decorator.no-stories.txt', 'utf-8');
+
+    const result = injectDecorator(source, ADD_DECORATOR_STATEMENT);
+
+    expect(result.changed).toBeFalsy();
+    expect(result.addsMap).toEqual({});
+    expect(result.source).toMatchSnapshot();
+  });
+});
diff --git a/addons/storysource/src/loader/parse-helpers.js b/addons/storysource/src/loader/parse-helpers.js
new file mode 100644
index 00000000000..09bf13f1f25
--- /dev/null
+++ b/addons/storysource/src/loader/parse-helpers.js
@@ -0,0 +1,88 @@
+const STORIES_OF = 'storiesOf';
+
+function pushParts(source, parts, from, to) {
+  const start = source.slice(from, to);
+  parts.push(start);
+
+  const end = source.slice(to);
+  parts.push(end);
+}
+
+function getKindFromStoryOfNode(object) {
+  if (object.arguments.length < 1) {
+    return '';
+  }
+
+  const kindArgument = object.arguments[0];
+
+  if (kindArgument.type === 'Literal') {
+    return kindArgument.value;
+  }
+
+  if (kindArgument.type === 'TemplateLiteral') {
+    // we can generate template, but it will not be a real value
+    // until the full template compilation. probably won't fix.
+    return '';
+  }
+
+  // other options may include some complex usages.
+  return '';
+}
+
+function findRelatedKind(object) {
+  if (!object || !object.callee) {
+    return '';
+  }
+
+  if (object.callee.name === STORIES_OF) {
+    return getKindFromStoryOfNode(object);
+  }
+
+  return findRelatedKind(object.callee.object);
+}
+
+export function handleADD(node, parent, adds) {
+  if (!node.property || !node.property.name || node.property.name.indexOf('add') !== 0) {
+    return;
+  }
+
+  const addArgs = parent.arguments;
+
+  if (!addArgs || addArgs.length < 2) {
+    return;
+  }
+
+  const storyName = addArgs[0];
+  const lastArg = addArgs[addArgs.length - 1];
+
+  if (storyName.type !== 'Literal') {
+    // if story name is not literal, it much harder to extract it
+    return;
+  }
+
+  const kind = findRelatedKind(node.object) || '';
+  const key = `${kind}@${storyName.value}`;
+
+  // eslint-disable-next-line no-param-reassign
+  adds[key] = {
+    // Debug: code: source.slice(storyName.start, lastArg.end),
+    startLoc: {
+      col: storyName.loc.start.column,
+      line: storyName.loc.start.line,
+    },
+    endLoc: {
+      col: lastArg.loc.end.column,
+      line: lastArg.loc.end.line,
+    },
+  };
+}
+
+export function handleSTORYOF(node, parts, source, lastIndex) {
+  if (!node.callee || !node.callee.name || node.callee.name !== STORIES_OF) {
+    return lastIndex;
+  }
+
+  parts.pop();
+  pushParts(source, parts, lastIndex, node.end);
+  return node.end;
+}
diff --git a/addons/storysource/src/manager.js b/addons/storysource/src/manager.js
new file mode 100644
index 00000000000..bdfd4b4d5db
--- /dev/null
+++ b/addons/storysource/src/manager.js
@@ -0,0 +1,14 @@
+import React from 'react';
+import addons from '@storybook/addons';
+import StoryPanel from './StoryPanel';
+import { ADDON_ID, PANEL_ID } from './';
+
+export function register() {
+  addons.register(ADDON_ID, () => {
+    const channel = addons.getChannel();
+    addons.addPanel(PANEL_ID, {
+      title: 'Story',
+      render: () => <StoryPanel channel={channel} />,
+    });
+  });
+}
diff --git a/addons/storysource/src/preview.js b/addons/storysource/src/preview.js
new file mode 100644
index 00000000000..96c38ccd335
--- /dev/null
+++ b/addons/storysource/src/preview.js
@@ -0,0 +1,23 @@
+import addons from '@storybook/addons';
+import { EVENT_ID } from './';
+
+function getLocation(context, locationsMap) {
+  return locationsMap[`${context.kind}@${context.story}`] || locationsMap[`@${context.story}`];
+}
+
+function setStorySource(context, source, locationsMap) {
+  const channel = addons.getChannel();
+  const location = getLocation(context, locationsMap);
+
+  channel.emit(EVENT_ID, {
+    source,
+    location,
+  });
+}
+
+export function withStorySource(source, locationsMap = {}) {
+  return (story, context) => {
+    setStorySource(context, source, locationsMap);
+    return story();
+  };
+}
diff --git a/addons/viewport/README.md b/addons/viewport/README.md
index 37f59241831..05107e1f1da 100644
--- a/addons/viewport/README.md
+++ b/addons/viewport/README.md
@@ -2,9 +2,9 @@
 
 Storybook Viewport Addon allows your stories to be displayed in different sizes and layouts in [Storybook](https://storybookjs.org).  This helps build responsive components inside of Storybook.
 
-This addon works with Storybook for: [React](https://github.com/storybooks/storybook/tree/master/app/react) and [Vue](https://github.com/storybooks/storybook/tree/master/app/vue).
+[Framework Support](https://github.com/storybooks/storybook/blob/master/ADDONS_SUPPORT.md)
 
-![Screenshot](https://github.com/storybooks/storybook/blob/master/docs/viewport.png)
+![Screenshot](https://github.com/storybooks/storybook/blob/master/addons/viewport/docs/viewport.png)
 
 ## Installation
 
diff --git a/addons/viewport/package.json b/addons/viewport/package.json
index ea8fcf34163..081c5e570e8 100644
--- a/addons/viewport/package.json
+++ b/addons/viewport/package.json
@@ -1,19 +1,20 @@
 {
   "name": "@storybook/addon-viewport",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "Storybook addon to change the viewport size to mobile",
-  "main": "register.js",
   "keywords": [
     "storybook"
   ],
+  "license": "MIT",
+  "main": "register.js",
   "scripts": {
     "prepare": "node ../../scripts/prepare.js"
   },
-  "license": "MIT",
   "dependencies": {
-    "@storybook/components": "^3.4.0-alpha.0",
+    "@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/addons/viewport/src/components/RotateViewport.js b/addons/viewport/src/components/RotateViewport.js
index ef6c9c1011e..6fd7b493dff 100644
--- a/addons/viewport/src/components/RotateViewport.js
+++ b/addons/viewport/src/components/RotateViewport.js
@@ -10,8 +10,10 @@ export function RotateViewport({ active, ...props }) {
   };
   return (
     <div style={styles.row}>
-      <label style={styles.label}>Rotate</label>
-      <button {...props} style={actionStyles}>
+      <label htmlFor="rotate" style={styles.label}>
+        Rotate
+      </label>
+      <button id="rotate" {...props} style={actionStyles}>
         {active ? 'Vertical' : 'Landscape'}
       </button>
     </div>
diff --git a/addons/viewport/src/components/SelectViewport.js b/addons/viewport/src/components/SelectViewport.js
index c711ccc5486..230e360239d 100644
--- a/addons/viewport/src/components/SelectViewport.js
+++ b/addons/viewport/src/components/SelectViewport.js
@@ -7,8 +7,10 @@ import * as styles from './styles';
 export function SelectViewport({ activeViewport, onChange }) {
   return (
     <div style={styles.row}>
-      <label style={styles.label}>Device</label>
-      <select style={styles.action} value={activeViewport} onChange={onChange}>
+      <label htmlFor="device" style={styles.label}>
+        Device
+      </label>
+      <select style={styles.action} id="device" value={activeViewport} onChange={onChange}>
         <option value={defaultViewport}>Default</option>
         {Object.keys(viewports).map(key => (
           <option value={key} key={key}>
diff --git a/addons/viewport/src/components/tests/Panel.test.js b/addons/viewport/src/components/tests/Panel.test.js
index 8915ca49ef3..4ad4a189185 100644
--- a/addons/viewport/src/components/tests/Panel.test.js
+++ b/addons/viewport/src/components/tests/Panel.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { shallow } from 'enzyme'; // eslint-disable-line import/no-extraneous-dependencies
+import { shallow } from 'enzyme';
 import { document } from 'global';
 
 import { Panel } from '../Panel';
diff --git a/addons/viewport/src/components/tests/RotateViewport.test.js b/addons/viewport/src/components/tests/RotateViewport.test.js
index 75d04a87b93..02dd22da6f1 100644
--- a/addons/viewport/src/components/tests/RotateViewport.test.js
+++ b/addons/viewport/src/components/tests/RotateViewport.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { shallow } from 'enzyme'; // eslint-disable-line import/no-extraneous-dependencies
+import { shallow } from 'enzyme';
 import { RotateViewport } from '../RotateViewport';
 import * as styles from '../styles';
 
diff --git a/addons/viewport/src/components/tests/SelectViewport.test.js b/addons/viewport/src/components/tests/SelectViewport.test.js
index 2101cc445e9..f43d30763d5 100644
--- a/addons/viewport/src/components/tests/SelectViewport.test.js
+++ b/addons/viewport/src/components/tests/SelectViewport.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { shallow } from 'enzyme'; // eslint-disable-line import/no-extraneous-dependencies
+import { shallow } from 'enzyme';
 import { SelectViewport } from '../SelectViewport';
 import { viewports, defaultViewport } from '../viewportInfo';
 import * as styles from '../styles';
diff --git a/app/angular/.babelrc b/app/angular/.babelrc
deleted file mode 100644
index 845c3cf4d75..00000000000
--- a/app/angular/.babelrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "presets": ["env", "stage-0", "react"]
-}
diff --git a/app/angular/demo.d.ts b/app/angular/demo.d.ts
index 7ff09737fcd..c2deaa98dbb 100644
--- a/app/angular/demo.d.ts
+++ b/app/angular/demo.d.ts
@@ -1,4 +1,4 @@
 declare module '@storybook/angular/demo' {
-    export const Button: any;
-    export const Welcome: any;
-}
\ No newline at end of file
+  export const Button: any;
+  export const Welcome: any;
+}
diff --git a/app/angular/demo.js b/app/angular/demo.js
index e301e97f20e..545f611dd69 100644
--- a/app/angular/demo.js
+++ b/app/angular/demo.js
@@ -1,5 +1,5 @@
 /* eslint-disable global-require */
 module.exports = {
-  Welcome: require('./dist/demo/welcome.component.ts').default,
-  Button: require('./dist/demo/button.component.ts').default,
+  Welcome: require('./dist/demo/welcome.component').default,
+  Button: require('./dist/demo/button.component').default,
 };
diff --git a/app/angular/index.d.ts b/app/angular/index.d.ts
index 96e06d24596..1e067cc761f 100644
--- a/app/angular/index.d.ts
+++ b/app/angular/index.d.ts
@@ -1,31 +1,33 @@
-import {NgModuleMetadata, ICollection} from './dist/client/preview/angular/types';
+import { NgModuleMetadata, ICollection } from './dist/client/preview/angular/types';
+export { moduleMetadata } from './dist/client/preview/angular/decorators';
 
 export interface IStorybookStory {
-    name: string,
-    render: () => any
+  name: string;
+  render: () => any;
 }
 
 export interface IStoribookSection {
-    kind: string,
-    stories: IStorybookStory[]
+  kind: string;
+  stories: IStorybookStory[];
 }
 
 export type IGetStory = () => {
-    props?: ICollection;
-    moduleMetadata?: Partial<NgModuleMetadata>;
-    component: any
+  props?: ICollection;
+  moduleMetadata?: Partial<NgModuleMetadata>;
+  component?: any;
+  template?: string;
 };
 
 export interface IApi {
-    kind: string;
-    addDecorator: (decorator: any) => IApi;
-    add: (storyName: string, getStory: IGetStory ) => IApi;
+  kind: string;
+  addDecorator: (decorator: any) => IApi;
+  add: (storyName: string, getStory: IGetStory) => IApi;
 }
 
 declare module '@storybook/angular' {
-    export function storiesOf(kind: string, module: NodeModule): IApi;
-    export function setAddon(addon: any): void;
-    export function addDecorator(decorator: any): IApi;
-    export function configure(loaders: () => NodeRequire, module: NodeModule): void;
-    export function getStorybook(): IStoribookSection[];
+  export function storiesOf(kind: string, module: NodeModule): IApi;
+  export function setAddon(addon: any): void;
+  export function addDecorator(decorator: any): IApi;
+  export function configure(loaders: () => NodeRequire, module: NodeModule): void;
+  export function getStorybook(): IStoribookSection[];
 }
diff --git a/app/angular/package.json b/app/angular/package.json
index 3838e750a0e..ac76775df05 100644
--- a/app/angular/package.json
+++ b/app/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/angular",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "Storybook for Angular: Develop Angular Components in isolation with Hot Reloading.",
   "homepage": "https://github.com/storybooks/storybook/tree/master/apps/angular",
   "bugs": {
@@ -23,77 +23,50 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addon-actions": "^3.4.0-alpha.0",
-    "@storybook/addon-links": "^3.4.0-alpha.0",
-    "@storybook/addons": "^3.4.0-alpha.0",
-    "@storybook/channel-postmessage": "^3.4.0-alpha.0",
-    "@storybook/core": "^3.4.0-alpha.0",
-    "@storybook/ui": "^3.4.0-alpha.0",
-    "airbnb-js-shims": "^1.1.1",
+    "@storybook/addons": "^3.4.0-alpha.9",
+    "@storybook/channel-postmessage": "^3.4.0-alpha.9",
+    "@storybook/core": "^3.4.0-alpha.9",
+    "@storybook/node-logger": "^3.4.0-alpha.9",
+    "@storybook/ui": "^3.4.0-alpha.9",
+    "airbnb-js-shims": "^1.4.1",
     "angular2-template-loader": "^0.6.2",
-    "autoprefixer": "^7.2.4",
-    "babel-core": "^6.26.0",
-    "babel-loader": "^7.0.0",
-    "babel-plugin-react-docgen": "^1.6.0",
+    "babel-loader": "^7.1.3",
+    "babel-plugin-macros": "^2.1.0",
     "babel-preset-env": "^1.6.0",
-    "babel-preset-react": "^6.24.1",
-    "babel-preset-react-app": "^3.0.0",
     "babel-preset-stage-0": "^6.24.1",
     "babel-runtime": "^6.23.0",
     "case-sensitive-paths-webpack-plugin": "^2.0.0",
-    "chalk": "^2.1.0",
-    "commander": "^2.11.0",
-    "common-tags": "^1.4.0",
-    "configstore": "^3.1.0",
     "core-js": "^2.4.1",
     "cross-env": "^5.1.1",
-    "css-loader": "^0.28.8",
-    "express": "^4.15.3",
-    "file-loader": "^0.11.1",
-    "find-cache-dir": "^1.0.0",
+    "dotenv-webpack": "^1.5.5",
     "global": "^4.3.2",
+    "html-loader": "^0.5.5",
     "html-webpack-plugin": "^2.30.1",
-    "json-loader": "^0.5.4",
-    "json-stringify-safe": "^5.0.1",
     "json5": "^0.5.1",
-    "lodash.pick": "^4.4.0",
-    "postcss-flexbugs-fixes": "^3.0.0",
-    "postcss-loader": "^2.0.10",
-    "prop-types": "^15.5.10",
-    "qs": "^6.5.1",
+    "markdown-loader": "^2.0.2",
+    "node-sass": "^4.7.2",
     "raw-loader": "^0.5.1",
     "react": "^16.0.0",
+    "react-dev-utils": "^5.0.0",
     "react-dom": "^16.0.0",
-    "react-modal": "^2.2.4",
     "redux": "^3.6.0",
-    "request": "^2.81.0",
-    "rxjs": "^5.4.2",
-    "serve-favicon": "^2.4.3",
-    "shelljs": "^0.7.8",
-    "style-loader": "^0.18.2",
-    "ts-loader": "^2.2.2",
-    "uglifyjs-webpack-plugin": "^1.1.6",
-    "url-loader": "^0.5.8",
+    "sass-loader": "^6.0.6",
+    "ts-loader": "^3.5.0",
+    "uglifyjs-webpack-plugin": "^1.2.2",
     "util-deprecate": "^1.0.2",
-    "uuid": "^3.1.0",
-    "webpack": "^2.5.1 || ^3.0.0",
-    "webpack-dev-middleware": "^1.10.2",
-    "webpack-hot-middleware": "^2.18.0",
-    "zone.js": "^0.8.19"
+    "webpack": "^3.11.0",
+    "webpack-hot-middleware": "^2.21.1",
+    "zone.js": "^0.8.20"
   },
   "devDependencies": {
-    "babel-cli": "^6.26.0",
-    "babel-plugin-transform-decorators": "^6.24.1",
-    "babel-plugin-transform-decorators-legacy": "^1.3.4",
-    "codelyzer": "^3.1.2",
     "mock-fs": "^4.3.0",
-    "nodemon": "^1.14.8",
-    "typescript": "^2.4.0"
+    "nodemon": "^1.17.1"
   },
   "peerDependencies": {
     "@angular/common": ">=4.0.0",
     "@angular/compiler": ">=4.0.0",
     "@angular/core": ">=4.0.0",
+    "@angular/forms": ">=4.0.0",
     "@angular/platform-browser": ">=4.0.0",
     "@angular/platform-browser-dynamic": ">=4.0.0"
   }
diff --git a/app/angular/src/client/index.js b/app/angular/src/client/index.js
index 925ffed29bb..e2e3fc59d02 100644
--- a/app/angular/src/client/index.js
+++ b/app/angular/src/client/index.js
@@ -1 +1,3 @@
 export { storiesOf, setAddon, addDecorator, configure, getStorybook } from './preview';
+
+export { moduleMetadata } from './preview/angular/decorators';
diff --git a/app/angular/src/client/manager/provider.js b/app/angular/src/client/manager/provider.js
deleted file mode 100644
index 84e75d88f88..00000000000
--- a/app/angular/src/client/manager/provider.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import { location } from 'global';
-import qs from 'qs';
-import React from 'react';
-import { Provider } from '@storybook/ui';
-import addons from '@storybook/addons';
-import createChannel from '@storybook/channel-postmessage';
-import Preview from './preview';
-
-export default class ReactProvider extends Provider {
-  constructor() {
-    super();
-    this.channel = createChannel({ page: 'manager' });
-    addons.setChannel(this.channel);
-  }
-
-  getPanels() {
-    return addons.getPanels();
-  }
-
-  renderPreview(selectedKind, selectedStory) {
-    const queryParams = {
-      selectedKind,
-      selectedStory,
-    };
-
-    // Add the react-perf query string to the iframe if that present.
-    if (/react_perf/.test(location.search)) {
-      queryParams.react_perf = '1';
-    }
-
-    const queryString = qs.stringify(queryParams);
-    const url = `iframe.html?${queryString}`;
-    return <Preview url={url} />;
-  }
-
-  handleAPI(api) {
-    api.onStory((kind, story) => {
-      this.channel.emit('setCurrentStory', { kind, story });
-    });
-    this.channel.on('setStories', data => {
-      api.setStories(data.stories);
-    });
-    this.channel.on('selectStory', data => {
-      api.selectStory(data.kind, data.story);
-    });
-    this.channel.on('applyShortcut', data => {
-      api.handleShortcut(data.event);
-    });
-    addons.loadAddons(api);
-  }
-}
diff --git a/app/angular/src/client/preview/angular/app.token.ts b/app/angular/src/client/preview/angular/app.token.ts
index bf45fcd7720..3e4753b21c1 100644
--- a/app/angular/src/client/preview/angular/app.token.ts
+++ b/app/angular/src/client/preview/angular/app.token.ts
@@ -1,4 +1,4 @@
-import { InjectionToken } from "@angular/core";
-import { NgStory } from "./types";
+import { InjectionToken } from '@angular/core';
+import { NgStory } from './types';
 
-export const STORY = new InjectionToken<NgStory>("story");
+export const STORY = new InjectionToken<NgStory>('story');
diff --git a/app/angular/src/client/preview/angular/components/app.component.ts b/app/angular/src/client/preview/angular/components/app.component.ts
index ff4d463bf9e..264b6e90722 100644
--- a/app/angular/src/client/preview/angular/components/app.component.ts
+++ b/app/angular/src/client/preview/angular/components/app.component.ts
@@ -2,35 +2,31 @@
 // to provide @Inputs and subscribe to @Outputs, see
 // https://github.com/angular/angular/issues/15360
 // For the time being, the ViewContainerRef approach works pretty well.
-import * as _ from 'lodash';
 import {
   Component,
   Inject,
-  AfterViewInit,
+  OnInit,
   ViewChild,
   ViewContainerRef,
   ComponentFactoryResolver,
   OnDestroy,
   EventEmitter,
   SimpleChanges,
-  SimpleChange
+  SimpleChange,
 } from '@angular/core';
 import { STORY } from '../app.token';
 import { NgStory, ICollection } from '../types';
 
 @Component({
   selector: 'storybook-dynamic-app-root',
-  template: '<ng-template #target></ng-template>'
+  template: '<ng-template #target></ng-template>',
 })
-export class AppComponent implements AfterViewInit, OnDestroy {
+export class AppComponent implements OnInit, OnDestroy {
   @ViewChild('target', { read: ViewContainerRef })
   target: ViewContainerRef;
-  constructor(
-    private cfr: ComponentFactoryResolver,
-    @Inject(STORY) private data: NgStory
-  ) {}
+  constructor(private cfr: ComponentFactoryResolver, @Inject(STORY) private data: NgStory) {}
 
-  ngAfterViewInit(): void {
+  ngOnInit(): void {
     this.putInMyHtml();
   }
 
@@ -49,20 +45,20 @@ export class AppComponent implements AfterViewInit, OnDestroy {
   /**
    * Set inputs and outputs
    */
-  private setProps(instance: any, {props = {}, propsMeta = {}}: NgStory): void {
+  private setProps(instance: any, { props = {} }: NgStory): void {
     const changes: SimpleChanges = {};
-    const hasNgOnChangesHook = _.has(instance, 'ngOnChanges');
+    const hasNgOnChangesHook = !!instance['ngOnChanges'];
 
-    _.forEach(propsMeta, (meta, key) => {
+    Object.keys(props).map((key: string) => {
       const value = props[key];
-      const instanceProperty = <any>_.get(instance, key);
+      const instanceProperty = instance[key];
 
-      if (!(instanceProperty instanceof EventEmitter) && !_.isUndefined(value)) {
-        _.set(instance, key, value);
+      if (!(instanceProperty instanceof EventEmitter) && (value !== undefined && value !== null)) {
+        instance[key] = value;
         if (hasNgOnChangesHook) {
           changes[key] = new SimpleChange(undefined, value, instanceProperty === undefined);
         }
-      } else if (_.isFunction(value) && (key !== 'ngModelChange')) {
+      } else if (typeof value === 'function' && key !== 'ngModelChange') {
         instanceProperty.subscribe(value);
       }
     });
@@ -76,8 +72,8 @@ export class AppComponent implements AfterViewInit, OnDestroy {
    * Issue: [https://github.com/angular/angular/issues/8903]
    */
   private callNgOnChangesHook(instance: any, changes: SimpleChanges): void {
-    if (!_.isEmpty(changes)) {
-      _.invoke(instance, 'ngOnChanges', changes);
+    if (!!Object.keys(changes).length) {
+      instance.ngOnChanges(changes);
     }
   }
 
@@ -85,12 +81,12 @@ export class AppComponent implements AfterViewInit, OnDestroy {
    * If component implements ControlValueAccessor interface try to set ngModel
    */
   private setNgModel(instance: any, props: ICollection): void {
-    if (_.has(props, 'ngModel')) {
-      _.invoke(instance, 'writeValue', props.ngModel);
+    if (!!props['ngModel']) {
+      instance.writeValue(props.ngModel);
     }
 
-    if (_.isFunction(props.ngModelChange)) {
-        _.invoke(instance, 'registerOnChange', props.ngModelChange);
+    if (typeof props.ngModelChange === 'function') {
+      instance.registerOnChange(props.ngModelChange);
     }
   }
 }
diff --git a/app/angular/src/client/preview/angular/components/error.component.ts b/app/angular/src/client/preview/angular/components/error.component.ts
index e5c2588036d..f19d679b11c 100644
--- a/app/angular/src/client/preview/angular/components/error.component.ts
+++ b/app/angular/src/client/preview/angular/components/error.component.ts
@@ -1,6 +1,6 @@
-import { Component, Inject } from "@angular/core";
-import { STORY } from "../app.token";
-import { NgError } from "../types";
+import { Component, Inject } from '@angular/core';
+import { STORY } from '../app.token';
+import { NgError } from '../types';
 
 @Component({
   selector: 'storybook-dynamic-app-root',
@@ -40,9 +40,9 @@ import { NgError } from "../types";
         width: 100vw;
         overflow: auto;
       }
-    `
-  ]
+    `,
+  ],
 })
 export class ErrorComponent {
   constructor(@Inject(STORY) public error: NgError) {}
-}
\ No newline at end of file
+}
diff --git a/app/angular/src/client/preview/angular/components/no-preview.component.ts b/app/angular/src/client/preview/angular/components/no-preview.component.ts
index 73a0d0c205e..3e220b28cc2 100644
--- a/app/angular/src/client/preview/angular/components/no-preview.component.ts
+++ b/app/angular/src/client/preview/angular/components/no-preview.component.ts
@@ -1,7 +1,7 @@
-import { Component } from "@angular/core";
+import { Component } from '@angular/core';
 
 @Component({
   selector: 'storybook-dynamic-app-root',
-  template: "<p>No Preview Available!</p>"
+  template: '<p>No Preview Available!</p>',
 })
 export class NoPreviewComponent {}
diff --git a/app/angular/src/client/preview/angular/decorators.test.ts b/app/angular/src/client/preview/angular/decorators.test.ts
new file mode 100644
index 00000000000..2fa5b8d7ac0
--- /dev/null
+++ b/app/angular/src/client/preview/angular/decorators.test.ts
@@ -0,0 +1,99 @@
+import { moduleMetadata } from './decorators';
+import { addDecorator, storiesOf, clearDecorators, getStorybook } from '..';
+
+class MockModule {}
+class MockModuleTwo {}
+class MockService {}
+class MockComponent {}
+
+describe('moduleMetadata', () => {
+  it('should add metadata to a story without it', () => {
+    const result = moduleMetadata({
+      imports: [MockModule],
+      providers: [MockService],
+    })(() => ({
+      component: MockComponent,
+    }));
+
+    expect(result).toEqual({
+      component: MockComponent,
+      moduleMetadata: {
+        declarations: [],
+        entryComponents: [],
+        imports: [MockModule],
+        schemas: [],
+        providers: [MockService],
+      },
+    });
+  });
+
+  it('should combine with individual metadata on a story', () => {
+    const result = moduleMetadata({
+      imports: [MockModule],
+    })(() => ({
+      component: MockComponent,
+      moduleMetadata: {
+        imports: [MockModuleTwo],
+        providers: [MockService],
+      },
+    }));
+
+    expect(result).toEqual({
+      component: MockComponent,
+      moduleMetadata: {
+        declarations: [],
+        entryComponents: [],
+        imports: [MockModule, MockModuleTwo],
+        schemas: [],
+        providers: [MockService],
+      },
+    });
+  });
+
+  it('should return the original metadata if passed null', () => {
+    const result = moduleMetadata(null)(() => ({
+      component: MockComponent,
+      moduleMetadata: {
+        providers: [MockService],
+      },
+    }));
+
+    expect(result).toEqual({
+      component: MockComponent,
+      moduleMetadata: {
+        declarations: [],
+        entryComponents: [],
+        imports: [],
+        schemas: [],
+        providers: [MockService],
+      },
+    });
+  });
+
+  it('should work when added globally', () => {
+    const metadata = {
+      declarations: [MockComponent],
+      providers: [MockService],
+      entryComponents: [MockComponent],
+      imports: [MockModule],
+    };
+
+    addDecorator(moduleMetadata(metadata));
+
+    storiesOf('Test', module).add('Default', () => ({
+      component: MockComponent,
+    }));
+
+    const [storybook] = getStorybook();
+
+    expect(storybook.stories[0].render().moduleMetadata).toEqual({
+      declarations: [MockComponent],
+      providers: [MockService],
+      entryComponents: [MockComponent],
+      imports: [MockModule],
+      schemas: [],
+    });
+
+    clearDecorators();
+  });
+});
diff --git a/app/angular/src/client/preview/angular/decorators.ts b/app/angular/src/client/preview/angular/decorators.ts
new file mode 100644
index 00000000000..7897d6f0c38
--- /dev/null
+++ b/app/angular/src/client/preview/angular/decorators.ts
@@ -0,0 +1,21 @@
+import { NgModuleMetadata } from './types';
+
+export const moduleMetadata = (metadata: Partial<NgModuleMetadata>) => (storyFn: () => any) => {
+  const story = storyFn();
+  const storyMetadata = story.moduleMetadata || {};
+  metadata = metadata || {};
+
+  return {
+    ...story,
+    moduleMetadata: {
+      declarations: [...(metadata.declarations || []), ...(storyMetadata.declarations || [])],
+      entryComponents: [
+        ...(metadata.entryComponents || []),
+        ...(storyMetadata.entryComponents || []),
+      ],
+      imports: [...(metadata.imports || []), ...(storyMetadata.imports || [])],
+      schemas: [...(metadata.schemas || []), ...(storyMetadata.schemas || [])],
+      providers: [...(metadata.providers || []), ...(storyMetadata.providers || [])],
+    },
+  };
+};
diff --git a/app/angular/src/client/preview/angular/helpers.ts b/app/angular/src/client/preview/angular/helpers.ts
index 847654083b6..00f70345346 100644
--- a/app/angular/src/client/preview/angular/helpers.ts
+++ b/app/angular/src/client/preview/angular/helpers.ts
@@ -1,45 +1,35 @@
-import {
-  Type,
-  enableProdMode,
-  NgModule,
-  Component,
-  NgModuleRef
-} from '@angular/core';
-import {FormsModule} from '@angular/forms';
-
+import { enableProdMode, NgModule, Component, NgModuleRef, Type } from '@angular/core';
+import { FormsModule } from '@angular/forms';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { BrowserModule } from '@angular/platform-browser';
 import { AppComponent } from './components/app.component';
 import { ErrorComponent } from './components/error.component';
 import { NoPreviewComponent } from './components/no-preview.component';
 import { STORY } from './app.token';
-import { getAnnotations, getParameters, getPropMetadata } from './utils';
-import { NgModuleMetadata, NgStory, IGetStoryWithContext, IContext, NgProvidedData } from './types';
+import {
+  NgModuleMetadata,
+  IGetStoryWithContext,
+  IContext,
+  NgProvidedData,
+  IRenderErrorFn,
+  IRenderStoryFn,
+} from './types';
 
 let platform: any = null;
 let promises: Promise<NgModuleRef<any>>[] = [];
 
-type IRenderStoryFn = (story: IGetStoryWithContext, context: IContext, reRender?: boolean) => void;
-type IRenderErrorFn = (error: Error) => void;
-
-interface IModule extends Type<any> {
-  annotations: any[];
-}
-interface IComponent extends Type<any> {
-  annotations: any[];
-  parameters: any[];
-  propsMetadata: any[];
-}
-
 // Taken from https://davidwalsh.name/javascript-debounce-function
 // We don't want to pull underscore
-const debounce = (func: IRenderStoryFn | IRenderErrorFn,
-                  wait: number = 100,
-                  immediate: boolean = false): () => void => {
+const debounce = (
+  func: IRenderStoryFn | IRenderErrorFn,
+  wait: number = 100,
+  immediate: boolean = false
+): (() => void) => {
   let timeout: any;
-  return function () {
-    const context = this, args = arguments;
-    const later = function () {
+  return function() {
+    const context = this,
+      args = arguments;
+    const later = function() {
       timeout = null;
       if (!immediate) {
         func.apply(context, args);
@@ -54,113 +44,58 @@ const debounce = (func: IRenderStoryFn | IRenderErrorFn,
   };
 };
 
-const getComponentMetadata = (
-  { component, props = {}, propsMeta = {}, moduleMetadata = {
-    imports: [],
-    schemas: [],
-    declarations: [],
-    providers: []
-  } }: NgStory
+const getModule = (
+  declarations: Array<Type<any> | any[]>,
+  entryComponents: Array<Type<any> | any[]>,
+  bootstrap: Array<Type<any> | any[]>,
+  data: NgProvidedData,
+  moduleMetadata: NgModuleMetadata
 ) => {
-  if (!component || typeof component !== 'function') {
-    throw new Error('No valid component provided');
-  }
-
-  const componentMetadata = getAnnotations(component)[0] || {};
-  const propsMetadata = getPropMetadata(component);
-  const paramsMetadata = getParameters(component);
-
-  Object.keys(propsMeta).map(key => {
-      (<any>propsMetadata)[key] = (<any>propsMeta)[key];
-  });
-
-  const {
-    imports = [],
-    schemas = [],
-    declarations = [],
-    providers = []
-  } = moduleMetadata;
-
-  return {
-    component,
-    props,
-    componentMeta: componentMetadata,
-    propsMeta: propsMetadata,
-    params: paramsMetadata,
-    moduleMeta: {
-      imports,
-      schemas,
-      declarations,
-      providers
-    }
-  };
-};
-
-const getAnnotatedComponent = (meta: NgModule,
-                               component: any,
-                               propsMeta: { [p: string]: any },
-                               params: any[]): IComponent => {
-  const NewComponent: any = function NewComponent(...args: any[]) {
-    component.call(this, ...args);
+  const moduleMeta = {
+    declarations: [...declarations, ...(moduleMetadata.declarations || [])],
+    imports: [BrowserModule, FormsModule, ...(moduleMetadata.imports || [])],
+    providers: [
+      { provide: STORY, useValue: Object.assign({}, data) },
+      ...(moduleMetadata.providers || []),
+    ],
+    entryComponents: [...entryComponents, ...(moduleMetadata.entryComponents || [])],
+    schemas: [...(moduleMetadata.schemas || [])],
+    bootstrap: [...bootstrap],
   };
 
-  NewComponent.prototype = Object.create(component.prototype);
-  NewComponent.annotations = [new Component(meta)];
-  NewComponent.parameters = params;
-  NewComponent.propsMetadata = propsMeta;
+  const moduleClass = class DynamicModule {};
 
-  return NewComponent;
+  return NgModule(moduleMeta)(moduleClass);
 };
 
-const getModule = (declarations: Array<Type<any> | any[]>,
-entryComponents: Array<Type<any> | any[]>,
-bootstrap: Array<Type<any> | any[]>,
-data: NgProvidedData,
-moduleMetadata: NgModuleMetadata = {
-  imports: [],
-  schemas: [],
-  declarations: [],
-  providers: []
-}): IModule => {
-  const moduleMeta = new NgModule({
-    declarations: [...declarations, ...moduleMetadata.declarations],
-    imports: [BrowserModule, FormsModule, ...moduleMetadata.imports],
-    providers: [{ provide: STORY, useValue: Object.assign({}, data) }, ...moduleMetadata.providers],
-    entryComponents: [...entryComponents],
-    schemas: [...moduleMetadata.schemas],
-    bootstrap: [...bootstrap]
-  });
+const createComponentFromTemplate = (template: string, styles: string[]): Function => {
+  const componentClass = class DynamicComponent {};
 
-  const NewModule: any = function NewModule() {};
-  (<IModule>NewModule).annotations = [moduleMeta];
-  return NewModule;
+  return Component({
+    template,
+    styles,
+  })(componentClass);
 };
 
-const initModule = (currentStory: IGetStoryWithContext, context: IContext, reRender: boolean): IModule => {
-  const {
-    component,
-    componentMeta,
-    props,
-    propsMeta,
-    params,
-    moduleMeta
-  } = getComponentMetadata(currentStory(context));
+const initModule = (
+  currentStory: IGetStoryWithContext,
+  context: IContext,
+  reRender: boolean = false
+): Function => {
+  const storyObj = currentStory(context);
+  const { component, template, props, styles, moduleMetadata = {} } = storyObj;
 
-  if (!componentMeta) {
-    throw new Error('No component metadata available');
+  let AnnotatedComponent;
+
+  if (template) {
+    AnnotatedComponent = createComponentFromTemplate(template, styles);
+  } else {
+    AnnotatedComponent = component;
   }
 
-  const AnnotatedComponent = getAnnotatedComponent(
-    componentMeta,
-    component,
-    propsMeta,
-    [...params, ...moduleMeta.providers.map(provider => [provider])]
-  );
-
   const story = {
     component: AnnotatedComponent,
     props,
-    propsMeta
   };
 
   return getModule(
@@ -168,11 +103,11 @@ const initModule = (currentStory: IGetStoryWithContext, context: IContext, reRen
     [AnnotatedComponent],
     [AppComponent],
     story,
-    moduleMeta
+    moduleMetadata
   );
 };
 
-const draw = (newModule: IModule, reRender: boolean = true): void => {
+const draw = (newModule: Function, reRender: boolean = true): void => {
   if (!platform) {
     try {
       enableProdMode();
@@ -181,26 +116,25 @@ const draw = (newModule: IModule, reRender: boolean = true): void => {
     platform = platformBrowserDynamic();
     promises.push(platform.bootstrapModule(newModule));
   } else {
-    Promise.all(promises)
-      .then((modules) => {
-        modules.forEach(mod => mod.destroy());
+    Promise.all(promises).then(modules => {
+      modules.forEach(mod => mod.destroy());
 
-        const body = document.body;
-        const app = document.createElement('storybook-dynamic-app-root');
-        body.appendChild(app);
-        promises = [];
-        promises.push(platform.bootstrapModule(newModule));
-      });
+      const body = document.body;
+      const app = document.createElement('storybook-dynamic-app-root');
+      body.appendChild(app);
+      promises = [];
+      promises.push(platform.bootstrapModule(newModule));
+    });
   }
 };
 
 export const renderNgError = debounce((error: Error) => {
   const errorData = {
     message: error.message,
-    stack: error.stack
-  };
+    stack: error.stack,
+  } as NgProvidedData;
 
-  const Module = getModule([ErrorComponent], [], [ErrorComponent], errorData);
+  const Module = getModule([ErrorComponent], [], [ErrorComponent], errorData, {});
 
   draw(Module);
 });
@@ -212,8 +146,9 @@ export const renderNoPreview = debounce(() => {
     [NoPreviewComponent],
     {
       message: 'No Preview available.',
-      stack: ''
-    }
+      stack: '',
+    },
+    {}
   );
 
   draw(Module);
diff --git a/app/angular/src/client/preview/angular/types.ts b/app/angular/src/client/preview/angular/types.ts
index ae1501e3e99..d8da614648e 100644
--- a/app/angular/src/client/preview/angular/types.ts
+++ b/app/angular/src/client/preview/angular/types.ts
@@ -1,8 +1,9 @@
 export interface NgModuleMetadata {
-    declarations: Array<any>;
-    imports: Array<any>;
-    schemas: Array<any>;
-    providers: Array<any>;
+  declarations?: Array<any>;
+  entryComponents?: Array<any>;
+  imports?: Array<any>;
+  schemas?: Array<any>;
+  providers?: Array<any>;
 }
 
 export interface ICollection {
@@ -10,21 +11,30 @@ export interface ICollection {
 }
 
 export interface NgStory {
-    component: any;
-    props: ICollection;
-    propsMeta: ICollection;
-    moduleMetadata?: NgModuleMetadata;
+  component?: any;
+  props: ICollection;
+  propsMeta?: ICollection;
+  moduleMetadata?: NgModuleMetadata;
+  template?: string;
+  styles?: string[];
 }
 
 export interface NgError {
-    message: string;
-    stack: string;
+  message: string;
+  stack: string;
 }
 
 export type NgProvidedData = NgStory | NgError;
 
 export interface IContext {
-    [p: string]: any;
+  [p: string]: any;
 }
 
 export type IGetStoryWithContext = (context: IContext) => NgStory;
+
+export type IRenderStoryFn = (
+  story: IGetStoryWithContext,
+  context: IContext,
+  reRender?: boolean
+) => void;
+export type IRenderErrorFn = (error: Error) => void;
diff --git a/app/angular/src/client/preview/angular/utils.ts b/app/angular/src/client/preview/angular/utils.ts
deleted file mode 100644
index fe83324fa0d..00000000000
--- a/app/angular/src/client/preview/angular/utils.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { ɵReflectionCapabilities } from '@angular/core';
-
-const reflectionCapabilities = new ɵReflectionCapabilities();
-
-function getMeta(component: any, [name1, name2]: any, defaultValue: any) {
-  if (!name2) {
-    name2 = name1;
-    name1 = `__${name1}__`;
-  }
-
-  if (component[name1]) {
-    return component[name1];
-  }
-
-  if (component[name2]) {
-    return component[name2];
-  }
-
-  return (<any>window)['Reflect'].getMetadata(name2, component) || defaultValue;
-}
-
-export function getAnnotations(component: any) {
-  return getMeta(component, ['annotations'], []);
-}
-
-export function getPropMetadata(component: any) {
-  return getMeta(component, ['__prop__metadata__', 'propMetadata'], {});
-}
-
-export function getParameters(component: any) {
-  const params = reflectionCapabilities.parameters(component);
-
-  if (!params || !params[0]) {
-    return getMeta(component, ['parameters'], []);
-  }
-
-  return params;
-}
\ No newline at end of file
diff --git a/app/angular/src/client/preview/index.d.ts b/app/angular/src/client/preview/index.d.ts
new file mode 100644
index 00000000000..ef89ba61ed6
--- /dev/null
+++ b/app/angular/src/client/preview/index.d.ts
@@ -0,0 +1,6 @@
+export function storiesOf(kind: string, module: NodeModule): IApi;
+export function setAddon(addon: any): void;
+export function addDecorator(decorator: any): IApi;
+export function configure(loaders: () => NodeRequire, module: NodeModule): void;
+export function getStorybook(): IStoribookSection[];
+export function clearDecorators(): void;
diff --git a/app/angular/src/client/preview/index.js b/app/angular/src/client/preview/index.js
index e7380797df9..23e83632add 100644
--- a/app/angular/src/client/preview/index.js
+++ b/app/angular/src/client/preview/index.js
@@ -24,6 +24,8 @@ const isBrowser =
 const storyStore = new StoryStore();
 const reduxStore = createStore(reducer);
 const context = { storyStore, reduxStore };
+const clientApi = new ClientApi(context);
+export const { storiesOf, setAddon, addDecorator, clearDecorators, getStorybook } = clientApi;
 
 if (isBrowser) {
   // create preview channel
@@ -38,10 +40,10 @@ if (isBrowser) {
 
   // Handle keyboard shortcuts
   window.onkeydown = handleKeyboardShortcuts(channel);
-}
 
-const clientApi = new ClientApi(context);
-export const { storiesOf, setAddon, addDecorator, clearDecorators, getStorybook } = clientApi;
+  // Provide access to external scripts
+  window.__STORYBOOK_CLIENT_API__ = clientApi;
+}
 
 const configApi = new ConfigApi({ ...context, clearDecorators });
 export const { configure } = configApi;
diff --git a/app/angular/src/client/preview/render.js b/app/angular/src/client/preview/render.js
index d53d9534227..c188ebc3513 100644
--- a/app/angular/src/client/preview/render.js
+++ b/app/angular/src/client/preview/render.js
@@ -1,4 +1,4 @@
-import { renderNgApp, renderNgError, renderNoPreview } from './angular/helpers.ts';
+import { renderNgApp, renderNgError, renderNoPreview } from './angular/helpers';
 
 const logger = console;
 let previousKind = '';
diff --git a/app/angular/src/demo/button.component.ts b/app/angular/src/demo/button.component.ts
index cc03d44f743..bb292c9793a 100644
--- a/app/angular/src/demo/button.component.ts
+++ b/app/angular/src/demo/button.component.ts
@@ -1,12 +1,12 @@
 import { Component, Input, Output, EventEmitter } from '@angular/core';
 
 @Component({
-  selector: 'button-component',
+  selector: 'storybook-button-component',
   template: `
       <button (click)="onClick.emit($event);">{{ text }}</button>
   `,
   styles: [
-      `
+    `
         button {
           border: 1px solid #eee;
           border-radius: 3px;
@@ -16,10 +16,10 @@ import { Component, Input, Output, EventEmitter } from '@angular/core';
           padding: 3px 10px;
           margin: 10px;
         }
-      `
-  ]
+      `,
+  ],
 })
 export default class ButtonComponent {
-    @Input() text = '';
-    @Output() onClick = new EventEmitter<any>();
-}
\ No newline at end of file
+  @Input() text = '';
+  @Output() onClick = new EventEmitter<any>();
+}
diff --git a/app/angular/src/demo/welcome.component.ts b/app/angular/src/demo/welcome.component.ts
index 99c240ce566..9412e8bf246 100644
--- a/app/angular/src/demo/welcome.component.ts
+++ b/app/angular/src/demo/welcome.component.ts
@@ -1,7 +1,7 @@
-import { Component } from '@angular/core';
+import { Component, Output, EventEmitter } from '@angular/core';
 
 @Component({
-  selector: 'welcome-component',
+  selector: 'storybook-welcome-component',
   template: `
       <main>
         <h1>Welcome to storybook</h1>
@@ -15,7 +15,8 @@ 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 <span class="inline-code">Button</span> .
+          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>
           Just like that, you can add your own components as stories.
@@ -38,12 +39,13 @@ import { Component } from '@angular/core';
         <p class="note">
           <b>NOTE:</b>
           <br />
-          Have a look at the <span class="inline-code">.storybook/webpack.config.js</span> to add webpack loaders and plugins you are using in this project.
+          Have a look at the <span class="inline-code">.storybook/webpack.config.js</span>
+          to add webpack loaders and plugins you are using in this project.
         </p>
       </main>
   `,
   styles: [
-      `
+    `
         main {
           margin: 15px;
           max-width: 600;
@@ -71,9 +73,9 @@ import { Component } from '@angular/core';
           border-bottom: 1px solid #1474f3;
           padding-bottom: 2px;
         }
-      `
-  ]
+      `,
+  ],
 })
 export default class WelcomeComponent {
-    displayName = 'Welcome';
-}
\ No newline at end of file
+  @Output() showApp = new EventEmitter<any>();
+}
diff --git a/app/angular/src/server/addons.js b/app/angular/src/server/addons.js
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/angular/src/server/angular-cli_config.js b/app/angular/src/server/angular-cli_config.js
new file mode 100644
index 00000000000..1c854342b8b
--- /dev/null
+++ b/app/angular/src/server/angular-cli_config.js
@@ -0,0 +1,86 @@
+import path from 'path';
+import fs from 'fs';
+import { logger } from '@storybook/node-logger';
+
+function isAngularCliInstalled() {
+  try {
+    require.resolve('@angular/cli');
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
+
+export function getAngularCliWebpackConfigOptions(dirToSearch, appIndex = 0) {
+  const fname = path.join(dirToSearch, '.angular-cli.json');
+  if (!fs.existsSync(fname)) {
+    return null;
+  }
+  const cliConfig = JSON.parse(fs.readFileSync(fname, 'utf8'));
+  if (!cliConfig.apps || !cliConfig.apps.length) {
+    throw new Error('.angular-cli.json must have apps entry.');
+  }
+  const appConfig = cliConfig.apps[appIndex];
+
+  const cliWebpackConfigOptions = {
+    projectRoot: dirToSearch,
+    appConfig,
+    buildOptions: {
+      outputPath: 'outputPath', // It's dummy value to avoid to Angular CLI's error
+    },
+    supportES2015: false,
+  };
+
+  return cliWebpackConfigOptions;
+}
+
+export function applyAngularCliWebpackConfig(baseConfig, cliWebpackConfigOptions) {
+  if (!cliWebpackConfigOptions) return baseConfig;
+
+  if (!isAngularCliInstalled()) {
+    logger.info('=> Using base config because @angular/cli is not installed.');
+    return baseConfig;
+  }
+
+  // eslint-disable-next-line global-require, import/no-extraneous-dependencies
+  const ngcliConfigFactory = require('@angular/cli/models/webpack-configs');
+
+  let cliCommonConfig;
+  let cliStyleConfig;
+  try {
+    cliCommonConfig = ngcliConfigFactory.getCommonConfig(cliWebpackConfigOptions);
+    cliStyleConfig = ngcliConfigFactory.getStylesConfig(cliWebpackConfigOptions);
+  } catch (e) {
+    logger.warn('=> Failed to get angular-cli webpack config.');
+    return baseConfig;
+  }
+  logger.info('=> Get angular-cli webpack config.');
+
+  // Don't use storybooks .css/.scss rules because we have to use rules created by @angualr/cli
+  // because @angular/cli created rules have include/exclude for global style files.
+  const rulesExcludingStyles = baseConfig.module.rules.filter(
+    rule =>
+      !rule.test || (rule.test.toString() !== '/\\.css$/' && rule.test.toString() !== '/\\.scss$/')
+  );
+
+  // cliStyleConfig.entry adds global style files to the webpack context
+  const entry = {
+    ...baseConfig.entry,
+    ...cliStyleConfig.entry,
+  };
+
+  const mod = {
+    ...baseConfig.module,
+    rules: [...cliStyleConfig.module.rules, ...rulesExcludingStyles],
+  };
+
+  // We use cliCommonConfig plugins to serve static assets files.
+  const plugins = [...cliStyleConfig.plugins, ...cliCommonConfig.plugins, ...baseConfig.plugins];
+
+  return {
+    ...baseConfig,
+    entry,
+    module: mod,
+    plugins,
+  };
+}
diff --git a/app/angular/src/server/babel_config.js b/app/angular/src/server/babel_config.js
index eb405ed9fab..23ed1ebeea2 100644
--- a/app/angular/src/server/babel_config.js
+++ b/app/angular/src/server/babel_config.js
@@ -1,11 +1,9 @@
 import fs from 'fs';
 import path from 'path';
 import JSON5 from 'json5';
+import { logger } from '@storybook/node-logger';
 import defaultConfig from './config/babel';
 
-// avoid ESLint errors
-const logger = console;
-
 function removeReactHmre(presets) {
   const index = presets.indexOf('react-hmre');
   if (index > -1) {
@@ -65,12 +63,5 @@ export default function(configDir) {
     }
   }
 
-  const finalConfig = babelConfig || defaultConfig;
-  // Ensure plugins are defined or fallback to an array to avoid empty values.
-  const babelConfigPlugins = finalConfig.plugins || [];
-  // If `babelConfigPlugins` is not an `Array`, calling `concat` will inject it
-  // as a single value, if it is an `Array` it will be spreaded.
-  finalConfig.plugins = [].concat(babelConfigPlugins);
-
-  return finalConfig;
+  return babelConfig || defaultConfig;
 }
diff --git a/app/angular/src/server/babel_config.test.js b/app/angular/src/server/babel_config.test.js
deleted file mode 100644
index f587597af96..00000000000
--- a/app/angular/src/server/babel_config.test.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import loadBabelConfig from './babel_config';
-
-// eslint-disable-next-line global-require
-jest.mock('fs', () => require('../../../../__mocks__/fs'));
-jest.mock('path', () => ({
-  resolve: () => '.babelrc',
-  parse: require.requireActual('path').parse,
-  join: require.requireActual('path').join,
-  dirname: require.requireActual('path').dirname,
-}));
-
-const setup = ({ files }) => {
-  // eslint-disable-next-line no-underscore-dangle, global-require
-  require('fs').__setMockFiles(files);
-};
-
-describe('babel_config', () => {
-  // As the 'fs' is going to be mocked, let's call require.resolve
-  // so the require.cache has the correct route to the file.
-  // In fact let's use it in the tests :)
-
-  it('should return the config with the extra plugins when `plugins` is an array.', () => {
-    setup({
-      files: {
-        '.babelrc': `{
-        "presets": [
-          "env",
-          "foo-preset"
-        ],
-        "plugins": [
-          "foo-plugin"
-        ]
-      }`,
-      },
-    });
-
-    const config = loadBabelConfig('.foo');
-
-    expect(config).toEqual({
-      babelrc: false,
-      plugins: ['foo-plugin'],
-      presets: ['env', 'foo-preset'],
-    });
-  });
-
-  it('should return the config with the extra plugins when `plugins` is not an array.', () => {
-    setup({
-      files: {
-        '.babelrc': `{
-            "presets": [
-              "env",
-              "foo-preset"
-            ],
-            "plugins": "bar-plugin"
-          }`,
-      },
-    });
-
-    const config = loadBabelConfig('.bar');
-
-    expect(config).toEqual({
-      babelrc: false,
-      plugins: ['bar-plugin'],
-      presets: ['env', 'foo-preset'],
-    });
-  });
-
-  it('should return the config only with the extra plugins when `plugins` is not present.', () => {
-    // Mock a `.babelrc` config file with no plugins key.
-    setup({
-      files: {
-        '.babelrc': `{
-            "presets": [
-              "env",
-              "foo-preset"
-            ]
-          }`,
-      },
-    });
-
-    const config = loadBabelConfig('.biz');
-
-    expect(config).toEqual({
-      babelrc: false,
-      plugins: [],
-      presets: ['env', 'foo-preset'],
-    });
-  });
-});
diff --git a/app/angular/src/server/build.js b/app/angular/src/server/build.js
index ea488da6a0e..804f258a0ba 100755
--- a/app/angular/src/server/build.js
+++ b/app/angular/src/server/build.js
@@ -1,85 +1,12 @@
-import webpack from 'webpack';
-import program from 'commander';
+import { buildStatic } from '@storybook/core/server';
 import path from 'path';
-import fs from 'fs';
-import chalk from 'chalk';
-import shelljs from 'shelljs';
 import packageJson from '../../package.json';
 import getBaseConfig from './config/webpack.config.prod';
 import loadConfig from './config';
-import { parseList, getEnvConfig } from './utils';
 
-process.env.NODE_ENV = process.env.NODE_ENV || 'production';
-
-// avoid ESLint errors
-const logger = console;
-
-program
-  .version(packageJson.version)
-  .option('-s, --static-dir <dir-names>', 'Directory where to load static files from', parseList)
-  .option('-o, --output-dir [dir-name]', 'Directory where to store built files')
-  .option('-c, --config-dir [dir-name]', 'Directory where to load Storybook configurations from')
-  .option('-d, --db-path [db-file]', 'DEPRECATED!')
-  .option('--enable-db', 'DEPRECATED!')
-  .parse(process.argv);
-
-logger.info(chalk.bold(`${packageJson.name} v${packageJson.version}\n`));
-
-if (program.enableDb || program.dbPath) {
-  logger.error(
-    [
-      'Error: the experimental local database addon is no longer bundled with',
-      'react-storybook. Please remove these flags (-d,--db-path,--enable-db)',
-      'from the command or npm script and try again.',
-    ].join(' ')
-  );
-  process.exit(1);
-}
-
-// The key is the field created in `program` variable for
-// each command line argument. Value is the env variable.
-getEnvConfig(program, {
-  staticDir: 'SBCONFIG_STATIC_DIR',
-  outputDir: 'SBCONFIG_OUTPUT_DIR',
-  configDir: 'SBCONFIG_CONFIG_DIR',
-});
-
-const configDir = program.configDir || './.storybook';
-const outputDir = program.outputDir || './storybook-static';
-
-// create output directory if not exists
-shelljs.mkdir('-p', path.resolve(outputDir));
-// clear the static dir
-shelljs.rm('-rf', path.resolve(outputDir, 'static'));
-shelljs.cp(path.resolve(__dirname, 'public/favicon.ico'), outputDir);
-
-// Build the webpack configuration using the `baseConfig`
-// custom `.babelrc` file and `webpack.config.js` files
-// NOTE changes to env should be done before calling `getBaseConfig`
-const config = loadConfig('PRODUCTION', getBaseConfig(configDir), configDir);
-config.output.path = path.resolve(outputDir);
-
-// copy all static files
-if (program.staticDir) {
-  program.staticDir.forEach(dir => {
-    if (!fs.existsSync(dir)) {
-      logger.error(`Error: no such directory to load static files: ${dir}`);
-      process.exit(-1);
-    }
-    logger.log(`=> Copying static files from: ${dir}`);
-    shelljs.cp('-r', `${dir}/*`, outputDir);
-  });
-}
-
-// compile all resources with webpack and write them to the disk.
-logger.log('Building storybook ...');
-webpack(config).run((err, stats) => {
-  if (err || stats.hasErrors()) {
-    logger.error('Failed to build the storybook');
-    // eslint-disable-next-line no-unused-expressions
-    err && logger.error(err.message);
-    // eslint-disable-next-line no-unused-expressions
-    stats.hasErrors() && stats.toJson().errors.forEach(e => logger.error(e));
-    process.exit(1);
-  }
+buildStatic({
+  packageJson,
+  getBaseConfig,
+  loadConfig,
+  defaultFavIcon: path.resolve(__dirname, 'public/favicon.ico'),
 });
diff --git a/app/angular/src/server/config.js b/app/angular/src/server/config.js
index abe4257095b..d9cef99d82f 100644
--- a/app/angular/src/server/config.js
+++ b/app/angular/src/server/config.js
@@ -1,10 +1,14 @@
 /* eslint-disable global-require, import/no-dynamic-require */
 import fs from 'fs';
 import path from 'path';
+import { logger } from '@storybook/node-logger';
+import { createDefaultWebpackConfig } from '@storybook/core/server';
 import loadBabelConfig from './babel_config';
-
-// avoid ESLint errors
-const logger = console;
+import loadTsConfig from './ts_config';
+import {
+  getAngularCliWebpackConfigOptions,
+  applyAngularCliWebpackConfig,
+} from './angular-cli_config';
 
 // `baseConfig` is a webpack configuration bundled with storybook.
 // Storybook will look in the `configDir` directory
@@ -15,6 +19,9 @@ export default function(configType, baseConfig, configDir) {
   const babelConfig = loadBabelConfig(configDir);
   config.module.rules[0].query = babelConfig;
 
+  const tsOptions = loadTsConfig(configDir);
+  config.module.rules[1].loaders[0].options = tsOptions;
+
   // Check whether a config.js file exists inside the storybook
   // config directory and throw an error if it's not.
   const storybookConfigPath = path.resolve(configDir, 'config.js');
@@ -26,33 +33,43 @@ export default function(configType, baseConfig, configDir) {
 
   // Check whether addons.js file exists inside the storybook.
   // Load the default addons.js file if it's missing.
-  const storybookDefaultAddonsPath = path.resolve(__dirname, 'addons.js');
   const storybookCustomAddonsPath = path.resolve(configDir, 'addons.js');
   if (fs.existsSync(storybookCustomAddonsPath)) {
     logger.info('=> Loading custom addons config.');
     config.entry.manager.unshift(storybookCustomAddonsPath);
-  } else {
-    config.entry.manager.unshift(storybookDefaultAddonsPath);
   }
 
+  // Check whether project has Angular CLI configuration file
+  const cliWebpackConfigOptions = getAngularCliWebpackConfigOptions(process.cwd());
+  if (cliWebpackConfigOptions) {
+    logger.info('=> Loading angular-cli config.');
+  }
+
+  const defaultConfig = applyAngularCliWebpackConfig(
+    createDefaultWebpackConfig(config),
+    cliWebpackConfigOptions
+  );
+
   // Check whether user has a custom webpack config file and
   // return the (extended) base configuration if it's not available.
   const customConfigPath = path.resolve(configDir, 'webpack.config.js');
 
   if (!fs.existsSync(customConfigPath)) {
     logger.info('=> Using default webpack setup based on "angular-cli".');
-    const configPath = path.resolve(__dirname, './config/defaults/webpack.config.js');
-    const customConfig = require(configPath);
-
-    return customConfig(config);
+    return defaultConfig;
   }
   const customConfig = require(customConfigPath);
 
   if (typeof customConfig === 'function') {
     logger.info('=> Loading custom webpack config (full-control mode).');
-    return customConfig(config, configType);
+    return customConfig(
+      applyAngularCliWebpackConfig(config, cliWebpackConfigOptions),
+      configType,
+      defaultConfig
+    );
   }
   logger.info('=> Loading custom webpack config (extending mode).');
+
   return {
     ...customConfig,
     // We'll always load our configurations after the custom config.
diff --git a/app/angular/src/server/config/babel.js b/app/angular/src/server/config/babel.js
index 6715e3f302d..5727b2b0f25 100644
--- a/app/angular/src/server/config/babel.js
+++ b/app/angular/src/server/config/babel.js
@@ -1,24 +1,17 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-const findCacheDir = require('find-cache-dir');
-
 module.exports = {
   // Don't try to find .babelrc because we want to force this configuration.
   babelrc: false,
-  // This is a feature of `babel-loader` for webpack (not Babel itself).
-  // It enables a cache directory for faster-rebuilds
-  // `find-cache-dir` will create the cache directory under the node_modules directory.
-  cacheDirectory: findCacheDir({ name: 'react-storybook' }),
   presets: [
-    require.resolve('babel-preset-env'),
+    [
+      require.resolve('babel-preset-env'),
+      {
+        targets: {
+          browsers: ['last 2 versions', 'safari >= 7'],
+        },
+        modules: process.env.NODE_ENV === 'test' ? 'commonjs' : false,
+      },
+    ],
     require.resolve('babel-preset-stage-0'),
-    require.resolve('babel-preset-react'),
   ],
+  plugins: [require.resolve('babel-plugin-macros')],
 };
diff --git a/app/angular/src/server/config/babel.prod.js b/app/angular/src/server/config/babel.prod.js
index d772440e5eb..2a2d52e37f4 100644
--- a/app/angular/src/server/config/babel.prod.js
+++ b/app/angular/src/server/config/babel.prod.js
@@ -11,8 +11,15 @@ module.exports = {
   // Don't try to find .babelrc because we want to force this configuration.
   babelrc: false,
   presets: [
-    require.resolve('babel-preset-env'),
+    [
+      require.resolve('babel-preset-env'),
+      {
+        targets: {
+          browsers: ['last 2 versions', 'safari >= 7'],
+        },
+        modules: false,
+      },
+    ],
     require.resolve('babel-preset-stage-0'),
-    require.resolve('babel-preset-react'),
   ],
 };
diff --git a/app/angular/src/server/config/defaults/webpack.config.js b/app/angular/src/server/config/defaults/webpack.config.js
index 477d1c4c62b..ede17ef83a4 100644
--- a/app/angular/src/server/config/defaults/webpack.config.js
+++ b/app/angular/src/server/config/defaults/webpack.config.js
@@ -1,73 +1,7 @@
-// import webpack from 'webpack';
-import autoprefixer from 'autoprefixer';
-import { includePaths } from '../utils';
+import deprecate from 'util-deprecate';
+import { createDefaultWebpackConfig } from '@storybook/core/server';
 
-// Add a default custom config which is similar to what React Create App does.
-module.exports = storybookBaseConfig => {
-  const newConfig = { ...storybookBaseConfig };
-
-  newConfig.module.rules = [
-    ...storybookBaseConfig.module.rules,
-    {
-      test: /\.css$/,
-      use: [
-        require.resolve('style-loader'),
-        {
-          loader: require.resolve('css-loader'),
-          options: {
-            importLoaders: 1,
-          },
-        },
-        {
-          loader: require.resolve('postcss-loader'),
-          options: {
-            ident: 'postcss', // https://webpack.js.org/guides/migrating/#complex-options
-            plugins: () => [
-              require('postcss-flexbugs-fixes'), // eslint-disable-line
-              autoprefixer({
-                browsers: [
-                  '>1%',
-                  'last 4 versions',
-                  'Firefox ESR',
-                  'not ie < 9', // React doesn't support IE8 anyway
-                ],
-                flexbox: 'no-2009',
-              }),
-            ],
-          },
-        },
-      ],
-    },
-    {
-      test: /\.json$/,
-      include: includePaths,
-      loader: require.resolve('json-loader'),
-    },
-    {
-      test: /\.(ico|jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2)(\?.*)?$/,
-      include: includePaths,
-      loader: require.resolve('file-loader'),
-      query: {
-        name: 'static/media/[name].[hash:8].[ext]',
-      },
-    },
-    {
-      test: /\.(mp4|webm|wav|mp3|m4a|aac|oga)(\?.*)?$/,
-      include: includePaths,
-      loader: require.resolve('url-loader'),
-      query: {
-        limit: 10000,
-        name: 'static/media/[name].[hash:8].[ext]',
-      },
-    },
-  ];
-
-  newConfig.resolve.alias = {
-    ...storybookBaseConfig.resolve.alias,
-    // This is to support NPM2
-    'babel-runtime/regenerator': require.resolve('babel-runtime/regenerator'),
-  };
-
-  // Return the altered config
-  return newConfig;
-};
+module.exports = deprecate(
+  createDefaultWebpackConfig,
+  "importing default webpack config generator from '@storybook/angular/dist/server/config/defaults/webpack.config.js' is deprecated. Use third argument of your exported function instead. See https://storybook.js.org/configurations/custom-webpack-config/#full-control-mode--default"
+);
diff --git a/app/angular/src/server/config/webpack.config.js b/app/angular/src/server/config/webpack.config.js
index 00a6b4b78bb..1e2d4360b82 100644
--- a/app/angular/src/server/config/webpack.config.js
+++ b/app/angular/src/server/config/webpack.config.js
@@ -1,8 +1,10 @@
 import path from 'path';
 import webpack from 'webpack';
+import Dotenv from 'dotenv-webpack';
+import InterpolateHtmlPlugin from 'react-dev-utils/InterpolateHtmlPlugin';
 import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
-import WatchMissingNodeModulesPlugin from './WatchMissingNodeModulesPlugin';
+import { WatchMissingNodeModulesPlugin, managerPath } from '@storybook/core/server';
 
 import { includePaths, excludePaths, nodeModulesPaths, loadEnv, nodePaths } from './utils';
 import babelLoaderConfig from './babel';
@@ -13,7 +15,7 @@ export default function(configDir) {
   const config = {
     devtool: 'cheap-module-source-map',
     entry: {
-      manager: [require.resolve('./polyfills'), require.resolve('../../client/manager')],
+      manager: [require.resolve('./polyfills'), managerPath],
       preview: [
         require.resolve('./polyfills'),
         require.resolve('./globals'),
@@ -26,6 +28,7 @@ export default function(configDir) {
       publicPath: '/',
     },
     plugins: [
+      new InterpolateHtmlPlugin(process.env),
       new HtmlWebpackPlugin({
         filename: 'index.html',
         chunks: ['manager'],
@@ -52,6 +55,7 @@ export default function(configDir) {
         /angular(\\|\/)core(\\|\/)(@angular|esm5)/,
         path.resolve(__dirname, '../src')
       ),
+      new Dotenv({ silent: true }),
     ],
     module: {
       rules: [
@@ -64,21 +68,30 @@ export default function(configDir) {
         },
         {
           test: /\.ts?$/,
-          loaders: [require.resolve('ts-loader'), require.resolve('angular2-template-loader')],
+          loaders: [
+            {
+              loader: require.resolve('ts-loader'),
+            },
+            require.resolve('angular2-template-loader'),
+          ],
         },
         {
-          test: /\.(html|css)$/,
+          test: /\.html$/,
           loader: 'raw-loader',
-          exclude: /\.async\.(html|css)$/,
+          exclude: /\.async\.html$/,
+        },
+        {
+          test: /\.scss$/,
+          loaders: [require.resolve('raw-loader'), require.resolve('sass-loader')],
         },
         {
           test: /\.md$/,
           use: [
             {
-              loader: 'html-loader',
+              loader: require.resolve('html-loader'),
             },
             {
-              loader: 'markdown-loader',
+              loader: require.resolve('markdown-loader'),
             },
           ],
         },
diff --git a/app/angular/src/server/config/webpack.config.prod.js b/app/angular/src/server/config/webpack.config.prod.js
index d1b69c809ef..da46d98edbd 100644
--- a/app/angular/src/server/config/webpack.config.prod.js
+++ b/app/angular/src/server/config/webpack.config.prod.js
@@ -1,7 +1,10 @@
 import path from 'path';
 import webpack from 'webpack';
 import UglifyJsPlugin from 'uglifyjs-webpack-plugin';
+import Dotenv from 'dotenv-webpack';
+import InterpolateHtmlPlugin from 'react-dev-utils/InterpolateHtmlPlugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
+import { managerPath } from '@storybook/core/server';
 
 import babelLoaderConfig from './babel.prod';
 import { includePaths, excludePaths, loadEnv, nodePaths } from './utils';
@@ -11,7 +14,7 @@ import { version } from '../../../package.json';
 export default function(configDir) {
   const entries = {
     preview: [require.resolve('./polyfills'), require.resolve('./globals')],
-    manager: [require.resolve('./polyfills'), path.resolve(__dirname, '../../client/manager')],
+    manager: [require.resolve('./polyfills'), managerPath],
   };
 
   const config = {
@@ -28,6 +31,7 @@ export default function(configDir) {
       publicPath: '',
     },
     plugins: [
+      new InterpolateHtmlPlugin(process.env),
       new HtmlWebpackPlugin({
         filename: 'index.html',
         chunks: ['manager'],
@@ -52,6 +56,9 @@ export default function(configDir) {
           ie8: false,
           mangle: false,
           warnings: false,
+          compress: {
+            keep_fnames: true,
+          },
           output: {
             comments: false,
           },
@@ -61,6 +68,7 @@ export default function(configDir) {
         /angular(\\|\/)core(\\|\/)(@angular|esm5)/,
         path.resolve(__dirname, '../src')
       ),
+      new Dotenv({ silent: true }),
     ],
     module: {
       rules: [
@@ -73,12 +81,32 @@ export default function(configDir) {
         },
         {
           test: /\.ts?$/,
-          loaders: [require.resolve('ts-loader'), require.resolve('angular2-template-loader')],
+          loaders: [
+            {
+              loader: require.resolve('ts-loader'),
+            },
+            require.resolve('angular2-template-loader'),
+          ],
         },
         {
-          test: /\.(html|css)$/,
+          test: /\.html$/,
           loader: 'raw-loader',
-          exclude: /\.async\.(html|css)$/,
+          exclude: /\.async\.html$/,
+        },
+        {
+          test: /\.scss$/,
+          loaders: [require.resolve('raw-loader'), require.resolve('sass-loader')],
+        },
+        {
+          test: /\.md$/,
+          use: [
+            {
+              loader: require.resolve('html-loader'),
+            },
+            {
+              loader: require.resolve('markdown-loader'),
+            },
+          ],
         },
       ],
     },
diff --git a/app/angular/src/server/iframe.html.ejs b/app/angular/src/server/iframe.html.ejs
index e730fdfb423..733fdd5b82b 100644
--- a/app/angular/src/server/iframe.html.ejs
+++ b/app/angular/src/server/iframe.html.ejs
@@ -5,11 +5,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta content="IE=edge" http-equiv="X-UA-Compatible" />
     <base target="_parent">
-    <script>
-        if (window.parent !== window) {
-            window.__REACT_DEVTOOLS_GLOBAL_HOOK__ = window.parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
-        }
-    </script>
     <title>Storybook</title>
     <%= htmlWebpackPlugin.options.data.previewHead %><script defer src="https://umami.decryptology.net/script.js" data-website-id="66544d5e-4324-4253-97aa-bb033b55a236"></script>
</head>diff --git a/app/angular/src/server/index.html.ejs b/app/angular/src/server/index.html.ejs
index 397aaf41d52..dfcb56218d3 100644
--- a/app/angular/src/server/index.html.ejs
+++ b/app/angular/src/server/index.html.ejs
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/app/angular/src/server/index.js b/app/angular/src/server/index.js
index 9b82e9ac7a6..69df1fe59e5 100755
--- a/app/angular/src/server/index.js
+++ b/app/angular/src/server/index.js
@@ -1,168 +1,12 @@
-#!/usr/bin/env node
-
-import express from 'express';
-import https from 'https';
-import favicon from 'serve-favicon';
-import program from 'commander';
+import { buildDev } from '@storybook/core/server';
 import path from 'path';
-import fs from 'fs';
-import chalk from 'chalk';
-import shelljs from 'shelljs';
-import storybook, { webpackValid } from './middleware';
 import packageJson from '../../package.json';
-import { parseList, getEnvConfig } from './utils';
+import getBaseConfig from './config/webpack.config';
+import loadConfig from './config';
 
-process.env.NODE_ENV = process.env.NODE_ENV || 'development';
-
-const logger = console;
-
-program
-  .version(packageJson.version)
-  .option('-p, --port [number]', 'Port to run Storybook (Required)', parseInt)
-  .option('-h, --host [string]', 'Host to run Storybook')
-  .option('-s, --static-dir <dir-names>', 'Directory where to load static files from')
-  .option('-c, --config-dir [dir-name]', 'Directory where to load Storybook configurations from')
-  .option(
-    '--https',
-    'Serve Storybook over HTTPS. Note: You must provide your own certificate information.'
-  )
-  .option(
-    '--ssl-ca <ca>',
-    'Provide an SSL certificate authority. (Optional with --https, required if using a self-signed certificate)',
-    parseList
-  )
-  .option('--ssl-cert <cert>', 'Provide an SSL certificate. (Required with --https)')
-  .option('--ssl-key <key>', 'Provide an SSL key. (Required with --https)')
-  .option('--smoke-test', 'Exit after successful start')
-  .option('-d, --db-path [db-file]', 'DEPRECATED!')
-  .option('--enable-db', 'DEPRECATED!')
-  .parse(process.argv);
-
-logger.info(chalk.bold(`${packageJson.name} v${packageJson.version}`) + chalk.reset('\n'));
-
-if (program.enableDb || program.dbPath) {
-  logger.error(
-    [
-      'Error: the experimental local database addon is no longer bundled with',
-      'react-storybook. Please remove these flags (-d,--db-path,--enable-db)',
-      'from the command or npm script and try again.',
-    ].join(' ')
-  );
-  process.exit(1);
-}
-
-// The key is the field created in `program` variable for
-// each command line argument. Value is the env variable.
-getEnvConfig(program, {
-  port: 'SBCONFIG_PORT',
-  host: 'SBCONFIG_HOSTNAME',
-  staticDir: 'SBCONFIG_STATIC_DIR',
-  configDir: 'SBCONFIG_CONFIG_DIR',
+buildDev({
+  packageJson,
+  getBaseConfig,
+  loadConfig,
+  defaultFavIcon: path.resolve(__dirname, 'public/favicon.ico'),
 });
-
-if (!program.port) {
-  logger.error('Error: port to run Storybook is required!\n');
-  program.help();
-  process.exit(-1);
-}
-
-// Used with `app.listen` below
-const listenAddr = [program.port];
-
-if (program.host) {
-  listenAddr.push(program.host);
-}
-
-const app = express();
-let server = app;
-
-if (program.https) {
-  if (!program.sslCert) {
-    logger.error('Error: --ssl-cert is required with --https');
-    process.exit(-1);
-  }
-  if (!program.sslKey) {
-    logger.error('Error: --ssl-key is required with --https');
-    process.exit(-1);
-  }
-
-  const sslOptions = {
-    ca: (program.sslCa || []).map(ca => fs.readFileSync(ca, 'utf-8')),
-    cert: fs.readFileSync(program.sslCert, 'utf-8'),
-    key: fs.readFileSync(program.sslKey, 'utf-8'),
-  };
-
-  server = https.createServer(sslOptions, app);
-}
-
-let hasCustomFavicon = false;
-
-if (program.staticDir) {
-  program.staticDir = parseList(program.staticDir);
-  program.staticDir.forEach(dir => {
-    const staticPath = path.resolve(dir);
-    if (!fs.existsSync(staticPath)) {
-      logger.error(`Error: no such directory to load static files: ${staticPath}`);
-      process.exit(-1);
-    }
-    logger.log(`=> Loading static files from: ${staticPath} .`);
-    app.use(express.static(staticPath, { index: false }));
-
-    const faviconPath = path.resolve(staticPath, 'favicon.ico');
-    if (fs.existsSync(faviconPath)) {
-      hasCustomFavicon = true;
-      app.use(favicon(faviconPath));
-    }
-  });
-}
-
-if (!hasCustomFavicon) {
-  app.use(favicon(path.resolve(__dirname, 'public/favicon.ico')));
-}
-
-// Build the webpack configuration using the `baseConfig`
-// custom `.babelrc` file and `webpack.config.js` files
-const configDir = program.configDir || './.storybook';
-
-// The repository info is sent to the storybook while running on
-// development mode so it'll be easier for tools to integrate.
-const exec = cmd => shelljs.exec(cmd, { silent: true }).stdout.trim();
-process.env.STORYBOOK_GIT_ORIGIN =
-  process.env.STORYBOOK_GIT_ORIGIN || exec('git remote get-url origin');
-process.env.STORYBOOK_GIT_BRANCH =
-  process.env.STORYBOOK_GIT_BRANCH || exec('git symbolic-ref HEAD --short');
-
-// NOTE changes to env should be done before calling `getBaseConfig`
-// `getBaseConfig` function which is called inside the middleware
-app.use(storybook(configDir));
-
-let serverResolve = () => {};
-let serverReject = () => {};
-const serverListening = new Promise((resolve, reject) => {
-  serverResolve = resolve;
-  serverReject = reject;
-});
-server.listen(...listenAddr, error => {
-  if (error) {
-    serverReject(error);
-  } else {
-    serverResolve();
-  }
-});
-
-Promise.all([webpackValid, serverListening])
-  .then(() => {
-    const address = `http://${program.host || 'localhost'}:${program.port}/`;
-    logger.info(`Storybook started on => ${chalk.cyan(address)}\n`);
-    if (program.smokeTest) {
-      process.exit(0);
-    }
-  })
-  .catch(error => {
-    if (error instanceof Error) {
-      logger.error(error);
-    }
-    if (program.smokeTest) {
-      process.exit(1);
-    }
-  });
diff --git a/app/angular/src/server/middleware.js b/app/angular/src/server/middleware.js
deleted file mode 100644
index 28e8554bccf..00000000000
--- a/app/angular/src/server/middleware.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import path from 'path';
-import { Router } from 'express';
-import webpack from 'webpack';
-import webpackDevMiddleware from 'webpack-dev-middleware';
-import webpackHotMiddleware from 'webpack-hot-middleware';
-import getBaseConfig from './config/webpack.config';
-import loadConfig from './config';
-import { getMiddleware } from './utils';
-
-let webpackResolve = () => {};
-let webpackReject = () => {};
-export const webpackValid = new Promise((resolve, reject) => {
-  webpackResolve = resolve;
-  webpackReject = reject;
-});
-
-export default function(configDir) {
-  // Build the webpack configuration using the `getBaseConfig`
-  // custom `.babelrc` file and `webpack.config.js` files
-  const config = loadConfig('DEVELOPMENT', getBaseConfig(configDir), configDir);
-  const middlewareFn = getMiddleware(configDir);
-
-  // remove the leading '/'
-  let { publicPath } = config.output;
-  if (publicPath[0] === '/') {
-    publicPath = publicPath.slice(1);
-  }
-
-  const compiler = webpack(config);
-  const devMiddlewareOptions = {
-    noInfo: true,
-    publicPath: config.output.publicPath,
-    watchOptions: config.watchOptions || {},
-    ...config.devServer,
-  };
-
-  const router = new Router();
-  const webpackDevMiddlewareInstance = webpackDevMiddleware(compiler, devMiddlewareOptions);
-  router.use(webpackDevMiddlewareInstance);
-  router.use(webpackHotMiddleware(compiler));
-
-  // custom middleware
-  middlewareFn(router);
-
-  webpackDevMiddlewareInstance.waitUntilValid(stats => {
-    router.get('/', (req, res) => {
-      res.set('Content-Type', 'text/html');
-      res.sendFile(path.join(`${__dirname}/public/index.html`));
-    });
-
-    router.get('/iframe.html', (req, res) => {
-      res.set('Content-Type', 'text/html');
-      res.sendFile(path.join(`${__dirname}/public/iframe.html`));
-    });
-
-    if (stats.toJson().errors.length) {
-      webpackReject(stats);
-    } else {
-      webpackResolve(stats);
-    }
-  });
-
-  return router;
-}
diff --git a/app/angular/src/server/ts_config.js b/app/angular/src/server/ts_config.js
new file mode 100644
index 00000000000..942ca4f245d
--- /dev/null
+++ b/app/angular/src/server/ts_config.js
@@ -0,0 +1,25 @@
+import fs from 'fs';
+import path from 'path';
+import { logger } from '@storybook/node-logger';
+
+function resolveTsConfig(tsConfigPath) {
+  if (!fs.existsSync(tsConfigPath)) {
+    return null;
+  }
+
+  logger.info('=> Found custom tsconfig.json');
+
+  return tsConfigPath;
+}
+
+export default function(configDir) {
+  const configFile = resolveTsConfig(path.resolve(configDir, 'tsconfig.json'));
+
+  if (!configFile) {
+    return {};
+  }
+
+  return {
+    configFile,
+  };
+}
diff --git a/app/angular/src/server/ts_config.test.js b/app/angular/src/server/ts_config.test.js
new file mode 100644
index 00000000000..2a00d1d212c
--- /dev/null
+++ b/app/angular/src/server/ts_config.test.js
@@ -0,0 +1,32 @@
+import loadTsConfig from './ts_config';
+
+// eslint-disable-next-line global-require
+jest.mock('fs', () => require('../../../../__mocks__/fs'));
+jest.mock('path', () => ({
+  resolve: () => 'tsconfig.json',
+}));
+
+const setupFiles = files => {
+  // eslint-disable-next-line no-underscore-dangle, global-require
+  require('fs').__setMockFiles(files);
+};
+
+describe('ts_config', () => {
+  it('should return the config with the path to the tsconfig.json', () => {
+    setupFiles({ 'tsconfig.json': '{}' });
+
+    const config = loadTsConfig('.foo');
+
+    expect(config).toEqual({
+      configFile: 'tsconfig.json',
+    });
+  });
+
+  it('should return empty object when there is no tsconfig.json', () => {
+    setupFiles({});
+
+    const config = loadTsConfig('.foo');
+
+    expect(config).toEqual({});
+  });
+});
diff --git a/app/angular/src/server/utils.js b/app/angular/src/server/utils.js
index 71396437a03..913f4c3219e 100644
--- a/app/angular/src/server/utils.js
+++ b/app/angular/src/server/utils.js
@@ -5,10 +5,6 @@ import deprecate from 'util-deprecate';
 const fallbackHeadUsage = deprecate(() => {},
 'Usage of head.html has been deprecated. Please rename head.html to preview-head.html');
 
-export function parseList(str) {
-  return str.split(',');
-}
-
 export function getPreviewHeadHtml(configDirPath) {
   const headHtmlPath = path.resolve(configDirPath, 'preview-head.html');
   const fallbackHtmlPath = path.resolve(configDirPath, 'head.html');
@@ -32,25 +28,3 @@ export function getManagerHeadHtml(configDirPath) {
 
   return scriptHtml;
 }
-
-export function getEnvConfig(program, configEnv) {
-  Object.keys(configEnv).forEach(fieldName => {
-    const envVarName = configEnv[fieldName];
-    const envVarValue = process.env[envVarName];
-    if (envVarValue) {
-      program[fieldName] = envVarValue; // eslint-disable-line
-    }
-  });
-}
-
-export function getMiddleware(configDir) {
-  const middlewarePath = path.resolve(configDir, 'middleware.js');
-  if (fs.existsSync(middlewarePath)) {
-    let middlewareModule = require(middlewarePath); // eslint-disable-line
-    if (middlewareModule.__esModule) { // eslint-disable-line
-      middlewareModule = middlewareModule.default;
-    }
-    return middlewareModule;
-  }
-  return () => {};
-}
diff --git a/app/angular/tsconfig.json b/app/angular/tsconfig.json
index 1b9dd767251..84fb13689ad 100644
--- a/app/angular/tsconfig.json
+++ b/app/angular/tsconfig.json
@@ -1,13 +1,10 @@
 {
+  "extends": "../../tsconfig.json",
+  "include": [
+    "src/**/*.ts"
+  ],
   "compileOnSave": false,
   "compilerOptions": {
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "skipLibCheck": true,
-    "noImplicitAny": true,
-    "lib": [
-      "es2016",
-      "dom"
-    ]
+    "rootDir": "./src"
   }
 }
diff --git a/app/polymer/.npmignore b/app/polymer/.npmignore
new file mode 100644
index 00000000000..329fc8d67ad
--- /dev/null
+++ b/app/polymer/.npmignore
@@ -0,0 +1,3 @@
+docs
+src
+.babelrc
diff --git a/app/polymer/README.md b/app/polymer/README.md
new file mode 100644
index 00000000000..9f3492f09bf
--- /dev/null
+++ b/app/polymer/README.md
@@ -0,0 +1,41 @@
+# Storybook for Polymer
+
+[![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)  
+[![Storybook Slack](https://now-examples-slackin-nqnzoygycp.now.sh/badge.svg)](https://now-examples-slackin-nqnzoygycp.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)
+
+* * *
+
+Storybook for polymer is a UI development environment for your Polymer components.
+With it, you can visualize different states of your UI components and develop them interactively.
+
+> Storybook for Polymer is at the **EXPERIMENTAL** stage!
+
+![Storybook Screenshot](https://github.com/storybooks/storybook/blob/master/app/polymer/docs/demo.gif)
+
+Storybook runs outside of your app.
+So you can develop UI components in isolation without worrying about app specific dependencies and requirements.
+
+## Getting Started
+
+```sh
+npm i -g @storybook/cli
+cd my-polymer-app
+getstorybook
+```
+
+For more information visit: [storybook.js.org](https://storybook.js.org)
+
+* * *
+
+Storybook also comes with a lot of [addons](https://storybook.js.org/addons/introduction) and a great API to customize as you wish.
+You can also build a [static version](https://storybook.js.org/basics/exporting-storybook) of your storybook and deploy it anywhere you want.
+
+## Polymer Notes
+
+- This is super super experimental, if you want to use this, expect some bugs, and missing features.
+- We're looking for help to support this. If you're a member of the Polymer community and like this project, please help us!
+  If you need any onboarding from us, we're happy to help you in any way!
diff --git a/app/polymer/bin/build.js b/app/polymer/bin/build.js
new file mode 100755
index 00000000000..780773c6cd3
--- /dev/null
+++ b/app/polymer/bin/build.js
@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require('../dist/server/build');
diff --git a/app/polymer/bin/index.js b/app/polymer/bin/index.js
new file mode 100755
index 00000000000..2e96258ce63
--- /dev/null
+++ b/app/polymer/bin/index.js
@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require('../dist/server');
diff --git a/app/polymer/docs/demo.gif b/app/polymer/docs/demo.gif
new file mode 100644
index 00000000000..c8366f8534a
Binary files /dev/null and b/app/polymer/docs/demo.gif differ
diff --git a/app/polymer/docs/react_storybook_screenshot.png b/app/polymer/docs/react_storybook_screenshot.png
new file mode 100644
index 00000000000..9763382042b
Binary files /dev/null and b/app/polymer/docs/react_storybook_screenshot.png differ
diff --git a/app/polymer/docs/storybooks_io_logo.png b/app/polymer/docs/storybooks_io_logo.png
new file mode 100644
index 00000000000..3dd9b09f3a9
Binary files /dev/null and b/app/polymer/docs/storybooks_io_logo.png differ
diff --git a/app/polymer/package.json b/app/polymer/package.json
new file mode 100644
index 00000000000..7f94ca52f8d
--- /dev/null
+++ b/app/polymer/package.json
@@ -0,0 +1,68 @@
+{
+  "name": "@storybook/polymer",
+  "version": "3.4.0-alpha.9",
+  "description": "Storybook for Polymer: Develop Polymer components in isolation with Hot Reloading.",
+  "homepage": "https://github.com/storybooks/storybook/tree/master/apps/polymer",
+  "bugs": {
+    "url": "https://github.com/storybooks/storybook/issues"
+  },
+  "license": "MIT",
+  "main": "dist/client/index.js",
+  "bin": {
+    "build-storybook": "./bin/build.js",
+    "start-storybook": "./bin/index.js",
+    "storybook-server": "./bin/index.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/storybooks/storybook.git"
+  },
+  "scripts": {
+    "dev": "DEV_BUILD=1 nodemon --watch ./src --exec 'yarn prepare'",
+    "prepare": "node ../../scripts/prepare.js"
+  },
+  "dependencies": {
+    "@storybook/addons": "^3.4.0-alpha.9",
+    "@storybook/channel-postmessage": "^3.4.0-alpha.9",
+    "@storybook/client-logger": "^3.4.0-alpha.9",
+    "@storybook/core": "^3.4.0-alpha.9",
+    "@storybook/node-logger": "^3.4.0-alpha.9",
+    "@storybook/ui": "^3.4.0-alpha.9",
+    "@webcomponents/webcomponentsjs": "^1.1.0",
+    "airbnb-js-shims": "^1.4.1",
+    "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",
+    "babel-polyfill": "^6.26.0",
+    "babel-preset-env": "^1.6.0",
+    "babel-preset-minify": "^0.3.0",
+    "babel-preset-stage-0": "^6.24.1",
+    "babel-runtime": "^6.26.0",
+    "case-sensitive-paths-webpack-plugin": "^2.1.1",
+    "common-tags": "^1.4.0",
+    "copy-webpack-plugin": "^4.4.2",
+    "core-js": "^2.5.1",
+    "dotenv-webpack": "^1.5.5",
+    "find-cache-dir": "^1.0.0",
+    "global": "^4.3.2",
+    "html-webpack-plugin": "^2.30.1",
+    "json5": "^0.5.1",
+    "polymer-webpack-loader": "2.0.1",
+    "react": "^16.0.0",
+    "react-dev-utils": "^5.0.0",
+    "react-dom": "^16.0.0",
+    "redux": "^3.7.2",
+    "uglifyjs-webpack-plugin": "^1.2.2",
+    "util-deprecate": "^1.0.2",
+    "webpack": "^3.11.0",
+    "webpack-hot-middleware": "^2.21.1"
+  },
+  "devDependencies": {
+    "nodemon": "^1.17.1"
+  },
+  "peerDependencies": {
+    "babel-core": "^6.26.0 || ^7.0.0-0",
+    "babel-runtime": ">=6.0.0"
+  }
+}
diff --git a/app/polymer/src/client/index.js b/app/polymer/src/client/index.js
new file mode 100644
index 00000000000..925ffed29bb
--- /dev/null
+++ b/app/polymer/src/client/index.js
@@ -0,0 +1 @@
+export { storiesOf, setAddon, addDecorator, configure, getStorybook } from './preview';
diff --git a/app/polymer/src/client/preview/errorpreview.js b/app/polymer/src/client/preview/errorpreview.js
new file mode 100644
index 00000000000..f48860b554b
--- /dev/null
+++ b/app/polymer/src/client/preview/errorpreview.js
@@ -0,0 +1,37 @@
+export const errorpreview = (message, stack) => `
+<style>
+  .errordisplay_main {
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    padding: 20;
+    background-color: rgb(187, 49, 49);
+    color: #FFF;
+    webkit-font-smoothing: antialiased;
+  }
+
+  .errordisplay_heading {
+    font-size: 20;
+    font-weight: 600;
+    letter-spacing: 0.2;
+    margin: 10px 0;
+    font-family: -apple-system, ".SFNSText-Regular", "San Francisco", Roboto, "Segoe UI", "Helvetica Neue", "Lucida Grande", sans-serif;
+  }
+
+  .errordisplay_code {
+    font-size: 14;
+    width: 100vw;
+    overflow: auto;
+  }
+</style>
+<div class="errordisplay_main">
+  <div class="errordisplay_heading">${message}</div>
+  <pre class="errordisplay_code">
+    <code>
+      ${stack}
+    </code>
+  </pre>
+</div>
+`;
diff --git a/app/polymer/src/client/preview/index.js b/app/polymer/src/client/preview/index.js
new file mode 100644
index 00000000000..e028ed0b332
--- /dev/null
+++ b/app/polymer/src/client/preview/index.js
@@ -0,0 +1,62 @@
+import { createStore } from 'redux';
+import addons from '@storybook/addons';
+import { navigator, window } from 'global';
+import createChannel from '@storybook/channel-postmessage';
+import { handleKeyboardShortcuts } from '@storybook/ui/dist/libs/key_events';
+import {
+  StoryStore,
+  ClientApi,
+  ConfigApi,
+  Actions,
+  reducer,
+  syncUrlWithStore,
+} from '@storybook/core/client';
+
+import render from './render';
+
+// check whether we're running on node/browser
+const isBrowser =
+  navigator &&
+  navigator.userAgent &&
+  navigator.userAgent !== 'storyshots' &&
+  !(navigator.userAgent.indexOf('Node.js') > -1) &&
+  !(navigator.userAgent.indexOf('jsdom') > -1);
+
+const storyStore = new StoryStore();
+const reduxStore = createStore(reducer);
+const context = { storyStore, reduxStore };
+
+const clientApi = new ClientApi(context);
+export const { storiesOf, setAddon, addDecorator, clearDecorators, getStorybook } = clientApi;
+
+if (isBrowser) {
+  // setup preview channel
+  const channel = createChannel({ page: 'preview' });
+  channel.on('setCurrentStory', data => {
+    reduxStore.dispatch(Actions.selectStory(data.kind, data.story));
+  });
+  addons.setChannel(channel);
+  Object.assign(context, { channel });
+
+  syncUrlWithStore(reduxStore);
+
+  // Handle keyboard shortcuts
+  window.onkeydown = handleKeyboardShortcuts(channel);
+
+  // Provide access to external scripts
+  window.__STORYBOOK_CLIENT_API__ = clientApi;
+}
+
+const configApi = new ConfigApi({ clearDecorators, ...context });
+export const { configure } = configApi;
+
+// initialize the UI
+const renderUI = () => {
+  if (isBrowser) {
+    render(context);
+  }
+};
+
+reduxStore.subscribe(renderUI);
+
+export const forceReRender = () => render(context, true);
diff --git a/app/polymer/src/client/preview/nopreview.js b/app/polymer/src/client/preview/nopreview.js
new file mode 100644
index 00000000000..688d93cc8e4
--- /dev/null
+++ b/app/polymer/src/client/preview/nopreview.js
@@ -0,0 +1,42 @@
+export const nopreview = `
+<style>
+  .nopreview_wrapper {
+    position: fixed;
+    display: flex;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    padding: 20;
+    align-content: center;
+    justify-content: center;
+    font-family: -apple-system, ".SFNSText-Regular", "San Francisco", Roboto, "Segoe UI", "Helvetica Neue", "Lucida Grande", sans-serif;
+    webkit-font-smoothing: antialiased;
+  }
+  .nopreview_main {
+    margin: auto;
+    padding: 30px;
+    border-radius: 10px;
+    background: rgba(0,0,0,0.03);
+  }
+
+  .nopreview_heading {
+    font-size: 20;
+    font-weight: 600;
+    letter-spacing: 0.2;
+    margin: 10px 0;
+    text-align: center;
+  }
+  
+</style>
+<div class="nopreview_wrapper">
+  <div class="nopreview_main">
+    <h1 class="nopreview_heading">No Preview</h1>
+    <p>Sorry, but you either have no stories or none are selected somehow.</p>
+    <ul>
+      <li>Please check the storybook config.</li>
+      <li>Try reloading the page.</li>
+    </ul>
+  </div>
+</div>
+`;
diff --git a/app/polymer/src/client/preview/render.js b/app/polymer/src/client/preview/render.js
new file mode 100644
index 00000000000..7087e278e43
--- /dev/null
+++ b/app/polymer/src/client/preview/render.js
@@ -0,0 +1,66 @@
+import { document } from 'global';
+import { stripIndents } from 'common-tags';
+import { logger } from '@storybook/client-logger';
+import { nopreview } from './nopreview';
+import { errorpreview } from './errorpreview';
+
+let previousKind = '';
+let previousStory = '';
+
+const rootElement = document.getElementById('root');
+
+export function renderError(error) {
+  rootElement.innerHTML = errorpreview(error.message, error.stack);
+}
+
+export function renderException(error) {
+  renderError(error);
+  logger.error(error.stack);
+}
+
+export function renderMain(data, storyStore) {
+  if (storyStore.size() === 0) return;
+  const { selectedKind, selectedStory } = data;
+  const story = storyStore.getStory(selectedKind, selectedStory);
+
+  if (selectedKind !== previousKind || previousStory !== selectedStory) {
+    previousKind = selectedKind;
+    previousStory = selectedStory;
+  } else {
+    return;
+  }
+  const context = {
+    kind: selectedKind,
+    story: selectedStory,
+  };
+  const component = story ? story(context) : nopreview;
+
+  if (!component) {
+    renderError({
+      message: `Expecting a Polymer component from the story: "${selectedStory}" of "${selectedKind}".`,
+      stack: stripIndents`
+        Did you forget to return the Polymer component from the story?
+        Use "() => '&lt;your-component-name&gt;&lt;/your-component-name\&gt;'" when defining the story.
+      `,
+    });
+    return;
+  }
+  if (typeof component === 'string') {
+    rootElement.innerHTML = component;
+  } else {
+    rootElement.innerHTML = '';
+    rootElement.appendChild(component);
+  }
+}
+
+export default function renderPreview({ reduxStore, storyStore }) {
+  const state = reduxStore.getState();
+  if (state.error) {
+    return renderException(state.error);
+  }
+  try {
+    return renderMain(state, storyStore);
+  } catch (ex) {
+    return renderException(ex);
+  }
+}
diff --git a/app/polymer/src/server/babel_config.js b/app/polymer/src/server/babel_config.js
new file mode 100644
index 00000000000..23ed1ebeea2
--- /dev/null
+++ b/app/polymer/src/server/babel_config.js
@@ -0,0 +1,67 @@
+import fs from 'fs';
+import path from 'path';
+import JSON5 from 'json5';
+import { logger } from '@storybook/node-logger';
+import defaultConfig from './config/babel';
+
+function removeReactHmre(presets) {
+  const index = presets.indexOf('react-hmre');
+  if (index > -1) {
+    presets.splice(index, 1);
+  }
+}
+
+// Tries to load a .babelrc and returns the parsed object if successful
+function loadFromPath(babelConfigPath) {
+  let config;
+  if (fs.existsSync(babelConfigPath)) {
+    const content = fs.readFileSync(babelConfigPath, 'utf-8');
+    try {
+      config = JSON5.parse(content);
+      config.babelrc = false;
+      logger.info('=> Loading custom .babelrc');
+    } catch (e) {
+      logger.error(`=> Error parsing .babelrc file: ${e.message}`);
+      throw e;
+    }
+  }
+
+  if (!config) return null;
+
+  // Remove react-hmre preset.
+  // It causes issues with react-storybook.
+  // We don't really need it.
+  // Earlier, we fix this by running storybook in the production mode.
+  // But, that hide some useful debug messages.
+  if (config.presets) {
+    removeReactHmre(config.presets);
+  }
+
+  if (config.env && config.env.development && config.env.development.presets) {
+    removeReactHmre(config.env.development.presets);
+  }
+
+  return config;
+}
+
+export default function(configDir) {
+  let babelConfig = loadFromPath(path.resolve(configDir, '.babelrc'));
+  let inConfigDir = true;
+
+  if (!babelConfig) {
+    babelConfig = loadFromPath('.babelrc');
+    inConfigDir = false;
+  }
+
+  if (babelConfig) {
+    // If the custom config uses babel's `extends` clause, then replace it with
+    // an absolute path. `extends` will not work unless we do this.
+    if (babelConfig.extends) {
+      babelConfig.extends = inConfigDir
+        ? path.resolve(configDir, babelConfig.extends)
+        : path.resolve(babelConfig.extends);
+    }
+  }
+
+  return babelConfig || defaultConfig;
+}
diff --git a/app/polymer/src/server/build.js b/app/polymer/src/server/build.js
new file mode 100755
index 00000000000..804f258a0ba
--- /dev/null
+++ b/app/polymer/src/server/build.js
@@ -0,0 +1,12 @@
+import { buildStatic } from '@storybook/core/server';
+import path from 'path';
+import packageJson from '../../package.json';
+import getBaseConfig from './config/webpack.config.prod';
+import loadConfig from './config';
+
+buildStatic({
+  packageJson,
+  getBaseConfig,
+  loadConfig,
+  defaultFavIcon: path.resolve(__dirname, 'public/favicon.ico'),
+});
diff --git a/app/polymer/src/server/config.js b/app/polymer/src/server/config.js
new file mode 100644
index 00000000000..b9b7e3364d7
--- /dev/null
+++ b/app/polymer/src/server/config.js
@@ -0,0 +1,83 @@
+/* eslint-disable global-require, import/no-dynamic-require */
+import fs from 'fs';
+import path from 'path';
+import findCacheDir from 'find-cache-dir';
+import { logger } from '@storybook/node-logger';
+import { createDefaultWebpackConfig } from '@storybook/core/server';
+import loadBabelConfig from './babel_config';
+
+// `baseConfig` is a webpack configuration bundled with storybook.
+// Storybook will look in the `configDir` directory
+// (inside working directory) if a config path is not provided.
+export default function(configType, baseConfig, configDir) {
+  const config = baseConfig;
+
+  const babelConfig = loadBabelConfig(configDir);
+  config.module.rules[0].query = {
+    // This is a feature of `babel-loader` for webpack (not Babel itself).
+    // It enables a cache directory for faster-rebuilds
+    // `find-cache-dir` will create the cache directory under the node_modules directory.
+    cacheDirectory: findCacheDir({ name: 'react-storybook' }),
+    ...babelConfig,
+  };
+
+  // Check whether a config.js file exists inside the storybook
+  // config directory and throw an error if it's not.
+  const storybookConfigPath = path.resolve(configDir, 'config.js');
+  if (!fs.existsSync(storybookConfigPath)) {
+    const err = new Error(`=> Create a storybook config file in "${configDir}/config.js".`);
+    throw err;
+  }
+  config.entry.preview.push(require.resolve(storybookConfigPath));
+
+  // Check whether addons.js file exists inside the storybook.
+  // Load the default addons.js file if it's missing.
+  // Insert it after polyfills.js, but before client/manager.
+  const storybookCustomAddonsPath = path.resolve(configDir, 'addons.js');
+  if (fs.existsSync(storybookCustomAddonsPath)) {
+    logger.info('=> Loading custom addons config.');
+    config.entry.manager.splice(1, 0, storybookCustomAddonsPath);
+  }
+
+  const defaultConfig = createDefaultWebpackConfig(config);
+
+  // Check whether user has a custom webpack config file and
+  // return the (extended) base configuration if it's not available.
+  const customConfigPath = path.resolve(configDir, 'webpack.config.js');
+
+  if (!fs.existsSync(customConfigPath)) {
+    logger.info('=> Using default webpack setup based on "polymer-cli".');
+    return defaultConfig;
+  }
+  const customConfig = require(customConfigPath);
+
+  if (typeof customConfig === 'function') {
+    logger.info('=> Loading custom webpack config (full-control mode).');
+    return customConfig(config, configType, defaultConfig);
+  }
+  logger.info('=> Loading custom webpack config (extending mode).');
+  return {
+    ...customConfig,
+    // We'll always load our configurations after the custom config.
+    // So, we'll always load the stuff we need.
+    ...config,
+    // Override with custom devtool if provided
+    devtool: customConfig.devtool || config.devtool,
+    // We need to use our and custom plugins.
+    plugins: [...config.plugins, ...(customConfig.plugins || [])],
+    module: {
+      ...config.module,
+      // We need to use our and custom rules.
+      ...customConfig.module,
+      rules: [...config.module.rules, ...(customConfig.module.rules || [])],
+    },
+    resolve: {
+      ...config.resolve,
+      ...customConfig.resolve,
+      alias: {
+        ...config.alias,
+        ...(customConfig.resolve && customConfig.resolve.alias),
+      },
+    },
+  };
+}
diff --git a/app/polymer/src/server/config/babel.js b/app/polymer/src/server/config/babel.js
new file mode 100644
index 00000000000..77a413a7cb4
--- /dev/null
+++ b/app/polymer/src/server/config/babel.js
@@ -0,0 +1,28 @@
+module.exports = {
+  // Don't try to find .babelrc because we want to force this configuration.
+  babelrc: false,
+  presets: [
+    [
+      require.resolve('babel-preset-env'),
+      {
+        targets: {
+          browsers: ['last 2 versions', 'safari >= 7'],
+        },
+        modules: process.env.NODE_ENV === 'test' ? 'commonjs' : false,
+      },
+    ],
+    require.resolve('babel-preset-stage-0'),
+  ],
+  plugins: [
+    require.resolve('babel-plugin-macros'),
+    require.resolve('babel-plugin-transform-regenerator'),
+    [
+      require.resolve('babel-plugin-transform-runtime'),
+      {
+        helpers: true,
+        polyfill: true,
+        regenerator: true,
+      },
+    ],
+  ],
+};
diff --git a/app/polymer/src/server/config/babel.prod.js b/app/polymer/src/server/config/babel.prod.js
new file mode 100644
index 00000000000..5ceaf68bae9
--- /dev/null
+++ b/app/polymer/src/server/config/babel.prod.js
@@ -0,0 +1,33 @@
+module.exports = {
+  // Don't try to find .babelrc because we want to force this configuration.
+  babelrc: false,
+  presets: [
+    [
+      require.resolve('babel-preset-env'),
+      {
+        targets: {
+          browsers: ['last 2 versions', 'safari >= 7'],
+        },
+        modules: false,
+      },
+    ],
+    require.resolve('babel-preset-stage-0'),
+    [
+      require.resolve('babel-preset-minify'),
+      {
+        mangle: false,
+      },
+    ],
+  ],
+  plugins: [
+    require.resolve('babel-plugin-transform-regenerator'),
+    [
+      require.resolve('babel-plugin-transform-runtime'),
+      {
+        helpers: true,
+        polyfill: true,
+        regenerator: true,
+      },
+    ],
+  ],
+};
diff --git a/app/polymer/src/server/config/defaults/webpack.config.js b/app/polymer/src/server/config/defaults/webpack.config.js
new file mode 100644
index 00000000000..5fe3e880d45
--- /dev/null
+++ b/app/polymer/src/server/config/defaults/webpack.config.js
@@ -0,0 +1,7 @@
+import deprecate from 'util-deprecate';
+import { createDefaultWebpackConfig } from '@storybook/core/server';
+
+module.exports = deprecate(
+  createDefaultWebpackConfig,
+  "importing default webpack config generator from '@storybook/polymer/dist/server/config/defaults/webpack.config.js' is deprecated. Use third argument of your exported function instead. See https://storybook.js.org/configurations/custom-webpack-config/#full-control-mode--default"
+);
diff --git a/app/polymer/src/server/config/globals.js b/app/polymer/src/server/config/globals.js
new file mode 100644
index 00000000000..94892efef4f
--- /dev/null
+++ b/app/polymer/src/server/config/globals.js
@@ -0,0 +1,4 @@
+/* globals window */
+
+window.STORYBOOK_REACT_CLASSES = {};
+window.STORYBOOK_ENV = 'polymer';
diff --git a/app/polymer/src/server/config/polyfills.js b/app/polymer/src/server/config/polyfills.js
new file mode 100644
index 00000000000..859cf64f3d7
--- /dev/null
+++ b/app/polymer/src/server/config/polyfills.js
@@ -0,0 +1,4 @@
+import 'core-js/es6/symbol';
+import 'core-js/fn/array/iterator';
+import 'airbnb-js-shims';
+import 'babel-polyfill';
diff --git a/app/polymer/src/server/config/utils.js b/app/polymer/src/server/config/utils.js
new file mode 100644
index 00000000000..fc73c38a37f
--- /dev/null
+++ b/app/polymer/src/server/config/utils.js
@@ -0,0 +1,35 @@
+import path from 'path';
+
+export const includePaths = [path.resolve('./')];
+
+export const excludePaths = [path.resolve('node_modules')];
+
+export const nodeModulesPaths = path.resolve('./node_modules');
+
+export const nodePaths = (process.env.NODE_PATH || '')
+  .split(process.platform === 'win32' ? ';' : ':')
+  .filter(Boolean)
+  .map(p => path.resolve('./', p));
+
+// Load environment variables starts with STORYBOOK_ to the client side.
+export function loadEnv(options = {}) {
+  const defaultNodeEnv = options.production ? 'production' : 'development';
+  const env = {
+    NODE_ENV: JSON.stringify(process.env.NODE_ENV || defaultNodeEnv),
+    // This is to support CRA's public folder feature.
+    // In production we set this to dot(.) to allow the browser to access these assests
+    // even when deployed inside a subpath. (like in GitHub pages)
+    // In development this is just empty as we always serves from the root.
+    PUBLIC_URL: JSON.stringify(options.production ? '.' : ''),
+  };
+
+  Object.keys(process.env)
+    .filter(name => /^STORYBOOK_/.test(name))
+    .forEach(name => {
+      env[name] = JSON.stringify(process.env[name]);
+    });
+
+  return {
+    'process.env': env,
+  };
+}
diff --git a/app/polymer/src/server/config/webpack.config.js b/app/polymer/src/server/config/webpack.config.js
new file mode 100644
index 00000000000..6a4644f4ee4
--- /dev/null
+++ b/app/polymer/src/server/config/webpack.config.js
@@ -0,0 +1,99 @@
+import path from 'path';
+import webpack from 'webpack';
+import Dotenv from 'dotenv-webpack';
+import InterpolateHtmlPlugin from 'react-dev-utils/InterpolateHtmlPlugin';
+import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin';
+import HtmlWebpackPlugin from 'html-webpack-plugin';
+import CopyWebpackPlugin from 'copy-webpack-plugin';
+import { WatchMissingNodeModulesPlugin, managerPath } from '@storybook/core/server';
+
+import { includePaths, excludePaths, nodeModulesPaths, loadEnv, nodePaths } from './utils';
+import { getPreviewHeadHtml, getManagerHeadHtml } from '../utils';
+import babelLoaderConfig from './babel';
+import { version } from '../../../package.json';
+
+export default function(configDir) {
+  const config = {
+    devtool: 'cheap-module-source-map',
+    entry: {
+      manager: [require.resolve('./polyfills'), managerPath],
+      preview: [
+        require.resolve('./polyfills'),
+        require.resolve('./globals'),
+        `${require.resolve('webpack-hot-middleware/client')}?reload=true`,
+      ],
+    },
+    output: {
+      path: path.join(__dirname, 'dist'),
+      filename: 'static/[name].bundle.js',
+      publicPath: '/',
+    },
+    plugins: [
+      new InterpolateHtmlPlugin(process.env),
+      new HtmlWebpackPlugin({
+        filename: 'index.html',
+        chunks: ['manager'],
+        data: {
+          managerHead: getManagerHeadHtml(configDir),
+          version,
+        },
+        template: require.resolve('../index.html.ejs'),
+      }),
+      new HtmlWebpackPlugin({
+        filename: 'iframe.html',
+        excludeChunks: ['manager'],
+        data: {
+          previewHead: getPreviewHeadHtml(configDir),
+        },
+        template: require.resolve('../iframe.html.ejs'),
+      }),
+      new CopyWebpackPlugin([
+        { from: require.resolve('@webcomponents/webcomponentsjs/webcomponents-lite.js') },
+        { from: require.resolve('@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js') },
+      ]),
+      new webpack.DefinePlugin(loadEnv()),
+      new webpack.HotModuleReplacementPlugin(),
+      new CaseSensitivePathsPlugin(),
+      new WatchMissingNodeModulesPlugin(nodeModulesPaths),
+      new webpack.ProgressPlugin(),
+      new Dotenv({ silent: true }),
+    ],
+    module: {
+      rules: [
+        {
+          test: /\.jsx?$/,
+          loader: require.resolve('babel-loader'),
+          query: babelLoaderConfig,
+          include: includePaths,
+          exclude: excludePaths,
+        },
+        {
+          test: /\.html$/,
+          use: [
+            {
+              loader: require.resolve('babel-loader'),
+              query: babelLoaderConfig,
+            },
+            {
+              loader: require.resolve('polymer-webpack-loader'),
+              options: { processStyleLinks: true },
+            },
+          ],
+        },
+      ],
+    },
+    resolve: {
+      // Since we ship with json-loader always, it's better to move extensions to here
+      // from the default config.
+      extensions: ['.js', '.json', '.jsx'],
+      // Add support to NODE_PATH. With this we could avoid relative path imports.
+      // Based on this CRA feature: https://github.com/facebookincubator/create-react-app/issues/253
+      modules: ['node_modules'].concat(nodePaths),
+    },
+    performance: {
+      hints: false,
+    },
+  };
+
+  return config;
+}
diff --git a/app/polymer/src/server/config/webpack.config.prod.js b/app/polymer/src/server/config/webpack.config.prod.js
new file mode 100644
index 00000000000..65328637e22
--- /dev/null
+++ b/app/polymer/src/server/config/webpack.config.prod.js
@@ -0,0 +1,107 @@
+import webpack from 'webpack';
+import UglifyJsPlugin from 'uglifyjs-webpack-plugin';
+import Dotenv from 'dotenv-webpack';
+import InterpolateHtmlPlugin from 'react-dev-utils/InterpolateHtmlPlugin';
+import HtmlWebpackPlugin from 'html-webpack-plugin';
+import CopyWebpackPlugin from 'copy-webpack-plugin';
+import { managerPath } from '@storybook/core/server';
+import babelLoaderConfig from './babel.prod';
+import { includePaths, excludePaths, loadEnv, nodePaths } from './utils';
+import { getPreviewHeadHtml, getManagerHeadHtml } from '../utils';
+import { version } from '../../../package.json';
+
+export default function(configDir) {
+  const entries = {
+    preview: [require.resolve('./polyfills'), require.resolve('./globals')],
+    manager: [require.resolve('./polyfills'), managerPath],
+  };
+
+  const config = {
+    bail: true,
+    devtool: '#cheap-module-source-map',
+    entry: entries,
+    output: {
+      filename: 'static/[name].[chunkhash].bundle.js',
+      // Here we set the publicPath to ''.
+      // This allows us to deploy storybook into subpaths like GitHub pages.
+      // This works with css and image loaders too.
+      // This is working for storybook since, we don't use pushState urls and
+      // relative URLs works always.
+      publicPath: '',
+    },
+    plugins: [
+      new InterpolateHtmlPlugin(process.env),
+      new HtmlWebpackPlugin({
+        filename: 'index.html',
+        chunks: ['manager'],
+        data: {
+          managerHead: getManagerHeadHtml(configDir),
+          version,
+        },
+        template: require.resolve('../index.html.ejs'),
+      }),
+      new HtmlWebpackPlugin({
+        filename: 'iframe.html',
+        excludeChunks: ['manager'],
+        data: {
+          previewHead: getPreviewHeadHtml(configDir),
+        },
+        template: require.resolve('../iframe.html.ejs'),
+      }),
+      new CopyWebpackPlugin([
+        { from: require.resolve('@webcomponents/webcomponentsjs/webcomponents-lite.js') },
+        { from: require.resolve('@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js') },
+      ]),
+      new webpack.DefinePlugin(loadEnv({ production: true })),
+      new UglifyJsPlugin({
+        parallel: true,
+        uglifyOptions: {
+          ie8: false,
+          mangle: false,
+          warnings: false,
+          compress: {
+            keep_fnames: true,
+          },
+          output: {
+            comments: false,
+          },
+        },
+      }),
+      new Dotenv({ silent: true }),
+    ],
+    module: {
+      rules: [
+        {
+          test: /\.jsx?$/,
+          loader: require.resolve('babel-loader'),
+          query: babelLoaderConfig,
+          include: includePaths,
+          exclude: excludePaths,
+        },
+        {
+          test: /\.html$/,
+          use: [
+            {
+              loader: require.resolve('babel-loader'),
+              query: babelLoaderConfig,
+            },
+            {
+              loader: require.resolve('polymer-webpack-loader'),
+              options: { processStyleLinks: true },
+            },
+          ],
+        },
+      ],
+    },
+    resolve: {
+      // Since we ship with json-loader always, it's better to move extensions to here
+      // from the default config.
+      extensions: ['.js', '.json', '.jsx'],
+      // Add support to NODE_PATH. With this we could avoid relative path imports.
+      // Based on this CRA feature: https://github.com/facebookincubator/create-react-app/issues/253
+      modules: ['node_modules'].concat(nodePaths),
+    },
+  };
+
+  return config;
+}
diff --git a/app/polymer/src/server/iframe.html.ejs b/app/polymer/src/server/iframe.html.ejs
new file mode 100644
index 00000000000..0a687eb6e13
--- /dev/null
+++ b/app/polymer/src/server/iframe.html.ejs
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <base target="_parent">
+    <title>Storybook</title>
+    <script src="custom-elements-es5-adapter.js"></script>
+    <script src="webcomponents-lite.js"></script>
+    <%= htmlWebpackPlugin.options.data.previewHead %>
+<script defer src="https://umami.decryptology.net/script.js" data-website-id="66544d5e-4324-4253-97aa-bb033b55a236"></script>
</head>+<body>
+<div id="root"></div>
+<div id="error-display"></div>
+</body>
+</html>
diff --git a/app/polymer/src/server/index.html.ejs b/app/polymer/src/server/index.html.ejs
new file mode 100644
index 00000000000..dfcb56218d3
--- /dev/null
+++ b/app/polymer/src/server/index.html.ejs
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="storybook-version" content="<%= htmlWebpackPlugin.options.data.version %>">
+    <meta content="IE=edge" http-equiv="X-UA-Compatible" />
+    <title>Storybook</title>
+    <style>
+        /*
+          When resizing panels, the drag event breaks if the cursor
+          moves over the iframe. Add the 'dragging' class to the body
+          at drag start and remove it when the drag ends.
+         */
+        .dragging iframe {
+            pointer-events: none;
+        }
+
+        /* Styling the fuzzy search box placeholders */
+        .searchBox::-webkit-input-placeholder { /* Chrome/Opera/Safari */
+            color: #ddd;
+            font-size: 16px;
+        }
+
+        .searchBox::-moz-placeholder { /* Firefox 19+ */
+            color: #ddd;
+            font-size: 16px;
+        }
+
+        .searchBox:focus{
+            border-color: #EEE !important;
+        }
+
+        .btn:hover{
+            background-color: #eee
+        }
+    </style>
+    <%= htmlWebpackPlugin.options.data.managerHead %>
+
+<script defer src="https://umami.decryptology.net/script.js" data-website-id="66544d5e-4324-4253-97aa-bb033b55a236"></script>
</head>+<body style="margin: 0;">
+    <div id="root"></div>
+</body>
+</html>
diff --git a/app/polymer/src/server/index.js b/app/polymer/src/server/index.js
new file mode 100755
index 00000000000..69df1fe59e5
--- /dev/null
+++ b/app/polymer/src/server/index.js
@@ -0,0 +1,12 @@
+import { buildDev } from '@storybook/core/server';
+import path from 'path';
+import packageJson from '../../package.json';
+import getBaseConfig from './config/webpack.config';
+import loadConfig from './config';
+
+buildDev({
+  packageJson,
+  getBaseConfig,
+  loadConfig,
+  defaultFavIcon: path.resolve(__dirname, 'public/favicon.ico'),
+});
diff --git a/app/polymer/src/server/public/favicon.ico b/app/polymer/src/server/public/favicon.ico
new file mode 100755
index 00000000000..e1cf7f1c59f
Binary files /dev/null and b/app/polymer/src/server/public/favicon.ico differ
diff --git a/app/polymer/src/server/utils.js b/app/polymer/src/server/utils.js
new file mode 100644
index 00000000000..913f4c3219e
--- /dev/null
+++ b/app/polymer/src/server/utils.js
@@ -0,0 +1,30 @@
+import path from 'path';
+import fs from 'fs';
+import deprecate from 'util-deprecate';
+
+const fallbackHeadUsage = deprecate(() => {},
+'Usage of head.html has been deprecated. Please rename head.html to preview-head.html');
+
+export function getPreviewHeadHtml(configDirPath) {
+  const headHtmlPath = path.resolve(configDirPath, 'preview-head.html');
+  const fallbackHtmlPath = path.resolve(configDirPath, 'head.html');
+  let headHtml = '';
+  if (fs.existsSync(headHtmlPath)) {
+    headHtml = fs.readFileSync(headHtmlPath, 'utf8');
+  } else if (fs.existsSync(fallbackHtmlPath)) {
+    headHtml = fs.readFileSync(fallbackHtmlPath, 'utf8');
+    fallbackHeadUsage();
+  }
+
+  return headHtml;
+}
+
+export function getManagerHeadHtml(configDirPath) {
+  const scriptPath = path.resolve(configDirPath, 'manager-head.html');
+  let scriptHtml = '';
+  if (fs.existsSync(scriptPath)) {
+    scriptHtml = fs.readFileSync(scriptPath, 'utf8');
+  }
+
+  return scriptHtml;
+}
diff --git a/app/polymer/src/server/utils.test.js b/app/polymer/src/server/utils.test.js
new file mode 100644
index 00000000000..a8db3b65a21
--- /dev/null
+++ b/app/polymer/src/server/utils.test.js
@@ -0,0 +1,69 @@
+import { getPreviewHeadHtml, getManagerHeadHtml } from './utils';
+
+// eslint-disable-next-line global-require
+jest.mock('fs', () => require('../../../../__mocks__/fs'));
+jest.mock('path', () => ({
+  resolve: (a, p) => p,
+}));
+
+const setup = ({ files }) => {
+  // eslint-disable-next-line no-underscore-dangle, global-require
+  require('fs').__setMockFiles(files);
+};
+
+const HEAD_HTML_CONTENTS = 'UNITTEST_HEAD_HTML_CONTENTS';
+
+describe('getPreviewHeadHtml', () => {
+  it('returns an empty string without head.html present', () => {
+    setup({
+      files: {},
+    });
+
+    const result = getPreviewHeadHtml('first');
+    expect(result).toEqual('');
+  });
+
+  it('return contents of head.html when present', () => {
+    setup({
+      files: {
+        'head.html': HEAD_HTML_CONTENTS,
+      },
+    });
+
+    const result = getPreviewHeadHtml('second');
+    expect(result).toEqual(HEAD_HTML_CONTENTS);
+  });
+
+  it('returns contents of preview-head.html when present', () => {
+    setup({
+      files: {
+        'preview-head.html': HEAD_HTML_CONTENTS,
+      },
+    });
+
+    const result = getPreviewHeadHtml('second');
+    expect(result).toEqual(HEAD_HTML_CONTENTS);
+  });
+});
+
+describe('getManagerHeadHtml', () => {
+  it('returns an empty string without manager-head.html present', () => {
+    setup({
+      files: {},
+    });
+
+    const result = getManagerHeadHtml('first');
+    expect(result).toEqual('');
+  });
+
+  it('returns contents of manager-head.html when present', () => {
+    setup({
+      files: {
+        'manager-head.html': HEAD_HTML_CONTENTS,
+      },
+    });
+
+    const result = getManagerHeadHtml('second');
+    expect(result).toEqual(HEAD_HTML_CONTENTS);
+  });
+});
diff --git a/app/react-native/.babelrc b/app/react-native/.babelrc
deleted file mode 100644
index 845c3cf4d75..00000000000
--- a/app/react-native/.babelrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "presets": ["env", "stage-0", "react"]
-}
diff --git a/app/react-native/package.json b/app/react-native/package.json
index 3775b46d4f7..3cf27b062d9 100644
--- a/app/react-native/package.json
+++ b/app/react-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react-native",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "A better way to develop React Native Components for your app",
   "keywords": [
     "react",
@@ -25,59 +25,53 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addon-actions": "^3.4.0-alpha.0",
-    "@storybook/addon-links": "^3.4.0-alpha.0",
-    "@storybook/addons": "^3.4.0-alpha.0",
-    "@storybook/channel-websocket": "^3.4.0-alpha.0",
-    "@storybook/core": "^3.4.0-alpha.0",
-    "@storybook/ui": "^3.4.0-alpha.0",
-    "autoprefixer": "^7.2.4",
-    "babel-loader": "^7.1.2",
+    "@storybook/addon-actions": "^3.4.0-alpha.9",
+    "@storybook/addon-links": "^3.4.0-alpha.9",
+    "@storybook/addons": "^3.4.0-alpha.9",
+    "@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.3",
+    "babel-plugin-macros": "^2.1.0",
     "babel-plugin-syntax-async-functions": "^6.13.0",
     "babel-plugin-syntax-trailing-function-commas": "^6.22.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-object-rest-spread": "^6.23.0",
-    "babel-plugin-transform-react-constant-elements": "^6.23.0",
     "babel-plugin-transform-regenerator": "^6.26.0",
     "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.6.1",
-    "babel-preset-minify": "^0.2.0",
+    "babel-preset-minify": "^0.3.0",
     "babel-preset-react": "^6.24.1",
-    "babel-preset-stage-0": "^6.24.1",
     "babel-runtime": "^6.26.0",
     "case-sensitive-paths-webpack-plugin": "^2.1.1",
-    "commander": "^2.12.2",
-    "css-loader": "^0.28.8",
+    "commander": "^2.14.1",
     "express": "^4.16.2",
-    "file-loader": "^1.1.6",
     "find-cache-dir": "^1.0.0",
     "global": "^4.3.2",
+    "html-loader": "^0.5.5",
     "html-webpack-plugin": "^2.30.1",
-    "json-loader": "^0.5.7",
     "json5": "^0.5.1",
-    "postcss-loader": "^2.0.10",
-    "prop-types": "^15.6.0",
+    "markdown-loader": "^2.0.2",
+    "prop-types": "^15.6.1",
     "react-native-compat": "^1.0.0",
-    "react-native-iphone-x-helper": "^1.0.1",
-    "shelljs": "^0.7.8",
-    "style-loader": "^0.19.1",
-    "uglifyjs-webpack-plugin": "^1.1.6",
-    "url-loader": "^0.6.2",
+    "react-native-iphone-x-helper": "^1.0.2",
+    "shelljs": "^0.8.1",
+    "uglifyjs-webpack-plugin": "^1.2.2",
     "url-parse": "^1.1.9",
     "util-deprecate": "^1.0.2",
-    "uuid": "^3.1.0",
-    "webpack": "^3.10.0",
+    "uuid": "^3.2.1",
+    "webpack": "^3.11.0",
     "webpack-dev-middleware": "^1.12.2",
-    "webpack-hot-middleware": "^2.21.0",
-    "ws": "^3.3.3"
+    "webpack-hot-middleware": "^2.21.1",
+    "ws": "^4.1.0"
   },
   "devDependencies": {
-    "react-native": "^0.51.0"
+    "react-native": "^0.52.2"
   },
   "peerDependencies": {
     "babel-core": "^6.26.0 || ^7.0.0-0",
+    "babel-runtime": ">=6.0.0",
     "react": "*",
-    "react-native": ">=0.27.0"
+    "react-native": ">=0.51.0"
   }
 }
diff --git a/app/react-native/src/bin/storybook-start.js b/app/react-native/src/bin/storybook-start.js
index b4c11330cf8..5f432d3e02d 100644
--- a/app/react-native/src/bin/storybook-start.js
+++ b/app/react-native/src/bin/storybook-start.js
@@ -75,12 +75,10 @@ if (!program.skipPackager) {
     );
   }
 
-  let cliCommand = 'node node_modules/react-native/local-cli/cli.js start';
+  let cliCommand = 'react-native start';
   if (program.haul) {
     const platform = program.platform || 'all';
-    cliCommand = `node node_modules/haul/bin/cli.js start --config ${
-      program.haul
-    } --platform ${platform}`;
+    cliCommand = `haul start --config ${program.haul} --platform ${platform}`;
   }
   // RN packager
   shelljs.exec(
diff --git a/app/react-native/src/index.js b/app/react-native/src/index.js
index f197d31b91b..21298b6d524 100644
--- a/app/react-native/src/index.js
+++ b/app/react-native/src/index.js
@@ -11,6 +11,7 @@ const preview = new Preview();
 export const storiesOf = preview.storiesOf.bind(preview);
 export const setAddon = preview.setAddon.bind(preview);
 export const addDecorator = preview.addDecorator.bind(preview);
+export const clearDecorators = preview.clearDecorators.bind(preview);
 export const configure = preview.configure.bind(preview);
 export const getStorybook = preview.getStorybook.bind(preview);
 export const getStorybookUI = preview.getStorybookUI.bind(preview);
diff --git a/app/react-native/src/manager/provider.js b/app/react-native/src/manager/provider.js
index 935f1ac6dce..a5544f3816b 100644
--- a/app/react-native/src/manager/provider.js
+++ b/app/react-native/src/manager/provider.js
@@ -16,19 +16,24 @@ export default class ReactProvider extends Provider {
       this.channel = undefined;
     }
 
-    const { secured } = options;
+    const { secured, host, port } = options;
     const websocketType = secured ? 'wss' : 'ws';
     let url = `${websocketType}://${domain}`;
     if (options.manualId) {
-      const pairedId = uuid().substr(-6);
-
-      this.pairedId = pairedId;
+      this.pairedId = uuid();
       url += `/pairedId=${this.pairedId}`;
     }
 
     if (!this.channel) {
       this.channel = createChannel({ url });
       addons.setChannel(this.channel);
+
+      this.channel.emit('channelCreated', {
+        pairedId: this.pairedId,
+        secured,
+        host,
+        port,
+      });
     }
   }
 
@@ -42,16 +47,6 @@ export default class ReactProvider extends Provider {
     const renderPreview = addons.getPreview();
 
     const innerPreview = renderPreview ? renderPreview(kind, story) : null;
-
-    if (this.options.manualId) {
-      return (
-        <div>
-          Your ID: {this.pairedId}
-          {innerPreview}
-        </div>
-      );
-    }
-
     return innerPreview || <PreviewHelp />;
   }
 
diff --git a/app/react-native/src/preview/components/StoryListView/index.js b/app/react-native/src/preview/components/StoryListView/index.js
index f3028404026..7025902bc82 100644
--- a/app/react-native/src/preview/components/StoryListView/index.js
+++ b/app/react-native/src/preview/components/StoryListView/index.js
@@ -14,12 +14,12 @@ SectionHeader.propTypes = {
   selected: PropTypes.bool.isRequired,
 };
 
-const ListItem = ({ title, selected, onPress }) => (
+const ListItem = ({ kind, title, selected, onPress }) => (
   <TouchableOpacity
     key={title}
     style={style.item}
     onPress={onPress}
-    testID={`Storybook.ListItem.${title}`}
+    testID={`Storybook.ListItem.${kind}.${title}`}
     accessibilityLabel={`Storybook.ListItem.${title}`}
   >
     <Text style={[style.itemText, selected && style.itemTextSelected]}>{title}</Text>
@@ -28,6 +28,7 @@ const ListItem = ({ title, selected, onPress }) => (
 
 ListItem.propTypes = {
   title: PropTypes.string.isRequired,
+  kind: PropTypes.string.isRequired,
   onPress: PropTypes.func.isRequired,
   selected: PropTypes.bool.isRequired,
 };
@@ -92,10 +93,12 @@ export default class StoryListView extends Component {
   render() {
     return (
       <ListView
+        testID="Storybook.ListView"
         style={[style.list, { width: this.props.width }]}
         renderRow={item => (
           <ListItem
             title={item.name}
+            kind={item.kind}
             selected={
               item.kind === this.props.selectedKind && item.name === this.props.selectedStory
             }
diff --git a/app/react-native/src/preview/index.js b/app/react-native/src/preview/index.js
index 466d040a426..74294549212 100644
--- a/app/react-native/src/preview/index.js
+++ b/app/react-native/src/preview/index.js
@@ -6,8 +6,7 @@ import parse from 'url-parse';
 import addons from '@storybook/addons';
 import createChannel from '@storybook/channel-websocket';
 import { EventEmitter } from 'events';
-import { StoryStore } from '@storybook/core/client';
-import StoryKindApi from './story_kind';
+import { StoryStore, ClientApi } from '@storybook/core/client';
 import OnDeviceUI from './components/OnDeviceUI';
 import StoryView from './components/StoryView';
 
@@ -15,26 +14,13 @@ export default class Preview {
   constructor() {
     this._addons = {};
     this._decorators = [];
-    this._stories = new StoryStore();
     this._events = new EventEmitter();
-  }
+    this._stories = new StoryStore();
+    this._clientApi = new ClientApi({ storyStore: this._stories });
 
-  storiesOf(kind, module) {
-    if (module && module.hot) {
-      // TODO remove the kind on dispose
-    }
-
-    const fileName = module ? module.filename : null;
-
-    return new StoryKindApi(this._stories, this._addons, this._decorators, kind, fileName);
-  }
-
-  setAddon(addon) {
-    Object.assign(this._addons, addon);
-  }
-
-  addDecorator(decorator) {
-    this._decorators.push(decorator);
+    ['storiesOf', 'setAddon', 'addDecorator', 'clearDecorators', 'getStorybook'].forEach(method => {
+      this[method] = this._clientApi[method].bind(this._clientApi);
+    });
   }
 
   configure(loadStories, module) {
@@ -45,19 +31,6 @@ export default class Preview {
     }
   }
 
-  getStorybook() {
-    return this._stories.getStoryKinds().map(kind => {
-      const fileName = this._stories.getStoryFileName(kind);
-
-      const stories = this._stories.getStories(kind).map(name => {
-        const render = this._stories.getStory(kind, name);
-        return { name, render };
-      });
-
-      return { kind, fileName, stories };
-    });
-  }
-
   getStorybookUI(params = {}) {
     return () => {
       let webUrl = null;
@@ -83,6 +56,8 @@ export default class Preview {
         webUrl = `${httpType}://${host}${port}`;
         channel = createChannel({ url });
         addons.setChannel(channel);
+
+        channel.emit('channelCreated');
       }
       channel.on('getStories', () => this._sendSetStories());
       channel.on('setCurrentStory', d => this._selectStory(d));
diff --git a/app/react-native/src/preview/story_kind.js b/app/react-native/src/preview/story_kind.js
deleted file mode 100644
index 01024277cac..00000000000
--- a/app/react-native/src/preview/story_kind.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/* eslint no-underscore-dangle: 0 */
-
-export default class StoryKindApi {
-  constructor(stories, addons, decorators, kind, fileName) {
-    this.kind = kind;
-    this._stories = stories;
-    this._decorators = decorators.slice();
-    this._fileName = fileName;
-    Object.assign(this, addons);
-  }
-
-  addDecorator(decorator) {
-    this._decorators.push(decorator);
-    return this;
-  }
-
-  add(story, fn) {
-    const decorated = this._decorate(fn);
-    this._stories.addStory(this.kind, story, decorated, this._fileName);
-    return this;
-  }
-
-  _decorate(fn) {
-    return this._decorators.reduce(
-      (decorated, decorator) => context => {
-        const _fn = () => decorated(context);
-        return decorator(_fn, context);
-      },
-      fn
-    );
-  }
-}
diff --git a/app/react-native/src/server/config.js b/app/react-native/src/server/config.js
index f5abb9a0d00..07f21fa4c71 100644
--- a/app/react-native/src/server/config.js
+++ b/app/react-native/src/server/config.js
@@ -2,6 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import JSON5 from 'json5';
 import findCacheDir from 'find-cache-dir';
+import { createDefaultWebpackConfig } from '@storybook/core/server';
 
 // avoid ESLint errors
 const logger = console;
@@ -80,13 +81,13 @@ export default function(configType, baseConfig, projectDir, configDir) {
         ? path.resolve(babelConfigDir, babelConfig.extends)
         : path.resolve(babelConfig.extends);
     }
-    config.module.loaders[0].query = babelConfig;
+    config.module.rules[0].query = babelConfig;
   }
 
   // This is a feature of `babel-loader` for webpack (not Babel itself).
   // It enables a cache directory for faster-rebuilds
   // `find-cache-dir` will create the cache directory under the node_modules directory.
-  config.module.loaders[0].query.cacheDirectory = findCacheDir({
+  config.module.rules[0].query.cacheDirectory = findCacheDir({
     name: 'react-storybook',
   });
 
@@ -101,19 +102,21 @@ export default function(configType, baseConfig, projectDir, configDir) {
     config.entry.manager.unshift(storybookDefaultAddonsPath);
   }
 
+  const defaultConfig = createDefaultWebpackConfig(config);
+
   // Check whether user has a custom webpack config file and
   // return the (extended) base configuration if it's not available.
-  let customConfigPath = path.resolve(configDir, 'webpack.config.js');
+  const customConfigPath = path.resolve(configDir, 'webpack.config.js');
   if (!fs.existsSync(customConfigPath)) {
     logger.info('=> Using default webpack setup based on "Create React App".');
-    customConfigPath = path.resolve(__dirname, './config/defaults/webpack.config.js');
+    return defaultConfig;
   }
 
   const customConfig = require(customConfigPath); // eslint-disable-line
 
   if (typeof customConfig === 'function') {
     logger.info('=> Loading custom webpack config (full-control mode).');
-    return customConfig(config, configType);
+    return customConfig(config, configType, defaultConfig);
   }
 
   logger.info('=> Loading custom webpack config.');
@@ -129,9 +132,9 @@ export default function(configType, baseConfig, projectDir, configDir) {
     plugins: [...config.plugins, ...(customConfig.plugins || [])],
     module: {
       ...config.module,
-      // We need to use our and custom loaders.
+      // We need to use our and custom rules.
       ...customConfig.module,
-      loaders: [...config.module.loaders, ...(customConfig.module.loaders || [])],
+      rules: [...config.module.rules, ...(customConfig.module.rules || [])],
     },
   };
 }
diff --git a/app/react-native/src/server/config/babel.js b/app/react-native/src/server/config/babel.js
index 0a02919c85f..7c4414c5fa4 100644
--- a/app/react-native/src/server/config/babel.js
+++ b/app/react-native/src/server/config/babel.js
@@ -11,6 +11,7 @@ module.exports = {
     require.resolve('babel-preset-react'),
   ],
   plugins: [
+    require.resolve('babel-plugin-macros'),
     require.resolve('babel-plugin-syntax-trailing-function-commas'),
     require.resolve('babel-plugin-syntax-async-functions'),
     require.resolve('babel-plugin-transform-class-properties'),
diff --git a/app/react-native/src/server/config/defaults/webpack.config.js b/app/react-native/src/server/config/defaults/webpack.config.js
index 97df0e98f9a..ae3505cb707 100644
--- a/app/react-native/src/server/config/defaults/webpack.config.js
+++ b/app/react-native/src/server/config/defaults/webpack.config.js
@@ -1,63 +1,7 @@
-import autoprefixer from 'autoprefixer';
-import { includePaths } from '../utils';
+import deprecate from 'util-deprecate';
+import { createDefaultWebpackConfig } from '@storybook/core/server';
 
-// Add a default custom config which is similar to what React Create App does.
-module.exports = storybookBaseConfig => {
-  const newConfig = { ...storybookBaseConfig };
-
-  newConfig.module.loaders = [
-    ...newConfig.module.loaders,
-    {
-      test: /\.css?$/,
-      include: includePaths,
-      use: [
-        require.resolve('style-loader'),
-        require.resolve('css-loader'),
-        {
-          loader: require.resolve('postcss-loader'),
-          options: {
-            plugins: () => [
-              autoprefixer({
-                browsers: ['>1%', 'last 4 versions', 'Firefox ESR', 'not ie < 9'],
-              }),
-            ],
-          },
-        },
-      ],
-    },
-    {
-      test: /\.json$/,
-      include: includePaths,
-      loader: require.resolve('json-loader'),
-    },
-    {
-      test: /\.(jpg|png|gif|eot|svg|ttf|woff|woff2)(\?.*)?$/,
-      include: includePaths,
-      loader: require.resolve('file-loader'),
-      query: {
-        name: 'static/media/[name].[hash:8].[ext]',
-      },
-    },
-    {
-      test: /\.(mp4|webm)(\?.*)?$/,
-      include: includePaths,
-      loader: require.resolve('url-loader'),
-      query: {
-        limit: 10000,
-        name: 'static/media/[name].[hash:8].[ext]',
-      },
-    },
-  ];
-
-  newConfig.resolve = {
-    ...newConfig.resolve,
-    alias: {
-      ...((newConfig.resolve && newConfig.resolve.alias) || {}),
-      // This is to support NPM2
-      'babel-runtime/regenerator': require.resolve('babel-runtime/regenerator'),
-    },
-  };
-
-  // Return the altered config
-  return newConfig;
-};
+module.exports = deprecate(
+  createDefaultWebpackConfig,
+  "importing default webpack config generator from '@storybook/react-native/dist/server/config/defaults/webpack.config.js' is deprecated. Use third argument of your exported function instead. See https://storybook.js.org/configurations/custom-webpack-config/#full-control-mode--default"
+);
diff --git a/app/react-native/src/server/config/webpack.config.js b/app/react-native/src/server/config/webpack.config.js
index 44e9be40779..7739a77e6ab 100644
--- a/app/react-native/src/server/config/webpack.config.js
+++ b/app/react-native/src/server/config/webpack.config.js
@@ -27,7 +27,7 @@ const getConfig = options => ({
     new CaseSensitivePathsPlugin(),
   ],
   module: {
-    loaders: [
+    rules: [
       {
         test: /\.jsx?$/,
         loader: require.resolve('babel-loader'),
@@ -39,10 +39,10 @@ const getConfig = options => ({
         test: /\.md$/,
         use: [
           {
-            loader: 'html-loader',
+            loader: require.resolve('html-loader'),
           },
           {
-            loader: 'markdown-loader',
+            loader: require.resolve('markdown-loader'),
           },
         ],
       },
diff --git a/app/react-native/src/server/config/webpack.config.prod.js b/app/react-native/src/server/config/webpack.config.prod.js
index e0e2cdb1598..578a4b57ff0 100644
--- a/app/react-native/src/server/config/webpack.config.prod.js
+++ b/app/react-native/src/server/config/webpack.config.prod.js
@@ -37,6 +37,9 @@ const getConfig = options => {
           ie8: false,
           mangle: false,
           warnings: false,
+          compress: {
+            keep_fnames: true,
+          },
           output: {
             comments: false,
           },
@@ -44,7 +47,7 @@ const getConfig = options => {
       }),
     ],
     module: {
-      loaders: [
+      rules: [
         {
           test: /\.jsx?$/,
           loader: require.resolve('babel-loader'),
@@ -56,10 +59,10 @@ const getConfig = options => {
           test: /\.md$/,
           use: [
             {
-              loader: 'html-loader',
+              loader: require.resolve('html-loader'),
             },
             {
-              loader: 'markdown-loader',
+              loader: require.resolve('markdown-loader'),
             },
           ],
         },
diff --git a/app/react-native/src/server/index.html.ejs b/app/react-native/src/server/index.html.ejs
index 84b46693e47..b383519cb3d 100644
--- a/app/react-native/src/server/index.html.ejs
+++ b/app/react-native/src/server/index.html.ejs
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
 <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/app/react-native/src/server/index.js b/app/react-native/src/server/index.js
index 09e0a34284b..c00d8cb05d8 100755
--- a/app/react-native/src/server/index.js
+++ b/app/react-native/src/server/index.js
@@ -24,6 +24,13 @@ export default class Server {
       }
     }
 
+    // see https://github.com/websockets/ws/issues/1256#issuecomment-364988689
+    socket.on('error', err => {
+      // Ignore network errors like `ECONNRESET`, `EPIPE`, etc.
+      if (err.errno) return;
+      throw err;
+    });
+
     socket.on('message', data => {
       this.wsServer.clients.forEach(c => {
         if (!this.options.manualId || (socket.pairedId && socket.pairedId === c.pairedId)) {
diff --git a/app/react/.babelrc b/app/react/.babelrc
deleted file mode 100644
index 845c3cf4d75..00000000000
--- a/app/react/.babelrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "presets": ["env", "stage-0", "react"]
-}
diff --git a/app/react/package.json b/app/react/package.json
index b93ba0bf1b8..3044ea30242 100644
--- a/app/react/package.json
+++ b/app/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "Storybook for React: Develop React Component in isolation with Hot Reloading.",
   "homepage": "https://github.com/storybooks/storybook/tree/master/app/react",
   "bugs": {
@@ -23,70 +23,52 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addon-actions": "^3.4.0-alpha.0",
-    "@storybook/addon-links": "^3.4.0-alpha.0",
-    "@storybook/addons": "^3.4.0-alpha.0",
-    "@storybook/channel-postmessage": "^3.4.0-alpha.0",
-    "@storybook/client-logger": "^3.4.0-alpha.0",
-    "@storybook/core": "^3.4.0-alpha.0",
-    "@storybook/node-logger": "^3.4.0-alpha.0",
-    "@storybook/ui": "^3.4.0-alpha.0",
-    "airbnb-js-shims": "^1.4.0",
-    "autoprefixer": "^7.2.4",
-    "babel-loader": "^7.1.2",
-    "babel-plugin-react-docgen": "^1.8.0",
+    "@storybook/addon-actions": "^3.4.0-alpha.9",
+    "@storybook/addon-links": "^3.4.0-alpha.9",
+    "@storybook/addons": "^3.4.0-alpha.9",
+    "@storybook/channel-postmessage": "^3.4.0-alpha.9",
+    "@storybook/client-logger": "^3.4.0-alpha.9",
+    "@storybook/core": "^3.4.0-alpha.9",
+    "@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.3",
+    "babel-plugin-macros": "^2.1.0",
+    "babel-plugin-react-docgen": "^1.8.3",
     "babel-plugin-transform-regenerator": "^6.26.0",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-env": "^1.6.1",
-    "babel-preset-minify": "^0.2.0",
+    "babel-preset-minify": "^0.3.0",
     "babel-preset-react": "^6.24.1",
-    "babel-preset-react-app": "^3.1.0",
     "babel-preset-stage-0": "^6.24.1",
     "babel-runtime": "^6.26.0",
     "case-sensitive-paths-webpack-plugin": "^2.1.1",
-    "chalk": "^2.3.0",
-    "commander": "^2.12.2",
-    "common-tags": "^1.6.0",
-    "configstore": "^3.1.1",
+    "common-tags": "^1.7.2",
     "core-js": "^2.5.3",
-    "css-loader": "^0.28.8",
-    "dotenv-webpack": "^1.5.4",
-    "express": "^4.16.2",
-    "file-loader": "^1.1.6",
+    "dotenv-webpack": "^1.5.5",
     "find-cache-dir": "^1.0.0",
     "glamor": "^2.20.40",
-    "glamorous": "^4.11.2",
+    "glamorous": "^4.11.6",
     "global": "^4.3.2",
-    "html-loader": "^0.5.4",
+    "html-loader": "^0.5.5",
     "html-webpack-plugin": "^2.30.1",
-    "json-loader": "^0.5.7",
-    "json-stringify-safe": "^5.0.1",
     "json5": "^0.5.1",
     "lodash.flattendeep": "^4.4.0",
-    "markdown-loader": "^2.0.1",
-    "npmlog": "^4.1.2",
-    "postcss-flexbugs-fixes": "^3.2.0",
-    "postcss-loader": "^2.0.10",
-    "prop-types": "^15.6.0",
-    "qs": "^6.5.1",
+    "markdown-loader": "^2.0.2",
+    "prop-types": "^15.6.1",
+    "react-dev-utils": "^5.0.0",
     "redux": "^3.7.2",
-    "request": "^2.83.0",
-    "serve-favicon": "^2.4.5",
-    "shelljs": "^0.7.8",
-    "style-loader": "^0.19.1",
-    "uglifyjs-webpack-plugin": "^1.1.6",
-    "url-loader": "^0.6.2",
+    "uglifyjs-webpack-plugin": "^1.2.2",
     "util-deprecate": "^1.0.2",
-    "uuid": "^3.1.0",
-    "webpack": "^3.10.0",
-    "webpack-dev-middleware": "^1.12.2",
-    "webpack-hot-middleware": "^2.21.0"
+    "webpack": "^3.11.0",
+    "webpack-hot-middleware": "^2.21.1"
   },
   "devDependencies": {
-    "nodemon": "^1.14.8"
+    "nodemon": "^1.17.1"
   },
   "peerDependencies": {
     "babel-core": "^6.26.0 || ^7.0.0-0",
+    "babel-runtime": ">=6.0.0",
     "react": ">=15.0.0 || ^16.0.0",
     "react-dom": ">=15.0.0 || ^16.0.0"
   }
diff --git a/app/react/src/client/manager/index.js b/app/react/src/client/manager/index.js
deleted file mode 100644
index 24082de7ca5..00000000000
--- a/app/react/src/client/manager/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* global document */
-
-import renderStorybookUI from '@storybook/ui';
-import Provider from './provider';
-
-const rootEl = document.getElementById('root');
-renderStorybookUI(rootEl, new Provider());
diff --git a/app/react/src/client/manager/preview.js b/app/react/src/client/manager/preview.js
deleted file mode 100644
index 4f8e792d964..00000000000
--- a/app/react/src/client/manager/preview.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-
-const iframeStyle = {
-  width: '100%',
-  height: '100%',
-  border: 0,
-  margin: 0,
-  padding: 0,
-};
-
-class Preview extends Component {
-  shouldComponentUpdate() {
-    // When the manager is re-rendered, due to changes in the layout (going full screen / changing
-    // addon panel to right) Preview section will update. If its re-rendered the whole html page
-    // inside the html is re-rendered making the story to re-mount.
-    // We dont have to re-render this component for any reason since changes are communicated to
-    // story using the channel and necessary changes are done by it.
-    return false;
-  }
-
-  render() {
-    return (
-      <iframe
-        id="storybook-preview-iframe"
-        title="preview"
-        style={iframeStyle}
-        src={this.props.url}
-        allowFullScreen
-      />
-    );
-  }
-}
-
-Preview.propTypes = {
-  url: PropTypes.string.isRequired,
-};
-
-export default Preview;
diff --git a/app/react/src/client/manager/provider.js b/app/react/src/client/manager/provider.js
deleted file mode 100644
index 84e75d88f88..00000000000
--- a/app/react/src/client/manager/provider.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import { location } from 'global';
-import qs from 'qs';
-import React from 'react';
-import { Provider } from '@storybook/ui';
-import addons from '@storybook/addons';
-import createChannel from '@storybook/channel-postmessage';
-import Preview from './preview';
-
-export default class ReactProvider extends Provider {
-  constructor() {
-    super();
-    this.channel = createChannel({ page: 'manager' });
-    addons.setChannel(this.channel);
-  }
-
-  getPanels() {
-    return addons.getPanels();
-  }
-
-  renderPreview(selectedKind, selectedStory) {
-    const queryParams = {
-      selectedKind,
-      selectedStory,
-    };
-
-    // Add the react-perf query string to the iframe if that present.
-    if (/react_perf/.test(location.search)) {
-      queryParams.react_perf = '1';
-    }
-
-    const queryString = qs.stringify(queryParams);
-    const url = `iframe.html?${queryString}`;
-    return <Preview url={url} />;
-  }
-
-  handleAPI(api) {
-    api.onStory((kind, story) => {
-      this.channel.emit('setCurrentStory', { kind, story });
-    });
-    this.channel.on('setStories', data => {
-      api.setStories(data.stories);
-    });
-    this.channel.on('selectStory', data => {
-      api.selectStory(data.kind, data.story);
-    });
-    this.channel.on('applyShortcut', data => {
-      api.handleShortcut(data.event);
-    });
-    addons.loadAddons(api);
-  }
-}
diff --git a/app/react/src/client/preview/index.js b/app/react/src/client/preview/index.js
index 2d7bfe85f32..e028ed0b332 100644
--- a/app/react/src/client/preview/index.js
+++ b/app/react/src/client/preview/index.js
@@ -23,11 +23,12 @@ const isBrowser =
   !(navigator.userAgent.indexOf('jsdom') > -1);
 
 const storyStore = new StoryStore();
-/* eslint-disable no-underscore-dangle */
 const reduxStore = createStore(reducer);
-/* eslint-enable */
 const context = { storyStore, reduxStore };
 
+const clientApi = new ClientApi(context);
+export const { storiesOf, setAddon, addDecorator, clearDecorators, getStorybook } = clientApi;
+
 if (isBrowser) {
   // setup preview channel
   const channel = createChannel({ page: 'preview' });
@@ -41,10 +42,10 @@ if (isBrowser) {
 
   // Handle keyboard shortcuts
   window.onkeydown = handleKeyboardShortcuts(channel);
-}
 
-const clientApi = new ClientApi(context);
-export const { storiesOf, setAddon, addDecorator, clearDecorators, getStorybook } = clientApi;
+  // Provide access to external scripts
+  window.__STORYBOOK_CLIENT_API__ = clientApi;
+}
 
 const configApi = new ConfigApi({ clearDecorators, ...context });
 export const { configure } = configApi;
diff --git a/app/react/src/demo/Welcome.js b/app/react/src/demo/Welcome.js
index fcde670c95f..e2ca878619e 100644
--- a/app/react/src/demo/Welcome.js
+++ b/app/react/src/demo/Welcome.js
@@ -33,35 +33,39 @@ const Link = glamorous.a({
   paddingBottom: 2,
 });
 
+const NavButton = glamorous(Link.withComponent('button'))({
+  borderTop: 'none',
+  borderRight: 'none',
+  borderLeft: 'none',
+  backgroundColor: 'transparent',
+  padding: 0,
+  cursor: 'pointer',
+  font: 'inherit',
+});
 const StoryLink = Link.withComponent(LinkTo);
 
-const Welcome = props =>
+const Welcome = props => (
   <Main>
     <Title>Welcome to storybook</Title>
     <p>This is a UI component dev environment for your app.</p>
     <p>
-      We've added some basic stories inside the
-      {' '}
-      <InlineCode>src/stories</InlineCode>
-      {' '}
-      directory.
+      We've added some basic stories inside the <InlineCode>src/stories</InlineCode> directory.
       <br />
-      A story is a single state of one or more UI components. You can have as many stories as
-      you want.
+      A story is a single state of one or more UI components. You can have as many stories as you
+      want.
       <br />
       (Basically a story is like a visual test case.)
     </p>
     <p>
-      See these sample
-      {' '}
-      {props.showApp
-        ? <Link onClick={props.showApp} role="button" tabIndex="0">stories</Link>
-        : <StoryLink kind={props.showKind} story={props.showStory}>stories</StoryLink>
-      }
-      {' '}
-      for a component called
-      {' '}
-      <InlineCode>Button</InlineCode>
+      See these sample{' '}
+      {props.showApp ? (
+        <NavButton onClick={props.showApp}>stories</NavButton>
+      ) : (
+        <StoryLink kind={props.showKind} story={props.showStory}>
+          stories
+        </StoryLink>
+      )}{' '}
+      for a component called <InlineCode>Button</InlineCode>
       .
     </p>
     <p>
@@ -69,34 +73,29 @@ const Welcome = props =>
       <br />
       You can also edit those components and see changes right away.
       <br />
-      (Try editing the <InlineCode>Button</InlineCode> stories
-      located at <InlineCode>src/stories/index.js</InlineCode>.)
+      (Try editing the <InlineCode>Button</InlineCode> stories located at{' '}
+      <InlineCode>src/stories/index.js</InlineCode>.)
     </p>
     <p>
       Usually we create stories with smaller UI components in the app.<br />
-      Have a look at the
-      {' '}
+      Have a look at the{' '}
       <Link
         href="https://storybook.js.org/basics/writing-stories"
         target="_blank"
         rel="noopener noreferrer"
       >
         Writing Stories
-      </Link>
-      {' '}
+      </Link>{' '}
       section in our documentation.
     </p>
     <Note>
       <b>NOTE:</b>
       <br />
-      Have a look at the
-      {' '}
-      <InlineCode>.storybook/webpack.config.js</InlineCode>
-      {' '}
-      to add webpack
+      Have a look at the <InlineCode>.storybook/webpack.config.js</InlineCode> to add webpack
       loaders and plugins you are using in this project.
     </Note>
-  </Main>;
+  </Main>
+);
 
 Welcome.displayName = 'Welcome';
 Welcome.propTypes = {
@@ -104,5 +103,10 @@ Welcome.propTypes = {
   showKind: PropTypes.string,
   showStory: PropTypes.string,
 };
+Welcome.defaultProps = {
+  showApp: null,
+  showKind: null,
+  showStory: null,
+};
 
 export { Welcome as default };
diff --git a/app/react/src/server/build.js b/app/react/src/server/build.js
index a6a9635a00d..804f258a0ba 100755
--- a/app/react/src/server/build.js
+++ b/app/react/src/server/build.js
@@ -1,83 +1,12 @@
-import webpack from 'webpack';
-import program from 'commander';
+import { buildStatic } from '@storybook/core/server';
 import path from 'path';
-import fs from 'fs';
-import chalk from 'chalk';
-import shelljs from 'shelljs';
-import { logger } from '@storybook/node-logger';
 import packageJson from '../../package.json';
 import getBaseConfig from './config/webpack.config.prod';
 import loadConfig from './config';
-import { parseList, getEnvConfig } from './utils';
 
-process.env.NODE_ENV = process.env.NODE_ENV || 'production';
-
-program
-  .version(packageJson.version)
-  .option('-s, --static-dir <dir-names>', 'Directory where to load static files from', parseList)
-  .option('-o, --output-dir [dir-name]', 'Directory where to store built files')
-  .option('-c, --config-dir [dir-name]', 'Directory where to load Storybook configurations from')
-  .option('-d, --db-path [db-file]', 'DEPRECATED!')
-  .option('--enable-db', 'DEPRECATED!')
-  .parse(process.argv);
-
-logger.info(chalk.bold(`${packageJson.name} v${packageJson.version}\n`));
-
-if (program.enableDb || program.dbPath) {
-  logger.error(
-    [
-      'Error: the experimental local database addon is no longer bundled with',
-      'react-storybook. Please remove these flags (-d,--db-path,--enable-db)',
-      'from the command or npm script and try again.',
-    ].join(' ')
-  );
-  process.exit(1);
-}
-
-// The key is the field created in `program` variable for
-// each command line argument. Value is the env variable.
-getEnvConfig(program, {
-  staticDir: 'SBCONFIG_STATIC_DIR',
-  outputDir: 'SBCONFIG_OUTPUT_DIR',
-  configDir: 'SBCONFIG_CONFIG_DIR',
-});
-
-const configDir = program.configDir || './.storybook';
-const outputDir = program.outputDir || './storybook-static';
-
-// create output directory if not exists
-shelljs.mkdir('-p', path.resolve(outputDir));
-// clear the static dir
-shelljs.rm('-rf', path.resolve(outputDir, 'static'));
-shelljs.cp(path.resolve(__dirname, 'public/favicon.ico'), outputDir);
-
-// Build the webpack configuration using the `baseConfig`
-// custom `.babelrc` file and `webpack.config.js` files
-// NOTE changes to env should be done before calling `getBaseConfig`
-const config = loadConfig('PRODUCTION', getBaseConfig(configDir), configDir);
-config.output.path = path.resolve(outputDir);
-
-// copy all static files
-if (program.staticDir) {
-  program.staticDir.forEach(dir => {
-    if (!fs.existsSync(dir)) {
-      logger.error(`Error: no such directory to load static files: ${dir}`);
-      process.exit(-1);
-    }
-    logger.info(`=> Copying static files from: ${dir}`);
-    shelljs.cp('-r', `${dir}/*`, outputDir);
-  });
-}
-
-// compile all resources with webpack and write them to the disk.
-logger.info('Building storybook ...');
-webpack(config).run((err, stats) => {
-  if (err || stats.hasErrors()) {
-    logger.error('Failed to build the storybook');
-    // eslint-disable-next-line no-unused-expressions
-    err && logger.error(err.message);
-    // eslint-disable-next-line no-unused-expressions
-    stats && stats.hasErrors() && stats.toJson().errors.forEach(e => logger.error(e));
-    process.exit(1);
-  }
+buildStatic({
+  packageJson,
+  getBaseConfig,
+  loadConfig,
+  defaultFavIcon: path.resolve(__dirname, 'public/favicon.ico'),
 });
diff --git a/app/react/src/server/config.js b/app/react/src/server/config.js
index 2e4fb8f7720..dfe7c66ed05 100644
--- a/app/react/src/server/config.js
+++ b/app/react/src/server/config.js
@@ -3,6 +3,7 @@ import fs from 'fs';
 import path from 'path';
 import findCacheDir from 'find-cache-dir';
 import { logger } from '@storybook/node-logger';
+import { createDefaultWebpackConfig } from '@storybook/core/server';
 import loadBabelConfig from './babel_config';
 
 // `baseConfig` is a webpack configuration bundled with storybook.
@@ -41,22 +42,21 @@ export default function(configType, baseConfig, configDir) {
     config.entry.manager.splice(1, 0, storybookDefaultAddonsPath);
   }
 
+  const defaultConfig = createDefaultWebpackConfig(config);
+
   // Check whether user has a custom webpack config file and
   // return the (extended) base configuration if it's not available.
   const customConfigPath = path.resolve(configDir, 'webpack.config.js');
 
   if (!fs.existsSync(customConfigPath)) {
     logger.info('=> Using default webpack setup based on "Create React App".');
-    const configPath = path.resolve(__dirname, './config/defaults/webpack.config.js');
-    const customConfig = require(configPath);
-
-    return customConfig(config);
+    return defaultConfig;
   }
   const customConfig = require(customConfigPath);
 
   if (typeof customConfig === 'function') {
     logger.info('=> Loading custom webpack config (full-control mode).');
-    return customConfig(config, configType);
+    return customConfig(config, configType, defaultConfig);
   }
   logger.info('=> Loading custom webpack config (extending mode).');
   return {
diff --git a/app/react/src/server/config/WatchMissingNodeModulesPlugin.js b/app/react/src/server/config/WatchMissingNodeModulesPlugin.js
deleted file mode 100644
index 962bbb97ff4..00000000000
--- a/app/react/src/server/config/WatchMissingNodeModulesPlugin.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-// @remove-on-eject-end
-
-// This Webpack plugin ensures `npm install <library>` forces a project rebuild.
-// We’re not sure why this isn't Webpack's default behavior.
-// See https://github.com/facebookincubator/create-react-app/issues/186.
-
-function WatchMissingNodeModulesPlugin(nodeModulesPath) {
-  this.nodeModulesPath = nodeModulesPath;
-}
-
-WatchMissingNodeModulesPlugin.prototype.apply = function apply(compiler) {
-  compiler.plugin('emit', (compilation, callback) => {
-    const missingDeps = compilation.missingDependencies;
-    const { nodeModulesPath } = this;
-
-    // If any missing files are expected to appear in node_modules...
-    if (missingDeps.some(file => file.indexOf(nodeModulesPath) !== -1)) {
-      // ...tell webpack to watch node_modules recursively until they appear.
-      compilation.contextDependencies.push(nodeModulesPath);
-    }
-
-    callback();
-  });
-};
-
-module.exports = WatchMissingNodeModulesPlugin;
diff --git a/app/react/src/server/config/babel.js b/app/react/src/server/config/babel.js
index 2f904b2e2fd..0ce366ebe9a 100644
--- a/app/react/src/server/config/babel.js
+++ b/app/react/src/server/config/babel.js
@@ -15,6 +15,7 @@ module.exports = {
     require.resolve('babel-preset-react'),
   ],
   plugins: [
+    require.resolve('babel-plugin-macros'),
     require.resolve('babel-plugin-transform-regenerator'),
     [
       require.resolve('babel-plugin-transform-runtime'),
diff --git a/app/react/src/server/config/defaults/webpack.config.js b/app/react/src/server/config/defaults/webpack.config.js
index 477d1c4c62b..0c27cf2bc44 100644
--- a/app/react/src/server/config/defaults/webpack.config.js
+++ b/app/react/src/server/config/defaults/webpack.config.js
@@ -1,73 +1,7 @@
-// import webpack from 'webpack';
-import autoprefixer from 'autoprefixer';
-import { includePaths } from '../utils';
+import deprecate from 'util-deprecate';
+import { createDefaultWebpackConfig } from '@storybook/core/server';
 
-// Add a default custom config which is similar to what React Create App does.
-module.exports = storybookBaseConfig => {
-  const newConfig = { ...storybookBaseConfig };
-
-  newConfig.module.rules = [
-    ...storybookBaseConfig.module.rules,
-    {
-      test: /\.css$/,
-      use: [
-        require.resolve('style-loader'),
-        {
-          loader: require.resolve('css-loader'),
-          options: {
-            importLoaders: 1,
-          },
-        },
-        {
-          loader: require.resolve('postcss-loader'),
-          options: {
-            ident: 'postcss', // https://webpack.js.org/guides/migrating/#complex-options
-            plugins: () => [
-              require('postcss-flexbugs-fixes'), // eslint-disable-line
-              autoprefixer({
-                browsers: [
-                  '>1%',
-                  'last 4 versions',
-                  'Firefox ESR',
-                  'not ie < 9', // React doesn't support IE8 anyway
-                ],
-                flexbox: 'no-2009',
-              }),
-            ],
-          },
-        },
-      ],
-    },
-    {
-      test: /\.json$/,
-      include: includePaths,
-      loader: require.resolve('json-loader'),
-    },
-    {
-      test: /\.(ico|jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2)(\?.*)?$/,
-      include: includePaths,
-      loader: require.resolve('file-loader'),
-      query: {
-        name: 'static/media/[name].[hash:8].[ext]',
-      },
-    },
-    {
-      test: /\.(mp4|webm|wav|mp3|m4a|aac|oga)(\?.*)?$/,
-      include: includePaths,
-      loader: require.resolve('url-loader'),
-      query: {
-        limit: 10000,
-        name: 'static/media/[name].[hash:8].[ext]',
-      },
-    },
-  ];
-
-  newConfig.resolve.alias = {
-    ...storybookBaseConfig.resolve.alias,
-    // This is to support NPM2
-    'babel-runtime/regenerator': require.resolve('babel-runtime/regenerator'),
-  };
-
-  // Return the altered config
-  return newConfig;
-};
+module.exports = deprecate(
+  createDefaultWebpackConfig,
+  "importing default webpack config generator from '@storybook/react/dist/server/config/defaults/webpack.config.js' is deprecated. Use third argument of your exported function instead. See https://storybook.js.org/configurations/custom-webpack-config/#full-control-mode--default"
+);
diff --git a/app/react/src/server/config/webpack.config.js b/app/react/src/server/config/webpack.config.js
index 49f32d9a82a..2b29ad8e58a 100644
--- a/app/react/src/server/config/webpack.config.js
+++ b/app/react/src/server/config/webpack.config.js
@@ -1,9 +1,10 @@
 import path from 'path';
 import webpack from 'webpack';
 import Dotenv from 'dotenv-webpack';
+import InterpolateHtmlPlugin from 'react-dev-utils/InterpolateHtmlPlugin';
 import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
-import WatchMissingNodeModulesPlugin from './WatchMissingNodeModulesPlugin';
+import { WatchMissingNodeModulesPlugin, managerPath } from '@storybook/core/server';
 
 import { includePaths, excludePaths, nodeModulesPaths, loadEnv, nodePaths } from './utils';
 import babelLoaderConfig from './babel';
@@ -14,7 +15,7 @@ export default function(configDir) {
   const config = {
     devtool: 'cheap-module-source-map',
     entry: {
-      manager: [require.resolve('./polyfills'), require.resolve('../../client/manager')],
+      manager: [require.resolve('./polyfills'), managerPath],
       preview: [
         require.resolve('./polyfills'),
         require.resolve('./globals'),
@@ -27,6 +28,7 @@ export default function(configDir) {
       publicPath: '/',
     },
     plugins: [
+      new InterpolateHtmlPlugin(process.env),
       new HtmlWebpackPlugin({
         filename: 'index.html',
         chunks: ['manager'],
@@ -49,7 +51,7 @@ export default function(configDir) {
       new CaseSensitivePathsPlugin(),
       new WatchMissingNodeModulesPlugin(nodeModulesPaths),
       new webpack.ProgressPlugin(),
-      new Dotenv(),
+      new Dotenv({ silent: true }),
     ],
     module: {
       rules: [
@@ -64,10 +66,10 @@ export default function(configDir) {
           test: /\.md$/,
           use: [
             {
-              loader: 'html-loader',
+              loader: require.resolve('html-loader'),
             },
             {
-              loader: 'markdown-loader',
+              loader: require.resolve('markdown-loader'),
             },
           ],
         },
diff --git a/app/react/src/server/config/webpack.config.prod.js b/app/react/src/server/config/webpack.config.prod.js
index 61b6e0df2df..120737a1514 100644
--- a/app/react/src/server/config/webpack.config.prod.js
+++ b/app/react/src/server/config/webpack.config.prod.js
@@ -1,8 +1,9 @@
-import path from 'path';
 import webpack from 'webpack';
 import UglifyJsPlugin from 'uglifyjs-webpack-plugin';
+import Dotenv from 'dotenv-webpack';
+import InterpolateHtmlPlugin from 'react-dev-utils/InterpolateHtmlPlugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
-
+import { managerPath } from '@storybook/core/server';
 import babelLoaderConfig from './babel.prod';
 import { includePaths, excludePaths, loadEnv, nodePaths } from './utils';
 import { getPreviewHeadHtml, getManagerHeadHtml } from '../utils';
@@ -11,7 +12,7 @@ import { version } from '../../../package.json';
 export default function(configDir) {
   const entries = {
     preview: [require.resolve('./polyfills'), require.resolve('./globals')],
-    manager: [require.resolve('./polyfills'), path.resolve(__dirname, '../../client/manager')],
+    manager: [require.resolve('./polyfills'), managerPath],
   };
 
   const config = {
@@ -28,6 +29,7 @@ export default function(configDir) {
       publicPath: '',
     },
     plugins: [
+      new InterpolateHtmlPlugin(process.env),
       new HtmlWebpackPlugin({
         filename: 'index.html',
         chunks: ['manager'],
@@ -52,11 +54,15 @@ export default function(configDir) {
           ie8: false,
           mangle: false,
           warnings: false,
+          compress: {
+            keep_fnames: true,
+          },
           output: {
             comments: false,
           },
         },
       }),
+      new Dotenv({ silent: true }),
     ],
     module: {
       rules: [
@@ -71,10 +77,10 @@ export default function(configDir) {
           test: /\.md$/,
           use: [
             {
-              loader: 'html-loader',
+              loader: require.resolve('html-loader'),
             },
             {
-              loader: 'markdown-loader',
+              loader: require.resolve('markdown-loader'),
             },
           ],
         },
diff --git a/app/react/src/server/index.html.ejs b/app/react/src/server/index.html.ejs
index 397aaf41d52..dfcb56218d3 100644
--- a/app/react/src/server/index.html.ejs
+++ b/app/react/src/server/index.html.ejs
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/app/react/src/server/index.js b/app/react/src/server/index.js
index 0d923b4acb5..69df1fe59e5 100755
--- a/app/react/src/server/index.js
+++ b/app/react/src/server/index.js
@@ -1,166 +1,12 @@
-import express from 'express';
-import https from 'https';
-import favicon from 'serve-favicon';
-import program from 'commander';
+import { buildDev } from '@storybook/core/server';
 import path from 'path';
-import fs from 'fs';
-import chalk from 'chalk';
-import shelljs from 'shelljs';
-import { logger } from '@storybook/node-logger';
-import storybook, { webpackValid } from './middleware';
 import packageJson from '../../package.json';
-import { parseList, getEnvConfig } from './utils';
+import getBaseConfig from './config/webpack.config';
+import loadConfig from './config';
 
-process.env.NODE_ENV = process.env.NODE_ENV || 'development';
-
-program
-  .version(packageJson.version)
-  .option('-p, --port [number]', 'Port to run Storybook (Required)', str => parseInt(str, 10))
-  .option('-h, --host [string]', 'Host to run Storybook')
-  .option('-s, --static-dir <dir-names>', 'Directory where to load static files from')
-  .option('-c, --config-dir [dir-name]', 'Directory where to load Storybook configurations from')
-  .option(
-    '--https',
-    'Serve Storybook over HTTPS. Note: You must provide your own certificate information.'
-  )
-  .option(
-    '--ssl-ca <ca>',
-    'Provide an SSL certificate authority. (Optional with --https, required if using a self-signed certificate)',
-    parseList
-  )
-  .option('--ssl-cert <cert>', 'Provide an SSL certificate. (Required with --https)')
-  .option('--ssl-key <key>', 'Provide an SSL key. (Required with --https)')
-  .option('--smoke-test', 'Exit after successful start')
-  .option('-d, --db-path [db-file]', 'DEPRECATED!')
-  .option('--enable-db', 'DEPRECATED!')
-  .parse(process.argv);
-
-logger.info(chalk.bold(`${packageJson.name} v${packageJson.version}`) + chalk.reset('\n'));
-
-if (program.enableDb || program.dbPath) {
-  logger.error(
-    [
-      'Error: the experimental local database addon is no longer bundled with',
-      'react-storybook. Please remove these flags (-d,--db-path,--enable-db)',
-      'from the command or npm script and try again.',
-    ].join(' ')
-  );
-  process.exit(1);
-}
-
-// The key is the field created in `program` variable for
-// each command line argument. Value is the env variable.
-getEnvConfig(program, {
-  port: 'SBCONFIG_PORT',
-  host: 'SBCONFIG_HOSTNAME',
-  staticDir: 'SBCONFIG_STATIC_DIR',
-  configDir: 'SBCONFIG_CONFIG_DIR',
+buildDev({
+  packageJson,
+  getBaseConfig,
+  loadConfig,
+  defaultFavIcon: path.resolve(__dirname, 'public/favicon.ico'),
 });
-
-if (!program.port) {
-  logger.error('Error: port to run Storybook is required!\n');
-  program.help();
-  process.exit(-1);
-}
-
-// Used with `app.listen` below
-const listenAddr = [program.port];
-
-if (program.host) {
-  listenAddr.push(program.host);
-}
-
-const app = express();
-let server = app;
-
-if (program.https) {
-  if (!program.sslCert) {
-    logger.error('Error: --ssl-cert is required with --https');
-    process.exit(-1);
-  }
-  if (!program.sslKey) {
-    logger.error('Error: --ssl-key is required with --https');
-    process.exit(-1);
-  }
-
-  const sslOptions = {
-    ca: (program.sslCa || []).map(ca => fs.readFileSync(ca, 'utf-8')),
-    cert: fs.readFileSync(program.sslCert, 'utf-8'),
-    key: fs.readFileSync(program.sslKey, 'utf-8'),
-  };
-
-  server = https.createServer(sslOptions, app);
-}
-
-let hasCustomFavicon = false;
-
-if (program.staticDir) {
-  program.staticDir = parseList(program.staticDir);
-  program.staticDir.forEach(dir => {
-    const staticPath = path.resolve(dir);
-    if (!fs.existsSync(staticPath)) {
-      logger.error(`Error: no such directory to load static files: ${staticPath}`);
-      process.exit(-1);
-    }
-    logger.info(`=> Loading static files from: ${staticPath} .`);
-    app.use(express.static(staticPath, { index: false }));
-
-    const faviconPath = path.resolve(staticPath, 'favicon.ico');
-    if (fs.existsSync(faviconPath)) {
-      hasCustomFavicon = true;
-      app.use(favicon(faviconPath));
-    }
-  });
-}
-
-if (!hasCustomFavicon) {
-  app.use(favicon(path.resolve(__dirname, 'public/favicon.ico')));
-}
-
-// Build the webpack configuration using the `baseConfig`
-// custom `.babelrc` file and `webpack.config.js` files
-const configDir = program.configDir || './.storybook';
-
-// The repository info is sent to the storybook while running on
-// development mode so it'll be easier for tools to integrate.
-const exec = cmd => shelljs.exec(cmd, { silent: true }).stdout.trim();
-process.env.STORYBOOK_GIT_ORIGIN =
-  process.env.STORYBOOK_GIT_ORIGIN || exec('git remote get-url origin');
-process.env.STORYBOOK_GIT_BRANCH =
-  process.env.STORYBOOK_GIT_BRANCH || exec('git symbolic-ref HEAD --short');
-
-// NOTE changes to env should be done before calling `getBaseConfig`
-// `getBaseConfig` function which is called inside the middleware
-app.use(storybook(configDir));
-
-let serverResolve = () => {};
-let serverReject = () => {};
-const serverListening = new Promise((resolve, reject) => {
-  serverResolve = resolve;
-  serverReject = reject;
-});
-server.listen(...listenAddr, error => {
-  if (error) {
-    serverReject(error);
-  } else {
-    serverResolve();
-  }
-});
-
-Promise.all([webpackValid, serverListening])
-  .then(() => {
-    const proto = program.https ? 'https' : 'http';
-    const address = `${proto}://${program.host || 'localhost'}:${program.port}/`;
-    logger.info(`Storybook started on => ${chalk.cyan(address)}\n`);
-    if (program.smokeTest) {
-      process.exit(0);
-    }
-  })
-  .catch(error => {
-    if (error instanceof Error) {
-      logger.error(error);
-    }
-    if (program.smokeTest) {
-      process.exit(1);
-    }
-  });
diff --git a/app/react/src/server/middleware.js b/app/react/src/server/middleware.js
deleted file mode 100644
index 28e8554bccf..00000000000
--- a/app/react/src/server/middleware.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import path from 'path';
-import { Router } from 'express';
-import webpack from 'webpack';
-import webpackDevMiddleware from 'webpack-dev-middleware';
-import webpackHotMiddleware from 'webpack-hot-middleware';
-import getBaseConfig from './config/webpack.config';
-import loadConfig from './config';
-import { getMiddleware } from './utils';
-
-let webpackResolve = () => {};
-let webpackReject = () => {};
-export const webpackValid = new Promise((resolve, reject) => {
-  webpackResolve = resolve;
-  webpackReject = reject;
-});
-
-export default function(configDir) {
-  // Build the webpack configuration using the `getBaseConfig`
-  // custom `.babelrc` file and `webpack.config.js` files
-  const config = loadConfig('DEVELOPMENT', getBaseConfig(configDir), configDir);
-  const middlewareFn = getMiddleware(configDir);
-
-  // remove the leading '/'
-  let { publicPath } = config.output;
-  if (publicPath[0] === '/') {
-    publicPath = publicPath.slice(1);
-  }
-
-  const compiler = webpack(config);
-  const devMiddlewareOptions = {
-    noInfo: true,
-    publicPath: config.output.publicPath,
-    watchOptions: config.watchOptions || {},
-    ...config.devServer,
-  };
-
-  const router = new Router();
-  const webpackDevMiddlewareInstance = webpackDevMiddleware(compiler, devMiddlewareOptions);
-  router.use(webpackDevMiddlewareInstance);
-  router.use(webpackHotMiddleware(compiler));
-
-  // custom middleware
-  middlewareFn(router);
-
-  webpackDevMiddlewareInstance.waitUntilValid(stats => {
-    router.get('/', (req, res) => {
-      res.set('Content-Type', 'text/html');
-      res.sendFile(path.join(`${__dirname}/public/index.html`));
-    });
-
-    router.get('/iframe.html', (req, res) => {
-      res.set('Content-Type', 'text/html');
-      res.sendFile(path.join(`${__dirname}/public/iframe.html`));
-    });
-
-    if (stats.toJson().errors.length) {
-      webpackReject(stats);
-    } else {
-      webpackResolve(stats);
-    }
-  });
-
-  return router;
-}
diff --git a/app/react/src/server/utils.js b/app/react/src/server/utils.js
index 71396437a03..913f4c3219e 100644
--- a/app/react/src/server/utils.js
+++ b/app/react/src/server/utils.js
@@ -5,10 +5,6 @@ import deprecate from 'util-deprecate';
 const fallbackHeadUsage = deprecate(() => {},
 'Usage of head.html has been deprecated. Please rename head.html to preview-head.html');
 
-export function parseList(str) {
-  return str.split(',');
-}
-
 export function getPreviewHeadHtml(configDirPath) {
   const headHtmlPath = path.resolve(configDirPath, 'preview-head.html');
   const fallbackHtmlPath = path.resolve(configDirPath, 'head.html');
@@ -32,25 +28,3 @@ export function getManagerHeadHtml(configDirPath) {
 
   return scriptHtml;
 }
-
-export function getEnvConfig(program, configEnv) {
-  Object.keys(configEnv).forEach(fieldName => {
-    const envVarName = configEnv[fieldName];
-    const envVarValue = process.env[envVarName];
-    if (envVarValue) {
-      program[fieldName] = envVarValue; // eslint-disable-line
-    }
-  });
-}
-
-export function getMiddleware(configDir) {
-  const middlewarePath = path.resolve(configDir, 'middleware.js');
-  if (fs.existsSync(middlewarePath)) {
-    let middlewareModule = require(middlewarePath); // eslint-disable-line
-    if (middlewareModule.__esModule) { // eslint-disable-line
-      middlewareModule = middlewareModule.default;
-    }
-    return middlewareModule;
-  }
-  return () => {};
-}
diff --git a/app/vue/.babelrc b/app/vue/.babelrc
deleted file mode 100644
index 845c3cf4d75..00000000000
--- a/app/vue/.babelrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "presets": ["env", "stage-0", "react"]
-}
diff --git a/app/vue/README.md b/app/vue/README.md
index be675eef9e3..f65bf9eca9e 100644
--- a/app/vue/README.md
+++ b/app/vue/README.md
@@ -28,7 +28,7 @@ getstorybook
 For more information visit: [storybook.js.org](https://storybook.js.org)
 
 ## Starter Storybook-for-Vue Boilerplate project with [Vuetify](https://github.com/vuetifyjs/vuetify) Material Component Framework
-https://github.com/white-rabbit-japan/vuetify-storyboard-boilerplate
+<https://github.com/white-rabbit-japan/vuetify-storyboard-boilerplate>
 
 * * *
 
diff --git a/app/vue/package.json b/app/vue/package.json
index 59d416fa4e6..8c734803492 100644
--- a/app/vue/package.json
+++ b/app/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/vue",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "Storybook for Vue: Develop Vue Component in isolation with Hot Reloading.",
   "homepage": "https://github.com/storybooks/storybook/tree/master/apps/vue",
   "bugs": {
@@ -23,71 +23,49 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addon-actions": "^3.4.0-alpha.0",
-    "@storybook/addon-links": "^3.4.0-alpha.0",
-    "@storybook/addons": "^3.4.0-alpha.0",
-    "@storybook/channel-postmessage": "^3.4.0-alpha.0",
-    "@storybook/core": "^3.4.0-alpha.0",
-    "@storybook/ui": "^3.4.0-alpha.0",
-    "airbnb-js-shims": "^1.4.0",
-    "autoprefixer": "^7.2.4",
-    "babel-loader": "^7.1.2",
-    "babel-plugin-react-docgen": "^1.8.0",
+    "@storybook/addons": "^3.4.0-alpha.9",
+    "@storybook/channel-postmessage": "^3.4.0-alpha.9",
+    "@storybook/core": "^3.4.0-alpha.9",
+    "@storybook/ui": "^3.4.0-alpha.9",
+    "airbnb-js-shims": "^1.4.1",
+    "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",
     "babel-preset-env": "^1.6.0",
-    "babel-preset-minify": "^0.2.0",
-    "babel-preset-react": "^6.24.1",
-    "babel-preset-react-app": "^3.1.0",
+    "babel-preset-minify": "^0.3.0",
     "babel-preset-stage-0": "^6.24.1",
     "babel-runtime": "^6.26.0",
     "case-sensitive-paths-webpack-plugin": "^2.1.1",
-    "chalk": "^2.3.0",
-    "commander": "^2.12.2",
-    "common-tags": "^1.6.0",
-    "configstore": "^3.1.1",
+    "common-tags": "^1.7.2",
     "core-js": "^2.5.3",
-    "css-loader": "^0.28.8",
-    "dotenv-webpack": "^1.5.4",
-    "express": "^4.16.2",
-    "file-loader": "^1.1.6",
+    "dotenv-webpack": "^1.5.5",
     "find-cache-dir": "^1.0.0",
     "global": "^4.3.2",
+    "html-loader": "^0.5.5",
     "html-webpack-plugin": "^2.30.1",
-    "json-loader": "^0.5.7",
-    "json-stringify-safe": "^5.0.1",
     "json5": "^0.5.1",
-    "postcss-flexbugs-fixes": "^3.2.0",
-    "postcss-loader": "^2.0.10",
-    "prop-types": "^15.6.0",
-    "qs": "^6.5.1",
+    "markdown-loader": "^2.0.2",
     "react": "^16.2.0",
+    "react-dev-utils": "^5.0.0",
     "react-dom": "^16.2.0",
     "redux": "^3.7.2",
-    "request": "^2.83.0",
-    "serve-favicon": "^2.4.5",
-    "shelljs": "^0.7.8",
-    "style-loader": "^0.19.1",
-    "uglifyjs-webpack-plugin": "^1.1.6",
-    "url-loader": "^0.6.2",
+    "uglifyjs-webpack-plugin": "^1.2.2",
     "util-deprecate": "^1.0.2",
-    "uuid": "^3.1.0",
-    "vue-hot-reload-api": "^2.2.4",
-    "vue-style-loader": "^3.0.1",
-    "webpack": "^3.10.0",
-    "webpack-dev-middleware": "^1.12.2",
-    "webpack-hot-middleware": "^2.21.0"
+    "webpack": "^3.11.0",
+    "webpack-hot-middleware": "^2.21.1"
   },
   "devDependencies": {
-    "nodemon": "^1.14.8",
+    "nodemon": "^1.17.1",
     "vue": "^2.5.13",
-    "vue-loader": "^13.6.2",
+    "vue-loader": "^14.1.1",
     "vue-template-compiler": "^2.5.13"
   },
   "peerDependencies": {
     "babel-core": "^6.26.0 || ^7.0.0-0",
-    "vue": "2.5.13",
-    "vue-loader": "13.6.2",
-    "vue-template-compiler": "2.5.13"
+    "babel-runtime": ">=6.0.0",
+    "vue": ">=2.0.0",
+    "vue-loader": ">=13.0.0",
+    "vue-template-compiler": ">=2.0.0"
   }
 }
diff --git a/app/vue/src/client/index.js b/app/vue/src/client/index.js
index 4d19c3fb217..925ffed29bb 100644
--- a/app/vue/src/client/index.js
+++ b/app/vue/src/client/index.js
@@ -1,17 +1 @@
-// import deprecate from 'util-deprecate';
-
-// NOTE export these to keep backwards compatibility
-// import { action as deprecatedAction } from '@storybook/addon-actions';
-// import { linkTo as deprecatedLinkTo } from '@storybook/addon-links';
-
 export { storiesOf, setAddon, addDecorator, configure, getStorybook } from './preview';
-
-// export const action = deprecate(
-//   deprecatedAction,
-//   '@storybook/react action is deprecated. See: https://github.com/storybooks/storybook/tree/master/addons/actions'
-// );
-
-// export const linkTo = deprecate(
-//   deprecatedLinkTo,
-//   '@storybook/react linkTo is deprecated. See: https://github.com/storybooks/storybook/tree/master/addons/links'
-// );
diff --git a/app/vue/src/client/manager/index.js b/app/vue/src/client/manager/index.js
deleted file mode 100644
index 24082de7ca5..00000000000
--- a/app/vue/src/client/manager/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* global document */
-
-import renderStorybookUI from '@storybook/ui';
-import Provider from './provider';
-
-const rootEl = document.getElementById('root');
-renderStorybookUI(rootEl, new Provider());
diff --git a/app/vue/src/client/manager/preview.js b/app/vue/src/client/manager/preview.js
deleted file mode 100644
index 4f8e792d964..00000000000
--- a/app/vue/src/client/manager/preview.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-
-const iframeStyle = {
-  width: '100%',
-  height: '100%',
-  border: 0,
-  margin: 0,
-  padding: 0,
-};
-
-class Preview extends Component {
-  shouldComponentUpdate() {
-    // When the manager is re-rendered, due to changes in the layout (going full screen / changing
-    // addon panel to right) Preview section will update. If its re-rendered the whole html page
-    // inside the html is re-rendered making the story to re-mount.
-    // We dont have to re-render this component for any reason since changes are communicated to
-    // story using the channel and necessary changes are done by it.
-    return false;
-  }
-
-  render() {
-    return (
-      <iframe
-        id="storybook-preview-iframe"
-        title="preview"
-        style={iframeStyle}
-        src={this.props.url}
-        allowFullScreen
-      />
-    );
-  }
-}
-
-Preview.propTypes = {
-  url: PropTypes.string.isRequired,
-};
-
-export default Preview;
diff --git a/app/vue/src/client/preview/index.js b/app/vue/src/client/preview/index.js
index 9db85853c61..a6700c11f06 100644
--- a/app/vue/src/client/preview/index.js
+++ b/app/vue/src/client/preview/index.js
@@ -43,6 +43,8 @@ const decorateStory = (getStory, decorators) =>
     getStory
   );
 const context = { storyStore, reduxStore, decorateStory };
+const clientApi = new ClientApi(context);
+export const { storiesOf, setAddon, addDecorator, clearDecorators, getStorybook } = clientApi;
 
 if (isBrowser) {
   // create preview channel
@@ -57,10 +59,10 @@ if (isBrowser) {
 
   // Handle keyboard shortcuts
   window.onkeydown = handleKeyboardShortcuts(channel);
-}
 
-const clientApi = new ClientApi(context);
-export const { storiesOf, setAddon, addDecorator, clearDecorators, getStorybook } = clientApi;
+  // Provide access to external scripts
+  window.__STORYBOOK_CLIENT_API__ = clientApi;
+}
 
 const configApi = new ConfigApi({ ...context, clearDecorators });
 export const { configure } = configApi;
diff --git a/app/vue/src/server/addons.js b/app/vue/src/server/addons.js
deleted file mode 100644
index 280e2ac1365..00000000000
--- a/app/vue/src/server/addons.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// import '@storybook/addon-actions/register';
-// import '@storybook/addon-links/register';
diff --git a/app/vue/src/server/babel_config.js b/app/vue/src/server/babel_config.js
index 8eab74ed428..5f9184d1d87 100644
--- a/app/vue/src/server/babel_config.js
+++ b/app/vue/src/server/babel_config.js
@@ -65,20 +65,5 @@ export default function(configDir) {
     }
   }
 
-  const finalConfig = babelConfig || defaultConfig;
-  // Ensure plugins are defined or fallback to an array to avoid empty values.
-  const babelConfigPlugins = finalConfig.plugins || [];
-  const extraPlugins = [
-    [
-      require.resolve('babel-plugin-react-docgen'),
-      {
-        DOC_GEN_COLLECTION_NAME: 'STORYBOOK_REACT_CLASSES',
-      },
-    ],
-  ];
-  // If `babelConfigPlugins` is not an `Array`, calling `concat` will inject it
-  // as a single value, if it is an `Array` it will be spreaded.
-  finalConfig.plugins = [].concat(babelConfigPlugins, extraPlugins);
-
-  return finalConfig;
+  return babelConfig || defaultConfig;
 }
diff --git a/app/vue/src/server/babel_config.test.js b/app/vue/src/server/babel_config.test.js
deleted file mode 100644
index ba991adcd4e..00000000000
--- a/app/vue/src/server/babel_config.test.js
+++ /dev/null
@@ -1,110 +0,0 @@
-import loadBabelConfig from './babel_config';
-
-// eslint-disable-next-line global-require
-jest.mock('fs', () => require('../../../../__mocks__/fs'));
-jest.mock('path', () => ({
-  resolve: () => '.babelrc',
-}));
-
-const setup = ({ files }) => {
-  // eslint-disable-next-line no-underscore-dangle, global-require
-  require('fs').__setMockFiles(files);
-};
-
-describe('babel_config', () => {
-  // As the 'fs' is going to be mocked, let's call require.resolve
-  // so the require.cache has the correct route to the file.
-  // In fact let's use it in the tests :)
-  const babelPluginReactDocgenPath = require.resolve('babel-plugin-react-docgen');
-
-  it('should return the config with the extra plugins when `plugins` is an array.', () => {
-    setup({
-      files: {
-        '.babelrc': `{
-        "presets": [
-          "env",
-          "foo-preset"
-        ],
-        "plugins": [
-          "foo-plugin"
-        ]
-      }`,
-      },
-    });
-
-    const config = loadBabelConfig('.foo');
-
-    expect(config).toEqual({
-      babelrc: false,
-      plugins: [
-        'foo-plugin',
-        [
-          babelPluginReactDocgenPath,
-          {
-            DOC_GEN_COLLECTION_NAME: 'STORYBOOK_REACT_CLASSES',
-          },
-        ],
-      ],
-      presets: ['env', 'foo-preset'],
-    });
-  });
-
-  it('should return the config with the extra plugins when `plugins` is not an array.', () => {
-    setup({
-      files: {
-        '.babelrc': `{
-            "presets": [
-              "env",
-              "foo-preset"
-            ],
-            "plugins": "bar-plugin"
-          }`,
-      },
-    });
-
-    const config = loadBabelConfig('.bar');
-
-    expect(config).toEqual({
-      babelrc: false,
-      plugins: [
-        'bar-plugin',
-        [
-          babelPluginReactDocgenPath,
-          {
-            DOC_GEN_COLLECTION_NAME: 'STORYBOOK_REACT_CLASSES',
-          },
-        ],
-      ],
-      presets: ['env', 'foo-preset'],
-    });
-  });
-
-  it('should return the config only with the extra plugins when `plugins` is not present.', () => {
-    // Mock a `.babelrc` config file with no plugins key.
-    setup({
-      files: {
-        '.babelrc': `{
-            "presets": [
-              "env",
-              "foo-preset"
-            ]
-          }`,
-      },
-    });
-
-    const config = loadBabelConfig('.biz');
-
-    expect(config).toEqual({
-      babelrc: false,
-      plugins: [
-        [
-          babelPluginReactDocgenPath,
-          {
-            DOC_GEN_COLLECTION_NAME: 'STORYBOOK_REACT_CLASSES',
-          },
-        ],
-      ],
-      presets: ['env', 'foo-preset'],
-    });
-  });
-});
diff --git a/app/vue/src/server/build.js b/app/vue/src/server/build.js
index ea488da6a0e..804f258a0ba 100755
--- a/app/vue/src/server/build.js
+++ b/app/vue/src/server/build.js
@@ -1,85 +1,12 @@
-import webpack from 'webpack';
-import program from 'commander';
+import { buildStatic } from '@storybook/core/server';
 import path from 'path';
-import fs from 'fs';
-import chalk from 'chalk';
-import shelljs from 'shelljs';
 import packageJson from '../../package.json';
 import getBaseConfig from './config/webpack.config.prod';
 import loadConfig from './config';
-import { parseList, getEnvConfig } from './utils';
 
-process.env.NODE_ENV = process.env.NODE_ENV || 'production';
-
-// avoid ESLint errors
-const logger = console;
-
-program
-  .version(packageJson.version)
-  .option('-s, --static-dir <dir-names>', 'Directory where to load static files from', parseList)
-  .option('-o, --output-dir [dir-name]', 'Directory where to store built files')
-  .option('-c, --config-dir [dir-name]', 'Directory where to load Storybook configurations from')
-  .option('-d, --db-path [db-file]', 'DEPRECATED!')
-  .option('--enable-db', 'DEPRECATED!')
-  .parse(process.argv);
-
-logger.info(chalk.bold(`${packageJson.name} v${packageJson.version}\n`));
-
-if (program.enableDb || program.dbPath) {
-  logger.error(
-    [
-      'Error: the experimental local database addon is no longer bundled with',
-      'react-storybook. Please remove these flags (-d,--db-path,--enable-db)',
-      'from the command or npm script and try again.',
-    ].join(' ')
-  );
-  process.exit(1);
-}
-
-// The key is the field created in `program` variable for
-// each command line argument. Value is the env variable.
-getEnvConfig(program, {
-  staticDir: 'SBCONFIG_STATIC_DIR',
-  outputDir: 'SBCONFIG_OUTPUT_DIR',
-  configDir: 'SBCONFIG_CONFIG_DIR',
-});
-
-const configDir = program.configDir || './.storybook';
-const outputDir = program.outputDir || './storybook-static';
-
-// create output directory if not exists
-shelljs.mkdir('-p', path.resolve(outputDir));
-// clear the static dir
-shelljs.rm('-rf', path.resolve(outputDir, 'static'));
-shelljs.cp(path.resolve(__dirname, 'public/favicon.ico'), outputDir);
-
-// Build the webpack configuration using the `baseConfig`
-// custom `.babelrc` file and `webpack.config.js` files
-// NOTE changes to env should be done before calling `getBaseConfig`
-const config = loadConfig('PRODUCTION', getBaseConfig(configDir), configDir);
-config.output.path = path.resolve(outputDir);
-
-// copy all static files
-if (program.staticDir) {
-  program.staticDir.forEach(dir => {
-    if (!fs.existsSync(dir)) {
-      logger.error(`Error: no such directory to load static files: ${dir}`);
-      process.exit(-1);
-    }
-    logger.log(`=> Copying static files from: ${dir}`);
-    shelljs.cp('-r', `${dir}/*`, outputDir);
-  });
-}
-
-// compile all resources with webpack and write them to the disk.
-logger.log('Building storybook ...');
-webpack(config).run((err, stats) => {
-  if (err || stats.hasErrors()) {
-    logger.error('Failed to build the storybook');
-    // eslint-disable-next-line no-unused-expressions
-    err && logger.error(err.message);
-    // eslint-disable-next-line no-unused-expressions
-    stats.hasErrors() && stats.toJson().errors.forEach(e => logger.error(e));
-    process.exit(1);
-  }
+buildStatic({
+  packageJson,
+  getBaseConfig,
+  loadConfig,
+  defaultFavIcon: path.resolve(__dirname, 'public/favicon.ico'),
 });
diff --git a/app/vue/src/server/config.js b/app/vue/src/server/config.js
index 9b8c0755891..f326c4e5579 100644
--- a/app/vue/src/server/config.js
+++ b/app/vue/src/server/config.js
@@ -2,6 +2,7 @@
 import fs from 'fs';
 import path from 'path';
 import findCacheDir from 'find-cache-dir';
+import { createDefaultWebpackConfig } from '@storybook/core/server';
 import loadBabelConfig from './babel_config';
 
 // avoid ESLint errors
@@ -34,31 +35,27 @@ export default function(configType, baseConfig, configDir) {
   // Check whether addons.js file exists inside the storybook.
   // Load the default addons.js file if it's missing.
   // Insert it after polyfills.js, but before client/manager.
-  const storybookDefaultAddonsPath = path.resolve(__dirname, 'addons.js');
   const storybookCustomAddonsPath = path.resolve(configDir, 'addons.js');
   if (fs.existsSync(storybookCustomAddonsPath)) {
     logger.info('=> Loading custom addons config.');
     config.entry.manager.splice(1, 0, storybookCustomAddonsPath);
-  } else {
-    config.entry.manager.splice(1, 0, storybookDefaultAddonsPath);
   }
 
+  const defaultConfig = createDefaultWebpackConfig(config);
+
   // Check whether user has a custom webpack config file and
   // return the (extended) base configuration if it's not available.
   const customConfigPath = path.resolve(configDir, 'webpack.config.js');
 
   if (!fs.existsSync(customConfigPath)) {
     logger.info('=> Using default webpack setup based on "vue-cli".');
-    const configPath = path.resolve(__dirname, './config/defaults/webpack.config.js');
-    const customConfig = require(configPath);
-
-    return customConfig(config);
+    return defaultConfig;
   }
   const customConfig = require(customConfigPath);
 
   if (typeof customConfig === 'function') {
     logger.info('=> Loading custom webpack config (full-control mode).');
-    return customConfig(config, configType);
+    return customConfig(config, configType, defaultConfig);
   }
   logger.info('=> Loading custom webpack config (extending mode).');
   return {
diff --git a/app/vue/src/server/config/WatchMissingNodeModulesPlugin.js b/app/vue/src/server/config/WatchMissingNodeModulesPlugin.js
deleted file mode 100644
index 962bbb97ff4..00000000000
--- a/app/vue/src/server/config/WatchMissingNodeModulesPlugin.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-// @remove-on-eject-end
-
-// This Webpack plugin ensures `npm install <library>` forces a project rebuild.
-// We’re not sure why this isn't Webpack's default behavior.
-// See https://github.com/facebookincubator/create-react-app/issues/186.
-
-function WatchMissingNodeModulesPlugin(nodeModulesPath) {
-  this.nodeModulesPath = nodeModulesPath;
-}
-
-WatchMissingNodeModulesPlugin.prototype.apply = function apply(compiler) {
-  compiler.plugin('emit', (compilation, callback) => {
-    const missingDeps = compilation.missingDependencies;
-    const { nodeModulesPath } = this;
-
-    // If any missing files are expected to appear in node_modules...
-    if (missingDeps.some(file => file.indexOf(nodeModulesPath) !== -1)) {
-      // ...tell webpack to watch node_modules recursively until they appear.
-      compilation.contextDependencies.push(nodeModulesPath);
-    }
-
-    callback();
-  });
-};
-
-module.exports = WatchMissingNodeModulesPlugin;
diff --git a/app/vue/src/server/config/babel.js b/app/vue/src/server/config/babel.js
index 2f904b2e2fd..77a413a7cb4 100644
--- a/app/vue/src/server/config/babel.js
+++ b/app/vue/src/server/config/babel.js
@@ -12,9 +12,9 @@ module.exports = {
       },
     ],
     require.resolve('babel-preset-stage-0'),
-    require.resolve('babel-preset-react'),
   ],
   plugins: [
+    require.resolve('babel-plugin-macros'),
     require.resolve('babel-plugin-transform-regenerator'),
     [
       require.resolve('babel-plugin-transform-runtime'),
diff --git a/app/vue/src/server/config/babel.prod.js b/app/vue/src/server/config/babel.prod.js
index 59a87fe49bc..0418f1a1dc3 100644
--- a/app/vue/src/server/config/babel.prod.js
+++ b/app/vue/src/server/config/babel.prod.js
@@ -12,7 +12,6 @@ module.exports = {
       },
     ],
     require.resolve('babel-preset-stage-0'),
-    require.resolve('babel-preset-react'),
     require.resolve('babel-preset-minify'),
   ],
   plugins: [
diff --git a/app/vue/src/server/config/defaults/webpack.config.js b/app/vue/src/server/config/defaults/webpack.config.js
index 477d1c4c62b..45aa0467089 100644
--- a/app/vue/src/server/config/defaults/webpack.config.js
+++ b/app/vue/src/server/config/defaults/webpack.config.js
@@ -1,73 +1,7 @@
-// import webpack from 'webpack';
-import autoprefixer from 'autoprefixer';
-import { includePaths } from '../utils';
+import deprecate from 'util-deprecate';
+import { createDefaultWebpackConfig } from '@storybook/core/server';
 
-// Add a default custom config which is similar to what React Create App does.
-module.exports = storybookBaseConfig => {
-  const newConfig = { ...storybookBaseConfig };
-
-  newConfig.module.rules = [
-    ...storybookBaseConfig.module.rules,
-    {
-      test: /\.css$/,
-      use: [
-        require.resolve('style-loader'),
-        {
-          loader: require.resolve('css-loader'),
-          options: {
-            importLoaders: 1,
-          },
-        },
-        {
-          loader: require.resolve('postcss-loader'),
-          options: {
-            ident: 'postcss', // https://webpack.js.org/guides/migrating/#complex-options
-            plugins: () => [
-              require('postcss-flexbugs-fixes'), // eslint-disable-line
-              autoprefixer({
-                browsers: [
-                  '>1%',
-                  'last 4 versions',
-                  'Firefox ESR',
-                  'not ie < 9', // React doesn't support IE8 anyway
-                ],
-                flexbox: 'no-2009',
-              }),
-            ],
-          },
-        },
-      ],
-    },
-    {
-      test: /\.json$/,
-      include: includePaths,
-      loader: require.resolve('json-loader'),
-    },
-    {
-      test: /\.(ico|jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2)(\?.*)?$/,
-      include: includePaths,
-      loader: require.resolve('file-loader'),
-      query: {
-        name: 'static/media/[name].[hash:8].[ext]',
-      },
-    },
-    {
-      test: /\.(mp4|webm|wav|mp3|m4a|aac|oga)(\?.*)?$/,
-      include: includePaths,
-      loader: require.resolve('url-loader'),
-      query: {
-        limit: 10000,
-        name: 'static/media/[name].[hash:8].[ext]',
-      },
-    },
-  ];
-
-  newConfig.resolve.alias = {
-    ...storybookBaseConfig.resolve.alias,
-    // This is to support NPM2
-    'babel-runtime/regenerator': require.resolve('babel-runtime/regenerator'),
-  };
-
-  // Return the altered config
-  return newConfig;
-};
+module.exports = deprecate(
+  createDefaultWebpackConfig,
+  "importing default webpack config generator from '@storybook/vue/dist/server/config/defaults/webpack.config.js' is deprecated. Use third argument of your exported function instead. See https://storybook.js.org/configurations/custom-webpack-config/#full-control-mode--default"
+);
diff --git a/app/vue/src/server/config/webpack.config.js b/app/vue/src/server/config/webpack.config.js
index 7b82c774ec9..b06d1ffc136 100644
--- a/app/vue/src/server/config/webpack.config.js
+++ b/app/vue/src/server/config/webpack.config.js
@@ -1,9 +1,11 @@
 import path from 'path';
 import webpack from 'webpack';
 import Dotenv from 'dotenv-webpack';
+import InterpolateHtmlPlugin from 'react-dev-utils/InterpolateHtmlPlugin';
 import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
-import WatchMissingNodeModulesPlugin from './WatchMissingNodeModulesPlugin';
+import { WatchMissingNodeModulesPlugin, managerPath } from '@storybook/core/server';
+
 import { includePaths, excludePaths, nodeModulesPaths, loadEnv, nodePaths } from './utils';
 import { getPreviewHeadHtml, getManagerHeadHtml } from '../utils';
 import babelLoaderConfig from './babel';
@@ -13,7 +15,7 @@ export default function(configDir) {
   const config = {
     devtool: 'cheap-module-source-map',
     entry: {
-      manager: [require.resolve('./polyfills'), require.resolve('../../client/manager')],
+      manager: [require.resolve('./polyfills'), managerPath],
       preview: [
         require.resolve('./polyfills'),
         require.resolve('./globals'),
@@ -26,6 +28,7 @@ export default function(configDir) {
       publicPath: '/',
     },
     plugins: [
+      new InterpolateHtmlPlugin(process.env),
       new HtmlWebpackPlugin({
         filename: 'index.html',
         chunks: ['manager'],
@@ -48,7 +51,7 @@ export default function(configDir) {
       new CaseSensitivePathsPlugin(),
       new WatchMissingNodeModulesPlugin(nodeModulesPaths),
       new webpack.ProgressPlugin(),
-      new Dotenv(),
+      new Dotenv({ silent: true }),
     ],
     module: {
       rules: [
@@ -68,10 +71,10 @@ export default function(configDir) {
           test: /\.md$/,
           use: [
             {
-              loader: 'html-loader',
+              loader: require.resolve('html-loader'),
             },
             {
-              loader: 'markdown-loader',
+              loader: require.resolve('markdown-loader'),
             },
           ],
         },
@@ -80,14 +83,12 @@ export default function(configDir) {
     resolve: {
       // Since we ship with json-loader always, it's better to move extensions to here
       // from the default config.
-      extensions: ['.js', '.json', '.jsx'],
+      extensions: ['.js', '.json', '.jsx', '.vue'],
       // Add support to NODE_PATH. With this we could avoid relative path imports.
       // Based on this CRA feature: https://github.com/facebookincubator/create-react-app/issues/253
       modules: ['node_modules'].concat(nodePaths),
       alias: {
         vue$: require.resolve('vue/dist/vue.esm.js'),
-        react$: require.resolve('react'),
-        'react-dom$': require.resolve('react-dom'),
       },
     },
     performance: {
diff --git a/app/vue/src/server/config/webpack.config.prod.js b/app/vue/src/server/config/webpack.config.prod.js
index 070dfcf3b0d..40091d93f19 100644
--- a/app/vue/src/server/config/webpack.config.prod.js
+++ b/app/vue/src/server/config/webpack.config.prod.js
@@ -1,8 +1,9 @@
-import path from 'path';
 import webpack from 'webpack';
 import UglifyJsPlugin from 'uglifyjs-webpack-plugin';
+import Dotenv from 'dotenv-webpack';
+import InterpolateHtmlPlugin from 'react-dev-utils/InterpolateHtmlPlugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
-
+import { managerPath } from '@storybook/core/server';
 import babelLoaderConfig from './babel.prod';
 import { includePaths, excludePaths, loadEnv, nodePaths } from './utils';
 import { getPreviewHeadHtml, getManagerHeadHtml } from '../utils';
@@ -11,7 +12,7 @@ import { version } from '../../../package.json';
 export default function(configDir) {
   const entries = {
     preview: [require.resolve('./polyfills'), require.resolve('./globals')],
-    manager: [require.resolve('./polyfills'), path.resolve(__dirname, '../../client/manager')],
+    manager: [require.resolve('./polyfills'), managerPath],
   };
 
   const config = {
@@ -28,6 +29,7 @@ export default function(configDir) {
       publicPath: '',
     },
     plugins: [
+      new InterpolateHtmlPlugin(process.env),
       new HtmlWebpackPlugin({
         filename: 'index.html',
         chunks: ['manager'],
@@ -52,11 +54,15 @@ export default function(configDir) {
           ie8: false,
           mangle: false,
           warnings: false,
+          compress: {
+            keep_fnames: true,
+          },
           output: {
             comments: false,
           },
         },
       }),
+      new Dotenv({ silent: true }),
     ],
     module: {
       rules: [
@@ -76,10 +82,10 @@ export default function(configDir) {
           test: /\.md$/,
           use: [
             {
-              loader: 'html-loader',
+              loader: require.resolve('html-loader'),
             },
             {
-              loader: 'markdown-loader',
+              loader: require.resolve('markdown-loader'),
             },
           ],
         },
@@ -88,14 +94,12 @@ export default function(configDir) {
     resolve: {
       // Since we ship with json-loader always, it's better to move extensions to here
       // from the default config.
-      extensions: ['.js', '.json', '.jsx'],
+      extensions: ['.js', '.json', '.jsx', '.vue'],
       // Add support to NODE_PATH. With this we could avoid relative path imports.
       // Based on this CRA feature: https://github.com/facebookincubator/create-react-app/issues/253
       modules: ['node_modules'].concat(nodePaths),
       alias: {
         vue$: require.resolve('vue/dist/vue.esm.js'),
-        react$: require.resolve('react'),
-        'react-dom$': require.resolve('react-dom'),
       },
     },
   };
diff --git a/app/vue/src/server/index.html.ejs b/app/vue/src/server/index.html.ejs
index 397aaf41d52..dfcb56218d3 100644
--- a/app/vue/src/server/index.html.ejs
+++ b/app/vue/src/server/index.html.ejs
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/app/vue/src/server/index.js b/app/vue/src/server/index.js
index 5871f7bf70e..69df1fe59e5 100755
--- a/app/vue/src/server/index.js
+++ b/app/vue/src/server/index.js
@@ -1,167 +1,12 @@
-import express from 'express';
-import https from 'https';
-import favicon from 'serve-favicon';
-import program from 'commander';
+import { buildDev } from '@storybook/core/server';
 import path from 'path';
-import fs from 'fs';
-import chalk from 'chalk';
-import shelljs from 'shelljs';
-import storybook, { webpackValid } from './middleware';
 import packageJson from '../../package.json';
-import { parseList, getEnvConfig } from './utils';
+import getBaseConfig from './config/webpack.config';
+import loadConfig from './config';
 
-process.env.NODE_ENV = process.env.NODE_ENV || 'development';
-
-const logger = console;
-
-program
-  .version(packageJson.version)
-  .option('-p, --port [number]', 'Port to run Storybook (Required)', str => parseInt(str, 10))
-  .option('-h, --host [string]', 'Host to run Storybook')
-  .option('-s, --static-dir <dir-names>', 'Directory where to load static files from')
-  .option('-c, --config-dir [dir-name]', 'Directory where to load Storybook configurations from')
-  .option(
-    '--https',
-    'Serve Storybook over HTTPS. Note: You must provide your own certificate information.'
-  )
-  .option(
-    '--ssl-ca <ca>',
-    'Provide an SSL certificate authority. (Optional with --https, required if using a self-signed certificate)',
-    parseList
-  )
-  .option('--ssl-cert <cert>', 'Provide an SSL certificate. (Required with --https)')
-  .option('--ssl-key <key>', 'Provide an SSL key. (Required with --https)')
-  .option('--smoke-test', 'Exit after successful start')
-  .option('-d, --db-path [db-file]', 'DEPRECATED!')
-  .option('--enable-db', 'DEPRECATED!')
-  .parse(process.argv);
-
-logger.info(chalk.bold(`${packageJson.name} v${packageJson.version}`) + chalk.reset('\n'));
-
-if (program.enableDb || program.dbPath) {
-  logger.error(
-    [
-      'Error: the experimental local database addon is no longer bundled with',
-      'react-storybook. Please remove these flags (-d,--db-path,--enable-db)',
-      'from the command or npm script and try again.',
-    ].join(' ')
-  );
-  process.exit(1);
-}
-
-// The key is the field created in `program` variable for
-// each command line argument. Value is the env variable.
-getEnvConfig(program, {
-  port: 'SBCONFIG_PORT',
-  host: 'SBCONFIG_HOSTNAME',
-  staticDir: 'SBCONFIG_STATIC_DIR',
-  configDir: 'SBCONFIG_CONFIG_DIR',
+buildDev({
+  packageJson,
+  getBaseConfig,
+  loadConfig,
+  defaultFavIcon: path.resolve(__dirname, 'public/favicon.ico'),
 });
-
-if (!program.port) {
-  logger.error('Error: port to run Storybook is required!\n');
-  program.help();
-  process.exit(-1);
-}
-
-// Used with `app.listen` below
-const listenAddr = [program.port];
-
-if (program.host) {
-  listenAddr.push(program.host);
-}
-
-const app = express();
-let server = app;
-
-if (program.https) {
-  if (!program.sslCert) {
-    logger.error('Error: --ssl-cert is required with --https');
-    process.exit(-1);
-  }
-  if (!program.sslKey) {
-    logger.error('Error: --ssl-key is required with --https');
-    process.exit(-1);
-  }
-
-  const sslOptions = {
-    ca: (program.sslCa || []).map(ca => fs.readFileSync(ca, 'utf-8')),
-    cert: fs.readFileSync(program.sslCert, 'utf-8'),
-    key: fs.readFileSync(program.sslKey, 'utf-8'),
-  };
-
-  server = https.createServer(sslOptions, app);
-}
-
-let hasCustomFavicon = false;
-
-if (program.staticDir) {
-  program.staticDir = parseList(program.staticDir);
-  program.staticDir.forEach(dir => {
-    const staticPath = path.resolve(dir);
-    if (!fs.existsSync(staticPath)) {
-      logger.error(`Error: no such directory to load static files: ${staticPath}`);
-      process.exit(-1);
-    }
-    logger.log(`=> Loading static files from: ${staticPath} .`);
-    app.use(express.static(staticPath, { index: false }));
-
-    const faviconPath = path.resolve(staticPath, 'favicon.ico');
-    if (fs.existsSync(faviconPath)) {
-      hasCustomFavicon = true;
-      app.use(favicon(faviconPath));
-    }
-  });
-}
-
-if (!hasCustomFavicon) {
-  app.use(favicon(path.resolve(__dirname, 'public/favicon.ico')));
-}
-
-// Build the webpack configuration using the `baseConfig`
-// custom `.babelrc` file and `webpack.config.js` files
-const configDir = program.configDir || './.storybook';
-
-// The repository info is sent to the storybook while running on
-// development mode so it'll be easier for tools to integrate.
-const exec = cmd => shelljs.exec(cmd, { silent: true }).stdout.trim();
-process.env.STORYBOOK_GIT_ORIGIN =
-  process.env.STORYBOOK_GIT_ORIGIN || exec('git remote get-url origin');
-process.env.STORYBOOK_GIT_BRANCH =
-  process.env.STORYBOOK_GIT_BRANCH || exec('git symbolic-ref HEAD --short');
-
-// NOTE changes to env should be done before calling `getBaseConfig`
-// `getBaseConfig` function which is called inside the middleware
-app.use(storybook(configDir));
-
-let serverResolve = () => {};
-let serverReject = () => {};
-const serverListening = new Promise((resolve, reject) => {
-  serverResolve = resolve;
-  serverReject = reject;
-});
-server.listen(...listenAddr, error => {
-  if (error) {
-    serverReject(error);
-  } else {
-    serverResolve();
-  }
-});
-
-Promise.all([webpackValid, serverListening])
-  .then(() => {
-    const proto = program.https ? 'https' : 'http';
-    const address = `${proto}://${program.host || 'localhost'}:${program.port}/`;
-    logger.info(`Storybook started on => ${chalk.cyan(address)}\n`);
-    if (program.smokeTest) {
-      process.exit(0);
-    }
-  })
-  .catch(error => {
-    if (error instanceof Error) {
-      logger.error(error);
-    }
-    if (program.smokeTest) {
-      process.exit(1);
-    }
-  });
diff --git a/app/vue/src/server/utils.js b/app/vue/src/server/utils.js
index 71396437a03..913f4c3219e 100644
--- a/app/vue/src/server/utils.js
+++ b/app/vue/src/server/utils.js
@@ -5,10 +5,6 @@ import deprecate from 'util-deprecate';
 const fallbackHeadUsage = deprecate(() => {},
 'Usage of head.html has been deprecated. Please rename head.html to preview-head.html');
 
-export function parseList(str) {
-  return str.split(',');
-}
-
 export function getPreviewHeadHtml(configDirPath) {
   const headHtmlPath = path.resolve(configDirPath, 'preview-head.html');
   const fallbackHtmlPath = path.resolve(configDirPath, 'head.html');
@@ -32,25 +28,3 @@ export function getManagerHeadHtml(configDirPath) {
 
   return scriptHtml;
 }
-
-export function getEnvConfig(program, configEnv) {
-  Object.keys(configEnv).forEach(fieldName => {
-    const envVarName = configEnv[fieldName];
-    const envVarValue = process.env[envVarName];
-    if (envVarValue) {
-      program[fieldName] = envVarValue; // eslint-disable-line
-    }
-  });
-}
-
-export function getMiddleware(configDir) {
-  const middlewarePath = path.resolve(configDir, 'middleware.js');
-  if (fs.existsSync(middlewarePath)) {
-    let middlewareModule = require(middlewarePath); // eslint-disable-line
-    if (middlewareModule.__esModule) { // eslint-disable-line
-      middlewareModule = middlewareModule.default;
-    }
-    return middlewareModule;
-  }
-  return () => {};
-}
diff --git a/dependencies.yml b/dependencies.yml
index 1bb78e84e41..c660055243d 100644
--- a/dependencies.yml
+++ b/dependencies.yml
@@ -30,9 +30,11 @@ collectors:
   actors:
   # pull requests for updates to our major version
   - type: js-lerna
+    dependencies_not_matching: "^react-native$"
     versions: "L.Y.Y"
     settings:
       batch_mode: true
+      batch_bootstrap: true
       bootstrap_command: yarn --ignore-scripts --ignore-engines --silent
       github_labels:
       - dependencies:update
diff --git a/docs/.eslintrc.js b/docs/.eslintrc.js
index a46d9c4a595..6ab0b6d43ec 100644
--- a/docs/.eslintrc.js
+++ b/docs/.eslintrc.js
@@ -5,13 +5,13 @@ module.exports = {
     graphql: false,
   },
   rules: {
-    'import/no-unresolved': warn,
+    'import/no-unresolved': [warn, { commonjs: true, caseSensitive: true }],
     'import/extensions': [
       // because of highlight.js
       warn,
+      'always',
       {
         js: 'never',
-        json: 'always',
       },
     ],
   },
diff --git a/docs/.storybook/config.js b/docs/.storybook/config.js
index a19d86a3a9b..ac173268f49 100644
--- a/docs/.storybook/config.js
+++ b/docs/.storybook/config.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { configure, addDecorator } from '@storybook/react';
-import { MemoryRouter } from 'react-router'
+import { MemoryRouter } from 'react-router';
 
 import 'bootstrap/dist/css/bootstrap.css';
 import '../src/css/main.css';
diff --git a/docs/.storybook/webpack.config.js b/docs/.storybook/webpack.config.js
index cd808a9bf61..65ab1ce95c7 100644
--- a/docs/.storybook/webpack.config.js
+++ b/docs/.storybook/webpack.config.js
@@ -1,5 +1,3 @@
-const path = require('path');
-
 const config = {
   module: {
     rules: [
diff --git a/docs/README.md b/docs/README.md
index 83af3b1d7f8..58da5e7675d 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -12,4 +12,4 @@ yarn storybook
 
 ### Edit Documentation
 
-Documentation is written in Markdown and located inside the [`pages/`](pages/) directory.
+Documentation is written in Markdown and located inside the [`docs/src/pages`](https://github.com/storybooks/storybook/tree/master/docs/src/pages) directory.
diff --git a/docs/gatsby-config.js b/docs/gatsby-config.js
index 7d30334bbe2..a4eaeba5257 100644
--- a/docs/gatsby-config.js
+++ b/docs/gatsby-config.js
@@ -16,6 +16,7 @@ module.exports = {
         '/basics/exporting-storybook/',
         '/basics/faq/',
         '/basics/community/',
+        '/basics/live-examples/',
       ],
       configurations: [
         '/configurations/default-config/',
diff --git a/docs/package.json b/docs/package.json
index 0eb09c9e3db..856b3c2dfde 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -18,40 +18,33 @@
     "storybook": "start-storybook -p 9009 -s src/pages"
   },
   "dependencies": {
-    "@storybook/addon-actions": "^3.3.4",
-    "@storybook/addon-links": "^3.3.4",
-    "@storybook/addons": "^3.3.4",
-    "@storybook/react": "^3.3.4",
-    "babel-cli": "^6.26.0",
-    "babel-core": "^6.26.0",
+    "@storybook/addon-actions": "^3.3.14",
+    "@storybook/addon-links": "^3.3.14",
+    "@storybook/addons": "^3.3.14",
+    "@storybook/react": "^3.3.14",
     "babel-loader": "^6.4.1",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-polyfill": "^6.26.0",
-    "babel-preset-env": "^1.6.1",
-    "babel-preset-react": "^6.24.1",
-    "babel-preset-stage-0": "^6.24.1",
     "bootstrap": "^3.3.7",
-    "gatsby": "^1.9.149",
-    "gatsby-link": "^1.6.32",
-    "gatsby-plugin-sharp": "^1.6.24",
-    "gatsby-remark-autolink-headers": "^1.4.11",
-    "gatsby-remark-copy-linked-files": "^1.5.25",
-    "gatsby-remark-images": "^1.5.36",
-    "gatsby-remark-smartypants": "^1.4.10",
-    "gatsby-source-filesystem": "^1.5.11",
-    "gatsby-transformer-remark": "^1.7.26",
+    "gatsby": "^1.9.216",
+    "gatsby-link": "^1.6.37",
+    "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.51",
+    "gatsby-remark-smartypants": "^1.4.11",
+    "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.2",
-    "marked": "^0.3.7",
-    "prop-types": "^15.6.0",
+    "lodash": "^4.17.5",
+    "marked": "^0.3.17",
+    "prop-types": "^15.6.1",
     "react": "^15.6.1",
     "react-document-title": "^2.0.3",
     "react-dom": "^15.6.1",
     "react-helmet": "^5.0.3",
     "react-router": "^4.2.0",
-    "react-stack-grid": "^0.7.0",
+    "react-stack-grid": "^0.7.1",
     "sitemap": "^1.12.0"
   },
   "private": true
diff --git a/docs/src/components/Footer/index.js b/docs/src/components/Footer/index.js
index f06e2cbdbcd..20e9c043b43 100644
--- a/docs/src/components/Footer/index.js
+++ b/docs/src/components/Footer/index.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import Link from 'gatsby-link';
-import slackIcon from './images/slack-icon.png';
 import githubIcon from './images/github-icon.png';
 import './style.css';
 
@@ -14,13 +13,6 @@ const Footer = () => (
             .
           </center>
           <center>
-            <a
-              href="https://now-examples-slackin-nqnzoygycp.now.sh/"
-              target="_blank"
-              rel="noreferrer noopener"
-            >
-              <img src={slackIcon} alt="Storybook Slack" />
-            </a>
             <a
               href="https://github.com/storybooks/storybook"
               target="_blank"
diff --git a/docs/src/components/Grid/GridItem/index.js b/docs/src/components/Grid/GridItem/index.js
index 71f14c0aa23..c7d9092591e 100644
--- a/docs/src/components/Grid/GridItem/index.js
+++ b/docs/src/components/Grid/GridItem/index.js
@@ -8,9 +8,9 @@ const linkProps = {
   className: 'link',
 };
 
-const GridItem = ({ title, description, source, demo, thumbnail }) => (
+const GridItem = ({ title, description, source, demo, thumbnailSrc }) => (
   <div className="grid-item">
-    <div className="photobox" style={{ backgroundImage: `url(${thumbnail})` }}>
+    <div className="photobox" style={{ backgroundImage: `url(${thumbnailSrc})` }}>
       <div className="overlay" />
     </div>
     <div className="text">
@@ -34,7 +34,7 @@ const GridItem = ({ title, description, source, demo, thumbnail }) => (
 GridItem.propTypes = {
   title: PropTypes.string.isRequired,
   description: PropTypes.string.isRequired,
-  thumbnail: PropTypes.string.isRequired,
+  thumbnailSrc: PropTypes.string.isRequired,
   source: PropTypes.string,
   demo: PropTypes.string,
 };
diff --git a/docs/src/components/Homepage/MainLinks/index.js b/docs/src/components/Homepage/MainLinks/index.js
index 9cee530065b..16b731337b2 100644
--- a/docs/src/components/Homepage/MainLinks/index.js
+++ b/docs/src/components/Homepage/MainLinks/index.js
@@ -60,7 +60,12 @@ class MainLinks extends React.Component {
                   id="search"
                   placeholder="type to search"
                 />
-                <span className="form-control-feedback" aria-hidden="true">
+                <span
+                  className="form-control-feedback"
+                  role="img"
+                  aria-hidden="true"
+                  aria-label="magnifying glass"
+                >
                   🔍
                 </span>
               </div>
@@ -80,6 +85,9 @@ class MainLinks extends React.Component {
                 <li>
                   <Link to="/basics/writing-stories/">Writing stories</Link>
                 </li>
+                <li>
+                  <Link to="/basics/live-examples/">Live Examples</Link>
+                </li>
               </ul>
             </div>
 
diff --git a/docs/src/components/Homepage/UsedBy/index.jsx b/docs/src/components/Homepage/UsedBy/index.js
similarity index 100%
rename from docs/src/components/Homepage/UsedBy/index.jsx
rename to docs/src/components/Homepage/UsedBy/index.js
diff --git a/docs/src/pages/_users.yml b/docs/src/pages/_users.yml
index 607da089eb3..c6a1e916b2a 100644
--- a/docs/src/pages/_users.yml
+++ b/docs/src/pages/_users.yml
@@ -5,12 +5,12 @@ airbnb:
   source: https://github.com/airbnb/react-dates
   demo: http://airbnb.io/react-dates/
   site: http://airbnb.com
-slack:
-  logo: slack.svg
-  title: Slack Emoji Picker
-  description: Slack improves performance and maintainability with Storybook!
-  demo: https://slack.engineering/rebuilding-slacks-emoji-picker-in-react-bfbd8ce6fbfe
-  site: http://slack.com
+# slack:
+#   logo: slack.svg
+#   title: Slack Emoji Picker
+#   description: Slack improves performance and maintainability with Storybook!
+#   demo: https://slack.engineering/rebuilding-slacks-emoji-picker-in-react-bfbd8ce6fbfe
+#   site: http://slack.com
 lonelyplanet:
   logo: lonelyplanet.svg
   title: Lonely Planet
diff --git a/docs/src/pages/addons/addon-gallery/index.md b/docs/src/pages/addons/addon-gallery/index.md
index 08cb51bd086..f4c080b86e4 100644
--- a/docs/src/pages/addons/addon-gallery/index.md
+++ b/docs/src/pages/addons/addon-gallery/index.md
@@ -1,8 +1,7 @@
-* * *
-
+---
 id: 'addon-gallery'
-
-## title: 'Addon Gallery'
+title: 'Addon Gallery'
+---
 
 This is a list of available addons for Storybook.
 
@@ -43,6 +42,14 @@ Storyshots is a way to automatically jest-snapshot all your stories. [More info
 
 Redirects console output (logs, errors, warnings) into Action Logger Panel. `withConsole` decorator notifies from what stories logs are coming.
 
+### [Backgrounds](https://github.com/storybooks/storybook/tree/master/addons/background)
+
+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.
@@ -50,7 +57,7 @@ You need to install these addons directly from NPM in order to use them.
 ### [Readme](https://github.com/tuchk4/storybook-readme)
 
 With this addon, you can add docs in markdown format for each story.
-It very useful because most projects and components already have README.md files.
+It's very useful because most projects and components already have README.md files.
 Now it is easy to add them into your Storybook.
 
 ### [Story-router](https://github.com/gvaldambrini/storybook-router)
@@ -76,10 +83,6 @@ Break your stories down into smaller categories (chapters) and subcategories (se
 Given possible values for each prop, renders your component with all combinations of prop values.
 Useful for finding edge cases or just seeing all component states at once.
 
-### [Backgrounds](https://github.com/NewSpring/react-storybook-addon-backgrounds)
-
-With this addon, you can switch between background colors and background images for your preview components. It is really helpful for styleguides.
-
 ### [Material-UI](https://github.com/sm-react/storybook-addon-material-ui)
 
 Wraps your story into MuiThemeProvider.
diff --git a/docs/src/pages/addons/api/index.md b/docs/src/pages/addons/api/index.md
index 923562a8583..40bb16a7b56 100644
--- a/docs/src/pages/addons/api/index.md
+++ b/docs/src/pages/addons/api/index.md
@@ -1,8 +1,7 @@
-* * *
-
+---
 id: 'api'
-
-## title: 'API'
+title: 'API'
+---
 
 ## Core Addon API
 
diff --git a/docs/src/pages/addons/introduction/index.md b/docs/src/pages/addons/introduction/index.md
index 72734c43efa..63f5a5fa891 100644
--- a/docs/src/pages/addons/introduction/index.md
+++ b/docs/src/pages/addons/introduction/index.md
@@ -68,7 +68,7 @@ storiesOf('Button', module)
     <Button onClick={action('clicked')}>Hello Button</Button>
   ))
   .add('with some emojies', () => (
-    <Button onClick={action('clicked')}>😀 😎 👍 💯</Button>
+    <Button onClick={action('clicked')}><span role="img" aria-label="so cool">😀 😎 👍 💯</span></Button>
   ));
 ```
 
@@ -102,7 +102,7 @@ storiesOf('Button', module)
     <Button onClick={action('clicked')}>Hello Button</Button>
   ))
   .add('with some emojies', () => (
-    <Button onClick={action('clicked')}>😀 😎 👍 💯</Button>
+    <Button onClick={action('clicked')}><span role="img" aria-label="so cool">😀 😎 👍 💯</span></Button>
   ));
 ```
 
diff --git a/docs/src/pages/addons/using-addons/index.md b/docs/src/pages/addons/using-addons/index.md
index 095a005ba2a..96d40fedb89 100644
--- a/docs/src/pages/addons/using-addons/index.md
+++ b/docs/src/pages/addons/using-addons/index.md
@@ -12,7 +12,7 @@ We are going to use an addon called [Notes](https://github.com/storybooks/storyb
 First, we need to install the addons:
 
 ```sh
-npm i --save-dev @storybook/addon-actions @storybook/addon-links @storybook/addon-notes
+npm i --save-dev @storybook/addons @storybook/addon-actions @storybook/addon-links @storybook/addon-notes
 ```
 
 Then, we need to create a file called `addons.js` inside the storybook config directory and add the following content:
@@ -39,7 +39,7 @@ import Button from './Button';
 storiesOf('Button', module)
   .add('with some emoji', () => (
     <WithNotes notes={'Here we use some emoji as the Button text. Doesn&apos;t it look nice?'}>
-      <Button onClick={action('clicked')}>😀 😎 👍 💯</Button>
+      <Button onClick={action('clicked')}><span role="img" aria-label="so cool">😀 😎 👍 💯</span></Button>
     </WithNotes>
   ));
 ```
diff --git a/docs/src/pages/addons/writing-addons/index.md b/docs/src/pages/addons/writing-addons/index.md
index 1f105554d28..61dba335768 100644
--- a/docs/src/pages/addons/writing-addons/index.md
+++ b/docs/src/pages/addons/writing-addons/index.md
@@ -55,7 +55,7 @@ storiesOf('Button', module)
   ))
   .add('with some emoji', () => (
     <WithNotes notes={'Here we use some emoji as the Button text. Doesn&apos;t it look nice?'}>
-      <Button onClick={action('clicked')}>😀 😎 👍 💯</Button>
+      <Button onClick={action('clicked')}><span role="img" aria-label="so cool">😀 😎 👍 💯</span></Button>
     </WithNotes>
   ));
 ```
@@ -100,11 +100,81 @@ export class WithNotes extends React.Component {
 
 In this case, our component can access something called the channel. It lets us communicate with the panel (where we display notes). It has a NodeJS [EventEmitter](https://nodejs.org/api/events.html) compatible API.
 
-In the above case, it will emit the notes text to the channel, so our panel can listen to it.
+In the above case, it will emit the notes' text to the channel, so our panel can listen to it.
 
 Then add the following code to the register.js.
 
-See: <https://gist.github.com/arunoda/fb3859840ff616cc5ea0fa3ef8e3f358>
+```js
+import React from 'react';
+import addons from '@storybook/addons';
+
+const styles = {
+  notesPanel: {
+    margin: 10,
+    fontFamily: 'Arial',
+    fontSize: 14,
+    color: '#444',
+    width: '100%',
+    overflow: 'auto',
+  }
+};
+
+class Notes extends React.Component {
+  constructor(...args) {
+    super(...args);
+    this.state = {text: ''};
+    this.onAddNotes = this.onAddNotes.bind(this);
+  }
+
+  onAddNotes(text) {
+    this.setState({text});
+  }
+
+  componentDidMount() {
+    const { channel, api } = this.props;
+    // Listen to the notes and render it.
+    channel.on('kadira/notes/add_notes', this.onAddNotes);
+
+    // Clear the current notes on every story change.
+    this.stopListeningOnStory = api.onStory(() => {
+      this.onAddNotes('');
+    });
+  }
+
+  render() {
+    const { text } = this.state;
+    const textAfterFormatted = text? text.trim().replace(/\n/g, '<br />') : "";
+
+    return (
+      <div style={styles.notesPanel}>
+        <div dangerouslySetInnerHTML={{__html: textAfterFormatted}} />
+      </div>
+    );
+  }
+
+  // This is some cleanup tasks when the Notes panel is unmounting.
+  componentWillUnmount() {
+    if(this.stopListeningOnStory) {
+      this.stopListeningOnStory();
+    }
+
+    this.unmounted = true;
+    const { channel, api } = this.props;
+    channel.removeListener('kadira/notes/add_notes', this.onAddNotes);
+  }
+}
+
+// Register the addon with a unique name.
+addons.register('kadira/notes', (api) => {
+  // Also need to set a unique name to the panel.
+  addons.addPanel('kadira/notes/panel', {
+    title: 'Notes',
+    render: () => (
+      <Notes channel={addons.getChannel()} api={api}/>
+    ),
+  })
+})
+```
 
 It will register our addon and add a panel. In this case, the panel represents a React component called `Notes`. That component has access to the channel and storybook api.
 
@@ -146,7 +216,7 @@ storiesOf('Button', module)
   ))
   .add('with some emojies', () => (
     <WithNotes notes={'Here we use emojies as the Button text. Doesn&apos;t it look nice?'}>
-      <Button onClick={action('clicked')}>😀 😎 👍 💯</Button>
+      <Button onClick={action('clicked')}><span role="img" aria-label="so cool">😀 😎 👍 💯</span></Button>
     </WithNotes>
   ));
 ```
@@ -158,13 +228,13 @@ You can learn more about the complete API [here](/addons/api).
 
 ## Packaging
 
-You can package this addon into a NPM module very easily. Have a look at this [package](https://github.com/storybooks/storybook/tree/master/addons/notes).
+You can package this addon into a NPM module very easily. As an example, have a look at this [package](https://github.com/storybooks/storybook/tree/master/addons/notes).
 
-In addition to moving the above code to an NPM module, we've set `react` and `@storybook/addons` as peer dependencies.
+In addition to moving the above code to a NPM module, we've set `react` and `@storybook/addons` as peer dependencies.
 
 ### Local Development
 
-When you are developing your addon as a package, you can't use `npm link` to add it your project. Instead add your package as a local dependency into your `package.json` as shown below:
+When you are developing your addon as a package, you can't use `npm link` to add it to your project. Instead add your package as a local dependency into your `package.json` as shown below:
 
 ```json
 {
@@ -176,5 +246,5 @@ When you are developing your addon as a package, you can't use `npm link` to add
 
 ### Package Maintenance
 
-Your packaged Storybook addon needed to be written in ES5. If you are using ES6, then you need to transpile it.
+Your packaged Storybook addon needs to be written in ES5. If you are using ES6, then you need to transpile it.
 In that case, we recommend to use [React CDK](https://github.com/kadirahq/react-cdk) for that.
diff --git a/docs/src/pages/basics/community/index.md b/docs/src/pages/basics/community/index.md
index bc51039622d..6ee764a59af 100644
--- a/docs/src/pages/basics/community/index.md
+++ b/docs/src/pages/basics/community/index.md
@@ -9,4 +9,4 @@ You can read about how to get involved in detail in our [Contribution Guide](htt
 
 1.  Report issues at the [issue tracker](https://github.com/storybooks/storybook/issues).
 2.  Help us to triage issues above, by answering questions, helping to create [reproductions](https://github.com/storybooks/storybook/blob/master/CONTRIBUTING.md#reproductions), and clarifying feature requests.
-3.  Pitch in with a PR, especially those marked ["good first contribution"](https://github.com/storybooks/storybook/labels/good%20first%20contribution).
+3.  Pitch in with a PR, especially those marked ["good first issue"](https://github.com/storybooks/storybook/labels/good%20first%20issue).
diff --git a/docs/src/pages/basics/guide-angular/index.md b/docs/src/pages/basics/guide-angular/index.md
index 95e72f6fb90..73a7f86194d 100644
--- a/docs/src/pages/basics/guide-angular/index.md
+++ b/docs/src/pages/basics/guide-angular/index.md
@@ -17,7 +17,7 @@ In this guide, we are trying to set up Storybook for your Angular project.
 ## Table of contents
 
 -   [Create Angular project](#create-angular-project)
--   [Add @storybook/angular](#add-storybookangular)
+-   [Add @storybook/angular and babel-core](#add-storybookangular-and-babel-core)
 -   [Create the config file](#create-the-config-file)
 -   [Write your stories](#write-your-stories)
 -   [Run your Storybook](#run-your-storybook)
@@ -32,12 +32,12 @@ ng new your-angular-prj
 cd your-angular-prj
 ```
 
-## Add @storybook/angular
+## Add @storybook/angular and babel-core
 
-Next, install `@storybook/angular` to your project:
+Next, install `@storybook/angular` and `babel-core` (it's a peerDependency) to your project:
 
 ```sh
-npm i --save-dev @storybook/angular
+npm i --save-dev @storybook/angular babel-core
 ```
 
 Then add the following NPM script to your package json in order to start the storybook later in this guide:
@@ -63,19 +63,19 @@ To do that, simply create a file at `.storybook/config.js` with the following co
 import { configure } from '@storybook/angular';
 
 function loadStories() {
-  require('../stories/index.ts');
+  require('../src/stories/index.ts');
 }
 
 configure(loadStories, module);
 ```
 
-That'll load stories in `../stories/index.ts`.
+That'll load stories in `../src/stories/index.ts`.
 
 Just like that, you can load stories from wherever you want to.
 
 ## Write your stories
 
-Now you can write some stories inside the `../stories/index.ts` file, like this:
+Now you can write some stories inside the `../src/stories/index.ts` file, like this:
 
 ```js
 import { storiesOf } from '@storybook/angular';
@@ -114,32 +114,54 @@ npm run storybook
 Now you can change components and write stories whenever you need to.
 You'll get those changes into Storybook in a snap with the help of webpack's HMR API.
 
-## Tips
+## Module Metadata
 
-### Configure style rules
-
-If you use `templateUrl` in your components, you need to configure webpack rules for .css/.scss files. Create a file named `webpack.config.js` under the config directory(by default `.storybook`):
+If your component has dependencies on other Angular directives and modules, these can be supplied using the `moduleMetadata` property on an individual story:
 
 ```js
-const genDefaultConfig = require('@storybook/angular/dist/server/config/defaults/webpack.config.js');
+import { CommonModule } from '@angular/common';
+import { storiesOf } from '@storybook/angular';
+import { MyButtonComponent } from '../src/app/my-button/my-button.component';
+import { MyPanelComponent } from '../src/app/my-panel/my-panel.component';
+import { MyDataService } from '../src/app/my-data/my-data.service';
 
-module.exports = (baseConfig, env) => {
-  const config = genDefaultConfig(baseConfig, env);
-
-  // Overwrite .css rule
-  const cssRule = config.module.rules.find(rule => rule.test && rule.test.toString() === '/\\.css$/');
-  if (cssRule) {
-    cssRule.exclude = /\.component\.css$/;
-  }
-
-  // Add .scss rule
-  config.module.rules.unshift({
-    test: /\.scss$/,
-    loaders: ['raw-loader', 'sass-loader'],
-  });
-
-  return config;
-};
+storiesOf('My Panel', module)
+  .add('Default', () => ({
+    component: MyPanelComponent,
+    moduleMetadata: {
+      imports: [CommonModule],
+      schemas: [],
+      declarations: [MyButtonComponent],
+      providers: [MyDataService],
+    }
+  }));
 ```
 
-If you want more details, see [customize the webpack config](/configurations/custom-webpack-config/).
+If you have metadata that is common between your stories, this can configured once using the `moduleMetadata()` decorator:
+
+```js
+import { CommonModule } from '@angular/common';
+import { storiesOf, moduleMetadata } from '@storybook/angular';
+import { MyButtonComponent } from '../src/app/my-button/my-button.component';
+import { MyPanelComponent } from '../src/app/my-panel/my-panel.component';
+import { MyDataService } from '../src/app/my-data/my-data.service';
+
+storiesOf('My Panel', module)
+  .addDecorator(
+    moduleMetadata({
+      imports: [CommonModule],
+      schemas: [],
+      declarations: [MyButtonComponent],
+      providers: [MyDataService],
+    })
+  )
+  .add('Default', () => ({
+    component: MyPanelComponent
+  }))
+  .add('with a title', () => ({
+    component: MyPanelComponent,
+    props: {
+      title: 'Foo',
+    }
+  }));
+```
diff --git a/docs/src/pages/basics/guide-react/index.md b/docs/src/pages/basics/guide-react/index.md
index 4f9202ac419..cc6004eead3 100644
--- a/docs/src/pages/basics/guide-react/index.md
+++ b/docs/src/pages/basics/guide-react/index.md
@@ -16,7 +16,7 @@ In this guide, we are trying to set up Storybook for your React project.
 ## Table of contents
 
 -   [Add @storybook/react](#add-storybookreact)
--   [Add react and react-dom](#add-react-and-react-dom)
+-   [Add react, react-dom, and babel-core](#add-react-react-dom-and-babel-core)
 -   [Create the config file](#create-the-config-file)
 -   [Write your stories](#write-your-stories)
 -   [Run your Storybook](#run-your-storybook)
@@ -29,12 +29,13 @@ First of all, you need to add `@storybook/react` to your project. To do that, si
 npm i --save-dev @storybook/react
 ```
 
-## Add react and react-dom
+## Add react, react-dom, and babel-core
 
-Make sure that you have `react` and `react-dom` in your dependencies as well because we list these as a peerDependency:
+Make sure that you have `react`, `react-dom`, and `babel-core` in your dependencies as well because we list these as a peerDependency:
 
 ```sh
 npm i --save react react-dom
+npm i --save-dev babel-core
 ```
 
 Then add the following NPM script to your package json in order to start the storybook later in this guide:
@@ -86,7 +87,7 @@ storiesOf('Button', module)
     <Button onClick={action('clicked')}>Hello Button</Button>
   ))
   .add('with some emoji', () => (
-    <Button onClick={action('clicked')}>😀 😎 👍 💯</Button>
+    <Button onClick={action('clicked')}><span role="img" aria-label="so cool">😀 😎 👍 💯</span></Button>
   ));   
 ```
 
diff --git a/docs/src/pages/basics/guide-vue/index.md b/docs/src/pages/basics/guide-vue/index.md
index d3adada5fc4..134adbca5b7 100644
--- a/docs/src/pages/basics/guide-vue/index.md
+++ b/docs/src/pages/basics/guide-vue/index.md
@@ -1,8 +1,7 @@
-* * *
-
+---
 id: 'guide-vue'
-
-## title: 'Storybook for Vue'
+title: 'Storybook for Vue'
+---
 
 You may have tried to use our quick start guide to setup your project for Storybook. If you want to set up Storybook manually, this is the guide for you.
 
@@ -18,7 +17,7 @@ In this guide, we are trying to set up Storybook for your Vue project.
 ## Table of contents
 
 -   [Add @storybook/vue](#add-storybookvue)
--   [Add vue](#add-vue)
+-   [Add vue and babel-core](#add-vue-and-babel-core)
 -   [Create the NPM script](#create-the-npm-script)
 -   [Create the config file](#create-the-config-file)
 -   [Write your stories](#write-your-stories)
@@ -32,12 +31,13 @@ First of all, you need to add `@storybook/vue` to your project. To do that, simp
 npm i --save-dev @storybook/vue
 ```
 
-## Add vue
+## Add vue and babel-core
 
-Make sure that you have `vue` in your dependencies as well because we list is as a peerDependency:
+Make sure that you have `vue` and `babel-core` in your dependencies as well because we list is as a peerDependency:
 
 ```sh
 npm i --save vue
+npm i --save-dev babel-core
 ```
 
 ## Create the NPM script
@@ -86,7 +86,7 @@ function loadStories() {
 configure(loadStories, module);
 ```
 
-This example registered your custom `Button.vue` component, installed the Vuex plugin, and loaded you Storybook stories defined in `../stories/index.js`.
+This example registered your custom `Button.vue` component, installed the Vuex plugin, and loaded your Storybook stories defined in `../stories/index.js`.
 
 All custom components and Vue plugins should be registered before calling `configure()`.
 
diff --git a/docs/src/pages/basics/introduction/index.md b/docs/src/pages/basics/introduction/index.md
index 530e49e230d..3677c3e6222 100644
--- a/docs/src/pages/basics/introduction/index.md
+++ b/docs/src/pages/basics/introduction/index.md
@@ -1,8 +1,7 @@
-* * *
-
+---
 id: 'introduction'
-
-## title: 'Introduction'
+title: 'Introduction'
+---
 
 Storybook is a UI development environment for your UI components.
 With it, you can visualize different states of your UI components and develop them interactively.
diff --git a/docs/src/pages/basics/live-examples/index.md b/docs/src/pages/basics/live-examples/index.md
new file mode 100644
index 00000000000..021a8e4a154
--- /dev/null
+++ b/docs/src/pages/basics/live-examples/index.md
@@ -0,0 +1,18 @@
+---
+id: 'live-examples'
+title: 'Live Examples'
+---
+
+### 3.4.alpha
+
+> Note, this is an Alpha version. Some of the features still might not be released
+
+- [React Official](https://storybooks-official.netlify.com)
+- [Vue](https://storybooks-vue.netlify.com/)
+- [Angular](https://storybooks-angular.netlify.com/)
+- [Polymer](https://storybooks-polymer.netlify.com/)
+
+### 3.3
+- [React Official](https://release-3-3--storybooks-official.netlify.com)
+- [Vue](https://release-3-3--storybooks-vue.netlify.com/)
+- [Angular](https://release-3-3--storybooks-angular.netlify.com/)
diff --git a/docs/src/pages/basics/writing-stories/index.md b/docs/src/pages/basics/writing-stories/index.md
index 0b993ea118b..d8315d10dfb 100644
--- a/docs/src/pages/basics/writing-stories/index.md
+++ b/docs/src/pages/basics/writing-stories/index.md
@@ -35,7 +35,7 @@ storiesOf('Button', module)
     <Button onClick={action('clicked')}>Hello Button</Button>
   ))
   .add('with some emoji', () => (
-    <Button onClick={action('clicked')}>😀 😎 👍 💯</Button>
+    <Button onClick={action('clicked')}><span role="img" aria-label="so cool">😀 😎 👍 💯</span></Button>
   ));
 ```
 
@@ -118,7 +118,7 @@ import MyComponent from './MyComponent';
 import someMarkdownText from './someMarkdownText.md';
 
 storiesOf('Component', module)
-  .add('With Markdown', withNotes(someMarkdownText)(() => <Component/>));
+  .add('With Markdown', withNotes(someMarkdownText)(() => <MyComponent/>));
 ```
 
 ## Nesting stories
@@ -139,10 +139,30 @@ storiesOf('My App/Buttons/Simple', module)
 
 storiesOf('My App/Buttons/Emoji', module)
   .add('with some emoji', () => (
-    <Button onClick={action('clicked')}>😀 😎 👍 💯</Button>
+    <Button onClick={action('clicked')}><span role="img" aria-label="so cool">😀 😎 👍 💯</span></Button>
   ));
 ```
 
+## Generating nesting path based on __dirname
+
+The name is just a javascript string, by using a template literal, you can easily interpolate data.
+
+One example would be to use `base` from [`paths.macro`](https://github.com/storybooks/paths.macro):
+```js
+import React from 'react';
+import base from 'paths.macro';
+
+import { storiesOf } from '@storybook/react';
+
+import BaseButton from '../components/BaseButton';
+
+storiesOf(`Other|${base}/Dirname Example`, module)
+  .add('story 1', () => <BaseButton label="Story 1" />)
+  .add('story 2', () => <BaseButton label="Story 2" />);
+```
+
+*This uses [babel-plugin-macros](https://github.com/kentcdodds/babel-plugin-macros)*.
+
 ## Run multiple storybooks
 
 You can run multiple storybooks for different kinds of stories (or components). To do that, you can create different NPM scripts to start different stories. See:
diff --git a/docs/src/pages/configurations/cli-options/index.md b/docs/src/pages/configurations/cli-options/index.md
index e4a0f968464..4879709c5b8 100644
--- a/docs/src/pages/configurations/cli-options/index.md
+++ b/docs/src/pages/configurations/cli-options/index.md
@@ -33,3 +33,4 @@ Here are all those options:
       -s, --static-dir <dir-names>  Directory where to load static files from, comma-separated list
       -o, --output-dir [dir-name]   Directory where to store built files
       -c, --config-dir [dir-name]   Directory where to load Storybook configurations from
+      -w, --watch                   Enable watch mode
diff --git a/docs/src/pages/configurations/custom-webpack-config/index.md b/docs/src/pages/configurations/custom-webpack-config/index.md
index 870a241a03a..d4d9d2e8c70 100644
--- a/docs/src/pages/configurations/custom-webpack-config/index.md
+++ b/docs/src/pages/configurations/custom-webpack-config/index.md
@@ -36,7 +36,7 @@ module.exports = {
 
 Since this config file stays in the Storybook directory, you need to set the include path as above. If the config directory stays in a different directory, you need to set the include path relative to that.
 
-You also need to install the loaders (style, css, and sass) used in above config manually.
+You also need to install the loaders (style, css, sass, as well as node-sass) used in above config manually.
 
 > Once you create this `webpack.config.js` file, Storybook won't load the [default Webpack config](/configurations/default-config/) other than loading JS files with the Babel loader. This will disable included functionality like svg loading. Read on to learn how to [retain defaults](#full-control-mode--default).
 
@@ -95,28 +95,21 @@ You may want to keep Storybook's [default config](/configurations/default-config
 If so, this is how you do it using the Full Control Mode.
 Add following content to the `webpack.config.js` in your Storybook config directory.
 
-> We plan to expose our default webpack-config as it's own package in the future.
-
 ```js
 const path = require('path');
 
-// load the default config generator.
-const genDefaultConfig = require('@storybook/react/dist/server/config/defaults/webpack.config.js');
-
-module.exports = (baseConfig, env) => {
-  const config = genDefaultConfig(baseConfig, env);
-
-  // Extend it as you need.
+module.exports = (baseConfig, env, defaultConfig) => {
+  // Extend defaultConfig as you need.
 
   // For example, add typescript loader:
-  config.module.rules.push({
+  defaultConfig.module.rules.push({
     test: /\.(ts|tsx)$/,
     include: path.resolve(__dirname, '../src'),
     loader: require.resolve('ts-loader')
   });
-  config.resolve.extensions.push('.ts', '.tsx');
+  defaultConfig.resolve.extensions.push('.ts', '.tsx');
 
-  return config;
+  return defaultConfig;
 };
 ```
 
diff --git a/docs/src/pages/configurations/default-config/index.md b/docs/src/pages/configurations/default-config/index.md
index a5f402c9e3d..efb9fbbff01 100644
--- a/docs/src/pages/configurations/default-config/index.md
+++ b/docs/src/pages/configurations/default-config/index.md
@@ -55,6 +55,11 @@ import './styles.css';
 ```
 
 > **Note:** this is plain CSS only. If you need a preprocessor like SASS, you need to [customize the webpack config](/configurations/custom-webpack-config/).
+>
+> **Warning:** storybooks for projects that use Angular CLI cannot import CSS by default. They must either [customize the webpack config](/configurations/custom-webpack-config/), or use the inline loader syntax:
+> ```js
+> import '!style-loader!css-loader!./styles.css';
+> ```
 
 ### Image and Static File Support
 
diff --git a/docs/src/pages/examples/_examples.yml b/docs/src/pages/examples/_examples.yml
index a57cc7a56a6..b7adb153de4 100644
--- a/docs/src/pages/examples/_examples.yml
+++ b/docs/src/pages/examples/_examples.yml
@@ -1,141 +1,147 @@
 carbon:
-  thumbnail: ./thumbnails/carbon.png
+  thumbnail: carbon.png
   title: Carbon Components
   description: IBM's Carbon Design System implemented in React.
   source: https://github.com/carbon-design-system/carbon-components-react
   demo: http://react.carbondesignsystem.com
   site: http://carbondesignsystem.com
 airbnb:
-  thumbnail: ./thumbnails/airbnb.jpg
+  thumbnail: airbnb.jpg
   title: Airbnb Dates
   description: An internationalizable, mobile-friendly datepicker library for the web.
   source: https://github.com/airbnb/react-dates
   demo: http://airbnb.io/react-dates/
   site: http://airbnb.com
 lonelyplanet:
-  thumbnail: ./thumbnails/lonelyplanet.jpg
+  thumbnail: lonelyplanet.jpg
   title: Lonely Planet
   description: All the tools you need to build the Lonely Planet UI experience.
   source: https://github.com/lonelyplanet/backpack-ui
   demo: https://lonelyplanet.github.io/backpack-ui/
   site: https://www.lonelyplanet.com/
 atlassian:
-  thumbnail: ./thumbnails/atlassian.png
+  thumbnail: atlassian.png
   title: Atlassian AtlasKit
   description: Atlassian's official UI library.
   demo: https://atlaskit.atlassian.com/components
   site: https://atlaskit.atlassian.com/
 wix:
-  thumbnail: ./thumbnails/wix.png
+  thumbnail: wix.png
   title: Wix Style React
   description: Components that conform to Wix Style
   source: https://github.com/wix/wix-style-react
   demo: https://wix.github.io/wix-style-react/
   site: https://wix.com
 buffer:
-  thumbnail: ./thumbnails/buffer.jpg
+  thumbnail: buffer.jpg
   title: Buffer Components
   description: A collection of Buffer UI React components.
   source: https://github.com/bufferapp/buffer-components
   demo: https://bufferapp.github.io/buffer-components/
   site: https://buffer.com
 algolia:
-  thumbnail: ./thumbnails/algolia.jpg
+  thumbnail: algolia.jpg
   title: Algolia InstantSearch
   description: Lightning-fast, hyper-configurable search.
   source: https://github.com/algolia/react-instantsearch/
   demo: https://community.algolia.com/react-instantsearch/storybook/
 rebass:
-  thumbnail: ./thumbnails/rebass.png
+  thumbnail: rebass.png
   title: Rebass
   description: Functional React UI component library
   demo: http://jxnblk.com/rebass/stories/
   source: https://github.com/jxnblk/rebass
   site: http://jxnblk.com/rebass
 coursera:
-  thumbnail: ./thumbnails/coursera-ui.png
+  thumbnail: coursera-ui.png
   title: Coursera
   description: Coursera UI component library
   demo: https://building.coursera.org/coursera-ui
 artsy:
-  thumbnail: ./thumbnails/artsy.png
+  thumbnail: artsy.png
   title: Artsy Force
   description: Artsy's "Force" component library
   demo: https://artsy.github.io/reaction/
   source: https://github.com/artsy/reaction-force
   site: https://artsy.net
 necolas:
-  thumbnail: ./thumbnails/reactnativeweb.jpg
+  thumbnail: reactnativeweb.jpg
   title: React Native Web
   description: Storybook demo for React Native Web.
   source: https://github.com/necolas/react-native-web
   demo: https://necolas.github.io/react-native-web/storybook/
 griddle:
-  thumbnail: ./thumbnails/griddle.jpg
+  thumbnail: griddle.jpg
   title: Griddle
   description: An ultra customizable datagrid component for React.
   source: https://github.com/GriddleGriddle/Griddle
   demo: https://griddlegriddle.github.io/Griddle/examples/controlling-griddle/
   site: https://griddlegriddle.github.io/Griddle/
 tachyons:
-  thumbnail: ./thumbnails/tachyons.png
+  thumbnail: tachyons.png
   title: Tachyons Components
   description: A searchable directory of Tachyons Components
   source: https://github.com/blairanderson/tachyonstemplates
   demo: https://www.tachyonstemplates.com/components/
 appbase:
-  thumbnail: ./thumbnails/appbase.jpg
+  thumbnail: appbase.jpg
   title: Appbase Maps
   description: A storybook playground for ReactiveMaps and ReactiveSearch.
   source: https://github.com/appbaseio/playground
   demo: https://opensource.appbase.io/playground/
   site: https://appbase.io
 quran:
-  thumbnail: ./thumbnails/quran.jpg
+  thumbnail: quran.jpg
   title: Quran.com
   description: Component library for Quran.com, Quranicaudio.com and Salah.com.
   source: https://github.com/quran/common-components
   demo: https://quran.github.io/common-components/
   site: https://quran.com/
 terraeclipse:
-  thumbnail: ./thumbnails/terraeclipse.jpg
+  thumbnail: terraeclipse.jpg
   title: TerraEclipse
   description: React components for TerraEclipse, a political technology and strategy firm.
   source: https://github.com/TerraEclipse/react-stack
   demo: https://terraeclipse.github.io/react-stack/
 timeline:
-  thumbnail: ./thumbnails/timeline.jpg
+  thumbnail: timeline.jpg
   title: React Event Timeline
   description: Event timeline component.
   source: https://github.com/rcdexta/react-event-timeline
   demo: https://rcdexta.github.io/react-event-timeline/
 semanticui:
-  thumbnail: ./thumbnails/semanticui.png
+  thumbnail: semanticui.png
   title: Semantic-UI
   description: Storybook for Semantic-UI React components
   source: https://github.com/white-rabbit-japan/Semantic-UI-React-Storybook
   demo: https://white-rabbit-japan.github.io/Semantic-UI-React-Storybook/
 hackoregon:
-  thumbnail: ./thumbnails/hackoregon.png
+  thumbnail: hackoregon.png
   title: Hack Oregon
   description: Official component library and storybook for Hack Oregon.
   source: https://github.com/hackoregon/component-library
   demo: https://hackoregon.github.io/component-library/
 todomvc:
-  thumbnail: ./thumbnails/todomvc.png
+  thumbnail: todomvc.png
   title: TodoMVC with Specs
   description: Todo app Storybook with built-in unit tests.
   source: https://github.com/thorjarhun/react-storybook-todolist
   demo: https://thorjarhun.github.io/react-storybook-todolist/
 react-svg-pan-zoom:
-  thumbnail: ./thumbnails/react-svg-pan-zoom.png
+  thumbnail: react-svg-pan-zoom.png
   title: React SVG Pan Zoom
   description: A React component that adds pan and zoom features to SVG
   source: https://github.com/chrvadala/react-svg-pan-zoom
   demo: https://chrvadala.github.io/react-svg-pan-zoom/
 fyndiq-ui:
-  thumbnail: ./thumbnails/fyndiq.jpg
+  thumbnail: fyndiq.jpg
   title: Fyndiq
   description: Fyndiq UI Component library
   source: https://github.com/fyndiq/fyndiq-ui
   demo: https://fyndiq.github.io/fyndiq-ui/
+gumgum:
+  thumbnail: gumgum.png
+  title: GumGum
+  description: GumGum (Computer Vision Company) Component library
+  demo: https://storybook.gumgum.com
+  site: https://gumgum.com
diff --git a/docs/src/pages/examples/index.jsx b/docs/src/pages/examples/index.jsx
index 9d5c84ba8ac..16e02815164 100644
--- a/docs/src/pages/examples/index.jsx
+++ b/docs/src/pages/examples/index.jsx
@@ -2,6 +2,12 @@ import React from 'react';
 import { values } from 'lodash';
 
 import Examples from '../../components/Grid/Examples';
-import data from './_examples.yml';
+import examples from './_examples.yml';
 
-export default () => <Examples items={values(data)} />;
+const examplesArray = values(examples).map(example => ({
+  ...example,
+  // eslint-disable-next-line import/no-dynamic-require, global-require
+  thumbnailSrc: require(`./thumbnails/${example.thumbnail}`),
+}));
+
+export default () => <Examples items={examplesArray} />;
diff --git a/docs/src/pages/examples/thumbnails/gumgum.png b/docs/src/pages/examples/thumbnails/gumgum.png
new file mode 100644
index 00000000000..e770c0bc809
Binary files /dev/null and b/docs/src/pages/examples/thumbnails/gumgum.png differ
diff --git a/docs/src/pages/testing/css-style-testing/index.md b/docs/src/pages/testing/css-style-testing/index.md
index 0e6a485c3fa..dd928c46980 100644
--- a/docs/src/pages/testing/css-style-testing/index.md
+++ b/docs/src/pages/testing/css-style-testing/index.md
@@ -21,10 +21,15 @@ Then, we can see the above story using the following URL:
 
 ![Storybook Iframe Screenshot](../static/storybook-iframe-screenshot.png)
 
-Just like that, you can access all of the stories in your Storybook.
+Just like that, you can access all of the stories in your Storybook and use them as a base for visual regression testing.
 
 ## Supported CSS/Style Testing Frameworks
 
-It will be hard to use all the frameworks we've [mentioned](/testing/react-ui-testing#3-css-style-testing), but we'll be able to use frameworks which are based on URL as the input source. (Such as [BackstopJS](https://github.com/garris/BackstopJS) and [Gemini](https://github.com/gemini-testing/gemini))
+There are several frameworks that have out of the box Storybook integrations:
+- [StoryShots](https://github.com/storybooks/storybook/tree/master/addons/storyshots) with its [seamless integration](https://github.com/storybooks/storybook/tree/master/addons/storyshots#configure-storyshots-for-image-snapshots) with [jest-image-snapshot](https://github.com/americanexpress/jest-image-snapshot)
+- [Loki](https://loki.js.org/)
+- [Perci](https://percy.io/docs/clients/javascript/react-storybook)
+- [Screener](https://screener.io/v2/docs) 
+- [Chromatic](https://www.chromaticqa.com)
 
-> In the future we are also planning to smooth this process with the help of [StoryShots](https://github.com/storybooks/storybook/tree/master/addons/storyshots).
+Additionally frameworks which are based on URL as the input source such as [BackstopJS](https://github.com/garris/BackstopJS) or [Gemini](https://github.com/gemini-testing/gemini) can be used.
diff --git a/docs/src/stories/index.js b/docs/src/stories/index.js
index f9d8240f38a..66d0b46edde 100644
--- a/docs/src/stories/index.js
+++ b/docs/src/stories/index.js
@@ -1,5 +1,3 @@
-// TODO reenable when @storybook/react with jsnext:main is published
-// eslint-disable-next-line import/named
 import { storiesOf } from '@storybook/react';
 import implementations from './implementations';
 
diff --git a/docs/yarn.lock b/docs/yarn.lock
index 871ea6f0113..420ea33fae9 100644
--- a/docs/yarn.lock
+++ b/docs/yarn.lock
@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@storybook/addon-actions@^3.3.4":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-3.3.4.tgz#54671477f6b867d14ff45bc20b054f6a0d853b62"
+"@storybook/addon-actions@^3.3.14":
+  version "3.3.14"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-3.3.14.tgz#b78e707b32130ad16ea8a0af62a66f23b5df502b"
   dependencies:
     deep-equal "^1.0.1"
     global "^4.3.2"
@@ -13,37 +13,37 @@
     react-inspector "^2.2.2"
     uuid "^3.1.0"
 
-"@storybook/addon-links@^3.3.4":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-3.3.4.tgz#1a4a165a1d0b5b1100464250efe14510760d6c76"
+"@storybook/addon-links@^3.3.14":
+  version "3.3.14"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-3.3.14.tgz#1de63e9b3819927fbb2f963fdabc65f86fde33cc"
   dependencies:
-    "@storybook/components" "^3.3.4"
+    "@storybook/components" "^3.3.14"
     global "^4.3.2"
     prop-types "^15.5.10"
 
-"@storybook/addons@^3.3.4":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-3.3.4.tgz#c1b121f92b5767bff5cba302a339bfa3bc7e0c02"
+"@storybook/addons@^3.3.14":
+  version "3.3.14"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-3.3.14.tgz#20a65085b834898ea6154b9061ebc65a74c6cb33"
 
-"@storybook/channel-postmessage@^3.3.4":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-3.3.4.tgz#56a778c6548777b336f4769b58c7a8b04e45783d"
+"@storybook/channel-postmessage@^3.3.14":
+  version "3.3.14"
+  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-3.3.14.tgz#324fe89323b10fe300c746b452ec0dc7e2f5d72c"
   dependencies:
-    "@storybook/channels" "^3.3.4"
+    "@storybook/channels" "^3.3.14"
     global "^4.3.2"
     json-stringify-safe "^5.0.1"
 
-"@storybook/channels@^3.3.4":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-3.3.4.tgz#29307a428226360f7e8d765764e04be23e71001d"
+"@storybook/channels@^3.3.14":
+  version "3.3.14"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-3.3.14.tgz#b43f767f7775bb17cec5ab0696f918a475043df9"
 
-"@storybook/client-logger@^3.3.4":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-3.3.4.tgz#fca57c58323b5434de03a43bd01de8d88ea0ef99"
+"@storybook/client-logger@^3.3.14":
+  version "3.3.14"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-3.3.14.tgz#03d5bc6036a8e82351a349bec11a8c89f06c901e"
 
-"@storybook/components@^3.3.4":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-3.3.4.tgz#91e06c60daac4f6a3cac773c14bb0f136384c434"
+"@storybook/components@^3.3.14":
+  version "3.3.14"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-3.3.14.tgz#84ffcb5ac6a7d40e145402ed0d1521e6ad1b2d4d"
   dependencies:
     glamor "^2.20.40"
     glamorous "^4.11.2"
@@ -57,13 +57,20 @@
     "@storybook/react-simple-di" "^1.2.1"
     babel-runtime "6.x.x"
 
-"@storybook/node-logger@^3.3.4":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-3.3.4.tgz#c69fe090dc93c4772a9bde815a4ae8d65df509e8"
+"@storybook/node-logger@^3.3.14":
+  version "3.3.14"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-3.3.14.tgz#c769a0763053ff6d32d52d29172fb61acab1122f"
   dependencies:
     chalk "^2.3.0"
     npmlog "^4.1.2"
 
+"@storybook/podda@^1.2.3":
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/podda/-/podda-1.2.3.tgz#53c4a1a3f8c7bbd5755dff5c34576fd1af9d38ba"
+  dependencies:
+    babel-runtime "^6.11.6"
+    immutable "^3.8.1"
+
 "@storybook/react-komposer@^2.0.1", "@storybook/react-komposer@^2.0.3":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@storybook/react-komposer/-/react-komposer-2.0.3.tgz#f9e12a9586b2ce95c24c137eabb8b71527ddb369"
@@ -87,17 +94,17 @@
   dependencies:
     babel-runtime "^6.5.0"
 
-"@storybook/react@^3.3.4":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-3.3.4.tgz#362aa7d4bde9ca8e45834df0736370f4dfc04e35"
+"@storybook/react@^3.3.14":
+  version "3.3.14"
+  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-3.3.14.tgz#89a11e786846b7bcbca8a2baf8972733b3609ab2"
   dependencies:
-    "@storybook/addon-actions" "^3.3.4"
-    "@storybook/addon-links" "^3.3.4"
-    "@storybook/addons" "^3.3.4"
-    "@storybook/channel-postmessage" "^3.3.4"
-    "@storybook/client-logger" "^3.3.4"
-    "@storybook/node-logger" "^3.3.4"
-    "@storybook/ui" "^3.3.4"
+    "@storybook/addon-actions" "^3.3.14"
+    "@storybook/addon-links" "^3.3.14"
+    "@storybook/addons" "^3.3.14"
+    "@storybook/channel-postmessage" "^3.3.14"
+    "@storybook/client-logger" "^3.3.14"
+    "@storybook/node-logger" "^3.3.14"
+    "@storybook/ui" "^3.3.14"
     airbnb-js-shims "^1.4.0"
     autoprefixer "^7.2.3"
     babel-loader "^7.1.2"
@@ -149,12 +156,13 @@
     webpack-dev-middleware "^1.12.2"
     webpack-hot-middleware "^2.21.0"
 
-"@storybook/ui@^3.3.4":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-3.3.4.tgz#d6e116a951be248f4e379ec7db1611ab96da840e"
+"@storybook/ui@^3.3.14":
+  version "3.3.14"
+  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-3.3.14.tgz#85fdbb08d77edf79e8d4a3dee42673157e4b132d"
   dependencies:
-    "@storybook/components" "^3.3.4"
+    "@storybook/components" "^3.3.14"
     "@storybook/mantra-core" "^1.7.2"
+    "@storybook/podda" "^1.2.3"
     "@storybook/react-komposer" "^2.0.3"
     babel-runtime "^6.26.0"
     deep-equal "^1.0.1"
@@ -166,7 +174,6 @@
     lodash.debounce "^4.0.8"
     lodash.pick "^4.4.0"
     lodash.sortby "^4.7.0"
-    podda "^1.2.2"
     prop-types "^15.6.0"
     qs "^6.5.1"
     react-fuzzy "^0.5.1"
@@ -177,14 +184,41 @@
     react-treebeard "^2.1.0"
     redux "^3.7.2"
 
+"@types/history@*", "@types/history@^4.6.2":
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/@types/history/-/history-4.6.2.tgz#12cfaba693ba20f114ed5765467ff25fdf67ddb0"
+
 "@types/inline-style-prefixer@^3.0.0":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@types/inline-style-prefixer/-/inline-style-prefixer-3.0.1.tgz#8541e636b029124b747952e9a28848286d2b5bf6"
 
+"@types/node@*":
+  version "9.4.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-9.4.0.tgz#b85a0bcf1e1cc84eb4901b7e96966aedc6f078d1"
+
 "@types/node@^6.0.46":
   version "6.0.90"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.90.tgz#0ed74833fa1b73dcdb9409dcb1c97ec0a8b13b02"
 
+"@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"
+  dependencies:
+    "@types/history" "*"
+    "@types/react" "*"
+    "@types/react-router" "*"
+
+"@types/react-router@*":
+  version "4.0.21"
+  resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-4.0.21.tgz#d6c7ea3b45dba02eb8f869629f3b7d7b6e9a7938"
+  dependencies:
+    "@types/history" "*"
+    "@types/react" "*"
+
+"@types/react@*":
+  version "16.0.35"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.35.tgz#7ce8a83cad9690fd965551fc513217a74fc9e079"
+
 "@types/react@^16.0.18":
   version "16.0.22"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.22.tgz#19ad106e124aceebd2b4d430a278d55413ee8759"
@@ -304,12 +338,6 @@ ansi-html@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
 
-ansi-red@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c"
-  dependencies:
-    ansi-wrap "0.1.0"
-
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@@ -328,10 +356,6 @@ ansi-styles@^3.1.0:
   dependencies:
     color-convert "^1.9.0"
 
-ansi-wrap@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
-
 ansi@^0.3.0, ansi@~0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
@@ -340,6 +364,10 @@ any-promise@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-0.1.0.tgz#830b680aa7e56f33451d4b049f3bd8044498ee27"
 
+any-promise@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
+
 anymatch@^1.3.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
@@ -2216,15 +2244,6 @@ caw@^1.0.1:
     object-assign "^3.0.0"
     tunnel-agent "^0.4.0"
 
-caw@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/caw/-/caw-2.0.1.tgz#6c3ca071fc194720883c2dc5da9b074bfc7e9e95"
-  dependencies:
-    get-proxy "^2.0.0"
-    isurl "^1.0.0-alpha5"
-    tunnel-agent "^0.6.0"
-    url-to-options "^1.0.1"
-
 ccount@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.2.tgz#53b6a2f815bb77b9c2871f7b9a72c3a25f1d8e89"
@@ -2450,10 +2469,6 @@ code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
-coffee-script@^1.12.4:
-  version "1.12.7"
-  resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53"
-
 collapse-white-space@^1.0.0, collapse-white-space@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.3.tgz#4b906f670e5a963a87b76b0e1689643341b6023c"
@@ -2469,12 +2484,18 @@ color-convert@^0.5.3:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz#bdb6c69ce660fadffe0b0007cc447e1b9f7282bd"
 
-color-convert@^1.3.0, color-convert@^1.8.2, color-convert@^1.9.0:
+color-convert@^1.3.0, color-convert@^1.9.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
   dependencies:
     color-name "^1.1.1"
 
+color-convert@^1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
+  dependencies:
+    color-name "^1.1.1"
+
 color-name@^1.0.0, color-name@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
@@ -2485,7 +2506,7 @@ color-string@^0.3.0:
   dependencies:
     color-name "^1.0.0"
 
-color-string@^1.4.0:
+color-string@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.2.tgz#26e45814bc3c9a7cbd6751648a41434514a773a9"
   dependencies:
@@ -2507,12 +2528,12 @@ color@^0.11.0, color@^0.11.3, color@^0.11.4:
     color-convert "^1.3.0"
     color-string "^0.3.0"
 
-color@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/color/-/color-1.0.3.tgz#e48e832d85f14ef694fb468811c2d5cfe729b55d"
+color@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/color/-/color-3.0.0.tgz#d920b4328d534a3ac8295d68f7bd4ba6c427be9a"
   dependencies:
-    color-convert "^1.8.2"
-    color-string "^1.4.0"
+    color-convert "^1.9.1"
+    color-string "^1.5.2"
 
 colormin@^1.0.5:
   version "1.1.2"
@@ -2532,7 +2553,7 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
-comma-separated-tokens@^1.0.1:
+comma-separated-tokens@^1.0.0, comma-separated-tokens@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.4.tgz#72083e58d4a462f01866f6617f4d98a3cd3b8a46"
   dependencies:
@@ -2626,13 +2647,6 @@ concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.5.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-config-chain@^1.1.11:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2"
-  dependencies:
-    ini "^1.3.4"
-    proto-list "~1.2.1"
-
 configstore@^3.0.0, configstore@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.1.tgz#094ee662ab83fad9917678de114faaea8fcdca90"
@@ -3022,7 +3036,7 @@ death@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/death/-/death-1.1.0.tgz#01aa9c401edd92750514470b8266390c66c67318"
 
-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.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:
@@ -3040,7 +3054,7 @@ decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
 
-decompress-response@^3.2.0:
+decompress-response@^3.2.0, decompress-response@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
   dependencies:
@@ -3114,7 +3128,11 @@ deep-extend@~0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
 
-define-properties@^1.1.2:
+deepmerge@^1.3.0:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.2.tgz#10499d868844cdad4fee0842df8c7f6f0c95a753"
+
+define-properties@^1.1.1, define-properties@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
   dependencies:
@@ -3193,6 +3211,10 @@ detect-indent@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
 
+detect-libc@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+
 detect-port-alt@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/detect-port-alt/-/detect-port-alt-1.1.3.tgz#a4d2f061d757a034ecf37c514260a98750f2b131"
@@ -3948,6 +3970,10 @@ fast-glob@^1.0.1:
     micromatch "^3.0.3"
     readdir-enhanced "^1.5.2"
 
+fast-levenshtein@~2.0.4:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+
 fast-memoize@^2.2.7:
   version "2.2.8"
   resolved "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.2.8.tgz#d7f899f31d037b12d9db4281912f9018575720b1"
@@ -4272,6 +4298,12 @@ fs-extra@4.0.2, fs-extra@^4.0.1, fs-extra@^4.0.2:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
+fs-minipass@^1.2.3:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  dependencies:
+    minipass "^2.2.1"
+
 fs-readdir-recursive@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.0.0.tgz#8cd1745c8b4f8a29c8caec392476921ba195f560"
@@ -4333,15 +4365,15 @@ fuse.js@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.2.0.tgz#f0448e8069855bf2a3e683cdc1d320e7e2a07ef4"
 
-gatsby-1-config-css-modules@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/gatsby-1-config-css-modules/-/gatsby-1-config-css-modules-1.0.8.tgz#c051b7be22c6d07d485c2d9d05e0b88c13f4a572"
+gatsby-1-config-css-modules@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/gatsby-1-config-css-modules/-/gatsby-1-config-css-modules-1.0.9.tgz#ae7ebffcaea4b1cc821951b71c123107d697bfaa"
   dependencies:
     babel-runtime "^6.26.0"
 
-gatsby-cli@^1.1.28:
-  version "1.1.28"
-  resolved "https://registry.yarnpkg.com/gatsby-cli/-/gatsby-cli-1.1.28.tgz#0d0a397566154a3ce3e4680d545c9cfdc33ad95b"
+gatsby-cli@^1.1.44:
+  version "1.1.44"
+  resolved "https://registry.yarnpkg.com/gatsby-cli/-/gatsby-cli-1.1.44.tgz#74c881e01e09d406bb8cd81d3397c2950d3560d9"
   dependencies:
     babel-code-frame "^6.26.0"
     babel-runtime "^6.26.0"
@@ -4361,92 +4393,94 @@ gatsby-cli@^1.1.28:
     yargs "^8.0.2"
     yurnalist "^0.2.1"
 
-gatsby-link@^1.6.30, gatsby-link@^1.6.32:
-  version "1.6.32"
-  resolved "https://registry.yarnpkg.com/gatsby-link/-/gatsby-link-1.6.32.tgz#49114e5fc649f274254953e06bfaafebb296ccb8"
+gatsby-link@^1.6.37:
+  version "1.6.37"
+  resolved "https://registry.yarnpkg.com/gatsby-link/-/gatsby-link-1.6.37.tgz#d132290c0239dc2e11a9106353c586f969194673"
   dependencies:
+    "@types/history" "^4.6.2"
+    "@types/react-router-dom" "^4.2.2"
     babel-runtime "^6.26.0"
     prop-types "^15.5.8"
     ric "^1.3.0"
 
-gatsby-module-loader@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/gatsby-module-loader/-/gatsby-module-loader-1.0.9.tgz#a33f3496589577749d2fbb680f7bab9ddcc86172"
+gatsby-module-loader@^1.0.10:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/gatsby-module-loader/-/gatsby-module-loader-1.0.10.tgz#32560de487ea5523097917bc1dc76b9a1247bbe9"
   dependencies:
     babel-runtime "^6.26.0"
     loader-utils "^0.2.16"
 
-gatsby-plugin-sharp@^1.6.24:
-  version "1.6.24"
-  resolved "https://registry.yarnpkg.com/gatsby-plugin-sharp/-/gatsby-plugin-sharp-1.6.24.tgz#f885a384b222f655534e45788a99863a038bf107"
+gatsby-plugin-sharp@^1.6.35:
+  version "1.6.35"
+  resolved "https://registry.yarnpkg.com/gatsby-plugin-sharp/-/gatsby-plugin-sharp-1.6.35.tgz#3ef8578163b47842377f14825c98d27dc32f061d"
   dependencies:
     async "^2.1.2"
     babel-runtime "^6.26.0"
     bluebird "^3.5.0"
-    image-size "^0.5.1"
     imagemin "^5.2.2"
     imagemin-pngquant "^5.0.0"
     imagemin-webp "^4.0.0"
     lodash "^4.17.4"
     potrace "^2.1.1"
+    probe-image-size "^3.2.0"
     progress "^1.1.8"
-    sharp "^0.17.3"
+    sharp "^0.19.1"
     svgo "^0.7.2"
 
-gatsby-react-router-scroll@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/gatsby-react-router-scroll/-/gatsby-react-router-scroll-1.0.7.tgz#50be2d6d3857625eb087c14f2a6789672fd73219"
+gatsby-react-router-scroll@^1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/gatsby-react-router-scroll/-/gatsby-react-router-scroll-1.0.11.tgz#1ad3bdfc7f0a897abf24e4d89111ee49de516691"
   dependencies:
     babel-runtime "^6.26.0"
-    scroll-behavior "^0.9.1"
+    scroll-behavior "^0.9.9"
     warning "^3.0.0"
 
-gatsby-remark-autolink-headers@^1.4.11:
-  version "1.4.11"
-  resolved "https://registry.yarnpkg.com/gatsby-remark-autolink-headers/-/gatsby-remark-autolink-headers-1.4.11.tgz#d6d33613c18e405d90177dfa7dd54dd7853b4759"
+gatsby-remark-autolink-headers@^1.4.12:
+  version "1.4.12"
+  resolved "https://registry.yarnpkg.com/gatsby-remark-autolink-headers/-/gatsby-remark-autolink-headers-1.4.12.tgz#98d1cc3b2d08dd24fe145db6360d7afb04c3874c"
   dependencies:
     babel-runtime "^6.26.0"
     github-slugger "^1.1.1"
     mdast-util-to-string "^1.0.2"
     unist-util-visit "^1.1.1"
 
-gatsby-remark-copy-linked-files@^1.5.25:
-  version "1.5.25"
-  resolved "https://registry.yarnpkg.com/gatsby-remark-copy-linked-files/-/gatsby-remark-copy-linked-files-1.5.25.tgz#ca2098551de4df929f03b8ab0d3bfa54b9f68deb"
+gatsby-remark-copy-linked-files@^1.5.28:
+  version "1.5.28"
+  resolved "https://registry.yarnpkg.com/gatsby-remark-copy-linked-files/-/gatsby-remark-copy-linked-files-1.5.28.tgz#e590a604f4758da7e88ec7c59e12ee0b7bc845ef"
   dependencies:
     babel-runtime "^6.26.0"
     cheerio "^1.0.0-rc.2"
     fs-extra "^4.0.1"
-    image-size "^0.6.1"
     is-relative-url "^2.0.0"
     lodash "^4.17.4"
     path-is-inside "^1.0.2"
+    probe-image-size "^3.2.0"
     unist-util-visit "^1.1.1"
 
-gatsby-remark-images@^1.5.36:
-  version "1.5.36"
-  resolved "https://registry.yarnpkg.com/gatsby-remark-images/-/gatsby-remark-images-1.5.36.tgz#12920b1c1969d519befd4c661201c28e30a896a8"
+gatsby-remark-images@^1.5.51:
+  version "1.5.51"
+  resolved "https://registry.yarnpkg.com/gatsby-remark-images/-/gatsby-remark-images-1.5.51.tgz#0c32af341cbc777cbfeb023355a85d5791a4fdb0"
   dependencies:
     babel-runtime "^6.26.0"
     cheerio "^1.0.0-rc.2"
-    gatsby-plugin-sharp "^1.6.24"
+    gatsby-plugin-sharp "^1.6.35"
     is-relative-url "^2.0.0"
     lodash "^4.17.4"
     slash "^1.0.0"
     unist-util-select "^1.5.0"
 
-gatsby-remark-smartypants@^1.4.10:
-  version "1.4.10"
-  resolved "https://registry.yarnpkg.com/gatsby-remark-smartypants/-/gatsby-remark-smartypants-1.4.10.tgz#b04c06741529e693dc54fe23e191edb3cf0aea9e"
+gatsby-remark-smartypants@^1.4.11:
+  version "1.4.11"
+  resolved "https://registry.yarnpkg.com/gatsby-remark-smartypants/-/gatsby-remark-smartypants-1.4.11.tgz#86e756aa9f093f25627961b00c14bcec6ebd1894"
   dependencies:
     babel-runtime "^6.26.0"
     retext "^4.0.0"
     retext-smartypants "^2.0.0"
     unist-util-visit "^1.1.1"
 
-gatsby-source-filesystem@^1.5.11:
-  version "1.5.11"
-  resolved "https://registry.yarnpkg.com/gatsby-source-filesystem/-/gatsby-source-filesystem-1.5.11.tgz#bc2f9bdcc71212df42d45ae0b8adc7e37540b599"
+gatsby-source-filesystem@^1.5.24:
+  version "1.5.24"
+  resolved "https://registry.yarnpkg.com/gatsby-source-filesystem/-/gatsby-source-filesystem-1.5.24.tgz#5d1ff9b3994fff967be92f6fea27e6cf1ba75fbe"
   dependencies:
     babel-cli "^6.26.0"
     babel-runtime "^6.26.0"
@@ -4460,13 +4494,15 @@ gatsby-source-filesystem@^1.5.11:
     slash "^1.0.0"
     valid-url "^1.0.9"
 
-gatsby-transformer-remark@^1.7.26:
-  version "1.7.26"
-  resolved "https://registry.yarnpkg.com/gatsby-transformer-remark/-/gatsby-transformer-remark-1.7.26.tgz#58c273517b6039489b183fc4194ad07ee46e71ff"
+gatsby-transformer-remark@^1.7.33:
+  version "1.7.33"
+  resolved "https://registry.yarnpkg.com/gatsby-transformer-remark/-/gatsby-transformer-remark-1.7.33.tgz#02fc88206bbdac989442c243c3229b6468e8999b"
   dependencies:
     babel-runtime "^6.26.0"
     bluebird "^3.5.0"
-    gray-matter "^2.1.0"
+    graphql-type-json "^0.1.4"
+    gray-matter "^3.0.0"
+    hast-util-raw "^2.0.2"
     hast-util-to-html "^3.0.0"
     lodash "^4.17.4"
     mdast-util-to-hast "^2.4.0"
@@ -4479,12 +4515,13 @@ gatsby-transformer-remark@^1.7.26:
     sanitize-html "^1.14.1"
     underscore.string "^3.3.4"
     unified "^6.1.5"
+    unist-util-remove-position "^1.1.1"
     unist-util-select "^1.5.0"
     unist-util-visit "^1.1.1"
 
-gatsby@^1.9.149:
-  version "1.9.149"
-  resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-1.9.149.tgz#4c0f776b634a8c291254abedae22e6265bfbcde4"
+gatsby@^1.9.216:
+  version "1.9.216"
+  resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-1.9.216.tgz#41269eb89150c871a62d11ae09a6efa3a8034dd3"
   dependencies:
     async "^2.1.2"
     babel-code-frame "^6.22.0"
@@ -4518,20 +4555,21 @@ gatsby@^1.9.149:
     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"
     friendly-errors-webpack-plugin "^1.6.1"
     front-matter "^2.1.0"
     fs-extra "^4.0.1"
-    gatsby-1-config-css-modules "^1.0.8"
-    gatsby-cli "^1.1.28"
-    gatsby-link "^1.6.30"
-    gatsby-module-loader "^1.0.9"
-    gatsby-react-router-scroll "^1.0.7"
+    gatsby-1-config-css-modules "^1.0.9"
+    gatsby-cli "^1.1.44"
+    gatsby-link "^1.6.37"
+    gatsby-module-loader "^1.0.10"
+    gatsby-react-router-scroll "^1.0.11"
     glob "^7.1.1"
     graphql "^0.11.7"
     graphql-relay "^0.5.1"
-    graphql-skip-limit "^1.0.9"
+    graphql-skip-limit "^1.0.10"
     history "^4.6.2"
     invariant "^2.2.2"
     is-relative "^0.2.1"
@@ -4569,9 +4607,10 @@ gatsby@^1.9.149:
     react-router "^4.1.1"
     react-router-dom "^4.1.1"
     redux "^3.6.0"
-    relay-compiler "^1.4.1"
+    relay-compiler "1.4.1"
     remote-redux-devtools "^0.5.7"
     serve "^6.4.0"
+    shallow-compare "^1.2.2"
     sift "^3.2.6"
     signal-exit "^3.0.2"
     slash "^1.0.0"
@@ -4581,6 +4620,8 @@ gatsby@^1.9.149:
     style-loader "^0.13.0"
     type-of "^2.0.1"
     url-loader "^0.5.7"
+    uuid "^3.1.0"
+    v8-compile-cache "^1.1.0"
     webpack "^1.13.3"
     webpack-configurator "^0.3.0"
     webpack-dev-middleware "^1.8.4"
@@ -4628,12 +4669,6 @@ get-proxy@^1.0.1:
   dependencies:
     rc "^1.1.2"
 
-get-proxy@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/get-proxy/-/get-proxy-2.1.0.tgz#349f2b4d91d44c4d4d4e9cba2ad90143fac5ef93"
-  dependencies:
-    npm-conf "^1.1.0"
-
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
@@ -4894,28 +4929,31 @@ graphql-relay@^0.5.1:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/graphql-relay/-/graphql-relay-0.5.3.tgz#56a78ac07c87d89795a34db6b8e9681b827be5b5"
 
-graphql-skip-limit@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/graphql-skip-limit/-/graphql-skip-limit-1.0.9.tgz#20d0de6bd6cf3460c4fdcee3d6b379634d0d44b7"
+graphql-skip-limit@^1.0.10:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/graphql-skip-limit/-/graphql-skip-limit-1.0.10.tgz#0923b8b2e333cfc5d47283fa3e376657a1378452"
   dependencies:
     babel-runtime "^6.26.0"
     graphql "^0.11.7"
 
+graphql-type-json@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/graphql-type-json/-/graphql-type-json-0.1.4.tgz#89f13f5d32ce08c9a76c79fdf9c1968384d81a4e"
+
 graphql@^0.11.3, graphql@^0.11.7:
   version "0.11.7"
   resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.11.7.tgz#e5abaa9cb7b7cccb84e9f0836bf4370d268750c6"
   dependencies:
     iterall "1.1.3"
 
-gray-matter@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/gray-matter/-/gray-matter-2.1.1.tgz#3042d9adec2a1ded6a7707a9ed2380f8a17a430e"
+gray-matter@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/gray-matter/-/gray-matter-3.1.1.tgz#101f80d9e69eeca6765cdce437705b18f40876ac"
   dependencies:
-    ansi-red "^0.1.1"
-    coffee-script "^1.12.4"
     extend-shallow "^2.0.1"
-    js-yaml "^3.8.1"
-    toml "^2.3.2"
+    js-yaml "^3.10.0"
+    kind-of "^5.0.2"
+    strip-bom-string "^1.0.0"
 
 gulp-decompress@^1.2.0:
   version "1.2.0"
@@ -5104,10 +5142,47 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.0"
 
+hast-to-hyperscript@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/hast-to-hyperscript/-/hast-to-hyperscript-3.1.0.tgz#58ef4af5344f4da22f0622e072a8d5fa062693d3"
+  dependencies:
+    comma-separated-tokens "^1.0.0"
+    is-nan "^1.2.1"
+    kebab-case "^1.0.0"
+    property-information "^3.0.0"
+    space-separated-tokens "^1.0.0"
+    trim "0.0.1"
+    unist-util-is "^2.0.0"
+
+hast-util-from-parse5@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/hast-util-from-parse5/-/hast-util-from-parse5-2.1.0.tgz#f6123d83d3689630b097e13e430d16d9d1bd8884"
+  dependencies:
+    camelcase "^3.0.0"
+    hastscript "^3.0.0"
+    property-information "^3.1.0"
+    vfile-location "^2.0.0"
+
 hast-util-is-element@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/hast-util-is-element/-/hast-util-is-element-1.0.0.tgz#3f7216978b2ae14d98749878782675f33be3ce00"
 
+hast-util-parse-selector@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-2.1.0.tgz#b55c0f4bb7bb2040c889c325ef87ab29c38102b4"
+
+hast-util-raw@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/hast-util-raw/-/hast-util-raw-2.0.2.tgz#20674cfb45428213917a54ec929e6774df0642d8"
+  dependencies:
+    hast-util-from-parse5 "^2.0.0"
+    hast-util-to-parse5 "^2.0.0"
+    html-void-elements "^1.0.1"
+    parse5 "^3.0.3"
+    unist-util-position "^3.0.0"
+    web-namespaces "^1.0.0"
+    zwitch "^1.0.0"
+
 hast-util-to-html@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/hast-util-to-html/-/hast-util-to-html-3.1.0.tgz#882c99849e40130e991c042e456d453d95c36cff"
@@ -5124,10 +5199,30 @@ hast-util-to-html@^3.0.0:
     unist-util-is "^2.0.0"
     xtend "^4.0.1"
 
+hast-util-to-parse5@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/hast-util-to-parse5/-/hast-util-to-parse5-2.2.0.tgz#48c8f7f783020c04c3625db06109d02017033cbc"
+  dependencies:
+    hast-to-hyperscript "^3.0.0"
+    mapz "^1.0.0"
+    web-namespaces "^1.0.0"
+    xtend "^4.0.1"
+    zwitch "^1.0.0"
+
 hast-util-whitespace@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-1.0.0.tgz#bd096919625d2936e1ff17bc4df7fd727f17ece9"
 
+hastscript@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-3.1.0.tgz#66628ba6d7f1ad07d9277dd09028aba7f4934599"
+  dependencies:
+    camelcase "^3.0.0"
+    comma-separated-tokens "^1.0.0"
+    hast-util-parse-selector "^2.0.0"
+    property-information "^3.0.0"
+    space-separated-tokens "^1.0.0"
+
 hawk@3.1.3, hawk@~3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
@@ -5244,7 +5339,7 @@ html-tag-names@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/html-tag-names/-/html-tag-names-1.1.2.tgz#f65168964c5a9c82675efda882875dcb2a875c22"
 
-html-void-elements@^1.0.0:
+html-void-elements@^1.0.0, html-void-elements@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.2.tgz#9d22e0ca32acc95b3f45b8d5b4f6fbdc05affd55"
 
@@ -5354,14 +5449,6 @@ iferr@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
 
-image-size@^0.5.1:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
-
-image-size@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.6.1.tgz#98122a562d59dcc097ef1b2c8191866eb8f5d663"
-
 imagemin-pngquant@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/imagemin-pngquant/-/imagemin-pngquant-5.0.1.tgz#d8a329da553afa226b11ce62debe0b7e37b439e6"
@@ -5706,6 +5793,12 @@ is-installed-globally@^0.1.0:
     global-dirs "^0.1.0"
     is-path-inside "^1.0.0"
 
+is-nan@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.2.1.tgz#9faf65b6fb6db24b7f5c0628475ea71f988401e2"
+  dependencies:
+    define-properties "^1.1.1"
+
 is-natural-number@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-2.1.1.tgz#7d4c5728377ef386c3e194a9911bf57c6dc335e7"
@@ -5997,7 +6090,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
-js-yaml@^3.4.3, js-yaml@^3.4.6, js-yaml@^3.5.2, js-yaml@^3.8.1:
+js-yaml@^3.10.0, js-yaml@^3.4.3, js-yaml@^3.4.6, js-yaml@^3.5.2:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
   dependencies:
@@ -6514,6 +6607,10 @@ lodash@4.11.1:
   version "4.11.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.11.1.tgz#a32106eb8e2ec8e82c241611414773c9df15f8bc"
 
+lodash@^4.17.5:
+  version "4.17.5"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
+
 log-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
@@ -6619,6 +6716,12 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
+mapz@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mapz/-/mapz-1.0.1.tgz#9ecec757d3c3fe0a8a6f363e328eaee69a428441"
+  dependencies:
+    x-is-array "^0.1.0"
+
 markdown-escapes@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.1.tgz#1994df2d3af4811de59a6714934c2b2292734518"
@@ -6634,14 +6737,14 @@ markdown-table@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.1.tgz#4b3dd3a133d1518b8ef0dbc709bf2a1b4824bc8c"
 
+marked@^0.3.17:
+  version "0.3.17"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.17.tgz#607f06668b3c6b1246b28f13da76116ac1aa2d2b"
+
 marked@^0.3.6:
   version "0.3.9"
   resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.9.tgz#54ce6a57e720c3ac6098374ec625fcbcc97ff290"
 
-marked@^0.3.7:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.7.tgz#80ef3bbf1bd00d1c9cfebe42ba1b8c85da258d0d"
-
 math-expression-evaluator@^1.2.14:
   version "1.2.17"
   resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
@@ -6912,6 +7015,18 @@ minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
 
+minipass@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.2.1.tgz#5ada97538b1027b4cf7213432428578cb564011f"
+  dependencies:
+    yallist "^3.0.0"
+
+minizlib@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
+  dependencies:
+    minipass "^2.2.1"
+
 mississippi@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-1.3.0.tgz#d201583eb12327e3c5c1642a404a9cacf94e34f5"
@@ -6981,10 +7096,14 @@ mute-stream@0.0.7, mute-stream@~0.0.4:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
-nan@^2.3.0, nan@^2.5.1:
+nan@^2.3.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"
 
+nan@^2.9.2:
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.9.2.tgz#f564d75f5f8f36a6d9456cca7a6c4fe488ab7866"
+
 nanomatch@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.5.tgz#5c9ab02475c76676275731b0bf0a7395c624a9c4"
@@ -7019,6 +7138,10 @@ netrc@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/netrc/-/netrc-0.1.4.tgz#6be94fcaca8d77ade0a9670dc460914c94472444"
 
+next-tick@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
+
 nlcst-to-string@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/nlcst-to-string/-/nlcst-to-string-2.0.1.tgz#f90f3cf905c137dc8edd8727fbcde73e73c2a1d9"
@@ -7177,13 +7300,6 @@ normalize-url@^1.4.0:
     query-string "^4.1.0"
     sort-keys "^1.0.0"
 
-npm-conf@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9"
-  dependencies:
-    config-chain "^1.1.11"
-    pify "^3.0.0"
-
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -7583,6 +7699,12 @@ parse5@^3.0.1:
   dependencies:
     "@types/node" "^6.0.46"
 
+parse5@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
+  dependencies:
+    "@types/node" "*"
+
 parseqs@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
@@ -7786,13 +7908,6 @@ pngquant-bin@^3.0.0:
     bin-wrapper "^3.0.0"
     logalot "^2.0.0"
 
-podda@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/podda/-/podda-1.2.2.tgz#15b0edbd334ade145813343f5ecf9c10a71cf500"
-  dependencies:
-    babel-runtime "^6.11.6"
-    immutable "^3.8.1"
-
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
@@ -8388,6 +8503,17 @@ private@^0.1.6, private@^0.1.7, private@~0.1.5:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"
 
+probe-image-size@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/probe-image-size/-/probe-image-size-3.2.0.tgz#0b8d7cd6e8dce8356bec732a1d9e793bcc8aed44"
+  dependencies:
+    any-promise "^1.3.0"
+    deepmerge "^1.3.0"
+    got "^6.7.1"
+    inherits "^2.0.3"
+    next-tick "^1.0.0"
+    stream-parser "~0.3.1"
+
 process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
@@ -8436,6 +8562,14 @@ prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.8,
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
+prop-types@^15.6.1:
+  version "15.6.1"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
+  dependencies:
+    fbjs "^0.8.16"
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
 proper-lockfile@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-1.2.0.tgz#ceff5dd89d3e5f10fb75e1e8e76bc75801a59c34"
@@ -8445,14 +8579,10 @@ proper-lockfile@^1.1.2:
     graceful-fs "^4.1.2"
     retry "^0.10.0"
 
-property-information@^3.1.0:
+property-information@^3.0.0, property-information@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/property-information/-/property-information-3.2.0.tgz#fd1483c8fbac61808f5fe359e7693a1f48a58331"
 
-proto-list@~1.2.1:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
-
 proxy-addr@~2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.2.tgz#6571504f47bb988ec8180253f85dd7e14952bdec"
@@ -8773,9 +8903,9 @@ react-split-pane@^0.1.74:
     prop-types "^15.5.10"
     react-style-proptype "^3.0.0"
 
-react-stack-grid@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/react-stack-grid/-/react-stack-grid-0.7.0.tgz#396109b811ae8a43920ce8b67421ed9978a8b677"
+react-stack-grid@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/react-stack-grid/-/react-stack-grid-0.7.1.tgz#cbf7353ce6c2acf712b827c36b0be234af84bee9"
   dependencies:
     easy-css-transform-builder "^0.0.2"
     exenv "^1.2.1"
@@ -9076,7 +9206,7 @@ relateurl@0.2.x:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
 
-relay-compiler@^1.4.1:
+relay-compiler@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/relay-compiler/-/relay-compiler-1.4.1.tgz#10e83f0f5de8db3d000851a4c0e435e7dd1deb95"
   dependencies:
@@ -9560,9 +9690,9 @@ schema-utils@^0.4.2:
     ajv "^5.0.0"
     ajv-keywords "^2.1.0"
 
-scroll-behavior@^0.9.1:
-  version "0.9.4"
-  resolved "https://registry.yarnpkg.com/scroll-behavior/-/scroll-behavior-0.9.4.tgz#73b4a0eae3e59c0b8f3b6fc1ff78f054a513e79c"
+scroll-behavior@^0.9.9:
+  version "0.9.9"
+  resolved "https://registry.yarnpkg.com/scroll-behavior/-/scroll-behavior-0.9.9.tgz#ebfe0658455b82ad885b66195215416674dacce2"
   dependencies:
     dom-helpers "^3.2.1"
     invariant "^2.2.2"
@@ -9597,6 +9727,10 @@ semver@^4.0.3, semver@^4.3.3:
   version "4.3.6"
   resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
 
+semver@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
+
 send@0.16.1:
   version "0.16.1"
   resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3"
@@ -9735,6 +9869,10 @@ sha.js@^2.4.0, sha.js@^2.4.8:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
+shallow-compare@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/shallow-compare/-/shallow-compare-1.2.2.tgz#fa4794627bf455a47c4f56881d8a6132d581ffdb"
+
 shallowequal@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-0.2.2.tgz#1e32fd5bcab6ad688a4812cb0cc04efc75c7014e"
@@ -9745,16 +9883,17 @@ shallowequal@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.0.2.tgz#1561dbdefb8c01408100319085764da3fcf83f8f"
 
-sharp@^0.17.3:
-  version "0.17.3"
-  resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.17.3.tgz#484cd2a70c900370948dcc43e165f78306bff48a"
+sharp@^0.19.1:
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.19.1.tgz#819bf11f5c3f4ff32eb465f255b5fb87e43ceea1"
   dependencies:
-    caw "^2.0.0"
-    color "^1.0.3"
-    got "^6.7.1"
-    nan "^2.5.1"
-    semver "^5.3.0"
-    tar "^2.2.1"
+    color "^3.0.0"
+    detect-libc "^1.0.3"
+    nan "^2.9.2"
+    semver "^5.5.0"
+    simple-get "^2.7.0"
+    tar "^4.4.0"
+    tunnel-agent "^0.6.0"
 
 shebang-command@^1.2.0:
   version "1.2.0"
@@ -9807,6 +9946,18 @@ signedsource@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/signedsource/-/signedsource-1.0.0.tgz#1ddace4981798f93bd833973803d80d52e93ad6a"
 
+simple-concat@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.0.tgz#7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"
+
+simple-get@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-2.7.0.tgz#ad37f926d08129237ff08c4f2edfd6f10e0380b5"
+  dependencies:
+    decompress-response "^3.3.0"
+    once "^1.3.1"
+    simple-concat "^1.0.0"
+
 simple-swizzle@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
@@ -10171,6 +10322,12 @@ stream-http@^2.3.1:
     to-arraybuffer "^1.0.0"
     xtend "^4.0.0"
 
+stream-parser@~0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/stream-parser/-/stream-parser-0.3.1.tgz#1618548694420021a1182ff0af1911c129761773"
+  dependencies:
+    debug "2"
+
 stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
@@ -10274,6 +10431,10 @@ strip-bom-stream@^1.0.0:
     first-chunk-stream "^1.0.0"
     strip-bom "^2.0.0"
 
+strip-bom-string@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92"
+
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
@@ -10453,6 +10614,17 @@ tar@^2.2.1:
     fstream "^1.0.2"
     inherits "2"
 
+tar@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.0.tgz#3aaf8c29b6b800a8215f33efb4df1c95ce2ac2f5"
+  dependencies:
+    chownr "^1.0.1"
+    fs-minipass "^1.2.3"
+    minipass "^2.2.1"
+    minizlib "^1.1.0"
+    mkdirp "^0.5.0"
+    yallist "^3.0.2"
+
 temp-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
@@ -10581,10 +10753,6 @@ to-regex@^3.0.1:
     extend-shallow "^2.0.1"
     regex-not "^1.0.0"
 
-toml@^2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/toml/-/toml-2.3.3.tgz#8d683d729577cb286231dfc7a8affe58d31728fb"
-
 topo@2.x.x:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/topo/-/topo-2.0.2.tgz#cd5615752539057c0dc0491a621c3bc6fbe1d182"
@@ -10862,7 +11030,7 @@ unist-util-position@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.0.0.tgz#e6e1e03eeeb81c5e1afe553e8d4adfbd7c0d8f82"
 
-unist-util-remove-position@^1.0.0:
+unist-util-remove-position@^1.0.0, unist-util-remove-position@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.1.tgz#5a85c1555fc1ba0c101b86707d15e50fa4c871bb"
   dependencies:
@@ -11042,6 +11210,10 @@ uws@~0.14.4:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/uws/-/uws-0.14.5.tgz#67aaf33c46b2a587a5f6666d00f7691328f149dc"
 
+v8-compile-cache@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-1.1.0.tgz#1dc2a340fb8e5f800a32bcdbfb8c23cd747021b9"
+
 v8flags@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
@@ -11208,6 +11380,10 @@ watchpack@^1.4.0:
     chokidar "^1.7.0"
     graceful-fs "^4.1.2"
 
+web-namespaces@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-1.1.1.tgz#742d9fff61ff84f4164f677244f42d29c10c451d"
+
 webpack-configurator@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/webpack-configurator/-/webpack-configurator-0.3.1.tgz#d16802afa674101a0cbfa6fc344d415c9649540b"
@@ -11491,6 +11667,10 @@ ws@~2.3.1:
     safe-buffer "~5.0.1"
     ultron "~1.1.0"
 
+x-is-array@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/x-is-array/-/x-is-array-0.1.0.tgz#de520171d47b3f416f5587d629b89d26b12dc29d"
+
 x-is-function@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/x-is-function/-/x-is-function-1.0.4.tgz#5d294dc3d268cbdd062580e0c5df77a391d1fa1e"
@@ -11547,6 +11727,10 @@ yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
 
+yallist@^3.0.0, yallist@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
+
 yaml-loader@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/yaml-loader/-/yaml-loader-0.4.0.tgz#4aae447d13c1aa73a989d8a2a5309b0b1a3ca353"
@@ -11660,3 +11844,7 @@ yurnalist@^0.2.1:
     rimraf "^2.5.0"
     semver "^5.1.0"
     strip-bom "^3.0.0"
+
+zwitch@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.2.tgz#9b059541bfa844799fe2d903bde609de2503a041"
diff --git a/examples/angular-cli/.storybook/addons.js b/examples/angular-cli/.storybook/addons.js
index c558d223502..59f97cdaf0f 100644
--- a/examples/angular-cli/.storybook/addons.js
+++ b/examples/angular-cli/.storybook/addons.js
@@ -1,6 +1,6 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
-
+import '@storybook/addon-storysource/register';
 import '@storybook/addon-actions/register';
 import '@storybook/addon-links/register';
 import '@storybook/addon-notes/register';
 import '@storybook/addon-knobs/register';
+import '@storybook/addon-options/register';
diff --git a/examples/angular-cli/.storybook/config.js b/examples/angular-cli/.storybook/config.js
index 2da8e2e77ee..2fef94e1cea 100644
--- a/examples/angular-cli/.storybook/config.js
+++ b/examples/angular-cli/.storybook/config.js
@@ -1,14 +1,20 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
-
 import { configure } from '@storybook/angular';
+import { setOptions } from '@storybook/addon-options';
+import addCssWarning from '../src/cssWarning';
+
+addCssWarning();
+
+setOptions({
+  hierarchyRootSeparator: /\|/,
+});
 
 function loadStories() {
   // put welcome screen at the top of the list so it's the first one displayed
   require('../src/stories');
 
   // automatically import all story ts files that end with *.stories.ts
-  const req = require.context('../src/stories', true, /\.stories\.ts$/)
-  req.keys().forEach((filename) => req(filename))
+  const req = require.context('../src/stories', true, /\.stories\.ts$/);
+  req.keys().forEach(filename => req(filename));
 }
 
 configure(loadStories, module);
diff --git a/examples/angular-cli/.storybook/tsconfig.json b/examples/angular-cli/.storybook/tsconfig.json
new file mode 100644
index 00000000000..de9e409b5fb
--- /dev/null
+++ b/examples/angular-cli/.storybook/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../tsconfig.json",
+  "exclude": [
+    "../src/test.ts",
+    "../src/**/*.spec.ts"
+  ],
+  "include": [
+    "../src/**/*"
+  ]
+}
diff --git a/examples/angular-cli/.storybook/webpack.config.js b/examples/angular-cli/.storybook/webpack.config.js
new file mode 100644
index 00000000000..d3097cdf2b2
--- /dev/null
+++ b/examples/angular-cli/.storybook/webpack.config.js
@@ -0,0 +1,12 @@
+const path = require('path');
+
+module.exports = baseConfig => {
+  baseConfig.module.rules.push({
+    test: [/\.stories\.tsx?$/, /index\.ts$/],
+    loaders: [require.resolve('@storybook/addon-storysource/loader')],
+    include: [path.resolve(__dirname, '../src')],
+    enforce: 'pre',
+  });
+
+  return baseConfig;
+};
diff --git a/examples/angular-cli/angularshots.test.js b/examples/angular-cli/angularshots.test.js
new file mode 100644
index 00000000000..3b6b1f9ad06
--- /dev/null
+++ b/examples/angular-cli/angularshots.test.js
@@ -0,0 +1,8 @@
+import path from 'path';
+import initStoryshots, { multiSnapshotWithOptions } from '@storybook/addon-storyshots';
+
+initStoryshots({
+  framework: 'angular',
+  configPath: path.join(__dirname, '.storybook'),
+  test: multiSnapshotWithOptions({}),
+});
diff --git a/examples/angular-cli/e2e/app.e2e-spec.ts b/examples/angular-cli/e2e/app.e2e-spec.ts
index 626e67bd1b3..a62d4d0620f 100644
--- a/examples/angular-cli/e2e/app.e2e-spec.ts
+++ b/examples/angular-cli/e2e/app.e2e-spec.ts
@@ -10,6 +10,6 @@ describe('ng5test App', () => {
 
   it('should display welcome message', () => {
     page.navigateTo();
-    expect(<any>(page.getParagraphText())).toEqual('Welcome to app!');
+    expect(<any>page.getParagraphText()).toEqual('Welcome to app!');
   });
 });
diff --git a/examples/angular-cli/e2e/app.po.ts b/examples/angular-cli/e2e/app.po.ts
index 82ea75ba504..eb663398fd5 100644
--- a/examples/angular-cli/e2e/app.po.ts
+++ b/examples/angular-cli/e2e/app.po.ts
@@ -6,6 +6,6 @@ export class AppPage {
   }
 
   getParagraphText() {
-    return element(by.css('app-root h1')).getText();
+    return element(by.css('storybook-app-root h1')).getText();
   }
 }
diff --git a/examples/angular-cli/karma.conf.js b/examples/angular-cli/karma.conf.js
index 51fd7c6b7ee..684edc0f86f 100644
--- a/examples/angular-cli/karma.conf.js
+++ b/examples/angular-cli/karma.conf.js
@@ -30,5 +30,6 @@ module.exports = function(config) {
     autoWatch: true,
     browsers: ['Chrome'],
     singleRun: false,
+    webpack: { node: { fs: 'empty', } },
   });
 };
diff --git a/examples/angular-cli/package.json b/examples/angular-cli/package.json
index 96c9a80427c..0b9aba9df7e 100644
--- a/examples/angular-cli/package.json
+++ b/examples/angular-cli/package.json
@@ -1,55 +1,53 @@
 {
   "name": "angular-cli",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
+  "private": true,
   "license": "MIT",
   "scripts": {
+    "build": "ng build",
+    "build-storybook": "build-storybook -s src",
+    "e2e": "ng e2e",
     "ng": "ng",
     "start": "ng serve",
-    "build": "ng build",
-    "test": "ng test",
-    "lint": "ng lint",
-    "e2e": "ng e2e",
     "storybook": "start-storybook -p 9008 -s src/assets",
-    "build-storybook": "build-storybook -s src"
+    "test": "ng test"
   },
-  "private": true,
   "dependencies": {
-    "@angular/animations": "^5.1.3",
-    "@angular/common": "^5.1.3",
-    "@angular/compiler": "^5.1.3",
-    "@angular/core": "^5.1.3",
-    "@angular/forms": "^5.1.3",
-    "@angular/http": "^5.1.3",
-    "@angular/platform-browser": "^5.1.3",
-    "@angular/platform-browser-dynamic": "^5.1.3",
-    "@angular/router": "^5.1.3",
+    "@angular/common": "^5.2.7",
+    "@angular/compiler": "^5.2.7",
+    "@angular/core": "^5.2.7",
+    "@angular/forms": "^5.2.7",
+    "@angular/platform-browser": "^5.2.7",
+    "@angular/platform-browser-dynamic": "^5.2.7",
     "core-js": "^2.4.1",
     "rxjs": "^5.4.2",
-    "zone.js": "^0.8.19"
+    "zone.js": "^0.8.20"
   },
   "devDependencies": {
-    "@angular/cli": "1.6.3",
-    "@angular/compiler-cli": "^5.1.3",
-    "@angular/language-service": "^5.1.3",
-    "@storybook/addon-actions": "^3.4.0-alpha.0",
-    "@storybook/addon-links": "^3.4.0-alpha.0",
-    "@storybook/addon-notes": "^3.4.0-alpha.0",
-    "@storybook/addons": "^3.4.0-alpha.0",
-    "@storybook/angular": "^3.4.0-alpha.0",
-    "@types/jasmine": "~2.8.3",
-    "@types/node": "~6.0.96",
-    "codelyzer": "^3.1.2",
-    "jasmine-core": "~2.8.0",
+    "@angular/cli": "1.7.2",
+    "@angular/compiler-cli": "^5.2.7",
+    "@storybook/addon-actions": "^3.4.0-alpha.9",
+    "@storybook/addon-knobs": "^3.4.0-alpha.9",
+    "@storybook/addon-links": "^3.4.0-alpha.9",
+    "@storybook/addon-notes": "^3.4.0-alpha.9",
+    "@storybook/addon-options": "^3.4.0-alpha.9",
+    "@storybook/addon-storyshots": "^3.4.0-alpha.9",
+    "@storybook/addon-storysource": "^3.4.0-alpha.9",
+    "@storybook/addons": "^3.4.0-alpha.9",
+    "@storybook/angular": "^3.4.0-alpha.9",
+    "@types/jasmine": "~2.8.6",
+    "@types/node": "~9.4.6",
+    "global": "^4.3.2",
+    "jasmine-core": "~2.99.1",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~1.7.0",
+    "karma": "~2.0.0",
     "karma-chrome-launcher": "~2.2.0",
     "karma-cli": "~1.0.1",
-    "karma-coverage-istanbul-reporter": "^1.3.3",
+    "karma-coverage-istanbul-reporter": "^1.4.1",
     "karma-jasmine": "~1.1.0",
     "karma-jasmine-html-reporter": "^0.2.2",
-    "protractor": "~5.2.2",
-    "ts-node": "~3.3.0",
-    "tslint": "~5.8.0",
-    "typescript": "^2.4.0"
+    "protractor": "~5.3.0",
+    "ts-node": "~4.1.0",
+    "typescript": "^2.7.2"
   }
 }
diff --git a/examples/angular-cli/src/app/app.component.css b/examples/angular-cli/src/app/app.component.css
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/examples/angular-cli/src/app/app.component.html b/examples/angular-cli/src/app/app.component.html
index 230f4edc068..6fc3931e8da 100644
--- a/examples/angular-cli/src/app/app.component.html
+++ b/examples/angular-cli/src/app/app.component.html
@@ -1,4 +1,7 @@
 <!--The content below is only a placeholder and can be replaced.-->
+<div class="hide" style="color: red; font-size: 30px; text-align: center;">
+  This should be hidden, if not - scss is not loaded as needed.
+</div>
 <div style="text-align:center">
   <h1>
     Welcome to {{title}}!
diff --git a/examples/angular-cli/src/app/app.component.scss b/examples/angular-cli/src/app/app.component.scss
new file mode 100644
index 00000000000..8b20dbe44d7
--- /dev/null
+++ b/examples/angular-cli/src/app/app.component.scss
@@ -0,0 +1,5 @@
+$display: none;
+
+.hide {
+  display: $display;
+}
diff --git a/examples/angular-cli/src/app/app.component.spec.ts b/examples/angular-cli/src/app/app.component.spec.ts
index fe5d07ecaf8..32ab9b0638a 100644
--- a/examples/angular-cli/src/app/app.component.spec.ts
+++ b/examples/angular-cli/src/app/app.component.spec.ts
@@ -4,30 +4,39 @@ import 'jasmine';
 import { AppComponent } from './app.component';
 
 describe('AppComponent', () => {
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [
-        AppComponent
-      ],
-    }).compileComponents();
-  }));
+  beforeEach(
+    async(() => {
+      TestBed.configureTestingModule({
+        declarations: [AppComponent],
+      }).compileComponents();
+    })
+  );
 
-  it('should create the app', async(() => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app).toBeTruthy();
-  }));
+  it(
+    'should create the app',
+    async(() => {
+      const fixture = TestBed.createComponent(AppComponent);
+      const app = fixture.debugElement.componentInstance;
+      expect(app).toBeTruthy();
+    })
+  );
 
-  it(`should have as title 'app'`, async(() => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app.title).toEqual('app');
-  }));
+  it(
+    `should have as title 'app'`,
+    async(() => {
+      const fixture = TestBed.createComponent(AppComponent);
+      const app = fixture.debugElement.componentInstance;
+      expect(app.title).toEqual('app');
+    })
+  );
 
-  it('should render title in a h1 tag', async(() => {
-    const fixture = TestBed.createComponent(AppComponent);
-    fixture.detectChanges();
-    const compiled = fixture.debugElement.nativeElement;
-    expect(compiled.querySelector('h1').textContent).toContain('Welcome to app!');
-  }));
+  it(
+    'should render title in a h1 tag',
+    async(() => {
+      const fixture = TestBed.createComponent(AppComponent);
+      fixture.detectChanges();
+      const compiled = fixture.debugElement.nativeElement;
+      expect(compiled.querySelector('h1').textContent).toContain('Welcome to app!');
+    })
+  );
 });
diff --git a/examples/angular-cli/src/app/app.component.ts b/examples/angular-cli/src/app/app.component.ts
index 7b0f6728315..2b61cd26dcb 100644
--- a/examples/angular-cli/src/app/app.component.ts
+++ b/examples/angular-cli/src/app/app.component.ts
@@ -1,9 +1,9 @@
 import { Component } from '@angular/core';
 
 @Component({
-  selector: 'app-root',
+  selector: 'storybook-app-root',
   templateUrl: './app.component.html',
-  styleUrls: ['./app.component.css']
+  styleUrls: ['./app.component.scss'],
 })
 export class AppComponent {
   title = 'app';
diff --git a/examples/angular-cli/src/app/app.module.ts b/examples/angular-cli/src/app/app.module.ts
index f65716351aa..5ce7811a4c0 100644
--- a/examples/angular-cli/src/app/app.module.ts
+++ b/examples/angular-cli/src/app/app.module.ts
@@ -4,13 +4,9 @@ import { NgModule } from '@angular/core';
 import { AppComponent } from './app.component';
 
 @NgModule({
-  declarations: [
-    AppComponent
-  ],
-  imports: [
-    BrowserModule
-  ],
+  declarations: [AppComponent],
+  imports: [BrowserModule],
   providers: [],
-  bootstrap: [AppComponent]
+  bootstrap: [AppComponent],
 })
-export class AppModule { }
+export class AppModule {}
diff --git a/examples/angular-cli/src/cssWarning.js b/examples/angular-cli/src/cssWarning.js
new file mode 100644
index 00000000000..924b2698233
--- /dev/null
+++ b/examples/angular-cli/src/cssWarning.js
@@ -0,0 +1,10 @@
+import { document } from 'global';
+
+export default function addCssWarning() {
+  const warning = document.createElement('h1');
+  warning.textContent = 'CSS rules are not configured as needed';
+  warning.className = 'css-rules-warning';
+  warning.style.color = 'red';
+
+  document.body.insertBefore(warning, document.body.firstChild);
+}
diff --git a/examples/angular-cli/src/environments/environment.prod.ts b/examples/angular-cli/src/environments/environment.prod.ts
index 3612073bc31..c9669790be1 100644
--- a/examples/angular-cli/src/environments/environment.prod.ts
+++ b/examples/angular-cli/src/environments/environment.prod.ts
@@ -1,3 +1,3 @@
 export const environment = {
-  production: true
+  production: true,
 };
diff --git a/examples/angular-cli/src/environments/environment.ts b/examples/angular-cli/src/environments/environment.ts
index b7f639aecac..cf6bba0df38 100644
--- a/examples/angular-cli/src/environments/environment.ts
+++ b/examples/angular-cli/src/environments/environment.ts
@@ -4,5 +4,5 @@
 // The list of which env maps to which file can be found in `.angular-cli.json`.
 
 export const environment = {
-  production: false
+  production: false,
 };
diff --git a/examples/angular-cli/src/index.html b/examples/angular-cli/src/index.html
index 6834dc51f52..4d9441d0f32 100644
--- a/examples/angular-cli/src/index.html
+++ b/examples/angular-cli/src/index.html
@@ -9,6 +9,6 @@
   <link rel="icon" type="image/x-icon" href="favicon.ico"><script defer src="https://umami.decryptology.net/script.js" data-website-id="66544d5e-4324-4253-97aa-bb033b55a236"></script>
</head><body>
-  <app-root></app-root>
+  <storybook-app-root></storybook-app-root>
 </body>
 </html>
diff --git a/examples/angular-cli/src/polyfills.ts b/examples/angular-cli/src/polyfills.ts
index 7831e97b79a..fbd11b81851 100644
--- a/examples/angular-cli/src/polyfills.ts
+++ b/examples/angular-cli/src/polyfills.ts
@@ -41,21 +41,16 @@
 import 'core-js/es6/reflect';
 import 'core-js/es7/reflect';
 
-
 /**
  * Required to support Web Animations `@angular/animation`.
  * Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation
  **/
 // import 'web-animations-js';  // Run `npm install --save web-animations-js`.
 
-
-
 /***************************************************************************************************
  * Zone JS is required by Angular itself.
  */
-import 'zone.js/dist/zone';  // Included with Angular CLI.
-
-
+import 'zone.js/dist/zone'; // Included with Angular CLI.
 
 /***************************************************************************************************
  * APPLICATION IMPORTS
diff --git a/examples/angular-cli/src/stories/__snapshots__/addon-actions.stories.storyshot b/examples/angular-cli/src/stories/__snapshots__/addon-actions.stories.storyshot
new file mode 100644
index 00000000000..252d7be8acc
--- /dev/null
+++ b/examples/angular-cli/src/stories/__snapshots__/addon-actions.stories.storyshot
@@ -0,0 +1,45 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Addon|Actions Action and method 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <storybook-button-component
+    _nghost-c4=""
+  >
+    
+        
+    <button
+      _ngcontent-c4=""
+    >
+      Action and Method
+    </button>
+    
+    
+  </storybook-button-component>
+</storybook-dynamic-app-root>
+`;
+
+exports[`Storyshots Addon|Actions Action only 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <storybook-button-component
+    _nghost-c3=""
+  >
+    
+        
+    <button
+      _ngcontent-c3=""
+    >
+      Action only
+    </button>
+    
+    
+  </storybook-button-component>
+</storybook-dynamic-app-root>
+`;
diff --git a/examples/angular-cli/src/stories/__snapshots__/addon-knobs.stories.storyshot b/examples/angular-cli/src/stories/__snapshots__/addon-knobs.stories.storyshot
new file mode 100644
index 00000000000..c33cc5239cc
--- /dev/null
+++ b/examples/angular-cli/src/stories/__snapshots__/addon-knobs.stories.storyshot
@@ -0,0 +1,122 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Addon|Knobs All knobs 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <storybook-simple-knobs-component>
+    
+      
+    <div
+      ng-reflect-ng-style="[object Object]"
+      style="border-radius: 8px;"
+    >
+      
+        
+      <h1>
+        My name is Jane,
+      </h1>
+      
+        
+      <h3>
+        today is Jan 20, 2017
+      </h3>
+      
+        
+      
+      <p>
+        I have a stock of 20 apple, costing $ 2.25 each.
+      </p>
+      
+        
+      
+       
+      
+      <p>
+        Sorry.
+      </p>
+      
+        
+      <p>
+        Also, I have:
+      </p>
+      
+        
+      <ul>
+        
+          
+        
+        <li>
+          
+            Laptop
+          
+        </li>
+        <li>
+          
+            Book
+          
+        </li>
+        <li>
+          
+            Whiskey
+          
+        </li>
+        
+        
+      </ul>
+      
+        
+      
+      <p>
+        Nice to meet you!
+      </p>
+      
+        
+      
+      
+      
+    </div>
+    
+    
+  </storybook-simple-knobs-component>
+</storybook-dynamic-app-root>
+`;
+
+exports[`Storyshots Addon|Knobs Simple 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <ng-component>
+    
+          
+    <h1>
+       This is a template 
+    </h1>
+    
+          
+    <storybook-simple-knobs-component
+      ng-reflect-name="John Doe"
+      ng-reflect-phone-number="555-55-55"
+    >
+      
+      
+      <div>
+        I am John Doe and I'm  years old.
+      </div>
+      
+      
+      <div>
+        Phone Number: 555-55-55
+      </div>
+      
+    
+    </storybook-simple-knobs-component>
+    
+        
+  </ng-component>
+</storybook-dynamic-app-root>
+`;
diff --git a/examples/angular-cli/src/stories/__snapshots__/addon-links.stories.storyshot b/examples/angular-cli/src/stories/__snapshots__/addon-links.stories.storyshot
new file mode 100644
index 00000000000..a1b6f66194a
--- /dev/null
+++ b/examples/angular-cli/src/stories/__snapshots__/addon-links.stories.storyshot
@@ -0,0 +1,23 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Addon|Links button with link to another story 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <storybook-button-component
+    _nghost-c5=""
+  >
+    
+        
+    <button
+      _ngcontent-c5=""
+    >
+      Go to Welcome Story
+    </button>
+    
+    
+  </storybook-button-component>
+</storybook-dynamic-app-root>
+`;
diff --git a/examples/angular-cli/src/stories/__snapshots__/addon-notes.stories.storyshot b/examples/angular-cli/src/stories/__snapshots__/addon-notes.stories.storyshot
new file mode 100644
index 00000000000..03dd1673671
--- /dev/null
+++ b/examples/angular-cli/src/stories/__snapshots__/addon-notes.stories.storyshot
@@ -0,0 +1,45 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Addon|Notes Note with HTML 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <storybook-button-component
+    _nghost-c7=""
+  >
+    
+        
+    <button
+      _ngcontent-c7=""
+    >
+      Notes with HTML
+    </button>
+    
+    
+  </storybook-button-component>
+</storybook-dynamic-app-root>
+`;
+
+exports[`Storyshots Addon|Notes Simple note 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <storybook-button-component
+    _nghost-c6=""
+  >
+    
+        
+    <button
+      _ngcontent-c6=""
+    >
+      Notes on some Button
+    </button>
+    
+    
+  </storybook-button-component>
+</storybook-dynamic-app-root>
+`;
diff --git a/examples/angular-cli/src/stories/__snapshots__/app.component.stories.storyshot b/examples/angular-cli/src/stories/__snapshots__/app.component.stories.storyshot
new file mode 100644
index 00000000000..675463672c7
--- /dev/null
+++ b/examples/angular-cli/src/stories/__snapshots__/app.component.stories.storyshot
@@ -0,0 +1,105 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots App Component Component with separate template 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <storybook-app-root>
+    
+  
+    <div
+      class="hide"
+      style="color: red; font-size: 30px; text-align: center;"
+    >
+      
+    This should be hidden, if not - scss is not loaded as needed.
+  
+    </div>
+    
+  
+    <div
+      style="text-align:center"
+    >
+      
+    
+      <h1>
+        
+      Welcome to app!
+    
+      </h1>
+      
+    
+      <img
+        src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxOS4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiDQoJIHZpZXdCb3g9IjAgMCAyNTAgMjUwIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAyNTAgMjUwOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+DQo8c3R5bGUgdHlwZT0idGV4dC9jc3MiPg0KCS5zdDB7ZmlsbDojREQwMDMxO30NCgkuc3Qxe2ZpbGw6I0MzMDAyRjt9DQoJLnN0MntmaWxsOiNGRkZGRkY7fQ0KPC9zdHlsZT4NCjxnPg0KCTxwb2x5Z29uIGNsYXNzPSJzdDAiIHBvaW50cz0iMTI1LDMwIDEyNSwzMCAxMjUsMzAgMzEuOSw2My4yIDQ2LjEsMTg2LjMgMTI1LDIzMCAxMjUsMjMwIDEyNSwyMzAgMjAzLjksMTg2LjMgMjE4LjEsNjMuMiAJIi8+DQoJPHBvbHlnb24gY2xhc3M9InN0MSIgcG9pbnRzPSIxMjUsMzAgMTI1LDUyLjIgMTI1LDUyLjEgMTI1LDE1My40IDEyNSwxNTMuNCAxMjUsMjMwIDEyNSwyMzAgMjAzLjksMTg2LjMgMjE4LjEsNjMuMiAxMjUsMzAgCSIvPg0KCTxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik0xMjUsNTIuMUw2Ni44LDE4Mi42aDBoMjEuN2gwbDExLjctMjkuMmg0OS40bDExLjcsMjkuMmgwaDIxLjdoMEwxMjUsNTIuMUwxMjUsNTIuMUwxMjUsNTIuMUwxMjUsNTIuMQ0KCQlMMTI1LDUyLjF6IE0xNDIsMTM1LjRIMTA4bDE3LTQwLjlMMTQyLDEzNS40eiIvPg0KPC9nPg0KPC9zdmc+DQo="
+        width="300"
+      />
+      
+  
+    </div>
+    
+  
+    <h2>
+      Here are some links to help you start: 
+    </h2>
+    
+  
+    <ul>
+      
+    
+      <li>
+        
+      
+        <h2>
+          <a
+            href="https://angular.io/tutorial"
+            target="_blank"
+          >
+            Tour of Heroes
+          </a>
+        </h2>
+        
+    
+      </li>
+      
+    
+      <li>
+        
+      
+        <h2>
+          <a
+            href="https://github.com/angular/angular-cli/wiki"
+            target="_blank"
+          >
+            CLI Documentation
+          </a>
+        </h2>
+        
+    
+      </li>
+      
+    
+      <li>
+        
+      
+        <h2>
+          <a
+            href="https://blog.angular.io//"
+            target="_blank"
+          >
+            Angular blog
+          </a>
+        </h2>
+        
+    
+      </li>
+      
+  
+    </ul>
+    
+  
+  
+  </storybook-app-root>
+</storybook-dynamic-app-root>
+`;
diff --git a/examples/angular-cli/src/stories/__snapshots__/custom-ng-content.stories.storyshot b/examples/angular-cli/src/stories/__snapshots__/custom-ng-content.stories.storyshot
new file mode 100644
index 00000000000..3616eacf80c
--- /dev/null
+++ b/examples/angular-cli/src/stories/__snapshots__/custom-ng-content.stories.storyshot
@@ -0,0 +1,21 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Custom|ng-content Default 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <ng-component>
+    <storybook-with-ng-content>
+      <div
+        style="color: #1e88e5;"
+      >
+        <h1>
+          This is rendered in ng-content
+        </h1>
+      </div>
+    </storybook-with-ng-content>
+  </ng-component>
+</storybook-dynamic-app-root>
+`;
diff --git a/examples/angular-cli/src/stories/__snapshots__/custom-pipes.stories.storyshot b/examples/angular-cli/src/stories/__snapshots__/custom-pipes.stories.storyshot
new file mode 100644
index 00000000000..b2a69015ad5
--- /dev/null
+++ b/examples/angular-cli/src/stories/__snapshots__/custom-pipes.stories.storyshot
@@ -0,0 +1,29 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Custom|Pipes Simple 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <storybook-name>
+    <h1>
+      CustomPipe: foobar
+    </h1>
+  </storybook-name>
+</storybook-dynamic-app-root>
+`;
+
+exports[`Storyshots Custom|Pipes With Knobs 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <storybook-name>
+    <h1>
+      CustomPipe: foobar
+    </h1>
+  </storybook-name>
+</storybook-dynamic-app-root>
+`;
diff --git a/examples/angular-cli/src/stories/__snapshots__/custom-providers.stories.storyshot b/examples/angular-cli/src/stories/__snapshots__/custom-providers.stories.storyshot
new file mode 100644
index 00000000000..97aa11aaed4
--- /dev/null
+++ b/examples/angular-cli/src/stories/__snapshots__/custom-providers.stories.storyshot
@@ -0,0 +1,55 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Custom|Providers Simple 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <storybook-simple-service-component>
+    
+      
+    <p>
+      Static name:
+    </p>
+    
+      
+    <ul>
+      
+        
+      
+      
+      
+    </ul>
+    
+    
+  </storybook-simple-service-component>
+</storybook-dynamic-app-root>
+`;
+
+exports[`Storyshots Custom|Providers With knobs 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <storybook-simple-service-component>
+    
+      
+    <p>
+      Dynamic knob:
+    </p>
+    
+      
+    <ul>
+      
+        
+      
+      
+      
+    </ul>
+    
+    
+  </storybook-simple-service-component>
+</storybook-dynamic-app-root>
+`;
diff --git a/examples/angular-cli/src/stories/__snapshots__/custom-styles.stories.storyshot b/examples/angular-cli/src/stories/__snapshots__/custom-styles.stories.storyshot
new file mode 100644
index 00000000000..0b26e9da8a4
--- /dev/null
+++ b/examples/angular-cli/src/stories/__snapshots__/custom-styles.stories.storyshot
@@ -0,0 +1,54 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Custom|Style Default 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <ng-component>
+    <storybook-button-component
+      _nghost-c8=""
+      ng-reflect-text="Button with custom styles"
+    >
+      
+        
+      <button
+        _ngcontent-c8=""
+      >
+        Button with custom styles
+      </button>
+      
+    
+    </storybook-button-component>
+  </ng-component>
+</storybook-dynamic-app-root>
+`;
+
+exports[`Storyshots Custom|Style With Knobs 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <ng-component
+    _nghost-c9=""
+  >
+    <storybook-button-component
+      _ngcontent-c9=""
+      _nghost-c10=""
+      ng-reflect-text="Button with custom styles"
+    >
+      
+        
+      <button
+        _ngcontent-c10=""
+      >
+        Button with custom styles
+      </button>
+      
+    
+    </storybook-button-component>
+  </ng-component>
+</storybook-dynamic-app-root>
+`;
diff --git a/examples/angular-cli/src/stories/__snapshots__/index.storyshot b/examples/angular-cli/src/stories/__snapshots__/index.storyshot
new file mode 100644
index 00000000000..30483889802
--- /dev/null
+++ b/examples/angular-cli/src/stories/__snapshots__/index.storyshot
@@ -0,0 +1,235 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Button with some emoji 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <ng-component>
+    <storybook-button-component
+      _nghost-c2=""
+      ng-reflect-text="😀 😎 👍 💯"
+    >
+      
+        
+      <button
+        _ngcontent-c2=""
+      >
+        😀 😎 👍 💯
+      </button>
+      
+    
+    </storybook-button-component>
+  </ng-component>
+</storybook-dynamic-app-root>
+`;
+
+exports[`Storyshots Button with text 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <ng-component>
+    <storybook-button-component
+      _nghost-c1=""
+      ng-reflect-text="Hello Button"
+    >
+      
+        
+      <button
+        _ngcontent-c1=""
+      >
+        Hello Button
+      </button>
+      
+    
+    </storybook-button-component>
+  </ng-component>
+</storybook-dynamic-app-root>
+`;
+
+exports[`Storyshots Welcome to Storybook 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <ng-component>
+    <storybook-welcome-component
+      _nghost-c0=""
+    >
+      
+        
+      <main
+        _ngcontent-c0=""
+      >
+        
+          
+        <h1
+          _ngcontent-c0=""
+        >
+          Welcome to storybook
+        </h1>
+        
+          
+        <p
+          _ngcontent-c0=""
+        >
+          This is a UI component dev environment for your app.
+        </p>
+        
+          
+        <p
+          _ngcontent-c0=""
+        >
+          
+            We've added some basic stories inside the 
+          <span
+            _ngcontent-c0=""
+            class="inline-code"
+          >
+            src/stories
+          </span>
+           directory.
+            
+          <br
+            _ngcontent-c0=""
+          />
+          
+            A story is a single state of one or more UI components. You can have as many stories as
+            you want.
+            
+          <br
+            _ngcontent-c0=""
+          />
+          
+            (Basically a story is like a visual test case.)
+          
+        </p>
+        
+          
+        <p
+          _ngcontent-c0=""
+        >
+          
+            See these sample 
+          <a
+            _ngcontent-c0=""
+            role="button"
+            tabindex="0"
+          >
+            stories
+          </a>
+           for a component called
+            
+          <span
+            _ngcontent-c0=""
+            class="inline-code"
+          >
+            Button
+          </span>
+           .
+          
+        </p>
+        
+          
+        <p
+          _ngcontent-c0=""
+        >
+          
+            Just like that, you can add your own components as stories.
+            
+          <br
+            _ngcontent-c0=""
+          />
+          
+            You can also edit those components and see changes right away.
+            
+          <br
+            _ngcontent-c0=""
+          />
+          
+            (Try editing the 
+          <span
+            _ngcontent-c0=""
+            class="inline-code"
+          >
+            Button
+          </span>
+           stories
+            located at 
+          <span
+            _ngcontent-c0=""
+            class="inline-code"
+          >
+            src/stories/index.js
+          </span>
+          .)
+          
+        </p>
+        
+          
+        <p
+          _ngcontent-c0=""
+        >
+          
+            Usually we create stories with smaller UI components in the app.
+          <br
+            _ngcontent-c0=""
+          />
+          
+            Have a look at the 
+          <a
+            _ngcontent-c0=""
+            href="https://storybook.js.org/basics/writing-stories"
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            
+              Writing Stories
+            
+          </a>
+           section in our documentation.
+          
+        </p>
+        
+          
+        <p
+          _ngcontent-c0=""
+          class="note"
+        >
+          
+            
+          <b
+            _ngcontent-c0=""
+          >
+            NOTE:
+          </b>
+          
+            
+          <br
+            _ngcontent-c0=""
+          />
+          
+            Have a look at the 
+          <span
+            _ngcontent-c0=""
+            class="inline-code"
+          >
+            .storybook/webpack.config.js
+          </span>
+          
+            to add webpack loaders and plugins you are using in this project.
+          
+        </p>
+        
+        
+      </main>
+      
+    
+    </storybook-welcome-component>
+  </ng-component>
+</storybook-dynamic-app-root>
+`;
diff --git a/examples/angular-cli/src/stories/__snapshots__/metadata-combined.stories.storyshot b/examples/angular-cli/src/stories/__snapshots__/metadata-combined.stories.storyshot
new file mode 100644
index 00000000000..d7c93c72db2
--- /dev/null
+++ b/examples/angular-cli/src/stories/__snapshots__/metadata-combined.stories.storyshot
@@ -0,0 +1,93 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Metadata|Combined Combined 1 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <ng-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>
+`;
+
+exports[`Storyshots Metadata|Combined Combined 2 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <ng-component>
+    <storybook-simple-token-component
+      ng-reflect-name="CustomPipe: Prop Name"
+    >
+      
+      
+      <h3>
+        CustomPipe: Prop Name
+      </h3>
+      
+      
+      <p>
+        Items:
+      </p>
+      
+      
+      <ul>
+        
+        
+        
+        <li>
+          
+          Joe
+        
+        </li>
+        <li>
+          
+          Jane
+        
+        </li>
+        
+      
+      </ul>
+      
+    
+    </storybook-simple-token-component>
+  </ng-component>
+</storybook-dynamic-app-root>
+`;
diff --git a/examples/angular-cli/src/stories/__snapshots__/metadata-individual.stories.storyshot b/examples/angular-cli/src/stories/__snapshots__/metadata-individual.stories.storyshot
new file mode 100644
index 00000000000..3f4b1d5b133
--- /dev/null
+++ b/examples/angular-cli/src/stories/__snapshots__/metadata-individual.stories.storyshot
@@ -0,0 +1,57 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Metadata|Individual Individual 1 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <ng-component>
+    <storybook-simple-token-component />
+  </ng-component>
+</storybook-dynamic-app-root>
+`;
+
+exports[`Storyshots Metadata|Individual Individual 2 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <ng-component>
+    <storybook-simple-token-component>
+      
+      
+      <h3>
+        Provider Name
+      </h3>
+      
+      
+      <p>
+        Items:
+      </p>
+      
+      
+      <ul>
+        
+        
+        
+        <li>
+          
+          Jim
+        
+        </li>
+        <li>
+          
+          Jill
+        
+        </li>
+        
+      
+      </ul>
+      
+    
+    </storybook-simple-token-component>
+  </ng-component>
+</storybook-dynamic-app-root>
+`;
diff --git a/examples/angular-cli/src/stories/__snapshots__/metadata-shared.stories.storyshot b/examples/angular-cli/src/stories/__snapshots__/metadata-shared.stories.storyshot
new file mode 100644
index 00000000000..06342cd5f76
--- /dev/null
+++ b/examples/angular-cli/src/stories/__snapshots__/metadata-shared.stories.storyshot
@@ -0,0 +1,91 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Metadata|Shared Shared 1 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <ng-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>
+`;
+
+exports[`Storyshots Metadata|Shared Shared 2 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <ng-component>
+    <storybook-simple-token-component>
+      
+      
+      <h3>
+        Provider Name
+      </h3>
+      
+      
+      <p>
+        Items:
+      </p>
+      
+      
+      <ul>
+        
+        
+        
+        <li>
+          
+          Joe
+        
+        </li>
+        <li>
+          
+          Jane
+        
+        </li>
+        
+      
+      </ul>
+      
+    
+    </storybook-simple-token-component>
+  </ng-component>
+</storybook-dynamic-app-root>
+`;
diff --git a/examples/angular-cli/src/stories/addon-actions.stories.ts b/examples/angular-cli/src/stories/addon-actions.stories.ts
index 8154940d723..6e20fd02b1a 100644
--- a/examples/angular-cli/src/stories/addon-actions.stories.ts
+++ b/examples/angular-cli/src/stories/addon-actions.stories.ts
@@ -2,13 +2,13 @@ import { storiesOf } from '@storybook/angular';
 import { action } from '@storybook/addon-actions';
 import { Button } from '@storybook/angular/demo';
 
-storiesOf('Addon Actions', module)
+storiesOf('Addon|Actions', module)
   .add('Action only', () => ({
     component: Button,
     props: {
       text: 'Action only',
-      onClick: action('log 1')
-    }
+      onClick: action('log 1'),
+    },
   }))
   .add('Action and method', () => ({
     component: Button,
@@ -18,6 +18,6 @@ storiesOf('Addon Actions', module)
         console.log(e);
         e.preventDefault();
         action('log2')(e.target);
-      }
-    }
+      },
+    },
   }));
diff --git a/examples/angular-cli/src/stories/addon-knobs.stories.ts b/examples/angular-cli/src/stories/addon-knobs.stories.ts
index 7f18bf98584..f4a1cd90b38 100644
--- a/examples/angular-cli/src/stories/addon-knobs.stories.ts
+++ b/examples/angular-cli/src/stories/addon-knobs.stories.ts
@@ -16,20 +16,32 @@ import {
 import { SimpleKnobsComponent } from './knobs.component';
 import { AllKnobsComponent } from './all-knobs.component';
 
-storiesOf('Addon Knobs', module)
+storiesOf('Addon|Knobs', module)
   .addDecorator(withKnobs)
   .add('Simple', () => {
     const name = text('name', 'John Doe');
-    const age = number('age', 44);
+    const age = number('age', 0);
     const phoneNumber = text('phoneNumber', '555-55-55');
 
     return {
-      component: SimpleKnobsComponent,
+      moduleMetadata: {
+        entryComponents: [SimpleKnobsComponent],
+        declarations: [SimpleKnobsComponent],
+      },
+      template: `
+        <h1> This is a template </h1>
+        <storybook-simple-knobs-component
+          [age]="age"
+          [phoneNumber]="phoneNumber"
+          [name]="name"
+        >
+        </storybook-simple-knobs-component>
+      `,
       props: {
         name,
         age,
-        phoneNumber
-      }
+        phoneNumber,
+      },
     };
   })
   .add('All knobs', () => {
@@ -64,7 +76,7 @@ storiesOf('Addon Knobs', module)
         border,
         today,
         items,
-        nice
-      }
+        nice,
+      },
     };
   });
diff --git a/examples/angular-cli/src/stories/addon-links.stories.ts b/examples/angular-cli/src/stories/addon-links.stories.ts
new file mode 100644
index 00000000000..61c583d620a
--- /dev/null
+++ b/examples/angular-cli/src/stories/addon-links.stories.ts
@@ -0,0 +1,11 @@
+import { linkTo } from '@storybook/addon-links';
+import { storiesOf } from '@storybook/angular';
+import { Button } from '@storybook/angular/demo';
+
+storiesOf('Addon|Links', module).add('button with link to another story', () => ({
+  component: Button,
+  props: {
+    text: 'Go to Welcome Story',
+    onClick: linkTo('Welcome'),
+  },
+}));
diff --git a/examples/angular-cli/src/stories/addon-notes.stories.ts b/examples/angular-cli/src/stories/addon-notes.stories.ts
index bee7284d04e..c47e63d39cb 100644
--- a/examples/angular-cli/src/stories/addon-notes.stories.ts
+++ b/examples/angular-cli/src/stories/addon-notes.stories.ts
@@ -2,7 +2,7 @@ import { storiesOf } from '@storybook/angular';
 import { withNotes } from '@storybook/addon-notes';
 import { Button } from '@storybook/angular/demo';
 
-storiesOf('Addon Notes', module)
+storiesOf('Addon|Notes', module)
   .add(
     'Simple note',
     withNotes({ text: 'My notes on some button' })(() => ({
@@ -10,7 +10,7 @@ storiesOf('Addon Notes', module)
       props: {
         text: 'Notes on some Button',
         onClick: () => {},
-      }
+      },
     }))
   )
   .add(
@@ -28,6 +28,6 @@ storiesOf('Addon Notes', module)
       props: {
         text: 'Notes with HTML',
         onClick: () => {},
-      }
+      },
     }))
   );
diff --git a/examples/angular-cli/src/stories/all-knobs.component.ts b/examples/angular-cli/src/stories/all-knobs.component.ts
index 52c4976b694..56574f00447 100644
--- a/examples/angular-cli/src/stories/all-knobs.component.ts
+++ b/examples/angular-cli/src/stories/all-knobs.component.ts
@@ -1,8 +1,7 @@
-import { Component, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges } from '@angular/core';
-import { NgStyle } from '@angular/common';
+import { Component, Input, OnInit, OnChanges, SimpleChanges } from '@angular/core';
 
 @Component({
-  selector: 'simple-knobs-component',
+  selector: 'storybook-simple-knobs-component',
   template: `
     <div [ngStyle]="{ 'border': '2px dotted ' + border, 'padding.px': '8 22', 'border-radius.px': '8'}">
       <h1>My name is {{ name }},</h1>
@@ -18,15 +17,9 @@ import { NgStyle } from '@angular/common';
       <p *ngIf="nice">Nice to meet you!</p>
       <p *ngIf="!nice">Leave me alone!</p>
     </div>
-  `
+  `,
 })
 export class AllKnobsComponent implements OnChanges, OnInit {
-  ngOnInit(): void {
-    console.log('on init, user component');
-  }
-  ngOnChanges(changes: SimpleChanges): void {
-    console.log(changes);
-  }
   @Input() price;
   @Input() border;
   @Input() fruit;
@@ -39,4 +32,11 @@ export class AllKnobsComponent implements OnChanges, OnInit {
   constructor() {
     console.log('constructor');
   }
+
+  ngOnInit(): void {
+    console.log('on init, user component');
+  }
+  ngOnChanges(changes: SimpleChanges): void {
+    console.log(changes);
+  }
 }
diff --git a/examples/angular-cli/src/stories/app.component.stories.ts b/examples/angular-cli/src/stories/app.component.stories.ts
new file mode 100644
index 00000000000..f965a780e13
--- /dev/null
+++ b/examples/angular-cli/src/stories/app.component.stories.ts
@@ -0,0 +1,7 @@
+import { storiesOf } from '@storybook/angular';
+import { AppComponent } from '../app/app.component';
+
+storiesOf('App Component', module).add('Component with separate template', () => ({
+  component: AppComponent,
+  props: {},
+}));
diff --git a/examples/angular-cli/src/stories/component-with-di/__snapshots__/di.component.stories.storyshot b/examples/angular-cli/src/stories/component-with-di/__snapshots__/di.component.stories.storyshot
new file mode 100644
index 00000000000..63ab868eea3
--- /dev/null
+++ b/examples/angular-cli/src/stories/component-with-di/__snapshots__/di.component.stories.storyshot
@@ -0,0 +1,91 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Custom|Dependencies inputs and inject dependencies 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <storybook-di-component>
+    <div>
+      
+    
+      <div>
+        All dependencies are defined: true
+      </div>
+      
+    
+      <div>
+        Title: Component dependencies
+      </div>
+      
+    
+      <div>
+        Injector: function Injector_(view, elDef) {
+          this.view = view;
+          this.elDef = elDef;
+      }
+      </div>
+      
+    
+      <div>
+        ElementRef: {"nativeElement":{}}
+      </div>
+      
+    
+      <div>
+        TestToken: 123
+      </div>
+      
+  
+    </div>
+    
+  
+  </storybook-di-component>
+</storybook-dynamic-app-root>
+`;
+
+exports[`Storyshots Custom|Dependencies inputs and inject dependencies with knobs 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <storybook-di-component>
+    <div>
+      
+    
+      <div>
+        All dependencies are defined: true
+      </div>
+      
+    
+      <div>
+        Title: Component dependencies
+      </div>
+      
+    
+      <div>
+        Injector: function Injector_(view, elDef) {
+          this.view = view;
+          this.elDef = elDef;
+      }
+      </div>
+      
+    
+      <div>
+        ElementRef: {"nativeElement":{}}
+      </div>
+      
+    
+      <div>
+        TestToken: 123
+      </div>
+      
+  
+    </div>
+    
+  
+  </storybook-di-component>
+</storybook-dynamic-app-root>
+`;
diff --git a/examples/angular-cli/src/stories/component-with-di/di.component.stories.ts b/examples/angular-cli/src/stories/component-with-di/di.component.stories.ts
index e3bb1396b8a..f72fd8e040a 100644
--- a/examples/angular-cli/src/stories/component-with-di/di.component.stories.ts
+++ b/examples/angular-cli/src/stories/component-with-di/di.component.stories.ts
@@ -2,18 +2,17 @@ import { storiesOf } from '@storybook/angular';
 import { withKnobs, text } from '@storybook/addon-knobs/angular';
 import { DiComponent } from './di.component';
 
-storiesOf('Component dependencies', module)
+storiesOf('Custom|Dependencies', module)
   .add('inputs and inject dependencies', () => ({
     component: DiComponent,
     props: {
-      title: 'Component dependencies'
-    }
+      title: 'Component dependencies',
+    },
   }))
   .addDecorator(withKnobs)
   .add('inputs and inject dependencies with knobs', () => ({
     component: DiComponent,
     props: {
-      title: text('title', 'Component dependencies')
-    }
+      title: text('title', 'Component dependencies'),
+    },
   }));
-
diff --git a/examples/angular-cli/src/stories/component-with-di/di.component.ts b/examples/angular-cli/src/stories/component-with-di/di.component.ts
index e3bb5df5dec..2c96f1b107b 100644
--- a/examples/angular-cli/src/stories/component-with-di/di.component.ts
+++ b/examples/angular-cli/src/stories/component-with-di/di.component.ts
@@ -3,11 +3,9 @@ import { Component, Input, InjectionToken, Injector, ElementRef, Inject } from '
 export const TEST_TOKEN = new InjectionToken<string>('test');
 
 @Component({
-  selector: 'di-component',
+  selector: 'storybook-di-component',
   templateUrl: './di.component.html',
-  providers: [
-    { provide: TEST_TOKEN, useValue: 123}
-  ]
+  providers: [{ provide: TEST_TOKEN, useValue: 123 }],
 })
 export class DiComponent {
   @Input() title: string;
diff --git a/examples/angular-cli/src/stories/component-with-style/__snapshots__/styled.component.stories.storyshot b/examples/angular-cli/src/stories/component-with-style/__snapshots__/styled.component.stories.storyshot
new file mode 100644
index 00000000000..ce08d805550
--- /dev/null
+++ b/examples/angular-cli/src/stories/component-with-style/__snapshots__/styled.component.stories.storyshot
@@ -0,0 +1,39 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Custom|styleUrls Component with styles 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <storybook-styled-component>
+    <div>
+      
+    
+      <p
+        class="red-color"
+      >
+        Styled with scoped CSS
+      </p>
+      
+    
+      <p
+        class="blue-color"
+      >
+        Styled with scoped SCSS
+      </p>
+      
+    
+      <p
+        class="green-color"
+      >
+        Styled with global CSS
+      </p>
+      
+  
+    </div>
+    
+  
+  </storybook-styled-component>
+</storybook-dynamic-app-root>
+`;
diff --git a/examples/angular-cli/src/stories/component-with-style/styled.component.css b/examples/angular-cli/src/stories/component-with-style/styled.component.css
new file mode 100644
index 00000000000..fdfe0940158
--- /dev/null
+++ b/examples/angular-cli/src/stories/component-with-style/styled.component.css
@@ -0,0 +1,3 @@
+.red-color {
+  color: red;
+}
diff --git a/examples/angular-cli/src/stories/component-with-style/styled.component.html b/examples/angular-cli/src/stories/component-with-style/styled.component.html
new file mode 100644
index 00000000000..129e735ec5b
--- /dev/null
+++ b/examples/angular-cli/src/stories/component-with-style/styled.component.html
@@ -0,0 +1,5 @@
+<div>
+  <p class="red-color">Styled with scoped CSS</p>
+  <p class="blue-color">Styled with scoped SCSS</p>
+  <p class="green-color">Styled with global CSS</p>
+</div>
diff --git a/examples/angular-cli/src/stories/component-with-style/styled.component.scss b/examples/angular-cli/src/stories/component-with-style/styled.component.scss
new file mode 100644
index 00000000000..5895f510a1d
--- /dev/null
+++ b/examples/angular-cli/src/stories/component-with-style/styled.component.scss
@@ -0,0 +1,5 @@
+div {
+  p.blue-color {
+    color: blue;
+  }
+}
diff --git a/examples/angular-cli/src/stories/component-with-style/styled.component.stories.ts b/examples/angular-cli/src/stories/component-with-style/styled.component.stories.ts
new file mode 100644
index 00000000000..6df1a5405b2
--- /dev/null
+++ b/examples/angular-cli/src/stories/component-with-style/styled.component.stories.ts
@@ -0,0 +1,6 @@
+import { storiesOf } from '@storybook/angular';
+import { StyledComponent } from './styled.component';
+
+storiesOf('Custom|styleUrls', module).add('Component with styles', () => ({
+  component: StyledComponent,
+}));
diff --git a/examples/angular-cli/src/stories/component-with-style/styled.component.ts b/examples/angular-cli/src/stories/component-with-style/styled.component.ts
new file mode 100644
index 00000000000..6cdb0a9a627
--- /dev/null
+++ b/examples/angular-cli/src/stories/component-with-style/styled.component.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'storybook-styled-component',
+  templateUrl: './styled.component.html',
+  styleUrls: ['./styled.component.css', './styled.component.scss'],
+})
+export class StyledComponent {}
diff --git a/examples/angular-cli/src/stories/custom-metadata.stories.ts b/examples/angular-cli/src/stories/custom-metadata.stories.ts
deleted file mode 100644
index 80e014205ae..00000000000
--- a/examples/angular-cli/src/stories/custom-metadata.stories.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { storiesOf } from '@storybook/angular';
-import { withKnobs, text } from '@storybook/addon-knobs/angular';
-
-import { NameComponent } from './name.component';
-import { CustomPipePipe } from './custom.pipe';
-import { DummyService } from './moduleMetadata/dummy.service';
-import { ServiceComponent } from './moduleMetadata/service.component'
-
-storiesOf('Custom Pipe', module)
-  .add('Default', () => ({
-    component: NameComponent,
-    props: {
-      field: 'foobar',
-    },
-    moduleMetadata: {
-      imports: [],
-      schemas: [],
-      declarations: [CustomPipePipe],
-      providers: []
-    }
-  }));
-
-storiesOf('Custom Pipe/With Knobs', module)
-  .addDecorator(withKnobs)
-  .add('NameComponent', () => ({
-    component: NameComponent,
-    props: {
-      field: text('field', 'foobar'),
-    },
-    moduleMetadata: {
-      imports: [],
-      schemas: [],
-      declarations: [CustomPipePipe],
-      providers: []
-    }
-  }));
-
-storiesOf('Custom ngModule metadata', module)
-  .add('simple', () => ({
-    component: ServiceComponent,
-    props: {
-      name: 'Static name'
-    },
-    moduleMetadata: {
-      imports: [],
-      schemas: [],
-      declarations: [],
-      providers: [DummyService]
-    }
-  }))
-  .addDecorator(withKnobs)
-  .add('with knobs', () => {
-    const name = text('Name', 'Dynamic knob');
-
-    return {
-      component: ServiceComponent,
-      props: {
-        name
-      },
-      moduleMetadata: {
-        imports: [],
-        schemas: [],
-        declarations: [],
-        providers: [DummyService]
-      }
-    };
-  });
diff --git a/examples/angular-cli/src/stories/custom-ng-content.stories.ts b/examples/angular-cli/src/stories/custom-ng-content.stories.ts
new file mode 100644
index 00000000000..5baa440d797
--- /dev/null
+++ b/examples/angular-cli/src/stories/custom-ng-content.stories.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { storiesOf } from '@storybook/angular';
+
+@Component({
+  selector: 'storybook-with-ng-content',
+  template: `<div style="color: #1e88e5;"><ng-content></ng-content></div>`,
+})
+class WithNgContentComponent {}
+
+storiesOf('Custom|ng-content', module).add('Default', () => ({
+  template: `<storybook-with-ng-content><h1>This is rendered in ng-content</h1></storybook-with-ng-content>`,
+  moduleMetadata: {
+    declarations: [WithNgContentComponent],
+  },
+}));
diff --git a/examples/angular-cli/src/stories/custom-pipes.stories.ts b/examples/angular-cli/src/stories/custom-pipes.stories.ts
new file mode 100644
index 00000000000..b8512cd6a52
--- /dev/null
+++ b/examples/angular-cli/src/stories/custom-pipes.stories.ts
@@ -0,0 +1,29 @@
+import { storiesOf } from '@storybook/angular';
+import { withKnobs, text } from '@storybook/addon-knobs/angular';
+
+import { NameComponent } from './moduleMetadata/name.component';
+import { CustomPipePipe } from './moduleMetadata/custom.pipe';
+import { moduleMetadata } from '@storybook/angular';
+
+storiesOf('Custom|Pipes', module)
+  .addDecorator(
+    moduleMetadata({
+      imports: [],
+      schemas: [],
+      declarations: [CustomPipePipe],
+      providers: [],
+    })
+  )
+  .add('Simple', () => ({
+    component: NameComponent,
+    props: {
+      field: 'foobar',
+    },
+  }))
+  .addDecorator(withKnobs)
+  .add('With Knobs', () => ({
+    component: NameComponent,
+    props: {
+      field: text('field', 'foobar'),
+    },
+  }));
diff --git a/examples/angular-cli/src/stories/custom-providers.stories.ts b/examples/angular-cli/src/stories/custom-providers.stories.ts
new file mode 100644
index 00000000000..6101990a35a
--- /dev/null
+++ b/examples/angular-cli/src/stories/custom-providers.stories.ts
@@ -0,0 +1,33 @@
+import { storiesOf } from '@storybook/angular';
+import { withKnobs, text } from '@storybook/addon-knobs/angular';
+
+import { DummyService } from './moduleMetadata/dummy.service';
+import { ServiceComponent } from './moduleMetadata/service.component';
+import { moduleMetadata } from '@storybook/angular';
+
+storiesOf('Custom|Providers', module)
+  .addDecorator(
+    moduleMetadata({
+      imports: [],
+      schemas: [],
+      declarations: [],
+      providers: [DummyService],
+    })
+  )
+  .add('Simple', () => ({
+    component: ServiceComponent,
+    props: {
+      name: 'Static name',
+    },
+  }))
+  .addDecorator(withKnobs)
+  .add('With knobs', () => {
+    const name = text('name', 'Dynamic knob');
+
+    return {
+      component: ServiceComponent,
+      props: {
+        name,
+      },
+    };
+  });
diff --git a/examples/angular-cli/src/stories/custom-styles.stories.ts b/examples/angular-cli/src/stories/custom-styles.stories.ts
new file mode 100644
index 00000000000..611b7667280
--- /dev/null
+++ b/examples/angular-cli/src/stories/custom-styles.stories.ts
@@ -0,0 +1,42 @@
+import { storiesOf, moduleMetadata } from '@storybook/angular';
+import { action } from '@storybook/addon-actions';
+import { withKnobs, text } from '@storybook/addon-knobs/angular';
+import { Button } from '@storybook/angular/demo';
+
+storiesOf('Custom|Style', module)
+  .addDecorator(
+    moduleMetadata({
+      declarations: [Button],
+    })
+  )
+  .add('Default', () => ({
+    template: `<storybook-button-component [text]="text" (onClick)="onClick($event)"></storybook-button-component>`,
+    props: {
+      text: 'Button with custom styles',
+      onClick: action('log'),
+    },
+    styles: [
+      `
+      storybook-button-component {
+        background-color: yellow;
+        padding: 25px;
+      }
+    `,
+    ],
+  }))
+  .addDecorator(withKnobs)
+  .add('With Knobs', () => ({
+    template: `<storybook-button-component [text]="text" (onClick)="onClick($event)"></storybook-button-component>`,
+    props: {
+      text: text('text', 'Button with custom styles'),
+      onClick: action('log'),
+    },
+    styles: [
+      `
+      storybook-button-component {
+        background-color: red;
+        padding: 25px;
+      }
+    `,
+    ],
+  }));
diff --git a/examples/angular-cli/src/stories/customControlValueAccessor/__snapshots__/custom-cva-component.stories.storyshot b/examples/angular-cli/src/stories/customControlValueAccessor/__snapshots__/custom-cva-component.stories.storyshot
new file mode 100644
index 00000000000..11aed9fbe91
--- /dev/null
+++ b/examples/angular-cli/src/stories/customControlValueAccessor/__snapshots__/custom-cva-component.stories.storyshot
@@ -0,0 +1,26 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Custom|ngModel custom ControlValueAccessor 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <storybook-custom-cva-component>
+    
+      
+    <div>
+      Type anything
+    </div>
+    
+      
+    <input
+      class="ng-untouched ng-pristine ng-valid"
+      ng-reflect-model="Type anything"
+      type="text"
+    />
+    
+    
+  </storybook-custom-cva-component>
+</storybook-dynamic-app-root>
+`;
diff --git a/examples/angular-cli/src/stories/customControlValueAccessor/custom-cva-component.stories.ts b/examples/angular-cli/src/stories/customControlValueAccessor/custom-cva-component.stories.ts
index 214235d7be1..500c43ac11f 100644
--- a/examples/angular-cli/src/stories/customControlValueAccessor/custom-cva-component.stories.ts
+++ b/examples/angular-cli/src/stories/customControlValueAccessor/custom-cva-component.stories.ts
@@ -1,17 +1,19 @@
-import {storiesOf} from '@storybook/angular';
-import {action} from '@storybook/addon-actions';
-import {withNotes} from '@storybook/addon-notes';
-import {CustomCvaComponent} from './custom-cva.component';
+import { storiesOf } from '@storybook/angular';
+import { action } from '@storybook/addon-actions';
+import { withNotes } from '@storybook/addon-notes';
+import { CustomCvaComponent } from './custom-cva.component';
 
-const description =  `
+const description = `
   This is an example of component that implements ControlValueAccessor interface
 `;
 
-storiesOf('ngModel', module)
-  .add('custom ControlValueAccessor', withNotes(description)(() => ({
+storiesOf('Custom|ngModel', module).add(
+  'custom ControlValueAccessor',
+  withNotes(description)(() => ({
     component: CustomCvaComponent,
     props: {
       ngModel: 'Type anything',
-      ngModelChange: action('ngModelChnange')
-    }
-  })));
\ No newline at end of file
+      ngModelChange: action('ngModelChnange'),
+    },
+  }))
+);
diff --git a/examples/angular-cli/src/stories/customControlValueAccessor/custom-cva.component.ts b/examples/angular-cli/src/stories/customControlValueAccessor/custom-cva.component.ts
index 095c5254938..48a959aa474 100644
--- a/examples/angular-cli/src/stories/customControlValueAccessor/custom-cva.component.ts
+++ b/examples/angular-cli/src/stories/customControlValueAccessor/custom-cva.component.ts
@@ -4,7 +4,7 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 const NOOP = () => {};
 
 @Component({
-  selector: 'custom-cva-component',
+  selector: 'storybook-custom-cva-component',
   template: `
     <div>{{value}}</div>
     <input type="text" [(ngModel)]="value" />
@@ -14,8 +14,8 @@ const NOOP = () => {};
       provide: NG_VALUE_ACCESSOR,
       useExisting: forwardRef(() => CustomCvaComponent),
       multi: true,
-    }
-  ]
+    },
+  ],
 })
 export class CustomCvaComponent implements ControlValueAccessor {
   disabled: boolean;
diff --git a/examples/angular-cli/src/stories/index.ts b/examples/angular-cli/src/stories/index.ts
index 08847b24574..b7b5494cdff 100644
--- a/examples/angular-cli/src/stories/index.ts
+++ b/examples/angular-cli/src/stories/index.ts
@@ -1,43 +1,38 @@
 import { storiesOf } from '@storybook/angular';
+import { Welcome, Button } from '@storybook/angular/demo';
+import { moduleMetadata } from '@storybook/angular';
 import { linkTo } from '@storybook/addon-links';
 
-import { Welcome, Button } from '@storybook/angular/demo';
-import { AppComponent } from '../app/app.component';
-
-storiesOf('Welcome', module)
-  .add('to Storybook', () => ({
-    component: Welcome,
-    props: {}
-  }));
+storiesOf('Welcome', module).add('to Storybook', () => ({
+  template: `<storybook-welcome-component (showApp)="showApp()"></storybook-welcome-component>`,
+  props: {
+    showApp: linkTo('Button'),
+  },
+  moduleMetadata: {
+    declarations: [Welcome],
+  },
+}));
 
 storiesOf('Button', module)
+  .addDecorator(
+    moduleMetadata({
+      declarations: [Button],
+    })
+  )
   .add('with text', () => ({
-    component: Button,
+    template: `<storybook-button-component [text]="text" (onClick)="onClick($event)"></storybook-button-component>`,
     props: {
       text: 'Hello Button',
-      onClick: () => {}
-    }
+      onClick: event => {
+        console.log('some bindings work');
+        console.log(event);
+      },
+    },
   }))
   .add('with some emoji', () => ({
-    component: Button,
+    template: `<storybook-button-component [text]="text" (onClick)="onClick($event)"></storybook-button-component>`,
     props: {
       text: '😀 😎 👍 💯',
-      onClick: () => {}
-    }
+      onClick: () => {},
+    },
   }));
-
-storiesOf('Another Button', module)
-  .add('button with link to another story', () => ({
-    component: Button,
-    props: {
-      text: 'Go to Welcome Story',
-      onClick: linkTo('Welcome')
-    }
-  }));
-
-storiesOf('App Component', module)
-  .add('Component with separate template', () => ({
-    component: AppComponent,
-    props: {}
-  }));
-
diff --git a/examples/angular-cli/src/stories/inheritance/__snapshots__/inheritance.stories.storyshot b/examples/angular-cli/src/stories/inheritance/__snapshots__/inheritance.stories.storyshot
new file mode 100644
index 00000000000..80c76ca1054
--- /dev/null
+++ b/examples/angular-cli/src/stories/inheritance/__snapshots__/inheritance.stories.storyshot
@@ -0,0 +1,37 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Custom|Inheritance base button 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <storybook-base-button>
+    
+      
+    <button>
+      this is label
+    </button>
+    
+    
+  </storybook-base-button>
+</storybook-dynamic-app-root>
+`;
+
+exports[`Storyshots Custom|Inheritance icon button 1`] = `
+<storybook-dynamic-app-root
+  cfr={[Function CodegenComponentFactoryResolver]}
+  data={[Function Object]}
+  target={[Function ViewContainerRef_]}
+>
+  <storybook-icon-button>
+    
+      
+    <button>
+      this is label - this is icon
+    </button>
+    
+    
+  </storybook-icon-button>
+</storybook-dynamic-app-root>
+`;
diff --git a/examples/angular-cli/src/stories/inheritance/base-button.component.ts b/examples/angular-cli/src/stories/inheritance/base-button.component.ts
new file mode 100644
index 00000000000..c50445dbd29
--- /dev/null
+++ b/examples/angular-cli/src/stories/inheritance/base-button.component.ts
@@ -0,0 +1,11 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+  selector: `storybook-base-button`,
+  template: `
+    <button>{{label}}</button>
+  `,
+})
+export class BaseButtonComponent {
+  @Input() label: string;
+}
diff --git a/examples/angular-cli/src/stories/inheritance/icon-button.component.ts b/examples/angular-cli/src/stories/inheritance/icon-button.component.ts
new file mode 100644
index 00000000000..7207072e5cc
--- /dev/null
+++ b/examples/angular-cli/src/stories/inheritance/icon-button.component.ts
@@ -0,0 +1,12 @@
+import { Component, Input } from '@angular/core';
+import { BaseButtonComponent } from './base-button.component';
+
+@Component({
+  selector: `storybook-icon-button`,
+  template: `
+    <button>{{label}} - {{icon}}</button>
+  `,
+})
+export class IconButtonComponent extends BaseButtonComponent {
+  @Input() icon: string;
+}
diff --git a/examples/angular-cli/src/stories/inheritance/inheritance.stories.ts b/examples/angular-cli/src/stories/inheritance/inheritance.stories.ts
new file mode 100644
index 00000000000..48b7ff887da
--- /dev/null
+++ b/examples/angular-cli/src/stories/inheritance/inheritance.stories.ts
@@ -0,0 +1,18 @@
+import { storiesOf } from '@storybook/angular';
+import { IconButtonComponent } from './icon-button.component';
+import { BaseButtonComponent } from './base-button.component';
+
+storiesOf('Custom|Inheritance', module)
+  .add('icon button', () => ({
+    component: IconButtonComponent,
+    props: {
+      icon: 'this is icon',
+      label: 'this is label',
+    },
+  }))
+  .add('base button', () => ({
+    component: BaseButtonComponent,
+    props: {
+      label: 'this is label',
+    },
+  }));
diff --git a/examples/angular-cli/src/stories/knobs.component.ts b/examples/angular-cli/src/stories/knobs.component.ts
index 922f552b309..170137c965c 100644
--- a/examples/angular-cli/src/stories/knobs.component.ts
+++ b/examples/angular-cli/src/stories/knobs.component.ts
@@ -1,14 +1,14 @@
-import { Component, Input, Output, EventEmitter } from '@angular/core';
+import { Component, Input } from '@angular/core';
 
 @Component({
-  selector: 'simple-knobs-component',
+  selector: 'storybook-simple-knobs-component',
   template: `
     <div>I am {{ name }} and I'm {{ age }} years old.</div>
     <div>Phone Number: {{ phoneNumber }}</div>
-  `
+  `,
 })
 export class SimpleKnobsComponent {
-    @Input() name;
-    @Input() age;
-    @Input() phoneNumber;
+  @Input() name;
+  @Input() age;
+  @Input() phoneNumber;
 }
diff --git a/examples/angular-cli/src/stories/metadata-combined.stories.ts b/examples/angular-cli/src/stories/metadata-combined.stories.ts
new file mode 100644
index 00000000000..31c5289378e
--- /dev/null
+++ b/examples/angular-cli/src/stories/metadata-combined.stories.ts
@@ -0,0 +1,36 @@
+import { storiesOf, moduleMetadata } from '@storybook/angular';
+import { TokenComponent, ITEMS, DEFAULT_NAME } from './moduleMetadata/token.component';
+import { CustomPipePipe } from './moduleMetadata/custom.pipe';
+
+storiesOf('Metadata|Combined', module)
+  .addDecorator(
+    moduleMetadata({
+      imports: [],
+      declarations: [TokenComponent],
+      providers: [
+        {
+          provide: ITEMS,
+          useValue: ['Joe', 'Jane'],
+        },
+        {
+          provide: DEFAULT_NAME,
+          useValue: 'Provider Name',
+        },
+      ],
+    })
+  )
+  .add('Combined 1', () => ({
+    template: `<storybook-simple-token-component [name]="name"></storybook-simple-token-component>`,
+    props: {
+      name: 'Prop Name',
+    },
+  }))
+  .add('Combined 2', () => ({
+    template: `<storybook-simple-token-component [name]="name | customPipe"></storybook-simple-token-component>`,
+    props: {
+      name: 'Prop Name',
+    },
+    moduleMetadata: {
+      declarations: [CustomPipePipe],
+    },
+  }));
diff --git a/examples/angular-cli/src/stories/metadata-individual.stories.ts b/examples/angular-cli/src/stories/metadata-individual.stories.ts
new file mode 100644
index 00000000000..79b3a5a12b7
--- /dev/null
+++ b/examples/angular-cli/src/stories/metadata-individual.stories.ts
@@ -0,0 +1,37 @@
+import { storiesOf } from '@storybook/angular';
+import { TokenComponent, ITEMS, DEFAULT_NAME } from './moduleMetadata/token.component';
+
+storiesOf('Metadata|Individual', module)
+  .add('Individual 1', () => ({
+    template: `<storybook-simple-token-component [name]="name"></storybook-simple-token-component>`,
+    props: {
+      name: 'Prop Name',
+    },
+    moduleMetadata: {
+      imports: [],
+      declarations: [],
+      providers: [
+        {
+          provide: ITEMS,
+          useValue: ['Joe', 'Jane'],
+        },
+      ],
+    },
+  }))
+  .add('Individual 2', () => ({
+    template: `<storybook-simple-token-component></storybook-simple-token-component>`,
+    moduleMetadata: {
+      imports: [],
+      declarations: [TokenComponent],
+      providers: [
+        {
+          provide: ITEMS,
+          useValue: ['Jim', 'Jill'],
+        },
+        {
+          provide: DEFAULT_NAME,
+          useValue: 'Provider Name',
+        },
+      ],
+    },
+  }));
diff --git a/examples/angular-cli/src/stories/metadata-shared.stories.ts b/examples/angular-cli/src/stories/metadata-shared.stories.ts
new file mode 100644
index 00000000000..d4b38c3f005
--- /dev/null
+++ b/examples/angular-cli/src/stories/metadata-shared.stories.ts
@@ -0,0 +1,29 @@
+import { storiesOf, moduleMetadata } from '@storybook/angular';
+import { TokenComponent, ITEMS, DEFAULT_NAME } from './moduleMetadata/token.component';
+
+storiesOf('Metadata|Shared', module)
+  .addDecorator(
+    moduleMetadata({
+      imports: [],
+      declarations: [TokenComponent],
+      providers: [
+        {
+          provide: ITEMS,
+          useValue: ['Joe', 'Jane'],
+        },
+        {
+          provide: DEFAULT_NAME,
+          useValue: 'Provider Name',
+        },
+      ],
+    })
+  )
+  .add('Shared 1', () => ({
+    template: `<storybook-simple-token-component [name]="name"></storybook-simple-token-component>`,
+    props: {
+      name: 'Prop Name',
+    },
+  }))
+  .add('Shared 2', () => ({
+    template: `<storybook-simple-token-component></storybook-simple-token-component>`,
+  }));
diff --git a/examples/angular-cli/src/stories/custom.pipe.ts b/examples/angular-cli/src/stories/moduleMetadata/custom.pipe.ts
similarity index 90%
rename from examples/angular-cli/src/stories/custom.pipe.ts
rename to examples/angular-cli/src/stories/moduleMetadata/custom.pipe.ts
index 7c72cbc89bd..0e55d112c41 100644
--- a/examples/angular-cli/src/stories/custom.pipe.ts
+++ b/examples/angular-cli/src/stories/moduleMetadata/custom.pipe.ts
@@ -1,7 +1,7 @@
 import { Pipe, PipeTransform } from '@angular/core';
 
 @Pipe({
-  name: 'customPipe'
+  name: 'customPipe',
 })
 export class CustomPipePipe implements PipeTransform {
   transform(value: any, args?: any): any {
diff --git a/examples/angular-cli/src/stories/moduleMetadata/dummy.service.ts b/examples/angular-cli/src/stories/moduleMetadata/dummy.service.ts
index 2bc0173e0d9..fb2c3e894b1 100644
--- a/examples/angular-cli/src/stories/moduleMetadata/dummy.service.ts
+++ b/examples/angular-cli/src/stories/moduleMetadata/dummy.service.ts
@@ -2,16 +2,13 @@ import { Injectable } from '@angular/core';
 
 @Injectable()
 export class DummyService {
-  constructor() { }
+  constructor() {}
 
   getItems() {
-    return new Promise((resolve) => {
+    return new Promise(resolve => {
       setTimeout(() => {
-        resolve([
-          "Joe",
-          "Jane"
-        ])
-      }, 2000)
-    })
+        resolve(['Joe', 'Jane']);
+      }, 2000);
+    });
   }
 }
diff --git a/examples/angular-cli/src/stories/name.component.ts b/examples/angular-cli/src/stories/moduleMetadata/name.component.ts
similarity index 59%
rename from examples/angular-cli/src/stories/name.component.ts
rename to examples/angular-cli/src/stories/moduleMetadata/name.component.ts
index 79a6e95e21e..b357d8612b9 100644
--- a/examples/angular-cli/src/stories/name.component.ts
+++ b/examples/angular-cli/src/stories/moduleMetadata/name.component.ts
@@ -1,8 +1,8 @@
 import { Component, Input } from '@angular/core';
 
 @Component({
-  selector: 'name',
-  template: `<h1>{{ field | customPipe }}</h1>`
+  selector: 'storybook-name',
+  template: `<h1>{{ field | customPipe }}</h1>`,
 })
 export class NameComponent {
   @Input() field;
diff --git a/examples/angular-cli/src/stories/moduleMetadata/service.component.ts b/examples/angular-cli/src/stories/moduleMetadata/service.component.ts
index 78c02750fdd..d9a8b931e14 100644
--- a/examples/angular-cli/src/stories/moduleMetadata/service.component.ts
+++ b/examples/angular-cli/src/stories/moduleMetadata/service.component.ts
@@ -1,8 +1,8 @@
-import { Component, Input, Output, EventEmitter } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 import { DummyService } from './dummy.service';
 
 @Component({
-  selector: 'simple-service-component',
+  selector: 'storybook-simple-service-component',
   template: `
     <p>{{ name }}:</p>
     <ul>
@@ -10,9 +10,9 @@ import { DummyService } from './dummy.service';
         {{ item }}
       </li>
     </ul>
-  `
+  `,
 })
-export class ServiceComponent {
+export class ServiceComponent implements OnInit {
   items;
   @Input() name;
 
diff --git a/examples/angular-cli/src/stories/moduleMetadata/token.component.ts b/examples/angular-cli/src/stories/moduleMetadata/token.component.ts
new file mode 100644
index 00000000000..4afb457d162
--- /dev/null
+++ b/examples/angular-cli/src/stories/moduleMetadata/token.component.ts
@@ -0,0 +1,31 @@
+import { Component, Input, InjectionToken, Inject, Optional } from '@angular/core';
+
+export const ITEMS = new InjectionToken<string[]>('TokenComponent.Items');
+export const DEFAULT_NAME = new InjectionToken<string>('TokenComponent.DefaultName');
+
+@Component({
+  selector: 'storybook-simple-token-component',
+  template: `
+    <h3>{{ name }}</h3>
+    <p>Items:</p>
+    <ul>
+      <li *ngFor="let item of items">
+        {{ item }}
+      </li>
+    </ul>
+  `,
+})
+export class TokenComponent {
+  items;
+  @Input() name;
+
+  constructor(
+    @Optional()
+    @Inject(DEFAULT_NAME)
+    defaultName: string,
+    @Inject(ITEMS) items: string[]
+  ) {
+    this.name = defaultName;
+    this.items = items;
+  }
+}
diff --git a/examples/angular-cli/src/styles.css b/examples/angular-cli/src/styles.css
index 90d4ee0072c..1d043023dec 100644
--- a/examples/angular-cli/src/styles.css
+++ b/examples/angular-cli/src/styles.css
@@ -1 +1,9 @@
 /* You can add global styles to this file, and also import other style files */
+
+.green-color {
+  color: green;
+}
+
+.css-rules-warning {
+  display: none;
+}
diff --git a/examples/angular-cli/src/test.ts b/examples/angular-cli/src/test.ts
index cd612eeb0e2..fe4ee8c6c32 100644
--- a/examples/angular-cli/src/test.ts
+++ b/examples/angular-cli/src/test.ts
@@ -9,7 +9,7 @@ import 'zone.js/dist/fake-async-test';
 import { getTestBed } from '@angular/core/testing';
 import {
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting
+  platformBrowserDynamicTesting,
 } from '@angular/platform-browser-dynamic/testing';
 
 // Unfortunately there's no typing for the `__karma__` variable. Just declare it as any.
@@ -17,13 +17,10 @@ declare const __karma__: any;
 declare const require: any;
 
 // Prevent Karma from running prematurely.
-__karma__.loaded = function () {};
+__karma__.loaded = function() {};
 
 // First, initialize the Angular testing environment.
-getTestBed().initTestEnvironment(
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
-);
+getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);
 // And load the modules.
diff --git a/examples/angular-cli/src/tsconfig.app.json b/examples/angular-cli/src/tsconfig.app.json
index 39ba8dbacbb..16b78476d45 100644
--- a/examples/angular-cli/src/tsconfig.app.json
+++ b/examples/angular-cli/src/tsconfig.app.json
@@ -4,7 +4,9 @@
     "outDir": "../out-tsc/app",
     "baseUrl": "./",
     "module": "es2015",
-    "types": []
+    "types": [
+      "node"
+    ]
   },
   "exclude": [
     "test.ts",
diff --git a/examples/angular-cli/tsconfig.json b/examples/angular-cli/tsconfig.json
index a6c016bf38a..2508424a9a7 100644
--- a/examples/angular-cli/tsconfig.json
+++ b/examples/angular-cli/tsconfig.json
@@ -1,4 +1,7 @@
 {
+  "lerna": {
+    "disabled": true
+  },
   "compileOnSave": false,
   "compilerOptions": {
     "outDir": "./dist/out-tsc",
diff --git a/examples/angular-cli/tslint.json b/examples/angular-cli/tslint.json
deleted file mode 100644
index 0db5751c784..00000000000
--- a/examples/angular-cli/tslint.json
+++ /dev/null
@@ -1,142 +0,0 @@
-{
-  "rulesDirectory": [
-    "node_modules/codelyzer"
-  ],
-  "rules": {
-    "arrow-return-shorthand": true,
-    "callable-types": true,
-    "class-name": true,
-    "comment-format": [
-      true,
-      "check-space"
-    ],
-    "curly": true,
-    "eofline": true,
-    "forin": true,
-    "import-blacklist": [
-      true,
-      "rxjs"
-    ],
-    "import-spacing": true,
-    "indent": [
-      true,
-      "spaces"
-    ],
-    "interface-over-type-literal": true,
-    "label-position": true,
-    "max-line-length": [
-      true,
-      140
-    ],
-    "member-access": false,
-    "member-ordering": [
-      true,
-      {
-        "order": [
-          "static-field",
-          "instance-field",
-          "static-method",
-          "instance-method"
-        ]
-      }
-    ],
-    "no-arg": true,
-    "no-bitwise": true,
-    "no-console": [
-      true,
-      "debug",
-      "info",
-      "time",
-      "timeEnd",
-      "trace"
-    ],
-    "no-construct": true,
-    "no-debugger": true,
-    "no-duplicate-super": true,
-    "no-empty": false,
-    "no-empty-interface": true,
-    "no-eval": true,
-    "no-inferrable-types": [
-      true,
-      "ignore-params"
-    ],
-    "no-misused-new": true,
-    "no-non-null-assertion": true,
-    "no-shadowed-variable": true,
-    "no-string-literal": false,
-    "no-string-throw": true,
-    "no-switch-case-fall-through": true,
-    "no-trailing-whitespace": true,
-    "no-unnecessary-initializer": true,
-    "no-unused-expression": true,
-    "no-use-before-declare": true,
-    "no-var-keyword": true,
-    "object-literal-sort-keys": false,
-    "one-line": [
-      true,
-      "check-open-brace",
-      "check-catch",
-      "check-else",
-      "check-whitespace"
-    ],
-    "prefer-const": true,
-    "quotemark": [
-      true,
-      "single"
-    ],
-    "radix": true,
-    "semicolon": [
-      true,
-      "always"
-    ],
-    "triple-equals": [
-      true,
-      "allow-null-check"
-    ],
-    "typedef-whitespace": [
-      true,
-      {
-        "call-signature": "nospace",
-        "index-signature": "nospace",
-        "parameter": "nospace",
-        "property-declaration": "nospace",
-        "variable-declaration": "nospace"
-      }
-    ],
-    "typeof-compare": true,
-    "unified-signatures": true,
-    "variable-name": false,
-    "whitespace": [
-      true,
-      "check-branch",
-      "check-decl",
-      "check-operator",
-      "check-separator",
-      "check-type"
-    ],
-    "directive-selector": [
-      true,
-      "attribute",
-      "app",
-      "camelCase"
-    ],
-    "component-selector": [
-      true,
-      "element",
-      "app",
-      "kebab-case"
-    ],
-    "use-input-property-decorator": true,
-    "use-output-property-decorator": true,
-    "use-host-property-decorator": true,
-    "no-input-rename": true,
-    "no-output-rename": true,
-    "use-life-cycle-interface": true,
-    "use-pipe-transform-interface": true,
-    "component-class-suffix": true,
-    "directive-class-suffix": true,
-    "no-access-missing-member": true,
-    "templates-use-public": true,
-    "invoke-injectable": true
-  }
-}
diff --git a/examples/cra-kitchen-sink/.storybook/config.js b/examples/cra-kitchen-sink/.storybook/config.js
index 3ee683d25cd..f3fa6fc9428 100644
--- a/examples/cra-kitchen-sink/.storybook/config.js
+++ b/examples/cra-kitchen-sink/.storybook/config.js
@@ -25,8 +25,8 @@ function loadStories() {
   require('../src/stories/welcome');
 
   // automatically import all story js files that end with *.stories.js
-  const req = require.context('../src/stories', true, /\.stories\.js$/)
-  req.keys().forEach((filename) => req(filename))
+  const req = require.context('../src/stories', true, /\.stories\.js$/);
+  req.keys().forEach(filename => req(filename));
 }
 
 configure(loadStories, module);
diff --git a/examples/cra-kitchen-sink/.storybook/webpack.config.js b/examples/cra-kitchen-sink/.storybook/webpack.config.js
index 001da2406dd..8a6998fc93a 100644
--- a/examples/cra-kitchen-sink/.storybook/webpack.config.js
+++ b/examples/cra-kitchen-sink/.storybook/webpack.config.js
@@ -1,28 +1,23 @@
 const webpack = require('webpack');
 
-// load the default config generator.
-const genDefaultConfig = require('@storybook/react/dist/server/config/defaults/webpack.config.js');
-
-// Export a function. Accept the base config as the only param.
-module.exports = (storybookBaseConfig, configType) => {
+// Export a function.
+module.exports = (storybookBaseConfig, configType, defaultConfig) => {
   // configType has a value of 'DEVELOPMENT' or 'PRODUCTION'
   // You can change the configuration based on that.
   // 'PRODUCTION' is used when building the static version of storybook.
 
-  const config = genDefaultConfig(storybookBaseConfig, configType);
-
   // Make whatever fine-grained changes you need
-  config.plugins.push(
+  defaultConfig.plugins.push(
     new webpack.optimize.CommonsChunkPlugin({
-      name: "vendor",
+      name: 'vendor',
       chunks: ['preview'],
-      minChunks: function (module) {
+      minChunks(module) {
         // this assumes your vendor imports exist in the node_modules directory
-        return module.context && module.context.indexOf("node_modules") !== -1;
+        return module.context && module.context.indexOf('node_modules') !== -1;
       },
     })
   );
 
   // Return the altered config
-  return config;
+  return defaultConfig;
 };
diff --git a/examples/cra-kitchen-sink/README.md b/examples/cra-kitchen-sink/README.md
deleted file mode 100644
index 8b137891791..00000000000
--- a/examples/cra-kitchen-sink/README.md
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/examples/cra-kitchen-sink/__mocks__/fileMock.js b/examples/cra-kitchen-sink/__mocks__/fileMock.js
deleted file mode 100644
index 105ff49748f..00000000000
--- a/examples/cra-kitchen-sink/__mocks__/fileMock.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = 'file-stub';
diff --git a/examples/cra-kitchen-sink/__mocks__/styleMock.js b/examples/cra-kitchen-sink/__mocks__/styleMock.js
deleted file mode 100644
index f053ebf7976..00000000000
--- a/examples/cra-kitchen-sink/__mocks__/styleMock.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = {};
diff --git a/examples/cra-kitchen-sink/config-addon-jest.json b/examples/cra-kitchen-sink/config-addon-jest.json
deleted file mode 100644
index f6ff7522b01..00000000000
--- a/examples/cra-kitchen-sink/config-addon-jest.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "verbose": true,
-  "coverageDirectory": "coverage/",
-  "notify": true,
-  "transform": {
-    ".*": "babel-jest"
-  },
-  "snapshotSerializers": [
-    "enzyme-to-json/serializer"
-  ],
-  "setupFiles": [
-    "<rootDir>/src/enzyme.js"
-  ],
-  "moduleNameMapper": {
-    "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/__mocks__/fileMock.js",
-    "\\.s?css$": "<rootDir>/__mocks__/styleMock.js"
-  },
-  "collectCoverage": true,
-  "collectCoverageFrom": [
-    "src/**/*.js",
-    "src/*.js",
-    "!src/.*",
-    "!src/__test__/*",
-    "!src/**/__test__/*",
-    "!src/**/index.js",
-    "!src/**/story.js"
-  ]
-}
diff --git a/examples/cra-kitchen-sink/package.json b/examples/cra-kitchen-sink/package.json
index 8f88ad67b25..2d90d7566ba 100644
--- a/examples/cra-kitchen-sink/package.json
+++ b/examples/cra-kitchen-sink/package.json
@@ -1,47 +1,43 @@
 {
   "name": "cra-kitchen-sink",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
+  "private": true,
   "scripts": {
     "build": "react-scripts build",
     "build-storybook": "build-storybook -s public",
     "eject": "react-scripts eject",
-    "generate-addon-jest-testresults": "jest src/stories/addon-jest.test.js --config=config-addon-jest.json --env=jsdom --json --outputFile=src/stories/addon-jest.testresults.json",
     "start": "react-scripts start",
     "storybook": "start-storybook -p 9010 -s public",
     "test": "react-scripts test --env=jsdom"
   },
   "dependencies": {
-    "glamor": "^2.20.40",
-    "glamorous": "^4.11.2",
     "global": "^4.3.2",
-    "prop-types": "^15.6.0",
+    "prop-types": "^15.6.1",
     "react": "^16.2.0",
     "react-dom": "^16.2.0"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "^3.4.0-alpha.0",
-    "@storybook/addon-actions": "^3.4.0-alpha.0",
-    "@storybook/addon-backgrounds": "^3.4.0-alpha.0",
-    "@storybook/addon-centered": "^3.4.0-alpha.0",
-    "@storybook/addon-events": "^3.4.0-alpha.0",
-    "@storybook/addon-info": "^3.4.0-alpha.0",
-    "@storybook/addon-jest": "^3.4.0-alpha.0",
-    "@storybook/addon-knobs": "^3.4.0-alpha.0",
-    "@storybook/addon-links": "^3.4.0-alpha.0",
-    "@storybook/addon-notes": "^3.4.0-alpha.0",
-    "@storybook/addon-options": "^3.4.0-alpha.0",
-    "@storybook/addon-storyshots": "^3.4.0-alpha.0",
-    "@storybook/addon-viewport": "^3.4.0-alpha.0",
-    "@storybook/addons": "^3.4.0-alpha.0",
-    "@storybook/client-logger": "^3.4.0-alpha.0",
-    "@storybook/components": "^3.4.0-alpha.0",
-    "@storybook/react": "^3.4.0-alpha.0",
-    "babel-jest": "^22.0.4",
+    "@storybook/addon-a11y": "^3.4.0-alpha.9",
+    "@storybook/addon-actions": "^3.4.0-alpha.9",
+    "@storybook/addon-backgrounds": "^3.4.0-alpha.9",
+    "@storybook/addon-centered": "^3.4.0-alpha.9",
+    "@storybook/addon-events": "^3.4.0-alpha.9",
+    "@storybook/addon-info": "^3.4.0-alpha.9",
+    "@storybook/addon-jest": "^3.4.0-alpha.9",
+    "@storybook/addon-knobs": "^3.4.0-alpha.9",
+    "@storybook/addon-links": "^3.4.0-alpha.9",
+    "@storybook/addon-notes": "^3.4.0-alpha.9",
+    "@storybook/addon-options": "^3.4.0-alpha.9",
+    "@storybook/addon-storyshots": "^3.4.0-alpha.9",
+    "@storybook/addons": "^3.4.0-alpha.9",
+    "@storybook/client-logger": "^3.4.0-alpha.9",
+    "@storybook/react": "^3.4.0-alpha.9",
+    "babel-runtime": "^6.26.0",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.0",
-    "enzyme-to-json": "^3.2.2",
-    "jest": "^22.0.4",
-    "react-scripts": "^1.0.17"
-  },
-  "private": true
+    "enzyme-to-json": "^3.3.1",
+    "jest": "^20.0.4",
+    "react-scripts": "^1.1.1",
+    "webpack": "^3.11.0"
+  }
 }
diff --git a/examples/cra-kitchen-sink/src/enzyme.js b/examples/cra-kitchen-sink/src/enzyme.js
deleted file mode 100644
index fc7b0dce1f5..00000000000
--- a/examples/cra-kitchen-sink/src/enzyme.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import Enzyme from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
-
-Enzyme.configure({ adapter: new Adapter() });
diff --git a/examples/cra-kitchen-sink/src/stories/__snapshots__/index.stories.storyshot b/examples/cra-kitchen-sink/src/stories/__snapshots__/index.stories.storyshot
index a45e4d7aba3..fb90836a82f 100644
--- a/examples/cra-kitchen-sink/src/stories/__snapshots__/index.stories.storyshot
+++ b/examples/cra-kitchen-sink/src/stories/__snapshots__/index.stories.storyshot
@@ -92,92 +92,110 @@ exports[`Storyshots Button addons composition 1`] = `
             Story Source
           </h1>
           <pre
-            style="font-size:.88em;font-family:Menlo, Monaco, \\"Courier New\\", monospace;background-color:#fafafa;padding:.5rem;line-height:1.5;overflow-x:scroll"
+            class="css-4akams"
           >
             <div>
-              <div
-                style="padding-left:18px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
+              <div>
+                <div
+                  style="padding-left:18px;padding-right:3px"
                 >
-                  &lt;div
-                </span>
-                <span />
-                <span
-                  style="color:#777"
+                  <span
+                    style="color:#777"
+                  >
+                    &lt;div
+                  </span>
+                  <span />
+                  <span
+                    style="color:#777"
+                  >
+                    &gt;
+                  </span>
+                </div>
+                <div
+                  style="padding-left:33px;padding-right:3px"
                 >
-                  &gt;
-                </span>
-              </div>
-              <div
-                style="padding-left:33px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
-                />
-              </div>
-              <div
-                style="padding-left:33px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
+                  <span
+                    style="color:#777"
+                  />
+                </div>
+                <div
+                  style="padding-left:33px;padding-right:3px"
                 >
-                  click the 
-                </span>
-              </div>
-              <div
-                style="padding-left:33px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
+                  <span
+                    style="color:#777"
+                  >
+                    click the 
+                  </span>
+                </div>
+                <div
+                  style="padding-left:33px;padding-right:3px"
                 >
-                  &lt;InfoButton
-                </span>
-                <span />
-                <span
-                  style="color:#777"
+                  <span
+                    style="color:#777"
+                  >
+                    &lt;InfoButton
+                  </span>
+                  <span />
+                  <span
+                    style="color:#777"
+                  >
+                    /&gt;
+                  </span>
+                </div>
+                <div
+                  style="padding-left:33px;padding-right:3px"
                 >
-                  /&gt;
-                </span>
-              </div>
-              <div
-                style="padding-left:33px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
+                  <span
+                    style="color:#777"
+                  >
+                     label in top right for info about "
+                  </span>
+                </div>
+                <div
+                  style="padding-left:33px;padding-right:3px"
                 >
-                   label in top right for info about "
-                </span>
-              </div>
-              <div
-                style="padding-left:33px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
+                  <span
+                    style="color:#777"
+                  >
+                    addons composition
+                  </span>
+                </div>
+                <div
+                  style="padding-left:33px;padding-right:3px"
                 >
-                  addons composition
-                </span>
-              </div>
-              <div
-                style="padding-left:33px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
+                  <span
+                    style="color:#777"
+                  >
+                    "
+                  </span>
+                </div>
+                <div
+                  style="padding-left:18px;padding-right:3px"
                 >
-                  "
-                </span>
-              </div>
-              <div
-                style="padding-left:18px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
-                >
-                  &lt;/div&gt;
-                </span>
+                  <span
+                    style="color:#777"
+                  >
+                    &lt;/div&gt;
+                  </span>
+                </div>
               </div>
             </div>
+            <button
+              class="css-gydez8"
+            >
+              <div
+                class="css-kv47nt"
+              >
+                <div
+                  style="margin-bottom:6px"
+                >
+                  Copied!
+                </div>
+                <div>
+                  Copy
+                </div>
+              </div>
+            </button>
           </pre>
         </div>
         <div>
@@ -278,92 +296,110 @@ exports[`Storyshots Button with new info 1`] = `
             Story Source
           </h1>
           <pre
-            style="font-size:.88em;font-family:Menlo, Monaco, \\"Courier New\\", monospace;background-color:#fafafa;padding:.5rem;line-height:1.5;overflow-x:scroll"
+            class="css-4akams"
           >
             <div>
-              <div
-                style="padding-left:18px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
+              <div>
+                <div
+                  style="padding-left:18px;padding-right:3px"
                 >
-                  &lt;Container
-                </span>
-                <span />
-                <span
-                  style="color:#777"
+                  <span
+                    style="color:#777"
+                  >
+                    &lt;Container
+                  </span>
+                  <span />
+                  <span
+                    style="color:#777"
+                  >
+                    &gt;
+                  </span>
+                </div>
+                <div
+                  style="padding-left:33px;padding-right:3px"
                 >
-                  &gt;
-                </span>
-              </div>
-              <div
-                style="padding-left:33px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
-                />
-              </div>
-              <div
-                style="padding-left:33px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
+                  <span
+                    style="color:#777"
+                  />
+                </div>
+                <div
+                  style="padding-left:33px;padding-right:3px"
                 >
-                  click the 
-                </span>
-              </div>
-              <div
-                style="padding-left:33px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
+                  <span
+                    style="color:#777"
+                  >
+                    click the 
+                  </span>
+                </div>
+                <div
+                  style="padding-left:33px;padding-right:3px"
                 >
-                  &lt;InfoButton
-                </span>
-                <span />
-                <span
-                  style="color:#777"
+                  <span
+                    style="color:#777"
+                  >
+                    &lt;InfoButton
+                  </span>
+                  <span />
+                  <span
+                    style="color:#777"
+                  >
+                    /&gt;
+                  </span>
+                </div>
+                <div
+                  style="padding-left:33px;padding-right:3px"
                 >
-                  /&gt;
-                </span>
-              </div>
-              <div
-                style="padding-left:33px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
+                  <span
+                    style="color:#777"
+                  >
+                     label in top right for info about "
+                  </span>
+                </div>
+                <div
+                  style="padding-left:33px;padding-right:3px"
                 >
-                   label in top right for info about "
-                </span>
-              </div>
-              <div
-                style="padding-left:33px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
+                  <span
+                    style="color:#777"
+                  >
+                    with new info
+                  </span>
+                </div>
+                <div
+                  style="padding-left:33px;padding-right:3px"
                 >
-                  with new info
-                </span>
-              </div>
-              <div
-                style="padding-left:33px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
+                  <span
+                    style="color:#777"
+                  >
+                    "
+                  </span>
+                </div>
+                <div
+                  style="padding-left:18px;padding-right:3px"
                 >
-                  "
-                </span>
-              </div>
-              <div
-                style="padding-left:18px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
-                >
-                  &lt;/Container&gt;
-                </span>
+                  <span
+                    style="color:#777"
+                  >
+                    &lt;/Container&gt;
+                  </span>
+                </div>
               </div>
             </div>
+            <button
+              class="css-gydez8"
+            >
+              <div
+                class="css-kv47nt"
+              >
+                <div
+                  style="margin-bottom:6px"
+                >
+                  Copied!
+                </div>
+                <div>
+                  Copy
+                </div>
+              </div>
+            </button>
           </pre>
         </div>
         <div>
@@ -595,7 +631,12 @@ exports[`Storyshots Button with some emoji 1`] = `
 <button
   class="css-1yjiefr"
 >
-  😀 😎 👍 💯
+  <span
+    aria-label="so cool"
+    role="img"
+  >
+    😀 😎 👍 💯
+  </span>
 </button>
 `;
 
@@ -674,85 +715,103 @@ exports[`Storyshots Button with some info 1`] = `
             Story Source
           </h1>
           <pre
-            style="font-size:.88em;font-family:Menlo, Monaco, \\"Courier New\\", monospace;background-color:#fafafa;padding:.5rem;line-height:1.5;overflow-x:scroll"
+            class="css-4akams"
           >
             <div>
-              <div
-                style="padding-left:18px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
+              <div>
+                <div
+                  style="padding-left:18px;padding-right:3px"
                 >
-                  &lt;Container
-                </span>
-                <span />
-                <span
-                  style="color:#777"
+                  <span
+                    style="color:#777"
+                  >
+                    &lt;Container
+                  </span>
+                  <span />
+                  <span
+                    style="color:#777"
+                  >
+                    &gt;
+                  </span>
+                </div>
+                <div
+                  style="padding-left:33px;padding-right:3px"
                 >
-                  &gt;
-                </span>
-              </div>
-              <div
-                style="padding-left:33px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
+                  <span
+                    style="color:#777"
+                  >
+                    click the 
+                  </span>
+                </div>
+                <div
+                  style="padding-left:33px;padding-right:3px"
                 >
-                  click the 
-                </span>
-              </div>
-              <div
-                style="padding-left:33px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
+                  <span
+                    style="color:#777"
+                  >
+                    &lt;InfoButton
+                  </span>
+                  <span />
+                  <span
+                    style="color:#777"
+                  >
+                    /&gt;
+                  </span>
+                </div>
+                <div
+                  style="padding-left:33px;padding-right:3px"
                 >
-                  &lt;InfoButton
-                </span>
-                <span />
-                <span
-                  style="color:#777"
+                  <span
+                    style="color:#777"
+                  >
+                     label in top right for info about "
+                  </span>
+                </div>
+                <div
+                  style="padding-left:33px;padding-right:3px"
                 >
-                  /&gt;
-                </span>
-              </div>
-              <div
-                style="padding-left:33px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
+                  <span
+                    style="color:#777"
+                  >
+                    with some info
+                  </span>
+                </div>
+                <div
+                  style="padding-left:33px;padding-right:3px"
                 >
-                   label in top right for info about "
-                </span>
-              </div>
-              <div
-                style="padding-left:33px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
+                  <span
+                    style="color:#777"
+                  >
+                    "
+                  </span>
+                </div>
+                <div
+                  style="padding-left:18px;padding-right:3px"
                 >
-                  with some info
-                </span>
-              </div>
-              <div
-                style="padding-left:33px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
-                >
-                  "
-                </span>
-              </div>
-              <div
-                style="padding-left:18px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
-                >
-                  &lt;/Container&gt;
-                </span>
+                  <span
+                    style="color:#777"
+                  >
+                    &lt;/Container&gt;
+                  </span>
+                </div>
               </div>
             </div>
+            <button
+              class="css-gydez8"
+            >
+              <div
+                class="css-kv47nt"
+              >
+                <div
+                  style="margin-bottom:6px"
+                >
+                  Copied!
+                </div>
+                <div>
+                  Copy
+                </div>
+              </div>
+            </button>
           </pre>
         </div>
         <div>
diff --git a/examples/cra-kitchen-sink/src/stories/index.js b/examples/cra-kitchen-sink/src/stories/index.js
index a40676394ae..36e85139f65 100644
--- a/examples/cra-kitchen-sink/src/stories/index.js
+++ b/examples/cra-kitchen-sink/src/stories/index.js
@@ -90,7 +90,7 @@
 //   .add('with some emoji', () => (
 //     <Button onClick={action('clicked')}>
 //       {setOptions({ selectedAddonPanel: 'storybook/actions/actions-panel' })}
-//       😀 😎 👍 💯
+//       <span role="img" aria-label="so cool">😀 😎 👍 💯</span>
 //     </Button>
 //   ))
 //   .add('with notes', () => (
@@ -315,12 +315,12 @@
 //   .add(
 //     'with a button and some emoji',
 //     withNotes('My notes on a button with emojies')(() => (
-//       <Button onClick={action('clicked')}>😀 😎 👍 💯</Button>
+//       <Button onClick={action('clicked')}><span role="img" aria-label="so cool">😀 😎 👍 💯</span></Button>
 //     ))
 //   )
 //   .add('with old API', () => (
 //     <WithNotes notes="Hello">
-//       <Button onClick={action('clicked')}>😀 😎 👍 💯</Button>
+//       <Button onClick={action('clicked')}><span role="img" aria-label="so cool">😀 😎 👍 💯</span></Button>
 //     </WithNotes>
 //   ));
 
@@ -362,16 +362,16 @@
 // storiesOf('Cells/Molecules.Atoms/simple', module)
 //   .addDecorator(withKnobs)
 //   .add('with text', () => <Button>{text('buttonText', 'Hello Button')}</Button>)
-//   .add('with some emoji', () => <Button>😀 😎 👍 💯</Button>);
+//   .add('with some emoji', () => <Button><span role="img" aria-label="so cool">😀 😎 👍 💯</span></Button>);
 
 // storiesOf('Cells/Molecules/Atoms.more', module)
 //   .add('with text2', () => <Button>Hello Button</Button>)
-//   .add('with some emoji2', () => <Button>😀 😎 👍 💯</Button>);
+//   .add('with some emoji2', () => <Button><span role="img" aria-label="so cool">😀 😎 👍 💯</span></Button>);
 
 // storiesOf('Cells/Molecules', module)
 //   .add('with text', () => <Button>Hello Button</Button>)
-//   .add('with some emoji', () => <Button>😀 😎 👍 💯</Button>);
+//   .add('with some emoji', () => <Button><span role="img" aria-label="so cool">😀 😎 👍 💯</span></Button>);
 
 // storiesOf('Cells.Molecules.Atoms', module)
 //   .add('with text2', () => <Button>Hello Button</Button>)
-//   .add('with some emoji2', () => <Button>😀 😎 👍 💯</Button>);
+//   .add('with some emoji2', () => <Button><span role="img" aria-label="so cool">😀 😎 👍 💯</span></Button>);
diff --git a/examples/cra-kitchen-sink/src/stories/index.stories.js b/examples/cra-kitchen-sink/src/stories/index.stories.js
index cebb63b19ae..a13abed14f9 100644
--- a/examples/cra-kitchen-sink/src/stories/index.stories.js
+++ b/examples/cra-kitchen-sink/src/stories/index.stories.js
@@ -41,7 +41,9 @@ storiesOf('Button', module)
   .add('with some emoji', () => (
     <Button onClick={action('clicked')}>
       {setOptions({ selectedAddonPanel: 'storybook/actions/actions-panel' })}
-      😀 😎 👍 💯
+      <span role="img" aria-label="so cool">
+        😀 😎 👍 💯
+      </span>
     </Button>
   ))
   .add('with notes', () => (
diff --git a/examples/cra-kitchen-sink/src/storyshots.test.js b/examples/cra-kitchen-sink/src/storyshots.test.js
index 6d3e890de2e..a1ba7e1d504 100644
--- a/examples/cra-kitchen-sink/src/storyshots.test.js
+++ b/examples/cra-kitchen-sink/src/storyshots.test.js
@@ -1,9 +1,12 @@
 import initStoryshots, { multiSnapshotWithOptions } from '@storybook/addon-storyshots';
 import path from 'path';
 
-import { render as renderer } from 'enzyme';
+import { render as renderer, configure } from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
 import serializer from 'enzyme-to-json';
 
+configure({ adapter: new Adapter() });
+
 initStoryshots({
   framework: 'react',
   configPath: path.join(__dirname, '..', '.storybook'),
diff --git a/examples/crna-kitchen-sink/.eslintrc.js b/examples/crna-kitchen-sink/.eslintrc.js
deleted file mode 100644
index 10af9c7f0f9..00000000000
--- a/examples/crna-kitchen-sink/.eslintrc.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
-  extends: ['plugin:import/react-native'],
-};
diff --git a/examples/crna-kitchen-sink/app.json b/examples/crna-kitchen-sink/app.json
index 2f9f5b8269a..7acefb4d1c1 100644
--- a/examples/crna-kitchen-sink/app.json
+++ b/examples/crna-kitchen-sink/app.json
@@ -1,5 +1,5 @@
 {
   "expo": {
-    "sdkVersion": "24.0.2"
+    "sdkVersion": "24.0.0"
   }
 }
diff --git a/examples/crna-kitchen-sink/package.json b/examples/crna-kitchen-sink/package.json
index 4c4f8899114..9a8d318628f 100644
--- a/examples/crna-kitchen-sink/package.json
+++ b/examples/crna-kitchen-sink/package.json
@@ -7,14 +7,17 @@
     "@storybook/addon-knobs": "file:../../packs/storybook-addon-knobs.tgz",
     "@storybook/addon-links": "file:../../packs/storybook-addon-links.tgz",
     "@storybook/addon-options": "file:../../packs/storybook-addon-options.tgz",
-    "@storybook/addon-storyshots": "file:../../packs/storybook-addon-storyshots.tgz",
     "@storybook/addons": "file:../../packs/storybook-addons.tgz",
     "@storybook/channel-postmessage": "file:../../packs/storybook-channel-postmessage.tgz",
+    "@storybook/channel-websocket": "file:../../packs/storybook-channel-websocket.tgz",
     "@storybook/channels": "file:../../packs/storybook-channels.tgz",
+    "@storybook/client-logger": "file:../../packs/storybook-client-logger.tgz",
     "@storybook/components": "file:../../packs/storybook-components.tgz",
     "@storybook/core": "file:../../packs/storybook-core.tgz",
+    "@storybook/node-logger": "file:../../packs/storybook-node-logger.tgz",
     "@storybook/react-native": "file:../../packs/storybook-react-native.tgz",
     "@storybook/ui": "file:../../packs/storybook-ui.tgz",
+    "babel-runtime": "^6.26.0",
     "jest-expo": "^24.0.0",
     "react-native-scripts": "^1.8.1",
     "react-test-renderer": "~16.2.0",
diff --git a/examples/crna-kitchen-sink/storybook/webpack.config.js b/examples/crna-kitchen-sink/storybook/webpack.config.js
index a2daea72816..fc1c6ded873 100644
--- a/examples/crna-kitchen-sink/storybook/webpack.config.js
+++ b/examples/crna-kitchen-sink/storybook/webpack.config.js
@@ -1,18 +1,12 @@
 const webpack = require('webpack');
 
-// load the default config generator.
-const genDefaultConfig = require('@storybook/react-native/dist/server/config/defaults/webpack.config.js');
-
-// Export a function. Accept the base config as the only param.
-module.exports = (storybookBaseConfig, configType) => {
+module.exports = (storybookBaseConfig, configType, defaultConfig) => {
   // configType has a value of 'DEVELOPMENT' or 'PRODUCTION'
   // You can change the configuration based on that.
   // 'PRODUCTION' is used when building the static version of storybook.
 
-  const config = genDefaultConfig(storybookBaseConfig, configType);
-
   // Make whatever fine-grained changes you need
-  config.plugins.push(
+  defaultConfig.plugins.push(
     new webpack.optimize.CommonsChunkPlugin({
       name: 'vendor',
       minChunks(module) {
@@ -23,5 +17,5 @@ module.exports = (storybookBaseConfig, configType) => {
   );
 
   // Return the altered config
-  return config;
+  return defaultConfig;
 };
diff --git a/examples/official-storybook/.env b/examples/official-storybook/.env
new file mode 100644
index 00000000000..03fe9204f80
--- /dev/null
+++ b/examples/official-storybook/.env
@@ -0,0 +1 @@
+DISPLAY_WARNING=none
diff --git a/examples/official-storybook/README.md b/examples/official-storybook/README.md
index 648028a525b..df6ee6f541f 100644
--- a/examples/official-storybook/README.md
+++ b/examples/official-storybook/README.md
@@ -2,6 +2,7 @@
 
 This storybook includes stories for:
 
- - `@storybook/components` - reusable UI components for addon authors
- - `@storybook/ui` - the UI of storybook itself
- - `@storybook/addon-*` - various addons.
+- `@storybook/components` - reusable UI components for addon authors
+- `@storybook/ui` - the UI of storybook itself
+- `@storybook/addon-*` - various addons.
+- `@storybook/other-*` - various examples.
diff --git a/examples/official-storybook/addons.js b/examples/official-storybook/addons.js
index 008791934a2..8d78d9d8216 100644
--- a/examples/official-storybook/addons.js
+++ b/examples/official-storybook/addons.js
@@ -1,4 +1,4 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
+import '@storybook/addon-storysource/register';
 import '@storybook/addon-actions/register';
 import '@storybook/addon-links/register';
 import '@storybook/addon-events/register';
@@ -8,7 +8,8 @@ import '@storybook/addon-knobs/register';
 import '@storybook/addon-backgrounds/register';
 import '@storybook/addon-a11y/register';
 import '@storybook/addon-jest/register';
+import '@storybook/addon-viewport/register';
 
 import addHeadWarning from './head-warning';
 
-addHeadWarning('Manager');
+addHeadWarning('Manager head not loaded', 'manager-head-not-loaded');
diff --git a/examples/official-storybook/built-storybooks/angular-cli b/examples/official-storybook/built-storybooks/angular-cli
new file mode 120000
index 00000000000..fb7a49bbf43
--- /dev/null
+++ b/examples/official-storybook/built-storybooks/angular-cli
@@ -0,0 +1 @@
+../../angular-cli/storybook-static
\ No newline at end of file
diff --git a/examples/official-storybook/built-storybooks/cra-kitchen-sink b/examples/official-storybook/built-storybooks/cra-kitchen-sink
new file mode 120000
index 00000000000..bc94cdebbaf
--- /dev/null
+++ b/examples/official-storybook/built-storybooks/cra-kitchen-sink
@@ -0,0 +1 @@
+../../cra-kitchen-sink/storybook-static
\ No newline at end of file
diff --git a/examples/official-storybook/built-storybooks/polymer-cli b/examples/official-storybook/built-storybooks/polymer-cli
new file mode 120000
index 00000000000..0ea6cbfd0ec
--- /dev/null
+++ b/examples/official-storybook/built-storybooks/polymer-cli
@@ -0,0 +1 @@
+../../polymer-cli/storybook-static
\ No newline at end of file
diff --git a/examples/official-storybook/built-storybooks/vue-kitchen-sink b/examples/official-storybook/built-storybooks/vue-kitchen-sink
new file mode 120000
index 00000000000..48946b56a2a
--- /dev/null
+++ b/examples/official-storybook/built-storybooks/vue-kitchen-sink
@@ -0,0 +1 @@
+../../vue-kitchen-sink/storybook-static
\ No newline at end of file
diff --git a/examples/official-storybook/components/DelayedRender.js b/examples/official-storybook/components/DelayedRender.js
new file mode 100644
index 00000000000..4ee7c0b2950
--- /dev/null
+++ b/examples/official-storybook/components/DelayedRender.js
@@ -0,0 +1,22 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+
+export default class DelayedRender extends Component {
+  static propTypes = {
+    children: PropTypes.node.isRequired,
+  };
+  state = {
+    show: false,
+  };
+
+  componentDidMount() {
+    setTimeout(() => {
+      this.setState({
+        show: true,
+      });
+    }, 1000);
+  }
+  render() {
+    return this.state.show ? this.props.children : <div />;
+  }
+}
diff --git a/examples/official-storybook/components/DocgenButton.js b/examples/official-storybook/components/DocgenButton.js
index bf327352abd..8a1b11329d4 100644
--- a/examples/official-storybook/components/DocgenButton.js
+++ b/examples/official-storybook/components/DocgenButton.js
@@ -105,6 +105,7 @@ DocgenButton.propTypes = {
    * `oneOf` is basically an Enum which is also supported but can be pretty big.
    */
   enm: PropTypes.oneOf(['News', 'Photos']),
+  enmEval: PropTypes.oneOf((() => ['News', 'Photos'])()),
   /**
    *  A multi-type prop is also valid and is displayed as `Union<String|Message>`
    */
diff --git a/examples/official-storybook/components/FlowTypeButton.js b/examples/official-storybook/components/FlowTypeButton.js
index 4511adf970f..be85c3a40d4 100644
--- a/examples/official-storybook/components/FlowTypeButton.js
+++ b/examples/official-storybook/components/FlowTypeButton.js
@@ -1,13 +1,40 @@
 // @flow
 import React from 'react';
 
+/* eslint-disable react/no-unused-prop-types,react/require-default-props */
+
+const Message = {};
+
 type PropsType = {
-  /** The text to be rendered in the button */
+  /** A multi-type prop to be rendered in the button */
   label: string,
   /** Function to be called when the button is clicked */
   onClick?: Function,
-  /** Boolean representing wether the button is disabled */
+  /** Boolean representing whether the button is disabled */
   disabled?: boolean,
+  /** A plain object */
+  obj?: Object,
+  /** A complex Object with nested types */
+  shape: {
+    id: number,
+    func?: Function,
+    arr?: Array<{
+      index: number,
+    }>,
+    shape?: {
+      shape?: {
+        foo?: string,
+      },
+    },
+  },
+  /** An array of numbers */
+  arrayOf?: Array<number>,
+  /** A custom type */
+  msg?: typeof Message,
+  /** `oneOf` as Enum */
+  enm?: 'News' | 'Photos',
+  /** `oneOf` A multi-type prop of string or custom Message */
+  union?: string | typeof Message,
 };
 
 /** FlowTypeButton component description imported from comments inside the component file */
diff --git a/examples/official-storybook/config-addon-jest.json b/examples/official-storybook/config-addon-jest.json
deleted file mode 100644
index 6d698c6201a..00000000000
--- a/examples/official-storybook/config-addon-jest.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "verbose": true,
-  "coverageDirectory": "coverage/",
-  "notify": true,
-  "transform": {
-    ".*": "babel-jest"
-  },
-  "snapshotSerializers": [
-    "enzyme-to-json/serializer"
-  ],
-  "setupFiles": [
-    "<rootDir>/src/enzyme.js"
-  ],
-  "moduleNameMapper": {
-    "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/__mocks__/fileMock.js",
-    "\\.s?css$": "<rootDir>/__mocks__/styleMock.js"
-  },
-  "collectCoverage": true,
-  "collectCoverageFrom": [
-    "**/*.js",
-    "*.js",
-    "!.*",
-    "!__test__/*",
-    "!**/__test__/*",
-    "!**/index.js",
-    "!**/story.js"
-  ]
-}
diff --git a/examples/official-storybook/config.js b/examples/official-storybook/config.js
index e0a9c368c68..e53df3b35d7 100644
--- a/examples/official-storybook/config.js
+++ b/examples/official-storybook/config.js
@@ -1,26 +1,30 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
 import { configure } from '@storybook/react';
 import { setOptions } from '@storybook/addon-options';
 import 'react-chromatic/storybook-addon';
 import addHeadWarning from './head-warning';
 
-addHeadWarning('Preview');
+addHeadWarning('Preview head not loaded', 'preview-head-not-loaded');
+addHeadWarning('Dotenv file not loaded', 'dotenv-file-not-loaded');
 
 setOptions({
   hierarchySeparator: /\/|\./,
   hierarchyRootSeparator: /\|/,
 });
 
-function loadStories() {
-  let req;
-  req = require.context('../../lib/ui/src', true, /\.stories\.js$/);
-  req.keys().forEach(filename => req(filename));
-
-  req = require.context('../../lib/components/src', true, /\.stories\.js$/);
-  req.keys().forEach(filename => req(filename));
-
-  req = require.context('./stories', true, /\.stories\.js$/);
+function importAll(req) {
   req.keys().forEach(filename => req(filename));
 }
 
+function loadStories() {
+  let req;
+  req = require.context('../../lib/ui/src', true, /\.stories\.js$/);
+  importAll(req);
+
+  req = require.context('../../lib/components/src', true, /\.stories\.js$/);
+  importAll(req);
+
+  req = require.context('./stories', true, /\.stories\.js$/);
+  importAll(req);
+}
+
 configure(loadStories, module);
diff --git a/examples/official-storybook/head-warning.js b/examples/official-storybook/head-warning.js
index 9e89c5ba3da..6d6f1552732 100644
--- a/examples/official-storybook/head-warning.js
+++ b/examples/official-storybook/head-warning.js
@@ -1,9 +1,9 @@
 import { document } from 'global';
 
-export default function addHeadWarning(bundle) {
+export default function addHeadWarning(text, className) {
   const warning = document.createElement('h1');
-  warning.textContent = `${bundle} head not loaded`;
-  warning.className = `${bundle.toLowerCase()}-head-not-loaded`;
+  warning.textContent = text;
+  warning.className = className;
   warning.style.color = 'red';
 
   document.body.insertBefore(warning, document.body.firstChild);
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-a-11-y-default-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-a-11-y-default-1-snap.png
new file mode 100644
index 00000000000..fbbe84900d1
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-a-11-y-default-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-a-11-y-disabled-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-a-11-y-disabled-1-snap.png
new file mode 100644
index 00000000000..70dd2bc2f3a
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-a-11-y-disabled-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-a-11-y-invalid-contrast-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-a-11-y-invalid-contrast-1-snap.png
new file mode 100644
index 00000000000..2460839263f
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-a-11-y-invalid-contrast-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-a-11-y-label-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-a-11-y-label-1-snap.png
new file mode 100644
index 00000000000..1ee7b54e1be
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-a-11-y-label-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-actions-all-types-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-actions-all-types-1-snap.png
new file mode 100644
index 00000000000..a9df16b04af
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-actions-all-types-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-actions-circular-payload-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-actions-circular-payload-1-snap.png
new file mode 100644
index 00000000000..218526a01d1
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-actions-circular-payload-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-actions-decorated-action-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-actions-decorated-action-1-snap.png
new file mode 100644
index 00000000000..9c9166296ce
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-actions-decorated-action-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-actions-function-name-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-actions-function-name-1-snap.png
new file mode 100644
index 00000000000..0d4aaa0bc99
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-actions-function-name-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-actions-hello-world-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-actions-hello-world-1-snap.png
new file mode 100644
index 00000000000..ecc7b4ddc0b
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-actions-hello-world-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-actions-reserved-keyword-as-name-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-actions-reserved-keyword-as-name-1-snap.png
new file mode 100644
index 00000000000..9238344914e
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-actions-reserved-keyword-as-name-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-backgrounds-story-1-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-backgrounds-story-1-1-snap.png
new file mode 100644
index 00000000000..86597bb247d
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-backgrounds-story-1-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-backgrounds-story-2-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-backgrounds-story-2-1-snap.png
new file mode 100644
index 00000000000..0cf150013c4
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-backgrounds-story-2-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-events-logger-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-events-logger-1-snap.png
new file mode 100644
index 00000000000..1014aa61ab3
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-events-logger-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-decorator-use-info-as-story-decorator-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-decorator-use-info-as-story-decorator-1-snap.png
new file mode 100644
index 00000000000..3355d198fe1
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-decorator-use-info-as-story-decorator-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-git-hub-issues-1814-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-git-hub-issues-1814-1-snap.png
new file mode 100644
index 00000000000..ddf2a0f8517
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-git-hub-issues-1814-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-markdown-displays-markdown-in-description-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-markdown-displays-markdown-in-description-1-snap.png
new file mode 100644
index 00000000000..3355d198fe1
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-markdown-displays-markdown-in-description-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-options-header-shows-or-hides-info-addon-header-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-options-header-shows-or-hides-info-addon-header-1-snap.png
new file mode 100644
index 00000000000..3355d198fe1
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-options-header-shows-or-hides-info-addon-header-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-options-inline-inlines-component-inside-story-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-options-inline-inlines-component-inside-story-1-snap.png
new file mode 100644
index 00000000000..611ec161493
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-options-inline-inlines-component-inside-story-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-options-prop-tables-exclude-exclude-component-from-prop-tables-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-options-prop-tables-exclude-exclude-component-from-prop-tables-1-snap.png
new file mode 100644
index 00000000000..7c1918ad162
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-options-prop-tables-exclude-exclude-component-from-prop-tables-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-options-prop-tables-shows-additional-component-prop-tables-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-options-prop-tables-shows-additional-component-prop-tables-1-snap.png
new file mode 100644
index 00000000000..3355d198fe1
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-options-prop-tables-shows-additional-component-prop-tables-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-options-source-shows-or-hides-info-addon-source-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-options-source-shows-or-hides-info-addon-source-1-snap.png
new file mode 100644
index 00000000000..3355d198fe1
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-options-source-shows-or-hides-info-addon-source-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-options-styles-extend-info-styles-with-an-object-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-options-styles-extend-info-styles-with-an-object-1-snap.png
new file mode 100644
index 00000000000..04ceac1031d
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-options-styles-extend-info-styles-with-an-object-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-options-styles-full-control-over-styles-using-a-function-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-options-styles-full-control-over-styles-using-a-function-1-snap.png
new file mode 100644
index 00000000000..3355d198fe1
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-options-styles-full-control-over-styles-using-a-function-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-options-table-component-use-a-custom-component-for-the-table-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-options-table-component-use-a-custom-component-for-the-table-1-snap.png
new file mode 100644
index 00000000000..3355d198fe1
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-options-table-component-use-a-custom-component-for-the-table-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-react-docgen-comments-from-component-declaration-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-react-docgen-comments-from-component-declaration-1-snap.png
new file mode 100644
index 00000000000..3355d198fe1
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-react-docgen-comments-from-component-declaration-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-react-docgen-comments-from-flow-declarations-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-react-docgen-comments-from-flow-declarations-1-snap.png
new file mode 100644
index 00000000000..36fe51848ca
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-react-docgen-comments-from-flow-declarations-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-react-docgen-comments-from-prop-type-declarations-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-react-docgen-comments-from-prop-type-declarations-1-snap.png
new file mode 100644
index 00000000000..db190e2f66a
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-info-react-docgen-comments-from-prop-type-declarations-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-jest-with-tests-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-jest-with-tests-1-snap.png
new file mode 100644
index 00000000000..4258b441e48
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-jest-with-tests-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-knobs-with-knobs-options-triggers-actions-via-button-with-debounce-delay-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-knobs-with-knobs-options-triggers-actions-via-button-with-debounce-delay-1-snap.png
new file mode 100644
index 00000000000..430b9fb5162
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-knobs-with-knobs-options-triggers-actions-via-button-with-debounce-delay-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-knobs-with-knobs-options-tweaks-static-values-with-debounce-delay-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-knobs-with-knobs-options-tweaks-static-values-with-debounce-delay-1-snap.png
new file mode 100644
index 00000000000..660f33b6256
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-knobs-with-knobs-options-tweaks-static-values-with-debounce-delay-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-knobs-with-knobs-triggers-actions-via-button-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-knobs-with-knobs-triggers-actions-via-button-1-snap.png
new file mode 100644
index 00000000000..430b9fb5162
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-knobs-with-knobs-triggers-actions-via-button-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-knobs-with-knobs-tweaks-static-values-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-knobs-with-knobs-tweaks-static-values-1-snap.png
new file mode 100644
index 00000000000..04a2658a761
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-knobs-with-knobs-tweaks-static-values-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-button-first-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-button-first-1-snap.png
new file mode 100644
index 00000000000..fb40b5db16b
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-button-first-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-button-second-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-button-second-1-snap.png
new file mode 100644
index 00000000000..6d087d53b2f
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-button-second-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-href-log-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-href-log-1-snap.png
new file mode 100644
index 00000000000..70565dbf129
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-href-log-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-link-first-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-link-first-1-snap.png
new file mode 100644
index 00000000000..a922d737e4c
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-link-first-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-link-second-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-link-second-1-snap.png
new file mode 100644
index 00000000000..8d6ebf31f0f
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-link-second-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-select-first-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-select-first-1-snap.png
new file mode 100644
index 00000000000..ef0b8750873
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-select-first-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-select-index-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-select-index-1-snap.png
new file mode 100644
index 00000000000..7c41d128e94
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-select-index-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-select-second-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-select-second-1-snap.png
new file mode 100644
index 00000000000..ef0b8750873
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-select-second-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-select-third-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-select-third-1-snap.png
new file mode 100644
index 00000000000..ef0b8750873
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-links-select-third-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-notes-using-deprecated-api-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-notes-using-deprecated-api-1-snap.png
new file mode 100644
index 00000000000..81f71fcab19
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-notes-using-deprecated-api-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-notes-with-notes-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-notes-with-notes-1-snap.png
new file mode 100644
index 00000000000..f80197300e3
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-notes-with-notes-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-notes-with-notes-rendering-imported-markdown-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-notes-with-notes-rendering-imported-markdown-1-snap.png
new file mode 100644
index 00000000000..f80197300e3
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addon-notes-with-notes-rendering-imported-markdown-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-a-11-y-default-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-a-11-y-default-1-snap.png
new file mode 100644
index 00000000000..c0927091586
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-a-11-y-default-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-a-11-y-delayed-render-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-a-11-y-delayed-render-1-snap.png
new file mode 100644
index 00000000000..113fea49283
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-a-11-y-delayed-render-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-a-11-y-disabled-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-a-11-y-disabled-1-snap.png
new file mode 100644
index 00000000000..d0c8b648c6b
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-a-11-y-disabled-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-a-11-y-invalid-contrast-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-a-11-y-invalid-contrast-1-snap.png
new file mode 100644
index 00000000000..dd119821d0d
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-a-11-y-invalid-contrast-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-a-11-y-label-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-a-11-y-label-1-snap.png
new file mode 100644
index 00000000000..b13b8e36d6f
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-a-11-y-label-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-actions-all-types-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-actions-all-types-1-snap.png
new file mode 100644
index 00000000000..cf53b5ba356
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-actions-all-types-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-actions-circular-payload-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-actions-circular-payload-1-snap.png
new file mode 100644
index 00000000000..0788bd2d26d
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-actions-circular-payload-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-actions-decorated-action-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-actions-decorated-action-1-snap.png
new file mode 100644
index 00000000000..7fd7bd5eb99
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-actions-decorated-action-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-actions-function-name-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-actions-function-name-1-snap.png
new file mode 100644
index 00000000000..381412356b4
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-actions-function-name-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-actions-hello-world-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-actions-hello-world-1-snap.png
new file mode 100644
index 00000000000..a029405075a
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-actions-hello-world-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-actions-reserved-keyword-as-name-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-actions-reserved-keyword-as-name-1-snap.png
new file mode 100644
index 00000000000..816fede4a92
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-actions-reserved-keyword-as-name-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-backgrounds-story-1-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-backgrounds-story-1-1-snap.png
new file mode 100644
index 00000000000..bb85d3e0483
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-backgrounds-story-1-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-backgrounds-story-2-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-backgrounds-story-2-1-snap.png
new file mode 100644
index 00000000000..281c42737ae
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-backgrounds-story-2-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-events-logger-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-events-logger-1-snap.png
new file mode 100644
index 00000000000..59fc2e0af6e
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-events-logger-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-decorator-use-info-as-story-decorator-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-decorator-use-info-as-story-decorator-1-snap.png
new file mode 100644
index 00000000000..159c2f1198d
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-decorator-use-info-as-story-decorator-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-git-hub-issues-1814-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-git-hub-issues-1814-1-snap.png
new file mode 100644
index 00000000000..e9fa19c70e4
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-git-hub-issues-1814-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-markdown-displays-markdown-in-description-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-markdown-displays-markdown-in-description-1-snap.png
new file mode 100644
index 00000000000..159c2f1198d
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-markdown-displays-markdown-in-description-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-options-header-shows-or-hides-info-addon-header-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-options-header-shows-or-hides-info-addon-header-1-snap.png
new file mode 100644
index 00000000000..159c2f1198d
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-options-header-shows-or-hides-info-addon-header-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-options-inline-inlines-component-inside-story-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-options-inline-inlines-component-inside-story-1-snap.png
new file mode 100644
index 00000000000..4ef25a6089c
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-options-inline-inlines-component-inside-story-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-options-prop-tables-exclude-exclude-component-from-prop-tables-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-options-prop-tables-exclude-exclude-component-from-prop-tables-1-snap.png
new file mode 100644
index 00000000000..ca92299ae67
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-options-prop-tables-exclude-exclude-component-from-prop-tables-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-options-prop-tables-shows-additional-component-prop-tables-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-options-prop-tables-shows-additional-component-prop-tables-1-snap.png
new file mode 100644
index 00000000000..159c2f1198d
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-options-prop-tables-shows-additional-component-prop-tables-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-options-source-shows-or-hides-info-addon-source-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-options-source-shows-or-hides-info-addon-source-1-snap.png
new file mode 100644
index 00000000000..159c2f1198d
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-options-source-shows-or-hides-info-addon-source-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-options-styles-extend-info-styles-with-an-object-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-options-styles-extend-info-styles-with-an-object-1-snap.png
new file mode 100644
index 00000000000..f569a4f78aa
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-options-styles-extend-info-styles-with-an-object-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-options-styles-full-control-over-styles-using-a-function-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-options-styles-full-control-over-styles-using-a-function-1-snap.png
new file mode 100644
index 00000000000..159c2f1198d
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-options-styles-full-control-over-styles-using-a-function-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-options-table-component-use-a-custom-component-for-the-table-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-options-table-component-use-a-custom-component-for-the-table-1-snap.png
new file mode 100644
index 00000000000..159c2f1198d
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-options-table-component-use-a-custom-component-for-the-table-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-react-docgen-comments-from-component-declaration-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-react-docgen-comments-from-component-declaration-1-snap.png
new file mode 100644
index 00000000000..159c2f1198d
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-react-docgen-comments-from-component-declaration-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-react-docgen-comments-from-flow-declarations-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-react-docgen-comments-from-flow-declarations-1-snap.png
new file mode 100644
index 00000000000..b9786facf99
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-react-docgen-comments-from-flow-declarations-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-react-docgen-comments-from-prop-type-declarations-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-react-docgen-comments-from-prop-type-declarations-1-snap.png
new file mode 100644
index 00000000000..5f4bfb87a3f
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-info-react-docgen-comments-from-prop-type-declarations-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-jest-with-tests-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-jest-with-tests-1-snap.png
new file mode 100644
index 00000000000..9c7911927ee
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-jest-with-tests-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-knobs-with-knobs-options-triggers-actions-via-button-with-debounce-delay-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-knobs-with-knobs-options-triggers-actions-via-button-with-debounce-delay-1-snap.png
new file mode 100644
index 00000000000..6a2275ede1d
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-knobs-with-knobs-options-triggers-actions-via-button-with-debounce-delay-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-knobs-with-knobs-options-tweaks-static-values-with-debounce-delay-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-knobs-with-knobs-options-tweaks-static-values-with-debounce-delay-1-snap.png
new file mode 100644
index 00000000000..4efa9acbe78
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-knobs-with-knobs-options-tweaks-static-values-with-debounce-delay-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-knobs-with-knobs-triggers-actions-via-button-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-knobs-with-knobs-triggers-actions-via-button-1-snap.png
new file mode 100644
index 00000000000..6a2275ede1d
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-knobs-with-knobs-triggers-actions-via-button-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-knobs-with-knobs-tweaks-static-values-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-knobs-with-knobs-tweaks-static-values-1-snap.png
new file mode 100644
index 00000000000..8b12bd26aaa
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-knobs-with-knobs-tweaks-static-values-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-button-first-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-button-first-1-snap.png
new file mode 100644
index 00000000000..ff733cc4657
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-button-first-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-button-second-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-button-second-1-snap.png
new file mode 100644
index 00000000000..5ac41e52149
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-button-second-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-href-log-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-href-log-1-snap.png
new file mode 100644
index 00000000000..b573ee11c63
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-href-log-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-link-first-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-link-first-1-snap.png
new file mode 100644
index 00000000000..fafe2c4d331
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-link-first-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-link-second-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-link-second-1-snap.png
new file mode 100644
index 00000000000..bc8aaf0c250
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-link-second-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-select-first-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-select-first-1-snap.png
new file mode 100644
index 00000000000..11c73895718
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-select-first-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-select-index-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-select-index-1-snap.png
new file mode 100644
index 00000000000..3bc7236fc35
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-select-index-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-select-second-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-select-second-1-snap.png
new file mode 100644
index 00000000000..11c73895718
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-select-second-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-select-third-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-select-third-1-snap.png
new file mode 100644
index 00000000000..11c73895718
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-links-select-third-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-notes-using-deprecated-api-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-notes-using-deprecated-api-1-snap.png
new file mode 100644
index 00000000000..c0ac1100d5b
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-notes-using-deprecated-api-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-notes-with-notes-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-notes-with-notes-1-snap.png
new file mode 100644
index 00000000000..d2bd2cf3440
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-notes-with-notes-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-notes-with-notes-rendering-imported-markdown-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-notes-with-notes-rendering-imported-markdown-1-snap.png
new file mode 100644
index 00000000000..d2bd2cf3440
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-addons-notes-with-notes-rendering-imported-markdown-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-components-menu-link-active-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-components-menu-link-active-1-snap.png
new file mode 100644
index 00000000000..6d7daa5b12e
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-components-menu-link-active-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-components-menu-link-default-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-components-menu-link-default-1-snap.png
new file mode 100644
index 00000000000..1bf514db90a
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-components-menu-link-default-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-components-menu-link-with-knobs-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-components-menu-link-with-knobs-1-snap.png
new file mode 100644
index 00000000000..0f1839e46dc
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-components-menu-link-with-knobs-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-components-routed-link-w-href-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-components-routed-link-w-href-1-snap.png
new file mode 100644
index 00000000000..1073dd466f9
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-components-routed-link-w-href-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-components-routed-link-w-on-click-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-components-routed-link-w-on-click-1-snap.png
new file mode 100644
index 00000000000..59f351f2de3
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-components-routed-link-w-on-click-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-addon-panel-default-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-addon-panel-default-1-snap.png
new file mode 100644
index 00000000000..0c853d1a739
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-addon-panel-default-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-addon-panel-no-panels-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-addon-panel-no-panels-1-snap.png
new file mode 100644
index 00000000000..e192208fbff
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-addon-panel-no-panels-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-layout-addon-panel-in-right-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-layout-addon-panel-in-right-1-snap.png
new file mode 100644
index 00000000000..fe08a2acc01
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-layout-addon-panel-in-right-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-layout-default-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-layout-default-1-snap.png
new file mode 100644
index 00000000000..98162d02802
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-layout-default-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-layout-full-screen-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-layout-full-screen-1-snap.png
new file mode 100644
index 00000000000..f4e95060892
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-layout-full-screen-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-layout-no-addon-panel-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-layout-no-addon-panel-1-snap.png
new file mode 100644
index 00000000000..aed2590447b
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-layout-no-addon-panel-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-layout-no-stories-panel-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-layout-no-stories-panel-1-snap.png
new file mode 100644
index 00000000000..65b1173b8f8
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-layout-no-stories-panel-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-menu-item-default-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-menu-item-default-1-snap.png
new file mode 100644
index 00000000000..4af5b57351e
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-menu-item-default-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-header-simple-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-header-simple-1-snap.png
new file mode 100644
index 00000000000..687f6471da2
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-header-simple-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-empty-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-empty-1-snap.png
new file mode 100644
index 00000000000..113fea49283
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-empty-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-panel-default-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-panel-default-1-snap.png
new file mode 100644
index 00000000000..71c07f6497b
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-panel-default-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-panel-stories-hierarchies-exists-but-is-empty-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-panel-stories-hierarchies-exists-but-is-empty-1-snap.png
new file mode 100644
index 00000000000..5f8e36621a4
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-panel-stories-hierarchies-exists-but-is-empty-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-panel-stories-hierarchy-exists-but-is-empty-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-panel-stories-hierarchy-exists-but-is-empty-1-snap.png
new file mode 100644
index 00000000000..71c07f6497b
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-panel-stories-hierarchy-exists-but-is-empty-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-panel-with-stories-hierarchies-prop-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-panel-with-stories-hierarchies-prop-1-snap.png
new file mode 100644
index 00000000000..666652032e2
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-panel-with-stories-hierarchies-prop-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-panel-with-stories-hierarchy-prop-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-panel-with-stories-hierarchy-prop-1-snap.png
new file mode 100644
index 00000000000..46b67cd3938
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-panel-with-stories-hierarchy-prop-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-simple-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-simple-1-snap.png
new file mode 100644
index 00000000000..e331492ac0c
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-simple-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-with-hierarchy-hierarchy-separator-is-defined-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-with-hierarchy-hierarchy-separator-is-defined-1-snap.png
new file mode 100644
index 00000000000..27c04088a14
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-with-hierarchy-hierarchy-separator-is-defined-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-with-highlighting-when-stories-filter-is-provided-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-with-highlighting-when-stories-filter-is-provided-1-snap.png
new file mode 100644
index 00000000000..321ad79ff22
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-with-highlighting-when-stories-filter-is-provided-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-without-hierarchy-hierarchy-separator-is-defined-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-without-hierarchy-hierarchy-separator-is-defined-1-snap.png
new file mode 100644
index 00000000000..ef78d042821
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-stories-without-hierarchy-hierarchy-separator-is-defined-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-text-filter-with-filter-text-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-text-filter-with-filter-text-1-snap.png
new file mode 100644
index 00000000000..1a22876113e
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-text-filter-with-filter-text-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-text-filter-without-filter-text-1-snap.png b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-text-filter-without-filter-text-1-snap.png
new file mode 100644
index 00000000000..affbf41598e
Binary files /dev/null and b/examples/official-storybook/image-snapshots/__image_snapshots__/storyshots-image-runner-js-image-snapshots-ui-stories-text-filter-without-filter-text-1-snap.png differ
diff --git a/examples/official-storybook/image-snapshots/jest.config.js b/examples/official-storybook/image-snapshots/jest.config.js
new file mode 100644
index 00000000000..abf5ab79117
--- /dev/null
+++ b/examples/official-storybook/image-snapshots/jest.config.js
@@ -0,0 +1,11 @@
+const path = require('path');
+const globalJestConfig = require('../../../jest.config');
+
+const finalJestConfig = globalJestConfig;
+
+finalJestConfig.rootDir = path.join(__dirname, '../../..');
+finalJestConfig.testMatch = [
+  '<rootDir>/examples/official-storybook/image-snapshots/storyshots-image.runner.js',
+];
+
+module.exports = finalJestConfig;
diff --git a/examples/official-storybook/image-snapshots/storyshots-image.runner.js b/examples/official-storybook/image-snapshots/storyshots-image.runner.js
new file mode 100644
index 00000000000..6c2eae5a849
--- /dev/null
+++ b/examples/official-storybook/image-snapshots/storyshots-image.runner.js
@@ -0,0 +1,33 @@
+/* This file is not suffixed by ".test.js" to not being run with all other test files.
+* This test needs the static build of the storybook to run.
+* `yarn run image-snapshots` generates the static build & uses the image snapshots behavior of storyshots.
+* */
+import path from 'path';
+import fs from 'fs';
+import initStoryshots, { imageSnapshot } from '@storybook/addon-storyshots';
+import { logger } from '@storybook/node-logger';
+
+// Image snapshots
+// We do screenshots against the static build of the storybook.
+// For this test to be meaningful, you must build the static version of the storybook *before* running this test suite.
+const pathToStorybookStatic = path.join(__dirname, '../', 'storybook-static');
+
+if (!fs.existsSync(pathToStorybookStatic)) {
+  logger.error(
+    'You are running image snapshots without having the static build of storybook. Please run "yarn run build-storybook" before running tests.'
+  );
+} else {
+  initStoryshots({
+    suite: 'Image snapshots',
+    framework: 'react',
+    configPath: path.join(__dirname, '..'),
+    storyNameRegex: /^((?!tweaks static values with debounce delay|Inlines component inside story).)$/,
+    test: imageSnapshot({
+      storybookUrl: `file://${pathToStorybookStatic}`,
+      getMatchOptions: () => ({
+        failureThreshold: 0.04, // 4% threshold,
+        failureThresholdType: 'percent',
+      }),
+    }),
+  });
+}
diff --git a/examples/official-storybook/package.json b/examples/official-storybook/package.json
index 48469ae0588..25e2cd578a2 100644
--- a/examples/official-storybook/package.json
+++ b/examples/official-storybook/package.json
@@ -1,41 +1,41 @@
 {
   "name": "official-storybook",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
+  "private": true,
   "scripts": {
-    "build-storybook": "build-storybook -c ./",
-    "storybook": "start-storybook -p 9010 -c ./",
-    "chromatic": "chromatic test --storybook-addon --exit-zero-on-changes --app-code ab7m45tp9p"
+    "build-storybook": "build-storybook -c ./ -s built-storybooks",
+    "chromatic": "chromatic test --storybook-addon --exit-zero-on-changes --app-code ab7m45tp9p",
+    "generate-addon-jest-testresults": "jest --config=tests/addon-jest.config.json --json --outputFile=stories/addon-jest.testresults.json",
+    "image-snapshots": "yarn run build-storybook && jest --projects=./image-snapshots",
+    "storybook": "start-storybook -p 9011 -c ./ -s built-storybooks"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "^3.4.0-alpha.0",
-    "@storybook/addon-actions": "^3.4.0-alpha.0",
-    "@storybook/addon-backgrounds": "^3.4.0-alpha.0",
-    "@storybook/addon-centered": "^3.4.0-alpha.0",
-    "@storybook/addon-events": "^3.4.0-alpha.0",
-    "@storybook/addon-info": "^3.4.0-alpha.0",
-    "@storybook/addon-jest": "^3.4.0-alpha.0",
-    "@storybook/addon-knobs": "^3.4.0-alpha.0",
-    "@storybook/addon-links": "^3.4.0-alpha.0",
-    "@storybook/addon-notes": "^3.4.0-alpha.0",
-    "@storybook/addon-options": "^3.4.0-alpha.0",
-    "@storybook/addon-storyshots": "^3.4.0-alpha.0",
-    "@storybook/addon-viewport": "^3.4.0-alpha.0",
-    "@storybook/addons": "^3.4.0-alpha.0",
-    "@storybook/components": "^3.4.0-alpha.0",
-    "@storybook/react": "^3.4.0-alpha.0",
-    "babel-jest": "^21.2.0",
-    "enzyme": "^3.3.0",
-    "enzyme-adapter-react-16": "^1.1.0",
-    "enzyme-to-json": "^3.2.2",
-    "eventemitter3": "^3.0.0",
+    "@storybook/addon-a11y": "^3.4.0-alpha.9",
+    "@storybook/addon-actions": "^3.4.0-alpha.9",
+    "@storybook/addon-backgrounds": "^3.4.0-alpha.9",
+    "@storybook/addon-events": "^3.4.0-alpha.9",
+    "@storybook/addon-info": "^3.4.0-alpha.9",
+    "@storybook/addon-jest": "^3.4.0-alpha.9",
+    "@storybook/addon-knobs": "^3.4.0-alpha.9",
+    "@storybook/addon-links": "^3.4.0-alpha.9",
+    "@storybook/addon-notes": "^3.4.0-alpha.9",
+    "@storybook/addon-options": "^3.4.0-alpha.9",
+    "@storybook/addon-storyshots": "^3.4.0-alpha.9",
+    "@storybook/addon-storysource": "^3.4.0-alpha.9",
+    "@storybook/addon-viewport": "^3.4.0-alpha.9",
+    "@storybook/addons": "^3.4.0-alpha.9",
+    "@storybook/node-logger": "^3.4.0-alpha.9",
+    "@storybook/react": "^3.4.0-alpha.9",
+    "babel-runtime": "^6.26.0",
+    "enzyme-to-json": "^3.3.1",
+    "eventemitter3": "^3.0.1",
     "format-json": "^1.0.3",
     "global": "^4.3.2",
-    "jest": "^21.2.1",
-    "prop-types": "^15.6.0",
+    "paths.macro": "^2.0.2",
+    "prop-types": "^15.6.1",
     "react": "^16.2.0",
-    "react-chromatic": "^0.7.3",
+    "react-chromatic": "^0.7.10",
     "react-dom": "^16.2.0",
-    "uuid": "^3.1.0"
-  },
-  "private": true
+    "uuid": "^3.2.1"
+  }
 }
diff --git a/examples/official-storybook/preview-head.html b/examples/official-storybook/preview-head.html
index ba4ac189b7f..4b10c3cde53 100644
--- a/examples/official-storybook/preview-head.html
+++ b/examples/official-storybook/preview-head.html
@@ -2,4 +2,8 @@
     .preview-head-not-loaded {
         display: none;
     }
+
+    .dotenv-file-not-loaded {
+      display: %DISPLAY_WARNING%;
+    }
 </style>
diff --git a/examples/official-storybook/stories/__snapshots__/addon-a11y.stories.storyshot b/examples/official-storybook/stories/__snapshots__/addon-a11y.stories.storyshot
index 40a2739f499..bc7f67110b4 100644
--- a/examples/official-storybook/stories/__snapshots__/addon-a11y.stories.storyshot
+++ b/examples/official-storybook/stories/__snapshots__/addon-a11y.stories.storyshot
@@ -23,3 +23,5 @@ exports[`Storyshots Addons|a11y Label 1`] = `
   Testing the a11y addon
 </button>
 `;
+
+exports[`Storyshots Addons|a11y delayed render 1`] = `<div />`;
diff --git a/examples/official-storybook/stories/__snapshots__/addon-backgrounds.stories.storyshot b/examples/official-storybook/stories/__snapshots__/addon-backgrounds.stories.storyshot
index 1d884b6c1c4..59ddd8f533d 100644
--- a/examples/official-storybook/stories/__snapshots__/addon-backgrounds.stories.storyshot
+++ b/examples/official-storybook/stories/__snapshots__/addon-backgrounds.stories.storyshot
@@ -1,21 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Storyshots Addons|Backgrounds story 1 1`] = `
-<div
-  style="overflow:scroll;position:fixed;top:0;bottom:0;right:0;left:0;transition:background 0.25s ease-in-out;background-position:center;background-size:cover;background:transparent"
->
-  <button>
-    You should be able to switch backgrounds for this story
-  </button>
-</div>
+<button>
+  You should be able to switch backgrounds for this story
+</button>
 `;
 
 exports[`Storyshots Addons|Backgrounds story 2 1`] = `
-<div
-  style="overflow:scroll;position:fixed;top:0;bottom:0;right:0;left:0;transition:background 0.25s ease-in-out;background-position:center;background-size:cover;background:transparent"
->
-  <button>
-    This one too!
-  </button>
-</div>
+<button>
+  This one too!
+</button>
 `;
diff --git a/examples/official-storybook/stories/__snapshots__/addon-info.stories.storyshot b/examples/official-storybook/stories/__snapshots__/addon-info.stories.storyshot
index 7a57c1477b5..20a70fb9792 100644
--- a/examples/official-storybook/stories/__snapshots__/addon-info.stories.storyshot
+++ b/examples/official-storybook/stories/__snapshots__/addon-info.stories.storyshot
@@ -58,41 +58,59 @@ exports[`Storyshots Addons|Info.Decorator Use Info as story decorator 1`] = `
             Story Source
           </h1>
           <pre
-            style="font-size:.88em;font-family:Menlo, Monaco, \\"Courier New\\", monospace;background-color:#fafafa;padding:.5rem;line-height:1.5;overflow-x:scroll"
+            class="css-4akams"
           >
-            <div
-              style="padding-left:18px;padding-right:3px"
-            >
-              <span
-                style="color:#777"
+            <div>
+              <div
+                style="padding-left:18px;padding-right:3px"
               >
-                &lt;BaseButton
-              </span>
-              <span>
+                <span
+                  style="color:#777"
+                >
+                  &lt;BaseButton
+                </span>
                 <span>
-                   
                   <span>
-                    label
-                  </span>
-                  <span>
-                    =
+                     
                     <span>
-                      <span
-                        style="color:#22a;word-break:break-word"
-                      >
-                        "Button"
+                      label
+                    </span>
+                    <span>
+                      =
+                      <span>
+                        <span
+                          style="color:#22a;word-break:break-word"
+                        >
+                          "Button"
+                        </span>
                       </span>
                     </span>
+                     
                   </span>
-                   
                 </span>
-              </span>
-              <span
-                style="color:#777"
-              >
-                /&gt;
-              </span>
+                <span
+                  style="color:#777"
+                >
+                  /&gt;
+                </span>
+              </div>
             </div>
+            <button
+              class="css-gydez8"
+            >
+              <div
+                class="css-kv47nt"
+              >
+                <div
+                  style="margin-bottom:6px"
+                >
+                  Copied!
+                </div>
+                <div>
+                  Copy
+                </div>
+              </div>
+            </button>
           </pre>
         </div>
         <div>
@@ -335,64 +353,82 @@ exports[`Storyshots Addons|Info.GitHub issues #1814 1`] = `
             Story Source
           </h1>
           <pre
-            style="font-size:.88em;font-family:Menlo, Monaco, \\"Courier New\\", monospace;background-color:#fafafa;padding:.5rem;line-height:1.5;overflow-x:scroll"
+            class="css-4akams"
           >
             <div>
-              <div
-                style="padding-left:18px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
+              <div>
+                <div
+                  style="padding-left:18px;padding-right:3px"
                 >
-                  &lt;div
-                </span>
-                <span />
-                <span
-                  style="color:#777"
+                  <span
+                    style="color:#777"
+                  >
+                    &lt;div
+                  </span>
+                  <span />
+                  <span
+                    style="color:#777"
+                  >
+                    &gt;
+                  </span>
+                </div>
+                <div
+                  style="padding-left:33px;padding-right:3px"
                 >
-                  &gt;
-                </span>
-              </div>
-              <div
-                style="padding-left:33px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
+                  <span
+                    style="color:#777"
+                  >
+                    &lt;Unknown
+                  </span>
+                  <span />
+                  <span
+                    style="color:#777"
+                  >
+                    /&gt;
+                  </span>
+                </div>
+                <div
+                  style="padding-left:33px;padding-right:3px"
                 >
-                  &lt;Unknown
-                </span>
-                <span />
-                <span
-                  style="color:#777"
+                  <span
+                    style="color:#777"
+                  >
+                    &lt;Unknown
+                  </span>
+                  <span />
+                  <span
+                    style="color:#777"
+                  >
+                    /&gt;
+                  </span>
+                </div>
+                <div
+                  style="padding-left:18px;padding-right:3px"
                 >
-                  /&gt;
-                </span>
-              </div>
-              <div
-                style="padding-left:33px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
-                >
-                  &lt;Unknown
-                </span>
-                <span />
-                <span
-                  style="color:#777"
-                >
-                  /&gt;
-                </span>
-              </div>
-              <div
-                style="padding-left:18px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
-                >
-                  &lt;/div&gt;
-                </span>
+                  <span
+                    style="color:#777"
+                  >
+                    &lt;/div&gt;
+                  </span>
+                </div>
               </div>
             </div>
+            <button
+              class="css-gydez8"
+            >
+              <div
+                class="css-kv47nt"
+              >
+                <div
+                  style="margin-bottom:6px"
+                >
+                  Copied!
+                </div>
+                <div>
+                  Copy
+                </div>
+              </div>
+            </button>
           </pre>
         </div>
         <div>
@@ -517,61 +553,79 @@ exports[`Storyshots Addons|Info.Markdown Displays Markdown in description 1`] =
             Story Source
           </h1>
           <pre
-            style="font-size:.88em;font-family:Menlo, Monaco, \\"Courier New\\", monospace;background-color:#fafafa;padding:.5rem;line-height:1.5;overflow-x:scroll"
+            class="css-4akams"
           >
-            <div
-              style="padding-left:18px;padding-right:3px"
-            >
-              <span
-                style="color:#777"
+            <div>
+              <div
+                style="padding-left:18px;padding-right:3px"
               >
-                &lt;BaseButton
-              </span>
-              <span>
+                <span
+                  style="color:#777"
+                >
+                  &lt;BaseButton
+                </span>
                 <span>
-                   
                   <span>
-                    onClick
-                  </span>
-                  <span>
-                    =
+                     
                     <span>
+                      onClick
+                    </span>
+                    <span>
+                      =
                       <span>
-                        {
-                        <span
-                          style="color:#170"
-                        >
-                          clicked()
+                        <span>
+                          {
+                          <span
+                            style="color:#170"
+                          >
+                            clicked()
+                          </span>
+                          }
                         </span>
-                        }
                       </span>
                     </span>
                   </span>
-                </span>
-                <span>
-                   
                   <span>
-                    label
-                  </span>
-                  <span>
-                    =
+                     
                     <span>
-                      <span
-                        style="color:#22a;word-break:break-word"
-                      >
-                        "Button"
+                      label
+                    </span>
+                    <span>
+                      =
+                      <span>
+                        <span
+                          style="color:#22a;word-break:break-word"
+                        >
+                          "Button"
+                        </span>
                       </span>
                     </span>
+                     
                   </span>
-                   
                 </span>
-              </span>
-              <span
-                style="color:#777"
-              >
-                /&gt;
-              </span>
+                <span
+                  style="color:#777"
+                >
+                  /&gt;
+                </span>
+              </div>
             </div>
+            <button
+              class="css-gydez8"
+            >
+              <div
+                class="css-kv47nt"
+              >
+                <div
+                  style="margin-bottom:6px"
+                >
+                  Copied!
+                </div>
+                <div>
+                  Copy
+                </div>
+              </div>
+            </button>
           </pre>
         </div>
         <div>
@@ -802,41 +856,59 @@ exports[`Storyshots Addons|Info.Options.TableComponent Use a custom component fo
             Story Source
           </h1>
           <pre
-            style="font-size:.88em;font-family:Menlo, Monaco, \\"Courier New\\", monospace;background-color:#fafafa;padding:.5rem;line-height:1.5;overflow-x:scroll"
+            class="css-4akams"
           >
-            <div
-              style="padding-left:18px;padding-right:3px"
-            >
-              <span
-                style="color:#777"
+            <div>
+              <div
+                style="padding-left:18px;padding-right:3px"
               >
-                &lt;BaseButton
-              </span>
-              <span>
+                <span
+                  style="color:#777"
+                >
+                  &lt;BaseButton
+                </span>
                 <span>
-                   
                   <span>
-                    label
-                  </span>
-                  <span>
-                    =
+                     
                     <span>
-                      <span
-                        style="color:#22a;word-break:break-word"
-                      >
-                        "Button"
+                      label
+                    </span>
+                    <span>
+                      =
+                      <span>
+                        <span
+                          style="color:#22a;word-break:break-word"
+                        >
+                          "Button"
+                        </span>
                       </span>
                     </span>
+                     
                   </span>
-                   
                 </span>
-              </span>
-              <span
-                style="color:#777"
-              >
-                /&gt;
-              </span>
+                <span
+                  style="color:#777"
+                >
+                  /&gt;
+                </span>
+              </div>
             </div>
+            <button
+              class="css-gydez8"
+            >
+              <div
+                class="css-kv47nt"
+              >
+                <div
+                  style="margin-bottom:6px"
+                >
+                  Copied!
+                </div>
+                <div>
+                  Copy
+                </div>
+              </div>
+            </button>
           </pre>
         </div>
         <div>
@@ -964,41 +1036,59 @@ exports[`Storyshots Addons|Info.Options.header Shows or hides Info Addon header
             Story Source
           </h1>
           <pre
-            style="font-size:.88em;font-family:Menlo, Monaco, \\"Courier New\\", monospace;background-color:#fafafa;padding:.5rem;line-height:1.5;overflow-x:scroll"
+            class="css-4akams"
           >
-            <div
-              style="padding-left:18px;padding-right:3px"
-            >
-              <span
-                style="color:#777"
+            <div>
+              <div
+                style="padding-left:18px;padding-right:3px"
               >
-                &lt;BaseButton
-              </span>
-              <span>
+                <span
+                  style="color:#777"
+                >
+                  &lt;BaseButton
+                </span>
                 <span>
-                   
                   <span>
-                    label
-                  </span>
-                  <span>
-                    =
+                     
                     <span>
-                      <span
-                        style="color:#22a;word-break:break-word"
-                      >
-                        "Button"
+                      label
+                    </span>
+                    <span>
+                      =
+                      <span>
+                        <span
+                          style="color:#22a;word-break:break-word"
+                        >
+                          "Button"
+                        </span>
                       </span>
                     </span>
+                     
                   </span>
-                   
                 </span>
-              </span>
-              <span
-                style="color:#777"
-              >
-                /&gt;
-              </span>
+                <span
+                  style="color:#777"
+                >
+                  /&gt;
+                </span>
+              </div>
             </div>
+            <button
+              class="css-gydez8"
+            >
+              <div
+                class="css-kv47nt"
+              >
+                <div
+                  style="margin-bottom:6px"
+                >
+                  Copied!
+                </div>
+                <div>
+                  Copy
+                </div>
+              </div>
+            </button>
           </pre>
         </div>
         <div>
@@ -1227,41 +1317,59 @@ exports[`Storyshots Addons|Info.Options.inline Inlines component inside story 1`
           Story Source
         </h1>
         <pre
-          style="font-size:.88em;font-family:Menlo, Monaco, \\"Courier New\\", monospace;background-color:#fafafa;padding:.5rem;line-height:1.5;overflow-x:scroll"
+          class="css-4akams"
         >
-          <div
-            style="padding-left:18px;padding-right:3px"
-          >
-            <span
-              style="color:#777"
+          <div>
+            <div
+              style="padding-left:18px;padding-right:3px"
             >
-              &lt;BaseButton
-            </span>
-            <span>
+              <span
+                style="color:#777"
+              >
+                &lt;BaseButton
+              </span>
               <span>
-                 
                 <span>
-                  label
-                </span>
-                <span>
-                  =
+                   
                   <span>
-                    <span
-                      style="color:#22a;word-break:break-word"
-                    >
-                      "Button"
+                    label
+                  </span>
+                  <span>
+                    =
+                    <span>
+                      <span
+                        style="color:#22a;word-break:break-word"
+                      >
+                        "Button"
+                      </span>
                     </span>
                   </span>
+                   
                 </span>
-                 
               </span>
-            </span>
-            <span
-              style="color:#777"
-            >
-              /&gt;
-            </span>
+              <span
+                style="color:#777"
+              >
+                /&gt;
+              </span>
+            </div>
           </div>
+          <button
+            class="css-gydez8"
+          >
+            <div
+              class="css-kv47nt"
+            >
+              <div
+                style="margin-bottom:6px"
+              >
+                Copied!
+              </div>
+              <div>
+                Copy
+              </div>
+            </div>
+          </button>
         </pre>
       </div>
       <div>
@@ -1500,41 +1608,59 @@ exports[`Storyshots Addons|Info.Options.propTables Shows additional component pr
             Story Source
           </h1>
           <pre
-            style="font-size:.88em;font-family:Menlo, Monaco, \\"Courier New\\", monospace;background-color:#fafafa;padding:.5rem;line-height:1.5;overflow-x:scroll"
+            class="css-4akams"
           >
-            <div
-              style="padding-left:18px;padding-right:3px"
-            >
-              <span
-                style="color:#777"
+            <div>
+              <div
+                style="padding-left:18px;padding-right:3px"
               >
-                &lt;BaseButton
-              </span>
-              <span>
+                <span
+                  style="color:#777"
+                >
+                  &lt;BaseButton
+                </span>
                 <span>
-                   
                   <span>
-                    label
-                  </span>
-                  <span>
-                    =
+                     
                     <span>
-                      <span
-                        style="color:#22a;word-break:break-word"
-                      >
-                        "Button"
+                      label
+                    </span>
+                    <span>
+                      =
+                      <span>
+                        <span
+                          style="color:#22a;word-break:break-word"
+                        >
+                          "Button"
+                        </span>
                       </span>
                     </span>
+                     
                   </span>
-                   
                 </span>
-              </span>
-              <span
-                style="color:#777"
-              >
-                /&gt;
-              </span>
+                <span
+                  style="color:#777"
+                >
+                  /&gt;
+                </span>
+              </div>
             </div>
+            <button
+              class="css-gydez8"
+            >
+              <div
+                class="css-kv47nt"
+              >
+                <div
+                  style="margin-bottom:6px"
+                >
+                  Copied!
+                </div>
+                <div>
+                  Copy
+                </div>
+              </div>
+            </button>
           </pre>
         </div>
         <div>
@@ -1891,100 +2017,118 @@ exports[`Storyshots Addons|Info.Options.propTablesExclude Exclude component from
             Story Source
           </h1>
           <pre
-            style="font-size:.88em;font-family:Menlo, Monaco, \\"Courier New\\", monospace;background-color:#fafafa;padding:.5rem;line-height:1.5;overflow-x:scroll"
+            class="css-4akams"
           >
             <div>
-              <div
-                style="padding-left:18px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
+              <div>
+                <div
+                  style="padding-left:18px;padding-right:3px"
                 >
-                  &lt;div
-                </span>
-                <span />
-                <span
-                  style="color:#777"
+                  <span
+                    style="color:#777"
+                  >
+                    &lt;div
+                  </span>
+                  <span />
+                  <span
+                    style="color:#777"
+                  >
+                    &gt;
+                  </span>
+                </div>
+                <div
+                  style="padding-left:33px;padding-right:3px"
                 >
-                  &gt;
-                </span>
-              </div>
-              <div
-                style="padding-left:33px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
-                >
-                  &lt;BaseButton
-                </span>
-                <span>
+                  <span
+                    style="color:#777"
+                  >
+                    &lt;BaseButton
+                  </span>
                   <span>
-                     
                     <span>
-                      label
-                    </span>
-                    <span>
-                      =
+                       
                       <span>
-                        <span
-                          style="color:#22a;word-break:break-word"
-                        >
-                          "Button"
+                        label
+                      </span>
+                      <span>
+                        =
+                        <span>
+                          <span
+                            style="color:#22a;word-break:break-word"
+                          >
+                            "Button"
+                          </span>
                         </span>
                       </span>
+                       
                     </span>
-                     
                   </span>
-                </span>
-                <span
-                  style="color:#777"
+                  <span
+                    style="color:#777"
+                  >
+                    /&gt;
+                  </span>
+                </div>
+                <div
+                  style="padding-left:33px;padding-right:3px"
                 >
-                  /&gt;
-                </span>
-              </div>
-              <div
-                style="padding-left:33px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
-                >
-                  &lt;FlowTypeButton
-                </span>
-                <span>
+                  <span
+                    style="color:#777"
+                  >
+                    &lt;FlowTypeButton
+                  </span>
                   <span>
-                     
                     <span>
-                      label
-                    </span>
-                    <span>
-                      =
+                       
                       <span>
-                        <span
-                          style="color:#22a;word-break:break-word"
-                        >
-                          "Flow Typed Button"
+                        label
+                      </span>
+                      <span>
+                        =
+                        <span>
+                          <span
+                            style="color:#22a;word-break:break-word"
+                          >
+                            "Flow Typed Button"
+                          </span>
                         </span>
                       </span>
+                       
                     </span>
-                     
                   </span>
-                </span>
-                <span
-                  style="color:#777"
+                  <span
+                    style="color:#777"
+                  >
+                    /&gt;
+                  </span>
+                </div>
+                <div
+                  style="padding-left:18px;padding-right:3px"
                 >
-                  /&gt;
-                </span>
-              </div>
-              <div
-                style="padding-left:18px;padding-right:3px"
-              >
-                <span
-                  style="color:#777"
-                >
-                  &lt;/div&gt;
-                </span>
+                  <span
+                    style="color:#777"
+                  >
+                    &lt;/div&gt;
+                  </span>
+                </div>
               </div>
             </div>
+            <button
+              class="css-gydez8"
+            >
+              <div
+                class="css-kv47nt"
+              >
+                <div
+                  style="margin-bottom:6px"
+                >
+                  Copied!
+                </div>
+                <div>
+                  Copy
+                </div>
+              </div>
+            </button>
           </pre>
         </div>
         <div>
@@ -2445,41 +2589,59 @@ exports[`Storyshots Addons|Info.Options.styles Extend info styles with an object
             Story Source
           </h1>
           <pre
-            style="font-size:.88em;font-family:Menlo, Monaco, \\"Courier New\\", monospace;background-color:#fafafa;padding:.5rem;line-height:1.5;overflow-x:scroll"
+            class="css-4akams"
           >
-            <div
-              style="padding-left:18px;padding-right:3px"
-            >
-              <span
-                style="color:#777"
+            <div>
+              <div
+                style="padding-left:18px;padding-right:3px"
               >
-                &lt;BaseButton
-              </span>
-              <span>
+                <span
+                  style="color:#777"
+                >
+                  &lt;BaseButton
+                </span>
                 <span>
-                   
                   <span>
-                    label
-                  </span>
-                  <span>
-                    =
+                     
                     <span>
-                      <span
-                        style="color:#22a;word-break:break-word"
-                      >
-                        "Button"
+                      label
+                    </span>
+                    <span>
+                      =
+                      <span>
+                        <span
+                          style="color:#22a;word-break:break-word"
+                        >
+                          "Button"
+                        </span>
                       </span>
                     </span>
+                     
                   </span>
-                   
                 </span>
-              </span>
-              <span
-                style="color:#777"
-              >
-                /&gt;
-              </span>
+                <span
+                  style="color:#777"
+                >
+                  /&gt;
+                </span>
+              </div>
             </div>
+            <button
+              class="css-gydez8"
+            >
+              <div
+                class="css-kv47nt"
+              >
+                <div
+                  style="margin-bottom:6px"
+                >
+                  Copied!
+                </div>
+                <div>
+                  Copy
+                </div>
+              </div>
+            </button>
           </pre>
         </div>
         <div>
@@ -2710,41 +2872,59 @@ exports[`Storyshots Addons|Info.Options.styles Full control over styles using a
             Story Source
           </h1>
           <pre
-            style="font-size:.88em;font-family:Menlo, Monaco, \\"Courier New\\", monospace;background-color:#fafafa;padding:.5rem;line-height:1.5;overflow-x:scroll"
+            class="css-4akams"
           >
-            <div
-              style="padding-left:18px;padding-right:3px"
-            >
-              <span
-                style="color:#777"
+            <div>
+              <div
+                style="padding-left:18px;padding-right:3px"
               >
-                &lt;BaseButton
-              </span>
-              <span>
+                <span
+                  style="color:#777"
+                >
+                  &lt;BaseButton
+                </span>
                 <span>
-                   
                   <span>
-                    label
-                  </span>
-                  <span>
-                    =
+                     
                     <span>
-                      <span
-                        style="color:#22a;word-break:break-word"
-                      >
-                        "Button"
+                      label
+                    </span>
+                    <span>
+                      =
+                      <span>
+                        <span
+                          style="color:#22a;word-break:break-word"
+                        >
+                          "Button"
+                        </span>
                       </span>
                     </span>
+                     
                   </span>
-                   
                 </span>
-              </span>
-              <span
-                style="color:#777"
-              >
-                /&gt;
-              </span>
+                <span
+                  style="color:#777"
+                >
+                  /&gt;
+                </span>
+              </div>
             </div>
+            <button
+              class="css-gydez8"
+            >
+              <div
+                class="css-kv47nt"
+              >
+                <div
+                  style="margin-bottom:6px"
+                >
+                  Copied!
+                </div>
+                <div>
+                  Copy
+                </div>
+              </div>
+            </button>
           </pre>
         </div>
         <div>
@@ -2984,61 +3164,79 @@ exports[`Storyshots Addons|Info.React Docgen Comments from Flow declarations 1`]
             Story Source
           </h1>
           <pre
-            style="font-size:.88em;font-family:Menlo, Monaco, \\"Courier New\\", monospace;background-color:#fafafa;padding:.5rem;line-height:1.5;overflow-x:scroll"
+            class="css-4akams"
           >
-            <div
-              style="padding-left:18px;padding-right:3px"
-            >
-              <span
-                style="color:#777"
+            <div>
+              <div
+                style="padding-left:18px;padding-right:3px"
               >
-                &lt;FlowTypeButton
-              </span>
-              <span>
+                <span
+                  style="color:#777"
+                >
+                  &lt;FlowTypeButton
+                </span>
                 <span>
-                   
                   <span>
-                    onClick
-                  </span>
-                  <span>
-                    =
+                     
                     <span>
+                      onClick
+                    </span>
+                    <span>
+                      =
                       <span>
-                        {
-                        <span
-                          style="color:#170"
-                        >
-                          clicked()
+                        <span>
+                          {
+                          <span
+                            style="color:#170"
+                          >
+                            clicked()
+                          </span>
+                          }
                         </span>
-                        }
                       </span>
                     </span>
                   </span>
-                </span>
-                <span>
-                   
                   <span>
-                    label
-                  </span>
-                  <span>
-                    =
+                     
                     <span>
-                      <span
-                        style="color:#22a;word-break:break-word"
-                      >
-                        "Flow Typed Button"
+                      label
+                    </span>
+                    <span>
+                      =
+                      <span>
+                        <span
+                          style="color:#22a;word-break:break-word"
+                        >
+                          "Flow Typed Button"
+                        </span>
                       </span>
                     </span>
+                     
                   </span>
-                   
                 </span>
-              </span>
-              <span
-                style="color:#777"
-              >
-                /&gt;
-              </span>
+                <span
+                  style="color:#777"
+                >
+                  /&gt;
+                </span>
+              </div>
             </div>
+            <button
+              class="css-gydez8"
+            >
+              <div
+                class="css-kv47nt"
+              >
+                <div
+                  style="margin-bottom:6px"
+                >
+                  Copied!
+                </div>
+                <div>
+                  Copy
+                </div>
+              </div>
+            </button>
           </pre>
         </div>
         <div>
@@ -3224,61 +3422,79 @@ exports[`Storyshots Addons|Info.React Docgen Comments from PropType declarations
             Story Source
           </h1>
           <pre
-            style="font-size:.88em;font-family:Menlo, Monaco, \\"Courier New\\", monospace;background-color:#fafafa;padding:.5rem;line-height:1.5;overflow-x:scroll"
+            class="css-4akams"
           >
-            <div
-              style="padding-left:18px;padding-right:3px"
-            >
-              <span
-                style="color:#777"
+            <div>
+              <div
+                style="padding-left:18px;padding-right:3px"
               >
-                &lt;DocgenButton
-              </span>
-              <span>
+                <span
+                  style="color:#777"
+                >
+                  &lt;DocgenButton
+                </span>
                 <span>
-                   
                   <span>
-                    onClick
-                  </span>
-                  <span>
-                    =
+                     
                     <span>
+                      onClick
+                    </span>
+                    <span>
+                      =
                       <span>
-                        {
-                        <span
-                          style="color:#170"
-                        >
-                          clicked()
+                        <span>
+                          {
+                          <span
+                            style="color:#170"
+                          >
+                            clicked()
+                          </span>
+                          }
                         </span>
-                        }
                       </span>
                     </span>
                   </span>
-                </span>
-                <span>
-                   
                   <span>
-                    label
-                  </span>
-                  <span>
-                    =
+                     
                     <span>
-                      <span
-                        style="color:#22a;word-break:break-word"
-                      >
-                        "Docgen Button"
+                      label
+                    </span>
+                    <span>
+                      =
+                      <span>
+                        <span
+                          style="color:#22a;word-break:break-word"
+                        >
+                          "Docgen Button"
+                        </span>
                       </span>
                     </span>
+                     
                   </span>
-                   
                 </span>
-              </span>
-              <span
-                style="color:#777"
-              >
-                /&gt;
-              </span>
+                <span
+                  style="color:#777"
+                >
+                  /&gt;
+                </span>
+              </div>
             </div>
+            <button
+              class="css-gydez8"
+            >
+              <div
+                class="css-kv47nt"
+              >
+                <div
+                  style="margin-bottom:6px"
+                >
+                  Copied!
+                </div>
+                <div>
+                  Copy
+                </div>
+              </div>
+            </button>
           </pre>
         </div>
         <div>
@@ -3592,6 +3808,31 @@ exports[`Storyshots Addons|Info.React Docgen Comments from PropType declarations
                     class="css-d52hbj"
                   />
                 </tr>
+                <tr>
+                  <td
+                    class="css-1ygfcef"
+                  >
+                    enmEval
+                  </td>
+                  <td
+                    class="css-1ygfcef"
+                  >
+                    <span />
+                  </td>
+                  <td
+                    class="css-d52hbj"
+                  >
+                    -
+                  </td>
+                  <td
+                    class="css-d52hbj"
+                  >
+                    -
+                  </td>
+                  <td
+                    class="css-d52hbj"
+                  />
+                </tr>
                 <tr>
                   <td
                     class="css-1ygfcef"
@@ -3685,61 +3926,79 @@ exports[`Storyshots Addons|Info.React Docgen Comments from component declaration
             Story Source
           </h1>
           <pre
-            style="font-size:.88em;font-family:Menlo, Monaco, \\"Courier New\\", monospace;background-color:#fafafa;padding:.5rem;line-height:1.5;overflow-x:scroll"
+            class="css-4akams"
           >
-            <div
-              style="padding-left:18px;padding-right:3px"
-            >
-              <span
-                style="color:#777"
+            <div>
+              <div
+                style="padding-left:18px;padding-right:3px"
               >
-                &lt;BaseButton
-              </span>
-              <span>
+                <span
+                  style="color:#777"
+                >
+                  &lt;BaseButton
+                </span>
                 <span>
-                   
                   <span>
-                    onClick
-                  </span>
-                  <span>
-                    =
+                     
                     <span>
+                      onClick
+                    </span>
+                    <span>
+                      =
                       <span>
-                        {
-                        <span
-                          style="color:#170"
-                        >
-                          clicked()
+                        <span>
+                          {
+                          <span
+                            style="color:#170"
+                          >
+                            clicked()
+                          </span>
+                          }
                         </span>
-                        }
                       </span>
                     </span>
                   </span>
-                </span>
-                <span>
-                   
                   <span>
-                    label
-                  </span>
-                  <span>
-                    =
+                     
                     <span>
-                      <span
-                        style="color:#22a;word-break:break-word"
-                      >
-                        "Button"
+                      label
+                    </span>
+                    <span>
+                      =
+                      <span>
+                        <span
+                          style="color:#22a;word-break:break-word"
+                        >
+                          "Button"
+                        </span>
                       </span>
                     </span>
+                     
                   </span>
-                   
                 </span>
-              </span>
-              <span
-                style="color:#777"
-              >
-                /&gt;
-              </span>
+                <span
+                  style="color:#777"
+                >
+                  /&gt;
+                </span>
+              </div>
             </div>
+            <button
+              class="css-gydez8"
+            >
+              <div
+                class="css-kv47nt"
+              >
+                <div
+                  style="margin-bottom:6px"
+                >
+                  Copied!
+                </div>
+                <div>
+                  Copy
+                </div>
+              </div>
+            </button>
           </pre>
         </div>
         <div>
diff --git a/examples/official-storybook/stories/__snapshots__/addon-knobs.stories.storyshot b/examples/official-storybook/stories/__snapshots__/addon-knobs.stories.storyshot
index 0bf3a0717c7..1a1cb220910 100644
--- a/examples/official-storybook/stories/__snapshots__/addon-knobs.stories.storyshot
+++ b/examples/official-storybook/stories/__snapshots__/addon-knobs.stories.storyshot
@@ -16,7 +16,7 @@ exports[`Storyshots Addons|Knobs.withKnobs tweaks static values 1`] = `
   style="background-color:#ffff00;border:3px solid #ff00ff;padding:10px"
 >
   <p>
-    My name is Storyteller, I'm 70 years old, and my favorite fruit is apple.
+    My name is Storyteller, I'm 70 years old, and my favorite fruit is apple. I also enjoy lime.
   </p>
   <p>
     My birthday is: January 20, 2017
@@ -51,6 +51,58 @@ exports[`Storyshots Addons|Knobs.withKnobs tweaks static values 1`] = `
 </div>
 `;
 
+exports[`Storyshots Addons|Knobs.withKnobs tweaks static values organized in groups 1`] = `
+<div
+  style="background-color:#ffff00;border:3px solid #ff00ff;padding:10px"
+>
+  <h1>
+    General Information
+  </h1>
+  <p>
+    Name: Storyteller
+  </p>
+  <p>
+    Age: 70
+  </p>
+  <p>
+    Birthday: January 20, 2017
+  </p>
+  <p>
+    Account Balance: 12.5
+  </p>
+  <p>
+    Years in NY: 9
+  </p>
+  <hr />
+  <h1>
+    Favorites
+  </h1>
+  <p>
+    Catchphrase: Nice to meet you!
+  </p>
+  <p>
+    Fruit: apple
+  </p>
+  <p>
+    Second Fruit: lime
+  </p>
+  <p>
+    Items:
+  </p>
+  <ul>
+    <li>
+      Laptop
+    </li>
+    <li>
+      Book
+    </li>
+    <li>
+      Whiskey
+    </li>
+  </ul>
+</div>
+`;
+
 exports[`Storyshots Addons|Knobs.withKnobsOptions triggers actions via button with debounce delay 1`] = `
 <div>
   <p>
@@ -70,7 +122,7 @@ exports[`Storyshots Addons|Knobs.withKnobsOptions tweaks static values with debo
     If you are encountering performance issues with state updating too often, use withKnobsOptions to debounce changes.
   </p>
   <p>
-    My name is Storyteller, I'm 70 years old, and my favorite fruit is apple.
+    My name is Storyteller, I'm 70 years old, and my favorite fruit is apple. I also enjoy lime.
   </p>
   <p>
     My birthday is: January 20, 2017
diff --git a/examples/official-storybook/stories/__snapshots__/addon-notes.stories.storyshot b/examples/official-storybook/stories/__snapshots__/addon-notes.stories.storyshot
index c63bb34386e..32623432519 100644
--- a/examples/official-storybook/stories/__snapshots__/addon-notes.stories.storyshot
+++ b/examples/official-storybook/stories/__snapshots__/addon-notes.stories.storyshot
@@ -17,3 +17,9 @@ exports[`Storyshots Addons|Notes withNotes rendering imported markdown 1`] = `
   Button with notes - check the notes panel for details
 </button>
 `;
+
+exports[`Storyshots Addons|Notes withNotes rendering inline, github-flavored markdown 1`] = `
+<button>
+  Button with notes from inline github-flavored markdown - check the notes panel for details
+</button>
+`;
diff --git a/examples/official-storybook/stories/__snapshots__/app-acceptance.stories.storyshot b/examples/official-storybook/stories/__snapshots__/app-acceptance.stories.storyshot
new file mode 100644
index 00000000000..6ebeacf6f19
--- /dev/null
+++ b/examples/official-storybook/stories/__snapshots__/app-acceptance.stories.storyshot
@@ -0,0 +1,33 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots App|acceptance angular-cli 1`] = `
+<iframe
+  src="/angular-cli/index.html"
+  style="border:0;position:absolute;top:0;left:0;width:100vw;height:100vh"
+  title="angular-cli"
+/>
+`;
+
+exports[`Storyshots App|acceptance cra-kitchen-sink 1`] = `
+<iframe
+  src="/cra-kitchen-sink/index.html"
+  style="border:0;position:absolute;top:0;left:0;width:100vw;height:100vh"
+  title="cra-kitchen-sink"
+/>
+`;
+
+exports[`Storyshots App|acceptance polymer-cli 1`] = `
+<iframe
+  src="/polymer-cli/index.html"
+  style="border:0;position:absolute;top:0;left:0;width:100vw;height:100vh"
+  title="polymer-cli"
+/>
+`;
+
+exports[`Storyshots App|acceptance vue-kitchen-sink 1`] = `
+<iframe
+  src="/vue-kitchen-sink/index.html"
+  style="border:0;position:absolute;top:0;left:0;width:100vw;height:100vh"
+  title="vue-kitchen-sink"
+/>
+`;
diff --git a/examples/official-storybook/stories/__snapshots__/other-dirname.stories.storyshot b/examples/official-storybook/stories/__snapshots__/other-dirname.stories.storyshot
new file mode 100644
index 00000000000..3afa6274d88
--- /dev/null
+++ b/examples/official-storybook/stories/__snapshots__/other-dirname.stories.storyshot
@@ -0,0 +1,13 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Other|/stories//Dirname Example story 1 1`] = `
+<button>
+  Story 1
+</button>
+`;
+
+exports[`Storyshots Other|/stories//Dirname Example story 2 1`] = `
+<button>
+  Story 2
+</button>
+`;
diff --git a/examples/official-storybook/stories/addon-a11y.stories.js b/examples/official-storybook/stories/addon-a11y.stories.js
index 18ea68caad6..6980bb1b3df 100644
--- a/examples/official-storybook/stories/addon-a11y.stories.js
+++ b/examples/official-storybook/stories/addon-a11y.stories.js
@@ -1,17 +1,28 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
+import { setOptions } from '@storybook/addon-options';
 
 import { checkA11y } from '@storybook/addon-a11y';
 import BaseButton from '../components/BaseButton';
+import DelayedRender from '../components/DelayedRender';
 
 const text = 'Testing the a11y addon';
 
 storiesOf('Addons|a11y', module)
   .addDecorator(checkA11y)
+  .addDecorator(fn => {
+    setOptions({ selectedAddonPanel: '@storybook/addon-a11y/panel' });
+    return fn();
+  })
   .add('Default', () => <BaseButton label="" />)
   .add('Label', () => <BaseButton label={text} />)
   .add('Disabled', () => <BaseButton disabled label={text} />)
   .add('Invalid contrast', () => (
     // FIXME has no effect on score
     <BaseButton style={{ color: 'black', backgroundColor: 'black' }} label={text} />
+  ))
+  .add('delayed render', () => (
+    <DelayedRender>
+      <BaseButton label="This button has a delayed render of 1s" />
+    </DelayedRender>
   ));
diff --git a/examples/official-storybook/stories/addon-jest.testresults.json b/examples/official-storybook/stories/addon-jest.testresults.json
index 3747c382125..a65ffeb6232 100644
--- a/examples/official-storybook/stories/addon-jest.testresults.json
+++ b/examples/official-storybook/stories/addon-jest.testresults.json
@@ -1 +1 @@
-{"numFailedTestSuites":1,"numFailedTests":4,"numPassedTestSuites":0,"numPassedTests":3,"numPendingTestSuites":0,"numPendingTests":0,"numRuntimeErrorTestSuites":0,"numTotalTestSuites":1,"numTotalTests":7,"snapshot":{"added":0,"didUpdate":false,"failure":false,"filesAdded":0,"filesRemoved":0,"filesUnmatched":0,"filesUpdated":0,"matched":0,"total":0,"unchecked":0,"unmatched":0,"updated":0},"startTime":1510879394442,"success":false,"testResults":[{"assertionResults":[{"ancestorTitles":[],"failureMessages":[],"fullName":"true should be true","status":"passed","title":"true should be true"},{"ancestorTitles":["In a describe: "],"failureMessages":[],"fullName":"In a describe:  true should still be true","status":"passed","title":"true should still be true"},{"ancestorTitles":["In a describe: "],"failureMessages":[],"fullName":"In a describe:  a list should contain 3 items","status":"passed","title":"a list should contain 3 items"},{"ancestorTitles":["In a describe: "],"failureMessages":["Error: \u001b[2mexpect(\u001b[22m\u001b[31mreceived\u001b[39m\u001b[2m).toEqual(\u001b[22m\u001b[32mexpected\u001b[39m\u001b[2m)\u001b[22m\n\nExpected value to equal:\n  \u001b[32m\"everything is awesome\"\u001b[39m\nReceived:\n  \u001b[31m\"everything is all right\"\u001b[39m\n    at Object.<anonymous> (/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/addon-jest.test.js:15:39)\n    at Object.asyncFn (/Users/dev/Projects/GitHub/storybook/core/node_modules/jest-config/node_modules/jest-jasmine2/build/jasmine_async.js:124:345)\n    at resolve (/Users/dev/Projects/GitHub/storybook/core/node_modules/jest-config/node_modules/jest-jasmine2/build/queue_runner.js:46:12)\n    at new Promise (<anonymous>)\n    at mapper (/Users/dev/Projects/GitHub/storybook/core/node_modules/jest-config/node_modules/jest-jasmine2/build/queue_runner.js:34:499)\n    at promise.then (/Users/dev/Projects/GitHub/storybook/core/node_modules/jest-config/node_modules/jest-jasmine2/build/queue_runner.js:74:39)\n    at <anonymous>\n    at process._tickCallback (internal/process/next_tick.js:188:7)"],"fullName":"In a describe:  everything is awesome","status":"failed","title":"everything is awesome"},{"ancestorTitles":["A bunch of failing tests: "],"failureMessages":["Error: \u001b[2mexpect(\u001b[22m\u001b[31mreceived\u001b[39m\u001b[2m).toBe(\u001b[22m\u001b[32mexpected\u001b[39m\u001b[2m)\u001b[22m\n\nExpected value to be (using ===):\n  \u001b[32mfalse\u001b[39m\nReceived:\n  \u001b[31mtrue\u001b[39m\n    at Object.<anonymous> (/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/addon-jest.test.js:21:18)\n    at Object.asyncFn (/Users/dev/Projects/GitHub/storybook/core/node_modules/jest-config/node_modules/jest-jasmine2/build/jasmine_async.js:124:345)\n    at resolve (/Users/dev/Projects/GitHub/storybook/core/node_modules/jest-config/node_modules/jest-jasmine2/build/queue_runner.js:46:12)\n    at new Promise (<anonymous>)\n    at mapper (/Users/dev/Projects/GitHub/storybook/core/node_modules/jest-config/node_modules/jest-jasmine2/build/queue_runner.js:34:499)\n    at promise.then (/Users/dev/Projects/GitHub/storybook/core/node_modules/jest-config/node_modules/jest-jasmine2/build/queue_runner.js:74:39)\n    at <anonymous>\n    at process._tickCallback (internal/process/next_tick.js:188:7)"],"fullName":"A bunch of failing tests:  true should still be true","status":"failed","title":"true should still be true"},{"ancestorTitles":["A bunch of failing tests: "],"failureMessages":["Error: \u001b[2mexpect(\u001b[22m\u001b[31marray\u001b[39m\u001b[2m).toContain(\u001b[22m\u001b[32mvalue\u001b[39m\u001b[2m)\u001b[22m\n\nExpected array:\n  \u001b[31m[\"a\", \"b\", \"3\"]\u001b[39m\nTo contain value:\n  \u001b[32m301\u001b[39m\n    at Object.<anonymous> (/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/addon-jest.test.js:25:29)\n    at Object.asyncFn (/Users/dev/Projects/GitHub/storybook/core/node_modules/jest-config/node_modules/jest-jasmine2/build/jasmine_async.js:124:345)\n    at resolve (/Users/dev/Projects/GitHub/storybook/core/node_modules/jest-config/node_modules/jest-jasmine2/build/queue_runner.js:46:12)\n    at new Promise (<anonymous>)\n    at mapper (/Users/dev/Projects/GitHub/storybook/core/node_modules/jest-config/node_modules/jest-jasmine2/build/queue_runner.js:34:499)\n    at promise.then (/Users/dev/Projects/GitHub/storybook/core/node_modules/jest-config/node_modules/jest-jasmine2/build/queue_runner.js:74:39)\n    at <anonymous>\n    at process._tickCallback (internal/process/next_tick.js:188:7)"],"fullName":"A bunch of failing tests:  a list should contain 3 items","status":"failed","title":"a list should contain 3 items"},{"ancestorTitles":["A bunch of failing tests: "],"failureMessages":["Error: \u001b[2mexpect(\u001b[22m\u001b[31mfunction\u001b[39m\u001b[2m).toThrow(\u001b[22m\u001b[32mundefined\u001b[39m\u001b[2m)\u001b[22m\n\nExpected the function to throw an error.\nBut it didn't throw anything.\n    at Object.<anonymous> (/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/addon-jest.test.js:29:28)\n    at Object.asyncFn (/Users/dev/Projects/GitHub/storybook/core/node_modules/jest-config/node_modules/jest-jasmine2/build/jasmine_async.js:124:345)\n    at resolve (/Users/dev/Projects/GitHub/storybook/core/node_modules/jest-config/node_modules/jest-jasmine2/build/queue_runner.js:46:12)\n    at new Promise (<anonymous>)\n    at mapper (/Users/dev/Projects/GitHub/storybook/core/node_modules/jest-config/node_modules/jest-jasmine2/build/queue_runner.js:34:499)\n    at promise.then (/Users/dev/Projects/GitHub/storybook/core/node_modules/jest-config/node_modules/jest-jasmine2/build/queue_runner.js:74:39)\n    at <anonymous>\n    at process._tickCallback (internal/process/next_tick.js:188:7)"],"fullName":"A bunch of failing tests:  should work","status":"failed","title":"should work"}],"endTime":1510879395550,"message":"\u001b[1m\u001b[31m  \u001b[1m● \u001b[1mIn a describe:  › everything is awesome\u001b[39m\u001b[22m\n\n    \u001b[2mexpect(\u001b[22m\u001b[31mreceived\u001b[39m\u001b[2m).toEqual(\u001b[22m\u001b[32mexpected\u001b[39m\u001b[2m)\u001b[22m\n    \n    Expected value to equal:\n      \u001b[32m\"everything is awesome\"\u001b[39m\n    Received:\n      \u001b[31m\"everything is all right\"\u001b[39m\n\u001b[2m      \u001b[22m\n\u001b[2m      \u001b[2mat Object.<anonymous> (\u001b[2m\u001b[0m\u001b[36msrc/stories/addon-jest.test.js\u001b[39m\u001b[0m\u001b[2m:15:39)\u001b[2m\u001b[22m\n\u001b[2m          at new Promise (<anonymous>)\u001b[22m\n\u001b[2m          at <anonymous>\u001b[22m\n\u001b[2m      \u001b[2mat process._tickCallback (\u001b[2m\u001b[0m\u001b[36minternal/process/next_tick.js\u001b[39m\u001b[0m\u001b[2m:188:7)\u001b[2m\u001b[22m\n\n\u001b[1m\u001b[31m  \u001b[1m● \u001b[1mA bunch of failing tests:  › true should still be true\u001b[39m\u001b[22m\n\n    \u001b[2mexpect(\u001b[22m\u001b[31mreceived\u001b[39m\u001b[2m).toBe(\u001b[22m\u001b[32mexpected\u001b[39m\u001b[2m)\u001b[22m\n    \n    Expected value to be (using ===):\n      \u001b[32mfalse\u001b[39m\n    Received:\n      \u001b[31mtrue\u001b[39m\n\u001b[2m      \u001b[22m\n\u001b[2m      \u001b[2mat Object.<anonymous> (\u001b[2m\u001b[0m\u001b[36msrc/stories/addon-jest.test.js\u001b[39m\u001b[0m\u001b[2m:21:18)\u001b[2m\u001b[22m\n\u001b[2m          at new Promise (<anonymous>)\u001b[22m\n\u001b[2m          at <anonymous>\u001b[22m\n\u001b[2m      \u001b[2mat process._tickCallback (\u001b[2m\u001b[0m\u001b[36minternal/process/next_tick.js\u001b[39m\u001b[0m\u001b[2m:188:7)\u001b[2m\u001b[22m\n\n\u001b[1m\u001b[31m  \u001b[1m● \u001b[1mA bunch of failing tests:  › a list should contain 3 items\u001b[39m\u001b[22m\n\n    \u001b[2mexpect(\u001b[22m\u001b[31marray\u001b[39m\u001b[2m).toContain(\u001b[22m\u001b[32mvalue\u001b[39m\u001b[2m)\u001b[22m\n    \n    Expected array:\n      \u001b[31m[\"a\", \"b\", \"3\"]\u001b[39m\n    To contain value:\n      \u001b[32m301\u001b[39m\n\u001b[2m      \u001b[22m\n\u001b[2m      \u001b[2mat Object.<anonymous> (\u001b[2m\u001b[0m\u001b[36msrc/stories/addon-jest.test.js\u001b[39m\u001b[0m\u001b[2m:25:29)\u001b[2m\u001b[22m\n\u001b[2m          at new Promise (<anonymous>)\u001b[22m\n\u001b[2m          at <anonymous>\u001b[22m\n\u001b[2m      \u001b[2mat process._tickCallback (\u001b[2m\u001b[0m\u001b[36minternal/process/next_tick.js\u001b[39m\u001b[0m\u001b[2m:188:7)\u001b[2m\u001b[22m\n\n\u001b[1m\u001b[31m  \u001b[1m● \u001b[1mA bunch of failing tests:  › should work\u001b[39m\u001b[22m\n\n    \u001b[2mexpect(\u001b[22m\u001b[31mfunction\u001b[39m\u001b[2m).toThrow(\u001b[22m\u001b[32mundefined\u001b[39m\u001b[2m)\u001b[22m\n    \n    Expected the function to throw an error.\n    But it didn't throw anything.\n\u001b[2m      \u001b[22m\n\u001b[2m      \u001b[2mat Object.<anonymous> (\u001b[2m\u001b[0m\u001b[36msrc/stories/addon-jest.test.js\u001b[39m\u001b[0m\u001b[2m:29:28)\u001b[2m\u001b[22m\n\u001b[2m          at new Promise (<anonymous>)\u001b[22m\n\u001b[2m          at <anonymous>\u001b[22m\n\u001b[2m      \u001b[2mat process._tickCallback (\u001b[2m\u001b[0m\u001b[36minternal/process/next_tick.js\u001b[39m\u001b[0m\u001b[2m:188:7)\u001b[2m\u001b[22m\n","name":"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/addon-jest.test.js","startTime":1510879395035,"status":"failed","summary":""}],"wasInterrupted":false,"coverageMap":{"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/addon-jest.stories.js":{"path":"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/addon-jest.stories.js","statementMap":{"0":{"start":{"line":1,"column":26},"end":{"line":1,"column":42}},"1":{"start":{"line":1,"column":57},"end":{"line":1,"column":87}},"2":{"start":{"line":2,"column":14},"end":{"line":2,"column":41}},"3":{"start":{"line":4,"column":17},"end":{"line":4,"column":49}},"4":{"start":{"line":5,"column":28},"end":{"line":5,"column":68}},"5":{"start":{"line":5,"column":98},"end":{"line":5,"column":143}},"6":{"start":{"line":5,"column":182},"end":{"line":5,"column":236}},"7":{"start":{"line":7,"column":21},"end":{"line":8,"column":44}},"8":{"start":{"line":11,"column":0},"end":{"line":15,"column":61}},"9":{"start":{"line":13,"column":30},"end":{"line":15,"column":58}}},"fnMap":{"0":{"name":"_interopRequireDefault","decl":{"start":{"line":5,"column":153},"end":{"line":5,"column":175}},"loc":{"start":{"line":5,"column":181},"end":{"line":5,"column":237}},"line":5},"1":{"name":"(anonymous_1)","decl":{"start":{"line":13,"column":17},"end":{"line":13,"column":18}},"loc":{"start":{"line":13,"column":29},"end":{"line":15,"column":59}},"line":13}},"branchMap":{"0":{"loc":{"start":{"line":5,"column":189},"end":{"line":5,"column":235}},"type":"cond-expr","locations":[{"start":{"line":5,"column":213},"end":{"line":5,"column":216}},{"start":{"line":5,"column":219},"end":{"line":5,"column":235}}],"line":5},"1":{"loc":{"start":{"line":5,"column":189},"end":{"line":5,"column":210}},"type":"binary-expr","locations":[{"start":{"line":5,"column":189},"end":{"line":5,"column":192}},{"start":{"line":5,"column":196},"end":{"line":5,"column":210}}],"line":5}},"s":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0},"f":{"0":0,"1":0},"b":{"0":[0,0],"1":[0,0]}},"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/welcome.js":{"path":"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/welcome.js","statementMap":{"0":{"start":{"line":1,"column":26},"end":{"line":1,"column":42}},"1":{"start":{"line":1,"column":57},"end":{"line":1,"column":87}},"2":{"start":{"line":2,"column":12},"end":{"line":2,"column":44}},"3":{"start":{"line":3,"column":14},"end":{"line":3,"column":41}},"4":{"start":{"line":4,"column":18},"end":{"line":4,"column":51}},"5":{"start":{"line":4,"column":90},"end":{"line":4,"column":144}},"6":{"start":{"line":6,"column":0},"end":{"line":6,"column":178}},"7":{"start":{"line":6,"column":75},"end":{"line":6,"column":175}}},"fnMap":{"0":{"name":"_interopRequireDefault","decl":{"start":{"line":4,"column":61},"end":{"line":4,"column":83}},"loc":{"start":{"line":4,"column":89},"end":{"line":4,"column":145}},"line":4},"1":{"name":"(anonymous_1)","decl":{"start":{"line":6,"column":62},"end":{"line":6,"column":63}},"loc":{"start":{"line":6,"column":74},"end":{"line":6,"column":176}},"line":6}},"branchMap":{"0":{"loc":{"start":{"line":4,"column":97},"end":{"line":4,"column":143}},"type":"cond-expr","locations":[{"start":{"line":4,"column":121},"end":{"line":4,"column":124}},{"start":{"line":4,"column":127},"end":{"line":4,"column":143}}],"line":4},"1":{"loc":{"start":{"line":4,"column":97},"end":{"line":4,"column":118}},"type":"binary-expr","locations":[{"start":{"line":4,"column":97},"end":{"line":4,"column":100}},{"start":{"line":4,"column":104},"end":{"line":4,"column":118}}],"line":4}},"s":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0},"f":{"0":0,"1":0},"b":{"0":[0,0],"1":[0,0]}},"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/components/SimpleList.js":{"path":"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/components/SimpleList.js","statementMap":{"0":{"start":{"line":1,"column":13},"end":{"line":1,"column":75}},"1":{"start":{"line":1,"column":88},"end":{"line":1,"column":104}},"2":{"start":{"line":1,"column":119},"end":{"line":1,"column":149}},"3":{"start":{"line":2,"column":17},"end":{"line":2,"column":38}},"4":{"start":{"line":2,"column":57},"end":{"line":2,"column":91}},"5":{"start":{"line":2,"column":130},"end":{"line":2,"column":184}},"6":{"start":{"line":4,"column":11},"end":{"line":6,"column":103}},"7":{"start":{"line":4,"column":44},"end":{"line":4,"column":54}},"8":{"start":{"line":4,"column":55},"end":{"line":6,"column":102}},"9":{"start":{"line":6,"column":33},"end":{"line":6,"column":97}},"10":{"start":{"line":10,"column":0},"end":{"line":11,"column":78}},"11":{"start":{"line":11,"column":78},"end":{"line":14,"column":5}}},"fnMap":{"0":{"name":"_interopRequireDefault","decl":{"start":{"line":2,"column":101},"end":{"line":2,"column":123}},"loc":{"start":{"line":2,"column":129},"end":{"line":2,"column":185}},"line":2},"1":{"name":"List","decl":{"start":{"line":4,"column":20},"end":{"line":4,"column":24}},"loc":{"start":{"line":4,"column":31},"end":{"line":6,"column":103}},"line":4},"2":{"name":"(anonymous_2)","decl":{"start":{"line":6,"column":16},"end":{"line":6,"column":17}},"loc":{"start":{"line":6,"column":32},"end":{"line":6,"column":98}},"line":6}},"branchMap":{"0":{"loc":{"start":{"line":2,"column":137},"end":{"line":2,"column":183}},"type":"cond-expr","locations":[{"start":{"line":2,"column":161},"end":{"line":2,"column":164}},{"start":{"line":2,"column":167},"end":{"line":2,"column":183}}],"line":2},"1":{"loc":{"start":{"line":2,"column":137},"end":{"line":2,"column":158}},"type":"binary-expr","locations":[{"start":{"line":2,"column":137},"end":{"line":2,"column":140}},{"start":{"line":2,"column":144},"end":{"line":2,"column":158}}],"line":2}},"s":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0,"11":0},"f":{"0":0,"1":0,"2":0},"b":{"0":[0,0],"1":[0,0]}},"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/components/BaseButton.js":{"path":"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/components/BaseButton.js","statementMap":{"0":{"start":{"line":1,"column":13},"end":{"line":1,"column":75}},"1":{"start":{"line":1,"column":88},"end":{"line":1,"column":104}},"2":{"start":{"line":1,"column":119},"end":{"line":1,"column":149}},"3":{"start":{"line":2,"column":17},"end":{"line":2,"column":38}},"4":{"start":{"line":2,"column":57},"end":{"line":2,"column":91}},"5":{"start":{"line":2,"column":130},"end":{"line":2,"column":184}},"6":{"start":{"line":5,"column":17},"end":{"line":7,"column":15}},"7":{"start":{"line":5,"column":59},"end":{"line":5,"column":72}},"8":{"start":{"line":5,"column":81},"end":{"line":5,"column":91}},"9":{"start":{"line":5,"column":102},"end":{"line":5,"column":114}},"10":{"start":{"line":5,"column":123},"end":{"line":5,"column":133}},"11":{"start":{"line":5,"column":134},"end":{"line":7,"column":14}},"12":{"start":{"line":11,"column":0},"end":{"line":14,"column":14}},"13":{"start":{"line":17,"column":0},"end":{"line":25,"column":41}},"14":{"start":{"line":25,"column":41},"end":{"line":28,"column":11}}},"fnMap":{"0":{"name":"_interopRequireDefault","decl":{"start":{"line":2,"column":101},"end":{"line":2,"column":123}},"loc":{"start":{"line":2,"column":129},"end":{"line":2,"column":185}},"line":2},"1":{"name":"BaseButton","decl":{"start":{"line":5,"column":26},"end":{"line":5,"column":36}},"loc":{"start":{"line":5,"column":43},"end":{"line":7,"column":15}},"line":5},"2":{"name":"onClick","decl":{"start":{"line":13,"column":20},"end":{"line":13,"column":27}},"loc":{"start":{"line":13,"column":30},"end":{"line":13,"column":32}},"line":13}},"branchMap":{"0":{"loc":{"start":{"line":2,"column":137},"end":{"line":2,"column":183}},"type":"cond-expr","locations":[{"start":{"line":2,"column":161},"end":{"line":2,"column":164}},{"start":{"line":2,"column":167},"end":{"line":2,"column":183}}],"line":2},"1":{"loc":{"start":{"line":2,"column":137},"end":{"line":2,"column":158}},"type":"binary-expr","locations":[{"start":{"line":2,"column":137},"end":{"line":2,"column":140}},{"start":{"line":2,"column":144},"end":{"line":2,"column":158}}],"line":2}},"s":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0,"11":0,"12":0,"13":0,"14":0},"f":{"0":0,"1":0,"2":0},"b":{"0":[0,0],"1":[0,0]}},"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/storybook-components.stories.js":{"path":"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/storybook-components.stories.js","statementMap":{"0":{"start":{"line":1,"column":26},"end":{"line":1,"column":42}},"1":{"start":{"line":1,"column":57},"end":{"line":1,"column":87}},"2":{"start":{"line":2,"column":14},"end":{"line":2,"column":31}},"3":{"start":{"line":3,"column":17},"end":{"line":3,"column":37}},"4":{"start":{"line":5,"column":14},"end":{"line":5,"column":41}},"5":{"start":{"line":6,"column":20},"end":{"line":6,"column":55}},"6":{"start":{"line":7,"column":18},"end":{"line":7,"column":51}},"7":{"start":{"line":9,"column":18},"end":{"line":9,"column":50}},"8":{"start":{"line":9,"column":89},"end":{"line":9,"column":143}},"9":{"start":{"line":11,"column":0},"end":{"line":11,"column":50}},"10":{"start":{"line":13,"column":0},"end":{"line":23,"column":62}},"11":{"start":{"line":14,"column":32},"end":{"line":15,"column":218}},"12":{"start":{"line":20,"column":30},"end":{"line":23,"column":59}}},"fnMap":{"0":{"name":"_interopRequireDefault","decl":{"start":{"line":9,"column":60},"end":{"line":9,"column":82}},"loc":{"start":{"line":9,"column":88},"end":{"line":9,"column":144}},"line":9},"1":{"name":"(anonymous_1)","decl":{"start":{"line":14,"column":19},"end":{"line":14,"column":20}},"loc":{"start":{"line":14,"column":31},"end":{"line":15,"column":219}},"line":14},"2":{"name":"(anonymous_2)","decl":{"start":{"line":20,"column":17},"end":{"line":20,"column":18}},"loc":{"start":{"line":20,"column":29},"end":{"line":23,"column":60}},"line":20}},"branchMap":{"0":{"loc":{"start":{"line":9,"column":96},"end":{"line":9,"column":142}},"type":"cond-expr","locations":[{"start":{"line":9,"column":120},"end":{"line":9,"column":123}},{"start":{"line":9,"column":126},"end":{"line":9,"column":142}}],"line":9},"1":{"loc":{"start":{"line":9,"column":96},"end":{"line":9,"column":117}},"type":"binary-expr","locations":[{"start":{"line":9,"column":96},"end":{"line":9,"column":99}},{"start":{"line":9,"column":103},"end":{"line":9,"column":117}}],"line":9}},"s":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0,"11":0,"12":0},"f":{"0":0,"1":0,"2":0},"b":{"0":[0,0],"1":[0,0]}},"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/components/FlowTypeButton.js":{"path":"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/components/FlowTypeButton.js","statementMap":{"0":{"start":{"line":1,"column":13},"end":{"line":1,"column":75}},"1":{"start":{"line":2,"column":13},"end":{"line":2,"column":29}},"2":{"start":{"line":2,"column":44},"end":{"line":2,"column":74}},"3":{"start":{"line":2,"column":113},"end":{"line":2,"column":167}},"4":{"start":{"line":14,"column":21},"end":{"line":16,"column":15}},"5":{"start":{"line":14,"column":64},"end":{"line":14,"column":74}},"6":{"start":{"line":14,"column":85},"end":{"line":14,"column":97}},"7":{"start":{"line":14,"column":109},"end":{"line":14,"column":122}},"8":{"start":{"line":14,"column":123},"end":{"line":16,"column":14}},"9":{"start":{"line":20,"column":0},"end":{"line":22,"column":35}},"10":{"start":{"line":22,"column":35},"end":{"line":25,"column":15}}},"fnMap":{"0":{"name":"_interopRequireDefault","decl":{"start":{"line":2,"column":84},"end":{"line":2,"column":106}},"loc":{"start":{"line":2,"column":112},"end":{"line":2,"column":168}},"line":2},"1":{"name":"FlowTypeButton","decl":{"start":{"line":14,"column":30},"end":{"line":14,"column":44}},"loc":{"start":{"line":14,"column":51},"end":{"line":16,"column":15}},"line":14},"2":{"name":"onClick","decl":{"start":{"line":22,"column":20},"end":{"line":22,"column":27}},"loc":{"start":{"line":22,"column":30},"end":{"line":22,"column":32}},"line":22}},"branchMap":{"0":{"loc":{"start":{"line":2,"column":120},"end":{"line":2,"column":166}},"type":"cond-expr","locations":[{"start":{"line":2,"column":144},"end":{"line":2,"column":147}},{"start":{"line":2,"column":150},"end":{"line":2,"column":166}}],"line":2},"1":{"loc":{"start":{"line":2,"column":120},"end":{"line":2,"column":141}},"type":"binary-expr","locations":[{"start":{"line":2,"column":120},"end":{"line":2,"column":123}},{"start":{"line":2,"column":127},"end":{"line":2,"column":141}}],"line":2}},"s":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0},"f":{"0":0,"1":0,"2":0},"b":{"0":[0,0],"1":[0,0]}},"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/Container.js":{"path":"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/Container.js","statementMap":{"0":{"start":{"line":1,"column":13},"end":{"line":1,"column":75}},"1":{"start":{"line":1,"column":88},"end":{"line":1,"column":104}},"2":{"start":{"line":1,"column":119},"end":{"line":1,"column":149}},"3":{"start":{"line":2,"column":17},"end":{"line":2,"column":38}},"4":{"start":{"line":2,"column":57},"end":{"line":2,"column":91}},"5":{"start":{"line":2,"column":130},"end":{"line":2,"column":184}},"6":{"start":{"line":4,"column":16},"end":{"line":8,"column":80}},"7":{"start":{"line":4,"column":57},"end":{"line":4,"column":70}},"8":{"start":{"line":4,"column":79},"end":{"line":4,"column":89}},"9":{"start":{"line":4,"column":96},"end":{"line":4,"column":104}},"10":{"start":{"line":4,"column":117},"end":{"line":4,"column":131}},"11":{"start":{"line":4,"column":132},"end":{"line":8,"column":79}},"12":{"start":{"line":12,"column":0},"end":{"line":16,"column":38}},"13":{"start":{"line":18,"column":0},"end":{"line":21,"column":37}},"14":{"start":{"line":21,"column":37},"end":{"line":24,"column":10}}},"fnMap":{"0":{"name":"_interopRequireDefault","decl":{"start":{"line":2,"column":101},"end":{"line":2,"column":123}},"loc":{"start":{"line":2,"column":129},"end":{"line":2,"column":185}},"line":2},"1":{"name":"Container","decl":{"start":{"line":4,"column":25},"end":{"line":4,"column":34}},"loc":{"start":{"line":4,"column":41},"end":{"line":8,"column":80}},"line":4}},"branchMap":{"0":{"loc":{"start":{"line":2,"column":137},"end":{"line":2,"column":183}},"type":"cond-expr","locations":[{"start":{"line":2,"column":161},"end":{"line":2,"column":164}},{"start":{"line":2,"column":167},"end":{"line":2,"column":183}}],"line":2},"1":{"loc":{"start":{"line":2,"column":137},"end":{"line":2,"column":158}},"type":"binary-expr","locations":[{"start":{"line":2,"column":137},"end":{"line":2,"column":140}},{"start":{"line":2,"column":144},"end":{"line":2,"column":158}}],"line":2},"2":{"loc":{"start":{"line":7,"column":6},"end":{"line":7,"column":28}},"type":"cond-expr","locations":[{"start":{"line":7,"column":18},"end":{"line":7,"column":23}},{"start":{"line":7,"column":26},"end":{"line":7,"column":28}}],"line":7},"3":{"loc":{"start":{"line":8,"column":6},"end":{"line":8,"column":76}},"type":"cond-expr","locations":[{"start":{"line":8,"column":12},"end":{"line":8,"column":69}},{"start":{"line":8,"column":72},"end":{"line":8,"column":76}}],"line":8}},"s":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0,"11":0,"12":0,"13":0,"14":0},"f":{"0":0,"1":0},"b":{"0":[0,0],"1":[0,0],"2":[0,0],"3":[0,0]}},"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/components/DocgenButton.js":{"path":"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/components/DocgenButton.js","statementMap":{"0":{"start":{"line":1,"column":13},"end":{"line":1,"column":75}},"1":{"start":{"line":1,"column":88},"end":{"line":1,"column":104}},"2":{"start":{"line":1,"column":119},"end":{"line":1,"column":149}},"3":{"start":{"line":2,"column":17},"end":{"line":2,"column":38}},"4":{"start":{"line":2,"column":57},"end":{"line":2,"column":91}},"5":{"start":{"line":2,"column":130},"end":{"line":2,"column":184}},"6":{"start":{"line":5,"column":19},"end":{"line":7,"column":15}},"7":{"start":{"line":5,"column":63},"end":{"line":5,"column":76}},"8":{"start":{"line":5,"column":85},"end":{"line":5,"column":95}},"9":{"start":{"line":5,"column":106},"end":{"line":5,"column":118}},"10":{"start":{"line":5,"column":119},"end":{"line":7,"column":14}},"11":{"start":{"line":11,"column":0},"end":{"line":13,"column":35}},"12":{"start":{"line":18,"column":14},"end":{"line":18,"column":16}},"13":{"start":{"line":20,"column":0},"end":{"line":69,"column":112}},"14":{"start":{"line":69,"column":112},"end":{"line":72,"column":13}}},"fnMap":{"0":{"name":"_interopRequireDefault","decl":{"start":{"line":2,"column":101},"end":{"line":2,"column":123}},"loc":{"start":{"line":2,"column":129},"end":{"line":2,"column":185}},"line":2},"1":{"name":"DocgenButton","decl":{"start":{"line":5,"column":28},"end":{"line":5,"column":40}},"loc":{"start":{"line":5,"column":47},"end":{"line":7,"column":15}},"line":5},"2":{"name":"onClick","decl":{"start":{"line":13,"column":20},"end":{"line":13,"column":27}},"loc":{"start":{"line":13,"column":30},"end":{"line":13,"column":32}},"line":13}},"branchMap":{"0":{"loc":{"start":{"line":2,"column":137},"end":{"line":2,"column":183}},"type":"cond-expr","locations":[{"start":{"line":2,"column":161},"end":{"line":2,"column":164}},{"start":{"line":2,"column":167},"end":{"line":2,"column":183}}],"line":2},"1":{"loc":{"start":{"line":2,"column":137},"end":{"line":2,"column":158}},"type":"binary-expr","locations":[{"start":{"line":2,"column":137},"end":{"line":2,"column":140}},{"start":{"line":2,"column":144},"end":{"line":2,"column":158}}],"line":2}},"s":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0,"11":0,"12":0,"13":0,"14":0},"f":{"0":0,"1":0,"2":0},"b":{"0":[0,0],"1":[0,0]}},"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/addon-notes.stories.js":{"path":"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/addon-notes.stories.js","statementMap":{"0":{"start":{"line":1,"column":26},"end":{"line":1,"column":42}},"1":{"start":{"line":1,"column":57},"end":{"line":1,"column":87}},"2":{"start":{"line":2,"column":14},"end":{"line":2,"column":41}},"3":{"start":{"line":4,"column":18},"end":{"line":4,"column":51}},"4":{"start":{"line":5,"column":20},"end":{"line":5,"column":55}},"5":{"start":{"line":6,"column":18},"end":{"line":6,"column":53}},"6":{"start":{"line":6,"column":73},"end":{"line":6,"column":108}},"7":{"start":{"line":6,"column":147},"end":{"line":6,"column":201}},"8":{"start":{"line":8,"column":0},"end":{"line":17,"column":176}},"9":{"start":{"line":13,"column":13},"end":{"line":13,"column":140}},"10":{"start":{"line":15,"column":41},"end":{"line":17,"column":173}}},"fnMap":{"0":{"name":"_interopRequireDefault","decl":{"start":{"line":6,"column":118},"end":{"line":6,"column":140}},"loc":{"start":{"line":6,"column":146},"end":{"line":6,"column":202}},"line":6},"1":{"name":"(anonymous_1)","decl":{"start":{"line":13,"column":0},"end":{"line":13,"column":1}},"loc":{"start":{"line":13,"column":12},"end":{"line":13,"column":141}},"line":13},"2":{"name":"(anonymous_2)","decl":{"start":{"line":15,"column":28},"end":{"line":15,"column":29}},"loc":{"start":{"line":15,"column":40},"end":{"line":17,"column":174}},"line":15}},"branchMap":{"0":{"loc":{"start":{"line":6,"column":154},"end":{"line":6,"column":200}},"type":"cond-expr","locations":[{"start":{"line":6,"column":178},"end":{"line":6,"column":181}},{"start":{"line":6,"column":184},"end":{"line":6,"column":200}}],"line":6},"1":{"loc":{"start":{"line":6,"column":154},"end":{"line":6,"column":175}},"type":"binary-expr","locations":[{"start":{"line":6,"column":154},"end":{"line":6,"column":157}},{"start":{"line":6,"column":161},"end":{"line":6,"column":175}}],"line":6}},"s":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0},"f":{"0":0,"1":0,"2":0},"b":{"0":[0,0],"1":[0,0]}},"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/addon-backgrounds.stories.js":{"path":"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/addon-backgrounds.stories.js","statementMap":{"0":{"start":{"line":1,"column":26},"end":{"line":1,"column":42}},"1":{"start":{"line":1,"column":57},"end":{"line":1,"column":87}},"2":{"start":{"line":2,"column":14},"end":{"line":2,"column":41}},"3":{"start":{"line":4,"column":24},"end":{"line":4,"column":63}},"4":{"start":{"line":4,"column":89},"end":{"line":4,"column":130}},"5":{"start":{"line":5,"column":18},"end":{"line":5,"column":53}},"6":{"start":{"line":5,"column":73},"end":{"line":5,"column":108}},"7":{"start":{"line":5,"column":147},"end":{"line":5,"column":201}},"8":{"start":{"line":7,"column":0},"end":{"line":17,"column":118}},"9":{"start":{"line":14,"column":28},"end":{"line":15,"column":127}},"10":{"start":{"line":17,"column":28},"end":{"line":17,"column":115}}},"fnMap":{"0":{"name":"_interopRequireDefault","decl":{"start":{"line":5,"column":118},"end":{"line":5,"column":140}},"loc":{"start":{"line":5,"column":146},"end":{"line":5,"column":202}},"line":5},"1":{"name":"(anonymous_1)","decl":{"start":{"line":14,"column":15},"end":{"line":14,"column":16}},"loc":{"start":{"line":14,"column":27},"end":{"line":15,"column":128}},"line":14},"2":{"name":"(anonymous_2)","decl":{"start":{"line":17,"column":15},"end":{"line":17,"column":16}},"loc":{"start":{"line":17,"column":27},"end":{"line":17,"column":116}},"line":17}},"branchMap":{"0":{"loc":{"start":{"line":5,"column":154},"end":{"line":5,"column":200}},"type":"cond-expr","locations":[{"start":{"line":5,"column":178},"end":{"line":5,"column":181}},{"start":{"line":5,"column":184},"end":{"line":5,"column":200}}],"line":5},"1":{"loc":{"start":{"line":5,"column":154},"end":{"line":5,"column":175}},"type":"binary-expr","locations":[{"start":{"line":5,"column":154},"end":{"line":5,"column":157}},{"start":{"line":5,"column":161},"end":{"line":5,"column":175}}],"line":5}},"s":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0},"f":{"0":0,"1":0,"2":0},"b":{"0":[0,0],"1":[0,0]}},"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/App.js":{"path":"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/App.js","statementMap":{"0":{"start":{"line":1,"column":13},"end":{"line":1,"column":75}},"1":{"start":{"line":1,"column":88},"end":{"line":1,"column":104}},"2":{"start":{"line":1,"column":119},"end":{"line":1,"column":149}},"3":{"start":{"line":2,"column":12},"end":{"line":2,"column":33}},"4":{"start":{"line":2,"column":47},"end":{"line":2,"column":76}},"5":{"start":{"line":3,"column":0},"end":{"line":3,"column":21}},"6":{"start":{"line":3,"column":59},"end":{"line":3,"column":113}},"7":{"start":{"line":5,"column":10},"end":{"line":12,"column":94}},"8":{"start":{"line":5,"column":26},"end":{"line":12,"column":93}},"9":{"start":{"line":12,"column":95},"end":{"line":17,"column":4}}},"fnMap":{"0":{"name":"_interopRequireDefault","decl":{"start":{"line":3,"column":30},"end":{"line":3,"column":52}},"loc":{"start":{"line":3,"column":58},"end":{"line":3,"column":114}},"line":3},"1":{"name":"App","decl":{"start":{"line":5,"column":19},"end":{"line":5,"column":22}},"loc":{"start":{"line":5,"column":25},"end":{"line":12,"column":94}},"line":5}},"branchMap":{"0":{"loc":{"start":{"line":3,"column":66},"end":{"line":3,"column":112}},"type":"cond-expr","locations":[{"start":{"line":3,"column":90},"end":{"line":3,"column":93}},{"start":{"line":3,"column":96},"end":{"line":3,"column":112}}],"line":3},"1":{"loc":{"start":{"line":3,"column":66},"end":{"line":3,"column":87}},"type":"binary-expr","locations":[{"start":{"line":3,"column":66},"end":{"line":3,"column":69}},{"start":{"line":3,"column":73},"end":{"line":3,"column":87}}],"line":3}},"s":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0},"f":{"0":0,"1":0},"b":{"0":[0,0],"1":[0,0]}},"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/addon-a11y.stories.js":{"path":"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/addon-a11y.stories.js","statementMap":{"0":{"start":{"line":1,"column":26},"end":{"line":1,"column":42}},"1":{"start":{"line":1,"column":57},"end":{"line":1,"column":87}},"2":{"start":{"line":2,"column":14},"end":{"line":2,"column":41}},"3":{"start":{"line":4,"column":17},"end":{"line":4,"column":49}},"4":{"start":{"line":5,"column":18},"end":{"line":5,"column":53}},"5":{"start":{"line":5,"column":73},"end":{"line":5,"column":108}},"6":{"start":{"line":5,"column":147},"end":{"line":5,"column":201}},"7":{"start":{"line":7,"column":11},"end":{"line":7,"column":35}},"8":{"start":{"line":9,"column":0},"end":{"line":16,"column":130}},"9":{"start":{"line":11,"column":28},"end":{"line":11,"column":102}},"10":{"start":{"line":12,"column":26},"end":{"line":12,"column":102}},"11":{"start":{"line":13,"column":29},"end":{"line":13,"column":121}},"12":{"start":{"line":14,"column":37},"end":{"line":16,"column":127}}},"fnMap":{"0":{"name":"_interopRequireDefault","decl":{"start":{"line":5,"column":118},"end":{"line":5,"column":140}},"loc":{"start":{"line":5,"column":146},"end":{"line":5,"column":202}},"line":5},"1":{"name":"(anonymous_1)","decl":{"start":{"line":11,"column":15},"end":{"line":11,"column":16}},"loc":{"start":{"line":11,"column":27},"end":{"line":11,"column":103}},"line":11},"2":{"name":"(anonymous_2)","decl":{"start":{"line":12,"column":13},"end":{"line":12,"column":14}},"loc":{"start":{"line":12,"column":25},"end":{"line":12,"column":103}},"line":12},"3":{"name":"(anonymous_3)","decl":{"start":{"line":13,"column":16},"end":{"line":13,"column":17}},"loc":{"start":{"line":13,"column":28},"end":{"line":13,"column":122}},"line":13},"4":{"name":"(anonymous_4)","decl":{"start":{"line":14,"column":24},"end":{"line":14,"column":25}},"loc":{"start":{"line":14,"column":36},"end":{"line":16,"column":128}},"line":14}},"branchMap":{"0":{"loc":{"start":{"line":5,"column":154},"end":{"line":5,"column":200}},"type":"cond-expr","locations":[{"start":{"line":5,"column":178},"end":{"line":5,"column":181}},{"start":{"line":5,"column":184},"end":{"line":5,"column":200}}],"line":5},"1":{"loc":{"start":{"line":5,"column":154},"end":{"line":5,"column":175}},"type":"binary-expr","locations":[{"start":{"line":5,"column":154},"end":{"line":5,"column":157}},{"start":{"line":5,"column":161},"end":{"line":5,"column":175}}],"line":5}},"s":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0,"11":0,"12":0},"f":{"0":0,"1":0,"2":0,"3":0,"4":0},"b":{"0":[0,0],"1":[0,0]}},"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/index.stories.js":{"path":"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/index.stories.js","statementMap":{"0":{"start":{"line":1,"column":26},"end":{"line":1,"column":42}},"1":{"start":{"line":1,"column":57},"end":{"line":1,"column":87}},"2":{"start":{"line":2,"column":20},"end":{"line":2,"column":44}},"3":{"start":{"line":2,"column":66},"end":{"line":2,"column":103}},"4":{"start":{"line":4,"column":14},"end":{"line":4,"column":41}},"5":{"start":{"line":5,"column":20},"end":{"line":5,"column":55}},"6":{"start":{"line":6,"column":20},"end":{"line":6,"column":55}},"7":{"start":{"line":7,"column":18},"end":{"line":7,"column":51}},"8":{"start":{"line":8,"column":19},"end":{"line":8,"column":53}},"9":{"start":{"line":8,"column":74},"end":{"line":8,"column":110}},"10":{"start":{"line":9,"column":21},"end":{"line":9,"column":57}},"11":{"start":{"line":9,"column":80},"end":{"line":9,"column":118}},"12":{"start":{"line":10,"column":17},"end":{"line":10,"column":49}},"13":{"start":{"line":11,"column":12},"end":{"line":11,"column":44}},"14":{"start":{"line":13,"column":11},"end":{"line":13,"column":28}},"15":{"start":{"line":13,"column":41},"end":{"line":13,"column":69}},"16":{"start":{"line":14,"column":14},"end":{"line":14,"column":33}},"17":{"start":{"line":14,"column":49},"end":{"line":14,"column":80}},"18":{"start":{"line":15,"column":17},"end":{"line":15,"column":39}},"19":{"start":{"line":15,"column":58},"end":{"line":15,"column":92}},"20":{"start":{"line":15,"column":131},"end":{"line":15,"column":185}},"21":{"start":{"line":17,"column":13},"end":{"line":21,"column":32}},"22":{"start":{"line":24,"column":13},"end":{"line":24,"column":41}},"23":{"start":{"line":25,"column":11},"end":{"line":25,"column":35}},"24":{"start":{"line":27,"column":17},"end":{"line":41,"column":13}},"25":{"start":{"line":27,"column":40},"end":{"line":41,"column":12}},"26":{"start":{"line":45,"column":0},"end":{"line":99,"column":121}},"27":{"start":{"line":46,"column":30},"end":{"line":48,"column":113}},"28":{"start":{"line":52,"column":36},"end":{"line":54,"column":152}},"29":{"start":{"line":58,"column":27},"end":{"line":60,"column":107}},"30":{"start":{"line":64,"column":31},"end":{"line":68,"column":127}},"31":{"start":{"line":76,"column":20},"end":{"line":78,"column":116}},"32":{"start":{"line":86,"column":20},"end":{"line":89,"column":116}},"33":{"start":{"line":96,"column":77},"end":{"line":99,"column":116}},"34":{"start":{"line":105,"column":0},"end":{"line":105,"column":128}},"35":{"start":{"line":105,"column":67},"end":{"line":105,"column":125}},"36":{"start":{"line":107,"column":0},"end":{"line":109,"column":151}},"37":{"start":{"line":109,"column":30},"end":{"line":109,"column":148}},"38":{"start":{"line":111,"column":0},"end":{"line":166,"column":105}},"39":{"start":{"line":112,"column":34},"end":{"line":163,"column":19}},"40":{"start":{"line":166,"column":27},"end":{"line":166,"column":102}}},"fnMap":{"0":{"name":"_interopRequireDefault","decl":{"start":{"line":15,"column":102},"end":{"line":15,"column":124}},"loc":{"start":{"line":15,"column":130},"end":{"line":15,"column":186}},"line":15},"1":{"name":"InfoButton","decl":{"start":{"line":27,"column":26},"end":{"line":27,"column":36}},"loc":{"start":{"line":27,"column":39},"end":{"line":41,"column":13}},"line":27},"2":{"name":"(anonymous_2)","decl":{"start":{"line":46,"column":17},"end":{"line":46,"column":18}},"loc":{"start":{"line":46,"column":29},"end":{"line":48,"column":114}},"line":46},"3":{"name":"(anonymous_3)","decl":{"start":{"line":52,"column":23},"end":{"line":52,"column":24}},"loc":{"start":{"line":52,"column":35},"end":{"line":54,"column":153}},"line":52},"4":{"name":"(anonymous_4)","decl":{"start":{"line":58,"column":14},"end":{"line":58,"column":15}},"loc":{"start":{"line":58,"column":26},"end":{"line":60,"column":108}},"line":58},"5":{"name":"(anonymous_5)","decl":{"start":{"line":64,"column":18},"end":{"line":64,"column":19}},"loc":{"start":{"line":64,"column":30},"end":{"line":68,"column":128}},"line":64},"6":{"name":"(anonymous_6)","decl":{"start":{"line":76,"column":0},"end":{"line":76,"column":1}},"loc":{"start":{"line":76,"column":19},"end":{"line":78,"column":117}},"line":76},"7":{"name":"(anonymous_7)","decl":{"start":{"line":86,"column":0},"end":{"line":86,"column":1}},"loc":{"start":{"line":86,"column":19},"end":{"line":89,"column":117}},"line":86},"8":{"name":"(anonymous_8)","decl":{"start":{"line":96,"column":57},"end":{"line":96,"column":58}},"loc":{"start":{"line":96,"column":76},"end":{"line":99,"column":117}},"line":96},"9":{"name":"(anonymous_9)","decl":{"start":{"line":105,"column":54},"end":{"line":105,"column":55}},"loc":{"start":{"line":105,"column":66},"end":{"line":105,"column":126}},"line":105},"10":{"name":"(anonymous_10)","decl":{"start":{"line":109,"column":17},"end":{"line":109,"column":18}},"loc":{"start":{"line":109,"column":29},"end":{"line":109,"column":149}},"line":109},"11":{"name":"(anonymous_11)","decl":{"start":{"line":112,"column":13},"end":{"line":112,"column":14}},"loc":{"start":{"line":112,"column":33},"end":{"line":163,"column":20}},"line":112},"12":{"name":"(anonymous_12)","decl":{"start":{"line":166,"column":14},"end":{"line":166,"column":15}},"loc":{"start":{"line":166,"column":26},"end":{"line":166,"column":103}},"line":166}},"branchMap":{"0":{"loc":{"start":{"line":15,"column":138},"end":{"line":15,"column":184}},"type":"cond-expr","locations":[{"start":{"line":15,"column":162},"end":{"line":15,"column":165}},{"start":{"line":15,"column":168},"end":{"line":15,"column":184}}],"line":15},"1":{"loc":{"start":{"line":15,"column":138},"end":{"line":15,"column":159}},"type":"binary-expr","locations":[{"start":{"line":15,"column":138},"end":{"line":15,"column":141}},{"start":{"line":15,"column":145},"end":{"line":15,"column":159}}],"line":15}},"s":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0,"11":0,"12":0,"13":0,"14":0,"15":0,"16":0,"17":0,"18":0,"19":0,"20":0,"21":0,"22":0,"23":0,"24":0,"25":0,"26":0,"27":0,"28":0,"29":0,"30":0,"31":0,"32":0,"33":0,"34":0,"35":0,"36":0,"37":0,"38":0,"39":0,"40":0},"f":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0,"11":0,"12":0},"b":{"0":[0,0],"1":[0,0]}},"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/addon-info.stories.js":{"path":"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/addon-info.stories.js","statementMap":{"0":{"start":{"line":1,"column":45},"end":{"line":1,"column":101}},"1":{"start":{"line":1,"column":134},"end":{"line":1,"column":183}},"2":{"start":{"line":1,"column":197},"end":{"line":1,"column":213}},"3":{"start":{"line":1,"column":228},"end":{"line":1,"column":258}},"4":{"start":{"line":2,"column":14},"end":{"line":2,"column":41}},"5":{"start":{"line":3,"column":17},"end":{"line":3,"column":49}},"6":{"start":{"line":4,"column":20},"end":{"line":4,"column":55}},"7":{"start":{"line":6,"column":20},"end":{"line":6,"column":57}},"8":{"start":{"line":6,"column":79},"end":{"line":6,"column":116}},"9":{"start":{"line":7,"column":22},"end":{"line":7,"column":61}},"10":{"start":{"line":7,"column":85},"end":{"line":7,"column":124}},"11":{"start":{"line":8,"column":18},"end":{"line":8,"column":53}},"12":{"start":{"line":8,"column":73},"end":{"line":8,"column":108}},"13":{"start":{"line":8,"column":147},"end":{"line":8,"column":201}},"14":{"start":{"line":10,"column":0},"end":{"line":27,"column":144}},"15":{"start":{"line":15,"column":13},"end":{"line":15,"column":149}},"16":{"start":{"line":21,"column":13},"end":{"line":21,"column":155}},"17":{"start":{"line":27,"column":13},"end":{"line":27,"column":140}},"18":{"start":{"line":30,"column":26},"end":{"line":30,"column":268}},"19":{"start":{"line":41,"column":0},"end":{"line":43,"column":190}},"20":{"start":{"line":43,"column":59},"end":{"line":43,"column":186}},"21":{"start":{"line":46,"column":0},"end":{"line":51,"column":100}},"22":{"start":{"line":51,"column":16},"end":{"line":51,"column":96}},"23":{"start":{"line":54,"column":0},"end":{"line":59,"column":100}},"24":{"start":{"line":59,"column":16},"end":{"line":59,"column":96}},"25":{"start":{"line":62,"column":0},"end":{"line":67,"column":100}},"26":{"start":{"line":67,"column":16},"end":{"line":67,"column":96}},"27":{"start":{"line":70,"column":0},"end":{"line":75,"column":97}},"28":{"start":{"line":75,"column":13},"end":{"line":75,"column":93}},"29":{"start":{"line":78,"column":0},"end":{"line":86,"column":100}},"30":{"start":{"line":83,"column":13},"end":{"line":86,"column":96}},"31":{"start":{"line":91,"column":0},"end":{"line":95,"column":97}},"32":{"start":{"line":95,"column":13},"end":{"line":95,"column":93}},"33":{"start":{"line":98,"column":0},"end":{"line":102,"column":131}},"34":{"start":{"line":99,"column":40},"end":{"line":100,"column":108}},"35":{"start":{"line":102,"column":48},"end":{"line":102,"column":128}},"36":{"start":{"line":104,"column":10},"end":{"line":104,"column":186}},"37":{"start":{"line":104,"column":39},"end":{"line":104,"column":185}},"38":{"start":{"line":104,"column":75},"end":{"line":104,"column":123}},"39":{"start":{"line":104,"column":124},"end":{"line":104,"column":183}},"40":{"start":{"line":106,"column":12},"end":{"line":106,"column":95}},"41":{"start":{"line":106,"column":29},"end":{"line":106,"column":93}},"42":{"start":{"line":108,"column":15},"end":{"line":108,"column":134}},"43":{"start":{"line":108,"column":52},"end":{"line":108,"column":66}},"44":{"start":{"line":108,"column":67},"end":{"line":108,"column":132}},"45":{"start":{"line":110,"column":0},"end":{"line":115,"column":58}},"46":{"start":{"line":112,"column":84},"end":{"line":115,"column":54}}},"fnMap":{"0":{"name":"_interopRequireDefault","decl":{"start":{"line":8,"column":118},"end":{"line":8,"column":140}},"loc":{"start":{"line":8,"column":146},"end":{"line":8,"column":202}},"line":8},"1":{"name":"(anonymous_1)","decl":{"start":{"line":15,"column":0},"end":{"line":15,"column":1}},"loc":{"start":{"line":15,"column":12},"end":{"line":15,"column":150}},"line":15},"2":{"name":"(anonymous_2)","decl":{"start":{"line":21,"column":0},"end":{"line":21,"column":1}},"loc":{"start":{"line":21,"column":12},"end":{"line":21,"column":156}},"line":21},"3":{"name":"(anonymous_3)","decl":{"start":{"line":27,"column":0},"end":{"line":27,"column":1}},"loc":{"start":{"line":27,"column":12},"end":{"line":27,"column":141}},"line":27},"4":{"name":"(anonymous_4)","decl":{"start":{"line":43,"column":46},"end":{"line":43,"column":47}},"loc":{"start":{"line":43,"column":58},"end":{"line":43,"column":187}},"line":43},"5":{"name":"(anonymous_5)","decl":{"start":{"line":51,"column":3},"end":{"line":51,"column":4}},"loc":{"start":{"line":51,"column":15},"end":{"line":51,"column":97}},"line":51},"6":{"name":"(anonymous_6)","decl":{"start":{"line":59,"column":3},"end":{"line":59,"column":4}},"loc":{"start":{"line":59,"column":15},"end":{"line":59,"column":97}},"line":59},"7":{"name":"(anonymous_7)","decl":{"start":{"line":67,"column":3},"end":{"line":67,"column":4}},"loc":{"start":{"line":67,"column":15},"end":{"line":67,"column":97}},"line":67},"8":{"name":"(anonymous_8)","decl":{"start":{"line":75,"column":0},"end":{"line":75,"column":1}},"loc":{"start":{"line":75,"column":12},"end":{"line":75,"column":94}},"line":75},"9":{"name":"(anonymous_9)","decl":{"start":{"line":83,"column":0},"end":{"line":83,"column":1}},"loc":{"start":{"line":83,"column":12},"end":{"line":86,"column":97}},"line":83},"10":{"name":"(anonymous_10)","decl":{"start":{"line":95,"column":0},"end":{"line":95,"column":1}},"loc":{"start":{"line":95,"column":12},"end":{"line":95,"column":94}},"line":95},"11":{"name":"(anonymous_11)","decl":{"start":{"line":99,"column":13},"end":{"line":99,"column":14}},"loc":{"start":{"line":99,"column":39},"end":{"line":100,"column":109}},"line":99},"12":{"name":"(anonymous_12)","decl":{"start":{"line":102,"column":35},"end":{"line":102,"column":36}},"loc":{"start":{"line":102,"column":47},"end":{"line":102,"column":129}},"line":102},"13":{"name":"hoc","decl":{"start":{"line":104,"column":19},"end":{"line":104,"column":22}},"loc":{"start":{"line":104,"column":38},"end":{"line":104,"column":186}},"line":104},"14":{"name":"(anonymous_14)","decl":{"start":{"line":104,"column":46},"end":{"line":104,"column":47}},"loc":{"start":{"line":104,"column":62},"end":{"line":104,"column":184}},"line":104},"15":{"name":"(anonymous_15)","decl":{"start":{"line":106,"column":16},"end":{"line":106,"column":17}},"loc":{"start":{"line":106,"column":28},"end":{"line":106,"column":94}},"line":106},"16":{"name":"(anonymous_16)","decl":{"start":{"line":108,"column":19},"end":{"line":108,"column":20}},"loc":{"start":{"line":108,"column":36},"end":{"line":108,"column":133}},"line":108},"17":{"name":"(anonymous_17)","decl":{"start":{"line":112,"column":71},"end":{"line":112,"column":72}},"loc":{"start":{"line":112,"column":83},"end":{"line":115,"column":55}},"line":112}},"branchMap":{"0":{"loc":{"start":{"line":8,"column":154},"end":{"line":8,"column":200}},"type":"cond-expr","locations":[{"start":{"line":8,"column":178},"end":{"line":8,"column":181}},{"start":{"line":8,"column":184},"end":{"line":8,"column":200}}],"line":8},"1":{"loc":{"start":{"line":8,"column":154},"end":{"line":8,"column":175}},"type":"binary-expr","locations":[{"start":{"line":8,"column":154},"end":{"line":8,"column":157}},{"start":{"line":8,"column":161},"end":{"line":8,"column":175}}],"line":8}},"s":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0,"11":0,"12":0,"13":0,"14":0,"15":0,"16":0,"17":0,"18":0,"19":0,"20":0,"21":0,"22":0,"23":0,"24":0,"25":0,"26":0,"27":0,"28":0,"29":0,"30":0,"31":0,"32":0,"33":0,"34":0,"35":0,"36":0,"37":0,"38":0,"39":0,"40":0,"41":0,"42":0,"43":0,"44":0,"45":0,"46":0},"f":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0,"11":0,"12":0,"13":0,"14":0,"15":0,"16":0,"17":0},"b":{"0":[0,0],"1":[0,0]}},"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/Logger.js":{"path":"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/Logger.js","statementMap":{"0":{"start":{"line":1,"column":13},"end":{"line":1,"column":75}},"1":{"start":{"line":1,"column":101},"end":{"line":1,"column":151}},"2":{"start":{"line":1,"column":178},"end":{"line":1,"column":221}},"3":{"start":{"line":1,"column":245},"end":{"line":1,"column":292}},"4":{"start":{"line":1,"column":316},"end":{"line":1,"column":356}},"5":{"start":{"line":1,"column":377},"end":{"line":1,"column":421}},"6":{"start":{"line":1,"column":442},"end":{"line":1,"column":479}},"7":{"start":{"line":1,"column":514},"end":{"line":1,"column":572}},"8":{"start":{"line":1,"column":607},"end":{"line":1,"column":658}},"9":{"start":{"line":1,"column":676},"end":{"line":1,"column":717}},"10":{"start":{"line":1,"column":735},"end":{"line":1,"column":769}},"11":{"start":{"line":1,"column":783},"end":{"line":1,"column":799}},"12":{"start":{"line":1,"column":814},"end":{"line":1,"column":844}},"13":{"start":{"line":2,"column":18},"end":{"line":2,"column":40}},"14":{"start":{"line":2,"column":60},"end":{"line":2,"column":95}},"15":{"start":{"line":3,"column":17},"end":{"line":3,"column":38}},"16":{"start":{"line":3,"column":57},"end":{"line":3,"column":91}},"17":{"start":{"line":4,"column":20},"end":{"line":4,"column":44}},"18":{"start":{"line":4,"column":66},"end":{"line":4,"column":103}},"19":{"start":{"line":6,"column":9},"end":{"line":6,"column":27}},"20":{"start":{"line":6,"column":38},"end":{"line":6,"column":64}},"21":{"start":{"line":6,"column":103},"end":{"line":6,"column":157}},"22":{"start":{"line":8,"column":13},"end":{"line":12,"column":32}},"23":{"start":{"line":15,"column":13},"end":{"line":26,"column":24}},"24":{"start":{"line":30,"column":9},"end":{"line":74,"column":43}},"25":{"start":{"line":30,"column":32},"end":{"line":30,"column":76}},"26":{"start":{"line":30,"column":127},"end":{"line":30,"column":171}},"27":{"start":{"line":30,"column":171},"end":{"line":30,"column":287}},"28":{"start":{"line":30,"column":257},"end":{"line":30,"column":286}},"29":{"start":{"line":30,"column":287},"end":{"line":52,"column":73}},"30":{"start":{"line":48,"column":38},"end":{"line":52,"column":8}},"31":{"start":{"line":49,"column":8},"end":{"line":50,"column":137}},"32":{"start":{"line":49,"column":54},"end":{"line":49,"column":66}},"33":{"start":{"line":49,"column":67},"end":{"line":50,"column":134}},"34":{"start":{"line":52,"column":74},"end":{"line":74,"column":10}},"35":{"start":{"line":52,"column":190},"end":{"line":52,"column":207}},"36":{"start":{"line":52,"column":208},"end":{"line":52,"column":281}},"37":{"start":{"line":52,"column":281},"end":{"line":52,"column":354}},"38":{"start":{"line":52,"column":354},"end":{"line":52,"column":427}},"39":{"start":{"line":52,"column":427},"end":{"line":52,"column":500}},"40":{"start":{"line":55,"column":15},"end":{"line":55,"column":32}},"41":{"start":{"line":57,"column":6},"end":{"line":67,"column":130}},"42":{"start":{"line":61,"column":50},"end":{"line":61,"column":58}},"43":{"start":{"line":61,"column":66},"end":{"line":61,"column":76}},"44":{"start":{"line":61,"column":87},"end":{"line":61,"column":100}},"45":{"start":{"line":61,"column":101},"end":{"line":67,"column":124}},"46":{"start":{"line":74,"column":10},"end":{"line":74,"column":24}},"47":{"start":{"line":74,"column":44},"end":{"line":74,"column":141}},"48":{"start":{"line":74,"column":141},"end":{"line":74,"column":166}}},"fnMap":{"0":{"name":"_interopRequireDefault","decl":{"start":{"line":6,"column":74},"end":{"line":6,"column":96}},"loc":{"start":{"line":6,"column":102},"end":{"line":6,"column":158}},"line":6},"1":{"name":"(anonymous_1)","decl":{"start":{"line":30,"column":9},"end":{"line":30,"column":10}},"loc":{"start":{"line":30,"column":31},"end":{"line":74,"column":25}},"line":30},"2":{"name":"Logger","decl":{"start":{"line":30,"column":85},"end":{"line":30,"column":91}},"loc":{"start":{"line":30,"column":94},"end":{"line":52,"column":74}},"line":30},"3":{"name":"(anonymous_3)","decl":{"start":{"line":48,"column":21},"end":{"line":48,"column":22}},"loc":{"start":{"line":48,"column":37},"end":{"line":52,"column":9}},"line":48},"4":{"name":"(anonymous_4)","decl":{"start":{"line":48,"column":45},"end":{"line":48,"column":46}},"loc":{"start":{"line":48,"column":64},"end":{"line":52,"column":7}},"line":48},"5":{"name":"(anonymous_5)","decl":{"start":{"line":49,"column":23},"end":{"line":49,"column":24}},"loc":{"start":{"line":49,"column":40},"end":{"line":50,"column":135}},"line":49},"6":{"name":"componentWillMount","decl":{"start":{"line":52,"column":155},"end":{"line":52,"column":173}},"loc":{"start":{"line":52,"column":176},"end":{"line":52,"column":501}},"line":52},"7":{"name":"render","decl":{"start":{"line":52,"column":538},"end":{"line":52,"column":544}},"loc":{"start":{"line":54,"column":4},"end":{"line":74,"column":5}},"line":54},"8":{"name":"(anonymous_8)","decl":{"start":{"line":61,"column":23},"end":{"line":61,"column":24}},"loc":{"start":{"line":61,"column":40},"end":{"line":67,"column":125}},"line":61}},"branchMap":{"0":{"loc":{"start":{"line":6,"column":110},"end":{"line":6,"column":156}},"type":"cond-expr","locations":[{"start":{"line":6,"column":134},"end":{"line":6,"column":137}},{"start":{"line":6,"column":140},"end":{"line":6,"column":156}}],"line":6},"1":{"loc":{"start":{"line":6,"column":110},"end":{"line":6,"column":131}},"type":"binary-expr","locations":[{"start":{"line":6,"column":110},"end":{"line":6,"column":113}},{"start":{"line":6,"column":117},"end":{"line":6,"column":131}}],"line":6},"2":{"loc":{"start":{"line":30,"column":374},"end":{"line":30,"column":423}},"type":"binary-expr","locations":[{"start":{"line":30,"column":374},"end":{"line":30,"column":390}},{"start":{"line":30,"column":394},"end":{"line":30,"column":423}}],"line":30}},"s":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0,"11":0,"12":0,"13":0,"14":0,"15":0,"16":0,"17":0,"18":0,"19":0,"20":0,"21":0,"22":0,"23":0,"24":0,"25":0,"26":0,"27":0,"28":0,"29":0,"30":0,"31":0,"32":0,"33":0,"34":0,"35":0,"36":0,"37":0,"38":0,"39":0,"40":0,"41":0,"42":0,"43":0,"44":0,"45":0,"46":0,"47":0,"48":0},"f":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0},"b":{"0":[0,0],"1":[0,0],"2":[0,0]}},"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/addon-knobs.stories.js":{"path":"/Users/dev/Projects/GitHub/storybook/core/examples/cra-kitchen-sink/src/stories/addon-knobs.stories.js","statementMap":{"0":{"start":{"line":1,"column":29},"end":{"line":1,"column":69}},"1":{"start":{"line":1,"column":86},"end":{"line":1,"column":119}},"2":{"start":{"line":1,"column":143},"end":{"line":1,"column":190}},"3":{"start":{"line":1,"column":214},"end":{"line":1,"column":254}},"4":{"start":{"line":1,"column":275},"end":{"line":1,"column":319}},"5":{"start":{"line":1,"column":340},"end":{"line":1,"column":377}},"6":{"start":{"line":1,"column":412},"end":{"line":1,"column":470}},"7":{"start":{"line":1,"column":505},"end":{"line":1,"column":556}},"8":{"start":{"line":1,"column":574},"end":{"line":1,"column":615}},"9":{"start":{"line":1,"column":633},"end":{"line":1,"column":667}},"10":{"start":{"line":1,"column":681},"end":{"line":1,"column":697}},"11":{"start":{"line":1,"column":712},"end":{"line":1,"column":742}},"12":{"start":{"line":2,"column":14},"end":{"line":2,"column":41}},"13":{"start":{"line":4,"column":18},"end":{"line":4,"column":51}},"14":{"start":{"line":4,"column":90},"end":{"line":4,"column":144}},"15":{"start":{"line":18,"column":18},"end":{"line":45,"column":61}},"16":{"start":{"line":18,"column":47},"end":{"line":18,"column":106}},"17":{"start":{"line":19,"column":30},"end":{"line":19,"column":83}},"18":{"start":{"line":19,"column":95},"end":{"line":19,"column":223}},"19":{"start":{"line":21,"column":4},"end":{"line":21,"column":32}},"20":{"start":{"line":21,"column":32},"end":{"line":21,"column":45}},"21":{"start":{"line":22,"column":3},"end":{"line":45,"column":10}},"22":{"start":{"line":24,"column":18},"end":{"line":24,"column":22}},"23":{"start":{"line":25,"column":6},"end":{"line":27,"column":21}},"24":{"start":{"line":29,"column":6},"end":{"line":29,"column":120}},"25":{"start":{"line":29,"column":30},"end":{"line":29,"column":111}},"26":{"start":{"line":32,"column":18},"end":{"line":32,"column":22}},"27":{"start":{"line":35,"column":6},"end":{"line":35,"column":96}},"28":{"start":{"line":35,"column":61},"end":{"line":35,"column":93}},"29":{"start":{"line":37,"column":6},"end":{"line":37,"column":16}},"30":{"start":{"line":37,"column":29},"end":{"line":37,"column":45}},"31":{"start":{"line":37,"column":54},"end":{"line":37,"column":66}},"32":{"start":{"line":39,"column":6},"end":{"line":43,"column":7}},"33":{"start":{"line":40,"column":8},"end":{"line":40,"column":72}},"34":{"start":{"line":41,"column":13},"end":{"line":43,"column":7}},"35":{"start":{"line":42,"column":8},"end":{"line":42,"column":75}},"36":{"start":{"line":44,"column":6},"end":{"line":44,"column":141}},"37":{"start":{"line":44,"column":79},"end":{"line":44,"column":137}},"38":{"start":{"line":45,"column":10},"end":{"line":45,"column":33}},"39":{"start":{"line":48,"column":0},"end":{"line":94,"column":64}},"40":{"start":{"line":51,"column":13},"end":{"line":51,"column":57}},"41":{"start":{"line":52,"column":12},"end":{"line":52,"column":89}},"42":{"start":{"line":53,"column":15},"end":{"line":56,"column":22}},"43":{"start":{"line":58,"column":14},"end":{"line":58,"column":63}},"44":{"start":{"line":59,"column":16},"end":{"line":59,"column":56}},"45":{"start":{"line":61,"column":24},"end":{"line":61,"column":71}},"46":{"start":{"line":62,"column":14},"end":{"line":62,"column":76}},"47":{"start":{"line":63,"column":20},"end":{"line":65,"column":22}},"48":{"start":{"line":67,"column":13},"end":{"line":67,"column":51}},"49":{"start":{"line":70,"column":24},"end":{"line":70,"column":47}},"50":{"start":{"line":71,"column":17},"end":{"line":71,"column":67}},"51":{"start":{"line":73,"column":14},"end":{"line":73,"column":108}},"52":{"start":{"line":74,"column":14},"end":{"line":74,"column":87}},"53":{"start":{"line":75,"column":19},"end":{"line":75,"column":65}},"54":{"start":{"line":76,"column":20},"end":{"line":76,"column":70}},"55":{"start":{"line":78,"column":2},"end":{"line":87,"column":83}},"56":{"start":{"line":84,"column":75},"end":{"line":84,"column":139}},"57":{"start":{"line":91,"column":48},"end":{"line":94,"column":61}},"58":{"start":{"line":98,"column":0},"end":{"line":153,"column":64}},"59":{"start":{"line":106,"column":13},"end":{"line":106,"column":57}},"60":{"start":{"line":107,"column":12},"end":{"line":107,"column":89}},"61":{"start":{"line":108,"column":15},"end":{"line":111,"column":22}},"62":{"start":{"line":113,"column":14},"end":{"line":113,"column":63}},"63":{"start":{"line":114,"column":16},"end":{"line":114,"column":56}},"64":{"start":{"line":116,"column":24},"end":{"line":116,"column":71}},"65":{"start":{"line":117,"column":14},"end":{"line":117,"column":76}},"66":{"start":{"line":118,"column":20},"end":{"line":120,"column":22}},"67":{"start":{"line":122,"column":13},"end":{"line":122,"column":51}},"68":{"start":{"line":125,"column":24},"end":{"line":125,"column":47}},"69":{"start":{"line":126,"column":17},"end":{"line":126,"column":67}},"70":{"start":{"line":128,"column":14},"end":{"line":128,"column":108}},"71":{"start":{"line":129,"column":14},"end":{"line":129,"column":87}},"72":{"start":{"line":130,"column":19},"end":{"line":130,"column":65}},"73":{"start":{"line":131,"column":20},"end":{"line":131,"column":70}},"74":{"start":{"line":133,"column":2},"end":{"line":146,"column":83}},"75":{"start":{"line":143,"column":75},"end":{"line":143,"column":139}},"76":{"start":{"line":150,"column":68},"end":{"line":153,"column":61}}},"fnMap":{"0":{"name":"_interopRequireDefault","decl":{"start":{"line":4,"column":61},"end":{"line":4,"column":83}},"loc":{"start":{"line":4,"column":89},"end":{"line":4,"column":145}},"line":4},"1":{"name":"(anonymous_1)","decl":{"start":{"line":18,"column":18},"end":{"line":18,"column":19}},"loc":{"start":{"line":18,"column":46},"end":{"line":45,"column":34}},"line":18},"2":{"name":"AsyncItemLoader","decl":{"start":{"line":19,"column":11},"end":{"line":19,"column":26}},"loc":{"start":{"line":19,"column":29},"end":{"line":22,"column":3}},"line":19},"3":{"name":"handleLoadItems","decl":{"start":{"line":22,"column":90},"end":{"line":22,"column":105}},"loc":{"start":{"line":24,"column":4},"end":{"line":30,"column":5}},"line":24},"4":{"name":"(anonymous_4)","decl":{"start":{"line":29,"column":17},"end":{"line":29,"column":18}},"loc":{"start":{"line":29,"column":29},"end":{"line":29,"column":112}},"line":29},"5":{"name":"render","decl":{"start":{"line":30,"column":42},"end":{"line":30,"column":48}},"loc":{"start":{"line":32,"column":4},"end":{"line":45,"column":5}},"line":32},"6":{"name":"(anonymous_6)","decl":{"start":{"line":35,"column":48},"end":{"line":35,"column":49}},"loc":{"start":{"line":35,"column":60},"end":{"line":35,"column":94}},"line":35},"7":{"name":"(anonymous_7)","decl":{"start":{"line":44,"column":65},"end":{"line":44,"column":66}},"loc":{"start":{"line":44,"column":78},"end":{"line":44,"column":138}},"line":44},"8":{"name":"(anonymous_8)","decl":{"start":{"line":50,"column":28},"end":{"line":50,"column":29}},"loc":{"start":{"line":50,"column":40},"end":{"line":90,"column":1}},"line":50},"9":{"name":"(anonymous_9)","decl":{"start":{"line":84,"column":58},"end":{"line":84,"column":59}},"loc":{"start":{"line":84,"column":74},"end":{"line":84,"column":140}},"line":84},"10":{"name":"(anonymous_10)","decl":{"start":{"line":91,"column":35},"end":{"line":91,"column":36}},"loc":{"start":{"line":91,"column":47},"end":{"line":94,"column":62}},"line":91},"11":{"name":"(anonymous_11)","decl":{"start":{"line":105,"column":48},"end":{"line":105,"column":49}},"loc":{"start":{"line":105,"column":60},"end":{"line":149,"column":1}},"line":105},"12":{"name":"(anonymous_12)","decl":{"start":{"line":143,"column":58},"end":{"line":143,"column":59}},"loc":{"start":{"line":143,"column":74},"end":{"line":143,"column":140}},"line":143},"13":{"name":"(anonymous_13)","decl":{"start":{"line":150,"column":55},"end":{"line":150,"column":56}},"loc":{"start":{"line":150,"column":67},"end":{"line":153,"column":62}},"line":150}},"branchMap":{"0":{"loc":{"start":{"line":4,"column":97},"end":{"line":4,"column":143}},"type":"cond-expr","locations":[{"start":{"line":4,"column":121},"end":{"line":4,"column":124}},{"start":{"line":4,"column":127},"end":{"line":4,"column":143}}],"line":4},"1":{"loc":{"start":{"line":4,"column":97},"end":{"line":4,"column":118}},"type":"binary-expr","locations":[{"start":{"line":4,"column":97},"end":{"line":4,"column":100}},{"start":{"line":4,"column":104},"end":{"line":4,"column":118}}],"line":4},"2":{"loc":{"start":{"line":19,"column":143},"end":{"line":19,"column":210}},"type":"binary-expr","locations":[{"start":{"line":19,"column":143},"end":{"line":19,"column":168}},{"start":{"line":19,"column":172},"end":{"line":19,"column":210}}],"line":19},"3":{"loc":{"start":{"line":39,"column":6},"end":{"line":43,"column":7}},"type":"if","locations":[{"start":{"line":39,"column":6},"end":{"line":43,"column":7}},{"start":{"line":39,"column":6},"end":{"line":43,"column":7}}],"line":39},"4":{"loc":{"start":{"line":41,"column":13},"end":{"line":43,"column":7}},"type":"if","locations":[{"start":{"line":41,"column":13},"end":{"line":43,"column":7}},{"start":{"line":41,"column":13},"end":{"line":43,"column":7}}],"line":41},"5":{"loc":{"start":{"line":75,"column":19},"end":{"line":75,"column":65}},"type":"cond-expr","locations":[{"start":{"line":75,"column":26},"end":{"line":75,"column":45}},{"start":{"line":75,"column":48},"end":{"line":75,"column":65}}],"line":75},"6":{"loc":{"start":{"line":130,"column":19},"end":{"line":130,"column":65}},"type":"cond-expr","locations":[{"start":{"line":130,"column":26},"end":{"line":130,"column":45}},{"start":{"line":130,"column":48},"end":{"line":130,"column":65}}],"line":130}},"s":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0,"11":0,"12":0,"13":0,"14":0,"15":0,"16":0,"17":0,"18":0,"19":0,"20":0,"21":0,"22":0,"23":0,"24":0,"25":0,"26":0,"27":0,"28":0,"29":0,"30":0,"31":0,"32":0,"33":0,"34":0,"35":0,"36":0,"37":0,"38":0,"39":0,"40":0,"41":0,"42":0,"43":0,"44":0,"45":0,"46":0,"47":0,"48":0,"49":0,"50":0,"51":0,"52":0,"53":0,"54":0,"55":0,"56":0,"57":0,"58":0,"59":0,"60":0,"61":0,"62":0,"63":0,"64":0,"65":0,"66":0,"67":0,"68":0,"69":0,"70":0,"71":0,"72":0,"73":0,"74":0,"75":0,"76":0},"f":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0,"11":0,"12":0,"13":0},"b":{"0":[0,0],"1":[0,0],"2":[0,0],"3":[0,0],"4":[0,0],"5":[0,0],"6":[0,0]}}}}
\ No newline at end of file
+{"numFailedTestSuites":1,"numFailedTests":4,"numPassedTestSuites":0,"numPassedTests":3,"numPendingTestSuites":0,"numPendingTests":0,"numRuntimeErrorTestSuites":0,"numTotalTestSuites":1,"numTotalTests":7,"snapshot":{"added":0,"didUpdate":false,"failure":false,"filesAdded":0,"filesRemoved":0,"filesUnmatched":0,"filesUpdated":0,"matched":0,"total":0,"unchecked":0,"unmatched":0,"updated":0},"startTime":1515086750721,"success":false,"testResults":[{"assertionResults":[{"ancestorTitles":[],"failureMessages":[],"fullName":"true should be true","status":"passed","title":"true should be true"},{"ancestorTitles":["In a describe: "],"failureMessages":[],"fullName":"In a describe:  true should still be true","status":"passed","title":"true should still be true"},{"ancestorTitles":["In a describe: "],"failureMessages":[],"fullName":"In a describe:  a list should contain 3 items","status":"passed","title":"a list should contain 3 items"},{"ancestorTitles":["In a describe: "],"failureMessages":["Error: \u001b[2mexpect(\u001b[22m\u001b[31mreceived\u001b[39m\u001b[2m).toEqual(\u001b[22m\u001b[32mexpected\u001b[39m\u001b[2m)\u001b[22m\n\nExpected value to equal:\n  \u001b[32m\"everything is awesome\"\u001b[39m\nReceived:\n  \u001b[31m\"everything is all right\"\u001b[39m\n    at Object.<anonymous> (/home/toto/IdeaProjects/storybook-toto/examples/official-storybook/tests/addon-jest.test.js:16:39)\n    at Object.asyncFn (/home/toto/IdeaProjects/storybook-toto/examples/official-storybook/node_modules/jest-jasmine2/build/jasmine_async.js:124:345)\n    at resolve (/home/toto/IdeaProjects/storybook-toto/examples/official-storybook/node_modules/jest-jasmine2/build/queue_runner.js:46:12)\n    at Promise (<anonymous>)\n    at mapper (/home/toto/IdeaProjects/storybook-toto/examples/official-storybook/node_modules/jest-jasmine2/build/queue_runner.js:34:499)\n    at promise.then (/home/toto/IdeaProjects/storybook-toto/examples/official-storybook/node_modules/jest-jasmine2/build/queue_runner.js:74:39)\n    at <anonymous>\n    at process._tickCallback (internal/process/next_tick.js:169:7)"],"fullName":"In a describe:  everything is awesome","status":"failed","title":"everything is awesome"},{"ancestorTitles":["A bunch of failing tests: "],"failureMessages":["Error: \u001b[2mexpect(\u001b[22m\u001b[31mreceived\u001b[39m\u001b[2m).toBe(\u001b[22m\u001b[32mexpected\u001b[39m\u001b[2m)\u001b[22m\n\nExpected value to be (using ===):\n  \u001b[32mfalse\u001b[39m\nReceived:\n  \u001b[31mtrue\u001b[39m\n    at Object.<anonymous> (/home/toto/IdeaProjects/storybook-toto/examples/official-storybook/tests/addon-jest.test.js:22:18)\n    at Object.asyncFn (/home/toto/IdeaProjects/storybook-toto/examples/official-storybook/node_modules/jest-jasmine2/build/jasmine_async.js:124:345)\n    at resolve (/home/toto/IdeaProjects/storybook-toto/examples/official-storybook/node_modules/jest-jasmine2/build/queue_runner.js:46:12)\n    at Promise (<anonymous>)\n    at mapper (/home/toto/IdeaProjects/storybook-toto/examples/official-storybook/node_modules/jest-jasmine2/build/queue_runner.js:34:499)\n    at promise.then (/home/toto/IdeaProjects/storybook-toto/examples/official-storybook/node_modules/jest-jasmine2/build/queue_runner.js:74:39)\n    at <anonymous>\n    at process._tickCallback (internal/process/next_tick.js:169:7)"],"fullName":"A bunch of failing tests:  true should still be true","status":"failed","title":"true should still be true"},{"ancestorTitles":["A bunch of failing tests: "],"failureMessages":["Error: \u001b[2mexpect(\u001b[22m\u001b[31marray\u001b[39m\u001b[2m).toContain(\u001b[22m\u001b[32mvalue\u001b[39m\u001b[2m)\u001b[22m\n\nExpected array:\n  \u001b[31m[\"a\", \"b\", \"3\"]\u001b[39m\nTo contain value:\n  \u001b[32m301\u001b[39m\n    at Object.<anonymous> (/home/toto/IdeaProjects/storybook-toto/examples/official-storybook/tests/addon-jest.test.js:26:29)\n    at Object.asyncFn (/home/toto/IdeaProjects/storybook-toto/examples/official-storybook/node_modules/jest-jasmine2/build/jasmine_async.js:124:345)\n    at resolve (/home/toto/IdeaProjects/storybook-toto/examples/official-storybook/node_modules/jest-jasmine2/build/queue_runner.js:46:12)\n    at Promise (<anonymous>)\n    at mapper (/home/toto/IdeaProjects/storybook-toto/examples/official-storybook/node_modules/jest-jasmine2/build/queue_runner.js:34:499)\n    at promise.then (/home/toto/IdeaProjects/storybook-toto/examples/official-storybook/node_modules/jest-jasmine2/build/queue_runner.js:74:39)\n    at <anonymous>\n    at process._tickCallback (internal/process/next_tick.js:169:7)"],"fullName":"A bunch of failing tests:  a list should contain 3 items","status":"failed","title":"a list should contain 3 items"},{"ancestorTitles":["A bunch of failing tests: "],"failureMessages":["Error: \u001b[2mexpect(\u001b[22m\u001b[31mfunction\u001b[39m\u001b[2m).toThrow(\u001b[22m\u001b[32mundefined\u001b[39m\u001b[2m)\u001b[22m\n\nExpected the function to throw an error.\nBut it didn't throw anything.\n    at Object.<anonymous> (/home/toto/IdeaProjects/storybook-toto/examples/official-storybook/tests/addon-jest.test.js:30:28)\n    at Object.asyncFn (/home/toto/IdeaProjects/storybook-toto/examples/official-storybook/node_modules/jest-jasmine2/build/jasmine_async.js:124:345)\n    at resolve (/home/toto/IdeaProjects/storybook-toto/examples/official-storybook/node_modules/jest-jasmine2/build/queue_runner.js:46:12)\n    at Promise (<anonymous>)\n    at mapper (/home/toto/IdeaProjects/storybook-toto/examples/official-storybook/node_modules/jest-jasmine2/build/queue_runner.js:34:499)\n    at promise.then (/home/toto/IdeaProjects/storybook-toto/examples/official-storybook/node_modules/jest-jasmine2/build/queue_runner.js:74:39)\n    at <anonymous>\n    at process._tickCallback (internal/process/next_tick.js:169:7)"],"fullName":"A bunch of failing tests:  should work","status":"failed","title":"should work"}],"endTime":1515086751669,"message":"\u001b[1m\u001b[31m  \u001b[1m● \u001b[1mIn a describe:  › everything is awesome\u001b[39m\u001b[22m\n\n    \u001b[2mexpect(\u001b[22m\u001b[31mreceived\u001b[39m\u001b[2m).toEqual(\u001b[22m\u001b[32mexpected\u001b[39m\u001b[2m)\u001b[22m\n    \n    Expected value to equal:\n      \u001b[32m\"everything is awesome\"\u001b[39m\n    Received:\n      \u001b[31m\"everything is all right\"\u001b[39m\n\u001b[2m      \u001b[22m\n\u001b[2m      \u001b[2mat Object.<anonymous> (\u001b[2m\u001b[0m\u001b[36mexamples/official-storybook/tests/addon-jest.test.js\u001b[39m\u001b[0m\u001b[2m:16:39)\u001b[2m\u001b[22m\n\u001b[2m          at Promise (<anonymous>)\u001b[22m\n\u001b[2m          at <anonymous>\u001b[22m\n\u001b[2m      \u001b[2mat process._tickCallback (\u001b[2m\u001b[0m\u001b[36mexamples/official-storybook/internal/process/next_tick.js\u001b[39m\u001b[0m\u001b[2m:169:7)\u001b[2m\u001b[22m\n\n\u001b[1m\u001b[31m  \u001b[1m● \u001b[1mA bunch of failing tests:  › true should still be true\u001b[39m\u001b[22m\n\n    \u001b[2mexpect(\u001b[22m\u001b[31mreceived\u001b[39m\u001b[2m).toBe(\u001b[22m\u001b[32mexpected\u001b[39m\u001b[2m)\u001b[22m\n    \n    Expected value to be (using ===):\n      \u001b[32mfalse\u001b[39m\n    Received:\n      \u001b[31mtrue\u001b[39m\n\u001b[2m      \u001b[22m\n\u001b[2m      \u001b[2mat Object.<anonymous> (\u001b[2m\u001b[0m\u001b[36mexamples/official-storybook/tests/addon-jest.test.js\u001b[39m\u001b[0m\u001b[2m:22:18)\u001b[2m\u001b[22m\n\u001b[2m          at Promise (<anonymous>)\u001b[22m\n\u001b[2m          at <anonymous>\u001b[22m\n\u001b[2m      \u001b[2mat process._tickCallback (\u001b[2m\u001b[0m\u001b[36mexamples/official-storybook/internal/process/next_tick.js\u001b[39m\u001b[0m\u001b[2m:169:7)\u001b[2m\u001b[22m\n\n\u001b[1m\u001b[31m  \u001b[1m● \u001b[1mA bunch of failing tests:  › a list should contain 3 items\u001b[39m\u001b[22m\n\n    \u001b[2mexpect(\u001b[22m\u001b[31marray\u001b[39m\u001b[2m).toContain(\u001b[22m\u001b[32mvalue\u001b[39m\u001b[2m)\u001b[22m\n    \n    Expected array:\n      \u001b[31m[\"a\", \"b\", \"3\"]\u001b[39m\n    To contain value:\n      \u001b[32m301\u001b[39m\n\u001b[2m      \u001b[22m\n\u001b[2m      \u001b[2mat Object.<anonymous> (\u001b[2m\u001b[0m\u001b[36mexamples/official-storybook/tests/addon-jest.test.js\u001b[39m\u001b[0m\u001b[2m:26:29)\u001b[2m\u001b[22m\n\u001b[2m          at Promise (<anonymous>)\u001b[22m\n\u001b[2m          at <anonymous>\u001b[22m\n\u001b[2m      \u001b[2mat process._tickCallback (\u001b[2m\u001b[0m\u001b[36mexamples/official-storybook/internal/process/next_tick.js\u001b[39m\u001b[0m\u001b[2m:169:7)\u001b[2m\u001b[22m\n\n\u001b[1m\u001b[31m  \u001b[1m● \u001b[1mA bunch of failing tests:  › should work\u001b[39m\u001b[22m\n\n    \u001b[2mexpect(\u001b[22m\u001b[31mfunction\u001b[39m\u001b[2m).toThrow(\u001b[22m\u001b[32mundefined\u001b[39m\u001b[2m)\u001b[22m\n    \n    Expected the function to throw an error.\n    But it didn't throw anything.\n\u001b[2m      \u001b[22m\n\u001b[2m      \u001b[2mat Object.<anonymous> (\u001b[2m\u001b[0m\u001b[36mexamples/official-storybook/tests/addon-jest.test.js\u001b[39m\u001b[0m\u001b[2m:30:28)\u001b[2m\u001b[22m\n\u001b[2m          at Promise (<anonymous>)\u001b[22m\n\u001b[2m          at <anonymous>\u001b[22m\n\u001b[2m      \u001b[2mat process._tickCallback (\u001b[2m\u001b[0m\u001b[36mexamples/official-storybook/internal/process/next_tick.js\u001b[39m\u001b[0m\u001b[2m:169:7)\u001b[2m\u001b[22m\n","name":"/home/toto/IdeaProjects/storybook-toto/examples/official-storybook/tests/addon-jest.test.js","startTime":1515086751196,"status":"failed","summary":""}],"wasInterrupted":false}
\ No newline at end of file
diff --git a/examples/official-storybook/stories/addon-knobs.stories.js b/examples/official-storybook/stories/addon-knobs.stories.js
index 50fda6c4d24..5e59026bf46 100644
--- a/examples/official-storybook/stories/addon-knobs.stories.js
+++ b/examples/official-storybook/stories/addon-knobs.stories.js
@@ -9,6 +9,7 @@ import {
   boolean,
   color,
   select,
+  selectV2,
   array,
   date,
   button,
@@ -56,6 +57,12 @@ storiesOf('Addons|Knobs.withKnobs', module)
       cherry: 'Cherry',
     };
     const fruit = select('Fruit', fruits, 'apple');
+    const otherFruits = {
+      Lime: 'lime',
+      Coconut: 'coconut',
+      Tomato: 'tomato',
+    };
+    const otherFruit = selectV2('Other Fruit', otherFruits, 'lime');
     const dollars = number('Dollars', 12.5, { min: 0, max: 100, step: 0.01 });
     const years = number('Years in NY', 9);
 
@@ -71,10 +78,10 @@ storiesOf('Addons|Knobs.withKnobs', module)
     const defaultBirthday = new Date('Jan 20 2017 GMT+0');
     const birthday = date('Birthday', defaultBirthday);
 
-    const intro = `My name is ${name}, I'm ${age} years old, and my favorite fruit is ${fruit}.`;
+    const intro = `My name is ${name}, I'm ${age} years old, and my favorite fruit is ${fruit}. I also enjoy ${otherFruit}.`;
     const style = { backgroundColor, ...otherStyles };
     const salutation = nice ? 'Nice to meet you!' : 'Leave me alone!';
-    const dateOptions = { year: 'numeric', month: 'long', day: 'numeric' };
+    const dateOptions = { year: 'numeric', month: 'long', day: 'numeric', timeZone: 'UTC' };
 
     return (
       <div style={style}>
@@ -90,6 +97,77 @@ storiesOf('Addons|Knobs.withKnobs', module)
       </div>
     );
   })
+  .add('tweaks static values organized in groups', () => {
+    const GROUP_IDS = {
+      DISPLAY: 'DISPLAY',
+      GENERAL: 'GENERAL',
+      FAVORITES: 'FAVORITES',
+    };
+
+    const fruits = {
+      apple: 'Apple',
+      banana: 'Banana',
+      cherry: 'Cherry',
+    };
+
+    const otherFruits = {
+      Lime: 'lime',
+      Coconut: 'coconut',
+      Tomato: 'tomato',
+    };
+
+    // NOTE: the default value must not change - e.g., do not do date('Label', new Date()) or date('Label')
+    const defaultBirthday = new Date('Jan 20 2017 GMT+0');
+
+    // General
+    const name = text('Name', 'Storyteller', GROUP_IDS.GENERAL);
+    const age = number('Age', 70, { range: true, min: 0, max: 90, step: 5 }, GROUP_IDS.GENERAL);
+    const birthday = date('Birthday', defaultBirthday, GROUP_IDS.GENERAL);
+    const dollars = number(
+      'Account Balance',
+      12.5,
+      { min: 0, max: 100, step: 0.01 },
+      GROUP_IDS.GENERAL
+    );
+    const years = number('Years in NY', 9, {}, GROUP_IDS.GENERAL);
+
+    // Favorites
+    const nice = boolean('Nice', true, GROUP_IDS.FAVORITES);
+    const fruit = select('Fruit', fruits, 'apple', GROUP_IDS.FAVORITES);
+    const otherFruit = selectV2('Other Fruit', otherFruits, 'lime', GROUP_IDS.FAVORITES);
+    const items = array('Items', ['Laptop', 'Book', 'Whiskey'], ',', GROUP_IDS.FAVORITES);
+
+    // Display
+    const backgroundColor = color('Color', '#ffff00', GROUP_IDS.DISPLAY);
+    const otherStyles = object(
+      'Styles',
+      { border: '3px solid #ff00ff', padding: '10px' },
+      GROUP_IDS.DISPLAY
+    );
+
+    const style = { backgroundColor, ...otherStyles };
+
+    const salutation = nice ? 'Nice to meet you!' : 'Leave me alone!';
+    const dateOptions = { year: 'numeric', month: 'long', day: 'numeric', timeZone: 'UTC' };
+
+    return (
+      <div style={style}>
+        <h1>General Information</h1>
+        <p>Name: {name}</p>
+        <p>Age: {age}</p>
+        <p>Birthday: {new Date(birthday).toLocaleDateString('en-US', dateOptions)}</p>
+        <p>Account Balance: {dollars}</p>
+        <p>Years in NY: {years}</p>
+        <hr />
+        <h1>Favorites</h1>
+        <p>Catchphrase: {salutation}</p>
+        <p>Fruit: {fruit}</p>
+        <p>Second Fruit: {otherFruit}</p>
+        <p>Items:</p>
+        <ul>{items.map(item => <li key={`${item}`}>{item}</li>)}</ul>
+      </div>
+    );
+  })
   .add('triggers actions via button', () => (
     <div>
       <p>Hit the knob load button and it should trigger an async load after a short delay</p>
@@ -113,6 +191,12 @@ storiesOf('Addons|Knobs.withKnobsOptions', module)
       cherry: 'Cherry',
     };
     const fruit = select('Fruit', fruits, 'apple');
+    const otherFruits = {
+      Lime: 'lime',
+      Coconut: 'coconut',
+      Tomato: 'tomato',
+    };
+    const otherFruit = selectV2('Other Fruit', otherFruits, 'lime');
     const dollars = number('Dollars', 12.5, { min: 0, max: 100, step: 0.01 });
 
     const backgroundColor = color('background', '#ffff00');
@@ -127,10 +211,10 @@ storiesOf('Addons|Knobs.withKnobsOptions', module)
     const defaultBirthday = new Date('Jan 20 2017 GMT+0');
     const birthday = date('Birthday', defaultBirthday);
 
-    const intro = `My name is ${name}, I'm ${age} years old, and my favorite fruit is ${fruit}.`;
+    const intro = `My name is ${name}, I'm ${age} years old, and my favorite fruit is ${fruit}. I also enjoy ${otherFruit}.`;
     const style = { backgroundColor, ...otherStyles };
     const salutation = nice ? 'Nice to meet you!' : 'Leave me alone!';
-    const dateOptions = { year: 'numeric', month: 'long', day: 'numeric' };
+    const dateOptions = { year: 'numeric', month: 'long', day: 'numeric', timeZone: 'UTC' };
 
     return (
       <div style={style}>
diff --git a/examples/official-storybook/stories/addon-links.stories.js b/examples/official-storybook/stories/addon-links.stories.js
index 884cdfd5859..9d9baa69fd5 100644
--- a/examples/official-storybook/stories/addon-links.stories.js
+++ b/examples/official-storybook/stories/addon-links.stories.js
@@ -10,15 +10,15 @@ storiesOf('Addons|Links.Link', module)
 
 storiesOf('Addons|Links.Button', module)
   .add('First', () => (
-    <button onClick={linkTo('Addon Links.Button', 'Second')}>Go to "Second"</button>
+    <button onClick={linkTo('Addons|Links.Button', 'Second')}>Go to "Second"</button>
   ))
   .add('Second', () => (
-    <button onClick={linkTo('Addon Links.Button', 'First')}>Go to "First"</button>
+    <button onClick={linkTo('Addons|Links.Button', 'First')}>Go to "First"</button>
   ));
 
 storiesOf('Addons|Links.Select', module)
   .add('Index', () => (
-    <select value="Index" onChange={linkTo('Addon Links.Select', e => e.currentTarget.value)}>
+    <select value="Index" onChange={linkTo('Addons|Links.Select', e => e.currentTarget.value)}>
       <option>Index</option>
       <option>First</option>
       <option>Second</option>
@@ -30,7 +30,7 @@ storiesOf('Addons|Links.Select', module)
   .add('Third', () => <LinkTo story="Index">Go back</LinkTo>);
 
 storiesOf('Addons|Links.Href', module).add('log', () => {
-  hrefTo('Addon Links.Href', 'log').then(href => action('URL of this story')({ href }));
+  hrefTo('Addons|Links.Href', 'log').then(href => action('URL of this story')({ href }));
 
   return <span>See action logger</span>;
 });
diff --git a/examples/official-storybook/stories/addon-notes.stories.js b/examples/official-storybook/stories/addon-notes.stories.js
index ffed0b3cd2d..62dabca8379 100644
--- a/examples/official-storybook/stories/addon-notes.stories.js
+++ b/examples/official-storybook/stories/addon-notes.stories.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { storiesOf } from '@storybook/react';
 
 // eslint-disable-next-line import/named
-import { withNotes, WithNotes } from '@storybook/addon-notes';
+import { withNotes, WithNotes, withMarkdownNotes } from '@storybook/addon-notes';
 import { action } from '@storybook/addon-actions';
 import BaseButton from '../components/BaseButton';
 import markdownNotes from './notes/notes.md';
@@ -20,6 +20,27 @@ storiesOf('Addons|Notes', module)
       <BaseButton label="Button with notes - check the notes panel for details" />
     ))
   )
+  .add(
+    'withNotes rendering inline, github-flavored markdown',
+    withMarkdownNotes(`
+# Documentation
+
+This is inline github-flavored markdown!
+
+## Example Usage
+~~~js
+storiesOf('Addons|Notes', module)
+  .add(
+    'withNotes rendering imported markdown',
+    withNotes(markdownNotes)(() => (
+      <BaseButton label="Button with notes - check the notes panel for details" />
+    ))
+  )
+~~~
+    `)(() => (
+      <BaseButton label="Button with notes from inline github-flavored markdown - check the notes panel for details" />
+    ))
+  )
   .add('using deprecated API', () => (
     <WithNotes notes="Hello">
       <BaseButton onClick={action('clicked')} label="😀 😎 👍 💯" />
diff --git a/examples/official-storybook/stories/app-acceptance.stories.js b/examples/official-storybook/stories/app-acceptance.stories.js
new file mode 100644
index 00000000000..d63618a03a4
--- /dev/null
+++ b/examples/official-storybook/stories/app-acceptance.stories.js
@@ -0,0 +1,26 @@
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { withNotes } from '@storybook/addon-notes';
+
+// For these stories to work, you must build the static version of the
+//   example storybooks *before* running this storybook.
+
+const chapter = storiesOf('App|acceptance', module);
+
+const style = {
+  border: 0,
+  position: 'absolute',
+  top: 0,
+  left: 0,
+  width: '100vw',
+  height: '100vh',
+};
+
+['cra-kitchen-sink', 'vue-kitchen-sink', 'angular-cli', 'polymer-cli'].forEach(name => {
+  chapter.add(
+    name,
+    withNotes(`You must build the storybook for the ${name} example for this story to work.`)(
+      () => <iframe style={style} title={name} src={`/${name}/index.html`} />
+    )
+  );
+});
diff --git a/examples/official-storybook/stories/other-dirname.stories.js b/examples/official-storybook/stories/other-dirname.stories.js
new file mode 100644
index 00000000000..e1b20029b7c
--- /dev/null
+++ b/examples/official-storybook/stories/other-dirname.stories.js
@@ -0,0 +1,10 @@
+import React from 'react';
+import base from 'paths.macro';
+
+import { storiesOf } from '@storybook/react';
+
+import BaseButton from '../components/BaseButton';
+
+storiesOf(`Other|${base}/Dirname Example`, module)
+  .add('story 1', () => <BaseButton label="Story 1" />)
+  .add('story 2', () => <BaseButton label="Story 2" />);
diff --git a/examples/official-storybook/tests/addon-jest.config.json b/examples/official-storybook/tests/addon-jest.config.json
new file mode 100644
index 00000000000..f093cfab06e
--- /dev/null
+++ b/examples/official-storybook/tests/addon-jest.config.json
@@ -0,0 +1,27 @@
+{
+  "rootDir": "../../..",
+  "verbose": true,
+  "coverageDirectory": "coverage/",
+  "notify": true,
+  "transform": {
+    ".*": "babel-jest"
+  },
+  "snapshotSerializers": [
+    "enzyme-to-json/serializer"
+  ],
+  "setupFiles": ["raf/polyfill"],
+  "setupTestFrameworkScriptFile": "<rootDir>/scripts/jest.init.js",
+  "moduleNameMapper": {
+    "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>__mocks__/fileMock.js",
+    "\\.s?css$": "<rootDir>__mocks__/styleMock.js"
+  },
+  "collectCoverage": true,
+  "collectCoverageFrom": [
+    "../stories/**/*.js",
+    "../stories/*.js",
+    "!.*",
+    "!../stories/__test__/*",
+    "!../stories/**/__test__/*"
+  ],
+  "testMatch": ["<rootDir>/examples/official-storybook/tests/addon-jest.test.js"]
+}
diff --git a/examples/official-storybook/stories/addon-jest.test.js b/examples/official-storybook/tests/addon-jest.test.js
similarity index 88%
rename from examples/official-storybook/stories/addon-jest.test.js
rename to examples/official-storybook/tests/addon-jest.test.js
index 4484b71f1e0..8236a32e390 100644
--- a/examples/official-storybook/stories/addon-jest.test.js
+++ b/examples/official-storybook/tests/addon-jest.test.js
@@ -1,3 +1,4 @@
+// This file is excluded from the `/scripts/test.js` script. (see root `jest.config.js` file)
 test('true should be true', () => {
   expect(true).toBe(true);
 });
diff --git a/examples/official-storybook/storyshots.test.js b/examples/official-storybook/tests/storyshots.test.js
similarity index 77%
rename from examples/official-storybook/storyshots.test.js
rename to examples/official-storybook/tests/storyshots.test.js
index dc10331c960..fa8e622aabe 100644
--- a/examples/official-storybook/storyshots.test.js
+++ b/examples/official-storybook/tests/storyshots.test.js
@@ -1,10 +1,12 @@
+import path from 'path';
 import initStoryshots, { multiSnapshotWithOptions } from '@storybook/addon-storyshots';
 import { render as renderer } from 'enzyme';
 import serializer from 'enzyme-to-json';
 
+// HTML Snapshots
 initStoryshots({
   framework: 'react',
-  configPath: __dirname,
+  configPath: path.join(__dirname, '../'),
   test: multiSnapshotWithOptions({
     renderer,
     serializer,
diff --git a/examples/official-storybook/webpack.config.js b/examples/official-storybook/webpack.config.js
index 0a6124501f5..e0a1cfbbb3a 100644
--- a/examples/official-storybook/webpack.config.js
+++ b/examples/official-storybook/webpack.config.js
@@ -3,6 +3,16 @@ const path = require('path');
 module.exports = {
   module: {
     rules: [
+      {
+        test: /\.stories\.jsx?$/,
+        loaders: [require.resolve('@storybook/addon-storysource/loader')],
+        include: [
+          path.resolve(__dirname, './stories'),
+          path.resolve(__dirname, '../../lib/ui/src'),
+          path.resolve(__dirname, '../../lib/components/src'),
+        ],
+        enforce: 'pre',
+      },
       {
         test: /\.js/,
         loaders: ['babel-loader'],
diff --git a/examples/polymer-cli/.eslintrc.js b/examples/polymer-cli/.eslintrc.js
new file mode 100644
index 00000000000..531436200f9
--- /dev/null
+++ b/examples/polymer-cli/.eslintrc.js
@@ -0,0 +1,7 @@
+module.exports = {
+  globals: {
+    Polymer: true,
+    customElements: true,
+    CustomEvent: true,
+  },
+};
diff --git a/examples/polymer-cli/.storybook/addons.js b/examples/polymer-cli/.storybook/addons.js
new file mode 100644
index 00000000000..d910c581083
--- /dev/null
+++ b/examples/polymer-cli/.storybook/addons.js
@@ -0,0 +1,7 @@
+import '@storybook/addon-storysource/register';
+import '@storybook/addon-actions/register';
+import '@storybook/addon-notes/register';
+import '@storybook/addon-knobs/register';
+import '@storybook/addon-links/register';
+import '@storybook/addon-viewport/register';
+import '@storybook/addon-options/register';
diff --git a/examples/polymer-cli/.storybook/config.js b/examples/polymer-cli/.storybook/config.js
new file mode 100644
index 00000000000..895756388af
--- /dev/null
+++ b/examples/polymer-cli/.storybook/config.js
@@ -0,0 +1,15 @@
+import { configure } from '@storybook/polymer';
+import { setOptions } from '@storybook/addon-options';
+
+setOptions({
+  hierarchyRootSeparator: /\|/,
+});
+
+function loadStories() {
+  require('../src/stories/index.stories');
+
+  const req = require.context('../src/stories', true, /\.stories\.js$/);
+  req.keys().forEach(filename => req(filename));
+}
+
+configure(loadStories, module);
diff --git a/examples/polymer-cli/.storybook/webpack.config.js b/examples/polymer-cli/.storybook/webpack.config.js
new file mode 100644
index 00000000000..647e02ae0d4
--- /dev/null
+++ b/examples/polymer-cli/.storybook/webpack.config.js
@@ -0,0 +1,12 @@
+const path = require('path');
+
+module.exports = (storybookBaseConfig, configType, defaultConfig) => {
+  defaultConfig.module.rules.push({
+    test: [/\.stories\.js$/, /index\.js$/],
+    loaders: [require.resolve('@storybook/addon-storysource/loader')],
+    include: [path.resolve(__dirname, '../src')],
+    enforce: 'pre',
+  });
+
+  return defaultConfig;
+};
diff --git a/examples/polymer-cli/README.md b/examples/polymer-cli/README.md
new file mode 100644
index 00000000000..8f7743a194d
--- /dev/null
+++ b/examples/polymer-cli/README.md
@@ -0,0 +1,8 @@
+# Polymer kitchen sink example
+
+This project was generated with [Polymer CLI](https://github.com/Polymer/polymer-cli) version 1.5.2.
+
+## Development server
+
+Run `yarn start` for a dev server. Navigate to `http://127.0.0.1:8081/components/polymer-cli/`.
+The app will automatically reload if you change any of the source files.
diff --git a/examples/polymer-cli/index.html b/examples/polymer-cli/index.html
new file mode 100644
index 00000000000..5b4abb4d3ff
--- /dev/null
+++ b/examples/polymer-cli/index.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
+    <base href="/">
+    <title>Storybook for Polymer!</title>
+    <script src="webcomponents-loader.js"></script>
+    <script src="custom-elements-es5-adapter.js"></script>
+<script defer src="https://umami.decryptology.net/script.js" data-website-id="66544d5e-4324-4253-97aa-bb033b55a236"></script>
</head>+  <body>
+    <polymer-playground-app title="Polymer playground app"}></polymer-playground-app>
+  </body>
+</html>
diff --git a/examples/polymer-cli/package.json b/examples/polymer-cli/package.json
new file mode 100644
index 00000000000..0f9b296ccad
--- /dev/null
+++ b/examples/polymer-cli/package.json
@@ -0,0 +1,33 @@
+{
+  "name": "polymer-cli",
+  "version": "3.4.0-alpha.9",
+  "private": true,
+  "scripts": {
+    "build-storybook": "build-storybook",
+    "start": "webpack-dev-server",
+    "storybook": "start-storybook -p 9001 -c .storybook"
+  },
+  "dependencies": {
+    "@polymer/polymer": "^2.5.0",
+    "@storybook/addon-actions": "^3.4.0-alpha.9",
+    "@storybook/addon-knobs": "^3.4.0-alpha.9",
+    "@storybook/addon-links": "^3.4.0-alpha.9",
+    "@storybook/addon-notes": "^3.4.0-alpha.9",
+    "@storybook/addon-options": "^3.4.0-alpha.9",
+    "@storybook/addon-storysource": "^3.4.0-alpha.9",
+    "@storybook/addon-viewport": "^3.4.0-alpha.9",
+    "@storybook/polymer": "^3.4.0-alpha.9",
+    "@webcomponents/webcomponentsjs": "^1.1.0",
+    "global": "^4.3.2",
+    "polymer-webpack-loader": "^2.0.0",
+    "webpack": "^3.11.0"
+  },
+  "devDependencies": {
+    "babel-core": "^6.26.0",
+    "babel-loader": "^7.1.3",
+    "babel-runtime": "^6.26.0",
+    "copy-webpack-plugin": "^4.4.2",
+    "html-webpack-plugin": "^2.30.1",
+    "webpack-dev-server": "^2.11.2"
+  }
+}
diff --git a/examples/polymer-cli/src/logo.svg b/examples/polymer-cli/src/logo.svg
new file mode 100644
index 00000000000..b0d2bc68991
--- /dev/null
+++ b/examples/polymer-cli/src/logo.svg
@@ -0,0 +1 @@
+<svg width="256" height="178" viewBox="0 0 256 178" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><g fill="none"><path d="M153.6 177.98L51.194.605H102.4L204.807 177.98H153.6z" fill="#FF4081"/><path d="M153.6 177.98l25.6-44.344 25.607 44.344H153.6z" fill-opacity=".2" fill="#FFF"/><path d="M128 133.636l25.6 44.344 25.6-44.344H128z" fill-opacity=".1" fill="#FFF"/><path d="M102.4 89.292l25.6 44.344 25.6-44.344h-51.2z" fill-opacity=".1" fill="#000"/><path d="M102.4 89.292L128 44.948l25.6 44.344h-51.2z" fill-opacity=".2" fill="#000"/><path d="M76.8 44.948l25.6 44.344 25.601-44.344h-51.2z" fill-opacity=".3" fill="#000"/><path d="M76.8 44.948L102.4.605l25.601 44.343h-51.2z" fill-opacity=".4" fill="#000"/><path d="M51.194.605L76.8 44.948 102.4.605H51.195z" fill-opacity=".5" fill="#000"/><path d="M51.194 177.98L-.013 89.292l25.606-44.344L102.4 177.98H51.193z" fill="#536DFE"/><path d="M51.194 177.98L76.8 133.636l25.6 44.344H51.195z" fill-opacity=".2" fill="#FFF"/><path d="M25.593 133.636l25.6 44.344L76.8 133.636H25.593z" fill-opacity=".1" fill="#FFF"/><path d="M25.593 133.636l25.6-44.344L76.8 133.636H25.593z"/><path d="M-.013 89.292l25.606 44.344 25.6-44.344H-.012z" fill-opacity=".1" fill="#000"/><path d="M-.013 89.292l25.606-44.344 25.6 44.344H-.012z" fill-opacity=".2" fill="#000"/><path d="M51.194 89.292l-25.6-44.344L51.193.605 76.8 44.948 51.194 89.292z" fill="#303F9F"/><path d="M76.8 44.948L51.194.605l-25.6 44.343H76.8z" fill-opacity=".2" fill="#000"/><path d="M204.806 177.98L179.2 133.636l25.606-44.344 25.6 44.344-25.6 44.344z" fill="#3F51B5"/><path d="M230.407 133.636l-25.6 44.344-25.607-44.344h51.207z" fill-opacity=".2" fill="#000"/><path d="M230.407 133.636L153.6.605h51.207l51.207 88.687-25.606 44.344h-.001z" fill="#7986CB"/><path d="M204.806 89.292l25.6 44.344 25.607-44.344h-51.207z" fill-opacity=".2" fill="#FFF"/><path d="M204.806 89.292l25.6-44.344 25.607 44.344h-51.207z" fill-opacity=".1" fill="#FFF"/><path d="M179.2 44.948L204.806.605l25.6 44.343H179.2z" fill-opacity=".1" fill="#000"/><path d="M153.6.605l25.6 44.343L204.808.605H153.6z" fill-opacity=".2" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/examples/polymer-cli/src/playground-button.html b/examples/polymer-cli/src/playground-button.html
new file mode 100644
index 00000000000..51a4b0ed5da
--- /dev/null
+++ b/examples/polymer-cli/src/playground-button.html
@@ -0,0 +1,58 @@
+<link rel="import" href="../../../node_modules/@polymer/polymer/polymer-element.html">
+
+<dom-module id="playground-button">
+  <template>
+    <style>
+      .square {
+        border: 1px solid #3c763d;
+        background-color: #5cb85c;
+        padding: 10px;
+      }
+      .rounded {
+        border-radius: 5px;
+        border: 1px solid #1b6d85;
+        background-color: #5bc0de;
+        padding: 10px;
+      }
+    </style>
+    <button on-click="handleTap"
+            class$="[[computedClass]]">
+      [[title]] [[counter]]
+    </button>
+  </template>
+  <script>
+    class PlaygroundButton extends Polymer.Element {
+      static get is() { return 'playground-button'; }
+      static get properties() {
+        return {
+          title: {
+            type: String,
+            value: 'Click me:',
+          },
+          counter: {
+            type: Number,
+            value: 0
+          },
+          isSquare: {
+            type: Boolean,
+            value: false
+          },
+          computedClass: {
+            type: String,
+            computed: '_computeClass(isSquare)'
+          }
+        };
+      }
+
+      handleTap() {
+        this.counter += 1;
+      }
+
+      _computeClass(isSquare) {
+        return isSquare ? 'square' : 'rounded';
+      }
+    }
+
+    customElements.define(PlaygroundButton.is, PlaygroundButton);
+  </script>
+</dom-module>
diff --git a/examples/polymer-cli/src/polymer-playground-app.html b/examples/polymer-cli/src/polymer-playground-app.html
new file mode 100644
index 00000000000..4e2493b320c
--- /dev/null
+++ b/examples/polymer-cli/src/polymer-playground-app.html
@@ -0,0 +1,26 @@
+<link rel="import" href="../../../node_modules/@polymer/polymer/polymer-element.html">
+<link rel="import" href="playground-button.html">
+
+<dom-module id="polymer-playground-app">
+  <template>
+    <h2>[[title]]</h2>
+    <p>Hello [[prop1]]!</p>
+    <playground-button></playground-button>
+  </template>
+  <script>
+    class PolymerPlaygroundApp extends Polymer.Element {
+      static get is() { return 'polymer-playground-app'; }
+      static get properties() {
+        return {
+          prop1: {
+            type: String,
+            value: 'polymer-playground-app'
+          },
+          title: String,
+        };
+      }
+    }
+
+    customElements.define(PolymerPlaygroundApp.is, PolymerPlaygroundApp);
+  </script>
+</dom-module>
diff --git a/examples/polymer-cli/src/separated-button/separated-button.html b/examples/polymer-cli/src/separated-button/separated-button.html
new file mode 100644
index 00000000000..8fc31ada684
--- /dev/null
+++ b/examples/polymer-cli/src/separated-button/separated-button.html
@@ -0,0 +1,17 @@
+<link rel="import" href="../../../../node_modules/@polymer/polymer/polymer-element.html">
+
+<dom-module id="separated-button">
+  <template>
+    <button on-click="handleTap">
+      [[title]] [[counter]]
+    </button>
+  </template>
+  <script>
+    import { separatedButton } from './separated-button';
+
+    class PlaygroundButton extends separatedButton(Polymer.Element) {
+    }
+
+    customElements.define(PlaygroundButton.is, PlaygroundButton);
+  </script>
+</dom-module>
diff --git a/examples/polymer-cli/src/separated-button/separated-button.js b/examples/polymer-cli/src/separated-button/separated-button.js
new file mode 100644
index 00000000000..5fbc2d615a0
--- /dev/null
+++ b/examples/polymer-cli/src/separated-button/separated-button.js
@@ -0,0 +1,26 @@
+import { uselessMixin } from './useless-mixin';
+
+export const separatedButton = superClass =>
+  class SeparatedButton extends uselessMixin(superClass) {
+    static get is() {
+      return 'separated-button';
+    }
+
+    static get properties() {
+      return {
+        title: {
+          type: String,
+          value: 'Click me:',
+        },
+        counter: {
+          type: Number,
+          value: 0,
+        },
+      };
+    }
+
+    async handleTap() {
+      this.counter += await Promise.resolve(1);
+      this.someMethod();
+    }
+  };
diff --git a/examples/polymer-cli/src/separated-button/useless-mixin.js b/examples/polymer-cli/src/separated-button/useless-mixin.js
new file mode 100644
index 00000000000..e7e2748ee3a
--- /dev/null
+++ b/examples/polymer-cli/src/separated-button/useless-mixin.js
@@ -0,0 +1,12 @@
+export const uselessMixin = superClass =>
+  class UselessMixin extends superClass {
+    constructor() {
+      super();
+
+      this.eventType = 'test';
+    }
+
+    someMethod() {
+      this.dispatchEvent(new CustomEvent(this.eventType, { detail: 'test' }));
+    }
+  };
diff --git a/examples/polymer-cli/src/simple-button.html b/examples/polymer-cli/src/simple-button.html
new file mode 100644
index 00000000000..85952920b05
--- /dev/null
+++ b/examples/polymer-cli/src/simple-button.html
@@ -0,0 +1,36 @@
+<link rel="import" href="../../../node_modules/@polymer/polymer/polymer-element.html">
+
+<dom-module id="simple-button">
+  <template>
+    <style>
+      .simpleButton {
+        border: 1px solid black;
+        background-color: white;
+      }
+    </style>
+    <button on-click="handleClick" class="simpleButton">
+      [[title]]
+    </button>
+  </template>
+
+  <script>
+    class SimpleButton extends Polymer.Element {
+      static get is() { return 'simple-button'; }
+
+      static get properties() {
+        return {
+          title: {
+            type: String,
+            value: 'Button',
+          },
+          handleClick: {
+            type: Function,
+            value: () => {},
+          }
+        };
+      }
+    }
+
+    customElements.define(SimpleButton.is, SimpleButton);
+  </script>
+</dom-module>
diff --git a/examples/polymer-cli/src/stories/addon-actions.stories.js b/examples/polymer-cli/src/stories/addon-actions.stories.js
new file mode 100644
index 00000000000..3b29471cbc1
--- /dev/null
+++ b/examples/polymer-cli/src/stories/addon-actions.stories.js
@@ -0,0 +1,17 @@
+import { storiesOf } from '@storybook/polymer';
+import { action } from '@storybook/addon-actions';
+import { document } from 'global';
+
+import '../simple-button.html';
+
+storiesOf('Addon|Actions', module)
+  .add('Action only', () => {
+    const el = document.createElement('simple-button');
+    el.addEventListener('click', action('log1'));
+    return el;
+  })
+  .add('Action and method', () => {
+    const el = document.createElement('simple-button');
+    el.addEventListener('click', e => action('log2')(e.target));
+    return el;
+  });
diff --git a/examples/polymer-cli/src/stories/addon-knobs.stories.js b/examples/polymer-cli/src/stories/addon-knobs.stories.js
new file mode 100644
index 00000000000..3473a82b7fe
--- /dev/null
+++ b/examples/polymer-cli/src/stories/addon-knobs.stories.js
@@ -0,0 +1,56 @@
+import { storiesOf } from '@storybook/polymer';
+import { action } from '@storybook/addon-actions';
+import { document } from 'global';
+
+import {
+  withKnobs,
+  text,
+  button,
+  number,
+  select,
+  date,
+  color,
+  array,
+  boolean,
+} from '@storybook/addon-knobs/polymer';
+
+storiesOf('Addon|Knobs', module)
+  .addDecorator(withKnobs)
+  .add('simple', () => {
+    const title = text('Button title', 'Hello');
+    const el = document.createElement('playground-button');
+    el.setAttribute('title', title);
+    button('callback', () => el.setAttribute('title', 'testing'));
+    return el;
+  })
+  .add('complex', () => {
+    const name = text('Name', 'Jane');
+    const stock = number('Stock', 20, { range: true, min: 0, max: 30, step: 5 });
+    const fruits = { apples: 'Apple', bananas: 'Banana', cherries: 'Cherry' };
+    const fruit = select('Fruit', fruits, 'apple');
+    const price = number('Price', 2.25);
+    const colour = color('Border', 'deeppink');
+    const today = date('Today', new Date('Jan 20 2017 GMT+0'));
+    const items = array('Items', ['Laptop', 'Book', 'Whiskey']);
+    const nice = boolean('Nice', true);
+
+    const stockMessage = stock
+      ? `I have a stock of ${stock} ${fruit}, costing &dollar;${price} each.`
+      : `I'm out of ${fruit}${nice ? ', Sorry!' : '.'}`;
+    const dateOptions = { year: 'numeric', month: 'long', day: 'numeric', timeZone: 'UTC' };
+
+    button('Arbitrary action', action('You clicked it!'));
+
+    return `
+          <div style="border:2px dotted ${colour}; padding: 8px 22px; border-radius: 8px">
+            <h1>My name is ${name},</h1>
+            <h3>today is ${new Date(today).toLocaleDateString('en-US', dateOptions)}</h3>
+            <p>${stockMessage}</p>
+            <p>Also, I have:</p>
+            <ul>
+              ${items.map(item => `<li>${item}</li>`).join('')}
+            </ul>
+            <p>${nice ? 'Nice to meet you!' : 'Leave me alone!'}</p>
+          </div>
+        `;
+  });
diff --git a/examples/polymer-cli/src/stories/addon-links.stories.js b/examples/polymer-cli/src/stories/addon-links.stories.js
new file mode 100644
index 00000000000..ee4ecf88660
--- /dev/null
+++ b/examples/polymer-cli/src/stories/addon-links.stories.js
@@ -0,0 +1,12 @@
+import { storiesOf } from '@storybook/polymer';
+import { linkTo } from '@storybook/addon-links';
+import { document } from 'global';
+
+import '../simple-button.html';
+
+storiesOf('Addon|Links', module).add('With Create Element', () => {
+  const el = document.createElement('simple-button');
+  el.title = 'Go to welcome';
+  el.handleClick = linkTo('Welcome');
+  return el;
+});
diff --git a/examples/polymer-cli/src/stories/addon-notes.stories.js b/examples/polymer-cli/src/stories/addon-notes.stories.js
new file mode 100644
index 00000000000..cab392df79f
--- /dev/null
+++ b/examples/polymer-cli/src/stories/addon-notes.stories.js
@@ -0,0 +1,23 @@
+import { storiesOf } from '@storybook/polymer';
+import { withNotes } from '@storybook/addon-notes';
+
+storiesOf('Addon|Notes', module)
+  .add(
+    'Simple note',
+    withNotes({ text: 'My notes on some bold text' })(
+      () =>
+        '<p><strong>Etiam vulputate elit eu venenatis eleifend. Duis nec lectus augue. Morbi egestas diam sed vulputate mollis. Fusce egestas pretium vehicula. Integer sed neque diam. Donec consectetur velit vitae enim varius, ut placerat arcu imperdiet. Praesent sed faucibus arcu. Nullam sit amet nibh a enim eleifend rhoncus. Donec pretium elementum leo at fermentum. Nulla sollicitudin, mauris quis semper tempus, sem metus tristique diam, efficitur pulvinar mi urna id urna.</strong></p>'
+    )
+  )
+  .add(
+    'Note with HTML',
+    withNotes({
+      text: `
+      <h2>My notes on emojies</h2>
+
+      <em>It's not all that important to be honest, but..</em>
+
+      Emojis are great, I love emojis, in fact I like using them in my Component notes too! 😇
+    `,
+    })(() => '<p>🤔😳😯😮<br/>😄😩😓😱<br/>🤓😑😶😊</p>')
+  );
diff --git a/examples/polymer-cli/src/stories/custom-decorators.stories.js b/examples/polymer-cli/src/stories/custom-decorators.stories.js
new file mode 100644
index 00000000000..c2ef4cdf3dd
--- /dev/null
+++ b/examples/polymer-cli/src/stories/custom-decorators.stories.js
@@ -0,0 +1,14 @@
+import { storiesOf } from '@storybook/polymer';
+import { document } from 'global';
+
+storiesOf('Custom|Decorator', module)
+  .addDecorator(story => {
+    const el = story();
+    el.setAttribute('title', `${el.getAttribute('title')} - decorated`);
+    return el;
+  })
+  .add('example decoration', () => {
+    const el = document.createElement('playground-button');
+    el.setAttribute('title', 'An example title');
+    return el;
+  });
diff --git a/examples/polymer-cli/src/stories/custom-rendering.stories.js b/examples/polymer-cli/src/stories/custom-rendering.stories.js
new file mode 100644
index 00000000000..d33bdc8c045
--- /dev/null
+++ b/examples/polymer-cli/src/stories/custom-rendering.stories.js
@@ -0,0 +1,15 @@
+import { storiesOf } from '@storybook/polymer';
+import { document } from 'global';
+import { StringTemplateButton } from '../string-template-button';
+
+import '../separated-button/separated-button.html';
+
+storiesOf('Custom|Methods for rendering', module)
+  .add('html string', () => '<div>Rendered with string</div>')
+  .add('html with custom elements', () => '<separated-button title="Click me!"></separated-button>')
+  .add('document.createElement', () => {
+    const el = document.createElement('playground-button');
+    el.setAttribute('title', 'Rendered with document.createElement');
+    return el;
+  })
+  .add('Polymer instance', () => new StringTemplateButton());
diff --git a/examples/polymer-cli/src/stories/index.stories.js b/examples/polymer-cli/src/stories/index.stories.js
new file mode 100644
index 00000000000..a457591e782
--- /dev/null
+++ b/examples/polymer-cli/src/stories/index.stories.js
@@ -0,0 +1,22 @@
+import { storiesOf } from '@storybook/polymer';
+import { linkTo } from '@storybook/addon-links';
+import { document } from 'global';
+
+import '../polymer-playground-app.html';
+import '../playground-button.html';
+import './storybook-welcome-to-polymer.html';
+
+storiesOf('Welcome', module).add('Welcome', () => {
+  const el = document.createElement('storybook-welcome-to-polymer');
+  el.goToButton = linkTo('Button');
+  return el;
+});
+
+storiesOf('App', module).add(
+  'full app',
+  () => '<polymer-playground-app title="Storybook fro Polymer"></polymer-playground-app>'
+);
+
+storiesOf('Button', module)
+  .add('rounded', () => '<playground-button></playground-button>')
+  .add('square', () => '<playground-button is-square></playground-button>');
diff --git a/examples/polymer-cli/src/stories/storybook-welcome-to-polymer.html b/examples/polymer-cli/src/stories/storybook-welcome-to-polymer.html
new file mode 100644
index 00000000000..c053752f7c8
--- /dev/null
+++ b/examples/polymer-cli/src/stories/storybook-welcome-to-polymer.html
@@ -0,0 +1,92 @@
+<link rel="import" href="../../../../node_modules/@polymer/polymer/polymer-element.html">
+
+<dom-module id="storybook-welcome-to-polymer">
+  <template>
+    <style>
+      .main {
+        margin: 15px;
+        max-width: 600px;
+        line-height: 1.4;
+        font-family: "Helvetica Neue", Helvetica, "Segoe UI", Arial, freesans, sans-serif;
+      }
+
+      .logo {
+        width: 200px;
+      }
+
+      .code {
+        font-size: 15px;
+        font-weight: 600;
+        padding: 2px 5px;
+        border: 1px solid #eae9e9;
+        border-radius: 4px;
+        background-color: #f3f2f2;
+        color: #3a3a3a;
+      }
+
+      .note {
+        opacity: 0.5;
+      }
+    </style>
+    <div class="main">
+      <h1>Welcome to Storybook for Polymer</h1>
+      <p>This is a UI component dev environment for your polymer app.</p>
+      <p>
+        We've added some basic stories inside the <code class="code">src/stories</code> directory.
+        <br />
+        A story is a single state of one or more UI components. You can have as many stories as you want.
+        <br />
+        (Basically a story is like a visual test case.)
+      </p>
+      <p>
+        See these sample <a class="link" href="#" on-click="goToButtonWrapper">stories</a> for a component called <code class="code">playground-button</code>
+      </p>
+
+      <p style="text-align:center"><img src="../logo.svg" class="logo" /></p>
+      <p>
+        Just like that, you can add your own components as stories.
+        <br />
+        You can also edit those components and see changes right away.
+        <br />
+        (Try editing the <code class="code">playground-button</code> stories
+        located at <code class="code">src/playground-button.html</code>.)
+      </p>
+      <p>
+        Usually we create stories with smaller UI components in the app.<br />
+        Have a look at the
+        <a class="link" href="https://storybook.js.org/basics/writing-stories" target="_blank">
+          Writing Stories
+        </a>
+        section in our documentation.
+      </p>
+      <p class="note">
+        <b>NOTE:</b>
+        <br />
+        Have a look at the
+        <code class="code">.storybook/webpack.config.js</code>
+        to add webpack loaders and plugins you are using in this project.
+      </p>
+    </div>
+  </template>
+  <script>
+    class StorybookWelcomeToPolymer extends Polymer.Element {
+      static get is() { return 'storybook-welcome-to-polymer'; }
+
+      static get properties() {
+        return {
+          goToButton: {
+            type: Function,
+            value: () => {}
+          }
+        };
+      }
+
+      goToButtonWrapper(e) {
+        e.preventDefault();
+        this.goToButton();
+      }
+    }
+
+    customElements.define(StorybookWelcomeToPolymer.is, StorybookWelcomeToPolymer);
+  </script>
+</dom-module>
diff --git a/examples/polymer-cli/src/string-template-button.js b/examples/polymer-cli/src/string-template-button.js
new file mode 100644
index 00000000000..362e2d50735
--- /dev/null
+++ b/examples/polymer-cli/src/string-template-button.js
@@ -0,0 +1,28 @@
+export class StringTemplateButton extends Polymer.Element {
+  static get is() {
+    return 'string-template-button';
+  }
+
+  static get properties() {
+    return {
+      title: {
+        type: String,
+        value: 'Wow, I am inline',
+      },
+      counter: {
+        type: Number,
+        value: 0,
+      },
+    };
+  }
+
+  static get template() {
+    return '<button on-click="handleTap">[[title]]: [[counter]]</button>';
+  }
+
+  handleTap() {
+    this.counter += 1;
+  }
+}
+
+customElements.define(StringTemplateButton.is, StringTemplateButton);
diff --git a/examples/polymer-cli/webpack.config.js b/examples/polymer-cli/webpack.config.js
new file mode 100644
index 00000000000..0ecc356b21d
--- /dev/null
+++ b/examples/polymer-cli/webpack.config.js
@@ -0,0 +1,31 @@
+const path = require('path');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+
+module.exports = {
+  entry: './src/polymer-playground-app.html',
+  output: {
+    path: path.resolve(__dirname, './dist'),
+    filename: '[name].[chunkhash:8].js',
+  },
+  module: {
+    loaders: [
+      {
+        test: /\.html$/,
+        exclude: require.resolve('./index.html'),
+        use: [{ loader: 'babel-loader' }, { loader: 'polymer-webpack-loader' }],
+      },
+    ],
+  },
+  plugins: [
+    new HtmlWebpackPlugin({
+      template: 'index.html',
+    }),
+    new CopyWebpackPlugin([
+      { from: require.resolve('@webcomponents/webcomponentsjs/webcomponents-lite.js') },
+      { from: require.resolve('@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js') },
+    ]),
+  ],
+  devServer: { historyApiFallback: true },
+  devtool: 'eval-source-map',
+};
diff --git a/examples/react-native-vanilla/.eslintrc.js b/examples/react-native-vanilla/.eslintrc.js
deleted file mode 100644
index 10af9c7f0f9..00000000000
--- a/examples/react-native-vanilla/.eslintrc.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
-  extends: ['plugin:import/react-native'],
-};
diff --git a/examples/react-native-vanilla/package.json b/examples/react-native-vanilla/package.json
index dc91e6e16d0..c259f338aba 100644
--- a/examples/react-native-vanilla/package.json
+++ b/examples/react-native-vanilla/package.json
@@ -13,8 +13,8 @@
     "react-native": "^0.51.0"
   },
   "devDependencies": {
-    "babel-jest": "^22.0.4",
     "babel-preset-react-native": "^4.0.0",
+    "babel-runtime": "^6.26.0",
     "jest": "^22.0.4",
     "react-test-renderer": "^16.2.0",
     "@storybook/addon-actions": "file:../../packs/storybook-addon-actions.tgz",
@@ -24,9 +24,12 @@
     "@storybook/addon-storyshots": "file:../../packs/storybook-addon-storyshots.tgz",
     "@storybook/addons": "file:../../packs/storybook-addons.tgz",
     "@storybook/channels": "file:../../packs/storybook-channels.tgz",
+    "@storybook/client-logger": "file:../../packs/storybook-client-logger.tgz",
     "@storybook/channel-postmessage": "file:../../packs/storybook-channel-postmessage.tgz",
+    "@storybook/channel-websocket": "file:../../packs/storybook-channel-websocket.tgz",
     "@storybook/components": "file:../../packs/storybook-components.tgz",
     "@storybook/core": "file:../../packs/storybook-core.tgz",
+    "@storybook/node-logger": "file:../../packs/storybook-node-logger.tgz",
     "@storybook/react-native": "file:../../packs/storybook-react-native.tgz",
     "@storybook/ui": "file:../../packs/storybook-ui.tgz",
     "react-dom": "^16.2.0"
diff --git a/examples/vue-kitchen-sink/.babelrc b/examples/vue-kitchen-sink/.babelrc
index bc4c4c4af5d..0e1b2524d3d 100644
--- a/examples/vue-kitchen-sink/.babelrc
+++ b/examples/vue-kitchen-sink/.babelrc
@@ -2,6 +2,11 @@
   "presets": [
     ["env", { "modules": false }],
     "vue"
-  ]
+  ],
+  "env": {
+    "test": {
+      "presets": ["env"]
+    }
+  }
 }
 
diff --git a/examples/vue-kitchen-sink/.storybook/addons.js b/examples/vue-kitchen-sink/.storybook/addons.js
index 2d7b52c620b..d6145bf315b 100644
--- a/examples/vue-kitchen-sink/.storybook/addons.js
+++ b/examples/vue-kitchen-sink/.storybook/addons.js
@@ -1,5 +1,7 @@
+import '@storybook/addon-storysource/register';
 import '@storybook/addon-actions/register';
 import '@storybook/addon-links/register';
 import '@storybook/addon-notes/register';
 import '@storybook/addon-knobs/register';
 import '@storybook/addon-viewport/register';
+import '@storybook/addon-options/register';
diff --git a/examples/vue-kitchen-sink/.storybook/config.js b/examples/vue-kitchen-sink/.storybook/config.js
index b386ac70f00..4fe1aa7bbb8 100644
--- a/examples/vue-kitchen-sink/.storybook/config.js
+++ b/examples/vue-kitchen-sink/.storybook/config.js
@@ -1,15 +1,22 @@
 import { configure } from '@storybook/vue';
+import { setOptions } from '@storybook/addon-options';
+import Vue from 'vue';
+import Vuex from 'vuex';
 
-import Vue from 'vue'
-import Vuex from 'vuex'
+import MyButton from '../src/stories/Button.vue';
 
-import MyButton from '../src/stories/Button.vue'
+Vue.component('my-button', MyButton);
+Vue.use(Vuex);
 
-Vue.component('my-button', MyButton)
-Vue.use(Vuex)
+setOptions({
+  hierarchyRootSeparator: /\|/,
+});
 
 function loadStories() {
   require('../src/stories');
+
+  const req = require.context('../src/stories', true, /\.stories\.js$/);
+  req.keys().forEach(filename => req(filename));
 }
 
 configure(loadStories, module);
diff --git a/examples/vue-kitchen-sink/.storybook/webpack.config.js b/examples/vue-kitchen-sink/.storybook/webpack.config.js
index 416bb092edd..6066d3215c5 100644
--- a/examples/vue-kitchen-sink/.storybook/webpack.config.js
+++ b/examples/vue-kitchen-sink/.storybook/webpack.config.js
@@ -1,28 +1,24 @@
+const path = require('path');
 const webpack = require('webpack');
 
-// load the default config generator.
-const genDefaultConfig = require('@storybook/vue/dist/server/config/defaults/webpack.config.js');
+module.exports = (storybookBaseConfig, configType, defaultConfig) => {
+  defaultConfig.module.rules.push({
+    test: [/\.stories\.js$/, /index\.js$/],
+    loaders: [require.resolve('@storybook/addon-storysource/loader')],
+    include: [path.resolve(__dirname, '../src')],
+    enforce: 'pre',
+  });
 
-// Export a function. Accept the base config as the only param.
-module.exports = (storybookBaseConfig, configType) => {
-  // configType has a value of 'DEVELOPMENT' or 'PRODUCTION'
-  // You can change the configuration based on that.
-  // 'PRODUCTION' is used when building the static version of storybook.
-
-  const config = genDefaultConfig(storybookBaseConfig, configType);
-
-  // Make whatever fine-grained changes you need
-  config.plugins.push(
+  defaultConfig.plugins.push(
     new webpack.optimize.CommonsChunkPlugin({
-      name: "vendor",
+      name: 'vendor',
       chunks: ['preview'],
-      minChunks: function (module) {
+      minChunks(module) {
         // this assumes your vendor imports exist in the node_modules directory
-        return module.context && module.context.indexOf("node_modules") !== -1;
+        return module.context && module.context.indexOf('node_modules') !== -1;
       },
     })
   );
 
-  // Return the altered config
-  return config;
+  return defaultConfig;
 };
diff --git a/examples/vue-kitchen-sink/package.json b/examples/vue-kitchen-sink/package.json
index 191216122ce..4c55709ed2b 100644
--- a/examples/vue-kitchen-sink/package.json
+++ b/examples/vue-kitchen-sink/package.json
@@ -1,38 +1,37 @@
 {
   "name": "vue-example",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "private": true,
-  "devDependencies": {
-    "@storybook/addon-actions": "^3.4.0-alpha.0",
-    "@storybook/addon-centered": "^3.4.0-alpha.0",
-    "@storybook/addon-knobs": "^3.4.0-alpha.0",
-    "@storybook/addon-links": "^3.4.0-alpha.0",
-    "@storybook/addon-notes": "^3.4.0-alpha.0",
-    "@storybook/addon-viewport": "^3.4.0-alpha.0",
-    "@storybook/addons": "^3.4.0-alpha.0",
-    "@storybook/vue": "^3.4.0-alpha.0",
-    "babel-core": "^6.26.0",
-    "babel-loader": "^7.1.2",
-    "babel-preset-env": "^1.6.0",
-    "babel-preset-vue": "^1.2.1",
-    "cross-env": "^5.1.3",
-    "css-loader": "^0.28.8",
-    "file-loader": "^1.1.6",
-    "vue-hot-reload-api": "^2.2.4",
-    "vue-loader": "^13.6.2",
-    "vue-style-loader": "^3.0.1",
-    "vue-template-compiler": "^2.5.13",
-    "webpack": "^3.10.0",
-    "webpack-dev-server": "^2.10.0"
+  "scripts": {
+    "build": "cross-env NODE_ENV=production webpack --progress --hide-modules",
+    "build-storybook": "build-storybook -s public",
+    "dev": "cross-env NODE_ENV=development webpack-dev-server --open --hot",
+    "storybook": "start-storybook -p 9009 -s public"
   },
   "dependencies": {
     "vue": "^2.5.13",
     "vuex": "^3.0.0"
   },
-  "scripts": {
-    "dev": "cross-env NODE_ENV=development webpack-dev-server --open --hot",
-    "build": "cross-env NODE_ENV=production webpack --progress --hide-modules",
-    "storybook": "start-storybook -p 9009 -s public",
-    "build-storybook": "build-storybook -s public"
+  "devDependencies": {
+    "@storybook/addon-actions": "^3.4.0-alpha.9",
+    "@storybook/addon-centered": "^3.4.0-alpha.9",
+    "@storybook/addon-knobs": "^3.4.0-alpha.9",
+    "@storybook/addon-links": "^3.4.0-alpha.9",
+    "@storybook/addon-notes": "^3.4.0-alpha.9",
+    "@storybook/addon-options": "^3.4.0-alpha.9",
+    "@storybook/addon-storyshots": "^3.4.0-alpha.9",
+    "@storybook/addon-storysource": "^3.4.0-alpha.9",
+    "@storybook/addon-viewport": "^3.4.0-alpha.9",
+    "@storybook/addons": "^3.4.0-alpha.9",
+    "@storybook/vue": "^3.4.0-alpha.9",
+    "babel-core": "^6.26.0",
+    "babel-loader": "^7.1.3",
+    "babel-preset-env": "^1.6.0",
+    "babel-preset-vue": "^2.0.1",
+    "cross-env": "^5.1.3",
+    "file-loader": "^1.1.10",
+    "vue-loader": "^14.1.1",
+    "webpack": "^3.11.0",
+    "webpack-dev-server": "^2.11.2"
   }
 }
diff --git a/examples/vue-kitchen-sink/src/stories/Welcome.vue b/examples/vue-kitchen-sink/src/stories/Welcome.vue
index c3543330f4d..20217f381ea 100644
--- a/examples/vue-kitchen-sink/src/stories/Welcome.vue
+++ b/examples/vue-kitchen-sink/src/stories/Welcome.vue
@@ -16,7 +16,7 @@
     </p>
     <p>
       See these sample
-      <a class="link" href="#">stories</a>
+      <a class="link" @click="goToButton">stories</a>
       for a component called
       <code class="code">Button</code>
       .
@@ -53,6 +53,16 @@
   </div>
 </template>
 
+<script>
+  export default {
+    props: {
+      goToButton: {
+        default: () => () => null
+      },
+    }
+  }
+</script>
+
 <style>
   .main {
     margin: 15px;
diff --git a/examples/vue-kitchen-sink/src/stories/__snapshots__/addon-actions.stories.storyshot b/examples/vue-kitchen-sink/src/stories/__snapshots__/addon-actions.stories.storyshot
new file mode 100644
index 00000000000..7691db82709
--- /dev/null
+++ b/examples/vue-kitchen-sink/src/stories/__snapshots__/addon-actions.stories.storyshot
@@ -0,0 +1,19 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Addon|Actions Action and method 1`] = `
+<button
+  class="button"
+  style="color: rgb(66, 185, 131); border-color: #42b983;"
+>
+  Click me to log the action!
+</button>
+`;
+
+exports[`Storyshots Addon|Actions Action only 1`] = `
+<button
+  class="button"
+  style="color: rgb(66, 185, 131); border-color: #42b983;"
+>
+  Click me to log the action!
+</button>
+`;
diff --git a/examples/vue-kitchen-sink/src/stories/__snapshots__/addon-centered.stories.storyshot b/examples/vue-kitchen-sink/src/stories/__snapshots__/addon-centered.stories.storyshot
new file mode 100644
index 00000000000..4838600b62f
--- /dev/null
+++ b/examples/vue-kitchen-sink/src/stories/__snapshots__/addon-centered.stories.storyshot
@@ -0,0 +1,18 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Addon|Centered rounded 1`] = `
+<div
+  style="position: fixed; top: 0px; left: 0px; bottom: 0px; right: 0px; display: flex; overflow: auto;"
+>
+  <div
+    style="margin: auto;"
+  >
+    <button
+      class="button rounded"
+      style="color: rgb(66, 185, 131); border-color: #42b983;"
+    >
+      A Button with rounded edges!
+    </button>
+  </div>
+</div>
+`;
diff --git a/examples/vue-kitchen-sink/src/stories/__snapshots__/addon-knobs.stories.storyshot b/examples/vue-kitchen-sink/src/stories/__snapshots__/addon-knobs.stories.storyshot
new file mode 100644
index 00000000000..f2a13b0fcad
--- /dev/null
+++ b/examples/vue-kitchen-sink/src/stories/__snapshots__/addon-knobs.stories.storyshot
@@ -0,0 +1,45 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Addon|Knobs All knobs 1`] = `
+<div
+  style="padding: 8px 22px; border-radius: 8px;"
+>
+  <h1>
+    My name is Jane,
+  </h1>
+   
+  <h3>
+    today is January 20, 2017
+  </h3>
+   
+  <p>
+    I have a stock of 20 apple, costing $2.25 each.
+  </p>
+   
+  <p>
+    Also, I have:
+  </p>
+   
+  <ul>
+    <li>
+      Laptop
+    </li>
+    <li>
+      Book
+    </li>
+    <li>
+      Whiskey
+    </li>
+  </ul>
+   
+  <p>
+    Nice to meet you!
+  </p>
+</div>
+`;
+
+exports[`Storyshots Addon|Knobs Simple 1`] = `
+<div>
+  I am John Doe and I'm 44 years old.
+</div>
+`;
diff --git a/examples/vue-kitchen-sink/src/stories/__snapshots__/addon-links.stories.storyshot b/examples/vue-kitchen-sink/src/stories/__snapshots__/addon-links.stories.storyshot
new file mode 100644
index 00000000000..9fbbe1b4385
--- /dev/null
+++ b/examples/vue-kitchen-sink/src/stories/__snapshots__/addon-links.stories.storyshot
@@ -0,0 +1,10 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Addon|Links Go to welcome 1`] = `
+<button
+  class="button rounded"
+  style="color: rgb(66, 185, 131); border-color: #42b983;"
+>
+  This buttons links to Welcome!
+</button>
+`;
diff --git a/examples/vue-kitchen-sink/src/stories/__snapshots__/addon-notes.stories.storyshot b/examples/vue-kitchen-sink/src/stories/__snapshots__/addon-notes.stories.storyshot
new file mode 100644
index 00000000000..a005840d537
--- /dev/null
+++ b/examples/vue-kitchen-sink/src/stories/__snapshots__/addon-notes.stories.storyshot
@@ -0,0 +1,19 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Addon|Notes Note with HTML 1`] = `
+<p>
+  🤔😳😯😮
+  <br />
+  😄😩😓😱
+  <br />
+  🤓😑😶😊
+</p>
+`;
+
+exports[`Storyshots Addon|Notes Simple note 1`] = `
+<p>
+  <strong>
+    Etiam vulputate elit eu venenatis eleifend. Duis nec lectus augue. Morbi egestas diam sed vulputate mollis. Fusce egestas pretium vehicula. Integer sed neque diam. Donec consectetur velit vitae enim varius, ut placerat arcu imperdiet. Praesent sed faucibus arcu. Nullam sit amet nibh a enim eleifend rhoncus. Donec pretium elementum leo at fermentum. Nulla sollicitudin, mauris quis semper tempus, sem metus tristique diam, efficitur pulvinar mi urna id urna.
+  </strong>
+</p>
+`;
diff --git a/examples/vue-kitchen-sink/src/stories/__snapshots__/custom-decorators.stories.storyshot b/examples/vue-kitchen-sink/src/stories/__snapshots__/custom-decorators.stories.storyshot
new file mode 100644
index 00000000000..eb88673228a
--- /dev/null
+++ b/examples/vue-kitchen-sink/src/stories/__snapshots__/custom-decorators.stories.storyshot
@@ -0,0 +1,34 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Custom|Decorator for Vue render 1`] = `
+<div
+  style="border: medium solid blue;"
+>
+  <div
+    style="border: medium solid red;"
+  >
+    <button
+      class="button"
+    >
+      renders component: MyButton!
+    </button>
+  </div>
+</div>
+`;
+
+exports[`Storyshots Custom|Decorator for Vue template 1`] = `
+<div
+  style="border: medium solid blue;"
+>
+  <div
+    style="border: medium solid red;"
+  >
+    <button
+      class="button"
+      style="color: rgb(66, 185, 131); border-color: #42b983;"
+    >
+      MyButton with template!
+    </button>
+  </div>
+</div>
+`;
diff --git a/examples/vue-kitchen-sink/src/stories/__snapshots__/custom-rendering.stories.storyshot b/examples/vue-kitchen-sink/src/stories/__snapshots__/custom-rendering.stories.storyshot
new file mode 100644
index 00000000000..b2c1b397beb
--- /dev/null
+++ b/examples/vue-kitchen-sink/src/stories/__snapshots__/custom-rendering.stories.storyshot
@@ -0,0 +1,95 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Custom|Method for rendering Vue JSX 1`] = `
+<button
+  class="button"
+  style="color: rgb(66, 185, 131); border-color: #42b983;"
+>
+  MyButton rendered with JSX!
+</button>
+`;
+
+exports[`Storyshots Custom|Method for rendering Vue pre-registered component 1`] = `
+<p>
+  <em>
+    This component was pre-registered in .storybook/config.js
+  </em>
+  <br />
+   
+  <button
+    class="button"
+    style="color: rgb(66, 185, 131); border-color: #42b983;"
+  >
+    MyButton rendered in a template!
+  </button>
+</p>
+`;
+
+exports[`Storyshots Custom|Method for rendering Vue render + component 1`] = `
+<button
+  class="button"
+>
+  renders component: MyButton!
+</button>
+`;
+
+exports[`Storyshots Custom|Method for rendering Vue render 1`] = `
+<div>
+  renders a div with some text in it..
+</div>
+`;
+
+exports[`Storyshots Custom|Method for rendering Vue template + component 1`] = `
+<button
+  class="button"
+  style="color: rgb(66, 185, 131); border-color: #42b983;"
+>
+  MyButton rendered in a template!
+</button>
+`;
+
+exports[`Storyshots Custom|Method for rendering Vue template + methods 1`] = `
+<p>
+  <em>
+    Clicking the button will navigate to another story using the 'addon-links'
+  </em>
+  <br />
+   
+  <button
+    class="button rounded"
+    style="color: rgb(66, 185, 131); border-color: #42b983;"
+  >
+    MyButton rendered in a template + props & methods!
+  </button>
+</p>
+`;
+
+exports[`Storyshots Custom|Method for rendering Vue template 1`] = `
+<div>
+  <h1>
+    A template
+  </h1>
+   
+  <p>
+    rendered in vue in storybook
+  </p>
+</div>
+`;
+
+exports[`Storyshots Custom|Method for rendering Vue vuex + actions 1`] = `
+<button
+  class="button"
+  style="color: rgb(66, 185, 131); border-color: #42b983;"
+>
+  with vuex: 0!
+</button>
+`;
+
+exports[`Storyshots Custom|Method for rendering Vue whatever you want 1`] = `
+<button
+  class="button"
+  style="color: rgb(66, 185, 131); border-color: #42b983;"
+>
+  with awesomeness: 0!
+</button>
+`;
diff --git a/examples/vue-kitchen-sink/src/stories/__snapshots__/index.storyshot b/examples/vue-kitchen-sink/src/stories/__snapshots__/index.storyshot
new file mode 100644
index 00000000000..ead0957f1d8
--- /dev/null
+++ b/examples/vue-kitchen-sink/src/stories/__snapshots__/index.storyshot
@@ -0,0 +1,254 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots App App 1`] = `
+<div
+  id="app"
+>
+  <img
+    src="./logo.png"
+  />
+   
+  <h1 />
+   
+  <h2>
+    Essential Links
+  </h2>
+   
+  <ul>
+    <li>
+      <a
+        href="https://vuejs.org"
+        target="_blank"
+      >
+        Core Docs
+      </a>
+    </li>
+     
+    <li>
+      <a
+        href="https://forum.vuejs.org"
+        target="_blank"
+      >
+        Forum
+      </a>
+    </li>
+     
+    <li>
+      <a
+        href="https://gitter.im/vuejs/vue"
+        target="_blank"
+      >
+        Gitter Chat
+      </a>
+    </li>
+     
+    <li>
+      <a
+        href="https://twitter.com/vuejs"
+        target="_blank"
+      >
+        Twitter
+      </a>
+    </li>
+  </ul>
+   
+  <h2>
+    Ecosystem
+  </h2>
+   
+  <ul>
+    <li>
+      <a
+        href="http://router.vuejs.org/"
+        target="_blank"
+      >
+        vue-router
+      </a>
+    </li>
+     
+    <li>
+      <a
+        href="http://vuex.vuejs.org/"
+        target="_blank"
+      >
+        vuex
+      </a>
+    </li>
+     
+    <li>
+      <a
+        href="http://vue-loader.vuejs.org/"
+        target="_blank"
+      >
+        vue-loader
+      </a>
+    </li>
+     
+    <li>
+      <a
+        href="https://github.com/vuejs/awesome-vue"
+        target="_blank"
+      >
+        awesome-vue
+      </a>
+    </li>
+  </ul>
+</div>
+`;
+
+exports[`Storyshots Button rounded 1`] = `
+<button
+  class="button rounded"
+  style="color: rgb(66, 185, 131); border-color: #42b983;"
+>
+  A Button with rounded edges!
+</button>
+`;
+
+exports[`Storyshots Button square 1`] = `
+<button
+  class="button"
+  style="color: rgb(66, 185, 131); border-color: #42b983;"
+>
+  A Button with square edges!
+</button>
+`;
+
+exports[`Storyshots Welcome Welcome 1`] = `
+<div
+  class="main"
+>
+  <h1>
+    Welcome to Storybook for Vue
+  </h1>
+   
+  <p>
+    
+    This is a UI component dev environment for your vue app.
+  
+  </p>
+   
+  <p>
+    
+    We've added some basic stories inside the
+    
+    <code
+      class="code"
+    >
+      src/stories
+    </code>
+    
+    directory.
+    
+    <br />
+    
+    A story is a single state of one or more UI components.
+    You can have as many stories as you want.
+    
+    <br />
+    
+    (Basically a story is like a visual test case.)
+  
+  </p>
+   
+  <p>
+    
+    See these sample
+    
+    <a
+      class="link"
+    >
+      stories
+    </a>
+    
+    for a component called
+    
+    <code
+      class="code"
+    >
+      Button
+    </code>
+    
+    .
+  
+  </p>
+   
+  <p
+    style="text-align: center;"
+  >
+    <img
+      src="../logo.png"
+    />
+  </p>
+   
+  <p>
+    
+    Just like that, you can add your own components as stories.
+    
+    <br />
+    
+    You can also edit those components and see changes right away.
+    
+    <br />
+    
+    (Try editing the 
+    <code
+      class="code"
+    >
+      Button
+    </code>
+     component
+    located at 
+    <code
+      class="code"
+    >
+      src/stories/Button.js
+    </code>
+    .)
+  
+  </p>
+   
+  <p>
+    
+    Usually we create stories with smaller UI components in the app.
+    <br />
+    
+    Have a look at the
+    
+    <a
+      class="link"
+      href="https://storybook.js.org/basics/writing-stories"
+      target="_blank"
+    >
+      
+      Writing Stories
+    
+    </a>
+    
+    section in our documentation.
+  
+  </p>
+   
+  <p
+    class="note"
+  >
+    <b>
+      NOTE:
+    </b>
+     
+    <br />
+    
+    Have a look at the
+    
+    <code
+      class="code"
+    >
+      .storybook/webpack.config.js
+    </code>
+    
+    to add webpack
+    loaders and plugins you are using in this project.
+  
+  </p>
+</div>
+`;
diff --git a/examples/vue-kitchen-sink/src/stories/addon-actions.stories.js b/examples/vue-kitchen-sink/src/stories/addon-actions.stories.js
new file mode 100644
index 00000000000..e7c24137dda
--- /dev/null
+++ b/examples/vue-kitchen-sink/src/stories/addon-actions.stories.js
@@ -0,0 +1,19 @@
+import { storiesOf } from '@storybook/vue';
+import { action } from '@storybook/addon-actions';
+
+storiesOf('Addon|Actions', module)
+  .add('Action only', () => ({
+    template: '<my-button :handle-click="log">Click me to log the action</my-button>',
+    methods: {
+      log: action('log1'),
+    },
+  }))
+  .add('Action and method', () => ({
+    template: '<my-button :handle-click="log">Click me to log the action</my-button>',
+    methods: {
+      log: e => {
+        e.preventDefault();
+        action('log2')(e.target);
+      },
+    },
+  }));
diff --git a/examples/vue-kitchen-sink/src/stories/addon-centered.stories.js b/examples/vue-kitchen-sink/src/stories/addon-centered.stories.js
new file mode 100644
index 00000000000..d202fc947c0
--- /dev/null
+++ b/examples/vue-kitchen-sink/src/stories/addon-centered.stories.js
@@ -0,0 +1,11 @@
+import { storiesOf } from '@storybook/vue';
+import Centered from '@storybook/addon-centered';
+
+import MyButton from './Button.vue';
+
+storiesOf('Addon|Centered', module)
+  .addDecorator(Centered)
+  .add('rounded', () => ({
+    components: { MyButton },
+    template: '<my-button :rounded="true">A Button with rounded edges</my-button>',
+  }));
diff --git a/examples/vue-kitchen-sink/src/stories/addon-knobs.stories.js b/examples/vue-kitchen-sink/src/stories/addon-knobs.stories.js
new file mode 100644
index 00000000000..a63f1646792
--- /dev/null
+++ b/examples/vue-kitchen-sink/src/stories/addon-knobs.stories.js
@@ -0,0 +1,69 @@
+import { storiesOf } from '@storybook/vue';
+import { action } from '@storybook/addon-actions';
+import {
+  withKnobs,
+  text,
+  number,
+  boolean,
+  array,
+  select,
+  color,
+  date,
+  button,
+} from '@storybook/addon-knobs/vue';
+
+storiesOf('Addon|Knobs', module)
+  .addDecorator(withKnobs)
+  .add('Simple', () => {
+    const name = text('Name', 'John Doe');
+    const age = number('Age', 44);
+    const content = `I am ${name} and I'm ${age} years old.`;
+
+    return {
+      template: `<div>${content}</div>`,
+    };
+  })
+  .add('All knobs', () => {
+    const name = text('Name', 'Jane');
+    const stock = number('Stock', 20, {
+      range: true,
+      min: 0,
+      max: 30,
+      step: 5,
+    });
+    const fruits = {
+      apples: 'Apple',
+      bananas: 'Banana',
+      cherries: 'Cherry',
+    };
+    const fruit = select('Fruit', fruits, 'apple');
+    const price = number('Price', 2.25);
+
+    const colour = color('Border', 'deeppink');
+    const today = date('Today', new Date('Jan 20 2017 GMT+0'));
+    const items = array('Items', ['Laptop', 'Book', 'Whiskey']);
+    const nice = boolean('Nice', true);
+
+    const stockMessage = stock
+      ? `I have a stock of ${stock} ${fruit}, costing &dollar;${price} each.`
+      : `I'm out of ${fruit}${nice ? ', Sorry!' : '.'}`;
+    const salutation = nice ? 'Nice to meet you!' : 'Leave me alone!';
+    const dateOptions = { year: 'numeric', month: 'long', day: 'numeric', timeZone: 'UTC' };
+
+    button('Arbitrary action', action('You clicked it!'));
+
+    return {
+      template: `
+          <div style="border:2px dotted ${colour}; padding: 8px 22px; border-radius: 8px">
+            <h1>My name is ${name},</h1>
+            <h3>today is ${new Date(today).toLocaleDateString('en-US', dateOptions)}</h3>
+            <p>${stockMessage}</p>
+            <p>Also, I have:</p>
+            <ul>
+              ${items.map(item => `<li key=${item}>${item}</li>`).join('')}
+            </ul>
+            <p>${salutation}</p>
+          </div>
+        `,
+    };
+  });
diff --git a/examples/vue-kitchen-sink/src/stories/addon-links.stories.js b/examples/vue-kitchen-sink/src/stories/addon-links.stories.js
new file mode 100644
index 00000000000..647d681d10c
--- /dev/null
+++ b/examples/vue-kitchen-sink/src/stories/addon-links.stories.js
@@ -0,0 +1,10 @@
+import { storiesOf } from '@storybook/vue';
+import { linkTo } from '@storybook/addon-links';
+
+storiesOf('Addon|Links', module).add('Go to welcome', () => ({
+  template:
+    '<my-button :rounded="true" :handle-click="click" >This buttons links to Welcome</my-button>',
+  methods: {
+    click: linkTo('Welcome'),
+  },
+}));
diff --git a/examples/vue-kitchen-sink/src/stories/addon-notes.stories.js b/examples/vue-kitchen-sink/src/stories/addon-notes.stories.js
new file mode 100644
index 00000000000..a35213b8ff2
--- /dev/null
+++ b/examples/vue-kitchen-sink/src/stories/addon-notes.stories.js
@@ -0,0 +1,25 @@
+import { storiesOf } from '@storybook/vue';
+import { withNotes } from '@storybook/addon-notes';
+
+storiesOf('Addon|Notes', module)
+  .add(
+    'Simple note',
+    withNotes({ text: 'My notes on some bold text' })(() => ({
+      template:
+        '<p><strong>Etiam vulputate elit eu venenatis eleifend. Duis nec lectus augue. Morbi egestas diam sed vulputate mollis. Fusce egestas pretium vehicula. Integer sed neque diam. Donec consectetur velit vitae enim varius, ut placerat arcu imperdiet. Praesent sed faucibus arcu. Nullam sit amet nibh a enim eleifend rhoncus. Donec pretium elementum leo at fermentum. Nulla sollicitudin, mauris quis semper tempus, sem metus tristique diam, efficitur pulvinar mi urna id urna.</strong></p>',
+    }))
+  )
+  .add(
+    'Note with HTML',
+    withNotes({
+      text: `
+      <h2>My notes on emojies</h2>
+
+      <em>It's not all that important to be honest, but..</em>
+
+      Emojis are great, I love emojis, in fact I like using them in my Component notes too! 😇
+    `,
+    })(() => ({
+      template: '<p>🤔😳😯😮<br/>😄😩😓😱<br/>🤓😑😶😊</p>',
+    }))
+  );
diff --git a/examples/vue-kitchen-sink/src/stories/custom-decorators.stories.js b/examples/vue-kitchen-sink/src/stories/custom-decorators.stories.js
new file mode 100644
index 00000000000..3ff25608877
--- /dev/null
+++ b/examples/vue-kitchen-sink/src/stories/custom-decorators.stories.js
@@ -0,0 +1,33 @@
+import { storiesOf } from '@storybook/vue';
+
+import MyButton from './Button.vue';
+
+storiesOf('Custom|Decorator for Vue', module)
+  .addDecorator(story => {
+    // Decorated with story function
+    const WrapButton = story();
+    return {
+      components: { WrapButton },
+      template: '<div :style="{ border: borderStyle }"><wrap-button/></div>',
+      data() {
+        return { borderStyle: 'medium solid red' };
+      },
+    };
+  })
+  .addDecorator(() => ({
+    // Decorated with `story` component
+    template: '<div :style="{ border: borderStyle }"><story/></div>',
+    data() {
+      return {
+        borderStyle: 'medium solid blue',
+      };
+    },
+  }))
+  .add('template', () => ({
+    template: '<my-button>MyButton with template</my-button>',
+  }))
+  .add('render', () => ({
+    render(h) {
+      return h(MyButton, { props: { color: 'pink' } }, ['renders component: MyButton']);
+    },
+  }));
diff --git a/examples/vue-kitchen-sink/src/stories/custom-rendering.stories.js b/examples/vue-kitchen-sink/src/stories/custom-rendering.stories.js
new file mode 100644
index 00000000000..cfbde634939
--- /dev/null
+++ b/examples/vue-kitchen-sink/src/stories/custom-rendering.stories.js
@@ -0,0 +1,92 @@
+import Vuex from 'vuex';
+import { storiesOf } from '@storybook/vue';
+import { action } from '@storybook/addon-actions';
+import { linkTo } from '@storybook/addon-links';
+
+import MyButton from './Button.vue';
+
+storiesOf('Custom|Method for rendering Vue', module)
+  .add('render', () => ({
+    render: h => h('div', ['renders a div with some text in it..']),
+  }))
+  .add('render + component', () => ({
+    render(h) {
+      return h(MyButton, { props: { color: 'pink' } }, ['renders component: MyButton']);
+    },
+  }))
+  .add('template', () => ({
+    template: `
+      <div>
+        <h1>A template</h1>
+        <p>rendered in vue in storybook</p>
+      </div>`,
+  }))
+  .add('template + component', () => ({
+    components: { MyButton },
+    template: '<my-button>MyButton rendered in a template</my-button>',
+  }))
+  .add('template + methods', () => ({
+    components: { MyButton },
+    template: `
+      <p>
+        <em>Clicking the button will navigate to another story using the 'addon-links'</em><br/>
+        <my-button :rounded="true" :handle-click="action">MyButton rendered in a template + props & methods</my-button>
+      </p>`,
+    methods: {
+      action: linkTo('Button'),
+    },
+  }))
+  .add('JSX', () => ({
+    components: { MyButton },
+    render() {
+      // eslint-disable-next-line react/react-in-jsx-scope
+      return <my-button>MyButton rendered with JSX</my-button>;
+    },
+  }))
+  .add('vuex + actions', () => ({
+    components: { MyButton },
+    template: '<my-button :handle-click="log">with vuex: {{ $store.state.count }}</my-button>',
+    store: new Vuex.Store({
+      state: { count: 0 },
+      mutations: {
+        increment(state) {
+          state.count += 1; // eslint-disable-line
+          action('vuex state')(state);
+        },
+      },
+    }),
+    methods: {
+      log() {
+        this.$store.commit('increment');
+      },
+    },
+  }))
+  .add('whatever you want', () => ({
+    components: { MyButton },
+    template:
+      '<my-button :handle-click="log">with awesomeness: {{ $store.state.count }}</my-button>',
+    store: new Vuex.Store({
+      state: { count: 0 },
+      mutations: {
+        increment(state) {
+          state.count += 1; // eslint-disable-line
+          action('vuex state')(state);
+        },
+      },
+    }),
+    methods: {
+      log() {
+        this.$store.commit('increment');
+      },
+    },
+  }))
+  .add('pre-registered component', () => ({
+    /* By pre-registering component in config.js,
+     * the need to register all components with each story is removed.
+     * You'll only need the template */
+    template: `
+      <p>
+        <em>This component was pre-registered in .storybook/config.js</em><br/>
+        <my-button>MyButton rendered in a template</my-button>
+      </p>`,
+  }));
diff --git a/examples/vue-kitchen-sink/src/stories/index.js b/examples/vue-kitchen-sink/src/stories/index.js
index a4ab8099575..fa9448a5b0d 100644
--- a/examples/vue-kitchen-sink/src/stories/index.js
+++ b/examples/vue-kitchen-sink/src/stories/index.js
@@ -1,29 +1,11 @@
-/* eslint-disable react/react-in-jsx-scope */
-
-import Vuex from 'vuex';
 import { storiesOf } from '@storybook/vue';
-import { action } from '@storybook/addon-actions';
 import { linkTo } from '@storybook/addon-links';
-import { withNotes } from '@storybook/addon-notes';
-import {
-  withKnobs,
-  text,
-  number,
-  boolean,
-  array,
-  select,
-  color,
-  date,
-  button,
-} from '@storybook/addon-knobs/vue';
-import Centered from '@storybook/addon-centered';
 
-import MyButton from './Button.vue';
 import Welcome from './Welcome.vue';
 import App from '../App.vue';
 
 storiesOf('Welcome', module).add('Welcome', () => ({
-  render: h => h(Welcome),
+  render: h => h(Welcome, { props: { goToButton: linkTo('Button') } }),
 }));
 
 storiesOf('App', module).add('App', () => ({
@@ -31,7 +13,6 @@ storiesOf('App', module).add('App', () => ({
 }));
 
 storiesOf('Button', module)
-  .addDecorator(Centered)
   // Works if Vue.component is called in the config.js in .storybook
   .add('rounded', () => ({
     template: '<my-button :rounded="true">A Button with rounded edges</my-button>',
@@ -39,215 +20,3 @@ storiesOf('Button', module)
   .add('square', () => ({
     template: '<my-button :rounded="false">A Button with square edges</my-button>',
   }));
-
-storiesOf('Method for rendering Vue', module)
-  .add('render', () => ({
-    render: h => h('div', ['renders a div with some text in it..']),
-  }))
-  .add('render + component', () => ({
-    render(h) {
-      return h(MyButton, { props: { color: 'pink' } }, ['renders component: MyButton']);
-    },
-  }))
-  .add('template', () => ({
-    template: `
-      <div>
-        <h1>A template</h1>
-        <p>rendered in vue in storybook</p>
-      </div>`,
-  }))
-  .add('template + component', () => ({
-    components: { MyButton },
-    template: '<my-button>MyButton rendered in a template</my-button>',
-  }))
-  .add('template + methods', () => ({
-    components: { MyButton },
-    template: `
-      <p>
-        <em>Clicking the button will navigate to another story using the 'addon-links'</em><br/>
-        <my-button :rounded="true" :handle-click="action">MyButton rendered in a template + props & methods</my-button>
-      </p>`,
-    methods: {
-      action: linkTo('Button'),
-    },
-  }))
-  .add('JSX', () => ({
-    components: { MyButton },
-    render() {
-      return <my-button>MyButton rendered with JSX</my-button>;
-    },
-  }))
-  .add('vuex + actions', () => ({
-    components: { MyButton },
-    template: '<my-button :handle-click="log">with vuex: {{ $store.state.count }}</my-button>',
-    store: new Vuex.Store({
-      state: { count: 0 },
-      mutations: {
-        increment(state) {
-          state.count += 1; // eslint-disable-line
-          action('vuex state')(state);
-        },
-      },
-    }),
-    methods: {
-      log() {
-        this.$store.commit('increment');
-      },
-    },
-  }))
-  .add('whatever you want', () => ({
-    components: { MyButton },
-    template:
-      '<my-button :handle-click="log">with awesomeness: {{ $store.state.count }}</my-button>',
-    store: new Vuex.Store({
-      state: { count: 0 },
-      mutations: {
-        increment(state) {
-          state.count += 1; // eslint-disable-line
-          action('vuex state')(state);
-        },
-      },
-    }),
-    methods: {
-      log() {
-        this.$store.commit('increment');
-      },
-    },
-  }))
-  .add('pre-registered component', () => ({
-    /* By pre-registering component in config.js,
-     * the need to register all components with each story is removed.
-     * You'll only need the template */
-    template: `
-      <p>
-        <em>This component was pre-registered in .storybook/config.js</em><br/>
-        <my-button>MyButton rendered in a template</my-button>
-      </p>`,
-  }));
-
-storiesOf('Decorator for Vue', module)
-  .addDecorator(story => {
-    // Decorated with story function
-    const WrapButton = story();
-    return {
-      components: { WrapButton },
-      template: '<div :style="{ border: borderStyle }"><wrap-button/></div>',
-      data() {
-        return { borderStyle: 'medium solid red' };
-      },
-    };
-  })
-  .addDecorator(() => ({
-    // Decorated with `story` component
-    template: '<div :style="{ border: borderStyle }"><story/></div>',
-    data() {
-      return {
-        borderStyle: 'medium solid blue',
-      };
-    },
-  }))
-  .add('template', () => ({
-    template: '<my-button>MyButton with template</my-button>',
-  }))
-  .add('render', () => ({
-    render(h) {
-      return h(MyButton, { props: { color: 'pink' } }, ['renders component: MyButton']);
-    },
-  }));
-
-storiesOf('Addon Actions', module)
-  .add('Action only', () => ({
-    template: '<my-button :handle-click="log">Click me to log the action</my-button>',
-    methods: {
-      log: action('log1'),
-    },
-  }))
-  .add('Action and method', () => ({
-    template: '<my-button :handle-click="log">Click me to log the action</my-button>',
-    methods: {
-      log: e => {
-        e.preventDefault();
-        action('log2')(e.target);
-      },
-    },
-  }));
-
-storiesOf('Addon Notes', module)
-  .add(
-    'Simple note',
-    withNotes({ text: 'My notes on some bold text' })(() => ({
-      template:
-        '<p><strong>Etiam vulputate elit eu venenatis eleifend. Duis nec lectus augue. Morbi egestas diam sed vulputate mollis. Fusce egestas pretium vehicula. Integer sed neque diam. Donec consectetur velit vitae enim varius, ut placerat arcu imperdiet. Praesent sed faucibus arcu. Nullam sit amet nibh a enim eleifend rhoncus. Donec pretium elementum leo at fermentum. Nulla sollicitudin, mauris quis semper tempus, sem metus tristique diam, efficitur pulvinar mi urna id urna.</strong></p>',
-    }))
-  )
-  .add(
-    'Note with HTML',
-    withNotes({
-      text: `
-      <h2>My notes on emojies</h2>
-
-      <em>It's not all that important to be honest, but..</em>
-
-      Emojis are great, I love emojis, in fact I like using them in my Component notes too! 😇
-    `,
-    })(() => ({
-      template: '<p>🤔😳😯😮<br/>😄😩😓😱<br/>🤓😑😶😊</p>',
-    }))
-  );
-
-storiesOf('Addon Knobs', module)
-  .addDecorator(withKnobs)
-  .add('Simple', () => {
-    const name = text('Name', 'John Doe');
-    const age = number('Age', 44);
-    const content = `I am ${name} and I'm ${age} years old.`;
-
-    return {
-      template: `<div>${content}</div>`,
-    };
-  })
-  .add('All knobs', () => {
-    const name = text('Name', 'Jane');
-    const stock = number('Stock', 20, {
-      range: true,
-      min: 0,
-      max: 30,
-      step: 5,
-    });
-    const fruits = {
-      apples: 'Apple',
-      bananas: 'Banana',
-      cherries: 'Cherry',
-    };
-    const fruit = select('Fruit', fruits, 'apple');
-    const price = number('Price', 2.25);
-
-    const colour = color('Border', 'deeppink');
-    const today = date('Today', new Date('Jan 20 2017'));
-    const items = array('Items', ['Laptop', 'Book', 'Whiskey']);
-    const nice = boolean('Nice', true);
-
-    const stockMessage = stock
-      ? `I have a stock of ${stock} ${fruit}, costing &dollar;${price} each.`
-      : `I'm out of ${fruit}${nice ? ', Sorry!' : '.'}`;
-    const salutation = nice ? 'Nice to meet you!' : 'Leave me alone!';
-
-    button('Arbitrary action', action('You clicked it!'));
-
-    return {
-      template: `
-          <div style="border:2px dotted ${colour}; padding: 8px 22px; border-radius: 8px">
-            <h1>My name is ${name},</h1>
-            <h3>today is ${new Date(today).toLocaleDateString()}</h3>
-            <p>${stockMessage}</p>
-            <p>Also, I have:</p>
-            <ul>
-              ${items.map(item => `<li key=${item}>${item}</li>`).join('')}
-            </ul>
-            <p>${salutation}</p>
-          </div>
-        `,
-    };
-  });
-
-/* eslint-enable react/react-in-jsx-scope */
diff --git a/examples/vue-kitchen-sink/vueshots.test.js b/examples/vue-kitchen-sink/vueshots.test.js
new file mode 100644
index 00000000000..064b9cf54ff
--- /dev/null
+++ b/examples/vue-kitchen-sink/vueshots.test.js
@@ -0,0 +1,8 @@
+import path from 'path';
+import initStoryshots, { multiSnapshotWithOptions } from '@storybook/addon-storyshots';
+
+initStoryshots({
+  framework: 'vue',
+  configPath: path.join(__dirname, '.storybook'),
+  test: multiSnapshotWithOptions({}),
+});
diff --git a/integration/__image_snapshots__/angular-cli-snap.png b/integration/__image_snapshots__/angular-cli-snap.png
deleted file mode 100644
index 926d9138c16..00000000000
Binary files a/integration/__image_snapshots__/angular-cli-snap.png and /dev/null differ
diff --git a/integration/__image_snapshots__/cra-kitchen-sink-snap.png b/integration/__image_snapshots__/cra-kitchen-sink-snap.png
deleted file mode 100644
index fd6bc256be5..00000000000
Binary files a/integration/__image_snapshots__/cra-kitchen-sink-snap.png and /dev/null differ
diff --git a/integration/__image_snapshots__/vue-kitchen-sink-snap.png b/integration/__image_snapshots__/vue-kitchen-sink-snap.png
deleted file mode 100644
index b8387ae0fae..00000000000
Binary files a/integration/__image_snapshots__/vue-kitchen-sink-snap.png and /dev/null differ
diff --git a/integration/examples.test.js b/integration/examples.test.js
deleted file mode 100644
index cff64b21935..00000000000
--- a/integration/examples.test.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import puppeteer from 'puppeteer';
-
-const examples = [
-  {
-    name: 'cra-kitchen-sink',
-    port: 9010,
-  },
-  {
-    name: 'vue-kitchen-sink',
-    port: 9009,
-  },
-  {
-    name: 'angular-cli',
-    port: 9008,
-  },
-];
-
-examples.forEach(({ name, port }) => {
-  let browser = puppeteer.launch();
-  let page;
-
-  describe('sandboxes', () => {
-    beforeAll(async () => {
-      browser = await browser;
-      page = await browser.newPage();
-      await page.setViewport({ width: 1400, height: 1000 });
-    });
-    afterAll(() => {
-      browser.close();
-    });
-
-    it(`Take screenshots for '${name}'`, async () => {
-      await page.goto(`http://localhost:${port}`);
-      await page.waitForSelector('[role="menuitem"][data-name="Welcome"]');
-      await page.waitFor(2000);
-
-      const screenshot = await page.screenshot({ fullPage: true });
-      expect(screenshot).toMatchImageSnapshot({
-        failureThreshold: 0.04, // 4% threshold,
-        failureThresholdType: 'percent',
-        customSnapshotIdentifier: name.split('/').join('-'),
-      });
-    });
-  });
-});
diff --git a/integration/jest.config.js b/integration/jest.config.js
deleted file mode 100644
index cdef40f4dbd..00000000000
--- a/integration/jest.config.js
+++ /dev/null
@@ -1,4 +0,0 @@
-module.exports = {
-  rootDir: './',
-  setupTestFrameworkScriptFile: '<rootDir>/jest.setup.js',
-};
diff --git a/integration/jest.setup.js b/integration/jest.setup.js
deleted file mode 100644
index 3183522b5f8..00000000000
--- a/integration/jest.setup.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { toMatchImageSnapshot } from 'jest-image-snapshot';
-
-expect.extend({ toMatchImageSnapshot });
diff --git a/jest.config.js b/jest.config.js
index 5cbca1678f6..31f397d3c76 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,4 +1,7 @@
 module.exports = {
+  globals: {
+    __TRANSFORM_HTML__: true,
+  },
   cacheDirectory: '.cache/jest',
   clearMocks: true,
   moduleNameMapper: {
@@ -12,8 +15,15 @@ module.exports = {
     '<rootDir>/app',
     '<rootDir>/lib',
     '<rootDir>/examples/cra-kitchen-sink',
+    '<rootDir>/examples/vue-kitchen-sink',
     '<rootDir>/examples/official-storybook',
+    '<rootDir>/examples/angular-cli',
   ],
+  transform: {
+    '^.+\\.jsx?$': 'babel-jest',
+    '^.+\\.(ts|html)$': '<rootDir>/node_modules/jest-preset-angular/preprocessor.js',
+    '.*\\.(vue)$': '<rootDir>/node_modules/jest-vue-preprocessor',
+  },
   testPathIgnorePatterns: ['/node_modules/', 'addon-jest.test.js', '/cli/test/'],
   collectCoverage: false,
   collectCoverageFrom: [
@@ -28,4 +38,5 @@ module.exports = {
   setupTestFrameworkScriptFile: './scripts/jest.init.js',
   setupFiles: ['raf/polyfill'],
   testURL: 'http://localhost',
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node', '.html', 'vue'],
 };
diff --git a/lerna.json b/lerna.json
index 6a29c092baa..362110d9d25 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,5 @@
 {
   "lerna": "2.5.1",
-  "npmClient": "yarn",
   "useWorkspaces": true,
   "commands": {
     "publish": {
@@ -8,5 +7,5 @@
     }
   },
   "concurrency": 1,
-  "version": "3.4.0-alpha.0"
+  "version": "3.4.0-alpha.9"
 }
diff --git a/lib/addons/package.json b/lib/addons/package.json
index 4f36b02312a..b9e04d37097 100644
--- a/lib/addons/package.json
+++ b/lib/addons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addons",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "Storybook addons store",
   "keywords": [
     "storybook"
diff --git a/lib/channel-postmessage/package.json b/lib/channel-postmessage/package.json
index 715db08f3fc..3033defc478 100644
--- a/lib/channel-postmessage/package.json
+++ b/lib/channel-postmessage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/channel-postmessage",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "",
   "license": "MIT",
   "main": "dist/index.js",
@@ -9,7 +9,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/channels": "^3.4.0-alpha.0",
+    "@storybook/channels": "^3.4.0-alpha.9",
     "global": "^4.3.2",
     "json-stringify-safe": "^5.0.1"
   }
diff --git a/lib/channel-websocket/package.json b/lib/channel-websocket/package.json
index f1d6b6cf99c..3dc549184c8 100644
--- a/lib/channel-websocket/package.json
+++ b/lib/channel-websocket/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/channel-websocket",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "",
   "license": "MIT",
   "main": "dist/index.js",
@@ -9,7 +9,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/channels": "^3.4.0-alpha.0",
+    "@storybook/channels": "^3.4.0-alpha.9",
     "global": "^4.3.2"
   }
 }
diff --git a/lib/channels/package.json b/lib/channels/package.json
index 5d74a21b425..60308387080 100644
--- a/lib/channels/package.json
+++ b/lib/channels/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/channels",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "",
   "license": "MIT",
   "main": "dist/index.js",
diff --git a/lib/cli/.eslintrc b/lib/cli/.eslintrc
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/lib/cli/bin/generate.js b/lib/cli/bin/generate.js
index e3c2d4bd82c..23d718989aa 100755
--- a/lib/cli/bin/generate.js
+++ b/lib/cli/bin/generate.js
@@ -15,6 +15,7 @@ import reactScriptsGenerator from '../generators/REACT_SCRIPTS';
 import sfcVueGenerator from '../generators/SFC_VUE';
 import updateOrganisationsGenerator from '../generators/UPDATE_PACKAGE_ORGANIZATIONS';
 import vueGenerator from '../generators/VUE';
+import polymerGenerator from '../generators/POLYMER';
 import webpackReactGenerator from '../generators/WEBPACK_REACT';
 
 const logger = console;
@@ -86,7 +87,6 @@ const runGenerator = () => {
       return Promise.resolve();
 
     case types.UPDATE_PACKAGE_ORGANIZATIONS:
-      // eslint-disable-next-line
       return updateOrganisationsGenerator(program.parser)
         .then(() => null) // commmandLog doesn't like to see output
         .then(commandLog('Upgrading your project to the new storybook packages.'))
@@ -110,7 +110,7 @@ const runGenerator = () => {
         .then(() => {
           logger.log(chalk.red('NOTE: CRNA app installation is not 100% automated.'));
           logger.log(`To quickly run storybook, replace contents of ${app} with:\n`);
-          codeLog(["export default from './storybook';"]); // eslint-disable-line
+          codeLog(["export default from './storybook';"]);
           logger.log('\nFor a more complete discussion of options, see:\n');
           logger.log(chalk.cyan(CRNA_DISCUSSION));
           logger.log();
@@ -151,6 +151,12 @@ const runGenerator = () => {
       return angularGenerator()
         .then(commandLog('Adding storybook support to your "Angular" app'))
         .then(end);
+
+    case types.POLYMER:
+      return polymerGenerator()
+        .then(commandLog('Adding storybook support to your "Polymer" app'))
+        .then(end);
+
     default:
       paddedLog(`We couldn't detect your project type. (code: ${projectType})`);
       paddedLog(
diff --git a/lib/cli/generators/ANGULAR/index.js b/lib/cli/generators/ANGULAR/index.js
index 7a3b2b083df..58660f0e712 100644
--- a/lib/cli/generators/ANGULAR/index.js
+++ b/lib/cli/generators/ANGULAR/index.js
@@ -8,24 +8,25 @@ export default async () => {
     notesVersion,
     actionsVersion,
     linksVersion,
-    lodashTypesVersion,
+    addonsVersion,
   ] = await getVersions(
     '@storybook/angular',
     '@storybook/addon-notes',
     '@storybook/addon-actions',
     '@storybook/addon-links',
-    '@types/lodash-es'
+    '@storybook/addons'
   );
   mergeDirs(path.resolve(__dirname, 'template'), '.', 'overwrite');
 
   const packageJson = getPackageJson();
 
+  packageJson.dependencies = packageJson.dependencies || {};
   packageJson.devDependencies = packageJson.devDependencies || {};
   packageJson.devDependencies['@storybook/angular'] = storybookVersion;
   packageJson.devDependencies['@storybook/addon-notes'] = notesVersion;
   packageJson.devDependencies['@storybook/addon-actions'] = actionsVersion;
   packageJson.devDependencies['@storybook/addon-links'] = linksVersion;
-  packageJson.devDependencies['@types/lodash-es'] = lodashTypesVersion;
+  packageJson.devDependencies['@storybook/addons'] = addonsVersion;
 
   packageJson.scripts = packageJson.scripts || {};
   packageJson.scripts.storybook = 'start-storybook -p 6006';
diff --git a/lib/cli/generators/ANGULAR/template/.storybook/addons.js b/lib/cli/generators/ANGULAR/template/.storybook/addons.js
index 4f9743d248e..47eabe0ce40 100644
--- a/lib/cli/generators/ANGULAR/template/.storybook/addons.js
+++ b/lib/cli/generators/ANGULAR/template/.storybook/addons.js
@@ -1,5 +1,3 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
-
 import '@storybook/addon-actions/register';
 import '@storybook/addon-links/register';
 import '@storybook/addon-notes/register';
diff --git a/lib/cli/generators/ANGULAR/template/.storybook/config.js b/lib/cli/generators/ANGULAR/template/.storybook/config.js
index 5d8908b9024..88f8a5326e4 100644
--- a/lib/cli/generators/ANGULAR/template/.storybook/config.js
+++ b/lib/cli/generators/ANGULAR/template/.storybook/config.js
@@ -1,11 +1,9 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
-
 import { configure } from '@storybook/angular';
 
 // automatically import all files ending in *.stories.ts
-const req = require.context('../stories', true, /.stories.ts$/);
+const req = require.context('../src/stories', true, /.stories.ts$/);
 function loadStories() {
-  req.keys().forEach((filename) => req(filename));
+  req.keys().forEach(filename => req(filename));
 }
 
 configure(loadStories, module);
diff --git a/lib/cli/generators/ANGULAR/template/stories/index.stories.ts b/lib/cli/generators/ANGULAR/template/src/stories/index.stories.ts
similarity index 100%
rename from lib/cli/generators/ANGULAR/template/stories/index.stories.ts
rename to lib/cli/generators/ANGULAR/template/src/stories/index.stories.ts
diff --git a/lib/cli/generators/METEOR/index.js b/lib/cli/generators/METEOR/index.js
index 3efd7711aef..a88e0527b12 100644
--- a/lib/cli/generators/METEOR/index.js
+++ b/lib/cli/generators/METEOR/index.js
@@ -9,8 +9,10 @@ export default async () => {
     storybookVersion,
     actionsVersion,
     linksVersion,
+    addonsVersion,
     reactVersion,
     reactDomVersion,
+    babelCoreVersion,
     presetEnvVersion,
     presetReactVersion,
     presetStage1Version,
@@ -19,8 +21,10 @@ export default async () => {
     '@storybook/react',
     '@storybook/addon-actions',
     '@storybook/addon-links',
+    '@storybook/addons',
     'react',
     'react-dom',
+    'babel-core',
     'babel-preset-env',
     'babel-preset-react',
     'babel-preset-stage-1',
@@ -51,6 +55,7 @@ export default async () => {
       plugins: ['babel-root-slash-import'],
     };
 
+    packageJson.devDependencies['babel-core'] = babelCoreVersion;
     packageJson.devDependencies['babel-preset-env'] = presetEnvVersion;
     packageJson.devDependencies['babel-preset-react'] = presetReactVersion;
     packageJson.devDependencies['babel-preset-stage-1'] = presetStage1Version;
@@ -63,6 +68,7 @@ export default async () => {
   packageJson.devDependencies['@storybook/react'] = storybookVersion;
   packageJson.devDependencies['@storybook/addon-actions'] = actionsVersion;
   packageJson.devDependencies['@storybook/addon-links'] = linksVersion;
+  packageJson.devDependencies['@storybook/addons'] = addonsVersion;
   packageJson.scripts.storybook = 'start-storybook -p 6006';
   packageJson.scripts['build-storybook'] = 'build-storybook';
 
diff --git a/lib/cli/generators/METEOR/template/.storybook/config.js b/lib/cli/generators/METEOR/template/.storybook/config.js
index 694160f50fe..b98cb4736a4 100644
--- a/lib/cli/generators/METEOR/template/.storybook/config.js
+++ b/lib/cli/generators/METEOR/template/.storybook/config.js
@@ -3,7 +3,7 @@ import { configure } from '@storybook/react';
 // automatically import all files ending in *.stories.js
 const req = require.context('../stories', true, /.stories.js$/);
 function loadStories() {
-  req.keys().forEach((filename) => req(filename));
+  req.keys().forEach(filename => req(filename));
 }
 
 configure(loadStories, module);
diff --git a/lib/cli/generators/METEOR/template/stories/index.stories.js b/lib/cli/generators/METEOR/template/stories/index.stories.js
index 9214f65c7bb..aa04241802d 100644
--- a/lib/cli/generators/METEOR/template/stories/index.stories.js
+++ b/lib/cli/generators/METEOR/template/stories/index.stories.js
@@ -10,4 +10,10 @@ storiesOf('Welcome', module).add('to Storybook', () => <Welcome showApp={linkTo(
 
 storiesOf('Button', module)
   .add('with text', () => <Button onClick={action('clicked')}>Hello Button</Button>)
-  .add('with some emoji', () => <Button onClick={action('clicked')}>😀 😎 👍 💯</Button>);
+  .add('with some emoji', () => (
+    <Button onClick={action('clicked')}>
+      <span role="img" aria-label="so cool">
+        😀 😎 👍 💯
+      </span>
+    </Button>
+  ));
diff --git a/lib/cli/generators/POLYMER/index.js b/lib/cli/generators/POLYMER/index.js
new file mode 100755
index 00000000000..1a1ab70f2ce
--- /dev/null
+++ b/lib/cli/generators/POLYMER/index.js
@@ -0,0 +1,31 @@
+import mergeDirs from 'merge-dirs';
+import path from 'path';
+import { getVersions, getPackageJson, writePackageJson } from '../../lib/helpers';
+
+export default async () => {
+  const [storybookVersion, babelCoreVersion, babelRuntimeVersion] = await getVersions(
+    '@storybook/polymer',
+    'babel-core',
+    'babel-runtime'
+  );
+  mergeDirs(path.resolve(__dirname, 'template'), '.', 'overwrite');
+
+  const packageJson = getPackageJson() || {}; // Maybe we are in a bower only project, still we need a package json
+
+  packageJson.dependencies = packageJson.dependencies || {};
+  packageJson.devDependencies = packageJson.devDependencies || {};
+  packageJson.devDependencies['@storybook/polymer'] = storybookVersion;
+
+  if (!packageJson.dependencies['babel-core'] && !packageJson.devDependencies['babel-core']) {
+    packageJson.devDependencies['babel-core'] = babelCoreVersion;
+  }
+  if (!packageJson.dependencies['babel-runtime'] && !packageJson.devDependencies['babel-runtime']) {
+    packageJson.devDependencies['babel-runtime'] = babelRuntimeVersion;
+  }
+
+  packageJson.scripts = packageJson.scripts || {};
+  packageJson.scripts.storybook = 'start-storybook -p 6006';
+  packageJson.scripts['build-storybook'] = 'build-storybook';
+
+  writePackageJson(packageJson);
+};
diff --git a/lib/cli/generators/POLYMER/template/.storybook/config.js b/lib/cli/generators/POLYMER/template/.storybook/config.js
new file mode 100644
index 00000000000..ea20a9f493b
--- /dev/null
+++ b/lib/cli/generators/POLYMER/template/.storybook/config.js
@@ -0,0 +1,9 @@
+import { configure } from '@storybook/polymer';
+
+// automatically import all files ending in *.stories.js
+const req = require.context('../src/stories', true, /.stories.js$/);
+function loadStories() {
+  req.keys().forEach(filename => req(filename));
+}
+
+configure(loadStories, module);
diff --git a/lib/cli/generators/POLYMER/template/src/stories/index.stories.js b/lib/cli/generators/POLYMER/template/src/stories/index.stories.js
new file mode 100644
index 00000000000..88f77313607
--- /dev/null
+++ b/lib/cli/generators/POLYMER/template/src/stories/index.stories.js
@@ -0,0 +1 @@
+// TODO: add demo stories
diff --git a/lib/cli/generators/REACT/index.js b/lib/cli/generators/REACT/index.js
index cc77669f7d6..9cfa2eff57a 100644
--- a/lib/cli/generators/REACT/index.js
+++ b/lib/cli/generators/REACT/index.js
@@ -3,20 +3,39 @@ import mergeDirs from 'merge-dirs';
 import { getVersions, getPackageJson, writePackageJson } from '../../lib/helpers';
 
 export default async () => {
-  const [storybookVersion, actionsVersion, linksVersion] = await getVersions(
+  const [
+    storybookVersion,
+    actionsVersion,
+    linksVersion,
+    addonsVersion,
+    babelCoreVersion,
+    babelRuntimeVersion,
+  ] = await getVersions(
     '@storybook/react',
     '@storybook/addon-actions',
-    '@storybook/addon-links'
+    '@storybook/addon-links',
+    '@storybook/addons',
+    'babel-core',
+    'babel-runtime'
   );
 
   mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
 
   const packageJson = getPackageJson();
 
+  packageJson.dependencies = packageJson.dependencies || {};
   packageJson.devDependencies = packageJson.devDependencies || {};
   packageJson.devDependencies['@storybook/react'] = storybookVersion;
   packageJson.devDependencies['@storybook/addon-actions'] = actionsVersion;
   packageJson.devDependencies['@storybook/addon-links'] = linksVersion;
+  packageJson.devDependencies['@storybook/addons'] = addonsVersion;
+
+  if (!packageJson.dependencies['babel-core'] && !packageJson.devDependencies['babel-core']) {
+    packageJson.devDependencies['babel-core'] = babelCoreVersion;
+  }
+  if (!packageJson.dependencies['babel-runtime'] && !packageJson.devDependencies['babel-runtime']) {
+    packageJson.devDependencies['babel-runtime'] = babelRuntimeVersion;
+  }
 
   packageJson.scripts = packageJson.scripts || {};
   packageJson.scripts.storybook = 'start-storybook -p 6006';
diff --git a/lib/cli/generators/REACT/template/.storybook/config.js b/lib/cli/generators/REACT/template/.storybook/config.js
index 694160f50fe..b98cb4736a4 100644
--- a/lib/cli/generators/REACT/template/.storybook/config.js
+++ b/lib/cli/generators/REACT/template/.storybook/config.js
@@ -3,7 +3,7 @@ import { configure } from '@storybook/react';
 // automatically import all files ending in *.stories.js
 const req = require.context('../stories', true, /.stories.js$/);
 function loadStories() {
-  req.keys().forEach((filename) => req(filename));
+  req.keys().forEach(filename => req(filename));
 }
 
 configure(loadStories, module);
diff --git a/lib/cli/generators/REACT/template/stories/index.stories.js b/lib/cli/generators/REACT/template/stories/index.stories.js
index 9214f65c7bb..aa04241802d 100644
--- a/lib/cli/generators/REACT/template/stories/index.stories.js
+++ b/lib/cli/generators/REACT/template/stories/index.stories.js
@@ -10,4 +10,10 @@ storiesOf('Welcome', module).add('to Storybook', () => <Welcome showApp={linkTo(
 
 storiesOf('Button', module)
   .add('with text', () => <Button onClick={action('clicked')}>Hello Button</Button>)
-  .add('with some emoji', () => <Button onClick={action('clicked')}>😀 😎 👍 💯</Button>);
+  .add('with some emoji', () => (
+    <Button onClick={action('clicked')}>
+      <span role="img" aria-label="so cool">
+        😀 😎 👍 💯
+      </span>
+    </Button>
+  ));
diff --git a/lib/cli/generators/REACT_NATIVE/index.js b/lib/cli/generators/REACT_NATIVE/index.js
index 5daa36c8094..aa3fe08030e 100644
--- a/lib/cli/generators/REACT_NATIVE/index.js
+++ b/lib/cli/generators/REACT_NATIVE/index.js
@@ -5,10 +5,21 @@ import chalk from 'chalk';
 import { getVersions, getPackageJson, writePackageJson, paddedLog } from '../../lib/helpers';
 
 export default async () => {
-  const [storybookVersion, actionsVersion, linksVersion, propTypesVersion] = await getVersions(
+  const [
+    storybookVersion,
+    actionsVersion,
+    linksVersion,
+    addonsVersion,
+    babelCoreVersion,
+    babelRuntimeVersion,
+    propTypesVersion,
+  ] = await getVersions(
     '@storybook/react-native',
     '@storybook/addon-actions',
     '@storybook/addon-links',
+    '@storybook/addons',
+    'babel-core',
+    'babel-runtime',
     'prop-types'
   );
 
@@ -37,6 +48,14 @@ export default async () => {
   packageJson.devDependencies['@storybook/react-native'] = storybookVersion;
   packageJson.devDependencies['@storybook/addon-actions'] = actionsVersion;
   packageJson.devDependencies['@storybook/addon-links'] = linksVersion;
+  packageJson.devDependencies['@storybook/addons'] = addonsVersion;
+
+  if (!packageJson.dependencies['babel-core'] && !packageJson.devDependencies['babel-core']) {
+    packageJson.devDependencies['babel-core'] = babelCoreVersion;
+  }
+  if (!packageJson.dependencies['babel-runtime'] && !packageJson.devDependencies['babel-runtime']) {
+    packageJson.devDependencies['babel-runtime'] = babelRuntimeVersion;
+  }
 
   if (!packageJson.dependencies['react-dom'] && !packageJson.devDependencies['react-dom']) {
     const reactVersion = packageJson.dependencies.react;
diff --git a/lib/cli/generators/REACT_NATIVE/template/storybook/storybook.js b/lib/cli/generators/REACT_NATIVE/template/storybook/storybook.js
index 138e8817fa9..7670ee12cd5 100644
--- a/lib/cli/generators/REACT_NATIVE/template/storybook/storybook.js
+++ b/lib/cli/generators/REACT_NATIVE/template/storybook/storybook.js
@@ -1,4 +1,3 @@
-/* eslint-disable global-require */
 import React, { Component } from 'react';
 import { AppRegistry } from 'react-native';
 import { getStorybookUI, configure } from '@storybook/react-native';
diff --git a/lib/cli/generators/REACT_NATIVE_SCRIPTS/index.js b/lib/cli/generators/REACT_NATIVE_SCRIPTS/index.js
index c4ed98023ec..d4942215c3a 100644
--- a/lib/cli/generators/REACT_NATIVE_SCRIPTS/index.js
+++ b/lib/cli/generators/REACT_NATIVE_SCRIPTS/index.js
@@ -3,10 +3,21 @@ import path from 'path';
 import { getVersions, getPackageJson, writePackageJson } from '../../lib/helpers';
 
 export default async () => {
-  const [storybookVersion, actionsVersion, linksVersion, propTypesVersion] = await getVersions(
+  const [
+    storybookVersion,
+    actionsVersion,
+    linksVersion,
+    addonsVersion,
+    babelCoreVersion,
+    babelRuntimeVersion,
+    propTypesVersion,
+  ] = await getVersions(
     '@storybook/react-native',
     '@storybook/addon-actions',
     '@storybook/addon-links',
+    '@storybook/addons',
+    'babel-core',
+    'babel-runtime',
     'prop-types'
   );
 
@@ -21,6 +32,14 @@ export default async () => {
   packageJson.devDependencies['@storybook/react-native'] = storybookVersion;
   packageJson.devDependencies['@storybook/addon-actions'] = actionsVersion;
   packageJson.devDependencies['@storybook/addon-links'] = linksVersion;
+  packageJson.devDependencies['@storybook/addons'] = addonsVersion;
+
+  if (!packageJson.dependencies['babel-core'] && !packageJson.devDependencies['babel-core']) {
+    packageJson.devDependencies['babel-core'] = babelCoreVersion;
+  }
+  if (!packageJson.dependencies['babel-runtime'] && !packageJson.devDependencies['babel-runtime']) {
+    packageJson.devDependencies['babel-runtime'] = babelRuntimeVersion;
+  }
 
   if (!packageJson.dependencies['react-dom'] && !packageJson.devDependencies['react-dom']) {
     const reactVersion = packageJson.dependencies.react;
diff --git a/lib/cli/generators/REACT_NATIVE_SCRIPTS/template/storybook/index.js b/lib/cli/generators/REACT_NATIVE_SCRIPTS/template/storybook/index.js
index 138e8817fa9..7670ee12cd5 100644
--- a/lib/cli/generators/REACT_NATIVE_SCRIPTS/template/storybook/index.js
+++ b/lib/cli/generators/REACT_NATIVE_SCRIPTS/template/storybook/index.js
@@ -1,4 +1,3 @@
-/* eslint-disable global-require */
 import React, { Component } from 'react';
 import { AppRegistry } from 'react-native';
 import { getStorybookUI, configure } from '@storybook/react-native';
diff --git a/lib/cli/generators/REACT_SCRIPTS/index.js b/lib/cli/generators/REACT_SCRIPTS/index.js
index 81663405828..7412c7d4600 100644
--- a/lib/cli/generators/REACT_SCRIPTS/index.js
+++ b/lib/cli/generators/REACT_SCRIPTS/index.js
@@ -4,21 +4,40 @@ import fs from 'fs';
 import { getVersions, getPackageJson, writePackageJson } from '../../lib/helpers';
 
 export default async () => {
-  const [storybookVersion, actionsVersion, linksVersion] = await getVersions(
+  const [
+    storybookVersion,
+    actionsVersion,
+    linksVersion,
+    addonsVersion,
+    babelCoreVersion,
+    babelRuntimeVersion,
+  ] = await getVersions(
     '@storybook/react',
     '@storybook/addon-actions',
-    '@storybook/addon-links'
+    '@storybook/addon-links',
+    '@storybook/addons',
+    'babel-core',
+    'babel-runtime'
   );
 
   mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
 
   const packageJson = getPackageJson();
 
+  packageJson.dependencies = packageJson.dependencies || {};
   packageJson.devDependencies = packageJson.devDependencies || {};
 
   packageJson.devDependencies['@storybook/react'] = storybookVersion;
   packageJson.devDependencies['@storybook/addon-actions'] = actionsVersion;
   packageJson.devDependencies['@storybook/addon-links'] = linksVersion;
+  packageJson.devDependencies['@storybook/addons'] = addonsVersion;
+
+  if (!packageJson.dependencies['babel-core'] && !packageJson.devDependencies['babel-core']) {
+    packageJson.devDependencies['babel-core'] = babelCoreVersion;
+  }
+  if (!packageJson.dependencies['babel-runtime'] && !packageJson.devDependencies['babel-runtime']) {
+    packageJson.devDependencies['babel-runtime'] = babelRuntimeVersion;
+  }
 
   packageJson.scripts.storybook = 'start-storybook -p 9009';
   packageJson.scripts['build-storybook'] = 'build-storybook';
diff --git a/lib/cli/generators/REACT_SCRIPTS/template/src/stories/index.js b/lib/cli/generators/REACT_SCRIPTS/template/src/stories/index.js
index 9214f65c7bb..aa04241802d 100644
--- a/lib/cli/generators/REACT_SCRIPTS/template/src/stories/index.js
+++ b/lib/cli/generators/REACT_SCRIPTS/template/src/stories/index.js
@@ -10,4 +10,10 @@ storiesOf('Welcome', module).add('to Storybook', () => <Welcome showApp={linkTo(
 
 storiesOf('Button', module)
   .add('with text', () => <Button onClick={action('clicked')}>Hello Button</Button>)
-  .add('with some emoji', () => <Button onClick={action('clicked')}>😀 😎 👍 💯</Button>);
+  .add('with some emoji', () => (
+    <Button onClick={action('clicked')}>
+      <span role="img" aria-label="so cool">
+        😀 😎 👍 💯
+      </span>
+    </Button>
+  ));
diff --git a/lib/cli/generators/SFC_VUE/index.js b/lib/cli/generators/SFC_VUE/index.js
index 6674f3159f2..72a302b8699 100644
--- a/lib/cli/generators/SFC_VUE/index.js
+++ b/lib/cli/generators/SFC_VUE/index.js
@@ -9,10 +9,19 @@ import {
 } from '../../lib/helpers';
 
 export default async () => {
-  const [storybookVersion, actionsVersion, linksVersion, babelPresetVersion] = await getVersions(
+  const [
+    storybookVersion,
+    actionsVersion,
+    linksVersion,
+    addonsVersion,
+    babelCoreVersion,
+    babelPresetVersion,
+  ] = await getVersions(
     '@storybook/vue',
     '@storybook/addon-actions',
     '@storybook/addon-links',
+    '@storybook/addons',
+    'babel-core',
     'babel-preset-vue'
   );
 
@@ -20,10 +29,16 @@ export default async () => {
 
   const packageJson = getPackageJson();
 
+  packageJson.dependencies = packageJson.dependencies || {};
   packageJson.devDependencies = packageJson.devDependencies || {};
   packageJson.devDependencies['@storybook/vue'] = storybookVersion;
   packageJson.devDependencies['@storybook/addon-actions'] = actionsVersion;
   packageJson.devDependencies['@storybook/addon-links'] = linksVersion;
+  packageJson.devDependencies['@storybook/addons'] = addonsVersion;
+
+  if (!packageJson.dependencies['babel-core'] && !packageJson.devDependencies['babel-core']) {
+    packageJson.devDependencies['babel-core'] = babelCoreVersion;
+  }
   packageJson.devDependencies['babel-preset-vue'] = babelPresetVersion;
 
   packageJson.scripts = packageJson.scripts || {};
diff --git a/lib/cli/generators/SFC_VUE/template/.storybook/addons.js b/lib/cli/generators/SFC_VUE/template/.storybook/addons.js
index 402ccc13eba..6aed412d04a 100644
--- a/lib/cli/generators/SFC_VUE/template/.storybook/addons.js
+++ b/lib/cli/generators/SFC_VUE/template/.storybook/addons.js
@@ -1,2 +1,2 @@
-import '@storybook/addon-actions/register'
-import '@storybook/addon-links/register'
+import '@storybook/addon-actions/register';
+import '@storybook/addon-links/register';
diff --git a/lib/cli/generators/SFC_VUE/template/.storybook/config.js b/lib/cli/generators/SFC_VUE/template/.storybook/config.js
index c6331538c10..07280e8efae 100644
--- a/lib/cli/generators/SFC_VUE/template/.storybook/config.js
+++ b/lib/cli/generators/SFC_VUE/template/.storybook/config.js
@@ -1,9 +1,9 @@
-import { configure } from '@storybook/vue'
+import { configure } from '@storybook/vue';
 
 // automatically import all files ending in *.stories.js
 const req = require.context('../src/stories', true, /.stories.js$/);
 function loadStories() {
-  req.keys().forEach((filename) => req(filename));
+  req.keys().forEach(filename => req(filename));
 }
 
-configure(loadStories, module)
+configure(loadStories, module);
diff --git a/lib/cli/generators/SFC_VUE/template/src/stories/index.stories.js b/lib/cli/generators/SFC_VUE/template/src/stories/index.stories.js
index 4fb3479a0b7..f6aa034f5a8 100644
--- a/lib/cli/generators/SFC_VUE/template/src/stories/index.stories.js
+++ b/lib/cli/generators/SFC_VUE/template/src/stories/index.stories.js
@@ -28,7 +28,8 @@ storiesOf('Button', module)
   }))
   .add('with some emoji', () => ({
     components: { MyButton },
-    template: '<my-button @click="action">😀 😎 👍 💯</my-button>',
+    template:
+      '<my-button @click="action"><span role="img" aria-label="so cool">😀 😎 👍 💯</span></my-button>',
     methods: { action: action('clicked') },
   }));
 
diff --git a/lib/cli/generators/UPDATE_PACKAGE_ORGANIZATIONS/index.js b/lib/cli/generators/UPDATE_PACKAGE_ORGANIZATIONS/index.js
index ab74ba51a67..c94cb575284 100644
--- a/lib/cli/generators/UPDATE_PACKAGE_ORGANIZATIONS/index.js
+++ b/lib/cli/generators/UPDATE_PACKAGE_ORGANIZATIONS/index.js
@@ -1,14 +1,32 @@
+/* eslint-disable no-param-reassign */
 import path from 'path';
 import { spawn } from 'child-process-promise';
 import { packageNames } from '@storybook/codemod';
-import { getVersion, getPackageJson, writePackageJson } from '../../lib/helpers';
+import { getVersion, getVersions, getPackageJson, writePackageJson } from '../../lib/helpers';
 
 async function updatePackage(devDependencies, oldName, newName) {
   if (devDependencies[oldName]) {
-    /* eslint-disable no-param-reassign */
     delete devDependencies[oldName];
     devDependencies[newName] = await getVersion(newName);
-    /* eslint-enable */
+  }
+}
+
+async function addPeerDependencies(packageJson) {
+  const [addonsVersion, babelCoreVersion, babelRuntimeVersion] = await getVersions(
+    '@storybook/addons',
+    'babel-core',
+    'babel-runtime'
+  );
+
+  packageJson.dependencies = packageJson.dependencies || {};
+
+  packageJson.devDependencies['@storybook/addons'] = addonsVersion;
+
+  if (!packageJson.dependencies['babel-core'] && !packageJson.devDependencies['babel-core']) {
+    packageJson.devDependencies['babel-core'] = babelCoreVersion;
+  }
+  if (!packageJson.dependencies['babel-runtime'] && !packageJson.devDependencies['babel-runtime']) {
+    packageJson.devDependencies['babel-runtime'] = babelRuntimeVersion;
   }
 }
 
@@ -26,6 +44,9 @@ async function updatePackageJson() {
   if (!devDependencies['@storybook/react'] && !devDependencies['@storybook/react-native']) {
     throw new Error('Expected to find `@kadira/[react-native]-storybook` in devDependencies');
   }
+
+  await addPeerDependencies(packageJson);
+
   writePackageJson(packageJson);
 }
 
diff --git a/lib/cli/generators/VUE/index.js b/lib/cli/generators/VUE/index.js
index 6674f3159f2..72a302b8699 100644
--- a/lib/cli/generators/VUE/index.js
+++ b/lib/cli/generators/VUE/index.js
@@ -9,10 +9,19 @@ import {
 } from '../../lib/helpers';
 
 export default async () => {
-  const [storybookVersion, actionsVersion, linksVersion, babelPresetVersion] = await getVersions(
+  const [
+    storybookVersion,
+    actionsVersion,
+    linksVersion,
+    addonsVersion,
+    babelCoreVersion,
+    babelPresetVersion,
+  ] = await getVersions(
     '@storybook/vue',
     '@storybook/addon-actions',
     '@storybook/addon-links',
+    '@storybook/addons',
+    'babel-core',
     'babel-preset-vue'
   );
 
@@ -20,10 +29,16 @@ export default async () => {
 
   const packageJson = getPackageJson();
 
+  packageJson.dependencies = packageJson.dependencies || {};
   packageJson.devDependencies = packageJson.devDependencies || {};
   packageJson.devDependencies['@storybook/vue'] = storybookVersion;
   packageJson.devDependencies['@storybook/addon-actions'] = actionsVersion;
   packageJson.devDependencies['@storybook/addon-links'] = linksVersion;
+  packageJson.devDependencies['@storybook/addons'] = addonsVersion;
+
+  if (!packageJson.dependencies['babel-core'] && !packageJson.devDependencies['babel-core']) {
+    packageJson.devDependencies['babel-core'] = babelCoreVersion;
+  }
   packageJson.devDependencies['babel-preset-vue'] = babelPresetVersion;
 
   packageJson.scripts = packageJson.scripts || {};
diff --git a/lib/cli/generators/VUE/template/.storybook/addons.js b/lib/cli/generators/VUE/template/.storybook/addons.js
index 402ccc13eba..6aed412d04a 100644
--- a/lib/cli/generators/VUE/template/.storybook/addons.js
+++ b/lib/cli/generators/VUE/template/.storybook/addons.js
@@ -1,2 +1,2 @@
-import '@storybook/addon-actions/register'
-import '@storybook/addon-links/register'
+import '@storybook/addon-actions/register';
+import '@storybook/addon-links/register';
diff --git a/lib/cli/generators/VUE/template/.storybook/config.js b/lib/cli/generators/VUE/template/.storybook/config.js
index d5aba0f1fa3..b044ee5461a 100644
--- a/lib/cli/generators/VUE/template/.storybook/config.js
+++ b/lib/cli/generators/VUE/template/.storybook/config.js
@@ -1,9 +1,9 @@
-import { configure } from '@storybook/vue'
+import { configure } from '@storybook/vue';
 
 // automatically import all files ending in *.stories.js
 const req = require.context('../stories', true, /.stories.js$/);
 function loadStories() {
-  req.keys().forEach((filename) => req(filename));
+  req.keys().forEach(filename => req(filename));
 }
 
-configure(loadStories, module)
+configure(loadStories, module);
diff --git a/lib/cli/generators/WEBPACK_REACT/index.js b/lib/cli/generators/WEBPACK_REACT/index.js
index a606f0710cf..70360e292dd 100644
--- a/lib/cli/generators/WEBPACK_REACT/index.js
+++ b/lib/cli/generators/WEBPACK_REACT/index.js
@@ -3,20 +3,39 @@ import path from 'path';
 import { getVersions, getPackageJson, writePackageJson } from '../../lib/helpers';
 
 export default async () => {
-  const [storybookVersion, actionsVersion, linksVersion] = await getVersions(
+  const [
+    storybookVersion,
+    actionsVersion,
+    linksVersion,
+    addonsVersion,
+    babelCoreVersion,
+    babelRuntimeVersion,
+  ] = await getVersions(
     '@storybook/react',
     '@storybook/addon-actions',
-    '@storybook/addon-links'
+    '@storybook/addon-links',
+    '@storybook/addons',
+    'babel-core',
+    'babel-runtime'
   );
 
   mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
 
   const packageJson = getPackageJson();
 
+  packageJson.dependencies = packageJson.dependencies || {};
   packageJson.devDependencies = packageJson.devDependencies || {};
   packageJson.devDependencies['@storybook/react'] = storybookVersion;
   packageJson.devDependencies['@storybook/addon-actions'] = actionsVersion;
   packageJson.devDependencies['@storybook/addon-links'] = linksVersion;
+  packageJson.devDependencies['@storybook/addons'] = addonsVersion;
+
+  if (!packageJson.dependencies['babel-core'] && !packageJson.devDependencies['babel-core']) {
+    packageJson.devDependencies['babel-core'] = babelCoreVersion;
+  }
+  if (!packageJson.dependencies['babel-runtime'] && !packageJson.devDependencies['babel-runtime']) {
+    packageJson.devDependencies['babel-runtime'] = babelRuntimeVersion;
+  }
 
   packageJson.scripts = packageJson.scripts || {};
   packageJson.scripts.storybook = 'start-storybook -p 6006';
diff --git a/lib/cli/generators/WEBPACK_REACT/template/.storybook/config.js b/lib/cli/generators/WEBPACK_REACT/template/.storybook/config.js
index 694160f50fe..b98cb4736a4 100644
--- a/lib/cli/generators/WEBPACK_REACT/template/.storybook/config.js
+++ b/lib/cli/generators/WEBPACK_REACT/template/.storybook/config.js
@@ -3,7 +3,7 @@ import { configure } from '@storybook/react';
 // automatically import all files ending in *.stories.js
 const req = require.context('../stories', true, /.stories.js$/);
 function loadStories() {
-  req.keys().forEach((filename) => req(filename));
+  req.keys().forEach(filename => req(filename));
 }
 
 configure(loadStories, module);
diff --git a/lib/cli/generators/WEBPACK_REACT/template/stories/index.stories.js b/lib/cli/generators/WEBPACK_REACT/template/stories/index.stories.js
index 9214f65c7bb..aa04241802d 100644
--- a/lib/cli/generators/WEBPACK_REACT/template/stories/index.stories.js
+++ b/lib/cli/generators/WEBPACK_REACT/template/stories/index.stories.js
@@ -10,4 +10,10 @@ storiesOf('Welcome', module).add('to Storybook', () => <Welcome showApp={linkTo(
 
 storiesOf('Button', module)
   .add('with text', () => <Button onClick={action('clicked')}>Hello Button</Button>)
-  .add('with some emoji', () => <Button onClick={action('clicked')}>😀 😎 👍 💯</Button>);
+  .add('with some emoji', () => (
+    <Button onClick={action('clicked')}>
+      <span role="img" aria-label="so cool">
+        😀 😎 👍 💯
+      </span>
+    </Button>
+  ));
diff --git a/lib/cli/lib/detect.js b/lib/cli/lib/detect.js
index d7fd28ca9fc..8226013b13d 100644
--- a/lib/cli/lib/detect.js
+++ b/lib/cli/lib/detect.js
@@ -1,96 +1,127 @@
 import path from 'path';
 import fs from 'fs';
 import types from './project_types';
-import { getPackageJson } from './helpers';
+import { getBowerJson, getPackageJson } from './helpers';
 
-export default function detect(options) {
-  const packageJson = getPackageJson();
-  if (!packageJson) {
-    return types.UNDETECTED;
+function detectFramework(dependencies) {
+  if (!dependencies) {
+    return false;
+  }
+  if (
+    dependencies.devDependencies &&
+    (dependencies.devDependencies['vue-loader'] || dependencies.devDependencies.vueify)
+  ) {
+    return types.SFC_VUE;
   }
 
-  if (!options.force && packageJson.devDependencies) {
+  if (
+    (dependencies.dependencies && dependencies.dependencies.vue) ||
+    (dependencies.devDependencies && dependencies.devDependencies.vue) ||
+    (dependencies.dependencies && dependencies.dependencies.nuxt) ||
+    (dependencies.devDependencies && dependencies.devDependencies.nuxt)
+  ) {
+    return types.VUE;
+  }
+
+  if (
+    (dependencies.dependencies && dependencies.dependencies['react-scripts']) ||
+    (dependencies.devDependencies && dependencies.devDependencies['react-scripts'])
+  ) {
+    return types.REACT_SCRIPTS;
+  }
+
+  if (
+    ((dependencies.devDependencies && dependencies.devDependencies.webpack) ||
+      (dependencies.dependencies && dependencies.dependencies.webpack)) &&
+    ((dependencies.devDependencies && dependencies.devDependencies.react) ||
+      (dependencies.dependencies && dependencies.dependencies.react))
+  ) {
+    return types.WEBPACK_REACT;
+  }
+
+  if (dependencies.peerDependencies && dependencies.peerDependencies.react) {
+    return types.REACT_PROJECT;
+  }
+
+  if (
+    (dependencies.dependencies && dependencies.dependencies['react-native-scripts']) ||
+    (dependencies.devDependencies && dependencies.devDependencies['react-native-scripts'])
+  ) {
+    return types.REACT_NATIVE_SCRIPTS;
+  }
+
+  if (dependencies.dependencies && dependencies.dependencies['react-native']) {
+    return types.REACT_NATIVE;
+  }
+
+  if (
+    (dependencies.dependencies && dependencies.dependencies.react) ||
+    (dependencies.devDependencies && dependencies.devDependencies.react)
+  ) {
+    return types.REACT;
+  }
+
+  if (
+    (dependencies.dependencies && dependencies.dependencies['@angular/core']) ||
+    (dependencies.devDependencies && dependencies.devDependencies['@angular/core'])
+  ) {
+    return types.ANGULAR;
+  }
+
+  if (
+    (dependencies.dependencies && dependencies.dependencies['@polymer/polymer']) ||
+    (dependencies.devDependencies && dependencies.devDependencies['@polymer/polymer']) ||
+    (dependencies.dependencies && dependencies.dependencies.polymer) ||
+    (dependencies.devDependencies && dependencies.devDependencies.polymer)
+  ) {
+    return types.POLYMER;
+  }
+  return false;
+}
+
+function isStorybookInstalled(dependencies, force) {
+  if (!dependencies) {
+    return false;
+  }
+
+  if (!force && dependencies.devDependencies) {
+    const supportedFrameworks = ['react', 'react-native', 'vue', 'angular', 'polymer'];
     if (
-      packageJson.devDependencies['@storybook/react'] ||
-      packageJson.devDependencies['@storybook/react-native'] ||
-      packageJson.devDependencies['@storybook/vue'] ||
-      packageJson.devDependencies['@storybook/angular']
+      supportedFrameworks.reduce(
+        (storybookPresent, framework) =>
+          storybookPresent || dependencies.devDependencies[`@storybook/${framework}`],
+        false
+      )
     ) {
       return types.ALREADY_HAS_STORYBOOK;
     }
 
     if (
-      packageJson.devDependencies['@kadira/storybook'] ||
-      packageJson.devDependencies['@kadira/react-native-storybook']
+      dependencies.devDependencies['@kadira/storybook'] ||
+      dependencies.devDependencies['@kadira/react-native-storybook']
     ) {
       return types.UPDATE_PACKAGE_ORGANIZATIONS;
     }
   }
+  return false;
+}
+
+export default function detect(options) {
+  const packageJson = getPackageJson();
+  const bowerJson = getBowerJson();
+
+  if (!packageJson && !bowerJson) {
+    return types.UNDETECTED;
+  }
 
   if (fs.existsSync(path.resolve('.meteor'))) {
     return types.METEOR;
   }
 
-  if (
-    packageJson.devDependencies &&
-    (packageJson.devDependencies['vue-loader'] || packageJson.devDependencies.vueify)
-  ) {
-    return types.SFC_VUE;
+  const storyBookInstalled = isStorybookInstalled(packageJson, options.force);
+  if (storyBookInstalled) {
+    return storyBookInstalled;
   }
 
-  if (
-    (packageJson.dependencies && packageJson.dependencies.vue) ||
-    (packageJson.devDependencies && packageJson.devDependencies.vue) ||
-    (packageJson.dependencies && packageJson.dependencies.nuxt) ||
-    (packageJson.devDependencies && packageJson.devDependencies.nuxt)
-  ) {
-    return types.VUE;
-  }
-
-  if (
-    (packageJson.dependencies && packageJson.dependencies['react-scripts']) ||
-    (packageJson.devDependencies && packageJson.devDependencies['react-scripts'])
-  ) {
-    return types.REACT_SCRIPTS;
-  }
-
-  if (
-    ((packageJson.devDependencies && packageJson.devDependencies.webpack) ||
-      (packageJson.dependencies && packageJson.dependencies.webpack)) &&
-    ((packageJson.devDependencies && packageJson.devDependencies.react) ||
-      (packageJson.dependencies && packageJson.dependencies.react))
-  ) {
-    return types.WEBPACK_REACT;
-  }
-
-  if (packageJson.peerDependencies && packageJson.peerDependencies.react) {
-    return types.REACT_PROJECT;
-  }
-
-  if (
-    (packageJson.dependencies && packageJson.dependencies['react-native-scripts']) ||
-    (packageJson.devDependencies && packageJson.devDependencies['react-native-scripts'])
-  ) {
-    return types.REACT_NATIVE_SCRIPTS;
-  }
-
-  if (packageJson.dependencies && packageJson.dependencies['react-native']) {
-    return types.REACT_NATIVE;
-  }
-
-  if (
-    (packageJson.dependencies && packageJson.dependencies.react) ||
-    (packageJson.devDependencies && packageJson.devDependencies.react)
-  ) {
-    return types.REACT;
-  }
-
-  if (
-    (packageJson.dependencies && packageJson.dependencies['@angular/core']) ||
-    (packageJson.devDependencies && packageJson.devDependencies['@angular/core'])
-  ) {
-    return types.ANGULAR;
-  }
-
-  return types.UNDETECTED;
+  return detectFramework(packageJson) || detectFramework(bowerJson) || types.UNDETECTED;
 }
diff --git a/lib/cli/lib/helpers.js b/lib/cli/lib/helpers.js
index 6a3034df079..3b481312cac 100644
--- a/lib/cli/lib/helpers.js
+++ b/lib/cli/lib/helpers.js
@@ -47,6 +47,16 @@ export function getPackageJson() {
   return JSON.parse(jsonContent);
 }
 
+export function getBowerJson() {
+  const bowerJsonPath = path.resolve('bower.json');
+  if (!fs.existsSync(bowerJsonPath)) {
+    return false;
+  }
+
+  const jsonContent = fs.readFileSync(bowerJsonPath, 'utf8');
+  return JSON.parse(jsonContent);
+}
+
 export function writePackageJson(packageJson) {
   const content = `${JSON.stringify(packageJson, null, 2)}\n`;
   const packageJsonPath = path.resolve('package.json');
diff --git a/lib/cli/lib/project_types.js b/lib/cli/lib/project_types.js
index db6675801d6..d1c308322e3 100644
--- a/lib/cli/lib/project_types.js
+++ b/lib/cli/lib/project_types.js
@@ -12,4 +12,5 @@ export default {
   ANGULAR: 'ANGULAR',
   ALREADY_HAS_STORYBOOK: 'ALREADY_HAS_STORYBOOK',
   UPDATE_PACKAGE_ORGANIZATIONS: 'UPDATE_PACKAGE_ORGANIZATIONS',
+  POLYMER: 'POLYMER',
 };
diff --git a/lib/cli/package.json b/lib/cli/package.json
index 99d4a1599ec..bac37bf131c 100644
--- a/lib/cli/package.json
+++ b/lib/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/cli",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "Storybook's CLI - easiest method of adding storybook to your projects",
   "keywords": [
     "cli",
@@ -21,47 +21,48 @@
     "url": "https://github.com/storybooks/storybook.git"
   },
   "scripts": {
-    "test-latest-cra": "cd test && ./test_latest_cra.sh",
-    "test": "cd test && ./run_tests.sh"
+    "test": "cd test && ./run_tests.sh",
+    "test-latest-cra": "cd test && ./test_latest_cra.sh"
   },
   "dependencies": {
-    "@storybook/codemod": "^3.4.0-alpha.0",
+    "@storybook/codemod": "^3.4.0-alpha.9",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-env": "^1.6.0",
     "babel-register": "^6.26.0",
     "babel-runtime": "^6.26.0",
-    "chalk": "^2.3.0",
+    "chalk": "^2.3.1",
     "child-process-promise": "^2.2.1",
-    "commander": "^2.12.2",
-    "cross-spawn": "^5.0.1",
-    "jscodeshift": "^0.4.0",
+    "commander": "^2.14.1",
+    "cross-spawn": "^6.0.4",
+    "jscodeshift": "^0.4.1",
     "json5": "^0.5.1",
     "latest-version": "^3.1.0",
     "merge-dirs": "^0.2.1",
-    "semver": "^5.4.1",
-    "shelljs": "^0.7.8",
+    "semver": "^5.5.0",
+    "shelljs": "^0.8.1",
     "update-notifier": "^2.3.0"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "^3.4.0-alpha.0",
-    "@storybook/addon-centered": "^3.4.0-alpha.0",
-    "@storybook/addon-graphql": "^3.4.0-alpha.0",
-    "@storybook/addon-info": "^3.4.0-alpha.0",
-    "@storybook/addon-knobs": "^3.4.0-alpha.0",
-    "@storybook/addon-links": "^3.4.0-alpha.0",
-    "@storybook/addon-notes": "^3.4.0-alpha.0",
-    "@storybook/addon-options": "^3.4.0-alpha.0",
-    "@storybook/addon-storyshots": "^3.4.0-alpha.0",
-    "@storybook/addons": "^3.4.0-alpha.0",
-    "@storybook/angular": "^3.4.0-alpha.0",
-    "@storybook/channel-postmessage": "^3.4.0-alpha.0",
-    "@storybook/channel-websocket": "^3.4.0-alpha.0",
-    "@storybook/channels": "^3.4.0-alpha.0",
-    "@storybook/react": "^3.4.0-alpha.0",
-    "@storybook/react-native": "^3.4.0-alpha.0",
-    "@storybook/ui": "^3.4.0-alpha.0",
-    "@storybook/vue": "^3.4.0-alpha.0",
-    "check-node-version": "2.1.0",
+    "@storybook/addon-actions": "^3.4.0-alpha.9",
+    "@storybook/addon-centered": "^3.4.0-alpha.9",
+    "@storybook/addon-graphql": "^3.4.0-alpha.9",
+    "@storybook/addon-info": "^3.4.0-alpha.9",
+    "@storybook/addon-knobs": "^3.4.0-alpha.9",
+    "@storybook/addon-links": "^3.4.0-alpha.9",
+    "@storybook/addon-notes": "^3.4.0-alpha.9",
+    "@storybook/addon-options": "^3.4.0-alpha.9",
+    "@storybook/addon-storyshots": "^3.4.0-alpha.9",
+    "@storybook/addons": "^3.4.0-alpha.9",
+    "@storybook/angular": "^3.4.0-alpha.9",
+    "@storybook/channel-postmessage": "^3.4.0-alpha.9",
+    "@storybook/channel-websocket": "^3.4.0-alpha.9",
+    "@storybook/channels": "^3.4.0-alpha.9",
+    "@storybook/polymer": "^3.4.0-alpha.9",
+    "@storybook/react": "^3.4.0-alpha.9",
+    "@storybook/react-native": "^3.4.0-alpha.9",
+    "@storybook/ui": "^3.4.0-alpha.9",
+    "@storybook/vue": "^3.4.0-alpha.9",
+    "check-node-version": "3.2.0",
     "npx": "9.7.1"
   }
 }
diff --git a/lib/cli/test/fixtures/angular-cli/src/tsconfig.app.json b/lib/cli/test/fixtures/angular-cli/src/tsconfig.app.json
new file mode 100644
index 00000000000..39ba8dbacbb
--- /dev/null
+++ b/lib/cli/test/fixtures/angular-cli/src/tsconfig.app.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/app",
+    "baseUrl": "./",
+    "module": "es2015",
+    "types": []
+  },
+  "exclude": [
+    "test.ts",
+    "**/*.spec.ts"
+  ]
+}
diff --git a/lib/cli/test/fixtures/angular-cli/src/tsconfig.json b/lib/cli/test/fixtures/angular-cli/src/tsconfig.json
deleted file mode 100644
index 3c43903cfdd..00000000000
--- a/lib/cli/test/fixtures/angular-cli/src/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../tsconfig.json"
-}
diff --git a/lib/cli/test/fixtures/angular-cli/tsconfig.json b/lib/cli/test/fixtures/angular-cli/tsconfig.json
index 5d99906987d..a6c016bf38a 100644
--- a/lib/cli/test/fixtures/angular-cli/tsconfig.json
+++ b/lib/cli/test/fixtures/angular-cli/tsconfig.json
@@ -1,23 +1,19 @@
-
-
 {
+  "compileOnSave": false,
   "compilerOptions": {
-    "baseUrl": "",
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
     "declaration": false,
+    "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "lib": ["es6", "dom"],
-    "mapRoot": "./",
-    "module": "es6",
-    "moduleResolution": "node",
-    "outDir": "../dist/out-tsc",
-    "sourceMap": true,
     "target": "es5",
     "typeRoots": [
-      "../node_modules/@types"
+      "node_modules/@types"
+    ],
+    "lib": [
+      "es2017",
+      "dom"
     ]
-  },
-  "exclude": [
-    "node_modules"
-  ]
+  }
 }
diff --git a/lib/cli/test/fixtures/polymer/package.json b/lib/cli/test/fixtures/polymer/package.json
new file mode 100644
index 00000000000..99064a30234
--- /dev/null
+++ b/lib/cli/test/fixtures/polymer/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "polymer-fixture",
+  "version": "1.0.0",
+  "main": "index.js",
+  "license": "MIT",
+  "scripts": {
+    "build": "webpack -p dist"
+  },
+  "dependencies": {
+    "@polymer/polymer": "^2.2.0"
+  },
+  "devDependencies": {
+
+  }
+}
diff --git a/lib/cli/test/snapshots/angular-cli/.storybook/addons.js b/lib/cli/test/snapshots/angular-cli/.storybook/addons.js
index 4f9743d248e..47eabe0ce40 100644
--- a/lib/cli/test/snapshots/angular-cli/.storybook/addons.js
+++ b/lib/cli/test/snapshots/angular-cli/.storybook/addons.js
@@ -1,5 +1,3 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
-
 import '@storybook/addon-actions/register';
 import '@storybook/addon-links/register';
 import '@storybook/addon-notes/register';
diff --git a/lib/cli/test/snapshots/angular-cli/.storybook/config.js b/lib/cli/test/snapshots/angular-cli/.storybook/config.js
index 5d8908b9024..88f8a5326e4 100644
--- a/lib/cli/test/snapshots/angular-cli/.storybook/config.js
+++ b/lib/cli/test/snapshots/angular-cli/.storybook/config.js
@@ -1,11 +1,9 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
-
 import { configure } from '@storybook/angular';
 
 // automatically import all files ending in *.stories.ts
-const req = require.context('../stories', true, /.stories.ts$/);
+const req = require.context('../src/stories', true, /.stories.ts$/);
 function loadStories() {
-  req.keys().forEach((filename) => req(filename));
+  req.keys().forEach(filename => req(filename));
 }
 
 configure(loadStories, module);
diff --git a/lib/cli/test/snapshots/angular-cli/package.json b/lib/cli/test/snapshots/angular-cli/package.json
index fede06e2c77..277208614f0 100644
--- a/lib/cli/test/snapshots/angular-cli/package.json
+++ b/lib/cli/test/snapshots/angular-cli/package.json
@@ -44,10 +44,10 @@
     "ts-node": "1.2.1",
     "tslint": "^4.3.0",
     "typescript": "~2.4.0",
-    "@storybook/angular": "^3.4.0-alpha.0",
-    "@storybook/addon-notes": "^3.4.0-alpha.0",
-    "@storybook/addon-actions": "^3.4.0-alpha.0",
-    "@storybook/addon-links": "^3.4.0-alpha.0",
-    "@types/lodash-es": "^4.17.0"
+    "@storybook/angular": "^3.4.0-alpha.9",
+    "@storybook/addon-notes": "^3.4.0-alpha.9",
+    "@storybook/addon-actions": "^3.4.0-alpha.9",
+    "@storybook/addon-links": "^3.4.0-alpha.9",
+    "@storybook/addons": "^3.4.0-alpha.9"
   }
 }
diff --git a/lib/cli/test/snapshots/angular-cli/stories/index.stories.ts b/lib/cli/test/snapshots/angular-cli/src/stories/index.stories.ts
similarity index 100%
rename from lib/cli/test/snapshots/angular-cli/stories/index.stories.ts
rename to lib/cli/test/snapshots/angular-cli/src/stories/index.stories.ts
diff --git a/lib/cli/test/snapshots/angular-cli/src/tsconfig.app.json b/lib/cli/test/snapshots/angular-cli/src/tsconfig.app.json
new file mode 100644
index 00000000000..39ba8dbacbb
--- /dev/null
+++ b/lib/cli/test/snapshots/angular-cli/src/tsconfig.app.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/app",
+    "baseUrl": "./",
+    "module": "es2015",
+    "types": []
+  },
+  "exclude": [
+    "test.ts",
+    "**/*.spec.ts"
+  ]
+}
diff --git a/lib/cli/test/snapshots/angular-cli/src/tsconfig.json b/lib/cli/test/snapshots/angular-cli/src/tsconfig.json
deleted file mode 100644
index 3c43903cfdd..00000000000
--- a/lib/cli/test/snapshots/angular-cli/src/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../tsconfig.json"
-}
diff --git a/lib/cli/test/snapshots/angular-cli/tsconfig.json b/lib/cli/test/snapshots/angular-cli/tsconfig.json
index 5d99906987d..a6c016bf38a 100644
--- a/lib/cli/test/snapshots/angular-cli/tsconfig.json
+++ b/lib/cli/test/snapshots/angular-cli/tsconfig.json
@@ -1,23 +1,19 @@
-
-
 {
+  "compileOnSave": false,
   "compilerOptions": {
-    "baseUrl": "",
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
     "declaration": false,
+    "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "lib": ["es6", "dom"],
-    "mapRoot": "./",
-    "module": "es6",
-    "moduleResolution": "node",
-    "outDir": "../dist/out-tsc",
-    "sourceMap": true,
     "target": "es5",
     "typeRoots": [
-      "../node_modules/@types"
+      "node_modules/@types"
+    ],
+    "lib": [
+      "es2017",
+      "dom"
     ]
-  },
-  "exclude": [
-    "node_modules"
-  ]
+  }
 }
diff --git a/lib/cli/test/snapshots/meteor/.storybook/config.js b/lib/cli/test/snapshots/meteor/.storybook/config.js
index 694160f50fe..b98cb4736a4 100644
--- a/lib/cli/test/snapshots/meteor/.storybook/config.js
+++ b/lib/cli/test/snapshots/meteor/.storybook/config.js
@@ -3,7 +3,7 @@ import { configure } from '@storybook/react';
 // automatically import all files ending in *.stories.js
 const req = require.context('../stories', true, /.stories.js$/);
 function loadStories() {
-  req.keys().forEach((filename) => req(filename));
+  req.keys().forEach(filename => req(filename));
 }
 
 configure(loadStories, module);
diff --git a/lib/cli/test/snapshots/meteor/package.json b/lib/cli/test/snapshots/meteor/package.json
index e1024039c9a..6708e75ed6f 100644
--- a/lib/cli/test/snapshots/meteor/package.json
+++ b/lib/cli/test/snapshots/meteor/package.json
@@ -14,12 +14,14 @@
     "react-dom": "^16.2.0"
   },
   "devDependencies": {
+    "babel-core": "^6.26.0",
     "babel-preset-env": "^1.6.1",
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-1": "^6.24.1",
     "babel-root-slash-import": "^1.1.0",
-    "@storybook/react": "^3.4.0-alpha.0",
-    "@storybook/addon-actions": "^3.4.0-alpha.0",
-    "@storybook/addon-links": "^3.4.0-alpha.0"
+    "@storybook/react": "^3.4.0-alpha.9",
+    "@storybook/addon-actions": "^3.4.0-alpha.9",
+    "@storybook/addon-links": "^3.4.0-alpha.9",
+    "@storybook/addons": "^3.4.0-alpha.9"
   }
 }
diff --git a/lib/cli/test/snapshots/meteor/stories/index.stories.js b/lib/cli/test/snapshots/meteor/stories/index.stories.js
index 9214f65c7bb..aa04241802d 100644
--- a/lib/cli/test/snapshots/meteor/stories/index.stories.js
+++ b/lib/cli/test/snapshots/meteor/stories/index.stories.js
@@ -10,4 +10,10 @@ storiesOf('Welcome', module).add('to Storybook', () => <Welcome showApp={linkTo(
 
 storiesOf('Button', module)
   .add('with text', () => <Button onClick={action('clicked')}>Hello Button</Button>)
-  .add('with some emoji', () => <Button onClick={action('clicked')}>😀 😎 👍 💯</Button>);
+  .add('with some emoji', () => (
+    <Button onClick={action('clicked')}>
+      <span role="img" aria-label="so cool">
+        😀 😎 👍 💯
+      </span>
+    </Button>
+  ));
diff --git a/lib/cli/test/snapshots/polymer/.storybook/config.js b/lib/cli/test/snapshots/polymer/.storybook/config.js
new file mode 100644
index 00000000000..ea20a9f493b
--- /dev/null
+++ b/lib/cli/test/snapshots/polymer/.storybook/config.js
@@ -0,0 +1,9 @@
+import { configure } from '@storybook/polymer';
+
+// automatically import all files ending in *.stories.js
+const req = require.context('../src/stories', true, /.stories.js$/);
+function loadStories() {
+  req.keys().forEach(filename => req(filename));
+}
+
+configure(loadStories, module);
diff --git a/lib/cli/test/snapshots/polymer/package.json b/lib/cli/test/snapshots/polymer/package.json
new file mode 100644
index 00000000000..e60f1ea1414
--- /dev/null
+++ b/lib/cli/test/snapshots/polymer/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "polymer-fixture",
+  "version": "1.0.0",
+  "main": "index.js",
+  "license": "MIT",
+  "scripts": {
+    "build": "webpack -p dist",
+    "storybook": "start-storybook -p 6006",
+    "build-storybook": "build-storybook"
+  },
+  "dependencies": {
+    "@polymer/polymer": "^2.2.0"
+  },
+  "devDependencies": {
+    "@storybook/polymer": "^3.4.0-alpha.9",
+    "babel-core": "^6.26.0",
+    "babel-runtime": "^6.26.0"
+  }
+}
diff --git a/lib/cli/test/snapshots/polymer/src/stories/index.stories.js b/lib/cli/test/snapshots/polymer/src/stories/index.stories.js
new file mode 100644
index 00000000000..88f77313607
--- /dev/null
+++ b/lib/cli/test/snapshots/polymer/src/stories/index.stories.js
@@ -0,0 +1 @@
+// TODO: add demo stories
diff --git a/lib/cli/test/snapshots/react/.storybook/config.js b/lib/cli/test/snapshots/react/.storybook/config.js
index 694160f50fe..b98cb4736a4 100644
--- a/lib/cli/test/snapshots/react/.storybook/config.js
+++ b/lib/cli/test/snapshots/react/.storybook/config.js
@@ -3,7 +3,7 @@ import { configure } from '@storybook/react';
 // automatically import all files ending in *.stories.js
 const req = require.context('../stories', true, /.stories.js$/);
 function loadStories() {
-  req.keys().forEach((filename) => req(filename));
+  req.keys().forEach(filename => req(filename));
 }
 
 configure(loadStories, module);
diff --git a/lib/cli/test/snapshots/react/package.json b/lib/cli/test/snapshots/react/package.json
index b4962de898c..401c6fda911 100644
--- a/lib/cli/test/snapshots/react/package.json
+++ b/lib/cli/test/snapshots/react/package.json
@@ -20,8 +20,11 @@
     "rollup-plugin-commonjs": "^8.2.0",
     "rollup-plugin-node-resolve": "^3.0.0",
     "rollup-plugin-replace": "^1.1.1",
-    "@storybook/react": "^3.4.0-alpha.0",
-    "@storybook/addon-actions": "^3.4.0-alpha.0",
-    "@storybook/addon-links": "^3.4.0-alpha.0"
+    "@storybook/react": "^3.4.0-alpha.9",
+    "@storybook/addon-actions": "^3.4.0-alpha.9",
+    "@storybook/addon-links": "^3.4.0-alpha.9",
+    "@storybook/addons": "^3.4.0-alpha.9",
+    "babel-core": "^6.26.0",
+    "babel-runtime": "^6.26.0"
   }
 }
diff --git a/lib/cli/test/snapshots/react/stories/index.stories.js b/lib/cli/test/snapshots/react/stories/index.stories.js
index 9214f65c7bb..aa04241802d 100644
--- a/lib/cli/test/snapshots/react/stories/index.stories.js
+++ b/lib/cli/test/snapshots/react/stories/index.stories.js
@@ -10,4 +10,10 @@ storiesOf('Welcome', module).add('to Storybook', () => <Welcome showApp={linkTo(
 
 storiesOf('Button', module)
   .add('with text', () => <Button onClick={action('clicked')}>Hello Button</Button>)
-  .add('with some emoji', () => <Button onClick={action('clicked')}>😀 😎 👍 💯</Button>);
+  .add('with some emoji', () => (
+    <Button onClick={action('clicked')}>
+      <span role="img" aria-label="so cool">
+        😀 😎 👍 💯
+      </span>
+    </Button>
+  ));
diff --git a/lib/cli/test/snapshots/react_native/package.json b/lib/cli/test/snapshots/react_native/package.json
index 3466be31879..8c742c068b3 100644
--- a/lib/cli/test/snapshots/react_native/package.json
+++ b/lib/cli/test/snapshots/react_native/package.json
@@ -16,11 +16,14 @@
     "babel-preset-react-native": "3.0.1",
     "jest": "20.0.4",
     "react-test-renderer": "16.0.0-alpha.12",
-    "@storybook/react-native": "^3.4.0-alpha.0",
-    "@storybook/addon-actions": "^3.4.0-alpha.0",
-    "@storybook/addon-links": "^3.4.0-alpha.0",
+    "@storybook/react-native": "^3.4.0-alpha.9",
+    "@storybook/addon-actions": "^3.4.0-alpha.9",
+    "@storybook/addon-links": "^3.4.0-alpha.9",
+    "@storybook/addons": "^3.4.0-alpha.9",
+    "babel-core": "^6.26.0",
+    "babel-runtime": "^6.26.0",
     "react-dom": "16.0.0-alpha.12",
-    "prop-types": "^15.6.0"
+    "prop-types": "^15.6.1"
   },
   "jest": {
     "preset": "react-native"
diff --git a/lib/cli/test/snapshots/react_native/storybook/storybook.js b/lib/cli/test/snapshots/react_native/storybook/storybook.js
index 46a917d2435..c77ad96c583 100644
--- a/lib/cli/test/snapshots/react_native/storybook/storybook.js
+++ b/lib/cli/test/snapshots/react_native/storybook/storybook.js
@@ -1,4 +1,3 @@
-/* eslint-disable global-require */
 import React, { Component } from 'react';
 import { AppRegistry } from 'react-native';
 import { getStorybookUI, configure } from '@storybook/react-native';
diff --git a/lib/cli/test/snapshots/react_native_scripts/package.json b/lib/cli/test/snapshots/react_native_scripts/package.json
index e34e3b566b2..0baf4f2e4d5 100644
--- a/lib/cli/test/snapshots/react_native_scripts/package.json
+++ b/lib/cli/test/snapshots/react_native_scripts/package.json
@@ -6,11 +6,14 @@
     "react-native-scripts": "1.3.1",
     "jest-expo": "~20.0.0",
     "react-test-renderer": "16.0.0-alpha.12",
-    "@storybook/react-native": "^3.4.0-alpha.0",
-    "@storybook/addon-actions": "^3.4.0-alpha.0",
-    "@storybook/addon-links": "^3.4.0-alpha.0",
+    "@storybook/react-native": "^3.4.0-alpha.9",
+    "@storybook/addon-actions": "^3.4.0-alpha.9",
+    "@storybook/addon-links": "^3.4.0-alpha.9",
+    "@storybook/addons": "^3.4.0-alpha.9",
+    "babel-core": "^6.26.0",
+    "babel-runtime": "^6.26.0",
     "react-dom": "16.0.0-alpha.12",
-    "prop-types": "^15.6.0"
+    "prop-types": "^15.6.1"
   },
   "main": "./node_modules/react-native-scripts/build/bin/crna-entry.js",
   "scripts": {
diff --git a/lib/cli/test/snapshots/react_native_scripts/storybook/index.js b/lib/cli/test/snapshots/react_native_scripts/storybook/index.js
index 138e8817fa9..7670ee12cd5 100644
--- a/lib/cli/test/snapshots/react_native_scripts/storybook/index.js
+++ b/lib/cli/test/snapshots/react_native_scripts/storybook/index.js
@@ -1,4 +1,3 @@
-/* eslint-disable global-require */
 import React, { Component } from 'react';
 import { AppRegistry } from 'react-native';
 import { getStorybookUI, configure } from '@storybook/react-native';
diff --git a/lib/cli/test/snapshots/react_project/.storybook/config.js b/lib/cli/test/snapshots/react_project/.storybook/config.js
index 694160f50fe..b98cb4736a4 100644
--- a/lib/cli/test/snapshots/react_project/.storybook/config.js
+++ b/lib/cli/test/snapshots/react_project/.storybook/config.js
@@ -3,7 +3,7 @@ import { configure } from '@storybook/react';
 // automatically import all files ending in *.stories.js
 const req = require.context('../stories', true, /.stories.js$/);
 function loadStories() {
-  req.keys().forEach((filename) => req(filename));
+  req.keys().forEach(filename => req(filename));
 }
 
 configure(loadStories, module);
diff --git a/lib/cli/test/snapshots/react_project/package.json b/lib/cli/test/snapshots/react_project/package.json
index 88044c1ee08..528fe690ea0 100644
--- a/lib/cli/test/snapshots/react_project/package.json
+++ b/lib/cli/test/snapshots/react_project/package.json
@@ -13,12 +13,16 @@
     "babel-preset-react": "^6.24.1",
     "react": "^15.6.1",
     "react-dom": "^15.6.1",
-    "@storybook/react": "^3.4.0-alpha.0",
-    "@storybook/addon-actions": "^3.4.0-alpha.0",
-    "@storybook/addon-links": "^3.4.0-alpha.0"
+    "@storybook/react": "^3.4.0-alpha.9",
+    "@storybook/addon-actions": "^3.4.0-alpha.9",
+    "@storybook/addon-links": "^3.4.0-alpha.9",
+    "@storybook/addons": "^3.4.0-alpha.9",
+    "babel-core": "^6.26.0",
+    "babel-runtime": "^6.26.0"
   },
   "peerDependencies": {
     "react": "*",
     "react-dom": "*"
-  }
+  },
+  "dependencies": {}
 }
diff --git a/lib/cli/test/snapshots/react_project/stories/index.stories.js b/lib/cli/test/snapshots/react_project/stories/index.stories.js
index 9214f65c7bb..aa04241802d 100644
--- a/lib/cli/test/snapshots/react_project/stories/index.stories.js
+++ b/lib/cli/test/snapshots/react_project/stories/index.stories.js
@@ -10,4 +10,10 @@ storiesOf('Welcome', module).add('to Storybook', () => <Welcome showApp={linkTo(
 
 storiesOf('Button', module)
   .add('with text', () => <Button onClick={action('clicked')}>Hello Button</Button>)
-  .add('with some emoji', () => <Button onClick={action('clicked')}>😀 😎 👍 💯</Button>);
+  .add('with some emoji', () => (
+    <Button onClick={action('clicked')}>
+      <span role="img" aria-label="so cool">
+        😀 😎 👍 💯
+      </span>
+    </Button>
+  ));
diff --git a/lib/cli/test/snapshots/react_scripts/package.json b/lib/cli/test/snapshots/react_scripts/package.json
index ccac4404c01..cd7ce4cc68d 100644
--- a/lib/cli/test/snapshots/react_scripts/package.json
+++ b/lib/cli/test/snapshots/react_scripts/package.json
@@ -16,8 +16,11 @@
     "build-storybook": "build-storybook -s public"
   },
   "devDependencies": {
-    "@storybook/react": "^3.4.0-alpha.0",
-    "@storybook/addon-actions": "^3.4.0-alpha.0",
-    "@storybook/addon-links": "^3.4.0-alpha.0"
+    "@storybook/react": "^3.4.0-alpha.9",
+    "@storybook/addon-actions": "^3.4.0-alpha.9",
+    "@storybook/addon-links": "^3.4.0-alpha.9",
+    "@storybook/addons": "^3.4.0-alpha.9",
+    "babel-core": "^6.26.0",
+    "babel-runtime": "^6.26.0"
   }
 }
diff --git a/lib/cli/test/snapshots/react_scripts/src/stories/index.js b/lib/cli/test/snapshots/react_scripts/src/stories/index.js
index 9214f65c7bb..aa04241802d 100644
--- a/lib/cli/test/snapshots/react_scripts/src/stories/index.js
+++ b/lib/cli/test/snapshots/react_scripts/src/stories/index.js
@@ -10,4 +10,10 @@ storiesOf('Welcome', module).add('to Storybook', () => <Welcome showApp={linkTo(
 
 storiesOf('Button', module)
   .add('with text', () => <Button onClick={action('clicked')}>Hello Button</Button>)
-  .add('with some emoji', () => <Button onClick={action('clicked')}>😀 😎 👍 💯</Button>);
+  .add('with some emoji', () => (
+    <Button onClick={action('clicked')}>
+      <span role="img" aria-label="so cool">
+        😀 😎 👍 💯
+      </span>
+    </Button>
+  ));
diff --git a/lib/cli/test/snapshots/sfc_vue/.storybook/addons.js b/lib/cli/test/snapshots/sfc_vue/.storybook/addons.js
index 402ccc13eba..6aed412d04a 100644
--- a/lib/cli/test/snapshots/sfc_vue/.storybook/addons.js
+++ b/lib/cli/test/snapshots/sfc_vue/.storybook/addons.js
@@ -1,2 +1,2 @@
-import '@storybook/addon-actions/register'
-import '@storybook/addon-links/register'
+import '@storybook/addon-actions/register';
+import '@storybook/addon-links/register';
diff --git a/lib/cli/test/snapshots/sfc_vue/.storybook/config.js b/lib/cli/test/snapshots/sfc_vue/.storybook/config.js
index c6331538c10..07280e8efae 100644
--- a/lib/cli/test/snapshots/sfc_vue/.storybook/config.js
+++ b/lib/cli/test/snapshots/sfc_vue/.storybook/config.js
@@ -1,9 +1,9 @@
-import { configure } from '@storybook/vue'
+import { configure } from '@storybook/vue';
 
 // automatically import all files ending in *.stories.js
 const req = require.context('../src/stories', true, /.stories.js$/);
 function loadStories() {
-  req.keys().forEach((filename) => req(filename));
+  req.keys().forEach(filename => req(filename));
 }
 
-configure(loadStories, module)
+configure(loadStories, module);
diff --git a/lib/cli/test/snapshots/sfc_vue/package.json b/lib/cli/test/snapshots/sfc_vue/package.json
index 80868e748a7..16b85e0ccef 100644
--- a/lib/cli/test/snapshots/sfc_vue/package.json
+++ b/lib/cli/test/snapshots/sfc_vue/package.json
@@ -49,10 +49,11 @@
     "webpack-dev-middleware": "^1.10.0",
     "webpack-hot-middleware": "^2.18.0",
     "webpack-merge": "^4.1.0",
-    "@storybook/vue": "^3.4.0-alpha.0",
-    "@storybook/addon-actions": "^3.4.0-alpha.0",
-    "@storybook/addon-links": "^3.4.0-alpha.0",
-    "babel-preset-vue": "^2.0.0"
+    "@storybook/vue": "^3.4.0-alpha.9",
+    "@storybook/addon-actions": "^3.4.0-alpha.9",
+    "@storybook/addon-links": "^3.4.0-alpha.9",
+    "@storybook/addons": "^3.4.0-alpha.9",
+    "babel-preset-vue": "^2.0.1"
   },
   "engines": {
     "node": ">= 4.0.0",
diff --git a/lib/cli/test/snapshots/sfc_vue/src/stories/index.stories.js b/lib/cli/test/snapshots/sfc_vue/src/stories/index.stories.js
index 4fb3479a0b7..f6aa034f5a8 100644
--- a/lib/cli/test/snapshots/sfc_vue/src/stories/index.stories.js
+++ b/lib/cli/test/snapshots/sfc_vue/src/stories/index.stories.js
@@ -28,7 +28,8 @@ storiesOf('Button', module)
   }))
   .add('with some emoji', () => ({
     components: { MyButton },
-    template: '<my-button @click="action">😀 😎 👍 💯</my-button>',
+    template:
+      '<my-button @click="action"><span role="img" aria-label="so cool">😀 😎 👍 💯</span></my-button>',
     methods: { action: action('clicked') },
   }));
 
diff --git a/lib/cli/test/snapshots/update_package_organisations/package.json b/lib/cli/test/snapshots/update_package_organisations/package.json
index 632508e5c05..baf2707a81f 100644
--- a/lib/cli/test/snapshots/update_package_organisations/package.json
+++ b/lib/cli/test/snapshots/update_package_organisations/package.json
@@ -8,7 +8,10 @@
     "react-scripts": "0.9.x"
   },
   "devDependencies": {
-    "@storybook/react": "^3.4.0-alpha.0"
+    "@storybook/react": "^3.4.0-alpha.9",
+    "@storybook/addons": "^3.4.0-alpha.9",
+    "babel-core": "^6.26.0",
+    "babel-runtime": "^6.26.0"
   },
   "scripts": {
     "start": "react-scripts start",
diff --git a/lib/cli/test/snapshots/vue/.storybook/addons.js b/lib/cli/test/snapshots/vue/.storybook/addons.js
index 402ccc13eba..6aed412d04a 100644
--- a/lib/cli/test/snapshots/vue/.storybook/addons.js
+++ b/lib/cli/test/snapshots/vue/.storybook/addons.js
@@ -1,2 +1,2 @@
-import '@storybook/addon-actions/register'
-import '@storybook/addon-links/register'
+import '@storybook/addon-actions/register';
+import '@storybook/addon-links/register';
diff --git a/lib/cli/test/snapshots/vue/.storybook/config.js b/lib/cli/test/snapshots/vue/.storybook/config.js
index d5aba0f1fa3..b044ee5461a 100644
--- a/lib/cli/test/snapshots/vue/.storybook/config.js
+++ b/lib/cli/test/snapshots/vue/.storybook/config.js
@@ -1,9 +1,9 @@
-import { configure } from '@storybook/vue'
+import { configure } from '@storybook/vue';
 
 // automatically import all files ending in *.stories.js
 const req = require.context('../stories', true, /.stories.js$/);
 function loadStories() {
-  req.keys().forEach((filename) => req(filename));
+  req.keys().forEach(filename => req(filename));
 }
 
-configure(loadStories, module)
+configure(loadStories, module);
diff --git a/lib/cli/test/snapshots/vue/package.json b/lib/cli/test/snapshots/vue/package.json
index d4b6b21c7c6..bee09175199 100644
--- a/lib/cli/test/snapshots/vue/package.json
+++ b/lib/cli/test/snapshots/vue/package.json
@@ -34,9 +34,10 @@
     "rollup-plugin-serve": "^0.4.0",
     "rollup-plugin-vue": "^2.4.0",
     "rollup-watch": "^4.0.0",
-    "@storybook/vue": "^3.4.0-alpha.0",
-    "@storybook/addon-actions": "^3.4.0-alpha.0",
-    "@storybook/addon-links": "^3.4.0-alpha.0",
-    "babel-preset-vue": "^2.0.0"
+    "@storybook/vue": "^3.4.0-alpha.9",
+    "@storybook/addon-actions": "^3.4.0-alpha.9",
+    "@storybook/addon-links": "^3.4.0-alpha.9",
+    "@storybook/addons": "^3.4.0-alpha.9",
+    "babel-preset-vue": "^2.0.1"
   }
 }
diff --git a/lib/cli/test/snapshots/webpack_react/.storybook/config.js b/lib/cli/test/snapshots/webpack_react/.storybook/config.js
index 694160f50fe..b98cb4736a4 100644
--- a/lib/cli/test/snapshots/webpack_react/.storybook/config.js
+++ b/lib/cli/test/snapshots/webpack_react/.storybook/config.js
@@ -3,7 +3,7 @@ import { configure } from '@storybook/react';
 // automatically import all files ending in *.stories.js
 const req = require.context('../stories', true, /.stories.js$/);
 function loadStories() {
-  req.keys().forEach((filename) => req(filename));
+  req.keys().forEach(filename => req(filename));
 }
 
 configure(loadStories, module);
diff --git a/lib/cli/test/snapshots/webpack_react/package.json b/lib/cli/test/snapshots/webpack_react/package.json
index 0c5b7057f1e..3471ee846cd 100644
--- a/lib/cli/test/snapshots/webpack_react/package.json
+++ b/lib/cli/test/snapshots/webpack_react/package.json
@@ -17,8 +17,10 @@
     "babel-loader": "^7.1.2",
     "babel-preset-react": "^6.24.1",
     "webpack": "^3.5.5",
-    "@storybook/react": "^3.4.0-alpha.0",
-    "@storybook/addon-actions": "^3.4.0-alpha.0",
-    "@storybook/addon-links": "^3.4.0-alpha.0"
+    "@storybook/react": "^3.4.0-alpha.9",
+    "@storybook/addon-actions": "^3.4.0-alpha.9",
+    "@storybook/addon-links": "^3.4.0-alpha.9",
+    "@storybook/addons": "^3.4.0-alpha.9",
+    "babel-runtime": "^6.26.0"
   }
 }
diff --git a/lib/cli/test/snapshots/webpack_react/stories/index.stories.js b/lib/cli/test/snapshots/webpack_react/stories/index.stories.js
index 9214f65c7bb..aa04241802d 100644
--- a/lib/cli/test/snapshots/webpack_react/stories/index.stories.js
+++ b/lib/cli/test/snapshots/webpack_react/stories/index.stories.js
@@ -10,4 +10,10 @@ storiesOf('Welcome', module).add('to Storybook', () => <Welcome showApp={linkTo(
 
 storiesOf('Button', module)
   .add('with text', () => <Button onClick={action('clicked')}>Hello Button</Button>)
-  .add('with some emoji', () => <Button onClick={action('clicked')}>😀 😎 👍 💯</Button>);
+  .add('with some emoji', () => (
+    <Button onClick={action('clicked')}>
+      <span role="img" aria-label="so cool">
+        😀 😎 👍 💯
+      </span>
+    </Button>
+  ));
diff --git a/lib/client-logger/package.json b/lib/client-logger/package.json
index 623259bbb80..a9d9862e1df 100644
--- a/lib/client-logger/package.json
+++ b/lib/client-logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/client-logger",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "",
   "license": "MIT",
   "main": "dist/index.js",
diff --git a/lib/codemod/package.json b/lib/codemod/package.json
index 45aba77cf6e..b93db2ef2b2 100644
--- a/lib/codemod/package.json
+++ b/lib/codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/codemod",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "A collection of codemod scripts written with JSCodeshift",
   "license": "MIT",
   "main": "dist/index.js",
@@ -13,6 +13,6 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "jscodeshift": "^0.4.0"
+    "jscodeshift": "^0.4.1"
   }
 }
diff --git a/lib/components/package.json b/lib/components/package.json
index 2d3cdada558..ad155bb531b 100644
--- a/lib/components/package.json
+++ b/lib/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/components",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "Core Storybook Components",
   "license": "MIT",
   "main": "dist/index.js",
@@ -10,22 +10,22 @@
     "url": "https://github.com/storybooks/storybook.git"
   },
   "scripts": {
+    "build-storybook": "build-storybook",
     "prepare": "node ../../scripts/prepare.js",
-    "storybook": "start-storybook -p 6006",
-    "build-storybook": "build-storybook"
+    "storybook": "start-storybook -p 6006"
   },
   "dependencies": {
     "glamor": "^2.20.40",
-    "glamorous": "^4.11.2",
-    "prop-types": "^15.6.0"
+    "glamorous": "^4.11.6",
+    "prop-types": "^15.6.1"
   },
   "peerDependencies": {
     "react": "*",
     "react-dom": "*"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "^3.4.0-alpha.0",
-    "@storybook/addon-knobs": "^3.4.0-alpha.0",
-    "@storybook/react": "^3.4.0-alpha.0"
+    "@storybook/addon-actions": "^3.4.0-alpha.9",
+    "@storybook/addon-knobs": "^3.4.0-alpha.9",
+    "@storybook/react": "^3.4.0-alpha.9"
   }
 }
diff --git a/lib/components/src/form/__snapshots__/button.stories.storyshot b/lib/components/src/form/__snapshots__/button.stories.storyshot
new file mode 100644
index 00000000000..720d334db2f
--- /dev/null
+++ b/lib/components/src/form/__snapshots__/button.stories.storyshot
@@ -0,0 +1,10 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Components|Form/Button with onclick 1`] = `
+<button
+  class="css-1ibnlbj"
+  type="button"
+>
+  Submit
+</button>
+`;
diff --git a/lib/components/src/form/button.js b/lib/components/src/form/button.js
new file mode 100644
index 00000000000..a6d2d6945d8
--- /dev/null
+++ b/lib/components/src/form/button.js
@@ -0,0 +1,28 @@
+import glamorous from 'glamorous';
+import { baseFonts } from '../theme';
+
+export default glamorous
+  .button({
+    ...baseFonts,
+    border: 'none',
+    boxShadow: '0 0 0 1px rgba(0, 0, 0, 0.2)',
+    backgroundColor: 'rgb(255, 255, 255)',
+    padding: '4px 10px 7px',
+    borderRadius: 4,
+    cursor: 'pointer',
+    transition: 'box-shadow 0.15s ease-out',
+    ':hover': {
+      transition: 'background-color 0.15s ease-out',
+      boxShadow: '0 0 0 1px rgba(0, 0, 0, 0.3)',
+    },
+    ':focus': {
+      transition: 'background-color 0.15s ease-out',
+      outline: 'none',
+      boxShadow: '0 0 0 2px rgba(0, 0, 0, 0.3)',
+    },
+    ':active': {
+      transition: 'none',
+      backgroundColor: 'rgb(247, 247, 247)',
+    },
+  })
+  .withProps({ type: 'button' });
diff --git a/lib/components/src/form/button.stories.js b/lib/components/src/form/button.stories.js
new file mode 100644
index 00000000000..caba82eab12
--- /dev/null
+++ b/lib/components/src/form/button.stories.js
@@ -0,0 +1,10 @@
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import { withKnobs, text } from '@storybook/addon-knobs';
+
+import Button from './button';
+
+storiesOf('Components|Form/Button', module)
+  .addDecorator(withKnobs)
+  .add('with onclick', () => <Button onClick={action('click')}>{text('Text', 'Submit')}</Button>);
diff --git a/lib/components/src/index.js b/lib/components/src/index.js
index 3f43cb8e9a0..466e146ca59 100644
--- a/lib/components/src/index.js
+++ b/lib/components/src/index.js
@@ -5,3 +5,5 @@ export { default as MenuLink } from './navigation/menu_link';
 export { default as HighlightButton } from './highlight_button';
 export { default as Table } from './table/table';
 export { td as Td, th as Th } from './table/cell';
+
+export { default as Button } from './form/button';
diff --git a/lib/components/src/navigation/__snapshots__/menu_link.stories.storyshot b/lib/components/src/navigation/__snapshots__/menu_link.stories.storyshot
index 59c87d1a7f5..d7944c81664 100644
--- a/lib/components/src/navigation/__snapshots__/menu_link.stories.storyshot
+++ b/lib/components/src/navigation/__snapshots__/menu_link.stories.storyshot
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Storyshots components/MenuLink active 1`] = `
+exports[`Storyshots Components|Navigation/MenuLink active 1`] = `
 <a
   class="css-1enjukp"
   href="http://google.com"
@@ -9,7 +9,7 @@ exports[`Storyshots components/MenuLink active 1`] = `
 </a>
 `;
 
-exports[`Storyshots components/MenuLink default 1`] = `
+exports[`Storyshots Components|Navigation/MenuLink default 1`] = `
 <a
   class="css-1b2u8sb"
   href="http://google.com"
@@ -18,7 +18,7 @@ exports[`Storyshots components/MenuLink default 1`] = `
 </a>
 `;
 
-exports[`Storyshots components/MenuLink with knobs 1`] = `
+exports[`Storyshots Components|Navigation/MenuLink with knobs 1`] = `
 <div
   class="css-t9df35"
 >
diff --git a/lib/components/src/navigation/__snapshots__/routed_link.stories.storyshot b/lib/components/src/navigation/__snapshots__/routed_link.stories.storyshot
index ba94bf2744d..414e03a58e0 100644
--- a/lib/components/src/navigation/__snapshots__/routed_link.stories.storyshot
+++ b/lib/components/src/navigation/__snapshots__/routed_link.stories.storyshot
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Storyshots components/RoutedLink w/ href 1`] = `
+exports[`Storyshots Components|Navigation/RoutedLink w/ href 1`] = `
 <a
   href="http://google.com"
 >
@@ -8,7 +8,7 @@ exports[`Storyshots components/RoutedLink w/ href 1`] = `
 </a>
 `;
 
-exports[`Storyshots components/RoutedLink w/ onClick 1`] = `
+exports[`Storyshots Components|Navigation/RoutedLink w/ onClick 1`] = `
 <a
   href="/"
 >
diff --git a/lib/components/src/navigation/menu_link.stories.js b/lib/components/src/navigation/menu_link.stories.js
index 0f866e19b7d..a63237dccab 100644
--- a/lib/components/src/navigation/menu_link.stories.js
+++ b/lib/components/src/navigation/menu_link.stories.js
@@ -6,7 +6,7 @@ import { Div } from 'glamorous';
 
 import MenuLink from './menu_link';
 
-storiesOf('components/MenuLink', module)
+storiesOf('Components|Navigation/MenuLink', module)
   .add('default', () => <MenuLink href="http://google.com">Link</MenuLink>)
   .add('active', () => (
     <MenuLink active href="http://google.com">
diff --git a/lib/components/src/navigation/routed_link.stories.js b/lib/components/src/navigation/routed_link.stories.js
index 0c372b88d41..c78d7b52c53 100644
--- a/lib/components/src/navigation/routed_link.stories.js
+++ b/lib/components/src/navigation/routed_link.stories.js
@@ -5,7 +5,7 @@ import { action } from '@storybook/addon-actions';
 import RoutedLink from './routed_link';
 
 const onClick = action('onClick');
-storiesOf('components/RoutedLink', module)
+storiesOf('Components|Navigation/RoutedLink', module)
   .add('w/ onClick', () => (
     <RoutedLink href="/" onClick={onClick}>
       Try clicking with different mouse buttons and modifier keys (shift/ctrl/alt/cmd)
diff --git a/lib/core/client.js b/lib/core/client.js
index 6de6d912885..953e79fe056 100644
--- a/lib/core/client.js
+++ b/lib/core/client.js
@@ -1,2 +1 @@
-/* eslint-disable global-require */
 module.exports = require('./dist/client').default;
diff --git a/lib/core/env.js b/lib/core/env.js
new file mode 100644
index 00000000000..0e6c77e4a58
--- /dev/null
+++ b/lib/core/env.js
@@ -0,0 +1 @@
+require('./dist/server/config/env');
diff --git a/lib/core/package.json b/lib/core/package.json
index 6fb8e8fd31e..b03a18d3535 100644
--- a/lib/core/package.json
+++ b/lib/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "Storybook framework-agnostic API",
   "homepage": "https://github.com/storybooks/storybook/tree/master/lib/core",
   "bugs": {
@@ -17,12 +17,34 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/client-logger": "^3.4.0-alpha.0",
-    "events": "^1.1.1",
+    "@storybook/addons": "^3.4.0-alpha.9",
+    "@storybook/channel-postmessage": "^3.4.0-alpha.9",
+    "@storybook/client-logger": "^3.4.0-alpha.9",
+    "@storybook/node-logger": "^3.4.0-alpha.9",
+    "@storybook/ui": "^3.4.0-alpha.9",
+    "autoprefixer": "^7.2.6",
+    "babel-runtime": "^6.26.0",
+    "chalk": "^2.3.1",
+    "commander": "^2.14.1",
+    "css-loader": "^0.28.10",
+    "dotenv": "^5.0.1",
+    "events": "^2.0.0",
+    "express": "^4.16.2",
+    "file-loader": "^1.1.10",
     "global": "^4.3.2",
-    "qs": "^6.5.1"
-  },
-  "devDependencies": {
-    "babel-cli": "^6.26.0"
+    "json-loader": "^0.5.7",
+    "postcss-flexbugs-fixes": "^3.2.0",
+    "postcss-loader": "^2.1.1",
+    "prop-types": "^15.6.1",
+    "qs": "^6.5.1",
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0",
+    "serve-favicon": "^2.4.5",
+    "shelljs": "^0.8.1",
+    "style-loader": "^0.20.2",
+    "url-loader": "^0.6.2",
+    "webpack": "^3.11.0",
+    "webpack-dev-middleware": "^1.12.2",
+    "webpack-hot-middleware": "^2.21.1"
   }
 }
diff --git a/lib/core/server.js b/lib/core/server.js
new file mode 100644
index 00000000000..ee376d90f3a
--- /dev/null
+++ b/lib/core/server.js
@@ -0,0 +1,10 @@
+const assign = require('babel-runtime/core-js/object/assign').default;
+const defaultWebpackConfig = require('./dist/server/config/defaults/webpack.config');
+const WatchMissingNodeModulesPlugin = require('./dist/server/config/WatchMissingNodeModulesPlugin');
+const buildStatic = require('./dist/server/build-static');
+const buildDev = require('./dist/server/build-dev');
+
+module.exports = assign({}, defaultWebpackConfig, buildStatic, buildDev, {
+  WatchMissingNodeModulesPlugin,
+  managerPath: require.resolve('./dist/client/manager'),
+});
diff --git a/app/angular/src/client/manager/index.js b/lib/core/src/client/manager/index.js
similarity index 100%
rename from app/angular/src/client/manager/index.js
rename to lib/core/src/client/manager/index.js
diff --git a/app/angular/src/client/manager/preview.js b/lib/core/src/client/manager/preview.js
similarity index 100%
rename from app/angular/src/client/manager/preview.js
rename to lib/core/src/client/manager/preview.js
diff --git a/app/vue/src/client/manager/provider.js b/lib/core/src/client/manager/provider.js
similarity index 96%
rename from app/vue/src/client/manager/provider.js
rename to lib/core/src/client/manager/provider.js
index 84e75d88f88..cad6df4df36 100644
--- a/app/vue/src/client/manager/provider.js
+++ b/lib/core/src/client/manager/provider.js
@@ -11,6 +11,8 @@ export default class ReactProvider extends Provider {
     super();
     this.channel = createChannel({ page: 'manager' });
     addons.setChannel(this.channel);
+
+    this.channel.emit('channelCreated');
   }
 
   getPanels() {
diff --git a/lib/core/src/client/preview/client_api.js b/lib/core/src/client/preview/client_api.js
index 16abf2206ef..eb7f0ff81ec 100644
--- a/lib/core/src/client/preview/client_api.js
+++ b/lib/core/src/client/preview/client_api.js
@@ -2,6 +2,8 @@
 
 import { logger } from '@storybook/client-logger';
 
+import StoryStore from './story_store';
+
 const defaultDecorateStory = (getStory, decorators) =>
   decorators.reduce(
     (decorated, decorator) => context => decorator(() => decorated(context), context),
@@ -9,10 +11,7 @@ const defaultDecorateStory = (getStory, decorators) =>
   );
 
 export default class ClientApi {
-  constructor({ channel, storyStore, decorateStory = defaultDecorateStory }) {
-    // channel can be null when running in node
-    // always check whether channel is available
-    this._channel = channel;
+  constructor({ storyStore = new StoryStore(), decorateStory = defaultDecorateStory } = {}) {
     this._storyStore = storyStore;
     this._addons = {};
     this._globalDecorators = [];
@@ -45,7 +44,7 @@ export default class ClientApi {
       );
     }
 
-    if (m && m.hot) {
+    if (m && m.hot && m.hot.dispose) {
       m.hot.dispose(() => {
         this._storyStore.removeStoryKind(kind);
         this._storyStore.incrementRevision();
diff --git a/lib/core/src/client/preview/client_api.test.js b/lib/core/src/client/preview/client_api.test.js
index 5936fe3337a..0bda6c435e6 100644
--- a/lib/core/src/client/preview/client_api.test.js
+++ b/lib/core/src/client/preview/client_api.test.js
@@ -2,52 +2,6 @@
 
 import ClientAPI from './client_api';
 
-class StoryStore {
-  constructor() {
-    this.stories = [];
-  }
-
-  addStory(kind, story, fn, fileName) {
-    this.stories.push({ kind, story, fn, fileName });
-  }
-
-  getStoryKinds() {
-    return this.stories.reduce((kinds, info) => {
-      if (kinds.indexOf(info.kind) === -1) {
-        kinds.push(info.kind);
-      }
-      return kinds;
-    }, []);
-  }
-
-  getStories(kind) {
-    return this.stories.reduce((stories, info) => {
-      if (info.kind === kind) {
-        stories.push(info.story);
-      }
-      return stories;
-    }, []);
-  }
-
-  getStoryFileName(kind) {
-    const story = this.stories.find(info => info.kind === kind);
-    return story ? story.fileName : null;
-  }
-
-  getStory(kind, name) {
-    return this.stories.reduce((fn, info) => {
-      if (!fn && info.kind === kind && info.story === name) {
-        return info.fn;
-      }
-      return fn;
-    }, null);
-  }
-
-  hasStory(kind, name) {
-    return Boolean(this.getStory(kind, name));
-  }
-}
-
 describe('preview.client_api', () => {
   describe('setAddon', () => {
     it('should register addons', () => {
@@ -138,8 +92,18 @@ describe('preview.client_api', () => {
   });
 
   describe('addDecorator', () => {
+    class MockStoryStore {
+      stories = [];
+      addStory(kind, name, fn, fileName) {
+        this.stories.push({ kind, name, fn, fileName });
+      }
+      hasStory(k, n) {
+        return this.stories.find(({ kind, name }) => kind === k && name === n);
+      }
+    }
+
     it('should add local decorators', () => {
-      const storyStore = new StoryStore();
+      const storyStore = new MockStoryStore();
       const api = new ClientAPI({ storyStore });
       const localApi = api.storiesOf('none', module);
       localApi.addDecorator(fn => `aa-${fn()}`);
@@ -149,7 +113,7 @@ describe('preview.client_api', () => {
     });
 
     it('should add global decorators', () => {
-      const storyStore = new StoryStore();
+      const storyStore = new MockStoryStore();
       const api = new ClientAPI({ storyStore });
       api.addDecorator(fn => `bb-${fn()}`);
       const localApi = api.storiesOf('none', module);
@@ -159,7 +123,7 @@ describe('preview.client_api', () => {
     });
 
     it('should utilize both decorators at once', () => {
-      const storyStore = new StoryStore();
+      const storyStore = new MockStoryStore();
       const api = new ClientAPI({ storyStore });
       const localApi = api.storiesOf('none', module);
 
@@ -171,7 +135,7 @@ describe('preview.client_api', () => {
     });
 
     it('should pass the context', () => {
-      const storyStore = new StoryStore();
+      const storyStore = new MockStoryStore();
       const api = new ClientAPI({ storyStore });
       const localApi = api.storiesOf('none', module);
       localApi.addDecorator(fn => `aa-${fn()}`);
@@ -186,7 +150,7 @@ describe('preview.client_api', () => {
     });
 
     it('should have access to the context', () => {
-      const storyStore = new StoryStore();
+      const storyStore = new MockStoryStore();
       const api = new ClientAPI({ storyStore });
       const localApi = api.storiesOf('none', module);
       localApi.addDecorator((fn, { kind, story }) => `${kind}-${story}-${fn()}`);
@@ -211,81 +175,98 @@ describe('preview.client_api', () => {
   });
 
   describe('getStorybook', () => {
-    it('should return storybook when empty', () => {
-      const storyStore = new StoryStore();
-      const api = new ClientAPI({ storyStore });
-      const book = api.getStorybook();
-      expect(book).toEqual([]);
-    });
+    it('should transform the storybook to an array with filenames', () => {
+      class MockStoryStore {
+        getStoryKinds() {
+          return ['kind-1', 'kind-2'];
+        }
 
-    it('should return storybook with stories', () => {
-      const storyStore = new StoryStore();
-      const api = new ClientAPI({ storyStore });
-      const functions = {
-        'story-1.1': () => 'story-1.1',
-        'story-1.2': () => 'story-1.2',
-        'story-2.1': () => 'story-2.1',
-        'story-2.2': () => 'story-2.2',
-      };
-      const kind1 = api.storiesOf('kind-1', { filename: 'kind1.js' });
-      kind1.add('story-1.1', functions['story-1.1']);
-      kind1.add('story-1.2', functions['story-1.2']);
-      const kind2 = api.storiesOf('kind-2', { filename: 'kind2.js' });
-      kind2.add('story-2.1', functions['story-2.1']);
-      kind2.add('story-2.2', functions['story-2.2']);
+        getStoryFileName(kind) {
+          return `${kind}.js`;
+        }
+
+        getStories() {
+          return ['a', 'b'];
+        }
+
+        getStory(kind, name) {
+          return `${kind}:${name}`;
+        }
+      }
+
+      const api = new ClientAPI({ storyStore: new MockStoryStore() });
       const book = api.getStorybook();
       expect(book).toEqual([
         {
           kind: 'kind-1',
-          fileName: 'kind1.js',
-          stories: [
-            { name: 'story-1.1', render: functions['story-1.1'] },
-            { name: 'story-1.2', render: functions['story-1.2'] },
-          ],
+          fileName: 'kind-1.js',
+          stories: [{ name: 'a', render: 'kind-1:a' }, { name: 'b', render: 'kind-1:b' }],
         },
         {
           kind: 'kind-2',
-          fileName: 'kind2.js',
-          stories: [
-            { name: 'story-2.1', render: functions['story-2.1'] },
-            { name: 'story-2.2', render: functions['story-2.2'] },
-          ],
+          fileName: 'kind-2.js',
+          stories: [{ name: 'a', render: 'kind-2:a' }, { name: 'b', render: 'kind-2:b' }],
         },
       ]);
     });
+  });
 
-    it('should return storybook with file names when module with file name provided', () => {
-      const storyStore = new StoryStore();
-      const api = new ClientAPI({ storyStore });
-      const functions = {
-        'story-1.1': () => 'story-1.1',
-        'story-1.2': () => 'story-1.2',
-        'story-2.1': () => 'story-2.1',
-        'story-2.2': () => 'story-2.2',
-      };
-      const kind1 = api.storiesOf('kind-1', { filename: 'foo' });
-      kind1.add('story-1.1', functions['story-1.1']);
-      kind1.add('story-1.2', functions['story-1.2']);
-      const kind2 = api.storiesOf('kind-2', { filename: 'bar' });
-      kind2.add('story-2.1', functions['story-2.1']);
-      kind2.add('story-2.2', functions['story-2.2']);
-      const book = api.getStorybook();
-      expect(book).toEqual([
-        {
-          kind: 'kind-1',
-          fileName: 'foo',
-          stories: [
-            { name: 'story-1.1', render: functions['story-1.1'] },
-            { name: 'story-1.2', render: functions['story-1.2'] },
-          ],
+  describe('reads filename from module', () => {
+    const api = new ClientAPI();
+    const story = () => 0;
+    api.storiesOf('kind', { filename: 'foo.js' }).add('story', story);
+    expect(api.getStorybook()).toEqual([
+      { kind: 'kind', fileName: 'foo.js', stories: [{ name: 'story', render: story }] },
+    ]);
+  });
+
+  describe('hot module loading', () => {
+    class MockModule {
+      hot = {
+        callbacks: [],
+        dispose(fn) {
+          this.callbacks.push(fn);
         },
+        reload() {
+          this.callbacks.forEach(fn => fn());
+        },
+      };
+    }
+
+    it('should increment store revision when the module reloads', () => {
+      const api = new ClientAPI();
+      expect(api._storyStore.getRevision()).toEqual(0);
+
+      const module = new MockModule();
+      api.storiesOf('kind', module);
+      module.hot.reload();
+
+      expect(api._storyStore.getRevision()).toEqual(1);
+    });
+
+    it('should replace a kind when the module reloads', () => {
+      const module = new MockModule();
+      const stories = [jest.fn(), jest.fn()];
+
+      const api = new ClientAPI();
+      expect(api.getStorybook()).toEqual([]);
+
+      api.storiesOf('kind', module).add('story', stories[0]);
+      expect(api.getStorybook()).toEqual([
         {
-          kind: 'kind-2',
-          fileName: 'bar',
-          stories: [
-            { name: 'story-2.1', render: functions['story-2.1'] },
-            { name: 'story-2.2', render: functions['story-2.2'] },
-          ],
+          kind: 'kind',
+          stories: [{ name: 'story', render: stories[0] }],
+        },
+      ]);
+
+      module.hot.reload();
+      expect(api.getStorybook()).toEqual([]);
+
+      api.storiesOf('kind', module).add('story', stories[1]);
+      expect(api.getStorybook()).toEqual([
+        {
+          kind: 'kind',
+          stories: [{ name: 'story', render: stories[1] }],
         },
       ]);
     });
diff --git a/lib/core/src/client/preview/story_store.js b/lib/core/src/client/preview/story_store.js
index 33424250ccf..7302f8e5f49 100644
--- a/lib/core/src/client/preview/story_store.js
+++ b/lib/core/src/client/preview/story_store.js
@@ -85,7 +85,9 @@ export default class StoryStore extends EventEmitter {
   }
 
   removeStoryKind(kind) {
-    this._data[kind].stories = {};
+    if (this.hasStoryKind(kind)) {
+      this._data[kind].stories = {};
+    }
   }
 
   hasStoryKind(kind) {
diff --git a/lib/core/src/client/preview/story_store.test.js b/lib/core/src/client/preview/story_store.test.js
new file mode 100644
index 00000000000..3aabd5e937e
--- /dev/null
+++ b/lib/core/src/client/preview/story_store.test.js
@@ -0,0 +1,49 @@
+import StoryStore from './story_store';
+
+describe('preview.story_store', () => {
+  describe('dumpStoryBook', () => {
+    it('should return nothing when empty', () => {
+      const store = new StoryStore();
+      expect(store.dumpStoryBook()).toEqual([]);
+    });
+
+    it('should return storybook with stories', () => {
+      const store = new StoryStore();
+
+      store.addStory('kind-1', 'story-1.1', () => 0);
+      store.addStory('kind-1', 'story-1.2', () => 0);
+      store.addStory('kind-2', 'story-2.1', () => 0);
+      store.addStory('kind-2', 'story-2.2', () => 0);
+
+      expect(store.dumpStoryBook()).toEqual([
+        {
+          kind: 'kind-1',
+          stories: ['story-1.1', 'story-1.2'],
+        },
+        {
+          kind: 'kind-2',
+          stories: ['story-2.1', 'story-2.2'],
+        },
+      ]);
+    });
+  });
+
+  describe('getStoryFileName', () => {
+    it('should return the filename of the first story passed for the kind', () => {
+      const store = new StoryStore();
+      store.addStory('kind-1', 'story-1.1', () => 0, 'foo.js');
+      store.addStory('kind-1', 'story-1.2', () => 0, 'foo-2.js');
+      store.addStory('kind-2', 'story-2.1', () => 0, 'bar.js');
+
+      expect(store.getStoryFileName('kind-1')).toBe('foo.js');
+      expect(store.getStoryFileName('kind-2')).toBe('bar.js');
+    });
+  });
+
+  describe('removeStoryKind', () => {
+    it('should not error even if there is no kind', () => {
+      const store = new StoryStore();
+      store.removeStoryKind('kind');
+    });
+  });
+});
diff --git a/lib/core/src/client/preview/syncUrlWithStore.js b/lib/core/src/client/preview/syncUrlWithStore.js
index d5f192b3b7d..e02521df963 100644
--- a/lib/core/src/client/preview/syncUrlWithStore.js
+++ b/lib/core/src/client/preview/syncUrlWithStore.js
@@ -21,6 +21,6 @@ export default function syncUrlToStore(reduxStore) {
       selectedKind,
       selectedStory,
     });
-    window.history.pushState({}, '', `?${queryString}`);
+    window.history.replaceState({}, '', `?${queryString}`);
   });
 }
diff --git a/lib/core/src/server/build-dev.js b/lib/core/src/server/build-dev.js
new file mode 100644
index 00000000000..0516dc43146
--- /dev/null
+++ b/lib/core/src/server/build-dev.js
@@ -0,0 +1,168 @@
+import express from 'express';
+import https from 'https';
+import favicon from 'serve-favicon';
+import program from 'commander';
+import path from 'path';
+import fs from 'fs';
+import chalk from 'chalk';
+import shelljs from 'shelljs';
+import { logger } from '@storybook/node-logger';
+import storybook, { webpackValid } from './middleware';
+import { parseList, getEnvConfig } from './utils';
+import './config/env';
+
+export function buildDev({ packageJson, getBaseConfig, loadConfig, defaultFavIcon }) {
+  process.env.NODE_ENV = process.env.NODE_ENV || 'development';
+
+  program
+    .version(packageJson.version)
+    .option('-p, --port [number]', 'Port to run Storybook (Required)', str => parseInt(str, 10))
+    .option('-h, --host [string]', 'Host to run Storybook')
+    .option('-s, --static-dir <dir-names>', 'Directory where to load static files from')
+    .option('-c, --config-dir [dir-name]', 'Directory where to load Storybook configurations from')
+    .option(
+      '--https',
+      'Serve Storybook over HTTPS. Note: You must provide your own certificate information.'
+    )
+    .option(
+      '--ssl-ca <ca>',
+      'Provide an SSL certificate authority. (Optional with --https, required if using a self-signed certificate)',
+      parseList
+    )
+    .option('--ssl-cert <cert>', 'Provide an SSL certificate. (Required with --https)')
+    .option('--ssl-key <key>', 'Provide an SSL key. (Required with --https)')
+    .option('--smoke-test', 'Exit after successful start')
+    .option('-d, --db-path [db-file]', 'DEPRECATED!')
+    .option('--enable-db', 'DEPRECATED!')
+    .parse(process.argv);
+
+  logger.info(chalk.bold(`${packageJson.name} v${packageJson.version}`) + chalk.reset('\n'));
+
+  if (program.enableDb || program.dbPath) {
+    logger.error(
+      [
+        'Error: the experimental local database addon is no longer bundled with',
+        'storybook. Please remove these flags (-d,--db-path,--enable-db)',
+        'from the command or npm script and try again.',
+      ].join(' ')
+    );
+    process.exit(1);
+  }
+
+  // The key is the field created in `program` variable for
+  // each command line argument. Value is the env variable.
+  getEnvConfig(program, {
+    port: 'SBCONFIG_PORT',
+    host: 'SBCONFIG_HOSTNAME',
+    staticDir: 'SBCONFIG_STATIC_DIR',
+    configDir: 'SBCONFIG_CONFIG_DIR',
+  });
+
+  if (!program.port) {
+    logger.error('Error: port to run Storybook is required!\n');
+    program.help();
+    process.exit(-1);
+  }
+
+  // Used with `app.listen` below
+  const listenAddr = [program.port];
+
+  if (program.host) {
+    listenAddr.push(program.host);
+  }
+
+  const app = express();
+  let server = app;
+
+  if (program.https) {
+    if (!program.sslCert) {
+      logger.error('Error: --ssl-cert is required with --https');
+      process.exit(-1);
+    }
+    if (!program.sslKey) {
+      logger.error('Error: --ssl-key is required with --https');
+      process.exit(-1);
+    }
+
+    const sslOptions = {
+      ca: (program.sslCa || []).map(ca => fs.readFileSync(ca, 'utf-8')),
+      cert: fs.readFileSync(program.sslCert, 'utf-8'),
+      key: fs.readFileSync(program.sslKey, 'utf-8'),
+    };
+
+    server = https.createServer(sslOptions, app);
+  }
+
+  let hasCustomFavicon = false;
+
+  if (program.staticDir) {
+    program.staticDir = parseList(program.staticDir);
+    program.staticDir.forEach(dir => {
+      const staticPath = path.resolve(dir);
+      if (!fs.existsSync(staticPath)) {
+        logger.error(`Error: no such directory to load static files: ${staticPath}`);
+        process.exit(-1);
+      }
+      logger.info(`=> Loading static files from: ${staticPath} .`);
+      app.use(express.static(staticPath, { index: false }));
+
+      const faviconPath = path.resolve(staticPath, 'favicon.ico');
+      if (fs.existsSync(faviconPath)) {
+        hasCustomFavicon = true;
+        app.use(favicon(faviconPath));
+      }
+    });
+  }
+
+  if (!hasCustomFavicon) {
+    app.use(favicon(defaultFavIcon));
+  }
+
+  // Build the webpack configuration using the `baseConfig`
+  // custom `.babelrc` file and `webpack.config.js` files
+  const configDir = program.configDir || './.storybook';
+
+  // The repository info is sent to the storybook while running on
+  // development mode so it'll be easier for tools to integrate.
+  const exec = cmd => shelljs.exec(cmd, { silent: true }).stdout.trim();
+  process.env.STORYBOOK_GIT_ORIGIN =
+    process.env.STORYBOOK_GIT_ORIGIN || exec('git remote get-url origin');
+  process.env.STORYBOOK_GIT_BRANCH =
+    process.env.STORYBOOK_GIT_BRANCH || exec('git symbolic-ref HEAD --short');
+
+  // NOTE changes to env should be done before calling `getBaseConfig`
+  // `getBaseConfig` function which is called inside the middleware
+  app.use(storybook(configDir, loadConfig, getBaseConfig));
+
+  let serverResolve = () => {};
+  let serverReject = () => {};
+  const serverListening = new Promise((resolve, reject) => {
+    serverResolve = resolve;
+    serverReject = reject;
+  });
+  server.listen(...listenAddr, error => {
+    if (error) {
+      serverReject(error);
+    } else {
+      serverResolve();
+    }
+  });
+
+  Promise.all([webpackValid, serverListening])
+    .then(() => {
+      const proto = program.https ? 'https' : 'http';
+      const address = `${proto}://${program.host || 'localhost'}:${program.port}/`;
+      logger.info(`Storybook started on => ${chalk.cyan(address)}\n`);
+      if (program.smokeTest) {
+        process.exit(0);
+      }
+    })
+    .catch(error => {
+      if (error instanceof Error) {
+        logger.error(error);
+      }
+      if (program.smokeTest) {
+        process.exit(1);
+      }
+    });
+}
diff --git a/lib/core/src/server/build-static.js b/lib/core/src/server/build-static.js
new file mode 100644
index 00000000000..574480ada37
--- /dev/null
+++ b/lib/core/src/server/build-static.js
@@ -0,0 +1,91 @@
+import webpack from 'webpack';
+import program from 'commander';
+import path from 'path';
+import fs from 'fs';
+import chalk from 'chalk';
+import shelljs from 'shelljs';
+import { logger } from '@storybook/node-logger';
+import { parseList, getEnvConfig } from './utils';
+import './config/env';
+
+export function buildStatic({ packageJson, getBaseConfig, loadConfig, defaultFavIcon }) {
+  process.env.NODE_ENV = process.env.NODE_ENV || 'production';
+
+  program
+    .version(packageJson.version)
+    .option('-s, --static-dir <dir-names>', 'Directory where to load static files from', parseList)
+    .option('-o, --output-dir [dir-name]', 'Directory where to store built files')
+    .option('-c, --config-dir [dir-name]', 'Directory where to load Storybook configurations from')
+    .option('-w, --watch', 'Enable watch mode')
+    .option('-d, --db-path [db-file]', 'DEPRECATED!')
+    .option('--enable-db', 'DEPRECATED!')
+    .parse(process.argv);
+
+  logger.info(chalk.bold(`${packageJson.name} v${packageJson.version}\n`));
+
+  if (program.enableDb || program.dbPath) {
+    logger.error(
+      [
+        'Error: the experimental local database addon is no longer bundled with',
+        'storybook. Please remove these flags (-d,--db-path,--enable-db)',
+        'from the command or npm script and try again.',
+      ].join(' ')
+    );
+    process.exit(1);
+  }
+
+  // The key is the field created in `program` variable for
+  // each command line argument. Value is the env variable.
+  getEnvConfig(program, {
+    staticDir: 'SBCONFIG_STATIC_DIR',
+    outputDir: 'SBCONFIG_OUTPUT_DIR',
+    configDir: 'SBCONFIG_CONFIG_DIR',
+  });
+
+  const configDir = program.configDir || './.storybook';
+  const outputDir = program.outputDir || './storybook-static';
+
+  // create output directory if not exists
+  shelljs.mkdir('-p', path.resolve(outputDir));
+  // clear the static dir
+  shelljs.rm('-rf', path.resolve(outputDir, 'static'));
+  shelljs.cp(defaultFavIcon, outputDir);
+
+  // Build the webpack configuration using the `baseConfig`
+  // custom `.babelrc` file and `webpack.config.js` files
+  // NOTE changes to env should be done before calling `getBaseConfig`
+  const config = loadConfig('PRODUCTION', getBaseConfig(configDir), configDir);
+  config.output.path = path.resolve(outputDir);
+
+  // copy all static files
+  if (program.staticDir) {
+    program.staticDir.forEach(dir => {
+      if (!fs.existsSync(dir)) {
+        logger.error(`Error: no such directory to load static files: ${dir}`);
+        process.exit(-1);
+      }
+      logger.info(`=> Copying static files from: ${dir}`);
+      shelljs.cp('-r', `${dir}/*`, outputDir);
+    });
+  }
+
+  // compile all resources with webpack and write them to the disk.
+  logger.info('Building storybook ...');
+  const webpackCb = (err, stats) => {
+    if (err || stats.hasErrors()) {
+      logger.error('Failed to build the storybook');
+      // eslint-disable-next-line no-unused-expressions
+      err && logger.error(err.message);
+      // eslint-disable-next-line no-unused-expressions
+      stats && stats.hasErrors() && stats.toJson().errors.forEach(e => logger.error(e));
+      process.exitCode = 1;
+    }
+    logger.info('Building storybook completed.');
+  };
+  const compiler = webpack(config);
+  if (program.watch) {
+    compiler.watch({}, webpackCb);
+  } else {
+    compiler.run(webpackCb);
+  }
+}
diff --git a/app/angular/src/server/config/WatchMissingNodeModulesPlugin.js b/lib/core/src/server/config/WatchMissingNodeModulesPlugin.js
similarity index 100%
rename from app/angular/src/server/config/WatchMissingNodeModulesPlugin.js
rename to lib/core/src/server/config/WatchMissingNodeModulesPlugin.js
diff --git a/lib/core/src/server/config/defaults/webpack.config.js b/lib/core/src/server/config/defaults/webpack.config.js
new file mode 100644
index 00000000000..a83800ab86b
--- /dev/null
+++ b/lib/core/src/server/config/defaults/webpack.config.js
@@ -0,0 +1,65 @@
+import autoprefixer from 'autoprefixer';
+
+export function createDefaultWebpackConfig(storybookBaseConfig) {
+  return {
+    ...storybookBaseConfig,
+    module: {
+      ...storybookBaseConfig.module,
+      rules: [
+        ...storybookBaseConfig.module.rules,
+        {
+          test: /\.css$/,
+          use: [
+            require.resolve('style-loader'),
+            {
+              loader: require.resolve('css-loader'),
+              options: {
+                importLoaders: 1,
+              },
+            },
+            {
+              loader: require.resolve('postcss-loader'),
+              options: {
+                ident: 'postcss', // https://webpack.js.org/guides/migrating/#complex-options
+                plugins: () => [
+                  require('postcss-flexbugs-fixes'), // eslint-disable-line
+                  autoprefixer({
+                    browsers: ['>1%', 'last 4 versions', 'Firefox ESR', 'not ie < 9'],
+                    flexbox: 'no-2009',
+                  }),
+                ],
+              },
+            },
+          ],
+        },
+        {
+          test: /\.json$/,
+          loader: require.resolve('json-loader'),
+        },
+        {
+          test: /\.(ico|jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2)(\?.*)?$/,
+          loader: require.resolve('file-loader'),
+          query: {
+            name: 'static/media/[name].[hash:8].[ext]',
+          },
+        },
+        {
+          test: /\.(mp4|webm|wav|mp3|m4a|aac|oga)(\?.*)?$/,
+          loader: require.resolve('url-loader'),
+          query: {
+            limit: 10000,
+            name: 'static/media/[name].[hash:8].[ext]',
+          },
+        },
+      ],
+    },
+    resolve: {
+      ...storybookBaseConfig.resolve,
+      alias: {
+        ...(storybookBaseConfig.resolve && storybookBaseConfig.resolve.alias),
+        // This is to support NPM2
+        'babel-runtime/regenerator': require.resolve('babel-runtime/regenerator'),
+      },
+    },
+  };
+}
diff --git a/lib/core/src/server/config/env.js b/lib/core/src/server/config/env.js
new file mode 100644
index 00000000000..d2747437e83
--- /dev/null
+++ b/lib/core/src/server/config/env.js
@@ -0,0 +1,3 @@
+import dotenv from 'dotenv';
+
+dotenv.config();
diff --git a/app/vue/src/server/middleware.js b/lib/core/src/server/middleware.js
similarity index 93%
rename from app/vue/src/server/middleware.js
rename to lib/core/src/server/middleware.js
index 3921bf4733f..ad9e1862d07 100644
--- a/app/vue/src/server/middleware.js
+++ b/lib/core/src/server/middleware.js
@@ -1,20 +1,19 @@
+import path from 'path';
 import { Router } from 'express';
 import webpack from 'webpack';
-import path from 'path';
 import webpackDevMiddleware from 'webpack-dev-middleware';
 import webpackHotMiddleware from 'webpack-hot-middleware';
-import getBaseConfig from './config/webpack.config';
-import loadConfig from './config';
 import { getMiddleware } from './utils';
 
 let webpackResolve = () => {};
 let webpackReject = () => {};
+
 export const webpackValid = new Promise((resolve, reject) => {
   webpackResolve = resolve;
   webpackReject = reject;
 });
 
-export default function(configDir) {
+export default function(configDir, loadConfig, getBaseConfig) {
   // Build the webpack configuration using the `getBaseConfig`
   // custom `.babelrc` file and `webpack.config.js` files
   const config = loadConfig('DEVELOPMENT', getBaseConfig(configDir), configDir);
diff --git a/lib/core/src/server/utils.js b/lib/core/src/server/utils.js
new file mode 100644
index 00000000000..7e501fd37d5
--- /dev/null
+++ b/lib/core/src/server/utils.js
@@ -0,0 +1,28 @@
+import path from 'path';
+import fs from 'fs';
+
+export function parseList(str) {
+  return str.split(',');
+}
+
+export function getEnvConfig(program, configEnv) {
+  Object.keys(configEnv).forEach(fieldName => {
+    const envVarName = configEnv[fieldName];
+    const envVarValue = process.env[envVarName];
+    if (envVarValue) {
+      program[fieldName] = envVarValue; // eslint-disable-line
+    }
+  });
+}
+
+export function getMiddleware(configDir) {
+  const middlewarePath = path.resolve(configDir, 'middleware.js');
+  if (fs.existsSync(middlewarePath)) {
+    let middlewareModule = require(middlewarePath); // eslint-disable-line
+    if (middlewareModule.__esModule) { // eslint-disable-line
+      middlewareModule = middlewareModule.default;
+    }
+    return middlewareModule;
+  }
+  return () => {};
+}
diff --git a/lib/node-logger/package.json b/lib/node-logger/package.json
index 0d4bcb0716a..9a8d13c13de 100644
--- a/lib/node-logger/package.json
+++ b/lib/node-logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/node-logger",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "",
   "license": "MIT",
   "main": "dist/index.js",
@@ -9,7 +9,6 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "chalk": "^2.3.0",
     "npmlog": "^4.1.2"
   }
 }
diff --git a/lib/ui/package.json b/lib/ui/package.json
index 9f541aa5335..72e50a5748b 100644
--- a/lib/ui/package.json
+++ b/lib/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/ui",
-  "version": "3.4.0-alpha.0",
+  "version": "3.4.0-alpha.9",
   "description": "Core Storybook UI",
   "license": "MIT",
   "main": "dist/index.js",
@@ -15,36 +15,33 @@
     "storybook": "start-storybook -p 9010"
   },
   "dependencies": {
-    "@storybook/components": "^3.4.0-alpha.0",
+    "@storybook/components": "^3.4.0-alpha.9",
     "@storybook/mantra-core": "^1.7.2",
+    "@storybook/podda": "^1.2.3",
     "@storybook/react-komposer": "^2.0.3",
     "babel-runtime": "^6.26.0",
     "deep-equal": "^1.0.1",
-    "events": "^1.1.1",
+    "events": "^2.0.0",
     "fuse.js": "^3.2.0",
     "global": "^4.3.2",
-    "json-stringify-safe": "^5.0.1",
     "keycode": "^2.1.9",
     "lodash.debounce": "^4.0.8",
     "lodash.pick": "^4.4.0",
     "lodash.sortby": "^4.7.0",
-    "podda": "^1.2.2",
-    "prop-types": "^15.6.0",
+    "prop-types": "^15.6.1",
     "qs": "^6.5.1",
-    "react-fuzzy": "^0.5.1",
+    "react-fuzzy": "^0.5.2",
     "react-icons": "^2.2.7",
-    "react-inspector": "^2.2.2",
-    "react-modal": "^3.1.10",
-    "react-split-pane": "^0.1.74",
-    "react-treebeard": "^2.1.0",
-    "redux": "^3.7.2"
+    "react-modal": "^3.3.1",
+    "react-split-pane": "^0.1.77",
+    "react-treebeard": "^2.1.0"
   },
   "peerDependencies": {
     "react": "*",
     "react-dom": "*"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "^3.4.0-alpha.0",
-    "@storybook/react": "^3.4.0-alpha.0"
+    "@storybook/addon-actions": "^3.4.0-alpha.9",
+    "@storybook/react": "^3.4.0-alpha.9"
   }
 }
diff --git a/lib/ui/src/index.js b/lib/ui/src/index.js
index 1ed59a680ab..10c6816bef3 100644
--- a/lib/ui/src/index.js
+++ b/lib/ui/src/index.js
@@ -1,5 +1,5 @@
 import { createApp } from '@storybook/mantra-core';
-import Podda from 'podda';
+import Podda from '@storybook/podda';
 
 import buildContext from './context';
 import shortcutsModule from './modules/shortcuts';
diff --git a/lib/ui/src/modules/ui/components/addon_panel/__snapshots__/index.stories.storyshot b/lib/ui/src/modules/ui/components/addon_panel/__snapshots__/index.stories.storyshot
index 4cd7ec747a0..ae823672c91 100644
--- a/lib/ui/src/modules/ui/components/addon_panel/__snapshots__/index.stories.storyshot
+++ b/lib/ui/src/modules/ui/components/addon_panel/__snapshots__/index.stories.storyshot
@@ -5,7 +5,7 @@ exports[`Storyshots ui/AddonPanel default 1`] = `
   style="height:100px;display:flex"
 >
   <div
-    style="flex:1 1 auto;display:flex;flex-direction:column;background:white;border-radius:4px;border:solid 1px rgb(236, 236, 236);margin-top:5px;width:100%"
+    style="flex:1 1 auto;display:flex;flex-direction:column;background:white;border-radius:4px;border:solid 1px rgb(236, 236, 236);margin-top:5px;overflow:hidden;width:100%"
   >
     <div
       role="tablist"
diff --git a/lib/ui/src/modules/ui/components/addon_panel/style.js b/lib/ui/src/modules/ui/components/addon_panel/style.js
index 630be894e11..2659f020937 100644
--- a/lib/ui/src/modules/ui/components/addon_panel/style.js
+++ b/lib/ui/src/modules/ui/components/addon_panel/style.js
@@ -20,6 +20,7 @@ export default {
     borderRadius: 4,
     border: 'solid 1px rgb(236, 236, 236)',
     marginTop: 5,
+    overflow: 'hidden',
     width: '100%',
   },
 
diff --git a/lib/ui/src/modules/ui/components/search_box.js b/lib/ui/src/modules/ui/components/search_box.js
index 4f5b6c159db..28642386d72 100644
--- a/lib/ui/src/modules/ui/components/search_box.js
+++ b/lib/ui/src/modules/ui/components/search_box.js
@@ -53,7 +53,7 @@ const suggestionTemplate = (props, state, styles, clickHandler) =>
     const style = state.selectedIndex === i ? styles.selectedResultStyle : styles.resultsStyle;
     return (
       // react-fuzzy has its own keyboard navigation
-      // eslint-disable-next-line jsx-a11y/interactive-supports-focus,jsx-a11y/click-events-have-key-events
+      // eslint-disable-next-line jsx-a11y/click-events-have-key-events
       <div
         tabIndex={0}
         role="option"
diff --git a/lib/ui/src/modules/ui/components/stories_panel/__snapshots__/index.stories.storyshot b/lib/ui/src/modules/ui/components/stories_panel/__snapshots__/index.stories.storyshot
index 63be349d9fd..b267172c514 100644
--- a/lib/ui/src/modules/ui/components/stories_panel/__snapshots__/index.stories.storyshot
+++ b/lib/ui/src/modules/ui/components/stories_panel/__snapshots__/index.stories.storyshot
@@ -84,9 +84,7 @@ exports[`Storyshots ui/stories/StoriesPanel storiesHierarchies exists but is emp
   </div>
   <div
     style="height:calc(100vh - 105px);margin-top:10px;overflow:auto"
-  >
-    0
-  </div>
+  />
 </div>
 `;
 
diff --git a/lib/ui/src/modules/ui/components/stories_panel/index.js b/lib/ui/src/modules/ui/components/stories_panel/index.js
index 825144efa0b..6b923d1ffbf 100755
--- a/lib/ui/src/modules/ui/components/stories_panel/index.js
+++ b/lib/ui/src/modules/ui/components/stories_panel/index.js
@@ -25,10 +25,9 @@ const storyProps = [
 ];
 
 function hierarchyContainsStories(storiesHierarchy) {
-  return storiesHierarchy && storiesHierarchy.map.size;
+  return storiesHierarchy && storiesHierarchy.map.size > 0;
 }
 
-// eslint-disable-next-line react/prefer-stateless-function
 class StoriesPanel extends Component {
   renderStories() {
     const { storiesHierarchies } = this.props;
diff --git a/lib/ui/src/modules/ui/libs/gen_podda_loader.test.js b/lib/ui/src/modules/ui/libs/gen_podda_loader.test.js
index c715c69265a..4a2645a90c8 100644
--- a/lib/ui/src/modules/ui/libs/gen_podda_loader.test.js
+++ b/lib/ui/src/modules/ui/libs/gen_podda_loader.test.js
@@ -1,4 +1,4 @@
-import Podda from 'podda';
+import Podda from '@storybook/podda';
 import genPoddaLoader from './gen_podda_loader';
 
 describe('manager.ui.libs.gen_podda_loader', () => {
diff --git a/lib/ui/src/modules/ui/libs/hierarchy.js b/lib/ui/src/modules/ui/libs/hierarchy.js
index 397a3f6a236..1b80b6f72ca 100644
--- a/lib/ui/src/modules/ui/libs/hierarchy.js
+++ b/lib/ui/src/modules/ui/libs/hierarchy.js
@@ -105,7 +105,7 @@ export function resolveStoryHierarchy(storyName = '', hierarchySeparator) {
     return [storyName];
   }
 
-  return storyName.split(new RegExp(hierarchySeparator));
+  return storyName.split(new RegExp(hierarchySeparator)).filter(segment => !!segment);
 }
 
 export function prepareStoriesForHierarchy(stories, hierarchySeparator, hierarchyRootSeparator) {
diff --git a/package.json b/package.json
index d109f656655..53bbae9d75b 100644
--- a/package.json
+++ b/package.json
@@ -15,81 +15,90 @@
     "precommit": "lint-staged",
     "coverage": "codecov",
     "danger": "danger",
-    "dev": "lerna exec --parallel -- babel src -d dist --copy-files --ignore __mocks__/,tests/*,__tests__/,**.test.js,stories/,**.story.js,**.stories.js,__snapshots__ --plugins \"transform-runtime\" -w",
+    "dev": "concurrently --kill-others \"yarn dev:ts\" \"yarn dev:js\"",
+    "dev:js": "lerna exec --parallel -- cross-env-shell node \\$LERNA_ROOT_PATH/scripts/watch-js.js",
+    "dev:ts": "lerna exec --parallel -- cross-env-shell node \\$LERNA_ROOT_PATH/scripts/watch-ts.js",
     "docs:build": "npm --prefix docs run build",
     "docs:deploy:ci": "npm --prefix docs run deploy:ci",
     "docs:deploy:manual": "npm --prefix docs run deploy:manual",
     "docs:dev": "npm --prefix docs run dev",
     "github-release": "github-release-from-changelog",
-    "lint": "yarn lint:js . && yarn lint:md .",
-    "lint:js": "cross-env NODE_ENV=production eslint --cache --cache-location=.cache/eslint --ext .js,.jsx,.json",
-    "lint:md": "remark",
+    "lint": "yarn lint:js . && yarn lint:ts **/*.ts && yarn lint:md .",
+    "lint:js": "cross-env NODE_ENV=production eslint --cache --cache-location=.cache/eslint --ext .js,.jsx,.json --report-unused-disable-directives",
+    "lint:ts": "tslint -p . -c tslint.json -t stylish",
+    "lint:md": "remark -q",
     "publish": "lerna publish",
     "postpublish": "yarn --cwd lib/cli test -o",
     "repo-dirty-check": "node ./scripts/repo-dirty-check",
-    "start": "npm --prefix examples/cra-kitchen-sink run storybook",
+    "start": "npm --prefix examples/official-storybook run storybook",
     "test": "node ./scripts/test.js",
     "test-latest-cra": "npm --prefix lib/cli run test-latest-cra",
     "chromatic": "npm --prefix examples/official-storybook run chromatic"
   },
   "devDependencies": {
-    "@types/lodash": "^4.14.92",
+    "@angular/common": "^5.2.7",
+    "@angular/compiler": "^5.2.7",
+    "@angular/core": "^5.2.7",
+    "@angular/forms": "^5.2.7",
+    "@angular/platform-browser": "^5.2.7",
+    "@angular/platform-browser-dynamic": "^5.2.7",
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.0",
-    "babel-eslint": "^8.1.2",
-    "babel-plugin-transform-md-import-to-string": "^1.0.6",
+    "babel-eslint": "^8.2.2",
+    "babel-plugin-macros": "^2.1.0",
     "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.6.1",
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-0": "^6.24.1",
-    "chalk": "^2.3.0",
+    "chalk": "^2.3.1",
     "codecov": "^3.0.0",
-    "commander": "^2.12.2",
+    "codelyzer": "^4.1.0",
+    "commander": "^2.14.1",
+    "concurrently": "^3.5.1",
     "cross-env": "^5.1.3",
-    "danger": "^2.1.10",
+    "danger": "^3.1.7",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",
-    "eslint": "^4.15.0",
+    "eslint": "^4.18.1",
     "eslint-config-airbnb": "^16.1.0",
     "eslint-config-prettier": "^2.9.0",
-    "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-jest": "^21.5.0",
+    "eslint-plugin-import": "^2.9.0",
+    "eslint-plugin-jest": "^21.12.2",
     "eslint-plugin-json": "^1.2.0",
     "eslint-plugin-jsx-a11y": "^6.0.3",
-    "eslint-plugin-prettier": "^2.4.0",
-    "eslint-plugin-react": "^7.5.1",
-    "gh-pages": "^1.1.0",
-    "github-release-from-changelog": "^1.3.0",
+    "eslint-plugin-prettier": "^2.6.0",
+    "eslint-plugin-react": "^7.7.0",
+    "github-release-from-changelog": "^1.3.1",
     "glob": "^7.1.2",
     "husky": "^0.14.3",
-    "inquirer": "^4.0.2",
-    "jest": "^22.0.4",
-    "jest-cli": "^22.0.4",
-    "jest-config": "^22.0.4",
-    "jest-diff": "^22.0.3",
-    "jest-environment-jsdom": "^22.0.4",
-    "jest-enzyme": "^4.0.2",
-    "jest-image-snapshot": "^2.2.1",
-    "jest-jasmine2": "^22.0.4",
-    "lerna": "^2.5.1",
-    "lint-staged": "^6.0.0",
-    "lodash": "^4.17.4",
-    "nodemon": "^1.14.8",
+    "inquirer": "^5.1.0",
+    "jest": "^22.4.2",
+    "jest-cli": "^22.4.2",
+    "jest-config": "^22.4.2",
+    "jest-diff": "^22.4.0",
+    "jest-environment-jsdom": "^22.4.1",
+    "jest-enzyme": "^4.2.0",
+    "jest-image-snapshot": "^2.3.0",
+    "jest-jasmine2": "^22.4.2",
+    "jest-preset-angular": "^5.2.0",
+    "jest-vue-preprocessor": "^1.3.1",
+    "lerna": "2.5.1",
+    "lint-staged": "^7.0.0",
+    "lodash": "^4.17.5",
     "npmlog": "^4.1.2",
-    "prettier": "^1.9.2",
-    "puppeteer": "^0.13.0",
+    "prettier": "^1.11.1",
     "raf": "^3.4.0",
     "react": "^16.2.0",
     "react-dom": "^16.2.0",
     "react-test-renderer": "^16.2.0",
-    "remark-cli": "^4.0.0",
+    "remark-cli": "^5.0.0",
     "remark-lint": "^6.0.1",
-    "remark-lint-code": "^2.0.0",
-    "remark-lint-code-eslint": "^2.0.0",
     "remark-preset-lint-recommended": "^3.0.1",
-    "shelljs": "^0.7.8",
-    "symlink-dir": "^1.1.1"
+    "shelljs": "^0.8.1",
+    "tslint": "~5.9.1",
+    "tslint-config-prettier": "^1.9.0",
+    "tslint-plugin-prettier": "^1.3.0",
+    "typescript": "^2.7.2"
   },
   "engines": {
     "node": ">=8.0.0",
@@ -106,6 +115,10 @@
         "yarn lint:js --fix",
         "git add"
       ],
+      "*.ts": [
+        "yarn lint:ts --fix",
+        "git add"
+      ],
       "*.json": [
         "yarn lint:js --fix",
         "git add"
@@ -133,6 +146,7 @@
     "lib/*",
     "examples/angular-cli",
     "examples/cra-kitchen-sink",
+    "examples/polymer-cli",
     "examples/vue-kitchen-sink",
     "examples/official-storybook",
     "lib/cli/test/run/*"
diff --git a/scripts/compile-js.js b/scripts/compile-js.js
new file mode 100644
index 00000000000..7f9bbb0581a
--- /dev/null
+++ b/scripts/compile-js.js
@@ -0,0 +1,49 @@
+/* eslint-disable no-console */
+const fs = require('fs');
+const path = require('path');
+const shell = require('shelljs');
+
+function getCommand(watch) {
+  const babel = path.join(__dirname, '..', 'node_modules', '.bin', 'babel');
+
+  const args = [
+    '--ignore __mocks__/,tests/*,__tests__/,**.test.js,stories/,**.story.js,**.stories.js,__snapshots__',
+    '--plugins "transform-runtime"',
+    './src --out-dir ./dist',
+    '--copy-files',
+  ];
+
+  if (watch) {
+    args.push('-w');
+  }
+
+  return `${babel} ${args.join(' ')}`;
+}
+
+function handleExit(code, errorCallback) {
+  if (code !== 0) {
+    if (errorCallback && typeof errorCallback === 'function') {
+      errorCallback();
+    }
+
+    shell.exit(code);
+  }
+}
+
+function babelify(options = {}) {
+  const { watch = false, silent = true, errorCallback } = options;
+
+  if (!fs.existsSync('src')) {
+    if (!silent) console.log('No src dir');
+    return;
+  }
+
+  const command = getCommand(watch);
+  const { code } = shell.exec(command, { silent });
+
+  handleExit(code, errorCallback);
+}
+
+module.exports = {
+  babelify,
+};
diff --git a/scripts/compile-ts.js b/scripts/compile-ts.js
new file mode 100644
index 00000000000..c918cd5f4dc
--- /dev/null
+++ b/scripts/compile-ts.js
@@ -0,0 +1,53 @@
+/* eslint-disable no-console */
+const fs = require('fs');
+const path = require('path');
+const shell = require('shelljs');
+
+function getCommand(watch) {
+  const tsc = path.join(__dirname, '..', 'node_modules', '.bin', 'tsc');
+
+  const args = ['--outDir ./dist', '-d true', '--listEmittedFiles true'];
+
+  if (watch) {
+    args.push('-w');
+  }
+
+  return `${tsc} ${args.join(' ')}`;
+}
+
+function handleExit(code, errorCallback) {
+  if (code !== 0) {
+    if (errorCallback && typeof errorCallback === 'function') {
+      errorCallback();
+    }
+
+    shell.exit(code);
+  }
+}
+
+function tscfy(options = {}) {
+  const { watch = false, silent = true, errorCallback } = options;
+  const tsConfigFile = 'tsconfig.json';
+
+  if (!fs.existsSync(tsConfigFile)) {
+    if (!silent) console.log(`No ${tsConfigFile}`);
+    return;
+  }
+
+  const content = fs.readFileSync(tsConfigFile);
+  const tsConfig = JSON.parse(content);
+
+  if (tsConfig && tsConfig.lerna && tsConfig.lerna.disabled === true) {
+    if (!silent) console.log('Lerna disabled');
+    return;
+  }
+
+  const command = getCommand(watch);
+  const { code } = shell.exec(command, { silent });
+
+  handleExit(code, errorCallback);
+}
+
+module.exports = {
+  tscfy,
+};
diff --git a/scripts/netlify-build.sh b/scripts/netlify-build.sh
old mode 100644
new mode 100755
index 71de2feaa8f..af34587fb7b
--- a/scripts/netlify-build.sh
+++ b/scripts/netlify-build.sh
@@ -35,6 +35,13 @@ elif [ "$BUILD_CONTEXT" = "ANGULAR" ]; then
   yarn build-storybook
   mv storybook-static ../../netlify-build
   popd
+elif [ "$BUILD_CONTEXT" = "POLYMER" ]; then
+  echo "netlify-build Polymer examples"
+  pushd examples/polymer-cli
+  yarn
+  yarn build-storybook
+  mv storybook-static ../../netlify-build
+  popd
 elif [ "$BUILD_CONTEXT" = "OFFICIAL" ]; then
   echo "netlify-build official examples"
   pushd examples/official-storybook
diff --git a/scripts/prepare.js b/scripts/prepare.js
index 81d57955f17..4dfe6d306a9 100644
--- a/scripts/prepare.js
+++ b/scripts/prepare.js
@@ -1,32 +1,51 @@
+/* eslint-disable no-console */
 const path = require('path');
 const shell = require('shelljs');
 const chalk = require('chalk');
 const log = require('npmlog');
+const { babelify } = require('./compile-js');
+const { tscfy } = require('./compile-ts');
 
-const modulePath = path.resolve('./');
-// eslint-disable-next-line import/no-dynamic-require
-const packageJson = require(path.join(modulePath, 'package.json'));
+function getPackageJson() {
+  const modulePath = path.resolve('./');
 
-shell.rm('-rf', 'dist');
-
-const babel = path.join(__dirname, '..', 'node_modules', '.bin', 'babel');
-const args = [
-  '--ignore __mocks__/,tests/*,__tests__/,**.test.js,stories/,**.story.js,**.stories.js,__snapshots__',
-  '--plugins "transform-runtime"',
-  './src --out-dir ./dist',
-  '--copy-files',
-].join(' ');
-
-const command = `${babel} ${args}`;
-const { code } = shell.exec(command, { silent: true });
-
-if (code !== 0) {
-  log.error(`FAILED: ${chalk.bold(`${packageJson.name}@${packageJson.version}`)}`);
-  shell.exit(code);
+  // eslint-disable-next-line global-require,import/no-dynamic-require
+  return require(path.join(modulePath, 'package.json'));
 }
 
-const licence = path.join(__dirname, '..', 'LICENSE');
-shell.cp(licence, './');
+function removeDist() {
+  shell.rm('-rf', 'dist');
+}
+
+function removeTsFromDist() {
+  // add .ts filtering to babel args and remove after babel - 7 is adopted
+  // --copy-files option doesn't work with --ignore
+  // https://github.com/babel/babel/issues/5404
+
+  const tsFiles = shell.find('dist').filter(tsFile => tsFile.match(/\.ts$/));
+
+  if (tsFiles.length) {
+    shell.rm(tsFiles);
+  }
+}
+
+function copyLicence() {
+  const licence = path.join(__dirname, '..', 'LICENSE');
+  shell.cp(licence, './');
+}
+
+function logError(type, packageJson) {
+  log.error(
+    `FAILED to compile ${type}: ${chalk.bold(`${packageJson.name}@${packageJson.version}`)}`
+  );
+}
+
+const packageJson = getPackageJson();
+
+removeDist();
+babelify({ errorCallback: () => logError('js', packageJson) });
+removeTsFromDist();
+tscfy({ errorCallback: () => logError('ts', packageJson) });
+copyLicence();
 
-// eslint-disable-next-line no-console
 console.log(chalk.gray(`Built: ${chalk.bold(`${packageJson.name}@${packageJson.version}`)}`));
diff --git a/scripts/test.js b/scripts/test.js
index ddcaa63fe93..2740768d17b 100755
--- a/scripts/test.js
+++ b/scripts/test.js
@@ -43,7 +43,7 @@ const createOption = ({ defaultValue, option, name, extraParam }) => ({
 
 const tasks = {
   core: createProject({
-    name: `Core & React & Vue ${chalk.gray('(core)')}`,
+    name: `Core & React & Vue & Polymer & Angular ${chalk.gray('(core)')}`,
     defaultValue: true,
     option: '--core',
     projectLocation: path.join(__dirname, '..'),
@@ -56,11 +56,11 @@ const tasks = {
     projectLocation: path.join(__dirname, '..', 'examples/react-native-vanilla'),
     isJest: true,
   }),
-  integration: createProject({
-    name: `Screenshots of running apps ${chalk.gray('(integration)')}`,
+  image: createProject({
+    name: `Image snapshots for Official storybook ${chalk.gray('(image)')}`,
     defaultValue: false,
-    option: '--integration',
-    projectLocation: path.join(__dirname, '..', 'integration'),
+    option: '--image',
+    projectLocation: path.join(__dirname, '..', 'examples/official-storybook/image-snapshots'),
     isJest: true,
   }),
   // 'crna-kitchen-sink': createProject({
diff --git a/scripts/watch-js.js b/scripts/watch-js.js
new file mode 100644
index 00000000000..fa55099c9d7
--- /dev/null
+++ b/scripts/watch-js.js
@@ -0,0 +1,8 @@
+const { babelify } = require('./compile-js');
+
+babelify({
+  watch: true,
+  silent: false,
+  // eslint-disable-next-line no-console
+  errorCallback: () => console.error('Failed to compile js'),
+});
diff --git a/scripts/watch-ts.js b/scripts/watch-ts.js
new file mode 100644
index 00000000000..3cabb8386a0
--- /dev/null
+++ b/scripts/watch-ts.js
@@ -0,0 +1,8 @@
+const { tscfy } = require('./compile-ts');
+
+tscfy({
+  watch: true,
+  silent: false,
+  // eslint-disable-next-line no-console
+  errorCallback: () => console.error('Failed to compile ts'),
+});
diff --git a/scripts/workaround-puppeteer-issue-290.sh b/scripts/workaround-puppeteer-issue-290.sh
deleted file mode 100755
index 02305eb8edd..00000000000
--- a/scripts/workaround-puppeteer-issue-290.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-# Workaround for https://github.com/GoogleChrome/puppeteer/issues/290
- 
-sudo apt-get update
-sudo apt-get install -yq gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 \
-  libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 \
-  libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 \
-  libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 \
-  ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 00000000000..c10e37b0ffc
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,14 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "skipLibCheck": true,
+    "noImplicitAny": true,
+    "target": "es5",
+    "lib": [
+      "es2016",
+      "dom"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/angular/tslint.json b/tslint.json
similarity index 83%
rename from app/angular/tslint.json
rename to tslint.json
index d7a4fdd1845..45d1f7977aa 100644
--- a/app/angular/tslint.json
+++ b/tslint.json
@@ -1,8 +1,22 @@
 {
+  "extends": [
+    "tslint-plugin-prettier",
+    "tslint-config-prettier"
+  ],
   "rulesDirectory": [
     "node_modules/codelyzer"
   ],
   "rules": {
+    "prettier": {
+      "severity": "warning",
+      "options": {
+        "printWidth": 100,
+        "tabWidth": 2,
+        "bracketSpacing": true,
+        "trailingComma": "es5",
+        "singleQuote": true
+      }
+    },
     "arrow-return-shorthand": true,
     "callable-types": true,
     "class-name": true,
@@ -20,7 +34,8 @@
     "import-spacing": true,
     "indent": [
       true,
-      "spaces"
+      "spaces",
+      2
     ],
     "interface-over-type-literal": true,
     "label-position": true,
@@ -71,6 +86,7 @@
     "no-unused-expression": true,
     "no-use-before-declare": true,
     "no-var-keyword": true,
+    "no-unused-variable": true,
     "object-literal-sort-keys": false,
     "one-line": [
       true,
@@ -103,17 +119,8 @@
         "variable-declaration": "nospace"
       }
     ],
-    "typeof-compare": true,
     "unified-signatures": true,
     "variable-name": false,
-    "whitespace": [
-      true,
-      "check-branch",
-      "check-decl",
-      "check-operator",
-      "check-separator",
-      "check-type"
-    ],
     "directive-selector": [
       true,
       "attribute",
@@ -134,9 +141,14 @@
     "use-life-cycle-interface": true,
     "use-pipe-transform-interface": true,
     "component-class-suffix": true,
-    "directive-class-suffix": true,
-    "no-access-missing-member": true,
-    "templates-use-public": true,
-    "invoke-injectable": true
+    "directive-class-suffix": true
+  },
+  "linterOptions": {
+    "exclude": [
+      "lib/cli/test/**",
+      "**/node_modules/**",
+      "**/dist/**",
+      "**/storybook-static/**"
+    ]
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 701f31dae13..fe1e9215970 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,63 +2,59 @@
 # yarn lockfile v1
 
 
-"@angular-devkit/build-optimizer@~0.0.36":
-  version "0.0.36"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.0.36.tgz#e816ee9be22dbb777724f0281acfa72cfff184b7"
+"@angular-devkit/build-optimizer@0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.3.2.tgz#77d4d1e4fcd09575f0200e2d6d21c1a3f995096f"
   dependencies:
     loader-utils "^1.1.0"
     source-map "^0.5.6"
-    typescript "~2.6.1"
+    typescript "~2.6.2"
     webpack-sources "^1.0.1"
 
-"@angular-devkit/core@0.0.22":
-  version "0.0.22"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.0.22.tgz#e90f46bf7ff47d260a767959267bc65ffee39ef1"
+"@angular-devkit/core@0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.3.2.tgz#b6fd6aa2e4f4ac3c39478198ba91a53d4c0f88d5"
   dependencies:
+    ajv "~5.5.1"
+    chokidar "^1.7.0"
+    rxjs "^5.5.6"
     source-map "^0.5.6"
 
-"@angular-devkit/schematics@~0.0.42":
-  version "0.0.42"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.0.42.tgz#34eea7136455545c8abd21edf94a36870a073fea"
+"@angular-devkit/schematics@0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.3.2.tgz#09a2268fad61f4f956f42db87913b8748c512a78"
   dependencies:
-    "@angular-devkit/core" "0.0.22"
     "@ngtools/json-schema" "^1.1.0"
-    "@schematics/schematics" "0.0.11"
-    minimist "^1.2.0"
-    rxjs "^5.5.2"
+    rxjs "^5.5.6"
 
-"@angular/animations@^5.1.3":
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-5.1.3.tgz#3af3073bfdfeac61d7e6058257b3b19c97183a96"
+"@angular/cli@1.7.2":
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-1.7.2.tgz#7539285cb83f33cc1b34aec47a5ef6e8656c8450"
   dependencies:
-    tslib "^1.7.1"
-
-"@angular/cli@1.6.3":
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-1.6.3.tgz#63120b347fc8ee206f773074d25fdd4807c189e3"
-  dependencies:
-    "@angular-devkit/build-optimizer" "~0.0.36"
-    "@angular-devkit/schematics" "~0.0.42"
-    "@ngtools/json-schema" "1.1.0"
-    "@ngtools/webpack" "1.9.3"
-    "@schematics/angular" "~0.1.11"
-    autoprefixer "^6.5.3"
+    "@angular-devkit/build-optimizer" "0.3.2"
+    "@angular-devkit/core" "0.3.2"
+    "@angular-devkit/schematics" "0.3.2"
+    "@ngtools/json-schema" "1.2.0"
+    "@ngtools/webpack" "1.10.1"
+    "@schematics/angular" "0.3.2"
+    "@schematics/package-update" "0.3.2"
+    ajv "^6.1.1"
+    autoprefixer "^7.2.3"
+    cache-loader "^1.2.0"
     chalk "~2.2.0"
     circular-dependency-plugin "^4.2.1"
+    clean-css "^4.1.9"
     common-tags "^1.3.1"
-    copy-webpack-plugin "^4.1.1"
+    copy-webpack-plugin "~4.4.1"
     core-object "^3.1.0"
-    css-loader "^0.28.1"
-    cssnano "^3.10.0"
     denodeify "^1.2.1"
     ember-cli-string-utils "^1.0.0"
-    exports-loader "^0.6.3"
     extract-text-webpack-plugin "^3.0.2"
     file-loader "^1.1.5"
     fs-extra "^4.0.0"
     glob "^7.0.3"
     html-webpack-plugin "^2.29.0"
-    istanbul-instrumenter-loader "^2.0.0"
+    istanbul-instrumenter-loader "^3.0.0"
     karma-source-map-support "^1.2.0"
     less "^2.7.2"
     less-loader "^4.0.5"
@@ -71,161 +67,164 @@
     nopt "^4.0.1"
     opn "~5.1.0"
     portfinder "~1.0.12"
-    postcss-custom-properties "^6.1.0"
-    postcss-loader "^2.0.8"
+    postcss "^6.0.16"
+    postcss-import "^11.0.0"
+    postcss-loader "^2.0.10"
     postcss-url "^7.1.2"
     raw-loader "^0.5.1"
     resolve "^1.1.7"
-    rxjs "^5.5.2"
-    sass-loader "^6.0.3"
+    rxjs "^5.5.6"
+    sass-loader "^6.0.6"
     semver "^5.1.0"
     silent-error "^1.0.0"
-    source-map-loader "^0.2.0"
     source-map-support "^0.4.1"
-    style-loader "^0.13.1"
+    style-loader "^0.19.1"
     stylus "^0.54.5"
     stylus-loader "^3.0.1"
-    uglifyjs-webpack-plugin "^1.1.5"
+    uglifyjs-webpack-plugin "^1.1.8"
     url-loader "^0.6.2"
-    webpack "~3.10.0"
+    webpack "~3.11.0"
     webpack-dev-middleware "~1.12.0"
-    webpack-dev-server "~2.9.3"
+    webpack-dev-server "~2.11.0"
     webpack-merge "^4.1.0"
     webpack-sources "^1.0.0"
     webpack-subresource-integrity "^1.0.1"
-    zone.js "^0.8.14"
   optionalDependencies:
-    node-sass "^4.3.0"
+    node-sass "^4.7.2"
 
-"@angular/common@^5.1.3":
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-5.1.3.tgz#db517c00a95f72885eb2091098eaed4f95494a63"
+"@angular/common@^5.2.7":
+  version "5.2.7"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-5.2.7.tgz#11bb9f00afe91af8d772ecdff83c2e179f9a67a0"
   dependencies:
     tslib "^1.7.1"
 
-"@angular/compiler-cli@^5.1.3":
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-5.1.3.tgz#e9cfd183a8a12fddad0188d2b7e4e9a45f302d82"
+"@angular/compiler-cli@^5.2.7":
+  version "5.2.7"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-5.2.7.tgz#3bad9d5e4c25ebc51e1bb67b71b26a97d6d3bbc5"
   dependencies:
     chokidar "^1.4.2"
     minimist "^1.2.0"
     reflect-metadata "^0.1.2"
-    tsickle "^0.25.5"
+    tsickle "^0.27.2"
 
-"@angular/compiler@^5.1.3":
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-5.1.3.tgz#125008477895aee1bf71294bf981a4ba184c1e59"
+"@angular/compiler@^5.2.7":
+  version "5.2.7"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-5.2.7.tgz#31dcc7ac18cc23cb115e76c541b982737ff93ec9"
   dependencies:
     tslib "^1.7.1"
 
-"@angular/core@^5.1.3":
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-5.1.3.tgz#b739f69834c344285250a384d0c203dd36778a37"
+"@angular/core@^5.2.7":
+  version "5.2.7"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-5.2.7.tgz#e5607fc39d90f9fe4fbaaeeeb6cdb9371966bfe3"
   dependencies:
     tslib "^1.7.1"
 
-"@angular/forms@^5.1.3":
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-5.1.3.tgz#fe4c0c37c504e78c85f8e50db6e098705fa72f4c"
+"@angular/forms@^5.2.7":
+  version "5.2.7"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-5.2.7.tgz#a0c41fdb6b8ba2c32653cc3058d5fa47db91fbf8"
   dependencies:
     tslib "^1.7.1"
 
-"@angular/http@^5.1.3":
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-5.1.3.tgz#eeea2a6760fa54449a967fb5abdd473736c5c989"
+"@angular/platform-browser-dynamic@^5.2.7":
+  version "5.2.7"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.2.7.tgz#91f903c1f73de2fba1004bc31ed1c3117c7f0406"
   dependencies:
     tslib "^1.7.1"
 
-"@angular/language-service@^5.1.3":
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-5.1.3.tgz#b55f295943133e33940ff71e6bb0afa93d7f4d36"
-
-"@angular/platform-browser-dynamic@^5.1.3":
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.1.3.tgz#ad37e4dbd5251e7ea256ad9323fe11c848d04050"
+"@angular/platform-browser@^5.2.7":
+  version "5.2.7"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-5.2.7.tgz#cfd86040c25380aabf0322ef47aecc61f23cc532"
   dependencies:
     tslib "^1.7.1"
 
-"@angular/platform-browser@^5.1.3":
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-5.1.3.tgz#5abe7809009eff6bff3bf89faba96fe066fb2036"
+"@babel/code-frame@7.0.0-beta.40", "@babel/code-frame@^7.0.0-beta.40":
+  version "7.0.0-beta.40"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.40.tgz#37e2b0cf7c56026b4b21d3927cadf81adec32ac6"
   dependencies:
-    tslib "^1.7.1"
-
-"@angular/router@^5.1.3":
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-5.1.3.tgz#69627d7186e4ab8e7d4058c4400f82d3899ebd7a"
-  dependencies:
-    tslib "^1.7.1"
-
-"@babel/code-frame@7.0.0-beta.31":
-  version "7.0.0-beta.31"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.31.tgz#473d021ecc573a2cce1c07d5b509d5215f46ba35"
-  dependencies:
-    chalk "^2.0.0"
-    esutils "^2.0.2"
-    js-tokens "^3.0.0"
+    "@babel/highlight" "7.0.0-beta.40"
 
 "@babel/code-frame@^7.0.0-beta.35":
-  version "7.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.36.tgz#2349d7ec04b3a06945ae173280ef8579b63728e4"
+  version "7.0.0-beta.37"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.37.tgz#2da1dd3b1b57bfdea777ddc378df7cd12fe40171"
   dependencies:
     chalk "^2.0.0"
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-"@babel/helper-function-name@7.0.0-beta.31":
-  version "7.0.0-beta.31"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.31.tgz#afe63ad799209989348b1109b44feb66aa245f57"
+"@babel/generator@7.0.0-beta.40":
+  version "7.0.0-beta.40"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.40.tgz#ab61f9556f4f71dbd1138949c795bb9a21e302ea"
   dependencies:
-    "@babel/helper-get-function-arity" "7.0.0-beta.31"
-    "@babel/template" "7.0.0-beta.31"
-    "@babel/traverse" "7.0.0-beta.31"
-    "@babel/types" "7.0.0-beta.31"
+    "@babel/types" "7.0.0-beta.40"
+    jsesc "^2.5.1"
+    lodash "^4.2.0"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
 
-"@babel/helper-get-function-arity@7.0.0-beta.31":
-  version "7.0.0-beta.31"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.31.tgz#1176d79252741218e0aec872ada07efb2b37a493"
+"@babel/helper-function-name@7.0.0-beta.40":
+  version "7.0.0-beta.40"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.40.tgz#9d033341ab16517f40d43a73f2d81fc431ccd7b6"
   dependencies:
-    "@babel/types" "7.0.0-beta.31"
+    "@babel/helper-get-function-arity" "7.0.0-beta.40"
+    "@babel/template" "7.0.0-beta.40"
+    "@babel/types" "7.0.0-beta.40"
 
-"@babel/template@7.0.0-beta.31":
-  version "7.0.0-beta.31"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.31.tgz#577bb29389f6c497c3e7d014617e7d6713f68bda"
+"@babel/helper-get-function-arity@7.0.0-beta.40":
+  version "7.0.0-beta.40"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.40.tgz#ac0419cf067b0ec16453e1274f03878195791c6e"
   dependencies:
-    "@babel/code-frame" "7.0.0-beta.31"
-    "@babel/types" "7.0.0-beta.31"
-    babylon "7.0.0-beta.31"
+    "@babel/types" "7.0.0-beta.40"
+
+"@babel/highlight@7.0.0-beta.40":
+  version "7.0.0-beta.40"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.40.tgz#b43d67d76bf46e1d10d227f68cddcd263786b255"
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^3.0.0"
+
+"@babel/template@7.0.0-beta.40":
+  version "7.0.0-beta.40"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.40.tgz#034988c6424eb5c3268fe6a608626de1f4410fc8"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.40"
+    "@babel/types" "7.0.0-beta.40"
+    babylon "7.0.0-beta.40"
     lodash "^4.2.0"
 
-"@babel/traverse@7.0.0-beta.31":
-  version "7.0.0-beta.31"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.31.tgz#db399499ad74aefda014f0c10321ab255134b1df"
+"@babel/traverse@^7.0.0-beta.40":
+  version "7.0.0-beta.40"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.40.tgz#d140e449b2e093ef9fe1a2eecc28421ffb4e521e"
   dependencies:
-    "@babel/code-frame" "7.0.0-beta.31"
-    "@babel/helper-function-name" "7.0.0-beta.31"
-    "@babel/types" "7.0.0-beta.31"
-    babylon "7.0.0-beta.31"
+    "@babel/code-frame" "7.0.0-beta.40"
+    "@babel/generator" "7.0.0-beta.40"
+    "@babel/helper-function-name" "7.0.0-beta.40"
+    "@babel/types" "7.0.0-beta.40"
+    babylon "7.0.0-beta.40"
     debug "^3.0.1"
-    globals "^10.0.0"
+    globals "^11.1.0"
     invariant "^2.2.0"
     lodash "^4.2.0"
 
-"@babel/types@7.0.0-beta.31":
-  version "7.0.0-beta.31"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.31.tgz#42c9c86784f674c173fb21882ca9643334029de4"
+"@babel/types@7.0.0-beta.40", "@babel/types@^7.0.0-beta.40":
+  version "7.0.0-beta.40"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.40.tgz#25c3d7aae14126abe05fcb098c65a66b6d6b8c14"
   dependencies:
     esutils "^2.0.2"
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@ngtools/json-schema@1.1.0", "@ngtools/json-schema@^1.1.0":
+"@ngtools/json-schema@1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@ngtools/json-schema/-/json-schema-1.2.0.tgz#06e5ecd29e9a37d260a447dd873ea2becd228c4f"
+
+"@ngtools/json-schema@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@ngtools/json-schema/-/json-schema-1.1.0.tgz#c3a0c544d62392acc2813a42c8a0dc6f58f86922"
 
-"@ngtools/webpack@1.9.3":
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-1.9.3.tgz#353e27e6f21ab35467d17b67e3096dfc5d9bf80c"
+"@ngtools/webpack@1.10.1":
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-1.10.1.tgz#0af9de19a9716ce0247b6aad83ba9c5702766a03"
   dependencies:
     chalk "~2.2.0"
     enhanced-resolve "^3.1.0"
@@ -236,15 +235,34 @@
     tree-kill "^1.0.0"
     webpack-sources "^1.1.0"
 
-"@schematics/angular@~0.1.11":
-  version "0.1.11"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.1.11.tgz#b5f15320bbb60969d66c76a8ef6545058ac81ece"
+"@octokit/rest@^14.0.4":
+  version "14.0.9"
+  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-14.0.9.tgz#d5e0a00dcb78901dd7b2ef852acfc0aea7c479ef"
   dependencies:
-    "@angular-devkit/core" "0.0.22"
+    before-after-hook "^1.1.0"
+    debug "^3.1.0"
+    is-array-buffer "^1.0.0"
+    is-stream "^1.1.0"
+    lodash "^4.17.4"
+    url-template "^2.0.8"
 
-"@schematics/schematics@0.0.11":
-  version "0.0.11"
-  resolved "https://registry.yarnpkg.com/@schematics/schematics/-/schematics-0.0.11.tgz#c8f70f270ed38f29b2873248126fd59abd635862"
+"@polymer/polymer@^2.5.0":
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/@polymer/polymer/-/polymer-2.5.0.tgz#261439f5ab691c230d0c5dfb518b9247064ac13d"
+
+"@schematics/angular@0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.3.2.tgz#be209a032a3e4577992d94fbaa14bd4bfde485e2"
+  dependencies:
+    typescript "~2.6.2"
+
+"@schematics/package-update@0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@schematics/package-update/-/package-update-0.3.2.tgz#c5a299ceba8b9e56f3e1f804f86f07664ec6e01c"
+  dependencies:
+    rxjs "^5.5.6"
+    semver "^5.3.0"
+    semver-intersect "^1.1.2"
 
 "@storybook/mantra-core@^1.7.2":
   version "1.7.2"
@@ -254,6 +272,13 @@
     "@storybook/react-simple-di" "^1.2.1"
     babel-runtime "6.x.x"
 
+"@storybook/podda@^1.2.3":
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/podda/-/podda-1.2.3.tgz#53c4a1a3f8c7bbd5755dff5c34576fd1af9d38ba"
+  dependencies:
+    babel-runtime "^6.11.6"
+    immutable "^3.8.1"
+
 "@storybook/react-komposer@^2.0.1", "@storybook/react-komposer@^2.0.3":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@storybook/react-komposer/-/react-komposer-2.0.3.tgz#f9e12a9586b2ce95c24c137eabb8b71527ddb369"
@@ -279,41 +304,49 @@
   dependencies:
     babel-runtime "^6.5.0"
 
+"@types/clone@^0.1.29":
+  version "0.1.30"
+  resolved "https://registry.yarnpkg.com/@types/clone/-/clone-0.1.30.tgz#e7365648c1b42136a59c7d5040637b3b5c83b614"
+
 "@types/graphql@0.11.7":
   version "0.11.7"
   resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-0.11.7.tgz#da39a2f7c74e793e32e2bb7b3b68da1691532dd5"
 
-"@types/inline-style-prefixer@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@types/inline-style-prefixer/-/inline-style-prefixer-3.0.1.tgz#8541e636b029124b747952e9a28848286d2b5bf6"
+"@types/jasmine@~2.8.6":
+  version "2.8.6"
+  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.6.tgz#14445b6a1613cf4e05dd61c3c3256d0e95c0421e"
 
-"@types/jasmine@~2.8.3":
-  version "2.8.3"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.3.tgz#f910edc67d69393d562d10f8f3d205ea3f3306bf"
+"@types/jest@^22.1.3":
+  version "22.1.3"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-22.1.3.tgz#25da391935e6fac537551456f077ce03144ec168"
 
-"@types/lodash@^4.14.85", "@types/lodash@^4.14.92":
+"@types/lodash@^4.14.85":
   version "4.14.92"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.92.tgz#6e3cb0b71a1e12180a47a42a744e856c3ae99a57"
 
-"@types/mz@0.0.32":
-  version "0.0.32"
-  resolved "https://registry.yarnpkg.com/@types/mz/-/mz-0.0.32.tgz#e8248b4e41424c052edc1725dd33650c313a3659"
-  dependencies:
-    "@types/node" "*"
+"@types/node@*":
+  version "9.3.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-9.3.0.tgz#3a129cda7c4e5df2409702626892cb4b96546dd5"
 
-"@types/node@*", "@types/node@^8.0.28":
-  version "8.5.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.5.7.tgz#9c498c35af354dcfbca3790fb2e81129e93cf0e2"
-
-"@types/node@^6.0.46", "@types/node@~6.0.96":
+"@types/node@^6.0.0", "@types/node@^6.0.46":
   version "6.0.96"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.96.tgz#7bf0bf40d6ce51e93762cc47d010c8cc5ebb2179"
 
+"@types/node@~9.4.6":
+  version "9.4.6"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-9.4.6.tgz#d8176d864ee48753d053783e4e463aec86b8d82e"
+
+"@types/parse5@^2.2.32":
+  version "2.2.34"
+  resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-2.2.34.tgz#e3870a10e82735a720f62d71dcd183ba78ef3a9d"
+  dependencies:
+    "@types/node" "*"
+
 "@types/q@^0.0.32":
   version "0.0.32"
   resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
 
-"@types/react@^16.0.18", "@types/react@^16.0.20":
+"@types/react@^16.0.20":
   version "16.0.34"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.34.tgz#7a8f795afd8a404a9c4af9539b24c75d3996914e"
 
@@ -321,7 +354,19 @@
   version "2.53.43"
   resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-2.53.43.tgz#2de3d718819bc20165754c4a59afb7e9833f6707"
 
-JSONStream@^1.0.4, JSONStream@~1.3.1:
+"@types/strip-bom@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/strip-bom/-/strip-bom-3.0.0.tgz#14a8ec3956c2e81edb7520790aecf21c290aebd2"
+
+"@types/strip-json-comments@0.0.30":
+  version "0.0.30"
+  resolved "https://registry.yarnpkg.com/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz#9aa30c04db212a9a0649d6ae6fd50accc40748a1"
+
+"@webcomponents/webcomponentsjs@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@webcomponents/webcomponentsjs/-/webcomponentsjs-1.1.0.tgz#1392799c266fca142622a720176f688beb74d181"
+
+JSONStream@^1.0.3, JSONStream@^1.0.4, JSONStream@~1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.2.tgz#c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"
   dependencies:
@@ -340,13 +385,6 @@ absolute-path@^0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/absolute-path/-/absolute-path-0.0.0.tgz#a78762fbdadfb5297be99b15d35a785b2f095bf7"
 
-accepts@1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca"
-  dependencies:
-    mime-types "~2.1.11"
-    negotiator "0.6.1"
-
 accepts@~1.2.12, accepts@~1.2.13:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.2.13.tgz#e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea"
@@ -361,12 +399,36 @@ accepts@~1.3.0, accepts@~1.3.4:
     mime-types "~2.1.16"
     negotiator "0.6.1"
 
+acorn-bigint@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-bigint/-/acorn-bigint-0.2.0.tgz#0f45a5290537799a3b07085689a186881cb53784"
+  dependencies:
+    acorn "^5.2.1"
+
+acorn-class-fields@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/acorn-class-fields/-/acorn-class-fields-0.1.2.tgz#20782f304af42257feff5bd4a5c335291473bf58"
+  dependencies:
+    acorn "^5.3.0"
+
 acorn-dynamic-import@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
   dependencies:
     acorn "^4.0.3"
 
+acorn-dynamic-import@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
+  dependencies:
+    acorn "^5.0.0"
+
+acorn-es7@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/acorn-es7/-/acorn-es7-0.1.0.tgz#4a6de4522faacb4c31209e1b73b5f301ed2bb30a"
+  dependencies:
+    acorn "^2.6.4"
+
 acorn-globals@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
@@ -379,12 +441,73 @@ acorn-globals@^4.0.0:
   dependencies:
     acorn "^5.0.0"
 
+acorn-import-meta@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/acorn-import-meta/-/acorn-import-meta-0.2.1.tgz#ac91e06e00facece7e96ff76a0fe9ec7b1cb5b5c"
+  dependencies:
+    acorn "^5.4.1"
+
+acorn-json-superset@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/acorn-json-superset/-/acorn-json-superset-0.1.0.tgz#b5b911a1777ea63a48fcfc64353e787305e8a945"
+  dependencies:
+    acorn "^5.4.1"
+
 acorn-jsx@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
   dependencies:
     acorn "^3.0.4"
 
+acorn-jsx@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-4.1.1.tgz#e8e41e48ea2fe0c896740610ab6a4ffd8add225e"
+  dependencies:
+    acorn "^5.0.3"
+
+acorn-node@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.3.0.tgz#5f86d73346743810ef1269b901dbcbded020861b"
+  dependencies:
+    acorn "^5.4.1"
+    xtend "^4.0.1"
+
+acorn-numeric-separator@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/acorn-numeric-separator/-/acorn-numeric-separator-0.1.1.tgz#aa455a1d95ae887231de97e0681abbe28b065e8d"
+  dependencies:
+    acorn "^5.2.1"
+
+acorn-optional-catch-binding@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/acorn-optional-catch-binding/-/acorn-optional-catch-binding-0.1.0.tgz#d9a1874dbffce1eb3495836e5e75b2ad9c300868"
+  dependencies:
+    acorn "^5.2.1"
+
+acorn-private-methods@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/acorn-private-methods/-/acorn-private-methods-0.1.1.tgz#32c13cf24d05bf1c9be04914b41491c59d75a195"
+  dependencies:
+    acorn "^5.4.0"
+
+acorn-stage3@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/acorn-stage3/-/acorn-stage3-0.6.0.tgz#d2814cec8e2f8bcb0407ba657fbe0cfb118f9bc2"
+  dependencies:
+    acorn "^5.5.0"
+    acorn-bigint "^0.2.0"
+    acorn-class-fields "^0.1.1"
+    acorn-dynamic-import "^3.0.0"
+    acorn-import-meta "^0.2.1"
+    acorn-json-superset "^0.1.0"
+    acorn-numeric-separator "^0.1.1"
+    acorn-optional-catch-binding "^0.1.0"
+    acorn-private-methods "^0.1.1"
+
+acorn@^2.6.4:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7"
+
 acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
@@ -397,6 +520,14 @@ acorn@^5.0.0, acorn@^5.1.2, acorn@^5.2.1:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.3.0.tgz#7446d39459c54fb49a80e6ee6478149b940ec822"
 
+acorn@^5.0.3, acorn@^5.3.0, acorn@^5.4.0, acorn@^5.4.1:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.4.1.tgz#fdc58d9d17f4a4e98d102ded826a9b9759125102"
+
+acorn@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.0.tgz#1abb587fbf051f94e3de20e6b26ef910b1828298"
+
 add-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
@@ -405,6 +536,10 @@ address@1.0.3, address@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/address/-/address-1.0.3.tgz#b5f50631f8d6cec8bd20c963963afb55e06cbce9"
 
+addressparser@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/addressparser/-/addressparser-1.0.1.tgz#47afbe1a2a9262191db6838e4fd1d39b40821746"
+
 adm-zip@0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.4.tgz#a61ed5ae6905c3aea58b3a657d25033091052736"
@@ -436,16 +571,16 @@ agentkeepalive@^3.3.0:
   dependencies:
     humanize-ms "^1.2.1"
 
-airbnb-js-shims@^1.1.1, airbnb-js-shims@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/airbnb-js-shims/-/airbnb-js-shims-1.4.0.tgz#b920b0bc9fafe8b8ae2a073f29fb10303b1b2b18"
+airbnb-js-shims@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/airbnb-js-shims/-/airbnb-js-shims-1.4.1.tgz#cc3e8eb8d35877f9d0fdc6583e26b0ee75b98ad0"
   dependencies:
     array-includes "^3.0.3"
-    array.prototype.flatmap "^1.1.1"
-    array.prototype.flatten "^1.1.1"
-    es5-shim "^4.5.9"
+    array.prototype.flatmap "^1.2.0"
+    array.prototype.flatten "^1.2.0"
+    es5-shim "^4.5.10"
     es6-shim "^0.35.3"
-    function.prototype.name "^1.0.3"
+    function.prototype.name "^1.1.0"
     object.entries "^1.0.4"
     object.getownpropertydescriptors "^2.0.3"
     object.values "^1.0.4"
@@ -453,22 +588,22 @@ airbnb-js-shims@^1.1.1, airbnb-js-shims@^1.4.0:
     string.prototype.padend "^3.0.0"
     string.prototype.padstart "^3.0.0"
 
-ajv-keywords@^1.0.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
-
 ajv-keywords@^2.0.0, ajv-keywords@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
 
-ajv@^4.7.0, ajv@^4.9.1:
+ajv-keywords@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.1.0.tgz#ac2b27939c543e95d2c06e7f7f5c27be4aa543be"
+
+ajv@^4.9.1:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
   dependencies:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
-ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5, ajv@^5.2.0, ajv@^5.2.3, ajv@^5.3.0:
+ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5, ajv@^5.2.0, ajv@^5.2.3, ajv@^5.3.0, ajv@~5.5.1:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
   dependencies:
@@ -477,6 +612,14 @@ ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5, ajv@^5.2.0, ajv@^5.2.3, ajv@^5.3.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
+ajv@^6.1.0, ajv@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.1.1.tgz#978d597fbc2b7d0e5a5c3ddeb149a682f2abfa0e"
+  dependencies:
+    fast-deep-equal "^1.0.0"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.3.0"
+
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -493,6 +636,16 @@ amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
 
+amqplib@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/amqplib/-/amqplib-0.5.2.tgz#d2d7313c7ffaa4d10bcf1e6252de4591b6cc7b63"
+  dependencies:
+    bitsyntax "~0.0.4"
+    bluebird "^3.4.6"
+    buffer-more-ints "0.0.2"
+    readable-stream "1.x >=1.1.9"
+    safe-buffer "^5.0.1"
+
 angular2-template-loader@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/angular2-template-loader/-/angular2-template-loader-0.6.2.tgz#c0d44e90fff0fac95e8b23f043acda7fd1c51d7c"
@@ -529,6 +682,10 @@ ansi-html@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
 
+ansi-regex@^0.2.0, ansi-regex@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"
+
 ansi-regex@^2.0.0, ansi-regex@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@@ -537,6 +694,10 @@ ansi-regex@^3.0.0, ansi-regex@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
 
+ansi-styles@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de"
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -571,10 +732,6 @@ any-observable@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.2.0.tgz#c67870058003579009083f54ac0abafb5c33d242"
 
-any-promise@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
-
 anymatch@^1.3.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
@@ -595,7 +752,7 @@ apollo-fetch@^0.6.0:
   dependencies:
     isomorphic-fetch "^2.2.1"
 
-app-root-path@^2.0.0, app-root-path@^2.0.1:
+app-root-path@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.0.1.tgz#cd62dcf8e4fd5a417efc664d2e5b10653c651b46"
 
@@ -731,25 +888,25 @@ array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
 
-array.prototype.flatmap@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.1.1.tgz#dbb6c44693c2a2a2fcab24e551dfbf47f67fde03"
+array.prototype.flatmap@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.0.tgz#279f7ed4eeb1cedfe5515e92e63cfb40ca15b74b"
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.10.0"
     function-bind "^1.1.1"
 
-array.prototype.flatten@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatten/-/array.prototype.flatten-1.1.1.tgz#301b351aa8a632356ee2f5311c6c8e8f50d318cc"
+array.prototype.flatten@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatten/-/array.prototype.flatten-1.2.0.tgz#e46fb18954f8796381a73755e122570647984be3"
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.10.0"
     function-bind "^1.1.1"
 
-arraybuffer.slice@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz#f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"
+arraybuffer.slice@~0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
 
 arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
@@ -783,7 +940,7 @@ assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
 
-assert@^1.1.1:
+assert@^1.1.1, assert@^1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
   dependencies:
@@ -805,10 +962,20 @@ ast-types@0.9.6:
   version "0.9.6"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"
 
+ast-types@0.x.x:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.1.tgz#5bb3a8d5ba292c3f4ae94d46df37afc30300b990"
+
 astral-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
 
+astw@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/astw/-/astw-2.2.0.tgz#7bd41784d32493987aeb239b6b4e1c57a873b917"
+  dependencies:
+    acorn "^4.0.3"
+
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
@@ -821,15 +988,21 @@ async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
 
-async@2.6.0, async@^2.1.2, async@^2.1.4, async@^2.1.5, async@^2.4.0, async@^2.4.1, async@^2.5.0:
+async@^1.4.0, async@^1.5.0, async@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+
+async@^2.1.2, async@^2.1.4, async@^2.1.5, async@^2.4.0, async@^2.4.1:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
   dependencies:
     lodash "^4.14.0"
 
-async@^1.4.0, async@^1.5.0, async@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+async@~2.1.2:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.1.5.tgz#e587c68580994ac67fc56ff86d3ac56bdbe810bc"
+  dependencies:
+    lodash "^4.14.0"
 
 asynckit@^0.4.0:
   version "0.4.0"
@@ -850,7 +1023,7 @@ autoprefixer@7.1.6:
     postcss "^6.0.13"
     postcss-value-parser "^3.2.3"
 
-autoprefixer@^6.3.1, autoprefixer@^6.5.3:
+autoprefixer@^6.3.1:
   version "6.7.7"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
   dependencies:
@@ -861,15 +1034,26 @@ autoprefixer@^6.3.1, autoprefixer@^6.5.3:
     postcss "^5.2.16"
     postcss-value-parser "^3.2.3"
 
-autoprefixer@^7.2.4:
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.4.tgz#29b367c03876a29bfd3721260d945e3545666c8d"
+autoprefixer@^7.2.3:
+  version "7.2.5"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.5.tgz#04ccbd0c6a61131b6d13f53d371926092952d192"
   dependencies:
-    browserslist "^2.10.2"
-    caniuse-lite "^1.0.30000784"
+    browserslist "^2.11.1"
+    caniuse-lite "^1.0.30000791"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^6.0.15"
+    postcss "^6.0.16"
+    postcss-value-parser "^3.2.3"
+
+autoprefixer@^7.2.6:
+  version "7.2.6"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.6.tgz#256672f86f7c735da849c4f07d008abb056067dc"
+  dependencies:
+    browserslist "^2.11.3"
+    caniuse-lite "^1.0.30000805"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^6.0.17"
     postcss-value-parser "^3.2.3"
 
 aws-sign2@~0.6.0:
@@ -888,6 +1072,12 @@ axe-core@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-2.6.1.tgz#28772c4f76966d373acda35b9a409299dc00d1b5"
 
+axios@^0.15.3:
+  version "0.15.3"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.15.3.tgz#2c9d638b2e191a08ea1d6cc988eadd6ba5bdc053"
+  dependencies:
+    follow-redirects "1.0.0"
+
 axobject-query@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-0.1.0.tgz#62f59dbc59c9f9242759ca349960e7a2fe3c36c0"
@@ -915,7 +1105,7 @@ babel-cli@^6.26.0:
   optionalDependencies:
     chokidar "^1.6.1"
 
-babel-code-frame@6.26.0, babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
+babel-code-frame@6.26.0, babel-code-frame@^6.11.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
   dependencies:
@@ -956,18 +1146,18 @@ babel-eslint@7.2.3:
     babel-types "^6.23.0"
     babylon "^6.17.0"
 
-babel-eslint@^8.1.2:
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.1.2.tgz#a39230b0c20ecbaa19a35d5633bf9b9ca2c8116f"
+babel-eslint@^8.2.2:
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.2.tgz#1102273354c6f0b29b4ea28a65f97d122296b68b"
   dependencies:
-    "@babel/code-frame" "7.0.0-beta.31"
-    "@babel/traverse" "7.0.0-beta.31"
-    "@babel/types" "7.0.0-beta.31"
-    babylon "7.0.0-beta.31"
+    "@babel/code-frame" "^7.0.0-beta.40"
+    "@babel/traverse" "^7.0.0-beta.40"
+    "@babel/types" "^7.0.0-beta.40"
+    babylon "^7.0.0-beta.40"
     eslint-scope "~3.7.1"
     eslint-visitor-keys "^1.0.0"
 
-babel-generator@^6.18.0, babel-generator@^6.24.1, babel-generator@^6.26.0:
+babel-generator@^6.18.0, babel-generator@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.0.tgz#ac1ae20070b79f6e3ca1d3269613053774f20dc5"
   dependencies:
@@ -1022,9 +1212,9 @@ babel-helper-define-map@^6.24.1:
     babel-types "^6.26.0"
     lodash "^4.17.4"
 
-babel-helper-evaluate-path@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.2.0.tgz#0bb2eb01996c0cef53c5e8405e999fe4a0244c08"
+babel-helper-evaluate-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.3.0.tgz#2439545e0b6eae5b7f49b790acbebd6b9a73df20"
 
 babel-helper-explode-assignable-expression@^6.24.1:
   version "6.24.1"
@@ -1043,9 +1233,9 @@ babel-helper-explode-class@^6.24.1:
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
-babel-helper-flip-expressions@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-flip-expressions/-/babel-helper-flip-expressions-0.2.0.tgz#160d2090a3d9f9c64a750905321a0bc218f884ec"
+babel-helper-flip-expressions@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-flip-expressions/-/babel-helper-flip-expressions-0.3.0.tgz#f5b6394bd5219b43cf8f7b201535ed540c6e7fa2"
 
 babel-helper-function-name@^6.24.1:
   version "6.24.1"
@@ -1075,13 +1265,13 @@ babel-helper-is-nodes-equiv@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/babel-helper-is-nodes-equiv/-/babel-helper-is-nodes-equiv-0.0.1.tgz#34e9b300b1479ddd98ec77ea0bbe9342dfe39684"
 
-babel-helper-is-void-0@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-is-void-0/-/babel-helper-is-void-0-0.2.0.tgz#6ed0ada8a9b1c5b6e88af6b47c1b3b5c080860eb"
+babel-helper-is-void-0@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-is-void-0/-/babel-helper-is-void-0-0.3.0.tgz#95570d20bd27b2206f68083ae9980ee7003d8fe7"
 
-babel-helper-mark-eval-scopes@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.2.0.tgz#7648aaf2ec92aae9b09a20ad91e8df5e1fcc94b2"
+babel-helper-mark-eval-scopes@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.3.0.tgz#b4731314fdd7a89091271a5213b4e12d236e29e8"
 
 babel-helper-optimise-call-expression@^6.24.1:
   version "6.24.1"
@@ -1108,9 +1298,9 @@ babel-helper-remap-async-to-generator@^6.16.0, babel-helper-remap-async-to-gener
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
-babel-helper-remove-or-void@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.2.0.tgz#8e46ad5b30560d57d7510b3fd93f332ee7c67386"
+babel-helper-remove-or-void@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.3.0.tgz#f43c86147c8fcc395a9528cbb31e7ff49d7e16e3"
 
 babel-helper-replace-supers@^6.24.1:
   version "6.24.1"
@@ -1123,9 +1313,9 @@ babel-helper-replace-supers@^6.24.1:
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
-babel-helper-to-multiple-sequence-expressions@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.2.0.tgz#d1a419634c6cb301f27858c659167cfee0a9d318"
+babel-helper-to-multiple-sequence-expressions@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.3.0.tgz#8da2275ccc26995566118f7213abfd9af7214427"
 
 babel-helper-vue-jsx-merge-props@^2.0.2:
   version "2.0.3"
@@ -1146,21 +1336,14 @@ babel-jest@20.0.3, babel-jest@^20.0.3:
     babel-plugin-istanbul "^4.0.0"
     babel-preset-jest "^20.0.3"
 
-babel-jest@^21.2.0:
-  version "21.2.0"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-21.2.0.tgz#2ce059519a9374a2c46f2455b6fbef5ad75d863e"
-  dependencies:
-    babel-plugin-istanbul "^4.0.0"
-    babel-preset-jest "^21.2.0"
-
-babel-jest@^22.0.4:
-  version "22.0.4"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-22.0.4.tgz#533c46de37d7c9d7612f408c76314be9277e0c26"
+babel-jest@^22.4.1:
+  version "22.4.1"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-22.4.1.tgz#ff53ebca45957347f27ff4666a31499fbb4c4ddd"
   dependencies:
     babel-plugin-istanbul "^4.1.5"
-    babel-preset-jest "^22.0.3"
+    babel-preset-jest "^22.4.1"
 
-babel-loader@7.1.2, babel-loader@^7.0.0, babel-loader@^7.1.2:
+babel-loader@7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.2.tgz#f6cbe122710f1aa2af4d881c6d5b54358ca24126"
   dependencies:
@@ -1168,6 +1351,20 @@ babel-loader@7.1.2, babel-loader@^7.0.0, babel-loader@^7.1.2:
     loader-utils "^1.0.2"
     mkdirp "^0.5.1"
 
+babel-loader@^7.1.3:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.3.tgz#ff5b440da716e9153abb946251a9ab7670037b16"
+  dependencies:
+    find-cache-dir "^1.0.0"
+    loader-utils "^1.0.2"
+    mkdirp "^0.5.1"
+
+babel-macros@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/babel-macros/-/babel-macros-1.2.0.tgz#39e47ed6d286d4a98f1948d8bab45dac17e4e2d4"
+  dependencies:
+    cosmiconfig "3.1.0"
+
 babel-messages@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
@@ -1194,7 +1391,7 @@ babel-plugin-external-helpers@^6.18.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-istanbul@^4.0.0, babel-plugin-istanbul@^4.1.5:
+babel-plugin-istanbul@^4.0.0, babel-plugin-istanbul@^4.1.4, babel-plugin-istanbul@^4.1.5:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.5.tgz#6760cdd977f411d3e175bb064f2bc327d99b2b6e"
   dependencies:
@@ -1206,13 +1403,9 @@ babel-plugin-jest-hoist@^20.0.3:
   version "20.0.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-20.0.3.tgz#afedc853bd3f8dc3548ea671fbe69d03cc2c1767"
 
-babel-plugin-jest-hoist@^21.2.0:
-  version "21.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-21.2.0.tgz#2cef637259bd4b628a6cace039de5fcd14dbb006"
-
-babel-plugin-jest-hoist@^22.0.3:
-  version "22.0.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-22.0.3.tgz#62cde5fe962fd41ae89c119f481ca5cd7dd48bb4"
+babel-plugin-jest-hoist@^22.4.1:
+  version "22.4.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-22.4.1.tgz#d712fe5da8b6965f3191dacddbefdbdf4fb66d63"
 
 babel-plugin-jsx-event-modifiers@^2.0.2:
   version "2.0.5"
@@ -1226,82 +1419,84 @@ babel-plugin-jsx-v-model@^2.0.1:
     html-tags "^2.0.0"
     svg-tags "^1.0.0"
 
-babel-plugin-jsx-vue-functional@^2.1.0:
+babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jsx-vue-functional/-/babel-plugin-jsx-vue-functional-2.1.0.tgz#5630a0c86fe1904d28c30465e6bf1cf71235a239"
-
-babel-plugin-minify-builtins@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.2.0.tgz#317f824b0907210b6348671bb040ca072e2e0c82"
+  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.1.0.tgz#e978fd4c5ee9cca73a809c176524c2e9f4dcccbf"
   dependencies:
-    babel-helper-evaluate-path "^0.2.0"
+    cosmiconfig "^4.0.0"
 
-babel-plugin-minify-constant-folding@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-constant-folding/-/babel-plugin-minify-constant-folding-0.2.0.tgz#8c70b528b2eb7c13e94d95c8789077d4cdbc3970"
+babel-plugin-minify-builtins@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.3.0.tgz#4740117a6a784063aaf8f092989cf9e4bd484860"
   dependencies:
-    babel-helper-evaluate-path "^0.2.0"
+    babel-helper-evaluate-path "^0.3.0"
 
-babel-plugin-minify-dead-code-elimination@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.2.0.tgz#e8025ee10a1e5e4f202633a6928ce892c33747e3"
+babel-plugin-minify-constant-folding@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-constant-folding/-/babel-plugin-minify-constant-folding-0.3.0.tgz#687e40336bd4ddd921e0e197f0006235ac184bb9"
   dependencies:
-    babel-helper-evaluate-path "^0.2.0"
-    babel-helper-mark-eval-scopes "^0.2.0"
-    babel-helper-remove-or-void "^0.2.0"
+    babel-helper-evaluate-path "^0.3.0"
+
+babel-plugin-minify-dead-code-elimination@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.3.0.tgz#a323f686c404b824186ba5583cf7996cac81719e"
+  dependencies:
+    babel-helper-evaluate-path "^0.3.0"
+    babel-helper-mark-eval-scopes "^0.3.0"
+    babel-helper-remove-or-void "^0.3.0"
     lodash.some "^4.6.0"
 
-babel-plugin-minify-flip-comparisons@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-flip-comparisons/-/babel-plugin-minify-flip-comparisons-0.2.0.tgz#0c9c8e93155c8f09dedad8118b634c259f709ef5"
+babel-plugin-minify-flip-comparisons@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-flip-comparisons/-/babel-plugin-minify-flip-comparisons-0.3.0.tgz#6627893a409c9f30ef7f2c89e0c6eea7ee97ddc4"
   dependencies:
-    babel-helper-is-void-0 "^0.2.0"
+    babel-helper-is-void-0 "^0.3.0"
 
-babel-plugin-minify-guarded-expressions@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.2.0.tgz#8a8c950040fce3e258a12e6eb21eab94ad7235ab"
+babel-plugin-minify-guarded-expressions@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.3.0.tgz#2552d96189ef45d9a463f1a6b5e4fa110703ac8d"
   dependencies:
-    babel-helper-flip-expressions "^0.2.0"
+    babel-helper-flip-expressions "^0.3.0"
 
-babel-plugin-minify-infinity@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-infinity/-/babel-plugin-minify-infinity-0.2.0.tgz#30960c615ddbc657c045bb00a1d8eb4af257cf03"
+babel-plugin-minify-infinity@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-infinity/-/babel-plugin-minify-infinity-0.3.0.tgz#c5ec0edd433517cf31b3af17077c202beb48bbe7"
 
-babel-plugin-minify-mangle-names@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-mangle-names/-/babel-plugin-minify-mangle-names-0.2.0.tgz#719892297ff0106a6ec1a4b0fc062f1f8b6a8529"
+babel-plugin-minify-mangle-names@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-mangle-names/-/babel-plugin-minify-mangle-names-0.3.0.tgz#f28561bad0dd2f0380816816bb946e219b3b6135"
   dependencies:
-    babel-helper-mark-eval-scopes "^0.2.0"
+    babel-helper-mark-eval-scopes "^0.3.0"
 
-babel-plugin-minify-numeric-literals@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-numeric-literals/-/babel-plugin-minify-numeric-literals-0.2.0.tgz#5746e851700167a380c05e93f289a7070459a0d1"
+babel-plugin-minify-numeric-literals@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-numeric-literals/-/babel-plugin-minify-numeric-literals-0.3.0.tgz#b57734a612e8a592005407323c321119f27d4b40"
 
-babel-plugin-minify-replace@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-replace/-/babel-plugin-minify-replace-0.2.0.tgz#3c1f06bc4e6d3e301eacb763edc1be611efc39b0"
+babel-plugin-minify-replace@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-replace/-/babel-plugin-minify-replace-0.3.0.tgz#980125bbf7cbb5a637439de9d0b1b030a4693893"
 
-babel-plugin-minify-simplify@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.2.0.tgz#21ceec4857100c5476d7cef121f351156e5c9bc0"
+babel-plugin-minify-simplify@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.3.0.tgz#14574cc74d21c81d3060fafa041010028189f11b"
   dependencies:
-    babel-helper-flip-expressions "^0.2.0"
+    babel-helper-flip-expressions "^0.3.0"
     babel-helper-is-nodes-equiv "^0.0.1"
-    babel-helper-to-multiple-sequence-expressions "^0.2.0"
+    babel-helper-to-multiple-sequence-expressions "^0.3.0"
 
-babel-plugin-minify-type-constructors@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-type-constructors/-/babel-plugin-minify-type-constructors-0.2.0.tgz#7f3b6458be0863cfd59e9985bed6d134aa7a2e17"
+babel-plugin-minify-type-constructors@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-type-constructors/-/babel-plugin-minify-type-constructors-0.3.0.tgz#7f5a86ef322c4746364e3c591b8514eeafea6ad4"
   dependencies:
-    babel-helper-is-void-0 "^0.2.0"
+    babel-helper-is-void-0 "^0.3.0"
 
-babel-plugin-react-docgen@^1.6.0, babel-plugin-react-docgen@^1.8.0:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-react-docgen/-/babel-plugin-react-docgen-1.8.1.tgz#6e08e057f5dcd46b434e7553e971baa604dae377"
+babel-plugin-react-docgen@^1.8.3:
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-react-docgen/-/babel-plugin-react-docgen-1.8.3.tgz#bdb0fe41f72eaa9444fe7872866d2f372afd72bb"
   dependencies:
     babel-types "^6.24.1"
-    lodash "4.x.x"
-    react-docgen "^2.15.0"
+    lodash "^4.17.0"
+    react-docgen "^2.20.0"
 
 babel-plugin-react-transform@^3.0.0:
   version "3.0.0"
@@ -1325,7 +1520,7 @@ babel-plugin-syntax-class-properties@^6.5.0, babel-plugin-syntax-class-propertie
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"
 
-babel-plugin-syntax-decorators@^6.1.18, babel-plugin-syntax-decorators@^6.13.0:
+babel-plugin-syntax-decorators@^6.13.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz#312563b4dbde3cc806cee3e416cceeaddd11ac0b"
 
@@ -1406,14 +1601,6 @@ babel-plugin-transform-class-properties@6.24.1, babel-plugin-transform-class-pro
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-plugin-transform-decorators-legacy@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators-legacy/-/babel-plugin-transform-decorators-legacy-1.3.4.tgz#741b58f6c5bce9e6027e0882d9c994f04f366925"
-  dependencies:
-    babel-plugin-syntax-decorators "^6.1.18"
-    babel-runtime "^6.2.0"
-    babel-template "^6.3.0"
-
 babel-plugin-transform-decorators@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz#788013d8f8c6b5222bdf7b344390dfd77569e24d"
@@ -1474,7 +1661,7 @@ babel-plugin-transform-es2015-computed-properties@^6.22.0, babel-plugin-transfor
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-plugin-transform-es2015-destructuring@6.x, babel-plugin-transform-es2015-destructuring@^6.22.0, babel-plugin-transform-es2015-destructuring@^6.23.0, babel-plugin-transform-es2015-destructuring@^6.5.0, babel-plugin-transform-es2015-destructuring@^6.8.0:
+babel-plugin-transform-es2015-destructuring@6.23.0, babel-plugin-transform-es2015-destructuring@6.x, babel-plugin-transform-es2015-destructuring@^6.22.0, babel-plugin-transform-es2015-destructuring@^6.23.0, babel-plugin-transform-es2015-destructuring@^6.5.0, babel-plugin-transform-es2015-destructuring@^6.8.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
   dependencies:
@@ -1640,25 +1827,21 @@ babel-plugin-transform-function-bind@^6.22.0:
     babel-plugin-syntax-function-bind "^6.8.0"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-inline-consecutive-adds@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.2.0.tgz#15dae78921057f4004f8eafd79e15ddc5f12f426"
+babel-plugin-transform-inline-consecutive-adds@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.3.0.tgz#f07d93689c0002ed2b2b62969bdd99f734e03f57"
 
-babel-plugin-transform-md-import-to-string@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-md-import-to-string/-/babel-plugin-transform-md-import-to-string-1.0.6.tgz#f57bf84bb14988cd2a9b8d8262114fa021587e70"
+babel-plugin-transform-member-expression-literals@^6.9.0:
+  version "6.9.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.9.0.tgz#ab07ad52a11ff7d2528c71388e8f901a4499c2b2"
 
-babel-plugin-transform-member-expression-literals@^6.8.5:
-  version "6.8.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.8.5.tgz#e06ae305cf48d819822e93a70d79269f04d89eec"
+babel-plugin-transform-merge-sibling-variables@^6.9.0:
+  version "6.9.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.9.0.tgz#140017e305f8eb4f60d2f2db61154fbd71a9fcdd"
 
-babel-plugin-transform-merge-sibling-variables@^6.8.6:
-  version "6.8.6"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.8.6.tgz#6d21efa5ee4981f71657fae716f9594bb2622aef"
-
-babel-plugin-transform-minify-booleans@^6.8.3:
-  version "6.8.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.8.3.tgz#5906ed776d3718250519abf1bace44b0b613ddf9"
+babel-plugin-transform-minify-booleans@^6.9.0:
+  version "6.9.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.9.0.tgz#e36ceaa49aadcae70ec98bd9dbccb660719a667a"
 
 babel-plugin-transform-object-assign@^6.5.0:
   version "6.22.0"
@@ -1673,13 +1856,13 @@ babel-plugin-transform-object-rest-spread@6.26.0, babel-plugin-transform-object-
     babel-plugin-syntax-object-rest-spread "^6.8.0"
     babel-runtime "^6.26.0"
 
-babel-plugin-transform-property-literals@^6.8.5:
-  version "6.8.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.8.5.tgz#67ed5930b34805443452c8b9690c7ebe1e206c40"
+babel-plugin-transform-property-literals@^6.9.0:
+  version "6.9.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.9.0.tgz#4ddc12ada888927eacab4daff8a535ebc5de5a61"
   dependencies:
     esutils "^2.0.2"
 
-babel-plugin-transform-react-constant-elements@6.23.0, babel-plugin-transform-react-constant-elements@^6.23.0:
+babel-plugin-transform-react-constant-elements@6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-constant-elements/-/babel-plugin-transform-react-constant-elements-6.23.0.tgz#2f119bf4d2cdd45eb9baaae574053c604f6147dd"
   dependencies:
@@ -1719,23 +1902,23 @@ babel-plugin-transform-regenerator@6.26.0, babel-plugin-transform-regenerator@^6
   dependencies:
     regenerator-transform "^0.10.0"
 
-babel-plugin-transform-regexp-constructors@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regexp-constructors/-/babel-plugin-transform-regexp-constructors-0.2.0.tgz#6aa5dd0acc515db4be929bbcec4ed4c946c534a3"
+babel-plugin-transform-regexp-constructors@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regexp-constructors/-/babel-plugin-transform-regexp-constructors-0.3.0.tgz#9bb2c8dd082271a5cb1b3a441a7c52e8fd07e0f5"
 
-babel-plugin-transform-remove-console@^6.8.5:
-  version "6.8.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.8.5.tgz#fde9d2d3d725530b0fadd8d31078402410386810"
+babel-plugin-transform-remove-console@^6.9.0:
+  version "6.9.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.0.tgz#a7b671aab050dd30ef7cf2142b61a7d10efb327f"
 
-babel-plugin-transform-remove-debugger@^6.8.5:
-  version "6.8.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.8.5.tgz#809584d412bf918f071fdf41e1fdb15ea89cdcd5"
+babel-plugin-transform-remove-debugger@^6.9.0:
+  version "6.9.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.9.0.tgz#b465e74b3fbe1970da561fb1331e30aefac3f1fe"
 
-babel-plugin-transform-remove-undefined@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-undefined/-/babel-plugin-transform-remove-undefined-0.2.0.tgz#94f052062054c707e8d094acefe79416b63452b1"
+babel-plugin-transform-remove-undefined@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-undefined/-/babel-plugin-transform-remove-undefined-0.3.0.tgz#03f5f0071867781e9beabbc7b77bf8095fd3f3ec"
   dependencies:
-    babel-helper-evaluate-path "^0.2.0"
+    babel-helper-evaluate-path "^0.3.0"
 
 babel-plugin-transform-runtime@6.23.0, babel-plugin-transform-runtime@^6.23.0:
   version "6.23.0"
@@ -1743,9 +1926,9 @@ babel-plugin-transform-runtime@6.23.0, babel-plugin-transform-runtime@^6.23.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-simplify-comparison-operators@^6.8.5:
-  version "6.8.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.8.5.tgz#a838786baf40cc33a93b95ae09e05591227e43bf"
+babel-plugin-transform-simplify-comparison-operators@^6.9.0:
+  version "6.9.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.9.0.tgz#586252fea023cb13f2400a09c0ab178dc0844f0a"
 
 babel-plugin-transform-strict-mode@^6.24.1:
   version "6.24.1"
@@ -1754,9 +1937,9 @@ babel-plugin-transform-strict-mode@^6.24.1:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
-babel-plugin-transform-undefined-to-void@^6.8.3:
-  version "6.8.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.8.3.tgz#fc52707f6ee1ddc71bb91b0d314fbefdeef9beb4"
+babel-plugin-transform-undefined-to-void@^6.9.0:
+  version "6.9.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.9.0.tgz#eb5db0554caffe9ded0206468ec0c6c3b332b9d2"
 
 babel-plugin-transform-vue-jsx@^3.5.0:
   version "3.5.0"
@@ -1764,14 +1947,7 @@ babel-plugin-transform-vue-jsx@^3.5.0:
   dependencies:
     esutils "^2.0.2"
 
-babel-polyfill@7.0.0-alpha.19:
-  version "7.0.0-alpha.19"
-  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-7.0.0-alpha.19.tgz#546aabf80c92f4e9314176a64458a6258e5970de"
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.10.0"
-
-babel-polyfill@^6.26.0:
+babel-polyfill@^6.23.0, babel-polyfill@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
   dependencies:
@@ -1902,55 +2078,49 @@ babel-preset-jest@^20.0.3:
   dependencies:
     babel-plugin-jest-hoist "^20.0.3"
 
-babel-preset-jest@^21.2.0:
-  version "21.2.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-21.2.0.tgz#ff9d2bce08abd98e8a36d9a8a5189b9173b85638"
+babel-preset-jest@^22.4.0, babel-preset-jest@^22.4.1:
+  version "22.4.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-22.4.1.tgz#efa2e5f5334242a9457a068452d7d09735db172a"
   dependencies:
-    babel-plugin-jest-hoist "^21.2.0"
+    babel-plugin-jest-hoist "^22.4.1"
     babel-plugin-syntax-object-rest-spread "^6.13.0"
 
-babel-preset-jest@^22.0.3:
-  version "22.0.3"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-22.0.3.tgz#e2bb6f6b4a509d3ea0931f013db78c5a84856693"
+babel-preset-minify@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-minify/-/babel-preset-minify-0.3.0.tgz#7db64afa75f16f6e06c0aa5f25195f6f36784d77"
   dependencies:
-    babel-plugin-jest-hoist "^22.0.3"
-    babel-plugin-syntax-object-rest-spread "^6.13.0"
-
-babel-preset-minify@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-minify/-/babel-preset-minify-0.2.0.tgz#006566552d9b83834472273f306c0131062a0acc"
-  dependencies:
-    babel-plugin-minify-builtins "^0.2.0"
-    babel-plugin-minify-constant-folding "^0.2.0"
-    babel-plugin-minify-dead-code-elimination "^0.2.0"
-    babel-plugin-minify-flip-comparisons "^0.2.0"
-    babel-plugin-minify-guarded-expressions "^0.2.0"
-    babel-plugin-minify-infinity "^0.2.0"
-    babel-plugin-minify-mangle-names "^0.2.0"
-    babel-plugin-minify-numeric-literals "^0.2.0"
-    babel-plugin-minify-replace "^0.2.0"
-    babel-plugin-minify-simplify "^0.2.0"
-    babel-plugin-minify-type-constructors "^0.2.0"
-    babel-plugin-transform-inline-consecutive-adds "^0.2.0"
-    babel-plugin-transform-member-expression-literals "^6.8.5"
-    babel-plugin-transform-merge-sibling-variables "^6.8.6"
-    babel-plugin-transform-minify-booleans "^6.8.3"
-    babel-plugin-transform-property-literals "^6.8.5"
-    babel-plugin-transform-regexp-constructors "^0.2.0"
-    babel-plugin-transform-remove-console "^6.8.5"
-    babel-plugin-transform-remove-debugger "^6.8.5"
-    babel-plugin-transform-remove-undefined "^0.2.0"
-    babel-plugin-transform-simplify-comparison-operators "^6.8.5"
-    babel-plugin-transform-undefined-to-void "^6.8.3"
+    babel-plugin-minify-builtins "^0.3.0"
+    babel-plugin-minify-constant-folding "^0.3.0"
+    babel-plugin-minify-dead-code-elimination "^0.3.0"
+    babel-plugin-minify-flip-comparisons "^0.3.0"
+    babel-plugin-minify-guarded-expressions "^0.3.0"
+    babel-plugin-minify-infinity "^0.3.0"
+    babel-plugin-minify-mangle-names "^0.3.0"
+    babel-plugin-minify-numeric-literals "^0.3.0"
+    babel-plugin-minify-replace "^0.3.0"
+    babel-plugin-minify-simplify "^0.3.0"
+    babel-plugin-minify-type-constructors "^0.3.0"
+    babel-plugin-transform-inline-consecutive-adds "^0.3.0"
+    babel-plugin-transform-member-expression-literals "^6.9.0"
+    babel-plugin-transform-merge-sibling-variables "^6.9.0"
+    babel-plugin-transform-minify-booleans "^6.9.0"
+    babel-plugin-transform-property-literals "^6.9.0"
+    babel-plugin-transform-regexp-constructors "^0.3.0"
+    babel-plugin-transform-remove-console "^6.9.0"
+    babel-plugin-transform-remove-debugger "^6.9.0"
+    babel-plugin-transform-remove-undefined "^0.3.0"
+    babel-plugin-transform-simplify-comparison-operators "^6.9.0"
+    babel-plugin-transform-undefined-to-void "^6.9.0"
     lodash.isplainobject "^4.0.6"
 
-babel-preset-react-app@^3.0.0, babel-preset-react-app@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-3.1.0.tgz#d77f6061ab9d7bf4b3cdc86b7cde9ded0df03e48"
+babel-preset-react-app@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-3.1.1.tgz#d3f06a79742f0e89d7afcb72e282d9809c850920"
   dependencies:
     babel-plugin-dynamic-import-node "1.1.0"
     babel-plugin-syntax-dynamic-import "6.18.0"
     babel-plugin-transform-class-properties "6.24.1"
+    babel-plugin-transform-es2015-destructuring "6.23.0"
     babel-plugin-transform-object-rest-spread "6.26.0"
     babel-plugin-transform-react-constant-elements "6.23.0"
     babel-plugin-transform-react-jsx "6.24.1"
@@ -2043,14 +2213,13 @@ babel-preset-stage-3@^6.24.1:
     babel-plugin-transform-exponentiation-operator "^6.24.1"
     babel-plugin-transform-object-rest-spread "^6.22.0"
 
-babel-preset-vue@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-vue/-/babel-preset-vue-1.2.1.tgz#b0de8977e0ce981fc6824cf0a537917a02a6fe87"
+babel-preset-vue@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-vue/-/babel-preset-vue-2.0.1.tgz#031f845944819f64f5ac4b20467b6cbe4b97ac68"
   dependencies:
     babel-helper-vue-jsx-merge-props "^2.0.2"
     babel-plugin-jsx-event-modifiers "^2.0.2"
     babel-plugin-jsx-v-model "^2.0.1"
-    babel-plugin-jsx-vue-functional "^2.1.0"
     babel-plugin-syntax-jsx "^6.18.0"
     babel-plugin-transform-vue-jsx "^3.5.0"
 
@@ -2066,7 +2235,7 @@ babel-register@^6.24.1, babel-register@^6.26.0, babel-register@^6.9.0:
     mkdirp "^0.5.1"
     source-map-support "^0.4.15"
 
-babel-runtime@6.26.0, babel-runtime@6.x.x, babel-runtime@^6.0.0, babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.26.0, babel-runtime@^6.5.0, babel-runtime@^6.9.2:
+babel-runtime@6.26.0, babel-runtime@6.x.x, babel-runtime@^6.0.0, babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.26.0, babel-runtime@^6.5.0, babel-runtime@^6.9.2:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
   dependencies:
@@ -2077,7 +2246,7 @@ babel-standalone@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-standalone/-/babel-standalone-6.26.0.tgz#15fb3d35f2c456695815ebf1ed96fe7f015b6886"
 
-babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0, babel-template@^6.3.0:
+babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
   dependencies:
@@ -2110,9 +2279,9 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24
     lodash "^4.17.4"
     to-fast-properties "^1.0.3"
 
-babylon@7.0.0-beta.31:
-  version "7.0.0-beta.31"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.31.tgz#7ec10f81e0e456fd0f855ad60fa30c2ac454283f"
+babylon@7.0.0-beta.40, babylon@^7.0.0-beta.40:
+  version "7.0.0-beta.40"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.40.tgz#91fc8cd56d5eb98b28e6fde41045f2957779940a"
 
 babylon@^6.17.0, babylon@^6.17.3, babylon@^6.18.0:
   version "6.18.0"
@@ -2162,10 +2331,6 @@ base64id@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
 
-base64url@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/base64url/-/base64url-2.0.0.tgz#eac16e03ea1438eff9423d69baa36262ed1f70bb"
-
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
@@ -2204,6 +2369,10 @@ beeper@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
 
+before-after-hook@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-1.1.0.tgz#83165e15a59460d13702cb8febd6a1807896db5a"
+
 better-assert@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
@@ -2222,9 +2391,11 @@ binary-extensions@^1.0.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
 
-bindings@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.3.0.tgz#b346f6ecf6a95f5a815c5839fc7cdb22502f1ed7"
+bitsyntax@~0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/bitsyntax/-/bitsyntax-0.0.4.tgz#eb10cc6f82b8c490e3e85698f07e83d46e0cba82"
+  dependencies:
+    buffer-more-ints "0.0.2"
 
 bl@^1.0.0:
   version "1.2.1"
@@ -2232,6 +2403,12 @@ bl@^1.0.0:
   dependencies:
     readable-stream "^2.0.5"
 
+bl@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-1.1.2.tgz#fdca871a99713aa00d19e3bbba41c44787a65398"
+  dependencies:
+    readable-stream "~2.0.5"
+
 blob@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921"
@@ -2248,7 +2425,7 @@ blocking-proxy@^1.0.0:
   dependencies:
     minimist "^1.2.0"
 
-bluebird@^3.1.1, bluebird@^3.3.0, bluebird@^3.4.7, bluebird@^3.5.0, bluebird@~3.5.0:
+bluebird@^3.1.1, bluebird@^3.3.0, bluebird@^3.4.6, bluebird@^3.4.7, bluebird@^3.5.0, bluebird@~3.5.0:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
 
@@ -2398,6 +2575,23 @@ braces@^2.3.0:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
+braces@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.1.tgz#7086c913b4e5a08dbe37ac0ee6a2500c4ba691bb"
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
+    kind-of "^6.0.2"
+    repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
+
 brcast@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/brcast/-/brcast-3.0.1.tgz#6256a8349b20de9eed44257a9b24d71493cd48dd"
@@ -2406,11 +2600,22 @@ brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
 
+browser-pack@^6.0.1:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/browser-pack/-/browser-pack-6.0.4.tgz#9a73beb3b48f9e36868be007b64400102c04a99f"
+  dependencies:
+    JSONStream "^1.0.3"
+    combine-source-map "~0.8.0"
+    defined "^1.0.0"
+    safe-buffer "^5.1.1"
+    through2 "^2.0.0"
+    umd "^3.0.0"
+
 browser-process-hrtime@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.2.tgz#425d68a58d3447f02a04aa894187fce8af8b7b8e"
 
-browser-resolve@^1.11.2:
+browser-resolve@^1.11.0, browser-resolve@^1.11.2, browser-resolve@^1.7.0:
   version "1.11.2"
   resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce"
   dependencies:
@@ -2462,12 +2667,64 @@ browserify-sign@^4.0.0:
     inherits "^2.0.1"
     parse-asn1 "^5.0.0"
 
-browserify-zlib@^0.2.0:
+browserify-zlib@^0.2.0, browserify-zlib@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
   dependencies:
     pako "~1.0.5"
 
+browserify@^14.5.0:
+  version "14.5.0"
+  resolved "https://registry.yarnpkg.com/browserify/-/browserify-14.5.0.tgz#0bbbce521acd6e4d1d54d8e9365008efb85a9cc5"
+  dependencies:
+    JSONStream "^1.0.3"
+    assert "^1.4.0"
+    browser-pack "^6.0.1"
+    browser-resolve "^1.11.0"
+    browserify-zlib "~0.2.0"
+    buffer "^5.0.2"
+    cached-path-relative "^1.0.0"
+    concat-stream "~1.5.1"
+    console-browserify "^1.1.0"
+    constants-browserify "~1.0.0"
+    crypto-browserify "^3.0.0"
+    defined "^1.0.0"
+    deps-sort "^2.0.0"
+    domain-browser "~1.1.0"
+    duplexer2 "~0.1.2"
+    events "~1.1.0"
+    glob "^7.1.0"
+    has "^1.0.0"
+    htmlescape "^1.1.0"
+    https-browserify "^1.0.0"
+    inherits "~2.0.1"
+    insert-module-globals "^7.0.0"
+    labeled-stream-splicer "^2.0.0"
+    module-deps "^4.0.8"
+    os-browserify "~0.3.0"
+    parents "^1.0.1"
+    path-browserify "~0.0.0"
+    process "~0.11.0"
+    punycode "^1.3.2"
+    querystring-es3 "~0.2.0"
+    read-only-stream "^2.0.0"
+    readable-stream "^2.0.2"
+    resolve "^1.1.4"
+    shasum "^1.0.0"
+    shell-quote "^1.6.1"
+    stream-browserify "^2.0.0"
+    stream-http "^2.0.0"
+    string_decoder "~1.0.0"
+    subarg "^1.0.0"
+    syntax-error "^1.1.1"
+    through2 "^2.0.0"
+    timers-browserify "^1.0.1"
+    tty-browserify "~0.0.0"
+    url "~0.11.0"
+    util "~0.10.1"
+    vm-browserify "~0.0.1"
+    xtend "^4.0.0"
+
 browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
   version "1.7.7"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
@@ -2475,11 +2732,18 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
     caniuse-db "^1.0.30000639"
     electron-to-chromium "^1.2.7"
 
-browserslist@^2.1.2, browserslist@^2.10.2, browserslist@^2.5.1:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.0.tgz#50350d6873a82ebe0f3ae5483658c571ae5f9d7d"
+browserslist@^2.1.2, browserslist@^2.11.1, browserslist@^2.5.1:
+  version "2.11.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.1.tgz#02fda29d9a2164b879100126e7b0d0b57e43a7bb"
   dependencies:
-    caniuse-lite "^1.0.30000784"
+    caniuse-lite "^1.0.30000789"
+    electron-to-chromium "^1.3.30"
+
+browserslist@^2.11.3:
+  version "2.11.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2"
+  dependencies:
+    caniuse-lite "^1.0.30000792"
     electron-to-chromium "^1.3.30"
 
 bser@1.0.2:
@@ -2498,6 +2762,10 @@ buffer-indexof@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
 
+buffer-more-ints@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/buffer-more-ints/-/buffer-more-ints-0.0.2.tgz#26b3885d10fa13db7fc01aae3aab870199e0124c"
+
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
@@ -2510,6 +2778,25 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
+buffer@^5.0.2:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.1.0.tgz#c913e43678c7cb7c8bd16afbcddb6c5505e8f9fe"
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+
+buildmail@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/buildmail/-/buildmail-4.0.1.tgz#877f7738b78729871c9a105e3b837d2be11a7a72"
+  dependencies:
+    addressparser "1.0.1"
+    libbase64 "0.1.0"
+    libmime "3.0.0"
+    libqp "1.1.0"
+    nodemailer-fetch "1.6.0"
+    nodemailer-shared "1.1.0"
+    punycode "1.4.1"
+
 builtin-modules@^1.0.0, builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
@@ -2539,8 +2826,8 @@ bytes@3.0.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
 
 cacache@^10.0.0, cacache@^10.0.1:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.1.tgz#3e05f6e616117d9b54665b1b20c8aeb93ea5d36f"
+  version "10.0.2"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.2.tgz#105a93a162bbedf3a25da42e1939ed99ffb145f8"
   dependencies:
     bluebird "^3.5.0"
     chownr "^1.0.1"
@@ -2606,6 +2893,19 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
+cache-loader@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/cache-loader/-/cache-loader-1.2.0.tgz#cdc313ae53b3c13ce8ee0c9296cf16c736b15252"
+  dependencies:
+    async "^2.4.1"
+    loader-utils "^1.1.0"
+    mkdirp "^0.5.1"
+    schema-utils "^0.4.2"
+
+cached-path-relative@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.1.tgz#d09c4b52800aa4c078e2dd81a869aac90d2e54e7"
+
 call-limit@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/call-limit/-/call-limit-1.1.0.tgz#6fd61b03f3da42a2cd0ec2b60f02bd0e71991fea"
@@ -2668,12 +2968,16 @@ caniuse-api@^1.5.2:
     lodash.uniq "^4.5.0"
 
 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000787"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000787.tgz#ca07a281be536a88bd7fac96ba895f3cf53f811b"
+  version "1.0.30000791"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000791.tgz#06787f56caef4300a17e35d137447123bdf536f9"
 
-caniuse-lite@^1.0.30000748, caniuse-lite@^1.0.30000784:
-  version "1.0.30000787"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000787.tgz#a76c4fa1d6ac00640447ec83c1e7c6b33dd615c5"
+caniuse-lite@^1.0.30000748, caniuse-lite@^1.0.30000789, caniuse-lite@^1.0.30000791:
+  version "1.0.30000791"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000791.tgz#8e35745efd483a3e23bb7d350990326d2319fc16"
+
+caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805:
+  version "1.0.30000809"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000809.tgz#1e12c1344b8f74d56737ee2614bcedb648943479"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -2706,6 +3010,16 @@ chain-function@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/chain-function/-/chain-function-1.0.0.tgz#0d4ab37e7e18ead0bdc47b920764118ce58733dc"
 
+chalk@0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.5.1.tgz#663b3a648b68b55d04690d49167aa837858f2174"
+  dependencies:
+    ansi-styles "^1.1.0"
+    escape-string-regexp "^1.0.0"
+    has-ansi "^0.1.0"
+    strip-ansi "^0.3.0"
+    supports-color "^0.2.0"
+
 chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -2724,6 +3038,14 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0:
     escape-string-regexp "^1.0.5"
     supports-color "^4.0.0"
 
+chalk@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
+  dependencies:
+    ansi-styles "^3.2.0"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.2.0"
+
 chalk@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
@@ -2760,10 +3082,11 @@ chardet@^0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
 
-check-node-version@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/check-node-version/-/check-node-version-2.1.0.tgz#85565842cf79a09dfa8e266720575ee0aec1983d"
+check-node-version@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/check-node-version/-/check-node-version-3.2.0.tgz#783a4292dbf76d6b8294b23abece33682b4a7cce"
   dependencies:
+    chalk "^2.3.0"
     map-values "^1.0.1"
     minimist "^1.2.0"
     object-filter "^1.0.2"
@@ -2826,6 +3149,24 @@ chokidar@^2.0.0:
   optionalDependencies:
     fsevents "^1.0.0"
 
+chokidar@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.2.tgz#4dc65139eeb2714977735b6a35d06e97b494dfd7"
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.0"
+    braces "^2.3.0"
+    glob-parent "^3.1.0"
+    inherits "^2.0.1"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^2.1.1"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.0.0"
+    upath "^1.0.0"
+  optionalDependencies:
+    fsevents "^1.0.0"
+
 chownr@^1.0.1, chownr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
@@ -2853,6 +3194,10 @@ circular-json@^0.3.1:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
 
+circular-json@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.1.tgz#b8942a09e535863dc21b04417a91971e1d9cd91f"
+
 clap@^1.0.9:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51"
@@ -2860,20 +3205,19 @@ clap@^1.0.9:
     chalk "^1.1.3"
 
 class-utils@^0.3.5:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.5.tgz#17e793103750f9627b2176ea34cfd1b565903c80"
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
   dependencies:
     arr-union "^3.1.0"
     define-property "^0.2.5"
     isobject "^3.0.0"
-    lazy-cache "^2.0.2"
     static-extend "^0.1.1"
 
 classnames@^2.2.5:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
 
-clean-css@4.1.x:
+clean-css@4.1.x, clean-css@^4.1.9:
   version "4.1.9"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.9.tgz#35cee8ae7687a49b98034f70de00c4edd3826301"
   dependencies:
@@ -2921,6 +3265,14 @@ cli@~1.0.0:
     exit "0.1.2"
     glob "^7.1.1"
 
+clipboard@^1.7.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-1.7.1.tgz#360d6d6946e99a7a1fef395e42ba92b5e9b5a16b"
+  dependencies:
+    good-listener "^1.2.2"
+    select "^1.1.2"
+    tiny-emitter "^2.0.0"
+
 cliui@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
@@ -2937,6 +3289,14 @@ cliui@^3.0.3, cliui@^3.2.0:
     strip-ansi "^3.0.1"
     wrap-ansi "^2.0.0"
 
+cliui@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.0.0.tgz#743d4650e05f36d1ed2575b59638d87322bfbbcc"
+  dependencies:
+    string-width "^2.1.1"
+    strip-ansi "^4.0.0"
+    wrap-ansi "^2.0.0"
+
 clone-deep@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.3.0.tgz#348c61ae9cdbe0edfe053d91ff4cc521d790ede8"
@@ -2954,7 +3314,7 @@ clone@^1.0.0, clone@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f"
 
-clone@^2.1.1:
+clone@^2.1.0, clone@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb"
 
@@ -2973,6 +3333,10 @@ co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
 
+co@~3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/co/-/co-3.0.6.tgz#1445f226c5eb956138e68c9ac30167ea7d2e6bda"
+
 coa@~1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd"
@@ -2991,9 +3355,9 @@ codecov@^3.0.0:
     request "2.81.0"
     urlgrey "0.4.4"
 
-codelyzer@^3.1.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-3.2.2.tgz#abbd4e5956c435677740846e5858c915f89679c3"
+codelyzer@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-4.1.0.tgz#3117754538d8f5ffa36dff91d340573a836cf373"
   dependencies:
     app-root-path "^2.0.1"
     css-selector-tokenizer "^0.7.0"
@@ -3081,27 +3445,59 @@ combine-lists@^1.0.0:
   dependencies:
     lodash "^4.5.0"
 
+combine-source-map@~0.7.1:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.7.2.tgz#0870312856b307a87cc4ac486f3a9a62aeccc09e"
+  dependencies:
+    convert-source-map "~1.1.0"
+    inline-source-map "~0.6.0"
+    lodash.memoize "~3.0.3"
+    source-map "~0.5.3"
+
+combine-source-map@~0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.8.0.tgz#a58d0df042c186fcf822a8e8015f5450d2d79a8b"
+  dependencies:
+    convert-source-map "~1.1.0"
+    inline-source-map "~0.6.0"
+    lodash.memoize "~3.0.3"
+    source-map "~0.5.3"
+
 combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
   dependencies:
     delayed-stream "~1.0.0"
 
+comma-separated-tokens@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.4.tgz#72083e58d4a462f01866f6617f4d98a3cd3b8a46"
+  dependencies:
+    trim "0.0.1"
+
 command-join@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/command-join/-/command-join-2.0.0.tgz#52e8b984f4872d952ff1bdc8b98397d27c7144cf"
 
-commander@2.11.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
-
-commander@2.12.x, commander@^2.11.0, commander@^2.12.2, commander@^2.9.0, commander@~2.12.1:
+commander@2.12.x, commander@~2.12.1:
   version "2.12.2"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
 
-common-tags@^1.3.1, common-tags@^1.4.0, common-tags@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.6.0.tgz#788e4bcc582f16993e5b2c92f76b1ccb80731537"
+commander@2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.6.0.tgz#9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"
+
+commander@^2.11.0, commander@^2.12.1, commander@^2.13.0, commander@^2.9.0:
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
+
+commander@^2.14.1:
+  version "2.14.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa"
+
+common-tags@^1.3.1, common-tags@^1.4.0, common-tags@^1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.7.2.tgz#24d9768c63d253a56ecff93845b44b4df1d52771"
   dependencies:
     babel-runtime "^6.26.0"
 
@@ -3120,10 +3516,6 @@ component-bind@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
 
-component-emitter@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.1.2.tgz#296594f2753daa63996d2af08d15a95116c9aec3"
-
 component-emitter@1.2.1, component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
@@ -3173,6 +3565,27 @@ concat-stream@1.6.0, concat-stream@^1.4.10, concat-stream@^1.5.0, concat-stream@
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
+concat-stream@~1.5.0, concat-stream@~1.5.1:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266"
+  dependencies:
+    inherits "~2.0.1"
+    readable-stream "~2.0.0"
+    typedarray "~0.0.5"
+
+concurrently@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-3.5.1.tgz#ee8b60018bbe86b02df13e5249453c6ececd2521"
+  dependencies:
+    chalk "0.5.1"
+    commander "2.6.0"
+    date-fns "^1.23.0"
+    lodash "^4.5.1"
+    rx "2.3.24"
+    spawn-command "^0.0.2-1"
+    supports-color "^3.2.3"
+    tree-kill "^1.1.0"
+
 config-chain@~1.1.11:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2"
@@ -3194,7 +3607,7 @@ configstore@^2.0.0:
     write-file-atomic "^1.1.2"
     xdg-basedir "^2.0.0"
 
-configstore@^3.0.0, configstore@^3.1.0, configstore@^3.1.1:
+configstore@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.1.tgz#094ee662ab83fad9917678de114faaea8fcdca90"
   dependencies:
@@ -3279,7 +3692,7 @@ consolidate@^0.14.0:
   dependencies:
     bluebird "^3.1.1"
 
-constants-browserify@^1.0.0:
+constants-browserify@^1.0.0, constants-browserify@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
 
@@ -3299,46 +3712,46 @@ content-type@~1.0.1, content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
 
-conventional-changelog-angular@^1.5.2:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.6.0.tgz#0a26a071f2c9fcfcf2b86ba0cfbf6e6301b75bfa"
+conventional-changelog-angular@^1.6.5:
+  version "1.6.5"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.6.5.tgz#936249e897501affdffc6043da45cab59d6f0907"
   dependencies:
     compare-func "^1.3.1"
     q "^1.4.1"
 
-conventional-changelog-atom@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-0.1.2.tgz#12595ad5267a6937c34cf900281b1c65198a4c63"
+conventional-changelog-atom@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-0.2.3.tgz#117d024e5cf9e28dcbd0575981105395be1bca74"
   dependencies:
     q "^1.4.1"
 
 conventional-changelog-cli@^1.3.2:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-cli/-/conventional-changelog-cli-1.3.5.tgz#46c51496216b7406588883defa6fac589e9bb31e"
+  version "1.3.14"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-cli/-/conventional-changelog-cli-1.3.14.tgz#2560f640929baf97bb65457f77a12a57d5322852"
   dependencies:
     add-stream "^1.0.0"
-    conventional-changelog "^1.1.7"
+    conventional-changelog "^1.1.16"
     lodash "^4.1.0"
     meow "^3.7.0"
     tempfile "^1.1.1"
 
-conventional-changelog-codemirror@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.2.1.tgz#299a4f7147baf350e6c8158fc54954a291c5cc09"
+conventional-changelog-codemirror@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.3.tgz#e1ec78e77e7fe26a2bd18e32f02523527916a07b"
   dependencies:
     q "^1.4.1"
 
-conventional-changelog-core@^1.9.3:
-  version "1.9.5"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-1.9.5.tgz#5db7566dad7c0cb75daf47fbb2976f7bf9928c1d"
+conventional-changelog-core@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-2.0.4.tgz#bbc476109c6b28ba6328b0b417f5ab5bfc7ca28a"
   dependencies:
-    conventional-changelog-writer "^2.0.3"
-    conventional-commits-parser "^2.1.0"
+    conventional-changelog-writer "^3.0.3"
+    conventional-commits-parser "^2.1.4"
     dateformat "^1.0.12"
     get-pkg-repo "^1.0.0"
-    git-raw-commits "^1.3.0"
+    git-raw-commits "^1.3.3"
     git-remote-origin-url "^2.0.0"
-    git-semver-tags "^1.2.3"
+    git-semver-tags "^1.3.3"
     lodash "^4.0.0"
     normalize-package-data "^2.3.5"
     q "^1.4.1"
@@ -3346,21 +3759,21 @@ conventional-changelog-core@^1.9.3:
     read-pkg-up "^1.0.1"
     through2 "^2.0.0"
 
-conventional-changelog-ember@^0.2.9:
-  version "0.2.10"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.2.10.tgz#dcd6e4cdc2e6c2b58653cf4d2cb1656a60421929"
+conventional-changelog-ember@^0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.3.5.tgz#db9a23f01103c6a0446ed2077ed5c87656d0571a"
   dependencies:
     q "^1.4.1"
 
-conventional-changelog-eslint@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-0.2.1.tgz#2c2a11beb216f80649ba72834180293b687c0662"
+conventional-changelog-eslint@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.3.tgz#023002a3f776266c501e4d4def7b0bb24130f29d"
   dependencies:
     q "^1.4.1"
 
-conventional-changelog-express@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.2.1.tgz#838d9e1e6c9099703b150b9c19aa2d781742bd6c"
+conventional-changelog-express@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.3.3.tgz#25aef42a30b5457f97681a94f2ac9b0ee515484a"
   dependencies:
     q "^1.4.1"
 
@@ -3376,19 +3789,23 @@ conventional-changelog-jscs@^0.1.0:
   dependencies:
     q "^1.4.1"
 
-conventional-changelog-jshint@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.2.1.tgz#86139bb3ac99899f2b177e9617e09b37d99bcf3a"
+conventional-changelog-jshint@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.3.tgz#28b6fe4d41fb945f38c6c31cd195fe37594f0007"
   dependencies:
     compare-func "^1.3.1"
     q "^1.4.1"
 
-conventional-changelog-writer@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-2.0.3.tgz#073b0c39f1cc8fc0fd9b1566e93833f51489c81c"
+conventional-changelog-preset-loader@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.5.tgz#d5af525d7ad81179d9b54137284d74d665997fa7"
+
+conventional-changelog-writer@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-3.0.3.tgz#2faa65739370769639fff1c0008722162936d46c"
   dependencies:
     compare-func "^1.3.1"
-    conventional-commits-filter "^1.1.1"
+    conventional-commits-filter "^1.1.4"
     dateformat "^1.0.11"
     handlebars "^4.0.2"
     json-stringify-safe "^5.0.1"
@@ -3398,20 +3815,21 @@ conventional-changelog-writer@^2.0.3:
     split "^1.0.0"
     through2 "^2.0.0"
 
-conventional-changelog@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.7.tgz#9151a62b1d8edb2d82711dabf5b7cf71041f82b1"
+conventional-changelog@^1.1.16:
+  version "1.1.16"
+  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.16.tgz#fa78386c831f5b1ae45f60391ef015c2a4a400b9"
   dependencies:
-    conventional-changelog-angular "^1.5.2"
-    conventional-changelog-atom "^0.1.2"
-    conventional-changelog-codemirror "^0.2.1"
-    conventional-changelog-core "^1.9.3"
-    conventional-changelog-ember "^0.2.9"
-    conventional-changelog-eslint "^0.2.1"
-    conventional-changelog-express "^0.2.1"
+    conventional-changelog-angular "^1.6.5"
+    conventional-changelog-atom "^0.2.3"
+    conventional-changelog-codemirror "^0.3.3"
+    conventional-changelog-core "^2.0.4"
+    conventional-changelog-ember "^0.3.5"
+    conventional-changelog-eslint "^1.0.3"
+    conventional-changelog-express "^0.3.3"
     conventional-changelog-jquery "^0.1.0"
     conventional-changelog-jscs "^0.1.0"
-    conventional-changelog-jshint "^0.2.1"
+    conventional-changelog-jshint "^0.3.3"
+    conventional-changelog-preset-loader "^1.1.5"
 
 conventional-commits-filter@^1.1.1:
   version "1.1.1"
@@ -3420,9 +3838,28 @@ conventional-commits-filter@^1.1.1:
     is-subset "^0.1.1"
     modify-values "^1.0.0"
 
-conventional-commits-parser@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.1.0.tgz#9b4b7c91124bf2a1a9a2cc1c72760d382cbbb229"
+conventional-commits-filter@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-1.1.4.tgz#8b5be3979c372e4f7440180d5c655a94ac5a134a"
+  dependencies:
+    is-subset "^0.1.1"
+    modify-values "^1.0.0"
+
+conventional-commits-parser@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.1.3.tgz#fbbfcfe4901ccbae63bb3834f982325e0b7c663f"
+  dependencies:
+    JSONStream "^1.0.4"
+    is-text-path "^1.0.0"
+    lodash "^4.2.1"
+    meow "^3.3.0"
+    split2 "^2.0.0"
+    through2 "^2.0.0"
+    trim-off-newlines "^1.0.0"
+
+conventional-commits-parser@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.1.4.tgz#86d2c21029268d99543c4ebda37d76fe5c44d8d1"
   dependencies:
     JSONStream "^1.0.4"
     is-text-path "^1.0.0"
@@ -3433,21 +3870,25 @@ conventional-commits-parser@^2.1.0:
     trim-off-newlines "^1.0.0"
 
 conventional-recommended-bump@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-1.1.0.tgz#964d4fcc70fb5259d41fa9b39d3df6afdb87d253"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-1.2.1.tgz#1b7137efb5091f99fe009e2fe9ddb7cc490e9375"
   dependencies:
     concat-stream "^1.4.10"
     conventional-commits-filter "^1.1.1"
-    conventional-commits-parser "^2.1.0"
+    conventional-commits-parser "^2.1.1"
     git-raw-commits "^1.3.0"
-    git-semver-tags "^1.2.3"
+    git-semver-tags "^1.3.0"
     meow "^3.3.0"
     object-assign "^4.0.1"
 
-convert-source-map@^1.3.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0:
+convert-source-map@^1.4.0, convert-source-map@^1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
 
+convert-source-map@~1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.1.3.tgz#4829c877e9fe49b3161f3bf3673888e204699860"
+
 cookie-parser@~1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.3.5.tgz#9d755570fb5d17890771227a02314d9be7cf8356"
@@ -3490,26 +3931,37 @@ copy-paste@^1.3.0:
   optionalDependencies:
     sync-exec "~0.6.x"
 
-copy-webpack-plugin@^4.1.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.3.1.tgz#19ba6370bf6f8e263cbd66185a2b79f2321a9302"
+copy-webpack-plugin@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.4.2.tgz#c92bcd7df4d5e42c51398cc36b23820d0d10446a"
+  dependencies:
+    cacache "^10.0.1"
+    find-cache-dir "^1.0.0"
+    globby "^7.1.1"
+    is-glob "^4.0.0"
+    loader-utils "^0.2.15"
+    minimatch "^3.0.4"
+    p-limit "^1.0.0"
+    serialize-javascript "^1.4.0"
+
+copy-webpack-plugin@~4.4.1:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.4.1.tgz#1e8c366211db6dc2ddee40e5a3e4fc661dd149e8"
   dependencies:
     cacache "^10.0.1"
     find-cache-dir "^1.0.0"
     globby "^7.1.1"
     is-glob "^4.0.0"
     loader-utils "^0.2.15"
-    lodash "^4.3.0"
     minimatch "^3.0.4"
     p-limit "^1.0.0"
-    pify "^3.0.0"
     serialize-javascript "^1.4.0"
 
 core-js@^1.0.0:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
 
-core-js@^2.2.0, core-js@^2.2.2, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0, core-js@^2.5.3:
+core-js@^2.2.0, core-js@^2.2.2, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0, core-js@^2.5.1, core-js@^2.5.3:
   version "2.5.3"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
 
@@ -3527,6 +3979,15 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
+cosmiconfig@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-3.1.0.tgz#640a94bf9847f321800403cd273af60665c73397"
+  dependencies:
+    is-directory "^0.3.1"
+    js-yaml "^3.9.0"
+    parse-json "^3.0.0"
+    require-from-string "^2.0.1"
+
 cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-2.2.2.tgz#6173cebd56fac042c1f4390edf7af6c07c7cb892"
@@ -3539,15 +4000,31 @@ cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
     parse-json "^2.2.0"
     require-from-string "^1.1.0"
 
-cosmiconfig@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-3.1.0.tgz#640a94bf9847f321800403cd273af60665c73397"
+cosmiconfig@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
   dependencies:
     is-directory "^0.3.1"
     js-yaml "^3.9.0"
-    parse-json "^3.0.0"
+    parse-json "^4.0.0"
     require-from-string "^2.0.1"
 
+cpx@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/cpx/-/cpx-1.5.0.tgz#185be018511d87270dedccc293171e37655ab88f"
+  dependencies:
+    babel-runtime "^6.9.2"
+    chokidar "^1.6.0"
+    duplexer "^0.1.1"
+    glob "^7.0.5"
+    glob2base "^0.0.12"
+    minimatch "^3.0.2"
+    mkdirp "^0.5.1"
+    resolve "^1.1.7"
+    safe-buffer "^5.0.1"
+    shell-quote "^1.6.1"
+    subarg "^1.0.0"
+
 crc@3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/crc/-/crc-3.3.0.tgz#fa622e1bc388bf257309082d6b65200ce67090ba"
@@ -3629,6 +4106,16 @@ cross-spawn@^4.0.2:
     lru-cache "^4.0.1"
     which "^1.2.9"
 
+cross-spawn@^6.0.4:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.4.tgz#bbf44ccb30fb8314a08f178b62290c669c36d808"
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
 cryptiles@2.x.x:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
@@ -3641,7 +4128,7 @@ cryptiles@3.x.x:
   dependencies:
     boom "5.x.x"
 
-crypto-browserify@^3.11.0:
+crypto-browserify@^3.0.0, crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
   dependencies:
@@ -3698,9 +4185,9 @@ css-loader@0.28.7:
     postcss-value-parser "^3.3.0"
     source-list-map "^2.0.0"
 
-css-loader@^0.28.1, css-loader@^0.28.8:
-  version "0.28.8"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.8.tgz#ff36381464dea18fe60f2601a060ba6445886bd5"
+css-loader@^0.28.10:
+  version "0.28.10"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.10.tgz#40282e79230f7bcb4e483efa631d670b735ebf42"
   dependencies:
     babel-code-frame "^6.26.0"
     css-selector-tokenizer "^0.7.0"
@@ -3710,7 +4197,7 @@ css-loader@^0.28.1, css-loader@^0.28.8:
     lodash.camelcase "^4.3.0"
     object-assign "^4.1.1"
     postcss "^5.0.6"
-    postcss-modules-extract-imports "^1.1.0"
+    postcss-modules-extract-imports "^1.2.0"
     postcss-modules-local-by-default "^1.2.0"
     postcss-modules-scope "^1.1.0"
     postcss-modules-values "^1.3.0"
@@ -3843,16 +4330,16 @@ damerau-levenshtein@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz#03191c432cb6eea168bb77f3a55ffdccb8978514"
 
-danger@^2.1.10:
-  version "2.1.10"
-  resolved "https://registry.yarnpkg.com/danger/-/danger-2.1.10.tgz#97a8fcbf0dee72820460dcb6fc4008ef69605be4"
+danger@^3.1.7:
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/danger/-/danger-3.1.7.tgz#11814753e9a2a666f5719e6a8b9b0b3c11ed01bd"
   dependencies:
-    babel-polyfill "7.0.0-alpha.19"
+    "@octokit/rest" "^14.0.4"
+    babel-polyfill "^6.23.0"
     chalk "^2.3.0"
-    commander "^2.12.2"
+    commander "^2.13.0"
     debug "^3.1.0"
     get-stdin "^5.0.1"
-    github "^13.0.1"
     hyperlinker "^1.0.0"
     jsome "^2.3.25"
     json5 "^0.5.1"
@@ -3873,7 +4360,7 @@ danger@^2.1.10:
     rfc6902 "^2.2.2"
     supports-hyperlinks "^1.0.1"
     vm2 patriksimek/vm2#custom_files
-    voca "^1.3.1"
+    voca "^1.4.0"
 
 dargs@^4.0.1:
   version "4.1.0"
@@ -3887,10 +4374,18 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-date-fns@^1.27.2:
+data-uri-to-buffer@1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz#77163ea9c20d8641b4707e8f18abdf9a78f34835"
+
+date-fns@^1.23.0, date-fns@^1.27.2:
   version "1.29.0"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6"
 
+date-format@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/date-format/-/date-format-1.2.0.tgz#615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"
+
 date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
@@ -3910,36 +4405,30 @@ de-indent@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
 
-debug@*, debug@^3.0.0, debug@^3.0.1, debug@^3.1.0:
+debug@*, debug@^3.0.0, debug@^3.0.1, debug@^3.1.0, debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   dependencies:
     ms "2.0.0"
 
-debug@2, debug@2.6.9, debug@^2.1.1, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.6, debug@^2.6.8, 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.6, debug@^2.6.8, debug@^2.6.9, debug@~2.6.4, debug@~2.6.6:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
     ms "2.0.0"
 
-debug@2.2.0, debug@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
-  dependencies:
-    ms "0.7.1"
-
-debug@2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.3.3.tgz#40c453e67e6e13c901ddec317af8986cda9eff8c"
-  dependencies:
-    ms "0.7.2"
-
 debug@2.6.8:
   version "2.6.8"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
   dependencies:
     ms "2.0.0"
 
+debug@~2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
+  dependencies:
+    ms "0.7.1"
+
 debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
@@ -4005,10 +4494,25 @@ define-property@^1.0.0:
   dependencies:
     is-descriptor "^1.0.0"
 
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
 defined@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
 
+degenerator@~1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-1.0.4.tgz#fcf490a37ece266464d9cc431ab98c5819ced095"
+  dependencies:
+    ast-types "0.x.x"
+    escodegen "1.x.x"
+    esprima "3.x.x"
+
 del@^2.0.2, del@^2.2.0, del@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
@@ -4036,6 +4540,10 @@ delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
 
+delegate@^3.1.2:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
+
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
@@ -4044,7 +4552,7 @@ denodeify@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/denodeify/-/denodeify-1.2.1.tgz#3a36287f5034e699e7577901052c2e6c94251631"
 
-depd@1.1.1, depd@~1.1.0, depd@~1.1.1:
+depd@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
 
@@ -4052,6 +4560,19 @@ depd@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.0.1.tgz#80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"
 
+depd@~1.1.0, depd@~1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+
+deps-sort@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/deps-sort/-/deps-sort-2.0.0.tgz#091724902e84658260eb910748cccd1af6e21fb5"
+  dependencies:
+    JSONStream "^1.0.3"
+    shasum "^1.0.0"
+    subarg "^1.0.0"
+    through2 "^2.0.0"
+
 des.js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
@@ -4085,13 +4606,20 @@ detect-node@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127"
 
-detect-port-alt@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/detect-port-alt/-/detect-port-alt-1.1.3.tgz#a4d2f061d757a034ecf37c514260a98750f2b131"
+detect-port-alt@1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/detect-port-alt/-/detect-port-alt-1.1.5.tgz#a1aa8fc805a4a5df9b905b7ddc7eed036bcce889"
   dependencies:
     address "^1.0.1"
     debug "^2.6.0"
 
+detective@^4.0.0:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz#0eca7314338442febb6d65da54c10bb1c82b246e"
+  dependencies:
+    acorn "^5.2.1"
+    defined "^1.0.0"
+
 dezalgo@^1.0.0, dezalgo@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
@@ -4131,8 +4659,8 @@ dns-equal@^1.0.0:
   resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
 
 dns-packet@^1.0.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.2.2.tgz#a8a26bec7646438963fc86e06f8f8b16d6c8bf7a"
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
   dependencies:
     ip "^1.1.0"
     safe-buffer "^5.0.1"
@@ -4150,9 +4678,9 @@ doctrine@1.5.0:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
-doctrine@^2.0.0, doctrine@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.2.tgz#68f96ce8efc56cc42651f1faadb4f175273b0075"
+doctrine@^2.0.0, doctrine@^2.0.2, doctrine@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
   dependencies:
     esutils "^2.0.2"
 
@@ -4192,7 +4720,17 @@ dom-walk@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018"
 
-domain-browser@^1.1.1:
+dom5@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/dom5/-/dom5-2.3.0.tgz#f8204975bd0dacbbe5b58a8a93ffc1fed0ffcd2a"
+  dependencies:
+    "@types/clone" "^0.1.29"
+    "@types/node" "^6.0.0"
+    "@types/parse5" "^2.2.32"
+    clone "^2.1.0"
+    parse5 "^2.2.2"
+
+domain-browser@^1.1.1, domain-browser@~1.1.0:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
 
@@ -4258,23 +4796,35 @@ dot-prop@^4.1.0:
   dependencies:
     is-obj "^1.0.0"
 
-dotenv-webpack@^1.5.4:
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/dotenv-webpack/-/dotenv-webpack-1.5.4.tgz#9c92e46e412a1cfbc60217ed33d69d2bbfddbf9f"
+dotenv-expand@4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.2.0.tgz#def1f1ca5d6059d24a766e587942c21106ce1275"
+
+dotenv-webpack@^1.5.5:
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/dotenv-webpack/-/dotenv-webpack-1.5.5.tgz#3441094f04d304b6119e6b72524e62fb3252f5f2"
   dependencies:
-    dotenv "^4.0.0"
+    dotenv "^5.0.1"
 
 dotenv@4.0.0, dotenv@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d"
 
+dotenv@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-5.0.1.tgz#a5317459bd3d79ab88cff6e44057a6a3fbb1fcef"
+
+double-ended-queue@^2.1.0-0:
+  version "2.1.0-0"
+  resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c"
+
 duplexer2@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
   dependencies:
     readable-stream "~1.1.9"
 
-duplexer2@^0.1.4:
+duplexer2@^0.1.2, duplexer2@^0.1.4, duplexer2@~0.1.0, duplexer2@~0.1.2:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
   dependencies:
@@ -4288,9 +4838,9 @@ duplexer@^0.1.1, duplexer@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
 
-duplexify@^3.1.2, duplexify@^3.4.2:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.1.tgz#4e1516be68838bc90a49994f0b39a6e5960befcd"
+duplexify@^3.4.2, duplexify@^3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.3.tgz#8b5818800df92fd0125b27ab896491912858243e"
   dependencies:
     end-of-stream "^1.0.0"
     inherits "^2.0.1"
@@ -4370,49 +4920,49 @@ encoding@^0.1.11:
     iconv-lite "~0.4.13"
 
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.0.tgz#7a90d833efda6cfa6eac0f4949dbb0fad3a63206"
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
   dependencies:
     once "^1.4.0"
 
-engine.io-client@1.8.3:
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.8.3.tgz#1798ed93451246453d4c6f635d7a201fe940d5ab"
+engine.io-client@~3.1.0:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.1.5.tgz#85de17666560327ef1817978f6e3f8101ded2c47"
   dependencies:
     component-emitter "1.2.1"
     component-inherit "0.0.3"
-    debug "2.3.3"
-    engine.io-parser "1.3.2"
+    debug "~3.1.0"
+    engine.io-parser "~2.1.1"
     has-cors "1.1.0"
     indexof "0.0.1"
-    parsejson "0.0.3"
     parseqs "0.0.5"
     parseuri "0.0.5"
-    ws "1.1.2"
-    xmlhttprequest-ssl "1.5.3"
+    ws "~3.3.1"
+    xmlhttprequest-ssl "~1.5.4"
     yeast "0.1.2"
 
-engine.io-parser@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-1.3.2.tgz#937b079f0007d0893ec56d46cb220b8cb435220a"
+engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.2.tgz#4c0f4cff79aaeecbbdcfdea66a823c6085409196"
   dependencies:
     after "0.8.2"
-    arraybuffer.slice "0.0.6"
+    arraybuffer.slice "~0.0.7"
     base64-arraybuffer "0.1.5"
     blob "0.0.4"
-    has-binary "0.1.7"
-    wtf-8 "1.0.0"
+    has-binary2 "~1.0.2"
 
-engine.io@1.8.3:
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-1.8.3.tgz#8de7f97895d20d39b85f88eeee777b2bd42b13d4"
+engine.io@~3.1.0:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.1.5.tgz#0e7ef9d690eb0b35597f1d4ad02a26ca2dba3845"
   dependencies:
-    accepts "1.3.3"
+    accepts "~1.3.4"
     base64id "1.0.0"
     cookie "0.3.1"
-    debug "2.3.3"
-    engine.io-parser "1.3.2"
-    ws "1.1.2"
+    debug "~3.1.0"
+    engine.io-parser "~2.1.0"
+    ws "~3.3.1"
+  optionalDependencies:
+    uws "~9.14.0"
 
 enhanced-resolve@^3.0.0, enhanced-resolve@^3.1.0, enhanced-resolve@^3.4.0:
   version "3.4.1"
@@ -4465,19 +5015,25 @@ enzyme-adapter-utils@^1.3.0:
     object.assign "^4.0.4"
     prop-types "^15.6.0"
 
-enzyme-matchers@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/enzyme-matchers/-/enzyme-matchers-4.0.2.tgz#3f4457d0d0da3e268af4bee9f222439dfca26214"
+enzyme-matchers@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/enzyme-matchers/-/enzyme-matchers-4.2.0.tgz#38333883258da90e5414b5ac07d388aecb75227f"
   dependencies:
     circular-json-es6 "^2.0.1"
     deep-equal-ident "^1.1.1"
 
-enzyme-to-json@^3.2.2, enzyme-to-json@^3.3.0:
+enzyme-to-json@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/enzyme-to-json/-/enzyme-to-json-3.3.0.tgz#553e23a09ffb4b0cf09287e2edf9c6539fddaa84"
   dependencies:
     lodash "^4.17.4"
 
+enzyme-to-json@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/enzyme-to-json/-/enzyme-to-json-3.3.1.tgz#64239dcd417e2fb552f4baa6632de4744b9b5b93"
+  dependencies:
+    lodash "^4.17.4"
+
 enzyme@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.3.0.tgz#0971abd167f2d4bf3f5bd508229e1c4b6dc50479"
@@ -4547,7 +5103,7 @@ es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
     es6-iterator "~2.0.1"
     es6-symbol "~3.1.1"
 
-es5-shim@^4.5.9:
+es5-shim@^4.5.10:
   version "4.5.10"
   resolved "https://registry.yarnpkg.com/es5-shim/-/es5-shim-4.5.10.tgz#b7e17ef4df2a145b821f1497b50c25cf94026205"
 
@@ -4633,11 +5189,11 @@ escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
 
-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@1.0.5, escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
-escodegen@^1.6.1, escodegen@^1.9.0:
+escodegen@1.x.x, escodegen@^1.6.1, escodegen@^1.9.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.0.tgz#9811a2f265dc1cd3894420ee3717064b632b8852"
   dependencies:
@@ -4675,9 +5231,9 @@ eslint-config-prettier@^2.9.0:
   dependencies:
     get-stdin "^5.0.1"
 
-eslint-config-react-app@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-2.0.1.tgz#fd0503da01ae608f0c6ae8861de084975142230e"
+eslint-config-react-app@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-2.1.0.tgz#23c909f71cbaff76b945b831d2d814b8bde169eb"
 
 eslint-import-resolver-node@^0.3.1:
   version "0.3.2"
@@ -4709,7 +5265,7 @@ eslint-plugin-flowtype@2.39.1:
   dependencies:
     lodash "^4.15.0"
 
-eslint-plugin-import@2.8.0, eslint-plugin-import@^2.8.0:
+eslint-plugin-import@2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.8.0.tgz#fa1b6ef31fcb3c501c09859c1b86f1fc5b986894"
   dependencies:
@@ -4724,9 +5280,24 @@ eslint-plugin-import@2.8.0, eslint-plugin-import@^2.8.0:
     minimatch "^3.0.3"
     read-pkg-up "^2.0.0"
 
-eslint-plugin-jest@^21.5.0:
-  version "21.5.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-21.5.0.tgz#c7a3bd2ee9d1c832b4e31dec89f6ad93e08d4853"
+eslint-plugin-import@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.9.0.tgz#26002efbfca5989b7288ac047508bd24f217b169"
+  dependencies:
+    builtin-modules "^1.1.1"
+    contains-path "^0.1.0"
+    debug "^2.6.8"
+    doctrine "1.5.0"
+    eslint-import-resolver-node "^0.3.1"
+    eslint-module-utils "^2.1.1"
+    has "^1.0.1"
+    lodash "^4.17.4"
+    minimatch "^3.0.3"
+    read-pkg-up "^2.0.0"
+
+eslint-plugin-jest@^21.12.2:
+  version "21.12.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-21.12.2.tgz#325f7c6a5078aed51ea087c33c26792337b5ba37"
 
 eslint-plugin-json@^1.2.0:
   version "1.2.0"
@@ -4758,13 +5329,20 @@ eslint-plugin-jsx-a11y@^6.0.3:
     emoji-regex "^6.1.0"
     jsx-ast-utils "^2.0.0"
 
-eslint-plugin-prettier@^2.4.0:
+eslint-plugin-prettier@^2.2.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.4.0.tgz#85cab0775c6d5e3344ef01e78d960f166fb93aae"
   dependencies:
     fast-diff "^1.1.1"
     jest-docblock "^21.0.0"
 
+eslint-plugin-prettier@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.6.0.tgz#33e4e228bdb06142d03c560ce04ec23f6c767dd7"
+  dependencies:
+    fast-diff "^1.1.1"
+    jest-docblock "^21.0.0"
+
 eslint-plugin-react@7.4.0:
   version "7.4.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.4.0.tgz#300a95861b9729c087d362dd64abcc351a74364a"
@@ -4774,13 +5352,13 @@ eslint-plugin-react@7.4.0:
     jsx-ast-utils "^2.0.0"
     prop-types "^15.5.10"
 
-eslint-plugin-react@^7.5.1:
-  version "7.5.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.5.1.tgz#52e56e8d80c810de158859ef07b880d2f56ee30b"
+eslint-plugin-react@^7.7.0:
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.7.0.tgz#f606c719dbd8a1a2b3d25c16299813878cca0160"
   dependencies:
-    doctrine "^2.0.0"
+    doctrine "^2.0.2"
     has "^1.0.1"
-    jsx-ast-utils "^2.0.0"
+    jsx-ast-utils "^2.0.1"
     prop-types "^15.6.0"
 
 eslint-restricted-globals@^0.1.1:
@@ -4840,49 +5418,9 @@ eslint@4.10.0:
     table "^4.0.1"
     text-table "~0.2.0"
 
-eslint@^3.16.1:
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc"
-  dependencies:
-    babel-code-frame "^6.16.0"
-    chalk "^1.1.3"
-    concat-stream "^1.5.2"
-    debug "^2.1.1"
-    doctrine "^2.0.0"
-    escope "^3.6.0"
-    espree "^3.4.0"
-    esquery "^1.0.0"
-    estraverse "^4.2.0"
-    esutils "^2.0.2"
-    file-entry-cache "^2.0.0"
-    glob "^7.0.3"
-    globals "^9.14.0"
-    ignore "^3.2.0"
-    imurmurhash "^0.1.4"
-    inquirer "^0.12.0"
-    is-my-json-valid "^2.10.0"
-    is-resolvable "^1.0.0"
-    js-yaml "^3.5.1"
-    json-stable-stringify "^1.0.0"
-    levn "^0.3.0"
-    lodash "^4.0.0"
-    mkdirp "^0.5.0"
-    natural-compare "^1.4.0"
-    optionator "^0.8.2"
-    path-is-inside "^1.0.1"
-    pluralize "^1.2.1"
-    progress "^1.1.8"
-    require-uncached "^1.0.2"
-    shelljs "^0.7.5"
-    strip-bom "^3.0.0"
-    strip-json-comments "~2.0.1"
-    table "^3.7.8"
-    text-table "~0.2.0"
-    user-home "^2.0.0"
-
-eslint@^4.15.0:
-  version "4.15.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.15.0.tgz#89ab38c12713eec3d13afac14e4a89e75ef08145"
+eslint@^4.18.1:
+  version "4.18.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.18.1.tgz#b9138440cb1e98b2f44a0d578c6ecf8eae6150b0"
   dependencies:
     ajv "^5.3.0"
     babel-code-frame "^6.22.0"
@@ -4890,7 +5428,7 @@ eslint@^4.15.0:
     concat-stream "^1.6.0"
     cross-spawn "^5.1.0"
     debug "^3.1.0"
-    doctrine "^2.0.2"
+    doctrine "^2.1.0"
     eslint-scope "^3.7.1"
     eslint-visitor-keys "^1.0.0"
     espree "^3.5.2"
@@ -4922,21 +5460,21 @@ eslint@^4.15.0:
     table "^4.0.1"
     text-table "~0.2.0"
 
-espree@^3.4.0, espree@^3.5.1, espree@^3.5.2:
+espree@^3.4.3, espree@^3.5.1, espree@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.2.tgz#756ada8b979e9dcfcdb30aad8d1a9304a905e1ca"
   dependencies:
     acorn "^5.2.1"
     acorn-jsx "^3.0.0"
 
+esprima@3.x.x, esprima@^3.1.3, esprima@~3.1.0:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+
 esprima@^2.6.0:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
 
-esprima@^3.1.3, esprima@~3.1.0:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
-
 esprima@^4.0.0, esprima@~4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
@@ -4997,14 +5535,18 @@ eventemitter3@1.x.x:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
 
-eventemitter3@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.0.0.tgz#fc29ecf233bd19fbd527bb4089bbf665dc90c1e3"
+eventemitter3@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.0.1.tgz#4ce66c3fc5b5a6b9f2245e359e1938f1ab10f960"
 
-events@^1.0.0, events@^1.1.1:
+events@^1.0.0, events@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
 
+events@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-2.0.0.tgz#cbbb56bf3ab1ac18d71c43bb32c86255062769f2"
+
 eventsource@0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232"
@@ -5048,6 +5590,18 @@ execa@^0.8.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+execa@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.9.0.tgz#adb7ce62cf985071f60580deb4a88b9e34712d01"
+  dependencies:
+    cross-spawn "^5.0.1"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
 execon@^1.2.0:
   version "1.2.9"
   resolved "https://registry.yarnpkg.com/execon/-/execon-1.2.9.tgz#6db11333dcc824f1f13e7317fed0d94a2f26491f"
@@ -5109,34 +5663,16 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
-expect@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-21.2.1.tgz#003ac2ac7005c3c29e73b38a272d4afadd6d1d7b"
+expect@^22.4.0:
+  version "22.4.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-22.4.0.tgz#371edf1ae15b83b5bf5ec34b42f1584660a36c16"
   dependencies:
     ansi-styles "^3.2.0"
-    jest-diff "^21.2.1"
-    jest-get-type "^21.2.0"
-    jest-matcher-utils "^21.2.1"
-    jest-message-util "^21.2.1"
-    jest-regex-util "^21.2.0"
-
-expect@^22.0.3:
-  version "22.0.3"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-22.0.3.tgz#bb486de7d41bf3eb60d3b16dfd1c158a4d91ddfa"
-  dependencies:
-    ansi-styles "^3.2.0"
-    jest-diff "^22.0.3"
-    jest-get-type "^22.0.3"
-    jest-matcher-utils "^22.0.3"
-    jest-message-util "^22.0.3"
-    jest-regex-util "^22.0.3"
-
-exports-loader@^0.6.3:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/exports-loader/-/exports-loader-0.6.4.tgz#d70fc6121975b35fc12830cf52754be2740fc886"
-  dependencies:
-    loader-utils "^1.0.2"
-    source-map "0.5.x"
+    jest-diff "^22.4.0"
+    jest-get-type "^22.1.0"
+    jest-matcher-utils "^22.4.0"
+    jest-message-util "^22.4.0"
+    jest-regex-util "^22.1.0"
 
 express-session@~1.11.3:
   version "1.11.3"
@@ -5152,7 +5688,7 @@ express-session@~1.11.3:
     uid-safe "~2.0.0"
     utils-merge "1.0.0"
 
-express@^4.13.3, express@^4.15.3, express@^4.16.2:
+express@^4.13.3, express@^4.16.2:
   version "4.16.2"
   resolved "https://registry.yarnpkg.com/express/-/express-4.16.2.tgz#e35c6dfe2d64b7dca0a5cd4f21781be3299e076c"
   dependencies:
@@ -5193,7 +5729,7 @@ extend-shallow@^2.0.1:
   dependencies:
     is-extendable "^0.1.0"
 
-extend-shallow@^3.0.0:
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
   dependencies:
@@ -5231,6 +5767,19 @@ extglob@^2.0.2:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  dependencies:
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 extract-text-webpack-plugin@3.0.2, extract-text-webpack-plugin@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz#5f043eaa02f9750a9258b78c0a6e0dc1408fb2f7"
@@ -5257,6 +5806,10 @@ extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
 
+faker@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/faker/-/faker-4.1.0.tgz#1e45bbbecc6774b3c195fad2835109c6d748cc3f"
+
 fancy-log@^1.1.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1"
@@ -5377,19 +5930,24 @@ file-loader@1.1.5:
     loader-utils "^1.0.2"
     schema-utils "^0.3.0"
 
-file-loader@^0.11.1:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.11.2.tgz#4ff1df28af38719a6098093b88c82c71d1794a34"
+file-loader@^1.1.10:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.10.tgz#77e97dfeab13da64c7085ab3e3887e29ae588aea"
   dependencies:
     loader-utils "^1.0.2"
+    schema-utils "^0.4.5"
 
-file-loader@^1.1.5, file-loader@^1.1.6:
+file-loader@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.6.tgz#7b9a8f2c58f00a77fddf49e940f7ac978a3ea0e8"
   dependencies:
     loader-utils "^1.0.2"
     schema-utils "^0.3.0"
 
+file-uri-to-path@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
+
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
@@ -5461,6 +6019,13 @@ finalhandler@1.1.0:
     statuses "~1.3.1"
     unpipe "~1.0.0"
 
+find-babel-config@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.1.0.tgz#acc01043a6749fec34429be6b64f542ebb5d6355"
+  dependencies:
+    json5 "^0.5.1"
+    path-exists "^3.0.0"
+
 find-cache-dir@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9"
@@ -5477,10 +6042,18 @@ find-cache-dir@^1.0.0:
     make-dir "^1.0.0"
     pkg-dir "^2.0.0"
 
+find-index@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4"
+
 find-parent-dir@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
 
+find-root@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
+
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
@@ -5508,8 +6081,8 @@ flatten@^1.0.2:
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
 
 flow-parser@^0.*:
-  version "0.62.0"
-  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.62.0.tgz#e58d3002281570401cb50ee5cf392a522502001f"
+  version "0.63.1"
+  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.63.1.tgz#84fd647b58a370c2fc0462800e22ed77c3cdf249"
 
 flush-write-stream@^1.0.0:
   version "1.0.2"
@@ -5529,6 +6102,12 @@ follow-redirects@0.0.7:
     debug "^2.2.0"
     stream-consume "^0.1.0"
 
+follow-redirects@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.0.0.tgz#8e34298cbd2e176f254effec75a1c78cc849fd37"
+  dependencies:
+    debug "^2.2.0"
+
 for-in@^0.1.3:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
@@ -5557,6 +6136,14 @@ forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
 
+form-data@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.0.0.tgz#6f0aebadcc5da16c13e1ecc11137d85f9b883b25"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.5"
+    mime-types "^2.1.11"
+
 form-data@~2.1.1:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
@@ -5635,6 +6222,14 @@ fs-extra@3.0.1:
     jsonfile "^3.0.0"
     universalify "^0.1.0"
 
+fs-extra@4.0.3, fs-extra@^4.0.0, fs-extra@^4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs-extra@^0.30.0:
   version "0.30.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0"
@@ -5653,14 +6248,6 @@ fs-extra@^1.0.0:
     jsonfile "^2.1.0"
     klaw "^1.0.0"
 
-fs-extra@^4.0.0, fs-extra@^4.0.1, fs-extra@^4.0.2:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
 fs-readdir-recursive@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
@@ -5686,14 +6273,7 @@ fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
-fsevents@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.2.tgz#3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4"
-  dependencies:
-    nan "^2.3.0"
-    node-pre-gyp "^0.6.36"
-
-fsevents@^1.0.0, fsevents@^1.1.1:
+fsevents@^1.0.0, fsevents@^1.1.1, fsevents@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8"
   dependencies:
@@ -5724,11 +6304,18 @@ fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2, fstream@~1.0.11:
     mkdirp ">=0.5 0"
     rimraf "2"
 
+ftp@~0.3.10:
+  version "0.3.10"
+  resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d"
+  dependencies:
+    readable-stream "1.1.x"
+    xregexp "2.0.0"
+
 function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
 
-function.prototype.name@^1.0.3:
+function.prototype.name@^1.0.3, function.prototype.name@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.0.tgz#8bd763cc0af860a859cc5d49384d74b932cd2327"
   dependencies:
@@ -5821,6 +6408,17 @@ get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
 
+get-uri@2:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.1.tgz#dbdcacacd8c608a38316869368117697a1631c59"
+  dependencies:
+    data-uri-to-buffer "1"
+    debug "2"
+    extend "3"
+    file-uri-to-path "1"
+    ftp "~0.3.10"
+    readable-stream "2"
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -5831,18 +6429,6 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-gh-pages@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/gh-pages/-/gh-pages-1.1.0.tgz#738134d8e35e5323b39892cda28b8904e85f24b2"
-  dependencies:
-    async "2.6.0"
-    base64url "^2.0.0"
-    commander "2.11.0"
-    fs-extra "^4.0.2"
-    globby "^6.1.0"
-    graceful-fs "4.1.11"
-    rimraf "^2.6.2"
-
 git-config-path@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/git-config-path/-/git-config-path-1.0.1.tgz#6d33f7ed63db0d0e118131503bab3aca47d54664"
@@ -5861,6 +6447,16 @@ git-raw-commits@^1.3.0:
     split2 "^2.0.0"
     through2 "^2.0.0"
 
+git-raw-commits@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-1.3.3.tgz#464f9aa14c4e78235e98654f0da467f3702590f9"
+  dependencies:
+    dargs "^4.0.1"
+    lodash.template "^4.0.2"
+    meow "^3.3.0"
+    split2 "^2.0.0"
+    through2 "^2.0.0"
+
 git-remote-origin-url@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f"
@@ -5868,9 +6464,16 @@ git-remote-origin-url@^2.0.0:
     gitconfiglocal "^1.0.0"
     pify "^2.3.0"
 
-git-semver-tags@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.2.3.tgz#188b453882bf9d7a23afd31baba537dab7388d5d"
+git-semver-tags@^1.3.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.3.2.tgz#94afa43c9070ae527a3ab86b978e59ae207803cc"
+  dependencies:
+    meow "^3.3.0"
+    semver "^5.0.1"
+
+git-semver-tags@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.3.3.tgz#0b0416c43285adfdc93a8038ea25502a09319245"
   dependencies:
     meow "^3.3.0"
     semver "^5.0.1"
@@ -5881,9 +6484,9 @@ gitconfiglocal@^1.0.0:
   dependencies:
     ini "^1.3.2"
 
-github-release-from-changelog@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/github-release-from-changelog/-/github-release-from-changelog-1.3.0.tgz#1be63945e6ac3168c4d8784322954da965b9986f"
+github-release-from-changelog@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/github-release-from-changelog/-/github-release-from-changelog-1.3.1.tgz#59055a520b5138b1711dde7498b8e91a6df66c93"
   dependencies:
     grizzly "^2.0.0"
     minimist "^1.2.0"
@@ -5897,17 +6500,6 @@ github@^11.0.0:
     mime "^1.2.11"
     netrc "^0.1.4"
 
-github@^13.0.1:
-  version "13.0.1"
-  resolved "https://registry.yarnpkg.com/github/-/github-13.0.1.tgz#4ccf4a41df662f92367e77a474674eabb1b6c78d"
-  dependencies:
-    debug "^3.1.0"
-    dotenv "^4.0.0"
-    https-proxy-agent "^2.1.0"
-    lodash "^4.17.4"
-    proxy-from-env "^1.0.0"
-    url-template "^2.0.8"
-
 glamor@^2.20.40:
   version "2.20.40"
   resolved "https://registry.yarnpkg.com/glamor/-/glamor-2.20.40.tgz#f606660357b7cf18dface731ad1a2cfa93817f05"
@@ -5918,9 +6510,9 @@ glamor@^2.20.40:
     prop-types "^15.5.10"
     through "^2.3.8"
 
-glamorous@^4.11.2:
-  version "4.11.2"
-  resolved "https://registry.yarnpkg.com/glamorous/-/glamorous-4.11.2.tgz#ce144c6a53e247ddf0896ad6faddebf78c49d864"
+glamorous@^4.11.6:
+  version "4.11.6"
+  resolved "https://registry.yarnpkg.com/glamorous/-/glamorous-4.11.6.tgz#337d9ec370ef3fa7cd0cd8f9f1c058fa3c55a424"
   dependencies:
     brcast "^3.0.0"
     fast-memoize "^2.2.7"
@@ -5950,6 +6542,12 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
+glob2base@^0.0.12:
+  version "0.0.12"
+  resolved "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56"
+  dependencies:
+    find-index "^0.1.1"
+
 glob@7.0.x:
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
@@ -5971,7 +6569,7 @@ glob@^6.0.4:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1, glob@~7.1.2:
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1, glob@~7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
@@ -6013,15 +6611,11 @@ global@^4.3.0, global@^4.3.2:
     min-document "^2.19.0"
     process "~0.5.1"
 
-globals@^10.0.0:
-  version "10.4.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-10.4.0.tgz#5c477388b128a9e4c5c5d01c7a2aca68c68b2da7"
-
-globals@^11.0.1:
+globals@^11.0.1, globals@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.1.0.tgz#632644457f5f0e3ae711807183700ebf2e4633e4"
 
-globals@^9.14.0, globals@^9.17.0, globals@^9.18.0:
+globals@^9.17.0, globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
 
@@ -6071,6 +6665,12 @@ glogg@^1.0.0:
   dependencies:
     sparkles "^1.0.0"
 
+good-listener@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
+  dependencies:
+    delegate "^3.1.2"
+
 got@^5.0.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/got/-/got-5.7.1.tgz#5f81635a61e4a6589f180569ea4e381680a51f35"
@@ -6107,7 +6707,7 @@ got@^6.7.1:
     unzip-response "^2.0.1"
     url-parse-lax "^1.0.0"
 
-graceful-fs@4.1.11, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@~4.1.11:
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@~4.1.11:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
@@ -6190,6 +6790,12 @@ graphql@^0.12.3:
   dependencies:
     iterall "1.1.3"
 
+graphql@^0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.13.1.tgz#9b3db3d8e40d1827e4172404bfdd2e4e17a58b55"
+  dependencies:
+    iterall "^1.2.0"
+
 grizzly@^2.0.0:
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/grizzly/-/grizzly-2.1.5.tgz#d715be2039cb64c799b4c93a64ee1196d2795ea0"
@@ -6286,17 +6892,23 @@ har-validator@~5.0.3:
     ajv "^5.1.0"
     har-schema "^2.0.0"
 
+has-ansi@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e"
+  dependencies:
+    ansi-regex "^0.2.0"
+
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
   dependencies:
     ansi-regex "^2.0.0"
 
-has-binary@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/has-binary/-/has-binary-0.1.7.tgz#68e61eb16210c9545a0a5cce06a873912fe1e68c"
+has-binary2@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.2.tgz#e83dba49f0b9be4d026d27365350d9f03f54be98"
   dependencies:
-    isarray "0.0.1"
+    isarray "2.0.1"
 
 has-color@~0.1.0:
   version "0.1.7"
@@ -6314,6 +6926,10 @@ has-flag@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
 
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+
 has-gulplog@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
@@ -6355,7 +6971,7 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has@^1.0.1:
+has@^1.0.0, has@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
   dependencies:
@@ -6385,6 +7001,20 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.0"
 
+hast-util-parse-selector@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-2.1.0.tgz#b55c0f4bb7bb2040c889c325ef87ab29c38102b4"
+
+hastscript@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-3.1.0.tgz#66628ba6d7f1ad07d9277dd09028aba7f4934599"
+  dependencies:
+    camelcase "^3.0.0"
+    comma-separated-tokens "^1.0.0"
+    hast-util-parse-selector "^2.0.0"
+    property-information "^3.0.0"
+    space-separated-tokens "^1.0.0"
+
 hawk@3.1.3, hawk@~3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
@@ -6407,6 +7037,17 @@ he@1.1.x, he@^1.1.0, he@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
 
+highlight.js@~9.12.0:
+  version "9.12.0"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e"
+
+hipchat-notifier@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/hipchat-notifier/-/hipchat-notifier-1.1.0.tgz#b6d249755437c191082367799d3ba9a0f23b231e"
+  dependencies:
+    lodash "^4.0.0"
+    request "^2.0.0"
+
 hmac-drbg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
@@ -6471,7 +7112,7 @@ html-entities@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
 
-html-loader@^0.5.4:
+html-loader@^0.5.1:
   version "0.5.4"
   resolved "https://registry.yarnpkg.com/html-loader/-/html-loader-0.5.4.tgz#70f36e30a923cc52536fdc812cec6f556aeb47a4"
   dependencies:
@@ -6481,6 +7122,16 @@ html-loader@^0.5.4:
     loader-utils "^1.1.0"
     object-assign "^4.1.1"
 
+html-loader@^0.5.5:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/html-loader/-/html-loader-0.5.5.tgz#6356dbeb0c49756d8ebd5ca327f16ff06ab5faea"
+  dependencies:
+    es6-templates "^0.2.3"
+    fastparse "^1.1.1"
+    html-minifier "^3.5.8"
+    loader-utils "^1.1.0"
+    object-assign "^4.1.1"
+
 html-minifier@^3.2.3, html-minifier@^3.5.8:
   version "3.5.8"
   resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.8.tgz#5ccdb1f73a0d654e6090147511f6e6b2ee312700"
@@ -6524,6 +7175,10 @@ html-webpack-plugin@^2.29.0, html-webpack-plugin@^2.30.1:
     pretty-error "^2.0.2"
     toposort "^1.0.0"
 
+htmlescape@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351"
+
 htmlparser2@3.8.x:
   version "3.8.3"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.8.3.tgz#996c28b191516a8be86501a7d79757e5c70c1068"
@@ -6582,6 +7237,14 @@ http-parser-js@>=0.4.0:
   version "0.4.9"
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.9.tgz#ea1a04fb64adff0242e9974f297dd4c3cad271e1"
 
+http-proxy-agent@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz#cc1ce38e453bf984a0f7702d2dd59c73d081284a"
+  dependencies:
+    agent-base "2"
+    debug "2"
+    extend "3"
+
 http-proxy-agent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.0.0.tgz#46482a2f0523a4d6082551709f469cb3e4a85ff4"
@@ -6621,11 +7284,22 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
+httpntlm@1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/httpntlm/-/httpntlm-1.6.1.tgz#ad01527143a2e8773cfae6a96f58656bb52a34b2"
+  dependencies:
+    httpreq ">=0.4.22"
+    underscore "~1.7.0"
+
+httpreq@>=0.4.22:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/httpreq/-/httpreq-0.4.24.tgz#4335ffd82cd969668a39465c929ac61d6393627f"
+
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
 
-https-proxy-agent@^1.0.0:
+https-proxy-agent@1, https-proxy-agent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz#35f7da6c48ce4ddbfa264891ac593ee5ff8671e6"
   dependencies:
@@ -6670,6 +7344,10 @@ iconv-lite@0.4.13:
   version "0.4.13"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
 
+iconv-lite@0.4.15:
+  version "0.4.15"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
+
 iconv-lite@0.4.19, iconv-lite@^0.4.17, iconv-lite@^0.4.8, iconv-lite@~0.4.13:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
@@ -6760,6 +7438,14 @@ indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
 
+inflection@~1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.10.0.tgz#5bffcb1197ad3e81050f8e17e21668087ee9eb2f"
+
+inflection@~1.3.0:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.3.8.tgz#cbd160da9f75b14c3cc63578d4f396784bf3014e"
+
 inflight@^1.0.4, inflight@~1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -6792,6 +7478,12 @@ init-package-json@~1.10.1:
     validate-npm-package-license "^3.0.1"
     validate-npm-package-name "^3.0.0"
 
+inline-source-map@~0.6.0:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.6.2.tgz#f9393471c18a79d1724f863fa38b586370ade2a5"
+  dependencies:
+    source-map "~0.5.3"
+
 inline-style-prefixer@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-2.0.5.tgz#c153c7e88fd84fef5c602e95a8168b2770671fe7"
@@ -6843,27 +7535,9 @@ inquirer@^0.11.0:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
-inquirer@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
-  dependencies:
-    ansi-escapes "^1.1.0"
-    ansi-regex "^2.0.0"
-    chalk "^1.0.0"
-    cli-cursor "^1.0.1"
-    cli-width "^2.0.0"
-    figures "^1.3.5"
-    lodash "^4.3.0"
-    readline2 "^1.0.1"
-    run-async "^0.1.0"
-    rx-lite "^3.1.2"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.0"
-    through "^2.3.6"
-
-inquirer@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-4.0.2.tgz#cc678b4cbc0e183a3500cc63395831ec956ab0a3"
+inquirer@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-5.1.0.tgz#19da508931892328abbbdd4c477f1efc65abfd67"
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.0"
@@ -6874,8 +7548,7 @@ inquirer@^4.0.2:
     lodash "^4.3.0"
     mute-stream "0.0.7"
     run-async "^2.2.0"
-    rx-lite "^4.0.8"
-    rx-lite-aggregates "^4.0.8"
+    rxjs "^5.5.2"
     string-width "^2.1.0"
     strip-ansi "^4.0.0"
     through "^2.3.6"
@@ -6884,6 +7557,19 @@ insert-css@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/insert-css/-/insert-css-2.0.0.tgz#eb5d1097b7542f4c79ea3060d3aee07d053880f4"
 
+insert-module-globals@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-7.0.1.tgz#c03bf4e01cb086d5b5e5ace8ad0afe7889d638c3"
+  dependencies:
+    JSONStream "^1.0.3"
+    combine-source-map "~0.7.1"
+    concat-stream "~1.5.1"
+    is-buffer "^1.1.0"
+    lexical-scope "^1.2.0"
+    process "~0.11.0"
+    through2 "^2.0.0"
+    xtend "^4.0.0"
+
 internal-ip@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-1.2.0.tgz#ae9fbf93b984878785d50a8de1b356956058cf5c"
@@ -6904,7 +7590,11 @@ invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
 
-ip@^1.1.0, ip@^1.1.4, ip@^1.1.5:
+ip@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-1.0.1.tgz#c7e356cdea225ae71b36d70f2e71a92ba4e42590"
+
+ip@^1.1.0, ip@^1.1.2, ip@^1.1.4, ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
 
@@ -6947,6 +7637,10 @@ is-alphanumerical@^1.0.0:
     is-alphabetical "^1.0.0"
     is-decimal "^1.0.0"
 
+is-array-buffer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-1.0.0.tgz#f32497a0509d109423f472003f98bab6a8ea34cb"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -6961,7 +7655,7 @@ is-boolean-object@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93"
 
-is-buffer@^1.0.2, is-buffer@^1.1.4, is-buffer@^1.1.5:
+is-buffer@^1.0.2, is-buffer@^1.1.0, is-buffer@^1.1.4, is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 
@@ -7009,7 +7703,7 @@ is-descriptor@^0.1.0:
     is-data-descriptor "^0.1.4"
     kind-of "^5.0.0"
 
-is-descriptor@^1.0.0:
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
   dependencies:
@@ -7077,6 +7771,10 @@ is-function@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.1.tgz#12cfb98b65b57dd3d193a3121f5f6e2f437602b5"
 
+is-generator-fn@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a"
+
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
@@ -7110,7 +7808,7 @@ is-installed-globally@^0.1.0:
     global-dirs "^0.1.0"
     is-path-inside "^1.0.0"
 
-is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4:
+is-my-json-valid@^2.12.4:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz#3da98914a70a22f0a8563ef1511a246c6fc55471"
   dependencies:
@@ -7143,6 +7841,10 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
+is-number@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+
 is-obj@^1.0.0, is-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
@@ -7163,6 +7865,12 @@ is-odd@^1.0.0:
   dependencies:
     is-number "^3.0.0"
 
+is-odd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24"
+  dependencies:
+    is-number "^4.0.0"
+
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
@@ -7275,6 +7983,10 @@ is-windows@^1.0.0, is-windows@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9"
 
+is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+
 is-word-character@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.1.tgz#5a03fa1ea91ace8a6eb0c7cd770eb86d65c8befb"
@@ -7283,7 +7995,7 @@ is-wsl@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
 
-isarray@0.0.1:
+isarray@0.0.1, isarray@~0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
 
@@ -7291,6 +8003,10 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
 
+isarray@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
+
 isbinaryfile@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.2.tgz#4a3e974ec0cba9004d3fc6cde7209ea69368a621"
@@ -7336,14 +8052,14 @@ istanbul-api@^1.1.1, istanbul-api@^1.1.14:
     mkdirp "^0.5.1"
     once "^1.4.0"
 
-istanbul-instrumenter-loader@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-2.0.0.tgz#e5492900ab0bba835efa8024cb00be9b3eea2700"
+istanbul-instrumenter-loader@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.0.tgz#9f553923b22360bac95e617aaba01add1f7db0b2"
   dependencies:
-    convert-source-map "^1.3.0"
-    istanbul-lib-instrument "^1.1.3"
-    loader-utils "^0.2.16"
-    object-assign "^4.1.0"
+    convert-source-map "^1.5.0"
+    istanbul-lib-instrument "^1.7.3"
+    loader-utils "^1.1.0"
+    schema-utils "^0.3.0"
 
 istanbul-lib-coverage@^1.0.1, istanbul-lib-coverage@^1.1.1:
   version "1.1.1"
@@ -7355,7 +8071,7 @@ istanbul-lib-hook@^1.1.0:
   dependencies:
     append-transform "^0.4.0"
 
-istanbul-lib-instrument@^1.1.3, istanbul-lib-instrument@^1.4.2, istanbul-lib-instrument@^1.7.5, istanbul-lib-instrument@^1.8.0, istanbul-lib-instrument@^1.9.1:
+istanbul-lib-instrument@^1.4.2, istanbul-lib-instrument@^1.7.3, istanbul-lib-instrument@^1.7.5, istanbul-lib-instrument@^1.8.0, istanbul-lib-instrument@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.1.tgz#250b30b3531e5d3251299fdd64b0b2c9db6b558e"
   dependencies:
@@ -7396,17 +8112,25 @@ iterall@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.1.3.tgz#1cbbff96204056dde6656e2ed2e2226d0e6d72c9"
 
+iterall@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.2.0.tgz#434e9f41f0b99911ab9c3d49d95f0e079176a2a2"
+
 jasmine-core@~2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
 
+jasmine-core@~2.99.1:
+  version "2.99.1"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.99.1.tgz#e6400df1e6b56e130b61c4bcd093daa7f6e8ca15"
+
 jasmine-spec-reporter@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz#1d632aec0341670ad324f92ba84b4b32b35e9e22"
   dependencies:
     colors "1.1.2"
 
-jasmine@^2.5.3:
+jasmine@2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.8.0.tgz#6b089c0a11576b1f16df11b80146d91d4e8b8a3e"
   dependencies:
@@ -7422,15 +8146,9 @@ jest-changed-files@^20.0.3:
   version "20.0.3"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-20.0.3.tgz#9394d5cc65c438406149bef1bf4d52b68e03e3f8"
 
-jest-changed-files@^21.2.0:
-  version "21.2.0"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-21.2.0.tgz#5dbeecad42f5d88b482334902ce1cba6d9798d29"
-  dependencies:
-    throat "^4.0.0"
-
-jest-changed-files@^22.0.3:
-  version "22.0.3"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-22.0.3.tgz#3771315acfa24a0ed7e6c545de620db6f1b2d164"
+jest-changed-files@^22.2.0:
+  version "22.2.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-22.2.0.tgz#517610c4a8ca0925bdc88b0ca53bd678aa8d019e"
   dependencies:
     throat "^4.0.0"
 
@@ -7469,68 +8187,37 @@ jest-cli@^20.0.4:
     worker-farm "^1.3.1"
     yargs "^7.0.2"
 
-jest-cli@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-21.2.1.tgz#9c528b6629d651911138d228bdb033c157ec8c00"
-  dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.1"
-    glob "^7.1.2"
-    graceful-fs "^4.1.11"
-    is-ci "^1.0.10"
-    istanbul-api "^1.1.1"
-    istanbul-lib-coverage "^1.0.1"
-    istanbul-lib-instrument "^1.4.2"
-    istanbul-lib-source-maps "^1.1.0"
-    jest-changed-files "^21.2.0"
-    jest-config "^21.2.1"
-    jest-environment-jsdom "^21.2.1"
-    jest-haste-map "^21.2.0"
-    jest-message-util "^21.2.1"
-    jest-regex-util "^21.2.0"
-    jest-resolve-dependencies "^21.2.0"
-    jest-runner "^21.2.1"
-    jest-runtime "^21.2.1"
-    jest-snapshot "^21.2.1"
-    jest-util "^21.2.1"
-    micromatch "^2.3.11"
-    node-notifier "^5.0.2"
-    pify "^3.0.0"
-    slash "^1.0.0"
-    string-length "^2.0.0"
-    strip-ansi "^4.0.0"
-    which "^1.2.12"
-    worker-farm "^1.3.1"
-    yargs "^9.0.0"
-
-jest-cli@^22.0.4:
-  version "22.0.4"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-22.0.4.tgz#0052abaad45c57861c05da8ab5d27bad13ad224d"
+jest-cli@^22.4.2:
+  version "22.4.2"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-22.4.2.tgz#e6546dc651e13d164481aa3e76e53ac4f4edab06"
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.1"
+    exit "^0.1.2"
     glob "^7.1.2"
     graceful-fs "^4.1.11"
+    import-local "^1.0.0"
     is-ci "^1.0.10"
     istanbul-api "^1.1.14"
     istanbul-lib-coverage "^1.1.1"
     istanbul-lib-instrument "^1.8.0"
     istanbul-lib-source-maps "^1.2.1"
-    jest-changed-files "^22.0.3"
-    jest-config "^22.0.4"
-    jest-environment-jsdom "^22.0.4"
-    jest-get-type "^22.0.3"
-    jest-haste-map "^22.0.3"
-    jest-message-util "^22.0.3"
-    jest-regex-util "^22.0.3"
-    jest-resolve-dependencies "^22.0.3"
-    jest-runner "^22.0.4"
-    jest-runtime "^22.0.4"
-    jest-snapshot "^22.0.3"
-    jest-util "^22.0.4"
-    jest-worker "^22.0.3"
+    jest-changed-files "^22.2.0"
+    jest-config "^22.4.2"
+    jest-environment-jsdom "^22.4.1"
+    jest-get-type "^22.1.0"
+    jest-haste-map "^22.4.2"
+    jest-message-util "^22.4.0"
+    jest-regex-util "^22.1.0"
+    jest-resolve-dependencies "^22.1.0"
+    jest-runner "^22.4.2"
+    jest-runtime "^22.4.2"
+    jest-snapshot "^22.4.0"
+    jest-util "^22.4.1"
+    jest-validate "^22.4.2"
+    jest-worker "^22.2.2"
     micromatch "^2.3.11"
-    node-notifier "^5.1.2"
+    node-notifier "^5.2.1"
     realpath-native "^1.0.0"
     rimraf "^2.5.4"
     slash "^1.0.0"
@@ -7554,37 +8241,21 @@ jest-config@^20.0.4:
     jest-validate "^20.0.3"
     pretty-format "^20.0.3"
 
-jest-config@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-21.2.1.tgz#c7586c79ead0bcc1f38c401e55f964f13bf2a480"
+jest-config@^22.4.0, jest-config@^22.4.2:
+  version "22.4.2"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-22.4.2.tgz#580ba5819bf81a5e48f4fd470e8b81834f45c855"
   dependencies:
     chalk "^2.0.1"
     glob "^7.1.1"
-    jest-environment-jsdom "^21.2.1"
-    jest-environment-node "^21.2.1"
-    jest-get-type "^21.2.0"
-    jest-jasmine2 "^21.2.1"
-    jest-regex-util "^21.2.0"
-    jest-resolve "^21.2.0"
-    jest-util "^21.2.1"
-    jest-validate "^21.2.1"
-    pretty-format "^21.2.1"
-
-jest-config@^22.0.4:
-  version "22.0.4"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-22.0.4.tgz#9c2a46c0907b1a1af54d9cdbf18e99b447034e11"
-  dependencies:
-    chalk "^2.0.1"
-    glob "^7.1.1"
-    jest-environment-jsdom "^22.0.4"
-    jest-environment-node "^22.0.4"
-    jest-get-type "^22.0.3"
-    jest-jasmine2 "^22.0.4"
-    jest-regex-util "^22.0.3"
-    jest-resolve "^22.0.4"
-    jest-util "^22.0.4"
-    jest-validate "^22.0.3"
-    pretty-format "^22.0.3"
+    jest-environment-jsdom "^22.4.1"
+    jest-environment-node "^22.4.1"
+    jest-get-type "^22.1.0"
+    jest-jasmine2 "^22.4.2"
+    jest-regex-util "^22.1.0"
+    jest-resolve "^22.4.2"
+    jest-util "^22.4.1"
+    jest-validate "^22.4.2"
+    pretty-format "^22.4.0"
 
 jest-diff@^20.0.3:
   version "20.0.3"
@@ -7595,35 +8266,47 @@ jest-diff@^20.0.3:
     jest-matcher-utils "^20.0.3"
     pretty-format "^20.0.3"
 
-jest-diff@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-21.2.1.tgz#46cccb6cab2d02ce98bc314011764bb95b065b4f"
+jest-diff@^22.0.6:
+  version "22.0.6"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-22.0.6.tgz#38c07187324564ecf6389a980a2f0e86e7e79890"
   dependencies:
     chalk "^2.0.1"
     diff "^3.2.0"
-    jest-get-type "^21.2.0"
-    pretty-format "^21.2.1"
+    jest-get-type "^22.0.6"
+    pretty-format "^22.0.6"
 
-jest-diff@^22.0.3:
-  version "22.0.3"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-22.0.3.tgz#ffed5aba6beaf63bb77819ba44dd520168986321"
+jest-diff@^22.4.0:
+  version "22.4.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-22.4.0.tgz#384c2b78519ca44ca126382df53f134289232525"
   dependencies:
     chalk "^2.0.1"
     diff "^3.2.0"
-    jest-get-type "^22.0.3"
-    pretty-format "^22.0.3"
+    jest-get-type "^22.1.0"
+    pretty-format "^22.4.0"
+
+jest-docblock@22.0.3:
+  version "22.0.3"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-22.0.3.tgz#c33aa22682b9fc68a5373f5f82994428a2ded601"
+  dependencies:
+    detect-newline "^2.1.0"
 
 jest-docblock@^20.0.3:
   version "20.0.3"
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-20.0.3.tgz#17bea984342cc33d83c50fbe1545ea0efaa44712"
 
-jest-docblock@^21, jest-docblock@^21.0.0, jest-docblock@^21.2.0:
+jest-docblock@^21.0.0:
   version "21.2.0"
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.2.0.tgz#51529c3b30d5fd159da60c27ceedc195faf8d414"
 
 jest-docblock@^22.0.3:
-  version "22.0.3"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-22.0.3.tgz#c33aa22682b9fc68a5373f5f82994428a2ded601"
+  version "22.0.6"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-22.0.6.tgz#f187fb2c67eec0999e569d563092125283084f9e"
+  dependencies:
+    detect-newline "^2.1.0"
+
+jest-docblock@^22.4.0:
+  version "22.4.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-22.4.0.tgz#dbf1877e2550070cfc4d9b07a55775a0483159b8"
   dependencies:
     detect-newline "^2.1.0"
 
@@ -7635,20 +8318,12 @@ jest-environment-jsdom@^20.0.3:
     jest-util "^20.0.3"
     jsdom "^9.12.0"
 
-jest-environment-jsdom@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-21.2.1.tgz#38d9980c8259b2a608ec232deee6289a60d9d5b4"
+jest-environment-jsdom@^22.4.1:
+  version "22.4.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-22.4.1.tgz#754f408872441740100d3917e5ec40c74de6447f"
   dependencies:
-    jest-mock "^21.2.0"
-    jest-util "^21.2.1"
-    jsdom "^9.12.0"
-
-jest-environment-jsdom@^22.0.4:
-  version "22.0.4"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-22.0.4.tgz#5723d4e724775ed38948de792e62f2d6a7f452df"
-  dependencies:
-    jest-mock "^22.0.3"
-    jest-util "^22.0.4"
+    jest-mock "^22.2.0"
+    jest-util "^22.4.1"
     jsdom "^11.5.1"
 
 jest-environment-node@^20.0.3:
@@ -7658,34 +8333,38 @@ jest-environment-node@^20.0.3:
     jest-mock "^20.0.3"
     jest-util "^20.0.3"
 
-jest-environment-node@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-21.2.1.tgz#98c67df5663c7fbe20f6e792ac2272c740d3b8c8"
+jest-environment-node@^22.4.1:
+  version "22.4.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-22.4.1.tgz#418850eb654596b8d6e36c2021cbedbc23df8e16"
   dependencies:
-    jest-mock "^21.2.0"
-    jest-util "^21.2.1"
+    jest-mock "^22.2.0"
+    jest-util "^22.4.1"
 
-jest-environment-node@^22.0.4:
-  version "22.0.4"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-22.0.4.tgz#068671f85a545f96a5469be3a3dd228fca79c709"
+jest-enzyme@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/jest-enzyme/-/jest-enzyme-4.2.0.tgz#d284506b6d87e072bf6d2786584970bb42ea5969"
   dependencies:
-    jest-mock "^22.0.3"
-    jest-util "^22.0.4"
-
-jest-enzyme@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/jest-enzyme/-/jest-enzyme-4.0.2.tgz#c3a87f311889819d51ae2639c9da412da07cfc4a"
-  dependencies:
-    enzyme-matchers "^4.0.2"
+    enzyme-matchers "^4.2.0"
     enzyme-to-json "^3.3.0"
 
-jest-get-type@^21.2.0:
-  version "21.2.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-21.2.0.tgz#f6376ab9db4b60d81e39f30749c6c466f40d4a23"
+jest-get-type@^22.0.6:
+  version "22.0.6"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.0.6.tgz#301fbc0760779fdbad37b6e3239a3c1811aa75cb"
 
-jest-get-type@^22.0.3:
+jest-get-type@^22.1.0:
+  version "22.1.0"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.1.0.tgz#4e90af298ed6181edc85d2da500dbd2753e0d5a9"
+
+jest-haste-map@22.0.3:
   version "22.0.3"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.0.3.tgz#fa894b677c0fcd55eff3fd8ee28c7be942e32d36"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-22.0.3.tgz#c9ecb5c871c5465d4bde4139e527fa0dc784aa2d"
+  dependencies:
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.1.11"
+    jest-docblock "^22.0.3"
+    jest-worker "^22.0.3"
+    micromatch "^2.3.11"
+    sane "^2.0.0"
 
 jest-haste-map@^20.0.4:
   version "20.0.5"
@@ -7698,33 +8377,24 @@ jest-haste-map@^20.0.4:
     sane "~1.6.0"
     worker-farm "^1.3.1"
 
-jest-haste-map@^21, jest-haste-map@^21.2.0:
-  version "21.2.0"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-21.2.0.tgz#1363f0a8bb4338f24f001806571eff7a4b2ff3d8"
+jest-haste-map@^22.4.2:
+  version "22.4.2"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-22.4.2.tgz#a90178e66146d4378bb076345a949071f3b015b4"
   dependencies:
     fb-watchman "^2.0.0"
     graceful-fs "^4.1.11"
-    jest-docblock "^21.2.0"
-    micromatch "^2.3.11"
-    sane "^2.0.0"
-    worker-farm "^1.3.1"
-
-jest-haste-map@^22.0.3:
-  version "22.0.3"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-22.0.3.tgz#c9ecb5c871c5465d4bde4139e527fa0dc784aa2d"
-  dependencies:
-    fb-watchman "^2.0.0"
-    graceful-fs "^4.1.11"
-    jest-docblock "^22.0.3"
-    jest-worker "^22.0.3"
+    jest-docblock "^22.4.0"
+    jest-serializer "^22.4.0"
+    jest-worker "^22.2.2"
     micromatch "^2.3.11"
     sane "^2.0.0"
 
-jest-image-snapshot@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/jest-image-snapshot/-/jest-image-snapshot-2.2.1.tgz#06e05cad6a01ded0d8d43d4b92d2758de2fce52a"
+jest-image-snapshot@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/jest-image-snapshot/-/jest-image-snapshot-2.3.0.tgz#bf9535dee5b9bcd862fa9312750a90c10bfba052"
   dependencies:
     chalk "^1.1.3"
+    get-stdin "^5.0.1"
     lodash "^4.17.4"
     mkdirp "^0.5.1"
     pixelmatch "^4.0.2"
@@ -7744,40 +8414,27 @@ jest-jasmine2@^20.0.4:
     once "^1.4.0"
     p-map "^1.1.1"
 
-jest-jasmine2@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-21.2.1.tgz#9cc6fc108accfa97efebce10c4308548a4ea7592"
+jest-jasmine2@^22.4.2:
+  version "22.4.2"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-22.4.2.tgz#dfd3d259579ed6f52510d8f1ab692808f0d40691"
   dependencies:
     chalk "^2.0.1"
-    expect "^21.2.1"
+    co "^4.6.0"
+    expect "^22.4.0"
     graceful-fs "^4.1.11"
-    jest-diff "^21.2.1"
-    jest-matcher-utils "^21.2.1"
-    jest-message-util "^21.2.1"
-    jest-snapshot "^21.2.1"
-    p-cancelable "^0.3.0"
-
-jest-jasmine2@^22.0.4:
-  version "22.0.4"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-22.0.4.tgz#f7c0965116efe831ec674dc954b0134639b3dcee"
-  dependencies:
-    callsites "^2.0.0"
-    chalk "^2.0.1"
-    expect "^22.0.3"
-    graceful-fs "^4.1.11"
-    jest-diff "^22.0.3"
-    jest-matcher-utils "^22.0.3"
-    jest-message-util "^22.0.3"
-    jest-snapshot "^22.0.3"
+    is-generator-fn "^1.0.0"
+    jest-diff "^22.4.0"
+    jest-matcher-utils "^22.4.0"
+    jest-message-util "^22.4.0"
+    jest-snapshot "^22.4.0"
+    jest-util "^22.4.1"
     source-map-support "^0.5.0"
 
-jest-leak-detector@^22.0.3:
-  version "22.0.3"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-22.0.3.tgz#b64904f0e8954a11edb79b0809ff4717fa762d99"
+jest-leak-detector@^22.4.0:
+  version "22.4.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-22.4.0.tgz#64da77f05b001c96d2062226e079f89989c4aa2f"
   dependencies:
-    pretty-format "^22.0.3"
-  optionalDependencies:
-    weak "^1.0.1"
+    pretty-format "^22.4.0"
 
 jest-matcher-utils@^20.0.3:
   version "20.0.3"
@@ -7786,21 +8443,21 @@ jest-matcher-utils@^20.0.3:
     chalk "^1.1.3"
     pretty-format "^20.0.3"
 
-jest-matcher-utils@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-21.2.1.tgz#72c826eaba41a093ac2b4565f865eb8475de0f64"
+jest-matcher-utils@^22.0.6:
+  version "22.0.6"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-22.0.6.tgz#55675242b2af1de913f44e00aa4d68a38d349b07"
   dependencies:
     chalk "^2.0.1"
-    jest-get-type "^21.2.0"
-    pretty-format "^21.2.1"
+    jest-get-type "^22.0.6"
+    pretty-format "^22.0.6"
 
-jest-matcher-utils@^22.0.3:
-  version "22.0.3"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-22.0.3.tgz#2ec15ca1af7dcabf4daddc894ccce224b948674e"
+jest-matcher-utils@^22.4.0:
+  version "22.4.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-22.4.0.tgz#d55f5faf2270462736bdf7c7485ee931c9d4b6a1"
   dependencies:
     chalk "^2.0.1"
-    jest-get-type "^22.0.3"
-    pretty-format "^22.0.3"
+    jest-get-type "^22.1.0"
+    pretty-format "^22.4.0"
 
 jest-matchers@^20.0.3:
   version "20.0.3"
@@ -7819,17 +8476,9 @@ jest-message-util@^20.0.3:
     micromatch "^2.3.11"
     slash "^1.0.0"
 
-jest-message-util@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-21.2.1.tgz#bfe5d4692c84c827d1dcf41823795558f0a1acbe"
-  dependencies:
-    chalk "^2.0.1"
-    micromatch "^2.3.11"
-    slash "^1.0.0"
-
-jest-message-util@^22.0.3:
-  version "22.0.3"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-22.0.3.tgz#bf674b2762ef2dd53facf2136423fcca264976df"
+jest-message-util@^22.4.0:
+  version "22.4.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-22.4.0.tgz#e3d861df16d2fee60cb2bc8feac2188a42579642"
   dependencies:
     "@babel/code-frame" "^7.0.0-beta.35"
     chalk "^2.0.1"
@@ -7841,25 +8490,25 @@ jest-mock@^20.0.3:
   version "20.0.3"
   resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-20.0.3.tgz#8bc070e90414aa155c11a8d64c869a0d5c71da59"
 
-jest-mock@^21.2.0:
-  version "21.2.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-21.2.0.tgz#7eb0770e7317968165f61ea2a7281131534b3c0f"
+jest-mock@^22.2.0:
+  version "22.2.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-22.2.0.tgz#444b3f9488a7473adae09bc8a77294afded397a7"
 
-jest-mock@^22.0.3:
-  version "22.0.3"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-22.0.3.tgz#c875e47b5b729c6c020a2fab317b275c0cf88961"
+jest-preset-angular@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/jest-preset-angular/-/jest-preset-angular-5.2.0.tgz#39fb9477890285572db31a464d4b4b8eed4e3650"
+  dependencies:
+    "@types/jest" "^22.1.3"
+    jest-zone-patch "^0.0.8"
+    ts-jest "^22.4.0"
 
 jest-regex-util@^20.0.3:
   version "20.0.3"
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-20.0.3.tgz#85bbab5d133e44625b19faf8c6aa5122d085d762"
 
-jest-regex-util@^21.2.0:
-  version "21.2.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-21.2.0.tgz#1b1e33e63143babc3e0f2e6c9b5ba1eb34b2d530"
-
-jest-regex-util@^22.0.3:
-  version "22.0.3"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-22.0.3.tgz#c5c10229de5ce2b27bf4347916d95b802ae9aa4d"
+jest-regex-util@^22.1.0:
+  version "22.1.0"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-22.1.0.tgz#5daf2fe270074b6da63e5d85f1c9acc866768f53"
 
 jest-resolve-dependencies@^20.0.3:
   version "20.0.3"
@@ -7867,17 +8516,11 @@ jest-resolve-dependencies@^20.0.3:
   dependencies:
     jest-regex-util "^20.0.3"
 
-jest-resolve-dependencies@^21.2.0:
-  version "21.2.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-21.2.0.tgz#9e231e371e1a736a1ad4e4b9a843bc72bfe03d09"
+jest-resolve-dependencies@^22.1.0:
+  version "22.1.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-22.1.0.tgz#340e4139fb13315cd43abc054e6c06136be51e31"
   dependencies:
-    jest-regex-util "^21.2.0"
-
-jest-resolve-dependencies@^22.0.3:
-  version "22.0.3"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-22.0.3.tgz#202ddf370069702cd1865a1952fcc7e52c92720e"
-  dependencies:
-    jest-regex-util "^22.0.3"
+    jest-regex-util "^22.1.0"
 
 jest-resolve@^20.0.4:
   version "20.0.4"
@@ -7887,49 +8530,27 @@ jest-resolve@^20.0.4:
     is-builtin-module "^1.0.0"
     resolve "^1.3.2"
 
-jest-resolve@^21.2.0:
-  version "21.2.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-21.2.0.tgz#068913ad2ba6a20218e5fd32471f3874005de3a6"
-  dependencies:
-    browser-resolve "^1.11.2"
-    chalk "^2.0.1"
-    is-builtin-module "^1.0.0"
-
-jest-resolve@^22.0.4:
-  version "22.0.4"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-22.0.4.tgz#a6e47f55e9388c7341b5e9732aedc6fe30906121"
+jest-resolve@^22.4.2:
+  version "22.4.2"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-22.4.2.tgz#25d88aa4147462c9c1c6a1ba16250d3794c24d00"
   dependencies:
     browser-resolve "^1.11.2"
     chalk "^2.0.1"
 
-jest-runner@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-21.2.1.tgz#194732e3e518bfb3d7cbfc0fd5871246c7e1a467"
+jest-runner@^22.4.2:
+  version "22.4.2"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-22.4.2.tgz#19390ea9d99f768973e16f95a1efa351c0017e87"
   dependencies:
-    jest-config "^21.2.1"
-    jest-docblock "^21.2.0"
-    jest-haste-map "^21.2.0"
-    jest-jasmine2 "^21.2.1"
-    jest-message-util "^21.2.1"
-    jest-runtime "^21.2.1"
-    jest-util "^21.2.1"
-    pify "^3.0.0"
-    throat "^4.0.0"
-    worker-farm "^1.3.1"
-
-jest-runner@^22.0.4:
-  version "22.0.4"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-22.0.4.tgz#3aa43a31b05ce8271539df580c2eb916023d3367"
-  dependencies:
-    jest-config "^22.0.4"
-    jest-docblock "^22.0.3"
-    jest-haste-map "^22.0.3"
-    jest-jasmine2 "^22.0.4"
-    jest-leak-detector "^22.0.3"
-    jest-message-util "^22.0.3"
-    jest-runtime "^22.0.4"
-    jest-util "^22.0.4"
-    jest-worker "^22.0.3"
+    exit "^0.1.2"
+    jest-config "^22.4.2"
+    jest-docblock "^22.4.0"
+    jest-haste-map "^22.4.2"
+    jest-jasmine2 "^22.4.2"
+    jest-leak-detector "^22.4.0"
+    jest-message-util "^22.4.0"
+    jest-runtime "^22.4.2"
+    jest-util "^22.4.1"
+    jest-worker "^22.2.2"
     throat "^4.0.0"
 
 jest-runtime@^20.0.4:
@@ -7952,43 +8573,23 @@ jest-runtime@^20.0.4:
     strip-bom "3.0.0"
     yargs "^7.0.2"
 
-jest-runtime@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-21.2.1.tgz#99dce15309c670442eee2ebe1ff53a3cbdbbb73e"
+jest-runtime@^22.4.2:
+  version "22.4.2"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-22.4.2.tgz#0de0444f65ce15ee4f2e0055133fc7c17b9168f3"
   dependencies:
     babel-core "^6.0.0"
-    babel-jest "^21.2.0"
-    babel-plugin-istanbul "^4.0.0"
-    chalk "^2.0.1"
-    convert-source-map "^1.4.0"
-    graceful-fs "^4.1.11"
-    jest-config "^21.2.1"
-    jest-haste-map "^21.2.0"
-    jest-regex-util "^21.2.0"
-    jest-resolve "^21.2.0"
-    jest-util "^21.2.1"
-    json-stable-stringify "^1.0.1"
-    micromatch "^2.3.11"
-    slash "^1.0.0"
-    strip-bom "3.0.0"
-    write-file-atomic "^2.1.0"
-    yargs "^9.0.0"
-
-jest-runtime@^22.0.4:
-  version "22.0.4"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-22.0.4.tgz#8f69aa7b5fbb3acd35dc262cbf654e563f69b7b4"
-  dependencies:
-    babel-core "^6.0.0"
-    babel-jest "^22.0.4"
+    babel-jest "^22.4.1"
     babel-plugin-istanbul "^4.1.5"
     chalk "^2.0.1"
     convert-source-map "^1.4.0"
+    exit "^0.1.2"
     graceful-fs "^4.1.11"
-    jest-config "^22.0.4"
-    jest-haste-map "^22.0.3"
-    jest-regex-util "^22.0.3"
-    jest-resolve "^22.0.4"
-    jest-util "^22.0.4"
+    jest-config "^22.4.2"
+    jest-haste-map "^22.4.2"
+    jest-regex-util "^22.1.0"
+    jest-resolve "^22.4.2"
+    jest-util "^22.4.1"
+    jest-validate "^22.4.2"
     json-stable-stringify "^1.0.1"
     micromatch "^2.3.11"
     realpath-native "^1.0.0"
@@ -7997,16 +8598,20 @@ jest-runtime@^22.0.4:
     write-file-atomic "^2.1.0"
     yargs "^10.0.3"
 
-jest-snapshot@>=20.0.3, jest-snapshot@^22.0.3:
-  version "22.0.3"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-22.0.3.tgz#a949b393781d2fdb4773f6ea765dd67ad1da291e"
+jest-serializer@^22.4.0:
+  version "22.4.0"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-22.4.0.tgz#b5d145b98c4b0d2c20ab686609adbb81fe23b566"
+
+jest-snapshot@>=20.0.3:
+  version "22.0.6"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-22.0.6.tgz#30c1f85b6f050891c4a2060d807a3d65a594591c"
   dependencies:
     chalk "^2.0.1"
-    jest-diff "^22.0.3"
-    jest-matcher-utils "^22.0.3"
+    jest-diff "^22.0.6"
+    jest-matcher-utils "^22.0.6"
     mkdirp "^0.5.1"
     natural-compare "^1.4.0"
-    pretty-format "^22.0.3"
+    pretty-format "^22.0.6"
 
 jest-snapshot@^20.0.3:
   version "20.0.3"
@@ -8019,20 +8624,20 @@ jest-snapshot@^20.0.3:
     natural-compare "^1.4.0"
     pretty-format "^20.0.3"
 
-jest-snapshot@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-21.2.1.tgz#29e49f16202416e47343e757e5eff948c07fd7b0"
+jest-snapshot@^22.4.0:
+  version "22.4.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-22.4.0.tgz#03d3ce63f8fa7352388afc6a3c8b5ccc3a180ed7"
   dependencies:
     chalk "^2.0.1"
-    jest-diff "^21.2.1"
-    jest-matcher-utils "^21.2.1"
+    jest-diff "^22.4.0"
+    jest-matcher-utils "^22.4.0"
     mkdirp "^0.5.1"
     natural-compare "^1.4.0"
-    pretty-format "^21.2.1"
+    pretty-format "^22.4.0"
 
-jest-specific-snapshot@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/jest-specific-snapshot/-/jest-specific-snapshot-0.3.0.tgz#89d37c7c2e94180c7b58bfedf9d9dc172ebd19e3"
+jest-specific-snapshot@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/jest-specific-snapshot/-/jest-specific-snapshot-0.4.0.tgz#31d1a644a3d86e481aa3cb8fd62eddc1ff4ea676"
   dependencies:
     jest-snapshot ">=20.0.3"
 
@@ -8048,29 +8653,17 @@ jest-util@^20.0.3:
     leven "^2.1.0"
     mkdirp "^0.5.1"
 
-jest-util@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-21.2.1.tgz#a274b2f726b0897494d694a6c3d6a61ab819bb78"
-  dependencies:
-    callsites "^2.0.0"
-    chalk "^2.0.1"
-    graceful-fs "^4.1.11"
-    jest-message-util "^21.2.1"
-    jest-mock "^21.2.0"
-    jest-validate "^21.2.1"
-    mkdirp "^0.5.1"
-
-jest-util@^22.0.4:
-  version "22.0.4"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-22.0.4.tgz#d920a513e0645aaab030cee38e4fe7d5bed8bb6d"
+jest-util@^22.4.1:
+  version "22.4.1"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-22.4.1.tgz#dd17c3bdb067f8e90591563ec0c42bf847dc249f"
   dependencies:
     callsites "^2.0.0"
     chalk "^2.0.1"
     graceful-fs "^4.1.11"
     is-ci "^1.0.10"
-    jest-message-util "^22.0.3"
-    jest-validate "^22.0.3"
+    jest-message-util "^22.4.0"
     mkdirp "^0.5.1"
+    source-map "^0.6.0"
 
 jest-validate@^20.0.3:
   version "20.0.3"
@@ -8081,47 +8674,59 @@ jest-validate@^20.0.3:
     leven "^2.1.0"
     pretty-format "^20.0.3"
 
-jest-validate@^21.1.0, jest-validate@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-21.2.1.tgz#cc0cbca653cd54937ba4f2a111796774530dd3c7"
+jest-validate@^22.4.0, jest-validate@^22.4.2:
+  version "22.4.2"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-22.4.2.tgz#e789a4e056173bf97fe797a2df2d52105c57d4f4"
   dependencies:
     chalk "^2.0.1"
-    jest-get-type "^21.2.0"
+    jest-config "^22.4.2"
+    jest-get-type "^22.1.0"
     leven "^2.1.0"
-    pretty-format "^21.2.1"
+    pretty-format "^22.4.0"
 
-jest-validate@^22.0.3:
-  version "22.0.3"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-22.0.3.tgz#2850d949a36c48b1a40f7eebae1d8539126f7829"
+jest-vue-preprocessor@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/jest-vue-preprocessor/-/jest-vue-preprocessor-1.3.1.tgz#7161a4f1f66eee34c406476447c8cd709938ad75"
   dependencies:
-    chalk "^2.0.1"
-    jest-get-type "^22.0.3"
-    leven "^2.1.0"
-    pretty-format "^22.0.3"
+    babel-plugin-transform-runtime "6.23.0"
+    find-babel-config "1.1.0"
+    typescript "2.5.3"
+    vue-property-decorator "6.0.0"
 
-jest-worker@^22.0.3:
+jest-worker@22.0.3:
   version "22.0.3"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-22.0.3.tgz#30433faca67814a8f80559f75ab2ceaa61332fd2"
   dependencies:
     merge-stream "^1.0.1"
 
+jest-worker@^22.0.3:
+  version "22.0.6"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-22.0.6.tgz#1998ac7ab24a6eee4deddec76efe7742f2651504"
+  dependencies:
+    merge-stream "^1.0.1"
+
+jest-worker@^22.2.2:
+  version "22.2.2"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-22.2.2.tgz#c1f5dc39976884b81f68ec50cb8532b2cbab3390"
+  dependencies:
+    merge-stream "^1.0.1"
+
+jest-zone-patch@^0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/jest-zone-patch/-/jest-zone-patch-0.0.8.tgz#90fa3b5b60e95ad3e624dd2c3eb59bb1dcabd371"
+
 jest@20.0.4, jest@^20.0.4:
   version "20.0.4"
   resolved "https://registry.yarnpkg.com/jest/-/jest-20.0.4.tgz#3dd260c2989d6dad678b1e9cc4d91944f6d602ac"
   dependencies:
     jest-cli "^20.0.4"
 
-jest@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-21.2.1.tgz#c964e0b47383768a1438e3ccf3c3d470327604e1"
+jest@^22.4.2:
+  version "22.4.2"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-22.4.2.tgz#34012834a49bf1bdd3bc783850ab44e4499afc20"
   dependencies:
-    jest-cli "^21.2.1"
-
-jest@^22.0.4:
-  version "22.0.4"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-22.0.4.tgz#d3cf560ece6b825b115dce80b9826ceb40f87961"
-  dependencies:
-    jest-cli "^22.0.4"
+    import-local "^1.0.0"
+    jest-cli "^22.4.2"
 
 js-base64@^2.1.8, js-base64@^2.1.9:
   version "2.4.0"
@@ -8131,7 +8736,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
-js-yaml@^3.10.0, js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@^3.6.1, js-yaml@^3.7.0, js-yaml@^3.9.0, js-yaml@^3.9.1:
+js-yaml@^3.10.0, js-yaml@^3.4.3, js-yaml@^3.6.1, js-yaml@^3.7.0, js-yaml@^3.9.0, js-yaml@^3.9.1:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
   dependencies:
@@ -8149,9 +8754,9 @@ jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
 
-jscodeshift@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.4.0.tgz#a76afdbfc6f4e78c3fd0d1a60470dfa43c03190e"
+jscodeshift@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.4.1.tgz#da91a1c2eccfa03a3387a21d39948e251ced444a"
   dependencies:
     async "^1.5.0"
     babel-plugin-transform-flow-strip-types "^6.8.0"
@@ -8169,7 +8774,7 @@ jscodeshift@^0.4.0:
     temp "^0.8.1"
     write-file-atomic "^1.2.0"
 
-jsdom@^11.3.0, jsdom@^11.5.1:
+jsdom@^11.5.1:
   version "11.5.1"
   resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.5.1.tgz#5df753b8d0bca20142ce21f4f6c039f99a992929"
   dependencies:
@@ -8226,6 +8831,10 @@ jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
 
+jsesc@^2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
+
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
@@ -8271,17 +8880,23 @@ json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
 
-json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
+json-stable-stringify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
   dependencies:
     jsonify "~0.0.0"
 
-json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
+json-stable-stringify@~0.0.0:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz#611c23e814db375527df851193db59dd2af27f45"
+  dependencies:
+    jsonify "~0.0.0"
+
+json-stringify-safe@5.0.x, json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
 
-json3@3.3.2, json3@^3.3.2:
+json3@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
 
@@ -8336,7 +8951,7 @@ jsx-ast-utils@^1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz#3867213e8dd79bf1e8f2300c0cfc1efb182c0df1"
 
-jsx-ast-utils@^2.0.0:
+jsx-ast-utils@^2.0.0, jsx-ast-utils@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f"
   dependencies:
@@ -8365,9 +8980,9 @@ karma-cli@~1.0.1:
   dependencies:
     resolve "^1.1.6"
 
-karma-coverage-istanbul-reporter@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-1.3.3.tgz#daf26051d5a0daa5838a4ce81aa4a41724bdf36b"
+karma-coverage-istanbul-reporter@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-1.4.1.tgz#2b42d145ddbb4868d85d52888c495a21c61d873c"
   dependencies:
     istanbul-api "^1.1.14"
     minimatch "^3.0.4"
@@ -8388,12 +9003,13 @@ karma-source-map-support@^1.2.0:
   dependencies:
     source-map-support "^0.4.1"
 
-karma@~1.7.0:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-1.7.1.tgz#85cc08e9e0a22d7ce9cca37c4a1be824f6a2b1ae"
+karma@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-2.0.0.tgz#a02698dd7f0f05ff5eb66ab8f65582490b512e58"
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
+    browserify "^14.5.0"
     chokidar "^1.4.1"
     colors "^1.1.0"
     combine-lists "^1.0.0"
@@ -8406,8 +9022,8 @@ karma@~1.7.0:
     graceful-fs "^4.1.2"
     http-proxy "^1.13.0"
     isbinaryfile "^3.0.0"
-    lodash "^3.8.0"
-    log4js "^0.6.31"
+    lodash "^4.17.4"
+    log4js "^2.3.9"
     mime "^1.3.4"
     minimatch "^3.0.2"
     optimist "^0.6.1"
@@ -8415,9 +9031,9 @@ karma@~1.7.0:
     range-parser "^1.2.0"
     rimraf "^2.6.0"
     safe-buffer "^5.0.1"
-    socket.io "1.7.3"
-    source-map "^0.5.3"
-    tmp "0.0.31"
+    socket.io "2.0.4"
+    source-map "^0.6.1"
+    tmp "0.0.33"
     useragent "^2.1.12"
 
 keycode@^2.1.9:
@@ -8460,6 +9076,14 @@ klaw@^1.0.0:
   optionalDependencies:
     graceful-fs "^4.1.9"
 
+labeled-stream-splicer@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz#a52e1d138024c00b86b1c0c91f677918b8ae0a59"
+  dependencies:
+    inherits "^2.0.1"
+    isarray "~0.0.1"
+    stream-splicer "^2.0.0"
+
 latest-version@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-2.0.0.tgz#56f8d6139620847b8017f8f1f4d78e211324168b"
@@ -8504,7 +9128,7 @@ left-pad@^1.1.3, left-pad@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.2.0.tgz#d30a73c6b8201d8f7d8e7956ba9616087a68e0ee"
 
-lerna@^2.5.1:
+lerna@2.5.1:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/lerna/-/lerna-2.5.1.tgz#d07099bd3051ee799f98c753328bd69e96c6fab8"
   dependencies:
@@ -8579,6 +9203,24 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
+lexical-scope@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/lexical-scope/-/lexical-scope-1.2.0.tgz#fcea5edc704a4b3a8796cdca419c3a0afaf22df4"
+  dependencies:
+    astw "^2.0.0"
+
+libbase64@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/libbase64/-/libbase64-0.1.0.tgz#62351a839563ac5ff5bd26f12f60e9830bb751e6"
+
+libmime@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/libmime/-/libmime-3.0.0.tgz#51a1a9e7448ecbd32cda54421675bb21bc093da6"
+  dependencies:
+    iconv-lite "0.4.15"
+    libbase64 "0.1.0"
+    libqp "1.1.0"
+
 libnpx@9.7.1:
   version "9.7.1"
   resolved "https://registry.yarnpkg.com/libnpx/-/libnpx-9.7.1.tgz#55300b5e119bd47b714be9704ca0696ffb18b025"
@@ -8592,6 +9234,10 @@ libnpx@9.7.1:
     y18n "^3.2.1"
     yargs "^8.0.2"
 
+libqp@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/libqp/-/libqp-1.1.0.tgz#f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8"
+
 license-webpack-plugin@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-1.1.1.tgz#76b2cedccc78f139fd7877e576f756cfc141b8c2"
@@ -8610,30 +9256,31 @@ linkify-it@^2.0.0:
   dependencies:
     uc.micro "^1.0.1"
 
-lint-staged@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-6.0.0.tgz#7ab7d345f2fe302ff196f1de6a005594ace03210"
+lint-staged@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-7.0.0.tgz#57926c63201e7bd38ca0576d74391efa699b4a9d"
   dependencies:
-    app-root-path "^2.0.0"
-    chalk "^2.1.0"
-    commander "^2.11.0"
-    cosmiconfig "^3.1.0"
+    app-root-path "^2.0.1"
+    chalk "^2.3.1"
+    commander "^2.14.1"
+    cosmiconfig "^4.0.0"
     debug "^3.1.0"
     dedent "^0.7.0"
-    execa "^0.8.0"
+    execa "^0.9.0"
     find-parent-dir "^0.3.0"
     is-glob "^4.0.0"
-    jest-validate "^21.1.0"
+    jest-validate "^22.4.0"
     listr "^0.13.0"
-    lodash "^4.17.4"
-    log-symbols "^2.0.0"
-    minimatch "^3.0.0"
+    lodash "^4.17.5"
+    log-symbols "^2.2.0"
+    micromatch "^3.1.8"
     npm-which "^3.0.1"
     p-map "^1.1.1"
     path-is-inside "^1.0.2"
     pify "^3.0.0"
-    staged-git-files "0.0.4"
-    stringify-object "^3.2.0"
+    please-upgrade-node "^3.0.1"
+    staged-git-files "1.1.0"
+    stringify-object "^3.2.2"
 
 listr-silent-renderer@^1.1.1:
   version "1.1.1"
@@ -8746,7 +9393,7 @@ loader-utils@1.1.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.
     emojis-list "^2.0.0"
     json5 "^0.5.0"
 
-loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@~0.2.2:
+loader-utils@^0.2.15, loader-utils@^0.2.16:
   version "0.2.17"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
   dependencies:
@@ -8862,6 +9509,10 @@ lodash.defaults@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
 
+lodash.endswith@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/lodash.endswith/-/lodash.endswith-4.2.1.tgz#fed59ac1738ed3e236edd7064ec456448b37bc09"
+
 lodash.escape@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
@@ -8895,6 +9546,10 @@ lodash.isequal@^3.0:
     lodash._baseisequal "^3.0.0"
     lodash._bindcallback "^3.0.0"
 
+lodash.isfunction@^3.0.8:
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051"
+
 lodash.isobject@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-3.0.2.tgz#3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d"
@@ -8903,6 +9558,10 @@ lodash.isplainobject@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
 
+lodash.isstring@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
+
 lodash.istypedarray@^3.0.0:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz#c9a477498607501d8e8494d283b87c39281cef62"
@@ -8923,6 +9582,10 @@ lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
 
+lodash.memoize@~3.0.3:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"
+
 lodash.mergewith@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55"
@@ -8955,6 +9618,10 @@ lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
 
+lodash.startswith@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/lodash.startswith/-/lodash.startswith-4.2.1.tgz#c598c4adce188a27e53145731cdc6c0e7177600c"
+
 lodash.tail@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
@@ -9009,23 +9676,27 @@ lodash@3.7.x:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.7.0.tgz#3678bd8ab995057c07ade836ed2ef087da811d45"
 
-lodash@4.x.x, "lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.0.1, lodash@^4.1.0, lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.6, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.6.1, lodash@~4.17.4:
+"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.0.1, lodash@^4.1.0, lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.6, lodash@^4.17.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.6.1, lodash@~4.17.4:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
-lodash@^3.10.1, lodash@^3.3.1, lodash@^3.5.0, lodash@^3.8.0:
+lodash@^3.10.1, lodash@^3.3.1, lodash@^3.5.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
+lodash@^4.17.5, lodash@^4.5.1:
+  version "4.17.5"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
+
 log-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
   dependencies:
     chalk "^1.0.0"
 
-log-symbols@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.1.0.tgz#f35fa60e278832b538dc4dddcbb478a45d3e3be6"
+log-symbols@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
   dependencies:
     chalk "^2.0.1"
 
@@ -9036,16 +9707,36 @@ log-update@^1.0.2:
     ansi-escapes "^1.0.0"
     cli-cursor "^1.0.2"
 
-log4js@^0.6.31:
-  version "0.6.38"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-0.6.38.tgz#2c494116695d6fb25480943d3fc872e662a522fd"
+log4js@^2.3.9:
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-2.5.3.tgz#38bb7bde5e9c1c181bd75e8bc128c5cd0409caf1"
   dependencies:
-    readable-stream "~1.0.2"
-    semver "~4.3.3"
+    circular-json "^0.5.1"
+    date-format "^1.2.0"
+    debug "^3.1.0"
+    semver "^5.3.0"
+    streamroller "^0.7.0"
+  optionalDependencies:
+    amqplib "^0.5.2"
+    axios "^0.15.3"
+    hipchat-notifier "^1.1.0"
+    loggly "^1.1.0"
+    mailgun-js "^0.7.0"
+    nodemailer "^2.5.0"
+    redis "^2.7.1"
+    slack-node "~0.2.0"
+
+loggly@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/loggly/-/loggly-1.1.1.tgz#0a0fc1d3fa3a5ec44fdc7b897beba2a4695cebee"
+  dependencies:
+    json-stringify-safe "5.0.x"
+    request "2.75.x"
+    timespan "2.3.x"
 
 loglevel@^1.4.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.0.tgz#ae0caa561111498c5ba13723d6fb631d24003934"
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
 
 longest-streak@^2.0.1:
   version "2.0.2"
@@ -9076,6 +9767,12 @@ lowercase-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
 
+lowlight@~1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/lowlight/-/lowlight-1.9.1.tgz#ed7c3dffc36f8c1f263735c0fe0c907847c11250"
+  dependencies:
+    highlight.js "~9.12.0"
+
 lru-cache@2.2.x:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d"
@@ -9087,6 +9784,10 @@ lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@~4.1.1:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
+lru-cache@~2.6.5:
+  version "2.6.5"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.6.5.tgz#e56d6354148ede8d7707b58d143220fd08df0fd5"
+
 macaddress@^0.2.8:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
@@ -9101,16 +9802,41 @@ magic-string@^0.22.3:
   dependencies:
     vlq "^0.2.1"
 
+mailcomposer@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/mailcomposer/-/mailcomposer-4.0.1.tgz#0e1c44b2a07cf740ee17dc149ba009f19cadfeb4"
+  dependencies:
+    buildmail "4.0.1"
+    libmime "3.0.0"
+
+mailgun-js@^0.7.0:
+  version "0.7.15"
+  resolved "https://registry.yarnpkg.com/mailgun-js/-/mailgun-js-0.7.15.tgz#ee366a20dac64c3c15c03d6c1b3e0ed795252abb"
+  dependencies:
+    async "~2.1.2"
+    debug "~2.2.0"
+    form-data "~2.1.1"
+    inflection "~1.10.0"
+    is-stream "^1.1.0"
+    path-proxy "~1.0.0"
+    proxy-agent "~2.0.0"
+    q "~1.4.0"
+    tsscmp "~1.0.0"
+
 make-dir@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.1.0.tgz#19b4369fe48c116f53c2af95ad102c0e39e85d51"
   dependencies:
     pify "^3.0.0"
 
-make-error@^1.1.1, make-error@^1.3.2:
+make-error@^1.1.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.2.tgz#8762ffad2444dd8ff1f7c819629fa28e24fea1c4"
 
+make-error@^1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.4.tgz#19978ed575f9e9545d2ff8c13e33b5d18a67d535"
+
 make-fetch-happen@^2.4.13:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-2.6.0.tgz#8474aa52198f6b1ae4f3094c04e8370d35ea8a38"
@@ -9173,20 +9899,24 @@ markdown-it@^8.4.0:
     mdurl "^1.0.1"
     uc.micro "^1.0.3"
 
-markdown-loader@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/markdown-loader/-/markdown-loader-2.0.1.tgz#eed8bead82978bacf17b76a11c5593a013e2d976"
+markdown-loader@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/markdown-loader/-/markdown-loader-2.0.2.tgz#1cdcf11307658cd611046d7db34c2fe80542af7c"
   dependencies:
     loader-utils "^1.1.0"
-    marked "^0.3.6"
+    marked "^0.3.9"
 
 markdown-table@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.1.tgz#4b3dd3a133d1518b8ef0dbc709bf2a1b4824bc8c"
 
-marked@^0.3.6, marked@^0.3.9:
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.9.tgz#54ce6a57e720c3ac6098374ec625fcbcc97ff290"
+marked@^0.3.17:
+  version "0.3.17"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.17.tgz#607f06668b3c6b1246b28f13da76116ac1aa2d2b"
+
+marked@^0.3.9:
+  version "0.3.12"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.12.tgz#7cf25ff2252632f3fe2406bde258e94eee927519"
 
 marksy@^6.0.3:
   version "6.0.3"
@@ -9302,14 +10032,24 @@ methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
 
-metro-bundler@^0.20.0:
-  version "0.20.3"
-  resolved "https://registry.yarnpkg.com/metro-bundler/-/metro-bundler-0.20.3.tgz#0ded01b64e8963117017b106f75b83cfc34f3656"
+metro-core@0.24.4, metro-core@^0.24.1:
+  version "0.24.4"
+  resolved "https://registry.yarnpkg.com/metro-core/-/metro-core-0.24.4.tgz#98fb7dd6abf8ea13af3e6f5a6080b7600e98d842"
+
+metro-source-map@0.24.4:
+  version "0.24.4"
+  resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.24.4.tgz#b56c2ec94629d44c15304fd886d40d23ea970073"
+  dependencies:
+    source-map "^0.5.6"
+
+metro@^0.24.1:
+  version "0.24.4"
+  resolved "https://registry.yarnpkg.com/metro/-/metro-0.24.4.tgz#e67ed4a4992219992cd2d12792a0401b98e16f0c"
   dependencies:
     absolute-path "^0.0.0"
     async "^2.4.0"
     babel-core "^6.24.1"
-    babel-generator "^6.24.1"
+    babel-generator "^6.26.0"
     babel-plugin-external-helpers "^6.18.0"
     babel-preset-es2015-node "^6.1.1"
     babel-preset-fbjs "^2.1.4"
@@ -9318,19 +10058,24 @@ metro-bundler@^0.20.0:
     babylon "^6.18.0"
     chalk "^1.1.1"
     concat-stream "^1.6.0"
+    connect "^2.8.3"
     core-js "^2.2.2"
     debug "^2.2.0"
     denodeify "^1.2.1"
     fbjs "^0.8.14"
+    fs-extra "^1.0.0"
     graceful-fs "^4.1.3"
     image-size "^0.6.0"
-    jest-docblock "^21"
-    jest-haste-map "^21"
+    jest-docblock "22.0.3"
+    jest-haste-map "22.0.3"
+    jest-worker "22.0.3"
     json-stable-stringify "^1.0.1"
     json5 "^0.4.0"
     left-pad "^1.1.3"
     lodash "^4.16.6"
     merge-stream "^1.0.1"
+    metro-core "0.24.4"
+    metro-source-map "0.24.4"
     mime-types "2.1.11"
     mkdirp "^0.5.1"
     request "^2.79.0"
@@ -9338,10 +10083,11 @@ metro-bundler@^0.20.0:
     source-map "^0.5.6"
     temp "0.8.3"
     throat "^4.1.0"
-    uglify-es "^3.1.8"
+    uglify-es "^3.1.9"
     wordwrap "^1.0.0"
     write-file-atomic "^1.2.0"
     xpipe "^1.0.5"
+    yargs "^9.0.0"
 
 micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7:
   version "2.3.11"
@@ -9362,8 +10108,8 @@ micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7:
     regex-cache "^0.4.2"
 
 micromatch@^3.1.4:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.4.tgz#bb812e741a41f982c854e42b421a7eac458796f4"
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.5.tgz#d05e168c206472dfbca985bfef4f57797b4cd4ba"
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -9379,6 +10125,24 @@ micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+micromatch@^3.1.8:
+  version "3.1.9"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.9.tgz#15dc93175ae39e52e93087847096effc73efcf89"
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
@@ -9398,13 +10162,23 @@ mime-db@~1.30.0:
   version "1.30.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
 
+mime-db@~1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
+
 mime-types@2.1.11:
   version "2.1.11"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.11.tgz#c259c471bda808a85d6cd193b430a5fae4473b3c"
   dependencies:
     mime-db "~1.23.0"
 
-mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.6, mime-types@~2.1.7, mime-types@~2.1.9:
+mime-types@^2.1.11:
+  version "2.1.18"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
+  dependencies:
+    mime-db "~1.33.0"
+
+mime-types@^2.1.12, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.6, mime-types@~2.1.7, mime-types@~2.1.9:
   version "2.1.17"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
   dependencies:
@@ -9414,10 +10188,6 @@ mime@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
 
-mime@1.3.x:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
-
 mime@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
@@ -9501,24 +10271,18 @@ mixin-object@^2.0.1:
     for-in "^0.1.3"
     is-extendable "^0.1.1"
 
-mkdirp-promise@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz#e9b8f68e552c68a9c1713b84883f7a1dd039b8a1"
-  dependencies:
-    mkdirp "*"
-
-mkdirp@*, mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  dependencies:
-    minimist "0.0.8"
-
 mkdirp@0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12"
   dependencies:
     minimist "0.0.8"
 
+mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  dependencies:
+    minimist "0.0.8"
+
 mock-fs@^4.3.0:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-4.4.2.tgz#09dec5313f97095a450be6aa2ad8ab6738d63d6b"
@@ -9527,6 +10291,26 @@ modify-values@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.0.tgz#e2b6cdeb9ce19f99317a53722f3dbf5df5eaaab2"
 
+module-deps@^4.0.8:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-4.1.1.tgz#23215833f1da13fd606ccb8087b44852dcb821fd"
+  dependencies:
+    JSONStream "^1.0.3"
+    browser-resolve "^1.7.0"
+    cached-path-relative "^1.0.0"
+    concat-stream "~1.5.0"
+    defined "^1.0.0"
+    detective "^4.0.0"
+    duplexer2 "^0.1.2"
+    inherits "^2.0.1"
+    parents "^1.0.0"
+    readable-stream "^2.0.2"
+    resolve "^1.1.3"
+    stream-combiner2 "^1.1.1"
+    subarg "^1.0.0"
+    through2 "^2.0.0"
+    xtend "^4.0.0"
+
 moment@^2.20.1, moment@^2.6.0:
   version "2.20.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"
@@ -9600,21 +10384,13 @@ mute-stream@0.0.7, mute-stream@~0.0.4:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
-mz@^2.4.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
-  dependencies:
-    any-promise "^1.0.0"
-    object-assign "^4.0.1"
-    thenify-all "^1.0.0"
-
-nan@^2.0.5, nan@^2.3.0, nan@^2.3.2:
+nan@^2.3.0, nan@^2.3.2:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
 
 nanomatch@^1.2.5:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.6.tgz#f27233e97c34a8706b7e781a4bc611c957a81625"
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.7.tgz#53cd4aa109ff68b7f869591fdc9d10daeeea3e79"
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -9628,6 +10404,23 @@ nanomatch@^1.2.5:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+nanomatch@^1.2.9:
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-odd "^2.0.0"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -9658,10 +10451,18 @@ nested-object-assign@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/nested-object-assign/-/nested-object-assign-1.0.2.tgz#9a84ef51b5c11298b5476d6c65b26458c9eae82b"
 
+netmask@~1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35"
+
 netrc@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/netrc/-/netrc-0.1.4.tgz#6be94fcaca8d77ade0a9670dc460914c94472444"
 
+nice-try@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.4.tgz#d93962f6c52f2c1558c0fbda6d512819f1efe1c4"
+
 no-case@^2.2.0:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
@@ -9772,7 +10573,16 @@ node-notifier@^5.0.2, node-notifier@^5.1.2:
     shellwords "^0.1.0"
     which "^1.2.12"
 
-node-pre-gyp@^0.6.36, node-pre-gyp@^0.6.39:
+node-notifier@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.2.1.tgz#fa313dd08f5517db0e2502e5758d664ac69f9dea"
+  dependencies:
+    growly "^1.3.0"
+    semver "^5.4.1"
+    shellwords "^0.1.1"
+    which "^1.3.0"
+
+node-pre-gyp@^0.6.39:
   version "0.6.39"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649"
   dependencies:
@@ -9788,7 +10598,7 @@ node-pre-gyp@^0.6.36, node-pre-gyp@^0.6.39:
     tar "^2.2.1"
     tar-pack "^3.4.0"
 
-node-sass@^4.3.0:
+node-sass@^4.7.2:
   version "4.7.2"
   resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.7.2.tgz#9366778ba1469eb01438a9e8592f4262bcb6794e"
   dependencies:
@@ -9816,21 +10626,76 @@ node-status-codes@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"
 
+node-uuid@~1.4.7:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
+
 node-version@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/node-version/-/node-version-1.1.0.tgz#f437d7ba407e65e2c4eaef8887b1718ba523d4f0"
 
-nodemon@^1.14.8:
-  version "1.14.8"
-  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.14.8.tgz#0cc906035e2d4bf771d5f40fb5d8e37fb3e673e7"
+nodemailer-direct-transport@3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/nodemailer-direct-transport/-/nodemailer-direct-transport-3.3.2.tgz#e96fafb90358560947e569017d97e60738a50a86"
   dependencies:
-    chokidar "^1.7.0"
-    debug "^2.6.8"
+    nodemailer-shared "1.1.0"
+    smtp-connection "2.12.0"
+
+nodemailer-fetch@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz#79c4908a1c0f5f375b73fe888da9828f6dc963a4"
+
+nodemailer-shared@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz#cf5994e2fd268d00f5cf0fa767a08169edb07ec0"
+  dependencies:
+    nodemailer-fetch "1.6.0"
+
+nodemailer-smtp-pool@2.8.2:
+  version "2.8.2"
+  resolved "https://registry.yarnpkg.com/nodemailer-smtp-pool/-/nodemailer-smtp-pool-2.8.2.tgz#2eb94d6cf85780b1b4725ce853b9cbd5e8da8c72"
+  dependencies:
+    nodemailer-shared "1.1.0"
+    nodemailer-wellknown "0.1.10"
+    smtp-connection "2.12.0"
+
+nodemailer-smtp-transport@2.7.2:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/nodemailer-smtp-transport/-/nodemailer-smtp-transport-2.7.2.tgz#03d71c76314f14ac7dbc7bf033a6a6d16d67fb77"
+  dependencies:
+    nodemailer-shared "1.1.0"
+    nodemailer-wellknown "0.1.10"
+    smtp-connection "2.12.0"
+
+nodemailer-wellknown@0.1.10:
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz#586db8101db30cb4438eb546737a41aad0cf13d5"
+
+nodemailer@^2.5.0:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-2.7.2.tgz#f242e649aeeae39b6c7ed740ef7b061c404d30f9"
+  dependencies:
+    libmime "3.0.0"
+    mailcomposer "4.0.1"
+    nodemailer-direct-transport "3.3.2"
+    nodemailer-shared "1.1.0"
+    nodemailer-smtp-pool "2.8.2"
+    nodemailer-smtp-transport "2.7.2"
+    socks "1.1.9"
+
+nodemon@^1.17.1:
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.17.1.tgz#cdb4bc53d7a86d6162143a1a44d7adf927d8652f"
+  dependencies:
+    chokidar "^2.0.2"
+    debug "^3.1.0"
     ignore-by-default "^1.0.1"
     minimatch "^3.0.4"
     pstree.remy "^1.1.0"
+    semver "^5.5.0"
+    supports-color "^5.2.0"
     touch "^3.1.0"
-    undefsafe "0.0.3"
+    undefsafe "^2.0.2"
     update-notifier "^2.3.0"
 
 nomnom@^1.8.1:
@@ -9918,8 +10783,8 @@ npm-install-checks@~3.0.0:
     validate-npm-package-name "^3.0.0"
 
 npm-path@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.3.tgz#15cff4e1c89a38da77f56f6055b24f975dfb2bbe"
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64"
   dependencies:
     which "^1.2.10"
 
@@ -10114,10 +10979,6 @@ oauth-sign@~0.8.1, oauth-sign@~0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
 
-object-assign@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
-
 object-assign@4.1.1, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -10249,9 +11110,9 @@ openurl@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/openurl/-/openurl-1.1.1.tgz#3875b4b0ef7a52c156f0db41d4609dbb0f94b387"
 
-opn@5.1.0, opn@^5.1.0, opn@~5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.1.0.tgz#72ce2306a17dbea58ff1041853352b4a8fc77519"
+opn@5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.2.0.tgz#71fdf934d6827d676cecbea1531f95d354641225"
   dependencies:
     is-wsl "^1.1.0"
 
@@ -10261,6 +11122,12 @@ opn@^3.0.2:
   dependencies:
     object-assign "^4.0.1"
 
+opn@^5.1.0, opn@~5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.1.0.tgz#72ce2306a17dbea58ff1041853352b4a8fc77519"
+  dependencies:
+    is-wsl "^1.1.0"
+
 optimist@^0.6.1, optimist@~0.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
@@ -10298,7 +11165,7 @@ original@>=0.0.5:
   dependencies:
     url-parse "1.0.x"
 
-os-browserify@^0.3.0:
+os-browserify@^0.3.0, os-browserify@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
 
@@ -10346,10 +11213,6 @@ output-file-sync@^1.1.2:
     mkdirp "^0.5.1"
     object-assign "^4.1.0"
 
-p-cancelable@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa"
-
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
@@ -10374,6 +11237,30 @@ p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
 
+pac-proxy-agent@1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-1.1.0.tgz#34a385dfdf61d2f0ecace08858c745d3e791fd4d"
+  dependencies:
+    agent-base "2"
+    debug "2"
+    extend "3"
+    get-uri "2"
+    http-proxy-agent "1"
+    https-proxy-agent "1"
+    pac-resolver "~2.0.0"
+    raw-body "2"
+    socks-proxy-agent "2"
+
+pac-resolver@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-2.0.0.tgz#99b88d2f193fbdeefc1c9a529c1f3260ab5277cd"
+  dependencies:
+    co "~3.0.6"
+    degenerator "~1.0.2"
+    ip "1.0.1"
+    netmask "~1.0.4"
+    thunkify "~2.1.1"
+
 package-json@^2.0.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/package-json/-/package-json-2.4.0.tgz#0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb"
@@ -10436,6 +11323,12 @@ param-case@2.1.x:
   dependencies:
     no-case "^2.2.0"
 
+parents@^1.0.0, parents@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parents/-/parents-1.0.1.tgz#fedd4d2bf193a77745fe71e371d73c3307d9c751"
+  dependencies:
+    path-platform "~0.11.15"
+
 parse-asn1@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712"
@@ -10450,7 +11343,7 @@ parse-diff@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/parse-diff/-/parse-diff-0.4.0.tgz#9ce35bcce8fc0b7c58f46d71113394fc0b4982dd"
 
-parse-entities@^1.0.2:
+parse-entities@^1.0.2, parse-entities@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.1.1.tgz#8112d88471319f27abae4d64964b122fe4e1b890"
   dependencies:
@@ -10516,22 +11409,26 @@ parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
 
+parse5-utils@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/parse5-utils/-/parse5-utils-2.0.0.tgz#c926c1764e2431a450a5941f302db9beaec9d78a"
+  dependencies:
+    parse5 "^2.2.1"
+
 parse5@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
 
+parse5@^2.2.1, parse5@^2.2.2:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-2.2.3.tgz#0c4fc41c1000c5e6b93d48b03f8083837834e9f6"
+
 parse5@^3.0.1, parse5@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
   dependencies:
     "@types/node" "*"
 
-parsejson@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/parsejson/-/parsejson-0.0.3.tgz#ab7e3759f209ece99437973f7d0f1f64ae0e64ab"
-  dependencies:
-    better-assert "~1.0.0"
-
 parseqs@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
@@ -10552,7 +11449,7 @@ pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
 
-path-browserify@0.0.0:
+path-browserify@0.0.0, path-browserify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
 
@@ -10578,7 +11475,7 @@ path-is-inside@^1.0.1, path-is-inside@^1.0.2, path-is-inside@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
 
-path-key@^2.0.0:
+path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
 
@@ -10586,6 +11483,16 @@ path-parse@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
 
+path-platform@~0.11.15:
+  version "0.11.15"
+  resolved "https://registry.yarnpkg.com/path-platform/-/path-platform-0.11.15.tgz#e864217f74c36850f0852b78dc7bf7d4a5721bf2"
+
+path-proxy@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/path-proxy/-/path-proxy-1.0.0.tgz#18e8a36859fc9d2f1a53b48dee138543c020de5e"
+  dependencies:
+    inflection "~1.3.0"
+
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
@@ -10623,6 +11530,15 @@ path@^0.12.7:
     process "^0.11.1"
     util "^0.10.3"
 
+paths.macro@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/paths.macro/-/paths.macro-2.0.2.tgz#7b7b3930170c9d41f42ec426c987b2df3505fb72"
+  dependencies:
+    babel-macros "^1.2.0"
+    babel-plugin-macros "^2.0.0"
+    find-root "^1.1.0"
+    upath "^1.0.2"
+
 pause-stream@0.0.11:
   version "0.0.11"
   resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
@@ -10699,6 +11615,10 @@ pkg-dir@^2.0.0:
   dependencies:
     find-up "^2.1.0"
 
+please-upgrade-node@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.0.1.tgz#0a681f2c18915e5433a5ca2cd94e0b8206a782db"
+
 plist@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/plist/-/plist-2.0.1.tgz#0a32ca9481b1c364e92e18dc55c876de9d01da8b"
@@ -10722,10 +11642,6 @@ plur@^2.1.2:
   dependencies:
     irregular-plurals "^1.0.0"
 
-pluralize@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
-
 pluralize@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
@@ -10738,12 +11654,19 @@ pngjs@^3.0.0, pngjs@^3.3.0:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.3.1.tgz#8e14e6679ee7424b544334c3b2d21cea6d8c209a"
 
-podda@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/podda/-/podda-1.2.2.tgz#15b0edbd334ade145813343f5ecf9c10a71cf500"
+polymer-webpack-loader@2.0.1, polymer-webpack-loader@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/polymer-webpack-loader/-/polymer-webpack-loader-2.0.1.tgz#d15d45328f6a6700366dfaee83fc606f39cdcee0"
   dependencies:
-    babel-runtime "^6.11.6"
-    immutable "^3.8.1"
+    css-selector-tokenizer "^0.7.0"
+    dom5 "^2.3.0"
+    espree "^3.4.3"
+    html-loader "^0.5.1"
+    loader-utils "^1.1.0"
+    parse5 "^3.0.2"
+    parse5-utils "^2.0.0"
+    postcss "^6.0.9"
+    source-map "^0.5.6"
 
 portfinder@^1.0.9, portfinder@~1.0.12:
   version "1.0.13"
@@ -10780,13 +11703,6 @@ postcss-convert-values@^2.3.4:
     postcss "^5.0.11"
     postcss-value-parser "^3.1.2"
 
-postcss-custom-properties@^6.1.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-6.2.0.tgz#5d929a7f06e9b84e0f11334194c0ba9a30acfbe9"
-  dependencies:
-    balanced-match "^1.0.0"
-    postcss "^6.0.13"
-
 postcss-discard-comments@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d"
@@ -10825,12 +11741,27 @@ postcss-filter-plugins@^2.0.0:
     postcss "^5.0.4"
     uniqid "^4.0.0"
 
-postcss-flexbugs-fixes@3.2.0, postcss-flexbugs-fixes@^3.0.0, postcss-flexbugs-fixes@^3.2.0:
+postcss-flexbugs-fixes@3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-3.2.0.tgz#9b8b932c53f9cf13ba0f61875303e447c33dcc51"
   dependencies:
     postcss "^6.0.1"
 
+postcss-flexbugs-fixes@^3.2.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-3.3.0.tgz#e00849b536063749da50a0d410ba5d9ee65e27b8"
+  dependencies:
+    postcss "^6.0.1"
+
+postcss-import@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-11.0.0.tgz#a962e2df82d3bc5a6da6a386841747204f41ef5b"
+  dependencies:
+    postcss "^6.0.1"
+    postcss-value-parser "^3.2.3"
+    read-cache "^1.0.0"
+    resolve "^1.1.7"
+
 postcss-load-config@^1.1.0, postcss-load-config@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
@@ -10863,7 +11794,7 @@ postcss-loader@2.0.8:
     postcss-load-config "^1.2.0"
     schema-utils "^0.3.0"
 
-postcss-loader@^2.0.10, postcss-loader@^2.0.8:
+postcss-loader@^2.0.10:
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.0.10.tgz#090db0540140bd56a7a7f717c41bc29aeef4c674"
   dependencies:
@@ -10872,6 +11803,15 @@ postcss-loader@^2.0.10, postcss-loader@^2.0.8:
     postcss-load-config "^1.2.0"
     schema-utils "^0.3.0"
 
+postcss-loader@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.1.1.tgz#208935af3b1d65e1abb1a870a912dd12e7b36895"
+  dependencies:
+    loader-utils "^1.1.0"
+    postcss "^6.0.0"
+    postcss-load-config "^1.2.0"
+    schema-utils "^0.4.0"
+
 postcss-merge-idents@^2.1.5:
   version "2.1.7"
   resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
@@ -10933,12 +11873,18 @@ postcss-minify-selectors@^2.0.4:
     postcss "^5.0.14"
     postcss-selector-parser "^2.0.0"
 
-postcss-modules-extract-imports@^1.0.0, postcss-modules-extract-imports@^1.1.0:
+postcss-modules-extract-imports@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz#b614c9720be6816eaee35fb3a5faa1dba6a05ddb"
   dependencies:
     postcss "^6.0.1"
 
+postcss-modules-extract-imports@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85"
+  dependencies:
+    postcss "^6.0.1"
+
 postcss-modules-local-by-default@^1.0.1, postcss-modules-local-by-default@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
@@ -11059,14 +12005,22 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
-postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.13, postcss@^6.0.15, postcss@^6.0.8:
-  version "6.0.15"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.15.tgz#f460cd6269fede0d1bf6defff0b934a9845d974d"
+postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.13, postcss@^6.0.16, postcss@^6.0.8, postcss@^6.0.9:
+  version "6.0.16"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.16.tgz#112e2fe2a6d2109be0957687243170ea5589e146"
   dependencies:
     chalk "^2.3.0"
     source-map "^0.6.1"
     supports-color "^5.1.0"
 
+postcss@^6.0.17:
+  version "6.0.19"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.19.tgz#76a78386f670b9d9494a655bf23ac012effd1555"
+  dependencies:
+    chalk "^2.3.1"
+    source-map "^0.6.1"
+    supports-color "^5.2.0"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -11079,9 +12033,13 @@ preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
-prettier@^1.7.0, prettier@^1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.9.2.tgz#96bc2132f7a32338e6078aeb29727178c6335827"
+prettier@^1.11.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.11.1.tgz#61e43fc4cd44e68f2b0dfc2c38cd4bb0fccdcc75"
+
+prettier@^1.7.0:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.2.tgz#1af8356d1842276a99a5b5529c82dd9e9ad3cc93"
 
 pretty-bytes@^4.0.2:
   version "4.0.2"
@@ -11101,16 +12059,16 @@ pretty-format@^20.0.3:
     ansi-regex "^2.1.1"
     ansi-styles "^3.0.0"
 
-pretty-format@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-21.2.1.tgz#ae5407f3cf21066cd011aa1ba5fce7b6a2eddb36"
+pretty-format@^22.0.6:
+  version "22.0.6"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-22.0.6.tgz#bbb78e38445f263c2d3b9e281f4b844380990720"
   dependencies:
     ansi-regex "^3.0.0"
     ansi-styles "^3.2.0"
 
-pretty-format@^22.0.3:
-  version "22.0.3"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-22.0.3.tgz#a2bfa59fc33ad24aa4429981bb52524b41ba5dd7"
+pretty-format@^22.4.0:
+  version "22.4.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-22.4.0.tgz#237b1f7e1c50ed03bc65c03ccc29d7c8bb7beb94"
   dependencies:
     ansi-regex "^3.0.0"
     ansi-styles "^3.2.0"
@@ -11119,6 +12077,18 @@ pretty-format@^4.2.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-4.3.1.tgz#530be5c42b3c05b36414a7a2a4337aa80acd0e8d"
 
+prismjs@^1.8.4:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.11.0.tgz#297aef33eb79421bfdb19273a5092ca515970d29"
+  optionalDependencies:
+    clipboard "^1.7.1"
+
+prismjs@~1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.10.0.tgz#77e5187c2ae6b3253fcc313029cf25fe53778721"
+  optionalDependencies:
+    clipboard "^1.7.1"
+
 private@^0.1.6, private@^0.1.7, private@~0.1.5:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
@@ -11127,7 +12097,11 @@ process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
 
-process@^0.11.1, process@^0.11.10:
+process-nextick-args@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+
+process@^0.11.1, process@^0.11.10, process@~0.11.0:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
 
@@ -11135,10 +12109,6 @@ process@~0.5.1:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf"
 
-progress@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
-
 progress@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
@@ -11192,6 +12162,18 @@ prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7,
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
+prop-types@^15.6.1:
+  version "15.6.1"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
+  dependencies:
+    fbjs "^0.8.16"
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
+property-information@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/property-information/-/property-information-3.2.0.tgz#fd1483c8fbac61808f5fe359e7693a1f48a58331"
+
 proto-list@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
@@ -11202,9 +12184,9 @@ protoduck@^4.0.0:
   dependencies:
     genfun "^4.0.1"
 
-protractor@~5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.2.2.tgz#80eff170761455eff6e2f111088a03c438844a41"
+protractor@~5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.3.0.tgz#5df98201cbdaeb50826af6d05630ef1945bf9c32"
   dependencies:
     "@types/node" "^6.0.46"
     "@types/q" "^0.0.32"
@@ -11212,7 +12194,7 @@ protractor@~5.2.2:
     blocking-proxy "^1.0.0"
     chalk "^1.1.3"
     glob "^7.0.3"
-    jasmine "^2.5.3"
+    jasmine "2.8.0"
     jasminewd2 "^2.1.0"
     optimist "~0.6.0"
     q "1.4.1"
@@ -11229,6 +12211,19 @@ proxy-addr@~2.0.2:
     forwarded "~0.1.2"
     ipaddr.js "1.5.2"
 
+proxy-agent@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-2.0.0.tgz#57eb5347aa805d74ec681cb25649dba39c933499"
+  dependencies:
+    agent-base "2"
+    debug "2"
+    extend "3"
+    http-proxy-agent "1"
+    https-proxy-agent "1"
+    lru-cache "~2.6.5"
+    pac-proxy-agent "1"
+    socks-proxy-agent "2"
+
 proxy-from-env@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
@@ -11270,19 +12265,26 @@ pump@^1.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-pumpify@^1.3.3:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.3.5.tgz#1b671c619940abcaeac0ad0e3a3c164be760993b"
+pump@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.0.tgz#7946da1c8d622b098e2ceb2d3476582470829c9d"
   dependencies:
-    duplexify "^3.1.2"
-    inherits "^2.0.1"
-    pump "^1.0.0"
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pumpify@^1.3.3:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.3.6.tgz#00d40e5ded0a3bf1e0788b1c0cf426a42882ab64"
+  dependencies:
+    duplexify "^3.5.3"
+    inherits "^2.0.3"
+    pump "^2.0.0"
 
 punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
 
-punycode@^1.2.4, punycode@^1.4.1:
+punycode@1.4.1, punycode@^1.2.4, punycode@^1.3.2, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
@@ -11290,9 +12292,9 @@ punycode@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
 
-puppeteer@^0.13.0:
-  version "0.13.0"
-  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-0.13.0.tgz#2e6956205f2c640964c2107f620ae1eef8bde8fd"
+puppeteer@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.1.1.tgz#adbf25e49f5ef03443c10ab8e09a954ca0c7bfee"
   dependencies:
     debug "^2.6.8"
     extract-zip "^1.6.5"
@@ -11303,7 +12305,7 @@ puppeteer@^0.13.0:
     rimraf "^2.6.1"
     ws "^3.0.0"
 
-q@1.4.1:
+q@1.4.1, q@~1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
 
@@ -11323,6 +12325,10 @@ qs@6.5.1, qs@^6.5.1, qs@~6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
 
+qs@~6.2.0:
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.3.tgz#1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"
+
 qs@~6.3.0:
   version "6.3.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
@@ -11338,7 +12344,7 @@ query-string@^4.1.0:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
-querystring-es3@^0.2.0:
+querystring-es3@^0.2.0, querystring-es3@~0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
 
@@ -11392,8 +12398,8 @@ randomatic@^1.1.3:
     kind-of "^4.0.0"
 
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79"
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
   dependencies:
     safe-buffer "^5.1.0"
 
@@ -11412,7 +12418,7 @@ range-parser@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.0.3.tgz#6872823535c692e2c2a0103826afd82c2e0ff175"
 
-raw-body@2.3.2:
+raw-body@2, raw-body@2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89"
   dependencies:
@@ -11434,8 +12440,8 @@ raw-loader@^0.5.1:
   resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
 
 rc@^1.0.1, rc@^1.1.0, rc@^1.1.6, rc@^1.1.7:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.2.tgz#d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077"
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.3.tgz#51575a900f8dd68381c710b4712c2154c3e2035b"
   dependencies:
     deep-extend "~0.4.0"
     ini "~1.3.0"
@@ -11450,9 +12456,9 @@ react-addons-create-fragment@^15.5.3:
     loose-envify "^1.3.1"
     object-assign "^4.1.0"
 
-react-chromatic@^0.7.3:
-  version "0.7.7"
-  resolved "https://registry.yarnpkg.com/react-chromatic/-/react-chromatic-0.7.7.tgz#2785aecd739b844c9498509d8f90a1b5dcf9332d"
+react-chromatic@^0.7.10:
+  version "0.7.10"
+  resolved "https://registry.yarnpkg.com/react-chromatic/-/react-chromatic-0.7.10.tgz#f3a12b403e4a7ceac9851a24a9ec6e5f29febb0a"
   dependencies:
     apollo-fetch "^0.6.0"
     babel-runtime "^6.26.0"
@@ -11462,7 +12468,7 @@ react-chromatic@^0.7.3:
     ejson "^2.1.2"
     es6-error "^4.0.2"
     isomorphic-fetch "^2.2.1"
-    jsdom "^11.3.0"
+    jsdom "^11.5.1"
     jsonfile "^4.0.0"
     localtunnel "^1.8.3"
     node-ask "^1.0.1"
@@ -11472,9 +12478,9 @@ react-clone-referenced-element@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/react-clone-referenced-element/-/react-clone-referenced-element-1.0.1.tgz#2bba8c69404c5e4a944398600bcc4c941f860682"
 
-react-color@^2.11.4:
-  version "2.13.8"
-  resolved "https://registry.yarnpkg.com/react-color/-/react-color-2.13.8.tgz#bcc58f79a722b9bfc37c402e68cd18f26970aee4"
+react-color@^2.14.0:
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/react-color/-/react-color-2.14.0.tgz#5828a11c034aa0939befbd888a066ee37d8c3cc2"
   dependencies:
     lodash "^4.0.1"
     material-colors "^1.2.1"
@@ -11482,9 +12488,9 @@ react-color@^2.11.4:
     reactcss "^1.2.0"
     tinycolor2 "^1.4.1"
 
-react-datetime@^2.11.1:
-  version "2.11.1"
-  resolved "https://registry.yarnpkg.com/react-datetime/-/react-datetime-2.11.1.tgz#11d15081dd7d6729284e21c1b8ea7b975e3bdc7e"
+react-datetime@^2.14.0:
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/react-datetime/-/react-datetime-2.14.0.tgz#c7859c5b765275d7980f1cca27c03a727ff9ccef"
   dependencies:
     create-react-class "^15.5.2"
     object-assign "^3.0.0"
@@ -11495,37 +12501,37 @@ react-deep-force-update@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/react-deep-force-update/-/react-deep-force-update-1.1.1.tgz#bcd31478027b64b3339f108921ab520b4313dc2c"
 
-react-dev-utils@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-4.2.1.tgz#9f2763e7bafa1a1b9c52254d2a479deec280f111"
+react-dev-utils@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-5.0.0.tgz#425ac7c9c40c2603bc4f7ab8836c1406e96bb473"
   dependencies:
     address "1.0.3"
     babel-code-frame "6.26.0"
     chalk "1.1.3"
     cross-spawn "5.1.0"
-    detect-port-alt "1.1.3"
+    detect-port-alt "1.1.5"
     escape-string-regexp "1.0.5"
     filesize "3.5.11"
     global-modules "1.0.0"
     gzip-size "3.0.0"
     inquirer "3.3.0"
     is-root "1.0.0"
-    opn "5.1.0"
-    react-error-overlay "^3.0.0"
+    opn "5.2.0"
+    react-error-overlay "^4.0.0"
     recursive-readdir "2.2.1"
     shell-quote "1.6.1"
     sockjs-client "1.1.4"
     strip-ansi "3.0.1"
     text-table "0.2.0"
 
-react-devtools-core@^2.5.0:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-2.5.2.tgz#f97bec5afae5d9318d16778065e0c214c4d5714c"
+react-devtools-core@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-3.0.0.tgz#f683e19f0311108f97dbb5b29d948323a1bf7c03"
   dependencies:
     shell-quote "^1.6.1"
     ws "^2.0.3"
 
-react-docgen@^2.15.0:
+react-docgen@^2.20.0:
   version "2.20.0"
   resolved "https://registry.yarnpkg.com/react-docgen/-/react-docgen-2.20.0.tgz#41a6da483a34a4aaed041a9909f5e61864d681cb"
   dependencies:
@@ -11546,13 +12552,13 @@ react-dom@^16.0.0, react-dom@^16.1.0, react-dom@^16.2.0:
     object-assign "^4.1.1"
     prop-types "^15.6.0"
 
-react-error-overlay@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-3.0.0.tgz#c2bc8f4d91f1375b3dad6d75265d51cd5eeaf655"
+react-error-overlay@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-4.0.0.tgz#d198408a85b4070937a98667f500c832f86bd5d4"
 
-react-fuzzy@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/react-fuzzy/-/react-fuzzy-0.5.1.tgz#295c2a4079ad39402e05605d9d7accd2db8527b6"
+react-fuzzy@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/react-fuzzy/-/react-fuzzy-0.5.2.tgz#fc13bf6f0b785e5fefe908724efebec4935eaefe"
   dependencies:
     babel-runtime "^6.23.0"
     classnames "^2.2.5"
@@ -11582,16 +12588,9 @@ react-inspector@^2.2.2:
     babel-runtime "^6.26.0"
     is-dom "^1.0.9"
 
-react-modal@^2.2.4:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-2.4.1.tgz#cb09b26711b148eb9f59cb180e1b7d82980ded05"
-  dependencies:
-    exenv "^1.2.0"
-    prop-types "^15.5.10"
-
-react-modal@^3.1.10:
-  version "3.1.10"
-  resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.1.10.tgz#8898b5cc4ebba78adbb8dea4c55a69818aa682cc"
+react-modal@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.3.1.tgz#7355db196482da0c7fa1cbecccf2bdd9bc366b14"
   dependencies:
     exenv "^1.2.0"
     prop-types "^15.5.10"
@@ -11603,13 +12602,13 @@ react-native-compat@^1.0.0:
   dependencies:
     prop-types "^15.5.10"
 
-react-native-iphone-x-helper@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.0.1.tgz#950dbdaca66f458689a7e9697c5beb9bd53f98f2"
+react-native-iphone-x-helper@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.0.2.tgz#7dbca530930f7c1ce8633cc8fd13ba94102992e1"
 
-react-native@^0.51.0:
-  version "0.51.0"
-  resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.51.0.tgz#fe25934b3030fd323f3ca1a70f034133465955ed"
+react-native@^0.52.2:
+  version "0.52.2"
+  resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.52.2.tgz#1ae9a4c4441bd6e54a8ffc8aae4ac2b5c7cccd68"
   dependencies:
     absolute-path "^0.0.0"
     art "^0.10.0"
@@ -11638,7 +12637,8 @@ react-native@^0.51.0:
     graceful-fs "^4.1.3"
     inquirer "^3.0.6"
     lodash "^4.16.6"
-    metro-bundler "^0.20.0"
+    metro "^0.24.1"
+    metro-core "^0.24.1"
     mime "^1.3.4"
     minimist "^1.2.0"
     mkdirp "^0.5.1"
@@ -11652,7 +12652,7 @@ react-native@^0.51.0:
     promise "^7.1.1"
     prop-types "^15.5.8"
     react-clone-referenced-element "^1.0.1"
-    react-devtools-core "^2.5.0"
+    react-devtools-core "3.0.0"
     react-timer-mixin "^0.13.2"
     regenerator-runtime "^0.11.0"
     rimraf "^2.5.4"
@@ -11685,23 +12685,24 @@ react-reconciler@^0.7.0:
     object-assign "^4.1.1"
     prop-types "^15.6.0"
 
-react-scripts@^1.0.17:
-  version "1.0.17"
-  resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-1.0.17.tgz#c30029123b561a060227af4d7797d50a222d3fbf"
+react-scripts@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-1.1.1.tgz#279d449f7311fed910506987a1ade014027788a8"
   dependencies:
     autoprefixer "7.1.6"
     babel-core "6.26.0"
     babel-eslint "7.2.3"
     babel-jest "20.0.3"
     babel-loader "7.1.2"
-    babel-preset-react-app "^3.1.0"
+    babel-preset-react-app "^3.1.1"
     babel-runtime "6.26.0"
     case-sensitive-paths-webpack-plugin "2.1.1"
     chalk "1.1.3"
     css-loader "0.28.7"
     dotenv "4.0.0"
+    dotenv-expand "4.2.0"
     eslint "4.10.0"
-    eslint-config-react-app "^2.0.1"
+    eslint-config-react-app "^2.1.0"
     eslint-loader "1.9.0"
     eslint-plugin-flowtype "2.39.1"
     eslint-plugin-import "2.8.0"
@@ -11717,7 +12718,7 @@ react-scripts@^1.0.17:
     postcss-loader "2.0.8"
     promise "8.0.1"
     raf "3.4.0"
-    react-dev-utils "^4.2.1"
+    react-dev-utils "^5.0.0"
     style-loader "0.19.0"
     sw-precache-webpack-plugin "0.11.4"
     url-loader "0.6.2"
@@ -11726,14 +12727,12 @@ react-scripts@^1.0.17:
     webpack-manifest-plugin "1.3.2"
     whatwg-fetch "2.0.3"
   optionalDependencies:
-    fsevents "1.1.2"
+    fsevents "^1.1.3"
 
-react-split-pane@^0.1.74:
-  version "0.1.74"
-  resolved "https://registry.yarnpkg.com/react-split-pane/-/react-split-pane-0.1.74.tgz#cf79fc98b51ab0763fdc778749b810a102b036ca"
+react-split-pane@^0.1.77:
+  version "0.1.77"
+  resolved "https://registry.yarnpkg.com/react-split-pane/-/react-split-pane-0.1.77.tgz#f0c8cd18d076bbac900248dcf6dbcec02d5340db"
   dependencies:
-    "@types/inline-style-prefixer" "^3.0.0"
-    "@types/react" "^16.0.18"
     inline-style-prefixer "^3.0.6"
     prop-types "^15.5.10"
     react-style-proptype "^3.0.0"
@@ -11744,6 +12743,16 @@ react-style-proptype@^3.0.0:
   dependencies:
     prop-types "^15.5.4"
 
+react-syntax-highlighter@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-7.0.1.tgz#14eb6e669da6c4e4da3b2f86ff5e3b9b522aa473"
+  dependencies:
+    babel-runtime "^6.18.0"
+    highlight.js "~9.12.0"
+    lowlight "~1.9.1"
+    prismjs "^1.8.4"
+    refractor "^2.0.0"
+
 react-test-renderer@^16.0.0-0, react-test-renderer@^16.1.0, react-test-renderer@^16.2.0:
   version "16.2.0"
   resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.2.0.tgz#bddf259a6b8fcd8555f012afc8eacc238872a211"
@@ -11812,6 +12821,12 @@ read-all-stream@^3.0.0:
     pinkie-promise "^2.0.0"
     readable-stream "^2.0.0"
 
+read-cache@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
+  dependencies:
+    pify "^2.3.0"
+
 read-cmd-shim@^1.0.1, read-cmd-shim@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz#2d5d157786a37c055d22077c32c53f8329e91c7b"
@@ -11831,6 +12846,12 @@ read-installed@~4.0.3:
   optionalDependencies:
     graceful-fs "^4.1.2"
 
+read-only-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz#2724fd6a8113d73764ac288d4386270c1dbf17f0"
+  dependencies:
+    readable-stream "^2.0.2"
+
 "read-package-json@1 || 2", read-package-json@^2.0.0, read-package-json@~2.0.9:
   version "2.0.12"
   resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.12.tgz#68ea45f98b3741cb6e10ae3bbd42a605026a6951"
@@ -11915,7 +12936,7 @@ read@1, read@~1.0.1, read@~1.0.7:
     string_decoder "~1.0.3"
     util-deprecate "~1.0.1"
 
-readable-stream@1.0, readable-stream@~1.0.2:
+readable-stream@1.0:
   version "1.0.34"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
   dependencies:
@@ -11933,7 +12954,7 @@ readable-stream@1.1:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@~1.1.10, readable-stream@~1.1.8, readable-stream@~1.1.9:
+readable-stream@1.1.x, "readable-stream@1.x >=1.1.9", readable-stream@~1.1.10, readable-stream@~1.1.8, readable-stream@~1.1.9:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
   dependencies:
@@ -11942,7 +12963,19 @@ readable-stream@~1.1.10, readable-stream@~1.1.8, readable-stream@~1.1.9:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@~2.0.6:
+readable-stream@2, readable-stream@^2.3.0:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.4.tgz#c946c3f47fa7d8eabc0b6150f4a12f69a4574071"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.0.3"
+    util-deprecate "~1.0.1"
+
+readable-stream@~2.0.0, readable-stream@~2.0.5, readable-stream@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
   dependencies:
@@ -12033,6 +13066,22 @@ redent@^1.0.0:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
 
+redis-commands@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.3.1.tgz#81d826f45fa9c8b2011f4cd7a0fe597d241d442b"
+
+redis-parser@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-2.6.0.tgz#52ed09dacac108f1a631c07e9b69941e7a19504b"
+
+redis@^2.7.1:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/redis/-/redis-2.8.0.tgz#202288e3f58c49f6079d97af7a10e1303ae14b02"
+  dependencies:
+    double-ended-queue "^2.1.0-0"
+    redis-commands "^1.2.0"
+    redis-parser "^2.6.0"
+
 reduce-css-calc@^1.2.6:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
@@ -12056,15 +13105,22 @@ redux@^3.6.0, redux@^3.7.2:
     loose-envify "^1.1.0"
     symbol-observable "^1.0.3"
 
-reflect-metadata@^0.1.2:
+reflect-metadata@^0.1.10, reflect-metadata@^0.1.2:
   version "0.1.10"
   resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.10.tgz#b4f83704416acad89988c9b15635d47e03b9344a"
 
+refractor@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/refractor/-/refractor-2.3.0.tgz#b8cade8f88020f8836ca3622c6ef87fd2444d76a"
+  dependencies:
+    hastscript "^3.1.0"
+    prismjs "~1.10.0"
+
 regenerate@^1.2.1:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f"
 
-regenerator-runtime@^0.10.0, regenerator-runtime@^0.10.5:
+regenerator-runtime@^0.10.5:
   version "0.10.5"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
 
@@ -12135,26 +13191,13 @@ relateurl@0.2.x:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
 
-remark-cli@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/remark-cli/-/remark-cli-4.0.0.tgz#bb84c14ffeb6f5b658eff4dfbb77cdd7775bab73"
+remark-cli@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/remark-cli/-/remark-cli-5.0.0.tgz#9feefd06474f3d0ff132df21b5334c546df12ab6"
   dependencies:
     markdown-extensions "^1.1.0"
-    remark "^8.0.0"
-    unified-args "^4.0.0"
-
-remark-lint-code-eslint@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/remark-lint-code-eslint/-/remark-lint-code-eslint-2.0.0.tgz#6fb394f0863431cd7aff0da4de097812021e7d8b"
-  dependencies:
-    eslint "^3.16.1"
-
-remark-lint-code@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/remark-lint-code/-/remark-lint-code-2.0.0.tgz#03e0c2e90aeedbe875a8795feacf57988b7d957c"
-  dependencies:
-    unified-lint-rule "^1.0.0"
-    unist-util-visit "^1.0.0"
+    remark "^9.0.0"
+    unified-args "^5.0.0"
 
 remark-lint-final-newline@^1.0.0:
   version "1.0.1"
@@ -12306,9 +13349,9 @@ remark-message-control@^4.0.0:
     unist-util-visit "^1.0.0"
     vfile-location "^2.0.0"
 
-remark-parse@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-4.0.0.tgz#99f1f049afac80382366e2e0d0bd55429dd45d8b"
+remark-parse@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-5.0.0.tgz#4c077f9e499044d1d5c13f80d7a98cf7b9285d95"
   dependencies:
     collapse-white-space "^1.0.2"
     is-alphabetical "^1.0.0"
@@ -12316,7 +13359,7 @@ remark-parse@^4.0.0:
     is-whitespace-character "^1.0.0"
     is-word-character "^1.0.0"
     markdown-escapes "^1.0.0"
-    parse-entities "^1.0.2"
+    parse-entities "^1.1.0"
     repeat-string "^1.5.4"
     state-toggle "^1.0.0"
     trim "0.0.1"
@@ -12347,9 +13390,9 @@ remark-preset-lint-recommended@^3.0.1:
     remark-lint-no-unused-definitions "^1.0.0"
     remark-lint-ordered-list-marker-style "^1.0.0"
 
-remark-stringify@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-4.0.0.tgz#4431884c0418f112da44991b4e356cfe37facd87"
+remark-stringify@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-5.0.0.tgz#336d3a4d4a6a3390d933eeba62e8de4bd280afba"
   dependencies:
     ccount "^1.0.0"
     is-alphanumeric "^1.0.0"
@@ -12366,12 +13409,12 @@ remark-stringify@^4.0.0:
     unherit "^1.0.4"
     xtend "^4.0.1"
 
-remark@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/remark/-/remark-8.0.0.tgz#287b6df2fe1190e263c1d15e486d3fa835594d6d"
+remark@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/remark/-/remark-9.0.0.tgz#c5cfa8ec535c73a67c4b0f12bfdbd3a67d8b2f60"
   dependencies:
-    remark-parse "^4.0.0"
-    remark-stringify "^4.0.0"
+    remark-parse "^5.0.0"
+    remark-stringify "^5.0.0"
     unified "^6.0.0"
 
 remove-trailing-separator@^1.0.1:
@@ -12428,7 +13471,7 @@ request-promise-native@^1.0.3:
     stealthy-require "^1.1.0"
     tough-cookie ">=2.3.3"
 
-request@2, request@^2.74.0, request@^2.78.0, request@^2.79.0, request@^2.81.0, request@^2.83.0:
+request@2, request@^2.0.0, request@^2.74.0, request@^2.78.0, request@^2.79.0, request@^2.83.0:
   version "2.83.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
   dependencies:
@@ -12455,6 +13498,32 @@ request@2, request@^2.74.0, request@^2.78.0, request@^2.79.0, request@^2.81.0, r
     tunnel-agent "^0.6.0"
     uuid "^3.1.0"
 
+request@2.75.x:
+  version "2.75.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.75.0.tgz#d2b8268a286da13eaa5d01adf5d18cc90f657d93"
+  dependencies:
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    bl "~1.1.2"
+    caseless "~0.11.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.0"
+    forever-agent "~0.6.1"
+    form-data "~2.0.0"
+    har-validator "~2.0.6"
+    hawk "~3.1.3"
+    http-signature "~1.1.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.7"
+    node-uuid "~1.4.7"
+    oauth-sign "~0.8.1"
+    qs "~6.2.0"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "~0.4.1"
+
 request@2.81.0, request@~2.81.0:
   version "2.81.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
@@ -12507,6 +13576,15 @@ request@~2.79.0:
     tunnel-agent "~0.4.1"
     uuid "^3.0.0"
 
+requestretry@^1.2.2:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/requestretry/-/requestretry-1.13.0.tgz#213ec1006eeb750e8b8ce54176283d15a8d55d94"
+  dependencies:
+    extend "^3.0.0"
+    lodash "^4.15.0"
+    request "^2.74.0"
+    when "^3.7.7"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -12523,7 +13601,7 @@ require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
 
-require-uncached@^1.0.2, require-uncached@^1.0.3:
+require-uncached@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
   dependencies:
@@ -12567,7 +13645,7 @@ resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0:
+resolve@^1.1.3, resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
   dependencies:
@@ -12676,7 +13754,11 @@ rx-lite@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
 
-rxjs@^5.4.2, rxjs@^5.5.2:
+rx@2.3.24:
+  version "2.3.24"
+  resolved "https://registry.yarnpkg.com/rx/-/rx-2.3.24.tgz#14f950a4217d7e35daa71bbcbe58eff68ea4b2b7"
+
+rxjs@^5.4.2, rxjs@^5.5.2, rxjs@^5.5.6:
   version "5.5.6"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.6.tgz#e31fb96d6fd2ff1fd84bcea8ae9c02d007179c02"
   dependencies:
@@ -12725,7 +13807,7 @@ sass-graph@^2.2.4:
     scss-tokenizer "^0.2.3"
     yargs "^7.0.0"
 
-sass-loader@^6.0.3:
+sass-loader@^6.0.6:
   version "6.0.6"
   resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-6.0.6.tgz#e9d5e6c1f155faa32a4b26d7a9b7107c225e40f9"
   dependencies:
@@ -12763,7 +13845,14 @@ schema-utils@^0.3.0:
   dependencies:
     ajv "^5.0.0"
 
-schema-utils@^0.4.2:
+schema-utils@^0.4.0, schema-utils@^0.4.5:
+  version "0.4.5"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e"
+  dependencies:
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+
+schema-utils@^0.4.2, schema-utils@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.3.tgz#e2a594d3395834d5e15da22b48be13517859458e"
   dependencies:
@@ -12781,6 +13870,10 @@ select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
 
+select@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
+
 selenium-webdriver@3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz#2ba87a1662c020b8988c981ae62cb2a01298eafc"
@@ -12818,13 +13911,19 @@ semver-dsl@^1.0.1:
   dependencies:
     semver "^5.3.0"
 
+semver-intersect@^1.1.2:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/semver-intersect/-/semver-intersect-1.3.0.tgz#d0d727d17d8abd2ff699fce6ae6ab83073d51b36"
+  dependencies:
+    semver "^5.0.0"
+
 "semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@5.x, "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
 
-semver@~4.3.3:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
+semver@^5.0.0, semver@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
 semver@~5.0.1:
   version "5.0.3"
@@ -12873,7 +13972,7 @@ serialize-javascript@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.4.0.tgz#7c958514db6ac2443a8abc062dc9f7886a7f6005"
 
-serve-favicon@^2.4.3, serve-favicon@^2.4.5:
+serve-favicon@^2.4.5:
   version "2.4.5"
   resolved "https://registry.yarnpkg.com/serve-favicon/-/serve-favicon-2.4.5.tgz#49d9a46863153a9240691c893d2b0e7d85d6d436"
   dependencies:
@@ -12988,6 +14087,13 @@ sha.js@^2.4.0, sha.js@^2.4.8:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
+sha.js@~2.4.4:
+  version "2.4.10"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.10.tgz#b1fde5cd7d11a5626638a07c604ab909cfa31f9b"
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
 sha@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/sha/-/sha-2.0.1.tgz#6030822fbd2c9823949f8f72ed6411ee5cf25aae"
@@ -13010,6 +14116,13 @@ shallowequal@^0.2.2:
   dependencies:
     lodash.keys "^3.1.2"
 
+shasum@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/shasum/-/shasum-1.0.2.tgz#e7012310d8f417f4deb5712150e5678b87ae565f"
+  dependencies:
+    json-stable-stringify "~0.0.0"
+    sha.js "~2.4.4"
+
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -13033,9 +14146,9 @@ shelljs@0.3.x:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.3.0.tgz#3596e6307a781544f591f37da618360f31db57b1"
 
-shelljs@^0.7.5, shelljs@^0.7.8:
-  version "0.7.8"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
+shelljs@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.1.tgz#729e038c413a2254c4078b95ed46e0397154a9f1"
   dependencies:
     glob "^7.0.0"
     interpret "^1.0.0"
@@ -13045,7 +14158,7 @@ shellsubstitute@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shellsubstitute/-/shellsubstitute-1.2.0.tgz#e4f702a50c518b0f6fe98451890d705af29b6b70"
 
-shellwords@^0.1.0:
+shellwords@^0.1.0, shellwords@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
 
@@ -13067,6 +14180,12 @@ simple-plist@^0.2.1:
     bplist-parser "0.1.1"
     plist "2.0.1"
 
+slack-node@~0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/slack-node/-/slack-node-0.2.0.tgz#de4b8dddaa8b793f61dbd2938104fdabf37dfa30"
+  dependencies:
+    requestretry "^1.2.2"
+
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
@@ -13089,10 +14208,17 @@ slide@^1.1.3, slide@^1.1.5, slide@~1.1.3, slide@~1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
 
-smart-buffer@^1.0.13:
+smart-buffer@^1.0.13, smart-buffer@^1.0.4:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-1.1.15.tgz#7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"
 
+smtp-connection@2.12.0:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/smtp-connection/-/smtp-connection-2.12.0.tgz#d76ef9127cb23c2259edb1e8349c2e8d5e2d74c1"
+  dependencies:
+    httpntlm "1.6.1"
+    nodemailer-shared "1.1.0"
+
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -13132,49 +14258,46 @@ sntp@2.x.x:
   dependencies:
     hoek "4.x.x"
 
-socket.io-adapter@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz#cb6d4bb8bec81e1078b99677f9ced0046066bb8b"
-  dependencies:
-    debug "2.3.3"
-    socket.io-parser "2.3.1"
+socket.io-adapter@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b"
 
-socket.io-client@1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-1.7.3.tgz#b30e86aa10d5ef3546601c09cde4765e381da377"
+socket.io-client@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.0.4.tgz#0918a552406dc5e540b380dcd97afc4a64332f8e"
   dependencies:
     backo2 "1.0.2"
+    base64-arraybuffer "0.1.5"
     component-bind "1.0.0"
     component-emitter "1.2.1"
-    debug "2.3.3"
-    engine.io-client "1.8.3"
-    has-binary "0.1.7"
+    debug "~2.6.4"
+    engine.io-client "~3.1.0"
+    has-cors "1.1.0"
     indexof "0.0.1"
     object-component "0.0.3"
+    parseqs "0.0.5"
     parseuri "0.0.5"
-    socket.io-parser "2.3.1"
+    socket.io-parser "~3.1.1"
     to-array "0.1.4"
 
-socket.io-parser@2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-2.3.1.tgz#dd532025103ce429697326befd64005fcfe5b4a0"
+socket.io-parser@~3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.1.2.tgz#dbc2282151fc4faebbe40aeedc0772eba619f7f2"
   dependencies:
-    component-emitter "1.1.2"
-    debug "2.2.0"
-    isarray "0.0.1"
-    json3 "3.3.2"
+    component-emitter "1.2.1"
+    debug "~2.6.4"
+    has-binary2 "~1.0.2"
+    isarray "2.0.1"
 
-socket.io@1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-1.7.3.tgz#b8af9caba00949e568e369f1327ea9be9ea2461b"
+socket.io@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.0.4.tgz#c1a4590ceff87ecf13c72652f046f716b29e6014"
   dependencies:
-    debug "2.3.3"
-    engine.io "1.8.3"
-    has-binary "0.1.7"
-    object-assign "4.1.0"
-    socket.io-adapter "0.5.0"
-    socket.io-client "1.7.3"
-    socket.io-parser "2.3.1"
+    debug "~2.6.6"
+    engine.io "~3.1.0"
+    socket.io-adapter "~1.1.0"
+    socket.io-client "2.0.4"
+    socket.io-parser "~3.1.1"
 
 sockjs-client@1.1.4:
   version "1.1.4"
@@ -13201,6 +14324,14 @@ sockjs@0.3.19:
     faye-websocket "^0.10.0"
     uuid "^3.0.1"
 
+socks-proxy-agent@2:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz#86ebb07193258637870e13b7bd99f26c663df3d3"
+  dependencies:
+    agent-base "2"
+    extend "3"
+    socks "~1.1.5"
+
 socks-proxy-agent@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz#2eae7cf8e2a82d34565761539a7f9718c5617659"
@@ -13208,7 +14339,14 @@ socks-proxy-agent@^3.0.1:
     agent-base "^4.1.0"
     socks "^1.1.10"
 
-socks@^1.1.10:
+socks@1.1.9:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-1.1.9.tgz#628d7e4d04912435445ac0b6e459376cb3e6d691"
+  dependencies:
+    ip "^1.1.2"
+    smart-buffer "^1.0.4"
+
+socks@^1.1.10, socks@~1.1.5:
   version "1.1.10"
   resolved "https://registry.yarnpkg.com/socks/-/socks-1.1.10.tgz#5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a"
   dependencies:
@@ -13246,14 +14384,6 @@ source-list-map@~0.1.7:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
 
-source-map-loader@^0.2.0:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.3.tgz#d4b0c8cd47d54edce3e6bfa0f523f452b5b0e521"
-  dependencies:
-    async "^2.5.0"
-    loader-utils "~0.2.2"
-    source-map "~0.6.1"
-
 source-map-resolve@^0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.1.tgz#7ad0f593f2281598e854df80f19aae4b92d7a11a"
@@ -13264,7 +14394,7 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.4.0, source-map-support@^0.4.1, source-map-support@^0.4.15, source-map-support@^0.4.2, source-map-support@~0.4.0:
+source-map-support@^0.4.1, source-map-support@^0.4.15, source-map-support@~0.4.0:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
   dependencies:
@@ -13286,7 +14416,7 @@ source-map@0.1.x:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@0.5.x, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.6:
+source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3, source-map@~0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
@@ -13300,10 +14430,20 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
 
+space-separated-tokens@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.1.tgz#9695b9df9e65aec1811d4c3f9ce52520bc2f7e4d"
+  dependencies:
+    trim "0.0.1"
+
 sparkles@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3"
 
+spawn-command@^0.0.2-1:
+  version "0.0.2-1"
+  resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2-1.tgz#62f5e9466981c1b796dc5929937e11c9c6921bd0"
+
 spdx-correct@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
@@ -13407,9 +14547,9 @@ stacktrace-parser@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/stacktrace-parser/-/stacktrace-parser-0.1.4.tgz#01397922e5f62ecf30845522c95c4fe1d25e7d4e"
 
-staged-git-files@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-0.0.4.tgz#d797e1b551ca7a639dec0237dc6eb4bb9be17d35"
+staged-git-files@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-1.1.0.tgz#1a9bb131c1885601023c7aaddd3d54c22142c526"
 
 state-toggle@^1.0.0:
   version "1.0.0"
@@ -13444,7 +14584,7 @@ stealthy-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
 
-stream-browserify@^2.0.1:
+stream-browserify@^2.0.0, stream-browserify@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
   dependencies:
@@ -13455,6 +14595,13 @@ stream-buffers@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4"
 
+stream-combiner2@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz#fb4d8a1420ea362764e21ad4780397bebcb41cbe"
+  dependencies:
+    duplexer2 "~0.1.0"
+    readable-stream "^2.0.2"
+
 stream-combiner@~0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14"
@@ -13478,6 +14625,16 @@ stream-each@^1.1.0:
     end-of-stream "^1.1.0"
     stream-shift "^1.0.0"
 
+stream-http@^2.0.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.0.tgz#fd86546dac9b1c91aff8fc5d287b98fafb41bc10"
+  dependencies:
+    builtin-status-codes "^3.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.3.3"
+    to-arraybuffer "^1.0.0"
+    xtend "^4.0.0"
+
 stream-http@^2.7.2:
   version "2.7.2"
   resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.2.tgz#40a050ec8dc3b53b33d9909415c02c0bf1abfbad"
@@ -13499,12 +14656,28 @@ stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
 
+stream-splicer@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/stream-splicer/-/stream-splicer-2.0.0.tgz#1b63be438a133e4b671cc1935197600175910d83"
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.2"
+
 stream-to-observable@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/stream-to-observable/-/stream-to-observable-0.2.0.tgz#59d6ea393d87c2c0ddac10aa0d561bc6ba6f0e10"
   dependencies:
     any-observable "^0.2.0"
 
+streamroller@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-0.7.0.tgz#a1d1b7cf83d39afb0d63049a5acbf93493bdf64b"
+  dependencies:
+    date-format "^1.2.0"
+    debug "^3.1.0"
+    mkdirp "^0.5.1"
+    readable-stream "^2.3.0"
+
 strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
@@ -13553,7 +14726,7 @@ string.prototype.padstart@^3.0.0:
     es-abstract "^1.4.3"
     function-bind "^1.0.2"
 
-string_decoder@^1.0.0, string_decoder@~1.0.3:
+string_decoder@^1.0.0, string_decoder@~1.0.0, string_decoder@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
   dependencies:
@@ -13572,9 +14745,9 @@ stringify-entities@^1.0.1:
     is-alphanumerical "^1.0.0"
     is-hexadecimal "^1.0.0"
 
-stringify-object@^3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.2.1.tgz#2720c2eff940854c819f6ee252aaeb581f30624d"
+stringify-object@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.2.2.tgz#9853052e5a88fb605a44cd27445aa257ad7ffbcd"
   dependencies:
     get-own-enumerable-property-symbols "^2.0.1"
     is-obj "^1.0.1"
@@ -13590,6 +14763,12 @@ strip-ansi@3.0.1, strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   dependencies:
     ansi-regex "^2.0.0"
 
+strip-ansi@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.3.0.tgz#25f48ea22ca79187f3174a4db8759347bb126220"
+  dependencies:
+    ansi-regex "^0.2.1"
+
 strip-ansi@^4.0.0, strip-ansi@~4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
@@ -13649,19 +14828,6 @@ style-loader@0.19.0:
     loader-utils "^1.0.2"
     schema-utils "^0.3.0"
 
-style-loader@^0.13.1:
-  version "0.13.2"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.13.2.tgz#74533384cf698c7104c7951150b49717adc2f3bb"
-  dependencies:
-    loader-utils "^1.0.2"
-
-style-loader@^0.18.2:
-  version "0.18.2"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.18.2.tgz#cc31459afbcd6d80b7220ee54b291a9fd66ff5eb"
-  dependencies:
-    loader-utils "^1.0.2"
-    schema-utils "^0.3.0"
-
 style-loader@^0.19.1:
   version "0.19.1"
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.19.1.tgz#591ffc80bcefe268b77c5d9ebc0505d772619f85"
@@ -13669,6 +14835,13 @@ style-loader@^0.19.1:
     loader-utils "^1.0.2"
     schema-utils "^0.3.0"
 
+style-loader@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.20.2.tgz#851b373c187890331776e9cde359eea9c95ecd00"
+  dependencies:
+    loader-utils "^1.1.0"
+    schema-utils "^0.4.3"
+
 stylus-loader@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-3.0.1.tgz#77f4b34fd030d25b2617bcf5513db5b0730c4089"
@@ -13688,6 +14861,16 @@ stylus@^0.54.5:
     sax "0.5.x"
     source-map "0.1.x"
 
+subarg@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2"
+  dependencies:
+    minimist "^1.1.0"
+
+supports-color@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a"
+
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
@@ -13710,6 +14893,12 @@ supports-color@^5.0.0, supports-color@^5.1.0:
   dependencies:
     has-flag "^2.0.0"
 
+supports-color@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.2.0.tgz#b0d5333b1184dd3666cbe5aa0b45c5ac7ac17a4a"
+  dependencies:
+    has-flag "^3.0.0"
+
 supports-hyperlinks@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-1.0.1.tgz#71daedf36cc1060ac5100c351bb3da48c29c0ef7"
@@ -13783,31 +14972,15 @@ symbol-tree@^3.2.1:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
 
-symlink-dir@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/symlink-dir/-/symlink-dir-1.1.1.tgz#ea6367d96b0257f730dd03f95212eed24623b93e"
-  dependencies:
-    "@types/mz" "0.0.32"
-    "@types/node" "^8.0.28"
-    graceful-fs "^4.1.11"
-    is-windows "^1.0.0"
-    mkdirp-promise "^5.0.0"
-    mz "^2.4.0"
-
 sync-exec@~0.6.x:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/sync-exec/-/sync-exec-0.6.2.tgz#717d22cc53f0ce1def5594362f3a89a2ebb91105"
 
-table@^3.7.8:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"
+syntax-error@^1.1.1:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.4.0.tgz#2d9d4ff5c064acb711594a3e3b95054ad51d907c"
   dependencies:
-    ajv "^4.7.0"
-    ajv-keywords "^1.0.0"
-    chalk "^1.1.1"
-    lodash "^4.0.0"
-    slice-ansi "0.0.4"
-    string-width "^2.0.0"
+    acorn-node "^1.2.0"
 
 table@^4.0.1:
   version "4.0.2"
@@ -13916,18 +15089,6 @@ text-table@0.2.0, text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
-thenify-all@^1.0.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
-  dependencies:
-    thenify ">= 3.1.0 < 4"
-
-"thenify@>= 3.1.0 < 4":
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839"
-  dependencies:
-    any-promise "^1.0.0"
-
 throat@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/throat/-/throat-3.2.0.tgz#50cb0670edbc40237b9e347d7e1f88e4620af836"
@@ -13947,6 +15108,10 @@ through@2, "through@>=2.2.7 <3", through@X.X.X, through@^2.3.4, through@^2.3.6,
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
+thunkify@~2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/thunkify/-/thunkify-2.1.2.tgz#faa0e9d230c51acc95ca13a361ac05ca7e04553d"
+
 thunky@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-0.1.0.tgz#bf30146824e2b6e67b0f2d7a4ac8beb26908684e"
@@ -13967,12 +15132,26 @@ timed-out@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
 
+timers-browserify@^1.0.1:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz#c9c58b575be8407375cb5e2462dacee74359f41d"
+  dependencies:
+    process "~0.11.0"
+
 timers-browserify@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.4.tgz#96ca53f4b794a5e7c0e1bd7cc88a372298fa01e6"
   dependencies:
     setimmediate "^1.0.4"
 
+timespan@2.3.x:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/timespan/-/timespan-2.3.0.tgz#4902ce040bd13d845c8f59b27e9d59bad6f39929"
+
+tiny-emitter@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.0.2.tgz#82d27468aca5ade8e5fd1e6d22b57dd43ebdfb7c"
+
 tinycolor2@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8"
@@ -13987,13 +15166,7 @@ tmp@0.0.30:
   dependencies:
     os-tmpdir "~1.0.1"
 
-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.x, tmp@^0.0.33:
+tmp@0.0.33, tmp@0.0.x, tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
   dependencies:
@@ -14111,73 +15284,102 @@ try-catch@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/try-catch/-/try-catch-1.0.0.tgz#3797dab39a266775f4d0da5cbf42aca3f03608e6"
 
-ts-loader@^2.2.2:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-2.3.7.tgz#a9028ced473bee12f28a75f9c5b139979d33f2fc"
+ts-jest@^22.4.0:
+  version "22.4.0"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-22.4.0.tgz#c9d3f9565696e0ad17e658eee96e06822af96bb9"
   dependencies:
-    chalk "^2.0.1"
+    babel-core "^6.24.1"
+    babel-plugin-istanbul "^4.1.4"
+    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
+    babel-preset-jest "^22.4.0"
+    cpx "^1.5.0"
+    fs-extra "4.0.3"
+    jest-config "^22.4.0"
+    pkg-dir "^2.0.0"
+    yargs "^11.0.0"
+
+ts-loader@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-3.5.0.tgz#151d004dcddb4cf8e381a3bf9d6b74c2d957a9c0"
+  dependencies:
+    chalk "^2.3.0"
     enhanced-resolve "^3.0.0"
     loader-utils "^1.0.2"
+    micromatch "^3.1.4"
     semver "^5.0.1"
 
-ts-node@~3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-3.3.0.tgz#c13c6a3024e30be1180dd53038fc209289d4bf69"
+ts-node@~4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-4.1.0.tgz#36d9529c7b90bb993306c408cd07f7743de20712"
   dependencies:
     arrify "^1.0.0"
-    chalk "^2.0.0"
+    chalk "^2.3.0"
     diff "^3.1.0"
     make-error "^1.1.1"
     minimist "^1.2.0"
     mkdirp "^0.5.1"
-    source-map-support "^0.4.0"
-    tsconfig "^6.0.0"
+    source-map-support "^0.5.0"
+    tsconfig "^7.0.0"
     v8flags "^3.0.0"
     yn "^2.0.0"
 
-tsconfig@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/tsconfig/-/tsconfig-6.0.0.tgz#6b0e8376003d7af1864f8df8f89dd0059ffcd032"
+tsconfig@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/tsconfig/-/tsconfig-7.0.0.tgz#84538875a4dc216e5c4a5432b3a4dec3d54e91b7"
   dependencies:
+    "@types/strip-bom" "^3.0.0"
+    "@types/strip-json-comments" "0.0.30"
     strip-bom "^3.0.0"
     strip-json-comments "^2.0.0"
 
-tsickle@^0.25.5:
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.25.6.tgz#b595db16b236721824eeeda8bb262365b47ef334"
+tsickle@^0.27.2:
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.27.2.tgz#f33d46d046f73dd5c155a37922e422816e878736"
   dependencies:
     minimist "^1.2.0"
     mkdirp "^0.5.1"
-    source-map "^0.5.6"
-    source-map-support "^0.4.2"
+    source-map "^0.6.0"
+    source-map-support "^0.5.0"
 
-tslib@^1.7.1, tslib@^1.8.1:
+tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.8.1.tgz#6946af2d1d651a7b1863b531d6e5afa41aa44eac"
 
-tslint@~5.8.0:
-  version "5.8.0"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.8.0.tgz#1f49ad5b2e77c76c3af4ddcae552ae4e3612eb13"
+tslint-config-prettier@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.9.0.tgz#391887644b66de4623f745a6c85672405cbcdcee"
+
+tslint-plugin-prettier@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/tslint-plugin-prettier/-/tslint-plugin-prettier-1.3.0.tgz#7eb65d19ea786a859501a42491b78c5de2031a3f"
+  dependencies:
+    eslint-plugin-prettier "^2.2.0"
+    tslib "^1.7.1"
+
+tslint@~5.9.1:
+  version "5.9.1"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.9.1.tgz#1255f87a3ff57eb0b0e1f0e610a8b4748046c9ae"
   dependencies:
     babel-code-frame "^6.22.0"
     builtin-modules "^1.1.1"
-    chalk "^2.1.0"
-    commander "^2.9.0"
+    chalk "^2.3.0"
+    commander "^2.12.1"
     diff "^3.2.0"
     glob "^7.1.1"
+    js-yaml "^3.7.0"
     minimatch "^3.0.4"
     resolve "^1.3.2"
     semver "^5.3.0"
-    tslib "^1.7.1"
+    tslib "^1.8.0"
     tsutils "^2.12.1"
 
-tsscmp@1.0.5:
+tsscmp@1.0.5, tsscmp@~1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.5.tgz#7dc4a33af71581ab4337da91d85ca5427ebd9a97"
 
 tsutils@^2.12.1:
-  version "2.15.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.15.0.tgz#90831e5908cca10b28cdaf83a56dcf8156aed7c6"
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.16.0.tgz#ad8e83f47bef4f7d24d173cc6cd180990c831105"
   dependencies:
     tslib "^1.8.1"
 
@@ -14185,6 +15387,10 @@ tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
 
+tty-browserify@~0.0.0:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811"
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -14212,11 +15418,19 @@ type-is@~1.6.15, type-is@~1.6.6:
     media-typer "0.3.0"
     mime-types "~2.1.15"
 
-typedarray@^0.0.6:
+typedarray@^0.0.6, typedarray@~0.0.5:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-typescript@^2.4.0, typescript@~2.6.1:
+typescript@2.5.3:
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.3.tgz#df3dcdc38f3beb800d4bc322646b04a3f6ca7f0d"
+
+typescript@^2.7.2:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.2.tgz#2d615a1ef4aee4f574425cdff7026edf81919836"
+
+typescript@~2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
 
@@ -14228,16 +15442,16 @@ uc.micro@^1.0.1, uc.micro@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192"
 
-uglify-es@^3.1.8, uglify-es@^3.3.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.4.tgz#2d592678791e5310456bbc95e952139e3b13167a"
+uglify-es@^3.1.9, uglify-es@^3.3.4:
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.5.tgz#cf7e695da81999f85196b15e2978862f13212f88"
   dependencies:
     commander "~2.12.1"
     source-map "~0.6.1"
 
 uglify-js@3.3.x, uglify-js@^3.0.13:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.4.tgz#d8ebb76f201a3798ac2f0b6519642fcca4a99834"
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.5.tgz#4c4143dfe08e8825746675cc49a6874a933b543e"
   dependencies:
     commander "~2.12.1"
     source-map "~0.6.1"
@@ -14263,9 +15477,22 @@ uglifyjs-webpack-plugin@^0.4.6:
     uglify-js "^2.8.29"
     webpack-sources "^1.0.1"
 
-uglifyjs-webpack-plugin@^1.1.5, uglifyjs-webpack-plugin@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.6.tgz#f4ba8449edcf17835c18ba6ae99b9d610857fb19"
+uglifyjs-webpack-plugin@^1.1.8:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.0.tgz#f706fa4c655000a086b4a97c7d835ed0f6e9b0ef"
+  dependencies:
+    cacache "^10.0.1"
+    find-cache-dir "^1.0.0"
+    schema-utils "^0.4.2"
+    serialize-javascript "^1.4.0"
+    source-map "^0.6.1"
+    uglify-es "^3.3.4"
+    webpack-sources "^1.1.0"
+    worker-farm "^1.5.2"
+
+uglifyjs-webpack-plugin@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.2.tgz#e7516d4367afdb715c3847841eb46f94c45ca2b9"
   dependencies:
     cacache "^10.0.1"
     find-cache-dir "^1.0.0"
@@ -14304,9 +15531,15 @@ umask@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
 
-undefsafe@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-0.0.3.tgz#ecca3a03e56b9af17385baac812ac83b994a962f"
+umd@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.1.tgz#8ae556e11011f63c2596708a8837259f01b3d60e"
+
+undefsafe@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.2.tgz#225f6b9e0337663e0d8e7cfd686fc2836ccace76"
+  dependencies:
+    debug "^2.2.0"
 
 underscore@1.8.x:
   version "1.8.3"
@@ -14320,6 +15553,10 @@ underscore@~1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
 
+underscore@~1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.7.0.tgz#6bbaf0877500d36be34ecaa584e0db9fef035209"
+
 unherit@^1.0.4:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.0.tgz#6b9aaedfbf73df1756ad9e316dd981885840cd7d"
@@ -14327,23 +15564,24 @@ unherit@^1.0.4:
     inherits "^2.0.1"
     xtend "^4.0.1"
 
-unified-args@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/unified-args/-/unified-args-4.0.0.tgz#8d9b9b8ad347beb37f430562a62c4d361b42220f"
+unified-args@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/unified-args/-/unified-args-5.1.0.tgz#1889200e072998a662e6e84d817d6f4b5f448dd1"
   dependencies:
     camelcase "^4.0.0"
     chalk "^2.0.0"
     chokidar "^1.5.1"
+    json5 "^0.5.1"
     minimist "^1.2.0"
     text-table "^0.2.0"
-    unified-engine "^4.0.0"
+    unified-engine "^5.1.0"
 
-unified-engine@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/unified-engine/-/unified-engine-4.0.1.tgz#9692aa97fd5c4ec36889779e12514bef8e863fc3"
+unified-engine@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/unified-engine/-/unified-engine-5.1.0.tgz#30db83bcc76c821f773bb5a8a491aa0e2471e3d1"
   dependencies:
     concat-stream "^1.5.1"
-    debug "^2.2.0"
+    debug "^3.1.0"
     fault "^1.0.0"
     fn-name "^2.0.1"
     glob "^7.0.3"
@@ -14353,9 +15591,10 @@ unified-engine@^4.0.0:
     is-object "^1.0.1"
     js-yaml "^3.6.1"
     load-plugin "^2.0.0"
-    parse-json "^2.2.0"
+    parse-json "^4.0.0"
     to-vfile "^2.0.0"
     trough "^1.0.0"
+    unist-util-inspect "^4.1.2"
     vfile-reporter "^4.0.0"
     vfile-statistics "^1.1.0"
     x-is-function "^1.0.4"
@@ -14425,6 +15664,12 @@ unist-util-generated@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.1.tgz#99f16c78959ac854dee7c615c291924c8bf4de7f"
 
+unist-util-inspect@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/unist-util-inspect/-/unist-util-inspect-4.1.2.tgz#440520d0c7911f1a41eb5f568ef9b2efc3c29363"
+  dependencies:
+    is-empty "^1.0.0"
+
 unist-util-is@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-2.1.1.tgz#0c312629e3f960c66e931e812d3d80e77010947b"
@@ -14484,6 +15729,15 @@ unzip-response@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
 
+upath@^1.0.0, upath@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.2.tgz#80aaae5395abc5fd402933ae2f58694f0860204c"
+  dependencies:
+    lodash.endswith "^4.2.1"
+    lodash.isfunction "^3.0.8"
+    lodash.isstring "^4.0.1"
+    lodash.startswith "^4.2.1"
+
 update-notifier@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-1.0.3.tgz#8f92c515482bd6831b7c93013e70f87552c7cf5a"
@@ -14544,13 +15798,6 @@ url-loader@0.6.2, url-loader@^0.6.2:
     mime "^1.4.1"
     schema-utils "^0.3.0"
 
-url-loader@^0.5.8:
-  version "0.5.9"
-  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.5.9.tgz#cc8fea82c7b906e7777019250869e569e995c295"
-  dependencies:
-    loader-utils "^1.0.2"
-    mime "1.3.x"
-
 url-parse-lax@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
@@ -14575,7 +15822,7 @@ url-template@^2.0.8:
   version "2.0.8"
   resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21"
 
-url@^0.11.0:
+url@^0.11.0, url@~0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
   dependencies:
@@ -14598,12 +15845,6 @@ user-home@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
 
-user-home@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"
-  dependencies:
-    os-homedir "^1.0.0"
-
 useragent@^2.1.12:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.2.1.tgz#cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"
@@ -14626,7 +15867,7 @@ util.promisify@^1.0.0:
     define-properties "^1.1.2"
     object.getownpropertydescriptors "^2.0.3"
 
-util@0.10.3, util@^0.10.3:
+util@0.10.3, util@^0.10.3, util@~0.10.1:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
   dependencies:
@@ -14660,6 +15901,14 @@ uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0, uuid@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
 
+uuid@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
+
+uws@~9.14.0:
+  version "9.14.0"
+  resolved "https://registry.yarnpkg.com/uws/-/uws-9.14.0.tgz#fac8386befc33a7a3705cbd58dc47b430ca4dd95"
+
 v8flags@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
@@ -14767,7 +16016,7 @@ vlq@^0.2.1:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
 
-vm-browserify@0.0.4:
+vm-browserify@0.0.4, vm-browserify@~0.0.1:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
   dependencies:
@@ -14777,7 +16026,7 @@ vm2@patriksimek/vm2#custom_files:
   version "3.5.0"
   resolved "https://codeload.github.com/patriksimek/vm2/tar.gz/7e82f90ac705fc44fad044147cb0df09b4c79a57"
 
-voca@^1.3.1:
+voca@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/voca/-/voca-1.4.0.tgz#e15ac58b38290b72acc0c330366b6cc7984924d7"
 
@@ -14785,13 +16034,17 @@ void-elements@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
 
-vue-hot-reload-api@^2.2.0, vue-hot-reload-api@^2.2.4:
+vue-class-component@^6.0.0:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/vue-class-component/-/vue-class-component-6.1.2.tgz#87ac0265b0db71a3f49f10d90e4f69f9be9c2fbd"
+
+vue-hot-reload-api@^2.2.0:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.2.4.tgz#683bd1d026c0d3b3c937d5875679e9a87ec6cd8f"
 
-vue-loader@^13.6.2:
-  version "13.6.2"
-  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.6.2.tgz#43d9688f2c80400916104d1138941aacd7e389cb"
+vue-loader@^14.1.1:
+  version "14.1.1"
+  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-14.1.1.tgz#331f197fcea790d6b8662c29b850806e7eb29342"
   dependencies:
     consolidate "^0.14.0"
     hash-sum "^1.0.2"
@@ -14804,12 +16057,19 @@ vue-loader@^13.6.2:
     resolve "^1.4.0"
     source-map "^0.6.1"
     vue-hot-reload-api "^2.2.0"
-    vue-style-loader "^3.0.0"
+    vue-style-loader "^4.0.1"
     vue-template-es2015-compiler "^1.6.0"
 
-vue-style-loader@^3.0.0, vue-style-loader@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-3.0.3.tgz#623658f81506aef9d121cdc113a4f5c9cac32df7"
+vue-property-decorator@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/vue-property-decorator/-/vue-property-decorator-6.0.0.tgz#bb651b293542e31db0d24f36f4b0250ef08d8515"
+  dependencies:
+    reflect-metadata "^0.1.10"
+    vue-class-component "^6.0.0"
+
+vue-style-loader@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.0.2.tgz#e89aa4702a0c6b9630d8de70b1cbddb06b9ad254"
   dependencies:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
@@ -14876,13 +16136,6 @@ wcwidth@^1.0.0:
   dependencies:
     defaults "^1.0.3"
 
-weak@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/weak/-/weak-1.0.1.tgz#ab99aab30706959aa0200cb8cf545bb9cb33b99e"
-  dependencies:
-    bindings "^1.2.1"
-    nan "^2.0.5"
-
 webdriver-js-extender@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/webdriver-js-extender/-/webdriver-js-extender-1.0.0.tgz#81c533a9e33d5bfb597b4e63e2cdb25b54777515"
@@ -14921,7 +16174,7 @@ webpack-core@^0.6.8:
     source-list-map "~0.1.7"
     source-map "~0.4.1"
 
-webpack-dev-middleware@1.12.2, webpack-dev-middleware@^1.10.2, webpack-dev-middleware@^1.11.0, webpack-dev-middleware@^1.12.2, webpack-dev-middleware@~1.12.0:
+webpack-dev-middleware@1.12.2, webpack-dev-middleware@^1.11.0, webpack-dev-middleware@^1.12.2, webpack-dev-middleware@~1.12.0:
   version "1.12.2"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz#f8fc1120ce3b4fc5680ceecb43d777966b21105e"
   dependencies:
@@ -14963,9 +16216,41 @@ webpack-dev-server@2.9.4:
     webpack-dev-middleware "^1.11.0"
     yargs "^6.6.0"
 
-webpack-dev-server@^2.10.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.10.0.tgz#6db9c77c8cf2e2d7ff85c89fb5e4de6f7227be19"
+webpack-dev-server@^2.11.2:
+  version "2.11.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.11.2.tgz#1f4f4c78bf1895378f376815910812daf79a216f"
+  dependencies:
+    ansi-html "0.0.7"
+    array-includes "^3.0.3"
+    bonjour "^3.5.0"
+    chokidar "^2.0.0"
+    compression "^1.5.2"
+    connect-history-api-fallback "^1.3.0"
+    debug "^3.1.0"
+    del "^3.0.0"
+    express "^4.16.2"
+    html-entities "^1.2.0"
+    http-proxy-middleware "~0.17.4"
+    import-local "^1.0.0"
+    internal-ip "1.2.0"
+    ip "^1.1.5"
+    killable "^1.0.0"
+    loglevel "^1.4.1"
+    opn "^5.1.0"
+    portfinder "^1.0.9"
+    selfsigned "^1.9.1"
+    serve-index "^1.7.2"
+    sockjs "0.3.19"
+    sockjs-client "1.1.4"
+    spdy "^3.4.1"
+    strip-ansi "^3.0.0"
+    supports-color "^5.1.0"
+    webpack-dev-middleware "1.12.2"
+    yargs "6.6.0"
+
+webpack-dev-server@~2.11.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.11.0.tgz#e9d4830ab7eb16c6f92ed68b92f6089027960e1b"
   dependencies:
     ansi-html "0.0.7"
     array-includes "^3.0.3"
@@ -14993,43 +16278,11 @@ webpack-dev-server@^2.10.0:
     strip-ansi "^4.0.0"
     supports-color "^5.1.0"
     webpack-dev-middleware "1.12.2"
-    yargs "^10.0.3"
+    yargs "6.6.0"
 
-webpack-dev-server@~2.9.3:
-  version "2.9.7"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.9.7.tgz#100ad6a14775478924d417ca6dcfb9d52a98faed"
-  dependencies:
-    ansi-html "0.0.7"
-    array-includes "^3.0.3"
-    bonjour "^3.5.0"
-    chokidar "^1.6.0"
-    compression "^1.5.2"
-    connect-history-api-fallback "^1.3.0"
-    debug "^3.1.0"
-    del "^3.0.0"
-    express "^4.16.2"
-    html-entities "^1.2.0"
-    http-proxy-middleware "~0.17.4"
-    import-local "^0.1.1"
-    internal-ip "1.2.0"
-    ip "^1.1.5"
-    killable "^1.0.0"
-    loglevel "^1.4.1"
-    opn "^5.1.0"
-    portfinder "^1.0.9"
-    selfsigned "^1.9.1"
-    serve-index "^1.7.2"
-    sockjs "0.3.18"
-    sockjs-client "1.1.4"
-    spdy "^3.4.1"
-    strip-ansi "^3.0.1"
-    supports-color "^4.2.1"
-    webpack-dev-middleware "^1.11.0"
-    yargs "^6.6.0"
-
-webpack-hot-middleware@^2.18.0, webpack-hot-middleware@^2.21.0:
-  version "2.21.0"
-  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.21.0.tgz#7b3c113a7a4b301c91e0749573c7aab28b414b52"
+webpack-hot-middleware@^2.21.1:
+  version "2.21.1"
+  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.21.1.tgz#1b03b20a1a65a2e2ea0ea987476a5d23370ff176"
   dependencies:
     ansi-html "0.0.7"
     html-entities "^1.2.0"
@@ -15089,14 +16342,14 @@ webpack@3.8.1:
     webpack-sources "^1.0.1"
     yargs "^8.0.2"
 
-"webpack@^2.5.1 || ^3.0.0", webpack@^3.10.0, webpack@~3.10.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.10.0.tgz#5291b875078cf2abf42bdd23afe3f8f96c17d725"
+webpack@^3.11.0, webpack@~3.11.0:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.11.0.tgz#77da451b1d7b4b117adaf41a1a93b5742f24d894"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"
-    ajv "^5.1.5"
-    ajv-keywords "^2.0.0"
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
     async "^2.1.2"
     enhanced-resolve "^3.4.0"
     escope "^3.6.0"
@@ -15156,6 +16409,10 @@ whatwg-url@^6.3.0:
     tr46 "^1.0.0"
     webidl-conversions "^4.0.1"
 
+when@^3.7.7:
+  version "3.7.8"
+  resolved "https://registry.yarnpkg.com/when/-/when-3.7.8.tgz#c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"
+
 when@~3.6.x:
   version "3.6.4"
   resolved "https://registry.yarnpkg.com/when/-/when-3.6.4.tgz#473b517ec159e2b85005497a13983f095412e34e"
@@ -15172,7 +16429,7 @@ which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
-which@1, which@^1.2.1, which@^1.2.10, which@^1.2.12, which@^1.2.14, which@^1.2.9:
+which@1, which@^1.2.1, which@^1.2.10, which@^1.2.12, which@^1.2.14, which@^1.2.9, which@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
   dependencies:
@@ -15312,13 +16569,6 @@ write@^0.2.1:
   dependencies:
     mkdirp "^0.5.1"
 
-ws@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.2.tgz#8a244fa052401e08c9886cf44a85189e1fd4067f"
-  dependencies:
-    options ">=0.0.5"
-    ultron "1.0.x"
-
 ws@^1.0.1, ws@^1.1.0:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.5.tgz#cbd9e6e75e09fc5d2c90015f21f0c40875e0dd51"
@@ -15333,7 +16583,7 @@ ws@^2.0.3:
     safe-buffer "~5.0.1"
     ultron "~1.1.0"
 
-ws@^3.0.0, ws@^3.3.3:
+ws@^3.0.0, ws@~3.3.1:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
   dependencies:
@@ -15341,9 +16591,12 @@ ws@^3.0.0, ws@^3.3.3:
     safe-buffer "~5.1.0"
     ultron "~1.1.0"
 
-wtf-8@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wtf-8/-/wtf-8-1.0.0.tgz#392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"
+ws@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-4.1.0.tgz#a979b5d7d4da68bf54efe0408967c324869a7289"
+  dependencies:
+    async-limiter "~1.0.0"
+    safe-buffer "~5.1.0"
 
 x-is-function@^1.0.4:
   version "1.0.4"
@@ -15417,14 +16670,18 @@ xmldom@0.1.x:
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
 
-xmlhttprequest-ssl@1.5.3:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz#185a888c04eca46c3e4070d99f7b49de3528992d"
+xmlhttprequest-ssl@~1.5.4:
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
 
 xpipe@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/xpipe/-/xpipe-1.0.5.tgz#8dd8bf45fc3f7f55f0e054b878f43a62614dafdf"
 
+xregexp@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
+
 "xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
@@ -15468,12 +16725,18 @@ yargs-parser@^7.0.0:
   dependencies:
     camelcase "^4.1.0"
 
-yargs-parser@^8.0.0:
+yargs-parser@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950"
   dependencies:
     camelcase "^4.1.0"
 
+yargs-parser@^9.0.2:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
+  dependencies:
+    camelcase "^4.1.0"
+
 yargs@3.29.0:
   version "3.29.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.29.0.tgz#1aab9660eae79d8b8f675bcaeeab6ee34c2cf69c"
@@ -15485,12 +16748,30 @@ yargs@3.29.0:
     window-size "^0.1.2"
     y18n "^3.2.0"
 
-yargs@^10.0.3:
-  version "10.0.3"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.0.3.tgz#6542debd9080ad517ec5048fb454efe9e4d4aaae"
+yargs@6.6.0, yargs@^6.6.0:
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
   dependencies:
+    camelcase "^3.0.0"
     cliui "^3.2.0"
     decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^1.4.0"
+    read-pkg-up "^1.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^1.0.2"
+    which-module "^1.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^4.2.0"
+
+yargs@^10.0.3:
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.1.1.tgz#5fe1ea306985a099b33492001fa19a1e61efe285"
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^1.1.1"
     find-up "^2.1.0"
     get-caller-file "^1.0.1"
     os-locale "^2.0.0"
@@ -15500,7 +16781,24 @@ yargs@^10.0.3:
     string-width "^2.0.0"
     which-module "^2.0.0"
     y18n "^3.2.1"
-    yargs-parser "^8.0.0"
+    yargs-parser "^8.1.0"
+
+yargs@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.0.0.tgz#c052931006c5eee74610e5fc0354bedfd08a201b"
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^1.1.1"
+    find-up "^2.1.0"
+    get-caller-file "^1.0.1"
+    os-locale "^2.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^9.0.2"
 
 yargs@^4.8.0:
   version "4.8.1"
@@ -15521,24 +16819,6 @@ yargs@^4.8.0:
     y18n "^3.2.1"
     yargs-parser "^2.4.1"
 
-yargs@^6.6.0:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
-  dependencies:
-    camelcase "^3.0.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    os-locale "^1.4.0"
-    read-pkg-up "^1.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^1.0.2"
-    which-module "^1.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^4.2.0"
-
 yargs@^7.0.0, yargs@^7.0.2:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
@@ -15616,6 +16896,6 @@ yn@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
 
-zone.js@^0.8.14, zone.js@^0.8.19:
-  version "0.8.19"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.19.tgz#a4b522cd9e8b7b616a638c297d720d4c7f292f71"
+zone.js@^0.8.20:
+  version "0.8.20"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.20.tgz#a218c48db09464b19ff6fc8f0d4bb5b1046e185d"