From 96b5668e25211bf75362189aa3d993be1de1399f Mon Sep 17 00:00:00 2001
From: igor-dv <davydkin.igor@gmail.com>
Date: Thu, 26 Apr 2018 16:02:19 +0300
Subject: [PATCH 01/11] First bit still ugly commit for the new angular-cli
 compatibility

---
 app/angular/src/server/angular-cli_config.js  |  13 +-
 .../src/server/config/webpack.config.js       |   2 +-
 examples/angular-cli/package.json             |  22 +-
 package.json                                  |  12 +-
 yarn.lock                                     | 829 +++++++++---------
 5 files changed, 438 insertions(+), 440 deletions(-)

diff --git a/app/angular/src/server/angular-cli_config.js b/app/angular/src/server/angular-cli_config.js
index a93ac9f49e52..9298dc8cb13c 100644
--- a/app/angular/src/server/angular-cli_config.js
+++ b/app/angular/src/server/angular-cli_config.js
@@ -4,7 +4,7 @@ import { logger } from '@storybook/node-logger';
 
 function isAngularCliInstalled() {
   try {
-    require.resolve('@angular/cli');
+    require.resolve('@angular-devkit/build-angular');
     return true;
   } catch (e) {
     return false;
@@ -21,12 +21,20 @@ export function getAngularCliWebpackConfigOptions(dirToSearch, appIndex = 0) {
     throw new Error('.angular-cli.json must have apps entry.');
   }
   const appConfig = cliConfig.apps[appIndex];
+  // const { scripts, styles, root } = appConfig;
+  const { root, styles, scripts } = appConfig;
 
   const cliWebpackConfigOptions = {
+    root,
     projectRoot: dirToSearch,
     appConfig,
     buildOptions: {
       outputPath: 'outputPath', // It's dummy value to avoid to Angular CLI's error
+      scripts,
+      styles,
+    },
+    tsConfig: {
+      options: {},
     },
     supportES2015: false,
   };
@@ -43,7 +51,8 @@ export function applyAngularCliWebpackConfig(baseConfig, cliWebpackConfigOptions
   }
 
   // eslint-disable-next-line global-require, import/no-extraneous-dependencies
-  const ngcliConfigFactory = require('@angular/cli/models/webpack-configs');
+  const ngcliConfigFactory = require('@angular-devkit/build-angular/src/angular-cli-files/models/webpack-configs');
+  // const ngcliConfigFactory = require('C:\\Projects\\storybook2\\node_modules\\@angular-devkit\\build-angular\\src\\angular-cli-files\\models\\webpack-configs\\index.js');
 
   let cliCommonConfig;
   let cliStyleConfig;
diff --git a/app/angular/src/server/config/webpack.config.js b/app/angular/src/server/config/webpack.config.js
index 7b04bffefc7b..5eaf513747a8 100644
--- a/app/angular/src/server/config/webpack.config.js
+++ b/app/angular/src/server/config/webpack.config.js
@@ -62,7 +62,7 @@ export default function(configDir, quiet) {
       new webpack.ProgressPlugin(),
       quiet ? null : new webpack.ProgressPlugin(),
       new webpack.ContextReplacementPlugin(
-        /angular(\\|\/)core(\\|\/)(@angular|esm5)/,
+        /angular(\\|\/)core(\\|\/)(@angular|esm5|fesm5)/,
         path.resolve(__dirname, '../src')
       ),
       new Dotenv({ silent: true }),
diff --git a/examples/angular-cli/package.json b/examples/angular-cli/package.json
index e07ba3538afb..d958eb32fb19 100644
--- a/examples/angular-cli/package.json
+++ b/examples/angular-cli/package.json
@@ -13,20 +13,22 @@
     "test": "ng test"
   },
   "dependencies": {
-    "@angular/common": "^5.2.10",
-    "@angular/compiler": "^5.2.10",
-    "@angular/core": "^5.2.10",
-    "@angular/forms": "^5.2.10",
-    "@angular/platform-browser": "^5.2.10",
-    "@angular/platform-browser-dynamic": "^5.2.10",
-    "@ngrx/store": "^5.2.0",
+    "@angular/common": "^6.0.0-rc.5",
+    "@angular/compiler": "^6.0.0-rc.5",
+    "@angular/core": "^6.0.0-rc.5",
+    "@angular/forms": "^6.0.0-rc.5",
+    "@angular/platform-browser": "^6.0.0-rc.5",
+    "@angular/platform-browser-dynamic": "^6.0.0-rc.5",
+    "@ngrx/store": "^6.0.0-beta.1",
     "core-js": "^2.5.5",
-    "rxjs": "^5.5.10",
+    "rxjs": "^6.0.0",
+    "rxjs-compat": "^6.0.0",
     "zone.js": "^0.8.26"
   },
   "devDependencies": {
-    "@angular/cli": "1.7.4",
-    "@angular/compiler-cli": "^5.2.10",
+    "@angular-devkit/build-angular": "^0.5.8",
+    "@angular/cli": "^6.0.0-rc.6",
+    "@angular/compiler-cli": "^6.0.0-rc.5",
     "@storybook/addon-actions": "4.0.0-alpha.3",
     "@storybook/addon-knobs": "4.0.0-alpha.3",
     "@storybook/addon-links": "4.0.0-alpha.3",
diff --git a/package.json b/package.json
index 03130f8ab912..90e3b6f2b159 100644
--- a/package.json
+++ b/package.json
@@ -38,12 +38,12 @@
     "chromatic": "npm --prefix examples/official-storybook run chromatic"
   },
   "devDependencies": {
-    "@angular/common": "^5.2.10",
-    "@angular/compiler": "^5.2.10",
-    "@angular/core": "^5.2.10",
-    "@angular/forms": "^5.2.10",
-    "@angular/platform-browser": "^5.2.10",
-    "@angular/platform-browser-dynamic": "^5.2.10",
+    "@angular/common": "^6.0.0-rc.5",
+    "@angular/compiler": "^6.0.0-rc.5",
+    "@angular/core": "^6.0.0-rc.5",
+    "@angular/forms": "^6.0.0-rc.5",
+    "@angular/platform-browser": "^6.0.0-rc.5",
+    "@angular/platform-browser-dynamic": "^6.0.0-rc.5",
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.0",
     "babel-eslint": "^8.2.3",
diff --git a/yarn.lock b/yarn.lock
index 7e70e3b4f2fc..8dada9db36ee 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,140 +2,160 @@
 # yarn lockfile v1
 
 
-"@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"
+"@angular-devkit/architect@0.5.8":
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.5.8.tgz#6073e2ebb072973804829e66434de22b9618e28f"
+  dependencies:
+    "@angular-devkit/core" "0.5.8"
+    rxjs "^6.0.0-beta.3"
+
+"@angular-devkit/build-angular@^0.5.8":
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.5.8.tgz#e049720b3f06c5746963ad965703025c80abe5cf"
+  dependencies:
+    "@angular-devkit/architect" "0.5.8"
+    "@angular-devkit/build-optimizer" "0.5.8"
+    "@angular-devkit/core" "0.5.8"
+    "@ngtools/webpack" "6.0.0-rc.6"
+    ajv "~6.4.0"
+    autoprefixer "^8.1.0"
+    cache-loader "^1.2.2"
+    chalk "~2.2.2"
+    circular-dependency-plugin "^5.0.2"
+    clean-css "^4.1.11"
+    copy-webpack-plugin "^4.5.1"
+    file-loader "^1.1.11"
+    glob "^7.0.3"
+    html-webpack-plugin "^3.0.6"
+    istanbul "^0.4.5"
+    istanbul-instrumenter-loader "^3.0.1"
+    karma-source-map-support "^1.2.0"
+    less "^3.0.1"
+    less-loader "^4.1.0"
+    license-webpack-plugin "^1.3.1"
+    lodash "^4.17.4"
+    memory-fs "^0.4.1"
+    mini-css-extract-plugin "~0.4.0"
+    minimatch "^3.0.4"
+    node-sass "^4.8.3"
+    opn "^5.1.0"
+    parse5 "^4.0.0"
+    portfinder "^1.0.13"
+    postcss "^6.0.19"
+    postcss-import "^11.1.0"
+    postcss-loader "^2.1.4"
+    postcss-url "^7.3.1"
+    raw-loader "^0.5.1"
+    request "^2.83.0"
+    resolve "^1.5.0"
+    rxjs "^6.0.0-beta.3"
+    sass-loader "^7.0.1"
+    silent-error "^1.1.0"
+    source-map-support "^0.5.0"
+    stats-webpack-plugin "^0.6.2"
+    style-loader "^0.21.0"
+    stylus "^0.54.5"
+    stylus-loader "^3.0.2"
+    tree-kill "^1.2.0"
+    uglifyjs-webpack-plugin "^1.2.5"
+    url-loader "^1.0.1"
+    webpack "~4.6.0"
+    webpack-dev-middleware "^3.1.2"
+    webpack-dev-server "^3.1.3"
+    webpack-merge "^4.1.2"
+    webpack-sources "^1.1.0"
+    webpack-subresource-integrity "^1.1.0-rc.4"
+
+"@angular-devkit/build-optimizer@0.5.8":
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.5.8.tgz#1a91d4b2a08de1a29cf66818490bd4c2fe24819e"
   dependencies:
     loader-utils "^1.1.0"
     source-map "^0.5.6"
-    typescript "~2.6.2"
-    webpack-sources "^1.0.1"
+    typescript "~2.7.2"
+    webpack-sources "^1.1.0"
 
-"@angular-devkit/core@0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.3.2.tgz#b6fd6aa2e4f4ac3c39478198ba91a53d4c0f88d5"
+"@angular-devkit/core@0.5.8":
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.5.8.tgz#7bc885cdc400378649766c605ce72a5492fd7ee9"
   dependencies:
-    ajv "~5.5.1"
+    ajv "~6.4.0"
     chokidar "^1.7.0"
-    rxjs "^5.5.6"
+    rxjs "^6.0.0-beta.3"
     source-map "^0.5.6"
 
-"@angular-devkit/schematics@0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.3.2.tgz#09a2268fad61f4f956f42db87913b8748c512a78"
+"@angular-devkit/schematics@0.5.8":
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.5.8.tgz#74f9b084ad8e68c9e845e32111dd0d240b368611"
   dependencies:
+    "@angular-devkit/core" "0.5.8"
     "@ngtools/json-schema" "^1.1.0"
-    rxjs "^5.5.6"
-
-"@angular/cli@1.7.4":
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-1.7.4.tgz#b6c31b5fc6f8ea07e55b1b01a26422f5358a4ea6"
-  dependencies:
-    "@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.2"
-    "@schematics/angular" "0.3.2"
-    "@schematics/package-update" "0.3.2"
-    ajv "^6.1.1"
-    autoprefixer "^7.2.3"
-    cache-loader "^1.2.0"
+    rxjs "^6.0.0-beta.3"
+
+"@angular/cli@^6.0.0-rc.6":
+  version "6.0.0-rc.6"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-6.0.0-rc.6.tgz#29895c8331fa6582909f1e19a8632bbd7f66901c"
+  dependencies:
+    "@angular-devkit/architect" "0.5.8"
+    "@angular-devkit/core" "0.5.8"
+    "@angular-devkit/schematics" "0.5.8"
+    "@schematics/angular" "0.5.8"
+    "@schematics/update" "0.5.8"
     chalk "~2.2.0"
-    circular-dependency-plugin "^4.2.1"
-    clean-css "^4.1.11"
-    common-tags "^1.3.1"
-    copy-webpack-plugin "~4.4.1"
-    core-object "^3.1.0"
-    denodeify "^1.2.1"
-    ember-cli-string-utils "^1.0.0"
-    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 "^3.0.0"
-    karma-source-map-support "^1.2.0"
-    less "^2.7.2"
-    less-loader "^4.0.5"
-    license-webpack-plugin "^1.0.0"
-    loader-utils "1.1.0"
-    lodash "^4.11.1"
-    memory-fs "^0.4.1"
-    minimatch "^3.0.4"
     node-modules-path "^1.0.0"
-    nopt "^4.0.1"
     opn "~5.1.0"
-    portfinder "~1.0.12"
-    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.6"
-    sass-loader "^6.0.6"
+    rxjs "^6.0.0-turbo-rc.4"
     semver "^5.1.0"
     silent-error "^1.0.0"
-    source-map-support "^0.4.1"
-    style-loader "^0.19.1"
-    stylus "^0.54.5"
-    stylus-loader "^3.0.1"
-    uglifyjs-webpack-plugin "^1.1.8"
-    url-loader "^0.6.2"
-    webpack "~3.11.0"
-    webpack-dev-middleware "~1.12.0"
-    webpack-dev-server "~2.11.0"
-    webpack-merge "^4.1.0"
-    webpack-sources "^1.0.0"
-    webpack-subresource-integrity "^1.0.1"
-  optionalDependencies:
-    node-sass "^4.7.2"
+    symbol-observable "^1.2.0"
+    yargs-parser "^9.0.2"
 
-"@angular/common@^5.2.10":
-  version "5.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-5.2.10.tgz#828308df8505a31f219a6895ff91dbb178ebac98"
+"@angular/common@^6.0.0-rc.5":
+  version "6.0.0-rc.5"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-6.0.0-rc.5.tgz#eb31379f187b60ea9724595bc29dff7439c0efcc"
   dependencies:
-    tslib "^1.7.1"
+    tslib "^1.9.0"
 
-"@angular/compiler-cli@^5.2.10":
-  version "5.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-5.2.10.tgz#7e9dead0730dc20f7658e110a558b557b60e7be2"
+"@angular/compiler-cli@^6.0.0-rc.5":
+  version "6.0.0-rc.5"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-6.0.0-rc.5.tgz#1ecb3702532def6e15051253ecd7e98467cf5842"
   dependencies:
     chokidar "^1.4.2"
     minimist "^1.2.0"
     reflect-metadata "^0.1.2"
     tsickle "^0.27.2"
 
-"@angular/compiler@^5.2.10":
-  version "5.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-5.2.10.tgz#1cd9914436f0707957823531c4418ce5b7e6a130"
+"@angular/compiler@^6.0.0-rc.5":
+  version "6.0.0-rc.5"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-6.0.0-rc.5.tgz#6d163ff459c2aa3134efd3d2f187cff08a7aeabf"
   dependencies:
-    tslib "^1.7.1"
+    tslib "^1.9.0"
 
-"@angular/core@^5.2.10":
-  version "5.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-5.2.10.tgz#a6eba06cae7267efbd2666e3fa5e42b84c2261de"
+"@angular/core@^6.0.0-rc.5":
+  version "6.0.0-rc.5"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-6.0.0-rc.5.tgz#33b1a6b4d0daaf1ec034fe2404a6009607f00cbd"
   dependencies:
-    tslib "^1.7.1"
+    tslib "^1.9.0"
 
-"@angular/forms@^5.2.10":
-  version "5.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-5.2.10.tgz#6a4cf9c87b57005599c0ec59a79b7f1b06375591"
+"@angular/forms@^6.0.0-rc.5":
+  version "6.0.0-rc.5"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-6.0.0-rc.5.tgz#9594f2c2423e46aa345000097ce1f8e6e6569fc5"
   dependencies:
-    tslib "^1.7.1"
+    tslib "^1.9.0"
 
-"@angular/platform-browser-dynamic@^5.2.10":
-  version "5.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.2.10.tgz#bec4c0ca9fb16c34adee851caa187989953216ca"
+"@angular/platform-browser-dynamic@^6.0.0-rc.5":
+  version "6.0.0-rc.5"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.0.0-rc.5.tgz#2f7fb42b10f2fd769d209dfed6b50b89590851d8"
   dependencies:
-    tslib "^1.7.1"
+    tslib "^1.9.0"
 
-"@angular/platform-browser@^5.2.10":
-  version "5.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-5.2.10.tgz#92883803de7362e635748a440dd5f6172fc2394a"
+"@angular/platform-browser@^6.0.0-rc.5":
+  version "6.0.0-rc.5"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-6.0.0-rc.5.tgz#492bc951339ff170eb057871626476b34e65227f"
   dependencies:
-    tslib "^1.7.1"
+    tslib "^1.9.0"
 
 "@babel/code-frame@7.0.0-beta.42":
   version "7.0.0-beta.42"
@@ -242,28 +262,19 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@ngrx/store@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ngrx/store/-/store-5.2.0.tgz#627ed74c9cd95462930485d912a557117b23903e"
-
-"@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"
+"@ngrx/store@^6.0.0-beta.1":
+  version "6.0.0-beta.1"
+  resolved "https://registry.yarnpkg.com/@ngrx/store/-/store-6.0.0-beta.1.tgz#db4b91fb54828b83495ae9cfb544cf62266a441d"
 
 "@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.10.2":
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-1.10.2.tgz#373705fd19992b36e996203480b1d412e942c8d6"
+"@ngtools/webpack@6.0.0-rc.6":
+  version "6.0.0-rc.6"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-6.0.0-rc.6.tgz#ae558c454d8330630ad62a39692a45406e4dac29"
   dependencies:
-    chalk "~2.2.0"
-    enhanced-resolve "^3.1.0"
-    loader-utils "^1.0.2"
-    magic-string "^0.22.3"
-    semver "^5.3.0"
-    source-map "^0.5.6"
+    "@angular-devkit/core" "0.5.8"
     tree-kill "^1.0.0"
     webpack-sources "^1.1.0"
 
@@ -284,17 +295,22 @@
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/@polymer/polymer/-/polymer-2.6.0.tgz#98601124122a045e74f4b41f55975006ef327dbc"
 
-"@schematics/angular@0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.3.2.tgz#be209a032a3e4577992d94fbaa14bd4bfde485e2"
+"@schematics/angular@0.5.8":
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.5.8.tgz#cb74fdd31a34e786060e765b40f7cd455fc7a0b9"
   dependencies:
-    typescript "~2.6.2"
+    "@angular-devkit/core" "0.5.8"
+    "@angular-devkit/schematics" "0.5.8"
+    typescript ">=2.6.2 <2.8"
 
-"@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"
+"@schematics/update@0.5.8":
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.5.8.tgz#e74e328bb8a6f3c323e7dc9c66046f5f877b4e13"
   dependencies:
-    rxjs "^5.5.6"
+    "@angular-devkit/core" "0.5.8"
+    "@angular-devkit/schematics" "0.5.8"
+    npm-registry-client "^8.5.1"
+    rxjs "^6.0.0-beta.3"
     semver "^5.3.0"
     semver-intersect "^1.1.2"
 
@@ -446,6 +462,10 @@ abbrev@1, abbrev@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
 
+abbrev@1.0.x:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
+
 absolute-path@^0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/absolute-path/-/absolute-path-0.0.0.tgz#a78762fbdadfb5297be99b15d35a785b2f095bf7"
@@ -603,7 +623,7 @@ ajv@^4.9.1:
     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.5.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:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
   dependencies:
@@ -612,7 +632,7 @@ 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
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-ajv@^6.1.0, ajv@^6.1.1:
+ajv@^6.1.0:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.1.1.tgz#978d597fbc2b7d0e5a5c3ddeb149a682f2abfa0e"
   dependencies:
@@ -620,6 +640,15 @@ ajv@^6.1.0, ajv@^6.1.1:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
+ajv@~6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.4.0.tgz#d3aff78e9277549771daf0164cff48482b754fc6"
+  dependencies:
+    fast-deep-equal "^1.0.0"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.3.0"
+    uri-js "^3.0.2"
+
 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"
@@ -998,11 +1027,11 @@ async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
 
-async@^1.4.0, async@^1.5.0, async@^1.5.2:
+async@1.x, 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:
+async@^2.1.2, async@^2.1.4, 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:
@@ -1044,18 +1073,7 @@ autoprefixer@^6.3.1:
     postcss "^5.2.16"
     postcss-value-parser "^3.2.3"
 
-autoprefixer@^7.2.3:
-  version "7.2.5"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.5.tgz#04ccbd0c6a61131b6d13f53d371926092952d192"
-  dependencies:
-    browserslist "^2.11.1"
-    caniuse-lite "^1.0.30000791"
-    normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    postcss "^6.0.16"
-    postcss-value-parser "^3.2.3"
-
-autoprefixer@^8.3.0:
+autoprefixer@^8.1.0, autoprefixer@^8.3.0:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.3.0.tgz#22ac5151c3c8946bb8f75f337d5c5042c0ec6404"
   dependencies:
@@ -2777,7 +2795,7 @@ 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.11.1, browserslist@^2.5.1:
+browserslist@^2.1.2, browserslist@^2.5.1:
   version "2.11.1"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.1.tgz#02fda29d9a2164b879100126e7b0d0b57e43a7bb"
   dependencies:
@@ -2874,7 +2892,7 @@ bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
 
-cacache@^10.0.0, cacache@^10.0.1:
+cacache@^10.0.0:
   version "10.0.2"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.2.tgz#105a93a162bbedf3a25da42e1939ed99ffb145f8"
   dependencies:
@@ -2960,13 +2978,13 @@ 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"
+cache-loader@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/cache-loader/-/cache-loader-1.2.2.tgz#6d5c38ded959a09cc5d58190ab5af6f73bd353f5"
   dependencies:
-    async "^2.4.1"
     loader-utils "^1.1.0"
     mkdirp "^0.5.1"
+    neo-async "^2.5.0"
     schema-utils "^0.4.2"
 
 cached-path-relative@^1.0.0:
@@ -3050,7 +3068,7 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
   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.30000789, caniuse-lite@^1.0.30000791:
+caniuse-lite@^1.0.30000748, caniuse-lite@^1.0.30000789:
   version "1.0.30000791"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000791.tgz#8e35745efd483a3e23bb7d350990326d2319fc16"
 
@@ -3157,7 +3175,7 @@ chalk@~0.4.0:
     has-color "~0.1.0"
     strip-ansi "~0.1.0"
 
-chalk@~2.2.0:
+chalk@~2.2.0, chalk@~2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.2.2.tgz#4403f5cf18f35c05f51fbdf152bf588f956cf7cb"
   dependencies:
@@ -3289,9 +3307,9 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-circular-dependency-plugin@^4.2.1:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-4.3.0.tgz#2a12824e584546e1aeea5865b7bf234a11c4a695"
+circular-dependency-plugin@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.0.2.tgz#da168c0b37e7b43563fb9f912c1c007c213389ef"
 
 circular-json-es6@^2.0.1:
   version "2.0.1"
@@ -3410,15 +3428,6 @@ cliui@^4.0.0:
     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"
-  dependencies:
-    for-own "^1.0.0"
-    is-plain-object "^2.0.1"
-    kind-of "^3.2.2"
-    shallow-clone "^0.1.2"
-
 clone-deep@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
@@ -3621,7 +3630,7 @@ commander@^2.15.1:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
 
-common-tags@^1.3.1, common-tags@^1.4.0, common-tags@^1.7.2:
+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:
@@ -4070,19 +4079,6 @@ copy-webpack-plugin@^4.5.1:
     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"
-    minimatch "^3.0.4"
-    p-limit "^1.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"
@@ -4099,12 +4095,6 @@ core-js@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"
 
-core-object@^3.1.0:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/core-object/-/core-object-3.1.5.tgz#fa627b87502adc98045e44678e9a8ec3b9c0d2a9"
-  dependencies:
-    chalk "^2.0.0"
-
 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"
@@ -5057,10 +5047,6 @@ elliptic@^6.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.0"
 
-ember-cli-string-utils@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz#39b677fc2805f55173735376fcef278eaa4452a1"
-
 emoji-regex@^6.1.0:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.5.1.tgz#9baea929b155565c11ea41c6626eaa65cef992c2"
@@ -5128,7 +5114,7 @@ engine.io@~3.1.0:
   optionalDependencies:
     uws "~9.14.0"
 
-enhanced-resolve@^3.1.0, enhanced-resolve@^3.4.0:
+enhanced-resolve@^3.4.0:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e"
   dependencies:
@@ -5365,6 +5351,17 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.0, escape-string-regexp@^1
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
+escodegen@1.8.x:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
+  dependencies:
+    esprima "^2.7.1"
+    estraverse "^1.9.1"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.2.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"
@@ -5660,14 +5657,14 @@ espree@^3.5.4:
     acorn "^5.5.0"
     acorn-jsx "^3.0.0"
 
+esprima@2.7.x, esprima@^2.6.0, esprima@^2.7.1:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
+
 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@^4.0.0, esprima@~4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
@@ -5685,6 +5682,10 @@ esrecurse@^4.1.0:
     estraverse "^4.1.0"
     object-assign "^4.0.1"
 
+estraverse@^1.9.1:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
+
 estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
@@ -6016,7 +6017,7 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-extract-text-webpack-plugin@3.0.2, 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"
   dependencies:
@@ -6183,13 +6184,6 @@ file-loader@1.1.5:
     loader-utils "^1.0.2"
     schema-utils "^0.3.0"
 
-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"
@@ -6846,6 +6840,16 @@ glob@7.0.x:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^5.0.15:
+  version "5.0.15"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@^6.0.4:
   version "6.0.4"
   resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
@@ -7157,7 +7161,7 @@ handle-thing@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"
 
-handlebars@^4.0.2, handlebars@^4.0.3:
+handlebars@^4.0.1, handlebars@^4.0.2, handlebars@^4.0.3:
   version "4.0.11"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc"
   dependencies:
@@ -7391,6 +7395,10 @@ hosted-git-info@^2.1.4, hosted-git-info@^2.4.2, hosted-git-info@^2.5.0, hosted-g
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
 
+hosted-git-info@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222"
+
 hpack.js@^2.1.6:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
@@ -7470,18 +7478,7 @@ html-webpack-plugin@2.29.0:
     pretty-error "^2.0.2"
     toposort "^1.0.0"
 
-html-webpack-plugin@^2.29.0:
-  version "2.30.1"
-  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-2.30.1.tgz#7f9c421b7ea91ec460f56527d78df484ee7537d5"
-  dependencies:
-    bluebird "^3.4.7"
-    html-minifier "^3.2.3"
-    loader-utils "^0.2.16"
-    lodash "^4.17.3"
-    pretty-error "^2.0.2"
-    toposort "^1.0.0"
-
-html-webpack-plugin@^3.2.0:
+html-webpack-plugin@^3.0.6, html-webpack-plugin@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b"
   dependencies:
@@ -8019,7 +8016,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.0, is-buffer@^1.1.4, is-buffer@^1.1.5:
+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"
 
@@ -8416,9 +8413,9 @@ istanbul-api@^1.1.1, istanbul-api@^1.1.14:
     mkdirp "^0.5.1"
     once "^1.4.0"
 
-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"
+istanbul-instrumenter-loader@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz#9957bd59252b373fae5c52b7b5188e6fde2a0949"
   dependencies:
     convert-source-map "^1.5.0"
     istanbul-lib-instrument "^1.7.3"
@@ -8472,6 +8469,25 @@ istanbul-reports@^1.1.3:
   dependencies:
     handlebars "^4.0.3"
 
+istanbul@^0.4.5:
+  version "0.4.5"
+  resolved "https://registry.yarnpkg.com/istanbul/-/istanbul-0.4.5.tgz#65c7d73d4c4da84d4f3ac310b918fb0b8033733b"
+  dependencies:
+    abbrev "1.0.x"
+    async "1.x"
+    escodegen "1.8.x"
+    esprima "2.7.x"
+    glob "^5.0.15"
+    handlebars "^4.0.1"
+    js-yaml "3.x"
+    mkdirp "0.5.x"
+    nopt "3.x"
+    once "1.x"
+    resolve "1.1.x"
+    supports-color "^3.1.0"
+    which "^1.1.1"
+    wordwrap "^1.0.0"
+
 iterall@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.1.3.tgz#1cbbff96204056dde6656e2ed2e2226d0e6d72c9"
@@ -9238,6 +9254,13 @@ 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.x:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
 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"
@@ -9552,13 +9575,7 @@ killable@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.0.tgz#da8b84bd47de5395878f95d64d02f2449fe05e6b"
 
-kind-of@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-2.0.1.tgz#018ec7a4ce7e3a86cb9141be519d24c8faa981b5"
-  dependencies:
-    is-buffer "^1.0.2"
-
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0, kind-of@^3.2.2:
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   dependencies:
@@ -9604,10 +9621,6 @@ latest-version@^3.0.0:
   dependencies:
     package-json "^4.0.0"
 
-lazy-cache@^0.2.3:
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65"
-
 lazy-cache@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
@@ -9680,25 +9693,25 @@ lerna@2.10.2:
     write-pkg "^3.1.0"
     yargs "^8.0.2"
 
-less-loader@^4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-4.0.5.tgz#ae155a7406cac6acd293d785587fcff0f478c4dd"
+less-loader@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-4.1.0.tgz#2c1352c5b09a4f84101490274fd51674de41363e"
   dependencies:
     clone "^2.1.1"
     loader-utils "^1.1.0"
-    pify "^2.3.0"
+    pify "^3.0.0"
 
-less@^2.7.2:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/less/-/less-2.7.3.tgz#cc1260f51c900a9ec0d91fb6998139e02507b63b"
+less@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/less/-/less-3.0.2.tgz#1bcb9813bb6090c884ac142f02c633bd42931844"
   optionalDependencies:
     errno "^0.1.1"
     graceful-fs "^4.1.2"
     image-size "~0.5.0"
-    mime "^1.2.11"
+    mime "^1.4.1"
     mkdirp "^0.5.0"
     promise "^7.1.1"
-    request "2.81.0"
+    request "^2.83.0"
     source-map "^0.5.3"
 
 leven@^2.1.0:
@@ -9747,9 +9760,9 @@ 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"
+license-webpack-plugin@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-1.3.1.tgz#688b76472188ef597918b7cae3eec7dc2fa5a0e8"
   dependencies:
     ejs "^2.5.7"
 
@@ -10181,7 +10194,7 @@ lodash@3.7.x:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.7.0.tgz#3678bd8ab995057c07ade836ed2ef087da811d45"
 
-"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.0.1, 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:
+"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.0.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"
 
@@ -10305,12 +10318,6 @@ macos-release@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-1.1.0.tgz#831945e29365b470aa8724b0ab36c8f8959d10fb"
 
-magic-string@^0.22.3:
-  version "0.22.4"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.4.tgz#31039b4e40366395618c1d6cf8193c53917475ff"
-  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"
@@ -10755,6 +10762,13 @@ min-document@^2.19.0:
   dependencies:
     dom-walk "^0.1.0"
 
+mini-css-extract-plugin@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.0.tgz#ff3bf08bee96e618e177c16ca6131bfecef707f9"
+  dependencies:
+    loader-utils "^1.1.0"
+    webpack-sources "^1.1.0"
+
 minimalistic-assert@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
@@ -10963,7 +10977,11 @@ 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.3.2:
+nan@^2.10.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
+
+nan@^2.3.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
 
@@ -11185,9 +11203,9 @@ node-pre-gyp@^0.6.39:
     tar "^2.2.1"
     tar-pack "^3.4.0"
 
-node-sass@^4.7.2:
-  version "4.7.2"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.7.2.tgz#9366778ba1469eb01438a9e8592f4262bcb6794e"
+node-sass@^4.8.3:
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.0.tgz#d1b8aa855d98ed684d6848db929a20771cc2ae52"
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -11201,7 +11219,7 @@ node-sass@^4.7.2:
     lodash.mergewith "^4.6.0"
     meow "^3.7.0"
     mkdirp "^0.5.1"
-    nan "^2.3.2"
+    nan "^2.10.0"
     node-gyp "^3.3.1"
     npmlog "^4.0.0"
     request "~2.79.0"
@@ -11284,7 +11302,7 @@ nomnom@~1.6.2:
     colors "0.5.x"
     underscore "~1.4.4"
 
-"nopt@2 || 3":
+"nopt@2 || 3", nopt@3.x:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
   dependencies:
@@ -11348,6 +11366,15 @@ npm-install-checks@~3.0.0:
     semver "^5.1.0"
     validate-npm-package-name "^3.0.0"
 
+"npm-package-arg@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
+  dependencies:
+    hosted-git-info "^2.6.0"
+    osenv "^0.1.5"
+    semver "^5.5.0"
+    validate-npm-package-name "^3.0.0"
+
 npm-package-arg@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.0.0.tgz#8cce04b49d3f9faec3f56b0fe5f4391aeb9d2fac"
@@ -11378,6 +11405,24 @@ npm-prefix@^1.2.0:
     shellsubstitute "^1.1.0"
     untildify "^2.1.0"
 
+npm-registry-client@^8.5.1:
+  version "8.5.1"
+  resolved "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-8.5.1.tgz#8115809c0a4b40938b8a109b8ea74d26c6f5d7f1"
+  dependencies:
+    concat-stream "^1.5.2"
+    graceful-fs "^4.1.6"
+    normalize-package-data "~1.0.1 || ^2.0.0"
+    npm-package-arg "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0"
+    once "^1.3.3"
+    request "^2.74.0"
+    retry "^0.10.0"
+    safe-buffer "^5.1.1"
+    semver "2 >=2.2.1 || 3.x || 4 || 5"
+    slide "^1.1.3"
+    ssri "^5.2.4"
+  optionalDependencies:
+    npmlog "2 || ^3.1.0 || ^4.0.0"
+
 npm-registry-client@~8.4.0:
   version "8.4.0"
   resolved "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-8.4.0.tgz#d52b901685647fc62a4c03eafecb6ceaa5018d4c"
@@ -11661,7 +11706,7 @@ on-headers@~1.0.0, on-headers@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
 
-once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0, once@~1.4.0:
+once@1.x, once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0, once@~1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
@@ -11786,6 +11831,13 @@ osenv@0, osenv@^0.1.0, osenv@^0.1.4, osenv@~0.1.4:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
+osenv@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
 output-file-sync@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-1.1.2.tgz#d0a33eefe61a205facb90092e826598d5245ce76"
@@ -12009,6 +12061,10 @@ parse5@^3.0.1, parse5@^3.0.2:
   dependencies:
     "@types/node" "*"
 
+parse5@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
+
 parseqs@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
@@ -12248,7 +12304,7 @@ polymer-webpack-loader@^2.0.2:
     postcss "^6.0.9"
     source-map "^0.5.6"
 
-portfinder@^1.0.9, portfinder@~1.0.12:
+portfinder@^1.0.13, portfinder@^1.0.9:
   version "1.0.13"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9"
   dependencies:
@@ -12333,9 +12389,9 @@ postcss-flexbugs-fixes@^3.2.0:
   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"
+postcss-import@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-11.1.0.tgz#55c9362c9192994ec68865d224419df1db2981f0"
   dependencies:
     postcss "^6.0.1"
     postcss-value-parser "^3.2.3"
@@ -12374,15 +12430,6 @@ postcss-loader@2.0.8:
     postcss-load-config "^1.2.0"
     schema-utils "^0.3.0"
 
-postcss-loader@^2.0.10:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.0.10.tgz#090db0540140bd56a7a7f717c41bc29aeef4c674"
-  dependencies:
-    loader-utils "^1.1.0"
-    postcss "^6.0.0"
-    postcss-load-config "^1.2.0"
-    schema-utils "^0.3.0"
-
 postcss-loader@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.1.4.tgz#f44a6390e03c84108b2b2063182d1a1011b2ce76"
@@ -12554,9 +12601,9 @@ postcss-unique-selectors@^2.0.2:
     postcss "^5.0.4"
     uniqs "^2.0.0"
 
-postcss-url@^7.1.2:
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-7.3.0.tgz#cf2f45e06743cf43cfea25309f81cbc003dc783f"
+postcss-url@^7.3.1:
+  version "7.3.2"
+  resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-7.3.2.tgz#5fea273807fb84b38c461c3c9a9e8abd235f7120"
   dependencies:
     mime "^1.4.1"
     minimatch "^3.0.4"
@@ -12585,7 +12632,7 @@ 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.16, postcss@^6.0.8, postcss@^6.0.9:
+postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.13, 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:
@@ -12593,7 +12640,7 @@ postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.13, postcss@^6.0.16, postcss@^6.0.8
     source-map "^0.6.1"
     supports-color "^5.1.0"
 
-postcss@^6.0.21:
+postcss@^6.0.19, postcss@^6.0.21:
   version "6.0.21"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.21.tgz#8265662694eddf9e9a5960db6da33c39e4cd069d"
   dependencies:
@@ -14284,7 +14331,7 @@ resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
 
-resolve@1.1.7:
+resolve@1.1.7, resolve@1.1.x:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
@@ -14413,17 +14460,21 @@ 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:
+rxjs-compat@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.0.0.tgz#2496403f74042d07899faeeac0bd703e4bce6710"
+
+rxjs@^5.4.2, rxjs@^5.5.2:
   version "5.5.6"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.6.tgz#e31fb96d6fd2ff1fd84bcea8ae9c02d007179c02"
   dependencies:
     symbol-observable "1.0.1"
 
-rxjs@^5.5.10:
-  version "5.5.10"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.10.tgz#fde02d7a614f6c8683d0d1957827f492e09db045"
+rxjs@^6.0.0, rxjs@^6.0.0-beta.3, rxjs@^6.0.0-turbo-rc.4:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0.tgz#d647e029b5854617f994c82fe57a4c6747b352da"
   dependencies:
-    symbol-observable "1.0.1"
+    tslib "^1.9.0"
 
 safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.1"
@@ -14474,16 +14525,6 @@ sass-graph@^2.2.4:
     scss-tokenizer "^0.2.3"
     yargs "^7.0.0"
 
-sass-loader@^6.0.6:
-  version "6.0.6"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-6.0.6.tgz#e9d5e6c1f155faa32a4b26d7a9b7107c225e40f9"
-  dependencies:
-    async "^2.1.5"
-    clone-deep "^0.3.0"
-    loader-utils "^1.0.1"
-    lodash.tail "^4.1.1"
-    pify "^3.0.0"
-
 sass-loader@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.0.1.tgz#fd937259ccba3a9cfe0d5f8a98746d48adfcc261"
@@ -14805,15 +14846,6 @@ sha@~2.0.1:
     graceful-fs "^4.1.2"
     readable-stream "^2.0.2"
 
-shallow-clone@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-0.1.2.tgz#5909e874ba77106d73ac414cfec1ffca87d97060"
-  dependencies:
-    is-extendable "^0.1.1"
-    kind-of "^2.0.1"
-    lazy-cache "^0.2.3"
-    mixin-object "^2.0.1"
-
 shallow-clone@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571"
@@ -14878,7 +14910,7 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
-silent-error@^1.0.0:
+silent-error@^1.0.0, silent-error@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/silent-error/-/silent-error-1.1.0.tgz#2209706f1c850a9f1d10d0d840918b46f26e1bc9"
   dependencies:
@@ -15148,6 +15180,12 @@ 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"
 
+source-map@~0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
+  dependencies:
+    amdefine ">=0.0.4"
+
 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"
@@ -15280,6 +15318,12 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
+stats-webpack-plugin@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/stats-webpack-plugin/-/stats-webpack-plugin-0.6.2.tgz#2c5949b531e07f87a88e6ea4dcfac53aa8c75a2b"
+  dependencies:
+    lodash "^4.17.4"
+
 statuses@1, "statuses@>= 1.3.1 < 2", statuses@~1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
@@ -15548,13 +15592,6 @@ style-loader@0.19.0:
     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"
-  dependencies:
-    loader-utils "^1.0.2"
-    schema-utils "^0.3.0"
-
 style-loader@^0.20.3:
   version "0.20.3"
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.20.3.tgz#ebef06b89dec491bcb1fdb3452e913a6fd1c10c4"
@@ -15562,9 +15599,16 @@ style-loader@^0.20.3:
     loader-utils "^1.1.0"
     schema-utils "^0.4.5"
 
-stylus-loader@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-3.0.1.tgz#77f4b34fd030d25b2617bcf5513db5b0730c4089"
+style-loader@^0.21.0:
+  version "0.21.0"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.21.0.tgz#68c52e5eb2afc9ca92b6274be277ee59aea3a852"
+  dependencies:
+    loader-utils "^1.1.0"
+    schema-utils "^0.4.5"
+
+stylus-loader@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-3.0.2.tgz#27a706420b05a38e038e7cacb153578d450513c6"
   dependencies:
     loader-utils "^1.0.2"
     lodash.clonedeep "^4.5.0"
@@ -15595,7 +15639,7 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-supports-color@^3.1.2, supports-color@^3.2.3:
+supports-color@^3.1.0, supports-color@^3.1.2, supports-color@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies:
@@ -15986,7 +16030,7 @@ tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
 
-tree-kill@^1.0.0, tree-kill@^1.1.0:
+tree-kill@^1.0.0, tree-kill@^1.1.0, tree-kill@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36"
 
@@ -16078,6 +16122,10 @@ 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"
 
+tslib@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
+
 tslint-config-prettier@^1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.10.0.tgz#5063c413d43de4f6988c73727f65ecfc239054ec"
@@ -16162,7 +16210,7 @@ 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.7.2:
+typescript@2.7.2, "typescript@>=2.6.2 <2.8", typescript@~2.7.2:
   version "2.7.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.2.tgz#2d615a1ef4aee4f574425cdff7026edf81919836"
 
@@ -16170,10 +16218,6 @@ typescript@^2.8.1:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.1.tgz#6160e4f8f195d5ba81d4876f9c0cc1fbc0820624"
 
-typescript@~2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
-
 ua-parser-js@^0.7.9:
   version "0.7.17"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
@@ -16217,22 +16261,22 @@ uglifyjs-webpack-plugin@^0.4.6:
     uglify-js "^2.8.29"
     webpack-sources "^1.0.1"
 
-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"
+uglifyjs-webpack-plugin@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.4.tgz#5eec941b2e9b8538be0a20fc6eda25b14c7c1043"
   dependencies:
-    cacache "^10.0.1"
+    cacache "^10.0.4"
     find-cache-dir "^1.0.0"
-    schema-utils "^0.4.2"
+    schema-utils "^0.4.5"
     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.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.4.tgz#5eec941b2e9b8538be0a20fc6eda25b14c7c1043"
+uglifyjs-webpack-plugin@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.5.tgz#2ef8387c8f1a903ec5e44fa36f9f3cbdcea67641"
   dependencies:
     cacache "^10.0.4"
     find-cache-dir "^1.0.0"
@@ -16531,6 +16575,12 @@ upper-case@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
 
+uri-js@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-3.0.2.tgz#f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa"
+  dependencies:
+    punycode "^2.1.0"
+
 urijs@^1.16.1:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.0.tgz#d8aa284d0e7469703a6988ad045c4cbfdf08ada0"
@@ -16543,7 +16593,7 @@ url-join@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.0.tgz#4d3340e807d3773bda9991f8305acdcc2a665d2a"
 
-url-loader@0.6.2, url-loader@^0.6.2:
+url-loader@0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.6.2.tgz#a007a7109620e9d988d14bce677a1decb9a993f7"
   dependencies:
@@ -16774,10 +16824,6 @@ vinyl@^0.5.0:
     clone-stats "^0.0.1"
     replace-ext "0.0.1"
 
-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.1:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
@@ -16944,16 +16990,6 @@ 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.11.0, 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:
-    memory-fs "~0.4.1"
-    mime "^1.5.0"
-    path-is-absolute "^1.0.0"
-    range-parser "^1.0.3"
-    time-stamp "^2.0.0"
-
 webpack-dev-middleware@3.1.2, webpack-dev-middleware@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.1.2.tgz#be4d0c36a4fa7d69d6904093418514caa9df3a40"
@@ -16966,6 +17002,16 @@ webpack-dev-middleware@3.1.2, webpack-dev-middleware@^3.1.2:
     url-join "^4.0.0"
     webpack-log "^1.0.1"
 
+webpack-dev-middleware@^1.11.0:
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz#f8fc1120ce3b4fc5680ceecb43d777966b21105e"
+  dependencies:
+    memory-fs "~0.4.1"
+    mime "^1.5.0"
+    path-is-absolute "^1.0.0"
+    range-parser "^1.0.3"
+    time-stamp "^2.0.0"
+
 webpack-dev-server@2.9.4:
   version "2.9.4"
   resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.9.4.tgz#7883e61759c6a4b33e9b19ec4037bd4ab61428d1"
@@ -17031,38 +17077,6 @@ webpack-dev-server@^3.1.3:
     webpack-log "^1.1.2"
     yargs "11.0.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"
-    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 "^4.0.0"
-    supports-color "^5.1.0"
-    webpack-dev-middleware "1.12.2"
-    yargs "6.6.0"
-
 webpack-hot-middleware@^2.22.1:
   version "2.22.1"
   resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.22.1.tgz#2ff865bfebc8e9937bd1619f0f48d6ab601bfea0"
@@ -17088,22 +17102,22 @@ webpack-manifest-plugin@1.3.2:
     fs-extra "^0.30.0"
     lodash ">=3.5 <5"
 
-webpack-merge@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.1.tgz#f1197a0a973e69c6fbeeb6d658219aa8c0c13555"
+webpack-merge@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.2.tgz#5d372dddd3e1e5f8874f5bf5a8e929db09feb216"
   dependencies:
-    lodash "^4.17.4"
+    lodash "^4.17.5"
 
-webpack-sources@^1.0.0, webpack-sources@^1.0.1, webpack-sources@^1.1.0:
+webpack-sources@^1.0.1, webpack-sources@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"
   dependencies:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack-subresource-integrity@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.0.3.tgz#c0606d40090b070cde428bec8df3603216e472eb"
+webpack-subresource-integrity@^1.1.0-rc.4:
+  version "1.1.0-rc.4"
+  resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.4.tgz#c5c4e3d690f9d2f64a9550e07a8767f9796aa5d8"
   dependencies:
     webpack-core "^0.6.8"
 
@@ -17134,7 +17148,7 @@ webpack@3.8.1:
     webpack-sources "^1.0.1"
     yargs "^8.0.2"
 
-webpack@^4.6.0:
+webpack@^4.6.0, webpack@~4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.6.0.tgz#363eafa733710eb0ed28c512b2b9b9f5fb01e69b"
   dependencies:
@@ -17158,33 +17172,6 @@ webpack@^4.6.0:
     watchpack "^1.5.0"
     webpack-sources "^1.0.1"
 
-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 "^6.1.0"
-    ajv-keywords "^3.1.0"
-    async "^2.1.2"
-    enhanced-resolve "^3.4.0"
-    escope "^3.6.0"
-    interpret "^1.0.0"
-    json-loader "^0.5.4"
-    json5 "^0.5.1"
-    loader-runner "^2.3.0"
-    loader-utils "^1.1.0"
-    memory-fs "~0.4.1"
-    mkdirp "~0.5.0"
-    node-libs-browser "^2.0.0"
-    source-map "^0.5.3"
-    supports-color "^4.2.1"
-    tapable "^0.2.7"
-    uglifyjs-webpack-plugin "^0.4.6"
-    watchpack "^1.4.0"
-    webpack-sources "^1.0.1"
-    yargs "^8.0.2"
-
 websocket-driver@>=0.5.1:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
@@ -17245,7 +17232,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.3.0:
+which@1, which@^1.1.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:
@@ -17584,24 +17571,6 @@ yargs@3.29.0:
     window-size "^0.1.2"
     y18n "^3.2.0"
 
-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"
@@ -17638,6 +17607,24 @@ 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"

From 575ad6ab7173aeeb19fb3344cc444b6daaadac41 Mon Sep 17 00:00:00 2001
From: igor-dv <davydkin.igor@gmail.com>
Date: Thu, 26 Apr 2018 16:11:11 +0300
Subject: [PATCH 02/11] WIP

---
 app/angular/src/server/angular-cli_config.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/angular/src/server/angular-cli_config.js b/app/angular/src/server/angular-cli_config.js
index 9298dc8cb13c..be5cb4a9b5ee 100644
--- a/app/angular/src/server/angular-cli_config.js
+++ b/app/angular/src/server/angular-cli_config.js
@@ -21,7 +21,6 @@ export function getAngularCliWebpackConfigOptions(dirToSearch, appIndex = 0) {
     throw new Error('.angular-cli.json must have apps entry.');
   }
   const appConfig = cliConfig.apps[appIndex];
-  // const { scripts, styles, root } = appConfig;
   const { root, styles, scripts } = appConfig;
 
   const cliWebpackConfigOptions = {
@@ -52,7 +51,6 @@ export function applyAngularCliWebpackConfig(baseConfig, cliWebpackConfigOptions
 
   // eslint-disable-next-line global-require, import/no-extraneous-dependencies
   const ngcliConfigFactory = require('@angular-devkit/build-angular/src/angular-cli-files/models/webpack-configs');
-  // const ngcliConfigFactory = require('C:\\Projects\\storybook2\\node_modules\\@angular-devkit\\build-angular\\src\\angular-cli-files\\models\\webpack-configs\\index.js');
 
   let cliCommonConfig;
   let cliStyleConfig;

From 06e6e05808cbfe717e89745c815bc40c16bab648 Mon Sep 17 00:00:00 2001
From: igor-dv <davydkin.igor@gmail.com>
Date: Mon, 7 May 2018 21:26:07 +0300
Subject: [PATCH 03/11] deps upgrade + update angular-cli_config.js based on a
 new format of the angular.json

---
 app/angular/src/server/angular-cli_config.js |  59 +++++----
 examples/angular-cli/.angular-cli.json       |  60 ---------
 examples/angular-cli/.gitignore              |   9 +-
 examples/angular-cli/README.md               |   7 +-
 examples/angular-cli/angular.json            | 122 +++++++++++++++++++
 examples/angular-cli/package.json            |  18 +--
 package.json                                 |  12 +-
 yarn.lock                                    | 119 ++++++++++--------
 8 files changed, 243 insertions(+), 163 deletions(-)
 delete mode 100644 examples/angular-cli/.angular-cli.json
 create mode 100644 examples/angular-cli/angular.json

diff --git a/app/angular/src/server/angular-cli_config.js b/app/angular/src/server/angular-cli_config.js
index be5cb4a9b5ee..4369b4d75a98 100644
--- a/app/angular/src/server/angular-cli_config.js
+++ b/app/angular/src/server/angular-cli_config.js
@@ -2,7 +2,7 @@ import path from 'path';
 import fs from 'fs';
 import { logger } from '@storybook/node-logger';
 
-function isAngularCliInstalled() {
+function isBuildAngularInstalled() {
   try {
     require.resolve('@angular-devkit/build-angular');
     return true;
@@ -11,41 +11,48 @@ function isAngularCliInstalled() {
   }
 }
 
-export function getAngularCliWebpackConfigOptions(dirToSearch, appIndex = 0) {
-  const fname = path.join(dirToSearch, '.angular-cli.json');
+export function getAngularCliWebpackConfigOptions(dirToSearch) {
+  const fname = path.join(dirToSearch, 'angular.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 angularJson = JSON.parse(fs.readFileSync(fname, 'utf8'));
+  const { projects, defaultProject } = angularJson;
+
+  if (!projects || !Object.keys(projects).length) {
+    throw new Error('angular.json must have projects entry.');
+  }
+
+  let project = projects[Object.keys(projects)[0]];
+
+  if (defaultProject) {
+    project = projects[defaultProject];
   }
-  const appConfig = cliConfig.apps[appIndex];
-  const { root, styles, scripts } = appConfig;
 
-  const cliWebpackConfigOptions = {
-    root,
+  return {
+    root: project.root,
     projectRoot: dirToSearch,
-    appConfig,
-    buildOptions: {
-      outputPath: 'outputPath', // It's dummy value to avoid to Angular CLI's error
-      scripts,
-      styles,
-    },
+    supportES2015: false,
     tsConfig: {
       options: {},
+      fileNames: [],
+      errors: [],
+    },
+    tsConfigPath: path.resolve(dirToSearch, 'src/tsconfig.app.json'),
+    buildOptions: {
+      ...project.architect.build.options,
+      assets: [],
     },
-    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.');
+  if (!isBuildAngularInstalled()) {
+    logger.info('=> Using base config because @angular-devkit/build-angular is not installed.');
     return baseConfig;
   }
 
@@ -58,13 +65,15 @@ export function applyAngularCliWebpackConfig(baseConfig, cliWebpackConfigOptions
     cliCommonConfig = ngcliConfigFactory.getCommonConfig(cliWebpackConfigOptions);
     cliStyleConfig = ngcliConfigFactory.getStylesConfig(cliWebpackConfigOptions);
   } catch (e) {
-    logger.warn('=> Failed to get angular-cli webpack config.');
-    return baseConfig;
+    logger.error(e);
+    throw 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.
+  // Don't use storybooks .css/.scss rules because we have to use rules created by @angular-devkit/build-angular
+  // because @angular-devkit/build-angular 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$/')
diff --git a/examples/angular-cli/.angular-cli.json b/examples/angular-cli/.angular-cli.json
deleted file mode 100644
index b11c6d4aaf71..000000000000
--- a/examples/angular-cli/.angular-cli.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-  "project": {
-    "name": "ng5test"
-  },
-  "apps": [
-    {
-      "root": "src",
-      "outDir": "dist",
-      "assets": [
-        "assets",
-        "favicon.ico"
-      ],
-      "index": "index.html",
-      "main": "main.ts",
-      "polyfills": "polyfills.ts",
-      "test": "test.ts",
-      "tsconfig": "tsconfig.app.json",
-      "testTsconfig": "tsconfig.spec.json",
-      "prefix": "app",
-      "styles": [
-        "styles.css"
-      ],
-      "scripts": [],
-      "environmentSource": "environments/environment.ts",
-      "environments": {
-        "dev": "environments/environment.ts",
-        "prod": "environments/environment.prod.ts"
-      }
-    }
-  ],
-  "e2e": {
-    "protractor": {
-      "config": "./protractor.conf.js"
-    }
-  },
-  "lint": [
-    {
-      "project": "src/tsconfig.app.json",
-      "exclude": "**/node_modules/**"
-    },
-    {
-      "project": "src/tsconfig.spec.json",
-      "exclude": "**/node_modules/**"
-    },
-    {
-      "project": "e2e/tsconfig.e2e.json",
-      "exclude": "**/node_modules/**"
-    }
-  ],
-  "test": {
-    "karma": {
-      "config": "./karma.conf.js"
-    }
-  },
-  "defaults": {
-    "styleExt": "css",
-    "component": {}
-  }
-}
diff --git a/examples/angular-cli/.gitignore b/examples/angular-cli/.gitignore
index d979644e1ec2..ee5c9d8336b7 100644
--- a/examples/angular-cli/.gitignore
+++ b/examples/angular-cli/.gitignore
@@ -30,17 +30,10 @@
 /coverage
 /libpeerconnection.log
 npm-debug.log
+yarn-error.log
 testem.log
 /typings
-yarn-error.log
-
-# e2e
-/e2e/*.js
-/e2e/*.map
 
 # System Files
 .DS_Store
 Thumbs.db
-
-/jest_0
-.jest-test-results.json
\ No newline at end of file
diff --git a/examples/angular-cli/README.md b/examples/angular-cli/README.md
index 5eac1c1640ee..abde1422bbbf 100644
--- a/examples/angular-cli/README.md
+++ b/examples/angular-cli/README.md
@@ -1,6 +1,6 @@
-# Ng5test
+# AngularCli
 
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.3.0.
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 6.0.0.
 
 ## Development server
 
@@ -12,7 +12,7 @@ Run `ng generate component component-name` to generate a new component. You can
 
 ## Build
 
-Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
+Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
 
 ## Running unit tests
 
@@ -21,7 +21,6 @@ Run `ng test` to execute the unit tests via [Jest](https://facebook.github.io/je
 ## Running end-to-end tests
 
 Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
-Before running the tests make sure you are serving the app via `ng serve`.
 
 ## Further help
 
diff --git a/examples/angular-cli/angular.json b/examples/angular-cli/angular.json
new file mode 100644
index 000000000000..0d2822ce4ece
--- /dev/null
+++ b/examples/angular-cli/angular.json
@@ -0,0 +1,122 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "angular-cli": {
+      "root": "",
+      "sourceRoot": "src",
+      "projectType": "application",
+      "prefix": "app",
+      "schematics": {},
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/angular-cli",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "src/tsconfig.app.json",
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ],
+            "styles": [
+              "src/styles.css"
+            ],
+            "scripts": []
+          },
+          "configurations": {
+            "production": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ],
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "aot": true,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "angular-cli:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "angular-cli:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "angular-cli:build"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/test.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "src/tsconfig.spec.json",
+            "karmaConfig": "src/karma.conf.js",
+            "styles": [
+              "styles.css"
+            ],
+            "scripts": [],
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ]
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "src/tsconfig.app.json",
+              "src/tsconfig.spec.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    },
+    "angular-cli-e2e": {
+      "root": "e2e/",
+      "projectType": "application",
+      "architect": {
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "e2e/protractor.conf.js",
+            "devServerTarget": "angular-cli:serve"
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": "e2e/tsconfig.e2e.json",
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    }
+  },
+  "defaultProject": "angular-cli"
+}
\ No newline at end of file
diff --git a/examples/angular-cli/package.json b/examples/angular-cli/package.json
index 787d7063ad82..6fd0fe6e7b29 100644
--- a/examples/angular-cli/package.json
+++ b/examples/angular-cli/package.json
@@ -17,12 +17,12 @@
     "test:generate-output": "jest --json --outputFile=addon-jest.testresults.json || true"
   },
   "dependencies": {
-    "@angular/common": "^6.0.0-rc.5",
-    "@angular/compiler": "^6.0.0-rc.5",
-    "@angular/core": "^6.0.0-rc.5",
-    "@angular/forms": "^6.0.0-rc.5",
-    "@angular/platform-browser": "^6.0.0-rc.5",
-    "@angular/platform-browser-dynamic": "^6.0.0-rc.5",
+    "@angular/common": "^6.0.0",
+    "@angular/compiler": "^6.0.0",
+    "@angular/core": "^6.0.0",
+    "@angular/forms": "^6.0.0",
+    "@angular/platform-browser": "^6.0.0",
+    "@angular/platform-browser-dynamic": "^6.0.0",
     "@ngrx/store": "^6.0.0-beta.1",
     "core-js": "^2.5.5",
     "rxjs": "^6.0.0",
@@ -30,9 +30,9 @@
     "zone.js": "^0.8.26"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.5.8",
-    "@angular/cli": "^6.0.0-rc.6",
-    "@angular/compiler-cli": "^6.0.0-rc.5",
+    "@angular-devkit/build-angular": "^0.6.0",
+    "@angular/cli": "^6.0.0",
+    "@angular/compiler-cli": "^6.0.0",
     "@storybook/addon-actions": "4.0.0-alpha.4",
     "@storybook/addon-jest": "4.0.0-alpha.4",
     "@storybook/addon-knobs": "4.0.0-alpha.4",
diff --git a/package.json b/package.json
index 66761e7f41c1..e247e5ac1eeb 100644
--- a/package.json
+++ b/package.json
@@ -38,12 +38,12 @@
     "chromatic": "npm --prefix examples/official-storybook run chromatic"
   },
   "devDependencies": {
-    "@angular/common": "^6.0.0-rc.5",
-    "@angular/compiler": "^6.0.0-rc.5",
-    "@angular/core": "^6.0.0-rc.5",
-    "@angular/forms": "^6.0.0-rc.5",
-    "@angular/platform-browser": "^6.0.0-rc.5",
-    "@angular/platform-browser-dynamic": "^6.0.0-rc.5",
+    "@angular/common": "^6.0.0",
+    "@angular/compiler": "^6.0.0",
+    "@angular/core": "^6.0.0",
+    "@angular/forms": "^6.0.0",
+    "@angular/platform-browser": "^6.0.0",
+    "@angular/platform-browser-dynamic": "^6.0.0",
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.3",
     "babel-eslint": "^8.2.3",
diff --git a/yarn.lock b/yarn.lock
index 4dba580378ad..d7e86b8e3159 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,13 +2,6 @@
 # yarn lockfile v1
 
 
-"@angular-devkit/architect@0.5.13":
-  version "0.5.13"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.5.13.tgz#6a842060c6e9320837d9e4454025f0c47a8510c3"
-  dependencies:
-    "@angular-devkit/core" "0.5.13"
-    rxjs "^6.0.0"
-
 "@angular-devkit/architect@0.6.0":
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.6.0.tgz#622a933337c946ef85d646545cc4244272ccb402"
@@ -16,14 +9,14 @@
     "@angular-devkit/core" "0.6.0"
     rxjs "^6.0.0"
 
-"@angular-devkit/build-angular@^0.5.8":
-  version "0.5.13"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.5.13.tgz#08ea2175709343c93d72b39968481046badad52d"
+"@angular-devkit/build-angular@^0.6.0":
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.6.0.tgz#f5757f80fc402458e6b5eae1578bbc2a1af44ebe"
   dependencies:
-    "@angular-devkit/architect" "0.5.13"
-    "@angular-devkit/build-optimizer" "0.5.13"
-    "@angular-devkit/core" "0.5.13"
-    "@ngtools/webpack" "6.0.0-rc.11"
+    "@angular-devkit/architect" "0.6.0"
+    "@angular-devkit/build-optimizer" "0.6.0"
+    "@angular-devkit/core" "0.6.0"
+    "@ngtools/webpack" "6.0.0"
     ajv "~6.4.0"
     autoprefixer "^8.1.0"
     cache-loader "^1.2.2"
@@ -66,30 +59,21 @@
     uglifyjs-webpack-plugin "^1.2.5"
     url-loader "^1.0.1"
     webpack "~4.6.0"
-    webpack-dev-middleware "^3.1.2"
-    webpack-dev-server "^3.1.3"
+    webpack-dev-middleware "^3.1.3"
+    webpack-dev-server "^3.1.4"
     webpack-merge "^4.1.2"
     webpack-sources "^1.1.0"
     webpack-subresource-integrity "^1.1.0-rc.4"
 
-"@angular-devkit/build-optimizer@0.5.13":
-  version "0.5.13"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.5.13.tgz#0484463b715de409b94c8a1aec4a8fc9161d8ce2"
+"@angular-devkit/build-optimizer@0.6.0":
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.6.0.tgz#150a76155b473dea17327a176d18245a2da1c13e"
   dependencies:
     loader-utils "^1.1.0"
     source-map "^0.5.6"
     typescript "~2.7.2"
     webpack-sources "^1.1.0"
 
-"@angular-devkit/core@0.5.13":
-  version "0.5.13"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.5.13.tgz#c48c83c1bf38917e6af3f399d221d29466be9677"
-  dependencies:
-    ajv "~6.4.0"
-    chokidar "^2.0.3"
-    rxjs "^6.0.0"
-    source-map "^0.5.6"
-
 "@angular-devkit/core@0.6.0":
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.6.0.tgz#d1a7275ff0f93de5cf007c4a549d1ebd00776fd0"
@@ -106,7 +90,7 @@
     "@angular-devkit/core" "0.6.0"
     rxjs "^6.0.0"
 
-"@angular/cli@^6.0.0-rc.6":
+"@angular/cli@^6.0.0":
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-6.0.0.tgz#346b356775ddf8cdb8a9a5095b0663878eca3486"
   dependencies:
@@ -123,13 +107,13 @@
     symbol-observable "^1.2.0"
     yargs-parser "^10.0.0"
 
-"@angular/common@^6.0.0-rc.5":
+"@angular/common@^6.0.0":
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/@angular/common/-/common-6.0.0.tgz#ca3b6b6b96837fe048861da897c31991aa04954f"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^6.0.0-rc.5":
+"@angular/compiler-cli@^6.0.0":
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-6.0.0.tgz#be50277faaa5ac08f3002c2c8cb8c39d220c76d5"
   dependencies:
@@ -138,31 +122,31 @@
     reflect-metadata "^0.1.2"
     tsickle "^0.27.2"
 
-"@angular/compiler@^6.0.0-rc.5":
+"@angular/compiler@^6.0.0":
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-6.0.0.tgz#9092a0f02f33dd1108276ab93cc48142e36a1e95"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^6.0.0-rc.5":
+"@angular/core@^6.0.0":
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/@angular/core/-/core-6.0.0.tgz#785cc8a37b7fb784a6b7dcbd0984abb4f10e5dfe"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/forms@^6.0.0-rc.5":
+"@angular/forms@^6.0.0":
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-6.0.0.tgz#436e2df39dc57db124da5a5c02bc63909fdf7046"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser-dynamic@^6.0.0-rc.5":
+"@angular/platform-browser-dynamic@^6.0.0":
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.0.0.tgz#66a34b65136446cb3ec39362fd6d2dbb5482ba70"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^6.0.0-rc.5":
+"@angular/platform-browser@^6.0.0":
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-6.0.0.tgz#848b687ea46786483fddcdbbbd17b29c7adcc768"
   dependencies:
@@ -277,11 +261,11 @@
   version "6.0.0-beta.1"
   resolved "https://registry.yarnpkg.com/@ngrx/store/-/store-6.0.0-beta.1.tgz#db4b91fb54828b83495ae9cfb544cf62266a441d"
 
-"@ngtools/webpack@6.0.0-rc.11":
-  version "6.0.0-rc.11"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-6.0.0-rc.11.tgz#ceef25e0f2141ebd17f7f447043520e6d2ba01fd"
+"@ngtools/webpack@6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-6.0.0.tgz#e160cccd85823e9b01ee7bc5156a02510a323a34"
   dependencies:
-    "@angular-devkit/core" "0.5.13"
+    "@angular-devkit/core" "0.6.0"
     tree-kill "^1.0.0"
     webpack-sources "^1.1.0"
 
@@ -16120,17 +16104,7 @@ webpack-dev-middleware@3.1.2:
     url-join "^4.0.0"
     webpack-log "^1.0.1"
 
-webpack-dev-middleware@^1.11.0:
-  version "1.12.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz#f8fc1120ce3b4fc5680ceecb43d777966b21105e"
-  dependencies:
-    memory-fs "~0.4.1"
-    mime "^1.5.0"
-    path-is-absolute "^1.0.0"
-    range-parser "^1.0.3"
-    time-stamp "^2.0.0"
-
-webpack-dev-middleware@^3.1.2, webpack-dev-middleware@^3.1.3:
+webpack-dev-middleware@3.1.3, webpack-dev-middleware@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.1.3.tgz#8b32aa43da9ae79368c1bf1183f2b6cf5e1f39ed"
   dependencies:
@@ -16142,6 +16116,16 @@ webpack-dev-middleware@^3.1.2, webpack-dev-middleware@^3.1.3:
     url-join "^4.0.0"
     webpack-log "^1.0.1"
 
+webpack-dev-middleware@^1.11.0:
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz#f8fc1120ce3b4fc5680ceecb43d777966b21105e"
+  dependencies:
+    memory-fs "~0.4.1"
+    mime "^1.5.0"
+    path-is-absolute "^1.0.0"
+    range-parser "^1.0.3"
+    time-stamp "^2.0.0"
+
 webpack-dev-server@2.9.4:
   version "2.9.4"
   resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.9.4.tgz#7883e61759c6a4b33e9b19ec4037bd4ab61428d1"
@@ -16207,6 +16191,39 @@ webpack-dev-server@^3.1.3:
     webpack-log "^1.1.2"
     yargs "11.0.0"
 
+webpack-dev-server@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.4.tgz#9a08d13c4addd1e3b6d8ace116e86715094ad5b4"
+  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.18.0"
+    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 "3.1.3"
+    webpack-log "^1.1.2"
+    yargs "11.0.0"
+
 webpack-hot-middleware@^2.22.1:
   version "2.22.1"
   resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.22.1.tgz#2ff865bfebc8e9937bd1619f0f48d6ab601bfea0"

From a36fc9f91aea4023c607f2672d6da5540b7b7eea Mon Sep 17 00:00:00 2001
From: igor-dv <davydkin.igor@gmail.com>
Date: Mon, 7 May 2018 21:45:25 +0300
Subject: [PATCH 04/11] Remove back silent return

---
 app/angular/src/server/angular-cli_config.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/angular/src/server/angular-cli_config.js b/app/angular/src/server/angular-cli_config.js
index 4369b4d75a98..6581a80fdb57 100644
--- a/app/angular/src/server/angular-cli_config.js
+++ b/app/angular/src/server/angular-cli_config.js
@@ -65,10 +65,8 @@ export function applyAngularCliWebpackConfig(baseConfig, cliWebpackConfigOptions
     cliCommonConfig = ngcliConfigFactory.getCommonConfig(cliWebpackConfigOptions);
     cliStyleConfig = ngcliConfigFactory.getStylesConfig(cliWebpackConfigOptions);
   } catch (e) {
-    logger.error(e);
-    throw e;
-    // logger.warn('=> Failed to get angular-cli webpack config.');
-    // return baseConfig;
+    logger.warn('=> Failed to get angular-cli webpack config.');
+    return baseConfig;
   }
   logger.info('=> Get angular-cli webpack config.');
 

From c8ace6c71c6a9c52e8044a62af178ded60342dc6 Mon Sep 17 00:00:00 2001
From: igor-dv <davydkin.igor@gmail.com>
Date: Mon, 7 May 2018 22:10:51 +0300
Subject: [PATCH 05/11] add dist to ignore list for jest in angular-cli example

---
 examples/angular-cli/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/examples/angular-cli/package.json b/examples/angular-cli/package.json
index 6fd0fe6e7b29..7da288b97515 100644
--- a/examples/angular-cli/package.json
+++ b/examples/angular-cli/package.json
@@ -65,6 +65,7 @@
     "testPathIgnorePatterns": [
       "/node_modules/",
       "/build/",
+      "/dist/",
       "/storybook-static/",
       "angularshots.test.js"
     ],

From 48044eb5aa78a537e611a5d1d6fc509597a5c37e Mon Sep 17 00:00:00 2001
From: igor-dv <davydkin.igor@gmail.com>
Date: Mon, 7 May 2018 22:16:17 +0300
Subject: [PATCH 06/11] Update snapshots

---
 .../addon-actions.stories.storyshot           |  8 --
 .../addon-jest.stories.storyshot              | 44 +--------
 .../addon-knobs.stories.storyshot             | 51 +---------
 .../addon-links.stories.storyshot             |  4 -
 .../addon-notes.stories.storyshot             |  8 --
 .../app.component.stories.storyshot           | 44 +--------
 .../__snapshots__/core.stories.storyshot      |  4 -
 .../custom-providers.stories.storyshot        | 20 ----
 .../custom-styles.stories.storyshot           |  8 --
 .../src/stories/__snapshots__/index.storyshot | 93 ++++---------------
 .../metadata-combined.stories.storyshot       | 40 +-------
 .../metadata-individual.stories.storyshot     | 40 +-------
 .../metadata-shared.stories.storyshot         | 40 +-------
 .../di.component.stories.storyshot            | 28 ------
 .../styled.component.stories.storyshot        | 10 --
 .../custom-cva-component.stories.storyshot    |  6 --
 .../inheritance.stories.storyshot             |  8 --
 17 files changed, 37 insertions(+), 419 deletions(-)

diff --git a/examples/angular-cli/src/stories/__snapshots__/addon-actions.stories.storyshot b/examples/angular-cli/src/stories/__snapshots__/addon-actions.stories.storyshot
index 252d7be8acc7..e75f38ab6dba 100644
--- a/examples/angular-cli/src/stories/__snapshots__/addon-actions.stories.storyshot
+++ b/examples/angular-cli/src/stories/__snapshots__/addon-actions.stories.storyshot
@@ -9,15 +9,11 @@ exports[`Storyshots Addon|Actions Action and method 1`] = `
   <storybook-button-component
     _nghost-c4=""
   >
-    
-        
     <button
       _ngcontent-c4=""
     >
       Action and Method
     </button>
-    
-    
   </storybook-button-component>
 </storybook-dynamic-app-root>
 `;
@@ -31,15 +27,11 @@ exports[`Storyshots Addon|Actions Action only 1`] = `
   <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-jest.stories.storyshot b/examples/angular-cli/src/stories/__snapshots__/addon-jest.stories.storyshot
index adc31c0c584e..2b1132e5688a 100644
--- a/examples/angular-cli/src/stories/__snapshots__/addon-jest.stories.storyshot
+++ b/examples/angular-cli/src/stories/__snapshots__/addon-jest.stories.storyshot
@@ -7,50 +7,29 @@ exports[`Storyshots Addon|Jest app.component with jest tests 1`] = `
   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.
+       This should be hidden, if not - scss is not loaded as needed.
   
     </div>
-    
-  
     <div
       style="text-align:center"
     >
-      
-    
       <h1>
-        
-      Welcome to app!
-    
+         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"
@@ -59,14 +38,8 @@ exports[`Storyshots Addon|Jest app.component with jest tests 1`] = `
             Tour of Heroes
           </a>
         </h2>
-        
-    
       </li>
-      
-    
       <li>
-        
-      
         <h2>
           <a
             href="https://github.com/angular/angular-cli/wiki"
@@ -75,14 +48,8 @@ exports[`Storyshots Addon|Jest app.component with jest tests 1`] = `
             CLI Documentation
           </a>
         </h2>
-        
-    
       </li>
-      
-    
       <li>
-        
-      
         <h2>
           <a
             href="https://blog.angular.io//"
@@ -91,15 +58,8 @@ exports[`Storyshots Addon|Jest app.component with jest tests 1`] = `
             Angular blog
           </a>
         </h2>
-        
-    
       </li>
-      
-  
     </ul>
-    
-  
-  
   </storybook-app-root>
 </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
index 7b714f4052b2..dc46bd912a5f 100644
--- a/examples/angular-cli/src/stories/__snapshots__/addon-knobs.stories.storyshot
+++ b/examples/angular-cli/src/stories/__snapshots__/addon-knobs.stories.storyshot
@@ -7,79 +7,46 @@ exports[`Storyshots Addon|Knobs All knobs 1`] = `
   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
-          
+           Laptop 
         </li>
         <li>
-          
-            Book
-          
+           Book 
         </li>
         <li>
-          
-            Whiskey
-          
+           Whiskey 
         </li>
-        
-        
       </ul>
       
-        
-      
       <p>
         Nice to meet you!
       </p>
       
-        
-      
-      
-      
     </div>
-    
-    
   </storybook-simple-knobs-component>
 </storybook-dynamic-app-root>
 `;
@@ -91,32 +58,20 @@ exports[`Storyshots Addon|Knobs Simple 1`] = `
   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
index a1b6f66194a9..4d1b0cb5abb8 100644
--- a/examples/angular-cli/src/stories/__snapshots__/addon-links.stories.storyshot
+++ b/examples/angular-cli/src/stories/__snapshots__/addon-links.stories.storyshot
@@ -9,15 +9,11 @@ exports[`Storyshots Addon|Links button with link to another story 1`] = `
   <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
index 03dd16736718..de9c33e93991 100644
--- a/examples/angular-cli/src/stories/__snapshots__/addon-notes.stories.storyshot
+++ b/examples/angular-cli/src/stories/__snapshots__/addon-notes.stories.storyshot
@@ -9,15 +9,11 @@ exports[`Storyshots Addon|Notes Note with HTML 1`] = `
   <storybook-button-component
     _nghost-c7=""
   >
-    
-        
     <button
       _ngcontent-c7=""
     >
       Notes with HTML
     </button>
-    
-    
   </storybook-button-component>
 </storybook-dynamic-app-root>
 `;
@@ -31,15 +27,11 @@ exports[`Storyshots Addon|Notes Simple note 1`] = `
   <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
index 675463672c7a..3425505a2436 100644
--- a/examples/angular-cli/src/stories/__snapshots__/app.component.stories.storyshot
+++ b/examples/angular-cli/src/stories/__snapshots__/app.component.stories.storyshot
@@ -7,50 +7,29 @@ exports[`Storyshots App Component Component with separate template 1`] = `
   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.
+       This should be hidden, if not - scss is not loaded as needed.
   
     </div>
-    
-  
     <div
       style="text-align:center"
     >
-      
-    
       <h1>
-        
-      Welcome to app!
-    
+         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"
@@ -59,14 +38,8 @@ exports[`Storyshots App Component Component with separate template 1`] = `
             Tour of Heroes
           </a>
         </h2>
-        
-    
       </li>
-      
-    
       <li>
-        
-      
         <h2>
           <a
             href="https://github.com/angular/angular-cli/wiki"
@@ -75,14 +48,8 @@ exports[`Storyshots App Component Component with separate template 1`] = `
             CLI Documentation
           </a>
         </h2>
-        
-    
       </li>
-      
-    
       <li>
-        
-      
         <h2>
           <a
             href="https://blog.angular.io//"
@@ -91,15 +58,8 @@ exports[`Storyshots App Component Component with separate template 1`] = `
             Angular blog
           </a>
         </h2>
-        
-    
       </li>
-      
-  
     </ul>
-    
-  
-  
   </storybook-app-root>
 </storybook-dynamic-app-root>
 `;
diff --git a/examples/angular-cli/src/stories/__snapshots__/core.stories.storyshot b/examples/angular-cli/src/stories/__snapshots__/core.stories.storyshot
index 5f1150f55adb..707af9f7c4a5 100644
--- a/examples/angular-cli/src/stories/__snapshots__/core.stories.storyshot
+++ b/examples/angular-cli/src/stories/__snapshots__/core.stories.storyshot
@@ -9,15 +9,11 @@ exports[`Storyshots Core|Parameters passed to story 1`] = `
   <storybook-button-component
     _nghost-c8=""
   >
-    
-        
     <button
       _ngcontent-c8=""
     >
       Parameters are {"globalParameter":"globalParameter","chapterParameter":"chapterParameter","storyParameter":"storyParameter"}
     </button>
-    
-    
   </storybook-button-component>
 </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
index 97aa11aaed47..78c81be6c3b5 100644
--- a/examples/angular-cli/src/stories/__snapshots__/custom-providers.stories.storyshot
+++ b/examples/angular-cli/src/stories/__snapshots__/custom-providers.stories.storyshot
@@ -7,22 +7,12 @@ exports[`Storyshots Custom|Providers Simple 1`] = `
   target={[Function ViewContainerRef_]}
 >
   <storybook-simple-service-component>
-    
-      
     <p>
       Static name:
     </p>
-    
-      
     <ul>
       
-        
-      
-      
-      
     </ul>
-    
-    
   </storybook-simple-service-component>
 </storybook-dynamic-app-root>
 `;
@@ -34,22 +24,12 @@ exports[`Storyshots Custom|Providers With knobs 1`] = `
   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
index 9999b7af6024..5a375b037876 100644
--- a/examples/angular-cli/src/stories/__snapshots__/custom-styles.stories.storyshot
+++ b/examples/angular-cli/src/stories/__snapshots__/custom-styles.stories.storyshot
@@ -11,15 +11,11 @@ exports[`Storyshots Custom|Style Default 1`] = `
       _nghost-c9=""
       ng-reflect-text="Button with custom styles"
     >
-      
-        
       <button
         _ngcontent-c9=""
       >
         Button with custom styles
       </button>
-      
-    
     </storybook-button-component>
   </ng-component>
 </storybook-dynamic-app-root>
@@ -39,15 +35,11 @@ exports[`Storyshots Custom|Style With Knobs 1`] = `
       _nghost-c11=""
       ng-reflect-text="Button with custom styles"
     >
-      
-        
       <button
         _ngcontent-c11=""
       >
         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
index 30483889802a..882b366ea771 100644
--- a/examples/angular-cli/src/stories/__snapshots__/index.storyshot
+++ b/examples/angular-cli/src/stories/__snapshots__/index.storyshot
@@ -11,15 +11,11 @@ exports[`Storyshots Button with some emoji 1`] = `
       _nghost-c2=""
       ng-reflect-text="😀 😎 👍 💯"
     >
-      
-        
       <button
         _ngcontent-c2=""
       >
         😀 😎 👍 💯
       </button>
-      
-    
     </storybook-button-component>
   </ng-component>
 </storybook-dynamic-app-root>
@@ -36,15 +32,11 @@ exports[`Storyshots Button with text 1`] = `
       _nghost-c1=""
       ng-reflect-text="Hello Button"
     >
-      
-        
       <button
         _ngcontent-c1=""
       >
         Hello Button
       </button>
-      
-    
     </storybook-button-component>
   </ng-component>
 </storybook-dynamic-app-root>
@@ -60,61 +52,43 @@ exports[`Storyshots Welcome to Storybook 1`] = `
     <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 
+           We've added some basic stories inside the 
           <span
             _ngcontent-c0=""
             class="inline-code"
           >
             src/stories
           </span>
-           directory.
-            
+           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.
-            
+           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.)
-          
+           (Basically a story is like a visual test case.) 
         </p>
-        
-          
         <p
           _ngcontent-c0=""
         >
-          
-            See these sample 
+           See these sample 
           <a
             _ngcontent-c0=""
             role="button"
@@ -122,113 +96,82 @@ exports[`Storyshots Welcome to Storybook 1`] = `
           >
             stories
           </a>
-           for a component called
-            
+           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.
-            
+           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.
-            
+           You can also edit those components and see changes right away. 
           <br
             _ngcontent-c0=""
           />
-          
-            (Try editing the 
+           (Try editing the 
           <span
             _ngcontent-c0=""
             class="inline-code"
           >
             Button
           </span>
-           stories
-            located at 
+           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.
+           Usually we create stories with smaller UI components in the app.
           <br
             _ngcontent-c0=""
           />
-          
-            Have a look at the 
+           Have a look at the 
           <a
             _ngcontent-c0=""
             href="https://storybook.js.org/basics/writing-stories"
             rel="noopener noreferrer"
             target="_blank"
           >
-            
-              Writing Stories
-            
+             Writing Stories 
           </a>
-           section in our documentation.
-          
+           section in our documentation. 
         </p>
-        
-          
         <p
           _ngcontent-c0=""
           class="note"
         >
-          
-            
           <b
             _ngcontent-c0=""
           >
             NOTE:
           </b>
-          
-            
           <br
             _ngcontent-c0=""
           />
-          
-            Have a look at the 
+           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.
-          
+           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
index d7c93c72db25..f4f6520567f3 100644
--- a/examples/angular-cli/src/stories/__snapshots__/metadata-combined.stories.storyshot
+++ b/examples/angular-cli/src/stories/__snapshots__/metadata-combined.stories.storyshot
@@ -10,37 +10,21 @@ exports[`Storyshots Metadata|Combined Combined 1 1`] = `
     <storybook-simple-token-component
       ng-reflect-name="Prop Name"
     >
-      
-      
       <h3>
         Prop Name
       </h3>
-      
-      
       <p>
         Items:
       </p>
-      
-      
       <ul>
         
-        
-        
         <li>
-          
-          Joe
-        
+           Joe 
         </li>
         <li>
-          
-          Jane
-        
+           Jane 
         </li>
-        
-      
       </ul>
-      
-    
     </storybook-simple-token-component>
   </ng-component>
 </storybook-dynamic-app-root>
@@ -56,37 +40,21 @@ exports[`Storyshots Metadata|Combined Combined 2 1`] = `
     <storybook-simple-token-component
       ng-reflect-name="CustomPipe: Prop Name"
     >
-      
-      
       <h3>
         CustomPipe: Prop Name
       </h3>
-      
-      
       <p>
         Items:
       </p>
-      
-      
       <ul>
         
-        
-        
         <li>
-          
-          Joe
-        
+           Joe 
         </li>
         <li>
-          
-          Jane
-        
+           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
index d2e1ec8bbef0..2e2073b999fb 100644
--- a/examples/angular-cli/src/stories/__snapshots__/metadata-individual.stories.storyshot
+++ b/examples/angular-cli/src/stories/__snapshots__/metadata-individual.stories.storyshot
@@ -10,37 +10,21 @@ exports[`Storyshots Metadata|Individual Individual 1 1`] = `
     <storybook-simple-token-component
       ng-reflect-name="Prop Name"
     >
-      
-      
       <h3>
         Prop Name
       </h3>
-      
-      
       <p>
         Items:
       </p>
-      
-      
       <ul>
         
-        
-        
         <li>
-          
-          Joe
-        
+           Joe 
         </li>
         <li>
-          
-          Jane
-        
+           Jane 
         </li>
-        
-      
       </ul>
-      
-    
     </storybook-simple-token-component>
   </ng-component>
 </storybook-dynamic-app-root>
@@ -54,37 +38,21 @@ exports[`Storyshots Metadata|Individual Individual 2 1`] = `
 >
   <ng-component>
     <storybook-simple-token-component>
-      
-      
       <h3>
         Provider Name
       </h3>
-      
-      
       <p>
         Items:
       </p>
-      
-      
       <ul>
         
-        
-        
         <li>
-          
-          Jim
-        
+           Jim 
         </li>
         <li>
-          
-          Jill
-        
+           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
index 06342cd5f760..d43f8d826aa9 100644
--- a/examples/angular-cli/src/stories/__snapshots__/metadata-shared.stories.storyshot
+++ b/examples/angular-cli/src/stories/__snapshots__/metadata-shared.stories.storyshot
@@ -10,37 +10,21 @@ exports[`Storyshots Metadata|Shared Shared 1 1`] = `
     <storybook-simple-token-component
       ng-reflect-name="Prop Name"
     >
-      
-      
       <h3>
         Prop Name
       </h3>
-      
-      
       <p>
         Items:
       </p>
-      
-      
       <ul>
         
-        
-        
         <li>
-          
-          Joe
-        
+           Joe 
         </li>
         <li>
-          
-          Jane
-        
+           Jane 
         </li>
-        
-      
       </ul>
-      
-    
     </storybook-simple-token-component>
   </ng-component>
 </storybook-dynamic-app-root>
@@ -54,37 +38,21 @@ exports[`Storyshots Metadata|Shared Shared 2 1`] = `
 >
   <ng-component>
     <storybook-simple-token-component>
-      
-      
       <h3>
         Provider Name
       </h3>
-      
-      
       <p>
         Items:
       </p>
-      
-      
       <ul>
         
-        
-        
         <li>
-          
-          Joe
-        
+           Joe 
         </li>
         <li>
-          
-          Jane
-        
+           Jane 
         </li>
-        
-      
       </ul>
-      
-    
     </storybook-simple-token-component>
   </ng-component>
 </storybook-dynamic-app-root>
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
index 63ab868eea34..ba3224217846 100644
--- 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
@@ -8,39 +8,25 @@ exports[`Storyshots Custom|Dependencies inputs and inject dependencies 1`] = `
 >
   <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>
 `;
@@ -53,39 +39,25 @@ exports[`Storyshots Custom|Dependencies inputs and inject dependencies with knob
 >
   <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-style/__snapshots__/styled.component.stories.storyshot b/examples/angular-cli/src/stories/component-with-style/__snapshots__/styled.component.stories.storyshot
index ce08d8055500..add314142c4f 100644
--- 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
@@ -8,32 +8,22 @@ exports[`Storyshots Custom|styleUrls Component with styles 1`] = `
 >
   <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/customControlValueAccessor/__snapshots__/custom-cva-component.stories.storyshot b/examples/angular-cli/src/stories/customControlValueAccessor/__snapshots__/custom-cva-component.stories.storyshot
index 11aed9fbe91b..5b04573306f1 100644
--- 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
@@ -7,20 +7,14 @@ exports[`Storyshots Custom|ngModel custom ControlValueAccessor 1`] = `
   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/inheritance/__snapshots__/inheritance.stories.storyshot b/examples/angular-cli/src/stories/inheritance/__snapshots__/inheritance.stories.storyshot
index 80c76ca10549..5213750e890e 100644
--- a/examples/angular-cli/src/stories/inheritance/__snapshots__/inheritance.stories.storyshot
+++ b/examples/angular-cli/src/stories/inheritance/__snapshots__/inheritance.stories.storyshot
@@ -7,13 +7,9 @@ exports[`Storyshots Custom|Inheritance base button 1`] = `
   target={[Function ViewContainerRef_]}
 >
   <storybook-base-button>
-    
-      
     <button>
       this is label
     </button>
-    
-    
   </storybook-base-button>
 </storybook-dynamic-app-root>
 `;
@@ -25,13 +21,9 @@ exports[`Storyshots Custom|Inheritance icon button 1`] = `
   target={[Function ViewContainerRef_]}
 >
   <storybook-icon-button>
-    
-      
     <button>
       this is label - this is icon
     </button>
-    
-    
   </storybook-icon-button>
 </storybook-dynamic-app-root>
 `;

From a25b4cd4f77b9dc45cf695df30e34f507cbea5ef Mon Sep 17 00:00:00 2001
From: igor-dv <davydkin.igor@gmail.com>
Date: Wed, 16 May 2018 14:17:36 +0300
Subject: [PATCH 07/11] Use changes based on #3491 for the assets normalization

---
 app/angular/package.json                     |  1 +
 app/angular/src/server/angular-cli_config.js | 22 ++++----
 app/angular/src/server/angular-cli_utils.js  | 55 ++++++++++++++++++++
 3 files changed, 67 insertions(+), 11 deletions(-)
 create mode 100644 app/angular/src/server/angular-cli_utils.js

diff --git a/app/angular/package.json b/app/angular/package.json
index 3537082ab3d3..5dc1f28303e2 100644
--- a/app/angular/package.json
+++ b/app/angular/package.json
@@ -45,6 +45,7 @@
     "zone.js": "^0.8.26"
   },
   "peerDependencies": {
+    "@angular-devkit/core": "^0.6.1",
     "@angular/common": ">=4.0.0",
     "@angular/compiler": ">=4.0.0",
     "@angular/core": ">=4.0.0",
diff --git a/app/angular/src/server/angular-cli_config.js b/app/angular/src/server/angular-cli_config.js
index 6581a80fdb57..fdfaf6488084 100644
--- a/app/angular/src/server/angular-cli_config.js
+++ b/app/angular/src/server/angular-cli_config.js
@@ -1,15 +1,7 @@
 import path from 'path';
 import fs from 'fs';
 import { logger } from '@storybook/node-logger';
-
-function isBuildAngularInstalled() {
-  try {
-    require.resolve('@angular-devkit/build-angular');
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
+import { isBuildAngularInstalled, normalizeAssetPatterns } from './angular-cli_utils';
 
 export function getAngularCliWebpackConfigOptions(dirToSearch) {
   const fname = path.join(dirToSearch, 'angular.json');
@@ -31,6 +23,14 @@ export function getAngularCliWebpackConfigOptions(dirToSearch) {
     project = projects[defaultProject];
   }
 
+  const { options: projectOptions } = project.architect.build;
+
+  const normalizedAssets = normalizeAssetPatterns(
+    projectOptions.assets,
+    dirToSearch,
+    project.sourceRoot
+  );
+
   return {
     root: project.root,
     projectRoot: dirToSearch,
@@ -42,8 +42,8 @@ export function getAngularCliWebpackConfigOptions(dirToSearch) {
     },
     tsConfigPath: path.resolve(dirToSearch, 'src/tsconfig.app.json'),
     buildOptions: {
-      ...project.architect.build.options,
-      assets: [],
+      ...projectOptions,
+      assets: normalizedAssets,
     },
   };
 }
diff --git a/app/angular/src/server/angular-cli_utils.js b/app/angular/src/server/angular-cli_utils.js
new file mode 100644
index 000000000000..141cb99bcd4a
--- /dev/null
+++ b/app/angular/src/server/angular-cli_utils.js
@@ -0,0 +1,55 @@
+import fs from 'fs';
+import { basename, dirname, normalize, relative, resolve } from '@angular-devkit/core';
+
+function isDirectory(assetPath) {
+  try {
+    return fs.statSync(assetPath).isDirectory();
+  } catch (e) {
+    return false;
+  }
+}
+
+function getAssetsParts(resolvedAssetPath, assetPath) {
+  if (isDirectory(resolvedAssetPath)) {
+    return {
+      glob: '**/*', // Folders get a recursive star glob.
+      input: assetPath, // Input directory is their original path.
+    };
+  }
+
+  return {
+    glob: basename(assetPath), // Files are their own glob.
+    input: dirname(assetPath), // Input directory is their original dirname.
+  };
+}
+
+export function isBuildAngularInstalled() {
+  try {
+    require.resolve('@angular-devkit/build-angular');
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
+
+export function normalizeAssetPatterns(assetPatterns, dirToSearch, sourceRoot) {
+  if (!assetPatterns || !assetPatterns.length) {
+    return [];
+  }
+
+  return assetPatterns.map(assetPattern => {
+    const assetPath = normalize(assetPattern);
+    const resolvedSourceRoot = resolve(dirToSearch, sourceRoot);
+    const resolvedAssetPath = resolve(dirToSearch, assetPath);
+    const parts = getAssetsParts(resolvedAssetPath, assetPath);
+
+    // Output directory for both is the relative path from source root to input.
+    const output = relative(resolvedSourceRoot, resolve(dirToSearch, parts.input));
+
+    // Return the asset pattern in object format.
+    return {
+      ...parts,
+      output,
+    };
+  });
+}

From d4ea7e45543f25752f7c3aa6eb217e19db152db3 Mon Sep 17 00:00:00 2001
From: igor-dv <davydkin.igor@gmail.com>
Date: Sat, 2 Jun 2018 17:22:46 +0300
Subject: [PATCH 08/11] Fix snapshots

---
 .../addon-background.stories.storyshot        | 48 +------------
 .../addon-centered.stories.storyshot          | 68 +------------------
 2 files changed, 4 insertions(+), 112 deletions(-)

diff --git a/examples/angular-cli/src/stories/__snapshots__/addon-background.stories.storyshot b/examples/angular-cli/src/stories/__snapshots__/addon-background.stories.storyshot
index e87bf6ce8384..5881a069ece8 100644
--- a/examples/angular-cli/src/stories/__snapshots__/addon-background.stories.storyshot
+++ b/examples/angular-cli/src/stories/__snapshots__/addon-background.stories.storyshot
@@ -7,50 +7,29 @@ exports[`Storyshots Addon|Background background component 1`] = `
   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.
+       This should be hidden, if not - scss is not loaded as needed.
   
     </div>
-    
-  
     <div
       style="text-align:center"
     >
-      
-    
       <h1>
-        
-      Welcome to app!
-    
+         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"
@@ -59,14 +38,8 @@ exports[`Storyshots Addon|Background background component 1`] = `
             Tour of Heroes
           </a>
         </h2>
-        
-    
       </li>
-      
-    
       <li>
-        
-      
         <h2>
           <a
             href="https://github.com/angular/angular-cli/wiki"
@@ -75,14 +48,8 @@ exports[`Storyshots Addon|Background background component 1`] = `
             CLI Documentation
           </a>
         </h2>
-        
-    
       </li>
-      
-    
       <li>
-        
-      
         <h2>
           <a
             href="https://blog.angular.io//"
@@ -91,15 +58,8 @@ exports[`Storyshots Addon|Background background component 1`] = `
             Angular blog
           </a>
         </h2>
-        
-    
       </li>
-      
-  
     </ul>
-    
-  
-  
   </storybook-app-root>
 </storybook-dynamic-app-root>
 `;
@@ -115,15 +75,11 @@ exports[`Storyshots Addon|Background background template 1`] = `
       _nghost-c5=""
       ng-reflect-text="Hello Button"
     >
-      
-        
       <button
         _ngcontent-c5=""
       >
         Hello Button
       </button>
-      
-    
     </storybook-button-component>
   </ng-component>
 </storybook-dynamic-app-root>
diff --git a/examples/angular-cli/src/stories/__snapshots__/addon-centered.stories.storyshot b/examples/angular-cli/src/stories/__snapshots__/addon-centered.stories.storyshot
index 2de625a3a8e3..5da0a6f978c6 100644
--- a/examples/angular-cli/src/stories/__snapshots__/addon-centered.stories.storyshot
+++ b/examples/angular-cli/src/stories/__snapshots__/addon-centered.stories.storyshot
@@ -7,65 +7,38 @@ exports[`Storyshots Addon|Centered centered component 1`] = `
   target={[Function ViewContainerRef_]}
 >
   <ng-component>
-          
-        
     <div
       ng-reflect-ng-style="[object Object]"
       style="position: fixed; top: 0px; left: 0px; bottom: 0px; right: 0px; display: flex; overflow: auto;"
     >
-      
-          
       <div
         ng-reflect-ng-style="[object Object]"
         style="margin: auto;"
       >
-        
-            
         <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.
+             This should be hidden, if not - scss is not loaded as needed.
   
           </div>
-          
-  
           <div
             style="text-align:center"
           >
-            
-    
             <h1>
-              
-      Welcome to app!
-    
+               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"
@@ -74,14 +47,8 @@ exports[`Storyshots Addon|Centered centered component 1`] = `
                   Tour of Heroes
                 </a>
               </h2>
-              
-    
             </li>
-            
-    
             <li>
-              
-      
               <h2>
                 <a
                   href="https://github.com/angular/angular-cli/wiki"
@@ -90,14 +57,8 @@ exports[`Storyshots Addon|Centered centered component 1`] = `
                   CLI Documentation
                 </a>
               </h2>
-              
-    
             </li>
-            
-    
             <li>
-              
-      
               <h2>
                 <a
                   href="https://blog.angular.io//"
@@ -106,21 +67,10 @@ exports[`Storyshots Addon|Centered centered component 1`] = `
                   Angular blog
                 </a>
               </h2>
-              
-    
             </li>
-            
-  
           </ul>
-          
-  
-  
         </storybook-app-root>
-        
-          
       </div>
-      
-        
     </div>
   </ng-component>
 </storybook-dynamic-app-root>
@@ -133,39 +83,25 @@ exports[`Storyshots Addon|Centered centered template 1`] = `
   target={[Function ViewContainerRef_]}
 >
   <ng-component>
-          
-        
     <div
       ng-reflect-ng-style="[object Object]"
       style="position: fixed; top: 0px; left: 0px; bottom: 0px; right: 0px; display: flex; overflow: auto;"
     >
-      
-          
       <div
         ng-reflect-ng-style="[object Object]"
         style="margin: auto;"
       >
-        
-            
         <storybook-button-component
           _nghost-c6=""
           ng-reflect-text="Hello Button"
         >
-          
-        
           <button
             _ngcontent-c6=""
           >
             Hello Button
           </button>
-          
-    
         </storybook-button-component>
-        
-          
       </div>
-      
-        
     </div>
   </ng-component>
 </storybook-dynamic-app-root>

From 1689458fc94234ae3412d060c5508d3845796ba1 Mon Sep 17 00:00:00 2001
From: igor-dv <davydkin.igor@gmail.com>
Date: Sat, 2 Jun 2018 18:49:43 +0300
Subject: [PATCH 09/11] Fix warnings based on
 https://github.com/angular/universal-starter/pull/593

---
 app/angular/src/server/wrapInitialConfig.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/angular/src/server/wrapInitialConfig.js b/app/angular/src/server/wrapInitialConfig.js
index 0ab32b351568..9e3314bde478 100644
--- a/app/angular/src/server/wrapInitialConfig.js
+++ b/app/angular/src/server/wrapInitialConfig.js
@@ -16,6 +16,10 @@ export default (config, configDir) => ({
           require.resolve('angular2-template-loader'),
         ],
       },
+      {
+        test: /[/\\]@angular[/\\]core[/\\].+\.js$/,
+        parser: { system: true },
+      },
       {
         test: /\.html$/,
         loader: 'raw-loader',

From 28a06ac0df5501753732d52af3764ae2cb5179c2 Mon Sep 17 00:00:00 2001
From: igor-dv <davydkin.igor@gmail.com>
Date: Sat, 2 Jun 2018 18:50:39 +0300
Subject: [PATCH 10/11] Update versions

---
 examples/angular-cli/package.json | 22 +++++++++++-----------
 package.json                      | 12 ++++++------
 yarn.lock                         | 22 +++++++++++-----------
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/examples/angular-cli/package.json b/examples/angular-cli/package.json
index b803b79e29b0..93f5036f9855 100644
--- a/examples/angular-cli/package.json
+++ b/examples/angular-cli/package.json
@@ -38,22 +38,22 @@
     }
   },
   "dependencies": {
-    "@angular/common": "^6.0.0",
-    "@angular/compiler": "^6.0.0",
-    "@angular/core": "^6.0.0",
-    "@angular/forms": "^6.0.0",
-    "@angular/platform-browser": "^6.0.0",
-    "@angular/platform-browser-dynamic": "^6.0.0",
-    "@ngrx/store": "^6.0.0-beta.1",
+    "@angular/common": "^6.0.3",
+    "@angular/compiler": "^6.0.3",
+    "@angular/core": "^6.0.3",
+    "@angular/forms": "^6.0.3",
+    "@angular/platform-browser": "^6.0.3",
+    "@angular/platform-browser-dynamic": "^6.0.3",
+    "@ngrx/store": "^6.0.1",
     "core-js": "^2.5.7",
-    "rxjs": "^6.0.0",
-    "rxjs-compat": "^6.0.0",
+    "rxjs": "^6.2.0",
+    "rxjs-compat": "^6.2.0",
     "zone.js": "^0.8.26"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^0.6.0",
-    "@angular/cli": "^6.0.0",
-    "@angular/compiler-cli": "^6.0.0",
+    "@angular/cli": "^6.0.7",
+    "@angular/compiler-cli": "^6.0.3",
     "@storybook/addon-actions": "4.0.0-alpha.8",
     "@storybook/addon-backgrounds": "4.0.0-alpha.8",
     "@storybook/addon-jest": "4.0.0-alpha.8",
diff --git a/package.json b/package.json
index a2b810ceeb9d..92d6af4858de 100644
--- a/package.json
+++ b/package.json
@@ -39,12 +39,12 @@
     "chromatic": "npm --prefix examples/official-storybook run chromatic"
   },
   "devDependencies": {
-    "@angular/common": "^6.0.0",
-    "@angular/compiler": "^6.0.0",
-    "@angular/core": "^6.0.0",
-    "@angular/forms": "^6.0.0",
-    "@angular/platform-browser": "^6.0.0",
-    "@angular/platform-browser-dynamic": "^6.0.0",
+    "@angular/common": "^6.0.3",
+    "@angular/compiler": "^6.0.3",
+    "@angular/core": "^6.0.3",
+    "@angular/forms": "^6.0.3",
+    "@angular/platform-browser": "^6.0.3",
+    "@angular/platform-browser-dynamic": "^6.0.3",
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.3",
     "babel-eslint": "^8.2.3",
diff --git a/yarn.lock b/yarn.lock
index 414f43991d9a..a0e0538475ee 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -91,7 +91,7 @@
     "@angular-devkit/core" "0.6.7"
     rxjs "^6.0.0"
 
-"@angular/cli@^6.0.0":
+"@angular/cli@^6.0.7":
   version "6.0.7"
   resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-6.0.7.tgz#e4dc676c681cb875bc7196d9eff20aa865d7f2ea"
   dependencies:
@@ -108,13 +108,13 @@
     symbol-observable "^1.2.0"
     yargs-parser "^10.0.0"
 
-"@angular/common@^6.0.0":
+"@angular/common@^6.0.3":
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/@angular/common/-/common-6.0.3.tgz#8b2af3bb74add35c10cd969a5d179cb6a8b21545"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^6.0.0":
+"@angular/compiler-cli@^6.0.3":
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-6.0.3.tgz#4cdda9f28e3387811423c980f3e195ac2322057d"
   dependencies:
@@ -123,31 +123,31 @@
     reflect-metadata "^0.1.2"
     tsickle "^0.27.2"
 
-"@angular/compiler@^6.0.0":
+"@angular/compiler@^6.0.3":
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-6.0.3.tgz#47e988012e94f9e3477a4c5557c997d7910a3b2d"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^6.0.0":
+"@angular/core@^6.0.3":
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/@angular/core/-/core-6.0.3.tgz#50502115105c3784d24338dd8ffb7dddcb55b58d"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/forms@^6.0.0":
+"@angular/forms@^6.0.3":
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-6.0.3.tgz#57328c9ec0ddf4ae7823ec807315501813c22752"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser-dynamic@^6.0.0":
+"@angular/platform-browser-dynamic@^6.0.3":
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.0.3.tgz#b27e26c06df4ce34879cefd818e7ff394764f834"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^6.0.0":
+"@angular/platform-browser@^6.0.3":
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-6.0.3.tgz#67941ac1dc0e89c1a18bb97ef17d574f469be6d2"
   dependencies:
@@ -295,7 +295,7 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@ngrx/store@^6.0.0-beta.1":
+"@ngrx/store@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/@ngrx/store/-/store-6.0.1.tgz#02c806ce20c698b997e81f5671e0edc07d32cf86"
 
@@ -15595,7 +15595,7 @@ rx@2.3.24:
   version "2.3.24"
   resolved "https://registry.yarnpkg.com/rx/-/rx-2.3.24.tgz#14f950a4217d7e35daa71bbcbe58eff68ea4b2b7"
 
-rxjs-compat@^6.0.0:
+rxjs-compat@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.2.0.tgz#2eb49cc6ac20d0d7057c6887d1895beaab0966f9"
 
@@ -15605,7 +15605,7 @@ rxjs@^5.5.2:
   dependencies:
     symbol-observable "1.0.1"
 
-rxjs@^6.0.0, rxjs@^6.1.0:
+rxjs@^6.0.0, rxjs@^6.1.0, rxjs@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.0.tgz#e024d0e180b72756a83c2aaea8f25423751ba978"
   dependencies:

From 7bbaf8f7a3e46a5a2b565b931def4f1cb463d210 Mon Sep 17 00:00:00 2001
From: igor-dv <davydkin.igor@gmail.com>
Date: Mon, 4 Jun 2018 09:59:57 +0300
Subject: [PATCH 11/11] Change angular peers to >=6

---
 app/angular/package.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/angular/package.json b/app/angular/package.json
index 7765bf00710c..b565b68cf966 100644
--- a/app/angular/package.json
+++ b/app/angular/package.json
@@ -36,11 +36,11 @@
   },
   "peerDependencies": {
     "@angular-devkit/core": "^0.6.1",
-    "@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"
+    "@angular/common": ">=6.0.0",
+    "@angular/compiler": ">=6.0.0",
+    "@angular/core": ">=6.0.0",
+    "@angular/forms": ">=6.0.0",
+    "@angular/platform-browser": ">=6.0.0",
+    "@angular/platform-browser-dynamic": ">=6.0.0"
   }
 }